From d23a842a28d37f626ce397ce70dd0ddfdc31631f Mon Sep 17 00:00:00 2001 From: marcins78 Date: Tue, 19 Mar 2013 09:54:54 +0000 Subject: [PATCH] 20_152 --- gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-019/set20.js | 2 +- .../com/gempukku/lotro/cards/set20/gandalf/Card20_152.java | 6 +++--- 2 files changed, 4 insertions(+), 4 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 e15b32867..36ced1bb3 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 @@ -150,7 +150,7 @@ var set20 = { '20_149': 'http://lotrtcg.org/coreset/fallenrealms/whirlingstrike.png', '20_150': 'http://lotrtcg.org/coreset/gandalf/albertdrearyefb.png', '20_151': 'http://lotrtcg.org/coreset/gandalf/allsaveone.png', - '20_152': 'http://lotrtcg.org/coreset/gandalf/barlimanbutterburji.png', + '20_152': 'http://lotrtcg.org/coreset/gandalf/barlimanbutterburji(r1).png', '20_153': 'http://lotrtcg.org/coreset/gandalf/bindinglight.png', '20_154': 'http://lotrtcg.org/coreset/gandalf/bolsteredspirits.png', '20_155': 'http://lotrtcg.org/coreset/gandalf/discernment.png', diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/gandalf/Card20_152.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/gandalf/Card20_152.java index b66db9b21..14ae180ec 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/gandalf/Card20_152.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/gandalf/Card20_152.java @@ -17,10 +17,11 @@ import java.util.List; /** * 0 * •Barliman Butterbur, Jovial Innkeep - * Gandalf Ally • Man • Bree + * Ally • Man • Bree * 1 2 * To play, spot Gandalf. - * Fellowship or Regroup: If the fellowship is in region 1 or region 2, exert Barliman Butterbur to heal a companion. + * Fellowship or Regroup: Exert Barliman Butterbur to heal a companion. + * http://lotrtcg.org/coreset/gandalf/barlimanbutterburji(r1).png */ public class Card20_152 extends AbstractAlly { public Card20_152() { @@ -38,7 +39,6 @@ public class Card20_152 extends AbstractAlly { protected List getExtraInPlayPhaseActions(String playerId, LotroGame game, PhysicalCard self) { if ((PlayConditions.canUseFPCardDuringPhase(game, Phase.FELLOWSHIP, self) || PlayConditions.canUseFPCardDuringPhase(game, Phase.REGROUP, self)) - && PlayConditions.location(game, Filters.or(Filters.region(1), Filters.region(2))) && PlayConditions.canSelfExert(self, game)) { ActivateCardAction action = new ActivateCardAction(self); action.appendCost(