From afb83d5ec9d86bd98b3f649250ae9c9cf5fb81ef Mon Sep 17 00:00:00 2001
From: PhallenCassidy <leoplurodyn@gmail.com>
Date: Mon, 24 Mar 2025 16:52:20 -0400
Subject: [PATCH] Fix for Borders of the Forest

Workaround for the effect is no longer required, and also broken.
---
 .../hobbit/set33/set33-shadow.hjson           | 60 +++++--------------
 1 file changed, 16 insertions(+), 44 deletions(-)

diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set33/set33-shadow.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set33/set33-shadow.hjson
index 243ec4d8b..973e7c78c 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set33/set33-shadow.hjson
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set33/set33-shadow.hjson
@@ -379,54 +379,26 @@
 					}
 					{
 						type: canSpot
-						filter: culture(gundabad),orc
+						filter: culture(gundabad),orc,assignableToSkirmishAgainst(name(Bilbo))
 					}
 				]
-				effect: [
-					{
-						type: chooseActiveCards
-						text: Choose minion to assign to Bilbo
-						select: choose(culture(gundabad),orc,assignableToSkirmishAgainst(name(Bilbo)))
-						memorize: chosenMinion
+				effect: {
+					type: assignFpCharacterToSkirmish
+					fpCharacter: choose(name(Bilbo))
+					minion: choose(culture(gundabad),orc,assignableToSkirmishAgainst(name(Bilbo)))
+					memorizeFPCharacter: bilbo
+					memorizeMinion: chosenMinion
+					preventText: Would you like to add a burden and assign {chosenMinion} to prevent assigning Bilbo to that minion?
+					preventCost: {
+						type: addBurdens
 					}
-					{
-						type: optional
-						player: fp
-						text: Would you like to add a doubt to assign {chosenMinion} to a companion?
-						effect: [
-							{
-								type: addBurdens
-							}
-							{
-								type: assignFpCharacterToSkirmish
-								player: fp
-								fpCharacter: choose(companion)
-								minion: choose(memory(chosenMinion))
-							}
-						]
+					insteadEffect: {
+						type: assignFpCharacterToSkirmish
+						player: free people
+						fpCharacter: choose(any)
+						minion: choose(memory(chosenMinion))
 					}
-					{
-						type: preventable
-						player: fp
-						text: assignFpCharacterToSkirmish doesn't work here for some reason, so this cost registers as unable to be attempted and the effect assigns the minion if the FP passed on the optional above
-						cost: [
-							{
-								type: addBurdens
-							}
-							{
-								type: assignFpCharacterToSkirmish
-								player: shadowPlayer
-								fpCharacter: choose(companion)
-								minion: choose(memory(chosenMinion))
-							}
-						]
-						effect: {
-							type: assignFpCharacterToSkirmish
-							fpCharacter: choose(name(Bilbo))
-							minion: choose(memory(chosenMinion))
-						}
-					}
-				]
+				}
 			}
 		]
 	}