From d2a0db73f34233fcbcf77e0186fa806559b6e856 Mon Sep 17 00:00:00 2001
From: marcins78 <marcins78@eb7970ca-0f6f-de4b-2938-835b230b9d1f>
Date: Wed, 13 Mar 2013 12:25:39 +0000
Subject: [PATCH] - "Farin, Dwarf of Erebor" no longer has the extra activated
 ability of the old version.

---
 .../src/main/web/includes/changeLog.html      |  1 +
 .../lotro/cards/set20/dwarven/Card20_050.java | 31 +------------------
 2 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html b/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html
index dfdd8dba2..c72a20534 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html
@@ -12,6 +12,7 @@
 - "Troll of Morannon" has lost its prowess (Damage +1) (per card text).
 - FP player wins now in Second Edition, when Shadow player reconciles during regroup on site 9.
 - "Ulaire Cantea, Morgul Predator"'s trigger is now an optional one (power-level adjustment).
+- "Farin, Dwarf of Erebor" no longer has the extra activated ability of the old version.
 
 <b>12 Mar. 2013</b>
 - "Flaming Brand" from set 20 should now correctly apply strength and damage bonus if bearer is skirmishing a Nazgul.
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dwarven/Card20_050.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dwarven/Card20_050.java
index 4e9d00fd7..6d02bdf7a 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dwarven/Card20_050.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dwarven/Card20_050.java
@@ -4,17 +4,12 @@ import com.gempukku.lotro.cards.AbstractCompanion;
 import com.gempukku.lotro.cards.PlayConditions;
 import com.gempukku.lotro.cards.TriggerConditions;
 import com.gempukku.lotro.cards.effects.RemoveTwilightEffect;
-import com.gempukku.lotro.cards.effects.SelfExertEffect;
 import com.gempukku.lotro.cards.effects.choose.ChooseAndDiscardStackedCardsEffect;
-import com.gempukku.lotro.cards.effects.choose.ChooseAndStackCardsFromHandEffect;
 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.actions.ActivateCardAction;
 import com.gempukku.lotro.logic.actions.OptionalTriggerAction;
-import com.gempukku.lotro.logic.effects.ChooseActiveCardEffect;
-import com.gempukku.lotro.logic.effects.DrawCardsEffect;
 import com.gempukku.lotro.logic.timing.EffectResult;
 
 import java.util.Collection;
@@ -45,7 +40,7 @@ public class Card20_050 extends AbstractCompanion {
                     new ChooseAndDiscardStackedCardsEffect(action, playerId, 1, 1, Filters.and(Culture.DWARVEN, CardType.CONDITION), Culture.DWARVEN) {
                         @Override
                         protected void discardingCardsCallback(Collection<PhysicalCard> cards) {
-                            if (cards.size()>0) {
+                            if (cards.size() > 0) {
                                 final PhysicalCard card = cards.iterator().next();
                                 action.appendEffect(
                                         new RemoveTwilightEffect(card.getBlueprint().getTwilightCost()));
@@ -56,28 +51,4 @@ public class Card20_050 extends AbstractCompanion {
         }
         return null;
     }
-
-    @Override
-    protected List<ActivateCardAction> getExtraInPlayPhaseActions(final String playerId, LotroGame game, PhysicalCard self) {
-        if (PlayConditions.canUseFPCardDuringPhase(game, Phase.FELLOWSHIP, self)
-                && PlayConditions.canSelfExert(self, game)
-                && PlayConditions.hasCardInHand(game, playerId, 1, Culture.DWARVEN, CardType.EVENT)
-                && PlayConditions.canSpot(game, Culture.DWARVEN, Keyword.SUPPORT_AREA, CardType.CONDITION)) {
-            final ActivateCardAction action = new ActivateCardAction(self);
-            action.appendCost(
-                    new SelfExertEffect(action, self));
-            action.appendCost(
-                    new ChooseActiveCardEffect(self, playerId, "Choose DWARVEN condition in your support area", Culture.DWARVEN, Keyword.SUPPORT_AREA, CardType.CONDITION) {
-                        @Override
-                        protected void cardSelected(LotroGame game, PhysicalCard card) {
-                            action.appendCost(
-                                    new ChooseAndStackCardsFromHandEffect(action, playerId, 1, 1, card, Culture.DWARVEN, CardType.EVENT));
-                        }
-                    });
-            action.appendEffect(
-                    new DrawCardsEffect(action, playerId, 1));
-            return Collections.singletonList(action);
-        }
-        return null;
-    }
 }