From d1948a6a8807f48da38f0e79311c94f83d88b18a Mon Sep 17 00:00:00 2001
From: Christian 'ketura' McCarty <hyperlink.teltura@gmail.com>
Date: Wed, 20 Nov 2024 12:30:46 -0600
Subject: [PATCH] Updating V2 AEWOR to have a more streamlined interaction for
 the user

---
 .../cards/unofficial/pc/setV02/V2-Rohan.hjson | 37 ++++++++-----------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/V2-Rohan.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/V2-Rohan.hjson
index 20d4e68ba..3d488e9b2 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/V2-Rohan.hjson
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/V2-Rohan.hjson
@@ -90,28 +90,23 @@
 			}
 			cost: [
 				{
-					type: MemorizeNumber
-					amount: {
-						type: ForEachYouCanSpot
-						filter: HasCultureTokenCount(2,rohan)
-					}
-					memory: availableConditions
-				}
-				{
-					type: ChooseANumber
+					type: ChooseActiveCards
 					text: Choose how many {rohan} conditions to remove 2 tokens from.
-					from: 1
-					to: memory(availableConditions)
-					memorize: chosenNumber
+					count: {
+						type: Range
+						from: 1
+						to: {
+							type: ForEachYouCanSpot
+							filter: condition,HasCultureTokenCount(2,rohan)
+						}
+					}
+					select: choose(HasCultureTokenCount(2,rohan))
+					memorize: chosenConditions
 				}
 				{
-					type: Repeat
-					times: memory(chosenNumber)
-					effect: {
-						type: RemoveCultureTokens
-						select: choose(HasCultureTokenCount(2,rohan))
-						count: 2
-					}
+					type: RemoveCultureTokens
+					select: memory(chosenConditions)
+					count: 2
 				}				
 			]
 			effect: [
@@ -121,8 +116,8 @@
 					count: 3
 					until: start(regroup)
 					amount: {
-						type: FromMemory
-						memory: chosenNumber
+						type: ForEachInMemory
+						memory: chosenConditions
 					}
 				}
 			]