From defd15b2329addb99c2426b22a3d14fce45fcb31 Mon Sep 17 00:00:00 2001
From: paul_snoops <paulhammerton1@hotmail.co.uk>
Date: Mon, 18 Apr 2022 12:27:33 +0100
Subject: [PATCH 1/5] SNC - 18 April

---
 .../res/cardsfolder/upcoming/attended_socialite.txt  |  8 ++++++++
 .../res/cardsfolder/upcoming/celebrity_fencer.txt    |  1 +
 .../res/cardsfolder/upcoming/devilish_valet.txt      |  1 +
 .../res/cardsfolder/upcoming/elegant_entourage.txt   |  8 ++++++++
 forge-gui/res/cardsfolder/upcoming/forge_boss.txt    |  2 +-
 forge-gui/res/cardsfolder/upcoming/gala_greeters.txt |  1 +
 .../res/cardsfolder/upcoming/social_climber.txt      |  8 ++++++++
 .../res/cardsfolder/upcoming/witty_roastmaster.txt   |  7 +++++++
 .../res/cardsfolder/upcoming/workshop_warchief.txt   | 12 ++++++++++++
 9 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/attended_socialite.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/elegant_entourage.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/social_climber.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/witty_roastmaster.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/workshop_warchief.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/attended_socialite.txt b/forge-gui/res/cardsfolder/upcoming/attended_socialite.txt
new file mode 100644
index 00000000000..5737a35dbe0
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/attended_socialite.txt
@@ -0,0 +1,8 @@
+Name:Attended Socialite
+ManaCost:1 G
+Types:Creature Elf Druid
+PT:2/1
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Alliance — Whenever another creature enters the battlefield under your control, CARDNAME gets +1/+1 until end of turn.
+SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 1 | NumDef$ 1
+SVar:BuffedBy:Creature
+Oracle:Alliance — Whenever another creature enters the battlefield under your control, Attended Socialite gets +1/+1 until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/celebrity_fencer.txt b/forge-gui/res/cardsfolder/upcoming/celebrity_fencer.txt
index 4d2c0e84473..a79fa546e31 100644
--- a/forge-gui/res/cardsfolder/upcoming/celebrity_fencer.txt
+++ b/forge-gui/res/cardsfolder/upcoming/celebrity_fencer.txt
@@ -4,5 +4,6 @@ Types:Creature Elf Druid
 PT:3/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Alliance — Whenever another creature enters the battlefield under your control, put a +1/+1 counter on CARDNAME.
 SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
+SVar:BuffedBy:Creature
 DeckHas:Ability$Counters
 Oracle:Alliance — Whenever another creature enters the battlefield under your control, put a +1/+1 counter on Celebrity Fencer.
diff --git a/forge-gui/res/cardsfolder/upcoming/devilish_valet.txt b/forge-gui/res/cardsfolder/upcoming/devilish_valet.txt
index 8cdd19f2639..b2b0530461a 100644
--- a/forge-gui/res/cardsfolder/upcoming/devilish_valet.txt
+++ b/forge-gui/res/cardsfolder/upcoming/devilish_valet.txt
@@ -7,4 +7,5 @@ K:Haste
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Alliance — Whenever another creature enters the battlefield under your control, double CARDNAME's power until end of turn.
 SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ +X | Double$ True
 SVar:X:Count$CardPower
+SVar:BuffedBy:Creature
 Oracle:Trample, haste\nAlliance — Whenever another creature enters the battlefield under your control, double Devilish Valet's power until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/elegant_entourage.txt b/forge-gui/res/cardsfolder/upcoming/elegant_entourage.txt
new file mode 100644
index 00000000000..c8a8dd2d375
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/elegant_entourage.txt
@@ -0,0 +1,8 @@
+Name:Elegant Entourage
+ManaCost:3 G
+Types:Creature Elf Druid
+PT:4/4
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Alliance — Whenever another creature enters the battlefield under your control, target creature other than CARDNAME gets +1/+1 and gains trample until end of turn.
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.Other | TgtPrompt$ Select target creature other than CARDNAME | NumAtt$ +1 | NumDef$ +1 | KW$ Trample
+SVar:PlayMain1:TRUE
+Oracle:Alliance — Whenever another creature enters the battlefield under your control, target creature other than Elegant Entourage gets +1/+1 and gains trample until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/forge_boss.txt b/forge-gui/res/cardsfolder/upcoming/forge_boss.txt
index 5ac5366a68f..26e56d9bf56 100644
--- a/forge-gui/res/cardsfolder/upcoming/forge_boss.txt
+++ b/forge-gui/res/cardsfolder/upcoming/forge_boss.txt
@@ -2,7 +2,7 @@ Name:Forge Boss
 ManaCost:2 B R
 Types:Creature Human Warrior
 PT:3/4
