From 08742f8fd4484e2f637c441d2bbbe46121c5ae09 Mon Sep 17 00:00:00 2001
From: Dennis Vlahos <76853279+dennisvlahos@users.noreply.github.com>
Date: Wed, 13 Apr 2022 08:56:18 +0300
Subject: [PATCH 01/12] SNC: 3 New Cards

Ballroom Brawlers
Getaway Car
Errant, Street Artist
---
 .../cardsfolder/upcoming/ballroom_brawlers.txt  | 14 ++++++++++++++
 .../upcoming/errant_street_artist.txt           |  9 +++++++++
 .../res/cardsfolder/upcoming/getaway_car.txt    | 17 +++++++++++++++++
 3 files changed, 40 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/ballroom_brawlers.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/errant_street_artist.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/getaway_car.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/ballroom_brawlers.txt b/forge-gui/res/cardsfolder/upcoming/ballroom_brawlers.txt
new file mode 100644
index 00000000000..16745b4cff7
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/ballroom_brawlers.txt
@@ -0,0 +1,14 @@
+Name:Ballroom Brawlers
+ManaCost:3 W W
+Types:Creature Human Warrior
+PT:3/5
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigSelectTargetCreature | TriggerDescription$ Whenever CARDNAME attacks, CARDNAME and up to one other target creature you control both gain your choice of first strike or lifelink until end of turn.
+SVar:TrigSelectTargetCreature:DB$ Pump | ValidTgts$ Creature.YouCtrl+Other | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select up to one other target creature | AITgts$ Creature.withoutFirst Strike | SubAbility$ DBKeywordChoice | SpellDescription$ CARDNAME and up to one other target creature you control both gain your choice of first strike or lifelink until end of turn.
+SVar:DBKeywordChoice:DB$ GenericChoice | Defined$ You | Choices$ DBFirstStrike,DBLifelink | AILogic$ DBFirstStrike
+SVar:DBFirstStrike:DB$ Pump | Defined$ Self | KW$ First Strike | SubAbility$ DBFirstStrike2 | SpellDescription$ First strike
+SVar:DBFirstStrike2:DB$ Pump | Defined$ Targeted | KW$ First Strike
+SVar:DBLifelink:DB$ Pump | Defined$ Self | KW$ Lifelink | SubAbility$ DBLifelink2 | SpellDescription$ Lifelink
+SVar:DBLifelink2:DB$ Pump | Defined$ Targeted | KW$ Lifelink
+SVar:HasAttackEffect:True
+DeckHas:Ability$LifeGain
+Oracle:Whenever Ballroom Brawlers attacks, Ballroom Brawlers and up to one other target creature you control both gain your choice of first strike or lifelink until end of turn.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/errant_street_artist.txt b/forge-gui/res/cardsfolder/upcoming/errant_street_artist.txt
new file mode 100644
index 00000000000..3eda0d2cf53
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/errant_street_artist.txt
@@ -0,0 +1,9 @@
+Name:Errant, Street Artist
+ManaCost:U
+Types:Legendary Creature Human Rogue
+PT:0/3
+K:Flash
+K:Defender
+K:Haste
+A:AB$ CopySpellAbility | Cost$ 1 U T | ValidTgts$ Spell.YouCtrl+wasNotCast | TargetType$ Spell | MayChooseTarget$ True | AILogic$ OnceIfViable | SpellDescription$ Copy target spell you control that wasn’t cast. You may choose new targets for the copy.
+Oracle:Flash\nDefender, haste\n{1}{U}, {T}: Copy target spell you control that wasn’t cast. You may choose new targets for the copy.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/getaway_car.txt b/forge-gui/res/cardsfolder/upcoming/getaway_car.txt
new file mode 100644
index 00000000000..a4ff044cf33
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/getaway_car.txt
@@ -0,0 +1,17 @@
+Name:Getaway Car
+ManaCost:3
+Types:Artifact Vehicle
+PT:4/3
+K:Haste
+T:Mode$ BecomesCrewed | ValidVehicle$ Card.Self | Execute$ RememberCrew | Static$ True
+SVar:RememberCrew:DB$ PumpAll | ValidCards$ Creature.TriggeredCrew | RememberAllPumped$ True
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ DBCleanup | Static$ True
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ Player | TriggerZones$ Battlefield | Execute$ DBCleanup | Static$ True
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigReturn | TriggerDescription$ Whenever CARDNAME attacks or blocks, return up to one target creature that crewed it this turn to its owner’s hand.
+T:Mode$ Blocks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Secondary$ True | Execute$ TrigReturn | TriggerDescription$ Whenever CARDNAME attacks or blocks, return up to one target creature that crewed it this turn to its owner’s hand.
+SVar:TrigReturn:DB$ ChangeZone | ValidTgts$ Creature.IsRemembered | TargetMin$ 0 | TargetMax$ 1 | Origin$ Battlefield | Destination$ Hand | TgtPrompt$ Select up to one target creature
+K:Crew:1
+SVar:HasAttackEffect:True
+SVar:HasBlockEffect:True
+Oracle:Haste\nWhenever Getaway Car attacks or blocks, return up to one target creature that crewed it this turn to its owner’s hand.\nCrew 1
\ No newline at end of file

