GCR Card Fixes

- Fixed V2 Theoden counting himself
- Fixed V2 Isengard Foreman being required instead of optional
- Fixed House of Elrond being required instead of optional
- Fixed Catapult discarding from hand instead of from play
- Fixed Citadel of Minas Tirith working on non-gondor companions
- Fixed Drawing His Eye discarding all revealed cards instead of making the player choose one
- Added script for upgrading the old maps to V2 maps

gemp-lotr/db/update-maps-in-decks.sql

@@ -0,0 +1,18 @@
+
+
+SELECT *
+FROM deck
+WHERE contents LIKE '%100\_2%' OR contents LIKE '%100\_3%' OR contents LIKE '%100\_4%';
+
+UPDATE deck 
+SET contents = REGEXP_REPLACE(contents, '100_2', '102_74');
+
+UPDATE deck 
+SET contents = REGEXP_REPLACE(contents, '100_3', '102_75');
+
+UPDATE deck 
+SET contents = REGEXP_REPLACE(contents, '100_4', '102_76');
+
+SELECT *
+FROM deck
+WHERE contents LIKE '%102\_74%' OR contents LIKE '%102\_75%' OR contents LIKE '%102\_76%';

gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set03/set03-Gondor.hjson

@@ -158,7 +158,7 @@
 			}
 			effect: {
 				type: heal
-				select: choose(companion)
+				select: choose(culture(gondor),companion)
 			}
 		}
 		gametext: Plays to your support area.<br>You may heal a [gondor] companion at the end of each turn during which no companion or ally lost a skirmish.

gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set03/set03-Sites.hjson

@@ -156,6 +156,7 @@
 		keywords: Sanctuary
 		effects: {
 			type: trigger
+			optional: true
 			trigger: {
 				type: movesTo
 				filter: self

gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Gondor.hjson

@@ -57,7 +57,6 @@
 		culture: Gondor
 		twilight: 1
 		type: Possession
-		#target: 
 		keywords: Support Area
 		effects: [
 			{
@@ -83,10 +82,8 @@
 						memorize: revealedCard
 					}
 					{
-						type: discardFromHand
-						hand: shadow
+						type: Discard
 						player: shadow
-						forced: true
 						select: choose(side(shadow),printedTwilightCostFromMemory(revealedCard))
 					}
 				]

gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set10/set10-Gondor.hjson

@@ -280,7 +280,8 @@
 					forced: true
 					hand: shadow
 					player: you
-					select: memory(revealedCards)
+					count: 1
+					select: choose(memory(revealedCards))
 				}
 				{
 					type: drawCards

gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/V2-Rohan.hjson

@@ -720,7 +720,7 @@
 					filter: self
 					amount: {
 						type: ForEachYouCanSpot
-						filter: valiant, companion, AssignedToSkirmish(any)
+						filter: other, valiant, companion, AssignedToSkirmish(any)
 					}
 				}
 			}

gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/RequirementsAtTest.java

@@ -281,18 +281,18 @@ public class RequirementsAtTest extends AbstractAtTest {
     public void loseSkirmishThisTurn() throws Exception {
         initializeSimplestGame();
 
-        PhysicalCard gimli = addToZone(createCard(P1, "5_7"), Zone.FREE_CHARACTERS);
+        PhysicalCard aragorn = addToZone(createCard(P1, "1_89"), Zone.FREE_CHARACTERS);
         PhysicalCard citadelOfMinasTirith = addToZone(createCard(P1, "3_40"), Zone.SUPPORT);
 
         passUntil(Phase.FELLOWSHIP);
-        addWounds(gimli, 1);
+        addWounds(aragorn, 1);
 
         passUntil(Phase.REGROUP);
         pass(P1);
         pass(P2);
         selectNo(P1);
         selectCardAction(P1, citadelOfMinasTirith);
-        assertEquals(0, getWounds(gimli));
+        assertEquals(0, getWounds(aragorn));
     }
 
     @Test