From 1b578377dfe2f90c0799043fd3e10eb37049f95a Mon Sep 17 00:00:00 2001
From: marcins78 <marcins78@eb7970ca-0f6f-de4b-2938-835b230b9d1f>
Date: Wed, 20 Nov 2013 17:03:18 +0000
Subject: [PATCH] Southron Nomad

---
 .../src/main/web/js/gemp-019/set20.js         |  2 +-
 .../cards/set20/fallenRealms/Card20_138.java  | 22 ++++++++++---------
 2 files changed, 13 insertions(+), 11 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 3e2fb8d11..cec62c170 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
@@ -133,7 +133,7 @@ var set20 = {
     '20_135': 'http://lotrtcg.org/coreset/fallenrealms/resolveofrhun(r1).jpg',
     '20_136': 'http://lotrtcg.org/coreset/fallenrealms/southronbandit.jpg',
     '20_137': 'http://lotrtcg.org/coreset/fallenrealms/southrondeadeye(r1).jpg',
-    '20_138': 'http://lotrtcg.org/coreset/fallenrealms/southronnomad(r1).jpg',
+    '20_138': 'http://lotrtcg.org/coreset/fallenrealms/southronnomad(r3).jpg',
     '20_139': 'http://lotrtcg.org/coreset/fallenrealms/southronpackmaster(r1).jpg',
     '20_140': 'http://lotrtcg.org/coreset/fallenrealms/southronrogue.jpg',
     '20_141': 'http://lotrtcg.org/coreset/fallenrealms/southronsharpshooter.jpg',
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/fallenRealms/Card20_138.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/fallenRealms/Card20_138.java
index 8bce6741a..348ed3c17 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/fallenRealms/Card20_138.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/fallenRealms/Card20_138.java
@@ -1,6 +1,7 @@
 package com.gempukku.lotro.cards.set20.fallenRealms;
 
 import com.gempukku.lotro.cards.AbstractMinion;
+import com.gempukku.lotro.cards.PlayConditions;
 import com.gempukku.lotro.cards.TriggerConditions;
 import com.gempukku.lotro.cards.effects.choose.ChooseAndExertCharactersEffect;
 import com.gempukku.lotro.common.Culture;
@@ -9,20 +10,20 @@ import com.gempukku.lotro.common.Race;
 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.RequiredTriggerAction;
+import com.gempukku.lotro.logic.actions.OptionalTriggerAction;
 import com.gempukku.lotro.logic.timing.EffectResult;
 
 import java.util.Collections;
 import java.util.List;
 
 /**
- * 2
- * Southron Nomad
+ * ❷ Southron Nomad [Fal]
  * Minion • Man
- * 5	2	4
- * Southron. Ambush (1).
- * When you play this minion, the Free Peoples player must exert an unbound companion.
- * http://lotrtcg.org/coreset/fallenrealms/southronnomad(r1).png
+ * Strength: 5   Vitality: 2   Roaming: 4
+ * Ambush ❶. (When the Free Peoples player assigns one of his characters to skirmish this minion, the Shadow player who owns this minion may add ❶.) Southron.
+ * When you play this minion, you may spot another Southron to make the Free Peoples player exert a companion.
+ * <p/>
+ * http://lotrtcg.org/coreset/fallenrealms/southronnomad(r3).jpg
  */
 public class Card20_138 extends AbstractMinion {
     public Card20_138() {
@@ -32,9 +33,10 @@ public class Card20_138 extends AbstractMinion {
     }
 
     @Override
-    public List<RequiredTriggerAction> getRequiredAfterTriggers(LotroGame game, EffectResult effectResult, PhysicalCard self) {
-        if (TriggerConditions.played(game, effectResult, self)) {
-            RequiredTriggerAction action = new RequiredTriggerAction(self);
+    public List<OptionalTriggerAction> getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) {
+        if (TriggerConditions.played(game, effectResult, self)
+                && PlayConditions.canSpot(game, Filters.not(self), Keyword.SOUTHRON)) {
+            OptionalTriggerAction action = new OptionalTriggerAction(self);
             action.appendEffect(
                     new ChooseAndExertCharactersEffect(action, game.getGameState().getCurrentPlayerId(), 1, 1, Filters.unboundCompanion));
             return Collections.singletonList(action);