From 26f8820fa986594769a3ac61525bcbf333f9fe62 Mon Sep 17 00:00:00 2001
From: Dennis Vlahos <76853279+dennisvlahos@users.noreply.github.com>
Date: Wed, 13 Apr 2022 09:23:24 +0300
Subject: [PATCH 02/12] Add files via upload

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

diff --git a/forge-gui/res/cardsfolder/upcoming/security_rhox.txt b/forge-gui/res/cardsfolder/upcoming/security_rhox.txt
new file mode 100644
index 00000000000..fd28b64e156
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/security_rhox.txt
@@ -0,0 +1,6 @@
+Name:Security Rhox
+ManaCost:2 R G
+Types:Creature Rhino Warrior
+PT:5/4
+SVar:AltCost:Cost$ Mana<R G\Treasure> | Description$ You may pay {R}{G} rather than pay this spell’s mana cost. Spend only mana produced by Treasures to cast it this way.
+Oracle:You may pay {R}{G} rather than pay this spell’s mana cost. Spend only mana produced by Treasures to cast it this way.
\ No newline at end of file

From 7f24e3e207605ed7830ae76cf70ffa58ecfdc0ed Mon Sep 17 00:00:00 2001
From: Dennis Vlahos <76853279+dennisvlahos@users.noreply.github.com>
Date: Wed, 13 Apr 2022 09:50:22 +0300
Subject: [PATCH 03/12] Add files via upload

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

diff --git a/forge-gui/res/cardsfolder/upcoming/shakedown_heavy.txt b/forge-gui/res/cardsfolder/upcoming/shakedown_heavy.txt
new file mode 100644
index 00000000000..0c36f82351b
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/shakedown_heavy.txt
@@ -0,0 +1,10 @@
+Name:Shakedown Heavy
+ManaCost:2 B
+Types:Creature Ogre Warrior
+PT:6/4
+K:Menace
+T:Mode$ Attacks | ValidCard$ Card.Self | OptionalDecider$ DefendingPlayer | Execute$ TrigDraw | TriggerDescription$ Whenever CARDNAME attacks, defending player may have you draw a card. If they do, untap CARDNAME and remove it from combat.
+SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1 | SubAbility$ TrigUntap
+SVar:TrigUntap:DB$ Untap | Defined$ Self | SubAbility$ RemCombat
+SVar:RemCombat:DB$ RemoveFromCombat | Defined$ Self
+Oracle:Menace\nWhenever Shakedown Heavy attacks, defending player may have you draw a card. If they do, untap Shakedown Heavy and remove it from combat.
\ No newline at end of file

From af85d78743ac25c69d4906340beb3beae71fef92 Mon Sep 17 00:00:00 2001
From: Dennis Vlahos <76853279+dennisvlahos@users.noreply.github.com>
Date: Wed, 13 Apr 2022 10:03:34 +0300
Subject: [PATCH 04/12] Add files via upload

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

diff --git a/forge-gui/res/cardsfolder/upcoming/snooping_newsie.txt b/forge-gui/res/cardsfolder/upcoming/snooping_newsie.txt
new file mode 100644
index 00000000000..f9c3b46b2f3
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/snooping_newsie.txt
@@ -0,0 +1,10 @@
+Name:Snooping Newsie
+ManaCost:U B
+Types:Creature Human Rogue
+PT:2/2
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMill | TriggerDescription$ When CARDNAME enters the battlefield, mill two cards.
+SVar:TrigMill:DB$ Mill | NumCards$ 2 | Defined$ You
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ Lifelink | CheckSVar$ X | SVarCompare$ GE5 | Description$ As long as there are five or more mana values among cards in your graveyard, CARDNAME gets +1/+1 and has lifelink.
+SVar:X:Count$DifferentManaValueGraveyard Card.YouOwn
+DeckHas:Ability$Mill
+Oracle:When Snooping Newsie enters the battlefield, mill two cards. (Put the top two cards of your library into your graveyard.)\nAs long as there are five or more mana values among cards in your graveyard, Snooping Newsie gets +1/+1 and has lifelink.
\ No newline at end of file

From ee9ce5b29bd4944d4cea29f056e6bd9e2859f9bd Mon Sep 17 00:00:00 2001
From: Dennis Vlahos <76853279+dennisvlahos@users.noreply.github.com>
Date: Wed, 13 Apr 2022 10:24:25 +0300
Subject: [PATCH 05/12] Add files via upload

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

