From 381d3e89df170e4a5e166e96c2431e4b8f71cbef Mon Sep 17 00:00:00 2001 From: Troy Biesterfeld Date: Tue, 13 Apr 2021 21:50:38 -0500 Subject: [PATCH 1/2] Add SarumanFirstSentenceActive --- .../main/web/cards/errata/set03-errata.json | 23 ++++++++++++------- .../requirement/RequirementFactory.java | 1 + .../SarumanFirstSentenceActive.java | 21 +++++++++++++++++ 3 files changed, 37 insertions(+), 8 deletions(-) create mode 100644 gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/requirement/SarumanFirstSentenceActive.java diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/errata/set03-errata.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/errata/set03-errata.json index cba11e413..8311cfea5 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/errata/set03-errata.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/errata/set03-errata.json @@ -30,7 +30,7 @@ "modifier": { "type": "modifyStrength", "filter": "memory(chosenAlly)", - "amount": 3, + "amount": 3 }, "until": "start(regroup)" }, @@ -42,7 +42,6 @@ ] } }, - "53_68": { "side": "shadow", "site": 4, @@ -60,17 +59,25 @@ "modifier": { "type": "cantTakeWounds", "filter": "self", - "condition": { - "type": "phase", - "phase": "archery" - } + "condition": [ + { + "type": "phase", + "phase": "archery" + }, + { + "type": "sarumanfirstsentenceactive" + } + ] } }, { "type": "modifier", "modifier": { "type": "cantbeassignedtoskirmish", - "filter": "self" + "filter": "self", + "condition": { + "type": "sarumanfirstsentenceactive" + } } }, { @@ -104,5 +111,5 @@ } } ] - }, + } } diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/requirement/RequirementFactory.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/requirement/RequirementFactory.java index 5dfa64e50..1eb9f5107 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/requirement/RequirementFactory.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/requirement/RequirementFactory.java @@ -44,6 +44,7 @@ public class RequirementFactory { requirementProducers.put("cardsinhandmorethan", new CardsInHandMoreThan()); requirementProducers.put("cardsindeckcount", new CardsInDeckCount()); requirementProducers.put("playedcardthisphase", new PlayedCardThisPhase()); + requirementProducers.put("sarumanfirstsentenceactive", new SarumanFirstSentenceActive()); } public Requirement getRequirement(JSONObject object, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/requirement/SarumanFirstSentenceActive.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/requirement/SarumanFirstSentenceActive.java new file mode 100644 index 000000000..0caa4f88a --- /dev/null +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/requirement/SarumanFirstSentenceActive.java @@ -0,0 +1,21 @@ +package com.gempukku.lotro.cards.build.field.effect.requirement; + +import com.gempukku.lotro.cards.build.CardGenerationEnvironment; +import com.gempukku.lotro.cards.build.InvalidCardDefinitionException; +import com.gempukku.lotro.cards.build.Requirement; +import com.gempukku.lotro.cards.build.field.FieldUtils; +import com.gempukku.lotro.game.state.LotroGame; +import com.gempukku.lotro.logic.modifiers.ModifierFlag; +import org.json.simple.JSONObject; + +public class SarumanFirstSentenceActive implements RequirementProducer { + @Override + public Requirement getPlayRequirement(JSONObject object, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { + FieldUtils.validateAllowedFields(object); + + return (actionContext) -> { + final LotroGame game = actionContext.getGame(); + return !game.getModifiersQuerying().hasFlagActive(game, ModifierFlag.SARUMAN_FIRST_SENTENCE_INACTIVE); + }; + } +} From fad5382b3de4614835e87c641fa56c27860cf5b4 Mon Sep 17 00:00:00 2001 From: Troy Biesterfeld Date: Sat, 17 Apr 2021 15:10:11 -0500 Subject: [PATCH 2/2] Fix Breeding Pit --- .../gemp-lotr-async/src/main/web/cards/set1/set1-isengard.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1-isengard.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1-isengard.json index 69bcb85d0..e6a7226bd 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1-isengard.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1-isengard.json @@ -82,7 +82,7 @@ "type": "responseEvent", "trigger": { "type": "played", - "filter": "your,uruk hai", + "filter": "your,uruk-hai", "memorize": "playedUrukHai" }, "effect": {