diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set03/set3-isengard.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set03/set3-isengard.hjson index 5eda323f0..938f8efa4 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set03/set3-isengard.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set03/set3-isengard.hjson @@ -296,7 +296,7 @@ } effect: { type: if - condition: { + check: { type: canSpot filter: companion count: 5 diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Dwarven.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Dwarven.hjson index fef5ad439..fd185c17b 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Dwarven.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Dwarven.hjson @@ -577,7 +577,7 @@ effect: [ { type: if - condition: { + check: { type: canSpot filter: name(Legolas) } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Gondor.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Gondor.hjson index 825762611..8cd59f7fe 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Gondor.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Gondor.hjson @@ -781,7 +781,7 @@ } effect: { type: if - condition: { + check: { type: memoryMatches memory: exertedCompanion filter: unbound,culture(gondor),man diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Isengard.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Isengard.hjson index c589f4b1f..4f0b4d937 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Isengard.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Isengard.hjson @@ -436,7 +436,7 @@ } { type: if - condition: { + check: { type: memoryMatches memory: chosenCompanion filter: hobbit diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Shire.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Shire.hjson index b761e8b6d..6911c5866 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Shire.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Shire.hjson @@ -1201,7 +1201,7 @@ effect: [ { type: if - condition: { + check: { type: location filter: siteNumber(1-4),siteBlock(two towers) } @@ -1309,7 +1309,7 @@ effect: [ { type: if - condition: { + check: { type: location filter: siteNumber(1-5),siteBlock(two towers) } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set05/set05-Gollum.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set05/set05-Gollum.hjson index a4ad53917..4df08e0dc 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set05/set05-Gollum.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set05/set05-Gollum.hjson @@ -544,7 +544,7 @@ type: event cost: { type: if - condition: { + check: { type: phase phase: shadow } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set07/set07-Gollum.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set07/set07-Gollum.hjson index 75ff5760a..7ef6b9c91 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set07/set07-Gollum.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set07/set07-Gollum.hjson @@ -1256,7 +1256,7 @@ effect: [ { type: if - condition: { + check: { type: isGreaterThan firstNumber: { type: forEachVitality diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set07/set07-Gondor.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set07/set07-Gondor.hjson index 4c3d9f1ba..e6c349d46 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set07/set07-Gondor.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set07/set07-Gondor.hjson @@ -1750,7 +1750,7 @@ } effect: { type: if - condition: { + check: { type: twilightPoolLessThan amount: 1 } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set07/set07-Sauron.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set07/set07-Sauron.hjson index f38844f08..71291269c 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set07/set07-Sauron.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set07/set07-Sauron.hjson @@ -337,7 +337,7 @@ } { type: if - condition: { + check: { type: memoryMatches memory: discardedCard filter: minTwilight(memory(spotCount)) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Gandalf.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Gandalf.hjson index a87d9fc72..74445ce04 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Gandalf.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Gandalf.hjson @@ -27,7 +27,7 @@ effect: [ { type: if - condition: { + check: { type: location filter: siteBlock(king),siteNumber(1-5) } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set10/set10-Sauron.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set10/set10-Sauron.hjson index aeecc885a..b56c03090 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set10/set10-Sauron.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set10/set10-Sauron.hjson @@ -993,7 +993,7 @@ } effect: { type: if - condition: { + check: { type: cantSpotFPCultures amount: 3 } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set11/set11-Gondor.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set11/set11-Gondor.hjson index 9ff43243b..b8e24fe5e 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set11/set11-Gondor.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set11/set11-Gondor.hjson @@ -781,7 +781,7 @@ effect: [ { type: if - condition: { + check: { type: location filter: regionNumber(1) } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set11/set11-Orc.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set11/set11-Orc.hjson index 2cbb76e98..9340aa998 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set11/set11-Orc.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set11/set11-Orc.hjson @@ -33,7 +33,7 @@ effect: [ { type: if - condition: { + check: { type: location filter: battleground } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set11/set11-Shire.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set11/set11-Shire.hjson index d0597152d..f2848581c 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set11/set11-Shire.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set11/set11-Shire.hjson @@ -331,7 +331,7 @@ effect: [ { type: if - condition: { + check: { type: location filter: dwelling } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set13/set13-Gollum.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set13/set13-Gollum.hjson index 52485a56c..d34220e96 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set13/set13-Gollum.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set13/set13-Gollum.hjson @@ -958,7 +958,7 @@ effect: [ { type: if - condition: { + check: { type: location filter: regionNumber(1) } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set13/set13-Ringwraith.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set13/set13-Ringwraith.hjson index 82abc9377..2996b5e6d 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set13/set13-Ringwraith.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set13/set13-Ringwraith.hjson @@ -39,7 +39,7 @@ effect: [ { type: if - condition: { + check: { type: location filter: regionNumber(1) } @@ -335,7 +335,7 @@ } effect: { type: if - condition: { + check: { type: canSpot filter: companion count: 6 diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set15/set15-Dwarven.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set15/set15-Dwarven.hjson index 71fb93cb6..9759e6516 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set15/set15-Dwarven.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set15/set15-Dwarven.hjson @@ -69,7 +69,7 @@ } { type: if - condition: { + check: { type: memoryMatches memory: revealedCard filter: culture(dwarven) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set15/set15-Gandalf.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set15/set15-Gandalf.hjson index 53fed8f61..1ead00e3a 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set15/set15-Gandalf.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set15/set15-Gandalf.hjson @@ -414,7 +414,7 @@ effect: [ { type: if - condition: { + check: { type: memoryIs memory: effect value: first diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set15/set15-Orc.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set15/set15-Orc.hjson index d30e1cc41..9fbbc9044 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set15/set15-Orc.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set15/set15-Orc.hjson @@ -1137,7 +1137,7 @@ } { type: if - condition: { + check: { type: memoryMatches memory: revealedCard filter: culture(orc),orc @@ -1378,7 +1378,7 @@ } effect: { type: if - condition: { + check: { type: cantSpot filter: companion count: 6 diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set15/set15-Uruk-hai.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set15/set15-Uruk-hai.hjson index 344d5a61d..aab226b70 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set15/set15-Uruk-hai.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set15/set15-Uruk-hai.hjson @@ -1135,8 +1135,8 @@ ] effect: { type: exchangeSite - selector1: memory(spottedSite) - selector2: choose(controlledSite) + site1: memory(spottedSite) + site2: choose(controlledSite) } } ] diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set17/set17-Elven.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set17/set17-Elven.hjson index 80eeffaec..4d2635784 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set17/set17-Elven.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set17/set17-Elven.hjson @@ -569,7 +569,7 @@ effect: [ { type: if - condition: { + check: { type: memoryIs memory: played value: first diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set17/set17-Gandalf.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set17/set17-Gandalf.hjson index 017b72736..f61828eb3 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set17/set17-Gandalf.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set17/set17-Gandalf.hjson @@ -400,7 +400,7 @@ } { type: if - condition: { + check: { type: memoryMatches memory: chosenMinion filter: wizard @@ -603,14 +603,14 @@ } { type: if - condition: { + check: { type: memoryIs memory: chosenFP value: yes } true: { type: if - condition: { + check: { type: memoryMatches memory: revealedCards filter: side(free people) @@ -632,7 +632,7 @@ } false: { type: if - condition: { + check: { type: memoryMatches memory: revealedCards filter: side(shadow) diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/AppendCardIdsToWhileInZone.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/AppendCardIdsToWhileInZone.java index 484f8e185..cebc2beda 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/AppendCardIdsToWhileInZone.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/AppendCardIdsToWhileInZone.java @@ -21,6 +21,9 @@ public class AppendCardIdsToWhileInZone implements EffectAppenderProducer { String memory = FieldUtils.getString(effectObject.get("memory"), "memory"); + if (memory == null) + throw new InvalidCardDefinitionException("'memory' needs to be defined for AppendCardIdsToWhileInZone effect."); + return new DelayedAppender() { @Override protected Effect createEffect(boolean cost, CostToEffectAction action, ActionContext actionContext) { diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/ChooseArbitraryCards.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/ChooseArbitraryCards.java index 88a8f7bb1..b04463bae 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/ChooseArbitraryCards.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/ChooseArbitraryCards.java @@ -25,18 +25,19 @@ public class ChooseArbitraryCards implements EffectAppenderProducer { FieldUtils.validateAllowedFields(effectObject, "fromMemory", "count", "filter", "memorize", "text", "player"); final String fromMemory = FieldUtils.getString(effectObject.get("fromMemory"), "fromMemory"); - if (fromMemory == null) - throw new InvalidCardDefinitionException("You need to define fromMemory to display arbitrary cards"); final ValueSource valueSource = ValueResolver.resolveEvaluator(effectObject.get("count"), 1, environment); final String filter = FieldUtils.getString(effectObject.get("filter"), "filter", "any"); final String memorize = FieldUtils.getString(effectObject.get("memorize"), "memorize"); - if (memorize == null) - throw new InvalidCardDefinitionException("You need to define what memory to use to store chosen cards"); final String text = FieldUtils.getString(effectObject.get("text"), "text"); - if (text == null) - throw new InvalidCardDefinitionException("You need to define text to show"); final String player = FieldUtils.getString(effectObject.get("player"), "player", "you"); + if (fromMemory == null) + throw new InvalidCardDefinitionException("'fromMemory' field required for ChooseArbitraryCards effect."); + if (memorize == null) + throw new InvalidCardDefinitionException("'memorize' field required for ChooseArbitraryCards effect."); + if (text == null) + throw new InvalidCardDefinitionException("'text' field required for ChooseArbitraryCards effect."); + FilterableSource filterableSource = environment.getFilterFactory().generateFilter(filter, environment); final PlayerSource playerSource = PlayerResolver.resolvePlayer(player, environment); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/ChooseCardsFromDiscard.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/ChooseCardsFromDiscard.java index 2e8865032..3d9fdaa10 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/ChooseCardsFromDiscard.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/ChooseCardsFromDiscard.java @@ -21,8 +21,6 @@ public class ChooseCardsFromDiscard implements EffectAppenderProducer { if (memorize == null) throw new InvalidCardDefinitionException("You need to define what memory to use to store chosen cards"); final String text = FieldUtils.getString(effectObject.get("text"), "text", "Choose cards from discard."); - if (text == null) - throw new InvalidCardDefinitionException("You need to define text to show"); return CardResolver.resolveCardsInDiscard(select, valueSource, memorize, "you", text, environment); } diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/DiscardFromPlay.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/DiscardFromPlay.java index a9853ca2c..1914445ce 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/DiscardFromPlay.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/DiscardFromPlay.java @@ -28,7 +28,7 @@ public class DiscardFromPlay implements EffectAppenderProducer { final ValueSource valueSource = ValueResolver.resolveEvaluator(effectObject.get("count"), 1, environment); final String select = FieldUtils.getString(effectObject.get("select"), "select"); if (select == null) - throw new InvalidCardDefinitionException("select is required"); + throw new InvalidCardDefinitionException("'select' is required for Discard effect."); final String memory = FieldUtils.getString(effectObject.get("memorize"), "memorize", "_temp"); final String stackedCardsMemory = FieldUtils.getString(effectObject.get("memorizeStackedCards"), "memorizeStackedCards"); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/ExchangeCardsInHandWithCardsStacked.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/ExchangeCardsInHandWithCardsStacked.java index 4167fade2..c92debb0d 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/ExchangeCardsInHandWithCardsStacked.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/ExchangeCardsInHandWithCardsStacked.java @@ -32,7 +32,7 @@ public class ExchangeCardsInHandWithCardsStacked implements EffectAppenderProduc final ValueSource countHand = ValueResolver.resolveEvaluator(effectObject.get("countInHand"), 1, environment); final String selectInStacked = FieldUtils.getString(effectObject.get("selectInStacked"), "selectInStacked"); - final ValueSource stackedCardCount = ValueResolver.resolveEvaluator("1", environment); + final ValueSource stackedCardCount = ValueResolver.resolveEvaluator(effectObject.get("countInStacked"), 1, environment); MultiEffectAppender result = new MultiEffectAppender(); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/ExchangeSite.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/ExchangeSite.java index b31a64bb2..3d234e598 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/ExchangeSite.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/ExchangeSite.java @@ -18,17 +18,17 @@ import org.json.simple.JSONObject; public class ExchangeSite implements EffectAppenderProducer { @Override public EffectAppender createEffectAppender(JSONObject effectObject, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { - FieldUtils.validateAllowedFields(effectObject, "selector1", "selector2"); + FieldUtils.validateAllowedFields(effectObject, "site1", "site2"); - final String selector1 = FieldUtils.getString(effectObject.get("selector1"), "selector1"); - final String selector2 = FieldUtils.getString(effectObject.get("selector2"), "selector2"); + final String site1 = FieldUtils.getString(effectObject.get("site1"), "site1"); + final String site2 = FieldUtils.getString(effectObject.get("site2"), "site2"); MultiEffectAppender result = new MultiEffectAppender(); result.addEffectAppender( - CardResolver.resolveCard(selector1, "_temp1", "you", "Choose a site to exchange", environment)); + CardResolver.resolveCard(site1, "_temp1", "you", "Choose a site to exchange", environment)); result.addEffectAppender( - CardResolver.resolveCard(selector2, "_temp2", "you", "Choose a site to exchange", environment)); + CardResolver.resolveCard(site2, "_temp2", "you", "Choose a site to exchange", environment)); result.addEffectAppender( new DelayedAppender() { @Override diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/IfEffect.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/IfEffect.java index 718cf1c3c..ff791caf2 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/IfEffect.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/IfEffect.java @@ -16,9 +16,9 @@ import org.json.simple.JSONObject; public class IfEffect implements EffectAppenderProducer { @Override public EffectAppender createEffectAppender(JSONObject effectObject, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { - FieldUtils.validateAllowedFields(effectObject, "condition", "true", "false"); + FieldUtils.validateAllowedFields(effectObject, "check", "true", "false"); - final JSONObject[] conditionArray = FieldUtils.getObjectArray(effectObject.get("condition"), "condition"); + final JSONObject[] conditionArray = FieldUtils.getObjectArray(effectObject.get("check"), "check"); final JSONObject[] trueEffects = FieldUtils.getObjectArray(effectObject.get("true"), "true"); final JSONObject[] falseEffects = FieldUtils.getObjectArray(effectObject.get("false"), "false");