From 3e7966b46570ca6544e4575d94caf5b43ee00995 Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Thu, 28 Mar 2024 21:59:53 +0100
Subject: [PATCH 1/7] update

---
 .../res/cardsfolder/upcoming/arid_archway.txt     | 11 +++++++++++
 .../cardsfolder/upcoming/armored_armadillo.txt    |  8 ++++++++
 .../res/cardsfolder/upcoming/badlands_revival.txt |  7 +++++++
 .../cardsfolder/upcoming/binding_negotiation.txt  |  7 +++++++
 .../upcoming/bonny_pall_clearcutter.txt           | 12 ++++++++++++
 .../upcoming/bristly_bill_spine_sower.txt         | 10 ++++++++++
 .../upcoming/bruse_tarl_roving_rancher.txt        | 15 +++++++++++++++
 forge-gui/res/tokenscripts/beau.txt               |  8 ++++++++
 8 files changed, 78 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/arid_archway.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/armored_armadillo.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/badlands_revival.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/binding_negotiation.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/bonny_pall_clearcutter.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/bristly_bill_spine_sower.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/bruse_tarl_roving_rancher.txt
 create mode 100644 forge-gui/res/tokenscripts/beau.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/arid_archway.txt b/forge-gui/res/cardsfolder/upcoming/arid_archway.txt
