From d20e3d513617d5510e85eee9f7737202e01e8833 Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Fri, 14 Oct 2011 22:48:56 +0000 Subject: [PATCH] Making sure the responses on permanents will only show up, when the permanent is in play. --- .../lotro/cards/AbstractPermanent.java | 25 +++++++++++++++++++ .../lotro/cards/set1/elven/Card1_060.java | 8 ------ .../lotro/cards/set1/elven/Card1_067.java | 8 ------ .../lotro/cards/set1/isengard/Card1_144.java | 3 +-- .../lotro/cards/set1/isengard/Card1_155.java | 3 +-- .../lotro/cards/set1/isengard/Card1_159.java | 3 +-- .../lotro/cards/set1/moria/Card1_173.java | 3 +-- .../lotro/cards/set1/moria/Card1_183.java | 2 +- .../lotro/cards/set1/moria/Card1_193.java | 3 +-- .../lotro/cards/set1/sauron/Card1_240.java | 3 +-- .../lotro/cards/set1/sauron/Card1_261.java | 3 +-- .../lotro/cards/set1/sauron/Card1_275.java | 3 +-- .../lotro/cards/set1/shire/Card1_295.java | 8 ------ .../lotro/cards/set1/wraith/Card1_209.java | 3 +-- .../lotro/cards/set2/elven/Card2_018.java | 3 +-- .../lotro/cards/set2/isengard/Card2_047.java | 3 +-- .../lotro/cards/set2/sauron/Card2_089.java | 3 +-- .../lotro/cards/set2/shire/Card2_106.java | 3 +-- .../lotro/cards/set2/wraith/Card2_077.java | 3 +-- .../lotro/cards/set3/elven/Card3_007.java | 3 +-- .../lotro/cards/set3/elven/Card3_014.java | 3 +-- .../lotro/cards/set3/gandalf/Card3_036.java | 3 +-- .../lotro/cards/set3/isengard/Card3_059.java | 3 +-- .../lotro/cards/set3/isengard/Card3_068.java | 3 +-- .../lotro/cards/set3/shire/Card3_110.java | 3 +-- .../lotro/cards/set3/shire/Card3_114.java | 3 +-- .../lotro/cards/set4/dunland/Card4_019.java | 3 +-- .../lotro/cards/set4/dunland/Card4_040.java | 3 +-- .../lotro/cards/set4/gandalf/Card4_103.java | 2 +- .../lotro/cards/set4/isengard/Card4_186.java | 3 +-- .../lotro/cards/set4/isengard/Card4_188.java | 3 +-- .../lotro/cards/set4/isengard/Card4_190.java | 3 +-- .../lotro/cards/set4/rohan/Card4_264.java | 3 +-- .../lotro/cards/set4/rohan/Card4_270.java | 3 +-- .../lotro/cards/set4/rohan/Card4_271.java | 3 +-- 35 files changed, 56 insertions(+), 84 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractPermanent.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractPermanent.java index 4afce3a4a..46ab7c442 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractPermanent.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractPermanent.java @@ -4,7 +4,10 @@ import com.gempukku.lotro.cards.actions.PlayPermanentAction; 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.timing.Effect; +import com.gempukku.lotro.logic.timing.EffectResult; import java.util.Collections; import java.util.List; @@ -53,4 +56,26 @@ public class AbstractPermanent extends AbstractLotroCardBlueprint { return getExtraPhaseActions(playerId, game, self); } + + @Override + public final List getOptionalBeforeActions(String playerId, LotroGame game, Effect effect, PhysicalCard self) { + if (self.getZone().isInPlay()) + return getOptionalInPlayBeforeActions(playerId, game, effect, self); + return null; + } + + @Override + public final List getOptionalAfterActions(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { + if (self.getZone().isInPlay()) + return getOptionalInPlayAfterActions(playerId, game, effectResult, self); + return null; + } + + public List getOptionalInPlayBeforeActions(String playerId, LotroGame game, Effect effect, PhysicalCard self) { + return null; + } + + public List getOptionalInPlayAfterActions(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { + return null; + } } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_060.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_060.java index 37d41639d..d03babf08 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_060.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_060.java @@ -70,14 +70,6 @@ public class Card1_060 extends AbstractAlly { return null; } - @Override - public List getOptionalBeforeActions(String playerId, LotroGame game, Effect effect, PhysicalCard self) { - LotroCardBlueprint copied = getCopied(game, self); - if (copied != null) - return copied.getOptionalBeforeActions(playerId, game, effect, self); - return null; - } - @Override public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { LotroCardBlueprint copied = getCopied(game, self); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_067.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_067.java index 66a5c6020..b6f154ed3 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_067.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_067.java @@ -70,14 +70,6 @@ public class Card1_067 extends AbstractAlly { return null; } - @Override - public List getOptionalBeforeActions(String playerId, LotroGame game, Effect effect, PhysicalCard self) { - LotroCardBlueprint copied = getCopied(game, self); - if (copied != null) - return copied.getOptionalBeforeActions(playerId, game, effect, self); - return null; - } - @Override public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { LotroCardBlueprint copied = getCopied(game, self); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_144.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_144.java index 7ceeb502c..29e7949d3 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_144.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_144.java @@ -9,7 +9,6 @@ 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.effects.ChooseAndHealCharactersEffect; -import com.gempukku.lotro.logic.timing.Action; import com.gempukku.lotro.logic.timing.EffectResult; import com.gempukku.lotro.logic.timing.results.SkirmishResult; @@ -30,7 +29,7 @@ public class Card1_144 extends AbstractPermanent { } @Override - public List getOptionalAfterActions(final String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { + public List getOptionalInPlayAfterActions(final String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { if (PlayConditions.winsSkirmish(game.getGameState(), game.getModifiersQuerying(), effectResult, Filters.and(Filters.race(Race.URUK_HAI), Filters.owner(playerId))) && game.getGameState().getTwilightPool() >= 1) { SkirmishResult skirmishResult = ((SkirmishResult) effectResult); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_155.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_155.java index b71207ee7..a5521812d 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_155.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_155.java @@ -13,7 +13,6 @@ 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.timing.EffectResult; import com.gempukku.lotro.logic.timing.UnrespondableEffect; @@ -38,7 +37,7 @@ public class Card1_155 extends AbstractMinion { } @Override - public List getOptionalAfterActions(final String playerId, LotroGame game, EffectResult effectResult, final PhysicalCard self) { + public List getOptionalInPlayAfterActions(final String playerId, LotroGame game, EffectResult effectResult, final PhysicalCard self) { if (effectResult.getType() == EffectResult.Type.PUT_ON_THE_ONE_RING && PlayConditions.canExert(self, game.getGameState(), game.getModifiersQuerying(), self)) { final ActivateCardAction action = new ActivateCardAction(self); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_159.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_159.java index 373c3336d..a76354a2c 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_159.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_159.java @@ -11,7 +11,6 @@ import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.actions.ActivateCardAction; import com.gempukku.lotro.logic.effects.ChooseActiveCardEffect; import com.gempukku.lotro.logic.modifiers.KeywordModifier; -import com.gempukku.lotro.logic.timing.Action; import com.gempukku.lotro.logic.timing.EffectResult; import com.gempukku.lotro.logic.timing.results.SkirmishResult; @@ -39,7 +38,7 @@ public class Card1_159 extends AbstractPermanent { } @Override - public List getOptionalAfterActions(String playerId, LotroGame game, EffectResult effectResult, final PhysicalCard self) { + public List getOptionalInPlayAfterActions(String playerId, LotroGame game, EffectResult effectResult, final PhysicalCard self) { if (PlayConditions.winsSkirmish(game.getGameState(), game.getModifiersQuerying(), effectResult, Filters.and(Filters.owner(playerId), Filters.race(Race.URUK_HAI))) && game.getGameState().getTwilightPool() >= 3) { SkirmishResult skirmishResult = ((SkirmishResult) effectResult); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_173.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_173.java index 4fc5cec0e..71315c985 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_173.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_173.java @@ -13,7 +13,6 @@ import com.gempukku.lotro.logic.effects.AddTwilightEffect; import com.gempukku.lotro.logic.effects.ChooseActiveCardEffect; import com.gempukku.lotro.logic.effects.DiscardCardsFromPlayEffect; import com.gempukku.lotro.logic.effects.WoundCharactersEffect; -import com.gempukku.lotro.logic.timing.Action; import com.gempukku.lotro.logic.timing.Effect; import com.gempukku.lotro.logic.timing.EffectResult; @@ -47,7 +46,7 @@ public class Card1_173 extends AbstractPermanent { } @Override - public List getOptionalBeforeActions(String playerId, LotroGame game, final Effect effect, final PhysicalCard self) { + public List getOptionalInPlayBeforeActions(String playerId, LotroGame game, final Effect effect, final PhysicalCard self) { if (PlayConditions.canUseShadowCardDuringPhase(game.getGameState(), null, self, 0) && effect.getType() == EffectResult.Type.WOUND) { final WoundCharactersEffect woundEffect = (WoundCharactersEffect) effect; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_183.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_183.java index 786bde97b..7ab840ee6 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_183.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_183.java @@ -53,7 +53,7 @@ public class Card1_183 extends AbstractPermanent { } @Override - public List getOptionalAfterActions(String playerId, LotroGame game, EffectResult effectResult, final PhysicalCard self) { + public List getOptionalInPlayAfterActions(String playerId, LotroGame game, EffectResult effectResult, final PhysicalCard self) { if (PlayConditions.canUseShadowCardDuringPhase(game.getGameState(), null, self, 0) && PlayConditions.winsSkirmish(game.getGameState(), game.getModifiersQuerying(), effectResult, Filters.and(Filters.culture(Culture.MORIA), Filters.race(Race.ORC))) && Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Filters.culture(Culture.MORIA), Filters.race(Race.ORC), Filters.inSkirmish())) { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_193.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_193.java index 4be1fa515..91ab57a48 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_193.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_193.java @@ -7,7 +7,6 @@ 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.timing.EffectResult; import com.gempukku.lotro.logic.timing.results.DiscardCardsFromPlayResult; @@ -30,7 +29,7 @@ public class Card1_193 extends AbstractPermanent { } @Override - public List getOptionalAfterActions(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { + public List getOptionalInPlayAfterActions(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { if (effectResult.getType() == EffectResult.Type.DISCARD_FROM_PLAY) { DiscardCardsFromPlayResult discardResult = (DiscardCardsFromPlayResult) effectResult; Collection discardedCards = discardResult.getDiscardedCards(); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_240.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_240.java index 7c99bbd21..fd1011246 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_240.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_240.java @@ -9,7 +9,6 @@ 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.timing.Action; import com.gempukku.lotro.logic.timing.EffectResult; import java.util.Collections; @@ -33,7 +32,7 @@ public class Card1_240 extends AbstractMinion { } @Override - public List getOptionalAfterActions(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { + public List getOptionalInPlayAfterActions(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { if (PlayConditions.winsSkirmish(effectResult, self) && PlayConditions.canUseShadowCardDuringPhase(game.getGameState(), null, self, 2)) { ActivateCardAction action = new ActivateCardAction(self); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_261.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_261.java index 7cc867f52..128636dd4 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_261.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_261.java @@ -12,7 +12,6 @@ import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.actions.ActivateCardAction; import com.gempukku.lotro.logic.effects.PlayEventEffect; import com.gempukku.lotro.logic.modifiers.Modifier; -import com.gempukku.lotro.logic.timing.Action; import com.gempukku.lotro.logic.timing.Effect; import java.util.Collections; @@ -42,7 +41,7 @@ public class Card1_261 extends AbstractMinion { } @Override - public List getOptionalBeforeActions(String playerId, LotroGame game, Effect effect, PhysicalCard self) { + public List getOptionalInPlayBeforeActions(String playerId, LotroGame game, Effect effect, PhysicalCard self) { if (PlayConditions.canUseShadowCardDuringPhase(game.getGameState(), null, self, 0) && PlayConditions.played(game.getGameState(), game.getModifiersQuerying(), effect, Filters.and(Filters.side(Side.FREE_PEOPLE), Filters.type(CardType.EVENT), Filters.keyword(Keyword.REGROUP))) && PlayConditions.canExert(self, game.getGameState(), game.getModifiersQuerying(), self)) { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_275.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_275.java index 708852b7a..52ce28346 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_275.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_275.java @@ -10,7 +10,6 @@ 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.effects.PlayEventEffect; -import com.gempukku.lotro.logic.timing.Action; import com.gempukku.lotro.logic.timing.Effect; import java.util.Collections; @@ -32,7 +31,7 @@ public class Card1_275 extends AbstractPermanent { } @Override - public List getOptionalBeforeActions(String playerId, LotroGame game, Effect effect, PhysicalCard self) { + public List getOptionalInPlayBeforeActions(String playerId, LotroGame game, Effect effect, PhysicalCard self) { if (PlayConditions.canUseShadowCardDuringPhase(game.getGameState(), null, self, 0) && PlayConditions.canExert(self, game.getGameState(), game.getModifiersQuerying(), Filters.culture(Culture.SAURON), Filters.keyword(Keyword.TRACKER)) && PlayConditions.played(game.getGameState(), game.getModifiersQuerying(), effect, Filters.and(Filters.type(CardType.EVENT), Filters.keyword(Keyword.STEALTH)))) { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_295.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_295.java index 71b3d0562..8e2ad83e7 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_295.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_295.java @@ -73,14 +73,6 @@ public class Card1_295 extends AbstractAlly { return null; } - @Override - public List getOptionalBeforeActions(String playerId, LotroGame game, Effect effect, PhysicalCard self) { - LotroCardBlueprint copied = getCopied(game, self); - if (copied != null) - return copied.getOptionalBeforeActions(playerId, game, effect, self); - return null; - } - @Override public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { LotroCardBlueprint copied = getCopied(game, self); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_209.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_209.java index b5e1e36ef..04bc7e072 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_209.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_209.java @@ -11,7 +11,6 @@ import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.actions.ActivateCardAction; import com.gempukku.lotro.logic.actions.RequiredTriggerAction; import com.gempukku.lotro.logic.effects.WoundCharactersEffect; -import com.gempukku.lotro.logic.timing.Action; import com.gempukku.lotro.logic.timing.EffectResult; import java.util.Collections; @@ -33,7 +32,7 @@ public class Card1_209 extends AbstractPermanent { } @Override - public List getOptionalAfterActions(String playerId, LotroGame game, EffectResult effectResult, final PhysicalCard self) { + public List getOptionalInPlayAfterActions(String playerId, LotroGame game, EffectResult effectResult, final PhysicalCard self) { if (PlayConditions.winsSkirmish(game.getGameState(), game.getModifiersQuerying(), effectResult, Filters.and(Filters.owner(self.getOwner()), Filters.race(Race.NAZGUL))) && self.getZone() == Zone.SUPPORT && game.getGameState().getSkirmish() != null && game.getGameState().getSkirmish().getFellowshipCharacter() != null diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/elven/Card2_018.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/elven/Card2_018.java index 882c54161..57e1c928d 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/elven/Card2_018.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/elven/Card2_018.java @@ -14,7 +14,6 @@ import com.gempukku.lotro.logic.modifiers.AbstractModifier; import com.gempukku.lotro.logic.modifiers.Modifier; import com.gempukku.lotro.logic.modifiers.ModifierEffect; import com.gempukku.lotro.logic.modifiers.ModifiersQuerying; -import com.gempukku.lotro.logic.timing.Action; import com.gempukku.lotro.logic.timing.Effect; import com.gempukku.lotro.logic.timing.EffectResult; @@ -50,7 +49,7 @@ public class Card2_018 extends AbstractPermanent { } @Override - public List getOptionalBeforeActions(String playerId, LotroGame game, Effect effect, PhysicalCard self) { + public List getOptionalInPlayBeforeActions(String playerId, LotroGame game, Effect effect, PhysicalCard self) { if (effect.getType() == EffectResult.Type.WOUND) { final WoundCharactersEffect woundEffect = (WoundCharactersEffect) effect; Collection woundedCharacters = woundEffect.getAffectedCardsMinusPrevented(game); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/isengard/Card2_047.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/isengard/Card2_047.java index 5e444c85d..f0dca724a 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/isengard/Card2_047.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/isengard/Card2_047.java @@ -15,7 +15,6 @@ import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.actions.ActivateCardAction; import com.gempukku.lotro.logic.effects.PlayEventEffect; import com.gempukku.lotro.logic.modifiers.Modifier; -import com.gempukku.lotro.logic.timing.Action; import com.gempukku.lotro.logic.timing.Effect; import java.util.Collections; @@ -47,7 +46,7 @@ public class Card2_047 extends AbstractMinion { } @Override - public List getOptionalBeforeActions(String playerId, LotroGame game, Effect effect, PhysicalCard self) { + public List getOptionalInPlayBeforeActions(String playerId, LotroGame game, Effect effect, PhysicalCard self) { if (PlayConditions.played(game.getGameState(), game.getModifiersQuerying(), effect, Filters.type(CardType.EVENT)) && PlayConditions.canExert(self, game.getGameState(), game.getModifiersQuerying(), self)) { PlayEventEffect playEffect = (PlayEventEffect) effect; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/sauron/Card2_089.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/sauron/Card2_089.java index 93c85aaa3..bf91af7a8 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/sauron/Card2_089.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/sauron/Card2_089.java @@ -17,7 +17,6 @@ import com.gempukku.lotro.logic.actions.ActivateCardAction; import com.gempukku.lotro.logic.effects.DiscardCardsFromPlayEffect; import com.gempukku.lotro.logic.effects.PlayEventEffect; import com.gempukku.lotro.logic.modifiers.Modifier; -import com.gempukku.lotro.logic.timing.Action; import com.gempukku.lotro.logic.timing.Effect; import java.util.Collections; @@ -49,7 +48,7 @@ public class Card2_089 extends AbstractMinion { } @Override - public List getOptionalBeforeActions(String playerId, LotroGame game, Effect effect, PhysicalCard self) { + public List getOptionalInPlayBeforeActions(String playerId, LotroGame game, Effect effect, PhysicalCard self) { if (PlayConditions.played(game.getGameState(), game.getModifiersQuerying(), effect, Filters.type(CardType.EVENT))) { PlayEventEffect playEffect = (PlayEventEffect) effect; if (playEffect.isRequiresRanger()) { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/shire/Card2_106.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/shire/Card2_106.java index 33bb79e55..53e8780bc 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/shire/Card2_106.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/shire/Card2_106.java @@ -10,7 +10,6 @@ import com.gempukku.lotro.logic.actions.ActivateCardAction; import com.gempukku.lotro.logic.effects.ChooseActiveCardEffect; import com.gempukku.lotro.logic.effects.DiscardCardsFromPlayEffect; import com.gempukku.lotro.logic.effects.WoundCharactersEffect; -import com.gempukku.lotro.logic.timing.Action; import com.gempukku.lotro.logic.timing.Effect; import com.gempukku.lotro.logic.timing.EffectResult; @@ -34,7 +33,7 @@ public class Card2_106 extends AbstractPermanent { } @Override - public List getOptionalBeforeActions(String playerId, LotroGame game, Effect effect, PhysicalCard self) { + public List getOptionalInPlayBeforeActions(String playerId, LotroGame game, Effect effect, PhysicalCard self) { if (effect.getType() == EffectResult.Type.WOUND) { final WoundCharactersEffect woundEffect = (WoundCharactersEffect) effect; Collection woundedCharacters = woundEffect.getAffectedCardsMinusPrevented(game); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/wraith/Card2_077.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/wraith/Card2_077.java index bbfb17c80..91fa2fe4a 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/wraith/Card2_077.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/wraith/Card2_077.java @@ -11,7 +11,6 @@ import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.actions.ActivateCardAction; import com.gempukku.lotro.logic.effects.ChooseActiveCardEffect; import com.gempukku.lotro.logic.effects.WoundCharactersEffect; -import com.gempukku.lotro.logic.timing.Action; import com.gempukku.lotro.logic.timing.Effect; import com.gempukku.lotro.logic.timing.EffectResult; @@ -34,7 +33,7 @@ public class Card2_077 extends AbstractPermanent { } @Override - public List getOptionalBeforeActions(String playerId, LotroGame game, Effect effect, PhysicalCard self) { + public List getOptionalInPlayBeforeActions(String playerId, LotroGame game, Effect effect, PhysicalCard self) { if (PlayConditions.canUseShadowCardDuringPhase(game.getGameState(), null, self, 1) && effect.getType() == EffectResult.Type.WOUND) { final WoundCharactersEffect woundEffect = (WoundCharactersEffect) effect; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/elven/Card3_007.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/elven/Card3_007.java index 98ec7079b..a890c4e02 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/elven/Card3_007.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/elven/Card3_007.java @@ -13,7 +13,6 @@ import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.actions.ActivateCardAction; import com.gempukku.lotro.logic.effects.ChooseActiveCardEffect; import com.gempukku.lotro.logic.effects.WoundCharactersEffect; -import com.gempukku.lotro.logic.timing.Action; import com.gempukku.lotro.logic.timing.Effect; import com.gempukku.lotro.logic.timing.EffectResult; @@ -41,7 +40,7 @@ public class Card3_007 extends AbstractCompanion { } @Override - public List getOptionalBeforeActions(String playerId, LotroGame game, Effect effect, PhysicalCard self) { + public List getOptionalInPlayBeforeActions(String playerId, LotroGame game, Effect effect, PhysicalCard self) { if (effect.getType() == EffectResult.Type.WOUND && game.getGameState().getHand(playerId).size() >= 3) { final WoundCharactersEffect woundEffect = (WoundCharactersEffect) effect; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/elven/Card3_014.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/elven/Card3_014.java index 82eb4b958..5727a4825 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/elven/Card3_014.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/elven/Card3_014.java @@ -13,7 +13,6 @@ import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.actions.ActivateCardAction; import com.gempukku.lotro.logic.effects.ChooseActiveCardEffect; import com.gempukku.lotro.logic.effects.WoundCharactersEffect; -import com.gempukku.lotro.logic.timing.Action; import com.gempukku.lotro.logic.timing.Effect; import com.gempukku.lotro.logic.timing.EffectResult; @@ -45,7 +44,7 @@ public class Card3_014 extends AbstractAlly { } @Override - public List getOptionalBeforeActions(String playerId, LotroGame game, Effect effect, PhysicalCard self) { + public List getOptionalInPlayBeforeActions(String playerId, LotroGame game, Effect effect, PhysicalCard self) { if (effect.getType() == EffectResult.Type.WOUND) { final WoundCharactersEffect woundEffect = (WoundCharactersEffect) effect; Collection woundedCharacters = woundEffect.getAffectedCardsMinusPrevented(game); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/gandalf/Card3_036.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/gandalf/Card3_036.java index 945257e21..e0e1b0330 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/gandalf/Card3_036.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/gandalf/Card3_036.java @@ -14,7 +14,6 @@ import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.actions.ActivateCardAction; import com.gempukku.lotro.logic.effects.ChooseActiveCardEffect; import com.gempukku.lotro.logic.effects.WoundCharactersEffect; -import com.gempukku.lotro.logic.timing.Action; import com.gempukku.lotro.logic.timing.Effect; import com.gempukku.lotro.logic.timing.EffectResult; @@ -37,7 +36,7 @@ public class Card3_036 extends AbstractPermanent { } @Override - public List getOptionalBeforeActions(String playerId, LotroGame game, Effect effect, PhysicalCard self) { + public List getOptionalInPlayBeforeActions(String playerId, LotroGame game, Effect effect, PhysicalCard self) { if (effect.getType() == EffectResult.Type.WOUND && game.getGameState().getTwilightPool() >= 4 && PlayConditions.canExert(self, game.getGameState(), game.getModifiersQuerying(), Filters.name("Gandalf"))) { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/isengard/Card3_059.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/isengard/Card3_059.java index 276c99649..a65977626 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/isengard/Card3_059.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/isengard/Card3_059.java @@ -12,7 +12,6 @@ import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.actions.ActivateCardAction; import com.gempukku.lotro.logic.effects.ChooseActiveCardEffect; import com.gempukku.lotro.logic.effects.WoundCharactersEffect; -import com.gempukku.lotro.logic.timing.Action; import com.gempukku.lotro.logic.timing.Effect; import java.util.Collections; @@ -35,7 +34,7 @@ public class Card3_059 extends AbstractMinion { } @Override - public List getOptionalBeforeActions(String playerId, LotroGame game, Effect effect, PhysicalCard self) { + public List getOptionalInPlayBeforeActions(String playerId, LotroGame game, Effect effect, PhysicalCard self) { if (PlayConditions.canUseShadowCardDuringPhase(game.getGameState(), null, self, 2) && PlayConditions.isGettingWounded(effect, game, Filters.culture(Culture.ISENGARD), Filters.race(Race.ORC))) { final ActivateCardAction action = new ActivateCardAction(self); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/isengard/Card3_068.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/isengard/Card3_068.java index d4e353cdc..c1034a6a0 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/isengard/Card3_068.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/isengard/Card3_068.java @@ -19,7 +19,6 @@ import com.gempukku.lotro.logic.actions.ActivateCardAction; import com.gempukku.lotro.logic.effects.ChooseActiveCardEffect; import com.gempukku.lotro.logic.effects.WoundCharactersEffect; import com.gempukku.lotro.logic.modifiers.*; -import com.gempukku.lotro.logic.timing.Action; import com.gempukku.lotro.logic.timing.Effect; import java.util.Collections; @@ -77,7 +76,7 @@ public class Card3_068 extends AbstractMinion { } @Override - public List getOptionalBeforeActions(String playerId, LotroGame game, Effect effect, PhysicalCard self) { + public List getOptionalInPlayBeforeActions(String playerId, LotroGame game, Effect effect, PhysicalCard self) { if (PlayConditions.isGettingWounded(effect, game, Filters.race(Race.URUK_HAI)) && PlayConditions.canUseShadowCardDuringPhase(game.getGameState(), null, self, 0) && PlayConditions.canExert(self, game.getGameState(), game.getModifiersQuerying(), self)) { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/shire/Card3_110.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/shire/Card3_110.java index d390880b6..21b1e8ba6 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/shire/Card3_110.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/shire/Card3_110.java @@ -12,7 +12,6 @@ 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.effects.PreventEffect; -import com.gempukku.lotro.logic.timing.Action; import com.gempukku.lotro.logic.timing.Effect; import com.gempukku.lotro.logic.timing.EffectResult; @@ -37,7 +36,7 @@ public class Card3_110 extends AbstractAlly { } @Override - public List getOptionalBeforeActions(String playerId, LotroGame game, Effect effect, PhysicalCard self) { + public List getOptionalInPlayBeforeActions(String playerId, LotroGame game, Effect effect, PhysicalCard self) { if (effect.getType() == EffectResult.Type.ADD_BURDEN && PlayConditions.canExert(self, game.getGameState(), game.getModifiersQuerying(), self)) { final AddBurdenEffect addBurdenEffect = (AddBurdenEffect) effect; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/shire/Card3_114.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/shire/Card3_114.java index 3fc5dbc85..df46b30f0 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/shire/Card3_114.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/shire/Card3_114.java @@ -9,7 +9,6 @@ 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.effects.AddTwilightEffect; -import com.gempukku.lotro.logic.timing.Action; import com.gempukku.lotro.logic.timing.Effect; import com.gempukku.lotro.logic.timing.EffectResult; import com.gempukku.lotro.logic.timing.UnrespondableEffect; @@ -33,7 +32,7 @@ public class Card3_114 extends AbstractPermanent { } @Override - public List getOptionalBeforeActions(String playerId, LotroGame game, Effect effect, PhysicalCard self) { + public List getOptionalInPlayBeforeActions(String playerId, LotroGame game, Effect effect, PhysicalCard self) { if (effect.getType() == EffectResult.Type.ADD_TWILIGHT && PlayConditions.canExert(self, game.getGameState(), game.getModifiersQuerying(), Filters.race(Race.HOBBIT), Filters.type(CardType.ALLY))) { final AddTwilightEffect addTwilightEffect = (AddTwilightEffect) effect; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/dunland/Card4_019.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/dunland/Card4_019.java index 606c5f76d..febdb9362 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/dunland/Card4_019.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/dunland/Card4_019.java @@ -15,7 +15,6 @@ import com.gempukku.lotro.logic.effects.ChooseActiveCardEffect; import com.gempukku.lotro.logic.effects.DiscardCardsFromPlayEffect; import com.gempukku.lotro.logic.effects.DrawCardEffect; import com.gempukku.lotro.logic.effects.WoundCharactersEffect; -import com.gempukku.lotro.logic.timing.Action; import com.gempukku.lotro.logic.timing.Effect; import com.gempukku.lotro.logic.timing.EffectResult; @@ -50,7 +49,7 @@ public class Card4_019 extends AbstractPermanent { } @Override - public List getOptionalBeforeActions(String playerId, LotroGame game, Effect effect, PhysicalCard self) { + public List getOptionalInPlayBeforeActions(String playerId, LotroGame game, Effect effect, PhysicalCard self) { if (effect.getType() == EffectResult.Type.WOUND) { final WoundCharactersEffect woundEffect = (WoundCharactersEffect) effect; Collection woundedCharacters = woundEffect.getAffectedCardsMinusPrevented(game); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/dunland/Card4_040.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/dunland/Card4_040.java index f735b2d70..051594f54 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/dunland/Card4_040.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/dunland/Card4_040.java @@ -11,7 +11,6 @@ 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.timing.EffectResult; import java.util.Collections; @@ -35,7 +34,7 @@ public class Card4_040 extends AbstractMinion { } @Override - public List getOptionalAfterActions(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { + public List getOptionalInPlayAfterActions(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { if (PlayConditions.winsSkirmish(game.getGameState(), game.getModifiersQuerying(), effectResult, Filters.and(Filters.not(Filters.sameCard(self)), Filters.culture(Culture.DUNLAND), Filters.race(Race.MAN))) && PlayConditions.canExert(self, game.getGameState(), game.getModifiersQuerying(), self)) { ActivateCardAction action = new ActivateCardAction(self); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/gandalf/Card4_103.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/gandalf/Card4_103.java index 1ec33b5ac..ff327c8c2 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/gandalf/Card4_103.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/gandalf/Card4_103.java @@ -40,7 +40,7 @@ public class Card4_103 extends AbstractAlly { } @Override - public List getOptionalBeforeActions(String playerId, LotroGame game, Effect effect, final PhysicalCard self) { + public List getOptionalInPlayBeforeActions(String playerId, LotroGame game, Effect effect, final PhysicalCard self) { if (effect.getType() == EffectResult.Type.DISCARD_FROM_PLAY && PlayConditions.canUseFPCardDuringPhase(game.getGameState(), null, self)) { DiscardCardsFromPlayEffect discardEffect = (DiscardCardsFromPlayEffect) effect; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_186.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_186.java index f9425772a..564b45a9b 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_186.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_186.java @@ -13,7 +13,6 @@ 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.modifiers.Modifier; -import com.gempukku.lotro.logic.timing.Action; import com.gempukku.lotro.logic.timing.EffectResult; import com.gempukku.lotro.logic.timing.results.KillResult; @@ -46,7 +45,7 @@ public class Card4_186 extends AbstractMinion { } @Override - public List getOptionalAfterActions(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { + public List getOptionalInPlayAfterActions(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { if (effectResult.getType() == EffectResult.Type.KILL && PlayConditions.canUseShadowCardDuringPhase(game.getGameState(), null, self, 0) && PlayConditions.canExert(self, game, Filters.sameCard(self))) { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_188.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_188.java index 12b75c304..ebb823198 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_188.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_188.java @@ -15,7 +15,6 @@ import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.actions.ActivateCardAction; import com.gempukku.lotro.logic.effects.ChooseActiveCardEffect; import com.gempukku.lotro.logic.modifiers.Modifier; -import com.gempukku.lotro.logic.timing.Action; import com.gempukku.lotro.logic.timing.EffectResult; import com.gempukku.lotro.logic.timing.results.KillResult; @@ -48,7 +47,7 @@ public class Card4_188 extends AbstractMinion { } @Override - public List getOptionalAfterActions(final String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { + public List getOptionalInPlayAfterActions(final String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { if (effectResult.getType() == EffectResult.Type.KILL && PlayConditions.canUseShadowCardDuringPhase(game.getGameState(), null, self, 0) && PlayConditions.canExert(self, game, 2, Filters.sameCard(self))) { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_190.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_190.java index 520a8e2b2..9ff0d129c 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_190.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_190.java @@ -13,7 +13,6 @@ import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.actions.ActivateCardAction; import com.gempukku.lotro.logic.effects.ChooseAndWoundCharactersEffect; import com.gempukku.lotro.logic.modifiers.Modifier; -import com.gempukku.lotro.logic.timing.Action; import com.gempukku.lotro.logic.timing.EffectResult; import com.gempukku.lotro.logic.timing.results.KillResult; @@ -46,7 +45,7 @@ public class Card4_190 extends AbstractMinion { } @Override - public List getOptionalAfterActions(final String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { + public List getOptionalInPlayAfterActions(final String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { if (effectResult.getType() == EffectResult.Type.KILL && PlayConditions.canUseShadowCardDuringPhase(game.getGameState(), null, self, 0) && PlayConditions.canExert(self, game, Filters.sameCard(self))) { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/rohan/Card4_264.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/rohan/Card4_264.java index 1319936ac..be5c4d3fc 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/rohan/Card4_264.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/rohan/Card4_264.java @@ -13,7 +13,6 @@ 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.effects.PreventEffect; -import com.gempukku.lotro.logic.timing.Action; import com.gempukku.lotro.logic.timing.Effect; import com.gempukku.lotro.logic.timing.EffectResult; @@ -37,7 +36,7 @@ public class Card4_264 extends AbstractCompanion { } @Override - public List getOptionalBeforeActions(String playerId, LotroGame game, Effect effect, PhysicalCard self) { + public List getOptionalInPlayBeforeActions(String playerId, LotroGame game, Effect effect, PhysicalCard self) { if (effect.getType() == EffectResult.Type.TAKE_CONTROL_OF_A_SITE) { TakeControlOfASiteEffect takeControlEffect = (TakeControlOfASiteEffect) effect; if (!takeControlEffect.isPrevented() diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/rohan/Card4_270.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/rohan/Card4_270.java index 16c28998a..e413c0c37 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/rohan/Card4_270.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/rohan/Card4_270.java @@ -15,7 +15,6 @@ import com.gempukku.lotro.logic.actions.ActivateCardAction; import com.gempukku.lotro.logic.effects.AddTwilightEffect; import com.gempukku.lotro.logic.effects.ChooseActiveCardEffect; import com.gempukku.lotro.logic.effects.WoundCharactersEffect; -import com.gempukku.lotro.logic.timing.Action; import com.gempukku.lotro.logic.timing.Effect; import java.util.Collections; @@ -41,7 +40,7 @@ public class Card4_270 extends AbstractCompanion { } @Override - public List getOptionalBeforeActions(String playerId, LotroGame game, Effect effect, PhysicalCard self) { + public List getOptionalInPlayBeforeActions(String playerId, LotroGame game, Effect effect, PhysicalCard self) { if (PlayConditions.isGettingWounded(effect, game, Filters.unboundCompanion()) && PlayConditions.canExert(self, game, Filters.sameCard(self))) { final WoundCharactersEffect woundEffects = (WoundCharactersEffect) effect; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/rohan/Card4_271.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/rohan/Card4_271.java index 66854ab00..e4a0d5f44 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/rohan/Card4_271.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/rohan/Card4_271.java @@ -13,7 +13,6 @@ 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.effects.WoundCharactersEffect; -import com.gempukku.lotro.logic.timing.Action; import com.gempukku.lotro.logic.timing.Effect; import java.util.Collections; @@ -39,7 +38,7 @@ public class Card4_271 extends AbstractCompanion { } @Override - public List getOptionalBeforeActions(String playerId, LotroGame game, Effect effect, PhysicalCard self) { + public List getOptionalInPlayBeforeActions(String playerId, LotroGame game, Effect effect, PhysicalCard self) { if (PlayConditions.isGettingWounded(effect, game, Filters.sameCard(self)) && Filters.exhausted().accepts(game.getGameState(), game.getModifiersQuerying(), self) && game.getGameState().getHand(playerId).size() >= 2) {