From f14643f2918209a55d762209b21730186899d628 Mon Sep 17 00:00:00 2001
From: marcins78 <marcins78@eb7970ca-0f6f-de4b-2938-835b230b9d1f>
Date: Fri, 15 Mar 2013 17:49:16 +0000
Subject: [PATCH] 20_014

---
 .../src/main/web/js/gemp-019/set20.js         |  2 +-
 .../lotro/cards/set20/dunland/Card20_014.java | 38 ++++++-------------
 2 files changed, 13 insertions(+), 27 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 44bd1f361..027edb9ec 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
@@ -12,7 +12,7 @@ var set20 = {
     '20_11': 'http://lotrtcg.org/coreset/dunland/dunlendingbrute.png',
     '20_12': 'http://lotrtcg.org/coreset/dunland/dunlendingraider',
     '20_13': 'http://lotrtcg.org/coreset/dunland/dunlendingelder.png',
-    '20_14': 'http://lotrtcg.org/coreset/dunland/clanofthehills.png',
+    '20_14': 'http://lotrtcg.org/coreset/dunland/clanofthehills(r1).png',
     '20_15': 'http://lotrtcg.org/coreset/dunland/hillmantribe.png',
     '20_16': 'http://lotrtcg.org/coreset/dunland/hillmantorchbearer.png',
     '20_17': 'http://lotrtcg.org/coreset/dunland/hillmanprimitive.png',
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dunland/Card20_014.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dunland/Card20_014.java
index 131ab6d17..1c0e749a8 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dunland/Card20_014.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dunland/Card20_014.java
@@ -3,7 +3,8 @@ package com.gempukku.lotro.cards.set20.dunland;
 import com.gempukku.lotro.cards.AbstractMinion;
 import com.gempukku.lotro.cards.PlayConditions;
 import com.gempukku.lotro.cards.TriggerConditions;
-import com.gempukku.lotro.cards.effects.StackCardFromPlayEffect;
+import com.gempukku.lotro.cards.effects.TakeControlOfASiteEffect;
+import com.gempukku.lotro.cards.effects.choose.ChooseAndDiscardCardsFromPlayEffect;
 import com.gempukku.lotro.cards.modifiers.ShouldSkipPhaseModifier;
 import com.gempukku.lotro.cards.modifiers.conditions.LocationCondition;
 import com.gempukku.lotro.common.Culture;
@@ -13,8 +14,6 @@ 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.effects.ChooseActiveCardEffect;
-import com.gempukku.lotro.logic.effects.ChooseAndWoundCharactersEffect;
 import com.gempukku.lotro.logic.modifiers.Modifier;
 import com.gempukku.lotro.logic.timing.EffectResult;
 
@@ -24,16 +23,16 @@ import java.util.List;
 
 /**
  * 6
- * • Clan of the Hills
- * Dunland	Minion • Man
- * 14	2	3
- * While Clan of the Hills is in region 2, skip the archery phase.
- * Response: If Clan of the Hills wins a skirmish, stack a [Dunland] Man on a site you control to wound
- * an unbound companion.
+ * Clan of the Hills
+ * Minion • Man
+ * 12	1	3
+ * While this minion is in region 2, skip the archery phase.
+ * Each time this minion wins a skirmish, you may discard another [Dunland] Man to take control of a site.
+ * http://lotrtcg.org/coreset/dunland/clanofthehills(r1).png
  */
 public class Card20_014 extends AbstractMinion {
     public Card20_014() {
-        super(6, 14, 2, 3, Race.MAN, Culture.DUNLAND, "Clan of the Hills", null, true);
+        super(6, 12, 1, 3, Race.MAN, Culture.DUNLAND, "Clan of the Hills");
     }
 
     @Override
@@ -47,25 +46,12 @@ public class Card20_014 extends AbstractMinion {
     @Override
     public List<? extends ActivateCardAction> getOptionalInPlayAfterActions(final String playerId, LotroGame game, EffectResult effectResult, final PhysicalCard self) {
         if (TriggerConditions.winsSkirmish(game, effectResult, self)
-                && PlayConditions.canSpot(game, Culture.DUNLAND, Race.MAN)
-                && PlayConditions.canSpot(game, Filters.siteControlled(playerId))) {
+                && PlayConditions.canDiscardFromPlay(self, game, Filters.not(self), Culture.DUNLAND, Race.MAN)) {
             final ActivateCardAction action = new ActivateCardAction(self);
             action.appendCost(
-                    new ChooseActiveCardEffect(self, playerId, "Choose a minion to stack", Culture.DUNLAND, Race.MAN) {
-                        @Override
-                        protected void cardSelected(LotroGame game, final PhysicalCard minion) {
-                            action.appendCost(
-                                    new ChooseActiveCardEffect(self, playerId, "Choose site you control", Filters.siteControlled(playerId)) {
-                                        @Override
-                                        protected void cardSelected(LotroGame game, PhysicalCard site) {
-                                            action.appendCost(
-                                                    new StackCardFromPlayEffect(minion, site));
-                                        }
-                                    });
-                        }
-                    });
+                    new ChooseAndDiscardCardsFromPlayEffect(action, playerId, 1, 1, Filters.not(self), Culture.DUNLAND, Race.MAN));
             action.appendEffect(
-                    new ChooseAndWoundCharactersEffect(action, playerId, 1, 1, Filters.unboundCompanion));
+                    new TakeControlOfASiteEffect(self, playerId));
             return Collections.singletonList(action);
         }
         return null;