From 8f41709a35779658658a095fc16b5d9de185aa2f Mon Sep 17 00:00:00 2001
From: Phallen Cassidy <leoplurodyn@gmail.com>
Date: Mon, 30 Mar 2020 13:49:35 -0400
Subject: [PATCH] Revert 'Fixing references to "mounted"'

---
 .../src/main/web/cards/set31/set31-fp.json               | 9 ++-------
 .../src/main/web/cards/set31/set31-shadow.json           | 2 +-
 .../src/main/web/cards/set32/set32-fp.json               | 2 +-
 .../src/main/web/cards/set32/set32-shadow.json           | 6 +++---
 4 files changed, 7 insertions(+), 12 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 36d278de5..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"
@@ -532,11 +527,11 @@
           "type": "conditional",
           "condition": {
             "type": "canSpot",
-            "filter": "inSkirmish,hasAttached(mount),orc"
+            "filter": "inSkirmish,mounted,orc"
           },
           "effect": {
             "type": "cancelSkirmish",
-            "filter": "memory(bearer)"
+            "filter": "bearer"
           }
         }
       }
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 4cf81e197..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
@@ -265,7 +265,7 @@
     }
   },
   "31_25": {
-    "title": "Savage Warg",
+    "title": "Savage Worg",
     "culture": "gundabad",
     "cost": 3,
     "type": "possession",
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 7b9dcb1b3..91486e7c1 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
@@ -110,7 +110,7 @@
       "type": "modifier",
       "modifier": {
         "type": "modifyStrength",
-        "filter": "bearer,inSkirmishAgainst(hasAttached(mount),minion)",
+        "filter": "bearer,inSkirmishAgainst(mounted,minion)",
         "amount": 1
       }
     }
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 d4fe66ef0..54d69498b 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
@@ -455,7 +455,7 @@
         "phase": "regroup",
         "condition": {
           "type": "cantSpot",
-          "filter": "self,hasAttached(mount)"
+          "filter": "self,mounted"
         },
         "cost": {
           "type": "exert",
@@ -640,7 +640,7 @@
         "phase": "regroup",
         "condition": {
           "type": "cantSpot",
-          "filter": "self,hasAttached(mount)"
+          "filter": "self,mounted"
         },
         "cost": {
           "type": "exert",
@@ -738,7 +738,7 @@
         "phase": "regroup",
         "condition": {
           "type": "cantSpot",
-          "filter": "self,hasAttached(mount)"
+          "filter": "self,mounted"
         },
         "cost": {
           "type": "exert",