From 5d2ea67049e4f74df540a2d4ccd54c07fca61a50 Mon Sep 17 00:00:00 2001 From: "marcin.sciesinski" Date: Thu, 29 Aug 2019 22:02:28 -0700 Subject: [PATCH] Renamed "requirement" to "condition" to be consistent --- .../src/main/web/cards/set1.json | 14 +++--- .../src/main/web/cards/set40-dwarven.json | 2 +- .../src/main/web/cards/set40-elven.json | 43 ++++++++++++++++++- .../src/main/web/cards/set40.json | 8 ++-- .../build/LotroCardBlueprintBuilder.java | 2 +- .../effect/ActivatedEffectProcessor.java | 2 +- .../ActivatedTriggerEffectProcessor.java | 2 +- .../cards/build/field/effect/EffectUtils.java | 2 +- .../field/effect/TriggerEffectProcessor.java | 2 +- .../field/effect/appender/AddTrigger.java | 4 +- 10 files changed, 61 insertions(+), 20 deletions(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1.json index 8e71483d4..bd8ea904d 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1.json @@ -9,7 +9,7 @@ "strength": 4, "vitality": 2, "resistance": 6, - "requirement": { + "condition": { "type": "canSpot", "filter": "dwarf" } @@ -48,7 +48,7 @@ "strength": 5, "vitality": 3, "resistance": 6, - "requirement": { + "condition": { "type": "canSpot", "filter": "dwarf" }, @@ -74,7 +74,7 @@ "effects": { "type": "activated", "phase": "fellowship", - "requirement": { + "condition": { "type": "twilightPoolLessThan", "amount": 2 }, @@ -143,7 +143,7 @@ "cost": 0, "type": "event", "keyword": "archery", - "requirement": { + "condition": { "type": "canSpot", "filter": "elf,archer,companion" }, @@ -167,7 +167,7 @@ "strength": 5, "vitality": 3, "resistance": 6, - "requirement": { + "condition": { "type": "canSpot", "filter": "elf" }, @@ -241,7 +241,7 @@ "strength": 4, "vitality": 2, "resistance": 6, - "requirement": { + "condition": { "type": "canSpot", "filter": "elf" } @@ -333,7 +333,7 @@ { "type": "activated", "phase": "assignment", - "requirement": { + "condition": { "type": "canSpot", "filter": "hobbit,companion", "count": 2 diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set40-dwarven.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set40-dwarven.json index f0d8305de..a651a71d5 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set40-dwarven.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set40-dwarven.json @@ -795,7 +795,7 @@ "type": "played", "filter": "side(shadow),event" }, - "requirement": { + "condition": { "type": "canSpot", "filter": "self,hasStackedCount(3,any)" }, diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set40-elven.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set40-elven.json index aa783097b..bc8ddcafd 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set40-elven.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set40-elven.json @@ -6,7 +6,7 @@ "cost": 2, "type": "event", "keyword": "archery", - "requirement": { + "condition": { "type": "canSpot", "filter": "elf,archer,companion" }, @@ -47,5 +47,46 @@ }, "amount": 3 } + }, + "40_35": { + "title": "*Arwen", + "subtitle": "Lady of Imladris", + "side": "free people", + "culture": "elven", + "cost": 2, + "type": "companion", + "race": "elf", + "strength": 6, + "vitality": 3, + "resistance": 8, + "effects": [ + { + "type": "trigger", + "trigger": { + "type": "startOfTurn" + }, + "optional": true, + "condition": { + "type": "canSpot", + "filter": "name(Elrond)" + }, + "effect": { + "type": "heal", + "filter": "self" + } + }, + { + "type": "activated", + "phase": "fellowship", + "cost": { + "type": "exert", + "filter": "self" + }, + "effect": { + "type": "heal", + "filter": "choose(rivendell,ally)" + } + } + ] } } \ No newline at end of file diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set40.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set40.json index a29dd9c4a..356dea296 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set40.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set40.json @@ -9,7 +9,7 @@ "effects": [ { "type": "trigger", - "requirement": [ + "condition": [ { "type": "ringIsOn" }, @@ -33,7 +33,7 @@ }, { "type": "activated", - "requirement": { + "condition": { "type": "ringIsActive" }, "phase": "maneuver", @@ -68,7 +68,7 @@ "effects": [ { "type": "trigger", - "requirement": [ + "condition": [ { "type": "ringIsOn" }, @@ -100,7 +100,7 @@ "type": "aboutToTakeWound", "filter": "hasAttached(self)" }, - "requirement": [ + "condition": [ { "type": "phase", "phase": "skirmish" diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/LotroCardBlueprintBuilder.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/LotroCardBlueprintBuilder.java index 5402587f5..1db7a69ff 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/LotroCardBlueprintBuilder.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/LotroCardBlueprintBuilder.java @@ -39,7 +39,7 @@ public class LotroCardBlueprintBuilder implements CardGenerationEnvironment { fieldProcessors.put("direction", new DirectionFieldProcessor()); fieldProcessors.put("effects", new EffectFieldProcessor()); fieldProcessors.put("target", new TargetFieldProcessor()); - fieldProcessors.put("requirement", new RequirementFieldProcessor()); + fieldProcessors.put("condition", new RequirementFieldProcessor()); fieldProcessors.put("allyhome", new AllyHomeFieldProcessor()); } diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/ActivatedEffectProcessor.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/ActivatedEffectProcessor.java index fb3387cfe..0e352ff02 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/ActivatedEffectProcessor.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/ActivatedEffectProcessor.java @@ -19,7 +19,7 @@ import org.json.simple.JSONObject; public class ActivatedEffectProcessor implements EffectProcessor { @Override public void processEffect(JSONObject value, BuiltLotroCardBlueprint blueprint, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { - FieldUtils.validateAllowedFields(value, "phase", "requirement", "cost", "effect", "limitPerPhase"); + FieldUtils.validateAllowedFields(value, "phase", "condition", "cost", "effect", "limitPerPhase"); final String[] phaseArray = FieldUtils.getStringArray(value.get("phase"), "phase"); final int limitPerPhase = FieldUtils.getInteger(value.get("limitPerPhase"), "limitPerPhase", 0); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/ActivatedTriggerEffectProcessor.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/ActivatedTriggerEffectProcessor.java index 90a525903..4c4edff80 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/ActivatedTriggerEffectProcessor.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/ActivatedTriggerEffectProcessor.java @@ -11,7 +11,7 @@ import org.json.simple.JSONObject; public class ActivatedTriggerEffectProcessor implements EffectProcessor { @Override public void processEffect(JSONObject value, BuiltLotroCardBlueprint blueprint, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { - FieldUtils.validateAllowedFields(value, "trigger", "requirement", "cost", "effect"); + FieldUtils.validateAllowedFields(value, "trigger", "condition", "cost", "effect"); final JSONObject[] triggerArray = FieldUtils.getObjectArray(value.get("trigger"), "trigger"); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/EffectUtils.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/EffectUtils.java index 99d3aecce..35a2afefc 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/EffectUtils.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/EffectUtils.java @@ -8,7 +8,7 @@ import org.json.simple.JSONObject; public class EffectUtils { public static void processRequirementsCostsAndEffects(JSONObject value, CardGenerationEnvironment environment, DefaultActionSource actionSource) throws InvalidCardDefinitionException { - final JSONObject[] requirementArray = FieldUtils.getObjectArray(value.get("requirement"), "requirement"); + final JSONObject[] requirementArray = FieldUtils.getObjectArray(value.get("condition"), "condition"); for (JSONObject requirement : requirementArray) { final Requirement conditionRequirement = environment.getRequirementFactory().getRequirement(requirement, environment); actionSource.addPlayRequirement(conditionRequirement); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/TriggerEffectProcessor.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/TriggerEffectProcessor.java index 331de7fa1..f1b528b6a 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/TriggerEffectProcessor.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/TriggerEffectProcessor.java @@ -11,7 +11,7 @@ import org.json.simple.JSONObject; public class TriggerEffectProcessor implements EffectProcessor { @Override public void processEffect(JSONObject value, BuiltLotroCardBlueprint blueprint, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { - FieldUtils.validateAllowedFields(value, "trigger", "optional", "requirement", "cost", "effect"); + FieldUtils.validateAllowedFields(value, "trigger", "optional", "condition", "cost", "effect"); final JSONObject[] triggerArray = FieldUtils.getObjectArray(value.get("trigger"), "trigger"); final boolean optional = FieldUtils.getBoolean(value.get("optional"), "optional", false); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/AddTrigger.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/AddTrigger.java index 7bf661a78..2d6552358 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/AddTrigger.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/AddTrigger.java @@ -27,13 +27,13 @@ import java.util.List; public class AddTrigger implements EffectAppenderProducer { @Override public EffectAppender createEffectAppender(JSONObject effectObject, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { - FieldUtils.validateAllowedFields(effectObject, "trigger", "until", "optional", "requirement", "cost", "effect"); + FieldUtils.validateAllowedFields(effectObject, "trigger", "until", "optional", "condition", "cost", "effect"); final TimeResolver.Time until = TimeResolver.resolveTime(effectObject.get("until"), "end(current)"); final TriggerChecker trigger = environment.getTriggerCheckerFactory().getTriggerChecker((JSONObject) effectObject.get("trigger"), environment); final boolean optional = FieldUtils.getBoolean(effectObject.get("optional"), "optional", false); - final JSONObject[] requirementArray = FieldUtils.getObjectArray(effectObject.get("requirement"), "requirement"); + final JSONObject[] requirementArray = FieldUtils.getObjectArray(effectObject.get("condition"), "condition"); final JSONObject[] costArray = FieldUtils.getObjectArray(effectObject.get("cost"), "cost"); final JSONObject[] effectArray = FieldUtils.getObjectArray(effectObject.get("effect"), "effect");