diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1-elven.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1-elven.json index 445f67406..a4818cf64 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1-elven.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1-elven.json @@ -453,7 +453,7 @@ "type": "extraCost", "cost": { "type": "exert", - "filter": "choose(ally)" + "filter": "choose(elf,ally)" } }, { diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set19.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set19.json index d02d33fbc..a469da8d3 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set19.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set19.json @@ -755,6 +755,10 @@ "type": "location", "filter": "not(marsh)" } + }, + "effect": { + "type": "discard", + "filter": "self" } }, { @@ -797,6 +801,10 @@ "type": "location", "filter": "not(marsh)" } + }, + "effect": { + "type": "discard", + "filter": "self" } }, { 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 dad46fb4d..5ffb35387 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 @@ -19,6 +19,11 @@ public class EffectUtils { public static void processCostsAndEffects(JSONObject value, CardGenerationEnvironment environment, DefaultActionSource actionSource) throws InvalidCardDefinitionException { final JSONObject[] costArray = FieldUtils.getObjectArray(value.get("cost"), "cost"); + final JSONObject[] effectArray = FieldUtils.getObjectArray(value.get("effect"), "effect"); + + if (costArray.length == 0 && effectArray.length == 0) + throw new InvalidCardDefinitionException("Action does not contain a cost, nor effect"); + final EffectAppenderFactory effectAppenderFactory = environment.getEffectAppenderFactory(); for (JSONObject cost : costArray) { final EffectAppender effectAppender = effectAppenderFactory.getEffectAppender(cost, environment); @@ -27,7 +32,6 @@ public class EffectUtils { actionSource.addCost(effectAppender); } - final JSONObject[] effectArray = FieldUtils.getObjectArray(value.get("effect"), "effect"); for (JSONObject effect : effectArray) { final EffectAppender effectAppender = effectAppenderFactory.getEffectAppender(effect, environment); if (effectAppender == null) {