From 4e0c0e691e54a2e0f5ba6acd512b133244c55603 Mon Sep 17 00:00:00 2001 From: marcins78 Date: Tue, 19 Mar 2013 11:17:38 +0000 Subject: [PATCH] 20_346 --- .../src/main/web/js/gemp-019/set20.js | 2 +- .../gempukku/lotro/cards/set20/rohan/Card20_346.java | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-019/set20.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-019/set20.js index 5c3f9e302..cd800a50a 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-019/set20.js +++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-019/set20.js @@ -344,7 +344,7 @@ var set20 = { '20_343': 'http://lotrtcg.org/coreset/rohan/snowmaners.png', '20_344': 'http://lotrtcg.org/coreset/rohan/theodenkotgh.png', '20_345': 'http://lotrtcg.org/coreset/rohan/theodenris.png', - '20_346': 'http://lotrtcg.org/coreset/rohan/tothesmithy.png', + '20_346': 'http://lotrtcg.org/coreset/rohan/tothesmithy(r1).png', '20_347': 'http://lotrtcg.org/coreset/rohan/towhateverend.png', '20_348': 'http://lotrtcg.org/coreset/rohan/wallneverbreached.png', '20_349': 'http://lotrtcg.org/coreset/sauron/baraddurcaptain.png', diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/rohan/Card20_346.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/rohan/Card20_346.java index 6a8d0214b..298d375d0 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/rohan/Card20_346.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/rohan/Card20_346.java @@ -4,18 +4,20 @@ import com.gempukku.lotro.cards.AbstractEvent; import com.gempukku.lotro.cards.PlayConditions; import com.gempukku.lotro.cards.actions.PlayEventAction; import com.gempukku.lotro.cards.effects.choose.ChooseAndPlayCardFromDiscardEffect; -import com.gempukku.lotro.common.CardType; import com.gempukku.lotro.common.Culture; import com.gempukku.lotro.common.Phase; +import com.gempukku.lotro.common.PossessionClass; import com.gempukku.lotro.common.Side; +import com.gempukku.lotro.filters.Filters; import com.gempukku.lotro.game.PhysicalCard; import com.gempukku.lotro.game.state.LotroGame; /** * 0 * To the Smithy! - * Rohan Event • Skirmish - * Play a [Rohan] possession from your discard pile. + * Event • Skirmish + * Play a [Rohan] weapon or [Rohan] mount from your discard pile. + * http://lotrtcg.org/coreset/rohan/tothesmithy(r1).png */ public class Card20_346 extends AbstractEvent { public Card20_346() { @@ -25,14 +27,14 @@ public class Card20_346 extends AbstractEvent { @Override public boolean checkPlayRequirements(String playerId, LotroGame game, PhysicalCard self, int withTwilightRemoved, int twilightModifier, boolean ignoreRoamingPenalty, boolean ignoreCheckingDeadPile) { return super.checkPlayRequirements(playerId, game, self, withTwilightRemoved, twilightModifier, ignoreRoamingPenalty, ignoreCheckingDeadPile) - && PlayConditions.canPlayFromDiscard(playerId, game, Culture.ROHAN, CardType.POSSESSION); + && PlayConditions.canPlayFromDiscard(playerId, game, Culture.ROHAN, Filters.or(Filters.weapon, PossessionClass.MOUNT)); } @Override public PlayEventAction getPlayCardAction(String playerId, LotroGame game, PhysicalCard self, int twilightModifier, boolean ignoreRoamingPenalty) { PlayEventAction action = new PlayEventAction(self); action.appendEffect( - new ChooseAndPlayCardFromDiscardEffect(playerId, game, Culture.ROHAN, CardType.POSSESSION)); + new ChooseAndPlayCardFromDiscardEffect(playerId, game, Culture.ROHAN, Filters.or(Filters.weapon, PossessionClass.MOUNT))); return action; } }