From 50e3fa94959911cd930492194a7d9ec64e8eb66e Mon Sep 17 00:00:00 2001
From: Christian 'ketura' McCarty <hyperlink.teltura@gmail.com>
Date: Sun, 19 Dec 2021 13:40:01 -0600
Subject: [PATCH] Card Fixes

Fixed Gil-galad errata having all sorts of drunken problems with his ability costs
Fixed Walks in Twilight not triggering on a win
Fixed Valley of the Anduin only blocking stealth events instead of all events
Fixed Nen Hithoel checking for >5 instead of >4 companions
---
 .../cards/errata/set18-errata-playtest.json   | 21 ++++++++++---------
 .../set101/set101_ringwraith_playtest.json    |  4 ++--
 .../cards/set101/set101_sites_playtest.json   |  4 ++--
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/errata/set18-errata-playtest.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/errata/set18-errata-playtest.json
index 809a35c87..b66f79527 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/errata/set18-errata-playtest.json
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/errata/set18-errata-playtest.json
@@ -19,14 +19,14 @@
     	{
 	      "type": "activated",
 	      "phase": "maneuver",
-	      "cost": {
-	        "type": "removetokens",
-	        "count": 1,
-          "culture": "elven"
-	      },
+	      
+        "cost": {
+          "type": "addthreats",
+          "amount": 1
+        },
 	      "effect": {
           "type": "putcardsfromdiscardintohand",
-          "filter": "choose(culture(elven),condition)",
+          "filter": "choose(culture(elven),event,skirmish)",
           "count": 1
         }
 	    },
@@ -34,12 +34,13 @@
 	      "type": "activated",
 	      "phase": "regroup",
 	      "cost": {
-	        "type": "addthreats",
-	        "amount": 2
-	      },
+          "type": "removetokens",
+          "count": 1,
+          "culture": "elven"
+        },
 	      "effect": {
           "type": "putcardsfromdiscardintohand",
-          "filter": "choose(culture(elven),event)",
+          "filter": "choose(culture(elven),condition)",
           "count": 1
         }
 	    }
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_ringwraith_playtest.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_ringwraith_playtest.json
index 47fad6b2e..fbdea24bf 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_ringwraith_playtest.json
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_ringwraith_playtest.json
@@ -181,11 +181,11 @@
         "type": "trigger",
         "trigger": {
           "type": "winsSkirmish",
-          "filter": "twilight,nazgul"
+          "filter": "and(twilight,nazgul)"
         },
         "cost": {
           "type": "exert",
-          "filter": "bearer"
+          "filter": "choose(twilight,nazgul)"
         },
         "effect": {
           "type": "shufflecardsfromdiscardintodrawdeck",
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_sites_playtest.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_sites_playtest.json
index 4236bec6e..5d1682b4c 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_sites_playtest.json
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_sites_playtest.json
@@ -135,7 +135,7 @@
           "filter": "companion",
           "count": 6
         },
-        "filter": "stealth,event",
+        "filter": "event",
       }
     }
   },
@@ -162,7 +162,7 @@
         "count": {
           "type": "forEachYouCanSpot",
           "filter": "companion",
-          "over": 5
+          "over": 4
         }
       }
     }