From cb6f1d6ffea6735dc32bf9366bdea124f2964bbd Mon Sep 17 00:00:00 2001
From: "marcin.sciesinski" <Marcin.Sciesinski@stash.synchronoss.net>
Date: Sat, 19 Oct 2019 11:58:26 -0700
Subject: [PATCH] Fixing couple of bugs

---
 .../src/main/web/cards/set30/set30-fp.json    |  3 +++
 .../src/main/web/cards/set32/set32-fp.json    |  2 +-
 .../main/web/cards/set32/set32-shadow.json    |  2 +-
 .../src/main/web/cards/set9-1.json            | 24 +++++++++++++------
 .../field/effect/trigger/Transferred.java     |  3 +--
 5 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set30/set30-fp.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set30/set30-fp.json
index 6c16ca42e..8aaa8ed2f 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set30/set30-fp.json
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set30/set30-fp.json
@@ -131,6 +131,9 @@
           "type": "winsSkirmish",
           "filter": "bearer"
         },
+        "condition": {
+          "type": "fierceSkirmish"
+        },
         "effect": {
           "type": "discard",
           "filter": "choose(condition)"
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set32/set32-fp.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set32/set32-fp.json
index e284f933c..7f3f5b02c 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set32/set32-fp.json
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set32/set32-fp.json
@@ -550,7 +550,7 @@
         },
         "effect": {
           "type": "allyCanParticipateInArcheryFireAndSkirmishes",
-          "filter": "self",
+          "filter": "choose(name(Bard))",
           "until": "start(regroup)"
         }
       }
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set32/set32-shadow.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set32/set32-shadow.json
index f8e3b489c..dc4c4b6a7 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set32/set32-shadow.json
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set32/set32-shadow.json
@@ -1397,7 +1397,7 @@
           "filter": "condition"
         },
         "effect": {
-          "type": "exert",
+          "type": "discard",
           "filter": "choose(ally)"
         }
       }
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set9-1.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set9-1.json
index 8251fcbf1..10c038358 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set9-1.json
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set9-1.json
@@ -469,14 +469,24 @@
           "type": "discard",
           "filter": "self"
         },
-        "effect": {
-          "type": "wound",
-          "filter": "choose(minion)",
-          "count": {
-            "type": "forEachYouCanSpot",
-            "filter": "elf"
+        "effect": [
+          {
+            "type": "chooseHowManyToSpot",
+            "filter": "elf",
+            "memorize": "spottedElfCount"
+          },
+          {
+            "type": "duplicate",
+            "amount": {
+              "type": "fromMemory",
+              "memory": "spottedElfCount"
+            },
+            "effect": {
+              "type": "wound",
+              "filter": "choose(minion)"
+            }
           }
-        }
+        ]
       }
     ]
   },
diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/trigger/Transferred.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/trigger/Transferred.java
index 5e5fb44bb..2ad015c3e 100644
--- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/trigger/Transferred.java
+++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/trigger/Transferred.java
@@ -5,7 +5,6 @@ import com.gempukku.lotro.cards.build.CardGenerationEnvironment;
 import com.gempukku.lotro.cards.build.FilterableSource;
 import com.gempukku.lotro.cards.build.InvalidCardDefinitionException;
 import com.gempukku.lotro.cards.build.field.FieldUtils;
-import com.gempukku.lotro.filters.Filters;
 import com.gempukku.lotro.logic.timing.TriggerConditions;
 import org.json.simple.JSONObject;
 
@@ -31,7 +30,7 @@ public class Transferred implements TriggerCheckerProducer {
                 return TriggerConditions.transferredCard(actionContext.getGame(),
                         actionContext.getEffectResult(),
                         filterableSource.getFilterable(actionContext),
-                        Filters.any,
+                        null,
                         toFilterableSource.getFilterable(actionContext));
             }
         };