From 5b7d67f997c005e517669e3995dc2a1c10b78127 Mon Sep 17 00:00:00 2001
From: mctubbies <69433417+mctubbies@users.noreply.github.com>
Date: Thu, 7 Jul 2022 10:22:07 -0500
Subject: [PATCH 01/33] Add files via upload

---
 Zellix, Sanity Flayer.txt | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 Zellix, Sanity Flayer.txt

diff --git a/Zellix, Sanity Flayer.txt b/Zellix, Sanity Flayer.txt
new file mode 100644
index 00000000000..35f3b1725c8
--- /dev/null
+++ b/Zellix, Sanity Flayer.txt	
@@ -0,0 +1,9 @@
+Name:Zellix, Sanity Flayer
+ManaCost:2 U
+Types:Legendary Creature Horror
+PT:2/3
+K: Choose a Background
+T:Mode$ ChangesZoneAll | Origin$ Library | Destination$ Graveyard | ValidCard$ Creature.Other | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Hive Mind — Whenever a player mills one or more creature cards, you create a 1/1 black Horror creature token.
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ b_1_1_horror | TokenOwner$ You
+A:AB$ Mill | Cost$ 1 T | NumCards$ 3 | ValidTgts$ Player | TgtPrompt$ Select a player | SpellDescription$ Target player mills three cards.
+Oracle:Hive Mind — Whenever a player mills one or more creature cards, you create a 1/1 black Horror creature token.\n{1},{t}: Target player mills three cards.\nChoose a Background (You can have a Background as a second commander.)
\ No newline at end of file

From d736aba74f8a9f804a1eefabc23e0b2595d57887 Mon Sep 17 00:00:00 2001
From: mctubbies <69433417+mctubbies@users.noreply.github.com>
Date: Thu, 7 Jul 2022 10:50:29 -0500
Subject: [PATCH 02/33] Add files via upload

---
 Zellix, Sanity Flayer.txt | 4 ++--
 b_1_1_horror.txt          | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 b_1_1_horror.txt

diff --git a/Zellix, Sanity Flayer.txt b/Zellix, Sanity Flayer.txt
index 35f3b1725c8..a7700268f30 100644
--- a/Zellix, Sanity Flayer.txt	
+++ b/Zellix, Sanity Flayer.txt	
@@ -2,8 +2,8 @@ Name:Zellix, Sanity Flayer
 ManaCost:2 U
 Types:Legendary Creature Horror
 PT:2/3
-K: Choose a Background
+K:Choose a Background
 T:Mode$ ChangesZoneAll | Origin$ Library | Destination$ Graveyard | ValidCard$ Creature.Other | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Hive Mind — Whenever a player mills one or more creature cards, you create a 1/1 black Horror creature token.
-SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ b_1_1_horror | TokenOwner$ You
+SVar:TrigToken:DB$ Token | TokenScript$ b_1_1_horror
 A:AB$ Mill | Cost$ 1 T | NumCards$ 3 | ValidTgts$ Player | TgtPrompt$ Select a player | SpellDescription$ Target player mills three cards.
 Oracle:Hive Mind — Whenever a player mills one or more creature cards, you create a 1/1 black Horror creature token.\n{1},{t}: Target player mills three cards.\nChoose a Background (You can have a Background as a second commander.)
\ No newline at end of file
diff --git a/b_1_1_horror.txt b/b_1_1_horror.txt
new file mode 100644
index 00000000000..6c9a9e9af20
--- /dev/null
+++ b/b_1_1_horror.txt
@@ -0,0 +1,6 @@
+Name:Horror Token
+ManaCost:no cost
+Types:Creature Horror
+Colors:black
+PT:1/1
+Oracle:

From cc235f17727318a68a292bba7d8ba32e7fbd84d5 Mon Sep 17 00:00:00 2001
From: mctubbies <69433417+mctubbies@users.noreply.github.com>
Date: Thu, 7 Jul 2022 10:51:50 -0500
Subject: [PATCH 03/33] Add files via upload

---
 Zellix, Sanity Flayer.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Zellix, Sanity Flayer.txt b/Zellix, Sanity Flayer.txt
index a7700268f30..5b3cddda624 100644
--- a/Zellix, Sanity Flayer.txt	
+++ b/Zellix, Sanity Flayer.txt	
@@ -6,4 +6,5 @@ K:Choose a Background
 T:Mode$ ChangesZoneAll | Origin$ Library | Destination$ Graveyard | ValidCard$ Creature.Other | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Hive Mind — Whenever a player mills one or more creature cards, you create a 1/1 black Horror creature token.
 SVar:TrigToken:DB$ Token | TokenScript$ b_1_1_horror
 A:AB$ Mill | Cost$ 1 T | NumCards$ 3 | ValidTgts$ Player | TgtPrompt$ Select a player | SpellDescription$ Target player mills three cards.
-Oracle:Hive Mind — Whenever a player mills one or more creature cards, you create a 1/1 black Horror creature token.\n{1},{t}: Target player mills three cards.\nChoose a Background (You can have a Background as a second commander.)
\ No newline at end of file
+DeckHas:Ability$Mill|Token
+Oracle:Hive Mind — Whenever a player mills one or more creature cards, you create a 1/1 black Horror creature token.\n{1},{T}: Target player mills three cards.\nChoose a Background (You can have a Background as a second commander.)
\ No newline at end of file

From 7a938c084ceda5328fb40d41676bb2b1175421f6 Mon Sep 17 00:00:00 2001
From: mctubbies <69433417+mctubbies@users.noreply.github.com>
Date: Thu, 7 Jul 2022 11:17:53 -0500
Subject: [PATCH 04/33] Add files via upload

---
 Haunted One.txt | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 Haunted One.txt

