From c260f65ce600f6000992a806fbea40fd1b7ad744 Mon Sep 17 00:00:00 2001
From: Christian 'ketura' McCarty <hyperlink.teltura@gmail.com>
Date: Sat, 9 Nov 2024 14:34:55 -0600
Subject: [PATCH] Fixed Derurin's target filter. Fixed Shards of Narsil
 selection method.

---
 .../cards/official/set03/set03-Gondor.hjson   | 19 +++++++++++++++----
 .../cards/official/set07/set07-Gondor.hjson   |  2 +-
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set03/set03-Gondor.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set03/set03-Gondor.hjson
index 76e2d0aee..d224f77cd 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set03/set03-Gondor.hjson
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set03/set03-Gondor.hjson
@@ -352,10 +352,21 @@
 					type: addTwilight
 					amount: 1
 				}
-				effect: {
-					type: putStackedCardsIntoHand
-					on: self
-				}
+				effect: [
+					{
+						type: ChooseCardsFromSingleStack
+						select: choose(any)
+						count: 1
+						on: self
+						memorize: chosenCard
+						text: Choose a card to take into hand
+					}
+					{
+						type: putStackedCardsIntoHand
+						select: memory(chosenCard)
+						on: self
+					}
+				]
 			}
 		]
 		gametext: Plays to your support area.<br><b>Fellowship:</b> Stack a [gondor] card from hand here.<br><b>Fellowship:</b> Add (1) to take a card stacked here into hand.
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set07/set07-Gondor.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set07/set07-Gondor.hjson
index f0405b937..d07e82917 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set07/set07-Gondor.hjson
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set07/set07-Gondor.hjson
@@ -458,7 +458,7 @@
 				}
 				effect: {
 					type: discard
-					select: choose(engine,machine,possession)
+					select: choose(or(engine,machine,possession))
 				}
 			}
 		]