From 4788c93902f1e8aa4277a779613eba3a87516eaf Mon Sep 17 00:00:00 2001
From: marcins78 <marcins78@eb7970ca-0f6f-de4b-2938-835b230b9d1f>
Date: Tue, 19 Mar 2013 11:42:18 +0000
Subject: [PATCH] 20_374

---
 .../src/main/web/js/gemp-019/set20.js         |  2 +-
 .../lotro/cards/set20/sauron/Card20_374.java  | 26 +++++++++++++------
 2 files changed, 19 insertions(+), 9 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 0b85a0fa2..9f07bf176 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
@@ -372,7 +372,7 @@ var set20 = {
     '20_371': 'http://lotrtcg.org/coreset/sauron/orcstalker(r1).png',
     '20_372': 'http://lotrtcg.org/coreset/sauron/orcvillain.png',
     '20_373': 'http://lotrtcg.org/coreset/sauron/sauronsforces(r1).png',
-    '20_374': 'http://lotrtcg.org/coreset/sauron/shadowintheeast.png',
+    '20_374': 'http://lotrtcg.org/coreset/sauron/shadowintheeast(r1).png',
     '20_375': 'http://lotrtcg.org/coreset/sauron/threatofmordor.png',
     '20_376': 'http://lotrtcg.org/coreset/sauron/threateningologhai.png',
     '20_377': 'http://lotrtcg.org/coreset/sauron/trollofgorgoroth.png',
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/sauron/Card20_374.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/sauron/Card20_374.java
index 324e9be53..534b8db29 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/sauron/Card20_374.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/sauron/Card20_374.java
@@ -3,26 +3,28 @@ package com.gempukku.lotro.cards.set20.sauron;
 import com.gempukku.lotro.cards.AbstractEvent;
 import com.gempukku.lotro.cards.PlayConditions;
 import com.gempukku.lotro.cards.actions.PlayEventAction;
-import com.gempukku.lotro.cards.modifiers.evaluator.AddEvaluator;
 import com.gempukku.lotro.cards.modifiers.evaluator.CountFPCulturesEvaluator;
-import com.gempukku.lotro.cards.modifiers.evaluator.MultiplyEvaluator;
 import com.gempukku.lotro.common.CardType;
 import com.gempukku.lotro.common.Culture;
 import com.gempukku.lotro.common.Phase;
 import com.gempukku.lotro.common.Side;
 import com.gempukku.lotro.game.PhysicalCard;
+import com.gempukku.lotro.game.state.GameState;
 import com.gempukku.lotro.game.state.LotroGame;
 import com.gempukku.lotro.logic.effects.AddThreatsEffect;
+import com.gempukku.lotro.logic.modifiers.ModifiersQuerying;
+import com.gempukku.lotro.logic.modifiers.evaluator.Evaluator;
 
 /**
- * 2
+ * 1
  * Shadow in the East
- * Sauron	Event • Maneuver
- * Spot a [Sauron] minion to add a threat for each Free Peoples culture less than 4 that you can spot.
+ * Event • Maneuver
+ * Spot a [Sauron] minion to add a threat. Add an additional threat for each Free Peoples culture less than 4 you can spot.
+ * http://lotrtcg.org/coreset/sauron/shadowintheeast(r1).png
  */
 public class Card20_374 extends AbstractEvent {
     public Card20_374() {
-        super(Side.SHADOW, 2, Culture.SAURON, "Shadow in the East", Phase.MANEUVER);
+        super(Side.SHADOW, 1, Culture.SAURON, "Shadow in the East", Phase.MANEUVER);
     }
 
     @Override
@@ -32,10 +34,18 @@ public class Card20_374 extends AbstractEvent {
     }
 
     @Override
-    public PlayEventAction getPlayCardAction(String playerId, LotroGame game, PhysicalCard self, int twilightModifier, boolean ignoreRoamingPenalty) {
+    public PlayEventAction getPlayCardAction(String playerId, LotroGame game, final PhysicalCard self, int twilightModifier, boolean ignoreRoamingPenalty) {
         PlayEventAction action = new PlayEventAction(self);
         action.appendEffect(
-                new AddThreatsEffect(playerId, self, new AddEvaluator(4, new MultiplyEvaluator(-1, new CountFPCulturesEvaluator(self.getOwner())))));
+                new AddThreatsEffect(playerId, self,
+                        new Evaluator() {
+                            private Evaluator _eval = new CountFPCulturesEvaluator(self.getOwner());
+
+                            @Override
+                            public int evaluateExpression(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard cardAffected) {
+                                return 1 + Math.max(0, 4 - _eval.evaluateExpression(gameState, modifiersQuerying, cardAffected));
+                            }
+                        }));
         return action;
     }
 }