From ed226fb96e20faa3ff373814e56c55513fd5fd29 Mon Sep 17 00:00:00 2001
From: "marcin.sciesinski" <Marcin.Sciesinski@stash.synchronoss.net>
Date: Fri, 18 Oct 2019 06:08:36 -0700
Subject: [PATCH] Fixing couple of bugs

---
 .../gemp-lotr-async/src/main/web/cards/set30/set30-fp.json  | 1 +
 .../src/main/web/cards/set30/set30-shadow.json              | 6 +++++-
 .../src/main/web/cards/set31/set31-sites.json               | 2 +-
 3 files changed, 7 insertions(+), 2 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 ef58b5ab1..6c16ca42e 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
@@ -411,6 +411,7 @@
     "culture": "dwarven",
     "cost": 1,
     "type": "follower",
+    "race": "dwarf",
     "strength": 1,
     "effects": [
       {
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set30/set30-shadow.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set30/set30-shadow.json
index fa8c5a919..557f5238c 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set30/set30-shadow.json
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set30/set30-shadow.json
@@ -16,7 +16,7 @@
           "condition": {
             "type": "memoryMatches",
             "memory": "chosenMinion",
-            "filter": "hasAttached(follower)"
+            "filter": "inSkirmishAgainst(hasAttached(follower))"
           },
           "true": 4,
           "false": 2
@@ -398,6 +398,10 @@
             "type": "location",
             "filter": "not(mountain)"
           }
+        },
+        "effect": {
+          "type": "discard",
+          "filter": "self"
         }
       },
       {
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-sites.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-sites.json
index bb3996494..fcc357d37 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-sites.json
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-sites.json
@@ -286,7 +286,7 @@
     "type": "site",
     "block": "hobbit",
     "site": 7,
-    "keyword": "river",
+    "keyword": "mountain",
     "effects": {
       "type": "activated",
       "phase": "regroup",