From 02c780eb6eb0bc4927a31b510556809f69a36495 Mon Sep 17 00:00:00 2001
From: "marcins78@gmail.com"
 <marcins78@gmail.com@eb7970ca-0f6f-de4b-2938-835b230b9d1f>
Date: Wed, 31 Aug 2011 12:46:11 +0000
Subject: [PATCH] "Uruk Warrior"

---
 .../lotro/cards/set1/isengard/Card1_145.java  |  8 ++-
 .../lotro/cards/set1/isengard/Card1_156.java  | 55 +++++++++++++++++++
 2 files changed, 60 insertions(+), 3 deletions(-)
 create mode 100644 gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_156.java

diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_145.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_145.java
index 408aca502..3ef07c687 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_145.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_145.java
@@ -40,9 +40,9 @@ public class Card1_145 extends AbstractMinion {
 
     @Override
     public List<? extends Action> getPlayablePhaseActions(String playerId, final LotroGame lotroGame, final PhysicalCard self) {
-        List<Action> result = new LinkedList<Action>();
+        List<Action> actions = new LinkedList<Action>();
 
-        appendPlayMinionAction(result, lotroGame, self);
+        appendPlayMinionAction(actions, lotroGame, self);
 
         if (PlayConditions.canUseShadowCardDuringPhase(lotroGame.getGameState(), Phase.SKIRMISH, self, 2)) {
             final CostToEffectAction action = new CostToEffectAction(self, "Remove (2) to make this minion strength +1 for each other Uruk-hai you spot");
@@ -61,8 +61,10 @@ public class Card1_145 extends AbstractMinion {
                                 }
                             }
                     ));
+
+            actions.add(action);
         }
 
-        return result;
+        return actions;
     }
 }
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_156.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_156.java
new file mode 100644
index 000000000..e29a4551d
--- /dev/null
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_156.java
@@ -0,0 +1,55 @@
+package com.gempukku.lotro.cards.set1.isengard;
+
+import com.gempukku.lotro.cards.AbstractMinion;
+import com.gempukku.lotro.cards.PlayConditions;
+import com.gempukku.lotro.cards.effects.AddUntilStartOfPhaseModifierEffect;
+import com.gempukku.lotro.common.CardType;
+import com.gempukku.lotro.common.Culture;
+import com.gempukku.lotro.common.Keyword;
+import com.gempukku.lotro.common.Phase;
+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.CostToEffectAction;
+import com.gempukku.lotro.logic.modifiers.KeywordModifier;
+import com.gempukku.lotro.logic.timing.Action;
+
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ * Set: The Fellowship of the Ring
+ * Side: Shadow
+ * Culture: Isengard
+ * Twilight Cost: 3
+ * Type: Minion • Uruk-Hai
+ * Strength: 9
+ * Vitality: 2
+ * Site: 5
+ * Game Text: Damage +1. Maneuver: Spot 6 companions to make this minion fierce until the regroup phase.
+ */
+public class Card1_156 extends AbstractMinion {
+    public Card1_156() {
+        super(3, 9, 2, 5, Culture.ISENGARD, "Uruk Warrior", "1_156");
+        addKeyword(Keyword.URUK_HAI);
+        addKeyword(Keyword.DAMAGE);
+    }
+
+    @Override
+    public List<? extends Action> getPlayablePhaseActions(String playerId, LotroGame game, PhysicalCard self) {
+        List<Action> actions = new LinkedList<Action>();
+        appendPlayMinionAction(actions, game, self);
+
+        if (PlayConditions.canUseShadowCardDuringPhase(game.getGameState(), Phase.SHADOW, self, 0)
+                && Filters.countActive(game.getGameState(), game.getModifiersQuerying(), Filters.type(CardType.COMPANION)) >= 6) {
+            CostToEffectAction action = new CostToEffectAction(self, "Make this minion fierce until the regroup phase.");
+            action.addEffect(
+                    new AddUntilStartOfPhaseModifierEffect(
+                            new KeywordModifier(self, Filters.sameCard(self), Keyword.FIERCE), Phase.REGROUP));
+
+            actions.add(action);
+        }
+
+        return null;
+    }
+}