From 23d87ae238391c9cb9d76a7270f04e94236cd2e9 Mon Sep 17 00:00:00 2001 From: marcins78 Date: Tue, 19 Mar 2013 11:53:15 +0000 Subject: [PATCH] 20_405 --- .../src/main/web/js/gemp-019/set20.js | 2 +- .../lotro/cards/set20/shire/Card20_405.java | 15 ++++++++++----- 2 files changed, 11 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 4029f11a7..2d3e0bd60 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 @@ -403,7 +403,7 @@ var set20 = { '20_402': 'http://lotrtcg.org/coreset/shire/pippinht.png', '20_403': 'http://lotrtcg.org/coreset/shire/pippinspipe.png', '20_404': 'http://lotrtcg.org/coreset/shire/promise.png', - '20_405': 'http://anony.ws/i/2013/01/09/p7DWC.png', + '20_405': 'http://lotrtcg.org/coreset/shire/robinsmallburrowsoh(r1).png', '20_406': 'http://lotrtcg.org/coreset/shire/rosiecottongdb.png', '20_407': 'http://lotrtcg.org/coreset/shire/samdoe.png', '20_408': 'http://lotrtcg.org/coreset/shire/samhh.png', diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/shire/Card20_405.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/shire/Card20_405.java index f4b50c6da..d7ce58b3e 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/shire/Card20_405.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/shire/Card20_405.java @@ -5,10 +5,7 @@ import com.gempukku.lotro.cards.PlayConditions; import com.gempukku.lotro.cards.effects.CancelSkirmishEffect; import com.gempukku.lotro.cards.effects.SelfExertEffect; import com.gempukku.lotro.cards.effects.choose.ChooseAndAddUntilEOPStrengthBonusEffect; -import com.gempukku.lotro.common.Culture; -import com.gempukku.lotro.common.Keyword; -import com.gempukku.lotro.common.Phase; -import com.gempukku.lotro.common.Race; +import com.gempukku.lotro.common.*; import com.gempukku.lotro.game.PhysicalCard; import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.actions.ActivateCardAction; @@ -20,10 +17,12 @@ import java.util.List; /** * 1 * •Robin Smallburrow, Shirrif of Hobbiton - * Shire Ally • Hobbit • Shire + * Ally • Hobbit • Shire * 2 2 + * To play, spot 2 Hobbit companions. * Skirmish: At sites 1-4, exert Robin Smallburrow to cancel a skirmish involving a Hobbit. * Skirmish: At sites 5-9, exert Robin Smallburrow to make a Hobbit strength +2. + * http://lotrtcg.org/coreset/shire/robinsmallburrowsoh(r1).png */ public class Card20_405 extends AbstractAlly { public Card20_405() { @@ -31,6 +30,12 @@ public class Card20_405 extends AbstractAlly { addKeyword(Keyword.SHIRE); } + @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.canSpot(game, 2, CardType.COMPANION, Race.HOBBIT); + } + @Override protected List getExtraInPlayPhaseActions(String playerId, LotroGame game, PhysicalCard self) { if (PlayConditions.canUseFPCardDuringPhase(game, Phase.SKIRMISH, self)