From e4493e227a6cd3a2a70c95b1dad9b0eff9e8a0c4 Mon Sep 17 00:00:00 2001
From: Christian 'ketura' McCarty <hyperlink.teltura@gmail.com>
Date: Sun, 2 Jun 2024 13:51:23 -0500
Subject: [PATCH] Cleaning up V2 cards to match the new card definitions

---
 .../pc/setV02/setv02-Elven-playtest.hjson     |  6 +--
 .../pc/setV02/setv02-Gondor-playtest.hjson    | 39 ++++++++++---------
 .../build/LotroCardBlueprintBuilder.java      |  1 +
 3 files changed, 25 insertions(+), 21 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 ded34b0db..839b7a2ba 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
@@ -59,18 +59,18 @@
 			# 	filter: Elf,valiant
 			# }
 			{
-				type: activatedtrigger
+				type: Response
 				trigger: {
 					type: abouttodiscard
 					filter: culture(elven),rangedWeapon
 				}
 				cost: {
 					type: exert
-					filter: self
+					select: self
 				}
 				effect: {
 					type: preventDiscard
-					filter: choose(culture(elven),rangedWeapon)
+					select: choose(culture(elven),rangedWeapon)
 				}
 			}
 		]
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/setv02-Gondor-playtest.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/setv02-Gondor-playtest.hjson
index 486271c8e..36fad0800 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/setv02-Gondor-playtest.hjson
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/setv02-Gondor-playtest.hjson
@@ -51,14 +51,14 @@
 				phase: skirmish
 				cost: {
 					type: exert
-					filter: self
+					select: self
 				}
 				effect: {
 					type: modifyStrength
-					filter: choose(valiant,companion,inSkirmish)
+					select: choose(valiant,companion,inSkirmish)
 					memorize: chosenCompanion
 					amount: {
-						type: requires
+						type: Conditional
 						requires: {
 							type: memoryMatches
 							memory: chosenCompanion
@@ -107,14 +107,14 @@
 			type: event
 			cost: {
 				type: exert
-				filter: choose(name(Aragorn))
+				select: choose(name(Aragorn))
 				memorize: exertedCompanion
 				times: 3
 			}
 			effect: [
 				{
 					type: modifyStrength
-					filter: all(valiant,companion)
+					select: all(valiant,companion)
 					until: start(regroup)
 					amount: 2
 				}
@@ -127,7 +127,7 @@
 					}
 					effect: {
 						type: modifyStrength
-						filter: all(valiant,companion)
+						select: all(valiant,companion)
 						until: endOfTurn
 						amount: 1
 					}
@@ -178,7 +178,7 @@
 					type: modifyStrength
 					filter: culture(gondor),companion
 					amount: {
-						type: requires
+						type: Conditional
 						requires: {
 							type: IsGreaterThanOrEqual
 							firstNumber: {
@@ -205,13 +205,13 @@
 				cost: [
 					{
 						type: spot
-						filter: choose(culture(gondor),companion)
+						select: choose(culture(gondor),companion)
 						memorize: chosenGondorian
 					}
 					{
 						type: addThreats
 						amount: {
-							type: requires
+							type: Conditional
 							requires: {
 								type: memoryMatches
 								memory: chosenGondorian
@@ -225,13 +225,13 @@
 				effect: [
 					{
 						type: modifyStrength
-						filter: memory(chosenGondorian)
+						select: memory(chosenGondorian)
 						amount: 2
 						until: start(regroup)
 					}
 					{
 						type: addKeyword
-						filter: memory(chosenGondorian)
+						select: memory(chosenGondorian)
 						keyword: defender+1
 						until: start(regroup)
 					}
@@ -276,26 +276,29 @@
 		signet: Frodo
 		resistance: 6
 		keywords: Ranger
-		requires: {
-			type: canSpot
-			filter: ranger
-		}
 		effects: [
+			{
+				type: ToPlay
+				requires: {
+					type: canSpot
+					filter: ranger
+				}
+			}
 			{
 				type: activated
 				phase: skirmish
 				cost: {
 					type: discardFromHand
 					count: 1
-					filter: choose(culture(gondor))
+					select: choose(culture(gondor))
 					forced: false
 				}
 				effect: {
 					type: wound
-					filter: choose(minion,inSkirmishAgainst(self),roaming)
+					select: choose(minion,inSkirmishAgainst(self),roaming)
 					memorize: chosenMinion
 					times: {
-						type: requires
+						type: Conditional
 						requires: {
 							type: memoryMatches
 							memory: chosenMinion
diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/LotroCardBlueprintBuilder.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/LotroCardBlueprintBuilder.java
index 467112298..cb353e9ae 100644
--- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/LotroCardBlueprintBuilder.java
+++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/LotroCardBlueprintBuilder.java
@@ -34,6 +34,7 @@ public class LotroCardBlueprintBuilder implements CardGenerationEnvironment {
         fieldProcessors.put("keyword", new KeywordFieldProcessor());
         fieldProcessors.put("keywords", new KeywordFieldProcessor());
         fieldProcessors.put("timeword", new TimewordFieldProcessor());
+        fieldProcessors.put("timewords", new TimewordFieldProcessor());
         fieldProcessors.put("twilight", new TwilightCostFieldProcessor());
         fieldProcessors.put("strength", new StrengthFieldProcessor());
         fieldProcessors.put("vitality", new VitalityFieldProcessor());