From 599f40c2387b6df37d27a6bba12061a0160159d2 Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Mon, 10 Oct 2011 19:19:59 +0000 Subject: [PATCH] "Saruman's Staff" --- .../lotro/cards/set1/wraith/Card1_236.java | 2 +- .../lotro/cards/set4/dunland/Card4_015.java | 18 ++++++++--------- .../lotro/cards/set4/dunland/Card4_018.java | 20 +++++++++---------- 3 files changed, 18 insertions(+), 22 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_236.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_236.java index 7c2852a83..ae86e0e06 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_236.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_236.java @@ -37,7 +37,7 @@ public class Card1_236 extends AbstractMinion { if (PlayConditions.canUseShadowCardDuringPhase(game.getGameState(), Phase.ASSIGNMENT, self, 0) && game.getGameState().getBurdens() >= 4) { final ActivateCardAction action = new ActivateCardAction(self, Keyword.ASSIGNMENT); - if (Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Filters.sameCard(self), Filters.notAssigned(), Filters.canBeAssignedToSkirmish(Side.SHADOW))) { + if (Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Filters.sameCard(self), Filters.canBeAssignedToSkirmish(Side.SHADOW))) { action.appendEffect( new ChooseActiveCardEffect(self, playerId, "Choose a companion (except the Ring-Bearer", Filters.type(CardType.COMPANION), Filters.not(Filters.keyword(Keyword.RING_BEARER)), Filters.canBeAssignedToSkirmish(Side.SHADOW)) { @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/dunland/Card4_015.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/dunland/Card4_015.java index 4b4fba56c..806733258 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/dunland/Card4_015.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/dunland/Card4_015.java @@ -50,16 +50,14 @@ public class Card4_015 extends AbstractMinion { if (PlayConditions.canUseShadowCardDuringPhase(game.getGameState(), Phase.ASSIGNMENT, self, 0) && Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Filters.type(CardType.ALLY), Filters.canBeAssignedToSkirmish(Side.SHADOW))) { final ActivateCardAction action = new ActivateCardAction(self, Keyword.ASSIGNMENT); - if (Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Filters.sameCard(self), Filters.notAssigned())) { - action.appendEffect( - new ChooseActiveCardEffect(self, playerId, "Choose an ally", Filters.type(CardType.ALLY), Filters.canBeAssignedToSkirmish(Side.SHADOW)) { - @Override - protected void cardSelected(PhysicalCard ally) { - action.appendEffect( - new AssignmentEffect(playerId, ally, Collections.singletonList(self), "Dunlending Ravager effect")); - } - }); - } + action.appendEffect( + new ChooseActiveCardEffect(self, playerId, "Choose an ally", Filters.type(CardType.ALLY), Filters.canBeAssignedToSkirmish(Side.SHADOW)) { + @Override + protected void cardSelected(PhysicalCard ally) { + action.appendEffect( + new AssignmentEffect(playerId, ally, Collections.singletonList(self), "Dunlending Ravager effect")); + } + }); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/dunland/Card4_018.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/dunland/Card4_018.java index 0a726ec89..4eff47372 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/dunland/Card4_018.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/dunland/Card4_018.java @@ -34,18 +34,16 @@ public class Card4_018 extends AbstractMinion { @Override protected List getExtraPhaseActions(final String playerId, LotroGame game, final PhysicalCard self) { if (PlayConditions.canUseShadowCardDuringPhase(game.getGameState(), Phase.ASSIGNMENT, self, 0) - && Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Filters.type(CardType.ALLY))) { + && Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Filters.type(CardType.ALLY), Filters.canBeAssignedToSkirmish(Side.SHADOW))) { final ActivateCardAction action = new ActivateCardAction(self, Keyword.ASSIGNMENT); - if (Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Filters.sameCard(self), Filters.notAssigned())) { - action.appendEffect( - new ChooseActiveCardEffect(self, playerId, "Choose an ally", Filters.type(CardType.ALLY), Filters.canBeAssignedToSkirmish(Side.SHADOW)) { - @Override - protected void cardSelected(PhysicalCard ally) { - action.appendEffect( - new AssignmentEffect(playerId, ally, Collections.singletonList(self), "Dunlending Ravager effect")); - } - }); - } + action.appendEffect( + new ChooseActiveCardEffect(self, playerId, "Choose an ally", Filters.type(CardType.ALLY), Filters.canBeAssignedToSkirmish(Side.SHADOW)) { + @Override + protected void cardSelected(PhysicalCard ally) { + action.appendEffect( + new AssignmentEffect(playerId, ally, Collections.singletonList(self), "Dunlending Ravager effect")); + } + }); return Collections.singletonList(action); } return null;