From 483cb4a0f4710dfe1de3b5d1de560d60fa4377cf Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Sun, 21 Jan 2024 12:50:46 +0100
Subject: [PATCH 1/6] 10 cards

---
 .../java/forge/game/card/CounterEnumType.java     |  2 ++
 .../cardsfolder/upcoming/aftermath_analyst.txt    | 10 ++++++++++
 .../upcoming/blood_spatter_analysis.txt           | 15 +++++++++++++++
 .../cardsfolder/upcoming/ezrim_agency_chief.txt   | 10 ++++++++++
 .../res/cardsfolder/upcoming/felonious_rage.txt   |  8 ++++++++
 forge-gui/res/cardsfolder/upcoming/knife.txt      |  8 ++++++++
 .../res/cardsfolder/upcoming/lost_in_the_maze.txt | 13 +++++++++++++
 .../cardsfolder/upcoming/loxodon_eavesdropper.txt | 10 ++++++++++
 .../cardsfolder/upcoming/scene_of_the_crime.txt   | 10 ++++++++++
 .../cardsfolder/upcoming/treacherous_greed.txt    |  8 ++++++++
 .../cardsfolder/upcoming/undergrowth_recon.txt    |  8 ++++++++
 11 files changed, 102 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/aftermath_analyst.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/blood_spatter_analysis.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/ezrim_agency_chief.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/felonious_rage.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/knife.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/lost_in_the_maze.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/loxodon_eavesdropper.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/scene_of_the_crime.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/treacherous_greed.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/undergrowth_recon.txt

