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 a29587a95..0c74e12f8 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 @@ -615,7 +615,7 @@ effects: { type: modifier modifier: { - type: archeryTotal + type: ModifyArcheryTotal requires: { type: canSpot filter: another,culture(moria),archer diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set02/set2-shire.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set02/set2-shire.hjson index 3d3a6d9ac..839d3d789 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set02/set2-shire.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set02/set2-shire.hjson @@ -300,7 +300,7 @@ { type: modifier modifier: { - type: archeryTotal + type: ModifyArcheryTotal side: shadow amount: -1 } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Isengard.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Isengard.hjson index bc8d71286..6da314e00 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Isengard.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Isengard.hjson @@ -161,7 +161,7 @@ effects: { type: modifier modifier: { - type: archeryTotal + type: ModifyArcheryTotal side: shadow requires: { type: controlsSite diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/modifier/ArcheryTotal.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/modifier/ArcheryTotal.java deleted file mode 100644 index 786b2cdd6..000000000 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/modifier/ArcheryTotal.java +++ /dev/null @@ -1,30 +0,0 @@ -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.common.Side; -import com.gempukku.lotro.logic.modifiers.ArcheryTotalModifier; -import com.gempukku.lotro.logic.modifiers.Modifier; -import org.json.simple.JSONObject; - -public class ArcheryTotal implements ModifierSourceProducer { - @Override - public ModifierSource getModifierSource(JSONObject object, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { - FieldUtils.validateAllowedFields(object, "amount", "requires", "side"); - - final JSONObject[] conditionArray = FieldUtils.getObjectArray(object.get("requires"), "requires"); - final int amount = FieldUtils.getInteger(object.get("amount"), "amount"); - final Side side = FieldUtils.getEnum(Side.class, object.get("side"), "side"); - - final Requirement[] requirements = environment.getRequirementFactory().getRequirements(conditionArray, environment); - - return new ModifierSource() { - @Override - public Modifier getModifier(ActionContext actionContext) { - return new ArcheryTotalModifier(actionContext.getSource(), side, - RequirementCondition.createCondition(requirements, actionContext), - amount); - } - }; - } -} diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/modifier/ModifierSourceFactory.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/modifier/ModifierSourceFactory.java index f14aa6379..f59a01030 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/modifier/ModifierSourceFactory.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/modifier/ModifierSourceFactory.java @@ -24,7 +24,6 @@ public class ModifierSourceFactory { modifierProducers.put("allycanparticipateinarcheryfire", new AllyCanParticipateInArcheryFire()); modifierProducers.put("allycanparticipateinskirmishes", new AllyCanParticipateInSkirmishes()); modifierProducers.put("allymaynotparticipateinarcheryfireorskirmishes", new AllyMayNotParticipateInArcheryFireOrSkirmishes()); - modifierProducers.put("archerytotal", new ArcheryTotal()); modifierProducers.put("cancelkeywordbonus", new CancelKeywordBonus()); modifierProducers.put("cancelstrengthbonus", new CancelStrengthBonus()); modifierProducers.put("canplaystackedcards", new CanPlayStackedCards());