new file mode 100644
index 00000000000..2e797679306
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/arid_archway.txt
@@ -0,0 +1,11 @@
+Name:Arid Archway
+ManaCost:no cost
+Types:Land Desert
+K:CARDNAME enters the battlefield tapped.
+A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 2 | SpellDescription$ Add {C}{C}.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME enters the battlefield, return a land you control to its owner's hand.
+SVar:TrigReturn:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | Hidden$ True | Mandatory$ True | ChangeType$ Land.YouCtrl | RememberLKI$ True | AILogic$ NeverBounceItself | SubAbility$ DBSurveil
+SVar:DBSurveil:DB$ Surveil | Defined$ You | Amount$ 1 | ConditionDefined$ Remembered | ConditionPresent$ Desert.Other | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+DeckHints:Type$Desert
+Oracle:Arid Archway enters the battlefield tapped.\nWhen Arid Archway enters the battlefield, return a land you control to its owner's hand. If another Desert was returned this way, surveil 1. (Look at the top card of your library. You may put it into your graveyard.)\n{T}: Add {C}{C}.
diff --git a/forge-gui/res/cardsfolder/upcoming/armored_armadillo.txt b/forge-gui/res/cardsfolder/upcoming/armored_armadillo.txt
new file mode 100644
index 00000000000..32d1b66f928
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/armored_armadillo.txt
@@ -0,0 +1,8 @@
+Name:Armored Armadillo
+ManaCost:W
+Types:Creature Armadillo
+PT:0/4
+K:Ward:1
+A:AB$ Pump | Cost$ 3 W | NumAtt$ X | SpellDescription$ CARDNAME gets +X/+0 until end of turn, where X is its toughness.
+SVar:X:Count$CardToughness
+Oracle:Ward {1} (Whenever this creature becomes the target of a spell or ability an opponent controls, counter it unless that player pays {1}.)\n{3}{W}: Armored Armadillo gets +X/+0 until end of turn, where X is its toughness.
diff --git a/forge-gui/res/cardsfolder/upcoming/badlands_revival.txt b/forge-gui/res/cardsfolder/upcoming/badlands_revival.txt
new file mode 100644
index 00000000000..b468405c8c0
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/badlands_revival.txt
@@ -0,0 +1,7 @@
+Name:Badlands Revival
+ManaCost:3 B G
+Types:Sorcery
+A:SP$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Choose up to one target creature card in your graveyard | ValidTgts$ Creature.YouOwn | SubAbility$ DBReturn | SpellDescription$ Return up to one target creature card from your graveyard to the battlefield. 
+SVar:DBReturn:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Choose up to one target permanent card in your graveyard | ValidTgts$ Card.Permanent+YouOwn | SpellDescription$ Return up to one target permanent card from your graveyard to your hand.
+DeckHints:Ability$Graveyard
+Oracle:Return up to one target creature card from your graveyard to the battlefield. Return up to one target permanent card from your graveyard to your hand.
diff --git a/forge-gui/res/cardsfolder/upcoming/binding_negotiation.txt b/forge-gui/res/cardsfolder/upcoming/binding_negotiation.txt
new file mode 100644
index 00000000000..5195790da91
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/binding_negotiation.txt
@@ -0,0 +1,7 @@
+Name:Binding Negotiation
+ManaCost:1 B
+Types:Sorcery
+A:SP$ Discard | ValidTgts$ Opponent | Mode$ RevealYouChoose | DiscardValid$ Card.nonLand | DiscardValidDesc$ nonland card | RememberDiscarded$ True | SubAbility$ DBReturn | SpellDescription$ Target opponent reveals their hand. You may choose a nonland card from it. If you do, they discard it. Otherwise, you may put a face-up exiled card they own into their graveyard.
+SVar:DBReturn:DB$ ChangeZone | Origin$ Exile | Destination$ Graveyard | ChangeValid$ Card.faceUp+TargetedPlayerOwn | Optional$ True | ConditionDefined$ Remembered | ConditionPresent $ Card | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+Oracle:Target opponent reveals their hand. You may choose a nonland card from it. If you do, they discard it. Otherwise, you may put a face-up exiled card they own into their graveyard.
diff --git a/forge-gui/res/cardsfolder/upcoming/bonny_pall_clearcutter.txt b/forge-gui/res/cardsfolder/upcoming/bonny_pall_clearcutter.txt
new file mode 100644
index 00000000000..d3e1beb3f67
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/bonny_pall_clearcutter.txt
@@ -0,0 +1,12 @@
+Name:Bonny Pall, Clearcutter
+ManaCost:3 G U U
+Types:Legendary Creature Giant Scout
+PT:6/5
+K:Reach
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create Beau, a legendary blue Ox creature token with "This creature's power and toughness are each equal to the number of lands you control."
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ beau | TokenOwner$ You
+T:Mode$ AttackersDeclared | AttackingPlayer$ You | Execute$ TrigDraw | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack, draw a card, then you may put a land card from your hand or graveyard onto the battlefield.
+SVar:TrigDraw:DB$ Draw | SubAbility$ DBPut
+SVar:DBPut:DB$ ChangeZone | ChangeType$ Land.YouOwn | ChangeNum$ 1 | Origin$ Hand,Graveyard | Hidden$ True | Destination$ Battlefield
+DeckHas:Ability$Token|Graveyard & Type$Ox
+Oracle:Reach\nWhen Bonny Pall, Clearcutter enters the battlefield, create Beau, a legendary blue Ox creature token with "This creature's power and toughness are each equal to the number of lands you control."\nWhenever you attack, draw a card, then you may put a land card from your hand or graveyard onto the battlefield.
diff --git a/forge-gui/res/cardsfolder/upcoming/bristly_bill_spine_sower.txt b/forge-gui/res/cardsfolder/upcoming/bristly_bill_spine_sower.txt
new file mode 100644
index 00000000000..3da18fb40b1
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/bristly_bill_spine_sower.txt
@@ -0,0 +1,10 @@
+Name:Bristly Bill, Spine Sower
+ManaCost:1 G
+Types:Legendary Creature Plant Druid
+PT:2/2
+T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Landfall — Whenever a land enters the battlefield under your control, put a +1/+1 counter on target creature.
+SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature | CounterType$ P1P1 | CounterNum$ 1
+A:AB$ MultiplyCounter | Cost$ 3 G G  | Defined$ Valid Creature.YouCtrl | CounterType$ P1P1 | SpellDescription$ Double the number of +1/+1 counters on each creature you control.
+DeckHas:Ability$Counters
+DeckHints:Ability$Counters
+Oracle:Landfall — Whenever a land enters the battlefield under your control, put a +1/+1 counter on target creature.\n{3}{G}{G}: Double the number of +1/+1 counters on each creature you control.
diff --git a/forge-gui/res/cardsfolder/upcoming/bruse_tarl_roving_rancher.txt b/forge-gui/res/cardsfolder/upcoming/bruse_tarl_roving_rancher.txt
new file mode 100644
index 00000000000..e2b9f609bf2
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/bruse_tarl_roving_rancher.txt
@@ -0,0 +1,15 @@
+Name:Bruse Tarl, Roving Rancher
+ManaCost:2 R W
+Types:Legendary Creature Human Warrior
+PT:4/3
+S:Mode$ Continuous | Affected$ Ox.YouCtrl | AddKeyword$ Double Strike | Description$ Oxen you control have double strike.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$Whenever CARDNAME enters the battlefield or attacks, exile the top card of your library. If it's a land card, create a 2/2 white Ox creature token. Otherwise, you may cast it until the end of your next turn.
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigExile | Secondary$ True | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, exile the top card of your library. If it's a land card, create a 2/2 white Ox creature token. Otherwise, you may cast it until the end of your next turn.
+SVar:TrigExile:DB$ Dig | DigNum$ 1 | DestinationZone$ Exile | RememberChanged$ True | ChangeNum$ All | SubAbility$ DBToken
+SVar:DBToken:DB$ Token | TokenScript$ w_2_2_ox | TokenOwner$ You | ConditionDefined$ Remembered | ConditionPresent$ Land | SubAbility$ DBEffect
+SVar:DBEffect:DB$ Effect | RememberObjects$ RememberedCard | StaticAbilities$ Play | ForgetOnMoved$ Exile | Duration$ UntilTheEndOfYourNextTurn | ConditionDefined$ Remembered | ConditionPresent$ Card.nonLand | SubAbility$ DBCleanup
+SVar:Play:Mode$ Continuous | MayPlay$ True | EffectZone$ Command | Affected$ Card.IsRemembered+nonLand | AffectedZone$ Exile | Description$ You may cast that card until the end of your next turn.
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+DeckHints:Type$Ox
+DeckHas:Ability$Token
+Oracle:Oxen you control have double strike.\nWhenever Bruse Tarl, Roving Rancher enters the battlefield or attacks, exile the top card of your library. If it's a land card, create a 2/2 white Ox creature token. Otherwise, you may cast it until the end of your next turn.
diff --git a/forge-gui/res/tokenscripts/beau.txt b/forge-gui/res/tokenscripts/beau.txt
new file mode 100644
index 00000000000..080144c982c
--- /dev/null
+++ b/forge-gui/res/tokenscripts/beau.txt
@@ -0,0 +1,8 @@
+Name:Beau
+ManaCost:no cost
+Types:Legendary Creature Ox
+Colors:blue
+PT:*/*
+S:Mode$ Continuous | EffectZone$ All | CharacteristicDefining$ True | SetPower$ X | SetToughness$ X | Description$ This creature's power and toughness are each equal to the number of lands you control.
+SVar:X:Count$Valid Land.YouCtrl
+Oracle:This creature's power and toughness are each equal to the number of lands you control.

From 70c5a0f61684b0d54ae07d4e21cd5c6b6ef708ae Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Thu, 28 Mar 2024 22:02:55 +0100
Subject: [PATCH 2/7] update

---
 forge-gui/res/cardsfolder/upcoming/arid_archway.txt        | 2 +-
 forge-gui/res/cardsfolder/upcoming/binding_negotiation.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/arid_archway.txt b/forge-gui/res/cardsfolder/upcoming/arid_archway.txt
index 2e797679306..04ec27525b5 100644
--- a/forge-gui/res/cardsfolder/upcoming/arid_archway.txt
+++ b/forge-gui/res/cardsfolder/upcoming/arid_archway.txt
@@ -5,7 +5,7 @@ K:CARDNAME enters the battlefield tapped.
 A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 2 | SpellDescription$ Add {C}{C}.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME enters the battlefield, return a land you control to its owner's hand.
 SVar:TrigReturn:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | Hidden$ True | Mandatory$ True | ChangeType$ Land.YouCtrl | RememberLKI$ True | AILogic$ NeverBounceItself | SubAbility$ DBSurveil
-SVar:DBSurveil:DB$ Surveil | Defined$ You | Amount$ 1 | ConditionDefined$ Remembered | ConditionPresent$ Desert.Other | SubAbility$ DBCleanup
+SVar:DBSurveil:DB$ Surveil | Defined$ You | Amount$ 1 | ConditionDefined$ RememberedLKI | ConditionPresent$ Desert.Other | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 DeckHints:Type$Desert
 Oracle:Arid Archway enters the battlefield tapped.\nWhen Arid Archway enters the battlefield, return a land you control to its owner's hand. If another Desert was returned this way, surveil 1. (Look at the top card of your library. You may put it into your graveyard.)\n{T}: Add {C}{C}.
diff --git a/forge-gui/res/cardsfolder/upcoming/binding_negotiation.txt b/forge-gui/res/cardsfolder/upcoming/binding_negotiation.txt
index 5195790da91..132807793e7 100644
--- a/forge-gui/res/cardsfolder/upcoming/binding_negotiation.txt
+++ b/forge-gui/res/cardsfolder/upcoming/binding_negotiation.txt
@@ -2,6 +2,6 @@ Name:Binding Negotiation
 ManaCost:1 B
 Types:Sorcery
 A:SP$ Discard | ValidTgts$ Opponent | Mode$ RevealYouChoose | DiscardValid$ Card.nonLand | DiscardValidDesc$ nonland card | RememberDiscarded$ True | SubAbility$ DBReturn | SpellDescription$ Target opponent reveals their hand. You may choose a nonland card from it. If you do, they discard it. Otherwise, you may put a face-up exiled card they own into their graveyard.
-SVar:DBReturn:DB$ ChangeZone | Origin$ Exile | Destination$ Graveyard | ChangeValid$ Card.faceUp+TargetedPlayerOwn | Optional$ True | ConditionDefined$ Remembered | ConditionPresent $ Card | SubAbility$ DBCleanup
+SVar:DBReturn:DB$ ChangeZone | Origin$ Exile | Destination$ Graveyard | ChangeValid$ Card.faceUp+TargetedPlayerOwn | Optional$ True | ConditionDefined$ Remembered | ConditionPresent$ Card | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 Oracle:Target opponent reveals their hand. You may choose a nonland card from it. If you do, they discard it. Otherwise, you may put a face-up exiled card they own into their graveyard.

From b9bdeaa61e328ae738c2241e97d2a55e39eaf4b5 Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Fri, 29 Mar 2024 19:30:41 +0100
Subject: [PATCH 3/7] 3 more + cleanup

---
 .../res/cardsfolder/upcoming/assimilation_aegis.txt    |  9 +++++++++
 .../cardsfolder/upcoming/baron_bertram_graywater.txt   | 10 ++++++++++
 .../res/cardsfolder/upcoming/beastbond_outcaster.txt   |  8 ++++++++
 .../res/cardsfolder/upcoming/binding_negotiation.txt   |  4 ++--
 .../cardsfolder/upcoming/bruse_tarl_roving_rancher.txt |  2 +-
 .../res/tokenscripts/b_1_1_vampire_rogue_lifelink.txt  |  7 +++++++
 6 files changed, 37 insertions(+), 3 deletions(-)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/assimilation_aegis.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/baron_bertram_graywater.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/beastbond_outcaster.txt
 create mode 100644 forge-gui/res/tokenscripts/b_1_1_vampire_rogue_lifelink.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/assimilation_aegis.txt b/forge-gui/res/cardsfolder/upcoming/assimilation_aegis.txt
new file mode 100644
index 00000000000..ecd21a01c62
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/assimilation_aegis.txt
@@ -0,0 +1,9 @@
+Name:Assimilation Aegis
+ManaCost:1 W U
+Types:Artifact Equipment
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Destination$ Battlefield | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters the battlefield, exile up to one target creature until CARDNAME leaves the battlefield.
+SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Creature | TgtPrompt$ Select up to one target creature | TargetMin$ 0 | TargetMax$ 1 | Duration$ UntilHostLeavesPlay
+T:Mode$ Attached | ValidSource$ Card.Self | TriggerZones$ Battlefield | ValidTarget$ Creature | Execute$ TrigClone | TriggerDescription$ Whenever CARDNAME becomes attached to a creature, for as long as CARDNAME remains attached to it, that creature becomes a copy of a creature card exiled with CARDNAME.
+SVar:TrigClone:DB$ Clone | Choices$ Creature.ExiledWithSource | CloneTarget$ TriggeredTargetLKICopy | Duration$ UntilUnattached | ChoiceZone$ Exile
+K:Equip:2
+Oracle:When Assimilation Aegis enters the battlefield, exile up to one target creature until Assimilation Aegis leaves the battlefield.\nWhenever Assimilation Aegis becomes attached to a creature, for as long as Assimilation Aegis remains attached to it, that creature becomes a copy of a creature card exiled with Assimilation Aegis.\nEquip {2}
diff --git a/forge-gui/res/cardsfolder/upcoming/baron_bertram_graywater.txt b/forge-gui/res/cardsfolder/upcoming/baron_bertram_graywater.txt
new file mode 100644
index 00000000000..5c6b6c01dc7
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/baron_bertram_graywater.txt
@@ -0,0 +1,10 @@
+Name:Baron Bertram Graywater
+ManaCost:2 W B
+Types:Legendary Creature Vampire Noble
+PT:3/4
+T:Mode$ ChangesZoneAll | ValidCards$ Card.token+YouCtrl | Destination$ Battlefield | TriggerZones$ Battlefield | ActivationLimit$ 1 | Execute$ TrigToken | TriggerDescription$ Whenever one or more tokens enter the battlefield under your control, create a 1/1 black Vampire Rogue creature token with lifelink. This ability triggers only once each turn.
+SVar:TrigToken:DB$ Token | TokenScript$ b_1_1_vampire_rogue_lifelink
+A:AB$ Draw | Cost$ 1 B Sac<1/Creature.Other;Artifact/another creature or artifact> | SpellDescription$ Draw a card.
+DeckHas:Ability$Sacrifice|Token|LifeGain & Type$Rogue
+DeckHints:Ability$Token
+Oracle:Whenever one or more tokens enter the battlefield under your control, create a 1/1 black Vampire Rogue creature token with lifelink. This ability triggers only once each turn.\n{1}{B}, Sacrifice another creature or artifact: Draw a card.
diff --git a/forge-gui/res/cardsfolder/upcoming/beastbond_outcaster.txt b/forge-gui/res/cardsfolder/upcoming/beastbond_outcaster.txt
new file mode 100644
index 00000000000..ce58e11761a
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/beastbond_outcaster.txt
@@ -0,0 +1,8 @@
+Name:Beastbond Outcaster
+ManaCost:2 G
+Types:Creature Human Druid
+PT:3/3
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | IsPresent$ Creature.YouCtrl+powerGE4 | PresentCompare$ GE1 | Execute$ TrigDraw | TriggerDescription$When CARDNAME enters the battlefield, if you control a creature with power 4 or greater, draw a card.
+SVar:TrigDraw:DB$ Draw | NumCards$ 1 | Defined$ You
+K:Plot:1 G
+Oracle:When Beastbond Outcaster enters the battlefield, if you control a creature with power 4 or greater, draw a card.\nPlot {1}{G} (You may pay 1 this card from your hand. Cast it as a sorcery on a later turn without paying its mana cost. Plot only as a sorcery.)
diff --git a/forge-gui/res/cardsfolder/upcoming/binding_negotiation.txt b/forge-gui/res/cardsfolder/upcoming/binding_negotiation.txt
index 132807793e7..19eee9d54e1 100644
--- a/forge-gui/res/cardsfolder/upcoming/binding_negotiation.txt
+++ b/forge-gui/res/cardsfolder/upcoming/binding_negotiation.txt
@@ -1,7 +1,7 @@
 Name:Binding Negotiation
 ManaCost:1 B
 Types:Sorcery
-A:SP$ Discard | ValidTgts$ Opponent | Mode$ RevealYouChoose | DiscardValid$ Card.nonLand | DiscardValidDesc$ nonland card | RememberDiscarded$ True | SubAbility$ DBReturn | SpellDescription$ Target opponent reveals their hand. You may choose a nonland card from it. If you do, they discard it. Otherwise, you may put a face-up exiled card they own into their graveyard.
-SVar:DBReturn:DB$ ChangeZone | Origin$ Exile | Destination$ Graveyard | ChangeValid$ Card.faceUp+TargetedPlayerOwn | Optional$ True | ConditionDefined$ Remembered | ConditionPresent$ Card | SubAbility$ DBCleanup
+A:SP$ Discard | ValidTgts$ Opponent | Mode$ RevealYouChoose | Optional$ True | DiscardValid$ Card.nonLand | DiscardValidDesc$ nonland card | RememberDiscarded$ True | SubAbility$ DBReturn | SpellDescription$ Target opponent reveals their hand. You may choose a nonland card from it. If you do, they discard it. Otherwise, you may put a face-up exiled card they own into their graveyard.
+SVar:DBReturn:DB$ ChangeZone | Origin$ Exile | Destination$ Graveyard | ChangeType$ Card.faceUp+TargetedPlayerOwn | Optional$ True | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ EQ0 |SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 Oracle:Target opponent reveals their hand. You may choose a nonland card from it. If you do, they discard it. Otherwise, you may put a face-up exiled card they own into their graveyard.
diff --git a/forge-gui/res/cardsfolder/upcoming/bruse_tarl_roving_rancher.txt b/forge-gui/res/cardsfolder/upcoming/bruse_tarl_roving_rancher.txt
index e2b9f609bf2..c7b8fc3eba6 100644
--- a/forge-gui/res/cardsfolder/upcoming/bruse_tarl_roving_rancher.txt
+++ b/forge-gui/res/cardsfolder/upcoming/bruse_tarl_roving_rancher.txt
@@ -3,7 +3,7 @@ ManaCost:2 R W
 Types:Legendary Creature Human Warrior
 PT:4/3
 S:Mode$ Continuous | Affected$ Ox.YouCtrl | AddKeyword$ Double Strike | Description$ Oxen you control have double strike.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$Whenever CARDNAME enters the battlefield or attacks, exile the top card of your library. If it's a land card, create a 2/2 white Ox creature token. Otherwise, you may cast it until the end of your next turn.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, exile the top card of your library. If it's a land card, create a 2/2 white Ox creature token. Otherwise, you may cast it until the end of your next turn.
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigExile | Secondary$ True | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, exile the top card of your library. If it's a land card, create a 2/2 white Ox creature token. Otherwise, you may cast it until the end of your next turn.
 SVar:TrigExile:DB$ Dig | DigNum$ 1 | DestinationZone$ Exile | RememberChanged$ True | ChangeNum$ All | SubAbility$ DBToken
 SVar:DBToken:DB$ Token | TokenScript$ w_2_2_ox | TokenOwner$ You | ConditionDefined$ Remembered | ConditionPresent$ Land | SubAbility$ DBEffect
diff --git a/forge-gui/res/tokenscripts/b_1_1_vampire_rogue_lifelink.txt b/forge-gui/res/tokenscripts/b_1_1_vampire_rogue_lifelink.txt
new file mode 100644
index 00000000000..246cb162c3d
--- /dev/null
+++ b/forge-gui/res/tokenscripts/b_1_1_vampire_rogue_lifelink.txt
@@ -0,0 +1,7 @@
+Name:Vampire Rogue Token
+ManaCost:no cost
+Types:Creature Vampire Rogue
+Colors:black
+PT:1/1
+K:Lifelink
+Oracle:Lifelink

From 59b46a224ef8ffe66d42c6684476ca1c96b9f3ec Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Fri, 29 Mar 2024 19:37:47 +0100
Subject: [PATCH 4/7] Update beastbond_outcaster.txt

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

diff --git a/forge-gui/res/cardsfolder/upcoming/beastbond_outcaster.txt b/forge-gui/res/cardsfolder/upcoming/beastbond_outcaster.txt
index ce58e11761a..43c6d8ae7aa 100644
--- a/forge-gui/res/cardsfolder/upcoming/beastbond_outcaster.txt
+++ b/forge-gui/res/cardsfolder/upcoming/beastbond_outcaster.txt
@@ -2,7 +2,7 @@ Name:Beastbond Outcaster
 ManaCost:2 G
 Types:Creature Human Druid
 PT:3/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | IsPresent$ Creature.YouCtrl+powerGE4 | PresentCompare$ GE1 | Execute$ TrigDraw | TriggerDescription$When CARDNAME enters the battlefield, if you control a creature with power 4 or greater, draw a card.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | IsPresent$ Creature.YouCtrl+powerGE4 | PresentCompare$ GE1 | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, if you control a creature with power 4 or greater, draw a card.
 SVar:TrigDraw:DB$ Draw | NumCards$ 1 | Defined$ You
 K:Plot:1 G
 Oracle:When Beastbond Outcaster enters the battlefield, if you control a creature with power 4 or greater, draw a card.\nPlot {1}{G} (You may pay 1 this card from your hand. Cast it as a sorcery on a later turn without paying its mana cost. Plot only as a sorcery.)

From 8c64a44337a2d43280d761d3be37b33c363598fa Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Fri, 29 Mar 2024 23:03:04 +0100
Subject: [PATCH 5/7] Update baron_bertram_graywater.txt

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

diff --git a/forge-gui/res/cardsfolder/upcoming/baron_bertram_graywater.txt b/forge-gui/res/cardsfolder/upcoming/baron_bertram_graywater.txt
index 5c6b6c01dc7..6cb93b54f83 100644
--- a/forge-gui/res/cardsfolder/upcoming/baron_bertram_graywater.txt
+++ b/forge-gui/res/cardsfolder/upcoming/baron_bertram_graywater.txt
@@ -4,7 +4,7 @@ Types:Legendary Creature Vampire Noble
 PT:3/4
 T:Mode$ ChangesZoneAll | ValidCards$ Card.token+YouCtrl | Destination$ Battlefield | TriggerZones$ Battlefield | ActivationLimit$ 1 | Execute$ TrigToken | TriggerDescription$ Whenever one or more tokens enter the battlefield under your control, create a 1/1 black Vampire Rogue creature token with lifelink. This ability triggers only once each turn.
 SVar:TrigToken:DB$ Token | TokenScript$ b_1_1_vampire_rogue_lifelink
-A:AB$ Draw | Cost$ 1 B Sac<1/Creature.Other;Artifact/another creature or artifact> | SpellDescription$ Draw a card.
+A:AB$ Draw | Cost$ 1 B Sac<1/Creature.Other;Artifact.Other/another creature or artifact> | SpellDescription$ Draw a card.
 DeckHas:Ability$Sacrifice|Token|LifeGain & Type$Rogue
 DeckHints:Ability$Token
 Oracle:Whenever one or more tokens enter the battlefield under your control, create a 1/1 black Vampire Rogue creature token with lifelink. This ability triggers only once each turn.\n{1}{B}, Sacrifice another creature or artifact: Draw a card.

From 5698c771e58804a7070416136ba5644b320eb217 Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Sat, 30 Mar 2024 12:24:42 +0100
Subject: [PATCH 6/7] Update binding_negotiation.txt

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

diff --git a/forge-gui/res/cardsfolder/upcoming/binding_negotiation.txt b/forge-gui/res/cardsfolder/upcoming/binding_negotiation.txt
index 19eee9d54e1..5e562432d2e 100644
--- a/forge-gui/res/cardsfolder/upcoming/binding_negotiation.txt
+++ b/forge-gui/res/cardsfolder/upcoming/binding_negotiation.txt
@@ -2,6 +2,6 @@ Name:Binding Negotiation
 ManaCost:1 B
 Types:Sorcery
 A:SP$ Discard | ValidTgts$ Opponent | Mode$ RevealYouChoose | Optional$ True | DiscardValid$ Card.nonLand | DiscardValidDesc$ nonland card | RememberDiscarded$ True | SubAbility$ DBReturn | SpellDescription$ Target opponent reveals their hand. You may choose a nonland card from it. If you do, they discard it. Otherwise, you may put a face-up exiled card they own into their graveyard.
-SVar:DBReturn:DB$ ChangeZone | Origin$ Exile | Destination$ Graveyard | ChangeType$ Card.faceUp+TargetedPlayerOwn | Optional$ True | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ EQ0 |SubAbility$ DBCleanup
+SVar:DBReturn:DB$ ChangeZone | Origin$ Exile | Destination$ Graveyard | ChangeType$ Card.faceUp+TargetedPlayerOwn | Hidden$ True | Optional$ True | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ EQ0 |SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 Oracle:Target opponent reveals their hand. You may choose a nonland card from it. If you do, they discard it. Otherwise, you may put a face-up exiled card they own into their graveyard.

From 1b31a5a37b009910a91662f40de3c92051748c36 Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Sat, 30 Mar 2024 16:40:11 +0100
Subject: [PATCH 7/7] Update arid_archway.txt

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

diff --git a/forge-gui/res/cardsfolder/upcoming/arid_archway.txt b/forge-gui/res/cardsfolder/upcoming/arid_archway.txt
index 04ec27525b5..2a55f20b964 100644
--- a/forge-gui/res/cardsfolder/upcoming/arid_archway.txt
+++ b/forge-gui/res/cardsfolder/upcoming/arid_archway.txt
@@ -3,7 +3,7 @@ ManaCost:no cost
 Types:Land Desert
 K:CARDNAME enters the battlefield tapped.
 A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 2 | SpellDescription$ Add {C}{C}.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME enters the battlefield, return a land you control to its owner's hand.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME enters the battlefield, return a land you control to its owner's hand. If another Desert was returned this way, surveil 1. (Look at the top card of your library. You may put it into your graveyard.)
 SVar:TrigReturn:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | Hidden$ True | Mandatory$ True | ChangeType$ Land.YouCtrl | RememberLKI$ True | AILogic$ NeverBounceItself | SubAbility$ DBSurveil
 SVar:DBSurveil:DB$ Surveil | Defined$ You | Amount$ 1 | ConditionDefined$ RememberedLKI | ConditionPresent$ Desert.Other | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True