From 4485e4050b0d00a2478df94fcc40a8bb57cb7a9a Mon Sep 17 00:00:00 2001
From: Phallen Cassidy <leoplurodyn@gmail.com>
Date: Fri, 27 Mar 2020 21:44:34 -0400
Subject: [PATCH] Some Hobbit fixes

---
 .../src/main/web/cards/set31/set31-fp.json            | 11 +++--------
 .../src/main/web/cards/set31/set31-shadow.json        |  6 +++---
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-fp.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-fp.json
index bf0711829..d8c44c281 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-fp.json
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-fp.json
@@ -518,11 +518,6 @@
           "filter": "self,attachedTo(any)"
         },
         "cost": [
-          {
-            "type": "memorize",
-            "filter": "bearer",
-            "memory": "bearer"
-          },
           {
             "type": "transferToSupport",
             "filter": "self"
@@ -536,7 +531,7 @@
           },
           "effect": {
             "type": "cancelSkirmish",
-            "filter": "memory(bearer)"
+            "filter": "bearer"
           }
         }
       }
@@ -556,13 +551,13 @@
       "effect": [
         {
           "type": "modifyStrength",
-          "filter": "all(culture(dwarven),companion,hasStacked(follower))",
+          "filter": "all(culture(dwarven),companion,hasAttached(follower))",
           "amount": 2,
           "until": "start(regroup)"
         },
         {
           "type": "addKeyword",
-          "filter": "all(culture(dwarven),companion,hasStacked(and(follower,culture(gandalf))))",
+          "filter": "all(culture(dwarven),companion,hasAttached(and(follower,culture(gandalf))))",
           "keyword": "defender+1",
           "until": "start(regroup)"
         }
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-shadow.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-shadow.json
index 8b5c104f1..b3464c9d2 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-shadow.json
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-shadow.json
@@ -82,7 +82,7 @@
         "cost": [
           {
             "type": "exert",
-            "filter": "choose(name(Gollum),not(roaming))"
+            "filter": "choose(self,not(roaming))"
           },
           {
             "type": "assignFpCharacterToSkirmish",
@@ -304,7 +304,7 @@
   "31_26": {
     "title": "Threatening Warg",
     "culture": "gundabad",
-    "cost": 3,
+    "cost": 4,
     "type": "possession",
     "possession": "mount",
     "strength": 4,
@@ -1157,7 +1157,7 @@
   "31_65": {
     "title": "Caught in a Sack",
     "culture": "troll",
-    "cost": 2,
+    "cost": 0,
     "type": "condition",
     "keyword": "support area",
     "effects": [