From 3b8c182e05cf42fb261723067181c8a56ba63218 Mon Sep 17 00:00:00 2001
From: Christian 'ketura' McCarty <hyperlink.teltura@gmail.com>
Date: Wed, 16 Apr 2025 11:44:55 -0500
Subject: [PATCH] Fixed The Red Arrow getting broken by the recent optional
 update

---
 .../cards/official/set09/set09-Rohan.hjson    | 19 +++--
 .../official/set09/Card_09_046_Tests.java     | 82 ++++++++++++++++---
 2 files changed, 83 insertions(+), 18 deletions(-)

diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set09/set09-Rohan.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set09/set09-Rohan.hjson
index 6f6d98837..0f4b2c503 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set09/set09-Rohan.hjson
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set09/set09-Rohan.hjson
@@ -81,15 +81,18 @@
 				{
 					type: optional
 					text: Would you like exert the played {ROHAN} Man to play a possession on him or her?
-					cost: {
-						type: exert
-						select: memory(playedRohanMan)
-						ignoreCostCheckFailure: true
-					}
 					effect: {
-						type: PlayCardFromHand
-						select: choose(possession)
-						on: memory(playedRohanMan)
+						type: CostToEffect
+						cost: {
+							type: exert
+							select: memory(playedRohanMan)
+							ignoreCostCheckFailure: true
+						}
+						effect: {
+							type: PlayCardFromHand
+							select: choose(possession)
+							on: memory(playedRohanMan)
+						}
 					}
 				}
 				{
diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set09/Card_09_046_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set09/Card_09_046_Tests.java
index e931722df..387937a6f 100644
--- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set09/Card_09_046_Tests.java
+++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set09/Card_09_046_Tests.java
@@ -17,8 +17,13 @@ public class Card_09_046_Tests
 		return new GenericCardTestHelper(
 				new HashMap<>()
 				{{
-					put("card", "9_46");
-					// put other cards in here as needed for the test case
+					put("arrow", "9_46");
+					put("aragorn", "1_89");
+					put("eomer", "4_267");
+					put("spear", "4_268");
+
+					put("runner", "1_178");
+
 				}},
 				GenericCardTestHelper.FellowshipSites,
 				GenericCardTestHelper.FOTRFrodo,
@@ -43,7 +48,7 @@ public class Card_09_046_Tests
 
 		var scn = GetScenario();
 
-		var card = scn.GetFreepsCard("card");
+		var card = scn.GetFreepsCard("arrow");
 
 		assertEquals("The Red Arrow", card.getBlueprint().getTitle());
 		assertNull(card.getBlueprint().getSubtitle());
@@ -55,18 +60,75 @@ public class Card_09_046_Tests
 		assertEquals(0, card.getBlueprint().getTwilightCost());
 	}
 
-	// Uncomment any @Test markers below once this is ready to be used
-	//@Test
-	public void TheRedArrowTest1() throws DecisionResultInvalidException, CardNotFoundException {
+	@Test
+	public void TheRedArrowExertsAGondorCompToPlayRohanCompDuringAssignment() throws DecisionResultInvalidException, CardNotFoundException {
 		//Pre-game setup
 		var scn = GetScenario();
 
-		var card = scn.GetFreepsCard("card");
-		scn.FreepsMoveCardToHand(card);
+		var arrow = scn.GetFreepsCard("arrow");
+		var aragorn = scn.GetFreepsCard("aragorn");
+		var eomer = scn.GetFreepsCard("eomer");
+		var spear = scn.GetFreepsCard("spear");
+		scn.FreepsMoveCardToSupportArea(arrow);
+		scn.FreepsMoveCharToTable(aragorn);
+		scn.FreepsMoveCardToHand(eomer, spear);
+
+		scn.ShadowMoveCharToTable("runner");
 
 		scn.StartGame();
-		scn.FreepsPlayCard(card);
 
-		assertEquals(0, scn.GetTwilight());
+		scn.SkipToPhase(Phase.ASSIGNMENT);
+		assertEquals(Zone.FREE_CHARACTERS, aragorn.getZone());
+		assertEquals(Zone.HAND, eomer.getZone());
+		assertEquals(Zone.HAND, spear.getZone());
+		assertEquals(0, scn.GetWoundsOn(aragorn));
+
+		assertTrue(scn.FreepsActionAvailable(arrow));
+		scn.FreepsUseCardAction(arrow);
+		assertEquals(1, scn.GetWoundsOn(aragorn));
+		assertEquals(Zone.FREE_CHARACTERS, eomer.getZone());
+
+		assertTrue(scn.FreepsDecisionAvailable("Would you like exert the played"));
+		scn.FreepsChooseNo();
+		assertTrue(scn.ShadowAnyDecisionsAvailable());
+		assertEquals(Zone.HAND, spear.getZone());
+	}
+
+	@Test
+	public void TheRedArrowCanOptionallyPlayPossessionOnPlayedCompByExerting() throws DecisionResultInvalidException, CardNotFoundException {
+		//Pre-game setup
+		var scn = GetScenario();
+
+		var arrow = scn.GetFreepsCard("arrow");
+		var aragorn = scn.GetFreepsCard("aragorn");
+		var eomer = scn.GetFreepsCard("eomer");
+		var spear = scn.GetFreepsCard("spear");
+		scn.FreepsMoveCardToSupportArea(arrow);
+		scn.FreepsMoveCharToTable(aragorn);
+		scn.FreepsMoveCardToHand(eomer, spear);
+
+		scn.ShadowMoveCharToTable("runner");
+
+		scn.StartGame();
+
+		scn.SkipToPhase(Phase.ASSIGNMENT);
+		assertEquals(Zone.FREE_CHARACTERS, aragorn.getZone());
+		assertEquals(Zone.HAND, eomer.getZone());
+		assertEquals(Zone.HAND, spear.getZone());
+		assertEquals(0, scn.GetWoundsOn(aragorn));
+
+		assertTrue(scn.FreepsActionAvailable(arrow));
+		scn.FreepsUseCardAction(arrow);
+		assertEquals(1, scn.GetWoundsOn(aragorn));
+		assertEquals(Zone.FREE_CHARACTERS, eomer.getZone());
+
+		assertEquals(0, scn.GetWoundsOn(eomer));
+		assertTrue(scn.FreepsDecisionAvailable("Would you like exert the played"));
+		scn.FreepsChooseYes();
+
+		assertEquals(1, scn.GetWoundsOn(eomer));
+		assertEquals(Zone.ATTACHED, spear.getZone());
+		assertEquals(eomer, spear.getAttachedTo());
+		assertTrue(scn.ShadowAnyDecisionsAvailable());
 	}
 }