From ab61920fa1cc37bcc2aa67fdff425b6a99eb7b3f Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Wed, 21 Dec 2022 02:37:55 -0600 Subject: [PATCH] Various fixes to errata --- .../pc/errata/set01/set01-Elven-errata.hjson | 2 +- .../pc/errata/set01/set01-Sauron-errata.hjson | 4 ++-- .../errata/set02/set02-Isengard-errata.hjson | 2 +- .../errata/set03/set03-Isengard-errata.hjson | 3 --- .../pc/errata/set03/set03-Sauron-errata.hjson | 20 ++++++++--------- .../errata/set04/set04-Isengard-errata.hjson | 8 ++++++- .../errata/set05/set05-Isengard-errata.hjson | 22 ++++++++++++++----- .../pc/errata/set07/set07-Rohan-errata.hjson | 4 ++-- .../pc/errata/set08/set08-Gondor-errata.hjson | 2 +- .../pc/errata/set08/set08-Rohan-errata.hjson | 2 +- .../pc/errata/set10/set10-Rohan-errata.hjson | 4 ++-- 11 files changed, 43 insertions(+), 30 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set01/set01-Elven-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set01/set01-Elven-errata.hjson index 0127f2026..1dfda17da 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set01/set01-Elven-errata.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set01/set01-Elven-errata.hjson @@ -607,7 +607,7 @@ forced: false count: 1 } - text: Discard a card from hand to prevent {targetMinion} exert + text: Discard a card from hand to prevent {targetMinion} from exerting effect: { type: exert filter: memory(targetMinion) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set01/set01-Sauron-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set01/set01-Sauron-errata.hjson index f751afcfc..e55f1411e 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set01/set01-Sauron-errata.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set01/set01-Sauron-errata.hjson @@ -35,7 +35,7 @@ type: trigger trigger: { type: winsSkirmish - filter: bearer + filter: self } cost: { type: removeTwilight @@ -537,7 +537,7 @@ effect: [ { type: chooseActiveCards - filter: choose(companion,not(exhausted)) + filter: choose(companion,not(exhausted),not(Ring-bearer)) memorize: chosenComp text: Choose a companion to exhaust } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set02/set02-Isengard-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set02/set02-Isengard-errata.hjson index fe2c532e3..15856f8d4 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set02/set02-Isengard-errata.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set02/set02-Isengard-errata.hjson @@ -49,7 +49,7 @@ type: trigger trigger: { type: winsSkirmish - filter: bearer,title(Lurtz) + filter: bearer } effect: { type: choice diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set03/set03-Isengard-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set03/set03-Isengard-errata.hjson index 8fd0feb47..dae25417e 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set03/set03-Isengard-errata.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set03/set03-Isengard-errata.hjson @@ -29,7 +29,6 @@ culture: isengard twilight: 2 type: condition - itemclass: palantir keyword: support area requires: { type: canSpot @@ -47,8 +46,6 @@ cost: { type: discardfromhand forced: false - hand: freeps - player: freeps filter: choose(culture(isengard)) count: 1 memorize: discardedCard diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set03/set03-Sauron-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set03/set03-Sauron-errata.hjson index e9952ba5c..0c4e6bb8f 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set03/set03-Sauron-errata.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set03/set03-Sauron-errata.hjson @@ -70,7 +70,7 @@ memory: twilightCostInMemory } } - text: Discard {twilightCostInMemory} card from hand to prevent your opponent taking {chosenCard} into hand from their draw deck + text: Discard {twilightCostInMemory} cards from hand to prevent your opponent taking {chosenCard} into hand from their draw deck effect: { type: PutCardsFromDeckIntoHand filter: memory(chosenCard) @@ -78,7 +78,7 @@ } ] } - gametext: Exert a [sauron] minion to reveal a card at random from the Free Peoples player's hand. You may take a minion into hand from your draw deck costing X or less, where X is the twilight cost of the card revealed. The Free Peoples player may discard X cards from hand to prevent this. + gametext: Exert a [sauron] minion to reveal a card at random from the Free Peoples player's hand. You may take a minion into hand from your draw deck costing up to X, where X is the twilight cost of the card revealed. The Free Peoples player may discard X cards from hand to prevent this. lore: "" promotext: "" alts: { @@ -215,7 +215,7 @@ effect: [ { type: chooseActiveCards - filter: choose(companion,not(exhausted)) + filter: choose(companion,not(exhausted),not(Ring-bearer)) memorize: chosenComp text: Choose a companion to exhaust } @@ -325,7 +325,7 @@ count: 2 forced: false } - text: Discard the top 2 cards of your deck to prevent {chosenComp} + text: Discard the top 2 cards of your deck to prevent exerting {chosenComp} effect: { type: exert filter: memory(chosenComp) @@ -469,16 +469,16 @@ keyword: [ maneuver ] + requires: [ + { + type: CanSpot + filter: culture(Sauron),minion + } + ] effects: { type: event effect: { type: conditional - requires: [ - { - type: CanSpot - filter: culture(Sauron),minion - } - ] effect: { type: choice texts: [ diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set04/set04-Isengard-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set04/set04-Isengard-errata.hjson index 0e7c94574..d27b85378 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set04/set04-Isengard-errata.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set04/set04-Isengard-errata.hjson @@ -35,6 +35,12 @@ { type: activated phase: maneuver + requires: [ + { + type: CanSpot + filter: fortification + } + ] effect: [ { type: ChooseActiveCards @@ -88,7 +94,7 @@ ] } ] - gametext: Maneuver: Spot a fortification. Make the Free Peoples player distribute X + 1 wounds among your [isengard] minions to discard that fortification, where X is its twilight cost.\Archery: Spot 2 [isengard] archers to make allies take wounds from archery fire instead of companions. + gametext: Maneuver: If you can spot an [isengard] minion, spot a fortification. Make the Free Peoples player distribute X + 1 wounds among your [isengard] minions to discard that fortification, where X is its twilight cost.\Archery: Spot 2 [isengard] archers to make allies take wounds from archery fire instead of companions. lore: "" promotext: "" alts: { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set05/set05-Isengard-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set05/set05-Isengard-errata.hjson index 26153daa3..c306d85b4 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set05/set05-Isengard-errata.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set05/set05-Isengard-errata.hjson @@ -36,16 +36,26 @@ { type: activated phase: shadow + requires: { + type: perPhaseLimit + limit: 2 + } cost: { type: exert filter: choose(Uruk-hai) } - effect: { - type: AddTokens - amount: 1 - culture: isengard - filter: self - } + effect: [ + { + type: AddTokens + amount: 1 + culture: isengard + filter: self + } + { + type: incrementPerPhaseLimit + limit: 1 + } + ] } { type: activated diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set07/set07-Rohan-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set07/set07-Rohan-errata.hjson index 0d9df27da..5dc382ac1 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set07/set07-Rohan-errata.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set07/set07-Rohan-errata.hjson @@ -54,14 +54,14 @@ type: Wound filter: choose(minion) count: { - type: FromMemory + type: ForEachInMemory memory: exertedComps } } { type: RemoveBurdens amount: { - type: FromMemory + type: ForEachInMemory memory: exertedComps } } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set08/set08-Gondor-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set08/set08-Gondor-errata.hjson index b50777bed..6f9f600e1 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set08/set08-Gondor-errata.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set08/set08-Gondor-errata.hjson @@ -34,7 +34,7 @@ effects: [ { type: trigger - optional: true + optional: false trigger: { type: moves } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set08/set08-Rohan-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set08/set08-Rohan-errata.hjson index 72e7129f8..5fee58d2e 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set08/set08-Rohan-errata.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set08/set08-Rohan-errata.hjson @@ -25,7 +25,7 @@ } title: Rohirrim Army unique: true - culture: elven + culture: rohan twilight: 5 type: companion race: man diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set10/set10-Rohan-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set10/set10-Rohan-errata.hjson index 71c8054d3..e69867d13 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set10/set10-Rohan-errata.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set10/set10-Rohan-errata.hjson @@ -26,7 +26,7 @@ title: Éowyn subtitle: Lady of Ithilien unique: true - culture: elven + culture: rohan twilight: 2 type: companion race: man @@ -62,7 +62,7 @@ { type: Repeat amount: { - type: ForEachVitality + type: ForEachWound filter: minion,InSkirmishAgainst(self) } effect: {