diff --git a/forge-gui/res/cardsfolder/upcoming/topiary_stomper.txt b/forge-gui/res/cardsfolder/upcoming/topiary_stomper.txt
new file mode 100644
index 00000000000..a4f0b4fa3a8
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/topiary_stomper.txt
@@ -0,0 +1,11 @@
+Name:Topiary Stomper
+ManaCost:1 G G
+Types:Creature Plant Dinosaur
+PT:4/4
+K:Vigilance
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSearch | TriggerDescription$ When CARDNAME enters the battlefield, search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
+SVar:TrigSearch:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ 1 | Tapped$ True
+S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CARDNAME can't attack or block. | CheckSVar$ X | SVarCompare$ LT7 | Description$ CARDNAME can't attack or block unless you control seven or more lands.
+SVar:X:Count$Valid Land.YouCtrl
+SVar:BuffedBy:Land
+Oracle:Vigilance\nWhen Topiary Stomper enters the battlefield, search your library for a basic land card, put it onto the battlefield tapped, then shuffle.\nTopiary Stomper can’t attack or block unless you control seven or more lands.
\ No newline at end of file

From 211cda6af6bb1afea2ee16988113aa9666fe4dad Mon Sep 17 00:00:00 2001
From: Dennis Vlahos <76853279+dennisvlahos@users.noreply.github.com>
Date: Wed, 13 Apr 2022 10:44:47 +0300
Subject: [PATCH 06/12] Add files via upload

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

diff --git a/forge-gui/res/cardsfolder/upcoming/vampire_scrivener.txt b/forge-gui/res/cardsfolder/upcoming/vampire_scrivener.txt
new file mode 100644
index 00000000000..8e4f61afffb
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/vampire_scrivener.txt
@@ -0,0 +1,11 @@
+Name:Vampire Scrivener
+ManaCost:4 B
+Types:Creature Vampire Warlock
+PT:2/2
+K:Flying
+T:Mode$ LifeGained | ValidPlayer$ You | TriggerZones$ Battlefield | PlayerTurn$ True | Execute$ TrigPutCounter | TriggerDescription$ Whenever you gain life during your turn, put a +1/+1 counter on CARDNAME.
+T:Mode$ LifeLost | ValidPlayer$ You | TriggerZones$ Battlefield | PlayerTurn$ True | Execute$ TrigPutCounter | TriggerDescription$ Whenever you lose life during your turn, put a +1/+1 counter on CARDNAME.
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
+DeckHints:Ability$LifeGain
+DeckHas:Ability$Counters
+Oracle:Flying\nWhenever you gain life during your turn, put a +1/+1 counter on Vampire Scrivener.\nWhenever you lose life during your turn, put a +1/+1 counter on Vampire Scrivener.
\ No newline at end of file

From 1dcb2e4ba078dbe64365678cbd18f3215d7f74f3 Mon Sep 17 00:00:00 2001
From: Dennis Vlahos <76853279+dennisvlahos@users.noreply.github.com>
Date: Wed, 13 Apr 2022 11:20:43 +0300
Subject: [PATCH 07/12] Add files via upload

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

diff --git a/forge-gui/res/cardsfolder/upcoming/unleash_the_inferno.txt b/forge-gui/res/cardsfolder/upcoming/unleash_the_inferno.txt
new file mode 100644
index 00000000000..a4d2e541a85
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/unleash_the_inferno.txt
@@ -0,0 +1,9 @@
+Name:Unleash the Inferno
+ManaCost:1 B R G
+Types:Instant
+A:SP$ DealDamage | ValidTgts$ Creature,Planeswalker | TgtPrompt$ Select target creature or planeswalker | NumDmg$ 7 | ExcessSVar$ Excess | SubAbility$ DBImmediateTrigger | SpellDescription$ CARDNAME deals 7 damage to target creature or planeswalker. When it deals excess damage this way, destroy target artifact or enchantment an opponent controls with mana value less than or equal to that amount of excess damage.
+SVar:DBImmediateTrigger:DB$ ImmediateTrigger | ConditionCheckSVar$ Excess | ConditionSVarCompare$ GE1 | RememberSVarAmount$ Excess | Execute$ TrigDestroy | TriggerDescription$ When it deals excess damage this way, destroy target artifact or enchantment an opponent controls with mana value less than or equal to that amount of excess damage.
+SVar:TrigDestroy:DB$ Destroy | ValidTgts$ Artifact.OppCtrl+cmcLEX,Enchantment.OppCtrl+cmcLEX | TgtPrompt$ Select target Artifact or Enchantment | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:X:Count$TriggerRememberAmount
+Oracle:Unleash the Inferno deals 7 damage to target creature or planeswalker. When it deals excess damage this way, destroy target artifact or enchantment an opponent controls with mana value less than or equal to that amount of excess damage.
\ No newline at end of file

From bc4b047534f037d49850c090ae31043219ea63de Mon Sep 17 00:00:00 2001
From: Dennis Vlahos <76853279+dennisvlahos@users.noreply.github.com>
Date: Wed, 13 Apr 2022 11:49:45 +0300
Subject: [PATCH 08/12] Add files via upload

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