-T:Mode$ Sacrificed | ValidCard$ Creature.YouCtrl+Other | TriggerZones$ Battlefield | Execute$ TrigDamage | ActivationLimit$ 1 | TriggerDescription$ Whenever you sacrifice one or more other creatures, CARDNAME deals 2 damage to each opponent. This ability triggers only once each turn.
+T:Mode$ Sacrificed | ValidCard$ Creature.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigDamage | ActivationLimit$ 1 | TriggerDescription$ Whenever you sacrifice one or more other creatures, CARDNAME deals 2 damage to each opponent. This ability triggers only once each turn.
 SVar:TrigDamage:DB$ DealDamage | Defined$ Opponent | NumDmg$ 2
 DeckNeeds:Ability$Sacrifice
 Oracle:Whenever you sacrifice one or more other creatures, Forge Boss deals 2 damage to each opponent. This ability triggers only once each turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/gala_greeters.txt b/forge-gui/res/cardsfolder/upcoming/gala_greeters.txt
index 8261e50fda7..498e7f5bbe8 100644
--- a/forge-gui/res/cardsfolder/upcoming/gala_greeters.txt
+++ b/forge-gui/res/cardsfolder/upcoming/gala_greeters.txt
@@ -7,5 +7,6 @@ SVar:TrigCharm:DB$ Charm | Choices$ DBPutCounter,DBToken,DBGainLife | ChoiceRest
 SVar:DBPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Put a +1/+1 counter on CARDNAME.
 SVar:DBToken:DB$ Token | TokenScript$ c_a_treasure_sac | TokenTapped$ True | SpellDescription$ Create a tapped Treasure token.
 SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 2 | SpellDescription$ You gain 2 life.
+SVar:BuffedBy:Creature
 DeckHas:Ability$Counters|Token|LifeGain|Sacrifice & Type$Treasure
 Oracle:Alliance — Whenever another creature enters the battlefield under your control, choose one that hasn't been chosen this turn —\n• Put a +1/+1 counter on Gala Greeters.\n• Create a tapped Treasure token.\n• You gain 2 life.
diff --git a/forge-gui/res/cardsfolder/upcoming/social_climber.txt b/forge-gui/res/cardsfolder/upcoming/social_climber.txt
new file mode 100644
index 00000000000..4c8215a0805
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/social_climber.txt
@@ -0,0 +1,8 @@
+Name:Social Climber
+ManaCost:2 G
+Types:Creature Human Druid
+PT:3/2
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigGainLife | TriggerDescription$ Alliance — Whenever another creature enters the battlefield under your control, you gain 1 life.
+SVar:TrigGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 1
+DeckHas:Ability$LifeGain
+Oracle:Alliance — Whenever another creature enters the battlefield under your control, you gain 1 life.
diff --git a/forge-gui/res/cardsfolder/upcoming/witty_roastmaster.txt b/forge-gui/res/cardsfolder/upcoming/witty_roastmaster.txt
new file mode 100644
index 00000000000..e422484eec3
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/witty_roastmaster.txt
@@ -0,0 +1,7 @@
+Name:Witty Roastmaster
+ManaCost:2 R
+Types:Creature Devil Citizen
+PT:3/2
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigDmg | TriggerDescription$ Alliance — Whenever another creature enters the battlefield under your control, CARDNAME deals 1 damage to each opponent.
+SVar:TrigDmg:DB$ DealDamage | Defined$ Player.Opponent | NumDmg$ 1
+Oracle:Alliance — Whenever another creature enters the battlefield under your control, Witty Roastmaster deals 1 damage to each opponent.
diff --git a/forge-gui/res/cardsfolder/upcoming/workshop_warchief.txt b/forge-gui/res/cardsfolder/upcoming/workshop_warchief.txt
new file mode 100644
index 00000000000..3912745960d
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/workshop_warchief.txt
@@ -0,0 +1,12 @@
+Name:Workshop Warchief
+ManaCost:3 G G
+Types:Creature Rhino Warrior
+PT:5/3
+K:Trample
+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
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME dies, create a 4/4 green Rhino Warrior creature token.
+SVar:TrigToken:DB$ Token | TokenScript$ g_4_4_rhino_warrior
+K:Blitz:4 G G
+DeckHas:Ability$LifeGain|Token
+Oracle:Trample\nWhen Workshop Warchief enters the battlefield, you gain 3 life.\nWhen Workshop Warchief dies, create a 4/4 green Rhino Warrior creature token.\nBlitz {4}{G}{G} (If you cast this spell for its blitz cost, it gains haste and "When this creature dies, draw a card." Sacrifice it at the beginning of the next end step.)

