From f7703de186889d317e9ebc9c9dfde0fc9b6c7ba2 Mon Sep 17 00:00:00 2001 From: marcins78 Date: Mon, 25 Mar 2013 11:15:04 +0000 Subject: [PATCH] 20_390 --- .../src/main/web/js/gemp-019/set20.js | 2 +- .../lotro/cards/set20/shire/Card20_390.java | 33 ++++++++++++++----- 2 files changed, 25 insertions(+), 10 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 822294607..4302ff626 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 @@ -380,7 +380,7 @@ var set20 = { '20_387': 'http://lotrtcg.org/coreset/shire/frodobotsb.jpg', '20_388': 'http://lotrtcg.org/coreset/shire/frodoer.jpg', '20_389': 'http://lotrtcg.org/coreset/shire/frodospipe(r2).jpg', - '20_390': 'http://lotrtcg.org/coreset/shire/hamfastgamgeetg.jpg', + '20_390': 'http://lotrtcg.org/coreset/shire/hamfastgamgeetg(r2).jpg', '20_391': 'http://lotrtcg.org/coreset/shire/herbloreoftheshire.jpg', '20_392': 'http://lotrtcg.org/coreset/shire/hobbitpartyguest.jpg', '20_393': 'http://lotrtcg.org/coreset/shire/hobbitsword.jpg', diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/shire/Card20_390.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/shire/Card20_390.java index 2d830917d..917c206c6 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/shire/Card20_390.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/shire/Card20_390.java @@ -1,28 +1,43 @@ package com.gempukku.lotro.cards.set20.shire; import com.gempukku.lotro.cards.AbstractAlly; +import com.gempukku.lotro.cards.PlayConditions; +import com.gempukku.lotro.cards.effects.choose.ChooseAndPlayCardFromHandEffect; import com.gempukku.lotro.common.*; -import com.gempukku.lotro.filters.Filters; import com.gempukku.lotro.game.PhysicalCard; import com.gempukku.lotro.game.state.LotroGame; -import com.gempukku.lotro.logic.modifiers.Modifier; -import com.gempukku.lotro.logic.modifiers.StrengthModifier; +import com.gempukku.lotro.logic.actions.ActivateCardAction; +import com.gempukku.lotro.logic.effects.ChooseAndHealCharactersEffect; +import com.gempukku.lotro.logic.timing.Action; + +import java.util.Collections; +import java.util.List; /** * 1 - * •Ham Gamgee, The Gaffer - * Shire Ally • Hobbit • Shire + * •Hamfast Gamgee, The Gaffer + * Ally • Hobbit • Shire * 2 2 - * Each companion bearing a pipe is strength +1. + * Fellowship: Play a Hobbit ally to heal a Hobbit companion. + * http://lotrtcg.org/coreset/shire/hamfastgamgeetg(r2).jpg */ public class Card20_390 extends AbstractAlly { public Card20_390() { - super(1, null, 0, 2, 2, Race.HOBBIT, Culture.SHIRE, "Ham Gamgee", "The Gaffer", true); + super(1, null, 0, 2, 2, Race.HOBBIT, Culture.SHIRE, "Hamfast Gamgee", "The Gaffer", true); addKeyword(Keyword.SHIRE); } @Override - public Modifier getAlwaysOnModifier(LotroGame game, PhysicalCard self) { - return new StrengthModifier(self, Filters.and(CardType.COMPANION, Filters.hasAttached(PossessionClass.PIPE)), 1); + protected List getExtraInPlayPhaseActions(String playerId, LotroGame game, PhysicalCard self) { + if (PlayConditions.canUseFPCardDuringPhase(game, Phase.FELLOWSHIP, self) + && PlayConditions.canPlayFromHand(playerId, game, Race.HOBBIT, CardType.ALLY)) { + ActivateCardAction action = new ActivateCardAction(self); + action.appendCost( + new ChooseAndPlayCardFromHandEffect(playerId, game, Race.HOBBIT, CardType.ALLY)); + action.appendEffect( + new ChooseAndHealCharactersEffect(action, playerId, Race.HOBBIT, CardType.COMPANION)); + return Collections.singletonList(action); + } + return null; } }