From 244f50f432c04a765342c3ca707fa32f876d7b9a Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Thu, 17 Nov 2011 13:52:22 +0000 Subject: [PATCH] Simplifying PlayConditions --- .../com/gempukku/lotro/cards/PlayConditions.java | 14 +++++--------- .../lotro/cards/set1/dwarven/Card1_010.java | 2 +- .../gempukku/lotro/cards/set1/elven/Card1_061.java | 2 +- .../lotro/cards/set1/isengard/Card1_122.java | 2 +- .../lotro/cards/set1/isengard/Card1_130.java | 2 +- .../lotro/cards/set1/isengard/Card1_154.java | 2 +- .../gempukku/lotro/cards/set1/moria/Card1_173.java | 2 +- .../gempukku/lotro/cards/set1/moria/Card1_178.java | 2 +- .../gempukku/lotro/cards/set1/moria/Card1_179.java | 2 +- .../gempukku/lotro/cards/set1/moria/Card1_180.java | 2 +- .../gempukku/lotro/cards/set1/moria/Card1_181.java | 2 +- .../gempukku/lotro/cards/set1/moria/Card1_185.java | 2 +- .../gempukku/lotro/cards/set1/moria/Card1_191.java | 2 +- .../lotro/cards/set1/sauron/Card1_258.java | 2 +- .../lotro/cards/set1/sauron/Card1_268.java | 2 +- .../gempukku/lotro/cards/set1/shire/Card1_300.java | 2 +- .../gempukku/lotro/cards/set1/shire/Card1_305.java | 2 +- .../gempukku/lotro/cards/set1/shire/Card1_307.java | 2 +- .../gempukku/lotro/cards/set1/site/Card1_334.java | 2 +- .../gempukku/lotro/cards/set1/site/Card1_350.java | 2 +- .../lotro/cards/set1/wraith/Card1_219.java | 2 +- .../lotro/cards/set1/wraith/Card1_234.java | 2 +- .../lotro/cards/set2/gondor/Card2_031.java | 2 +- .../gempukku/lotro/cards/set2/moria/Card2_058.java | 2 +- .../gempukku/lotro/cards/set2/moria/Card2_061.java | 2 +- .../gempukku/lotro/cards/set2/moria/Card2_063.java | 2 +- .../gempukku/lotro/cards/set2/moria/Card2_064.java | 2 +- .../gempukku/lotro/cards/set2/moria/Card2_066.java | 2 +- .../gempukku/lotro/cards/set2/site/Card2_118.java | 2 +- .../lotro/cards/set2/wraith/Card2_082.java | 2 +- .../lotro/cards/set3/dwarven/Card3_003.java | 2 +- .../lotro/cards/set3/isengard/Card3_055.java | 2 +- .../lotro/cards/set3/isengard/Card3_075.java | 2 +- .../lotro/cards/set4/dunland/Card4_019.java | 2 +- .../lotro/cards/set4/dwarven/Card4_044.java | 2 +- .../lotro/cards/set4/dwarven/Card4_046.java | 2 +- .../lotro/cards/set4/gandalf/Card4_094.java | 2 +- .../lotro/cards/set4/gandalf/Card4_100.java | 2 +- .../lotro/cards/set4/isengard/Card4_173.java | 2 +- 39 files changed, 43 insertions(+), 47 deletions(-) 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 28374b119..147c72fc9 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 @@ -487,14 +487,6 @@ public class PlayConditions { return false; } - public static boolean played(GameState gameState, ModifiersQuerying modifiersQuerying, EffectResult effectResult, Filter filter) { - if (effectResult.getType() == EffectResult.Type.PLAY) { - PhysicalCard playedCard = ((PlayCardResult) effectResult).getPlayedCard(); - return filter.accepts(gameState, modifiersQuerying, playedCard); - } - return false; - } - public static boolean activated(LotroGame game, EffectResult effectResult, Filterable... filters) { if (effectResult.getType() == EffectResult.Type.ACTIVATE) { PhysicalCard source = ((ActivateCardResult) effectResult).getSource(); @@ -504,7 +496,11 @@ public class PlayConditions { } public static boolean played(LotroGame game, EffectResult effectResult, Filterable... filters) { - return played(game.getGameState(), game.getModifiersQuerying(), effectResult, Filters.and(filters)); + if (effectResult.getType() == EffectResult.Type.PLAY) { + PhysicalCard playedCard = ((PlayCardResult) effectResult).getPlayedCard(); + return Filters.and(filters).accepts(game.getGameState(), game.getModifiersQuerying(), playedCard); + } + return false; } public static boolean movesTo(LotroGame game, EffectResult effectResult, Filterable... filters) { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_010.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_010.java index 9dcc8dae7..af83d3e6e 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_010.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_010.java @@ -35,7 +35,7 @@ public class Card1_010 extends AbstractAttachable { @Override public List getRequiredAfterTriggers(LotroGame game, EffectResult effectResult, PhysicalCard self) { - if (PlayConditions.played(game.getGameState(), game.getModifiersQuerying(), effectResult, Filters.sameCard(self))) { + if (PlayConditions.played(game, effectResult, Filters.sameCard(self))) { RequiredTriggerAction action = new RequiredTriggerAction(self); action.appendEffect(new HealCharactersEffect(self, self.getAttachedTo())); action.appendEffect(new HealCharactersEffect(self, self.getAttachedTo())); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_061.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_061.java index a44e6b4a0..3696ae991 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_061.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_061.java @@ -28,7 +28,7 @@ public class Card1_061 extends AbstractPermanent { @Override public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { - if (PlayConditions.played(game.getGameState(), game.getModifiersQuerying(), effectResult, Filters.and(Culture.ELVEN, Keyword.TALE))) { + if (PlayConditions.played(game, effectResult, Filters.and(Culture.ELVEN, Keyword.TALE))) { OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendEffect(new RemoveBurdenEffect(self)); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_122.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_122.java index e8faab26a..7a4cc835e 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_122.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_122.java @@ -38,7 +38,7 @@ public class Card1_122 extends AbstractResponseOldEvent { @Override public List getOptionalAfterActions(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { - if (PlayConditions.played(game.getGameState(), game.getModifiersQuerying(), effectResult, Filters.and(Race.URUK_HAI, Filters.owner(playerId))) + if (PlayConditions.played(game, effectResult, Filters.and(Race.URUK_HAI, Filters.owner(playerId))) && checkPlayRequirements(playerId, game, self, 0, false)) { final PlayEventAction action = new PlayEventAction(self); String playedCardName = ((PlayCardResult) effectResult).getPlayedCard().getBlueprint().getName(); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_130.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_130.java index 7fd3bd53d..69d2ddc6d 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_130.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_130.java @@ -28,7 +28,7 @@ public class Card1_130 extends AbstractPermanent { @Override public List getRequiredAfterTriggers(LotroGame game, EffectResult effectResult, PhysicalCard self) { - if (PlayConditions.played(game.getGameState(), game.getModifiersQuerying(), effectResult, Filters.and(Keyword.WEATHER, CardType.CONDITION, Filters.owner(self.getOwner())))) { + if (PlayConditions.played(game, effectResult, Filters.and(Keyword.WEATHER, CardType.CONDITION, Filters.owner(self.getOwner())))) { final RequiredTriggerAction action = new RequiredTriggerAction(self); action.appendEffect( new ChooseAndExertCharactersEffect(action, self.getOwner(), 1, 1, Culture.GANDALF, Filters.or(CardType.COMPANION, CardType.ALLY))); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_154.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_154.java index 75d8053de..d19c15666 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_154.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_154.java @@ -35,7 +35,7 @@ public class Card1_154 extends AbstractMinion { @Override public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { - if (PlayConditions.played(game.getGameState(), game.getModifiersQuerying(), effectResult, Filters.sameCard(self))) { + if (PlayConditions.played(game, effectResult, Filters.sameCard(self))) { OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendEffect(new DiscardTopCardFromDeckEffect(self, game.getGameState().getCurrentPlayerId(), true)); return Collections.singletonList(action); 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 d584985cf..df10bc6d0 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 @@ -36,7 +36,7 @@ public class Card1_173 extends AbstractPermanent { @Override public List getRequiredAfterTriggers(LotroGame game, EffectResult effectResult, PhysicalCard self) { - if (PlayConditions.played(game.getGameState(), game.getModifiersQuerying(), effectResult, Filters.and(Filters.owner(self.getOwner()), Culture.MORIA, Filters.weapon))) { + if (PlayConditions.played(game, effectResult, Filters.and(Filters.owner(self.getOwner()), Culture.MORIA, Filters.weapon))) { RequiredTriggerAction action = new RequiredTriggerAction(self); action.appendEffect(new AddTwilightEffect(self, 1)); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_178.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_178.java index c071577ff..b76bf35d8 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_178.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_178.java @@ -32,7 +32,7 @@ public class Card1_178 extends AbstractMinion { @Override public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { - if (PlayConditions.played(game.getGameState(), game.getModifiersQuerying(), effectResult, Filters.sameCard(self))) { + if (PlayConditions.played(game, effectResult, Filters.sameCard(self))) { OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendEffect(new AddTwilightEffect(self, 2)); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_179.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_179.java index 6995e8328..ca45e08cf 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_179.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_179.java @@ -38,7 +38,7 @@ public class Card1_179 extends AbstractMinion { public List getOptionalAfterTriggers(final String playerId, final LotroGame game, EffectResult effectResult, final PhysicalCard self) { final Filter additionalAttachmentFilter = Filters.and(Filters.owner(self.getOwner()), Culture.MORIA, Race.ORC); - if (PlayConditions.played(game.getGameState(), game.getModifiersQuerying(), effectResult, Filters.sameCard(self)) + if (PlayConditions.played(game, effectResult, Filters.sameCard(self)) && PlayConditions.canPlayFromDiscard(playerId, game, Filters.weapon, ExtraFilters.attachableTo(game, additionalAttachmentFilter))) { OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendEffect( diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_180.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_180.java index 70846fa96..8beaf3716 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_180.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_180.java @@ -42,7 +42,7 @@ public class Card1_180 extends AbstractAttachable { @Override public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { - if (PlayConditions.played(game.getGameState(), game.getModifiersQuerying(), effectResult, Filters.sameCard(self))) { + if (PlayConditions.played(game, effectResult, Filters.sameCard(self))) { OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendEffect(new DrawCardEffect(playerId, 1)); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_181.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_181.java index 3fed0b023..8cbdc5858 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_181.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_181.java @@ -34,7 +34,7 @@ public class Card1_181 extends AbstractMinion { @Override public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { - if (PlayConditions.played(game.getGameState(), game.getModifiersQuerying(), effectResult, Filters.sameCard(self))) { + if (PlayConditions.played(game, effectResult, Filters.sameCard(self))) { final OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendEffect( new ChooseArbitraryCardsEffect(playerId, "Choose MORIA Orc", game.getGameState().getDiscard(playerId), Filters.and(Culture.MORIA, Race.ORC), 1, 1) { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_185.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_185.java index a28b7611f..d9aaa6e5f 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_185.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_185.java @@ -34,7 +34,7 @@ public class Card1_185 extends AbstractMinion { @Override public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, final PhysicalCard self) { - if (PlayConditions.played(game.getGameState(), game.getModifiersQuerying(), effectResult, Filters.sameCard(self))) { + if (PlayConditions.played(game, effectResult, Filters.sameCard(self))) { final OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendEffect( new ChooseActiveCardEffect(self, playerId, "Choose DWARVEN ally or DWARVEN condition", Culture.DWARVEN, Filters.or(CardType.ALLY, CardType.CONDITION)) { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_191.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_191.java index fe4776fdb..36a7e96b3 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_191.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_191.java @@ -32,7 +32,7 @@ public class Card1_191 extends AbstractMinion { @Override public List getRequiredAfterTriggers(LotroGame game, EffectResult effectResult, PhysicalCard self) { - if (PlayConditions.played(game.getGameState(), game.getModifiersQuerying(), effectResult, Filters.sameCard(self)) + if (PlayConditions.played(game, effectResult, Filters.sameCard(self)) && Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Race.ELF)) { RequiredTriggerAction action = new RequiredTriggerAction(self); action.appendEffect(new AddTwilightEffect(self, 2)); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_258.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_258.java index 18c92fd8d..e7a4bed72 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_258.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_258.java @@ -34,7 +34,7 @@ public class Card1_258 extends AbstractMinion { @Override public List getOptionalAfterTriggers(final String playerId, LotroGame game, EffectResult effectResult, final PhysicalCard self) { - if (PlayConditions.played(game.getGameState(), game.getModifiersQuerying(), effectResult, Filters.sameCard(self))) { + if (PlayConditions.played(game, effectResult, Filters.sameCard(self))) { final OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendEffect( new ChooseArbitraryCardsEffect(playerId, "Choose up to 2 WRAITH cards", game.getGameState().getDiscard(playerId), Culture.WRAITH, 0, 2) { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_268.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_268.java index 00731234b..66e994cda 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_268.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_268.java @@ -32,7 +32,7 @@ public class Card1_268 extends AbstractMinion { @Override public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { - if (PlayConditions.played(game.getGameState(), game.getModifiersQuerying(), effectResult, Filters.sameCard(self))) { + if (PlayConditions.played(game, effectResult, Filters.sameCard(self))) { OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendEffect( new DiscardCardAtRandomFromHandEffect(self, game.getGameState().getCurrentPlayerId(), true)); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_300.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_300.java index 4a80cd347..f8a488b54 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_300.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_300.java @@ -30,7 +30,7 @@ public class Card1_300 extends AbstractPermanent { @Override public List getOptionalAfterTriggers(final String playerId, LotroGame game, EffectResult effectResult, final PhysicalCard self) { - if (PlayConditions.played(game.getGameState(), game.getModifiersQuerying(), effectResult, Filters.sameCard(self))) { + if (PlayConditions.played(game, effectResult, Filters.sameCard(self))) { final OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendEffect( new ChooseAndDiscardCardsFromHandEffect(action, playerId, false, 0, 2, Filters.any)); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_305.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_305.java index bdd1d8444..7326cbe0b 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_305.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_305.java @@ -29,7 +29,7 @@ public class Card1_305 extends AbstractPermanent { @Override public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { - if (PlayConditions.played(game.getGameState(), game.getModifiersQuerying(), effectResult, Filters.sameCard(self))) { + if (PlayConditions.played(game, effectResult, Filters.sameCard(self))) { OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendEffect( new DrawCardEffect(playerId, 1)); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_307.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_307.java index d21c62fd1..f6b0e23b1 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_307.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_307.java @@ -39,7 +39,7 @@ public class Card1_307 extends AbstractCompanion { @Override public List getRequiredAfterTriggers(LotroGame game, EffectResult effectResult, final PhysicalCard self) { - if (PlayConditions.played(game.getGameState(), game.getModifiersQuerying(), effectResult, Filters.sameCard(self))) { + if (PlayConditions.played(game, effectResult, Filters.sameCard(self))) { final RequiredTriggerAction action = new RequiredTriggerAction(self); List possibleEffects = new LinkedList(); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_334.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_334.java index f05742ff5..9f791e4dd 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_334.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_334.java @@ -31,7 +31,7 @@ public class Card1_334 extends AbstractSite { @Override public List getRequiredAfterTriggers(LotroGame game, EffectResult effectResult, PhysicalCard self) { - if (PlayConditions.played(game.getGameState(), game.getModifiersQuerying(), effectResult, Filters.or(CardType.POSSESSION, CardType.ARTIFACT))) { + if (PlayConditions.played(game, effectResult, Filters.or(CardType.POSSESSION, CardType.ARTIFACT))) { PlayCardResult playCardResult = (PlayCardResult) effectResult; PhysicalCard attachedTo = playCardResult.getAttachedTo(); if (attachedTo != null && attachedTo.getBlueprint().getCardType() == CardType.COMPANION) { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_350.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_350.java index 40de1935d..660e73d53 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_350.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_350.java @@ -47,7 +47,7 @@ public class Card1_350 extends AbstractSite { @Override public List getRequiredAfterTriggers(LotroGame game, EffectResult effectResult, PhysicalCard self) { - if (PlayConditions.played(game.getGameState(), game.getModifiersQuerying(), effectResult, Filters.and(Culture.MORIA, Race.ORC))) + if (PlayConditions.played(game, effectResult, Filters.and(Culture.MORIA, Race.ORC))) self.storeData(new Object()); if (effectResult.getType() == EffectResult.Type.END_OF_TURN && self.getData() != null) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_219.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_219.java index 92e7af4fe..7848f9613 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_219.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_219.java @@ -30,7 +30,7 @@ public class Card1_219 extends AbstractPermanent { @Override public List getOptionalAfterTriggers(final String playerId, LotroGame game, EffectResult effectResult, final PhysicalCard self) { - if (PlayConditions.played(game.getGameState(), game.getModifiersQuerying(), effectResult, Filters.and(Filters.owner(self.getOwner()), Race.NAZGUL))) { + if (PlayConditions.played(game, effectResult, Filters.and(Filters.owner(self.getOwner()), Race.NAZGUL))) { final OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendEffect( new ChooseAndExertCharactersEffect(action, playerId, 1, 1, Race.HOBBIT, Filters.not(Keyword.RING_BEARER))); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_234.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_234.java index 65bf41fd0..d3e6fd7de 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_234.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_234.java @@ -33,7 +33,7 @@ public class Card1_234 extends AbstractMinion { @Override public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { - if (PlayConditions.played(game.getGameState(), game.getModifiersQuerying(), effectResult, Filters.sameCard(self)) + if (PlayConditions.played(game, effectResult, Filters.sameCard(self)) // You must be able to play a minion from discard to use this trigger && PlayConditions.canPlayFromDiscard(playerId, game, CardType.MINION)) { OptionalTriggerAction action = new OptionalTriggerAction(self); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/gondor/Card2_031.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/gondor/Card2_031.java index ba2218e6f..18443a944 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/gondor/Card2_031.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/gondor/Card2_031.java @@ -47,7 +47,7 @@ public class Card2_031 extends AbstractPermanent { @Override public List getRequiredAfterTriggers(LotroGame game, EffectResult effectResult, PhysicalCard self) { - if (PlayConditions.played(game.getGameState(), game.getModifiersQuerying(), effectResult, Filters.and(Culture.SAURON, CardType.MINION))) { + if (PlayConditions.played(game, effectResult, Filters.and(Culture.SAURON, CardType.MINION))) { RequiredTriggerAction action = new RequiredTriggerAction(self); action.appendEffect( new ExhaustCharacterEffect(self, action, ((PlayCardResult) effectResult).getPlayedCard())); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/moria/Card2_058.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/moria/Card2_058.java index 39b440bad..aacbe7853 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/moria/Card2_058.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/moria/Card2_058.java @@ -40,7 +40,7 @@ public class Card2_058 extends AbstractMinion { @Override public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { - if (PlayConditions.played(game.getGameState(), game.getModifiersQuerying(), effectResult, Filters.sameCard(self))) { + if (PlayConditions.played(game, effectResult, Filters.sameCard(self))) { OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendEffect( new ChooseAndPlayCardFromDeckEffect(playerId, Keyword.TENTACLE)); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/moria/Card2_061.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/moria/Card2_061.java index b3c6a6a5c..b14b7f4c9 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/moria/Card2_061.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/moria/Card2_061.java @@ -32,7 +32,7 @@ public class Card2_061 extends AbstractMinion { @Override public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { - if (PlayConditions.played(game.getGameState(), game.getModifiersQuerying(), effectResult, Filters.sameCard(self)) + if (PlayConditions.played(game, effectResult, Filters.sameCard(self)) && game.getGameState().getMoveCount() > 1) { OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendEffect( diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/moria/Card2_063.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/moria/Card2_063.java index 9a094d78f..9d5dfc95e 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/moria/Card2_063.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/moria/Card2_063.java @@ -33,7 +33,7 @@ public class Card2_063 extends AbstractMinion { @Override public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { - if (PlayConditions.played(game.getGameState(), game.getModifiersQuerying(), effectResult, Filters.sameCard(self))) { + if (PlayConditions.played(game, effectResult, Filters.sameCard(self))) { OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendEffect( new ChooseAndHealCharactersEffect(action, playerId, Culture.MORIA, CardType.MINION)); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/moria/Card2_064.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/moria/Card2_064.java index ba156c768..23ae9fbc5 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/moria/Card2_064.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/moria/Card2_064.java @@ -47,7 +47,7 @@ public class Card2_064 extends AbstractMinion { @Override public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { - if (PlayConditions.played(game.getGameState(), game.getModifiersQuerying(), effectResult, Filters.sameCard(self))) { + if (PlayConditions.played(game, effectResult, Filters.sameCard(self))) { OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendEffect( new ChooseAndDiscardCardsFromPlayEffect(action, playerId, 1, 1, Culture.ELVEN, CardType.CONDITION)); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/moria/Card2_066.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/moria/Card2_066.java index 589c904b9..88fbaf4e3 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/moria/Card2_066.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/moria/Card2_066.java @@ -41,7 +41,7 @@ public class Card2_066 extends AbstractMinion { @Override public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { - if (PlayConditions.played(game.getGameState(), game.getModifiersQuerying(), effectResult, Filters.sameCard(self))) { + if (PlayConditions.played(game, effectResult, Filters.sameCard(self))) { OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendEffect( new ChooseAndPlayCardFromDeckEffect(playerId, Filters.name("Watcher in the Water"))); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/site/Card2_118.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/site/Card2_118.java index 3f5177207..8d06b008b 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/site/Card2_118.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/site/Card2_118.java @@ -51,7 +51,7 @@ public class Card2_118 extends AbstractSite { @Override public List getRequiredAfterTriggers(LotroGame game, EffectResult effectResult, PhysicalCard self) { - if (PlayConditions.played(game.getGameState(), game.getModifiersQuerying(), effectResult, Filters.and(Culture.MORIA, Keyword.ARCHER)) + if (PlayConditions.played(game, effectResult, Filters.and(Culture.MORIA, Keyword.ARCHER)) && game.getGameState().getCurrentPhase() == Phase.SHADOW && game.getGameState().getCurrentSite() == self) self.storeData(new Object()); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/wraith/Card2_082.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/wraith/Card2_082.java index bf9d36785..916b0a909 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/wraith/Card2_082.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/wraith/Card2_082.java @@ -35,7 +35,7 @@ public class Card2_082 extends AbstractMinion { @Override public List getOptionalAfterTriggers(final String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { - if (PlayConditions.played(game.getGameState(), game.getModifiersQuerying(), effectResult, Filters.sameCard(self))) { + if (PlayConditions.played(game, effectResult, Filters.sameCard(self))) { final OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendEffect( new ChooseAndWoundCharactersEffect(action, playerId, 1, 1, CardType.ALLY)); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/dwarven/Card3_003.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/dwarven/Card3_003.java index aa902cec7..6ed00a882 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/dwarven/Card3_003.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/dwarven/Card3_003.java @@ -28,7 +28,7 @@ public class Card3_003 extends AbstractPermanent { @Override public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { - if (PlayConditions.played(game.getGameState(), game.getModifiersQuerying(), effectResult, Filters.and(Culture.DWARVEN, Keyword.TALE))) { + if (PlayConditions.played(game, effectResult, Filters.and(Culture.DWARVEN, Keyword.TALE))) { OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendEffect( new ChooseAndHealCharactersEffect(action, playerId, Race.DWARF, CardType.COMPANION)); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/isengard/Card3_055.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/isengard/Card3_055.java index 039642b38..8ba2c0ffb 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/isengard/Card3_055.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/isengard/Card3_055.java @@ -43,7 +43,7 @@ public class Card3_055 extends AbstractAttachable { @Override public List getRequiredAfterTriggers(LotroGame game, EffectResult effectResult, PhysicalCard self) { - if (PlayConditions.played(game.getGameState(), game.getModifiersQuerying(), effectResult, Filters.sameCard(self))) { + if (PlayConditions.played(game, effectResult, Filters.sameCard(self))) { RequiredTriggerAction action = new RequiredTriggerAction(self); action.appendEffect( new AddTwilightEffect(self, 1)); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/isengard/Card3_075.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/isengard/Card3_075.java index 75768941a..6ca29b7c5 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/isengard/Card3_075.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/isengard/Card3_075.java @@ -34,7 +34,7 @@ public class Card3_075 extends AbstractMinion { @Override public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { - if (PlayConditions.played(game.getGameState(), game.getModifiersQuerying(), effectResult, Filters.sameCard(self)) + if (PlayConditions.played(game, effectResult, Filters.sameCard(self)) && Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Filters.saruman)) { OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendEffect( 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 3e127899b..32b20386f 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 @@ -39,7 +39,7 @@ public class Card4_019 extends AbstractPermanent { @Override public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { - if (PlayConditions.played(game.getGameState(), game.getModifiersQuerying(), effectResult, Filters.sameCard(self))) { + if (PlayConditions.played(game, effectResult, Filters.sameCard(self))) { OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendEffect( new DrawCardEffect(playerId, 1)); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/dwarven/Card4_044.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/dwarven/Card4_044.java index 083aff636..546b4edf1 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/dwarven/Card4_044.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/dwarven/Card4_044.java @@ -35,7 +35,7 @@ public class Card4_044 extends AbstractPermanent { @Override public List getRequiredAfterTriggers(LotroGame game, EffectResult effectResult, final PhysicalCard self) { - if (PlayConditions.played(game.getGameState(), game.getModifiersQuerying(), effectResult, Filters.sameCard(self))) { + if (PlayConditions.played(game, effectResult, Filters.sameCard(self))) { final RequiredTriggerAction action = new RequiredTriggerAction(self); action.appendEffect( new ChooseCardsFromDiscardEffect(self.getOwner(), 1, 1, Filters.any) { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/dwarven/Card4_046.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/dwarven/Card4_046.java index 06d56c2ce..2a6cc1e6b 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/dwarven/Card4_046.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/dwarven/Card4_046.java @@ -38,7 +38,7 @@ public class Card4_046 extends AbstractPermanent { @Override public List getRequiredAfterTriggers(LotroGame game, EffectResult effectResult, PhysicalCard self) { - if (PlayConditions.played(game.getGameState(), game.getModifiersQuerying(), effectResult, Filters.sameCard(self))) { + if (PlayConditions.played(game, effectResult, Filters.sameCard(self))) { RequiredTriggerAction action = new RequiredTriggerAction(self); action.appendEffect( new StackTopCardsFromDeckEffect(self, self.getOwner(), 6, self)); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/gandalf/Card4_094.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/gandalf/Card4_094.java index c0985fe2f..3eb90481f 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/gandalf/Card4_094.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/gandalf/Card4_094.java @@ -66,7 +66,7 @@ public class Card4_094 extends AbstractAttachable { @Override public List getRequiredAfterTriggers(LotroGame game, EffectResult effectResult, PhysicalCard self) { - if (PlayConditions.played(game.getGameState(), game.getModifiersQuerying(), effectResult, Filters.sameCard(self))) { + if (PlayConditions.played(game, effectResult, Filters.sameCard(self))) { RequiredTriggerAction action = new RequiredTriggerAction(self); action.appendEffect( new DiscardCardsFromPlayEffect(self, Filters.and(Side.SHADOW, CardType.CONDITION, Filters.attachedTo(Filters.hasAttached(self))))); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/gandalf/Card4_100.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/gandalf/Card4_100.java index 137197f22..d8c406637 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/gandalf/Card4_100.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/gandalf/Card4_100.java @@ -48,7 +48,7 @@ public class Card4_100 extends AbstractAttachableFPPossession { @Override public List getRequiredAfterTriggers(LotroGame game, EffectResult effectResult, PhysicalCard self) { - if (PlayConditions.played(game.getGameState(), game.getModifiersQuerying(), effectResult, Filters.sameCard(self))) { + if (PlayConditions.played(game, effectResult, Filters.sameCard(self))) { RequiredTriggerAction action = new RequiredTriggerAction(self); action.appendEffect( new DiscardCardsFromPlayEffect(self, Filters.and(Filters.attachedTo(Filters.hasAttached(self)), PossessionClass.HAND_WEAPON))); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_173.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_173.java index e5521a6d5..6c7fec5c3 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_173.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_173.java @@ -70,7 +70,7 @@ public class Card4_173 extends AbstractMinion { @Override public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { - if (PlayConditions.played(game.getGameState(), game.getModifiersQuerying(), effectResult, Filters.sameCard(self))) { + if (PlayConditions.played(game, effectResult, Filters.sameCard(self))) { OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendEffect( new ChooseAndDiscardCardsFromPlayEffect(action, playerId, 1, 1, CardType.CONDITION));