From 6c6002e82e4856fb59709e8fece108a21373320e Mon Sep 17 00:00:00 2001
From: paul_snoops <paulhammerton1@hotmail.co.uk>
Date: Mon, 18 Apr 2022 15:07:30 +0100
Subject: [PATCH 2/5] more cards

---
 .../res/cardsfolder/upcoming/caldaia_strongarm.txt    | 10 ++++++++++
 forge-gui/res/cardsfolder/upcoming/civic_gardener.txt |  1 +
 forge-gui/res/cardsfolder/upcoming/girder_goons.txt   |  9 +++++++++
 .../cardsfolder/upcoming/jaxis_the_troublemaker.txt   |  1 +
 forge-gui/res/cardsfolder/upcoming/mayhem_patrol.txt  | 11 +++++++++++
 forge-gui/res/cardsfolder/upcoming/night_clubber.txt  | 10 ++++++++++
 forge-gui/res/cardsfolder/upcoming/plasma_jockey.txt  | 10 ++++++++++
 .../res/cardsfolder/upcoming/pugnacious_pugilist.txt  | 10 ++++++++++
 .../res/cardsfolder/upcoming/riveteers_decoy.txt      |  8 ++++++++
 .../cardsfolder/upcoming/riveteers_requisitioner.txt  |  9 +++++++++
 .../res/cardsfolder/upcoming/shakedown_heavy.txt      |  1 +
 .../res/cardsfolder/upcoming/tenacious_underdog.txt   |  8 ++++++++
 .../res/cardsfolder/upcoming/workshop_warchief.txt    |  2 +-
 forge-gui/res/tokenscripts/b_2_2_rogue.txt            |  6 ++++++
 14 files changed, 95 insertions(+), 1 deletion(-)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/caldaia_strongarm.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/girder_goons.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/mayhem_patrol.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/night_clubber.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/plasma_jockey.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/pugnacious_pugilist.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/riveteers_decoy.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/riveteers_requisitioner.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/tenacious_underdog.txt
 create mode 100644 forge-gui/res/tokenscripts/b_2_2_rogue.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/caldaia_strongarm.txt b/forge-gui/res/cardsfolder/upcoming/caldaia_strongarm.txt
new file mode 100644
index 00000000000..b427c153573
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/caldaia_strongarm.txt
@@ -0,0 +1,10 @@
+Name:Caldaia Strongarm
+ManaCost:4 G
+Types:Creature Human Warrior
+PT:2/3
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerDescription$ When CARDNAME enters the battlefield, put two +1/+1 counters on target creature.
+SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature | TgtPrompt$ Select target creature | CounterType$ P1P1 | CounterNum$ 2
+K:Blitz:3 G
+SVar:PlayMain1:TRUE
+DeckHas:Ability$Counters|Sacrifice
+Oracle:When Caldaia Strongarm enters the battlefield, put two +1/+1 counters on target creature.\nBlitz {3}{G} (If you cast this spell for its blitz cost, it gains haste and "When this creature dies, draw a card." Sacrifice it at the beginning of the next end step.)
diff --git a/forge-gui/res/cardsfolder/upcoming/civic_gardener.txt b/forge-gui/res/cardsfolder/upcoming/civic_gardener.txt
index 6dc9dc5b9bb..201b94da0cc 100644
--- a/forge-gui/res/cardsfolder/upcoming/civic_gardener.txt
+++ b/forge-gui/res/cardsfolder/upcoming/civic_gardener.txt
@@ -4,4 +4,5 @@ Types:Creature Human Citizen
 PT:2/2
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigUntap | TriggerDescription$ Whenever CARDNAME attacks, untap target creature or land.
 SVar:TrigUntap:DB$ Untap | ValidTgts$ Creature,Land | TgtPrompt$ Select target creature or land
