From 51f36772643661a3456e78224c8852b562ff7a08 Mon Sep 17 00:00:00 2001
From: marcins78 <marcins78@eb7970ca-0f6f-de4b-2938-835b230b9d1f>
Date: Mon, 25 Mar 2013 11:17:49 +0000
Subject: [PATCH] 20_391

---
 .../src/main/web/js/gemp-019/set20.js          |  2 +-
 .../lotro/cards/set20/shire/Card20_391.java    | 18 +++++++++---------
 2 files changed, 10 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 4302ff626..94556dc04 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
@@ -381,7 +381,7 @@ var set20 = {
     '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(r2).jpg',
-    '20_391': 'http://lotrtcg.org/coreset/shire/herbloreoftheshire.jpg',
+    '20_391': 'http://lotrtcg.org/coreset/shire/herbloreoftheshire(r2).jpg',
     '20_392': 'http://lotrtcg.org/coreset/shire/hobbitpartyguest.jpg',
     '20_393': 'http://lotrtcg.org/coreset/shire/hobbitsword.jpg',
     '20_394': 'http://lotrtcg.org/coreset/shire/legendaryadventures.jpg',
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/shire/Card20_391.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/shire/Card20_391.java
index e49876222..e857b2151 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/shire/Card20_391.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/shire/Card20_391.java
@@ -3,7 +3,7 @@ package com.gempukku.lotro.cards.set20.shire;
 import com.gempukku.lotro.cards.AbstractPermanent;
 import com.gempukku.lotro.cards.PlayConditions;
 import com.gempukku.lotro.cards.effects.choose.ChooseAndAddUntilEOPStrengthBonusEffect;
-import com.gempukku.lotro.cards.effects.choose.ChooseAndExertCharactersEffect;
+import com.gempukku.lotro.cards.effects.choose.ChooseAndDiscardCardsFromPlayEffect;
 import com.gempukku.lotro.cards.modifiers.evaluator.CountSpottableEvaluator;
 import com.gempukku.lotro.common.*;
 import com.gempukku.lotro.filters.Filters;
@@ -18,10 +18,10 @@ import java.util.List;
 /**
  * 2
  * •Herblore of the Shire
- * Shire	Possession • Support Area
- * Tale.
- * To play, spot Merry.
- * Skirmish: Exert a Hobbit Ally to make a Hobbit strength +1 for each pipe you can spot (limit +3).
+ * Possession • Support Area
+ * To play spot an unbound Hobbit.
+ * Skirmish: Discard a pipeweed possession to make a companion strength +1 for each pipe you can spot (limit +3).
+ * http://lotrtcg.org/coreset/shire/herbloreoftheshire(r2).jpg
  */
 public class Card20_391 extends AbstractPermanent {
     public Card20_391() {
@@ -32,19 +32,19 @@ public class Card20_391 extends AbstractPermanent {
     @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, Filters.name("Merry"));
+                && PlayConditions.canSpot(game, Filters.unboundCompanion, Race.HOBBIT);
     }
 
     @Override
     protected List<? extends Action> getExtraPhaseActions(String playerId, LotroGame game, PhysicalCard self) {
         if (PlayConditions.canUseFPCardDuringPhase(game, Phase.SKIRMISH, self)
-                && PlayConditions.canExert(self, game, Race.HOBBIT, CardType.ALLY)) {
+                && PlayConditions.canDiscardFromPlay(self, game, CardType.POSSESSION, Keyword.PIPEWEED)) {
             ActivateCardAction action = new ActivateCardAction(self);
             action.appendCost(
-                    new ChooseAndExertCharactersEffect(action, playerId, 1, 1, Race.HOBBIT, CardType.ALLY));
+                    new ChooseAndDiscardCardsFromPlayEffect(action, playerId, 1, 1, CardType.POSSESSION, Keyword.PIPEWEED));
             action.appendEffect(
                     new ChooseAndAddUntilEOPStrengthBonusEffect(action, self, playerId,
-                            new CountSpottableEvaluator(3, PossessionClass.PIPE), Race.HOBBIT));
+                            new CountSpottableEvaluator(3, PossessionClass.PIPE), CardType.COMPANION));
             return Collections.singletonList(action);
         }
         return null;