diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gandalf/Card30_023.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gandalf/Card30_023.java index ee5a1be40..94c558443 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gandalf/Card30_023.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gandalf/Card30_023.java @@ -6,6 +6,7 @@ import com.gempukku.lotro.cards.effects.ChoiceEffect; import com.gempukku.lotro.cards.effects.choose.ChooseAndPlayCardFromDeckEffect; import com.gempukku.lotro.cards.effects.choose.ChooseAndPlayCardFromDiscardEffect; import com.gempukku.lotro.common.*; +import com.gempukku.lotro.filters.Filter; import com.gempukku.lotro.filters.Filters; import com.gempukku.lotro.game.PhysicalCard; import com.gempukku.lotro.game.state.LotroGame; @@ -26,25 +27,29 @@ public class Card30_023 extends AbstractEvent { public Card30_023() { super(Side.FREE_PEOPLE, 1, Culture.GANDALF, "A Wizard Is Never Late", Phase.FELLOWSHIP); } - + @Override public PlayEventAction getPlayCardAction(final String playerId, final LotroGame game, PhysicalCard self, int twilightModifier, boolean ignoreRoamingPenalty) { - PlayEventAction action = new PlayEventAction(self); - List possibleCosts = new LinkedList(); - possibleCosts.add( - new ChooseAndPlayCardFromDeckEffect(playerId, Filters.or(Filters.gandalf, Filters.and(Filters.not(Race.DWARF), CardType.ALLY))) { + Filter filter = Filters.or(Filters.gandalf, Filters.and(CardType.ALLY, Filters.not(Race.DWARF))); + + PlayEventAction action = new PlayEventAction(self); + List possibleEffects = new LinkedList(); + possibleEffects.add( + new ChooseAndPlayCardFromDeckEffect(playerId, filter) { @Override public String getText(LotroGame game) { - return "Play Gandalf or an ally from your deck"; + return "Play character from draw deck"; } }); - possibleCosts.add( - new ChooseAndPlayCardFromDiscardEffect(playerId, game, Filters.or(Filters.gandalf, Filters.and(Filters.not(Race.DWARF), CardType.ALLY))) { + possibleEffects.add( + new ChooseAndPlayCardFromDiscardEffect(playerId, game, filter) { @Override public String getText(LotroGame game) { - return "Play Gandalf or an ally from your discard pile"; + return "Play character from discard pile"; } - }); - return action; + }); + action.appendEffect( + new ChoiceEffect(action, playerId, possibleEffects)); + return action; } }