+SVar:HasAttackEffect:True
 Oracle:Whenever Civic Gardener attacks, untap target creature or land.
diff --git a/forge-gui/res/cardsfolder/upcoming/girder_goons.txt b/forge-gui/res/cardsfolder/upcoming/girder_goons.txt
new file mode 100644
index 00000000000..d400dbabe7f
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/girder_goons.txt
@@ -0,0 +1,9 @@
+Name:Girder Goons
+ManaCost:4 B
+Types:Creature Ogre Warrior
+PT:4/4
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ When CARDNAME dies, create a tapped 2/2 black Rogue creature token.
+SVar:TrigToken:DB$ Token | TokenScript$ b_2_2_rogue | TokenTapped$ True
+K:Blitz:3 B
+DeckHas:Ability$Token|Sacrifice
+Oracle:When Girder Goons dies, create a tapped 2/2 black Rogue creature token.\nBlitz {3}{B} (If you cast this spell for its blitz cost, it gains haste and "When this creature dies, draw a card." Sacrifice it at the beginning of the next end step.)
diff --git a/forge-gui/res/cardsfolder/upcoming/jaxis_the_troublemaker.txt b/forge-gui/res/cardsfolder/upcoming/jaxis_the_troublemaker.txt
index 6396dd6a7db..b039301260b 100644
--- a/forge-gui/res/cardsfolder/upcoming/jaxis_the_troublemaker.txt
+++ b/forge-gui/res/cardsfolder/upcoming/jaxis_the_troublemaker.txt
@@ -6,4 +6,5 @@ A:AB$ CopyPermanent | Cost$ R T Discard<1/Card> | ValidTgts$ Creature.Other+YouC
 SVar:Dies:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When this creature dies, draw a card.
 SVar:TrigDraw:DB$ Draw | NumCards$ 1
 K:Blitz:1 R
+DeckHas:Ability$Sacrifice
 Oracle:{R}, {T}, Discard a card: Create a token that's a copy of another target creature you control. It gains haste and "When this creature dies, draw a card." Sacrifice it at the beginning of the next end step. Activate only as a sorcery.\nBlitz {1}{R} (If you cast this spell for its blitz cost, it gains haste and "When this creature dies, draw a card." Sacrifice it at the beginning of the next end step.)
