From 56ab98bdce348ae21068b2ca6b128b1ad9422619 Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Wed, 30 Aug 2023 22:03:29 +0200
Subject: [PATCH 1/5] update

---
 .../upcoming/galvanic_giant_storm_reading.txt | 19 ++++++++++++++++++
 .../gingerbread_hunter_puny_snack.txt         | 17 ++++++++++++++++
 .../upcoming/gnawing_crescendo.txt            |  9 +++++++++
 .../upcoming/goddric_cloaked_reveler.txt      | 11 ++++++++++
 .../upcoming/grabby_giant_thats_mine.txt      | 18 +++++++++++++++++
 .../upcoming/graceful_takedown.txt            | 10 ++++++++++
 .../cardsfolder/upcoming/grand_ball_guest.txt |  7 +++++++
 .../upcoming/greta_sweettooth_scourge.txt     | 11 ++++++++++
 .../cardsfolder/upcoming/gruff_triplets.txt   | 12 +++++++++++
 .../gumdrop_poisoner_tempt_with_treats.txt    | 20 +++++++++++++++++++
 10 files changed, 134 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/galvanic_giant_storm_reading.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/gingerbread_hunter_puny_snack.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/gnawing_crescendo.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/goddric_cloaked_reveler.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/grabby_giant_thats_mine.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/graceful_takedown.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/grand_ball_guest.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/greta_sweettooth_scourge.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/gruff_triplets.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/gumdrop_poisoner_tempt_with_treats.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/galvanic_giant_storm_reading.txt b/forge-gui/res/cardsfolder/upcoming/galvanic_giant_storm_reading.txt
