From d67cf3cc89b040e6ed799040af12c53a593fa98f Mon Sep 17 00:00:00 2001
From: Christian 'ketura' McCarty <hyperlink.teltura@gmail.com>
Date: Thu, 31 Oct 2024 23:15:50 -0500
Subject: [PATCH] V2 fixes

- refactored Arwen to respond to wounding instead of death
- fixed Machinery of War triggering on both skirmish loss and death
- refactored Royal Attendant to a less knot-tying version
---
 .../pc/setV02/setv02-Elven-playtest.hjson     |  4 +--
 .../pc/setV02/setv02-Isengard-playtest.hjson  |  5 ----
 .../pc/setV02/setv02-Rohan-playtest.hjson     | 30 ++++++++-----------
 3 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/setv02-Elven-playtest.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/setv02-Elven-playtest.hjson
index fb4bf8ee2..167cdd60a 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/setv02-Elven-playtest.hjson
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/setv02-Elven-playtest.hjson
@@ -252,7 +252,7 @@
 				type: trigger
 				optional: true
 				trigger: {
-					type: AboutToBeKilled
+					type: AboutToTakeWound
 					filter: name(Aragorn)
 				}
 				cost: {
@@ -265,7 +265,7 @@
 				}
 			}
 		]
-		gametext: Aragorn is strength +1.<br>If Aragorn is about to be killed you may exert Arwen to heal Aragorn.<br>While Arwen is exhausted, Aragorn is defender +1.
+		gametext: Aragorn is strength +1.<br>Each time Aragorn is about to take a wound, you may exert Arwen to heal Aragorn.<br>While Arwen is exhausted, Aragorn is defender +1.
 		lore: "'Dark is the Shadow, and yet my heart rejoices; for you, Estel, shall be among the great whose valour will destroy it.'"
 		promotext: ""
 		alts: {
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/setv02-Isengard-playtest.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/setv02-Isengard-playtest.hjson
index 69a5c336b..3b4f34009 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/setv02-Isengard-playtest.hjson
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/setv02-Isengard-playtest.hjson
@@ -116,11 +116,6 @@
 			{
 				type: trigger
 				trigger: [
-					{
-						type: Killed
-						inSkirmish: true
-						filter: culture(isengard), orc
-					}
 					{
 						type: LosesSkirmish
 						filter: culture(isengard), orc
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/setv02-Rohan-playtest.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/setv02-Rohan-playtest.hjson
index 1ee8ede63..6b34b1c67 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/setv02-Rohan-playtest.hjson
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/setv02-Rohan-playtest.hjson
@@ -165,11 +165,17 @@
 						filter: InSkirmish, Hobbit, companion
 					}
 				]
-				cost: {
-					type: Spot
-					select: choose(InSkirmish, Hobbit, companion)
-					memorize: guardedHobbit
-				}
+				cost: [
+					{
+						type: Exert
+						select: self	
+					}
+					{
+						type: Spot
+						select: choose(InSkirmish, Hobbit, companion)
+						memorize: guardedHobbit
+					}
+				]
 				effect: [
 					{
 						type: ModifyStrength
@@ -184,22 +190,10 @@
 						keyword: valiant
 						select: memory(guardedHobbit)
 					}
-					{
-						type: AddTrigger
-						optional: false
-						trigger: {
-							type: SkirmishAboutToEnd
-							involving: memory(guardedHobbit)
-						}
-						effect: {
-							type: Wound
-							select: self
-						}
-					}
 				]
 			}
 		]
-		gametext: To play, spot Theoden (or 3 [rohan] Men).<br>Skirmish: If a Hobbit companion is skirmishing, add this ally's strength to that Hobbit and make that Hobbit gain <b>valiant</b> until the regroup phase (limit once per phase). At the end of that skirmish, wound this ally.
+		gametext: To play, spot Theoden (or 3 [rohan] Men).\Skirmish: Exert this ally to add his strength to a skirmishing Hobbit and make that Hobbit gain <b>valiant</b> until the regroup phase (limit once per phase).
 		lore: ""
 		promotext: ""
 		alts: {