diff --git a/forge-gui/res/cardsfolder/upcoming/mayhem_patrol.txt b/forge-gui/res/cardsfolder/upcoming/mayhem_patrol.txt
new file mode 100644
index 00000000000..740a746635d
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/mayhem_patrol.txt
@@ -0,0 +1,11 @@
+Name:Mayhem Patrol
+ManaCost:1 R
+Types:Creature Devil Warrior
+PT:1/2
+K:Menace
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, target creature gets +1/+0 until end of turn.
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ 1
+K:Blitz:1 R
+SVar:HasAttackEffect:True
+DeckHas:Ability$Sacrifice
+Oracle:Menace (This creature can't be blocked except by two or more creatures.)\nWhenever Mayhem Patrol attacks, target creature gets +1/+0 until end of turn.\nBlitz {1}{R} (If you cast this spell for its blitz cost, it gains haste and "When this creature dies, draw a card." Sacrifice it at the beginning of the next end step.)
diff --git a/forge-gui/res/cardsfolder/upcoming/night_clubber.txt b/forge-gui/res/cardsfolder/upcoming/night_clubber.txt
new file mode 100644
index 00000000000..9c3c9739ad1
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/night_clubber.txt
@@ -0,0 +1,10 @@
+Name:Night Clubber
+ManaCost:1 B B
+Types:Creature Human Warrior
+PT:2/2
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPumpAll | TriggerDescription$ When CARDNAME enters the battlefield, creatures your opponents control get -1/-1 until end of turn.
+SVar:TrigPumpAll:DB$ PumpAll | NumAtt$ -1 | NumDef$ -1 | ValidCards$ Creature.OppCtrl | IsCurse$ True
+K:Blitz:2 B
+SVar:PlayMain1:TRUE
+DeckHas:Ability$Sacrifice
+Oracle:When Night Clubber enters the battlefield, creatures your opponents control get -1/-1 until end of turn.\nBlitz {2}{B} (If you cast this spell for its blitz cost, it gains haste and "When this creature dies, draw a card." Sacrifice it at the beginning of the next end step.)
diff --git a/forge-gui/res/cardsfolder/upcoming/plasma_jockey.txt b/forge-gui/res/cardsfolder/upcoming/plasma_jockey.txt
new file mode 100644
index 00000000000..de8e4be5fd0
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/plasma_jockey.txt
@@ -0,0 +1,10 @@
+Name:Plasma Jockey
+ManaCost:3 R
+Types:Creature Viashino Warrior
+PT:3/1
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, target creature an opponent controls can't block this turn.
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.OppCtrl | KW$ HIDDEN CARDNAME can't block. | TgtPrompt$ Select target creature an opponent controls | IsCurse$ True
+K:Blitz:2 R
+SVar:HasAttackEffect:True
+DeckHas:Ability$Sacrifice
+Oracle:Whenever Plasma Jockey attacks, target creature an opponent controls can't block this turn.\nBlitz {2}{R} (If you cast this spell for its blitz cost, it gains haste and "When this creature dies, draw a card." Sacrifice it at the beginning of the next end step.)
diff --git a/forge-gui/res/cardsfolder/upcoming/pugnacious_pugilist.txt b/forge-gui/res/cardsfolder/upcoming/pugnacious_pugilist.txt
new file mode 100644
index 00000000000..1b548d99bb8
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/pugnacious_pugilist.txt
@@ -0,0 +1,10 @@
+Name:Pugnacious Pugilist
+ManaCost:3 R R
+Types:Creature Ogre Warrior
+PT:4/4
+T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME attacks, create a tapped and attacking 1/1 red Devil creature token with "When this creature dies, it deals 1 damage to any target."
+SVar:TrigToken:DB$ Token | TokenScript$ r_1_1_devil_burn | TokenTapped$ True | TokenAttacking$ True
+K:Blitz:3 R
+DeckHas:Ability$Token|Sacrifice
+SVar:HasAttackEffect:True
+Oracle:Whenever Pugnacious Pugilist attacks, create a tapped and attacking 1/1 red Devil creature token with "When this creature dies, it deals 1 damage to any target."\nBlitz {3}{R} (If you cast this spell for its blitz cost, it gains haste and "When this creature dies, draw a card." Sacrifice it at the beginning of the next end step.)
diff --git a/forge-gui/res/cardsfolder/upcoming/riveteers_decoy.txt b/forge-gui/res/cardsfolder/upcoming/riveteers_decoy.txt
new file mode 100644
index 00000000000..c43e2d79826
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/riveteers_decoy.txt
@@ -0,0 +1,8 @@
+Name:Riveteers Decoy
+ManaCost:1 G
+Types:Creature Human Warrior
+PT:3/1
+K:CARDNAME must be blocked if able.
+K:Blitz:3 G
+DeckHas:Ability$Sacrifice
+Oracle:Riveteers Decoy must be blocked if able.\nBlitz {3}{G} (If you cast this spell for its blitz cost, it gains haste and "When this creature dies, draw a card." Sacrifice it at the beginning of the next end step.)
diff --git a/forge-gui/res/cardsfolder/upcoming/riveteers_requisitioner.txt b/forge-gui/res/cardsfolder/upcoming/riveteers_requisitioner.txt
new file mode 100644
index 00000000000..ca82e2d1cab
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/riveteers_requisitioner.txt
@@ -0,0 +1,9 @@
+Name:Riveteers Requisitioner
+ManaCost:1 R
+Types:Creature Viashino Rogue
+PT:3/1
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME dies, create a Treasure token. (It's an artifact with "{T}, Sacrifice this artifact: Add one mana of any color.")
+SVar:TrigToken:DB$ Token | TokenScript$ c_a_treasure_sac
+DeckHas:Ability$Token|Sacrifice & Type$Treasure|Artifact
+K:Blitz:2 R
+Oracle:When Riveteers Requisitioner dies, create a Treasure token. (It's an artifact with "{T}, Sacrifice this artifact: Add one mana of any color.")\nBlitz {2}{R} (If you cast this spell for its blitz cost, it gains haste and "When this creature dies, draw a card." Sacrifice it at the beginning of the next end step.)
diff --git a/forge-gui/res/cardsfolder/upcoming/shakedown_heavy.txt b/forge-gui/res/cardsfolder/upcoming/shakedown_heavy.txt
index fda957f67e5..286dd9d8ad4 100644
--- a/forge-gui/res/cardsfolder/upcoming/shakedown_heavy.txt
+++ b/forge-gui/res/cardsfolder/upcoming/shakedown_heavy.txt
@@ -7,4 +7,5 @@ T:Mode$ Attacks | ValidCard$ Card.Self | OptionalDecider$ DefendingPlayer | Exec
 SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1 | SubAbility$ TrigUntap
 SVar:TrigUntap:DB$ Untap | Defined$ Self | SubAbility$ RemCombat
 SVar:RemCombat:DB$ RemoveFromCombat | Defined$ Self
+SVar:HasAttackEffect:True
 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
diff --git a/forge-gui/res/cardsfolder/upcoming/tenacious_underdog.txt b/forge-gui/res/cardsfolder/upcoming/tenacious_underdog.txt
new file mode 100644
index 00000000000..e8c3b2f91ae
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/tenacious_underdog.txt
@@ -0,0 +1,8 @@
+Name:Tenacious Underdog
+ManaCost:1 B
+Types:Creature Human Warrior
+PT:3/2
+K:Blitz:2 B B PayLife<2>
+S:Mode$ Continuous | Affected$ Card.Self | MayPlay$ True | ValidSA$ Spell.Blitz | AffectedZone$ Graveyard | EffectZone$ Graveyard | Description$ You may cast CARDNAME from your graveyard using its blitz ability.
+DeckHas:Ability$Sacrifice|Graveyard
+Oracle:Blitz—{2}{B}{B}, Pay 2 life. (If you cast this spell for its blitz cost, it gains haste and "When this creature dies, draw a card." Sacrifice it at the beginning of the next end step.)\nYou may cast Tenacious Underdog from your graveyard using its blitz ability.
diff --git a/forge-gui/res/cardsfolder/upcoming/workshop_warchief.txt b/forge-gui/res/cardsfolder/upcoming/workshop_warchief.txt
index 3912745960d..9edf64a8838 100644
--- a/forge-gui/res/cardsfolder/upcoming/workshop_warchief.txt
+++ b/forge-gui/res/cardsfolder/upcoming/workshop_warchief.txt
@@ -8,5 +8,5 @@ SVar:TrigGainLife:DB$ GainLife | LifeAmount$ 3
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME dies, create a 4/4 green Rhino Warrior creature token.
 SVar:TrigToken:DB$ Token | TokenScript$ g_4_4_rhino_warrior
 K:Blitz:4 G G
-DeckHas:Ability$LifeGain|Token
+DeckHas:Ability$LifeGain|Token|Sacrifice
 Oracle:Trample\nWhen Workshop Warchief enters the battlefield, you gain 3 life.\nWhen Workshop Warchief dies, create a 4/4 green Rhino Warrior creature token.\nBlitz {4}{G}{G} (If you cast this spell for its blitz cost, it gains haste and "When this creature dies, draw a card." Sacrifice it at the beginning of the next end step.)
diff --git a/forge-gui/res/tokenscripts/b_2_2_rogue.txt b/forge-gui/res/tokenscripts/b_2_2_rogue.txt
new file mode 100644
index 00000000000..6f970d995c0
--- /dev/null
+++ b/forge-gui/res/tokenscripts/b_2_2_rogue.txt
@@ -0,0 +1,6 @@
+Name:Rogue Token
+ManaCost:no cost
+Types:Creature Rogue
+Colors:black
+PT:2/2
+Oracle:

From cb4f4a83caed8d332c6f70d03f842ab5fe11cd83 Mon Sep 17 00:00:00 2001
From: paul_snoops <paulhammerton1@hotmail.co.uk>
Date: Mon, 18 Apr 2022 15:17:35 +0100
Subject: [PATCH 3/5] jaxis

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

diff --git a/forge-gui/res/cardsfolder/upcoming/jaxis_the_troublemaker.txt b/forge-gui/res/cardsfolder/upcoming/jaxis_the_troublemaker.txt
index b039301260b..3c574f77ab7 100644
--- a/forge-gui/res/cardsfolder/upcoming/jaxis_the_troublemaker.txt
+++ b/forge-gui/res/cardsfolder/upcoming/jaxis_the_troublemaker.txt
@@ -6,5 +6,5 @@ A:AB$ CopyPermanent | Cost$ R T Discard<1/Card> | ValidTgts$ Creature.Other+YouC
 SVar:Dies:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When this creature dies, draw a card.
 SVar:TrigDraw:DB$ Draw | NumCards$ 1
 K:Blitz:1 R
-DeckHas:Ability$Sacrifice
+DeckHas:Ability$Discard|Token|Sacrifice
 Oracle:{R}, {T}, Discard a card: Create a token that's a copy of another target creature you control. It gains haste and "When this creature dies, draw a card." Sacrifice it at the beginning of the next end step. Activate only as a sorcery.\nBlitz {1}{R} (If you cast this spell for its blitz cost, it gains haste and "When this creature dies, draw a card." Sacrifice it at the beginning of the next end step.)

From 8f51584e72281612c7bc241c4840794508fce614 Mon Sep 17 00:00:00 2001
From: paul_snoops <paulhammerton1@hotmail.co.uk>
Date: Mon, 18 Apr 2022 16:07:29 +0100
Subject: [PATCH 4/5] venom_connoisseur

---
 .../res/cardsfolder/upcoming/ballroom_brawlers.txt     |  2 +-
 .../res/cardsfolder/upcoming/venom_connoisseur.txt     | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/venom_connoisseur.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/ballroom_brawlers.txt b/forge-gui/res/cardsfolder/upcoming/ballroom_brawlers.txt
index 8b7e49a8f8e..4332800a2f8 100644
--- a/forge-gui/res/cardsfolder/upcoming/ballroom_brawlers.txt
+++ b/forge-gui/res/cardsfolder/upcoming/ballroom_brawlers.txt
@@ -3,7 +3,7 @@ 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 | 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:TrigSelectTargetCreature:DB$ Pump | ValidTgts$ Creature.Other+YouCtrl | 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
diff --git a/forge-gui/res/cardsfolder/upcoming/venom_connoisseur.txt b/forge-gui/res/cardsfolder/upcoming/venom_connoisseur.txt
new file mode 100644
index 00000000000..0fadcf93991
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/venom_connoisseur.txt
@@ -0,0 +1,10 @@
+Name:Venom Connoisseur
+ManaCost:1 G
+Types:Creature Human Druid
+PT:2/2
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Alliance — Whenever another creature enters the battlefield under your control, Venom Connoisseur gains deathtouch until end of turn. If this is the second time this ability has resolved this turn, all creatures you control gain deathtouch until end of turn.
+SVar:TrigPump:DB$ Pump | Defined$ Self | KW$ Deathtouch | SubAbility$ DBPumpAll
+SVar:DBPumpAll:DB$ PumpAll | ValidCards$ Creature.YouCtrl | KW$ Deathtouch | ConditionCheckSVar$ CreatureETBAmount | ConditionSVarCompare$ EQ2
+SVar:CreatureETBAmount:Count$ResolvedThisTurn
+SVar:BuffedBy:Creature
+Oracle:Alliance — Whenever another creature enters the battlefield under your control, Venom Connoisseur gains deathtouch until end of turn. If this is the second time this ability has resolved this turn, all creatures you control gain deathtouch until end of turn.

From 2276390b86a0802b60c82fc6f8c518fe4b8d735e Mon Sep 17 00:00:00 2001
From: paul_snoops <paulhammerton1@hotmail.co.uk>
Date: Mon, 18 Apr 2022 18:51:23 +0100
Subject: [PATCH 5/5] additions

---
 forge-gui/res/cardsfolder/upcoming/elegant_entourage.txt   | 1 +
 forge-gui/res/cardsfolder/upcoming/girder_goons.txt        | 2 +-
 forge-gui/res/cardsfolder/upcoming/pugnacious_pugilist.txt | 2 +-
 forge-gui/res/cardsfolder/upcoming/social_climber.txt      | 1 +
 forge-gui/res/cardsfolder/upcoming/witty_roastmaster.txt   | 1 +
 5 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/elegant_entourage.txt b/forge-gui/res/cardsfolder/upcoming/elegant_entourage.txt
index c8a8dd2d375..4ad7042ebdf 100644
--- a/forge-gui/res/cardsfolder/upcoming/elegant_entourage.txt
+++ b/forge-gui/res/cardsfolder/upcoming/elegant_entourage.txt
@@ -5,4 +5,5 @@ PT:4/4
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Alliance — Whenever another creature enters the battlefield under your control, target creature other than CARDNAME gets +1/+1 and gains trample until end of turn.
 SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.Other | TgtPrompt$ Select target creature other than CARDNAME | NumAtt$ +1 | NumDef$ +1 | KW$ Trample
 SVar:PlayMain1:TRUE
+SVar:BuffedBy:Creature
 Oracle:Alliance — Whenever another creature enters the battlefield under your control, target creature other than Elegant Entourage gets +1/+1 and gains trample until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/girder_goons.txt b/forge-gui/res/cardsfolder/upcoming/girder_goons.txt
index d400dbabe7f..1696b415a5e 100644
--- a/forge-gui/res/cardsfolder/upcoming/girder_goons.txt
+++ b/forge-gui/res/cardsfolder/upcoming/girder_goons.txt
@@ -5,5 +5,5 @@ PT:4/4
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ When CARDNAME dies, create a tapped 2/2 black Rogue creature token.
 SVar:TrigToken:DB$ Token | TokenScript$ b_2_2_rogue | TokenTapped$ True
 K:Blitz:3 B
-DeckHas:Ability$Token|Sacrifice
+DeckHas:Ability$Token|Sacrifice & Type$Rogue
 Oracle:When Girder Goons dies, create a tapped 2/2 black Rogue creature token.\nBlitz {3}{B} (If you cast this spell for its blitz cost, it gains haste and "When this creature dies, draw a card." Sacrifice it at the beginning of the next end step.)
diff --git a/forge-gui/res/cardsfolder/upcoming/pugnacious_pugilist.txt b/forge-gui/res/cardsfolder/upcoming/pugnacious_pugilist.txt
index 1b548d99bb8..00ebb9773da 100644
--- a/forge-gui/res/cardsfolder/upcoming/pugnacious_pugilist.txt
+++ b/forge-gui/res/cardsfolder/upcoming/pugnacious_pugilist.txt
@@ -5,6 +5,6 @@ PT:4/4
 T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME attacks, create a tapped and attacking 1/1 red Devil creature token with "When this creature dies, it deals 1 damage to any target."
 SVar:TrigToken:DB$ Token | TokenScript$ r_1_1_devil_burn | TokenTapped$ True | TokenAttacking$ True
 K:Blitz:3 R
-DeckHas:Ability$Token|Sacrifice
+DeckHas:Ability$Token|Sacrifice & Type$Devil
 SVar:HasAttackEffect:True
 Oracle:Whenever Pugnacious Pugilist attacks, create a tapped and attacking 1/1 red Devil creature token with "When this creature dies, it deals 1 damage to any target."\nBlitz {3}{R} (If you cast this spell for its blitz cost, it gains haste and "When this creature dies, draw a card." Sacrifice it at the beginning of the next end step.)
diff --git a/forge-gui/res/cardsfolder/upcoming/social_climber.txt b/forge-gui/res/cardsfolder/upcoming/social_climber.txt
index 4c8215a0805..7c68a99f1be 100644
--- a/forge-gui/res/cardsfolder/upcoming/social_climber.txt
+++ b/forge-gui/res/cardsfolder/upcoming/social_climber.txt
@@ -4,5 +4,6 @@ Types:Creature Human Druid
 PT:3/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigGainLife | TriggerDescription$ Alliance — Whenever another creature enters the battlefield under your control, you gain 1 life.
 SVar:TrigGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 1
+SVar:BuffedBy:Creature
 DeckHas:Ability$LifeGain
 Oracle:Alliance — Whenever another creature enters the battlefield under your control, you gain 1 life.
diff --git a/forge-gui/res/cardsfolder/upcoming/witty_roastmaster.txt b/forge-gui/res/cardsfolder/upcoming/witty_roastmaster.txt
index e422484eec3..51e4d724cc3 100644
--- a/forge-gui/res/cardsfolder/upcoming/witty_roastmaster.txt
+++ b/forge-gui/res/cardsfolder/upcoming/witty_roastmaster.txt
@@ -4,4 +4,5 @@ Types:Creature Devil Citizen
 PT:3/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigDmg | TriggerDescription$ Alliance — Whenever another creature enters the battlefield under your control, CARDNAME deals 1 damage to each opponent.
 SVar:TrigDmg:DB$ DealDamage | Defined$ Player.Opponent | NumDmg$ 1
+SVar:BuffedBy:Creature
 Oracle:Alliance — Whenever another creature enters the battlefield under your control, Witty Roastmaster deals 1 damage to each opponent.