diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1-elven.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1-elven.hjson index ecfc19225..3fb13178e 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1-elven.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1-elven.hjson @@ -84,7 +84,7 @@ { type: trigger trigger: { - type: requires + type: ConstantlyCheck requires: [ { type: location diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1-isengard.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1-isengard.hjson index 62249693e..29b9f9187 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1-isengard.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1-isengard.hjson @@ -670,7 +670,7 @@ effects: { type: trigger trigger: { - type: requires + type: ConstantlyCheck requires: [ { type: perTurnLimit diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1-sauron.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1-sauron.hjson index 366e96b2b..1cffa33f3 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1-sauron.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1-sauron.hjson @@ -395,7 +395,7 @@ { type: trigger trigger: { - type: requires + type: ConstantlyCheck requires: [ { type: canSpotBurdens @@ -587,7 +587,7 @@ effects: { type: trigger trigger: { - type: requires + type: ConstantlyCheck requires: [ { type: perTurnLimit @@ -995,7 +995,7 @@ { type: trigger trigger: { - type: requires + type: ConstantlyCheck requires: [ { type: perTurnLimit diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1-wraith.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1-wraith.hjson index 30f1ca694..dd40f92ca 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1-wraith.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1-wraith.hjson @@ -200,7 +200,7 @@ { type: trigger trigger: { - type: requires + type: ConstantlyCheck requires: { type: location filter: underground diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1.hjson index f8c8559f4..9ec5cd6e6 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1.hjson @@ -286,7 +286,7 @@ effects: { type: trigger trigger: { - type: requires + type: ConstantlyCheck requires: { type: canSpot filter: ranger @@ -659,7 +659,7 @@ effects: { type: trigger trigger: { - type: requires + type: ConstantlyCheck requires: { type: canSpot filter: ranger 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 7b6917d03..0b3f0bff9 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 @@ -106,7 +106,7 @@ { type: trigger trigger: { - type: requires + type: ConstantlyCheck requires: { type: location filter: underground diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set02/set2-moria.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set02/set2-moria.hjson index 7f59d63a6..94d8799d9 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set02/set2-moria.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set02/set2-moria.hjson @@ -64,7 +64,7 @@ { type: trigger trigger: { - type: requires + type: ConstantlyCheck requires: { type: canSpot filter: another,minion @@ -85,7 +85,7 @@ { type: trigger trigger: { - type: requires + type: ConstantlyCheck requires: { type: not requires: { @@ -125,7 +125,7 @@ { type: trigger trigger: { - type: requires + type: ConstantlyCheck requires: { type: not requires: { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set19/set19.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set19/set19.hjson index 6bfa6495b..63e22608c 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set19/set19.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set19/set19.hjson @@ -761,7 +761,7 @@ { type: trigger trigger: { - type: requires + type: ConstantlyCheck requires: { type: location filter: not(marsh) @@ -807,7 +807,7 @@ { type: trigger trigger: { - type: requires + type: ConstantlyCheck requires: { type: location filter: not(marsh) @@ -846,7 +846,7 @@ { type: trigger trigger: { - type: requires + type: ConstantlyCheck requires: { type: canSpot filter: minion,not(self),not(tentacle) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set30/set30-shadow.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set30/set30-shadow.hjson index 15675bfaa..cea118ea9 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set30/set30-shadow.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set30/set30-shadow.hjson @@ -371,7 +371,7 @@ { type: trigger trigger: { - type: requires + type: ConstantlyCheck requires: { type: location filter: not(mountain) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set02/set02-Ringwraith-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set02/set02-Ringwraith-errata.hjson index 51d7757fa..61dfb493e 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set02/set02-Ringwraith-errata.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set02/set02-Ringwraith-errata.hjson @@ -59,7 +59,7 @@ { type: trigger trigger: { - type: requires + type: ConstantlyCheck requires: { type: location filter: underground diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set03/set03-Shire-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set03/set03-Shire-errata.hjson index 73b4ceedc..89067c265 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set03/set03-Shire-errata.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set03/set03-Shire-errata.hjson @@ -46,7 +46,7 @@ { type: trigger trigger: { - type: requires + type: ConstantlyCheck requires: { type: location filter: underground diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set18/set18-Shire-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set18/set18-Shire-errata.hjson index 37ad011bf..fc375917c 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set18/set18-Shire-errata.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set18/set18-Shire-errata.hjson @@ -210,7 +210,7 @@ { type: trigger trigger: { - type: requires + type: ConstantlyCheck requires: { type: canSpot filter: self,hasTokenCount(3,shire) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV01/V1_moria.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV01/V1_moria.hjson index 7901526b9..8ef481446 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV01/V1_moria.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV01/V1_moria.hjson @@ -89,7 +89,7 @@ { type: trigger trigger: { - type: requires + type: ConstantlyCheck requires: { type: location filter: not(marsh) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/second-edition/set40/set40-sauron.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/second-edition/set40/set40-sauron.hjson index 1fe00e8c1..5d99ed5cd 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/second-edition/set40/set40-sauron.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/second-edition/set40/set40-sauron.hjson @@ -308,7 +308,7 @@ { type: trigger trigger: { - type: requires + type: ConstantlyCheck requires: { type: canSpot filter: ring bearer,bearer diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/trigger/ConditionTrigger.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/trigger/ConstantlyCheckTrigger.java similarity index 94% rename from gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/trigger/ConditionTrigger.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/trigger/ConstantlyCheckTrigger.java index 83c9e9fba..62fdcacd9 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/trigger/ConditionTrigger.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/trigger/ConstantlyCheckTrigger.java @@ -7,7 +7,7 @@ import com.gempukku.lotro.cards.build.Requirement; import com.gempukku.lotro.cards.build.field.FieldUtils; import org.json.simple.JSONObject; -public class ConditionTrigger implements TriggerCheckerProducer { +public class ConstantlyCheckTrigger implements TriggerCheckerProducer { @Override public TriggerChecker getTriggerChecker(JSONObject value, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { FieldUtils.validateAllowedFields(value, "requires"); 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 438266e02..fad86c7e7 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 @@ -23,7 +23,7 @@ public class TriggerCheckerFactory { triggerCheckers.put("assignedagainst", new AssignedAgainst()); triggerCheckers.put("assignedtoskirmish", new AssignedToSkirmish()); triggerCheckers.put("cancelledskirmish", new CancelledSkirmish()); - triggerCheckers.put("requires", new ConditionTrigger()); + triggerCheckers.put("constantlycheck", new ConstantlyCheckTrigger()); triggerCheckers.put("discarded", new Discarded()); triggerCheckers.put("discardfromdeck", new DiscardFromDeck()); triggerCheckers.put("discardfromhand", new DiscardFromHand());