diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/PlayConditions.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/PlayConditions.java index 5dac4d829..dd36146a5 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/PlayConditions.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/PlayConditions.java @@ -61,6 +61,11 @@ public class PlayConditions { && twilightCost <= gameState.getTwilightPool(); } + public static boolean canUseStackedShadowCardDuringPhase(GameState gameState, Phase phase, PhysicalCard self, int twilightCost) { + return (phase == null || gameState.getCurrentPhase() == phase) && self.getZone() == Zone.STACKED + && twilightCost <= gameState.getTwilightPool(); + } + public static boolean canUseSiteDuringPhase(GameState gameState, Phase phase, PhysicalCard self) { return (phase == null || gameState.getCurrentPhase() == phase) && (gameState.getCurrentSite() == self); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/dunland/Card4_011.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/dunland/Card4_011.java index 49b0af8fa..dfc44cc79 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/dunland/Card4_011.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/dunland/Card4_011.java @@ -5,6 +5,7 @@ import com.gempukku.lotro.cards.PlayConditions; import com.gempukku.lotro.cards.effects.StackCardFromPlayEffect; import com.gempukku.lotro.common.CardType; import com.gempukku.lotro.common.Culture; +import com.gempukku.lotro.common.Phase; import com.gempukku.lotro.common.Race; import com.gempukku.lotro.filters.Filters; import com.gempukku.lotro.game.PhysicalCard; @@ -54,7 +55,8 @@ public class Card4_011 extends AbstractMinion { @Override public List getPhaseActionsFromStacked(String playerId, LotroGame game, PhysicalCard self) { - if (self.getStackedOn().getBlueprint().getCardType() == CardType.SITE + if (PlayConditions.canUseStackedShadowCardDuringPhase(game.getGameState(), Phase.SHADOW, self, 0) + && self.getStackedOn().getBlueprint().getCardType() == CardType.SITE && playerId.equals(self.getStackedOn().getCardController()) && checkPlayRequirements(playerId, game, self, -2)) { return Collections.singletonList(getPlayCardAction(playerId, game, self, -2)); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/dunland/Card4_016.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/dunland/Card4_016.java new file mode 100644 index 000000000..6e1cf662a --- /dev/null +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/dunland/Card4_016.java @@ -0,0 +1,51 @@ +package com.gempukku.lotro.cards.set4.dunland; + +import com.gempukku.lotro.cards.AbstractMinion; +import com.gempukku.lotro.cards.PlayConditions; +import com.gempukku.lotro.cards.effects.AddUntilStartOfPhaseModifierEffect; +import com.gempukku.lotro.cards.modifiers.StrengthModifier; +import com.gempukku.lotro.common.Culture; +import com.gempukku.lotro.common.Keyword; +import com.gempukku.lotro.common.Phase; +import com.gempukku.lotro.common.Race; +import com.gempukku.lotro.filters.Filters; +import com.gempukku.lotro.game.PhysicalCard; +import com.gempukku.lotro.game.state.LotroGame; +import com.gempukku.lotro.logic.actions.OptionalTriggerAction; +import com.gempukku.lotro.logic.modifiers.KeywordModifier; +import com.gempukku.lotro.logic.timing.EffectResult; + +import java.util.Collections; +import java.util.List; + +/** + * Set: The Two Towers + * Side: Shadow + * Culture: Dunland + * Twilight Cost: 3 + * Type: Minion • Man + * Strength: 9 + * Vitality: 1 + * Site: 3 + * Game Text: Each time this minion wins a skirmish, you may make him strength +2 and fierce until the regroup phase. + */ +public class Card4_016 extends AbstractMinion { + public Card4_016() { + super(3, 9, 1, 3, Race.MAN, Culture.DUNLAND, "Dunlending Robber"); + } + + @Override + public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { + if (PlayConditions.winsSkirmish(effectResult, self)) { + OptionalTriggerAction action = new OptionalTriggerAction(self); + action.appendEffect( + new AddUntilStartOfPhaseModifierEffect( + new StrengthModifier(self, Filters.sameCard(self), 2), Phase.REGROUP)); + action.appendEffect( + new AddUntilStartOfPhaseModifierEffect( + new KeywordModifier(self, Filters.sameCard(self), Keyword.FIERCE), Phase.REGROUP)); + return Collections.singletonList(action); + } + return null; + } +}