From 8258933d6018659c8f0e7ac81e8e5703883cff29 Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Fri, 24 Dec 2021 18:40:53 -0600 Subject: [PATCH] Card Fixes --- .../cards/errata/set08-errata-playtest.json | 40 ++++++---- .../cards/set101/set101_gandalf_playtest.json | 73 ++++++++++++------- .../set101/set101_isengard_playtest.json | 2 +- .../cards/set101/set101_moria_playtest.json | 2 +- .../set101/set101_ringwraith_playtest.json | 25 ++----- .../src/main/web/includes/changeLog.html | 26 ++++++- .../src/main/resources/lotrFormats.json | 6 +- 7 files changed, 107 insertions(+), 67 deletions(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/errata/set08-errata-playtest.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/errata/set08-errata-playtest.json index 0c0a2906f..cd94b4f3e 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/errata/set08-errata-playtest.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/errata/set08-errata-playtest.json @@ -201,26 +201,32 @@ { "type": "discard", "filter": "choose(and(culture(sauron),minion))" - } + }, + { + "type": "chooseActiveCards", + "text": "Choose a card for GROND to SMASH", + "filter": "choose(side(free people),not(companion),minTwilight(memory(numberOfTokens)),maxTwilight(memory(numberOfTokens)))", + "memorize": "chosenCard" + }, ], "effect": [ - { - "type": "discard", - "filter": "choose(side(free people),not(companion),minTwilight(memory(numberOfTokens)),maxTwilight(memory(numberOfTokens)))", - "memorize": "discardedCard" - }, { "type": "conditional", "condition": { "type": "memorymatches", - "memory": "discardedCard", + "memory": "chosenCard", "filter": "not(zone(SUPPORT))" }, "effect": { "type": "discard", "filter": "self" } - } + }, + { + "type": "discard", + "filter": "memory(chosenCard)" + }, + ] } ] @@ -242,10 +248,12 @@ "effects": [ { "type": "modifyOwnCost", - "amount": { - "type": "forEachYouCanSpot", - "filter": "controlledsite" + "condition": { + "type": "canSpot", + "filter": "engine", + "count": 4 }, + "amount": -4 }, { "type": "trigger", @@ -257,13 +265,13 @@ "condition": [ { "type": "location", - "filter": "siteNumber(5-9),siteBlock(king)" - }, - { - "type": "canspot", - "filter": "engine" + "filter": "siteNumber(5-9)" } ], + "cost": { + "type": "discard", + "filter": "choose(engine)" + }, "effect": { "type": "discard", "filter": "choose(condition,side(free people))" diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_gandalf_playtest.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_gandalf_playtest.json index 632263d2a..9f7137fbf 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_gandalf_playtest.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_gandalf_playtest.json @@ -60,25 +60,30 @@ "count": 3 }, "filter": "name(Gandalf)", - "amount": { - "type": "condition", - "condition": [ - { - "type": "canSpot", - "filter": "name(Elrond)" - }, - { - "type": "canSpot", - "filter": "name(Galadriel)" - }, - { - "type": "canSpot", - "filter": "name(Celeborn)" - } - ], - "true": 4, - "false": 2 - } + "amount": 2 + } + }, + + { + "type": "modifier", + "modifier": { + "type": "modifyStrength", + "condition": [ + { + "type": "canSpot", + "filter": "name(Elrond)" + }, + { + "type": "canSpot", + "filter": "name(Galadriel)" + }, + { + "type": "canSpot", + "filter": "name(Celeborn)" + } + ], + "filter": "name(Gandalf)", + "amount": 2 } } ] @@ -93,6 +98,12 @@ "race": "eagle", "strength": 8, "vitality": 2, + "condition": [ + { + "type": "canSpot", + "filter": "name(Gandalf)" + } + ], "effects": [ { "type": "trigger", @@ -139,19 +150,29 @@ "title": "My Heart Tells Me", "culture": "gandalf", "cost": 1, - "type": "event", - "keyword": "response", - "condition": { - "type": "canSpot", - "filter": "name(Gandalf)" - }, + "type": "condition", + "keyword": "support area", "effects": { - "type": "responseEvent", + "type": "activatedtrigger", "trigger": { "type": "aboutToTakeWound", "filter": "minion" }, + "condition": [ + { + "type": "canSpot", + "filter": "name(Gandalf)" + }, + { + "type": "perTurnLimit", + "limit": 1 + }, + ], "effect": [ + { + "type": "incrementPerTurnLimit", + "limit": 1 + }, { "type": "preventWound", "filter": "choose(minion)" diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_isengard_playtest.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_isengard_playtest.json index 55937148e..6778ef580 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_isengard_playtest.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_isengard_playtest.json @@ -219,7 +219,7 @@ "151_30": { "title": "*Saruman", - "subtitle": "Fell Voice On The Air", + "subtitle": "Fell Voice", "culture": "isengard", "cost": 4, "type": "minion", diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_moria_playtest.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_moria_playtest.json index 8001d2278..dd8fa37b6 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_moria_playtest.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_moria_playtest.json @@ -219,7 +219,7 @@ "151_36": { "title": "Vile Tentacle", "culture": "moria", - "cost": 3, + "cost": 2, "type": "minion", "race": "creature", "keyword": ["tentacle"], diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_ringwraith_playtest.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_ringwraith_playtest.json index 3a33cd075..891a19849 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_ringwraith_playtest.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_ringwraith_playtest.json @@ -8,26 +8,11 @@ "keyword": ["shadow"], "effects": { "type": "event", - "cost": { - "type": "exert", - "filter": "choose(elf)", - }, - "effect": [ - { - "type": "play", - "filter": "choose(nazgul)", - "memorize": "playedNazgul" - }, - { - "type": "optional", - "text": "Would you like to play a [wraith] possession on that Nazgul from your discard pile?", - "effect": { - "type": "playCardFromDiscard", - "filter": "choose(culture(wraith),possession)", - "on": "memory(playedNazgul)" - } - } - ] + "effect": { + "type": "playCardFromDiscard", + "filter": "choose(culture(wraith),item)", + "on": "memory(playedNazgul)" + }, } }, diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html b/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html index 681a4780b..1049dc628 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html +++ b/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html @@ -1,7 +1,31 @@ 
 Most recent update
 
-2021 December 22 - A
+2021 December 24 - A
+- UPDATED ERRATA: Great Hill Troll (8C102). 
+   Twilight Cost: 10 -> 
9

+   Game Text:
+      Besieger.  Fierce.
+      
While you can spot 4 engines, this minion is twilight cost -4.

+      When you play this minion at 
any site 5 to 9
, you may 
discard an engine to
 discard a Free Peoples condition.
+- UPDATED Gandalf, Olorin (V1_14):
+   Game Text:
+      At the start of your fellowship phase, you may spot 2 [elven] allies to shuffle a [Gandalf] or [elven] card from your discard pile into your draw deck.
+      While you can spot 3 [elven] allies, Gandalf is strength +2
.

+      
While you can spot Elrond, Galadriel and Celeborn, Gandalf is strength +2.

+- UPDATED Fell Voices Call (V1_37):
+   Game Text:
+      Play a [ringwraith] possession or artifact from your discard pile.
+- UPDATED Saruman (V1_30):
+   Subtitle: Fell Voice on the Air -> Fell Voice
+   This is to avoid too much overlap with the existing A Fell Voice on the Air (3R52).
+- UPDATED Vile Tentacle (V1_36)
+   Twilight Cost: 3 -> 
2

+- Fixed Grond errata needing to spot an orc to play.
+- Fixed Grond errata self-discarding on every use.
+- Fixed Gwaihir, Lord of Eagles (V1_15) not spotting Gandalf to play.
+
+2021 December 22
 - Fixed I Would Have Gone With You to the End (V1_23) permitting the use of any stacked cards for its ability.
 - Fixed Gaze of the Eye's image not showing the uniqueness dot.
 - Fixed Desperate Defense of the Ring (1R244) triggering each time minions are added to that companion's skirmish, instead of once per total assignment.
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json b/gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json
index ce277d27a..4d0ab2ee6 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json
+++ b/gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json
@@ -4,8 +4,10 @@
       "code":"debug",
       "sites": "SPECIAL",
       "maximumSameName":100,
-      "set":[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 151],
-      "hall":false
+      "set":[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 101, 151
+        51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 
+        70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89],
+      "hall":true
     },
     {
         "name":"Fellowship block",