From 09cf0589b49f90f6f7431c0d665c9985b778d386 Mon Sep 17 00:00:00 2001 From: marcins78 Date: Wed, 20 Nov 2013 17:31:36 +0000 Subject: [PATCH] Goblin Reclaimer --- .../src/main/web/js/gemp-019/set20.js | 2 +- .../lotro/cards/set20/moria/Card20_266.java | 17 +++++++++-------- 2 files changed, 10 insertions(+), 9 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 5cd49e360..93ba136e6 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 @@ -260,7 +260,7 @@ var set20 = { '20_263': 'http://lotrtcg.org/coreset/moria/goblinpatrol.jpg', '20_264': 'http://lotrtcg.org/coreset/moria/goblinrallyer.jpg', '20_265': 'http://lotrtcg.org/coreset/moria/goblinransacker.jpg', - '20_266': 'http://lotrtcg.org/coreset/moria/goblinreclaimer.jpg', + '20_266': 'http://lotrtcg.org/coreset/moria/goblinreclaimer(r3).jpg', '20_267': 'http://lotrtcg.org/coreset/moria/goblinreinforcements.jpg', '20_268': 'http://lotrtcg.org/coreset/moria/goblinrunner.jpg', '20_269': 'http://lotrtcg.org/coreset/moria/goblinscavengers.jpg', diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/moria/Card20_266.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/moria/Card20_266.java index 5c11867a6..8522c4a4e 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/moria/Card20_266.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/moria/Card20_266.java @@ -6,8 +6,8 @@ import com.gempukku.lotro.cards.TriggerConditions; 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.Keyword; import com.gempukku.lotro.common.Race; +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.OptionalTriggerAction; @@ -17,11 +17,12 @@ import java.util.Collections; import java.util.List; /** - * 2 - * Goblin Reclaimer - * Moria Minion • Goblin - * 6 2 4 - * When you play this minion at an underground site, you may play a [Moria] condition from your discard pile. + * ❷ Goblin Reclaimer [Mor] + * Minion • Goblin + * Strength: 6 Vitality: 2 Roaming: 4 + * When you play this minion, you may spot another [Mor] Goblin to play a [Mor] condition from your discard pile. + *

+ * http://lotrtcg.org/coreset/moria/goblinreclaimer(r3).jpg */ public class Card20_266 extends AbstractMinion { public Card20_266() { @@ -31,8 +32,8 @@ public class Card20_266 extends AbstractMinion { @Override public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { if (TriggerConditions.played(game, effectResult, self) - && PlayConditions.location(game, Keyword.UNDERGROUND) - && PlayConditions.canPlayFromDiscard(playerId, game, Culture.MORIA, CardType.CONDITION)) { + && PlayConditions.canSpot(game, Filters.not(self), Culture.MORIA, Race.GOBLIN) + && PlayConditions.canPlayFromDiscard(playerId, game, Culture.MORIA, CardType.CONDITION)) { OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendEffect( new ChooseAndPlayCardFromDiscardEffect(playerId, game, Culture.MORIA, CardType.CONDITION));