diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1-isengard.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1-isengard.json index 5a9d000dd..eebed0dca 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1-isengard.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1-isengard.json @@ -436,7 +436,8 @@ "condition": { "type": "location", "filter": "hasAttached(self)" - } + }, + "amount": -2 } }, { diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set14.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set14.json index e70ff93a5..f7a0a8b05 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set14.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set14.json @@ -262,7 +262,8 @@ "condition": { "type": "location", "filter": "or(forest,river)" - } + }, + "amount": 3 } } }, diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set40/set40-elven.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set40/set40-elven.json index 1353e1a88..3ec652b59 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set40/set40-elven.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set40/set40-elven.json @@ -379,6 +379,7 @@ { "type": "modifyStrength", "filter": "choose(elf)", + "amount": 1, "memorize": "chosenElf" }, { diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/PotentialDiscount.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/PotentialDiscount.java index 564b234b9..c8b023afb 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/PotentialDiscount.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/PotentialDiscount.java @@ -15,7 +15,7 @@ public class PotentialDiscount implements EffectProcessor { public void processEffect(JSONObject value, BuiltLotroCardBlueprint blueprint, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { FieldUtils.validateAllowedFields(value, "amount", "discount"); - final ValueSource amountSource = ValueResolver.resolveEvaluator(value.get("amount"), 0, environment); + final ValueSource amountSource = ValueResolver.resolveEvaluator(value.get("amount"), environment); final JSONObject discount = (JSONObject) value.get("discount"); final String discountType = FieldUtils.getString(discount.get("type"), "type"); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/Duplicate.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/Duplicate.java index 73db95099..df7c04f21 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/Duplicate.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/Duplicate.java @@ -21,7 +21,7 @@ public class Duplicate implements EffectAppenderProducer { public EffectAppender createEffectAppender(JSONObject effectObject, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { FieldUtils.validateAllowedFields(effectObject, "amount", "effect"); - final ValueSource amountSource = ValueResolver.resolveEvaluator(effectObject.get("amount"), 1, environment); + final ValueSource amountSource = ValueResolver.resolveEvaluator(effectObject.get("amount"), environment); final JSONObject effect = (JSONObject) effectObject.get("effect"); final EffectAppender effectAppender = environment.getEffectAppenderFactory().getEffectAppender(effect, environment); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/MemorizeNumber.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/MemorizeNumber.java index c37c62f2f..d3076f542 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/MemorizeNumber.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/MemorizeNumber.java @@ -19,7 +19,7 @@ public class MemorizeNumber implements EffectAppenderProducer { public EffectAppender createEffectAppender(JSONObject effectObject, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { FieldUtils.validateAllowedFields(effectObject, "amount", "memory"); - final ValueSource amountSource = ValueResolver.resolveEvaluator(effectObject.get("amount"), 0, environment); + final ValueSource amountSource = ValueResolver.resolveEvaluator(effectObject.get("amount"), environment); final String memory = FieldUtils.getString(effectObject.get("memory"), "memory"); return new DelayedAppender() { diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/ModifyArcheryTotal.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/ModifyArcheryTotal.java index eaf58235e..3c5fecf6f 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/ModifyArcheryTotal.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/ModifyArcheryTotal.java @@ -21,7 +21,7 @@ public class ModifyArcheryTotal implements EffectAppenderProducer { public EffectAppender createEffectAppender(JSONObject effectObject, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { FieldUtils.validateAllowedFields(effectObject, "amount", "side"); - final ValueSource valueSource = ValueResolver.resolveEvaluator(effectObject.get("amount"), 0, environment); + final ValueSource valueSource = ValueResolver.resolveEvaluator(effectObject.get("amount"), environment); final Side side = FieldUtils.getEnum(Side.class, effectObject.get("side"), "side"); if (side == null) diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/ModifyStrength.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/ModifyStrength.java index c24ebe710..4d66c21de 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/ModifyStrength.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/ModifyStrength.java @@ -26,7 +26,7 @@ public class ModifyStrength implements EffectAppenderProducer { public EffectAppender createEffectAppender(JSONObject effectObject, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { FieldUtils.validateAllowedFields(effectObject, "amount", "count", "filter", "until", "memorize"); - final ValueSource amountSource = ValueResolver.resolveEvaluator(effectObject.get("amount"), 0, environment); + final ValueSource amountSource = ValueResolver.resolveEvaluator(effectObject.get("amount"), environment); final ValueSource valueSource = ValueResolver.resolveEvaluator(effectObject.get("count"), 1, environment); final String filter = FieldUtils.getString(effectObject.get("filter"), "filter"); final String memory = FieldUtils.getString(effectObject.get("memorize"), "memorize", "_temp"); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/PlaySite.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/PlaySite.java index a6937af86..22b2c3c31 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/PlaySite.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/PlaySite.java @@ -22,7 +22,7 @@ public class PlaySite implements EffectAppenderProducer { FieldUtils.validateAllowedFields(effectObject, "block", "filter", "number", "memorize"); final SitesBlock block = FieldUtils.getEnum(SitesBlock.class, effectObject.get("block"), "block"); final String filter = FieldUtils.getString(effectObject.get("filter"), "filter", "any"); - final ValueSource valueSource = ValueResolver.resolveEvaluator(effectObject.get("number"), 0, environment); + final ValueSource valueSource = ValueResolver.resolveEvaluator(effectObject.get("number"), environment); final String memorize = FieldUtils.getString(effectObject.get("memorize"), "memorize"); 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/appender/PutCardsFromHandOnBottomOfDeck.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/PutCardsFromHandOnBottomOfDeck.java index d8cd69428..8df1c261a 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/PutCardsFromHandOnBottomOfDeck.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/PutCardsFromHandOnBottomOfDeck.java @@ -31,7 +31,7 @@ public class PutCardsFromHandOnBottomOfDeck implements EffectAppenderProducer { ValueSource valueSource; if (optional) - valueSource = ValueResolver.resolveEvaluator("0-1", 1, environment); + valueSource = ValueResolver.resolveEvaluator("0-1", environment); else valueSource = new ConstantEvaluator(1); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/PutCardsFromHandOnTopOfDeck.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/PutCardsFromHandOnTopOfDeck.java index 1b2c14c1d..c11c8f622 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/PutCardsFromHandOnTopOfDeck.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/PutCardsFromHandOnTopOfDeck.java @@ -31,7 +31,7 @@ public class PutCardsFromHandOnTopOfDeck implements EffectAppenderProducer { ValueSource valueSource; if (optional) - valueSource = ValueResolver.resolveEvaluator("0-1", 1, environment); + valueSource = ValueResolver.resolveEvaluator("0-1", environment); else valueSource = new ConstantEvaluator(1); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/resolver/ValueResolver.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/resolver/ValueResolver.java index 161e299b9..95d0c5f85 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/resolver/ValueResolver.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/resolver/ValueResolver.java @@ -16,7 +16,13 @@ import org.json.simple.JSONObject; import java.util.Collection; public class ValueResolver { - public static ValueSource resolveEvaluator(Object value, int defaultValue, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { + public static ValueSource resolveEvaluator(Object value, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { + return resolveEvaluator(value, null, environment); + } + + public static ValueSource resolveEvaluator(Object value, Integer defaultValue, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { + if (value == null && defaultValue == null) + throw new InvalidCardDefinitionException("Value not defined"); if (value == null) return new ConstantEvaluator(defaultValue); if (value instanceof Number) diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/filter/FilterFactory.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/filter/FilterFactory.java index 095d26514..27409f47b 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/filter/FilterFactory.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/filter/FilterFactory.java @@ -243,7 +243,7 @@ public class FilterFactory { return Filters.maxPrintedTwilightCost(value); }; } else { - final ValueSource valueSource = ValueResolver.resolveEvaluator(parameter, 0, environment); + final ValueSource valueSource = ValueResolver.resolveEvaluator(parameter, environment); return actionContext -> { final int value = valueSource.getEvaluator(actionContext).evaluateExpression(actionContext.getGame(), null); return Filters.maxPrintedTwilightCost(value); @@ -259,7 +259,7 @@ public class FilterFactory { return Filters.minPrintedTwilightCost(value); }; } else { - final ValueSource valueSource = ValueResolver.resolveEvaluator(parameter, 0, environment); + final ValueSource valueSource = ValueResolver.resolveEvaluator(parameter, environment); return actionContext -> { final int value = valueSource.getEvaluator(actionContext).evaluateExpression(actionContext.getGame(), null); return Filters.minPrintedTwilightCost(value); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/modifier/ModifyArcheryTotal.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/modifier/ModifyArcheryTotal.java index 9a848a79e..580f805f7 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/modifier/ModifyArcheryTotal.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/modifier/ModifyArcheryTotal.java @@ -13,7 +13,7 @@ public class ModifyArcheryTotal implements ModifierSourceProducer { public ModifierSource getModifierSource(JSONObject object, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { FieldUtils.validateAllowedFields(object, "side", "condition", "amount"); - final ValueSource valueSource = ValueResolver.resolveEvaluator(object.get("amount"), 1, environment); + final ValueSource valueSource = ValueResolver.resolveEvaluator(object.get("amount"), environment); final JSONObject[] conditionArray = FieldUtils.getObjectArray(object.get("condition"), "condition"); final Side side = FieldUtils.getEnum(Side.class, object.get("side"), "side"); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/modifier/ModifyCost.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/modifier/ModifyCost.java index c82b73b4f..d3e26572e 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/modifier/ModifyCost.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/modifier/ModifyCost.java @@ -18,7 +18,7 @@ public class ModifyCost implements ModifierSourceProducer { final Requirement[] conditions = environment.getRequirementFactory().getRequirements(conditionArray, environment); final FilterableSource filterableSource = environment.getFilterFactory().generateFilter(filter, environment); - final ValueSource amountSource = ValueResolver.resolveEvaluator(object.get("amount"), 0, environment); + final ValueSource amountSource = ValueResolver.resolveEvaluator(object.get("amount"), environment); return actionContext -> { final Filterable filterable = filterableSource.getFilterable(actionContext); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/modifier/ModifyMoveLimit.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/modifier/ModifyMoveLimit.java index 1fe852b92..2e1e25241 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/modifier/ModifyMoveLimit.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/modifier/ModifyMoveLimit.java @@ -15,7 +15,7 @@ public class ModifyMoveLimit implements ModifierSourceProducer { public ModifierSource getModifierSource(JSONObject object, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { FieldUtils.validateAllowedFields(object, "amount"); - final ValueSource valueSource = ValueResolver.resolveEvaluator(object.get("amount"), 1, environment); + final ValueSource valueSource = ValueResolver.resolveEvaluator(object.get("amount"), environment); return (actionContext) -> { final Evaluator evaluator = valueSource.getEvaluator(actionContext); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/modifier/ModifyOwnCost.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/modifier/ModifyOwnCost.java index e6636836f..71e73ef76 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/modifier/ModifyOwnCost.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/modifier/ModifyOwnCost.java @@ -14,7 +14,7 @@ public class ModifyOwnCost implements EffectProcessor { FieldUtils.validateAllowedFields(value, "amount", "condition", "on"); final String onFilter = FieldUtils.getString(value.get("on"), "on", "any"); - final ValueSource amountSource = ValueResolver.resolveEvaluator(value.get("amount"), 0, environment); + final ValueSource amountSource = ValueResolver.resolveEvaluator(value.get("amount"), environment); final JSONObject[] conditionArray = FieldUtils.getObjectArray(value.get("condition"), "condition"); final FilterableSource onFilterableSource = environment.getFilterFactory().generateFilter(onFilter, environment); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/modifier/ModifyPlayOnCost.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/modifier/ModifyPlayOnCost.java index 8b11cc314..3925a3320 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/modifier/ModifyPlayOnCost.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/modifier/ModifyPlayOnCost.java @@ -24,7 +24,7 @@ public class ModifyPlayOnCost implements ModifierSourceProducer { final Requirement[] conditions = environment.getRequirementFactory().getRequirements(conditionArray, environment); final FilterableSource filterableSource = environment.getFilterFactory().generateFilter(filter, environment); final FilterableSource onFilterableSource = environment.getFilterFactory().generateFilter(onFilter, environment); - final ValueSource amountSource = ValueResolver.resolveEvaluator(object.get("amount"), 0, environment); + final ValueSource amountSource = ValueResolver.resolveEvaluator(object.get("amount"), environment); return actionContext -> { final Filterable filterable = filterableSource.getFilterable(actionContext); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/modifier/ModifyResistance.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/modifier/ModifyResistance.java index e886889d4..985b73097 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/modifier/ModifyResistance.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/modifier/ModifyResistance.java @@ -12,7 +12,7 @@ public class ModifyResistance implements ModifierSourceProducer { public ModifierSource getModifierSource(JSONObject object, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { FieldUtils.validateAllowedFields(object, "filter", "condition", "amount"); - final ValueSource valueSource = ValueResolver.resolveEvaluator(object.get("amount"), 1, environment); + final ValueSource valueSource = ValueResolver.resolveEvaluator(object.get("amount"), environment); final JSONObject[] conditionArray = FieldUtils.getObjectArray(object.get("condition"), "condition"); final String filter = FieldUtils.getString(object.get("filter"), "filter"); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/modifier/ModifySanctuaryHeal.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/modifier/ModifySanctuaryHeal.java index 3493d7f95..96d62ab74 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/modifier/ModifySanctuaryHeal.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/modifier/ModifySanctuaryHeal.java @@ -3,8 +3,6 @@ package com.gempukku.lotro.cards.build.field.effect.modifier; import com.gempukku.lotro.cards.build.*; import com.gempukku.lotro.cards.build.field.FieldUtils; import com.gempukku.lotro.cards.build.field.effect.appender.resolver.ValueResolver; -import com.gempukku.lotro.common.Phase; -import com.gempukku.lotro.logic.modifiers.CantTakeMoreThanXWoundsModifier; import com.gempukku.lotro.logic.modifiers.SanctuaryHealModifier; import org.json.simple.JSONObject; @@ -13,7 +11,7 @@ public class ModifySanctuaryHeal implements ModifierSourceProducer { public ModifierSource getModifierSource(JSONObject object, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { FieldUtils.validateAllowedFields(object, "condition", "amount"); - final ValueSource amountSource = ValueResolver.resolveEvaluator(object.get("amount"), 1, environment); + final ValueSource amountSource = ValueResolver.resolveEvaluator(object.get("amount"), environment); final JSONObject[] conditionArray = FieldUtils.getObjectArray(object.get("condition"), "condition"); final Requirement[] requirements = environment.getRequirementFactory().getRequirements(conditionArray, environment); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/modifier/ModifySiteNumber.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/modifier/ModifySiteNumber.java index ad76ac860..770f2939f 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/modifier/ModifySiteNumber.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/modifier/ModifySiteNumber.java @@ -14,7 +14,7 @@ public class ModifySiteNumber implements ModifierSourceProducer { final JSONObject[] conditionArray = FieldUtils.getObjectArray(object.get("condition"), "condition"); final String filter = FieldUtils.getString(object.get("filter"), "filter"); - final ValueSource amount = ValueResolver.resolveEvaluator(object.get("amount"), 0, environment); + final ValueSource amount = ValueResolver.resolveEvaluator(object.get("amount"), environment); final FilterableSource filterableSource = environment.getFilterFactory().generateFilter(filter, environment); final Requirement[] requirements = environment.getRequirementFactory().getRequirements(conditionArray, environment); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/modifier/ModifyStrength.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/modifier/ModifyStrength.java index 348e9f8c4..2fabdb229 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/modifier/ModifyStrength.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/modifier/ModifyStrength.java @@ -12,7 +12,7 @@ public class ModifyStrength implements ModifierSourceProducer { public ModifierSource getModifierSource(JSONObject object, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { FieldUtils.validateAllowedFields(object, "filter", "condition", "amount"); - final ValueSource valueSource = ValueResolver.resolveEvaluator(object.get("amount"), 1, environment); + final ValueSource valueSource = ValueResolver.resolveEvaluator(object.get("amount"), environment); final JSONObject[] conditionArray = FieldUtils.getObjectArray(object.get("condition"), "condition"); final String filter = FieldUtils.getString(object.get("filter"), "filter"); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/requirement/CardsInDeckCount.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/requirement/CardsInDeckCount.java index 6bca4a2b6..7b21b0a60 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/requirement/CardsInDeckCount.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/requirement/CardsInDeckCount.java @@ -13,7 +13,7 @@ public class CardsInDeckCount implements RequirementProducer { final String deck = FieldUtils.getString(object.get("deck"), "deck", "you"); final PlayerSource playerSource = PlayerResolver.resolvePlayer(deck, environment); - final ValueSource valueSource = ValueResolver.resolveEvaluator(object.get("count"), 0, environment); + final ValueSource valueSource = ValueResolver.resolveEvaluator(object.get("count"), environment); return actionContext -> { final String player = playerSource.getPlayer(actionContext); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/requirement/IsMore.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/requirement/IsMore.java index 082a8ac55..641a4a37e 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/requirement/IsMore.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/requirement/IsMore.java @@ -13,8 +13,8 @@ public class IsMore implements RequirementProducer { public Requirement getPlayRequirement(JSONObject object, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { FieldUtils.validateAllowedFields(object, "firstNumber", "secondNumber"); - final ValueSource firstNumber = ValueResolver.resolveEvaluator(object.get("firstNumber"), 0, environment); - final ValueSource secondNumber = ValueResolver.resolveEvaluator(object.get("secondNumber"), 0, environment); + final ValueSource firstNumber = ValueResolver.resolveEvaluator(object.get("firstNumber"), environment); + final ValueSource secondNumber = ValueResolver.resolveEvaluator(object.get("secondNumber"), environment); return actionContext -> { final int first = firstNumber.getEvaluator(actionContext).evaluateExpression(actionContext.getGame(), null);