From 0998be8436f2d3987310cadbf51ab729b4825c08 Mon Sep 17 00:00:00 2001
From: Christian 'ketura' McCarty <hyperlink.teltura@gmail.com>
Date: Sun, 8 Dec 2024 17:02:39 -0600
Subject: [PATCH] Fixing black sails of umbar not self-discarding

---
 .../cards/official/set08/set08-Raider.hjson   | 70 ++++++++++---------
 1 file changed, 38 insertions(+), 32 deletions(-)

diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Raider.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Raider.hjson
index dc6f38bb5..642cd0eb1 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Raider.hjson
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Raider.hjson
@@ -91,47 +91,53 @@
 						multiplier: -1
 					}
 				}
-				effect: {
-					type: CostToEffect
-					cost: {
-						type: chooseANumber
-						text: Choose how many {raider} tokens to remove
-						from: 0
-						to: {
-							type: ForEachCultureToken
-							culture: raider
-							filter: self
-						}
-						memorize: tokenCount
-					}
-					effect: {
+				effect: [
+					{
 						type: CostToEffect
 						cost: {
-							type: RemoveCultureTokens
-							culture: raider
-							select: self
-							count: {
-								type: fromMemory
-								memory: tokenCount
-							}
-						}
-						effect: {
-							type: playCardFromDiscard
-							select: choose(corsair)
-							maxDiscount: {
+							type: chooseANumber
+							text: Choose how many {raider} tokens to remove
+							from: 0
+							to: {
 								type: ForEachCultureToken
 								culture: raider
 								filter: self
-								multiplier: -1
 							}
-							discount: {
-								type: fromMemory
-								memory: tokenCount
-								multiplier: -1
+							memorize: tokenCount
+						}
+						effect: {
+							type: CostToEffect
+							cost: {
+								type: RemoveCultureTokens
+								culture: raider
+								select: self
+								count: {
+									type: fromMemory
+									memory: tokenCount
+								}
+							}
+							effect: {
+								type: playCardFromDiscard
+								select: choose(corsair)
+								maxDiscount: {
+									type: ForEachCultureToken
+									culture: raider
+									filter: self
+									multiplier: -1
+								}
+								discount: {
+									type: fromMemory
+									memory: tokenCount
+									multiplier: -1
+								}
 							}
 						}
 					}
-				}
+					{
+						type: Discard
+						select: self
+					}
+				]
 			}
 		]
 		gametext: When you play this possession, you may add a [raider] token here.<br><b>Shadow:</b> Remove X [raider] tokens here to play a corsair from your discard pile; its twilight cost is -X. Discard this possession.