Fixing couple of bugs

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": [
       {

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"
         }
       },
       {

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",