diff --git a/forge-game/src/main/java/forge/game/card/CounterEnumType.java b/forge-game/src/main/java/forge/game/card/CounterEnumType.java
index f706482d3c3..0358ba81541 100644
--- a/forge-game/src/main/java/forge/game/card/CounterEnumType.java
+++ b/forge-game/src/main/java/forge/game/card/CounterEnumType.java
@@ -56,6 +56,8 @@ public enum CounterEnumType {
     BLOOD("BLOOD", 255, 108, 111),
 
     BLOODLINE("BLDLN", 224, 44, 44),
+    
+    BLOODSTAIN("BLDT", 224, 44, 44),
 
     BORE("BORE", 98, 47, 34),
 
diff --git a/forge-gui/res/cardsfolder/upcoming/aftermath_analyst.txt b/forge-gui/res/cardsfolder/upcoming/aftermath_analyst.txt
new file mode 100644
index 00000000000..2de2321925a
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/aftermath_analyst.txt
@@ -0,0 +1,10 @@
+Name:Aftermath Analyst
+ManaCost:1 G
+Types:Creature Elf Detective
+PT:1/3
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMill | TriggerDescription$ When CARDNAME enters the battlefield, mill three cards.
+SVar:TrigMill:DB$ Mill | Defined$ You | NumCards$ 3
+A:AB$ ChangeZoneAll | Cost$ 3 G Sac<1/CARDNAME> | ChangeType$ Land.YouCtrl | Origin$ Graveyard | Destination$ Battlefield | Tapped$ True | SpellDescription$ Return all land cards from your graveyard to the battlefield tapped.
+DeckHas:Ability$Mill|Sacrifice|Graveyard
+DeckHints:Ability$Mill|Graveyard
+Oracle:\nWhen Aftermath Analyst enters the battlefield, mill three cards.\n{3}{G}, Sacrifice Aftermath Analyst: Return all land cards from your graveyard to the battlefield tapped.
diff --git a/forge-gui/res/cardsfolder/upcoming/blood_spatter_analysis.txt b/forge-gui/res/cardsfolder/upcoming/blood_spatter_analysis.txt
new file mode 100644
index 00000000000..b65d41b656d
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/blood_spatter_analysis.txt
@@ -0,0 +1,15 @@
+Name:Blood Spatter Analysis
+ManaCost:B R
+Types:Enchantment
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDamage | TriggerDescription$ When CARDNAME enters the battlefield, it deals 3 damage to target creature an opponent controls.
+SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls | NumDmg$ 3
+T:Mode$ ChangesZoneAll | TriggerZones$ Battlefield | ValidCards$ Creature | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigMill | TriggerDescription$ Whenever one or more creatures die, mill a card and put a bloodstain counter on CARDNAME. Then sacrifice it if it has five or more bloodstain counters on it. When you do, return target creature card from your graveyard to your hand.
+SVar:TrigMill:DB$ Mill | NumCards$ 1 | Defined$ You | SubAbility$ DBPutCounter
+SVar:DBPutCounter:DB$ PutCounter | CounterType$ BLOODSTAIN | SubAbility$ DBSac
+SVar:DBSac:DB$ Sacrifice | SacValid$ Self | ConditionPresent$ Card.Self+counters_GE5_BLOODSTAIN | RememberSacrificed$ True | SubAbility$ DBTrigger
+SVar:DBTrigger:DB$ ImmediateTrigger | Execute$ TrigChange | RememberObjects$ RememberedCard | ConditionDefined$ Remembered | ConditionPresent$ Card | SubAbility$ DBCleanup | TriggerDescription$ When you do, return target creature card from your graveyard to your hand.
+SVar:TrigChange:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouCtrl
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+DeckHas:Ability$Graveyard|Counters|Mill
+DeckHints:Ability$Graveyard
+Oracle:When Blood Spatter Analysis enters the battlefield, it deals 3 damage to target creature an opponent controls.\nWhenever one or more creatures die, mill a card and put a bloodstain counter on Blood Spatter Analysis. Then sacrifice it if it has five or more bloodstain counters on it. When you do, return target creature card from your graveyard to your hand.
diff --git a/forge-gui/res/cardsfolder/upcoming/ezrim_agency_chief.txt b/forge-gui/res/cardsfolder/upcoming/ezrim_agency_chief.txt
new file mode 100644
index 00000000000..ee4f7a81d28
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/ezrim_agency_chief.txt
@@ -0,0 +1,10 @@
+Name:Ezrim, Agency Chief
+ManaCost:1 W W U U
+Types:Legendary Creature Archon Detective
+PT:5/5
+K:Flying
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigInvestigate | TriggerDescription$ When CARDNAME enters the battlefield, investigate twice. (To investigate, create a colorless Clue artifact token with "{2}, Sacrifice this artifact: Draw a card.")
+SVar:TrigInvestigate:DB$ Investigate | Num$ 2
+A:AB$ Pump | Cost$ 1 Sac<1/Artifact> | Defined$ Self | KWChoice$ Vigilance,Lifelink,Hexproof | SpellDescription$ NICKNAME gains your choice of vigilance, lifelink, or hexproof until end of turn.
+DeckHas:Ability$Token|Sacrifice|LifeGain & Type$Clue|Artifact
+Oracle:Flying\nWhen Ezrim, Agency Chief enters the battlefield, investigate twice. (To investigate, create a Clue token. It's an artifact with "{2}, Sacrifice this artifact: Draw a card.")\n{1}, Sacrifice an artifact: Ezrim gains your choice of vigilance, lifelink, or hexproof until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/felonious_rage.txt b/forge-gui/res/cardsfolder/upcoming/felonious_rage.txt
new file mode 100644
index 00000000000..0a175cd2546
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/felonious_rage.txt
@@ -0,0 +1,8 @@
+Name:Felonious Rage
+ManaCost:R
+Types:Instant
+A:SP$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +2 | KW$ Haste | SubAbility$ DBDelayedTrigger | SpellDescription$ Target creature you control gets +2/+0 and gains haste until end of turn. 
+SVar:DBDelayedTrigger:DB$ DelayedTrigger | Mode$ ChangesZone | RememberObjects$ Targeted | ValidCard$ Card.IsTriggerRemembered | Origin$ Battlefield | Destination$ Graveyard | ThisTurn$ True | Execute$ TrigToken | SpellDescription$ When that creature dies this turn, create a 2/2 white and blue Detective creature token.
+SVar:TrigToken:DB$ Token | TokenScript$ wu_2_2_detective
+DeckHas:Ability$Token & Type$Detective & Color$Blue|White
+Oracle:Target creature you control gets +2/+0 and gains haste until end of turn. When that creature dies this turn, create a 2/2 white and blue Detective creature token.
diff --git a/forge-gui/res/cardsfolder/upcoming/knife.txt b/forge-gui/res/cardsfolder/upcoming/knife.txt
new file mode 100644
index 00000000000..3236eb791c7
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/knife.txt
@@ -0,0 +1,8 @@
+Name:Knife
+ManaCost:R
+Types:Artifact Clue Equipment
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddKeyword$ First Strike | AddPower$ 1 | Condition$ PlayerTurn | Description$ As long as it's your turn, equipped creature gets +1/+0 and has first strike.
+A:AB$ Draw | Cost$ 2 Sac<1/CARDNAME> | SpellDescription$ Draw a card.
+K:Equip:2
+DeckHas:Ability$Sacrifice
+Oracle:As long as it's your turn, equipped creature gets +1/+0 and has first strike.\n{2}, Sacrifice Knife: Draw a card.\nEquip {2}
diff --git a/forge-gui/res/cardsfolder/upcoming/lost_in_the_maze.txt b/forge-gui/res/cardsfolder/upcoming/lost_in_the_maze.txt
new file mode 100644
index 00000000000..04f9379e3e0
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/lost_in_the_maze.txt
@@ -0,0 +1,13 @@
+Name:Lost in the Maze
+ManaCost:X U U 
+Types:Enchantment
+K:Flash
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters the battlefield, tap X target creatures. Put a stun counter on each of those creatures you don't control. (If a permanent with a stun counter would become untapped, remove one from it instead.)
+SVar:TrigTap:DB$ Tap | TargetMin$ X | TargetMax$ X | RememberTapped$ True | ValidTgts$ Creature | SubAbility$ DBCounter | TgtPrompt$ Select target creatures
+SVar:DBCounter:DB$ PutCounterAll | ValidCards$ Creature.IsRemembered+YouDontCtrl | CounterType$ Stun | CounterNum$ 1 | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+S:Mode$ Continuous | Affected$ Creature.YouCtrl+tapped | AddKeyword$ Hexproof | Description$ Tapped creatures you control have hexproof.
+SVar:X:Count$xPaid
+DeckHas:Ability$Counters
+SVar:PlayMain1:TRUE
+Oracle:Flash\nWhen Lost in the Maze enters the battlefield, tap X target creatures. Put a stun counter on each of those creatures you don't control. (If a permanent with a stun counter would become untapped, remove one from it instead.)\nTapped creatures you control have hexproof.
diff --git a/forge-gui/res/cardsfolder/upcoming/loxodon_eavesdropper.txt b/forge-gui/res/cardsfolder/upcoming/loxodon_eavesdropper.txt
new file mode 100644
index 00000000000..39f654413eb
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/loxodon_eavesdropper.txt
@@ -0,0 +1,10 @@
+Name:Loxodon Eavesdropper
+ManaCost:3 G
+Types:Creature Elephant Detective
+PT:3/3
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigInvestigate | TriggerDescription$ When CARDNAME enters the battlefield, investigate. (Create a Clue token. It's an artifact with "{2}, Sacrifice this artifact: Draw a card.")
+SVar:TrigInvestigate:DB$ Investigate | Num$ 1
+T:Mode$ Drawn | ValidCard$ Card.YouCtrl | Number$ 2 | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever you draw your second card each turn, CARDNAME gets +1/+1 and gains vigilance until end of turn.
+SVar:TrigPump:DB$ Pump | Defined$ Self | KW$ Vigilance | NumAtt$ 1 | NumDef$ 1
+DeckHas:Ability$Token|Sacrifice & Type$Artifact|Clue
+Oracle:When Loxodon Eavesdropper enters the battlefield, investigate. (Create a Clue token. It's an artifact with "{2}, Sacrifice this artifact: Draw a card.")\nWhenever you draw your second card each turn, Loxodon Eavesdropper gets +1/+1 and gains vigilance until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/scene_of_the_crime.txt b/forge-gui/res/cardsfolder/upcoming/scene_of_the_crime.txt
new file mode 100644
index 00000000000..8df056f10eb
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/scene_of_the_crime.txt
@@ -0,0 +1,10 @@
+Name:Scene of the Crime
+ManaCost:no cost
+Types:Artifact Land Clue
+K:CARDNAME enters the battlefield tapped.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T tapXType<1/Creature> | Produced$ Any | SpellDescription$ Add one mana of any color.
+A:AB$ Draw | Cost$ 2 Sac<1/CARDNAME> | SpellDescription$ Draw a card.
+DeckHas:Ability$Sacrifice
+DeckHints:Type$Clue
+Oracle:Scene of the Crime enters the battlefield tapped.\n{T}: Add {C}.\n{T}, Tap an untapped creature you control: Add one mana of any color.\n{2}, Sacrifice Scene of the Crime: Draw a card.
diff --git a/forge-gui/res/cardsfolder/upcoming/treacherous_greed.txt b/forge-gui/res/cardsfolder/upcoming/treacherous_greed.txt
new file mode 100644
index 00000000000..9c0550df39d
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/treacherous_greed.txt
@@ -0,0 +1,8 @@
+Name:Treacherous Greed
+ManaCost:1 W B
+Types:Instant
+A:SP$ Draw | Cost$ B Sac<1/Creature.wasDealtDamageThisTurn/creature that was damaged this turn> | NumCards$ 3 | SubAbility$ DBLoseLife | SpellDescription$ Draw two cards.
+SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ 3 | Defined$ Opponent | SubAbility$ DBGainLife | SpellDescription$ Draw three cards. Each opponent loses 3 life and you gain 3 life.
+SVar:DBGainLife:DB$ GainLife | LifeAmount$ 3
+DeckHas:Ability$Sacrifice|LifeGain
+Oracle:As an additional cost to cast this spell, sacrifice a creature that dealt damage this turn.\nDraw three cards. Each opponent loses 3 life and you gain 3 life.
diff --git a/forge-gui/res/cardsfolder/upcoming/undergrowth_recon.txt b/forge-gui/res/cardsfolder/upcoming/undergrowth_recon.txt
new file mode 100644
index 00000000000..c2864cac7c4
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/undergrowth_recon.txt
@@ -0,0 +1,8 @@
+Name:Undergrowth Recon
+ManaCost:1 G G
+Types:Enchantment
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigChange | TriggerDescription$ At the beginning of your upkeep, return target land card from your graveyard to the battlefield tapped.
+SVar:TrigChange:DB$ ChangeZone | Origin$ Graveyard | Tapped$ True | Destination$ Battlefield | ValidTgts$ Land.YouCtrl
+DeckHints:Ability$Graveyard|Mill|Dredge
+DeckHas:Ability$Graveyard
+Oracle:At the beginning of your upkeep, return target land card from your graveyard to the battlefield tapped.

From c7318c6fedf2c18ed6cd978478e01f98cb20efce Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Sun, 21 Jan 2024 13:51:02 +0100
Subject: [PATCH 2/6] update

---
 forge-gui/res/cardsfolder/upcoming/blood_spatter_analysis.txt | 2 +-
 forge-gui/res/cardsfolder/upcoming/lost_in_the_maze.txt       | 2 +-
 forge-gui/res/cardsfolder/upcoming/treacherous_greed.txt      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/blood_spatter_analysis.txt b/forge-gui/res/cardsfolder/upcoming/blood_spatter_analysis.txt
index b65d41b656d..2291c0825bb 100644
--- a/forge-gui/res/cardsfolder/upcoming/blood_spatter_analysis.txt
+++ b/forge-gui/res/cardsfolder/upcoming/blood_spatter_analysis.txt
@@ -7,7 +7,7 @@ T:Mode$ ChangesZoneAll | TriggerZones$ Battlefield | ValidCards$ Creature | Orig
 SVar:TrigMill:DB$ Mill | NumCards$ 1 | Defined$ You | SubAbility$ DBPutCounter
 SVar:DBPutCounter:DB$ PutCounter | CounterType$ BLOODSTAIN | SubAbility$ DBSac
 SVar:DBSac:DB$ Sacrifice | SacValid$ Self | ConditionPresent$ Card.Self+counters_GE5_BLOODSTAIN | RememberSacrificed$ True | SubAbility$ DBTrigger
-SVar:DBTrigger:DB$ ImmediateTrigger | Execute$ TrigChange | RememberObjects$ RememberedCard | ConditionDefined$ Remembered | ConditionPresent$ Card | SubAbility$ DBCleanup | TriggerDescription$ When you do, return target creature card from your graveyard to your hand.
+SVar:DBTrigger:DB$ ImmediateTrigger | Execute$ TrigChange | ConditionDefined$ Remembered | ConditionPresent$ Card | SubAbility$ DBCleanup | TriggerDescription$ When you do, return target creature card from your graveyard to your hand.
 SVar:TrigChange:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouCtrl
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 DeckHas:Ability$Graveyard|Counters|Mill
diff --git a/forge-gui/res/cardsfolder/upcoming/lost_in_the_maze.txt b/forge-gui/res/cardsfolder/upcoming/lost_in_the_maze.txt
index 04f9379e3e0..67ac39ebe13 100644
--- a/forge-gui/res/cardsfolder/upcoming/lost_in_the_maze.txt
+++ b/forge-gui/res/cardsfolder/upcoming/lost_in_the_maze.txt
@@ -3,7 +3,7 @@ ManaCost:X U U
 Types:Enchantment
 K:Flash
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters the battlefield, tap X target creatures. Put a stun counter on each of those creatures you don't control. (If a permanent with a stun counter would become untapped, remove one from it instead.)
-SVar:TrigTap:DB$ Tap | TargetMin$ X | TargetMax$ X | RememberTapped$ True | ValidTgts$ Creature | SubAbility$ DBCounter | TgtPrompt$ Select target creatures
+SVar:TrigTap:DB$ Tap | TargetMin$ X | TargetMax$ X | RememberTargets$ True | ValidTgts$ Creature | SubAbility$ DBCounter | TgtPrompt$ Select target creatures
 SVar:DBCounter:DB$ PutCounterAll | ValidCards$ Creature.IsRemembered+YouDontCtrl | CounterType$ Stun | CounterNum$ 1 | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 S:Mode$ Continuous | Affected$ Creature.YouCtrl+tapped | AddKeyword$ Hexproof | Description$ Tapped creatures you control have hexproof.
diff --git a/forge-gui/res/cardsfolder/upcoming/treacherous_greed.txt b/forge-gui/res/cardsfolder/upcoming/treacherous_greed.txt
index 9c0550df39d..1618f9faad6 100644
--- a/forge-gui/res/cardsfolder/upcoming/treacherous_greed.txt
+++ b/forge-gui/res/cardsfolder/upcoming/treacherous_greed.txt
@@ -1,7 +1,7 @@
 Name:Treacherous Greed
 ManaCost:1 W B
 Types:Instant
-A:SP$ Draw | Cost$ B Sac<1/Creature.wasDealtDamageThisTurn/creature that was damaged this turn> | NumCards$ 3 | SubAbility$ DBLoseLife | SpellDescription$ Draw two cards.
+A:SP$ Draw | Cost$ B Sac<1/Creature.dealtDamageThisTurn/creature that was damaged this turn> | NumCards$ 3 | SubAbility$ DBLoseLife | SpellDescription$ Draw three cards.
 SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ 3 | Defined$ Opponent | SubAbility$ DBGainLife | SpellDescription$ Draw three cards. Each opponent loses 3 life and you gain 3 life.
 SVar:DBGainLife:DB$ GainLife | LifeAmount$ 3
 DeckHas:Ability$Sacrifice|LifeGain

From 3e8428624c2927a443c5a9719764b5340a065275 Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Sun, 21 Jan 2024 14:22:46 +0100
Subject: [PATCH 3/6] Update lost_in_the_maze.txt

---
 forge-gui/res/cardsfolder/upcoming/lost_in_the_maze.txt | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/lost_in_the_maze.txt b/forge-gui/res/cardsfolder/upcoming/lost_in_the_maze.txt
index 67ac39ebe13..d458ebd7e30 100644
--- a/forge-gui/res/cardsfolder/upcoming/lost_in_the_maze.txt
+++ b/forge-gui/res/cardsfolder/upcoming/lost_in_the_maze.txt
@@ -3,9 +3,8 @@ ManaCost:X U U
 Types:Enchantment
 K:Flash
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters the battlefield, tap X target creatures. Put a stun counter on each of those creatures you don't control. (If a permanent with a stun counter would become untapped, remove one from it instead.)
-SVar:TrigTap:DB$ Tap | TargetMin$ X | TargetMax$ X | RememberTargets$ True | ValidTgts$ Creature | SubAbility$ DBCounter | TgtPrompt$ Select target creatures
-SVar:DBCounter:DB$ PutCounterAll | ValidCards$ Creature.IsRemembered+YouDontCtrl | CounterType$ Stun | CounterNum$ 1 | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:TrigTap:DB$ Tap | TargetMin$ X | TargetMax$ X | ValidTgts$ Creature | SubAbility$ DBCounter | TgtPrompt$ Select target creatures
+SVar:DBCounter:DB$ PutCounter | Defined$ Targeted.YouDontCtrl | CounterType$ Stun | CounterNum$ 1
 S:Mode$ Continuous | Affected$ Creature.YouCtrl+tapped | AddKeyword$ Hexproof | Description$ Tapped creatures you control have hexproof.
 SVar:X:Count$xPaid
 DeckHas:Ability$Counters

From 8bd7dceb8fa5eed683dcb559859430b3b8864a25 Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Sun, 21 Jan 2024 15:37:54 +0100
Subject: [PATCH 4/6] cleanup

---
 forge-game/src/main/java/forge/game/card/CounterEnumType.java | 2 +-
 forge-gui/res/cardsfolder/upcoming/blood_spatter_analysis.txt | 2 +-
 forge-gui/res/cardsfolder/upcoming/ezrim_agency_chief.txt     | 2 +-
 forge-gui/res/cardsfolder/upcoming/felonious_rage.txt         | 2 +-
 forge-gui/res/cardsfolder/upcoming/lost_in_the_maze.txt       | 1 -
 forge-gui/res/cardsfolder/upcoming/treacherous_greed.txt      | 4 ++--
 forge-gui/res/cardsfolder/upcoming/undergrowth_recon.txt      | 4 ++--
 7 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/card/CounterEnumType.java b/forge-game/src/main/java/forge/game/card/CounterEnumType.java
index 0358ba81541..7d35e0f74b0 100644
--- a/forge-game/src/main/java/forge/game/card/CounterEnumType.java
+++ b/forge-game/src/main/java/forge/game/card/CounterEnumType.java
@@ -57,7 +57,7 @@ public enum CounterEnumType {
 
     BLOODLINE("BLDLN", 224, 44, 44),
     
-    BLOODSTAIN("BLDT", 224, 44, 44),
+    BLOODSTAIN("BLDST", 224, 44, 44),
 
     BORE("BORE", 98, 47, 34),
 
diff --git a/forge-gui/res/cardsfolder/upcoming/blood_spatter_analysis.txt b/forge-gui/res/cardsfolder/upcoming/blood_spatter_analysis.txt
index 2291c0825bb..a92ea143373 100644
--- a/forge-gui/res/cardsfolder/upcoming/blood_spatter_analysis.txt
+++ b/forge-gui/res/cardsfolder/upcoming/blood_spatter_analysis.txt
@@ -8,7 +8,7 @@ SVar:TrigMill:DB$ Mill | NumCards$ 1 | Defined$ You | SubAbility$ DBPutCounter
 SVar:DBPutCounter:DB$ PutCounter | CounterType$ BLOODSTAIN | SubAbility$ DBSac
 SVar:DBSac:DB$ Sacrifice | SacValid$ Self | ConditionPresent$ Card.Self+counters_GE5_BLOODSTAIN | RememberSacrificed$ True | SubAbility$ DBTrigger
 SVar:DBTrigger:DB$ ImmediateTrigger | Execute$ TrigChange | ConditionDefined$ Remembered | ConditionPresent$ Card | SubAbility$ DBCleanup | TriggerDescription$ When you do, return target creature card from your graveyard to your hand.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouCtrl
+SVar:TrigChange:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouOwn
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 DeckHas:Ability$Graveyard|Counters|Mill
 DeckHints:Ability$Graveyard
diff --git a/forge-gui/res/cardsfolder/upcoming/ezrim_agency_chief.txt b/forge-gui/res/cardsfolder/upcoming/ezrim_agency_chief.txt
index ee4f7a81d28..09444c2a384 100644
--- a/forge-gui/res/cardsfolder/upcoming/ezrim_agency_chief.txt
+++ b/forge-gui/res/cardsfolder/upcoming/ezrim_agency_chief.txt
@@ -5,6 +5,6 @@ PT:5/5
 K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigInvestigate | TriggerDescription$ When CARDNAME enters the battlefield, investigate twice. (To investigate, create a colorless Clue artifact token with "{2}, Sacrifice this artifact: Draw a card.")
 SVar:TrigInvestigate:DB$ Investigate | Num$ 2
-A:AB$ Pump | Cost$ 1 Sac<1/Artifact> | Defined$ Self | KWChoice$ Vigilance,Lifelink,Hexproof | SpellDescription$ NICKNAME gains your choice of vigilance, lifelink, or hexproof until end of turn.
+A:AB$ Pump | Cost$ 1 Sac<1/Artifact> | Defined$ Self | StackDescription$ SpellDescription | KWChoice$ Vigilance,Lifelink,Hexproof | SpellDescription$ NICKNAME gains your choice of vigilance, lifelink, or hexproof until end of turn.
 DeckHas:Ability$Token|Sacrifice|LifeGain & Type$Clue|Artifact
 Oracle:Flying\nWhen Ezrim, Agency Chief enters the battlefield, investigate twice. (To investigate, create a Clue token. It's an artifact with "{2}, Sacrifice this artifact: Draw a card.")\n{1}, Sacrifice an artifact: Ezrim gains your choice of vigilance, lifelink, or hexproof until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/felonious_rage.txt b/forge-gui/res/cardsfolder/upcoming/felonious_rage.txt
index 0a175cd2546..ef1efc042d5 100644
--- a/forge-gui/res/cardsfolder/upcoming/felonious_rage.txt
+++ b/forge-gui/res/cardsfolder/upcoming/felonious_rage.txt
@@ -1,7 +1,7 @@
 Name:Felonious Rage
 ManaCost:R
 Types:Instant
-A:SP$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +2 | KW$ Haste | SubAbility$ DBDelayedTrigger | SpellDescription$ Target creature you control gets +2/+0 and gains haste until end of turn. 
+A:SP$ Pump | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | NumAtt$ +2 | KW$ Haste | SubAbility$ DBDelayedTrigger | SpellDescription$ Target creature you control gets +2/+0 and gains haste until end of turn. 
 SVar:DBDelayedTrigger:DB$ DelayedTrigger | Mode$ ChangesZone | RememberObjects$ Targeted | ValidCard$ Card.IsTriggerRemembered | Origin$ Battlefield | Destination$ Graveyard | ThisTurn$ True | Execute$ TrigToken | SpellDescription$ When that creature dies this turn, create a 2/2 white and blue Detective creature token.
 SVar:TrigToken:DB$ Token | TokenScript$ wu_2_2_detective
 DeckHas:Ability$Token & Type$Detective & Color$Blue|White
diff --git a/forge-gui/res/cardsfolder/upcoming/lost_in_the_maze.txt b/forge-gui/res/cardsfolder/upcoming/lost_in_the_maze.txt
index d458ebd7e30..f2c5d6b6cbb 100644
--- a/forge-gui/res/cardsfolder/upcoming/lost_in_the_maze.txt
+++ b/forge-gui/res/cardsfolder/upcoming/lost_in_the_maze.txt
@@ -8,5 +8,4 @@ SVar:DBCounter:DB$ PutCounter | Defined$ Targeted.YouDontCtrl | CounterType$ Stu
 S:Mode$ Continuous | Affected$ Creature.YouCtrl+tapped | AddKeyword$ Hexproof | Description$ Tapped creatures you control have hexproof.
 SVar:X:Count$xPaid
 DeckHas:Ability$Counters
-SVar:PlayMain1:TRUE
 Oracle:Flash\nWhen Lost in the Maze enters the battlefield, tap X target creatures. Put a stun counter on each of those creatures you don't control. (If a permanent with a stun counter would become untapped, remove one from it instead.)\nTapped creatures you control have hexproof.
diff --git a/forge-gui/res/cardsfolder/upcoming/treacherous_greed.txt b/forge-gui/res/cardsfolder/upcoming/treacherous_greed.txt
index 1618f9faad6..afe3dca5574 100644
--- a/forge-gui/res/cardsfolder/upcoming/treacherous_greed.txt
+++ b/forge-gui/res/cardsfolder/upcoming/treacherous_greed.txt
@@ -1,8 +1,8 @@
 Name:Treacherous Greed
 ManaCost:1 W B
 Types:Instant
-A:SP$ Draw | Cost$ B Sac<1/Creature.dealtDamageThisTurn/creature that was damaged this turn> | NumCards$ 3 | SubAbility$ DBLoseLife | SpellDescription$ Draw three cards.
-SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ 3 | Defined$ Opponent | SubAbility$ DBGainLife | SpellDescription$ Draw three cards. Each opponent loses 3 life and you gain 3 life.
+A:SP$ Draw | Cost$ B Sac<1/Creature.dealtDamageThisTurn/creature that dealt damage this turn> | NumCards$ 3 | SubAbility$ DBLoseLife | SpellDescription$ Draw three cards.
+SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ 3 | Defined$ Opponent | SubAbility$ DBGainLife | SpellDescription$ Each opponent loses 3 life and you gain 3 life.
 SVar:DBGainLife:DB$ GainLife | LifeAmount$ 3
 DeckHas:Ability$Sacrifice|LifeGain
 Oracle:As an additional cost to cast this spell, sacrifice a creature that dealt damage this turn.\nDraw three cards. Each opponent loses 3 life and you gain 3 life.
diff --git a/forge-gui/res/cardsfolder/upcoming/undergrowth_recon.txt b/forge-gui/res/cardsfolder/upcoming/undergrowth_recon.txt
index c2864cac7c4..93e1380c6ef 100644
--- a/forge-gui/res/cardsfolder/upcoming/undergrowth_recon.txt
+++ b/forge-gui/res/cardsfolder/upcoming/undergrowth_recon.txt
@@ -2,7 +2,7 @@ Name:Undergrowth Recon
 ManaCost:1 G G
 Types:Enchantment
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigChange | TriggerDescription$ At the beginning of your upkeep, return target land card from your graveyard to the battlefield tapped.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Graveyard | Tapped$ True | Destination$ Battlefield | ValidTgts$ Land.YouCtrl
-DeckHints:Ability$Graveyard|Mill|Dredge
+SVar:TrigChange:DB$ ChangeZone | Origin$ Graveyard | Tapped$ True | TgtPrompt$ Select target land card in your graveyard | Destination$ Battlefield | ValidTgts$ Land.YouOwn
+DeckHints:Ability$Graveyard|Mill|Dredge|Discard
 DeckHas:Ability$Graveyard
 Oracle:At the beginning of your upkeep, return target land card from your graveyard to the battlefield tapped.

From c93485cef61b26d6f016f60effc36e8868abdcf7 Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Sun, 21 Jan 2024 16:05:47 +0100
Subject: [PATCH 5/6] Update treacherous_greed.txt

---
 forge-gui/res/cardsfolder/upcoming/treacherous_greed.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/treacherous_greed.txt b/forge-gui/res/cardsfolder/upcoming/treacherous_greed.txt
index afe3dca5574..42d7055bc7c 100644
--- a/forge-gui/res/cardsfolder/upcoming/treacherous_greed.txt
+++ b/forge-gui/res/cardsfolder/upcoming/treacherous_greed.txt
@@ -1,7 +1,7 @@
 Name:Treacherous Greed
 ManaCost:1 W B
 Types:Instant
-A:SP$ Draw | Cost$ B Sac<1/Creature.dealtDamageThisTurn/creature that dealt damage this turn> | NumCards$ 3 | SubAbility$ DBLoseLife | SpellDescription$ Draw three cards.
+A:SP$ Draw | Cost$ 1 W B Sac<1/Creature.dealtDamageThisTurn/creature that dealt damage this turn> | NumCards$ 3 | SubAbility$ DBLoseLife | SpellDescription$ Draw three cards.
 SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ 3 | Defined$ Opponent | SubAbility$ DBGainLife | SpellDescription$ Each opponent loses 3 life and you gain 3 life.
 SVar:DBGainLife:DB$ GainLife | LifeAmount$ 3
 DeckHas:Ability$Sacrifice|LifeGain

From 0049d4d704c685018aaed2dbe4cb28ae300b438f Mon Sep 17 00:00:00 2001
From: Northmoc <timothy.s.mocny@gmail.com>
Date: Sun, 21 Jan 2024 17:39:47 -0500
Subject: [PATCH 6/6] small tweaks

---
 forge-gui/res/cardsfolder/upcoming/aftermath_analyst.txt    | 2 +-
 forge-gui/res/cardsfolder/upcoming/ezrim_agency_chief.txt   | 2 +-
 forge-gui/res/cardsfolder/upcoming/loxodon_eavesdropper.txt | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/aftermath_analyst.txt b/forge-gui/res/cardsfolder/upcoming/aftermath_analyst.txt
index 2de2321925a..bad20951782 100644
--- a/forge-gui/res/cardsfolder/upcoming/aftermath_analyst.txt
+++ b/forge-gui/res/cardsfolder/upcoming/aftermath_analyst.txt
@@ -7,4 +7,4 @@ SVar:TrigMill:DB$ Mill | Defined$ You | NumCards$ 3
 A:AB$ ChangeZoneAll | Cost$ 3 G Sac<1/CARDNAME> | ChangeType$ Land.YouCtrl | Origin$ Graveyard | Destination$ Battlefield | Tapped$ True | SpellDescription$ Return all land cards from your graveyard to the battlefield tapped.
 DeckHas:Ability$Mill|Sacrifice|Graveyard
 DeckHints:Ability$Mill|Graveyard
-Oracle:\nWhen Aftermath Analyst enters the battlefield, mill three cards.\n{3}{G}, Sacrifice Aftermath Analyst: Return all land cards from your graveyard to the battlefield tapped.
+Oracle:When Aftermath Analyst enters the battlefield, mill three cards.\n{3}{G}, Sacrifice Aftermath Analyst: Return all land cards from your graveyard to the battlefield tapped.
diff --git a/forge-gui/res/cardsfolder/upcoming/ezrim_agency_chief.txt b/forge-gui/res/cardsfolder/upcoming/ezrim_agency_chief.txt
index 09444c2a384..b4d3eddfc09 100644
--- a/forge-gui/res/cardsfolder/upcoming/ezrim_agency_chief.txt
+++ b/forge-gui/res/cardsfolder/upcoming/ezrim_agency_chief.txt
@@ -6,5 +6,5 @@ K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigInvestigate | TriggerDescription$ When CARDNAME enters the battlefield, investigate twice. (To investigate, create a colorless Clue artifact token with "{2}, Sacrifice this artifact: Draw a card.")
 SVar:TrigInvestigate:DB$ Investigate | Num$ 2
 A:AB$ Pump | Cost$ 1 Sac<1/Artifact> | Defined$ Self | StackDescription$ SpellDescription | KWChoice$ Vigilance,Lifelink,Hexproof | SpellDescription$ NICKNAME gains your choice of vigilance, lifelink, or hexproof until end of turn.
-DeckHas:Ability$Token|Sacrifice|LifeGain & Type$Clue|Artifact
+DeckHas:Ability$Token|Sacrifice|LifeGain|Investigate & Type$Clue|Artifact
 Oracle:Flying\nWhen Ezrim, Agency Chief enters the battlefield, investigate twice. (To investigate, create a Clue token. It's an artifact with "{2}, Sacrifice this artifact: Draw a card.")\n{1}, Sacrifice an artifact: Ezrim gains your choice of vigilance, lifelink, or hexproof until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/loxodon_eavesdropper.txt b/forge-gui/res/cardsfolder/upcoming/loxodon_eavesdropper.txt
index 39f654413eb..154d8de1de4 100644
--- a/forge-gui/res/cardsfolder/upcoming/loxodon_eavesdropper.txt
+++ b/forge-gui/res/cardsfolder/upcoming/loxodon_eavesdropper.txt
@@ -6,5 +6,5 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S
 SVar:TrigInvestigate:DB$ Investigate | Num$ 1
 T:Mode$ Drawn | ValidCard$ Card.YouCtrl | Number$ 2 | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever you draw your second card each turn, CARDNAME gets +1/+1 and gains vigilance until end of turn.
 SVar:TrigPump:DB$ Pump | Defined$ Self | KW$ Vigilance | NumAtt$ 1 | NumDef$ 1
-DeckHas:Ability$Token|Sacrifice & Type$Artifact|Clue
+DeckHas:Ability$Investigate|Token|Sacrifice & Type$Artifact|Clue
 Oracle:When Loxodon Eavesdropper enters the battlefield, investigate. (Create a Clue token. It's an artifact with "{2}, Sacrifice this artifact: Draw a card.")\nWhenever you draw your second card each turn, Loxodon Eavesdropper gets +1/+1 and gains vigilance until end of turn.