diff --git a/forge-gui/res/cardsfolder/upcoming/unlucky_witness.txt b/forge-gui/res/cardsfolder/upcoming/unlucky_witness.txt
new file mode 100644
index 00000000000..533f52c21a9
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/unlucky_witness.txt
@@ -0,0 +1,13 @@
+Name:Unlucky Witness
+ManaCost:R
+Types:Creature Human Citizen
+PT:1/1
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When CARDNAME dies, exile the top two cards of your library. Until your next end step, you may play one of those cards.
+SVar:TrigExile:DB$ Dig | Defined$ You | DigNum$ 2 | ChangeNum$ All | DestinationZone$ Exile | RememberChanged$ True | SubAbility$ DBEffect
+SVar:DBEffect:DB$ Effect | StaticAbilities$ STPlay | Triggers$ Play1,Play2 | RememberObjects$ Remembered | ForgetOnMoved$ Exile | Duration$ UntilYourNextEndStep | SubAbility$ DBCleanup
+SVar:STPlay:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Exile | Affected$ Card.IsRemembered | MayPlay$ True | Description$ Until your next end step, you may play one of those cards.
+SVar:Play1:Mode$ SpellCast | ValidCard$ Card.IsRemembered | ValidActivatingPlayer$ You | TriggerZones$ Command | Execute$ ExileSelf | Static$ True
+SVar:Play2:Mode$ LandPlayed | ValidCard$ Land.IsRemembered | TriggerZones$ Command | Execute$ ExileSelf | Static$ True
+SVar:ExileSelf:DB$ ChangeZone | Origin$ Command | Destination$ Exile
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+Oracle:When Unlucky Witness dies, exile the top two cards of your library. Until your next end step, you may play one of those cards.
\ No newline at end of file

From 1d4bc63837f107a58da20e095dd6df5830cd304a Mon Sep 17 00:00:00 2001
From: Dennis Vlahos <76853279+dennisvlahos@users.noreply.github.com>
Date: Wed, 13 Apr 2022 12:16:19 +0300
Subject: [PATCH 09/12] Add files via upload

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

diff --git a/forge-gui/res/cardsfolder/upcoming/arc_spitter.txt b/forge-gui/res/cardsfolder/upcoming/arc_spitter.txt
new file mode 100644
index 00000000000..75fc718406c
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/arc_spitter.txt
@@ -0,0 +1,7 @@
+Name:Arc Spitter
+ManaCost:1
+Types:Artifact Equipment
+S:Mode$ Continuous | Affected$ Card.EquippedBy | AddAbility$ ABDealDamage | Description$ Equipped creature has “{1}: This creature deals 1 damage to target creature that’s blocking it.”
+SVar:ABDealDamage:AB$ DealDamage | Cost$ 1 | ValidTgts$ Creature.blockingSource | TgtPrompt$ Select target creature | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature that’s blocking it.
+K:Equip:1
+Oracle:Equipped creature has “{1}: This creature deals 1 damage to target creature that’s blocking it.”\nEquip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.)
\ No newline at end of file

From 5ee01ffe9ea8dcf8aa938306ab480554c8e101a4 Mon Sep 17 00:00:00 2001
From: Dennis Vlahos <76853279+dennisvlahos@users.noreply.github.com>
Date: Wed, 13 Apr 2022 22:11:17 +0300
Subject: [PATCH 10/12] Made requested changes

---
 forge-gui/res/cardsfolder/upcoming/arc_spitter.txt        | 6 +++---
 forge-gui/res/cardsfolder/upcoming/ballroom_brawlers.txt  | 4 ++--
 .../res/cardsfolder/upcoming/errant_street_artist.txt     | 4 ++--
 forge-gui/res/cardsfolder/upcoming/getaway_car.txt        | 8 ++++----
 forge-gui/res/cardsfolder/upcoming/security_rhox.txt      | 5 +++--
 forge-gui/res/cardsfolder/upcoming/snooping_newsie.txt    | 3 ++-
 forge-gui/res/cardsfolder/upcoming/topiary_stomper.txt    | 2 +-
 .../res/cardsfolder/upcoming/unleash_the_inferno.txt      | 2 +-
 8 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/arc_spitter.txt b/forge-gui/res/cardsfolder/upcoming/arc_spitter.txt
index 75fc718406c..560ba69ed2b 100644
--- a/forge-gui/res/cardsfolder/upcoming/arc_spitter.txt
+++ b/forge-gui/res/cardsfolder/upcoming/arc_spitter.txt
@@ -1,7 +1,7 @@
 Name:Arc Spitter
 ManaCost:1
 Types:Artifact Equipment