diff --git a/Haunted One.txt b/Haunted One.txt
new file mode 100644
index 00000000000..470fb1f37e7
--- /dev/null
+++ b/Haunted One.txt	
@@ -0,0 +1,8 @@
+Name:Haunted One
+ManaCost:2 B
+Types:Legendary Enchantment Background
+S:Mode$ Continuous | Affected$ Creature.IsCommander+YouOwn | AddTrigger$ BecomesTapped | Description$ Commander creatures you own have ''Whenever this creature becomes tapped, it and other creatures you control that share a creature type with it each get +2/+0 and gain undying until end of turn.''
+SVar:BecomesTapped:Mode$ Taps | ValidCards$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever this creature becomes tapped, it and other creatures you control that share a creature type with it each get +2/+0 and gain undying until end of turn.
+SVar:TrigPump:DB$ PumpAll | ValidCards$ Card.sharesCreatureTypeWith | KW$ Undying | NumAtt$ 2
+DeckHas:Ability$Counters
+Oracle:Commander creatures you own have ''Whenever this creature becomes tapped, it and other creatures you control that share a creature type with it each get +2/+0 and gain undying until end of turn.'' (When a creature with undying dies, if it had no +1/+1 counters on it, return it to the battlefield under its owner's control with a +1/+1 counter on it.)
\ No newline at end of file

From 2c2f934e03a5b636a50cb6eb74ca5498fbd5a813 Mon Sep 17 00:00:00 2001
From: mctubbies <69433417+mctubbies@users.noreply.github.com>
Date: Thu, 7 Jul 2022 11:19:05 -0500
Subject: [PATCH 05/33] Delete Haunted One.txt

---
 Haunted One.txt | 8 --------
 1 file changed, 8 deletions(-)
 delete mode 100644 Haunted One.txt

diff --git a/Haunted One.txt b/Haunted One.txt
deleted file mode 100644
index 470fb1f37e7..00000000000
--- a/Haunted One.txt	
+++ /dev/null
@@ -1,8 +0,0 @@
-Name:Haunted One
-ManaCost:2 B
-Types:Legendary Enchantment Background
-S:Mode$ Continuous | Affected$ Creature.IsCommander+YouOwn | AddTrigger$ BecomesTapped | Description$ Commander creatures you own have ''Whenever this creature becomes tapped, it and other creatures you control that share a creature type with it each get +2/+0 and gain undying until end of turn.''
-SVar:BecomesTapped:Mode$ Taps | ValidCards$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever this creature becomes tapped, it and other creatures you control that share a creature type with it each get +2/+0 and gain undying until end of turn.
-SVar:TrigPump:DB$ PumpAll | ValidCards$ Card.sharesCreatureTypeWith | KW$ Undying | NumAtt$ 2
-DeckHas:Ability$Counters
-Oracle:Commander creatures you own have ''Whenever this creature becomes tapped, it and other creatures you control that share a creature type with it each get +2/+0 and gain undying until end of turn.'' (When a creature with undying dies, if it had no +1/+1 counters on it, return it to the battlefield under its owner's control with a +1/+1 counter on it.)
\ No newline at end of file

From 08546ef06309e586613fcf99ba707b753052f519 Mon Sep 17 00:00:00 2001
From: mctubbies <69433417+mctubbies@users.noreply.github.com>
Date: Thu, 7 Jul 2022 14:14:30 -0500
Subject: [PATCH 06/33] Add files via upload

---
 .../res/cardsfolder/upcoming/zellix_sanity_flayer.txt  | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/zellix_sanity_flayer.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/zellix_sanity_flayer.txt b/forge-gui/res/cardsfolder/upcoming/zellix_sanity_flayer.txt
new file mode 100644
index 00000000000..5b3cddda624
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/zellix_sanity_flayer.txt
@@ -0,0 +1,10 @@
+Name:Zellix, Sanity Flayer
+ManaCost:2 U
+Types:Legendary Creature Horror
+PT:2/3
+K:Choose a Background
+T:Mode$ ChangesZoneAll | Origin$ Library | Destination$ Graveyard | ValidCard$ Creature.Other | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Hive Mind — Whenever a player mills one or more creature cards, you create a 1/1 black Horror creature token.
+SVar:TrigToken:DB$ Token | TokenScript$ b_1_1_horror
+A:AB$ Mill | Cost$ 1 T | NumCards$ 3 | ValidTgts$ Player | TgtPrompt$ Select a player | SpellDescription$ Target player mills three cards.
+DeckHas:Ability$Mill|Token
+Oracle:Hive Mind — Whenever a player mills one or more creature cards, you create a 1/1 black Horror creature token.\n{1},{T}: Target player mills three cards.\nChoose a Background (You can have a Background as a second commander.)
\ No newline at end of file

From 0aabab4a91b222116271d7e46cfcf3b8889b7473 Mon Sep 17 00:00:00 2001
From: mctubbies <69433417+mctubbies@users.noreply.github.com>
Date: Thu, 7 Jul 2022 14:14:40 -0500
Subject: [PATCH 07/33] Delete Zellix, Sanity Flayer.txt

---
 Zellix, Sanity Flayer.txt | 10 ----------
 1 file changed, 10 deletions(-)
 delete mode 100644 Zellix, Sanity Flayer.txt

diff --git a/Zellix, Sanity Flayer.txt b/Zellix, Sanity Flayer.txt
deleted file mode 100644
index 5b3cddda624..00000000000
--- a/Zellix, Sanity Flayer.txt	
+++ /dev/null
@@ -1,10 +0,0 @@
-Name:Zellix, Sanity Flayer
-ManaCost:2 U
-Types:Legendary Creature Horror
-PT:2/3
-K:Choose a Background
-T:Mode$ ChangesZoneAll | Origin$ Library | Destination$ Graveyard | ValidCard$ Creature.Other | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Hive Mind — Whenever a player mills one or more creature cards, you create a 1/1 black Horror creature token.
-SVar:TrigToken:DB$ Token | TokenScript$ b_1_1_horror
-A:AB$ Mill | Cost$ 1 T | NumCards$ 3 | ValidTgts$ Player | TgtPrompt$ Select a player | SpellDescription$ Target player mills three cards.
-DeckHas:Ability$Mill|Token
-Oracle:Hive Mind — Whenever a player mills one or more creature cards, you create a 1/1 black Horror creature token.\n{1},{T}: Target player mills three cards.\nChoose a Background (You can have a Background as a second commander.)
\ No newline at end of file

From 037fcc27a7696becbfc61eec41b2246d028c5192 Mon Sep 17 00:00:00 2001
From: mctubbies <69433417+mctubbies@users.noreply.github.com>
Date: Thu, 7 Jul 2022 14:16:42 -0500
Subject: [PATCH 08/33] Delete b_1_1_horror.txt

---
 b_1_1_horror.txt | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 b_1_1_horror.txt

diff --git a/b_1_1_horror.txt b/b_1_1_horror.txt
deleted file mode 100644
index 6c9a9e9af20..00000000000
--- a/b_1_1_horror.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Name:Horror Token
-ManaCost:no cost
-Types:Creature Horror
-Colors:black
-PT:1/1
-Oracle:

From e4f887bf38ce1e4377f8cebb25130e78e34455ae Mon Sep 17 00:00:00 2001
From: mctubbies <69433417+mctubbies@users.noreply.github.com>
Date: Thu, 7 Jul 2022 14:17:05 -0500
Subject: [PATCH 09/33] Add files via upload

---
 forge-gui/res/tokenscripts/b_1_1_horror.txt | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 forge-gui/res/tokenscripts/b_1_1_horror.txt

diff --git a/forge-gui/res/tokenscripts/b_1_1_horror.txt b/forge-gui/res/tokenscripts/b_1_1_horror.txt
new file mode 100644
index 00000000000..6c9a9e9af20
--- /dev/null
+++ b/forge-gui/res/tokenscripts/b_1_1_horror.txt
@@ -0,0 +1,6 @@
+Name:Horror Token
+ManaCost:no cost
+Types:Creature Horror
+Colors:black
+PT:1/1
+Oracle:

From a0aaa49c010faf4a4bd0338828d88d0e73320538 Mon Sep 17 00:00:00 2001
From: mctubbies <69433417+mctubbies@users.noreply.github.com>
Date: Thu, 7 Jul 2022 14:18:59 -0500
Subject: [PATCH 10/33] Add files via upload

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

diff --git a/forge-gui/res/cardsfolder/upcoming/zellix_sanity_flayer.txt b/forge-gui/res/cardsfolder/upcoming/zellix_sanity_flayer.txt
index 5b3cddda624..22f8fdf1a54 100644
--- a/forge-gui/res/cardsfolder/upcoming/zellix_sanity_flayer.txt
+++ b/forge-gui/res/cardsfolder/upcoming/zellix_sanity_flayer.txt
@@ -3,7 +3,7 @@ ManaCost:2 U
 Types:Legendary Creature Horror
 PT:2/3
 K:Choose a Background
-T:Mode$ ChangesZoneAll | Origin$ Library | Destination$ Graveyard | ValidCard$ Creature.Other | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Hive Mind — Whenever a player mills one or more creature cards, you create a 1/1 black Horror creature token.
+T:Mode$ MilledAll | ValidPlayer$ Player | ValidCard$ Creature | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Hive Mind — Whenever a player mills one or more creature cards, you create a 1/1 black Horror creature token.
 SVar:TrigToken:DB$ Token | TokenScript$ b_1_1_horror
 A:AB$ Mill | Cost$ 1 T | NumCards$ 3 | ValidTgts$ Player | TgtPrompt$ Select a player | SpellDescription$ Target player mills three cards.
 DeckHas:Ability$Mill|Token

From 7cc238df23455ba8fdf0ed2c8ef0d7804b84094b Mon Sep 17 00:00:00 2001
From: squee1968 <wrongway329@gmail.com>
Date: Wed, 20 Jul 2022 15:30:53 -0500
Subject: [PATCH 11/33] Create pact_weapon.txt

-closes #918
---
 .../res/cardsfolder/upcoming/pact_weapon.txt     | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/pact_weapon.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/pact_weapon.txt b/forge-gui/res/cardsfolder/upcoming/pact_weapon.txt
new file mode 100644
index 00000000000..bfc598aa72c
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/pact_weapon.txt
@@ -0,0 +1,16 @@
+Name:Pact Weapon
+ManaCost:3 B
+Types:Artifact Equipment
+K:Equip:Discard<1/Card>
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | IsPresent$ Card.Self+AttachedTo Creature | AddKeyword$ You don't lose the game for having 0 or less life. | Description$ As long as CARDNAME is attached to a creature, you don't lose the game for having 0 or less life.
+T:Mode$ Attacks | ValidCard$ Card.EquippedBy | Execute$ TrigDraw | TriggerDescription$ Whenever equipped creature attacks, draw a card and reveal it. The creature gets +X/+X until end of turn and you lose X life, where X is that card's mana value.
+SVar:TrigDraw:DB$ Draw | NumCards$ 1 | Reveal$ True | RememberDrawn$ True | SubAbility$ DBPump
+SVar:DBPump:DB$ Pump | ValidTgts$ Creature.EquippedBy | NumAtt$ +X | NumDef$ +X | SubAbility$ DBLoseLife
+SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ X | Defined$ You | SubAbility$ DBClean
+SVar:DBClean:DB$ Cleanup | ClearRemembered$ True
+SVar:X:Remembered$CardManaCost
+SVar:AIPreference:DiscardCost$Card
+AI:RemoveDeck:Random
+DeckHas:Ability$Discard
+DeckHints:Keyword$Madness & Ability$Delirium
+Oracle:As long as Pact Weapon is attached to a creature, you don't lose the game for having 0 or less life.\nWhenever equipped creature attacks, draw a card and reveal it. The creature gets +X/+X until end of turn and you lose X life, where X is that card's mana value.\nEquip—Discard a card.

From 6d6e8d15f03a4ec6b32b07fee86f1930335e4adb Mon Sep 17 00:00:00 2001
From: squee1968 <105706641+squee1968@users.noreply.github.com>
Date: Wed, 20 Jul 2022 17:17:12 -0500
Subject: [PATCH 12/33] Update pact_weapon.txt

---
 forge-gui/res/cardsfolder/upcoming/pact_weapon.txt | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/pact_weapon.txt b/forge-gui/res/cardsfolder/upcoming/pact_weapon.txt
index bfc598aa72c..21f6ea0db60 100644
--- a/forge-gui/res/cardsfolder/upcoming/pact_weapon.txt
+++ b/forge-gui/res/cardsfolder/upcoming/pact_weapon.txt
@@ -2,15 +2,14 @@ Name:Pact Weapon
 ManaCost:3 B
 Types:Artifact Equipment
 K:Equip:Discard<1/Card>
-S:Mode$ Continuous | Affected$ Creature.EquippedBy | IsPresent$ Card.Self+AttachedTo Creature | AddKeyword$ You don't lose the game for having 0 or less life. | Description$ As long as CARDNAME is attached to a creature, you don't lose the game for having 0 or less life.
-T:Mode$ Attacks | ValidCard$ Card.EquippedBy | Execute$ TrigDraw | TriggerDescription$ Whenever equipped creature attacks, draw a card and reveal it. The creature gets +X/+X until end of turn and you lose X life, where X is that card's mana value.
+S:Mode$ Continuous | Affected$ You | IsPresent$ Card.Self+AttachedTo Creature | AddKeyword$ You don't lose the game for having 0 or less life. | Description$ As long as CARDNAME is attached to a creature, you don't lose the game for having 0 or less life.
+T:Mode$ Attacks | ValidCard$ Creature.EquippedBy | Execute$ TrigDraw | TriggerDescription$ Whenever equipped creature attacks, draw a card and reveal it. The creature gets +X/+X until end of turn and you lose X life, where X is that card's mana value.
 SVar:TrigDraw:DB$ Draw | NumCards$ 1 | Reveal$ True | RememberDrawn$ True | SubAbility$ DBPump
-SVar:DBPump:DB$ Pump | ValidTgts$ Creature.EquippedBy | NumAtt$ +X | NumDef$ +X | SubAbility$ DBLoseLife
+SVar:DBPump:DB$ Pump | Defined$ Creature.EquippedBy | NumAtt$ +X | NumDef$ +X | SubAbility$ DBLoseLife
 SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ X | Defined$ You | SubAbility$ DBClean
 SVar:DBClean:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Remembered$CardManaCost
 SVar:AIPreference:DiscardCost$Card
-AI:RemoveDeck:Random
 DeckHas:Ability$Discard
 DeckHints:Keyword$Madness & Ability$Delirium
 Oracle:As long as Pact Weapon is attached to a creature, you don't lose the game for having 0 or less life.\nWhenever equipped creature attacks, draw a card and reveal it. The creature gets +X/+X until end of turn and you lose X life, where X is that card's mana value.\nEquip—Discard a card.

From 85437913b771578723825969672092aa92137f44 Mon Sep 17 00:00:00 2001
From: squee1968 <105706641+squee1968@users.noreply.github.com>
Date: Wed, 20 Jul 2022 17:21:48 -0500
Subject: [PATCH 13/33] Update pact_weapon.txt

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

diff --git a/forge-gui/res/cardsfolder/upcoming/pact_weapon.txt b/forge-gui/res/cardsfolder/upcoming/pact_weapon.txt
index 21f6ea0db60..4f33bf6db2c 100644
--- a/forge-gui/res/cardsfolder/upcoming/pact_weapon.txt
+++ b/forge-gui/res/cardsfolder/upcoming/pact_weapon.txt
@@ -5,7 +5,7 @@ K:Equip:Discard<1/Card>
 S:Mode$ Continuous | Affected$ You | IsPresent$ Card.Self+AttachedTo Creature | AddKeyword$ You don't lose the game for having 0 or less life. | Description$ As long as CARDNAME is attached to a creature, you don't lose the game for having 0 or less life.
 T:Mode$ Attacks | ValidCard$ Creature.EquippedBy | Execute$ TrigDraw | TriggerDescription$ Whenever equipped creature attacks, draw a card and reveal it. The creature gets +X/+X until end of turn and you lose X life, where X is that card's mana value.
 SVar:TrigDraw:DB$ Draw | NumCards$ 1 | Reveal$ True | RememberDrawn$ True | SubAbility$ DBPump
-SVar:DBPump:DB$ Pump | Defined$ Creature.EquippedBy | NumAtt$ +X | NumDef$ +X | SubAbility$ DBLoseLife
+SVar:DBPump:DB$ Pump | Defined$ TriggeredObject | NumAtt$ +X | NumDef$ +X | SubAbility$ DBLoseLife
 SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ X | Defined$ You | SubAbility$ DBClean
 SVar:DBClean:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Remembered$CardManaCost

From 07230694737719f384a847efa8aa97f6dcde8bbd Mon Sep 17 00:00:00 2001
From: squee1968 <105706641+squee1968@users.noreply.github.com>
Date: Wed, 20 Jul 2022 20:16:38 -0500
Subject: [PATCH 14/33] Update pact_weapon.txt

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

diff --git a/forge-gui/res/cardsfolder/upcoming/pact_weapon.txt b/forge-gui/res/cardsfolder/upcoming/pact_weapon.txt
index 4f33bf6db2c..75c62b9e1a8 100644
--- a/forge-gui/res/cardsfolder/upcoming/pact_weapon.txt
+++ b/forge-gui/res/cardsfolder/upcoming/pact_weapon.txt
@@ -5,7 +5,7 @@ K:Equip:Discard<1/Card>
 S:Mode$ Continuous | Affected$ You | IsPresent$ Card.Self+AttachedTo Creature | AddKeyword$ You don't lose the game for having 0 or less life. | Description$ As long as CARDNAME is attached to a creature, you don't lose the game for having 0 or less life.
 T:Mode$ Attacks | ValidCard$ Creature.EquippedBy | Execute$ TrigDraw | TriggerDescription$ Whenever equipped creature attacks, draw a card and reveal it. The creature gets +X/+X until end of turn and you lose X life, where X is that card's mana value.
 SVar:TrigDraw:DB$ Draw | NumCards$ 1 | Reveal$ True | RememberDrawn$ True | SubAbility$ DBPump
-SVar:DBPump:DB$ Pump | Defined$ TriggeredObject | NumAtt$ +X | NumDef$ +X | SubAbility$ DBLoseLife
+SVar:DBPump:DB$ Pump | Defined$ TriggeredCard | NumAtt$ +X | NumDef$ +X | SubAbility$ DBLoseLife
 SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ X | Defined$ You | SubAbility$ DBClean
 SVar:DBClean:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Remembered$CardManaCost

From 103c4f2eb65903a7c1e09aba4f1d09351f1cbaa4 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Thu, 21 Jul 2022 12:36:52 +0800
Subject: [PATCH 15/33] Create swashbuckler_extraordinaire.txt

---
 .../upcoming/swashbuckler_extraordinaire.txt     | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/swashbuckler_extraordinaire.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/swashbuckler_extraordinaire.txt b/forge-gui/res/cardsfolder/upcoming/swashbuckler_extraordinaire.txt
new file mode 100644
index 00000000000..cf8982aafdd
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/swashbuckler_extraordinaire.txt
@@ -0,0 +1,16 @@
+Name:Swashbuckler Extraordinaire
+ManaCost:2 R
+Types:Creature Dragon Rogue Warrior
+PT:2/2
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTreasure | TriggerDescription$ When CARDNAME enters the battlefield, create a Treasure token. (It's an artifact with "{T}, Sacrifice this artifact: Add one mana of any color.")
+SVar:TrigTreasure:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_treasure_sac | TokenOwner$ You
+T:Mode$ AttackersDeclared | AttackingPlayer$ You | Execute$ TrigSac | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack, you may sacrifice one or more Treasures. When you do, up to that many target creatures gain double strike until end of turn.
+SVar:TrigSac:DB$ Sacrifice | Defined$ You | Amount$ X | SacValid$ Treasure | SacMessage$ treasure | RememberSacrificed$ True | Optional$ True | SubAbility$ TrigChoose
+SVar:TrigChoose:DB$ ChooseCard | MinAmount$ 0 | Amount$ DBSize | Choices$ Creature | SubAbility$ DBPump
+SVar:DBPump:DB$ Pump | Defined$ ChosenCard | KW$ Double Strike | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True | ClearRemembered$ True
+SVar:DBSize:Count$RememberedSize
+SVar:X:Count$Valid Treasure.YouCtrl
+DeckHas:Ability$Token|Sacrifice & Type$Treasure
+AI:RemoveDeck:All
+Oracle:When Swashbuckler Extraordinaire enters the battlefield, create a Treasure token. (It's an artifact with "{T}, Sacrifice this artifact: Add one mana of any color.")\nWhenever you attack, you may sacrifice one or more Treasures. When you do, up to that many target creatures gain double strike until end of turn.

From 900159cb2b94a5b259a130e3f6ee8538c34af31a Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Thu, 21 Jul 2022 13:00:23 +0800
Subject: [PATCH 16/33] Create stunning_strike.txt

---
 .../res/cardsfolder/upcoming/stunning_strike.txt      | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/stunning_strike.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/stunning_strike.txt b/forge-gui/res/cardsfolder/upcoming/stunning_strike.txt
new file mode 100644
index 00000000000..0863e1d3653
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/stunning_strike.txt
@@ -0,0 +1,11 @@
+Name:Stunning Strike
+ManaCost:2 U
+Types:Enchantment Aura
+K:Flash
+A:SP$ Attach | ValidTgts$ Creature | AILogic$ Curse
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters the battlefield, tap enchanted creature and remove it from combat.
+SVar:TrigTap:DB$ Tap | Defined$ Enchanted | SubAbility$ RemCombat
+SVar:RemCombat:DB$ RemoveFromCombat | Defined$ Enchanted
+S:Mode$ Continuous | Affected$ Creature.nonlegendary+EnchantedBy | AddHiddenKeyword$ This card doesn't untap during your next untap step. | Description$ As long as enchanted creature isn't legendary, it doesn't untap during its controller's untap step.
+DeckHints:Type$Creature
+Oracle:Flash\nEnchant creature\nWhen Stunning Strike enters the battlefield, tap enchanted creature and remove it from combat.\nAs long as enchanted creature isn't legendary, it doesn't untap during its controller's untap step.

From cfe15d45fec5ed17a1196c82c026c5dcd7e2c48c Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Thu, 21 Jul 2022 13:09:53 +0800
Subject: [PATCH 17/33] Create stoneskin.txt

---
 forge-gui/res/cardsfolder/upcoming/stoneskin.txt | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/stoneskin.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/stoneskin.txt b/forge-gui/res/cardsfolder/upcoming/stoneskin.txt
new file mode 100644
index 00000000000..eafcf629b9f
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/stoneskin.txt
@@ -0,0 +1,7 @@
+Name:Stoneskin
+ManaCost:2 W
+Types:Enchantment Aura
+K:Flash
+A:SP$ Attach | ValidTgts$ Creature | AILogic$ Pump
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddToughness$ 10 | Description$ Enchanted creature gets +0/+10.
+Oracle:Flash\nEnchant creature\nEnchanted creature gets +0/+10.

From 8903d52186298ea4687a05df07753ba8e0d825ea Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Thu, 21 Jul 2022 13:24:55 +0800
Subject: [PATCH 18/33] Create steadfast_unicorn.txt

---
 forge-gui/res/cardsfolder/upcoming/steadfast_unicorn.txt | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/steadfast_unicorn.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/steadfast_unicorn.txt b/forge-gui/res/cardsfolder/upcoming/steadfast_unicorn.txt
new file mode 100644
index 00000000000..f9407e59c89
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/steadfast_unicorn.txt
@@ -0,0 +1,6 @@
+Name:Steadfast Unicorn
+ManaCost:W
+Types:Creature Unicorn
+PT:1/2
+A:AB$ PumpAll | Cost$ 3 W | ValidCards$ Creature.YouCtrl | NumAtt$ +1 | NumDef$ +1 | KW$ Vigilance | PlayerTurn$ True | SpellDescription$ Creatures you control get +1/+1 and gain vigilance until end of turn. Activate only during your turn.
+Oracle:{3}{W}: Creatures you control get +1/+1 and gain vigilance until end of turn. Activate only during your turn.

From d46bf314873688a7dcc3c587725f5f79eb530ab9 Mon Sep 17 00:00:00 2001
From: squee1968 <105706641+squee1968@users.noreply.github.com>
Date: Thu, 21 Jul 2022 01:46:37 -0500
Subject: [PATCH 19/33] Update pact_weapon.txt

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

diff --git a/forge-gui/res/cardsfolder/upcoming/pact_weapon.txt b/forge-gui/res/cardsfolder/upcoming/pact_weapon.txt
index 75c62b9e1a8..f2a68b7f91e 100644
--- a/forge-gui/res/cardsfolder/upcoming/pact_weapon.txt
+++ b/forge-gui/res/cardsfolder/upcoming/pact_weapon.txt
@@ -5,7 +5,7 @@ K:Equip:Discard<1/Card>
 S:Mode$ Continuous | Affected$ You | IsPresent$ Card.Self+AttachedTo Creature | AddKeyword$ You don't lose the game for having 0 or less life. | Description$ As long as CARDNAME is attached to a creature, you don't lose the game for having 0 or less life.
 T:Mode$ Attacks | ValidCard$ Creature.EquippedBy | Execute$ TrigDraw | TriggerDescription$ Whenever equipped creature attacks, draw a card and reveal it. The creature gets +X/+X until end of turn and you lose X life, where X is that card's mana value.
 SVar:TrigDraw:DB$ Draw | NumCards$ 1 | Reveal$ True | RememberDrawn$ True | SubAbility$ DBPump
-SVar:DBPump:DB$ Pump | Defined$ TriggeredCard | NumAtt$ +X | NumDef$ +X | SubAbility$ DBLoseLife
+SVar:DBPump:DB$ Pump | Defined$ TriggeredAttacker | NumAtt$ +X | NumDef$ +X | SubAbility$ DBLoseLife
 SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ X | Defined$ You | SubAbility$ DBClean
 SVar:DBClean:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Remembered$CardManaCost

From 969c405dc04d2801507c6e75b01799dd9c316157 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Thu, 21 Jul 2022 16:32:36 +0800
Subject: [PATCH 20/33] Update swashbuckler_extraordinaire.txt

---
 .../cardsfolder/upcoming/swashbuckler_extraordinaire.txt  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/swashbuckler_extraordinaire.txt b/forge-gui/res/cardsfolder/upcoming/swashbuckler_extraordinaire.txt
index cf8982aafdd..14a6f034000 100644
--- a/forge-gui/res/cardsfolder/upcoming/swashbuckler_extraordinaire.txt
+++ b/forge-gui/res/cardsfolder/upcoming/swashbuckler_extraordinaire.txt
@@ -4,10 +4,10 @@ Types:Creature Dragon Rogue Warrior
 PT:2/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTreasure | TriggerDescription$ When CARDNAME enters the battlefield, create a Treasure token. (It's an artifact with "{T}, Sacrifice this artifact: Add one mana of any color.")
 SVar:TrigTreasure:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_treasure_sac | TokenOwner$ You
-T:Mode$ AttackersDeclared | AttackingPlayer$ You | Execute$ TrigSac | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack, you may sacrifice one or more Treasures. When you do, up to that many target creatures gain double strike until end of turn.
-SVar:TrigSac:DB$ Sacrifice | Defined$ You | Amount$ X | SacValid$ Treasure | SacMessage$ treasure | RememberSacrificed$ True | Optional$ True | SubAbility$ TrigChoose
-SVar:TrigChoose:DB$ ChooseCard | MinAmount$ 0 | Amount$ DBSize | Choices$ Creature | SubAbility$ DBPump
-SVar:DBPump:DB$ Pump | Defined$ ChosenCard | KW$ Double Strike | SubAbility$ DBCleanup
+T:Mode$ AttackersDeclared | AttackingPlayer$ You | Execute$ TrigSac | OptionalDecider$ You | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack, you may sacrifice one or more Treasures. When you do, up to that many target creatures gain double strike until end of turn.
+SVar:TrigSac:DB$ Sacrifice | Defined$ You | Amount$ X | SacValid$ Treasure | SacMessage$ treasure | RememberSacrificed$ True | SubAbility$ TrigImmediateTrig
+SVar:TrigImmediateTrig:DB$ ImmediateTrigger | Execute$ DBPump | TriggerDescription$ When you do, up to that many target creatures gain double strike until end of turn.
+SVar:DBPump:DB$ Pump | ValidTgts$ Creature | KW$ Double Strike | TargetMin$ 0 | TargetMax$ DBSize | SubAbility$ DBCleanup | TgtPrompt$ Select target creatures | StackDescription$ {c:Targeted} gain double strike until end of turn. | SpellDescription$ Up to that many target creatures gain double strike until end of turn.
 SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True | ClearRemembered$ True
 SVar:DBSize:Count$RememberedSize
 SVar:X:Count$Valid Treasure.YouCtrl

From 2cfc0f93d815fe058fef382090da7cd7bd01beea Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Thu, 21 Jul 2022 17:22:35 +0800
Subject: [PATCH 21/33] Create sharpshooter_elf.txt

---
 .../res/cardsfolder/upcoming/sharpshooter_elf.txt     | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/sharpshooter_elf.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/sharpshooter_elf.txt b/forge-gui/res/cardsfolder/upcoming/sharpshooter_elf.txt
new file mode 100644
index 00000000000..c1d23ff1e6f
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/sharpshooter_elf.txt
@@ -0,0 +1,11 @@
+Name:Sharpshooter Elf
+ManaCost:2 G
+Types:Creature Elf Ranger
+PT:*/2
+K:Reach
+S:Mode$ Continuous | EffectZone$ All | CharacteristicDefining$ True | SetPower$ X | Description$ CARDNAME's power is equal to the number of creatures you control.
+SVar:X:Count$Valid Creature.YouCtrl
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDamage | TriggerDescription$ When CARDNAME enters the battlefield, it deals damage equal to its power to target creature with flying an opponent controls.
+SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Creature.OppCtrl+withFlying | TgtPrompt$ Select target creature with flying an opponent controls | NumDmg$ X 
+SVar:X:Count$CardPower
+Oracle:Reach\nSharpshooter Elf's power is equal to the number of creatures you control.\nWhen Sharpshooter Elf enters the battlefield, it deals damage equal to its power to target creature with flying an opponent controls.

From a3eb6e2d02eb7d7a894350f5528b67250ef39490 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Thu, 21 Jul 2022 17:24:56 +0800
Subject: [PATCH 22/33] Update swashbuckler_extraordinaire.txt

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

diff --git a/forge-gui/res/cardsfolder/upcoming/swashbuckler_extraordinaire.txt b/forge-gui/res/cardsfolder/upcoming/swashbuckler_extraordinaire.txt
index 14a6f034000..d07507c55a0 100644
--- a/forge-gui/res/cardsfolder/upcoming/swashbuckler_extraordinaire.txt
+++ b/forge-gui/res/cardsfolder/upcoming/swashbuckler_extraordinaire.txt
@@ -4,8 +4,8 @@ Types:Creature Dragon Rogue Warrior
 PT:2/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTreasure | TriggerDescription$ When CARDNAME enters the battlefield, create a Treasure token. (It's an artifact with "{T}, Sacrifice this artifact: Add one mana of any color.")
 SVar:TrigTreasure:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_treasure_sac | TokenOwner$ You
-T:Mode$ AttackersDeclared | AttackingPlayer$ You | Execute$ TrigSac | OptionalDecider$ You | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack, you may sacrifice one or more Treasures. When you do, up to that many target creatures gain double strike until end of turn.
-SVar:TrigSac:DB$ Sacrifice | Defined$ You | Amount$ X | SacValid$ Treasure | SacMessage$ treasure | RememberSacrificed$ True | SubAbility$ TrigImmediateTrig
+T:Mode$ AttackersDeclared | AttackingPlayer$ You | Execute$ TrigSac | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack, you may sacrifice one or more Treasures. When you do, up to that many target creatures gain double strike until end of turn.
+SVar:TrigSac:DB$ Sacrifice | Defined$ You | Amount$ X | SacValid$ Treasure | SacMessage$ treasure | Optional$ True | RememberSacrificed$ True | SubAbility$ TrigImmediateTrig
 SVar:TrigImmediateTrig:DB$ ImmediateTrigger | Execute$ DBPump | TriggerDescription$ When you do, up to that many target creatures gain double strike until end of turn.
 SVar:DBPump:DB$ Pump | ValidTgts$ Creature | KW$ Double Strike | TargetMin$ 0 | TargetMax$ DBSize | SubAbility$ DBCleanup | TgtPrompt$ Select target creatures | StackDescription$ {c:Targeted} gain double strike until end of turn. | SpellDescription$ Up to that many target creatures gain double strike until end of turn.
 SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True | ClearRemembered$ True

From 457c23bb2f7d95334109df3c6c2114e3de926a86 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Thu, 21 Jul 2022 17:32:07 +0800
Subject: [PATCH 23/33] Create scouting_hawk.txt

---
 forge-gui/res/cardsfolder/upcoming/scouting_hawk.txt | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/scouting_hawk.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/scouting_hawk.txt b/forge-gui/res/cardsfolder/upcoming/scouting_hawk.txt
new file mode 100644
index 00000000000..fa7af485dba
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/scouting_hawk.txt
@@ -0,0 +1,10 @@
+Name:Scouting Hawk
+ManaCost:2 W
+Types:Creature Bird
+PT:1/1
+K:Flying
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Self | Execute$ TrigChange | CheckSVar$ Y | SVarCompare$ GTX | TriggerDescription$ When CARDNAME enters the battlefield, if an opponent controls more lands than you, search your library for a basic Plains card, put it onto the battlefield tapped, then shuffle.
+SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Plains.Basic | ChangeNum$ 1 | Mandatory$ True
+SVar:X:Count$Valid Land.YouCtrl
+SVar:Y:PlayerCountOpponents$HighestValid Land.YouCtrl
+Oracle:Flying\nKeen Sight — When Scouting Hawk enters the battlefield, if an opponent controls more lands than you, search your library for a basic Plains card, put it onto the battlefield tapped, then shuffle.

From 6eccddbb7dd2c1a3ab69f9ec63900855f21862bc Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Thu, 21 Jul 2022 17:40:26 +0800
Subject: [PATCH 24/33] Create saddle_of_the_cavalier.txt

---
 .../res/cardsfolder/upcoming/saddle_of_the_cavalier.txt    | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/saddle_of_the_cavalier.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/saddle_of_the_cavalier.txt b/forge-gui/res/cardsfolder/upcoming/saddle_of_the_cavalier.txt
new file mode 100644
index 00000000000..455c2e7cc3f
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/saddle_of_the_cavalier.txt
@@ -0,0 +1,7 @@
+Name:Saddle of the Cavalier
+ManaCost:2 G
+Types:Artifact Equipment
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 3 | AddToughness$ 3 | Description$ Equipped creature gets +3/+3 and can't be blocked by creatures with power 3 or less.
+S:Mode$ CantBlockBy | ValidAttacker$ Creature.EquippedBy | ValidBlocker$ Creature.powerLE3 | Secondary$ True | Description$ Enchanted creature can't be blocked by creatures with power 3 or less.
+K:Equip:3
+Oracle:Equipped creature gets +3/+3 and can't be blocked by creatures with power 3 or less.\nEquip {3}

From 90bb1106f40cbd1b6ef4d31797f24347015bb588 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Thu, 21 Jul 2022 18:00:23 +0800
Subject: [PATCH 25/33] Create rug_of_smothering.txt

---
 .../res/cardsfolder/upcoming/rug_of_smothering.txt     | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/rug_of_smothering.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/rug_of_smothering.txt b/forge-gui/res/cardsfolder/upcoming/rug_of_smothering.txt
new file mode 100644
index 00000000000..bfbb2864558
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/rug_of_smothering.txt
@@ -0,0 +1,10 @@
+Name:Rug of Smothering
+ManaCost:3
+Types:Artifact Creature Construct
+PT:1/3
+K:Flying
+T:Mode$ SpellCast | ValidActivatingPlayer$ Player | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ Whenever a player casts a spell, they lose 1 life for each spell they've cast this turn.
+SVar:TrigLoseLife:DB$ LoseLife | Defined$ TriggeredActivator | LifeAmount$ X
+SVar:X:TriggeredPlayer$SpellsCastThisTurn
+AI:RemoveDeck:All
+Oracle:Flying\nWhenever a player casts a spell, they lose 1 life for each spell they've cast this turn.

From e4feb82f40603b8c915913fd2bf17772b3666bc7 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Thu, 21 Jul 2022 18:01:11 +0800
Subject: [PATCH 26/33] Update AbilityUtils.java

---
 forge-game/src/main/java/forge/game/ability/AbilityUtils.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java
index a8ff585f6ca..29682398b19 100644
--- a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java
+++ b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java
@@ -3460,6 +3460,10 @@ public class AbilityUtils {
             return doXMath(player.getLandsPlayedThisTurn(), m, source, ctb);
         }
 
+        if (value.contains("SpellsCastThisTurn")) {
+            return doXMath(player.getSpellsCastThisTurn(), m, source, ctb);
+        }
+
         if (value.contains("CardsDrawn")) {
             return doXMath(player.getNumDrawnThisTurn(), m, source, ctb);
         }

From 16a069c8bea87ed7a53a4a6f8c37f9ca54beb277 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Thu, 21 Jul 2022 18:05:07 +0800
Subject: [PATCH 27/33] Update scouting_hawk.txt

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

diff --git a/forge-gui/res/cardsfolder/upcoming/scouting_hawk.txt b/forge-gui/res/cardsfolder/upcoming/scouting_hawk.txt
index fa7af485dba..0496b1c4c49 100644
--- a/forge-gui/res/cardsfolder/upcoming/scouting_hawk.txt
+++ b/forge-gui/res/cardsfolder/upcoming/scouting_hawk.txt
@@ -4,7 +4,7 @@ Types:Creature Bird
 PT:1/1
 K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Self | Execute$ TrigChange | CheckSVar$ Y | SVarCompare$ GTX | TriggerDescription$ When CARDNAME enters the battlefield, if an opponent controls more lands than you, search your library for a basic Plains card, put it onto the battlefield tapped, then shuffle.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Plains.Basic | ChangeNum$ 1 | Mandatory$ True
+SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Plains.Basic | ChangeNum$ 1
 SVar:X:Count$Valid Land.YouCtrl
 SVar:Y:PlayerCountOpponents$HighestValid Land.YouCtrl
 Oracle:Flying\nKeen Sight — When Scouting Hawk enters the battlefield, if an opponent controls more lands than you, search your library for a basic Plains card, put it onto the battlefield tapped, then shuffle.

From 9702939c42ece424e83e80568d7df2e3c6191b61 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Thu, 21 Jul 2022 18:16:13 +0800
Subject: [PATCH 28/33] Create rescuer_chwinga.txt

---
 forge-gui/res/cardsfolder/upcoming/rescuer_chwinga.txt | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/rescuer_chwinga.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/rescuer_chwinga.txt b/forge-gui/res/cardsfolder/upcoming/rescuer_chwinga.txt
new file mode 100644
index 00000000000..ad4173ccaba
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/rescuer_chwinga.txt
@@ -0,0 +1,9 @@
+Name:Rescuer Chwinga
+ManaCost:1 W
+Types:Creature Elemental Spirit
+PT:2/2
+K:Flash
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | OptionalDecider$ You | TriggerDescription$ Natural Shelter — When CARDNAME enters the battlefield, you may return another permanent you control to its owner's hand.
+SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | Hidden$ True | AILogic$ Never | Mandatory$ True | ChangeType$ Permanent.Other+YouCtrl
+AI:RemoveDeck:Random
+Oracle:Flash\nNatural Shelter — When Rescuer Chwinga enters the battlefield, you may return another permanent you control to its owner's hand.

From 34a6c00714ce0e74ef4f767ae610b2f321950cff Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Thu, 21 Jul 2022 18:19:04 +0800
Subject: [PATCH 29/33] Create reckless_barbarian.txt

---
 forge-gui/res/cardsfolder/upcoming/reckless_barbarian.txt | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/reckless_barbarian.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/reckless_barbarian.txt b/forge-gui/res/cardsfolder/upcoming/reckless_barbarian.txt
new file mode 100644
index 00000000000..e433c17c5ae
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/reckless_barbarian.txt
@@ -0,0 +1,7 @@
+Name:Reckless Barbarian
+ManaCost:1 R
+Types:Creature Dragon Barbarian
+PT:2/2
+A:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ R | Amount$ 2 | SpellDescription$ Add {R}{R}.
+AI:RemoveDeck:All
+Oracle:Sacrifice Reckless Barbarian: Add {R}{R}.

From 972757c5de38849a956b0d8bc71a1d353e28c9d4 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Thu, 21 Jul 2022 18:38:49 +0800
Subject: [PATCH 30/33] Create pseudodragon_familiar.txt

---
 .../res/cardsfolder/upcoming/pseudodragon_familiar.txt     | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/pseudodragon_familiar.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/pseudodragon_familiar.txt b/forge-gui/res/cardsfolder/upcoming/pseudodragon_familiar.txt
new file mode 100644
index 00000000000..3a704d9610b
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/pseudodragon_familiar.txt
@@ -0,0 +1,7 @@
+Name:Pseudodragon Familiar
+ManaCost:2 U
+Types:Creature Dragon
+PT:2/1
+K:Flying
+A:AB$ Pump | Cost$ 2 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Flying | SpellDescription$ Target creature gains flying until end of turn.
+Oracle:Flying\n{2}{U}: Target creature gains flying until end of turn.

From 5f8c0ffedebd7572d4e18da10c242551e1ad6cea Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Thu, 21 Jul 2022 18:43:48 +0800
Subject: [PATCH 31/33] Create poison_the_blade.txt

---
 forge-gui/res/cardsfolder/upcoming/poison_the_blade.txt | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/poison_the_blade.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/poison_the_blade.txt b/forge-gui/res/cardsfolder/upcoming/poison_the_blade.txt
new file mode 100644
index 00000000000..4a3c2b390fb
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/poison_the_blade.txt
@@ -0,0 +1,6 @@
+Name:Poison the Blade
+ManaCost:1 G
+Types:Instant
+A:SP$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Deathtouch | SubAbility$ DBDraw | SpellDescription$ Target creature gains deathtouch until end of turn.
+SVar:DBDraw:DB$ Draw | SpellDescription$ Draw a card.
+Oracle:Target creature gains deathtouch until end of turn.\nDraw a card.

From 8de6b73ec285f85764a6e01f88aa60e002f754b4 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Thu, 21 Jul 2022 18:57:27 +0800
Subject: [PATCH 32/33] Create nimblewright_schematic.txt

---
 .../res/cardsfolder/upcoming/nimblewright_schematic.txt   | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/nimblewright_schematic.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/nimblewright_schematic.txt b/forge-gui/res/cardsfolder/upcoming/nimblewright_schematic.txt
new file mode 100644
index 00000000000..33e15551068
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/nimblewright_schematic.txt
@@ -0,0 +1,8 @@
+Name:Nimblewright Schematic
+ManaCost:2
+Types:Artifact
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield or is put into a graveyard from the battlefield, create a 1/1 colorless Construct artifact creature token.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Secondary$ True | Execute$ TrigToken | Secondary$ True | TriggerDescription$ When CARDNAME enters the battlefield or is put into a graveyard from the battlefield, create a 1/1 colorless Construct artifact creature token.
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_1_1_a_construct | TokenOwner$ You
+DeckHas:Ability$Token
+Oracle:When Nimblewright Schematic enters the battlefield or is put into a graveyard from the battlefield, create a 1/1 colorless Construct artifact creature token.

From 1b84bfd4c058c47ab4de53c509612c5e3b69558b Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Thu, 21 Jul 2022 18:58:28 +0800
Subject: [PATCH 33/33] Update swashbuckler_extraordinaire.txt

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

diff --git a/forge-gui/res/cardsfolder/upcoming/swashbuckler_extraordinaire.txt b/forge-gui/res/cardsfolder/upcoming/swashbuckler_extraordinaire.txt
index d07507c55a0..dbf2fa25702 100644
--- a/forge-gui/res/cardsfolder/upcoming/swashbuckler_extraordinaire.txt
+++ b/forge-gui/res/cardsfolder/upcoming/swashbuckler_extraordinaire.txt
@@ -8,7 +8,7 @@ T:Mode$ AttackersDeclared | AttackingPlayer$ You | Execute$ TrigSac | TriggerZon
 SVar:TrigSac:DB$ Sacrifice | Defined$ You | Amount$ X | SacValid$ Treasure | SacMessage$ treasure | Optional$ True | RememberSacrificed$ True | SubAbility$ TrigImmediateTrig
 SVar:TrigImmediateTrig:DB$ ImmediateTrigger | Execute$ DBPump | TriggerDescription$ When you do, up to that many target creatures gain double strike until end of turn.
 SVar:DBPump:DB$ Pump | ValidTgts$ Creature | KW$ Double Strike | TargetMin$ 0 | TargetMax$ DBSize | SubAbility$ DBCleanup | TgtPrompt$ Select target creatures | StackDescription$ {c:Targeted} gain double strike until end of turn. | SpellDescription$ Up to that many target creatures gain double strike until end of turn.
-SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True | ClearRemembered$ True
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:DBSize:Count$RememberedSize
 SVar:X:Count$Valid Treasure.YouCtrl
 DeckHas:Ability$Token|Sacrifice & Type$Treasure