From 4569a9d423ead5cbb5dc9b0a243c6f80a682ec56 Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Fri, 8 Nov 2024 10:45:44 -0600 Subject: [PATCH] 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 | 18 ++++++++++++++++++ .../cards/official/set03/set03-Gondor.hjson | 2 +- .../cards/official/set03/set03-Sites.hjson | 1 + .../cards/official/set08/set08-Gondor.hjson | 5 +---- .../cards/official/set10/set10-Gondor.hjson | 3 ++- .../cards/unofficial/pc/setV02/V2-Rohan.hjson | 2 +- .../gempukku/lotro/at/RequirementsAtTest.java | 6 +++--- 7 files changed, 27 insertions(+), 10 deletions(-) create mode 100644 gemp-lotr/db/update-maps-in-decks.sql diff --git a/gemp-lotr/db/update-maps-in-decks.sql b/gemp-lotr/db/update-maps-in-decks.sql new file mode 100644 index 000000000..14ba33501 --- /dev/null +++ b/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%'; \ No newline at end of file diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set03/set03-Gondor.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set03/set03-Gondor.hjson index 29bb69526..248c919bc 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set03/set03-Gondor.hjson +++ b/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.
You may heal a [gondor] companion at the end of each turn during which no companion or ally lost a skirmish. diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set03/set03-Sites.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set03/set03-Sites.hjson index 58fd6edbe..97fc4e731 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set03/set03-Sites.hjson +++ b/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 diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Gondor.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Gondor.hjson index bf74c1ba2..4697d334c 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Gondor.hjson +++ b/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)) } ] diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set10/set10-Gondor.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set10/set10-Gondor.hjson index 2874b79bc..ba365b26e 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set10/set10-Gondor.hjson +++ b/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 diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/V2-Rohan.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/V2-Rohan.hjson index f309876db..6f48ac846 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/V2-Rohan.hjson +++ b/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) } } } diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/RequirementsAtTest.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/RequirementsAtTest.java index fe2738dda..3ee963a33 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/RequirementsAtTest.java +++ b/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