-S:Mode$ Continuous | Affected$ Card.EquippedBy | AddAbility$ ABDealDamage | Description$ Equipped creature has “{1}: This creature deals 1 damage to target creature that’s blocking it.”
-SVar:ABDealDamage:AB$ DealDamage | Cost$ 1 | ValidTgts$ Creature.blockingSource | TgtPrompt$ Select target creature | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature that’s blocking it.
+S:Mode$ Continuous | Affected$ Card.EquippedBy | AddAbility$ ABDealDamage | Description$ Equipped creature has "{1}: This creature deals 1 damage to target creature that's blocking it."
+SVar:ABDealDamage:AB$ DealDamage | Cost$ 1 | ValidTgts$ Creature.blockingSource | TgtPrompt$ Select target blocking creature | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature that’s blocking it.
 K:Equip:1
-Oracle:Equipped creature has “{1}: This creature deals 1 damage to target creature that’s blocking it.”\nEquip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.)
\ No newline at end of file
+Oracle:Equipped creature has "{1}: This creature deals 1 damage to target creature that's blocking it."\nEquip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/ballroom_brawlers.txt b/forge-gui/res/cardsfolder/upcoming/ballroom_brawlers.txt
index 16745b4cff7..5280da3201f 100644
--- a/forge-gui/res/cardsfolder/upcoming/ballroom_brawlers.txt
+++ b/forge-gui/res/cardsfolder/upcoming/ballroom_brawlers.txt
@@ -3,8 +3,8 @@ ManaCost:3 W W
 Types:Creature Human Warrior
 PT:3/5
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigSelectTargetCreature | TriggerDescription$ Whenever CARDNAME attacks, CARDNAME and up to one other target creature you control both gain your choice of first strike or lifelink until end of turn.
-SVar:TrigSelectTargetCreature:DB$ Pump | ValidTgts$ Creature.YouCtrl+Other | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select up to one other target creature | AITgts$ Creature.withoutFirst Strike | SubAbility$ DBKeywordChoice | SpellDescription$ CARDNAME and up to one other target creature you control both gain your choice of first strike or lifelink until end of turn.
-SVar:DBKeywordChoice:DB$ GenericChoice | Defined$ You | Choices$ DBFirstStrike,DBLifelink | AILogic$ DBFirstStrike
+SVar:TrigSelectTargetCreature:DB$ Pump | ValidTgts$ Creature.YouCtrl+Other | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select up to one other target creature | SubAbility$ DBKeywordChoice | SpellDescription$ CARDNAME and up to one other target creature you control both gain your choice of first strike or lifelink until end of turn.
+SVar:DBKeywordChoice:DB$ GenericChoice | Defined$ You | Choices$ DBFirstStrike,DBLifelink
 SVar:DBFirstStrike:DB$ Pump | Defined$ Self | KW$ First Strike | SubAbility$ DBFirstStrike2 | SpellDescription$ First strike
 SVar:DBFirstStrike2:DB$ Pump | Defined$ Targeted | KW$ First Strike
 SVar:DBLifelink:DB$ Pump | Defined$ Self | KW$ Lifelink | SubAbility$ DBLifelink2 | SpellDescription$ Lifelink
diff --git a/forge-gui/res/cardsfolder/upcoming/errant_street_artist.txt b/forge-gui/res/cardsfolder/upcoming/errant_street_artist.txt
index 3eda0d2cf53..7e1f14cb8a6 100644
--- a/forge-gui/res/cardsfolder/upcoming/errant_street_artist.txt
+++ b/forge-gui/res/cardsfolder/upcoming/errant_street_artist.txt
@@ -5,5 +5,5 @@ PT:0/3
 K:Flash
 K:Defender
 K:Haste
-A:AB$ CopySpellAbility | Cost$ 1 U T | ValidTgts$ Spell.YouCtrl+wasNotCast | TargetType$ Spell | MayChooseTarget$ True | AILogic$ OnceIfViable | SpellDescription$ Copy target spell you control that wasn’t cast. You may choose new targets for the copy.
-Oracle:Flash\nDefender, haste\n{1}{U}, {T}: Copy target spell you control that wasn’t cast. You may choose new targets for the copy.
\ No newline at end of file
+A:AB$ CopySpellAbility | Cost$ 1 U T | ValidTgts$ Spell.YouCtrl+wasNotCast | TargetType$ Spell | MayChooseTarget$ True | AILogic$ OnceIfViable | SpellDescription$ Copy target spell you control that wasn't cast. You may choose new targets for the copy.
+Oracle:Flash\nDefender, haste\n{1}{U}, {T}: Copy target spell you control that wasn't cast. You may choose new targets for the copy.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/getaway_car.txt b/forge-gui/res/cardsfolder/upcoming/getaway_car.txt
index a4ff044cf33..8af2a726f64 100644
--- a/forge-gui/res/cardsfolder/upcoming/getaway_car.txt
+++ b/forge-gui/res/cardsfolder/upcoming/getaway_car.txt
@@ -8,10 +8,10 @@ SVar:RememberCrew:DB$ PumpAll | ValidCards$ Creature.TriggeredCrew | RememberAll
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ DBCleanup | Static$ True
 T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ Player | TriggerZones$ Battlefield | Execute$ DBCleanup | Static$ True
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigReturn | TriggerDescription$ Whenever CARDNAME attacks or blocks, return up to one target creature that crewed it this turn to its owner’s hand.
-T:Mode$ Blocks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Secondary$ True | Execute$ TrigReturn | TriggerDescription$ Whenever CARDNAME attacks or blocks, return up to one target creature that crewed it this turn to its owner’s hand.
-SVar:TrigReturn:DB$ ChangeZone | ValidTgts$ Creature.IsRemembered | TargetMin$ 0 | TargetMax$ 1 | Origin$ Battlefield | Destination$ Hand | TgtPrompt$ Select up to one target creature
+T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigReturn | TriggerDescription$ Whenever CARDNAME attacks or blocks, return up to one target creature that crewed it this turn to its owner's hand.
+T:Mode$ Blocks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Secondary$ True | Execute$ TrigReturn | TriggerDescription$ Whenever CARDNAME attacks or blocks, return up to one target creature that crewed it this turn to its owner's hand.
+SVar:TrigReturn:DB$ ChangeZone | ValidTgts$ Creature.IsRemembered | TargetMin$ 0 | TargetMax$ 1 | Origin$ Battlefield | Destination$ Hand | TgtPrompt$ Select up to one target creature to return to its owner's hand
 K:Crew:1
 SVar:HasAttackEffect:True
 SVar:HasBlockEffect:True
