From ee2839d7ec4a6aa9b8ee9a33838ead6c62b93612 Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Fri, 19 Aug 2022 19:24:14 -0500 Subject: [PATCH] Renamed ConditionEffect -> ConditionalEffect --- .../lotro/cards/build/field/effect/EffectAppenderFactory.java | 2 +- .../appender/{ConditionEffect.java => ConditionalEffect.java} | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) rename gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/{ConditionEffect.java => ConditionalEffect.java} (94%) diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/EffectAppenderFactory.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/EffectAppenderFactory.java index 0d08e5f07..54977eb6e 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/EffectAppenderFactory.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/EffectAppenderFactory.java @@ -45,7 +45,7 @@ public class EffectAppenderFactory { effectAppenderProducers.put("choosehowmanyburdenstospot", new ChooseHowManyBurdensToSpot()); effectAppenderProducers.put("choosehowmanytospot", new ChooseHowManyToSpot()); effectAppenderProducers.put("chooseyesorno", new ChooseYesOrNo()); - effectAppenderProducers.put("conditional", new ConditionEffect()); + effectAppenderProducers.put("conditional", new ConditionalEffect()); effectAppenderProducers.put("corruptringbearer", new CorruptRingBearer()); effectAppenderProducers.put("costtoeffect", new CostToEffect()); effectAppenderProducers.put("discard", new DiscardFromPlay()); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/ConditionEffect.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/ConditionalEffect.java similarity index 94% rename from gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/ConditionEffect.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/ConditionalEffect.java index 03e7eece4..faf0ed929 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/ConditionEffect.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/ConditionalEffect.java @@ -13,7 +13,7 @@ import com.gempukku.lotro.logic.effects.StackActionEffect; import com.gempukku.lotro.logic.timing.Effect; import org.json.simple.JSONObject; -public class ConditionEffect implements EffectAppenderProducer { +public class ConditionalEffect implements EffectAppenderProducer { @Override public EffectAppender createEffectAppender(JSONObject effectObject, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { FieldUtils.validateAllowedFields(effectObject, "requires", "effect"); @@ -46,7 +46,6 @@ public class ConditionEffect implements EffectAppenderProducer { return true; } - // TODO, maybe check the requirements, and if met, check if the effect is playable? @Override public boolean isPlayableInFull(ActionContext actionContext) { if (!checkConditions(actionContext))