diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/modifiers/ArcheryTotalModifier.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/modifiers/ArcheryTotalModifier.java index 711f71001..4fbdc4dfa 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/modifiers/ArcheryTotalModifier.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/modifiers/ArcheryTotalModifier.java @@ -7,27 +7,39 @@ import com.gempukku.lotro.logic.modifiers.AbstractModifier; import com.gempukku.lotro.logic.modifiers.Condition; import com.gempukku.lotro.logic.modifiers.ModifierEffect; import com.gempukku.lotro.logic.modifiers.ModifiersQuerying; +import com.gempukku.lotro.logic.modifiers.evaluator.ConstantEvaluator; +import com.gempukku.lotro.logic.modifiers.evaluator.Evaluator; public class ArcheryTotalModifier extends AbstractModifier { private Side _side; private Condition _condition; - private int _modifier; + private Evaluator _evaluator; public ArcheryTotalModifier(PhysicalCard source, Side side, int modifier) { this(source, side, null, modifier); } public ArcheryTotalModifier(PhysicalCard source, Side side, Condition condition, int modifier) { - super(source, ((side == Side.FREE_PEOPLE) ? "Fellowship" : "Minion") + " archery total " + ((modifier < 0) ? modifier : ("+" + modifier)), null, new ModifierEffect[]{ModifierEffect.ARCHERY_MODIFIER}); + this(source, side, condition, new ConstantEvaluator(modifier)); + } + + public ArcheryTotalModifier(PhysicalCard source, Side side, Condition condition, Evaluator evaluator) { + super(source, null, null, new ModifierEffect[]{ModifierEffect.ARCHERY_MODIFIER}); _side = side; _condition = condition; - _modifier = modifier; + _evaluator = evaluator; + } + + @Override + public String getText(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard self) { + int modifier = _evaluator.evaluateExpression(gameState, modifiersQuerying, self); + return ((_side == Side.FREE_PEOPLE) ? "Fellowship" : "Minion") + " archery total " + ((modifier < 0) ? modifier : ("+" + modifier)); } @Override public int getArcheryTotal(GameState gameState, ModifiersQuerying modifiersQuerying, Side side, int result) { if (side == _side && ((_condition == null) || (_condition.isFullfilled(gameState, modifiersQuerying)))) - return result + _modifier; + return result + _evaluator.evaluateExpression(gameState, modifiersQuerying, null); else return result; } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/raider/Card4_245.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/raider/Card4_245.java new file mode 100644 index 000000000..b73cc9b2a --- /dev/null +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/raider/Card4_245.java @@ -0,0 +1,44 @@ +package com.gempukku.lotro.cards.set4.raider; + +import com.gempukku.lotro.cards.AbstractMinion; +import com.gempukku.lotro.cards.modifiers.ArcheryTotalModifier; +import com.gempukku.lotro.cards.modifiers.evaluator.CountSpottableEvaluator; +import com.gempukku.lotro.common.Culture; +import com.gempukku.lotro.common.Keyword; +import com.gempukku.lotro.common.Race; +import com.gempukku.lotro.common.Side; +import com.gempukku.lotro.filters.Filters; +import com.gempukku.lotro.game.PhysicalCard; +import com.gempukku.lotro.logic.modifiers.Modifier; +import com.gempukku.lotro.logic.modifiers.SpotCondition; + +import java.util.Collections; +import java.util.List; + +/** + * Set: The Two Towers + * Side: Shadow + * Culture: Raider + * Twilight Cost: 3 + * Type: Minion • Man + * Strength: 6 + * Vitality: 2 + * Site: 4 + * Game Text: Southron. Archer. While you can spot another Southron, the minion archery total is +1 for each site + * you control. + */ +public class Card4_245 extends AbstractMinion { + public Card4_245() { + super(3, 6, 2, 4, Race.MAN, Culture.RAIDER, "Southron Archer"); + addKeyword(Keyword.SOUTHRON); + addKeyword(Keyword.ARCHER); + } + + @Override + public List getAlwaysOnModifiers(PhysicalCard self) { + return Collections.singletonList( + new ArcheryTotalModifier(self, Side.SHADOW, + new SpotCondition(Filters.not(Filters.sameCard(self)), Filters.keyword(Keyword.SOUTHRON)), + new CountSpottableEvaluator(Filters.siteControlled(self.getOwner())))); + } +}