-Oracle:Haste\nWhenever Getaway Car attacks or blocks, return up to one target creature that crewed it this turn to its owner’s hand.\nCrew 1
\ No newline at end of file
+Oracle:Haste\nWhenever Getaway Car attacks or blocks, return up to one target creature that crewed it this turn to its owner's hand.\nCrew 1
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/security_rhox.txt b/forge-gui/res/cardsfolder/upcoming/security_rhox.txt
index fd28b64e156..14ef41a5d22 100644
--- a/forge-gui/res/cardsfolder/upcoming/security_rhox.txt
+++ b/forge-gui/res/cardsfolder/upcoming/security_rhox.txt
@@ -2,5 +2,6 @@ Name:Security Rhox
 ManaCost:2 R G
 Types:Creature Rhino Warrior
 PT:5/4
-SVar:AltCost:Cost$ Mana<R G\Treasure> | Description$ You may pay {R}{G} rather than pay this spell’s mana cost. Spend only mana produced by Treasures to cast it this way.
-Oracle:You may pay {R}{G} rather than pay this spell’s mana cost. Spend only mana produced by Treasures to cast it this way.
\ No newline at end of file
+DeckHints:Type$Treasure
+SVar:AltCost:Cost$ Mana<R G\Treasure> | Description$ You may pay {R}{G} rather than pay this spell's mana cost. Spend only mana produced by Treasures to cast it this way.
+Oracle:You may pay {R}{G} rather than pay this spell's mana cost. Spend only mana produced by Treasures to cast it this way.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/snooping_newsie.txt b/forge-gui/res/cardsfolder/upcoming/snooping_newsie.txt
index f9c3b46b2f3..425b03b96d2 100644
--- a/forge-gui/res/cardsfolder/upcoming/snooping_newsie.txt
+++ b/forge-gui/res/cardsfolder/upcoming/snooping_newsie.txt
@@ -6,5 +6,6 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S
 SVar:TrigMill:DB$ Mill | NumCards$ 2 | Defined$ You
 S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ Lifelink | CheckSVar$ X | SVarCompare$ GE5 | Description$ As long as there are five or more mana values among cards in your graveyard, CARDNAME gets +1/+1 and has lifelink.
 SVar:X:Count$DifferentManaValueGraveyard Card.YouOwn
-DeckHas:Ability$Mill
+DeckHas:Ability$Mill|LifeGain
+DeckHints:Ability$Discard
 Oracle:When Snooping Newsie enters the battlefield, mill two cards. (Put the top two cards of your library into your graveyard.)\nAs long as there are five or more mana values among cards in your graveyard, Snooping Newsie gets +1/+1 and has lifelink.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/topiary_stomper.txt b/forge-gui/res/cardsfolder/upcoming/topiary_stomper.txt
index a4f0b4fa3a8..19ec3937ae5 100644
--- a/forge-gui/res/cardsfolder/upcoming/topiary_stomper.txt
+++ b/forge-gui/res/cardsfolder/upcoming/topiary_stomper.txt
@@ -8,4 +8,4 @@ SVar:TrigSearch:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Ch
 S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CARDNAME can't attack or block. | CheckSVar$ X | SVarCompare$ LT7 | Description$ CARDNAME can't attack or block unless you control seven or more lands.
 SVar:X:Count$Valid Land.YouCtrl
 SVar:BuffedBy:Land
