diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dunland/Card20_015.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dunland/Card20_015.java index c345aa241..1fe845a73 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dunland/Card20_015.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dunland/Card20_015.java @@ -11,7 +11,7 @@ import com.gempukku.lotro.logic.actions.ActivateCardAction; import com.gempukku.lotro.logic.cardtype.AbstractMinion; import com.gempukku.lotro.logic.effects.ChooseActiveCardEffect; import com.gempukku.lotro.logic.effects.StackCardFromPlayEffect; -import com.gempukku.lotro.logic.timing.Action; +import com.gempukku.lotro.logic.effects.choose.ChooseAndPlayCardFromStackedEffect; import com.gempukku.lotro.logic.timing.PlayConditions; import java.util.Collections; @@ -32,11 +32,14 @@ public class Card20_015 extends AbstractMinion { } @Override - public List getPhaseActionsFromStacked(String playerId, LotroGame game, PhysicalCard self) { + public List getPhaseActionsFromStacked(String playerId, LotroGame game, PhysicalCard self) { if (PlayConditions.canUseStackedShadowCardDuringPhase(game, Phase.SHADOW, self, 0) && PlayConditions.stackedOn(self, game, Filters.siteControlled(self.getOwner())) && PlayUtils.checkPlayRequirements(game, self, Filters.any, 0, -1, false, false)) { - return Collections.singletonList(PlayUtils.getPlayCardAction(game, self, -1, Filters.any, false)); + ActivateCardAction action = new ActivateCardAction(self); + action.appendEffect( + new ChooseAndPlayCardFromStackedEffect(playerId, self.getStackedOn(), -1, self)); + return Collections.singletonList(action); } return null; } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dunland/Card20_016.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dunland/Card20_016.java index b67109ccf..0a43eedd7 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dunland/Card20_016.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dunland/Card20_016.java @@ -11,7 +11,6 @@ import com.gempukku.lotro.logic.effects.ChooseActiveCardEffect; import com.gempukku.lotro.logic.effects.StackCardFromPlayEffect; import com.gempukku.lotro.logic.effects.choose.ChooseAndDiscardCardsFromPlayEffect; import com.gempukku.lotro.logic.effects.choose.ChooseAndPlayCardFromStackedEffect; -import com.gempukku.lotro.logic.timing.Action; import com.gempukku.lotro.logic.timing.PlayConditions; import java.util.Collections; @@ -31,7 +30,7 @@ public class Card20_016 extends AbstractMinion { } @Override - public List getPhaseActionsFromStacked(String playerId, LotroGame game, PhysicalCard self) { + public List getPhaseActionsFromStacked(String playerId, LotroGame game, PhysicalCard self) { if (PlayConditions.canUseStackedShadowCardDuringPhase(game, Phase.SHADOW, self, 0) && PlayConditions.stackedOn(self, game, Filters.siteControlled(self.getOwner())) && PlayUtils.checkPlayRequirements(game, self, Filters.any, 0, -1, false, false)) { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dunland/Card20_017.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dunland/Card20_017.java index 0c9b5d378..f20580555 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dunland/Card20_017.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dunland/Card20_017.java @@ -14,7 +14,6 @@ import com.gempukku.lotro.logic.effects.ChooseActiveCardEffect; import com.gempukku.lotro.logic.effects.StackCardFromPlayEffect; import com.gempukku.lotro.logic.effects.choose.ChooseAndPlayCardFromStackedEffect; import com.gempukku.lotro.logic.effects.choose.ChooseAndPutCardFromDiscardIntoHandEffect; -import com.gempukku.lotro.logic.timing.Action; import com.gempukku.lotro.logic.timing.PlayConditions; import java.util.Collections; @@ -36,7 +35,7 @@ public class Card20_017 extends AbstractMinion { } @Override - public List getPhaseActionsFromStacked(String playerId, LotroGame game, PhysicalCard self) { + public List getPhaseActionsFromStacked(String playerId, LotroGame game, PhysicalCard self) { if (PlayConditions.canUseStackedShadowCardDuringPhase(game, Phase.SHADOW, self, 0) && PlayConditions.stackedOn(self, game, Filters.siteControlled(self.getOwner())) && PlayUtils.checkPlayRequirements(game, self, Filters.any, 0, 0, false, false)) { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dunland/Card20_018.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dunland/Card20_018.java index b3f5ff889..abbf0d4bc 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dunland/Card20_018.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dunland/Card20_018.java @@ -9,7 +9,7 @@ import com.gempukku.lotro.logic.actions.ActivateCardAction; import com.gempukku.lotro.logic.cardtype.AbstractMinion; import com.gempukku.lotro.logic.effects.ChooseActiveCardEffect; import com.gempukku.lotro.logic.effects.StackCardFromPlayEffect; -import com.gempukku.lotro.logic.timing.Action; +import com.gempukku.lotro.logic.effects.choose.ChooseAndPlayCardFromStackedEffect; import com.gempukku.lotro.logic.timing.PlayConditions; import java.util.Collections; @@ -31,11 +31,14 @@ public class Card20_018 extends AbstractMinion { } @Override - public List getPhaseActionsFromStacked(String playerId, LotroGame game, PhysicalCard self) { + public List getPhaseActionsFromStacked(String playerId, LotroGame game, PhysicalCard self) { if (PlayConditions.canUseStackedShadowCardDuringPhase(game, Phase.SHADOW, self, 0) && PlayConditions.stackedOn(self, game, Filters.siteControlled(self.getOwner())) && PlayUtils.checkPlayRequirements(game, self, Filters.any, 0, -Filters.countSpottable(game, Side.FREE_PEOPLE, CardType.POSSESSION), false, false)) { - return Collections.singletonList(PlayUtils.getPlayCardAction(game, self, -Filters.countSpottable(game, Side.FREE_PEOPLE, CardType.POSSESSION), Filters.any, false)); + ActivateCardAction action = new ActivateCardAction(self); + action.appendEffect( + new ChooseAndPlayCardFromStackedEffect(playerId, self.getStackedOn(), -Filters.countSpottable(game, Side.FREE_PEOPLE, CardType.POSSESSION), self)); + return Collections.singletonList(action); } return null; } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dunland/Card20_020.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dunland/Card20_020.java index 75eee2909..5846bba5a 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dunland/Card20_020.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dunland/Card20_020.java @@ -11,7 +11,7 @@ import com.gempukku.lotro.logic.actions.ActivateCardAction; import com.gempukku.lotro.logic.cardtype.AbstractMinion; import com.gempukku.lotro.logic.effects.ChooseActiveCardEffect; import com.gempukku.lotro.logic.effects.StackCardFromPlayEffect; -import com.gempukku.lotro.logic.timing.Action; +import com.gempukku.lotro.logic.effects.choose.ChooseAndPlayCardFromStackedEffect; import com.gempukku.lotro.logic.timing.PlayConditions; import java.util.Collections; @@ -57,12 +57,15 @@ public class Card20_020 extends AbstractMinion { } @Override - public List getPhaseActionsFromStacked(String playerId, LotroGame game, PhysicalCard self) { + public List getPhaseActionsFromStacked(String playerId, LotroGame game, PhysicalCard self) { if (PlayConditions.canUseStackedShadowCardDuringPhase(game, Phase.SHADOW, self, 0) && PlayConditions.stackedOn(self, game, Filters.siteControlled(self.getOwner())) && PlayConditions.canSpot(game, Filters.or(Filters.saruman, Filters.and(Filters.not(self), Culture.DUNLAND, Race.MAN))) && PlayUtils.checkPlayRequirements(game, self, Filters.any, 0, -2, false, false)) { - return Collections.singletonList(PlayUtils.getPlayCardAction(game, self, -2, Filters.any, false)); + ActivateCardAction action = new ActivateCardAction(self); + action.appendEffect( + new ChooseAndPlayCardFromStackedEffect(playerId, self.getStackedOn(), -2, self)); + return Collections.singletonList(action); } return null; } 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 5106f1e6d..3de4af574 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 @@ -8,11 +8,12 @@ import com.gempukku.lotro.filters.Filters; import com.gempukku.lotro.game.PhysicalCard; import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.PlayUtils; +import com.gempukku.lotro.logic.actions.ActivateCardAction; import com.gempukku.lotro.logic.actions.OptionalTriggerAction; import com.gempukku.lotro.logic.cardtype.AbstractMinion; import com.gempukku.lotro.logic.effects.ChooseActiveCardEffect; import com.gempukku.lotro.logic.effects.StackCardFromPlayEffect; -import com.gempukku.lotro.logic.timing.Action; +import com.gempukku.lotro.logic.effects.choose.ChooseAndPlayCardFromStackedEffect; import com.gempukku.lotro.logic.timing.EffectResult; import com.gempukku.lotro.logic.timing.PlayConditions; import com.gempukku.lotro.logic.timing.TriggerConditions; @@ -56,12 +57,15 @@ public class Card4_011 extends AbstractMinion { } @Override - public List getPhaseActionsFromStacked(String playerId, LotroGame game, PhysicalCard self) { + public List getPhaseActionsFromStacked(String playerId, LotroGame game, PhysicalCard self) { if (PlayConditions.canUseStackedShadowCardDuringPhase(game, Phase.SHADOW, self, 0) && self.getStackedOn().getBlueprint().getCardType() == CardType.SITE && playerId.equals(self.getStackedOn().getCardController()) && PlayUtils.checkPlayRequirements(game, self, Filters.any, 0, -2, false, false)) { - return Collections.singletonList(PlayUtils.getPlayCardAction(game, self, -2, Filters.any, false)); + ActivateCardAction action = new ActivateCardAction(self); + action.appendEffect( + new ChooseAndPlayCardFromStackedEffect(playerId, self.getStackedOn(), -2, self)); + return Collections.singletonList(action); } return null; } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/dunland/Card4_024.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/dunland/Card4_024.java index 2a66b78a8..b5f381324 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/dunland/Card4_024.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/dunland/Card4_024.java @@ -8,11 +8,12 @@ import com.gempukku.lotro.filters.Filters; import com.gempukku.lotro.game.PhysicalCard; import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.PlayUtils; +import com.gempukku.lotro.logic.actions.ActivateCardAction; import com.gempukku.lotro.logic.actions.OptionalTriggerAction; import com.gempukku.lotro.logic.cardtype.AbstractMinion; import com.gempukku.lotro.logic.effects.ChooseActiveCardEffect; import com.gempukku.lotro.logic.effects.StackCardFromPlayEffect; -import com.gempukku.lotro.logic.timing.Action; +import com.gempukku.lotro.logic.effects.choose.ChooseAndPlayCardFromStackedEffect; import com.gempukku.lotro.logic.timing.EffectResult; import com.gempukku.lotro.logic.timing.PlayConditions; import com.gempukku.lotro.logic.timing.TriggerConditions; @@ -56,12 +57,15 @@ public class Card4_024 extends AbstractMinion { } @Override - public List getPhaseActionsFromStacked(String playerId, LotroGame game, PhysicalCard self) { + public List getPhaseActionsFromStacked(String playerId, LotroGame game, PhysicalCard self) { if (PlayConditions.canUseStackedShadowCardDuringPhase(game, Phase.SHADOW, self, 0) && self.getStackedOn().getBlueprint().getCardType() == CardType.SITE && playerId.equals(self.getStackedOn().getCardController()) && PlayUtils.checkPlayRequirements(game, self, Filters.any, 0, -2, false, false)) { - return Collections.singletonList(PlayUtils.getPlayCardAction(game, self, -2, Filters.any, false)); + ActivateCardAction action = new ActivateCardAction(self); + action.appendEffect( + new ChooseAndPlayCardFromStackedEffect(playerId, self.getStackedOn(), -2, self)); + return Collections.singletonList(action); } return null; } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_180.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_180.java index ee5a97b3c..2942394b0 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_180.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_180.java @@ -9,7 +9,7 @@ import com.gempukku.lotro.logic.actions.ActivateCardAction; import com.gempukku.lotro.logic.cardtype.AbstractMinion; import com.gempukku.lotro.logic.effects.ChooseActiveCardEffect; import com.gempukku.lotro.logic.effects.StackCardFromPlayEffect; -import com.gempukku.lotro.logic.timing.Action; +import com.gempukku.lotro.logic.effects.choose.ChooseAndPlayCardFromStackedEffect; import com.gempukku.lotro.logic.timing.PlayConditions; import java.util.Collections; @@ -52,12 +52,15 @@ public class Card4_180 extends AbstractMinion { } @Override - public List getPhaseActionsFromStacked(String playerId, LotroGame game, PhysicalCard self) { + public List getPhaseActionsFromStacked(String playerId, LotroGame game, PhysicalCard self) { if (PlayConditions.canUseStackedShadowCardDuringPhase(game, Phase.SHADOW, self, 0) && self.getStackedOn().getBlueprint().getCardType() == CardType.SITE && playerId.equals(self.getStackedOn().getCardController()) && PlayUtils.checkPlayRequirements(game, self, Filters.any, 0, -1, false, false)) { - return Collections.singletonList(PlayUtils.getPlayCardAction(game, self, -1, Filters.any, false)); + ActivateCardAction action = new ActivateCardAction(self); + action.appendEffect( + new ChooseAndPlayCardFromStackedEffect(playerId, self.getStackedOn(), -1, self)); + return Collections.singletonList(action); } return null; } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_199.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_199.java index 4d002b0a8..e2f4057cf 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_199.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_199.java @@ -9,7 +9,7 @@ import com.gempukku.lotro.logic.actions.ActivateCardAction; import com.gempukku.lotro.logic.cardtype.AbstractMinion; import com.gempukku.lotro.logic.effects.ChooseActiveCardEffect; import com.gempukku.lotro.logic.effects.StackCardFromPlayEffect; -import com.gempukku.lotro.logic.timing.Action; +import com.gempukku.lotro.logic.effects.choose.ChooseAndPlayCardFromStackedEffect; import com.gempukku.lotro.logic.timing.PlayConditions; import java.util.Collections; @@ -52,12 +52,15 @@ public class Card4_199 extends AbstractMinion { } @Override - public List getPhaseActionsFromStacked(String playerId, LotroGame game, PhysicalCard self) { + public List getPhaseActionsFromStacked(String playerId, LotroGame game, PhysicalCard self) { if (PlayConditions.canUseStackedShadowCardDuringPhase(game, Phase.SHADOW, self, 0) && self.getStackedOn().getBlueprint().getCardType() == CardType.SITE && playerId.equals(self.getStackedOn().getCardController()) && PlayUtils.checkPlayRequirements(game, self, Filters.any, 0, -1, false, false)) { - return Collections.singletonList(PlayUtils.getPlayCardAction(game, self, -1, Filters.any, false)); + ActivateCardAction action = new ActivateCardAction(self); + action.appendEffect( + new ChooseAndPlayCardFromStackedEffect(playerId, self.getStackedOn(), -1, self)); + return Collections.singletonList(action); } return null; } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_201.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_201.java index b94d354ab..9c46e7f0b 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_201.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_201.java @@ -9,7 +9,7 @@ import com.gempukku.lotro.logic.actions.ActivateCardAction; import com.gempukku.lotro.logic.cardtype.AbstractMinion; import com.gempukku.lotro.logic.effects.ChooseActiveCardEffect; import com.gempukku.lotro.logic.effects.StackCardFromPlayEffect; -import com.gempukku.lotro.logic.timing.Action; +import com.gempukku.lotro.logic.effects.choose.ChooseAndPlayCardFromStackedEffect; import com.gempukku.lotro.logic.timing.PlayConditions; import java.util.Collections; @@ -52,12 +52,15 @@ public class Card4_201 extends AbstractMinion { } @Override - public List getPhaseActionsFromStacked(String playerId, LotroGame game, PhysicalCard self) { + public List getPhaseActionsFromStacked(String playerId, LotroGame game, PhysicalCard self) { if (PlayConditions.canUseStackedShadowCardDuringPhase(game, Phase.SHADOW, self, 0) && self.getStackedOn().getBlueprint().getCardType() == CardType.SITE && playerId.equals(self.getStackedOn().getCardController()) && PlayUtils.checkPlayRequirements(game, self, Filters.any, 0, -1, false, false)) { - return Collections.singletonList(PlayUtils.getPlayCardAction(game, self, -1, Filters.any, false)); + ActivateCardAction action = new ActivateCardAction(self); + action.appendEffect( + new ChooseAndPlayCardFromStackedEffect(playerId, self.getStackedOn(), -1, self)); + return Collections.singletonList(action); } return null; } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/isengard/Card6_066.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/isengard/Card6_066.java index 91fa69ba6..de6c140c0 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/isengard/Card6_066.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/isengard/Card6_066.java @@ -1,16 +1,15 @@ package com.gempukku.lotro.cards.set6.isengard; -import com.gempukku.lotro.logic.cardtype.AbstractMinion; -import com.gempukku.lotro.logic.timing.PlayConditions; -import com.gempukku.lotro.logic.effects.DiscardStackedCardsEffect; import com.gempukku.lotro.common.Culture; import com.gempukku.lotro.common.Phase; import com.gempukku.lotro.common.Race; import com.gempukku.lotro.game.PhysicalCard; import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.actions.ActivateCardAction; +import com.gempukku.lotro.logic.cardtype.AbstractMinion; import com.gempukku.lotro.logic.effects.AddTwilightEffect; -import com.gempukku.lotro.logic.timing.Action; +import com.gempukku.lotro.logic.effects.DiscardStackedCardsEffect; +import com.gempukku.lotro.logic.timing.PlayConditions; import java.util.Collections; import java.util.List; @@ -32,7 +31,7 @@ public class Card6_066 extends AbstractMinion { } @Override - public List getPhaseActionsFromStacked(String playerId, LotroGame game, PhysicalCard self) { + public List getPhaseActionsFromStacked(String playerId, LotroGame game, PhysicalCard self) { if (PlayConditions.canUseStackedShadowCardDuringPhase(game, Phase.REGROUP, self, 0) && self.getStackedOn().getBlueprint().getCulture() == Culture.ISENGARD) { ActivateCardAction action = new ActivateCardAction(self); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/isengard/Card6_068.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/isengard/Card6_068.java index 276680f58..a795e6149 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/isengard/Card6_068.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/isengard/Card6_068.java @@ -12,7 +12,6 @@ import com.gempukku.lotro.logic.effects.AddTwilightEffect; import com.gempukku.lotro.logic.effects.ChooseAndWoundCharactersEffect; import com.gempukku.lotro.logic.effects.DiscardStackedCardsEffect; import com.gempukku.lotro.logic.effects.choose.ChooseAndDiscardCardsFromPlayEffect; -import com.gempukku.lotro.logic.timing.Action; import com.gempukku.lotro.logic.timing.PlayConditions; import java.util.Collections; @@ -52,7 +51,7 @@ public class Card6_068 extends AbstractMinion { } @Override - public List getPhaseActionsFromStacked(String playerId, LotroGame game, PhysicalCard self) { + public List getPhaseActionsFromStacked(String playerId, LotroGame game, PhysicalCard self) { if (PlayConditions.canUseStackedShadowCardDuringPhase(game, Phase.REGROUP, self, 0) && self.getStackedOn().getBlueprint().getCulture() == Culture.ISENGARD && PlayConditions.canSpot(game, Culture.ISENGARD, Race.ORC)) { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/isengard/Card6_070.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/isengard/Card6_070.java index 07f43a3bb..4869d0604 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/isengard/Card6_070.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/isengard/Card6_070.java @@ -1,10 +1,5 @@ package com.gempukku.lotro.cards.set6.isengard; -import com.gempukku.lotro.logic.cardtype.AbstractMinion; -import com.gempukku.lotro.logic.timing.PlayConditions; -import com.gempukku.lotro.logic.effects.DiscardStackedCardsEffect; -import com.gempukku.lotro.logic.effects.ExhaustCharacterEffect; -import com.gempukku.lotro.logic.effects.RemoveTwilightEffect; import com.gempukku.lotro.common.CardType; import com.gempukku.lotro.common.Culture; import com.gempukku.lotro.common.Phase; @@ -13,8 +8,12 @@ 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.ActivateCardAction; +import com.gempukku.lotro.logic.cardtype.AbstractMinion; import com.gempukku.lotro.logic.effects.ChooseActiveCardEffect; -import com.gempukku.lotro.logic.timing.Action; +import com.gempukku.lotro.logic.effects.DiscardStackedCardsEffect; +import com.gempukku.lotro.logic.effects.ExhaustCharacterEffect; +import com.gempukku.lotro.logic.effects.RemoveTwilightEffect; +import com.gempukku.lotro.logic.timing.PlayConditions; import java.util.Collections; import java.util.List; @@ -36,7 +35,7 @@ public class Card6_070 extends AbstractMinion { } @Override - public List getPhaseActionsFromStacked(final String playerId, LotroGame game, final PhysicalCard self) { + public List getPhaseActionsFromStacked(final String playerId, LotroGame game, final PhysicalCard self) { if (PlayConditions.canUseStackedShadowCardDuringPhase(game, Phase.REGROUP, self, 2) && self.getStackedOn().getBlueprint().getCulture() == Culture.ISENGARD) { final ActivateCardAction action = new ActivateCardAction(self); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/dwarven/Card7_014.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/dwarven/Card7_014.java index e28613d56..021ba5d3b 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/dwarven/Card7_014.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/dwarven/Card7_014.java @@ -9,7 +9,6 @@ import com.gempukku.lotro.logic.cardtype.AbstractEvent; import com.gempukku.lotro.logic.effects.DiscardStackedCardsEffect; import com.gempukku.lotro.logic.effects.DrawCardsEffect; import com.gempukku.lotro.logic.effects.choose.ChooseAndExertCharactersEffect; -import com.gempukku.lotro.logic.timing.Action; import com.gempukku.lotro.logic.timing.PlayConditions; import java.util.Collections; @@ -43,7 +42,7 @@ public class Card7_014 extends AbstractEvent { } @Override - public List getPhaseActionsFromStacked(String playerId, LotroGame game, PhysicalCard self) { + public List getPhaseActionsFromStacked(String playerId, LotroGame game, PhysicalCard self) { if (PlayConditions.canUseStackedFPCardDuringPhase(game, Phase.MANEUVER, self) && PlayConditions.stackedOn(self, game, Culture.DWARVEN, CardType.CONDITION) && PlayConditions.canSpot(game, Race.DWARF, CardType.COMPANION)) { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/sauron/Card7_276.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/sauron/Card7_276.java index a16482388..3d077dc2d 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/sauron/Card7_276.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/sauron/Card7_276.java @@ -1,15 +1,14 @@ package com.gempukku.lotro.cards.set7.sauron; -import com.gempukku.lotro.logic.cardtype.AbstractMinion; -import com.gempukku.lotro.logic.timing.PlayConditions; -import com.gempukku.lotro.logic.effects.DiscardStackedCardsEffect; -import com.gempukku.lotro.logic.effects.choose.ChooseAndAddUntilEOPStrengthBonusEffect; import com.gempukku.lotro.common.*; 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.ActivateCardAction; -import com.gempukku.lotro.logic.timing.Action; +import com.gempukku.lotro.logic.cardtype.AbstractMinion; +import com.gempukku.lotro.logic.effects.DiscardStackedCardsEffect; +import com.gempukku.lotro.logic.effects.choose.ChooseAndAddUntilEOPStrengthBonusEffect; +import com.gempukku.lotro.logic.timing.PlayConditions; import java.util.Collections; import java.util.List; @@ -33,7 +32,7 @@ public class Card7_276 extends AbstractMinion { } @Override - public List getPhaseActionsFromStacked(String playerId, LotroGame game, PhysicalCard self) { + public List getPhaseActionsFromStacked(String playerId, LotroGame game, PhysicalCard self) { if (PlayConditions.canUseStackedShadowCardDuringPhase(game, Phase.SKIRMISH, self, 0) && Filters.siteControlled(playerId).accepts(game, self.getStackedOn())) { ActivateCardAction action = new ActivateCardAction(self); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set8/sauron/Card8_099.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set8/sauron/Card8_099.java index 1da2e6f36..22f0fa719 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set8/sauron/Card8_099.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set8/sauron/Card8_099.java @@ -1,15 +1,14 @@ package com.gempukku.lotro.cards.set8.sauron; -import com.gempukku.lotro.logic.cardtype.AbstractMinion; -import com.gempukku.lotro.logic.timing.PlayConditions; -import com.gempukku.lotro.logic.effects.AddUntilEndOfTurnModifierEffect; -import com.gempukku.lotro.logic.effects.DiscardStackedCardsEffect; -import com.gempukku.lotro.logic.modifiers.MoveLimitModifier; import com.gempukku.lotro.common.*; import com.gempukku.lotro.game.PhysicalCard; import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.actions.ActivateCardAction; -import com.gempukku.lotro.logic.timing.Action; +import com.gempukku.lotro.logic.cardtype.AbstractMinion; +import com.gempukku.lotro.logic.effects.AddUntilEndOfTurnModifierEffect; +import com.gempukku.lotro.logic.effects.DiscardStackedCardsEffect; +import com.gempukku.lotro.logic.modifiers.MoveLimitModifier; +import com.gempukku.lotro.logic.timing.PlayConditions; import java.util.Collections; import java.util.List; @@ -33,7 +32,7 @@ public class Card8_099 extends AbstractMinion { } @Override - public List getPhaseActionsFromStacked(String playerId, LotroGame game, PhysicalCard self) { + public List getPhaseActionsFromStacked(String playerId, LotroGame game, PhysicalCard self) { if (PlayConditions.canUseStackedShadowCardDuringPhase(game, Phase.REGROUP, self, 0) && self.getStackedOn().getBlueprint().getCardType() == CardType.SITE && playerId.equals(self.getStackedOn().getCardController())) { diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/LotroCardBlueprint.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/LotroCardBlueprint.java index 131b84051..0001fd195 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/LotroCardBlueprint.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/LotroCardBlueprint.java @@ -73,7 +73,7 @@ public interface LotroCardBlueprint { public List getPhaseActionsInHand(String playerId, LotroGame game, PhysicalCard self); - public List getPhaseActionsFromStacked(String playerId, LotroGame game, PhysicalCard self); + public List getPhaseActionsFromStacked(String playerId, LotroGame game, PhysicalCard self); public List getPhaseActionsFromDiscard(String playerId, LotroGame game, PhysicalCard self); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/cardtype/AbstractLotroCardBlueprint.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/cardtype/AbstractLotroCardBlueprint.java index a33479173..47a11d05a 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/cardtype/AbstractLotroCardBlueprint.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/cardtype/AbstractLotroCardBlueprint.java @@ -207,7 +207,7 @@ public abstract class AbstractLotroCardBlueprint implements LotroCardBlueprint { } @Override - public List getPhaseActionsFromStacked(String playerId, LotroGame game, PhysicalCard self) { + public List getPhaseActionsFromStacked(String playerId, LotroGame game, PhysicalCard self) { return null; }