diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1-moria.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1-moria.hjson index 756f1bc4f..daa81f793 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1-moria.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1-moria.hjson @@ -659,7 +659,7 @@ type: responseEvent trigger: [ { - type: exerts + type: exerted filter: ring bearer } { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set02/set2-isengard.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set02/set2-isengard.hjson index f5265892f..53d9cca44 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set02/set2-isengard.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set02/set2-isengard.hjson @@ -58,7 +58,7 @@ { type: trigger trigger: { - type: exerts + type: exerted filter: culture(shire),ally } effect: { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set07/set07-Ringwraith.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set07/set07-Ringwraith.hjson index b98fece3e..79b4f7ec0 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set07/set07-Ringwraith.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set07/set07-Ringwraith.hjson @@ -2150,7 +2150,7 @@ { type: trigger trigger: { - type: exerts + type: exerted filter: bearer } effect: { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Shire.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Shire.hjson index 02dbea925..ba4268954 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Shire.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Shire.hjson @@ -397,7 +397,7 @@ effects: { type: responseEvent trigger: { - type: exerts + type: exerted filter: minion memorize: exertedMinion } 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 b64c28322..2cbb76e98 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 @@ -495,7 +495,7 @@ type: trigger optional: true trigger: { - type: exerts + type: exerted filter: companion } effect: { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set11/set11-Uruk-hai.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set11/set11-Uruk-hai.hjson index 31147b6bd..5785de272 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set11/set11-Uruk-hai.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set11/set11-Uruk-hai.hjson @@ -233,7 +233,7 @@ type: trigger optional: true trigger: { - type: exerts + type: exerted filter: companion } effect: { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set13/set13-Gondor.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set13/set13-Gondor.hjson index 8d1472d34..b1013ee4c 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set13/set13-Gondor.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set13/set13-Gondor.hjson @@ -1071,7 +1071,7 @@ { type: trigger trigger: { - type: exerts + type: exerted filter: name(Denethor) } effect: { @@ -1083,7 +1083,7 @@ { type: trigger trigger: { - type: exerts + type: exerted filter: name(Boromir) } effect: { @@ -1095,7 +1095,7 @@ { type: trigger trigger: { - type: exerts + type: exerted filter: name(Faramir) } cost: { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set31/set31-shadow.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set31/set31-shadow.hjson index 29f91db75..7555e7089 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set31/set31-shadow.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set31/set31-shadow.hjson @@ -186,7 +186,7 @@ type: Response trigger: [ { - type: exerts + type: exerted filter: name(Bilbo) } { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set33/set33-fp.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set33/set33-fp.hjson index 981bef61a..10e1907ac 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set33/set33-fp.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set33/set33-fp.hjson @@ -356,9 +356,9 @@ type: trigger optional: true trigger: { - type: exertedBy + type: exerted filter: name(Balin) - by: culture(dwarven),event + source: culture(dwarven),event } effect: { type: heal diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set11/set11-Orc-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set11/set11-Orc-errata.hjson index b516773c5..572d291cc 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set11/set11-Orc-errata.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set11/set11-Orc-errata.hjson @@ -31,7 +31,7 @@ { type: trigger trigger: { - type: exerts + type: exerted filter: companion } effect: { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV01/V1_sites.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV01/V1_sites.hjson index 465d437a5..1485f38d5 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV01/V1_sites.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV01/V1_sites.hjson @@ -145,7 +145,7 @@ type: trigger optional: true trigger: { - type: exerts + type: exerted filter: your,companion memorize: exertedComp } diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/trigger/ExertedBy.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/trigger/Exerted.java similarity index 95% rename from gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/trigger/ExertedBy.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/trigger/Exerted.java index 0c73960fa..fa4668bf2 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/trigger/ExertedBy.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/trigger/Exerted.java @@ -11,14 +11,14 @@ import com.gempukku.lotro.logic.timing.TriggerConditions; import com.gempukku.lotro.logic.timing.results.ExertResult; import org.json.simple.JSONObject; -public class ExertedBy implements TriggerCheckerProducer { +public class Exerted implements TriggerCheckerProducer { @Override public TriggerChecker getTriggerChecker(JSONObject value, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { - FieldUtils.validateAllowedFields(value, "filter", "memorize", "by"); + FieldUtils.validateAllowedFields(value, "filter", "memorize", "source"); final String filter = FieldUtils.getString(value.get("filter"), "filter", "any"); final String memorize = FieldUtils.getString(value.get("memorize"), "memorize"); - final String byFilter = FieldUtils.getString(value.get("by"), "by"); + final String byFilter = FieldUtils.getString(value.get("source"), "source", "any"); final FilterableSource filterableSource = environment.getFilterFactory().generateFilter(filter, environment); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/trigger/TriggerCheckerFactory.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/trigger/TriggerCheckerFactory.java index e519483af..0005ba36c 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/trigger/TriggerCheckerFactory.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/trigger/TriggerCheckerFactory.java @@ -45,8 +45,7 @@ public class TriggerCheckerFactory { triggerCheckers.put("cancelledskirmish", new CancelledSkirmish()); triggerCheckers.put("constantlycheck", new ConstantlyCheckTrigger()); triggerCheckers.put("discarded", new Discarded()); - triggerCheckers.put("exertedby", new ExertedBy()); - triggerCheckers.put("exerts", new Exerts()); + triggerCheckers.put("exerted", new Exerted()); triggerCheckers.put("exertsforspecialability", new ExertsForSpecialAbility()); triggerCheckers.put("exertstoplay", new ExertsToPlay()); triggerCheckers.put("fpdecidedifmoving", new FPDecidedIfMoving()); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/TriggerConditions.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/TriggerConditions.java index 445099e96..04d411b91 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/TriggerConditions.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/TriggerConditions.java @@ -176,9 +176,7 @@ public class TriggerConditions { } public static boolean forEachExerted(LotroGame game, EffectResult effectResult, Filterable... filters) { - if (effectResult.getType() == EffectResult.Type.FOR_EACH_EXERTED) - return Filters.and(filters).accepts(game, ((ExertResult) effectResult).getExertedCard()); - return false; + return forEachExertedBy(game, effectResult, Filters.any, filters); } public static boolean forEachExertedBy(LotroGame game, EffectResult effectResult, Filterable exertedBy, Filterable... exerted) {