-Oracle:Vigilance\nWhen Topiary Stomper enters the battlefield, search your library for a basic land card, put it onto the battlefield tapped, then shuffle.\nTopiary Stomper can’t attack or block unless you control seven or more lands.
\ No newline at end of file
+Oracle:Vigilance\nWhen Topiary Stomper enters the battlefield, search your library for a basic land card, put it onto the battlefield tapped, then shuffle.\nTopiary Stomper can't attack or block unless you control seven or more lands.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/unleash_the_inferno.txt b/forge-gui/res/cardsfolder/upcoming/unleash_the_inferno.txt
index a4d2e541a85..2732d1ddfda 100644
--- a/forge-gui/res/cardsfolder/upcoming/unleash_the_inferno.txt
+++ b/forge-gui/res/cardsfolder/upcoming/unleash_the_inferno.txt
@@ -3,7 +3,7 @@ ManaCost:1 B R G
 Types:Instant
 A:SP$ DealDamage | ValidTgts$ Creature,Planeswalker | TgtPrompt$ Select target creature or planeswalker | NumDmg$ 7 | ExcessSVar$ Excess | SubAbility$ DBImmediateTrigger | SpellDescription$ CARDNAME deals 7 damage to target creature or planeswalker. When it deals excess damage this way, destroy target artifact or enchantment an opponent controls with mana value less than or equal to that amount of excess damage.
 SVar:DBImmediateTrigger:DB$ ImmediateTrigger | ConditionCheckSVar$ Excess | ConditionSVarCompare$ GE1 | RememberSVarAmount$ Excess | Execute$ TrigDestroy | TriggerDescription$ When it deals excess damage this way, destroy target artifact or enchantment an opponent controls with mana value less than or equal to that amount of excess damage.
-SVar:TrigDestroy:DB$ Destroy | ValidTgts$ Artifact.OppCtrl+cmcLEX,Enchantment.OppCtrl+cmcLEX | TgtPrompt$ Select target Artifact or Enchantment | SubAbility$ DBCleanup
+SVar:TrigDestroy:DB$ Destroy | ValidTgts$ Artifact.OppCtrl+cmcLEX,Enchantment.OppCtrl+cmcLEX | TgtPrompt$ Select target artifact or enchantment an opponent controls with mana value less than or equal to the amount of excess damage | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Count$TriggerRememberAmount
 Oracle:Unleash the Inferno deals 7 damage to target creature or planeswalker. When it deals excess damage this way, destroy target artifact or enchantment an opponent controls with mana value less than or equal to that amount of excess damage.
\ No newline at end of file

From d54415e2ae48fcc607fe0fff35813940cb48b4cf Mon Sep 17 00:00:00 2001
From: Dennis Vlahos <76853279+dennisvlahos@users.noreply.github.com>
Date: Thu, 14 Apr 2022 03:10:38 +0300
Subject: [PATCH 11/12] Made requested changes, updated All-Seeing Arbiter

---
 forge-gui/res/cardsfolder/upcoming/all_seeing_arbiter.txt   | 2 +-
 forge-gui/res/cardsfolder/upcoming/errant_street_artist.txt | 1 +
 forge-gui/res/cardsfolder/upcoming/snooping_newsie.txt      | 2 +-
 forge-gui/res/cardsfolder/upcoming/topiary_stomper.txt      | 3 +--
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/all_seeing_arbiter.txt b/forge-gui/res/cardsfolder/upcoming/all_seeing_arbiter.txt
index 3135589ee3d..62805660728 100644
--- a/forge-gui/res/cardsfolder/upcoming/all_seeing_arbiter.txt
+++ b/forge-gui/res/cardsfolder/upcoming/all_seeing_arbiter.txt
@@ -9,7 +9,7 @@ SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 2 | SubAbility$ TrigDiscard
 SVar:TrigDiscard:DB$ Discard | Defined$ You | NumCards$ 1 | Mode$ TgtChoose
 T:Mode$ Discarded | ValidCard$ Card.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever you discard a card, target creature an opponent controls gets -X/-0 until your next turn, where X is the number of different mana values among cards in your graveyard.
 SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls | IsCurse$ True | NumAtt$ -X | Duration$ UntilYourNextTurn
-SVar:X:Count$DifferentManaValueGraveyard Card.YouOwn
+SVar:X:Count$ValidGraveyard Card.YouOwn$DifferentCMC
 SVar:HasAttackEffect:True
 DeckHas:Ability$Discard
 Oracle:Flying\nWhenever All-Seeing Arbiter enters the battlefield or attacks, draw two cards, then discard a card.\nWhenever you discard a card, target creature an opponent controls gets -X/-0 until your next turn, where X is the number of different mana values among cards in your graveyard.