new file mode 100644
index 00000000000..f3506e6b7ac
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/galvanic_giant_storm_reading.txt
@@ -0,0 +1,19 @@
+Name:Galvanic Giant
+ManaCost:3 U
+Types:Creature Giant Wizard
+PT:3/3
+T:Mode$ SpellCast | ValidCard$ Creature.cmcGE5 | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigTap | TriggerDescription$ Whenever you cast a spell with mana value 5 or greater, tap target creature an opponent controls and put a stun counter on it.
+SVar:TrigTap:DB$ Tap | ValidTgts$ Artifact.OppCtrl,Creature.OppCtrl | SubAbility$ DBCounter | TgtPrompt$ Select target creature an opponent controls
+SVar:DBCounter:DB$ PutCounter | Defined$ Targeted | CounterType$ Stun | CounterNum$ 1
+DeckHas:Ability$Counters|Discard
+AlternateMode:Adventure
+Oracle:Whenever you cast a spell with mana value 5 or greater, tap target creature an opponent controls and put a stun counter on it.
+
+ALTERNATE
+
+Name:Storm Reading
+ManaCost:5 U U
+Types:Instant Adventure
+A:SP$ Draw | NumCards$ 4 | SubAbility$ DBDiscard | SpellDescription$ Draw four cards, then discard two cards. (Then exile this card. You may cast the creature later from exile.)
+SVar:DBDiscard:DB$ Discard | Defined$ You | NumCards$ 2 | Mode$ TgtChoose
+Oracle:Draw four cards, then discard two cards. (Then exile this card. You may cast the creature later from exile.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/gingerbread_hunter_puny_snack.txt b/forge-gui/res/cardsfolder/upcoming/gingerbread_hunter_puny_snack.txt
new file mode 100644
index 00000000000..5d19f976eec
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/gingerbread_hunter_puny_snack.txt
@@ -0,0 +1,17 @@
+Name:Gingerbread Hunter
+ManaCost:4 G
+Types:Creature Giant
+PT:5/5
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigFood | TriggerDescription$ When CARDNAME enters the battlefield, create a Food token. (It's an artifact with "{2}, {T}, Sacrifice this artifact: You gain 3 life.")
+SVar:TrigFood:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_food_sac | TokenOwner$ You
+DeckHas:Ability$Token & Type$Artifact|Food
+AlternateMode:Adventure
+Oracle:When Gingerbread Hunter enters the battlefield, create a Food token. (It's an artifact with "{2}, {T}, Sacrifice this artifact: You gain 3 life.")
+
+ALTERNATE
+
+Name:Puny Snack
+ManaCost:2 B
+Types:Instant Adventure
+A:SP$ Pump | ValidTgts$ Creature | NumAtt$ -2 | NumDef$ -2 | IsCurse$ True | SpellDescription$ Target creature gets -2/-2 until end of turn. (Then exile this card. You may cast the creature later from exile.)
+Oracle:Target creature gets -2/-2 until end of turn. (Then exile this card. You may cast the creature later from exile.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/gnawing_crescendo.txt b/forge-gui/res/cardsfolder/upcoming/gnawing_crescendo.txt
new file mode 100644
index 00000000000..a83137752d7
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/gnawing_crescendo.txt
@@ -0,0 +1,9 @@
+Name:Gnawing Crescendo
+ManaCost:2 R
+Types:Instant
+A:SP$ PumpAll | ValidCards$ Creature.YouCtrl | NumAtt$ 2 | SubAbility$ DBEffect | SpellDescription$ Creatures you control get +2/+0 until end of turn. Whenever a nontoken creature you control dies this turn, create a 1/1 black Rat creature token with "This creature can't block."
+SVar:DBEffect:DB$ Effect | Triggers$ DiesTrig
+SVar:DiesTrig:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.nonToken+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever a nontoken creature you control dies this turn, create a 1/1 black Rat creature token with "This creature can't block."
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ b_1_1_rat_noblock | TokenOwner$ You
+DeckHas:Ability$Token & Type$Rat
+Oracle:Creatures you control get +2/+0 until end of turn. Whenever a nontoken creature you control dies this turn, create a 1/1 black Rat creature token with "This creature can't block."
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/goddric_cloaked_reveler.txt b/forge-gui/res/cardsfolder/upcoming/goddric_cloaked_reveler.txt
new file mode 100644
index 00000000000..f68aa174572
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/goddric_cloaked_reveler.txt
@@ -0,0 +1,11 @@
+Name:Goddric, Cloaked Reveler
+ManaCost:1 R R
+Types:Legendary Creature Human Noble
+PT:3/3
+K:Haste
+S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 4 | SetToughness$ 4 | AddAbility$ DragonPump | AddType$ Dragon | RemoveCreatureTypes$ True | AddKeyword$ Flying | CheckSVar$ Celebration | SVarCompare$ GE2 | Description$ Celebration — As long as two or more nonland permanents entered the battlefield under your control this turn, CARDNAME is a Dragon with base power and toughness 4/4, flying, and "{R}: Dragons you control get +1/+0 until end of turn." (It loses all other creature types.)
+SVar:DragonPump:AB$ PumpAll | Cost$ R | ValidCards$ Dragon.YouCtrl | NumAtt$ +1 | SpellDescription$ Dragons you control get +1/+0 until end of turn.
+SVar:Celebration:Count$ThisTurnEntered_Battlefield_Permanent.nonLand+YouCtrl
+DeckNeeds:Type$Dragon
+DeckHas:Type$Dragon
+Oracle:Haste\nCelebration — As long as two or more nonland permanents entered the battlefield under your control this turn, Goddric, Cloaked Reveler is a Dragon with base power and toughness 4/4, flying, and "{R}: Dragons you control get +1/+0 until end of turn." (It loses all other creature types.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/grabby_giant_thats_mine.txt b/forge-gui/res/cardsfolder/upcoming/grabby_giant_thats_mine.txt
new file mode 100644
index 00000000000..f199d0f4572
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/grabby_giant_thats_mine.txt
@@ -0,0 +1,18 @@
+Name:Grabby Giant
+ManaCost:3 R
+Types:Creature Giant
+PT:4/3
+K:Reach
+A:AB$ Draw | Cost$ T Sac<1/Artifact;Land/artifact or land> | SpellDescription$ Draw a card.
+DeckHas:Ability$Token|Sacrifice & Type$Treasure|Artifact
+DeckHints:Type$Artifact
+AlternateMode:Adventure
+Oracle:Haste\n{2}{R}, Sacrifice an artifact or land: Draw a card.
+
+ALTERNATE
+
+Name:That's Mine
+ManaCost:1 R
+Types:Instant Adventure
+A:SP$ Token | TokenScript$ c_a_treasure_sac | SpellDescription$ Create a Treasure token. (Then exile this card. You may cast the creature later from exile.)
+Oracle:Create a Treasure token. (Then exile this card. You may cast the creature later from exile.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/graceful_takedown.txt b/forge-gui/res/cardsfolder/upcoming/graceful_takedown.txt
new file mode 100644
index 00000000000..9e48f692c60
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/graceful_takedown.txt
@@ -0,0 +1,10 @@
+Name:Graceful Takedown
+ManaCost:1 G
+Types:Sorcery
+A:SP$ Pump | ValidTgts$ Creature.YouCtrl+enchanted | TargetMin$ 0 | TargetMax$ X | RememberTargets$ True | SubAbility$ DBPumpBis | SpellDescription$ Any number of target enchanted creatures you control and up to one other target creature you control each deal damage equal to their power to target creature you don't control.
+SVar:DBPumpBis:DB$ Pump | ValidTgts$ Creature.YouCtrl | TargetUnique$ True | TargetMin$ 0 | TargetMax 1 | RememberTargets$ True | SubAbility$ DBEachDamage
+SVar:X:Count$Valid Creature.YouCtrl+enchanted
+SVar:DBEachDamage:DB$ EachDamage | ValidTgts$ Creature.YouDontCtrl | TgtPrompt$ Select target creature you don't control | DefinedDamagers$ Remembered | NumDmg$ Count$CardPower | StackDescription$ REP target creature_{c:ThisTargetedCard} | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+DeckHints:Type$Aura
+Oracle:Any number of target enchanted creatures you control and up to one other target creature you control each deal damage equal to their power to target creature you don't control.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/grand_ball_guest.txt b/forge-gui/res/cardsfolder/upcoming/grand_ball_guest.txt
new file mode 100644
index 00000000000..82eabb3c3d4
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/grand_ball_guest.txt
@@ -0,0 +1,7 @@
+Name:Grand Ball Guest
+ManaCost:1 R
+Types:Creature Human Peasant
+PT:2/2
+S:Mode$ Continuous | Affected$ Card.Self | AddToughness$ 1 | AddPower$ 1 | AddKeyword$ Trample | CheckSVar$ Celebration | SVarCompare$ GE2 | Description$ Celebration — CARDNAME gets +1/+1 and has trample as long as two or more nonland permanents entered the battlefield under your control this turn.
+SVar:Celebration:Count$ThisTurnEntered_Battlefield_Permanent.nonLand+YouCtrl
+Oracle:Celebration — Grand Ball Guest gets +1/+1 and has trample as long as two or more nonland permanents entered the battlefield under your control this turn.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/greta_sweettooth_scourge.txt b/forge-gui/res/cardsfolder/upcoming/greta_sweettooth_scourge.txt
new file mode 100644
index 00000000000..c4e208250e7
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/greta_sweettooth_scourge.txt
@@ -0,0 +1,11 @@
+Name:Greta, Sweettooth Scourge
+ManaCost:1 B G
+Types:Legendary Creature Human Warrior
+PT:3/3
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigFood | TriggerDescription$ When CARDNAME enters the battlefield, create a Food token. (It's an artifact with "{2}, {T}, Sacrifice this artifact: You gain 3 life.")
+SVar:TrigFood:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_food_sac | TokenOwner$ You
+A:AB$ PutCounter | Cost$ G Sac<1/Food> | ValidTgts$ Creature | TgtPrompt$ Select target creature | CounterType$ P1P1 | CounterNum$ 1 | SorcerySpeed$ True | SpellDescription$ Put a +1/+1 counter on target creature. Activate only as a sorcery.
+A:AB$ Draw | Cost$ 1 B Sac<1/Food> | SubAbility$ DBLoseLife | SpellDescription$ You draw a card and you lose 1 life.
+SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ 1
+DeckHas:Ability$LifeGain|Token|Food|Sacrifice|Counters & Type$Food|Artifact
+Oracle:When Greta, Sweettooth Scourge enters the battlefield, create a Food token. (It's an artifact with "{2}, {T}, Sacrifice this artifact: You gain 3 life.")\n{G}, Sacrifice a Food: Put a +1/+1 counter on target creature. Activate only as a sorcery.\n{1}{B}, Sacrifice a Food: You draw a card and you lose 1 life.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/gruff_triplets.txt b/forge-gui/res/cardsfolder/upcoming/gruff_triplets.txt
new file mode 100644
index 00000000000..f398d87b98e
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/gruff_triplets.txt
@@ -0,0 +1,12 @@
+Name:Gruff Triplets
+ManaCost:3 G G G
+Types:Creature Satyr Warrior
+PT:3/3
+K:Trample
+T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Card.Self | IsPresent$ Card.Self+nonToken | Execute$ TrigToken | TriggerZones$ Battlefield | TriggerDescription$ When CARDNAME enters the battlefield, if it isn't a token, create two tokens that are copies of it.
+SVar:TrigToken:DB$ CopyPermanent | Defined$ TriggeredCard | NumCopies$ 2
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigCounters | TriggerDescription$ When CARDNAME dies, put a number of +1/+1 counters equal to its power on each creature you control named Gruff Triplets.
+SVar:TrigCounters:DB$ PutCounterAll | ValidCards$ Creature.YouCtrl+namedGruff Triplets | CounterType$ P1P1 | CounterNum$ X
+SVar:X:TriggeredCard$CardPower
+DeckHas:Ability$Token|Counters
+Oracle:Trample\nWhen Gruff Triplets enters the battlefield, if it isn't a token, create two tokens that are copies of it.\nWhen Gruff Triplets dies, put a number of +1/+1 counters equal to its power on each creature you control named Gruff Triplets.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/gumdrop_poisoner_tempt_with_treats.txt b/forge-gui/res/cardsfolder/upcoming/gumdrop_poisoner_tempt_with_treats.txt
new file mode 100644
index 00000000000..f3294f837f4
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/gumdrop_poisoner_tempt_with_treats.txt
@@ -0,0 +1,20 @@
+Name:Gumdrop Poisoner
+ManaCost:2 B
+Types:Creature Human Warlock
+PT:3/2
+K:Lifelink
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | TriggerZones$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDebuff | TriggerDescription$ When CARDNAME enters the battlefield, up to one target creature gets -X/-X until end of turn, where X is the amount of life you gained this turn.
+SVar:TrigDebuff:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select up to one target creature | TargetMin$ 0 | TargetMax$ 1 | NumAtt$ -X | NumDef$ -X | IsCurse$ True
+SVar:X:Count$LifeYouGainedThisTurn
+DeckHas:Ability$LifeGain|Token & Type$Food
+DeckHints:Ability$LifeGain
+AlternateMode:Adventure
+Oracle:Lifelink\nWhen Gumdrop Poisoner enters the battlefield, up to one target creature gets -X/-X until end of turn, where X is the amount of life you gained this turn.
+
+ALTERNATE
+
+Name:Tempt with Treats
+ManaCost:B
+Types:Instant Adventure
+A:SP$ Token | TokenAmount$ 1 | TokenScript$ c_a_food_sac | TokenOwner$ You | SpellDescription$ Create a Food token. (Then exile this card. You may cast the creature later from exile.)
+Oracle:Create a Food token. (Then exile this card. You may cast the creature later from exile.)
\ No newline at end of file

From 3681bf6ffd631920f46a5200bab989f45d6b90f8 Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Wed, 30 Aug 2023 22:05:39 +0200
Subject: [PATCH 2/5] Update galvanic_giant_storm_reading.txt

---
 .../res/cardsfolder/upcoming/galvanic_giant_storm_reading.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/galvanic_giant_storm_reading.txt b/forge-gui/res/cardsfolder/upcoming/galvanic_giant_storm_reading.txt
index f3506e6b7ac..a7d3816a1c0 100644
--- a/forge-gui/res/cardsfolder/upcoming/galvanic_giant_storm_reading.txt
+++ b/forge-gui/res/cardsfolder/upcoming/galvanic_giant_storm_reading.txt
@@ -3,7 +3,7 @@ ManaCost:3 U
 Types:Creature Giant Wizard
 PT:3/3
 T:Mode$ SpellCast | ValidCard$ Creature.cmcGE5 | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigTap | TriggerDescription$ Whenever you cast a spell with mana value 5 or greater, tap target creature an opponent controls and put a stun counter on it.
-SVar:TrigTap:DB$ Tap | ValidTgts$ Artifact.OppCtrl,Creature.OppCtrl | SubAbility$ DBCounter | TgtPrompt$ Select target creature an opponent controls
+SVar:TrigTap:DB$ Tap | ValidTgts$ Creature.OppCtrl | SubAbility$ DBCounter | TgtPrompt$ Select target creature an opponent controls
 SVar:DBCounter:DB$ PutCounter | Defined$ Targeted | CounterType$ Stun | CounterNum$ 1
 DeckHas:Ability$Counters|Discard
 AlternateMode:Adventure
@@ -16,4 +16,4 @@ ManaCost:5 U U
 Types:Instant Adventure
 A:SP$ Draw | NumCards$ 4 | SubAbility$ DBDiscard | SpellDescription$ Draw four cards, then discard two cards. (Then exile this card. You may cast the creature later from exile.)
 SVar:DBDiscard:DB$ Discard | Defined$ You | NumCards$ 2 | Mode$ TgtChoose
-Oracle:Draw four cards, then discard two cards. (Then exile this card. You may cast the creature later from exile.)
\ No newline at end of file
+Oracle:Draw four cards, then discard two cards. (Then exile this card. You may cast the creature later from exile.)

From ce42dea2f539a3c6d017e054a54a507147edbaf1 Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Thu, 31 Aug 2023 22:42:26 +0200
Subject: [PATCH 3/5] update

---
 .../upcoming/galvanic_giant_storm_reading.txt  |  2 +-
 .../upcoming/grabby_giant_thats_mine.txt       |  2 +-
 .../cardsfolder/upcoming/gruff_triplets.txt    |  2 +-
 .../cardsfolder/upcoming/hamlet_glutton.txt    | 13 +++++++++++++
 .../upcoming/harried_spearguard.txt            | 10 ++++++++++
 .../heartflame_duelist_heartflame_slash.txt    | 17 +++++++++++++++++
 .../horned_loch_whale_lagoon_breach.txt        | 18 ++++++++++++++++++
 .../cardsfolder/upcoming/regal_bunnicorn.txt   |  7 +++++++
 8 files changed, 68 insertions(+), 3 deletions(-)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/hamlet_glutton.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/harried_spearguard.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/heartflame_duelist_heartflame_slash.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/horned_loch_whale_lagoon_breach.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/regal_bunnicorn.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/galvanic_giant_storm_reading.txt b/forge-gui/res/cardsfolder/upcoming/galvanic_giant_storm_reading.txt
index a7d3816a1c0..641a64213f6 100644
--- a/forge-gui/res/cardsfolder/upcoming/galvanic_giant_storm_reading.txt
+++ b/forge-gui/res/cardsfolder/upcoming/galvanic_giant_storm_reading.txt
@@ -2,7 +2,7 @@ Name:Galvanic Giant
 ManaCost:3 U
 Types:Creature Giant Wizard
 PT:3/3
-T:Mode$ SpellCast | ValidCard$ Creature.cmcGE5 | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigTap | TriggerDescription$ Whenever you cast a spell with mana value 5 or greater, tap target creature an opponent controls and put a stun counter on it.
+T:Mode$ SpellCast | ValidCard$ Card.cmcGE5 | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigTap | TriggerDescription$ Whenever you cast a spell with mana value 5 or greater, tap target creature an opponent controls and put a stun counter on it.
 SVar:TrigTap:DB$ Tap | ValidTgts$ Creature.OppCtrl | SubAbility$ DBCounter | TgtPrompt$ Select target creature an opponent controls
 SVar:DBCounter:DB$ PutCounter | Defined$ Targeted | CounterType$ Stun | CounterNum$ 1
 DeckHas:Ability$Counters|Discard
diff --git a/forge-gui/res/cardsfolder/upcoming/grabby_giant_thats_mine.txt b/forge-gui/res/cardsfolder/upcoming/grabby_giant_thats_mine.txt
index f199d0f4572..b1376ef8ce3 100644
--- a/forge-gui/res/cardsfolder/upcoming/grabby_giant_thats_mine.txt
+++ b/forge-gui/res/cardsfolder/upcoming/grabby_giant_thats_mine.txt
@@ -7,7 +7,7 @@ A:AB$ Draw | Cost$ T Sac<1/Artifact;Land/artifact or land> | SpellDescription$ D
 DeckHas:Ability$Token|Sacrifice & Type$Treasure|Artifact
 DeckHints:Type$Artifact
 AlternateMode:Adventure
-Oracle:Haste\n{2}{R}, Sacrifice an artifact or land: Draw a card.
+Oracle:Reach\n{2}{R}, Sacrifice an artifact or land: Draw a card.
 
 ALTERNATE
 
diff --git a/forge-gui/res/cardsfolder/upcoming/gruff_triplets.txt b/forge-gui/res/cardsfolder/upcoming/gruff_triplets.txt
index f398d87b98e..33e98e04991 100644
--- a/forge-gui/res/cardsfolder/upcoming/gruff_triplets.txt
+++ b/forge-gui/res/cardsfolder/upcoming/gruff_triplets.txt
@@ -3,7 +3,7 @@ ManaCost:3 G G G
 Types:Creature Satyr Warrior
 PT:3/3
 K:Trample
-T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Card.Self | IsPresent$ Card.Self+nonToken | Execute$ TrigToken | TriggerZones$ Battlefield | TriggerDescription$ When CARDNAME enters the battlefield, if it isn't a token, create two tokens that are copies of it.
+T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Card.Self+nonToken | Execute$ TrigToken | TriggerZones$ Battlefield | TriggerDescription$ When CARDNAME enters the battlefield, if it isn't a token, create two tokens that are copies of it.
 SVar:TrigToken:DB$ CopyPermanent | Defined$ TriggeredCard | NumCopies$ 2
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigCounters | TriggerDescription$ When CARDNAME dies, put a number of +1/+1 counters equal to its power on each creature you control named Gruff Triplets.
 SVar:TrigCounters:DB$ PutCounterAll | ValidCards$ Creature.YouCtrl+namedGruff Triplets | CounterType$ P1P1 | CounterNum$ X
diff --git a/forge-gui/res/cardsfolder/upcoming/hamlet_glutton.txt b/forge-gui/res/cardsfolder/upcoming/hamlet_glutton.txt
new file mode 100644
index 00000000000..9ff92079c51
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/hamlet_glutton.txt
@@ -0,0 +1,13 @@
+Name:Hamlet Glutton
+ManaCost:5 G G
+Types:Creature Giant
+PT:6/6
+K:Bargain
+K:Trample
+S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ X | EffectZone$ All | Description$This spell costs {2} less to cast if it's bargained.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters the battlefield, you gain 3 life.
+SVar:TrigGainLife:DB$ GainLife | LifeAmount$ 3
+SVar:X:Count$Bargained.2.0
+DeckHas:Ability$Sacrifice|LifeGain
+DeckHints:Type$Token|Enchantment|Artifact
+Oracle:Bargain (You may sacrifice an artifact, enchantment, or token as you cast this spell.)\nThis spell costs {2} less to cast if it's bargained.\nTrample\nWhen Hamlet Glutton enters the battlefield, you gain 3 life.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/harried_spearguard.txt b/forge-gui/res/cardsfolder/upcoming/harried_spearguard.txt
new file mode 100644
index 00000000000..1616c283bd0
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/harried_spearguard.txt
@@ -0,0 +1,10 @@
+Name:Harried Spearguard
+ManaCost:R
+Types:Creature Human Soldier
+PT:1/1
+K:Haste
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME dies, create a 1/1 black Rat creature token with "This creature can't block."
+SVar:TrigToken:DB$ Token | TokenScript$ b_1_1_rat_noblock
+DeckHas:Ability$Token & Type$Rat
+SVar:SacMe:2
+Oracle:Haste\nWhen Harried Spearguard dies, create a 1/1 black Rat creature token with "This creature can't block."
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/heartflame_duelist_heartflame_slash.txt b/forge-gui/res/cardsfolder/upcoming/heartflame_duelist_heartflame_slash.txt
new file mode 100644
index 00000000000..540e3118f89
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/heartflame_duelist_heartflame_slash.txt
@@ -0,0 +1,17 @@
+Name:Heartflame Duelist
+ManaCost:1 W
+Types:Creature Human Knight
+PT:3/1
+S:Mode$ Continuous | AddKeyword$ Lifelink | Affected$ Instant.YouCtrl,Sorcery.YouCtrl | AffectedZone$ Stack | Description$ Instant and sorcery spells you control have lifelink.
+AlternateMode:Adventure
+DeckHas:Ability$LifeGain
+DeckHints:Type$Instant|Sorcery
+Oracle:Instant and sorcery spells you control have lifelink.
+
+ALTERNATE
+
+Name:Lagoon Breach
+ManaCost:2 R
+Types:Instant Adventure
+A:SP$ DealDamage | ValidTgts$ Any | NumDmg$ 3 | SpellDescription$ CARDNAME deals 3 damage to any target. (Then exile this card. You may cast the creature later from exile.)
+Oracle:Heartflame Slash deals 3 damage to any target. (Then exile this card. You may cast the creature later from exile.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/horned_loch_whale_lagoon_breach.txt b/forge-gui/res/cardsfolder/upcoming/horned_loch_whale_lagoon_breach.txt
new file mode 100644
index 00000000000..9052443b8db
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/horned_loch_whale_lagoon_breach.txt
@@ -0,0 +1,18 @@
+Name:Horned Loch-Whale
+ManaCost:4 U U
+Types:Creature Whale
+PT:6/6
+K:Flash
+K:Ward:2
+K:ETBReplacement:Other:LandTapped
+SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionOpponentTurn$ True | SpellDescription$ CARDNAME enters the battlefield tapped unless it's your turn.
+AlternateMode:Adventure
+Oracle:Flash\nWard {2}\nHorned Loch-Whale enters the battlefield tapped unless it's your turn.
+
+ALTERNATE
+
+Name:Lagoon Breach
+ManaCost:1 U
+Types:Instant Adventure
+A:SP$ ChangeZone | ValidTgts$ Creature.attacking+YouDontCtrl | TgtPrompt$ Select target attacking creature you don't control | AlternativeDecider$ TargetedOwner | Origin$ Battlefield | Destination$ Library | LibraryPosition$ 0 | DestinationAlternative$ Library | LibraryPositionAlternative$ -1 | AlternativeDestinationMessage$ Would you like to put the card on the top of your library (and not on the bottom)? | StackDescription$ The owner of {c:Targeted} puts it on the top or bottom of their library. | SpellDescription$ The owner of target attacking creature you don't control puts it on the top or bottom of their library.
+Oracle:The owner of target attacking creature you don't control puts it on the top or bottom of their library.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/regal_bunnicorn.txt b/forge-gui/res/cardsfolder/upcoming/regal_bunnicorn.txt
new file mode 100644
index 00000000000..903128f9d05
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/regal_bunnicorn.txt
@@ -0,0 +1,7 @@
+Name:Regal Bunnicorn
+ManaCost:1 W
+Types:Creature Rabbit Unicorn
+PT:*/*
+S:Mode$ Continuous | EffectZone$ All | CharacteristicDefining$ True | SetPower$ X | SetToughness$ X | Description$ CARDNAME's power and toughness are each equal to the number of nonland permanents you control.
+SVar:X:Count$Valid Permanent.nonLand+YouCtrl
+Oracle:Regal Bunnicorn's power and toughness are each equal to the number of nonland permanents you control.
\ No newline at end of file

From bf2481cad0a0e63b846a176ca0c8c0c6b1577f19 Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Fri, 1 Sep 2023 19:00:12 +0200
Subject: [PATCH 4/5] update

---
 .../cardsfolder/upcoming/hamlet_glutton.txt   |  4 ++--
 .../hearth_elemental_stoke_genius.txt         | 19 +++++++++++++++++++
 .../upcoming/high_fae_negotiator.txt          | 12 ++++++++++++
 .../upcoming/hollow_scavenger_bakery_raid.txt | 17 +++++++++++++++++
 .../cardsfolder/upcoming/hopeful_vigil.txt    | 10 ++++++++++
 .../upcoming/hopeless_nightmare.txt           | 11 +++++++++++
 .../horned_loch_whale_lagoon_breach.txt       |  2 +-
 7 files changed, 72 insertions(+), 3 deletions(-)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/hearth_elemental_stoke_genius.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/high_fae_negotiator.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/hollow_scavenger_bakery_raid.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/hopeful_vigil.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/hopeless_nightmare.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/hamlet_glutton.txt b/forge-gui/res/cardsfolder/upcoming/hamlet_glutton.txt
index 9ff92079c51..6e2ffa35103 100644
--- a/forge-gui/res/cardsfolder/upcoming/hamlet_glutton.txt
+++ b/forge-gui/res/cardsfolder/upcoming/hamlet_glutton.txt
@@ -4,10 +4,10 @@ Types:Creature Giant
 PT:6/6
 K:Bargain
 K:Trample
-S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ X | EffectZone$ All | Description$This spell costs {2} less to cast if it's bargained.
+S:Mode$ ReduceCost | ValidSpell$ Spell | Type$ Spell | ValidCard$ Card.Self | Amount$ 2 | EffectZone$ All | CheckSVar$ X | Description$This spell costs {2} less to cast if it's bargained.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters the battlefield, you gain 3 life.
 SVar:TrigGainLife:DB$ GainLife | LifeAmount$ 3
-SVar:X:Count$Bargained.2.0
+SVar:X:Count$Bargained.1.0
 DeckHas:Ability$Sacrifice|LifeGain
 DeckHints:Type$Token|Enchantment|Artifact
 Oracle:Bargain (You may sacrifice an artifact, enchantment, or token as you cast this spell.)\nThis spell costs {2} less to cast if it's bargained.\nTrample\nWhen Hamlet Glutton enters the battlefield, you gain 3 life.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/hearth_elemental_stoke_genius.txt b/forge-gui/res/cardsfolder/upcoming/hearth_elemental_stoke_genius.txt
new file mode 100644
index 00000000000..26d90043f90
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/hearth_elemental_stoke_genius.txt
@@ -0,0 +1,19 @@
+Name:Hearth Elemental
+ManaCost:5 R
+Types:Creature Elemental
+PT:4/5
+S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ X | EffectZone$ All | Description$ This spell costs {X} less to cast, where X is the number of cards in your graveyard that are instant cards, sorcery cards, and/or have an Adventure.
+SVar:X:Count$ValidGraveyard Instant.YouOwn,Sorcery.YouOwn,AdventureCard.YouOwn
+DeckHints:Ability$Graveyard|Mill & Type$Adventure
+DeckHas:Ability$Discard
+AlternateMode:Adventure
+Oracle:This spell costs {X} less to cast, where X is the number of cards in your graveyard that are instant cards, sorcery cards, and/or have an Adventure.
+
+ALTERNATE
+
+Name:Stoke Genius
+ManaCost:1 R
+Types:Sorcery Adventure
+A:SP$ Discard | Mode$ Hand | Defined$ You | SubAbility$ DBDraw | SpellDescription$ Discard your hand, then draw two cards. (Then exile this card. You may cast the creature later from exile.)
+SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ 2
+Oracle:Discard your hand, then draw two cards. (Then exile this card. You may cast the creature later from exile.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/high_fae_negotiator.txt b/forge-gui/res/cardsfolder/upcoming/high_fae_negotiator.txt
new file mode 100644
index 00000000000..f3648ebbfd6
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/high_fae_negotiator.txt
@@ -0,0 +1,12 @@
+Name:High Fae Negotiator
+ManaCost:3 B B
+Types:Creature Faerie Warlock
+PT:3/5
+K:Bargain
+K:Flying
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self+bargained | Execute$ TrigLoseLife | TriggerDescription$ When CARDNAME enters the battlefield, if it was bargained, each opponent loses 3 life and you gain 3 life.
+SVar:TrigLoseLife:DB$ LoseLife | LifeAmount$ 3 | Defined$ Opponent | SubAbility$ DBGainLife
+SVar:DBGainLife:DB$ GainLife | LifeAmount$ 3
+DeckHas:Ability$Sacrifice|LifeGain
+DeckHints:Type$Token|Enchantment|Artifact
+Oracle:Bargain (You may sacrifice an artifact, enchantment, or token as you cast this spell.)\nFlying\nWhen High Fae Negotiator enters the battlefield, if it was bargained, each opponent loses 3 life and you gain 3 life.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/hollow_scavenger_bakery_raid.txt b/forge-gui/res/cardsfolder/upcoming/hollow_scavenger_bakery_raid.txt
new file mode 100644
index 00000000000..be83af6f45e
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/hollow_scavenger_bakery_raid.txt
@@ -0,0 +1,17 @@
+Name:Hollow Scavenger
+ManaCost:2 G
+Types:Creature Wolf
+PT:3/2
+A:AB$ Pump | Cost$ 1 Sac<1/Food> | NumAtt$ 2 | NumDef$ 2 | ActivationLimit$ 1 | SpellDescription$ CARDNAME gets +2/+2 until end of turn. Activate only once each turn.
+DeckHas:Ability$Token|Sacrifice & Type$Food|Artifact
+DeckHints:Type$Food
+AlternateMode:Adventure
+Oracle:{1}, Sacrifice a Food: Hollow Scavenger gets +2/+2 until end of turn. Activate only once each turn.
+
+ALTERNATE
+
+Name:Bakery Raid
+ManaCost:G
+Types:Sorcery Adventure
+A:SP$ Token | TokenAmount$ 1 | TokenScript$ c_a_food_sac | TokenOwner$ You | SpellDescription$ Create a Food token. (Then exile this card. You may cast the creature later from exile.)
+Oracle:Create a Food token. (Then exile this card. You may cast the creature later from exile.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/hopeful_vigil.txt b/forge-gui/res/cardsfolder/upcoming/hopeful_vigil.txt
new file mode 100644
index 00000000000..5aa5f4617b7
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/hopeful_vigil.txt
@@ -0,0 +1,10 @@
+Name:Hopeful Vigil
+ManaCost:1 W
+Types:Enchantment
+T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create a 2/2 white Knight creature token with vigilance.
+SVar:TrigToken:DB$ Token | TokenScript$ w_2_2_knight_vigilance
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigScry | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, scry 2.
+SVar:TrigScry:DB$ Scry | ScryNum$ 2
+A:AB$ Sacrifice | Cost$ 2 W | SpellDescription$ Sacrifice CARDNAME
+DeckHas:Ability$Sacrifice|Token & Type$Knight
+Oracle:When Hopeful Vigil enters the battlefield, create a 2/2 white Knight creature token with vigilance.\nWhen Hopeful Vigil is put into a graveyard from the battlefield, scry 2.\n{2}{W}: Sacrifice Hopeful Vigil.
diff --git a/forge-gui/res/cardsfolder/upcoming/hopeless_nightmare.txt b/forge-gui/res/cardsfolder/upcoming/hopeless_nightmare.txt
new file mode 100644
index 00000000000..660797c2924
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/hopeless_nightmare.txt
@@ -0,0 +1,11 @@
+Name:Hopeless Nightmare
+ManaCost:B
+Types:Enchantment
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DBDiscard | TriggerDescription$ When CARDNAME enters the battlefield, each opponent discards a card and loses 2 life.
+SVar:DBDiscard:DB$ Discard | Mode$ TgtChoose | Defined$ Player.Opponent | NumCards$ 1 | SubAbility$ DBLoseLife
+SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ 2 | Defined$ Opponent
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigScry | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, scry 2.
+SVar:TrigScry:DB$ Scry | ScryNum$ 2
+A:AB$ Sacrifice | Cost$ 2 B | SpellDescription$ Sacrifice CARDNAME
+DeckHas:Ability$Discard|Sacrifice
+Oracle:When Hopeless Nightmare enters the battlefield, each opponent discards a card and loses 2 life.\nWhen Hopeless Nightmare is put into a graveyard from the battlefield, scry 2.\n{2}{B}: Sacrifice Hopeless Nightmare.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/horned_loch_whale_lagoon_breach.txt b/forge-gui/res/cardsfolder/upcoming/horned_loch_whale_lagoon_breach.txt
index 9052443b8db..cd54a763664 100644
--- a/forge-gui/res/cardsfolder/upcoming/horned_loch_whale_lagoon_breach.txt
+++ b/forge-gui/res/cardsfolder/upcoming/horned_loch_whale_lagoon_breach.txt
@@ -5,7 +5,7 @@ PT:6/6
 K:Flash
 K:Ward:2
 K:ETBReplacement:Other:LandTapped
-SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionOpponentTurn$ True | SpellDescription$ CARDNAME enters the battlefield tapped unless it's your turn.
+SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionPlayerTurn$ False | SpellDescription$ CARDNAME enters the battlefield tapped unless it's your turn.
 AlternateMode:Adventure
 Oracle:Flash\nWard {2}\nHorned Loch-Whale enters the battlefield tapped unless it's your turn.
 

From 56897b26e328bfe390b09a23e75614c78526011f Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Fri, 1 Sep 2023 20:10:09 +0200
Subject: [PATCH 5/5] update

---
 forge-gui/res/cardsfolder/upcoming/hamlet_glutton.txt        | 5 ++---
 .../cardsfolder/upcoming/hearth_elemental_stoke_genius.txt   | 2 +-
 forge-gui/res/cardsfolder/upcoming/high_fae_negotiator.txt   | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/hamlet_glutton.txt b/forge-gui/res/cardsfolder/upcoming/hamlet_glutton.txt
index 6e2ffa35103..0e15cd30f1b 100644
--- a/forge-gui/res/cardsfolder/upcoming/hamlet_glutton.txt
+++ b/forge-gui/res/cardsfolder/upcoming/hamlet_glutton.txt
@@ -4,10 +4,9 @@ Types:Creature Giant
 PT:6/6
 K:Bargain
 K:Trample
-S:Mode$ ReduceCost | ValidSpell$ Spell | Type$ Spell | ValidCard$ Card.Self | Amount$ 2 | EffectZone$ All | CheckSVar$ X | Description$This spell costs {2} less to cast if it's bargained.
+S:Mode$ ReduceCost | ValidSpell$ Spell.Bargain | Type$ Spell | ValidCard$ Card.Self | Amount$ 2 | EffectZone$ All | Description$This spell costs {2} less to cast if it's bargained.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters the battlefield, you gain 3 life.
 SVar:TrigGainLife:DB$ GainLife | LifeAmount$ 3
-SVar:X:Count$Bargained.1.0
 DeckHas:Ability$Sacrifice|LifeGain
-DeckHints:Type$Token|Enchantment|Artifact
+DeckHints:Ability$Token & Type$Enchantment|Artifact
 Oracle:Bargain (You may sacrifice an artifact, enchantment, or token as you cast this spell.)\nThis spell costs {2} less to cast if it's bargained.\nTrample\nWhen Hamlet Glutton enters the battlefield, you gain 3 life.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/hearth_elemental_stoke_genius.txt b/forge-gui/res/cardsfolder/upcoming/hearth_elemental_stoke_genius.txt
index 26d90043f90..5d02b8b938e 100644
--- a/forge-gui/res/cardsfolder/upcoming/hearth_elemental_stoke_genius.txt
+++ b/forge-gui/res/cardsfolder/upcoming/hearth_elemental_stoke_genius.txt
@@ -3,7 +3,7 @@ ManaCost:5 R
 Types:Creature Elemental
 PT:4/5
 S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ X | EffectZone$ All | Description$ This spell costs {X} less to cast, where X is the number of cards in your graveyard that are instant cards, sorcery cards, and/or have an Adventure.
-SVar:X:Count$ValidGraveyard Instant.YouOwn,Sorcery.YouOwn,AdventureCard.YouOwn
+SVar:X:Count$ValidGraveyard Instant.YouOwn,Sorcery.YouOwn,Card.AdventureCard+YouOwn
 DeckHints:Ability$Graveyard|Mill & Type$Adventure
 DeckHas:Ability$Discard
 AlternateMode:Adventure
diff --git a/forge-gui/res/cardsfolder/upcoming/high_fae_negotiator.txt b/forge-gui/res/cardsfolder/upcoming/high_fae_negotiator.txt
index f3648ebbfd6..b1584f3543f 100644
--- a/forge-gui/res/cardsfolder/upcoming/high_fae_negotiator.txt
+++ b/forge-gui/res/cardsfolder/upcoming/high_fae_negotiator.txt
@@ -8,5 +8,5 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S
 SVar:TrigLoseLife:DB$ LoseLife | LifeAmount$ 3 | Defined$ Opponent | SubAbility$ DBGainLife
 SVar:DBGainLife:DB$ GainLife | LifeAmount$ 3
 DeckHas:Ability$Sacrifice|LifeGain
-DeckHints:Type$Token|Enchantment|Artifact
+DeckHints:Type$Enchantment|Artifact & Ability$Token
 Oracle:Bargain (You may sacrifice an artifact, enchantment, or token as you cast this spell.)\nFlying\nWhen High Fae Negotiator enters the battlefield, if it was bargained, each opponent loses 3 life and you gain 3 life.
\ No newline at end of file