diff --git a/forge-gui/res/cardsfolder/upcoming/errant_street_artist.txt b/forge-gui/res/cardsfolder/upcoming/errant_street_artist.txt
index 7e1f14cb8a6..a8f2731f7f7 100644
--- a/forge-gui/res/cardsfolder/upcoming/errant_street_artist.txt
+++ b/forge-gui/res/cardsfolder/upcoming/errant_street_artist.txt
@@ -6,4 +6,5 @@ K:Flash
 K:Defender
 K:Haste
 A:AB$ CopySpellAbility | Cost$ 1 U T | ValidTgts$ Spell.YouCtrl+wasNotCast | TargetType$ Spell | MayChooseTarget$ True | AILogic$ OnceIfViable | SpellDescription$ Copy target spell you control that wasn't cast. You may choose new targets for the copy.
+AI:RemoveDeck:Random
 Oracle:Flash\nDefender, haste\n{1}{U}, {T}: Copy target spell you control that wasn't cast. You may choose new targets for the copy.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/snooping_newsie.txt b/forge-gui/res/cardsfolder/upcoming/snooping_newsie.txt
index 425b03b96d2..28c2a8eb175 100644
--- a/forge-gui/res/cardsfolder/upcoming/snooping_newsie.txt
+++ b/forge-gui/res/cardsfolder/upcoming/snooping_newsie.txt
@@ -5,7 +5,7 @@ PT:2/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMill | TriggerDescription$ When CARDNAME enters the battlefield, mill two cards.
 SVar:TrigMill:DB$ Mill | NumCards$ 2 | Defined$ You
 S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ Lifelink | CheckSVar$ X | SVarCompare$ GE5 | Description$ As long as there are five or more mana values among cards in your graveyard, CARDNAME gets +1/+1 and has lifelink.
-SVar:X:Count$DifferentManaValueGraveyard Card.YouOwn
+SVar:X:Count$ValidGraveyard Card.YouOwn$DifferentCMC
 DeckHas:Ability$Mill|LifeGain
 DeckHints:Ability$Discard
 Oracle:When Snooping Newsie enters the battlefield, mill two cards. (Put the top two cards of your library into your graveyard.)\nAs long as there are five or more mana values among cards in your graveyard, Snooping Newsie gets +1/+1 and has lifelink.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/topiary_stomper.txt b/forge-gui/res/cardsfolder/upcoming/topiary_stomper.txt
index 19ec3937ae5..e8a5fbe6962 100644
--- a/forge-gui/res/cardsfolder/upcoming/topiary_stomper.txt
+++ b/forge-gui/res/cardsfolder/upcoming/topiary_stomper.txt
@@ -5,7 +5,6 @@ PT:4/4
 K:Vigilance
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSearch | TriggerDescription$ When CARDNAME enters the battlefield, search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
 SVar:TrigSearch:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ 1 | Tapped$ True
-S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CARDNAME can't attack or block. | CheckSVar$ X | SVarCompare$ LT7 | Description$ CARDNAME can't attack or block unless you control seven or more lands.
-SVar:X:Count$Valid Land.YouCtrl
+S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CARDNAME can't attack or block. | IsPresent$ Land.YouCtrl | PresentCompare$ LT7 | Description$ CARDNAME can't attack or block unless you control seven or more lands.
 SVar:BuffedBy:Land
 Oracle:Vigilance\nWhen Topiary Stomper enters the battlefield, search your library for a basic land card, put it onto the battlefield tapped, then shuffle.\nTopiary Stomper can't attack or block unless you control seven or more lands.
\ No newline at end of file

From 0b708b896738f2c834eebdac84c95b07d6323e25 Mon Sep 17 00:00:00 2001
From: Dennis Vlahos <76853279+dennisvlahos@users.noreply.github.com>
Date: Thu, 14 Apr 2022 05:28:22 +0300
Subject: [PATCH 12/12] ' fix

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

diff --git a/forge-gui/res/cardsfolder/upcoming/arc_spitter.txt b/forge-gui/res/cardsfolder/upcoming/arc_spitter.txt
index 560ba69ed2b..92ae75005e2 100644
--- a/forge-gui/res/cardsfolder/upcoming/arc_spitter.txt
+++ b/forge-gui/res/cardsfolder/upcoming/arc_spitter.txt
@@ -2,6 +2,6 @@ Name:Arc Spitter
 ManaCost:1
 Types:Artifact Equipment
 S:Mode$ Continuous | Affected$ Card.EquippedBy | AddAbility$ ABDealDamage | Description$ Equipped creature has "{1}: This creature deals 1 damage to target creature that's blocking it."
-SVar:ABDealDamage:AB$ DealDamage | Cost$ 1 | ValidTgts$ Creature.blockingSource | TgtPrompt$ Select target blocking creature | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature that’s blocking it.
+SVar:ABDealDamage:AB$ DealDamage | Cost$ 1 | ValidTgts$ Creature.blockingSource | TgtPrompt$ Select target blocking creature | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature that's blocking it.
 K:Equip:1
-Oracle:Equipped creature has "{1}: This creature deals 1 damage to target creature that's blocking it."\nEquip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.)
\ No newline at end of file
+Oracle:Equipped creature has "{1}: This creature deals 1 damage to target creature that's blocking it."\nEquip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.)