From b721da78c897698ae1d1714d8c133b6556629bde Mon Sep 17 00:00:00 2001
From: Justin C <73019026+neoFuzz@users.noreply.github.com>
Date: Wed, 15 Jan 2025 11:30:34 +1100
Subject: [PATCH 01/13] Add ${androidBuildTools} to pom.xml
Update the Android Build Tools via variable
---
forge-gui-android/pom.xml | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/forge-gui-android/pom.xml b/forge-gui-android/pom.xml
index 8c68fac0c73..a7865f2a9eb 100644
--- a/forge-gui-android/pom.xml
+++ b/forge-gui-android/pom.xml
@@ -16,6 +16,7 @@
user
pass
ftp.cardforge.org
+ 35.0.0
@@ -263,7 +264,7 @@
35
- 35.0.0
+ ${androidBuildTools}
true
${project.basedir}/assets
@@ -393,7 +394,7 @@
35
- 35.0.0
+ ${androidBuildTools}
false
@@ -610,7 +611,7 @@
35
- 35.0.0
+ ${androidBuildTools}
false
From 82ebeefff7aaaff9977083a3b16e1e37bfff6774 Mon Sep 17 00:00:00 2001
From: Justin C <73019026+neoFuzz@users.noreply.github.com>
Date: Thu, 16 Jan 2025 06:40:39 +1100
Subject: [PATCH 02/13] Add ${androidPlatform}
---
forge-gui-android/pom.xml | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/forge-gui-android/pom.xml b/forge-gui-android/pom.xml
index a7865f2a9eb..ea16b164d85 100644
--- a/forge-gui-android/pom.xml
+++ b/forge-gui-android/pom.xml
@@ -17,6 +17,7 @@
pass
ftp.cardforge.org
35.0.0
+ 35
@@ -263,7 +264,7 @@
true
- 35
+ ${androidPlatform}
${androidBuildTools}
true
@@ -393,7 +394,7 @@
false
- 35
+ ${androidPlatform}
${androidBuildTools}
@@ -610,7 +611,7 @@
false
- 35
+ ${androidPlatform}
${androidBuildTools}
From 47a57f50b3a19546fe40202991c742b71b5c18f6 Mon Sep 17 00:00:00 2001
From: Renato Filipe Vidal Santos <45150760+dracontes@users.noreply.github.com>
Date: Wed, 22 Jan 2025 16:12:50 +0000
Subject: [PATCH 03/13] January 2025 cleanup: pass 7 (#6831)
---
forge-gui/res/cardsfolder/a/abuelos_awakening.txt | 2 +-
forge-gui/res/cardsfolder/a/acidic_slime.txt | 2 +-
forge-gui/res/cardsfolder/a/acolytes_reward.txt | 4 ++--
forge-gui/res/cardsfolder/a/alaundo_the_seer.txt | 8 ++++----
forge-gui/res/cardsfolder/a/avalanche_riders.txt | 2 +-
forge-gui/res/cardsfolder/b/burning_rune_demon.txt | 2 +-
forge-gui/res/cardsfolder/c/caldera_breaker.txt | 2 +-
forge-gui/res/cardsfolder/c/cemetery_gatekeeper.txt | 2 +-
forge-gui/res/cardsfolder/c/cemetery_illuminator.txt | 2 +-
forge-gui/res/cardsfolder/c/cemetery_protector.txt | 2 +-
forge-gui/res/cardsfolder/c/cemetery_prowler.txt | 2 +-
forge-gui/res/cardsfolder/c/clarion_ultimatum.txt | 2 +-
forge-gui/res/cardsfolder/c/cultivate.txt | 4 ++--
.../cardsfolder/c/curse_of_leeches_leeching_lurker.txt | 2 +-
.../res/cardsfolder/d/daretti_ingenious_iconoclast.txt | 2 +-
forge-gui/res/cardsfolder/d/demonic_hordes.txt | 2 +-
forge-gui/res/cardsfolder/d/detritivore.txt | 2 +-
forge-gui/res/cardsfolder/d/dichotomancy.txt | 2 +-
.../d/doric_natures_warden_doric_owlbear_avenger.txt | 6 ++++--
forge-gui/res/cardsfolder/d/doubling_chant.txt | 2 +-
forge-gui/res/cardsfolder/d/dwarven_catapult.txt | 2 +-
forge-gui/res/cardsfolder/e/edgin_larcenous_lutenist.txt | 1 +
forge-gui/res/cardsfolder/e/extract_from_darkness.txt | 2 +-
forge-gui/res/cardsfolder/f/faultgrinder.txt | 2 +-
forge-gui/res/cardsfolder/f/final_parting.txt | 4 ++--
forge-gui/res/cardsfolder/f/flare_of_cultivation.txt | 4 ++--
forge-gui/res/cardsfolder/f/flourishing_bloom_kin.txt | 4 ++--
.../res/cardsfolder/f/forge_neverwinter_charlatan.txt | 1 +
forge-gui/res/cardsfolder/f/fork_in_the_road.txt | 4 ++--
forge-gui/res/cardsfolder/g/ghireds_belligerence.txt | 2 +-
forge-gui/res/cardsfolder/g/goblin_settler.txt | 2 +-
forge-gui/res/cardsfolder/g/goldwardens_gambit.txt | 2 +-
forge-gui/res/cardsfolder/h/hellkite_courser.txt | 2 +-
forge-gui/res/cardsfolder/h/holga_relentless_rager.txt | 1 +
forge-gui/res/cardsfolder/i/inquisitor_captain.txt | 2 +-
forge-gui/res/cardsfolder/i/iroass_blessing.txt | 2 +-
forge-gui/res/cardsfolder/j/jarads_orders.txt | 4 ++--
forge-gui/res/cardsfolder/k/kamigawa_charm.txt | 4 ++--
forge-gui/res/cardsfolder/k/kaya_spirits_justice.txt | 2 +-
forge-gui/res/cardsfolder/k/king_narfis_betrayal.txt | 2 +-
forge-gui/res/cardsfolder/k/kodamas_reach.txt | 4 ++--
forge-gui/res/cardsfolder/l/life_finds_a_way.txt | 2 +-
forge-gui/res/cardsfolder/l/lynde_cheerful_tormentor.txt | 8 ++++----
forge-gui/res/cardsfolder/m/martyrdom.txt | 2 +-
forge-gui/res/cardsfolder/m/midnight_crusader_shuttle.txt | 2 +-
forge-gui/res/cardsfolder/n/nautiloid_ship.txt | 2 +-
forge-gui/res/cardsfolder/n/navigation_orb.txt | 2 +-
forge-gui/res/cardsfolder/n/nicol_bolas_planeswalker.txt | 2 +-
forge-gui/res/cardsfolder/o/ogre_arsonist.txt | 2 +-
forge-gui/res/cardsfolder/o/order_of_whiteclay.txt | 2 +-
forge-gui/res/cardsfolder/p/path_of_the_schemer.txt | 2 +-
forge-gui/res/cardsfolder/p/peregrination.txt | 4 ++--
forge-gui/res/cardsfolder/p/pongify.txt | 2 +-
forge-gui/res/cardsfolder/r/rapid_hybridization.txt | 2 +-
forge-gui/res/cardsfolder/r/ravaging_horde.txt | 2 +-
forge-gui/res/cardsfolder/r/ravenous_baboons.txt | 2 +-
.../res/cardsfolder/r/realmbreaker_the_invasion_tree.txt | 2 +-
forge-gui/res/cardsfolder/r/realms_uncharted.txt | 4 ++--
forge-gui/res/cardsfolder/r/reincarnation.txt | 4 ++--
forge-gui/res/cardsfolder/rebalanced/a-navigation_orb.txt | 2 +-
forge-gui/res/cardsfolder/s/search_the_city.txt | 2 +-
forge-gui/res/cardsfolder/s/simon_wild_magic_sorcerer.txt | 1 +
forge-gui/res/cardsfolder/s/slimefoots_survey.txt | 4 ++--
forge-gui/res/cardsfolder/s/soltari_visionary.txt | 2 +-
forge-gui/res/cardsfolder/s/sorins_thirst.txt | 2 +-
forge-gui/res/cardsfolder/s/swine_rebellion.txt | 2 +-
.../res/cardsfolder/s/sword_of_truth_and_justice.txt | 2 +-
forge-gui/res/cardsfolder/s/sylvan_primordial.txt | 2 +-
forge-gui/res/cardsfolder/s/szarekh_the_silent_king.txt | 2 +-
forge-gui/res/cardsfolder/u/urborg_scavengers.txt | 2 +-
forge-gui/res/cardsfolder/u/urza_academy_headmaster.txt | 6 +++---
forge-gui/res/cardsfolder/v/verdant_mastery.txt | 4 ++--
forge-gui/res/cardsfolder/v/vhal_eager_scholar.txt | 2 +-
.../res/cardsfolder/v/victor_valgavoths_seneschal.txt | 2 +-
forge-gui/res/cardsfolder/v/viewpoint_synchronization.txt | 4 ++--
forge-gui/res/cardsfolder/w/wake_to_slaughter.txt | 2 +-
forge-gui/res/cardsfolder/w/woodfall_primus.txt | 2 +-
forge-gui/res/cardsfolder/x/xenk_paladin_unbroken.txt | 1 +
78 files changed, 104 insertions(+), 97 deletions(-)
diff --git a/forge-gui/res/cardsfolder/a/abuelos_awakening.txt b/forge-gui/res/cardsfolder/a/abuelos_awakening.txt
index 404744de6c8..66563c751aa 100644
--- a/forge-gui/res/cardsfolder/a/abuelos_awakening.txt
+++ b/forge-gui/res/cardsfolder/a/abuelos_awakening.txt
@@ -1,7 +1,7 @@
Name:Abuelo's Awakening
ManaCost:X 3 W
Types:Sorcery
-A:SP$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Artifact.YouOwn,Enchantment.nonAura+YouOwn | TgtPrompt$ Select an Artifact or non-Aura enchantment | AnimateSubAbility$ DBAnimate | WithCountersType$ P1P1 | WithCountersAmount$ X | SpellDescription$ Return target artifact or non-Aura enchantment card from your graveyard to the battlefield with X additional +1/+1 counters on it. It's a 1/1 Spirit creature with flying in addition to its other types.
+A:SP$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Artifact.YouOwn,Enchantment.nonAura+YouOwn | TgtPrompt$ Select target artifact or non-Aura enchantment in your graveyard | AnimateSubAbility$ DBAnimate | WithCountersType$ P1P1 | WithCountersAmount$ X | SpellDescription$ Return target artifact or non-Aura enchantment card from your graveyard to the battlefield with X additional +1/+1 counters on it. It's a 1/1 Spirit creature with flying in addition to its other types.
SVar:DBAnimate:DB$ Animate | Defined$ Remembered | Power$ 1 | Toughness$ 1 | Keywords$ Flying | Types$ Creature,Spirit | Duration$ Permanent
SVar:X:Count$xPaid
DeckHas:Ability$Graveyard|Counters & Type$Spirit
diff --git a/forge-gui/res/cardsfolder/a/acidic_slime.txt b/forge-gui/res/cardsfolder/a/acidic_slime.txt
index aa66b7435cb..b136b84f1fb 100644
--- a/forge-gui/res/cardsfolder/a/acidic_slime.txt
+++ b/forge-gui/res/cardsfolder/a/acidic_slime.txt
@@ -4,6 +4,6 @@ Types:Creature Ooze
PT:2/2
K:Deathtouch
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME enters, destroy target artifact, enchantment, or land.
-SVar:TrigDestroy:DB$ Destroy | ValidTgts$ Artifact,Enchantment,Land | TgtPrompt$ Select an artifact, enchantment, or land.
+SVar:TrigDestroy:DB$ Destroy | ValidTgts$ Artifact,Enchantment,Land | TgtPrompt$ Select target artifact, enchantment, or land
SVar:PlayMain1:TRUE
Oracle:Deathtouch (Any amount of damage this deals to a creature is enough to destroy it.)\nWhen Acidic Slime enters, destroy target artifact, enchantment, or land.
diff --git a/forge-gui/res/cardsfolder/a/acolytes_reward.txt b/forge-gui/res/cardsfolder/a/acolytes_reward.txt
index 90b6c388f89..99a81a37e9d 100644
--- a/forge-gui/res/cardsfolder/a/acolytes_reward.txt
+++ b/forge-gui/res/cardsfolder/a/acolytes_reward.txt
@@ -1,8 +1,8 @@
Name:Acolyte's Reward
ManaCost:1 W
Types:Instant
-A:SP$ Pump | ValidTgts$ Any | TgtPrompt$ Select any target to damage with shield effect | IsCurse$ True | SubAbility$ AcolytesPrevention | StackDescription$ SpellDescription | AILogic$ Never | SpellDescription$ Prevent the next X damage that would be dealt to target creature this turn, where X is your devotion to white. If damage is prevented this way, CARDNAME deals that much damage to any target.
-SVar:AcolytesPrevention:DB$ PreventDamage | ValidTgts$ Creature | TgtPrompt$ Select a creature to prevent damage to | Amount$ X | PreventionSubAbility$ AcolytesRetribution | ShieldEffectTarget$ ParentTarget | StackDescription$ None
+A:SP$ Pump | ValidTgts$ Any | TgtPrompt$ Select any target to redirect prevented damage to | IsCurse$ True | SubAbility$ AcolytesPrevention | StackDescription$ SpellDescription | AILogic$ Never | SpellDescription$ Prevent the next X damage that would be dealt to target creature this turn, where X is your devotion to white. If damage is prevented this way, CARDNAME deals that much damage to any target.
+SVar:AcolytesPrevention:DB$ PreventDamage | ValidTgts$ Creature | TgtPrompt$ Select target creature to prevent damage dealt to | Amount$ X | PreventionSubAbility$ AcolytesRetribution | ShieldEffectTarget$ ParentTarget | StackDescription$ None
SVar:AcolytesRetribution:DB$ DealDamage | Defined$ ShieldEffectTarget | NumDmg$ PreventedDamage | SpellDescription$ CARDNAME deals damage to target creature or player for each damage prevented this way.
SVar:X:Count$Devotion.White
AI:RemoveDeck:All
diff --git a/forge-gui/res/cardsfolder/a/alaundo_the_seer.txt b/forge-gui/res/cardsfolder/a/alaundo_the_seer.txt
index 8d018b7090f..b6ba46f2895 100644
--- a/forge-gui/res/cardsfolder/a/alaundo_the_seer.txt
+++ b/forge-gui/res/cardsfolder/a/alaundo_the_seer.txt
@@ -2,14 +2,14 @@ Name:Alaundo the Seer
ManaCost:2 G U
Types:Legendary Creature Human Shaman
PT:3/5
-A:AB$ Draw | Cost$ T | SubAbility$ DBExile | StackDescription$ SpellDescription | SpellDescription$ Draw a card, then exile a card from your hand and put a number of time counters on it equal to its mana value. It gains "When the last time counter is removed from this card, if it's exiled, you may cast it without paying its mana cost. If you cast a creature spell this way, it gains haste until end of turn." Then remove a time counter from each other card you own in exile.
-SVar:DBExile:DB$ ChangeZone | Origin$ Hand | Destination$ Exile | TgtPrompt$ Select a card to exile with a number of time counters equal to its mana value | WithCountersType$ TIME | WithCountersAmount$ X | SubAbility$ DBAddTrigger | RememberChanged$ True | Mandatory$ True
+A:AB$ Draw | Cost$ T | SubAbility$ DBExile | StackDescription$ REP Draw_{p:You} draws & then exile_then exiles & from your_from their & and put_and puts & Then remove_Then {p:You} removes & you own_they own | SpellDescription$ Draw a card, then exile a card from your hand and put a number of time counters on it equal to its mana value. It gains "When the last time counter is removed from this card, if it's exiled, you may cast it without paying its mana cost. If you cast a creature spell this way, it gains haste until end of turn." Then remove a time counter from each other card you own in exile.
+SVar:DBExile:DB$ ChangeZone | Origin$ Hand | Destination$ Exile | SelectPrompt$ Select a card in your hand to exile with a number of time counters equal to its mana value | WithCountersType$ TIME | WithCountersAmount$ X | SubAbility$ DBAddTrigger | RememberChanged$ True | Mandatory$ True | StackDescription$ None
SVar:X:Remembered$CardManaCost
-SVar:DBAddTrigger:DB$ Animate | Defined$ Remembered | Triggers$ TWhenLastTimeCounterRemoved | Duration$ Permanent | SubAbility$ DBRemoveTimeCounterOtherCardsInExile
+SVar:DBAddTrigger:DB$ Animate | Defined$ Remembered | Triggers$ TWhenLastTimeCounterRemoved | Duration$ Permanent | StackDescription$ None | SubAbility$ DBRemoveTimeCounterOtherCardsInExile
SVar:TWhenLastTimeCounterRemoved:Mode$ CounterRemoved | ValidCard$ Card.Self+counters_EQ0_TIME | TriggerZones$ Exile | CounterType$ TIME | Execute$ DBCastWithoutPayingManaCost | TriggerDescription$ When the last time counter is removed from this card, if it's exiled, you may cast it without paying its mana cost. If you cast a creature spell this way, it gains haste until end of turn.
SVar:DBCastWithoutPayingManaCost:DB$ Play | Valid$ Card.Self | ValidSA$ Spell | ValidZone$ Exile | Destination$ Battlefield | WithoutManaCost$ True | Optional$ True | SubAbility$ DBGiveHaste
SVar:DBGiveHaste:DB$ Pump | Defined$ Self | KW$ Haste | ConditionDefined$ Self | ConditionPresent$ Card.Creature | PumpZone$ Stack
-SVar:DBRemoveTimeCounterOtherCardsInExile:DB$ RemoveCounterAll | ValidCards$ Card.YouOwn+IsNotRemembered | ValidZone$ Exile | CounterType$ TIME | CounterNum$ 1 | SubAbility$ DBCleanUp
+SVar:DBRemoveTimeCounterOtherCardsInExile:DB$ RemoveCounterAll | ValidCards$ Card.YouOwn+IsNotRemembered | ValidZone$ Exile | CounterType$ TIME | CounterNum$ 1 | StackDescription$ None | SubAbility$ DBCleanUp
SVar:DBCleanUp:DB$ Cleanup | ClearRemembered$ True
DeckHints:Keyword$Suspend
Oracle:{T}:Draw a card, then exile a card from your hand and put a number of time counters on it equal to its mana value. It gains "When the last time counter is removed from this card, if it's exiled, you may cast it without paying its mana cost. If you cast a creature spell this way, it gains haste until end of turn." Then remove a time counter from each other card you own in exile.
diff --git a/forge-gui/res/cardsfolder/a/avalanche_riders.txt b/forge-gui/res/cardsfolder/a/avalanche_riders.txt
index 269cd124818..25e6db8ae3d 100644
--- a/forge-gui/res/cardsfolder/a/avalanche_riders.txt
+++ b/forge-gui/res/cardsfolder/a/avalanche_riders.txt
@@ -5,5 +5,5 @@ PT:2/2
K:Haste
K:Echo:3 R
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME enters, destroy target land.
-SVar:TrigDestroy:DB$ Destroy | ValidTgts$ Land | TgtPrompt$ Select a land.
+SVar:TrigDestroy:DB$ Destroy | ValidTgts$ Land
Oracle:Haste\nEcho {3}{R} (At the beginning of your upkeep, if this came under your control since the beginning of your last upkeep, sacrifice it unless you pay its echo cost.)\nWhen Avalanche Riders enters, destroy target land.
diff --git a/forge-gui/res/cardsfolder/b/burning_rune_demon.txt b/forge-gui/res/cardsfolder/b/burning_rune_demon.txt
index b90ab7e8c9b..0cef5dcc70a 100644
--- a/forge-gui/res/cardsfolder/b/burning_rune_demon.txt
+++ b/forge-gui/res/cardsfolder/b/burning_rune_demon.txt
@@ -6,7 +6,7 @@ K:Flying
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters, you may search your library for exactly two cards not named Burning-Rune Demon that have different names. If you do, reveal those cards. An opponent chooses one of them. Put the chosen card into your hand and the other into your graveyard, then shuffle.
SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Library | ChangeType$ Card.notnamedBurning-Rune Demon | ChangeNum$ 2 | DifferentNames$ True | RememberChanged$ True | Reveal$ True | Shuffle$ False | AILogic$ Intuition | SubAbility$ DBChoosePlayer
SVar:DBChoosePlayer:DB$ ChoosePlayer | Defined$ You | Choices$ Player.Opponent | ChoiceTitle$ Choose an opponent | SubAbility$ DBChangeZone1
-SVar:DBChangeZone1:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Card.IsRemembered | Chooser$ ChosenPlayer | ChangeNum$ 1 | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card for the hand | Shuffle$ False | SubAbility$ DBChangeZone2 | StackDescription$ None
+SVar:DBChangeZone1:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Card.IsRemembered | Chooser$ ChosenPlayer | ChangeNum$ 1 | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card to be put into the hand of CARDNAME's controller | Shuffle$ False | SubAbility$ DBChangeZone2 | StackDescription$ None
SVar:DBChangeZone2:DB$ ChangeZoneAll | Origin$ Library | Destination$ Graveyard | ChangeType$ Card.IsRemembered | Shuffle$ True | StackDescription$ None | SubAbility$ DBCleanup
SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearChosenPlayer$ True
DeckHas:Ability$Graveyard
diff --git a/forge-gui/res/cardsfolder/c/caldera_breaker.txt b/forge-gui/res/cardsfolder/c/caldera_breaker.txt
index 7de6b872084..7a2f2c65277 100644
--- a/forge-gui/res/cardsfolder/c/caldera_breaker.txt
+++ b/forge-gui/res/cardsfolder/c/caldera_breaker.txt
@@ -6,7 +6,7 @@ K:Trample
T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters, exile all Mountain cards from your library. When you do, CARDNAME deals that much damage to target creature or planeswalker an opponent controls.
SVar:TrigChangeZone:DB$ ChangeZoneAll | Origin$ Library | Destination$ Exile | ChangeType$ Mountain.YouOwn | RememberChanged$ True | SubAbility$ DBImmediateTrig
SVar:DBImmediateTrig:DB$ ImmediateTrigger | ConditionDefined$ Remembered | ConditionPresent$ Card | Execute$ TrigDamage | RememberObjects$ Remembered | SubAbility$ DBCleanup | TriggerDescription$ When you do, CARDNAME deals that much damage to target creature or planeswalker an opponent controls.
-SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Creature.OppCtrl,Planeswalker.OppCtrl | TgtPrompt$ Select a creature or planeswalker an opponent controls | NumDmg$ X
+SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Creature.OppCtrl,Planeswalker.OppCtrl | TgtPrompt$ Select target creature or planeswalker an opponent controls | NumDmg$ X
SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigChangeZoneAll | TriggerDescription$ When CARDNAME dies, put all cards exiled with it onto the battlefield under their owner's control. Conjure four cards named Volcanic Geyser into your library, then shuffle.
SVar:TrigChangeZoneAll:DB$ ChangeZoneAll | ChangeType$ Card.ExiledWithSource | Origin$ Exile | Destination$ Battlefield | SubAbility$ DBConjure
diff --git a/forge-gui/res/cardsfolder/c/cemetery_gatekeeper.txt b/forge-gui/res/cardsfolder/c/cemetery_gatekeeper.txt
index b680980a27c..96cff5c7033 100644
--- a/forge-gui/res/cardsfolder/c/cemetery_gatekeeper.txt
+++ b/forge-gui/res/cardsfolder/c/cemetery_gatekeeper.txt
@@ -4,7 +4,7 @@ Types:Creature Vampire
PT:2/1
K:First Strike
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When CARDNAME enters, exile a card from a graveyard.
-SVar:TrigExile:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | ChangeType$ Card | ChangeNum$ 1 | SelectPrompt$ Select a card from a graveyard | Mandatory$ True | Hidden$ True | AILogic$ ExilePreference:MostProminentOppType
+SVar:TrigExile:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | ChangeType$ Card | ChangeNum$ 1 | SelectPrompt$ Select a card in a graveyard | Mandatory$ True | Hidden$ True | AILogic$ ExilePreference:MostProminentOppType
T:Mode$ LandPlayed | ValidCard$ Land.sharesCardTypeWith ValidExile Card.ExiledWithSource | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ Whenever a player plays a land or casts a spell, if it shares a card type with the exiled card, CARDNAME deals 2 damage to that player.
T:Mode$ SpellCast | ValidCard$ Card.sharesCardTypeWith ValidExile Card.ExiledWithSource | ValidActivatingPlayer$ Player | TriggerZones$ Battlefield | Execute$ TrigDamage | Secondary$ True | TriggerDescription$ Whenever a player plays a land or casts a spell, if it shares a card type with the exiled card, CARDNAME deals 2 damage to that player.
SVar:TrigDamage:DB$ DealDamage | NumDmg$ 2 | Defined$ TriggeredCardController | ConditionDefined$ TriggeredCardLKICopy | ConditionPresent$ Card.sharesCardTypeWith ValidExile Card.ExiledWithSource
diff --git a/forge-gui/res/cardsfolder/c/cemetery_illuminator.txt b/forge-gui/res/cardsfolder/c/cemetery_illuminator.txt
index 1be8e2a3e5a..a0b6deadcb1 100644
--- a/forge-gui/res/cardsfolder/c/cemetery_illuminator.txt
+++ b/forge-gui/res/cardsfolder/c/cemetery_illuminator.txt
@@ -5,7 +5,7 @@ PT:2/3
K:Flying
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When CARDNAME enters or attacks, exile a card from a graveyard.
T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigExile | Secondary$ True | TriggerDescription$ Whenever CARDNAME enters or attacks, exile a card from a graveyard.
-SVar:TrigExile:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | ChangeType$ Card | ChangeNum$ 1 | SelectPrompt$ Select a card from a graveyard | Mandatory$ True | Hidden$ True | Imprint$ True | AILogic$ ExilePreference:MostProminentOwnType
+SVar:TrigExile:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | ChangeType$ Card | ChangeNum$ 1 | SelectPrompt$ Select a card in a graveyard | Mandatory$ True | Hidden$ True | Imprint$ True | AILogic$ ExilePreference:MostProminentOwnType
S:Mode$ Continuous | Affected$ Card.TopLibrary+YouCtrl | AffectedZone$ Library | MayLookAt$ You | Description$ You may look at the top card of your library any time.
S:Mode$ Continuous | EffectZone$ Battlefield | Affected$ Card.nonLand+TopLibrary+YouCtrl+sharesCardTypeWith Imprinted.ExiledWithSource | AffectedZone$ Library | MayPlay$ True | MayPlayLimit$ 1 | Description$ Once each turn, you may cast a spell from the top of your library if it shares a card type with a card exiled with CARDNAME.
DeckHas:Ability$Graveyard
diff --git a/forge-gui/res/cardsfolder/c/cemetery_protector.txt b/forge-gui/res/cardsfolder/c/cemetery_protector.txt
index 58ef79e6a52..18fa93bd510 100644
--- a/forge-gui/res/cardsfolder/c/cemetery_protector.txt
+++ b/forge-gui/res/cardsfolder/c/cemetery_protector.txt
@@ -4,7 +4,7 @@ Types:Creature Human Soldier
PT:3/4
K:Flash
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When CARDNAME enters, exile a card from a graveyard.
-SVar:TrigExile:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | ChangeType$ Card | ChangeNum$ 1 | SelectPrompt$ Select a card from a graveyard | Mandatory$ True | Hidden$ True | Imprint$ True | AILogic$ ExilePreference:Land
+SVar:TrigExile:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | ChangeType$ Card | ChangeNum$ 1 | SelectPrompt$ Select a card in a graveyard | Mandatory$ True | Hidden$ True | Imprint$ True | AILogic$ ExilePreference:Land
T:Mode$ LandPlayed | ValidCard$ Land.YouOwn+sharesCardTypeWith Imprinted.ExiledWithSource | Execute$ TrigToken | TriggerZones$ Battlefield | TriggerDescription$ Whenever you play a land or cast a spell, if it shares a card type with the exiled card, create a 1/1 white Human creature token.
T:Mode$ SpellCast | ValidCard$ Card.sharesCardTypeWith Imprinted.ExiledWithSource | ValidActivatingPlayer$ You | Execute$ TrigToken | TriggerZones$ Battlefield | Secondary$ True | TriggerDescription$ Whenever you play a land or cast a spell, if it shares a card type with the exiled card, create a 1/1 white Human creature token.
SVar:TrigToken:DB$ Token | TokenScript$ w_1_1_human
diff --git a/forge-gui/res/cardsfolder/c/cemetery_prowler.txt b/forge-gui/res/cardsfolder/c/cemetery_prowler.txt
index 0fe3c038de3..08fc0d3c903 100644
--- a/forge-gui/res/cardsfolder/c/cemetery_prowler.txt
+++ b/forge-gui/res/cardsfolder/c/cemetery_prowler.txt
@@ -5,7 +5,7 @@ PT:3/4
K:Vigilance
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When CARDNAME enters or attacks, exile a card from a graveyard.
T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigExile | Secondary$ True | TriggerDescription$ Whenever CARDNAME enters or attacks, exile a card from a graveyard.
-SVar:TrigExile:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | ChangeType$ Card | ChangeNum$ 1 | SelectPrompt$ Select a card from a graveyard | Mandatory$ True | Hidden$ True | AILogic$ ExilePreference:MostProminentNonLandNonExiledOwnType
+SVar:TrigExile:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | ChangeType$ Card | ChangeNum$ 1 | SelectPrompt$ Select a card in a graveyard | Mandatory$ True | Hidden$ True | AILogic$ ExilePreference:MostProminentNonLandNonExiledOwnType
S:Mode$ ReduceCost | ValidCard$ Card | Type$ Spell | Amount$ AffectedX | Activator$ You | Description$ Spells you cast cost {1} less to cast for each card type they share with cards exiled with CARDNAME.
SVar:AffectedX:Count$TypesSharedWith ValidExile Card.ExiledWithSource
DeckHints:Ability$Graveyard|Discard
diff --git a/forge-gui/res/cardsfolder/c/clarion_ultimatum.txt b/forge-gui/res/cardsfolder/c/clarion_ultimatum.txt
index 8bb489f5ec8..e8ccf541fd9 100644
--- a/forge-gui/res/cardsfolder/c/clarion_ultimatum.txt
+++ b/forge-gui/res/cardsfolder/c/clarion_ultimatum.txt
@@ -3,7 +3,7 @@ ManaCost:G G W W W U U
Types:Sorcery
A:SP$ ChooseCard | Defined$ You | Amount$ 5 | Mandatory$ True | Choices$ Permanent.YouCtrl | ChoiceTitle$ Choose five permanents you control | ChoiceZone$ Battlefield | SubAbility$ DBRepeat | StackDescription$ SpellDescription | SpellDescription$ Choose five permanents you control. For each of those permanents, you may search your library for a card with the same name as that permanent. Put those cards onto the battlefield tapped, then shuffle.
SVar:DBRepeat:DB$ RepeatEach | RepeatCards$ Card.ChosenCard | Zone$ Battlefield | RepeatSubAbility$ DBSearch | SubAbility$ DBChangeZone
-SVar:DBSearch:DB$ ChooseCard | ChoiceZone$ Library | QuasiLibrarySearch$ You | Choices$ Card.YouOwn+IsNotImprinted+sharesNameWith Remembered | ImprintChosen$ True | ChoiceTitle$ You may select a card with this name from your library
+SVar:DBSearch:DB$ ChooseCard | ChoiceZone$ Library | QuasiLibrarySearch$ You | Choices$ Card.YouOwn+IsNotImprinted+sharesNameWith Remembered | ImprintChosen$ True | ChoiceTitle$ You may choose a card with this name from your library
SVar:DBChangeZone:DB$ ChangeZone | Defined$ Imprinted | Origin$ Library | Destination$ Battlefield | Tapped$ True | Searched$ True | Shuffle$ True | StackDescription$ None
SVar:NeedsToPlayVar:Z GE4
SVar:Z:Count$Valid Permanent.YouCtrl
diff --git a/forge-gui/res/cardsfolder/c/cultivate.txt b/forge-gui/res/cardsfolder/c/cultivate.txt
index fe7a236b432..dc93f59004d 100644
--- a/forge-gui/res/cardsfolder/c/cultivate.txt
+++ b/forge-gui/res/cardsfolder/c/cultivate.txt
@@ -2,7 +2,7 @@ Name:Cultivate
ManaCost:2 G
Types:Sorcery
A:SP$ ChangeZone | Origin$ Library | Destination$ Library | ChangeType$ Land.Basic | ChangeNum$ 2 | RememberChanged$ True | Reveal$ True | Shuffle$ False | StackDescription$ SpellDescription | SubAbility$ DBChangeZone1 | SpellDescription$ Search your library for up to two basic land cards, reveal those cards, put one onto the battlefield tapped and the other into your hand, then shuffle.
-SVar:DBChangeZone1:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.IsRemembered | ChangeNum$ 1 | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card for the battlefield | Tapped$ True | Shuffle$ False | SubAbility$ DBChangeZone2 | StackDescription$ None
-SVar:DBChangeZone2:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.IsRemembered | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card for your hand | StackDescription$ None | SubAbility$ DBCleanup
+SVar:DBChangeZone1:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.IsRemembered | ChangeNum$ 1 | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card to put onto the battlefield | Tapped$ True | Shuffle$ False | SubAbility$ DBChangeZone2 | StackDescription$ None
+SVar:DBChangeZone2:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.IsRemembered | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card to put into your hand | StackDescription$ None | SubAbility$ DBCleanup
SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
Oracle:Search your library for up to two basic land cards, reveal those cards, put one onto the battlefield tapped and the other into your hand, then shuffle.
diff --git a/forge-gui/res/cardsfolder/c/curse_of_leeches_leeching_lurker.txt b/forge-gui/res/cardsfolder/c/curse_of_leeches_leeching_lurker.txt
index dce85e2d024..8f8765cea23 100644
--- a/forge-gui/res/cardsfolder/c/curse_of_leeches_leeching_lurker.txt
+++ b/forge-gui/res/cardsfolder/c/curse_of_leeches_leeching_lurker.txt
@@ -4,7 +4,7 @@ Types:Enchantment Aura Curse
K:Enchant player
A:SP$ Attach | ValidTgts$ Player | AILogic$ Curse
R:Event$ Transform | ValidCard$ Card.Self | ReplaceWith$ Attach | Description$ As this permanent transforms into CARDNAME, attach it to a player.
-SVar:Attach:DB$ Attach | Object$ Self | Chooser$ You | PlayerChoices$ Player | ChoiceTitle$ Choose a player to curse | AILogic$ Curse
+SVar:Attach:DB$ Attach | Object$ Self | Chooser$ You | PlayerChoices$ Player | ChoiceTitle$ Choose a player to attach this Curse to | AILogic$ Curse
T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player.EnchantedBy | TriggerZones$ Battlefield | Execute$ TrigDrain | TriggerDescription$ At the beginning of enchanted player's upkeep, they lose 1 life and you gain 1 life.
SVar:TrigDrain:DB$ LoseLife | Defined$ TriggeredPlayer | LifeAmount$ 1 | SubAbility$ DBGainLife
SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 1
diff --git a/forge-gui/res/cardsfolder/d/daretti_ingenious_iconoclast.txt b/forge-gui/res/cardsfolder/d/daretti_ingenious_iconoclast.txt
index a09bebe87bb..a22335d7d7a 100644
--- a/forge-gui/res/cardsfolder/d/daretti_ingenious_iconoclast.txt
+++ b/forge-gui/res/cardsfolder/d/daretti_ingenious_iconoclast.txt
@@ -4,5 +4,5 @@ Types:Legendary Planeswalker Daretti
Loyalty:3
A:AB$ Token | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | TokenAmount$ 1 | TokenScript$ c_1_1_a_construct_defender | TokenOwner$ You | SpellDescription$ Create a 1/1 colorless Construct artifact creature token with defender.
A:AB$ Destroy | Cost$ SubCounter<1/LOYALTY> | Planeswalker$ True | ValidTgts$ Artifact,Creature | TgtPrompt$ Select target artifact or creature | UnlessCost$ Sac<1/Artifact> | UnlessSwitched$ True | UnlessPayer$ You | SpellDescription$ You may sacrifice an artifact. If you do, destroy target artifact or creature. | StackDescription$ SpellDescription
-A:AB$ CopyPermanent | Cost$ SubCounter<6/LOYALTY> | Planeswalker$ True | Ultimate$ True | ValidTgts$ Artifact | TgtZone$ Battlefield,Graveyard | TgtPrompt$ Select an artifact in graveyard or the battlefield | NumCopies$ 3 | SpellDescription$ Choose target artifact card in a graveyard or artifact on the battlefield. Create three tokens that are copies of it.
+A:AB$ CopyPermanent | Cost$ SubCounter<6/LOYALTY> | Planeswalker$ True | Ultimate$ True | ValidTgts$ Artifact | TgtZone$ Battlefield,Graveyard | TgtPrompt$ Select target artifact card in a graveyard or artifact on the battlefield | NumCopies$ 3 | SpellDescription$ Choose target artifact card in a graveyard or artifact on the battlefield. Create three tokens that are copies of it.
Oracle:[+1]: Create a 1/1 colorless Construct artifact creature token with defender.\n[-1]: You may sacrifice an artifact. If you do, destroy target artifact or creature.\n[-6]: Choose target artifact card in a graveyard or artifact on the battlefield. Create three tokens that are copies of it.
diff --git a/forge-gui/res/cardsfolder/d/demonic_hordes.txt b/forge-gui/res/cardsfolder/d/demonic_hordes.txt
index ebdf7b754f4..b8fed402d2a 100644
--- a/forge-gui/res/cardsfolder/d/demonic_hordes.txt
+++ b/forge-gui/res/cardsfolder/d/demonic_hordes.txt
@@ -6,7 +6,7 @@ T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | E
A:AB$ Destroy | ValidTgts$ Land | TgtPrompt$ Select target land. | Cost$ T | SpellDescription$ Destroy target land.
SVar:DBTap:DB$ Tap | Defined$ Self | UnlessCost$ B B B | UnlessPayer$ You | UnlessResolveSubs$ WhenNotPaid | SubAbility$ DBChooseOpponent
SVar:DBChooseOpponent:DB$ ChoosePlayer | Defined$ You | Choices$ Player.Opponent | ChoiceTitle$ Choose an opponent | SubAbility$ DBChooseLand
-SVar:DBChooseLand:DB$ ChooseCard | Defined$ ChosenPlayer | Choices$ Land.YouCtrl | Mandatory$ True | Reveal$ True | ChoiceTitle$ Select a land for opponent to sacrifice | SubAbility$ DBSacLand
+SVar:DBChooseLand:DB$ ChooseCard | Defined$ ChosenPlayer | Choices$ Land.YouCtrl | Mandatory$ True | Reveal$ True | ChoiceTitle$ Choose a land for CARDNAME's controller to sacrifice | SubAbility$ DBSacLand
SVar:DBSacLand:DB$ SacrificeAll | Defined$ ChosenCard
SVar:PlayMain1:FALSE
DeckHas:Ability$Sacrifice
diff --git a/forge-gui/res/cardsfolder/d/detritivore.txt b/forge-gui/res/cardsfolder/d/detritivore.txt
index 28db5b8b767..3757fda3b6b 100644
--- a/forge-gui/res/cardsfolder/d/detritivore.txt
+++ b/forge-gui/res/cardsfolder/d/detritivore.txt
@@ -5,7 +5,7 @@ PT:*/*
S:Mode$ Continuous | EffectZone$ All | CharacteristicDefining$ True | SetPower$ Y | SetToughness$ Y | Description$ CARDNAME's power and toughness are each equal to the number of nonbasic land cards in your opponents' graveyards.
K:Suspend:X:XMin1 X 3 R
T:Mode$ CounterRemoved | ValidCard$ Card.Self | TriggerZones$ Exile | CounterType$ TIME | Execute$ TrigDestroy | TriggerDescription$ Whenever a time counter is removed from CARDNAME while it's exiled, destroy target nonbasic land.
-SVar:TrigDestroy:DB$ Destroy | ValidTgts$ Land.nonBasic | TgtPrompt$ Select a nonbasic land.
+SVar:TrigDestroy:DB$ Destroy | ValidTgts$ Land.nonBasic | TgtPrompt$ Select target nonbasic land.
SVar:X:Count$xPaid
SVar:Y:Count$ValidGraveyard Land.nonBasic+OppCtrl
AI:RemoveDeck:All
diff --git a/forge-gui/res/cardsfolder/d/dichotomancy.txt b/forge-gui/res/cardsfolder/d/dichotomancy.txt
index a45b9f31c44..c5e2414641c 100644
--- a/forge-gui/res/cardsfolder/d/dichotomancy.txt
+++ b/forge-gui/res/cardsfolder/d/dichotomancy.txt
@@ -3,7 +3,7 @@ ManaCost:7 U U
Types:Sorcery
K:Suspend:3:1 U U
A:SP$ RepeatEach | ValidTgts$ Opponent | RepeatCards$ Permanent.nonLand+TargetedPlayerCtrl+tapped | Zone$ Battlefield | RepeatSubAbility$ DBSearch | SubAbility$ DBChangeZone | StackDescription$ SpellDescription | SpellDescription$ For each tapped nonland permanent target opponent controls, search that player's library for a card with the same name as that permanent. Put those cards onto the battlefield under your control, then that player shuffles.
-SVar:DBSearch:DB$ ChooseCard | ChoiceZone$ Library | QuasiLibrarySearch$ TargetedPlayer | Choices$ Card.TargetedPlayerOwn+IsNotImprinted+sharesNameWith Remembered | ImprintChosen$ True | ChoiceTitle$ You may select a card with the same name from target opponent's library
+SVar:DBSearch:DB$ ChooseCard | ChoiceZone$ Library | QuasiLibrarySearch$ TargetedPlayer | Choices$ Card.TargetedPlayerOwn+IsNotImprinted+sharesNameWith Remembered | ImprintChosen$ True | ChoiceTitle$ You may choose a card with the same name from target opponent's library
SVar:DBChangeZone:DB$ ChangeZone | Defined$ Imprinted | Origin$ Library | Destination$ Battlefield | GainControl$ True | Searched$ True | StackDescription$ None | SubAbility$ DBShuffle
SVar:DBShuffle:DB$ Shuffle | Defined$ ParentTarget | StackDescription$ None
SVar:NeedsToPlayVar:Z GE3
diff --git a/forge-gui/res/cardsfolder/d/doric_natures_warden_doric_owlbear_avenger.txt b/forge-gui/res/cardsfolder/d/doric_natures_warden_doric_owlbear_avenger.txt
index af8cebc4f63..6ba01daa33e 100644
--- a/forge-gui/res/cardsfolder/d/doric_natures_warden_doric_owlbear_avenger.txt
+++ b/forge-gui/res/cardsfolder/d/doric_natures_warden_doric_owlbear_avenger.txt
@@ -1,19 +1,21 @@
Name:Doric, Nature's Warden
+AltName:Casal, Lurkwood Pathfinder
ManaCost:3 G
Types:Legendary Creature Tiefling Druid
PT:3/3
K:Vigilance
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters, search your library for a Forest card, put it into the battlefield tapped, then shuffle.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters, search your library for a Forest card, put it onto the battlefield tapped, then shuffle.
SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Forest | ChangeNum$ 1
T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigTransform | TriggerDescription$ Whenever NICKNAME attacks, you may pay {1}{G}. If you do, transform her.
SVar:TrigTransform:AB$ SetState | Cost$ 1 G | Defined$ Self | Mode$ Transform
SVar:HasAttackEffect:TRUE
AlternateMode:DoubleFaced
-Oracle:Vigilance\nWhen Doric, Nature's Warden enters, search your library for a Forest card, put it into the battlefield tapped, then shuffle.\nWhenever Doric attacks, you may pay {1}{G}. If you do, transform her.
+Oracle:Vigilance\nWhen Doric, Nature's Warden enters, search your library for a Forest card, put it onto the battlefield tapped, then shuffle.\nWhenever Doric attacks, you may pay {1}{G}. If you do, transform her.
ALTERNATE
Name:Doric, Owlbear Avenger
+AltName:Casal, Pathbreaker Owlbear
ManaCost:no cost
Colors:green
Types:Legendary Creature Bird Bear
diff --git a/forge-gui/res/cardsfolder/d/doubling_chant.txt b/forge-gui/res/cardsfolder/d/doubling_chant.txt
index c1b8f4eba54..4c6ebf63d89 100644
--- a/forge-gui/res/cardsfolder/d/doubling_chant.txt
+++ b/forge-gui/res/cardsfolder/d/doubling_chant.txt
@@ -2,7 +2,7 @@ Name:Doubling Chant
ManaCost:5 G
Types:Sorcery
A:SP$ RepeatEach | RepeatSubAbility$ DBSearch | RepeatCards$ Creature.YouCtrl | SubAbility$ DBChangeZone | StackDescription$ SpellDescription | SpellDescription$ For each creature you control, you may search your library for a creature card with the same name as that creature. Put those cards onto the battlefield, then shuffle.
-SVar:DBSearch:DB$ ChooseCard | ChoiceZone$ Library | QuasiLibrarySearch$ You | Choices$ Card.YouOwn+IsNotImprinted+sharesNameWith Remembered | ImprintChosen$ True | ChoiceTitle$ You may select a card with the same name from your library
+SVar:DBSearch:DB$ ChooseCard | ChoiceZone$ Library | QuasiLibrarySearch$ You | Choices$ Card.YouOwn+IsNotImprinted+sharesNameWith Remembered | ImprintChosen$ True | ChoiceTitle$ You may choose a card with the same name from your library
SVar:DBChangeZone:DB$ ChangeZone | Defined$ Imprinted | Origin$ Library | Destination$ Battlefield | Searched$ True | Shuffle$ True | StackDescription$ None
SVar:NeedsToPlayVar:Z GE2
SVar:Z:Count$Valid Creature.YouCtrl
diff --git a/forge-gui/res/cardsfolder/d/dwarven_catapult.txt b/forge-gui/res/cardsfolder/d/dwarven_catapult.txt
index 45f2852a8b3..2702e0f76df 100644
--- a/forge-gui/res/cardsfolder/d/dwarven_catapult.txt
+++ b/forge-gui/res/cardsfolder/d/dwarven_catapult.txt
@@ -1,7 +1,7 @@
Name:Dwarven Catapult
ManaCost:X R
Types:Instant
-A:SP$ DamageAll | ValidTgts$ Opponent | TgtPrompt$ Select a opponent | ValidCards$ Creature | NumDmg$ Z | SpellDescription$ CARDNAME deals X damage divided evenly, rounded down, among all creatures target opponent controls.
+A:SP$ DamageAll | ValidTgts$ Opponent | ValidCards$ Creature | NumDmg$ Z | SpellDescription$ CARDNAME deals X damage divided evenly, rounded down, among all creatures target opponent controls.
SVar:X:Count$xPaid
SVar:Y:Count$Valid Creature.TargetedPlayerCtrl
SVar:Z:SVar$X/DivideEvenlyDown.Y
diff --git a/forge-gui/res/cardsfolder/e/edgin_larcenous_lutenist.txt b/forge-gui/res/cardsfolder/e/edgin_larcenous_lutenist.txt
index a23cacf6285..94da000808b 100644
--- a/forge-gui/res/cardsfolder/e/edgin_larcenous_lutenist.txt
+++ b/forge-gui/res/cardsfolder/e/edgin_larcenous_lutenist.txt
@@ -1,4 +1,5 @@
Name:Edgin, Larcenous Lutenist
+AltName:Bohn, Beguiling Balladeer
ManaCost:1 U R
Types:Legendary Creature Human Bard
PT:3/3
diff --git a/forge-gui/res/cardsfolder/e/extract_from_darkness.txt b/forge-gui/res/cardsfolder/e/extract_from_darkness.txt
index 493fe434e1d..fa1d74ac267 100644
--- a/forge-gui/res/cardsfolder/e/extract_from_darkness.txt
+++ b/forge-gui/res/cardsfolder/e/extract_from_darkness.txt
@@ -2,7 +2,7 @@ Name:Extract from Darkness
ManaCost:3 U B
Types:Sorcery
A:SP$ Mill | NumCards$ 2 | Defined$ Player | SubAbility$ DBChangeZone | SpellDescription$ Each player mills two cards.
-SVar:DBChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ChangeType$ Creature | ChangeNum$ 1 | Mandatory$ True | GainControl$ True | SelectPrompt$ Select a creature card to return to the battlefield | Hidden$ True | StackDescription$ SpellDescription | SpellDescription$ Then you put a creature card from a graveyard onto the battlefield under your control.
+SVar:DBChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ChangeType$ Creature | ChangeNum$ 1 | Mandatory$ True | GainControl$ True | SelectPrompt$ Select a creature card in a graveyard | Hidden$ True | StackDescription$ SpellDescription | SpellDescription$ Then you put a creature card from a graveyard onto the battlefield under your control.
AI:RemoveDeck:Random
DeckHas:Ability$Mill|Graveyard
Oracle:Each player mills two cards. Then you put a creature card from a graveyard onto the battlefield under your control.
diff --git a/forge-gui/res/cardsfolder/f/faultgrinder.txt b/forge-gui/res/cardsfolder/f/faultgrinder.txt
index 11dcfc51c4a..2fa58845480 100644
--- a/forge-gui/res/cardsfolder/f/faultgrinder.txt
+++ b/forge-gui/res/cardsfolder/f/faultgrinder.txt
@@ -5,6 +5,6 @@ PT:4/4
K:Trample
K:Evoke:4 R
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME enters, destroy target land.
-SVar:TrigDestroy:DB$ Destroy | ValidTgts$ Land | TgtPrompt$ Select a land.
+SVar:TrigDestroy:DB$ Destroy | ValidTgts$ Land
SVar:NeedsToPlayEvoked:Land.OppCtrl
Oracle:Trample\nWhen Faultgrinder enters, destroy target land.\nEvoke {4}{R} (You may cast this spell for its evoke cost. If you do, it's sacrificed when it enters.)
diff --git a/forge-gui/res/cardsfolder/f/final_parting.txt b/forge-gui/res/cardsfolder/f/final_parting.txt
index 34538ffdcc4..f9af5987051 100644
--- a/forge-gui/res/cardsfolder/f/final_parting.txt
+++ b/forge-gui/res/cardsfolder/f/final_parting.txt
@@ -2,7 +2,7 @@ Name:Final Parting
ManaCost:3 B B
Types:Sorcery
A:SP$ ChangeZone | Origin$ Library | Destination$ Library | ChangeType$ Card | ChangeNum$ 2 | Mandatory$ True | RememberChanged$ True | Shuffle$ False | StackDescription$ SpellDescription | SubAbility$ DBChangeZone1 | SpellDescription$ Search your library for two cards. Put one into your hand and the other into your graveyard. Then shuffle.
-SVar:DBChangeZone1:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Card.IsRemembered | ChangeNum$ 1 | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card to go to your hand | Shuffle$ False | NoReveal$ True | SubAbility$ DBChangeZone2 | StackDescription$ None
-SVar:DBChangeZone2:DB$ ChangeZone | Origin$ Library | Destination$ Graveyard | ChangeType$ Card.IsRemembered | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card to go to your graveyard | StackDescription$ None | SubAbility$ DBCleanup
+SVar:DBChangeZone1:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Card.IsRemembered | ChangeNum$ 1 | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card to put into your hand | Shuffle$ False | NoReveal$ True | SubAbility$ DBChangeZone2 | StackDescription$ None
+SVar:DBChangeZone2:DB$ ChangeZone | Origin$ Library | Destination$ Graveyard | ChangeType$ Card.IsRemembered | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card to put into your graveyard | StackDescription$ None | SubAbility$ DBCleanup
SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
Oracle:Search your library for two cards. Put one into your hand and the other into your graveyard. Then shuffle.
diff --git a/forge-gui/res/cardsfolder/f/flare_of_cultivation.txt b/forge-gui/res/cardsfolder/f/flare_of_cultivation.txt
index 1c81487e496..3655a017937 100644
--- a/forge-gui/res/cardsfolder/f/flare_of_cultivation.txt
+++ b/forge-gui/res/cardsfolder/f/flare_of_cultivation.txt
@@ -3,7 +3,7 @@ ManaCost:1 G G
Types:Sorcery
S:Mode$ AlternativeCost | ValidSA$ Spell.Self | EffectZone$ All | Cost$ Sac<1/Creature.Green+nonToken/a nontoken green creature> | Description$ You may sacrifice a nontoken green creature rather than pay this spell's mana cost.
A:SP$ ChangeZone | Origin$ Library | Destination$ Library | ChangeType$ Land.Basic | ChangeNum$ 2 | RememberChanged$ True | Reveal$ True | Shuffle$ False | StackDescription$ SpellDescription | SubAbility$ DBChangeZone1 | SpellDescription$ Search your library for up to two basic land cards, reveal those cards, put one onto the battlefield tapped and the other into your hand, then shuffle.
-SVar:DBChangeZone1:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.IsRemembered | ChangeNum$ 1 | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card for the battlefield | Tapped$ True | Shuffle$ False | SubAbility$ DBChangeZone2 | StackDescription$ None
-SVar:DBChangeZone2:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.IsRemembered | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card for your hand | StackDescription$ None | SubAbility$ DBCleanup
+SVar:DBChangeZone1:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.IsRemembered | ChangeNum$ 1 | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card to put onto the battlefield | Tapped$ True | Shuffle$ False | SubAbility$ DBChangeZone2 | StackDescription$ None
+SVar:DBChangeZone2:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.IsRemembered | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card to put into your hand | StackDescription$ None | SubAbility$ DBCleanup
SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
Oracle:You may sacrifice a nontoken green creature rather than pay this spell's mana cost.\nSearch your library for up to two basic land cards, reveal those cards, put one onto the battlefield tapped and the other into your hand, then shuffle.
diff --git a/forge-gui/res/cardsfolder/f/flourishing_bloom_kin.txt b/forge-gui/res/cardsfolder/f/flourishing_bloom_kin.txt
index 5944a68b621..6e4dced9d63 100644
--- a/forge-gui/res/cardsfolder/f/flourishing_bloom_kin.txt
+++ b/forge-gui/res/cardsfolder/f/flourishing_bloom_kin.txt
@@ -7,8 +7,8 @@ S:Mode$ Continuous | Affected$ Card.Self | AddPower$ X | AddToughness$ X | Descr
SVar:X:Count$Valid Forest.YouCtrl
T:Mode$ TurnFaceUp | ValidCard$ Card.Self | Execute$ TrigSearch | TriggerZones$ Battlefield | TriggerDescription$ When CARDNAME is turned face up, search your library for up to two Forest cards and reveal them. Put one of them onto the battlefield tapped and the other into your hand, then shuffle.
SVar:TrigSearch:DB$ ChangeZone | Origin$ Library | Destination$ Library | ChangeType$ Forest | ChangeNum$ 2 | RememberChanged$ True | Reveal$ True | Shuffle$ False | SubAbility$ DBChangeZone
-SVar:DBChangeZone:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Card.IsRemembered | ChangeNum$ 1 | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card for the battlefield | Tapped$ True | Shuffle$ False | SubAbility$ DBChangeZone2
-SVar:DBChangeZone2:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Card.IsRemembered | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card for your hand | SubAbility$ DBCleanup
+SVar:DBChangeZone:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Card.IsRemembered | ChangeNum$ 1 | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card to put onto the battlefield | Tapped$ True | Shuffle$ False | SubAbility$ DBChangeZone2
+SVar:DBChangeZone2:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Card.IsRemembered | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card to put into your hand | SubAbility$ DBCleanup
SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
SVar:BuffedBy:Forest
Oracle:Flourishing Bloom-Kin gets +1/+1 for each Forest you control.\nDisguise {4}{G}\nWhen Flourishing Bloom-Kin is turned face up, search your library for up to two Forest cards and reveal them. Put one of them onto the battlefield tapped and the other into your hand, then shuffle.
diff --git a/forge-gui/res/cardsfolder/f/forge_neverwinter_charlatan.txt b/forge-gui/res/cardsfolder/f/forge_neverwinter_charlatan.txt
index e5766372e02..d06fdf7ef3c 100644
--- a/forge-gui/res/cardsfolder/f/forge_neverwinter_charlatan.txt
+++ b/forge-gui/res/cardsfolder/f/forge_neverwinter_charlatan.txt
@@ -1,4 +1,5 @@
Name:Forge, Neverwinter Charlatan
+AltName:Evin, Waterdeep Opportunist
ManaCost:3 B
Types:Legendary Creature Human Rogue
PT:2/4
diff --git a/forge-gui/res/cardsfolder/f/fork_in_the_road.txt b/forge-gui/res/cardsfolder/f/fork_in_the_road.txt
index 299f180c301..4c28cc25c8a 100644
--- a/forge-gui/res/cardsfolder/f/fork_in_the_road.txt
+++ b/forge-gui/res/cardsfolder/f/fork_in_the_road.txt
@@ -2,8 +2,8 @@ Name:Fork in the Road
ManaCost:1 G
Types:Sorcery
A:SP$ ChangeZone | Origin$ Library | Destination$ Library | ChangeType$ Land.Basic | ChangeNum$ 2 | RememberChanged$ True | Reveal$ True | Shuffle$ False | StackDescription$ SpellDescription | SubAbility$ DBChangeZone1 | SpellDescription$ Search your library for up to two basic land cards and reveal them. Put one into your hand and the other into your graveyard. Then shuffle.
-SVar:DBChangeZone1:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic+IsRemembered | ChangeNum$ 1 | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card for your hand | Shuffle$ False | SubAbility$ DBChangeZone2 | StackDescription$ None
-SVar:DBChangeZone2:DB$ ChangeZone | Origin$ Library | Destination$ Graveyard | ChangeType$ Land.Basic+IsRemembered | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card for your graveyard | StackDescription$ None | SubAbility$ DBCleanup
+SVar:DBChangeZone1:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic+IsRemembered | ChangeNum$ 1 | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card to put into your hand | Shuffle$ False | SubAbility$ DBChangeZone2 | StackDescription$ None
+SVar:DBChangeZone2:DB$ ChangeZone | Origin$ Library | Destination$ Graveyard | ChangeType$ Land.Basic+IsRemembered | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card to put into your graveyard | StackDescription$ None | SubAbility$ DBCleanup
SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
DeckHints:Ability$Delirium
DeckHas:Ability$Graveyard
diff --git a/forge-gui/res/cardsfolder/g/ghireds_belligerence.txt b/forge-gui/res/cardsfolder/g/ghireds_belligerence.txt
index 1e44ff098a5..bfa4da2a7e6 100644
--- a/forge-gui/res/cardsfolder/g/ghireds_belligerence.txt
+++ b/forge-gui/res/cardsfolder/g/ghireds_belligerence.txt
@@ -4,7 +4,7 @@ Types:Sorcery
A:SP$ DealDamage | ValidTgts$ Creature | TgtPrompt$ Select any number of target creatures | NumDmg$ X | TargetMin$ 0 | TargetMax$ MaxTgts | DividedAsYouChoose$ X | SubAbility$ DBRepeat | RememberDamaged$ True | SpellDescription$ CARDNAME deals X damage divided as you choose among any number of target creatures. Whenever a creature dealt damage this way dies this turn, populate. (Create a token that's a copy of a creature token you control.)
SVar:DBRepeat:DB$ RepeatEach | RepeatCards$ Card.IsRemembered | UseImprinted$ True | RepeatSubAbility$ DBDelayedTrigger | SubAbility$ DBCleanup | StackDescription$ Whenever a creature dealt damage this way dies this turn, populate. (Create a token that's a copy of a creature token you control.)
SVar:DBDelayedTrigger:DB$ DelayedTrigger | Mode$ ChangesZone | RememberObjects$ Imprinted | ValidCard$ Card.IsTriggerRemembered | Origin$ Battlefield | Destination$ Graveyard | ThisTurn$ True | Execute$ TrigPopulate | TriggerDescription$ Whenever a creature dealt damage this way dies this turn, populate. (Create a token that's a copy of a creature token you control.)
-SVar:TrigPopulate:DB$ CopyPermanent | Choices$ Creature.token+YouCtrl | NumCopies$ 1 | Populate$ True | ChoiceTitle$ Select a creature token to copy
+SVar:TrigPopulate:DB$ CopyPermanent | Choices$ Creature.token+YouCtrl | NumCopies$ 1 | Populate$ True | ChoiceTitle$ Choose a creature token to copy
SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
SVar:X:Count$xPaid
SVar:MaxTgts:Count$Valid Creature
diff --git a/forge-gui/res/cardsfolder/g/goblin_settler.txt b/forge-gui/res/cardsfolder/g/goblin_settler.txt
index 71146261d7a..0fe77789ca5 100644
--- a/forge-gui/res/cardsfolder/g/goblin_settler.txt
+++ b/forge-gui/res/cardsfolder/g/goblin_settler.txt
@@ -3,5 +3,5 @@ ManaCost:3 R
Types:Creature Goblin
PT:1/1
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME enters, destroy target land.
-SVar:TrigDestroy:DB$ Destroy | ValidTgts$ Land | TgtPrompt$ Select a land.
+SVar:TrigDestroy:DB$ Destroy | ValidTgts$ Land
Oracle:When Goblin Settler enters, destroy target land.
diff --git a/forge-gui/res/cardsfolder/g/goldwardens_gambit.txt b/forge-gui/res/cardsfolder/g/goldwardens_gambit.txt
index 1d94b56b72a..7a32f80e57c 100644
--- a/forge-gui/res/cardsfolder/g/goldwardens_gambit.txt
+++ b/forge-gui/res/cardsfolder/g/goldwardens_gambit.txt
@@ -4,7 +4,7 @@ Types:Sorcery
K:Affinity:Equipment
A:SP$ Token | TokenScript$ r_2_2_rebel | TokenOwner$ You | RememberTokens$ True | TokenAmount$ 5 | SubAbility$ DBRepeat | PumpKeywords$ Haste | PumpDuration$ EOT | SpellDescription$ Create five 2/2 red Rebel creature tokens. They gain haste until end of turn. For each of those tokens, you may attach an Equipment you control to it.
SVar:DBRepeat:DB$ RepeatEach | UseImprinted$ True | DefinedCards$ DirectRemembered | RepeatSubAbility$ DBAttach | SubAbility$ DBCleanup
-SVar:DBAttach:DB$ Attach | Choices$ Equipment.YouCtrl+!IsRemembered | Defined$ Imprinted | RememberAttached$ True | ChoiceTitle$ Select an equipment to attach to this token | Optional$ True
+SVar:DBAttach:DB$ Attach | Choices$ Equipment.YouCtrl+!IsRemembered | Defined$ Imprinted | RememberAttached$ True | ChoiceTitle$ Choose an equipment to attach to this token | Optional$ True
SVar:DBCleanup:DB$ Cleanup | ClearImprinted$ True | ClearRemembered$ True
DeckHas:Ability$Token & Type$Rebel & Color$Red
DeckNeeds:Type$Equipment
diff --git a/forge-gui/res/cardsfolder/h/hellkite_courser.txt b/forge-gui/res/cardsfolder/h/hellkite_courser.txt
index 1e2205a5c01..5977002b93a 100644
--- a/forge-gui/res/cardsfolder/h/hellkite_courser.txt
+++ b/forge-gui/res/cardsfolder/h/hellkite_courser.txt
@@ -4,7 +4,7 @@ Types:Creature Dragon
PT:6/5
K:Flying
T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigChangeZone | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters, you may put a commander you own from the command zone onto the battlefield. It gains haste. Return it to the command zone at the beginning of the next end step.
-SVar:TrigChangeZone:DB$ ChangeZone | ChangeType$ Card.IsCommander+YouOwn | SelectPrompt$ Select a commander | ChangeNum$ 1 | Mandatory$ True | Origin$ Command | Destination$ Battlefield | Hidden$ True | RememberChanged$ True | SubAbility$ DBAnimate
+SVar:TrigChangeZone:DB$ ChangeZone | ChangeType$ Card.IsCommander+YouOwn | SelectPrompt$ Select a commander you own | ChangeNum$ 1 | Mandatory$ True | Origin$ Command | Destination$ Battlefield | Hidden$ True | RememberChanged$ True | SubAbility$ DBAnimate
SVar:DBAnimate:DB$ Animate | Keywords$ Haste | Defined$ Remembered | Duration$ Permanent | SubAbility$ DBDelTrig
SVar:DBDelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigReturn | RememberObjects$ RememberedLKI | SubAbility$ DBCleanup | TriggerDescription$ Return the commander to the command zone.
SVar:TrigReturn:DB$ ChangeZone | Origin$ Battlefield | Destination$ Command | Defined$ DelayTriggerRememberedLKI
diff --git a/forge-gui/res/cardsfolder/h/holga_relentless_rager.txt b/forge-gui/res/cardsfolder/h/holga_relentless_rager.txt
index 266985fb667..73365f990fa 100644
--- a/forge-gui/res/cardsfolder/h/holga_relentless_rager.txt
+++ b/forge-gui/res/cardsfolder/h/holga_relentless_rager.txt
@@ -1,4 +1,5 @@
Name:Holga, Relentless Rager
+AltName:Jurin, Leading the Charge
ManaCost:4 R R
Types:Legendary Creature Human Barbarian
PT:4/6
diff --git a/forge-gui/res/cardsfolder/i/inquisitor_captain.txt b/forge-gui/res/cardsfolder/i/inquisitor_captain.txt
index f6fb1d16881..46d0d6f2360 100644
--- a/forge-gui/res/cardsfolder/i/inquisitor_captain.txt
+++ b/forge-gui/res/cardsfolder/i/inquisitor_captain.txt
@@ -5,7 +5,7 @@ PT:3/3
K:Vigilance
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.wasCast+Self | CheckSVar$ X | SVarCompare$ GE20 | Execute$ TrigSeek | TriggerDescription$ When CARDNAME enters, if you cast it and there are twenty or more creature cards with mana value 3 or less among cards in your graveyard, hand, and library, seek two creature cards with mana value 3 or less. Put one of them onto the battlefield and shuffle the other into your library.
SVar:TrigSeek:DB$ Seek | Type$ Creature.YouOwn+cmcLE3 | Num$ 2 | RememberFound$ True | SubAbility$ DBChangeZone1
-SVar:DBChangeZone1:DB$ ChangeZone | Origin$ Hand | Destination$ Battlefield | ChangeType$ Creature.IsRemembered | ChangeNum$ 1 | Mandatory$ True | SelectPrompt$ Select a card for the battlefield | SubAbility$ DBChangeZone2
+SVar:DBChangeZone1:DB$ ChangeZone | Origin$ Hand | Destination$ Battlefield | ChangeType$ Creature.IsRemembered | ChangeNum$ 1 | Mandatory$ True | SelectPrompt$ Select a card to put onto the battlefield | SubAbility$ DBChangeZone2
SVar:DBChangeZone2:DB$ ChangeZone | Origin$ Hand | Destination$ Library | ChangeType$ Creature.IsRemembered | Mandatory$ True | Shuffle$ True | SubAbility$ DBCleanup
SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
SVar:X:Count$ValidGraveyard,Library,Hand Creature.YouOwn+cmcLE3
diff --git a/forge-gui/res/cardsfolder/i/iroass_blessing.txt b/forge-gui/res/cardsfolder/i/iroass_blessing.txt
index 6a163ab5968..82d5f6392b7 100644
--- a/forge-gui/res/cardsfolder/i/iroass_blessing.txt
+++ b/forge-gui/res/cardsfolder/i/iroass_blessing.txt
@@ -4,6 +4,6 @@ Types:Enchantment Aura
K:Enchant creature you control
A:SP$ Attach | ValidTgts$ Creature.YouCtrl | AILogic$ Pump
T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigDamage | TriggerDescription$ When CARDNAME enters, it deals 4 damage to target creature or planeswalker an opponent controls.
-SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Creature.OppCtrl,Planeswalker.OppCtrl | TgtPrompt$ Select a creature or planeswalker an opponent controls | NumDmg$ 4
+SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Creature.OppCtrl,Planeswalker.OppCtrl | TgtPrompt$ Select target creature or planeswalker an opponent controls | NumDmg$ 4
S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 1 | AddToughness$ 1 | Description$ Enchanted creature gets +1/+1.
Oracle:Enchant creature you control\nWhen Iroas's Blessing enters, it deals 4 damage to target creature or planeswalker an opponent controls.\nEnchanted creature gets +1/+1.
diff --git a/forge-gui/res/cardsfolder/j/jarads_orders.txt b/forge-gui/res/cardsfolder/j/jarads_orders.txt
index 3346291c8fd..eabbe3bc758 100644
--- a/forge-gui/res/cardsfolder/j/jarads_orders.txt
+++ b/forge-gui/res/cardsfolder/j/jarads_orders.txt
@@ -2,7 +2,7 @@ Name:Jarad's Orders
ManaCost:2 B G
Types:Sorcery
A:SP$ ChangeZone | Origin$ Library | Destination$ Library | ChangeType$ Creature | ChangeNum$ 2 | RememberChanged$ True | Reveal$ True | Shuffle$ False | StackDescription$ SpellDescription | SubAbility$ DBChangeZone1 | SpellDescription$ Search your library for up to two creature cards and reveal them. Put one into your hand and the other into your graveyard. Then shuffle.
-SVar:DBChangeZone1:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Creature.IsRemembered | ChangeNum$ 1 | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card for your hand | Shuffle$ False | SubAbility$ DBChangeZone2 | StackDescription$ None
-SVar:DBChangeZone2:DB$ ChangeZone | Origin$ Library | Destination$ Graveyard | ChangeType$ Creature.IsRemembered | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card for your graveyard | StackDescription$ None | SubAbility$ DBCleanup
+SVar:DBChangeZone1:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Creature.IsRemembered | ChangeNum$ 1 | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card to put into your hand | Shuffle$ False | SubAbility$ DBChangeZone2 | StackDescription$ None
+SVar:DBChangeZone2:DB$ ChangeZone | Origin$ Library | Destination$ Graveyard | ChangeType$ Creature.IsRemembered | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card to put into your graveyard | StackDescription$ None | SubAbility$ DBCleanup
SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
Oracle:Search your library for up to two creature cards and reveal them. Put one into your hand and the other into your graveyard. Then shuffle.
diff --git a/forge-gui/res/cardsfolder/k/kamigawa_charm.txt b/forge-gui/res/cardsfolder/k/kamigawa_charm.txt
index b26dba91fd9..385cd100663 100644
--- a/forge-gui/res/cardsfolder/k/kamigawa_charm.txt
+++ b/forge-gui/res/cardsfolder/k/kamigawa_charm.txt
@@ -5,8 +5,8 @@ A:SP$ Charm | Choices$ DosansOldestChant,KodamasReach,TimeOfNeed | Defined$ You
SVar:DosansOldestChant:DB$ GainLife | LifeAmount$ 6 | SubAbility$ DBDraw | SpellDescription$ You gain 6 life. Draw a card.
SVar:DBDraw:DB$ Draw | NumCards$ 1
SVar:KodamasReach:DB$ ChangeZone | Origin$ Library | Destination$ Library | ChangeType$ Land.Basic | ChangeNum$ 2 | RememberChanged$ True | Reveal$ True | Shuffle$ False | StackDescription$ SpellDescription | SubAbility$ DBChangeZone1 | SpellDescription$ Search your library for up to two basic land cards, reveal those cards, put one onto the battlefield tapped and the other into your hand, then shuffle.
-SVar:DBChangeZone1:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.IsRemembered | ChangeNum$ 1 | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card for the battlefield | Tapped$ True | Shuffle$ False | SubAbility$ DBChangeZone2 | StackDescription$ None
-SVar:DBChangeZone2:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.IsRemembered | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card for your hand | StackDescription$ None | SubAbility$ DBCleanup
+SVar:DBChangeZone1:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.IsRemembered | ChangeNum$ 1 | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card to put onto the battlefield | Tapped$ True | Shuffle$ False | SubAbility$ DBChangeZone2 | StackDescription$ None
+SVar:DBChangeZone2:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.IsRemembered | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card to put into your hand | StackDescription$ None | SubAbility$ DBCleanup
SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
SVar:TimeOfNeed:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Creature.Legendary | ChangeNum$ 1 | SpellDescription$ Search your library for a legendary creature card, reveal it, put it into your hand, then shuffle.
DeckHas:Ability$LifeGain
diff --git a/forge-gui/res/cardsfolder/k/kaya_spirits_justice.txt b/forge-gui/res/cardsfolder/k/kaya_spirits_justice.txt
index d76b2a000f0..f438c9f3f0b 100644
--- a/forge-gui/res/cardsfolder/k/kaya_spirits_justice.txt
+++ b/forge-gui/res/cardsfolder/k/kaya_spirits_justice.txt
@@ -5,7 +5,7 @@ Loyalty:3
T:Mode$ ChangesZoneAll | ValidCards$ Creature.YouCtrl | Origin$ Battlefield,Graveyard | Destination$ Exile | TriggerZones$ Battlefield | Execute$ TrigCopy | TriggerDescription$ Whenever one or more creatures you control and/or creature cards in your graveyard are put into exile, you may choose a creature card from among them. Until end of turn, target token you control becomes a copy of it, except it has flying.
SVar:TrigCopy:DB$ Clone | Choices$ Card.TriggeredCards+Creature | ChoiceZone$ Exile | ChoiceTitle$ Choose a creature card among the exiled cards to copy | ValidTgts$ Permanent.token+YouCtrl | TgtPrompt$ Choose target token you control | AddKeywords$ Flying | Duration$ UntilEndOfTurn
A:AB$ Surveil | Cost$ AddCounter<2/LOYALTY> | Amount$ 2 | Planeswalker$ True | SubAbility$ DBExile | SpellDescription$ Surveil 2, then exile a card from a graveyard.
-SVar:DBExile:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | ChangeType$ Card | ChangeNum$ 1 | SelectPrompt$ Select a card from a graveyard | Mandatory$ True | Hidden$ True
+SVar:DBExile:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | ChangeType$ Card | ChangeNum$ 1 | SelectPrompt$ Select a card in a graveyard | Mandatory$ True | Hidden$ True
A:AB$ Token | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | TokenScript$ wb_1_1_spirit_flying | SpellDescription$ Create a 1/1 white and black Spirit creature token with flying.
A:AB$ ChangeZone | Cost$ SubCounter<2/LOYALTY> | Planeswalker$ True | ValidTgts$ Creature.YouCtrl | Origin$ Battlefield | Destination$ Exile | TgtPrompt$ Select target creature you control | SubAbility$ DBForEach | SpellDescription$ Exile target creature you control. For each other player, exile up to one target creature that player controls.
SVar:DBForEach:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Creature.YouDontCtrl | TgtPrompt$ Select up to one target creature each other player controls | TargetMin$ 0 | TargetMax$ OneEach | TargetsForEachPlayer$ True
diff --git a/forge-gui/res/cardsfolder/k/king_narfis_betrayal.txt b/forge-gui/res/cardsfolder/k/king_narfis_betrayal.txt
index 22ba6ca043f..689aaf46a0f 100644
--- a/forge-gui/res/cardsfolder/k/king_narfis_betrayal.txt
+++ b/forge-gui/res/cardsfolder/k/king_narfis_betrayal.txt
@@ -4,7 +4,7 @@ Types:Enchantment Saga
K:Chapter:3:DBMill,DBEffect,DBEffect
SVar:DBMill:DB$ Mill | NumCards$ 4 | Defined$ Player | SubAbility$ DBRepeatEach | SpellDescription$ Each player mills four cards. Then you may exile a creature or planeswalker card from each graveyard.
SVar:DBRepeatEach:DB$ RepeatEach | Optional$ True | OptionPrompt$ Do you want to exile a creature or planeswalker card from each graveyard? | RepeatPlayers$ Player | RepeatSubAbility$ DBChooseCard | SubAbility$ DBExile
-SVar:DBChooseCard:DB$ ChooseCard | Defined$ You | Choices$ Creature.RememberedPlayerCtrl,Planeswalker.RememberedPlayerCtrl | ChoiceZone$ Graveyard | ChoiceTitle$ Select a creature or planeswalker | Mandatory$ True | RememberChosen$ True
+SVar:DBChooseCard:DB$ ChooseCard | Defined$ You | Choices$ Creature.RememberedPlayerCtrl,Planeswalker.RememberedPlayerCtrl | ChoiceZone$ Graveyard | ChoiceTitle$ Choose a creature or planeswalker card in a graveyard | Mandatory$ True | RememberChosen$ True
SVar:DBExile:DB$ ChangeZoneAll | Origin$ Graveyard | Destination$ Exile | ChangeType$ Card.IsRemembered
SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearChosenCard$ True
SVar:DBEffect:DB$ Effect | StaticAbilities$ PlayExile | SpellDescription$ Until end of turn, you may cast spells from among cards exiled with CARDNAME, and you may spend mana as though it were mana of any color to cast those spells.
diff --git a/forge-gui/res/cardsfolder/k/kodamas_reach.txt b/forge-gui/res/cardsfolder/k/kodamas_reach.txt
index c3454541d60..dc9f6bd9453 100644
--- a/forge-gui/res/cardsfolder/k/kodamas_reach.txt
+++ b/forge-gui/res/cardsfolder/k/kodamas_reach.txt
@@ -2,7 +2,7 @@ Name:Kodama's Reach
ManaCost:2 G
Types:Sorcery Arcane
A:SP$ ChangeZone | Origin$ Library | Destination$ Library | ChangeType$ Land.Basic | ChangeNum$ 2 | RememberChanged$ True | Reveal$ True | Shuffle$ False | StackDescription$ SpellDescription | SubAbility$ DBChangeZone1 | SpellDescription$ Search your library for up to two basic land cards, reveal those cards, put one onto the battlefield tapped and the other into your hand, then shuffle.
-SVar:DBChangeZone1:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.IsRemembered | ChangeNum$ 1 | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card for the battlefield | Tapped$ True | Shuffle$ False | SubAbility$ DBChangeZone2 | StackDescription$ None
-SVar:DBChangeZone2:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.IsRemembered | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card for your hand | StackDescription$ None | SubAbility$ DBCleanup
+SVar:DBChangeZone1:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.IsRemembered | ChangeNum$ 1 | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card to put onto the battlefield | Tapped$ True | Shuffle$ False | SubAbility$ DBChangeZone2 | StackDescription$ None
+SVar:DBChangeZone2:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.IsRemembered | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card to put into your hand | StackDescription$ None | SubAbility$ DBCleanup
SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
Oracle:Search your library for up to two basic land cards, reveal those cards, put one onto the battlefield tapped and the other into your hand, then shuffle.
diff --git a/forge-gui/res/cardsfolder/l/life_finds_a_way.txt b/forge-gui/res/cardsfolder/l/life_finds_a_way.txt
index be129c04434..e94b0f9f019 100644
--- a/forge-gui/res/cardsfolder/l/life_finds_a_way.txt
+++ b/forge-gui/res/cardsfolder/l/life_finds_a_way.txt
@@ -2,7 +2,7 @@ Name:Life Finds a Way
ManaCost:2 G
Types:Enchantment
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.powerGE4+YouCtrl+nonToken | TriggerZones$ Battlefield | Execute$ TrigPopulate | TriggerDescription$ Whenever a nontoken creature you control with power 4 or greater enters, populate. (Create a token that's a copy of a creature token you control.)
-SVar:TrigPopulate:DB$ CopyPermanent | Choices$ Creature.token+YouCtrl | NumCopies$ 1 | Populate$ True | ChoiceTitle$ Select a creature token to copy
+SVar:TrigPopulate:DB$ CopyPermanent | Choices$ Creature.token+YouCtrl | NumCopies$ 1 | Populate$ True | ChoiceTitle$ Choose a creature token to copy
DeckHints:Ability$Token
DeckHas:Ability$Token
Oracle:Whenever a nontoken creature you control with power 4 or greater enters, populate. (Create a token that's a copy of a creature token you control.)
diff --git a/forge-gui/res/cardsfolder/l/lynde_cheerful_tormentor.txt b/forge-gui/res/cardsfolder/l/lynde_cheerful_tormentor.txt
index 5db33f909b5..49eebf50071 100644
--- a/forge-gui/res/cardsfolder/l/lynde_cheerful_tormentor.txt
+++ b/forge-gui/res/cardsfolder/l/lynde_cheerful_tormentor.txt
@@ -3,12 +3,12 @@ ManaCost:1 U B R
Types:Legendary Creature Human Warlock
PT:2/4
K:Deathtouch
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Curse.YouOwn | Execute$ TrigDelayedTrig | TriggerDescription$ Whenever a curse is put into your graveyard from the battlefield, return it to the battlefield attached to you at the beginning of the next end step.
-SVar:TrigDelayedTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End Of Turn | Execute$ TrigReturn | RememberObjects$ TriggeredNewCardLKICopy | TriggerDescription$ Whenever a curse is put into your graveyard from the battlefield, return it to the battlefield attached to you at the beginning of the next end step.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Curse.YouOwn | Execute$ TrigDelayedTrig | TriggerDescription$ Whenever a Curse is put into your graveyard from the battlefield, return it to the battlefield attached to you at the beginning of the next end step.
+SVar:TrigDelayedTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End Of Turn | Execute$ TrigReturn | RememberObjects$ TriggeredNewCardLKICopy | TriggerDescription$ Whenever a Curse is put into your graveyard from the battlefield, return it to the battlefield attached to you at the beginning of the next end step.
SVar:TrigReturn:DB$ ChangeZone | Defined$ DelayTriggerRememberedLKI | Origin$ Graveyard | Destination$ Battlefield | AttachedToPlayer$ You
T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigChooseCurse | TriggerZones$ Battlefield | OptionalDecider$ You | IsPresent$ Curse.AttachedTo You | TriggerDescription$ At the beginning of your upkeep, you may attach a Curse attached to you to one of your opponents. If you do, draw two cards.
-SVar:TrigChooseCurse:DB$ ChooseCard | Choices$ Curse.AttachedTo You | ChoiceTitle$ Select a curse attached to you | SubAbility$ DBChooseOpponent
-SVar:DBChooseOpponent:DB$ ChoosePlayer | ConditionDefined$ ChosenCard | ConditionPresent$ Card | Defined$ You | Choices$ Player.Opponent | ChoiceTitle$ Choose an opponent to attach the curse to | SubAbility$ DBAttach
+SVar:TrigChooseCurse:DB$ ChooseCard | Choices$ Curse.AttachedTo You | ChoiceTitle$ Choose a Curse attached to you | SubAbility$ DBChooseOpponent
+SVar:DBChooseOpponent:DB$ ChoosePlayer | ConditionDefined$ ChosenCard | ConditionPresent$ Card | Defined$ You | Choices$ Player.Opponent | ChoiceTitle$ Choose an opponent to attach the chosen Curse to | SubAbility$ DBAttach
SVar:DBAttach:DB$ Attach | Object$ ChosenCard | Defined$ ChosenPlayer | RememberAttached$ True | SubAbility$ DBDraw
SVar:DBDraw:DB$ Draw | ConditionDefined$ Remembered | ConditionPresent$ Curse.AttachedTo ChosenPlayer | Defined$ You | NumCards$ 2 | SubAbility$ DBCleanup
SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True | ClearChosenPlayer$ True | ClearRemembered$ True
diff --git a/forge-gui/res/cardsfolder/m/martyrdom.txt b/forge-gui/res/cardsfolder/m/martyrdom.txt
index cf9262dc760..efbc906eab2 100644
--- a/forge-gui/res/cardsfolder/m/martyrdom.txt
+++ b/forge-gui/res/cardsfolder/m/martyrdom.txt
@@ -2,7 +2,7 @@ Name:Martyrdom
ManaCost:1 W W
Types:Instant
A:SP$ Animate | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | Abilities$ Martyr | TransferActivator$ True | StackDescription$ Until end of turn, {c:Targeted} gains "{0}: The next 1 damage that would be dealt to target creature, planeswalker, or player this turn is dealt to this creature instead." | SpellDescription$ Until end of turn, target creature you control gains "{0}: The next 1 damage that would be dealt to target creature, planeswalker, or player this turn is dealt to this creature instead." Only you may activate this ability.
-SVar:Martyr:AB$ Effect | Cost$ 0 | ValidTgts$ Creature,Planeswalker,Player | TgtPrompt$ Select a creature, planeswalker, or player to redirect damage from | Amount$ 1 | ReplacementEffects$ DamageEvent | Duration$ UntilHostLeavesPlayOrEOT | RememberObjects$ Targeted | ImprintCards$ Self | ExileOnMoved$ Battlefield | StackDescription$ The next 1 damage that would be dealt to {Targeted} this turn is dealt to {c:Self} instead. | SpellDescription$ The next 1 damage that would be dealt to target creature, planeswalker, or player this turn is dealt to CARDNAME instead.
+SVar:Martyr:AB$ Effect | Cost$ 0 | ValidTgts$ Creature,Planeswalker,Player | TgtPrompt$ Select target creature, planeswalker, or player to redirect damage from | Amount$ 1 | ReplacementEffects$ DamageEvent | Duration$ UntilHostLeavesPlayOrEOT | RememberObjects$ Targeted | ImprintCards$ Self | ExileOnMoved$ Battlefield | StackDescription$ The next 1 damage that would be dealt to {Targeted} this turn is dealt to {c:Self} instead. | SpellDescription$ The next 1 damage that would be dealt to target creature, planeswalker, or player this turn is dealt to CARDNAME instead.
SVar:DamageEvent:Event$ DamageDone | IsPresent$ Card.IsImprinted+Creature | ValidTarget$ Player.IsRemembered,Card.IsRemembered | ReplaceWith$ DamageEventDmg | DamageTarget$ Imprinted | Description$ The next 1 damage that would be dealt to this target this turn is dealt to EFFECTSOURCE instead.
SVar:DamageEventDmg:DB$ ReplaceSplitDamage | DamageTarget$ Imprinted
Oracle:Until end of turn, target creature you control gains "{0}: The next 1 damage that would be dealt to target creature, planeswalker, or player this turn is dealt to this creature instead." Only you may activate this ability.
diff --git a/forge-gui/res/cardsfolder/m/midnight_crusader_shuttle.txt b/forge-gui/res/cardsfolder/m/midnight_crusader_shuttle.txt
index 9a9276878e7..48aa5fadae4 100644
--- a/forge-gui/res/cardsfolder/m/midnight_crusader_shuttle.txt
+++ b/forge-gui/res/cardsfolder/m/midnight_crusader_shuttle.txt
@@ -5,7 +5,7 @@ PT:3/4
T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigVillainousChoice | TriggerDescription$ Midnight Entity — Whenever CARDNAME attacks, defending player faces a villainous choice — That player sacrifices a creature, or you gain control of a creature of your choice that player controls until end of turn. If you gain control of a creature this way, tap it, and it's attacking that player.
SVar:TrigVillainousChoice:DB$ VillainousChoice | Defined$ TriggeredDefendingPlayer | Choices$ DBSacrifice,DBGainControl
SVar:DBSacrifice:DB$ Sacrifice | Amount$ 1 | SacValid$ Creature | Defined$ Remembered | SpellDescription$ That player sacrifices a creature.
-SVar:DBGainControl:DB$ GainControl | Defined$ ChosenCard | Choices$ Creature.RememberedPlayerCtrl | ChoiceTitle$ Select a creature that player controls | NewController$ You | LoseControl$ EOT | RememberControlled$ True | SubAbility$ DBTap | SpellDescription$ You gain control of a creature of your choice that player controls until end of turn. If you gain control of a creature this way, tap it, and it's attacking that player.
+SVar:DBGainControl:DB$ GainControl | Defined$ ChosenCard | Choices$ Creature.RememberedPlayerCtrl | ChoiceTitle$ Choose a creature that player controls | NewController$ You | LoseControl$ EOT | RememberControlled$ True | SubAbility$ DBTap | SpellDescription$ You gain control of a creature of your choice that player controls until end of turn. If you gain control of a creature this way, tap it, and it's attacking that player.
SVar:DBTap:DB$ Tap | Defined$ Remembered | ConditionDefined$ Remembered | ConditionPresent$ Card.YouCtrl | SubAbility$ DBSetAttacking
SVar:DBSetAttacking:DB$ ChangeCombatants | Defined$ Remembered | ConditionDefined$ Remembered | ConditionPresent$ Card.YouCtrl | Attacking$ RememberedPlayer | SubAbility$ DBCleanup
SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
diff --git a/forge-gui/res/cardsfolder/n/nautiloid_ship.txt b/forge-gui/res/cardsfolder/n/nautiloid_ship.txt
index 6029ddc5f38..69cba06643c 100644
--- a/forge-gui/res/cardsfolder/n/nautiloid_ship.txt
+++ b/forge-gui/res/cardsfolder/n/nautiloid_ship.txt
@@ -6,7 +6,7 @@ K:Flying
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExileGrave | TriggerDescription$ When CARDNAME enters, exile target player's graveyard.
SVar:TrigExileGrave:DB$ ChangeZoneAll | Origin$ Graveyard | Destination$ Exile | ValidTgts$ Player | ChangeType$ Card | RememberChanged$ True
T:Mode$ DamageDone | ValidSource$ Card.Self | Execute$ TrigPut | CombatDamage$ True | ValidTarget$ Player | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may put a creature card exiled with CARDNAME onto the battlefield under your control.
-SVar:TrigPut:DB$ ChangeZone | Origin$ Exile | Destination$ Battlefield | Hidden$ True | ChangeType$ Creature.IsRemembered | SelectPrompt$ Select a creature card exiled with this | GainControl$ True
+SVar:TrigPut:DB$ ChangeZone | Origin$ Exile | Destination$ Battlefield | Hidden$ True | ChangeType$ Creature.IsRemembered | SelectPrompt$ Select a creature card exiled with CARDNAME | GainControl$ True
T:Mode$ ChangesZone | Origin$ Exile | Destination$ Any | Static$ True | ValidCard$ Card.IsRemembered | Execute$ DBForget
SVar:DBForget:DB$ Pump | ForgetObjects$ TriggeredCard
T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | Static$ True | ValidCard$ Card.Self | Execute$ DBCleanup
diff --git a/forge-gui/res/cardsfolder/n/navigation_orb.txt b/forge-gui/res/cardsfolder/n/navigation_orb.txt
index 827507745ad..d8e9503cb5f 100644
--- a/forge-gui/res/cardsfolder/n/navigation_orb.txt
+++ b/forge-gui/res/cardsfolder/n/navigation_orb.txt
@@ -2,7 +2,7 @@ Name:Navigation Orb
ManaCost:3
Types:Artifact
A:AB$ ChangeZone | Cost$ 2 T Sac<1/CARDNAME> | Origin$ Library | Destination$ Library | ChangeType$ Land.Basic,Gate | ChangeNum$ 2 | RememberChanged$ True | Reveal$ True | Shuffle$ False | StackDescription$ SpellDescription | SubAbility$ DBChangeZone1 | SpellDescription$ Search your library for up to two basic land cards and/or Gate cards, reveal those cards, put one onto the battlefield tapped and the other into your hand, then shuffle.
-SVar:DBChangeZone1:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.IsRemembered,Gate.IsRemembered | ChangeNum$ 1 | Mandatory$ True | ForgetChanged$ True | NoLooking$ True | SelectPrompt$ Select a card for the battlefield | Tapped$ True | Shuffle$ False | SubAbility$ DBChangeZone2 | StackDescription$ None
+SVar:DBChangeZone1:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.IsRemembered,Gate.IsRemembered | ChangeNum$ 1 | Mandatory$ True | ForgetChanged$ True | NoLooking$ True | SelectPrompt$ Select a card to put onto the battlefield | Tapped$ True | Shuffle$ False | SubAbility$ DBChangeZone2 | StackDescription$ None
SVar:DBChangeZone2:DB$ ChangeZone | Origin$ Library | Destination$ Hand | Defined$ Remembered | ConditionDefined$ Remembered | ConditionPresent$ Card | ForgetChanged$ True | StackDescription$ None | SubAbility$ DBCleanup
SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
DeckHints:Type$Gate
diff --git a/forge-gui/res/cardsfolder/n/nicol_bolas_planeswalker.txt b/forge-gui/res/cardsfolder/n/nicol_bolas_planeswalker.txt
index f815e36aa04..b713848d632 100644
--- a/forge-gui/res/cardsfolder/n/nicol_bolas_planeswalker.txt
+++ b/forge-gui/res/cardsfolder/n/nicol_bolas_planeswalker.txt
@@ -2,7 +2,7 @@ Name:Nicol Bolas, Planeswalker
ManaCost:4 U B B R
Types:Legendary Planeswalker Bolas
Loyalty:5
-A:AB$ Destroy | Cost$ AddCounter<3/LOYALTY> | ValidTgts$ Permanent.nonCreature | TgtPrompt$ Select a noncreature permanent. | Planeswalker$ True | SpellDescription$ Destroy target noncreature permanent.
+A:AB$ Destroy | Cost$ AddCounter<3/LOYALTY> | ValidTgts$ Permanent.nonCreature | TgtPrompt$ Select target noncreature permanent | Planeswalker$ True | SpellDescription$ Destroy target noncreature permanent.
A:AB$ GainControl | Cost$ SubCounter<2/LOYALTY> | ValidTgts$ Creature | Planeswalker$ True | SpellDescription$ Gain control of target creature.
A:AB$ DealDamage | Cost$ SubCounter<9/LOYALTY> | NumDmg$ 7 | ValidTgts$ Player,Planeswalker | Planeswalker$ True | Ultimate$ True | SubAbility$ DBDiscard | SpellDescription$ CARDNAME deals 7 damage to target player or planeswalker. That player or that planeswalker's controller discards seven cards, then sacrifices seven permanents.
SVar:DBDiscard:DB$ Discard | Defined$ TargetedOrController | NumCards$ 7 | Mode$ TgtChoose | SubAbility$ DBSac
diff --git a/forge-gui/res/cardsfolder/o/ogre_arsonist.txt b/forge-gui/res/cardsfolder/o/ogre_arsonist.txt
index 53d708da474..2c9e5c84f11 100644
--- a/forge-gui/res/cardsfolder/o/ogre_arsonist.txt
+++ b/forge-gui/res/cardsfolder/o/ogre_arsonist.txt
@@ -3,5 +3,5 @@ ManaCost:4 R
Types:Creature Ogre
PT:3/3
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME enters, destroy target land.
-SVar:TrigDestroy:DB$ Destroy | ValidTgts$ Land | TgtPrompt$ Select a land.
+SVar:TrigDestroy:DB$ Destroy | ValidTgts$ Land
Oracle:When Ogre Arsonist enters, destroy target land.
diff --git a/forge-gui/res/cardsfolder/o/order_of_whiteclay.txt b/forge-gui/res/cardsfolder/o/order_of_whiteclay.txt
index fed3ce90dc9..265b57ef2ad 100644
--- a/forge-gui/res/cardsfolder/o/order_of_whiteclay.txt
+++ b/forge-gui/res/cardsfolder/o/order_of_whiteclay.txt
@@ -2,5 +2,5 @@ Name:Order of Whiteclay
ManaCost:1 W W
Types:Creature Kithkin Cleric
PT:1/4
-A:AB$ ChangeZone | Cost$ 1 W W Untap | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.cmcLE3+YouCtrl | TgtPrompt$ Select a creature card with mana value 3 or less from your graveyard | ChangeNum$ 1 | SpellDescription$ Return target creature card with mana value 3 or less from your graveyard to the battlefield.
+A:AB$ ChangeZone | Cost$ 1 W W Untap | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.cmcLE3+YouCtrl | TgtPrompt$ Select target creature card with mana value 3 or less in your graveyard | ChangeNum$ 1 | SpellDescription$ Return target creature card with mana value 3 or less from your graveyard to the battlefield.
Oracle:{1}{W}{W}, {Q}: Return target creature card with mana value 3 or less from your graveyard to the battlefield. ({Q} is the untap symbol.)
diff --git a/forge-gui/res/cardsfolder/p/path_of_the_schemer.txt b/forge-gui/res/cardsfolder/p/path_of_the_schemer.txt
index 4964fa3dafd..302e644328b 100644
--- a/forge-gui/res/cardsfolder/p/path_of_the_schemer.txt
+++ b/forge-gui/res/cardsfolder/p/path_of_the_schemer.txt
@@ -2,7 +2,7 @@ Name:Path of the Schemer
ManaCost:4 B
Types:Sorcery
A:SP$ Mill | NumCards$ 2 | Defined$ Player | SubAbility$ DBChangeZone | SpellDescription$ Each player mills two cards. Then you put a creature card from a graveyard onto the battlefield under your control.
-SVar:DBChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ChangeType$ Creature | ChangeNum$ 1 | Mandatory$ True | GainControl$ True | AnimateSubAbility$ Animate | SubAbility$ DBSpace | SelectPrompt$ Select a creature card to return to the battlefield | Hidden$ True | StackDescription$ SpellDescription | SpellDescription$ Then you put a creature card from a graveyard onto the battlefield under your control.
+SVar:DBChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ChangeType$ Creature | ChangeNum$ 1 | Mandatory$ True | GainControl$ True | AnimateSubAbility$ Animate | SubAbility$ DBSpace | SelectPrompt$ Select a creature card in a graveyard | Hidden$ True | StackDescription$ SpellDescription | SpellDescription$ Then you put a creature card from a graveyard onto the battlefield under your control.
SVar:Animate:DB$ Animate | Defined$ Remembered | Types$ Phyrexian | Duration$ Permanent
SVar:DBSpace:DB$ BlankLine | SubAbility$ DBVote | SpellDescription$ ,,,,,,
SVar:DBVote:DB$ Vote | Defined$ Player | VoteType$ Planeswalk,Chaos | VotePlaneswalk$ DBPlaneswalk | VoteChaos$ DBChaos | Tied$ DBChaos | StackDescription$ SpellDescription | SpellDescription$ Will of the Planeswalkers — Starting with you, each player votes for planeswalk or chaos. If planeswalk gets more votes, planeswalk. If chaos gets more votes or the vote is tied, chaos ensues.
diff --git a/forge-gui/res/cardsfolder/p/peregrination.txt b/forge-gui/res/cardsfolder/p/peregrination.txt
index 90a44610adb..7c2a934fa4b 100644
--- a/forge-gui/res/cardsfolder/p/peregrination.txt
+++ b/forge-gui/res/cardsfolder/p/peregrination.txt
@@ -2,8 +2,8 @@ Name:Peregrination
ManaCost:3 G
Types:Sorcery
A:SP$ ChangeZone | Origin$ Library | Destination$ Library | ChangeType$ Land.Basic | ChangeNum$ 2 | RememberChanged$ True | Reveal$ True | Shuffle$ False | StackDescription$ SpellDescription | SubAbility$ DBChangeZone1 | SpellDescription$ Search your library for up to two basic land cards, reveal those cards, and put one onto the battlefield tapped and the other into your hand. Shuffle, then scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
-SVar:DBChangeZone1:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.IsRemembered | ChangeNum$ 1 | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card for the battlefield | Tapped$ True | Shuffle$ False | SubAbility$ DBChangeZone2 | StackDescription$ None
-SVar:DBChangeZone2:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.IsRemembered | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card for your hand | StackDescription$ None | SubAbility$ DBCleanup
+SVar:DBChangeZone1:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.IsRemembered | ChangeNum$ 1 | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card to put onto the battlefield | Tapped$ True | Shuffle$ False | SubAbility$ DBChangeZone2 | StackDescription$ None
+SVar:DBChangeZone2:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.IsRemembered | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card to put into your hand | StackDescription$ None | SubAbility$ DBCleanup
SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | SubAbility$ DBScry
SVar:DBScry:DB$ Scry | ScryNum$ 1 | StackDescription$ None
Oracle:Search your library for up to two basic land cards, reveal those cards, and put one onto the battlefield tapped and the other into your hand. Shuffle, then scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
diff --git a/forge-gui/res/cardsfolder/p/pongify.txt b/forge-gui/res/cardsfolder/p/pongify.txt
index 874b82cacb1..cbe821dc99b 100644
--- a/forge-gui/res/cardsfolder/p/pongify.txt
+++ b/forge-gui/res/cardsfolder/p/pongify.txt
@@ -1,6 +1,6 @@
Name:Pongify
ManaCost:U
Types:Instant
-A:SP$ Destroy | ValidTgts$ Creature | TgtPrompt$ Select a creature | AILogic$ Pongify | SubAbility$ DBToken | NoRegen$ True | SpellDescription$ Destroy target creature. It can't be regenerated. Its controller creates a 3/3 green Ape creature token.
+A:SP$ Destroy | ValidTgts$ Creature | AILogic$ Pongify | SubAbility$ DBToken | NoRegen$ True | SpellDescription$ Destroy target creature. It can't be regenerated. Its controller creates a 3/3 green Ape creature token.
SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ g_3_3_ape | TokenOwner$ TargetedController
Oracle:Destroy target creature. It can't be regenerated. Its controller creates a 3/3 green Ape creature token.
diff --git a/forge-gui/res/cardsfolder/r/rapid_hybridization.txt b/forge-gui/res/cardsfolder/r/rapid_hybridization.txt
index bc69d54b4eb..2aab573c538 100644
--- a/forge-gui/res/cardsfolder/r/rapid_hybridization.txt
+++ b/forge-gui/res/cardsfolder/r/rapid_hybridization.txt
@@ -1,6 +1,6 @@
Name:Rapid Hybridization
ManaCost:U
Types:Instant
-A:SP$ Destroy | ValidTgts$ Creature | TgtPrompt$ Select a creature | AILogic$ Pongify | SubAbility$ DBToken | NoRegen$ True | SpellDescription$ Destroy target creature. It can't be regenerated. That creature's controller creates a 3/3 green Frog Lizard creature token.
+A:SP$ Destroy | ValidTgts$ Creature | AILogic$ Pongify | SubAbility$ DBToken | NoRegen$ True | SpellDescription$ Destroy target creature. It can't be regenerated. That creature's controller creates a 3/3 green Frog Lizard creature token.
SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ g_3_3_frog_lizard | TokenOwner$ TargetedController
Oracle:Destroy target creature. It can't be regenerated. That creature's controller creates a 3/3 green Frog Lizard creature token.
diff --git a/forge-gui/res/cardsfolder/r/ravaging_horde.txt b/forge-gui/res/cardsfolder/r/ravaging_horde.txt
index 07b8345145a..de6aea91bd6 100644
--- a/forge-gui/res/cardsfolder/r/ravaging_horde.txt
+++ b/forge-gui/res/cardsfolder/r/ravaging_horde.txt
@@ -3,5 +3,5 @@ ManaCost:3 R R
Types:Creature Human Soldier
PT:3/3
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME enters, destroy target land.
-SVar:TrigDestroy:DB$ Destroy | ValidTgts$ Land | TgtPrompt$ Select a land.
+SVar:TrigDestroy:DB$ Destroy | ValidTgts$ Land
Oracle:When Ravaging Horde enters, destroy target land.
diff --git a/forge-gui/res/cardsfolder/r/ravenous_baboons.txt b/forge-gui/res/cardsfolder/r/ravenous_baboons.txt
index bde8b49b41e..a604608b0ce 100644
--- a/forge-gui/res/cardsfolder/r/ravenous_baboons.txt
+++ b/forge-gui/res/cardsfolder/r/ravenous_baboons.txt
@@ -3,5 +3,5 @@ ManaCost:3 R
Types:Creature Monkey
PT:2/2
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME enters, destroy target nonbasic land.
-SVar:TrigDestroy:DB$ Destroy | ValidTgts$ Land.nonBasic | TgtPrompt$ Select a nonbasic land.
+SVar:TrigDestroy:DB$ Destroy | ValidTgts$ Land.nonBasic | TgtPrompt$ Select target nonbasic land.
Oracle:When Ravenous Baboons enters, destroy target nonbasic land.
diff --git a/forge-gui/res/cardsfolder/r/realmbreaker_the_invasion_tree.txt b/forge-gui/res/cardsfolder/r/realmbreaker_the_invasion_tree.txt
index da39315cb71..9b71fc79794 100644
--- a/forge-gui/res/cardsfolder/r/realmbreaker_the_invasion_tree.txt
+++ b/forge-gui/res/cardsfolder/r/realmbreaker_the_invasion_tree.txt
@@ -2,7 +2,7 @@ Name:Realmbreaker, the Invasion Tree
ManaCost:3
Types:Legendary Artifact
A:AB$ Mill | Cost$ 2 T | NumCards$ 3 | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | SubAbility$ DBChangeZone | StackDescription$ {p:Targeted} mills three cards. {p:You} puts a land card from their graveyard onto the battlefield tapped under {p:You}'s control. It gains "If this land would leave the battlefield, exile it instead of putting it anywhere else." | SpellDescription$ Target opponent mills three cards. Put a land card from their graveyard onto the battlefield tapped under your control. It gains "If this land would leave the battlefield, exile it instead of putting it anywhere else."
-SVar:DBChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | Hidden$ True | ChangeType$ Land.TargetedPlayerCtrl | Tapped$ True | RememberChanged$ True | SubAbility$ DBAnimate | TgtPrompt$ Select a land card from targeted opponent's graveyard | StackDescription$ None
+SVar:DBChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | Hidden$ True | ChangeType$ Land.TargetedPlayerCtrl | Tapped$ True | RememberChanged$ True | SubAbility$ DBAnimate | SelectPrompt$ Select a land card in targeted opponent's graveyard | StackDescription$ None
SVar:DBAnimate:DB$ Animate | Replacements$ ReplaceLeaves | Defined$ Remembered | Duration$ Permanent | SubAbility$ DBCleanup | StackDescription$ None
SVar:ReplaceLeaves:Event$ Moved | ActiveZones$ Battlefield | Origin$ Battlefield | ValidCard$ Card.Self | ReplaceWith$ Exile | Description$ If this land would leave the battlefield, exile it instead of putting it anywhere else.
SVar:Exile:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | Defined$ ReplacedCard
diff --git a/forge-gui/res/cardsfolder/r/realms_uncharted.txt b/forge-gui/res/cardsfolder/r/realms_uncharted.txt
index ba83c4cfe66..fb54a629090 100644
--- a/forge-gui/res/cardsfolder/r/realms_uncharted.txt
+++ b/forge-gui/res/cardsfolder/r/realms_uncharted.txt
@@ -2,7 +2,7 @@ Name:Realms Uncharted
ManaCost:2 G
Types:Instant
A:SP$ ChangeZone | Origin$ Library | Destination$ Library | ChangeType$ Land | ChangeNum$ 4 | RememberChanged$ True | Reveal$ True | Shuffle$ False | DifferentNames$ True | StackDescription$ SpellDescription | SubAbility$ DBChangeZone1 | SpellDescription$ Search your library for up to four land cards with different names and reveal them. An opponent chooses two of those cards. Put the chosen cards into your graveyard and the rest into your hand. Then shuffle.
-SVar:DBChangeZone1:DB$ ChangeZone | Origin$ Library | Destination$ Graveyard | ChangeType$ Card.IsRemembered | Chooser$ Opponent | ChangeNum$ 2 | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card for the graveyard | Shuffle$ False | SubAbility$ DBChangeZone2 | StackDescription$ None
-SVar:DBChangeZone2:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Card.IsRemembered | ChangeNum$ 2 | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card for the hand | StackDescription$ None | SubAbility$ DBCleanup
+SVar:DBChangeZone1:DB$ ChangeZone | Origin$ Library | Destination$ Graveyard | ChangeType$ Card.IsRemembered | Chooser$ Opponent | ChangeNum$ 2 | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select two cards to be put into the graveyard of CARDNAME's controller | Shuffle$ False | SubAbility$ DBChangeZone2 | StackDescription$ None
+SVar:DBChangeZone2:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Card.IsRemembered | ChangeNum$ 2 | Mandatory$ True | NoLooking$ True | StackDescription$ None | SubAbility$ DBCleanup
SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
Oracle:Search your library for up to four land cards with different names and reveal them. An opponent chooses two of those cards. Put the chosen cards into your graveyard and the rest into your hand. Then shuffle.
diff --git a/forge-gui/res/cardsfolder/r/reincarnation.txt b/forge-gui/res/cardsfolder/r/reincarnation.txt
index 2ee791b3be1..54bb42ddb31 100644
--- a/forge-gui/res/cardsfolder/r/reincarnation.txt
+++ b/forge-gui/res/cardsfolder/r/reincarnation.txt
@@ -1,8 +1,8 @@
Name:Reincarnation
ManaCost:1 G G
Types:Instant
-A:SP$ DelayedTrigger | ValidTgts$ Creature | TgtPrompt$ Choose target creature | Mode$ ChangesZone | RememberObjects$ Targeted | ValidCard$ Card.IsTriggerRemembered | Origin$ Battlefield | Destination$ Graveyard | ThisTurn$ True | Execute$ TrigReturn | AILogic$ SaveCreature | TriggerDescription$ When that creature dies this turn, return a creature card from its owner's graveyard to the battlefield under the control of that creature's owner. | StackDescription$ When {c:Targeted} dies this turn, return a creature card from {p:TargetedOwner}'s graveyard to the battlefield under the control of that creature's owner. | SpellDescription$ Choose target creature. When that creature dies this turn, return a creature card from its owner's graveyard to the battlefield under the control of that creature's owner.
-SVar:TrigReturn:DB$ ChangeZone | ChangeType$ Creature.sharesOwnerWith TriggeredCard | Origin$ Graveyard | Destination$ Battlefield | Mandatory$ True | ChangeNum$ 1 | Hidden$ True | SelectPrompt$ Select a creature card from that creature's owner's graveyard
+A:SP$ DelayedTrigger | ValidTgts$ Creature | Mode$ ChangesZone | RememberObjects$ Targeted | ValidCard$ Card.IsTriggerRemembered | Origin$ Battlefield | Destination$ Graveyard | ThisTurn$ True | Execute$ TrigReturn | AILogic$ SaveCreature | TriggerDescription$ When that creature dies this turn, return a creature card from its owner's graveyard to the battlefield under the control of that creature's owner. | StackDescription$ When {c:Targeted} dies this turn, return a creature card from {p:TargetedOwner}'s graveyard to the battlefield under the control of that creature's owner. | SpellDescription$ Choose target creature. When that creature dies this turn, return a creature card from its owner's graveyard to the battlefield under the control of that creature's owner.
+SVar:TrigReturn:DB$ ChangeZone | ChangeType$ Creature.sharesOwnerWith TriggeredCard | Origin$ Graveyard | Destination$ Battlefield | Mandatory$ True | ChangeNum$ 1 | Hidden$ True | SelectPrompt$ Select a creature card in the graveyard of that creature's owner
DeckHas:Ability$Graveyard
DeckHints:Ability$Discard|Sacrifice
Oracle:Choose target creature. When that creature dies this turn, return a creature card from its owner's graveyard to the battlefield under the control of that creature's owner.
diff --git a/forge-gui/res/cardsfolder/rebalanced/a-navigation_orb.txt b/forge-gui/res/cardsfolder/rebalanced/a-navigation_orb.txt
index c8f18a65e4c..7acf42afb4b 100644
--- a/forge-gui/res/cardsfolder/rebalanced/a-navigation_orb.txt
+++ b/forge-gui/res/cardsfolder/rebalanced/a-navigation_orb.txt
@@ -2,7 +2,7 @@ Name:A-Navigation Orb
ManaCost:3
Types:Artifact
A:AB$ ChangeZone | Cost$ 1 T Sac<1/CARDNAME> | Origin$ Library | Destination$ Library | ChangeType$ Land.Basic,Gate | ChangeNum$ 2 | RememberChanged$ True | Reveal$ True | Shuffle$ False | StackDescription$ SpellDescription | SubAbility$ DBChangeZone1 | SpellDescription$ Search your library for up to two basic land cards and/or Gate cards, reveal those cards, put one onto the battlefield tapped and the other into your hand, then shuffle.
-SVar:DBChangeZone1:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.IsRemembered,Gate.IsRemembered | ChangeNum$ 1 | Mandatory$ True | ForgetChanged$ True | NoLooking$ True | SelectPrompt$ Select a card for the battlefield | Tapped$ True | Shuffle$ False | SubAbility$ DBChangeZone2 | StackDescription$ None
+SVar:DBChangeZone1:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.IsRemembered,Gate.IsRemembered | ChangeNum$ 1 | Mandatory$ True | ForgetChanged$ True | NoLooking$ True | SelectPrompt$ Select a card to put onto the battlefield | Tapped$ True | Shuffle$ False | SubAbility$ DBChangeZone2 | StackDescription$ None
SVar:DBChangeZone2:DB$ ChangeZone | Origin$ Library | Destination$ Hand | Defined$ Remembered | ConditionDefined$ Remembered | ConditionPresent$ Card | ForgetChanged$ True | StackDescription$ None | SubAbility$ DBCleanup
SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
DeckHints:Type$Gate
diff --git a/forge-gui/res/cardsfolder/s/search_the_city.txt b/forge-gui/res/cardsfolder/s/search_the_city.txt
index 21b5fce24bf..4242a3a4d49 100644
--- a/forge-gui/res/cardsfolder/s/search_the_city.txt
+++ b/forge-gui/res/cardsfolder/s/search_the_city.txt
@@ -5,7 +5,7 @@ T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefi
SVar:SetupSearch:DB$ Dig | Defined$ You | DigNum$ 5 | ChangeNum$ All | DestinationZone$ Exile | RememberChanged$ True | ForgetOtherRemembered$ True
T:Mode$ SpellCast | ValidCard$ Card.sharesNameWith Remembered | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigFind | TriggerDescription$ Whenever you play a card with the same name as one of the exiled cards, you may put one of those cards with that name into its owner's hand. Then if there are no cards exiled with CARDNAME, sacrifice it. If you do, take an extra turn after this one.
T:Mode$ LandPlayed | ValidCard$ Land.YouCtrl+sharesNameWith Remembered | TriggerZones$ Battlefield | Execute$ TrigFind | OptionalDecider$ You | Secondary$ True | TriggerDescription$ Whenever you play a card with the same name as one of the exiled cards, you may put one of those cards with that name into its owner's hand. Then if there are no cards exiled with CARDNAME, sacrifice it. If you do, take an extra turn after this one.
-SVar:TrigFind:DB$ ChangeZone | ChangeType$ TriggeredCard.sharesNameWith | Hidden$ True | TgtPrompt$ Select a card that shares a name with the played card | Origin$ Exile | Destination$ Hand | ChangeNum$ 1 | ForgetChanged$ True | SubAbility$ SacSelf
+SVar:TrigFind:DB$ ChangeZone | ChangeType$ TriggeredCard.sharesNameWith | Hidden$ True | SelectPrompt$ Select a card exiled with CARDNAME that shares a name with the played card | Origin$ Exile | Destination$ Hand | ChangeNum$ 1 | ForgetChanged$ True | SubAbility$ SacSelf
SVar:SacSelf:DB$ Sacrifice | ConditionCheckSVar$ StillLooking | ConditionSVarCompare$ EQ0 | RememberSacrificed$ True | SubAbility$ AllFoundCelebration
SVar:AllFoundCelebration:DB$ AddTurn | NumTurns$ 1 | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ1
SVar:StillLooking:Remembered$Amount
diff --git a/forge-gui/res/cardsfolder/s/simon_wild_magic_sorcerer.txt b/forge-gui/res/cardsfolder/s/simon_wild_magic_sorcerer.txt
index 546ccac00a9..e840d68cd4c 100644
--- a/forge-gui/res/cardsfolder/s/simon_wild_magic_sorcerer.txt
+++ b/forge-gui/res/cardsfolder/s/simon_wild_magic_sorcerer.txt
@@ -1,4 +1,5 @@
Name:Simon, Wild Magic Sorcerer
+AltName:Mathise, Surge Channeler
ManaCost:2 U
Types:Legendary Creature Human Elf Shaman
PT:1/1
diff --git a/forge-gui/res/cardsfolder/s/slimefoots_survey.txt b/forge-gui/res/cardsfolder/s/slimefoots_survey.txt
index 03b7e3bb183..7c51d01c945 100644
--- a/forge-gui/res/cardsfolder/s/slimefoots_survey.txt
+++ b/forge-gui/res/cardsfolder/s/slimefoots_survey.txt
@@ -1,8 +1,8 @@
Name:Slimefoot's Survey
ManaCost:4 G
Types:Sorcery
-A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.hasABasicLandType | ChangeNum$ 2 | Tapped$ True | SubAbility$ DBDig | SpellDescription$ Domain — Search your library for up to two land cards that each have a basic land type, put them into the battlefield tapped, then shuffle. Look at the top X cards of your library, where X is the number of basic land types among lands you control. Put up to one of them on top of your library and the rest on the bottom of your library in a random order.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.hasABasicLandType | ChangeNum$ 2 | Tapped$ True | SubAbility$ DBDig | SpellDescription$ Domain — Search your library for up to two land cards that each have a basic land type, put them onto the battlefield tapped, then shuffle. Look at the top X cards of your library, where X is the number of basic land types among lands you control. Put up to one of them on top of your library and the rest on the bottom of your library in a random order.
SVar:DBDig:DB$ Dig | DigNum$ X | ChangeNum$ 1 | RestRandomOrder$ True | DestinationZone$ Library | LibraryPosition$ 0 | Optional$ True
SVar:X:Count$Domain
AI:RemoveDeck:Random
-Oracle:Domain — Search your library for up to two land cards that each have a basic land type, put them into the battlefield tapped, then shuffle. Look at the top X cards of your library, where X is the number of basic land types among lands you control. Put up to one of them on top of your library and the rest on the bottom of your library in a random order.
+Oracle:Domain — Search your library for up to two land cards that each have a basic land type, put them onto the battlefield tapped, then shuffle. Look at the top X cards of your library, where X is the number of basic land types among lands you control. Put up to one of them on top of your library and the rest on the bottom of your library in a random order.
diff --git a/forge-gui/res/cardsfolder/s/soltari_visionary.txt b/forge-gui/res/cardsfolder/s/soltari_visionary.txt
index 03f705cee36..ed3d4683884 100644
--- a/forge-gui/res/cardsfolder/s/soltari_visionary.txt
+++ b/forge-gui/res/cardsfolder/s/soltari_visionary.txt
@@ -4,5 +4,5 @@ Types:Creature Soltari Cleric
PT:2/2
K:Shadow
T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | Execute$ TrigDestroy | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage to a player, destroy target enchantment that player controls.
-SVar:TrigDestroy:DB$ Destroy | ValidTgts$ Enchantment | TargetsWithDefinedController$ TriggeredTarget | TgtPrompt$ Select an enchantment that player controls.
+SVar:TrigDestroy:DB$ Destroy | ValidTgts$ Enchantment | TargetsWithDefinedController$ TriggeredTarget | TgtPrompt$ Select target enchantment that player controls.
Oracle:Shadow (This creature can block or be blocked by only creatures with shadow.)\nWhenever Soltari Visionary deals damage to a player, destroy target enchantment that player controls.
diff --git a/forge-gui/res/cardsfolder/s/sorins_thirst.txt b/forge-gui/res/cardsfolder/s/sorins_thirst.txt
index 4942100951c..780535798f7 100644
--- a/forge-gui/res/cardsfolder/s/sorins_thirst.txt
+++ b/forge-gui/res/cardsfolder/s/sorins_thirst.txt
@@ -1,7 +1,7 @@
Name:Sorin's Thirst
ManaCost:B B
Types:Instant
-A:SP$ DealDamage | ValidTgts$ Creature | TgtPrompt$ Select a creature | NumDmg$ 2 | SubAbility$ DBGainLife | SpellDescription$ CARDNAME deals 2 damage to target creature and you gain 2 life.
+A:SP$ DealDamage | ValidTgts$ Creature | NumDmg$ 2 | SubAbility$ DBGainLife | SpellDescription$ CARDNAME deals 2 damage to target creature and you gain 2 life.
SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 2
DeckHas:Ability$LifeGain
Oracle:Sorin's Thirst deals 2 damage to target creature and you gain 2 life.
diff --git a/forge-gui/res/cardsfolder/s/swine_rebellion.txt b/forge-gui/res/cardsfolder/s/swine_rebellion.txt
index 659ee1d99c8..c740ec7f736 100644
--- a/forge-gui/res/cardsfolder/s/swine_rebellion.txt
+++ b/forge-gui/res/cardsfolder/s/swine_rebellion.txt
@@ -4,7 +4,7 @@ Types:Sorcery
A:SP$ Branch | BranchConditionSVar$ X | BranchConditionSVarCompare$ GE3 | TrueSubAbility$ DBConjureAll | FalseSubAbility$ DBConjureTwo | SpellDescription$ If you control three or more Boars with different names, conjure each card from the Three Pigs spellbook onto the battlefield. If you control two or fewer Boars with different names, conjure two cards of your choice from the Three Pigs spellbook into your hand, then put one of them onto the battlefield.
SVar:DBConjureAll:DB$ MakeCard | Conjure$ True | Names$ First Little Pig,Second Little Pig,Third Little Pig | Zone$ Battlefield
SVar:DBConjureTwo:DB$ MakeCard | Conjure$ True | SpellbookName$ the Three Pigs | Spellbook$ First Little Pig,Second Little Pig,Third Little Pig | SpellbookAmount$ 2 | RememberMade$ True | Zone$ Hand | SubAbility$ DBPutBattlefield
-SVar:DBPutBattlefield:DB$ ChangeZone | Origin$ Hand | Destination$ Battlefield | ChangeType$ Card.IsRemembered | ChangeNum$ 1 | Mandatory$ True | SelectPrompt$ Select a card for the battlefield | SubAbility$ DBCleanup
+SVar:DBPutBattlefield:DB$ ChangeZone | Origin$ Hand | Destination$ Battlefield | ChangeType$ Card.IsRemembered | ChangeNum$ 1 | Mandatory$ True | SelectPrompt$ Select a card to put onto the battlefield | SubAbility$ DBCleanup
SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
SVar:X:Count$DifferentCardNames_Boar.YouCtrl+inRealZoneBattlefield
DeckHints:Type$Boar
diff --git a/forge-gui/res/cardsfolder/s/sword_of_truth_and_justice.txt b/forge-gui/res/cardsfolder/s/sword_of_truth_and_justice.txt
index 7ac175bc2c8..598c03e39a5 100644
--- a/forge-gui/res/cardsfolder/s/sword_of_truth_and_justice.txt
+++ b/forge-gui/res/cardsfolder/s/sword_of_truth_and_justice.txt
@@ -4,7 +4,7 @@ Types:Artifact Equipment
K:Equip:2
S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 2 | AddToughness$ 2 | AddSVar$ SwordOfTruthAndJusticeCE | AddKeyword$ Protection from white & Protection from blue | Description$ Equipped creature gets +2/+2 and has protection from white and from blue.
T:Mode$ DamageDone | ValidSource$ Creature.EquippedBy | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever equipped creature deals combat damage to a player, put a +1/+1 counter on a creature you control, then proliferate. (Choose any number of permanents and/or players, then give each another counter of each kind already there.)
-SVar:TrigPutCounter:DB$ PutCounter | Choices$ Creature.YouCtrl | ChoiceTitle$ Select a creature you control | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBProliferate | SpellDescription$ Put a +1/+1 counter on target creature you control and then proliferate.
+SVar:TrigPutCounter:DB$ PutCounter | Choices$ Creature.YouCtrl | ChoiceTitle$ Choose a creature you control | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBProliferate | SpellDescription$ Put a +1/+1 counter on target creature you control and then proliferate.
SVar:DBProliferate:DB$ Proliferate
SVar:SwordOfTruthAndJusticeCE:SVar:MustBeBlocked:AttackingPlayerConservative
DeckHas:Ability$Proliferate|Counters
diff --git a/forge-gui/res/cardsfolder/s/sylvan_primordial.txt b/forge-gui/res/cardsfolder/s/sylvan_primordial.txt
index 82988183829..316218b8821 100644
--- a/forge-gui/res/cardsfolder/s/sylvan_primordial.txt
+++ b/forge-gui/res/cardsfolder/s/sylvan_primordial.txt
@@ -4,7 +4,7 @@ Types:Creature Avatar
PT:6/8
K:Reach
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DestroyOneEach | TriggerDescription$ When CARDNAME enters, for each opponent, destroy target noncreature permanent that player controls. For each permanent destroyed this way, search your library for a Forest card and put that card onto the battlefield tapped. Then shuffle.
-SVar:DestroyOneEach:DB$ Destroy | ValidTgts$ Permanent.nonCreature+OppCtrl | TgtPrompt$ Select a noncreature permanent each opponent controls. | TargetMin$ 0 | TargetMax$ OneEach | TargetsForEachPlayer$ True | RememberDestroyed$ True | SubAbility$ GetForests
+SVar:DestroyOneEach:DB$ Destroy | ValidTgts$ Permanent.nonCreature+OppCtrl | TgtPrompt$ For each opponent, select target noncreature permanent that player controls | TargetMin$ 0 | TargetMax$ OneEach | TargetsForEachPlayer$ True | RememberDestroyed$ True | SubAbility$ GetForests
SVar:GetForests:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Forest | ChangeNum$ X | Tapped$ True | SubAbility$ DBCleanup
SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
SVar:X:Remembered$Amount
diff --git a/forge-gui/res/cardsfolder/s/szarekh_the_silent_king.txt b/forge-gui/res/cardsfolder/s/szarekh_the_silent_king.txt
index 47f5756348a..addfad3cdbd 100644
--- a/forge-gui/res/cardsfolder/s/szarekh_the_silent_king.txt
+++ b/forge-gui/res/cardsfolder/s/szarekh_the_silent_king.txt
@@ -5,7 +5,7 @@ PT:3/4
K:Flying
T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigMill | TriggerDescription$ My Will Be Done — Whenever CARDNAME attacks, mill three cards. You may put an artifact creature card or Vehicle card from among the cards milled this way into your hand.
SVar:TrigMill:DB$ Mill | NumCards$ 3 | Defined$ You | RememberMilled$ True | SubAbility$ DBChangeZone
-SVar:DBChangeZone:DB$ ChangeZone | Origin$ Graveyard,Exile | Destination$ Hand | Hidden$ True | Optional$ True | ChangeType$ Creature.IsRemembered+Artifact,Vehicle.IsRemembered | ChangeTypeDesc$ artifact creature card or vehicle card milled this way | ChangeNum$ 1 | SelectPrompt$ Select an artifact creature card or vehicle card milled this way | SubAbility$ DBCleanup
+SVar:DBChangeZone:DB$ ChangeZone | Origin$ Graveyard,Exile | Destination$ Hand | Hidden$ True | Optional$ True | ChangeType$ Creature.IsRemembered+Artifact,Vehicle.IsRemembered | ChangeTypeDesc$ artifact creature card or vehicle card milled this way | ChangeNum$ 1 | SelectPrompt$ Select an artifact creature card or Vehicle card milled this way | SubAbility$ DBCleanup
SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
DeckHas:Ability$Mill
DeckNeeds:Type$Artifact|Creature|Vehicle
diff --git a/forge-gui/res/cardsfolder/u/urborg_scavengers.txt b/forge-gui/res/cardsfolder/u/urborg_scavengers.txt
index 242d6855e36..904eb789b2a 100644
--- a/forge-gui/res/cardsfolder/u/urborg_scavengers.txt
+++ b/forge-gui/res/cardsfolder/u/urborg_scavengers.txt
@@ -4,7 +4,7 @@ Types:Creature Spirit
PT:2/2
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When CARDNAME enters or attacks, exile a card from a graveyard. Put a +1/+1 counter on CARDNAME.
T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigExile | Secondary$ True | TriggerDescription$ Whenever CARDNAME enters or attacks, exile a card from a graveyard.
-SVar:TrigExile:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | ChangeType$ Card | ChangeNum$ 1 | SelectPrompt$ Select a card from a graveyard | Mandatory$ True | Hidden$ True | SubAbility$ DBCounter
+SVar:TrigExile:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | ChangeType$ Card | ChangeNum$ 1 | SelectPrompt$ Select a card in a graveyard | Mandatory$ True | Hidden$ True | SubAbility$ DBCounter
SVar:DBCounter:DB$ PutCounter | Defined$ Self | CounterNum$ 1 | CounterType$ P1P1
S:Mode$ Continuous | EffectZone$ Battlefield | Affected$ Card.Self | SharedKeywordsZone$ Exile | SharedRestrictions$ Card.ExiledWithSource | AddKeyword$ Flying & First Strike & Double Strike & Deathtouch & Haste & Hexproof & Indestructible & Lifelink & Menace & Reach & Trample & Vigilance | Description$ CARDNAME has flying as long as a card exiled with it has flying. The same is true for first strike, double strike, deathtouch, haste, hexproof, indestructible, lifelink, menace, reach, trample, and vigilance.
SVar:HasAttackEffect:TRUE
diff --git a/forge-gui/res/cardsfolder/u/urza_academy_headmaster.txt b/forge-gui/res/cardsfolder/u/urza_academy_headmaster.txt
index 74690f29199..a8d9eb6367a 100644
--- a/forge-gui/res/cardsfolder/u/urza_academy_headmaster.txt
+++ b/forge-gui/res/cardsfolder/u/urza_academy_headmaster.txt
@@ -5,7 +5,7 @@ Loyalty:4
A:AB$ GenericChoice | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | AtRandom$ Urza | ShowChoice$ Description | Choices$ Pump1,PutCounter2,Destroy3,Token4,Token5,Token6,Dig7,MustAttack8,PutCounter9,Effect10,Exile11,Dig12,Animate13,Draw14,Animate15,PumpAll16,Dig17,DealDamage18,Animate19,Mana20 | ShowChoice$ Description | StackDescription$ SpellDescription | SpellDescription$ Head to AskUrza.com and click +1.
SVar:Pump1:DB$ Pump | TargetMin$ 0 | TargetMax$ 1 | KW$ First Strike & Vigilance & Lifelink | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +1 | NumDef$ +1 | KW$ First Strike & Vigilance & Lifelink | SpellDescription$ Until end of turn, up to one target creature gets +1/+1 and gains first strike, vigilance, and lifelink.
SVar:PutCounter2:DB$ PutCounter | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control to distribute counters to | CounterType$ P1P1 | CounterNum$ 3 | TargetMin$ 1 | TargetMax$ 3 | DividedAsYouChoose$ 3 | SpellDescription$ Distribute three +1/+1 counters among one, two, or three target creatures you control.
-SVar:Destroy3:DB$ Destroy | ValidTgts$ Permanent.nonCreature | TgtPrompt$ Select a noncreature permanent | SpellDescription$ Destroy target noncreature permanent.
+SVar:Destroy3:DB$ Destroy | ValidTgts$ Permanent.nonCreature | TgtPrompt$ Select target noncreature permanent | SpellDescription$ Destroy target noncreature permanent.
SVar:Token4:DB$ Token | TokenAmount$ 2 | TokenScript$ r_3_1_elemental_haste | AtEOT$ Exile | SpellDescription$ Create two 3/1 red Elemental creature tokens with haste. Exile them at the beginning of the next end step.
SVar:Token5:DB$ Token | TokenAmount$ 3 | TokenScript$ w_1_1_soldier | SpellDescription$ Create three 1/1 white Soldier creature tokens.
SVar:Token6:DB$ Token | TokenScript$ b_3_3_beast_deathtouch | SpellDescription$ Create a 3/3 black Beast creature token with deathtouch.
@@ -45,7 +45,7 @@ SVar:Effect5M:DB$ Effect | Name$ Emblem — Urza, Academy Headmaster (5M) | Stat
SVar:STPump5M:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Creature.YouCtrl | AddPower$ 1 | AddToughness$ 1 | Description$ Creatures you control get +1/+1.
SVar:ChangeZone6M:DB$ ChangeZone | Origin$ Hand | Destination$ Battlefield | ChangeType$ Creature | ChangeNum$ 1 | SpellDescription$ You may put a creature card from your hand onto the battlefield.
SVar:Draw7M:DB$ Draw | NumCards$ 3 | SubAbility$ DBChangeZone7M | SpellDescription$ Draw three cards, then put a card from your hand on top of your library.
-SVar:DBChangeZone7M:DB$ ChangeZone | Origin$ Hand | Destination$ Library | ChangeType$ Card | ChangeNum$ 1 | Mandatory$ True | SelectPrompt$ Select a card from your hand to put on top of your library
+SVar:DBChangeZone7M:DB$ ChangeZone | Origin$ Hand | Destination$ Library | ChangeType$ Card | ChangeNum$ 1 | Mandatory$ True | SelectPrompt$ Select a card in your hand to put on top of your library
SVar:Mill8M:DB$ Mill | ValidTgts$ Player | TgtPrompt$ Select target player | NumCards$ 10 | SpellDescription$ Target player puts the top ten cards of their library into their graveyard.
SVar:Dig9M:DB$ PeekAndReveal | PeekAmount$ 5 | NoPeek$ True | RememberRevealed$ True | SubAbility$ DBTwoPiles9M | SpellDescription$ Reveal the top five cards of your library. An opponent separates them into two piles. Put one pile into your hand and the other on the bottom of your library in any order.
SVar:DBTwoPiles9M:DB$ TwoPiles | Defined$ You | DefinedCards$ Remembered | Separator$ Opponent | ChosenPile$ DBHand9M | UnchosenPile$ DBLibraryBottom9M
@@ -62,7 +62,7 @@ SVar:Token14M:DB$ Token | TokenScript$ b_5_5_demon_flying | SubAbility$ DBLoseli
SVar:DBLoselife14M:DB$ LoseLife | LifeAmount$ 2
SVar:Token15M:DB$ Token | TokenScript$ c_4_4_dragon_flying | SpellDescription$ Create a 4/4 gold Dragon creature token with flying.
SVar:SetLife16M:DB$ SetLife | ValidTgts$ Player | TgtPrompt$ Select target player | LifeAmount$ 10 | SpellDescription$ Target player's life total becomes 10.
-SVar:Destroy17M:DB$ Destroy | ValidTgts$ Permanent.nonLand | TgtPrompt$ Select a nonland permanent | SpellDescription$ Destroy target nonland permanent.
+SVar:Destroy17M:DB$ Destroy | ValidTgts$ Permanent.nonLand | TgtPrompt$ Select target nonland permanent | SpellDescription$ Destroy target nonland permanent.
SVar:Return18M:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | TgtPrompt$ Select target permanent in a graveyard | ValidTgts$ Permanent | SpellDescription$ Return target permanent from a graveyard to the battlefield under your control.
SVar:Token19M:DB$ Token | TokenAmount$ 2 | TokenScript$ g_3_3_beast | SpellDescription$ Create two 3/3 green Beast creature tokens.
SVar:Draw20M:DB$ Draw | NumCards$ 4 | SubAbility$ DBDiscard20M | SpellDescription$ Draw four cards, then discard two cards.
diff --git a/forge-gui/res/cardsfolder/v/verdant_mastery.txt b/forge-gui/res/cardsfolder/v/verdant_mastery.txt
index 9a0394f842d..66bbc7cb3a6 100644
--- a/forge-gui/res/cardsfolder/v/verdant_mastery.txt
+++ b/forge-gui/res/cardsfolder/v/verdant_mastery.txt
@@ -5,8 +5,8 @@ S:Mode$ AlternativeCost | ValidSA$ Spell.Self | EffectZone$ All | Cost$ 3 G | De
A:SP$ ChangeZone | Origin$ Library | Hidden$ True | ChangeNum$ 4 | ChangeType$ Land.Basic | Destination$ Library | RememberChanged$ True | Reveal$ True | Shuffle$ False | SubAbility$ DBBranch | StackDescription$ Search your library for up to four basic land cards and reveal them. Put two of them onto the battlefield tapped under your control and the rest into your hand. Then shuffle. | SpellDescription$ Search your library for up to four basic land cards and reveal them. Put one of them onto the battlefield tapped under an opponent's control if the {3}{G} cost was paid. Put two of them onto the battlefield tapped under your control and the rest into your hand. Then shuffle.
SVar:DBBranch:DB$ Branch | BranchConditionSVar$ AltCostPaid | BranchConditionSVarCompare$ GE1 | TrueSubAbility$ OppShare | FalseSubAbility$ DBChangeZone2
SVar:OppShare:DB$ ChoosePlayer | Defined$ You | Choices$ Player.Opponent | ChoiceTitle$ Choose an opponent | SubAbility$ DBChangeZone
-SVar:DBChangeZone:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Card.IsRemembered | ChangeNum$ 1 | Mandatory$ True | SelectPrompt$ Select a land to put on the battlefield tapped under an opponent's control | GainControl$ ChosenPlayer | ForgetChanged$ True | NoShuffle$ True | SubAbility$ DBChangeZone2
-SVar:DBChangeZone2:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Card.IsRemembered | ChangeNum$ 2 | Mandatory$ True | SelectPrompt$ Select two lands to put on the battlefield tapped under your control | ForgetChanged$ True | NoShuffle$ True | SubAbility$ DBChangeZoneAll
+SVar:DBChangeZone:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Card.IsRemembered | ChangeNum$ 1 | Mandatory$ True | SelectPrompt$ Select a land to put onto the battlefield tapped under an opponent's control | GainControl$ ChosenPlayer | ForgetChanged$ True | NoShuffle$ True | SubAbility$ DBChangeZone2
+SVar:DBChangeZone2:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Card.IsRemembered | ChangeNum$ 2 | Mandatory$ True | SelectPrompt$ Select two lands to put onto the battlefield tapped under your control | ForgetChanged$ True | NoShuffle$ True | SubAbility$ DBChangeZoneAll
SVar:DBChangeZoneAll:DB$ ChangeZoneAll | Origin$ Library | Destination$ Hand | ChangeType$ Card.IsRemembered | Shuffle$ True | SubAbility$ DBCleanup
SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
SVar:AltCostPaid:Count$AltCost.1.0
diff --git a/forge-gui/res/cardsfolder/v/vhal_eager_scholar.txt b/forge-gui/res/cardsfolder/v/vhal_eager_scholar.txt
index 44c911294fc..80bb4bd6d67 100644
--- a/forge-gui/res/cardsfolder/v/vhal_eager_scholar.txt
+++ b/forge-gui/res/cardsfolder/v/vhal_eager_scholar.txt
@@ -86,7 +86,7 @@ PT:4/4
T:Mode$ Specializes | ValidCard$ Card.Self | Execute$ TrigRemoveCounters | TriggerDescription$ When this creature specializes, remove all study counters from it. Seek two creature cards with mana value less than or equal to the number of study counters removed this way. Put one of them onto the battlefield and shuffle the other into your library.
SVar:TrigRemoveCounters:DB$ RemoveCounter | CounterType$ STUDY | CounterNum$ All | RememberRemoved$ True | SubAbility$ DBSeek
SVar:DBSeek:DB$ Seek | Type$ Card.Creature+cmcLEX | Num$ 2 | RememberFound$ True | SubAbility$ DBBattlefield
-SVar:DBBattlefield:DB$ ChangeZone | Origin$ Hand | Destination$ Battlefield | SelectPrompt$ Select a card seeked this way to put onto the battlefield | ChangeType$ Card.IsRemembered | ForgetChanged$ True | SubAbility$ DBShuffle
+SVar:DBBattlefield:DB$ ChangeZone | Origin$ Hand | Destination$ Battlefield | SelectPrompt$ Select a card to put onto the battlefield | ChangeType$ Card.IsRemembered | ForgetChanged$ True | SubAbility$ DBShuffle
SVar:DBShuffle:DB$ ChangeZone | Origin$ Hand | Destination$ Library | Shuffle$ True | Defined$ RememberedCard | SubAbility$ DBCleanup
SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
SVar:X:Count$RememberedSize
diff --git a/forge-gui/res/cardsfolder/v/victor_valgavoths_seneschal.txt b/forge-gui/res/cardsfolder/v/victor_valgavoths_seneschal.txt
index 99ff61af1df..743bb9c4e4e 100644
--- a/forge-gui/res/cardsfolder/v/victor_valgavoths_seneschal.txt
+++ b/forge-gui/res/cardsfolder/v/victor_valgavoths_seneschal.txt
@@ -6,7 +6,7 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Enchan
T:Mode$ FullyUnlock | ValidCard$ Card.Room | ValidPlayer$ You | Secondary$ True | Execute$ TrigSurveil | TriggerZones$ Battlefield | TriggerDescription$ Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, surveil 2 if this is the first time this ability has resolved this turn. If it's the second time, each opponent discards a card. If it's the third time, put a creature card from a graveyard onto the battlefield under your control.
SVar:TrigSurveil:DB$ Surveil | Amount$ 2 | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ1 | SubAbility$ DBDiscard
SVar:DBDiscard:DB$ Discard | Defined$ Player.Opponent | Mode$ TgtChoose | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ2 | SubAbility$ DBChangeZone
-SVar:DBChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ChangeType$ Creature | ChangeNum$ 1 | Mandatory$ True | GainControl$ True | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ3 | SelectPrompt$ Select a creature card to return to the battlefield | Hidden$ True | SubAbility$ DBLog
+SVar:DBChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ChangeType$ Creature | ChangeNum$ 1 | Mandatory$ True | GainControl$ True | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ3 | SelectPrompt$ Select a creature card in a graveyard | Hidden$ True | SubAbility$ DBLog
SVar:DBLog:DB$ StoreSVar | SVar$ X | Type$ CountSVar | Expression$ X/Plus.1
SVar:X:Number$1
T:Mode$ Phase | Phase$ Cleanup | TriggerZones$ Battlefield | Execute$ DBCleanup | Static$ True
diff --git a/forge-gui/res/cardsfolder/v/viewpoint_synchronization.txt b/forge-gui/res/cardsfolder/v/viewpoint_synchronization.txt
index d6248b7476b..fe202451d2b 100644
--- a/forge-gui/res/cardsfolder/v/viewpoint_synchronization.txt
+++ b/forge-gui/res/cardsfolder/v/viewpoint_synchronization.txt
@@ -3,7 +3,7 @@ ManaCost:4 G
Types:Sorcery
K:Freerunning:2 G
A:SP$ ChangeZone | Origin$ Library | Destination$ Library | ChangeType$ Land.Basic | ChangeNum$ 3 | RememberChanged$ True | Reveal$ True | Shuffle$ False | StackDescription$ SpellDescription | SubAbility$ DBChangeZone1 | SpellDescription$ Search your library for up to three basic land cards and reveal them. Put two of them onto the battlefield tapped and the other into your hand, then shuffle.
-SVar:DBChangeZone1:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.IsRemembered | ChangeNum$ 2 | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card for the battlefield | Tapped$ True | Shuffle$ False | SubAbility$ DBChangeZone2 | StackDescription$ None
-SVar:DBChangeZone2:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.IsRemembered | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card for your hand | StackDescription$ None | SubAbility$ DBCleanup
+SVar:DBChangeZone1:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.IsRemembered | ChangeNum$ 2 | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card to put onto the battlefield | Tapped$ True | Shuffle$ False | SubAbility$ DBChangeZone2 | StackDescription$ None
+SVar:DBChangeZone2:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.IsRemembered | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card to put into your hand | StackDescription$ None | SubAbility$ DBCleanup
SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
Oracle:Freerunning {2}{G} (You may cast this spell for its freerunning cost if you dealt combat damage to a player this turn with an Assassin or commander.)\nSearch your library for up to three basic land cards and reveal them. Put two of them onto the battlefield tapped and the other into your hand, then shuffle.
diff --git a/forge-gui/res/cardsfolder/w/wake_to_slaughter.txt b/forge-gui/res/cardsfolder/w/wake_to_slaughter.txt
index d660a2dce30..7fd5d5651a8 100644
--- a/forge-gui/res/cardsfolder/w/wake_to_slaughter.txt
+++ b/forge-gui/res/cardsfolder/w/wake_to_slaughter.txt
@@ -3,7 +3,7 @@ ManaCost:3 B R
Types:Sorcery
A:SP$ Pump | TargetMin$ 0 | TargetMax$ 2 | ValidTgts$ Creature.YouOwn | TgtPrompt$ Choose up to two target creature cards in your graveyard | TgtZone$ Graveyard | RememberObjects$ Targeted | SubAbility$ DBChoosePlayer | StackDescription$ SpellDescription | SpellDescription$ Choose up to two target creature cards in your graveyard. An opponent chooses one of them. Return that card to your hand. Return the other to the battlefield under your control. It gains haste. Exile it at the beginning of the next end step.
SVar:DBChoosePlayer:DB$ ChoosePlayer | Defined$ You | Choices$ Player.Opponent | ChoiceTitle$ Choose an opponent | SubAbility$ DBOppChoose | StackDescription$ None
-SVar:DBOppChoose:DB$ ChooseCard | Choices$ Card.IsRemembered | ChoiceZone$ Graveyard | Defined$ ChosenPlayer | ChoiceTitle$ Select a card for the hand | Mandatory$ True | ForgetChosen$ True | SubAbility$ DBChangeZone1 | StackDescription$ None
+SVar:DBOppChoose:DB$ ChooseCard | Choices$ Card.IsRemembered | ChoiceZone$ Graveyard | Defined$ ChosenPlayer | ChoiceTitle$ Choose a card to be put into the hand of CARDNAME's controller | Mandatory$ True | ForgetChosen$ True | SubAbility$ DBChangeZone1 | StackDescription$ None
SVar:DBChangeZone1:DB$ ChangeZone | Defined$ ChosenCard | Origin$ Graveyard | Destination$ Hand | SubAbility$ DBChangeZone2 | StackDescription$ None
SVar:DBChangeZone2:DB$ ChangeZone | Defined$ Remembered | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | StackDescription$ None | SubAbility$ DBAnimate
SVar:DBAnimate:DB$ Animate | Keywords$ Haste | Defined$ Remembered | Duration$ Permanent | AtEOT$ Sacrifice | StackDescription$ None | SubAbility$ DBCleanup
diff --git a/forge-gui/res/cardsfolder/w/woodfall_primus.txt b/forge-gui/res/cardsfolder/w/woodfall_primus.txt
index 40d4bdbdb16..6510fa896c1 100644
--- a/forge-gui/res/cardsfolder/w/woodfall_primus.txt
+++ b/forge-gui/res/cardsfolder/w/woodfall_primus.txt
@@ -4,6 +4,6 @@ Types:Creature Treefolk Shaman
PT:6/6
K:Trample
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME enters, destroy target noncreature permanent.
-SVar:TrigDestroy:DB$ Destroy | ValidTgts$ Permanent.nonCreature | TgtPrompt$ Select a noncreature permanent.
+SVar:TrigDestroy:DB$ Destroy | ValidTgts$ Permanent.nonCreature | TgtPrompt$ Select target noncreature permanent.
K:Persist
Oracle:Trample\nWhen Woodfall Primus enters, destroy target noncreature permanent.\nPersist (When this creature dies, if it had no -1/-1 counters on it, return it to the battlefield under its owner's control with a -1/-1 counter on it.)
diff --git a/forge-gui/res/cardsfolder/x/xenk_paladin_unbroken.txt b/forge-gui/res/cardsfolder/x/xenk_paladin_unbroken.txt
index 9871e224af6..ab77d0c5ee5 100644
--- a/forge-gui/res/cardsfolder/x/xenk_paladin_unbroken.txt
+++ b/forge-gui/res/cardsfolder/x/xenk_paladin_unbroken.txt
@@ -1,4 +1,5 @@
Name:Xenk, Paladin Unbroken
+AltName:Rashel, Fist of Torm
ManaCost:2 W W
Types:Legendary Creature Human Knight
PT:2/4
From d314b2ef852c1d8b47ad94974a7945fb9129e81d Mon Sep 17 00:00:00 2001
From: tool4ever
Date: Wed, 22 Jan 2025 17:52:43 +0100
Subject: [PATCH 04/13] Clean + fix combo (#6830)
---
forge-game/src/main/java/forge/game/CardTraitBase.java | 5 -----
forge-game/src/main/java/forge/game/player/Player.java | 4 ----
forge-gui/res/cardsfolder/r/rose_cutthroat_raider.txt | 2 +-
forge-gui/res/cardsfolder/t/the_chain_veil.txt | 3 ++-
4 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/forge-game/src/main/java/forge/game/CardTraitBase.java b/forge-game/src/main/java/forge/game/CardTraitBase.java
index 548c80424b0..4713d24c8ef 100644
--- a/forge-game/src/main/java/forge/game/CardTraitBase.java
+++ b/forge-game/src/main/java/forge/game/CardTraitBase.java
@@ -548,11 +548,6 @@ else if ("None".equalsIgnoreCase(params.get("Revolt"))) {
}
}
- if (params.containsKey("ActivateNoLoyaltyAbilitiesCondition")) {
- final Player active = game.getPhaseHandler().getPlayerTurn();
- return !active.getActivateLoyaltyAbilityThisTurn(this);
- }
-
if (params.containsKey("ClassLevel")) {
final int level = getHostCard().getClassLevel();
final int levelMin = Integer.parseInt(params.get("ClassLevel"));
diff --git a/forge-game/src/main/java/forge/game/player/Player.java b/forge-game/src/main/java/forge/game/player/Player.java
index 07da018e783..aa03b7041ca 100644
--- a/forge-game/src/main/java/forge/game/player/Player.java
+++ b/forge-game/src/main/java/forge/game/player/Player.java
@@ -1890,10 +1890,6 @@ public final void setBeenDealtCombatDamageSinceLastTurn(final boolean b) {
beenDealtCombatDamageSinceLastTurn = b;
}
- public final boolean getActivateLoyaltyAbilityThisTurn(CardTraitBase ctb) {
- return !CardUtil.getThisTurnActivated("Activated.Loyalty+Planeswalker+YouCtrl", ctb.getHostCard(), ctb, this).isEmpty();
- }
-
public final List getCreaturesAttackedThisTurn() {
List result = Lists.newArrayList(Iterables.concat(attackedThisTurn.values()));
return result;
diff --git a/forge-gui/res/cardsfolder/r/rose_cutthroat_raider.txt b/forge-gui/res/cardsfolder/r/rose_cutthroat_raider.txt
index c84f40e7843..0883416afbc 100644
--- a/forge-gui/res/cardsfolder/r/rose_cutthroat_raider.txt
+++ b/forge-gui/res/cardsfolder/r/rose_cutthroat_raider.txt
@@ -6,7 +6,7 @@ K:First Strike
T:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ You | CheckSVar$ RaidTest | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Raid — At end of combat on your turn, if you attacked this turn, create a Junk token for each opponent you attacked. (It's an artifact with "{T}, Sacrifice this artifact: Exile the top card of your library. You may play that card this turn. Activate only as a sorcery.")
SVar:TrigToken:DB$ Token | TokenAmount$ X | TokenScript$ c_a_junk_sac_exileplay | TokenOwner$ You
SVar:RaidTest:Count$AttackersDeclared
-SVar:X:PlayerCountRegisteredOpponents$HasPropertyBeenAttackedThisCombat
+SVar:X:PlayerCountPropertyYou$OpponentsAttackedThisTurn
T:Mode$ Sacrificed | ValidCard$ Junk.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigMana | TriggerDescription$ Whenever you sacrifice a Junk, add {R}.
SVar:TrigMana:DB$ Mana | Produced$ R | Amount$ 1
DeckHas:Ability$Sacrifice|Token & Type$Junk|Artifact
diff --git a/forge-gui/res/cardsfolder/t/the_chain_veil.txt b/forge-gui/res/cardsfolder/t/the_chain_veil.txt
index 8a0d5967e50..f3d3d5f535d 100644
--- a/forge-gui/res/cardsfolder/t/the_chain_veil.txt
+++ b/forge-gui/res/cardsfolder/t/the_chain_veil.txt
@@ -1,10 +1,11 @@
Name:The Chain Veil
ManaCost:4
Types:Legendary Artifact
-T:Mode$ Phase | Phase$ End of Turn | ActivateNoLoyaltyAbilitiesCondition$ True | ValidPlayer$ You | Execute$ TrigLoseLife | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your end step, if you didn't activate a loyalty ability of a planeswalker this turn, you lose 2 life.
+T:Mode$ Phase | Phase$ End of Turn | CheckSVar$ X | SVarCompare$ EQ0 | ValidPlayer$ You | Execute$ TrigLoseLife | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your end step, if you didn't activate a loyalty ability of a planeswalker this turn, you lose 2 life.
SVar:TrigLoseLife:DB$ LoseLife | Defined$ You | LifeAmount$ 2
A:AB$ Effect | Cost$ 4 T | StaticAbilities$ LoyaltyAbs | AILogic$ ChainVeil | SpellDescription$ For each planeswalker you control, you may activate one of its loyalty abilities once this turn as though none of its loyalty abilities had been activated this turn.
SVar:LoyaltyAbs:Mode$ NumLoyaltyAct | ValidCard$ Planeswalker.YouCtrl | Additional$ 1 | Description$ For each planeswalker you control, you may activate one of its loyalty abilities once this turn as though none of its loyalty abilities had been activated this turn.
+SVar:X:Count$ThisTurnActivated_Activated.Loyalty+Planeswalker+YouCtrl
SVar:NeedsToPlay:Planeswalker.YouCtrl
AI:RemoveDeck:All
AI:RemoveDeck:Random
From 148cf0b5c51f5f00bdf17fc2bda2b115456fffef Mon Sep 17 00:00:00 2001
From: Paul Hammerton <18243520+paulsnoops@users.noreply.github.com>
Date: Wed, 22 Jan 2025 17:48:12 +0000
Subject: [PATCH 05/13] Edition updates: DFT, DRC, SPG
---
.../res/editions/Aetherdrift Commander.txt | 4 +
forge-gui/res/editions/Aetherdrift.txt | 194 +++++++++++++++++-
forge-gui/res/editions/Special Guests.txt | 4 +
3 files changed, 201 insertions(+), 1 deletion(-)
diff --git a/forge-gui/res/editions/Aetherdrift Commander.txt b/forge-gui/res/editions/Aetherdrift Commander.txt
index d4a38c411ac..a3a444bbcb5 100644
--- a/forge-gui/res/editions/Aetherdrift Commander.txt
+++ b/forge-gui/res/editions/Aetherdrift Commander.txt
@@ -6,3 +6,7 @@ Type=Commander
ScryfallCode=DRC
[cards]
+1 M Hashaton, Scarab's Fist @Wisnu Tan
+2 M Pia Nalaar, Chief Mechanic @Bram Sels
+3 M Saheeli, Radiant Creator @Ernanda Souza
+4 M Temmet, Naktamun's Will @Douglas Shuler
diff --git a/forge-gui/res/editions/Aetherdrift.txt b/forge-gui/res/editions/Aetherdrift.txt
index ee45f4bef36..084411f1c72 100644
--- a/forge-gui/res/editions/Aetherdrift.txt
+++ b/forge-gui/res/editions/Aetherdrift.txt
@@ -6,15 +6,92 @@ Type=Expansion
ScryfallCode=DFT
[cards]
+1 U Air Response Unit @Brock Grossman
+3 R Basri, Tomorrow's Champion @Kai Carpenter
+7 R Bulwark Ox @Brent Hollowell
+19 C Lightshield Parry @Leanna Crossan
+35 M Valor's Flagship @Stephan Martiniere
+47 C Hulldrifter @Alexandre Honoré
+50 C Midnight Mangler @Villarrte
+56 R Repurposing Bay @William Tempest
+73 R Vnwxt, Verbose Host @Izzy
+77 R Bloodghast @Francisco Badilla
+80 R Cryptcaller Chariot @Aaron Miller
+94 M The Last Ride @Michele Giorgi
+100 R Quag Feast @Loïc Canavaggia
+107 C Streaking Oilgorger @Campbell White
+113 R Boommobile @Alexandr Leskinen
+116 M Chandra, Spark Hunter @Devin Elle Kurtz
120 R Daretti, Rocketeer Engineer @Borja Pindado
+121 R Draconautics Engineer @Artur Nakhodkin
+133 M Hazoret, Godseeker @Chris Rallis
+138 U Marauding Mako @Alix Branwyn
+142 C Prowcatcher Specialist @Konstantin Porubov
+151 R Agonasaur Rex @Lucas Graciano
160 U Earthrumbler @Jean Pierre Targete
+161 U Elvish Refueler @Carly Milligan
+183 M Thunderous Velocipede @Adrián Rodríguez Pérez
+185 C Venomsac Lagac @Andrey Kuzinskiy
+187 R Aatchik, Emerald Radian @Loïc Canavaggia
+188 U Apocalypse Runner @Aaron J. Riley
+190 U Boosted Sloop @José Parodi
191 M Brightglass Gearhulk @José Parodi
+194 R Captain Howler, Sea Scourge @Mirko Failoni
+195 R Caradora, Heart of Alacria @Mirko Failoni
+197 U Cloudspire Skycycle @Hardy Fowler
+203 R Far Fortune, End Boss @Javier Charro
+206 U Guidelight Pathmaker @Stephan Martiniere
+210 R Kolodin, Triumph Caster @Michal Ivan
+211 U Lagorin, Soul of Alacria @Mirko Failoni
+212 M Loot, the Pathfinder @Ernanda Souza
+213 R Mendicant Core, Guidelight @Zezhou Chen
+215 M Oildeep Gearhulk @Artur Nakhodkin
+216 M Pyrewood Gearhulk @Martin de Diego Sádaba
+217 U Rangers' Aetherhive @Josiah "Jo" Cameron
+218 R Redshift, Rocketeer Chief @Wayne Reynolds
+220 U Rocketeer Boostbuggy @Chris Seaman
+221 M Sab-Sunen, Luxa Embodied @Valera Lutfullina
+222 R Samut, the Driving Force @Chris Rallis
+223 R Sita Varma, Masked Racer @Kai Carpenter
+228 R Winter, Cursed Rider @Daren Bader
+229 R Zahur, Glory's Past @Leroy Steinmann
+231 M The Aetherspark @Donato Giancola
234 R Lifecraft Engine @Mirko Failoni
+244 C Starting Column @Jakub Kasper
+248 U Amonkhet Raceway @Brian Valeza
+249 C Avishkar Raceway @Julian Kok Joon Wen
+250 R Bleachbone Verge @Mark Tedin
+251 C Bloodfell Caves @Ron Spencer
+252 C Blossoming Sands @Valera Lutfullina
+253 U Country Roads @Mark Poole
+254 C Dismal Backwater @Sam Burley
+255 U Foul Roads @Borja Pindado
+256 C Jungle Hollow @Eddie Mendoza
+257 R Muraganda Raceway @Brian Valeza
+258 C Night Market @David Álvarez
+259 U Reef Roads @David Álvarez
+260 R Riverpyre Verge @Titus Lunter
+261 U Rocky Roads @Arthur Yuan
+262 C Rugged Highlands @Florian de Gesincourt
+263 C Scoured Barrens @Eddie Mendoza
+264 R Sunbillow Verge @Pete Venters
+265 C Swiftwater Cliffs @Mark Poole
+266 C Thornwood Falls @Eddie Mendoza
+267 C Tranquil Cove @Wayne Wu
+268 R Wastewood Verge @Bartek Fedyczak
+269 U Wild Roads @Leanna Crossan
+270 R Willowrush Verge @Aaron Miller
+271 C Wind-Scarred Crag @Svetlin Velinov
+272 L Plains @Adam Paquette
+273 L Island @Maxime Minard
+274 L Swamp @Jonas De Ro
+275 L Mountain @Chris Ostrowski
+276 L Forest @Andreas Rocha
277 L Plains @Samuele Bandini
278 L Plains @Titus Lunter
279 L Plains @Leon Tukker
280 L Island @Samuele Bandini
-281 L Island @Titus Lunter
+281 L Island @Mark Poole
282 L Island @Leon Tukker
283 L Swamp @Samuele Bandini
284 L Swamp @Ron Spencer
@@ -25,5 +102,120 @@ ScryfallCode=DFT
289 L Forest @Samuele Bandini
290 L Forest @Yeong-Hao Han
291 L Forest @Leon Tukker
+292 U Air Response Unit @SchmandrewART
+298 M Valor's Flagship @William Tempest
+300 C Hulldrifter @Juan Marquez
+301 C Midnight Mangler @Boneface
+306 R Cryptcaller Chariot @Oliver Barrett
+308 M The Last Ride @Death Burger
+310 R Boommobile @Ian Jepson
+315 U Earthrumbler @SchmandrewART
+317 M Thunderous Velocipede @Eduardo Francisco
+319 U Apocalypse Runner @Arik Roper
+320 U Boosted Sloop @Gabriel Rubio
+321 U Cloudspire Skycycle @Yuko Shimizu
+324 U Guidelight Pathmaker @Dan Mumford
+326 U Rangers' Aetherhive @Francisco Badilla
+327 U Rocketeer Boostbuggy @Adam Volker
329 R Lifecraft Engine @Eduardo Francisco
+333 R Bulwark Ox @Jon Vermilyea
+337 R Bloodghast @Wojtek Łebski
+341 R Draconautics Engineer @Ryan Roadkill
+343 R Agonasaur Rex @Jon Vermilyea
+347 M Hazoret, Godseeker @Massiveface
+348 M Brightglass Gearhulk @Jorge Gutierrez Garcia
+351 M Oildeep Gearhulk @Chun Lo
+352 M Pyrewood Gearhulk @William Tempest
+354 M Sab-Sunen, Luxa Embodied @Benjamin Ee
+355 R Basri, Tomorrow's Champion @Justyna Dura
+356 R Vnwxt, Verbose Host @Chris Seaman
+358 R Daretti, Rocketeer Engineer @Samuel Perin
+360 R Aatchik, Emerald Radian @Erica Williams
+361 R Captain Howler, Sea Scourge @Mark Zug
+362 R Caradora, Heart of Alacria @Yuko Shimizu
+363 R Far Fortune, End Boss @Justine Jones
+364 R Kolodin, Triumph Caster @John Stanko
+365 R Mendicant Core, Guidelight @Dan Mumford
+366 R Redshift, Rocketeer Chief @Xavier Ribeiro
+367 R Samut, the Driving Force @Mark Poole
+368 R Sita Varma, Masked Racer @rk post
+369 R Winter, Cursed Rider @Ovidio Cartagena
+370 R Zahur, Glory's Past @Alex Stone
+371 R Bleachbone Verge @Daren Bader
+372 R Riverpyre Verge @Justin Sweet
+373 R Sunbillow Verge @Darrell Riche
+374 R Wastewood Verge @Kev Walker
+375 R Willowrush Verge @Carl Critchlow
+376 M The Aetherspark @Dominik Mayer
+380 R Repurposing Bay @William Tempest
+384 R Quag Feast @Loïc Canavaggia
+391 M Loot, the Pathfinder @Ernanda Souza
+396 R Muraganda Raceway @Brian Valeza
+401 M Chandra, Spark Hunter @jbstyle.
+404 M Loot, the Pathfinder @Tetsu Kurosawa
+411 M Chandra, Spark Hunter @jbstyle.
+414 M Loot, the Pathfinder @Tetsu Kurosawa
+419 U Marauding Mako @Alix Branwyn
423 R Lifecraft Engine @José Parodi
+424 U Amonkhet Raceway @Titus Lunter
+425 C Avishkar Raceway @Titus Lunter
+426 R Muraganda Raceway @Titus Lunter
+427 R Basri, Tomorrow's Champion @Kai Carpenter
+428 R Bulwark Ox @Brent Hollowell
+434 M Valor's Flagship @Stephan Martiniere
+439 R Repurposing Bay @William Tempest
+443 R Vnwxt, Verbose Host @Izzy
+445 R Bloodghast @Francisco Badilla
+446 R Cryptcaller Chariot @Aaron Miller
+451 M The Last Ride @Michele Giorgi
+452 R Quag Feast @Loïc Canavaggia
+454 R Boommobile @Alexandr Leskinen
+456 M Chandra, Spark Hunter @Devin Elle Kurtz
+458 R Daretti, Rocketeer Engineer @Borja Pindado
+459 R Draconautics Engineer @Artur Nakhodkin
+462 M Hazoret, Godseeker @Chris Rallis
+465 R Agonasaur Rex @Lucas Graciano
+471 M Thunderous Velocipede @Adrián Rodríguez Pérez
+473 R Aatchik, Emerald Radian @Loïc Canavaggia
+474 M Brightglass Gearhulk @José Parodi
+475 R Captain Howler, Sea Scourge @Mirko Failoni
+476 R Caradora, Heart of Alacria @Mirko Failoni
+480 R Far Fortune, End Boss @Javier Charro
+488 M Pyrewood Gearhulk @Martin de Diego Sádaba
+489 R Redshift, Rocketeer Chief @Wayne Reynolds
+491 M Sab-Sunen, Luxa Embodied @Valera Lutfullina
+493 R Sita Varma, Masked Racer @Kai Carpenter
+494 R Winter, Cursed Rider @Daren Bader
+495 R Zahur, Glory's Past @Leroy Steinmann
+496 M The Aetherspark @Donato Giancola
+497 R Lifecraft Engine @Mirko Failoni
+501 R Bleachbone Verge @Mark Tedin
+502 R Muraganda Raceway @Brian Valeza
+503 R Riverpyre Verge @Titus Lunter
+504 R Sunbillow Verge @Pete Venters
+505 R Wastewood Verge @Bartek Fedyczak
+506 R Willowrush Verge @Aaron Miller
+507 L Plains @Adam Paquette
+508 L Island @Maxime Minard
+509 L Swamp @Jonas De Ro
+510 L Mountain @Chris Ostrowski
+511 L Forest @Andreas Rocha
+512 L Plains @Calder Moore
+513 L Island @Calder Moore
+514 L Swamp @Calder Moore
+515 L Mountain @Calder Moore
+516 L Forest @Calder Moore
+519 M Valor's Flagship @William Tempest
+523 R Cryptcaller Chariot @Oliver Barrett
+525 M The Last Ride @Death Burger
+526 R Boommobile @Ian Jepson
+529 M Thunderous Velocipede @Eduardo Francisco
+532 R Bulwark Ox @Jon Vermilyea
+536 R Bloodghast @Wojtek Łebski
+540 R Draconautics Engineer @Ryan Roadkill
+542 R Agonasaur Rex @Jon Vermilyea
+546 M Hazoret, Godseeker @Massiveface
+547 M Brightglass Gearhulk @Jorge Gutierrez Garcia
+550 M Oildeep Gearhulk @Chun Lo
+551 M Pyrewood Gearhulk @William Tempest
+553 M Sab-Sunen, Luxa Embodied @Benjamin Ee
diff --git a/forge-gui/res/editions/Special Guests.txt b/forge-gui/res/editions/Special Guests.txt
index 12835e9f26f..b10bbce5687 100644
--- a/forge-gui/res/editions/Special Guests.txt
+++ b/forge-gui/res/editions/Special Guests.txt
@@ -95,3 +95,7 @@ ScryfallCode=SPG
81 M Akroma's Memorial @Carly Mazur
82 M Temporal Manipulation @Raita Kazama
83 M Fiend Artisan @Carl Critchlow
+88 M Lord of the Undead @Skinner
+92 M Chrome Mox @Princess Hidir
+98 M Lord of the Undead @Skinner
+102 M Chrome Mox @Princess Hidir
From 895d40f8176080bbcaca78d9883e36516fb49cc1 Mon Sep 17 00:00:00 2001
From: Fulgur14 <54345051+Fulgur14@users.noreply.github.com>
Date: Wed, 22 Jan 2025 19:46:13 +0100
Subject: [PATCH 06/13] Full Throttle (DFT) (#6835)
* Full Throttle (DFT)
* Update full_throttle.txt
* Update full_throttle.txt
---
.github/full_throttle.txt | 8 ++++++++
1 file changed, 8 insertions(+)
create mode 100644 .github/full_throttle.txt
diff --git a/.github/full_throttle.txt b/.github/full_throttle.txt
new file mode 100644
index 00000000000..97808150894
--- /dev/null
+++ b/.github/full_throttle.txt
@@ -0,0 +1,8 @@
+Name:Full Throttle
+ManaCost:4 R R
+Types:Sorcery
+A:SP$ AddPhase | ExtraPhase$ Combat | NumPhases$ 2 | ConditionPhases$ Main1,Main2 | SubAbility$ DBEffect | SpellDescription$ After this main phase, there are two additional combat phases. At the beginning of each combat this turn, untap all creatures that attacked this turn.
+SVar:DBEffect:DB$ Effect | Triggers$ TrigPhase
+SVar:TrigPhase:Mode$ Phase | Phase$ BeginCombat | Execute$ TrigUntapAll | TriggerDescription$ At the beginning of each combat this turn, untap all creatures that attacked this turn.
+SVar:TrigUntapAll:DB$ UntapAll | ValidCards$ Creature.attackedThisTurn
+Oracle:After this main phase, there are two additional combat phases.\nAt the beginning of each combat this turn, untap all creatures that attacked this turn.
From 86cdaa9d20f5a682d7f015be3acc40bd7a27d83b Mon Sep 17 00:00:00 2001
From: Fulgur14 <54345051+Fulgur14@users.noreply.github.com>
Date: Wed, 22 Jan 2025 19:46:30 +0100
Subject: [PATCH 07/13] Fearless Swashbuckler (DFT) (#6833)
---
.../cardsfolder/upcoming/fearless_swashbuckler.txt | 13 +++++++++++++
1 file changed, 13 insertions(+)
create mode 100644 forge-gui/res/cardsfolder/upcoming/fearless_swashbuckler.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/fearless_swashbuckler.txt b/forge-gui/res/cardsfolder/upcoming/fearless_swashbuckler.txt
new file mode 100644
index 00000000000..82fdce5a993
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/fearless_swashbuckler.txt
@@ -0,0 +1,13 @@
+Name:Fearless Swashbuckler
+ManaCost:1 U R
+Types:Creature Fish Pirate
+PT:3/3
+K:Haste
+S:Mode$ Continuous | Affected$ Vehicle.YouCtrl | AddKeyword$ Haste | Description$ Vehicles you control have haste.
+T:Mode$ AttackersDeclared | AttackingPlayer$ You | Execute$ TrigDraw | CheckSVar$ X | SVarCompare$ EQ2 | NoResolvingCheck$ True | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack, if a Pirate and a Vehicle attacked this combat, draw three cards, then discard two cards.
+SVar:TrigDraw:DB$ Draw | NumCards$ 3 | SubAbility$ DBDiscard
+SVar:DBDiscard:DB$ Discard | NumCards$ 2 | Mode$ TgtChoose | Defined$ You
+SVar:Y:Count$Valid Creature.Pirate+attacking/LimitMax.1
+SVar:Z:Count$Valid Creature.Vehicle+attacking/LimitMax.1
+SVar:X:SVar$Y/Plus.Z
+Oracle:Haste\nVehicles you control have haste.\nWhenever you attack, if a Pirate and a Vehicle attacked this combat, draw three cards, then discard two cards.
\ No newline at end of file
From f6297a9db612d94cc9848e0baffdd2ed395a7eb8 Mon Sep 17 00:00:00 2001
From: Fulgur14 <54345051+Fulgur14@users.noreply.github.com>
Date: Wed, 22 Jan 2025 19:46:35 +0100
Subject: [PATCH 08/13] Add files via upload (#6832)
---
.../res/cardsfolder/upcoming/voyager_glidecar.txt | 11 +++++++++++
1 file changed, 11 insertions(+)
create mode 100644 forge-gui/res/cardsfolder/upcoming/voyager_glidecar.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/voyager_glidecar.txt b/forge-gui/res/cardsfolder/upcoming/voyager_glidecar.txt
new file mode 100644
index 00000000000..cf34e49b977
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/voyager_glidecar.txt
@@ -0,0 +1,11 @@
+Name:Voyager Glidecar
+ManaCost:W
+Types:Artifact Vehicle
+PT:2/3
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigScry | TriggerDescription$ When this Vehicle enters, scry 1.
+SVar:TrigScry:DB$ Scry | ScryNum$ 1
+A:AB$ Animate | Cost$ tapXType<3/Creature.Other/other creature> | Defined$ Self | Types$ Artifact,Creature | Keywords$ Flying | SubAbility$ DBPutCounter | SpellDescription$ Until end of turn, this Vehicle becomes an artifact creature and gains flying. Put a +1/+1 counter on it.
+SVar:DBPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
+K:Crew:1
+DeckHas:Ability$Counters
+Oracle:When this Vehicle enters, scry 1.\nTap three other untapped creatures you control: Until end of turn, this Vehicle becomes an artifact creature and gains flying. Put a +1/+1 counter on it.\nCrew 1
\ No newline at end of file
From 3126fffb4b8677c540b2b48d1e797fe9ba3c0acb Mon Sep 17 00:00:00 2001
From: Fulgur14 <54345051+Fulgur14@users.noreply.github.com>
Date: Wed, 22 Jan 2025 22:33:49 +0100
Subject: [PATCH 09/13] Count on Luck (DFT) (#6837)
---
forge-gui/res/cardsfolder/upcoming/count_on_luck.txt | 10 ++++++++++
1 file changed, 10 insertions(+)
create mode 100644 forge-gui/res/cardsfolder/upcoming/count_on_luck.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/count_on_luck.txt b/forge-gui/res/cardsfolder/upcoming/count_on_luck.txt
new file mode 100644
index 00000000000..66aa349b0ec
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/count_on_luck.txt
@@ -0,0 +1,10 @@
+Name:Count on Luck
+ManaCost:R R R
+Types:Enchantment
+PT:4/4
+T:Mode$ Phase | Phase$ Upkeep | TriggerZones$ Battlefield | ValidPlayer$ You | Execute$ TrigExile | TriggerDescription$ At the beginning of your upkeep, exile the top card of your library. You may play it this turn.
+SVar:TrigExile:DB$ Dig | Defined$ You | DigNum$ 1 | ChangeNum$ All | DestinationZone$ Exile | RememberChanged$ True | SubAbility$ DBEffectYou
+SVar:DBEffectYou:DB$ Effect | RememberObjects$ RememberedCard | StaticAbilities$ Play | SubAbility$ DBCleanup | ExileOnMoved$ Exile
+SVar:Play:Mode$ Continuous | MayPlay$ True | EffectZone$ Command | Affected$ Card.IsRemembered | AffectedZone$ Exile | Description$ You may play the exiled card this turn.
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+Oracle:At the beginning of your upkeep, exile the top card of your library. You may play that card this turn.
\ No newline at end of file
From 0a685a6c21e1d8bdeae1f0b551dc4e522a32e0ae Mon Sep 17 00:00:00 2001
From: Fulgur14 <54345051+Fulgur14@users.noreply.github.com>
Date: Wed, 22 Jan 2025 23:14:02 +0100
Subject: [PATCH 10/13] 10 DFT cards (#6829)
---
forge-gui/res/cardsfolder/upcoming/boommobile.txt | 12 ++++++++++++
.../upcoming/draconautics_engineer.txt | 10 ++++++++++
.../cardsfolder/upcoming/loot_the_pathfinder.txt | 11 +++++++++++
.../upcoming/prowcatcher_specialist.txt | 8 ++++++++
.../cardsfolder/upcoming/rangers_aetherhive.txt | 10 ++++++++++
.../upcoming/redshift_rocketeer_chief.txt | 10 ++++++++++
.../cardsfolder/upcoming/rocketeer_boostbuggy.txt | 11 +++++++++++
.../upcoming/sita_varma_masker_racer.txt | 10 ++++++++++
.../res/cardsfolder/upcoming/the_aetherspark.txt | 15 +++++++++++++++
.../cardsfolder/upcoming/winter_cursed_raider.txt | 11 +++++++++++
.../tokenscripts/r_4_4_dinosaur_dragon_flying.txt | 6 ++++++
11 files changed, 114 insertions(+)
create mode 100644 forge-gui/res/cardsfolder/upcoming/boommobile.txt
create mode 100644 forge-gui/res/cardsfolder/upcoming/draconautics_engineer.txt
create mode 100644 forge-gui/res/cardsfolder/upcoming/loot_the_pathfinder.txt
create mode 100644 forge-gui/res/cardsfolder/upcoming/prowcatcher_specialist.txt
create mode 100644 forge-gui/res/cardsfolder/upcoming/rangers_aetherhive.txt
create mode 100644 forge-gui/res/cardsfolder/upcoming/redshift_rocketeer_chief.txt
create mode 100644 forge-gui/res/cardsfolder/upcoming/rocketeer_boostbuggy.txt
create mode 100644 forge-gui/res/cardsfolder/upcoming/sita_varma_masker_racer.txt
create mode 100644 forge-gui/res/cardsfolder/upcoming/the_aetherspark.txt
create mode 100644 forge-gui/res/cardsfolder/upcoming/winter_cursed_raider.txt
create mode 100644 forge-gui/res/tokenscripts/r_4_4_dinosaur_dragon_flying.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/boommobile.txt b/forge-gui/res/cardsfolder/upcoming/boommobile.txt
new file mode 100644
index 00000000000..fe5dad708dd
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/boommobile.txt
@@ -0,0 +1,12 @@
+Name:Boommobile
+ManaCost:2 R R
+Types:Artifact Vehicle
+PT:5/5
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMana | TriggerDescription$ When this Vehicle enters, add four mana of any one color. Spend this mana only to activate abilities.
+SVar:TrigMana:DB$ Mana | Produced$ Any | Amount$ 4 | RestrictValid$ Activated
+A:AB$ DealDamage | Cost$ X 2 R T | ValidTgts$ Any | NumDmg$ X | Exhaust$ True | SubAbility$ DBPutCounter | SpellDescription$ This Vehicle deals X damage to any target. Put a +1/+1 counter on this Vehicle. (Activate each exhaust ability only once.)
+SVar:DBPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
+K:Crew:2
+SVar:X:Count$xPaid
+DeckHas:Ability$Counters
+Oracle:When this Vehicle enters, add four mana of any one color. Spend this mana only to activate abilities.\nExhaust — {X}{2}{R}: This Vehicle deals X damage to any target. Put a +1/+1 counter on this Vehicle. (Activate each exhaust ability only once.)\nCrew 2
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/draconautics_engineer.txt b/forge-gui/res/cardsfolder/upcoming/draconautics_engineer.txt
new file mode 100644
index 00000000000..097fcda8012
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/draconautics_engineer.txt
@@ -0,0 +1,10 @@
+Name:Draconautics Engineer
+ManaCost:1 R
+Types:Creature Goblin Artificer
+PT:2/2
+A:AB$ PumpAll | Cost$ R | ValidCards$ Creature.YouCtrl+StrictlyOther | KW$ Haste | SubAbility$ DBPutCounter | Exhaust$ True | SpellDescription$ Other creatures you control gain haste until end of turn. Put a +1/+1 counter on this creature. (Activate each exhaust ability only once.)
+SVar:DBPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
+A:AB$ Token | Cost$ 3 R | TokenAmount$ 1 | TokenScript$ r_4_4_dinosaur_dragon_flying | TokenOwner$ You | Exhaust$ True | SpellDescription$ Create a 4/4 red Dinosaur Dragon creature token with flying.
+SVar:PlayMain1:TRUE
+DeckHas:Ability$Token|Counters
+Oracle:Exhaust — {R}: Other creatures you control gain haste until end of turn. Put a +1/+1 counter on this creature. (Activate each exhaust ability only once.)\nExhaust — {3}{R}: Create a 4/4 red Dinosaur Dragon creature token with flying.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/loot_the_pathfinder.txt b/forge-gui/res/cardsfolder/upcoming/loot_the_pathfinder.txt
new file mode 100644
index 00000000000..c560f9b3d34
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/loot_the_pathfinder.txt
@@ -0,0 +1,11 @@
+Name:Loot, the Pathfinder
+ManaCost:2 G U R
+Types:Legendary Creature Beast Noble
+PT:2/4
+K:Double Strike
+K:Vigilance
+K:Haste
+A:AB$ Mana | Cost$ G T | Produced$ Any | Amount$ 3 | Exhaust$ True | SpellDescription$ Add three mana of any one color. (Activate each exhaust ability only once.)
+A:AB$ Draw | Cost$ U T | NumCards$ 3 | Exhaust$ True | SpellDescription$ Draw three cards.
+A:AB$ DealDamage | Cost$ R T | ValidTgts$ Any | NumDmg$ 3 | Exhaust$ True | SpellDescription$ NICKNAME deals 3 damage to any target.
+Oracle:Double strike, vigilance, haste\nExhaust — {G}, {T}: Add three mana of any one color. (Activate each exhaust ability only once.)\nExhaust — {U}, {T}: Draw three cards.\nExhaust — {R}, {T}: Loot deals 3 damage to any target.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/prowcatcher_specialist.txt b/forge-gui/res/cardsfolder/upcoming/prowcatcher_specialist.txt
new file mode 100644
index 00000000000..6412da255c9
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/prowcatcher_specialist.txt
@@ -0,0 +1,8 @@
+Name:Prowcatcher Specialist
+ManaCost:1 R
+Types:Creature Goblin Warrior
+PT:2/1
+K:Haste
+A:AB$ PutCounter | Cost$ 3 R | Defined$ Self | CounterType$ P1P1 | CounterNum$ 2 | Exhaust$ True | SpellDescription$ Put two +1/+1 counters on this creature. (Activate each exhaust ability only once.)
+DeckHas:Ability$Counters
+Oracle:Haste\nExhaust — {3}{R}: Put two +1/+1 counters on this creature. (Activate each exhaust ability only once.)
diff --git a/forge-gui/res/cardsfolder/upcoming/rangers_aetherhive.txt b/forge-gui/res/cardsfolder/upcoming/rangers_aetherhive.txt
new file mode 100644
index 00000000000..faab8bb7983
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/rangers_aetherhive.txt
@@ -0,0 +1,10 @@
+Name:Rangers' Aetherhive
+ManaCost:1 G U
+Types:Artifact Vehicle
+PT:3/5
+K:Vigilance
+T:Mode$ AbilityCast | ValidActivatingPlayer$ You | ValidSA$ Activated.Exhaust | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever you activate an exhaust ability, create a 1/1 colorless Thopter artifact creature token with flying.
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_1_1_a_thopter_flying | TokenOwner$ You
+K:Crew:1
+DeckHas:Ability$Token
+Oracle:Vigilance\nWhenever you activate an exhaust ability, create a 1/1 colorless Thopter artifact creature token with flying.\nCrew 1 (Tap any number of creatures you control with total power 1 or more: This Vehicle becomes an artifact creature until end of turn.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/redshift_rocketeer_chief.txt b/forge-gui/res/cardsfolder/upcoming/redshift_rocketeer_chief.txt
new file mode 100644
index 00000000000..46a63da33b7
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/redshift_rocketeer_chief.txt
@@ -0,0 +1,10 @@
+Name:Redshift, Rocketeer Chief
+ManaCost:R G
+Types:Legendary Creature Goblin Pilot
+PT:2/3
+K:Vigilance
+A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ X | RestrictValid$ Activated | SpellDescription$ Add X mana of any one color, where X is NICKNAME's power. Spend this mana only to activate abilities.
+A:AB$ ChangeZone | Cost$ 10 R G | Origin$ Hand | Destination$ Battlefield | ChangeType$ Permanent | ChangeNum$ Y | Exhaust$ True | SpellDescription$ Put any number of permanent cards from your hand onto the battlefield. (Activate each exhaust ability only once.)
+SVar:X:Count$CardPower
+SVar:Y:Count$InYourHand.Permanent
+Oracle:Vigilance\n{T}: Add X mana of any one color, where X is Redshift's power. Spend this mana only to activate abilities.\nExhaust — {10}{R}{G}: Put any number of permanent cards from your hand onto the battlefield. (Activate each exhaust ability only once.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/rocketeer_boostbuggy.txt b/forge-gui/res/cardsfolder/upcoming/rocketeer_boostbuggy.txt
new file mode 100644
index 00000000000..8a65e5ebe54
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/rocketeer_boostbuggy.txt
@@ -0,0 +1,11 @@
+Name:Rocketeer Boostbuggy
+ManaCost:R G
+Types:Artifact Vehicle
+PT:3/2
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ Whenever this Vehicle attacks, create a Treasure token. (It's an artifact with "{T}, Sacrifice this token: Add one mana of any color.")
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_treasure_sac | TokenOwner$ You
+A:AB$ Animate | Cost$ 3 | Defined$ Self | Types$ Artifact,Creature | Exhaust$ True | SubAbility$ DBPutCounter | SpellDescription$ This Vehicle becomes an artifact creature. Put a +1/+1 counter on it. (Activate each exhaust ability only once.)
+SVar:DBPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
+K:Crew:1
+DeckHas:Ability$Token|Counters
+Oracle:Whenever this Vehicle attacks, create a Treasure token. (It's an artifact with "{T}, Sacrifice this token: Add one mana of any color.")\nExhaust — {3}: This Vehicle becomes an artifact creature. Put a +1/+1 counter on it. (Activate each exhaust ability only once.)\nCrew 1
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/sita_varma_masker_racer.txt b/forge-gui/res/cardsfolder/upcoming/sita_varma_masker_racer.txt
new file mode 100644
index 00000000000..e8dcf9545b5
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/sita_varma_masker_racer.txt
@@ -0,0 +1,10 @@
+Name:Sita Varma, Masked Racer
+ManaCost:G U
+Types:Legendary Creature Human Rogue
+PT:2/3
+A:AB$ PutCounter | Cost$ X G G U | Defined$ Self | CounterType$ P1P1 | CounterNum$ X | Exhaust$ True | SubAbility$ DBAnimateAll | SpellDescription$ Put X +1/+1 counters on NICKNAME. Then you may have the base power and toughness of each other creature you control become equal to NICKNAME's power until end of turn. (Activate each exhaust ability only once.)
+SVar:DBAnimateAll:DB$ Animate | Power$ Y | Toughness$ Y | Defined$ Valid Creature.YouCtrl+Other | Optional$ True
+DeckHas:Ability$Counters
+SVar:X:Count$xPaid
+SVar:Y:Count$CardPower
+Oracle:Exhaust — {X}{G}{G}{U}: Put X +1/+1 counters on Sita Varma. Then you may have the base power and toughness of each other creature you control become equal to Sita Varma's power until end of turn. (Activate each exhaust ability only once.)
diff --git a/forge-gui/res/cardsfolder/upcoming/the_aetherspark.txt b/forge-gui/res/cardsfolder/upcoming/the_aetherspark.txt
new file mode 100644
index 00000000000..c80d3b9ed84
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/the_aetherspark.txt
@@ -0,0 +1,15 @@
+Name:The Aetherspark
+ManaCost:4
+Types:Legendary Artifact Planeswalker Equipment
+Loyalty:4
+S:Mode$ CantAttack | ValidCard$ Creature | Target$ Card.Self+AttachedTo Creature | Description$ As long as CARDNAME is attached to a creature, CARDNAME can't be attacked and has "Whenever equipped creature deals combat damage during your turn, put that many loyalty counters on CARDNAME."
+S:Mode$ Continuous | Affected$ Card.Self+AttachedTo Creature | Secondary$ True | AddTrigger$ TrigDamageDoneOnce | Description$ As long as CARDNAME is attached to a creature, CARDNAME can't be attacked and has "Whenever equipped creature deals combat damage during your turn, put that many loyalty counters on CARDNAME."
+SVar:TrigDamageDoneOnce:Mode$ DamageDealtOnce | CombatDamage$ True | ValidSource$ Creature.EquippedBy | Execute$ TrigPutCounter | TriggerZones$ Battlefield | PlayerTurn$ True | TriggerDescription$ Whenever equipped creature deals combat damage during your turn, put that many loyalty counters on CARDNAME.
+SVar:TrigPutCounter:DB$ PutCounter | CounterType$ LOYALTY | CounterNum$ X
+A:AB$ Attach | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | ValidTgts$ Creature.YouCtrl | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select target creature you control | SubAbility$ DBPutCounter | SpellDescription$ Attach CARDNAME to up to one target creature you control. Put a +1/+1 counter on that creature.
+SVar:DBPutCounter:DB$ PutCounter | Defined$ Targeted | CounterType$ P1P1 | CounterNum$ 1
+A:AB$ Draw | Cost$ SubCounter<5/LOYALTY> | Planeswalker$ True | NumCards$ 2 | SpellDescription$ Draw two cards.
+A:AB$ Mana | Cost$ SubCounter<10/LOYALTY> | Planeswalker$ True | Ultimate$ True | Produced$ Any | Amount$ 10 | SpellDescription$ Add ten mana of any one color.
+DeckHas:Ability$Counters
+SVar:X:TriggerCount$DamageAmount
+Oracle:As long as The Aetherspark is attached to a creature, The Aetherspark can't be attacked and has "Whenever equipped creature deals combat damage during your turn, put that many loyalty counters on The Aetherspark."\n[+1]: Attach The Aetherspark to up to one target creature you control. Put a +1/+1 counter on that creature.\n[-5]: Draw two cards.\n[-10]: Add ten mana of any one color.
diff --git a/forge-gui/res/cardsfolder/upcoming/winter_cursed_raider.txt b/forge-gui/res/cardsfolder/upcoming/winter_cursed_raider.txt
new file mode 100644
index 00000000000..572f611094b
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/winter_cursed_raider.txt
@@ -0,0 +1,11 @@
+Name:Winter, Cursed Rider
+ManaCost:U B
+Types:Legendary Creature Human Warlock
+PT:3/2
+K:Ward:PayLife<2>
+S:Mode$ Continuous | Affected$ Artifact.YouCtrl | AddKeyword$ Ward:PayLife<2> | Description$ Artifacts you control have "Ward—Pay 2 life."
+A:AB$ PumpAll | Cost$ 2 U B T ExileFromGrave | ValidCards$ Creature.nonArtifact+Other | NumAtt$ -X | NumDef$ -X | IsCurse$ True | Exhaust$ True | SpellDescription$ Each other nonartifact creature gets -X/-X until end of turn. (Activate each exhaust ability only once.)
+SVar:X:Count$xPaid
+DeckHints:Type$Artifact
+DeckHas:Keyword$Ward
+Oracle:Ward—Pay 2 life.\nArtifacts you control have "Ward—Pay 2 life."\nExhaust — {2}{U}{B}, {T}, Exile X artifact cards from your graveyard: Each other nonartifact creature gets -X/-X until end of turn. (Activate each exhaust ability only once.)
\ No newline at end of file
diff --git a/forge-gui/res/tokenscripts/r_4_4_dinosaur_dragon_flying.txt b/forge-gui/res/tokenscripts/r_4_4_dinosaur_dragon_flying.txt
new file mode 100644
index 00000000000..23d5fe6dec3
--- /dev/null
+++ b/forge-gui/res/tokenscripts/r_4_4_dinosaur_dragon_flying.txt
@@ -0,0 +1,6 @@
+Name:Dinosaur Dragon Token
+ManaCost:no cost
+Types:Creature Dinosaur Dragon
+PT:4/4
+K:Flying
+Oracle:Flying
\ No newline at end of file
From d52590af7f56469e666bef5f0c0f4ddaa0217dd9 Mon Sep 17 00:00:00 2001
From: Fulgur14 <54345051+Fulgur14@users.noreply.github.com>
Date: Wed, 22 Jan 2025 23:14:58 +0100
Subject: [PATCH 11/13] Brightfield Mustang and Thopter Fabricator
---
.../res/cardsfolder/upcoming/brightfield_mustang.txt | 10 ++++++++++
.../res/cardsfolder/upcoming/thopter_fabricator.txt | 10 ++++++++++
2 files changed, 20 insertions(+)
create mode 100644 forge-gui/res/cardsfolder/upcoming/brightfield_mustang.txt
create mode 100644 forge-gui/res/cardsfolder/upcoming/thopter_fabricator.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/brightfield_mustang.txt b/forge-gui/res/cardsfolder/upcoming/brightfield_mustang.txt
new file mode 100644
index 00000000000..56c97017cfa
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/brightfield_mustang.txt
@@ -0,0 +1,10 @@
+Name:Brightfield Mustang
+ManaCost:3 W
+Types:Creature Horse Mount
+PT:3/3
+T:Mode$ Attacks | ValidCard$ Card.Self+IsSaddled | TriggerZones$ Battlefield | Execute$ TrigUntap | TriggerDescription$ Whenever this creature attacks while saddled, untap it and put a +1/+1 counter on it.
+SVar:TrigUntap:DB$ Untap | Defined$ Self | SubAbility$ DBPutCounter
+SVar:DBPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
+K:Saddle:1
+DeckHas:Ability$Counters
+Oracle:Whenever this creature attacks while saddled, untap it and put a +1/+1 counter on it.\nSaddle 1 (Tap any number of other creatures you control with total power 1 or more: This Mount becomes saddled until end of turn. Saddle only as a sorcery.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/thopter_fabricator.txt b/forge-gui/res/cardsfolder/upcoming/thopter_fabricator.txt
new file mode 100644
index 00000000000..dd40c06981e
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/thopter_fabricator.txt
@@ -0,0 +1,10 @@
+Name:Thopter Fabricator
+ManaCost:2 U
+Types:Artifact Vehicle
+PT:4/4
+K:Flying
+T:Mode$ Drawn | ValidCard$ Card.YouCtrl | Number$ 2 | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever you draw your second card each turn, create a 1/1 colorless Thopter artifact creature token with flying.
+SVar:TrigToken:DB$ Token | TokenScript$ c_1_1_a_thopter_flying
+K:Crew:2
+DeckHas:Ability$Token
+Oracle:Flying\nWhenever you draw your second card each turn, create a 1/1 colorless Thopter artifact creature token with flying.\nCrew 2
\ No newline at end of file
From 56606e0ac2f90df9cac067993e89ddde21f8f0f2 Mon Sep 17 00:00:00 2001
From: Hans Mackowiak
Date: Thu, 23 Jan 2025 07:36:22 +0100
Subject: [PATCH 12/13] ~ LF
---
.../upcoming/aatchik_emerald_radian.txt | 26 +++++++-------
.../cardsfolder/upcoming/agonasaur_rex.txt | 20 +++++------
.../upcoming/air_response_unit.txt | 14 ++++----
.../upcoming/apocalypse_runner.txt | 16 ++++-----
.../upcoming/basri_tomorrows_champion.txt | 20 +++++------
.../cardsfolder/upcoming/bleachbone_verge.txt | 12 +++----
.../res/cardsfolder/upcoming/boommobile.txt | 22 ++++++------
.../cardsfolder/upcoming/boosted_sloop.txt | 18 +++++-----
.../upcoming/brightfield_mustang.txt | 18 +++++-----
.../res/cardsfolder/upcoming/bulwark_ox.txt | 18 +++++-----
.../upcoming/captain_howler_sea_scourge.txt | 24 ++++++-------
.../upcoming/caradora_heart_of_alacria.txt | 20 +++++------
.../upcoming/chandra_spark_hunter.txt | 34 +++++++++----------
.../upcoming/cloudspire_skycycle.txt | 20 +++++------
.../cardsfolder/upcoming/count_on_luck.txt | 18 +++++-----
.../upcoming/cryptcaller_chariot.txt | 18 +++++-----
.../upcoming/draconautics_engineer.txt | 18 +++++-----
.../upcoming/fearless_swashbuckler.txt | 24 ++++++-------
.../upcoming/guidelight_pathmaker.txt | 24 ++++++-------
.../upcoming/hashaton_scarabs_fist.txt | 14 ++++----
.../res/cardsfolder/upcoming/hulldrifter.txt | 16 ++++-----
.../upcoming/kolodin_triumph_caster.txt | 22 ++++++------
.../upcoming/lagorin_soul_of_alacria.txt | 16 ++++-----
.../cardsfolder/upcoming/lifecraft_engine.txt | 20 +++++------
.../upcoming/lightshield_parry.txt | 10 +++---
.../upcoming/loot_the_pathfinder.txt | 20 +++++------
.../cardsfolder/upcoming/midnight_mangler.txt | 14 ++++----
.../res/cardsfolder/upcoming/night_market.txt | 18 +++++-----
.../cardsfolder/upcoming/oildeep_gearhulk.txt | 22 ++++++------
.../upcoming/pia_nalaar_chief_mechanic.txt | 22 ++++++------
.../upcoming/prowcatcher_specialist.txt | 16 ++++-----
.../upcoming/pyrewood_gearhulk.txt | 24 ++++++-------
.../res/cardsfolder/upcoming/quag_feast.txt | 16 ++++-----
.../upcoming/rangers_aetherhive.txt | 18 +++++-----
.../upcoming/redshift_rocketeer_chief.txt | 18 +++++-----
.../cardsfolder/upcoming/repurposing_bay.txt | 14 ++++----
.../cardsfolder/upcoming/riverpyre_verge.txt | 12 +++----
.../upcoming/rocketeer_boostbuggy.txt | 20 +++++------
.../upcoming/sab_sunen_luxa_embodied.txt | 26 +++++++-------
.../upcoming/saheeli_radiant_creator.txt | 22 ++++++------
.../upcoming/sita_varma_masker_racer.txt | 20 +++++------
.../cardsfolder/upcoming/sunbillow_verge.txt | 12 +++----
.../upcoming/temmet_naktamuns_will.txt | 24 ++++++-------
.../cardsfolder/upcoming/the_aetherspark.txt | 30 ++++++++--------
.../cardsfolder/upcoming/the_last_ride.txt | 16 ++++-----
.../upcoming/thopter_fabricator.txt | 18 +++++-----
.../upcoming/thunderous_velocipede.txt | 18 +++++-----
.../cardsfolder/upcoming/venomsac_lagac.txt | 16 ++++-----
.../cardsfolder/upcoming/voyager_glidecar.txt | 20 +++++------
.../cardsfolder/upcoming/wastewood_verge.txt | 12 +++----
.../cardsfolder/upcoming/willowrush_verge.txt | 12 +++----
.../upcoming/winter_cursed_raider.txt | 20 +++++------
52 files changed, 491 insertions(+), 491 deletions(-)
diff --git a/forge-gui/res/cardsfolder/upcoming/aatchik_emerald_radian.txt b/forge-gui/res/cardsfolder/upcoming/aatchik_emerald_radian.txt
index 0be9f10f0c6..234cfe94194 100644
--- a/forge-gui/res/cardsfolder/upcoming/aatchik_emerald_radian.txt
+++ b/forge-gui/res/cardsfolder/upcoming/aatchik_emerald_radian.txt
@@ -1,13 +1,13 @@
-Name:Aatchik, Emerald Radian
-ManaCost:3 B B G
-Types:Legendary Creature Insect Druid
-PT:3/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When NICKNAME enters, create a 1/1 green Insect creature token for each artifact and/or creature card in your graveyard.
-SVar:TrigToken:DB$ Token | TokenAmount$ X | TokenScript$ g_1_1_insect
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Insect.YouCtrl+Other | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever another Insect you control dies, put a +1/+1 counter on NICKNAME. Each opponent loses 1 life.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBLoseLife
-SVar:DBLoseLife:DB$ LoseLife | Defined$ Player.Opponent | LifeAmount$ 1
-SVar:X:Count$ValidGraveyard Artifact.YouOwn,Creature.YouOwn
-DeckHas:Ability$Token
-DeckHints:Type$Insect
-Oracle:When Aatchik enters, create a 1/1 green Insect creature token for each artifact and/or creature card in your graveyard.\nWhenever another Insect you control dies, put a +1/+1 counter on Aatchik. Each opponent loses 1 life.
+Name:Aatchik, Emerald Radian
+ManaCost:3 B B G
+Types:Legendary Creature Insect Druid
+PT:3/3
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When NICKNAME enters, create a 1/1 green Insect creature token for each artifact and/or creature card in your graveyard.
+SVar:TrigToken:DB$ Token | TokenAmount$ X | TokenScript$ g_1_1_insect
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Insect.YouCtrl+Other | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever another Insect you control dies, put a +1/+1 counter on NICKNAME. Each opponent loses 1 life.
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBLoseLife
+SVar:DBLoseLife:DB$ LoseLife | Defined$ Player.Opponent | LifeAmount$ 1
+SVar:X:Count$ValidGraveyard Artifact.YouOwn,Creature.YouOwn
+DeckHas:Ability$Token
+DeckHints:Type$Insect
+Oracle:When Aatchik enters, create a 1/1 green Insect creature token for each artifact and/or creature card in your graveyard.\nWhenever another Insect you control dies, put a +1/+1 counter on Aatchik. Each opponent loses 1 life.
diff --git a/forge-gui/res/cardsfolder/upcoming/agonasaur_rex.txt b/forge-gui/res/cardsfolder/upcoming/agonasaur_rex.txt
index 778ff685e62..ac77e040d50 100644
--- a/forge-gui/res/cardsfolder/upcoming/agonasaur_rex.txt
+++ b/forge-gui/res/cardsfolder/upcoming/agonasaur_rex.txt
@@ -1,11 +1,11 @@
-Name:Agonasaur Rex
-ManaCost:3 G G
-Types:Creature Dinosaur
-PT:8/8
-K:Trample
-K:Cycling:2 G
-T:Mode$ Cycled | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerDescription$ When you cycle this card, put two +1/+1 counters on up to one target creature or Vehicle. It gains trample and indestructible until end of turn.
-SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature,Vehicle | TgtPrompt$ Select target creature or Vehicle | TargetMin$ 0 | TargetMax$ 1 | CounterType$ P1P1 | CounterNum$ 2 | SubAbility$ DBPump
-SVar:DBPump:DB$ Pump | Defined$ Targeted | KW$ Trample & Indestructible
-DeckHas:Ability$Counters
+Name:Agonasaur Rex
+ManaCost:3 G G
+Types:Creature Dinosaur
+PT:8/8
+K:Trample
+K:Cycling:2 G
+T:Mode$ Cycled | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerDescription$ When you cycle this card, put two +1/+1 counters on up to one target creature or Vehicle. It gains trample and indestructible until end of turn.
+SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature,Vehicle | TgtPrompt$ Select target creature or Vehicle | TargetMin$ 0 | TargetMax$ 1 | CounterType$ P1P1 | CounterNum$ 2 | SubAbility$ DBPump
+SVar:DBPump:DB$ Pump | Defined$ Targeted | KW$ Trample & Indestructible
+DeckHas:Ability$Counters
Oracle:Trample\nCycling {2}{G} ({2}{G}, Discard this card: Draw a card.)\nWhen you cycle this card, put two +1/+1 counters on up to one target creature or Vehicle. It gains trample and indestructible until end of turn.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/air_response_unit.txt b/forge-gui/res/cardsfolder/upcoming/air_response_unit.txt
index 47ada2f9779..5d7b5d4d528 100644
--- a/forge-gui/res/cardsfolder/upcoming/air_response_unit.txt
+++ b/forge-gui/res/cardsfolder/upcoming/air_response_unit.txt
@@ -1,8 +1,8 @@
-Name:Air Response Unit
-ManaCost:2 W
-Types:Artifact Vehicle
-PT:3/3
-K:Flying
-K:Vigilance
-K:Crew:1
+Name:Air Response Unit
+ManaCost:2 W
+Types:Artifact Vehicle
+PT:3/3
+K:Flying
+K:Vigilance
+K:Crew:1
Oracle:Flying, vigilance\nCrew 1 (Tap any number of creatures you control with total power 1 or more: This Vehicle becomes an artifact creature until end of turn.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/apocalypse_runner.txt b/forge-gui/res/cardsfolder/upcoming/apocalypse_runner.txt
index b9429cfb194..2a80d15d5e6 100644
--- a/forge-gui/res/cardsfolder/upcoming/apocalypse_runner.txt
+++ b/forge-gui/res/cardsfolder/upcoming/apocalypse_runner.txt
@@ -1,9 +1,9 @@
-Name:Apocalypse Runner
-ManaCost:2 B R
-Types:Artifact Vehicle
-PT:6/5
-A:AB$ Pump | Cost$ T | ValidTgts$ Creature.powerLE2+YouCtrl | TgtPrompt$ Select target creature you control with power 2 or less | KW$ Lifelink | SubAbility$ DBUnblockable | SpellDescription$ Target creature you control with power 2 or less gains lifelink until end of turn and can't be blocked this turn.
-SVar:DBUnblockable:DB$ Effect | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable
-SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ This creature can't be blocked this turn.
-K:Crew:3
+Name:Apocalypse Runner
+ManaCost:2 B R
+Types:Artifact Vehicle
+PT:6/5
+A:AB$ Pump | Cost$ T | ValidTgts$ Creature.powerLE2+YouCtrl | TgtPrompt$ Select target creature you control with power 2 or less | KW$ Lifelink | SubAbility$ DBUnblockable | SpellDescription$ Target creature you control with power 2 or less gains lifelink until end of turn and can't be blocked this turn.
+SVar:DBUnblockable:DB$ Effect | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ This creature can't be blocked this turn.
+K:Crew:3
Oracle:{T}: Target creature you control with power 2 or less gains lifelink until end of turn and can't be blocked this turn.\nCrew 3 (Tap any number of creatures you control with total power 3 or more: This Vehicle becomes an artifact creature until end of turn.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/basri_tomorrows_champion.txt b/forge-gui/res/cardsfolder/upcoming/basri_tomorrows_champion.txt
index 6aa8c787fd9..e2f7777801d 100644
--- a/forge-gui/res/cardsfolder/upcoming/basri_tomorrows_champion.txt
+++ b/forge-gui/res/cardsfolder/upcoming/basri_tomorrows_champion.txt
@@ -1,10 +1,10 @@
-Name:Basri, Tomorrow's Champion
-ManaCost:W
-Types:Legendary Creature Human Knight
-PT:2/1
-A:AB$ Token | Cost$ W T Exert<1/NICKNAME> | TokenAmount$ 1 | TokenScript$ w_1_1_cat_lifelink | TokenOwner$ You | SpellDescription$ Create a 1/1 white Cat creature token with lifelink. (An exerted creature won't untap during your next untap step.)
-K:Cycling:2 W
-T:Mode$ Cycled | ValidCard$ Card.Self | Execute$ TrigPumpAll | TriggerDescription$ When you cycle this card, Cats you control gain hexproof and indestructible until end of turn.
-SVar:TrigPumpAll:DB$ PumpAll | ValidCards$ Cat.YouCtrl | KW$ Hexproof & Indestructible
-DeckHas:Ability$Token
-Oracle:{W}, {T}, Exert Basri: Create a 1/1 white Cat creature token with lifelink. (An exerted creature won't untap during your next untap step.)\nCycling {2}{W} ({2}{W}, Discard this card: Draw a card.)\nWhen you cycle this card, Cats you control gain hexproof and indestructible until end of turn.
+Name:Basri, Tomorrow's Champion
+ManaCost:W
+Types:Legendary Creature Human Knight
+PT:2/1
+A:AB$ Token | Cost$ W T Exert<1/NICKNAME> | TokenAmount$ 1 | TokenScript$ w_1_1_cat_lifelink | TokenOwner$ You | SpellDescription$ Create a 1/1 white Cat creature token with lifelink. (An exerted creature won't untap during your next untap step.)
+K:Cycling:2 W
+T:Mode$ Cycled | ValidCard$ Card.Self | Execute$ TrigPumpAll | TriggerDescription$ When you cycle this card, Cats you control gain hexproof and indestructible until end of turn.
+SVar:TrigPumpAll:DB$ PumpAll | ValidCards$ Cat.YouCtrl | KW$ Hexproof & Indestructible
+DeckHas:Ability$Token
+Oracle:{W}, {T}, Exert Basri: Create a 1/1 white Cat creature token with lifelink. (An exerted creature won't untap during your next untap step.)\nCycling {2}{W} ({2}{W}, Discard this card: Draw a card.)\nWhen you cycle this card, Cats you control gain hexproof and indestructible until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/bleachbone_verge.txt b/forge-gui/res/cardsfolder/upcoming/bleachbone_verge.txt
index da9d97d5c85..980e6a35f37 100644
--- a/forge-gui/res/cardsfolder/upcoming/bleachbone_verge.txt
+++ b/forge-gui/res/cardsfolder/upcoming/bleachbone_verge.txt
@@ -1,6 +1,6 @@
-Name:Bleachbone Verge
-ManaCost:no cost
-Types:Land
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
-A:AB$ Mana | Cost$ T | Produced$ W | IsPresent$ Plains.YouCtrl,Swamp.YouCtrl | SpellDescription$ Add {W}. Activate only if you control a Plains or a Swamp.
-Oracle:{T}: Add {B}.\n{T}: Add {W}. Activate only if you control a Plains or a Swamp.
+Name:Bleachbone Verge
+ManaCost:no cost
+Types:Land
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
+A:AB$ Mana | Cost$ T | Produced$ W | IsPresent$ Plains.YouCtrl,Swamp.YouCtrl | SpellDescription$ Add {W}. Activate only if you control a Plains or a Swamp.
+Oracle:{T}: Add {B}.\n{T}: Add {W}. Activate only if you control a Plains or a Swamp.
diff --git a/forge-gui/res/cardsfolder/upcoming/boommobile.txt b/forge-gui/res/cardsfolder/upcoming/boommobile.txt
index fe5dad708dd..952a364d9f9 100644
--- a/forge-gui/res/cardsfolder/upcoming/boommobile.txt
+++ b/forge-gui/res/cardsfolder/upcoming/boommobile.txt
@@ -1,12 +1,12 @@
-Name:Boommobile
-ManaCost:2 R R
-Types:Artifact Vehicle
-PT:5/5
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMana | TriggerDescription$ When this Vehicle enters, add four mana of any one color. Spend this mana only to activate abilities.
-SVar:TrigMana:DB$ Mana | Produced$ Any | Amount$ 4 | RestrictValid$ Activated
-A:AB$ DealDamage | Cost$ X 2 R T | ValidTgts$ Any | NumDmg$ X | Exhaust$ True | SubAbility$ DBPutCounter | SpellDescription$ This Vehicle deals X damage to any target. Put a +1/+1 counter on this Vehicle. (Activate each exhaust ability only once.)
-SVar:DBPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
-K:Crew:2
-SVar:X:Count$xPaid
-DeckHas:Ability$Counters
+Name:Boommobile
+ManaCost:2 R R
+Types:Artifact Vehicle
+PT:5/5
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMana | TriggerDescription$ When this Vehicle enters, add four mana of any one color. Spend this mana only to activate abilities.
+SVar:TrigMana:DB$ Mana | Produced$ Any | Amount$ 4 | RestrictValid$ Activated
+A:AB$ DealDamage | Cost$ X 2 R T | ValidTgts$ Any | NumDmg$ X | Exhaust$ True | SubAbility$ DBPutCounter | SpellDescription$ This Vehicle deals X damage to any target. Put a +1/+1 counter on this Vehicle. (Activate each exhaust ability only once.)
+SVar:DBPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
+K:Crew:2
+SVar:X:Count$xPaid
+DeckHas:Ability$Counters
Oracle:When this Vehicle enters, add four mana of any one color. Spend this mana only to activate abilities.\nExhaust — {X}{2}{R}: This Vehicle deals X damage to any target. Put a +1/+1 counter on this Vehicle. (Activate each exhaust ability only once.)\nCrew 2
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/boosted_sloop.txt b/forge-gui/res/cardsfolder/upcoming/boosted_sloop.txt
index c17f8af56d5..d5eeeeff2ec 100644
--- a/forge-gui/res/cardsfolder/upcoming/boosted_sloop.txt
+++ b/forge-gui/res/cardsfolder/upcoming/boosted_sloop.txt
@@ -1,10 +1,10 @@
-Name:Boosted Sloop
-ManaCost:1 U R
-Types:Artifact Vehicle
-PT:3/3
-K:Menace
-T:Mode$ AttackersDeclared | AttackingPlayer$ You | Execute$ TrigDraw | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack, draw a card, then discard a card.
-SVar:TrigDraw:DB$ Draw | SubAbility$ DBDiscard
-SVar:DBDiscard:DB$ Discard | Defined$ You | NumCards$ 1 | Mode$ TgtChoose
-K:Crew:1
+Name:Boosted Sloop
+ManaCost:1 U R
+Types:Artifact Vehicle
+PT:3/3
+K:Menace
+T:Mode$ AttackersDeclared | AttackingPlayer$ You | Execute$ TrigDraw | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack, draw a card, then discard a card.
+SVar:TrigDraw:DB$ Draw | SubAbility$ DBDiscard
+SVar:DBDiscard:DB$ Discard | Defined$ You | NumCards$ 1 | Mode$ TgtChoose
+K:Crew:1
Oracle:Menace\nWhenever you attack, draw a card, then discard a card.\nCrew 1 (Tap any number of creatures you control with total power 1 or more: This Vehicle becomes an artifact creature until end of turn.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/brightfield_mustang.txt b/forge-gui/res/cardsfolder/upcoming/brightfield_mustang.txt
index 56c97017cfa..42cef1b7581 100644
--- a/forge-gui/res/cardsfolder/upcoming/brightfield_mustang.txt
+++ b/forge-gui/res/cardsfolder/upcoming/brightfield_mustang.txt
@@ -1,10 +1,10 @@
-Name:Brightfield Mustang
-ManaCost:3 W
-Types:Creature Horse Mount
-PT:3/3
-T:Mode$ Attacks | ValidCard$ Card.Self+IsSaddled | TriggerZones$ Battlefield | Execute$ TrigUntap | TriggerDescription$ Whenever this creature attacks while saddled, untap it and put a +1/+1 counter on it.
-SVar:TrigUntap:DB$ Untap | Defined$ Self | SubAbility$ DBPutCounter
-SVar:DBPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
-K:Saddle:1
-DeckHas:Ability$Counters
+Name:Brightfield Mustang
+ManaCost:3 W
+Types:Creature Horse Mount
+PT:3/3
+T:Mode$ Attacks | ValidCard$ Card.Self+IsSaddled | TriggerZones$ Battlefield | Execute$ TrigUntap | TriggerDescription$ Whenever this creature attacks while saddled, untap it and put a +1/+1 counter on it.
+SVar:TrigUntap:DB$ Untap | Defined$ Self | SubAbility$ DBPutCounter
+SVar:DBPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
+K:Saddle:1
+DeckHas:Ability$Counters
Oracle:Whenever this creature attacks while saddled, untap it and put a +1/+1 counter on it.\nSaddle 1 (Tap any number of other creatures you control with total power 1 or more: This Mount becomes saddled until end of turn. Saddle only as a sorcery.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/bulwark_ox.txt b/forge-gui/res/cardsfolder/upcoming/bulwark_ox.txt
index b968f56dbbe..07926efe341 100644
--- a/forge-gui/res/cardsfolder/upcoming/bulwark_ox.txt
+++ b/forge-gui/res/cardsfolder/upcoming/bulwark_ox.txt
@@ -1,10 +1,10 @@
-Name:Bulwark Ox
-ManaCost:1 W
-Types:Creature Ox Mount
-PT:2/2
-T:Mode$ Attacks | ValidCard$ Card.Self+IsSaddled | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever this creature attacks while saddled, put a +1/+1 counter on target creature.
-SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature | TgtPrompt$ Select target creature | CounterType$ P1P1
-A:AB$ PumpAll | Cost$ Sac<1/CARDNAME> | ValidCards$ Creature.YouCtrl+HasCounters | KW$ Hexproof & Indestructible | SpellDescription$ Creatures you control with counters on them gain hexproof and indestructible until end of turn.
-K:Saddle:1
-DeckHas:Ability$Counters
+Name:Bulwark Ox
+ManaCost:1 W
+Types:Creature Ox Mount
+PT:2/2
+T:Mode$ Attacks | ValidCard$ Card.Self+IsSaddled | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever this creature attacks while saddled, put a +1/+1 counter on target creature.
+SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature | TgtPrompt$ Select target creature | CounterType$ P1P1
+A:AB$ PumpAll | Cost$ Sac<1/CARDNAME> | ValidCards$ Creature.YouCtrl+HasCounters | KW$ Hexproof & Indestructible | SpellDescription$ Creatures you control with counters on them gain hexproof and indestructible until end of turn.
+K:Saddle:1
+DeckHas:Ability$Counters
Oracle:Whenever this creature attacks while saddled, put a +1/+1 counter on target creature.\nSacrifice this creature: Creatures you control with counters on them gain hexproof and indestructible until end of turn.\nSaddle 1 (Tap any number of other creatures you control with total power 1 or more: This Mount becomes saddled until end of turn. Saddle only as a sorcery.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/captain_howler_sea_scourge.txt b/forge-gui/res/cardsfolder/upcoming/captain_howler_sea_scourge.txt
index 0196486d2ec..68778c55dea 100644
--- a/forge-gui/res/cardsfolder/upcoming/captain_howler_sea_scourge.txt
+++ b/forge-gui/res/cardsfolder/upcoming/captain_howler_sea_scourge.txt
@@ -1,13 +1,13 @@
-Name:Captain Howler, Sea Scourge
-ManaCost:2 U R
-Types:Legendary Creature Shark Pirate
-PT:5/4
-K:Ward:2 PayLife<2>
-T:Mode$ DiscardedAll | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever you discard one or more cards, target creature gets +2/+0 until end of turn for each card discarded this way. Whenever that creature deals combat damage to a player this turn, you draw a card.
-SVar:TrigPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ X | SubAbility$ DBEffect
-SVar:DBEffect:DB$ Effect | RememberObjects$ Targeted | Triggers$ TrigDamage
-SVar:TrigDamage:Mode$ DamageDone | ValidSource$ Creature.IsRemembered | ValidTarget$ Player | Execute$ TrigDraw | CombatDamage$ True | TriggerDescription$ Whenever that creature deals combat damage to a player this turn, you draw a card.
-SVar:TrigDraw:DB$ Draw
-SVar:X:TriggerCount$Amount/Twice
-DeckHints:Ability$Discard
+Name:Captain Howler, Sea Scourge
+ManaCost:2 U R
+Types:Legendary Creature Shark Pirate
+PT:5/4
+K:Ward:2 PayLife<2>
+T:Mode$ DiscardedAll | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever you discard one or more cards, target creature gets +2/+0 until end of turn for each card discarded this way. Whenever that creature deals combat damage to a player this turn, you draw a card.
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ X | SubAbility$ DBEffect
+SVar:DBEffect:DB$ Effect | RememberObjects$ Targeted | Triggers$ TrigDamage
+SVar:TrigDamage:Mode$ DamageDone | ValidSource$ Creature.IsRemembered | ValidTarget$ Player | Execute$ TrigDraw | CombatDamage$ True | TriggerDescription$ Whenever that creature deals combat damage to a player this turn, you draw a card.
+SVar:TrigDraw:DB$ Draw
+SVar:X:TriggerCount$Amount/Twice
+DeckHints:Ability$Discard
Oracle:Ward—{2}, Pay 2 life.\nWhenever you discard one or more cards, target creature gets +2/+0 until end of turn for each card discarded this way. Whenever that creature deals combat damage to a player this turn, you draw a card.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/caradora_heart_of_alacria.txt b/forge-gui/res/cardsfolder/upcoming/caradora_heart_of_alacria.txt
index 261e731ca16..15042b42c71 100644
--- a/forge-gui/res/cardsfolder/upcoming/caradora_heart_of_alacria.txt
+++ b/forge-gui/res/cardsfolder/upcoming/caradora_heart_of_alacria.txt
@@ -1,10 +1,10 @@
-Name:Caradora, Heart of Alacria
-ManaCost:2 G W
-Types:Legendary Creature Human Knight
-PT:4/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ When NICKNAME enters, you may search your library for a Mount or Vehicle card, reveal it, put it into your hand, then shuffle.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Mount,Vehicle | ShuffleNonMandatory$ True
-R:Event$ AddCounter | ActiveZones$ Battlefield | ValidCard$ Creature.YouCtrl+inZoneBattlefield,Vehicle.YouCtrl+inZoneBattlefield | ValidCounterType$ P1P1 | ReplaceWith$ AddOneMoreCounters | Description$ If one or more +1/+1 counters would be put on a creature or Vehicle you control, that many plus one +1/+1 counters are put on it instead.
-SVar:AddOneMoreCounters:DB$ ReplaceCounter | ValidCounterType$ P1P1 | ChooseCounter$ True | Amount$ X
-SVar:X:ReplaceCount$CounterNum/Plus.1
-Oracle:When Caradora enters, you may search your library for a Mount or Vehicle card, reveal it, put it into your hand, then shuffle.\nIf one or more +1/+1 counters would be put on a creature or Vehicle you control, that many plus one +1/+1 counters are put on it instead.
+Name:Caradora, Heart of Alacria
+ManaCost:2 G W
+Types:Legendary Creature Human Knight
+PT:4/2
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ When NICKNAME enters, you may search your library for a Mount or Vehicle card, reveal it, put it into your hand, then shuffle.
+SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Mount,Vehicle | ShuffleNonMandatory$ True
+R:Event$ AddCounter | ActiveZones$ Battlefield | ValidCard$ Creature.YouCtrl+inZoneBattlefield,Vehicle.YouCtrl+inZoneBattlefield | ValidCounterType$ P1P1 | ReplaceWith$ AddOneMoreCounters | Description$ If one or more +1/+1 counters would be put on a creature or Vehicle you control, that many plus one +1/+1 counters are put on it instead.
+SVar:AddOneMoreCounters:DB$ ReplaceCounter | ValidCounterType$ P1P1 | ChooseCounter$ True | Amount$ X
+SVar:X:ReplaceCount$CounterNum/Plus.1
+Oracle:When Caradora enters, you may search your library for a Mount or Vehicle card, reveal it, put it into your hand, then shuffle.\nIf one or more +1/+1 counters would be put on a creature or Vehicle you control, that many plus one +1/+1 counters are put on it instead.
diff --git a/forge-gui/res/cardsfolder/upcoming/chandra_spark_hunter.txt b/forge-gui/res/cardsfolder/upcoming/chandra_spark_hunter.txt
index 9b875836ce0..dabe8d4e0c8 100644
--- a/forge-gui/res/cardsfolder/upcoming/chandra_spark_hunter.txt
+++ b/forge-gui/res/cardsfolder/upcoming/chandra_spark_hunter.txt
@@ -1,17 +1,17 @@
-Name:Chandra, Spark Hunter
-ManaCost:3 R
-Types:Legendary Planeswalker Chandra
-Loyalty:4
-T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigAnimate | TriggerDescription$ At the beginning of combat on your turn, choose up to one target Vehicle you control. Until end of turn, it becomes an artifact creature and gains haste.
-SVar:TrigAnimate:DB$ Animate | ValidTgts$ Vehicle | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Choose target Vehicle | Types$ Artifact,Creature | Keywords$ Haste
-A:AB$ GenericChoice | Cost$ AddCounter<2/LOYALTY> | Planeswalker$ True | Choices$ DBSacToDraw,DBDiscardToDraw | SpellDescription$ You may sacrifice an artifact or discard a card. If you do, draw a card.
-SVar:DBSacToDraw:DB$ Draw | UnlessCost$ Sac<1/Artifact> | UnlessPayer$ You | UnlessSwitched$ True | SpellDescription$ Sacrifice an artifact.
-SVar:DBDiscardToDraw:DB$ Draw | UnlessCost$ Discard<1/Card> | UnlessPayer$ You | UnlessSwitched$ True | SpellDescription$ Discard a card.
-A:AB$ Token | Cost$ AddCounter<0/LOYALTY> | Planeswalker$ True | TokenAmount$ 1 | TokenScript$ c_3_2_a_vehicle_crew_1 | TokenOwner$ You | SpellDescription$ Create a 3/2 colorless Vehicle token with crew 1.
-A:AB$ Effect | Cost$ SubCounter<7/LOYALTY> | Name$ Emblem — Chandra, Spark Hunter | Image$ emblem_chandra_spark_hunter | Triggers$ TrigChangesZone | Planeswalker$ True | Ultimate$ True | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "Whenever an artifact you control enters, this emblem deals 3 damage to any target."
-SVar:TrigChangesZone:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Artifact.YouCtrl | TriggerZones$ Battlefield | Execute$ EffDealDamage | TriggerDescription$ Whenever an artifact you control enters, this emblem deals 3 damage to any target.
-SVar:EffDealDamage:DB$ DealDamage | ValidTgts$ Any | NumDmg$ 3
-SVar:PlayMain1:TRUE
-DeckHas:Ability$Sacrifice|Discard|Token
-DeckHints:Type$Artifact|Vehicle
-Oracle:At the beginning of combat on your turn, choose up to one target Vehicle you control. Until end of turn, it becomes an artifact creature and gains haste.\n[+2]: You may sacrifice an artifact or discard a card. If you do, draw a card.\n[0]: Create a 3/2 colorless Vehicle token with crew 1.\n[-7]: You get an emblem with "Whenever an artifact you control enters, this emblem deals 3 damage to any target."
+Name:Chandra, Spark Hunter
+ManaCost:3 R
+Types:Legendary Planeswalker Chandra
+Loyalty:4
+T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigAnimate | TriggerDescription$ At the beginning of combat on your turn, choose up to one target Vehicle you control. Until end of turn, it becomes an artifact creature and gains haste.
+SVar:TrigAnimate:DB$ Animate | ValidTgts$ Vehicle | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Choose target Vehicle | Types$ Artifact,Creature | Keywords$ Haste
+A:AB$ GenericChoice | Cost$ AddCounter<2/LOYALTY> | Planeswalker$ True | Choices$ DBSacToDraw,DBDiscardToDraw | SpellDescription$ You may sacrifice an artifact or discard a card. If you do, draw a card.
+SVar:DBSacToDraw:DB$ Draw | UnlessCost$ Sac<1/Artifact> | UnlessPayer$ You | UnlessSwitched$ True | SpellDescription$ Sacrifice an artifact.
+SVar:DBDiscardToDraw:DB$ Draw | UnlessCost$ Discard<1/Card> | UnlessPayer$ You | UnlessSwitched$ True | SpellDescription$ Discard a card.
+A:AB$ Token | Cost$ AddCounter<0/LOYALTY> | Planeswalker$ True | TokenAmount$ 1 | TokenScript$ c_3_2_a_vehicle_crew_1 | TokenOwner$ You | SpellDescription$ Create a 3/2 colorless Vehicle token with crew 1.
+A:AB$ Effect | Cost$ SubCounter<7/LOYALTY> | Name$ Emblem — Chandra, Spark Hunter | Image$ emblem_chandra_spark_hunter | Triggers$ TrigChangesZone | Planeswalker$ True | Ultimate$ True | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "Whenever an artifact you control enters, this emblem deals 3 damage to any target."
+SVar:TrigChangesZone:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Artifact.YouCtrl | TriggerZones$ Battlefield | Execute$ EffDealDamage | TriggerDescription$ Whenever an artifact you control enters, this emblem deals 3 damage to any target.
+SVar:EffDealDamage:DB$ DealDamage | ValidTgts$ Any | NumDmg$ 3
+SVar:PlayMain1:TRUE
+DeckHas:Ability$Sacrifice|Discard|Token
+DeckHints:Type$Artifact|Vehicle
+Oracle:At the beginning of combat on your turn, choose up to one target Vehicle you control. Until end of turn, it becomes an artifact creature and gains haste.\n[+2]: You may sacrifice an artifact or discard a card. If you do, draw a card.\n[0]: Create a 3/2 colorless Vehicle token with crew 1.\n[-7]: You get an emblem with "Whenever an artifact you control enters, this emblem deals 3 damage to any target."
diff --git a/forge-gui/res/cardsfolder/upcoming/cloudspire_skycycle.txt b/forge-gui/res/cardsfolder/upcoming/cloudspire_skycycle.txt
index 98f3f7dc7ff..0a8b5ee6ab7 100644
--- a/forge-gui/res/cardsfolder/upcoming/cloudspire_skycycle.txt
+++ b/forge-gui/res/cardsfolder/upcoming/cloudspire_skycycle.txt
@@ -1,11 +1,11 @@
-Name:Cloudspire Skycycle
-ManaCost:2 R W
-Types:Artifact Vehicle
-PT:2/3
-K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerDescription$ When this Vehicle enters, distribute two +1/+1 counters among one or two other target Vehicles and/or creatures you control.
-SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature.YouCtrl+Other,Vehicle.YouCtrl+Other | TgtPrompt$ Select another target creature or Vehicle you control to distribute counters to | CounterType$ P1P1 | CounterNum$ 2 | TargetMin$ 1 | TargetMax$ 2 | DividedAsYouChoose$ 2
-K:Crew:1
-SVar:PlayMain1:TRUE
-DeckHas:Ability$Counters
+Name:Cloudspire Skycycle
+ManaCost:2 R W
+Types:Artifact Vehicle
+PT:2/3
+K:Flying
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerDescription$ When this Vehicle enters, distribute two +1/+1 counters among one or two other target Vehicles and/or creatures you control.
+SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature.YouCtrl+Other,Vehicle.YouCtrl+Other | TgtPrompt$ Select another target creature or Vehicle you control to distribute counters to | CounterType$ P1P1 | CounterNum$ 2 | TargetMin$ 1 | TargetMax$ 2 | DividedAsYouChoose$ 2
+K:Crew:1
+SVar:PlayMain1:TRUE
+DeckHas:Ability$Counters
Oracle:Flying\nWhen this Vehicle enters, distribute two +1/+1 counters among one or two other target Vehicles and/or creatures you control.\nCrew 1
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/count_on_luck.txt b/forge-gui/res/cardsfolder/upcoming/count_on_luck.txt
index 66aa349b0ec..906fde9750b 100644
--- a/forge-gui/res/cardsfolder/upcoming/count_on_luck.txt
+++ b/forge-gui/res/cardsfolder/upcoming/count_on_luck.txt
@@ -1,10 +1,10 @@
-Name:Count on Luck
-ManaCost:R R R
-Types:Enchantment
-PT:4/4
-T:Mode$ Phase | Phase$ Upkeep | TriggerZones$ Battlefield | ValidPlayer$ You | Execute$ TrigExile | TriggerDescription$ At the beginning of your upkeep, exile the top card of your library. You may play it this turn.
-SVar:TrigExile:DB$ Dig | Defined$ You | DigNum$ 1 | ChangeNum$ All | DestinationZone$ Exile | RememberChanged$ True | SubAbility$ DBEffectYou
-SVar:DBEffectYou:DB$ Effect | RememberObjects$ RememberedCard | StaticAbilities$ Play | SubAbility$ DBCleanup | ExileOnMoved$ Exile
-SVar:Play:Mode$ Continuous | MayPlay$ True | EffectZone$ Command | Affected$ Card.IsRemembered | AffectedZone$ Exile | Description$ You may play the exiled card this turn.
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+Name:Count on Luck
+ManaCost:R R R
+Types:Enchantment
+PT:4/4
+T:Mode$ Phase | Phase$ Upkeep | TriggerZones$ Battlefield | ValidPlayer$ You | Execute$ TrigExile | TriggerDescription$ At the beginning of your upkeep, exile the top card of your library. You may play it this turn.
+SVar:TrigExile:DB$ Dig | Defined$ You | DigNum$ 1 | ChangeNum$ All | DestinationZone$ Exile | RememberChanged$ True | SubAbility$ DBEffectYou
+SVar:DBEffectYou:DB$ Effect | RememberObjects$ RememberedCard | StaticAbilities$ Play | SubAbility$ DBCleanup | ExileOnMoved$ Exile
+SVar:Play:Mode$ Continuous | MayPlay$ True | EffectZone$ Command | Affected$ Card.IsRemembered | AffectedZone$ Exile | Description$ You may play the exiled card this turn.
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
Oracle:At the beginning of your upkeep, exile the top card of your library. You may play that card this turn.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/cryptcaller_chariot.txt b/forge-gui/res/cardsfolder/upcoming/cryptcaller_chariot.txt
index e5d88646d6f..fa3e3012763 100644
--- a/forge-gui/res/cardsfolder/upcoming/cryptcaller_chariot.txt
+++ b/forge-gui/res/cardsfolder/upcoming/cryptcaller_chariot.txt
@@ -1,10 +1,10 @@
-Name:Cryptcaller Chariot
-ManaCost:3 B
-Types:Artifact Vehicle
-PT:5/5
-K:Menace
-T:Mode$ DiscardedAll | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever you discard one or more cards, create that many tapped 2/2 black Zombie creature tokens.
-SVar:TrigToken:DB$ Token | TokenAmount$ X | TokenScript$ b_2_2_zombie | TokenOwner$ You | TokenTapped$ True
-SVar:X:TriggerCount$Amount
-K:Crew:2
+Name:Cryptcaller Chariot
+ManaCost:3 B
+Types:Artifact Vehicle
+PT:5/5
+K:Menace
+T:Mode$ DiscardedAll | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever you discard one or more cards, create that many tapped 2/2 black Zombie creature tokens.
+SVar:TrigToken:DB$ Token | TokenAmount$ X | TokenScript$ b_2_2_zombie | TokenOwner$ You | TokenTapped$ True
+SVar:X:TriggerCount$Amount
+K:Crew:2
Oracle:Menace\nWhenever you discard one or more cards, create that many tapped 2/2 black Zombie creature tokens.\nCrew 2
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/draconautics_engineer.txt b/forge-gui/res/cardsfolder/upcoming/draconautics_engineer.txt
index 097fcda8012..06d88970c1b 100644
--- a/forge-gui/res/cardsfolder/upcoming/draconautics_engineer.txt
+++ b/forge-gui/res/cardsfolder/upcoming/draconautics_engineer.txt
@@ -1,10 +1,10 @@
-Name:Draconautics Engineer
-ManaCost:1 R
-Types:Creature Goblin Artificer
-PT:2/2
-A:AB$ PumpAll | Cost$ R | ValidCards$ Creature.YouCtrl+StrictlyOther | KW$ Haste | SubAbility$ DBPutCounter | Exhaust$ True | SpellDescription$ Other creatures you control gain haste until end of turn. Put a +1/+1 counter on this creature. (Activate each exhaust ability only once.)
-SVar:DBPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
-A:AB$ Token | Cost$ 3 R | TokenAmount$ 1 | TokenScript$ r_4_4_dinosaur_dragon_flying | TokenOwner$ You | Exhaust$ True | SpellDescription$ Create a 4/4 red Dinosaur Dragon creature token with flying.
-SVar:PlayMain1:TRUE
-DeckHas:Ability$Token|Counters
+Name:Draconautics Engineer
+ManaCost:1 R
+Types:Creature Goblin Artificer
+PT:2/2
+A:AB$ PumpAll | Cost$ R | ValidCards$ Creature.YouCtrl+StrictlyOther | KW$ Haste | SubAbility$ DBPutCounter | Exhaust$ True | SpellDescription$ Other creatures you control gain haste until end of turn. Put a +1/+1 counter on this creature. (Activate each exhaust ability only once.)
+SVar:DBPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
+A:AB$ Token | Cost$ 3 R | TokenAmount$ 1 | TokenScript$ r_4_4_dinosaur_dragon_flying | TokenOwner$ You | Exhaust$ True | SpellDescription$ Create a 4/4 red Dinosaur Dragon creature token with flying.
+SVar:PlayMain1:TRUE
+DeckHas:Ability$Token|Counters
Oracle:Exhaust — {R}: Other creatures you control gain haste until end of turn. Put a +1/+1 counter on this creature. (Activate each exhaust ability only once.)\nExhaust — {3}{R}: Create a 4/4 red Dinosaur Dragon creature token with flying.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/fearless_swashbuckler.txt b/forge-gui/res/cardsfolder/upcoming/fearless_swashbuckler.txt
index 82fdce5a993..fd481dfb4b0 100644
--- a/forge-gui/res/cardsfolder/upcoming/fearless_swashbuckler.txt
+++ b/forge-gui/res/cardsfolder/upcoming/fearless_swashbuckler.txt
@@ -1,13 +1,13 @@
-Name:Fearless Swashbuckler
-ManaCost:1 U R
-Types:Creature Fish Pirate
-PT:3/3
-K:Haste
-S:Mode$ Continuous | Affected$ Vehicle.YouCtrl | AddKeyword$ Haste | Description$ Vehicles you control have haste.
-T:Mode$ AttackersDeclared | AttackingPlayer$ You | Execute$ TrigDraw | CheckSVar$ X | SVarCompare$ EQ2 | NoResolvingCheck$ True | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack, if a Pirate and a Vehicle attacked this combat, draw three cards, then discard two cards.
-SVar:TrigDraw:DB$ Draw | NumCards$ 3 | SubAbility$ DBDiscard
-SVar:DBDiscard:DB$ Discard | NumCards$ 2 | Mode$ TgtChoose | Defined$ You
-SVar:Y:Count$Valid Creature.Pirate+attacking/LimitMax.1
-SVar:Z:Count$Valid Creature.Vehicle+attacking/LimitMax.1
-SVar:X:SVar$Y/Plus.Z
+Name:Fearless Swashbuckler
+ManaCost:1 U R
+Types:Creature Fish Pirate
+PT:3/3
+K:Haste
+S:Mode$ Continuous | Affected$ Vehicle.YouCtrl | AddKeyword$ Haste | Description$ Vehicles you control have haste.
+T:Mode$ AttackersDeclared | AttackingPlayer$ You | Execute$ TrigDraw | CheckSVar$ X | SVarCompare$ EQ2 | NoResolvingCheck$ True | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack, if a Pirate and a Vehicle attacked this combat, draw three cards, then discard two cards.
+SVar:TrigDraw:DB$ Draw | NumCards$ 3 | SubAbility$ DBDiscard
+SVar:DBDiscard:DB$ Discard | NumCards$ 2 | Mode$ TgtChoose | Defined$ You
+SVar:Y:Count$Valid Creature.Pirate+attacking/LimitMax.1
+SVar:Z:Count$Valid Creature.Vehicle+attacking/LimitMax.1
+SVar:X:SVar$Y/Plus.Z
Oracle:Haste\nVehicles you control have haste.\nWhenever you attack, if a Pirate and a Vehicle attacked this combat, draw three cards, then discard two cards.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/guidelight_pathmaker.txt b/forge-gui/res/cardsfolder/upcoming/guidelight_pathmaker.txt
index c4add94a400..48e9e9a28b0 100644
--- a/forge-gui/res/cardsfolder/upcoming/guidelight_pathmaker.txt
+++ b/forge-gui/res/cardsfolder/upcoming/guidelight_pathmaker.txt
@@ -1,13 +1,13 @@
-Name:Guidelight Pathmaker
-ManaCost:4 W U
-Types:Artifact Vehicle
-PT:6/5
-K:Vigilance
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSearch | TriggerDescription$ When this Vehicle enters, you may search your library for an artifact card and reveal it. Put it onto the battlefield if its mana value is 2 or less. Otherwise, put it into your hand. Then shuffle.
-SVar:TrigSearch:DB$ ChangeZone | Origin$ Library | Destination$ Library | ChangeType$ Artifact | ChangeNum$ 1 | Reveal$ True | Shuffle$ False | RememberChanged$ True | SubAbility$ DBChangeZone
-SVar:DBChangeZone:DB$ ChangeZone | Defined$ Remembered | Origin$ Library | Destination$ Battlefield | ConditionDefined$ Remembered | ConditionPresent$ Card.cmcLE2 | ForgetChanged$ True | SubAbility$ DBChangeZone2
-SVar:DBChangeZone2:DB$ ChangeZone | Defined$ Remembered | Origin$ Library | Destination$ Hand | SubAbility$ DBShuffle
-SVar:DBShuffle:DB$ Shuffle | Defined$ You | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-K:Crew:2
+Name:Guidelight Pathmaker
+ManaCost:4 W U
+Types:Artifact Vehicle
+PT:6/5
+K:Vigilance
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSearch | TriggerDescription$ When this Vehicle enters, you may search your library for an artifact card and reveal it. Put it onto the battlefield if its mana value is 2 or less. Otherwise, put it into your hand. Then shuffle.
+SVar:TrigSearch:DB$ ChangeZone | Origin$ Library | Destination$ Library | ChangeType$ Artifact | ChangeNum$ 1 | Reveal$ True | Shuffle$ False | RememberChanged$ True | SubAbility$ DBChangeZone
+SVar:DBChangeZone:DB$ ChangeZone | Defined$ Remembered | Origin$ Library | Destination$ Battlefield | ConditionDefined$ Remembered | ConditionPresent$ Card.cmcLE2 | ForgetChanged$ True | SubAbility$ DBChangeZone2
+SVar:DBChangeZone2:DB$ ChangeZone | Defined$ Remembered | Origin$ Library | Destination$ Hand | SubAbility$ DBShuffle
+SVar:DBShuffle:DB$ Shuffle | Defined$ You | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+K:Crew:2
Oracle:Vigilance\nWhen this Vehicle enters, you may search your library for an artifact card and reveal it. Put it onto the battlefield if its mana value is 2 or less. Otherwise, put it into your hand. Then shuffle.\nCrew 2
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/hashaton_scarabs_fist.txt b/forge-gui/res/cardsfolder/upcoming/hashaton_scarabs_fist.txt
index 1b92ca93be9..c33963e69b6 100644
--- a/forge-gui/res/cardsfolder/upcoming/hashaton_scarabs_fist.txt
+++ b/forge-gui/res/cardsfolder/upcoming/hashaton_scarabs_fist.txt
@@ -1,8 +1,8 @@
-Name:Hashaton, Scarab's Fist
-ManaCost:W B
-Types:Legendary Creature Zombie Wizard
-PT:1/3
-T:Mode$ Discarded | ValidCard$ Creature.YouOwn | TriggerZones$ Battlefield | Execute$ TrigCopy | TriggerDescription$ Whenever you discard a creature card, you may pay {2}{U}. If you do, create a tapped token that's a copy of that card, except it's a 4/4 black Zombie.
-SVar:TrigCopy:AB$ CopyPermanent | Cost$ 2 U | Defined$ TriggeredCard | SetPower$ 4 | SetToughness$ 4 | SetColor$ Black | SetCreatureTypes$ Zombie | TokenTapped$ True
-DeckHints:Ability$Discard
+Name:Hashaton, Scarab's Fist
+ManaCost:W B
+Types:Legendary Creature Zombie Wizard
+PT:1/3
+T:Mode$ Discarded | ValidCard$ Creature.YouOwn | TriggerZones$ Battlefield | Execute$ TrigCopy | TriggerDescription$ Whenever you discard a creature card, you may pay {2}{U}. If you do, create a tapped token that's a copy of that card, except it's a 4/4 black Zombie.
+SVar:TrigCopy:AB$ CopyPermanent | Cost$ 2 U | Defined$ TriggeredCard | SetPower$ 4 | SetToughness$ 4 | SetColor$ Black | SetCreatureTypes$ Zombie | TokenTapped$ True
+DeckHints:Ability$Discard
Oracle:Whenever you discard a creature card, you may pay {2}{U}. If you do, create a tapped token that's a copy of that card, except it's a 4/4 black Zombie.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/hulldrifter.txt b/forge-gui/res/cardsfolder/upcoming/hulldrifter.txt
index 55d43130b26..0221a8e2bf7 100644
--- a/forge-gui/res/cardsfolder/upcoming/hulldrifter.txt
+++ b/forge-gui/res/cardsfolder/upcoming/hulldrifter.txt
@@ -1,9 +1,9 @@
-Name:Hulldrifter
-ManaCost:3 U U
-Types:Artifact Vehicle
-PT:3/2
-K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When this Vehicle enters, draw two cards.
-SVar:TrigDraw:DB$ Draw | NumCards$ 2
-K:Crew:3
+Name:Hulldrifter
+ManaCost:3 U U
+Types:Artifact Vehicle
+PT:3/2
+K:Flying
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When this Vehicle enters, draw two cards.
+SVar:TrigDraw:DB$ Draw | NumCards$ 2
+K:Crew:3
Oracle:Flying\nWhen this Vehicle enters, draw two cards.\nCrew 3 (Tap any number of creatures you control with total power 3 or more: This Vehicle becomes an artifact creature until end of turn.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/kolodin_triumph_caster.txt b/forge-gui/res/cardsfolder/upcoming/kolodin_triumph_caster.txt
index de60d632b65..8322fae0ba1 100644
--- a/forge-gui/res/cardsfolder/upcoming/kolodin_triumph_caster.txt
+++ b/forge-gui/res/cardsfolder/upcoming/kolodin_triumph_caster.txt
@@ -1,12 +1,12 @@
-Name:Kolodin, Triumph Caster
-ManaCost:R W
-Types:Legendary Creature Human Pilot
-PT:2/3
-S:Mode$ Continuous | Affected$ Mount.YouCtrl,Vehicle.YouCtrl | AddKeyword$ Haste | Description$ Mounts and Vehicles you control have haste.
-T:Mode$ ChangesZone | ValidCard$ Mount.YouCtrl | Origin$ Any | Destination$ Battlefield | Execute$ TrigSaddle | TriggerZones$ Battlefield | TriggerDescription$ Whenever a Mount you control enters, it becomes saddled until end of turn.
-SVar:TrigSaddle:DB$ AlterAttribute | Defined$ TriggeredCard | Attributes$ Saddled
-T:Mode$ ChangesZone | ValidCard$ Vehicle.YouCtrl | Origin$ Any | Destination$ Battlefield | Execute$ TrigAnimate | TriggerZones$ Battlefield | TriggerDescription$ Whenever a Vehicle you control enters, it becomes an artifact creature until end of turn.
-SVar:TrigAnimate:DB$ Animate | Defined$ TriggeredCard | Types$ Artifact,Creature
-SVar:PlayMain1:TRUE
-DeckHints:Type$Mount|Vehicle
+Name:Kolodin, Triumph Caster
+ManaCost:R W
+Types:Legendary Creature Human Pilot
+PT:2/3
+S:Mode$ Continuous | Affected$ Mount.YouCtrl,Vehicle.YouCtrl | AddKeyword$ Haste | Description$ Mounts and Vehicles you control have haste.
+T:Mode$ ChangesZone | ValidCard$ Mount.YouCtrl | Origin$ Any | Destination$ Battlefield | Execute$ TrigSaddle | TriggerZones$ Battlefield | TriggerDescription$ Whenever a Mount you control enters, it becomes saddled until end of turn.
+SVar:TrigSaddle:DB$ AlterAttribute | Defined$ TriggeredCard | Attributes$ Saddled
+T:Mode$ ChangesZone | ValidCard$ Vehicle.YouCtrl | Origin$ Any | Destination$ Battlefield | Execute$ TrigAnimate | TriggerZones$ Battlefield | TriggerDescription$ Whenever a Vehicle you control enters, it becomes an artifact creature until end of turn.
+SVar:TrigAnimate:DB$ Animate | Defined$ TriggeredCard | Types$ Artifact,Creature
+SVar:PlayMain1:TRUE
+DeckHints:Type$Mount|Vehicle
Oracle:Mounts and Vehicles you control have haste.\nWhenever a Mount you control enters, it becomes saddled until end of turn.\nWhenever a Vehicle you control enters, it becomes an artifact creature until end of turn.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/lagorin_soul_of_alacria.txt b/forge-gui/res/cardsfolder/upcoming/lagorin_soul_of_alacria.txt
index 48d7935372d..3f88ffe951b 100644
--- a/forge-gui/res/cardsfolder/upcoming/lagorin_soul_of_alacria.txt
+++ b/forge-gui/res/cardsfolder/upcoming/lagorin_soul_of_alacria.txt
@@ -1,9 +1,9 @@
-Name:Lagorin, Soul of Alacria
-ManaCost:G W
-Types:Legendary Creature Beast Mount
-PT:1/1
-K:Flying
-T:Mode$ Attacks | ValidCard$ Card.Self+IsSaddled | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever NICKNAME attacks while saddled, put a +1/+1 counter on each of up to two target Mounts and/or Vehicles.
-SVar:TrigPutCounter:DB$ PutCounter | TargetMin$ 0 | TargetMax$ 2 | ValidTgts$ Mount,Vehicle | TgtPrompt$ Select up to two other target Mounts and/or Vehicles | CounterType$ P1P1 | CounterNum$ 1
-K:Saddle:1
+Name:Lagorin, Soul of Alacria
+ManaCost:G W
+Types:Legendary Creature Beast Mount
+PT:1/1
+K:Flying
+T:Mode$ Attacks | ValidCard$ Card.Self+IsSaddled | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever NICKNAME attacks while saddled, put a +1/+1 counter on each of up to two target Mounts and/or Vehicles.
+SVar:TrigPutCounter:DB$ PutCounter | TargetMin$ 0 | TargetMax$ 2 | ValidTgts$ Mount,Vehicle | TgtPrompt$ Select up to two other target Mounts and/or Vehicles | CounterType$ P1P1 | CounterNum$ 1
+K:Saddle:1
Oracle:Flying\nWhenever Lagorin attacks while saddled, put a +1/+1 counter on each of up to two target Mounts and/or Vehicles.\nSaddle 1 (Tap any number of other creatures you control with total power 1 or more: This Mount becomes saddled until end of turn. Saddle only as a sorcery.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/lifecraft_engine.txt b/forge-gui/res/cardsfolder/upcoming/lifecraft_engine.txt
index f3de9f81d60..e66716db7fd 100644
--- a/forge-gui/res/cardsfolder/upcoming/lifecraft_engine.txt
+++ b/forge-gui/res/cardsfolder/upcoming/lifecraft_engine.txt
@@ -1,11 +1,11 @@
-Name:Lifecraft Engine
-ManaCost:3
-Types:Artifact Vehicle
-PT:4/4
-K:ETBReplacement:Other:ChooseCT
-SVar:ChooseCT:DB$ ChooseType | Type$ Creature | AILogic$ MostProminentInComputerDeck | SpellDescription$ As this Vehicle enters, choose a creature type.
-S:Mode$ Continuous | Affected$ Creature.Vehicle+YouCtrl | AddType$ ChosenType | Description$ Vehicle creatures you control are the chosen creature type in addition to their other types.
-S:Mode$ Continuous | Affected$ Creature.ChosenType+Other+YouCtrl | AddPower$ 1 | AddToughness$ 1 | Description$ Each creature you control of the chosen type other than this Vehicle gets +1/+1.
-K:Crew:3
-SVar:PlayMain1:TRUE
+Name:Lifecraft Engine
+ManaCost:3
+Types:Artifact Vehicle
+PT:4/4
+K:ETBReplacement:Other:ChooseCT
+SVar:ChooseCT:DB$ ChooseType | Type$ Creature | AILogic$ MostProminentInComputerDeck | SpellDescription$ As this Vehicle enters, choose a creature type.
+S:Mode$ Continuous | Affected$ Creature.Vehicle+YouCtrl | AddType$ ChosenType | Description$ Vehicle creatures you control are the chosen creature type in addition to their other types.
+S:Mode$ Continuous | Affected$ Creature.ChosenType+Other+YouCtrl | AddPower$ 1 | AddToughness$ 1 | Description$ Each creature you control of the chosen type other than this Vehicle gets +1/+1.
+K:Crew:3
+SVar:PlayMain1:TRUE
Oracle:As this Vehicle enters, choose a creature type.\nVehicle creatures you control are the chosen creature type in addition to their other types.\nEach creature you control of the chosen type other than this Vehicle gets +1/+1.\nCrew 3
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/lightshield_parry.txt b/forge-gui/res/cardsfolder/upcoming/lightshield_parry.txt
index 9af7099eae2..cf0511061d9 100644
--- a/forge-gui/res/cardsfolder/upcoming/lightshield_parry.txt
+++ b/forge-gui/res/cardsfolder/upcoming/lightshield_parry.txt
@@ -1,6 +1,6 @@
-Name:Lightshield Parry
-ManaCost:W
-Types:Instant
-A:SP$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +2 | NumDef$ +2 | SpellDescription$ Target creature gets +2/+2 until end of turn.
-K:Cycling:2
+Name:Lightshield Parry
+ManaCost:W
+Types:Instant
+A:SP$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +2 | NumDef$ +2 | SpellDescription$ Target creature gets +2/+2 until end of turn.
+K:Cycling:2
Oracle:Target creature gets +2/+2 until end of turn.\nCycling {2} ({2}, Discard this card: Draw a card.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/loot_the_pathfinder.txt b/forge-gui/res/cardsfolder/upcoming/loot_the_pathfinder.txt
index c560f9b3d34..dcffd9433c0 100644
--- a/forge-gui/res/cardsfolder/upcoming/loot_the_pathfinder.txt
+++ b/forge-gui/res/cardsfolder/upcoming/loot_the_pathfinder.txt
@@ -1,11 +1,11 @@
-Name:Loot, the Pathfinder
-ManaCost:2 G U R
-Types:Legendary Creature Beast Noble
-PT:2/4
-K:Double Strike
-K:Vigilance
-K:Haste
-A:AB$ Mana | Cost$ G T | Produced$ Any | Amount$ 3 | Exhaust$ True | SpellDescription$ Add three mana of any one color. (Activate each exhaust ability only once.)
-A:AB$ Draw | Cost$ U T | NumCards$ 3 | Exhaust$ True | SpellDescription$ Draw three cards.
-A:AB$ DealDamage | Cost$ R T | ValidTgts$ Any | NumDmg$ 3 | Exhaust$ True | SpellDescription$ NICKNAME deals 3 damage to any target.
+Name:Loot, the Pathfinder
+ManaCost:2 G U R
+Types:Legendary Creature Beast Noble
+PT:2/4
+K:Double Strike
+K:Vigilance
+K:Haste
+A:AB$ Mana | Cost$ G T | Produced$ Any | Amount$ 3 | Exhaust$ True | SpellDescription$ Add three mana of any one color. (Activate each exhaust ability only once.)
+A:AB$ Draw | Cost$ U T | NumCards$ 3 | Exhaust$ True | SpellDescription$ Draw three cards.
+A:AB$ DealDamage | Cost$ R T | ValidTgts$ Any | NumDmg$ 3 | Exhaust$ True | SpellDescription$ NICKNAME deals 3 damage to any target.
Oracle:Double strike, vigilance, haste\nExhaust — {G}, {T}: Add three mana of any one color. (Activate each exhaust ability only once.)\nExhaust — {U}, {T}: Draw three cards.\nExhaust — {R}, {T}: Loot deals 3 damage to any target.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/midnight_mangler.txt b/forge-gui/res/cardsfolder/upcoming/midnight_mangler.txt
index 0fab0b9ccff..47fa4d65180 100644
--- a/forge-gui/res/cardsfolder/upcoming/midnight_mangler.txt
+++ b/forge-gui/res/cardsfolder/upcoming/midnight_mangler.txt
@@ -1,7 +1,7 @@
-Name:Midnight Mangler
-ManaCost:1 U
-Types:Artifact Vehicle
-PT:3/3
-S:Mode$ Continuous | Affected$ Card.Self | Condition$ NotPlayerTurn | AddType$ Artifact & Creature | Description$ During turns other than yours, this Vehicle is an artifact creature.
-K:Crew:2
-Oracle:During turns other than yours, this Vehicle is an artifact creature.\nCrew 2 (Tap any number of creatures you control with total power 2 or more: This Vehicle becomes an artifact creature until end of turn.)
+Name:Midnight Mangler
+ManaCost:1 U
+Types:Artifact Vehicle
+PT:3/3
+S:Mode$ Continuous | Affected$ Card.Self | Condition$ NotPlayerTurn | AddType$ Artifact & Creature | Description$ During turns other than yours, this Vehicle is an artifact creature.
+K:Crew:2
+Oracle:During turns other than yours, this Vehicle is an artifact creature.\nCrew 2 (Tap any number of creatures you control with total power 2 or more: This Vehicle becomes an artifact creature until end of turn.)
diff --git a/forge-gui/res/cardsfolder/upcoming/night_market.txt b/forge-gui/res/cardsfolder/upcoming/night_market.txt
index f5c521894b7..0fda240fa4d 100644
--- a/forge-gui/res/cardsfolder/upcoming/night_market.txt
+++ b/forge-gui/res/cardsfolder/upcoming/night_market.txt
@@ -1,10 +1,10 @@
-Name:Night Market
-ManaCost:no cost
-Types:Land
-R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ This land enters tapped.
-SVar:ETBTapped:DB$ Tap | Defined$ Self | ETB$ True
-K:ETBReplacement:Other:ChooseColor
-SVar:ChooseColor:DB$ ChooseColor | Defined$ You | AILogic$ MostProminentInComputerDeck | SpellDescription$ As this land enters, choose a color.
-A:AB$ Mana | Cost$ T | Produced$ Chosen | SpellDescription$ Add one mana of the chosen color.
-K:Cycling:3
+Name:Night Market
+ManaCost:no cost
+Types:Land
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ This land enters tapped.
+SVar:ETBTapped:DB$ Tap | Defined$ Self | ETB$ True
+K:ETBReplacement:Other:ChooseColor
+SVar:ChooseColor:DB$ ChooseColor | Defined$ You | AILogic$ MostProminentInComputerDeck | SpellDescription$ As this land enters, choose a color.
+A:AB$ Mana | Cost$ T | Produced$ Chosen | SpellDescription$ Add one mana of the chosen color.
+K:Cycling:3
Oracle:This land enters tapped. As it enters, choose a color.\n{T}: Add one mana of the chosen color.\nCycling {3} ({3}, Discard this card: Draw a card.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/oildeep_gearhulk.txt b/forge-gui/res/cardsfolder/upcoming/oildeep_gearhulk.txt
index 8c63698e913..8896b25b5b6 100644
--- a/forge-gui/res/cardsfolder/upcoming/oildeep_gearhulk.txt
+++ b/forge-gui/res/cardsfolder/upcoming/oildeep_gearhulk.txt
@@ -1,12 +1,12 @@
-Name:Oildeep Gearhulk
-ManaCost:U U B B
-Types:Artifact Creature Construct
-PT:4/4
-K:Lifelink
-K:Ward:1
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigDiscard | TriggerDescription$ When this creature enters, look at target player's hand. You may choose a card from it. If you do, that player discards that card, then draws a card.
-SVar:TrigDiscard:DB$ Discard | ValidTgts$ Player | Mode$ RevealYouChoose | Optional$ True | DiscardValid$ Card | DiscardValidDesc$ card | RememberDiscarded$ True | SubAbility$ DBDraw
-SVar:DBDraw:DB$ Draw | Defined$ Targeted | ConditionDefined$ Remembered | ConditionPresent$ Card | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-DeckHas:Ability$Discard
+Name:Oildeep Gearhulk
+ManaCost:U U B B
+Types:Artifact Creature Construct
+PT:4/4
+K:Lifelink
+K:Ward:1
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigDiscard | TriggerDescription$ When this creature enters, look at target player's hand. You may choose a card from it. If you do, that player discards that card, then draws a card.
+SVar:TrigDiscard:DB$ Discard | ValidTgts$ Player | Mode$ RevealYouChoose | Optional$ True | DiscardValid$ Card | DiscardValidDesc$ card | RememberDiscarded$ True | SubAbility$ DBDraw
+SVar:DBDraw:DB$ Draw | Defined$ Targeted | ConditionDefined$ Remembered | ConditionPresent$ Card | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+DeckHas:Ability$Discard
Oracle:Lifelink, ward {1}\nWhen this creature enters, look at target player's hand. You may choose a card from it. If you do, that player discards that card, then draws a card.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/pia_nalaar_chief_mechanic.txt b/forge-gui/res/cardsfolder/upcoming/pia_nalaar_chief_mechanic.txt
index 11b99ed5ac3..36a5d7f437a 100644
--- a/forge-gui/res/cardsfolder/upcoming/pia_nalaar_chief_mechanic.txt
+++ b/forge-gui/res/cardsfolder/upcoming/pia_nalaar_chief_mechanic.txt
@@ -1,11 +1,11 @@
-Name:Pia Nalaar, Chief Mechanic
-ManaCost:G U R
-Types:Legendary Creature Human Artificer
-PT:2/4
-T:Mode$ DamageDoneOnce | CombatDamage$ True | ValidSource$ Creature.Artifact+YouCtrl | ValidTarget$ Player | TriggerZones$ Battlefield | Execute$ TrigEnergy | TriggerDescription$ Whenever one or more artifact creatures you control deal combat damage to a player, you get {E}{E} (two energy counters).
-SVar:TrigEnergy:DB$ PutCounter | Defined$ You | CounterType$ ENERGY | CounterNum$ 2
-T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigChooseNumber | TriggerDescription$ At the beginning of your end step, you may pay one or more {E}. If you do, create an X/X colorless Vehicle artifact token named Nalaar Aetherjet with flying and crew 2, where X is the amount of {E} spent this way.
-SVar:TrigChooseNumber:DB$ ChooseNumber | Max$ Count$YourCountersEnergy | ListTitle$ amount of energy to pay | SubAbility$ DBToken | StackDescription$ None
-SVar:DBToken:DB$ Token | ConditionCheckSVar$ X | UnlessCost$ Mandatory PayEnergy | UnlessPayer$ You | UnlessSwitched$ True | TokenScript$ nalaar_aetherjet | TokenPower$ X | TokenToughness$ X
-SVar:X:Count$ChosenNumber
-Oracle:Whenever one or more artifact creatures you control deal combat damage to a player, you get {E}{E} (two energy counters).\nAt the beginning of your end step, you may pay one or more {E}. If you do, create an X/X colorless Vehicle artifact token named Nalaar Aetherjet with flying and crew 2, where X is the amount of {E} spent this way.
+Name:Pia Nalaar, Chief Mechanic
+ManaCost:G U R
+Types:Legendary Creature Human Artificer
+PT:2/4
+T:Mode$ DamageDoneOnce | CombatDamage$ True | ValidSource$ Creature.Artifact+YouCtrl | ValidTarget$ Player | TriggerZones$ Battlefield | Execute$ TrigEnergy | TriggerDescription$ Whenever one or more artifact creatures you control deal combat damage to a player, you get {E}{E} (two energy counters).
+SVar:TrigEnergy:DB$ PutCounter | Defined$ You | CounterType$ ENERGY | CounterNum$ 2
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigChooseNumber | TriggerDescription$ At the beginning of your end step, you may pay one or more {E}. If you do, create an X/X colorless Vehicle artifact token named Nalaar Aetherjet with flying and crew 2, where X is the amount of {E} spent this way.
+SVar:TrigChooseNumber:DB$ ChooseNumber | Max$ Count$YourCountersEnergy | ListTitle$ amount of energy to pay | SubAbility$ DBToken | StackDescription$ None
+SVar:DBToken:DB$ Token | ConditionCheckSVar$ X | UnlessCost$ Mandatory PayEnergy | UnlessPayer$ You | UnlessSwitched$ True | TokenScript$ nalaar_aetherjet | TokenPower$ X | TokenToughness$ X
+SVar:X:Count$ChosenNumber
+Oracle:Whenever one or more artifact creatures you control deal combat damage to a player, you get {E}{E} (two energy counters).\nAt the beginning of your end step, you may pay one or more {E}. If you do, create an X/X colorless Vehicle artifact token named Nalaar Aetherjet with flying and crew 2, where X is the amount of {E} spent this way.
diff --git a/forge-gui/res/cardsfolder/upcoming/prowcatcher_specialist.txt b/forge-gui/res/cardsfolder/upcoming/prowcatcher_specialist.txt
index 6412da255c9..56ec37765f3 100644
--- a/forge-gui/res/cardsfolder/upcoming/prowcatcher_specialist.txt
+++ b/forge-gui/res/cardsfolder/upcoming/prowcatcher_specialist.txt
@@ -1,8 +1,8 @@
-Name:Prowcatcher Specialist
-ManaCost:1 R
-Types:Creature Goblin Warrior
-PT:2/1
-K:Haste
-A:AB$ PutCounter | Cost$ 3 R | Defined$ Self | CounterType$ P1P1 | CounterNum$ 2 | Exhaust$ True | SpellDescription$ Put two +1/+1 counters on this creature. (Activate each exhaust ability only once.)
-DeckHas:Ability$Counters
-Oracle:Haste\nExhaust — {3}{R}: Put two +1/+1 counters on this creature. (Activate each exhaust ability only once.)
+Name:Prowcatcher Specialist
+ManaCost:1 R
+Types:Creature Goblin Warrior
+PT:2/1
+K:Haste
+A:AB$ PutCounter | Cost$ 3 R | Defined$ Self | CounterType$ P1P1 | CounterNum$ 2 | Exhaust$ True | SpellDescription$ Put two +1/+1 counters on this creature. (Activate each exhaust ability only once.)
+DeckHas:Ability$Counters
+Oracle:Haste\nExhaust — {3}{R}: Put two +1/+1 counters on this creature. (Activate each exhaust ability only once.)
diff --git a/forge-gui/res/cardsfolder/upcoming/pyrewood_gearhulk.txt b/forge-gui/res/cardsfolder/upcoming/pyrewood_gearhulk.txt
index ce1ca8684fd..6079dd869a2 100644
--- a/forge-gui/res/cardsfolder/upcoming/pyrewood_gearhulk.txt
+++ b/forge-gui/res/cardsfolder/upcoming/pyrewood_gearhulk.txt
@@ -1,12 +1,12 @@
-Name:Pyrewood Gearhulk
-ManaCost:2 R R G G
-Types:Artifact Creature Construct
-PT:7/7
-K:Vigilance
-K:Menace
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPumpAll | TriggerDescription$ When this creature enters, other creatures you control get +2/+2 and gain vigilance and menace until end of turn. Damage can't be prevented this turn.
-SVar:TrigPumpAll:DB$ PumpAll | ValidCards$ Creature.StrictlyOther+YouCtrl | NumAtt$ +2 | NumDef$ +2 | KW$ Vigilance & Menace | SubAbility$ DBEffect
-SVar:DBEFfect:DB$ Effect | StaticAbilities$ STCantPrevent
-SVar:STCantPrevent:Mode$ CantPreventDamage | EffectZone$ Command | Description$ Damage can't be prevented this turn.
-SVar:PlayMain1:TRUE
-Oracle:Vigilance, menace\nWhen this creature enters, other creatures you control get +2/+2 and gain vigilance and menace until end of turn. Damage can't be prevented this turn.
+Name:Pyrewood Gearhulk
+ManaCost:2 R R G G
+Types:Artifact Creature Construct
+PT:7/7
+K:Vigilance
+K:Menace
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPumpAll | TriggerDescription$ When this creature enters, other creatures you control get +2/+2 and gain vigilance and menace until end of turn. Damage can't be prevented this turn.
+SVar:TrigPumpAll:DB$ PumpAll | ValidCards$ Creature.StrictlyOther+YouCtrl | NumAtt$ +2 | NumDef$ +2 | KW$ Vigilance & Menace | SubAbility$ DBEffect
+SVar:DBEFfect:DB$ Effect | StaticAbilities$ STCantPrevent
+SVar:STCantPrevent:Mode$ CantPreventDamage | EffectZone$ Command | Description$ Damage can't be prevented this turn.
+SVar:PlayMain1:TRUE
+Oracle:Vigilance, menace\nWhen this creature enters, other creatures you control get +2/+2 and gain vigilance and menace until end of turn. Damage can't be prevented this turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/quag_feast.txt b/forge-gui/res/cardsfolder/upcoming/quag_feast.txt
index 3d979681756..fad3aafbc18 100644
--- a/forge-gui/res/cardsfolder/upcoming/quag_feast.txt
+++ b/forge-gui/res/cardsfolder/upcoming/quag_feast.txt
@@ -1,8 +1,8 @@
-Name:Quag Feast
-ManaCost:1 B
-Types:Sorcery
-A:SP$ Mill | NumCards$ 2 | SubAbility$ DBDestroy | SpellDescription$ Choose target creature, planeswalker, or Vehicle. Mill two cards, then destroy the chosen permanent if its mana value is less than or equal to the number of cards in your graveyard.
-SVar:DBDestroy:DB$ Destroy | ValidTgts$ Creature,Planeswalker,Vehicle | TgtPrompt$ Select target creature, planeswalker, or Vehicle | ConditionCheckSVar$ Y | ConditionSVarCompare$ LEX
-SVar:Y:Targeted$CardManaCost
-SVar:X:Count$InYourYard
-Oracle:Choose target creature, planeswalker, or Vehicle. Mill two cards, then destroy the chosen permanent if its mana value is less than or equal to the number of cards in your graveyard.
+Name:Quag Feast
+ManaCost:1 B
+Types:Sorcery
+A:SP$ Mill | NumCards$ 2 | SubAbility$ DBDestroy | SpellDescription$ Choose target creature, planeswalker, or Vehicle. Mill two cards, then destroy the chosen permanent if its mana value is less than or equal to the number of cards in your graveyard.
+SVar:DBDestroy:DB$ Destroy | ValidTgts$ Creature,Planeswalker,Vehicle | TgtPrompt$ Select target creature, planeswalker, or Vehicle | ConditionCheckSVar$ Y | ConditionSVarCompare$ LEX
+SVar:Y:Targeted$CardManaCost
+SVar:X:Count$InYourYard
+Oracle:Choose target creature, planeswalker, or Vehicle. Mill two cards, then destroy the chosen permanent if its mana value is less than or equal to the number of cards in your graveyard.
diff --git a/forge-gui/res/cardsfolder/upcoming/rangers_aetherhive.txt b/forge-gui/res/cardsfolder/upcoming/rangers_aetherhive.txt
index faab8bb7983..71b900a4091 100644
--- a/forge-gui/res/cardsfolder/upcoming/rangers_aetherhive.txt
+++ b/forge-gui/res/cardsfolder/upcoming/rangers_aetherhive.txt
@@ -1,10 +1,10 @@
-Name:Rangers' Aetherhive
-ManaCost:1 G U
-Types:Artifact Vehicle
-PT:3/5
-K:Vigilance
-T:Mode$ AbilityCast | ValidActivatingPlayer$ You | ValidSA$ Activated.Exhaust | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever you activate an exhaust ability, create a 1/1 colorless Thopter artifact creature token with flying.
-SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_1_1_a_thopter_flying | TokenOwner$ You
-K:Crew:1
-DeckHas:Ability$Token
+Name:Rangers' Aetherhive
+ManaCost:1 G U
+Types:Artifact Vehicle
+PT:3/5
+K:Vigilance
+T:Mode$ AbilityCast | ValidActivatingPlayer$ You | ValidSA$ Activated.Exhaust | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever you activate an exhaust ability, create a 1/1 colorless Thopter artifact creature token with flying.
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_1_1_a_thopter_flying | TokenOwner$ You
+K:Crew:1
+DeckHas:Ability$Token
Oracle:Vigilance\nWhenever you activate an exhaust ability, create a 1/1 colorless Thopter artifact creature token with flying.\nCrew 1 (Tap any number of creatures you control with total power 1 or more: This Vehicle becomes an artifact creature until end of turn.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/redshift_rocketeer_chief.txt b/forge-gui/res/cardsfolder/upcoming/redshift_rocketeer_chief.txt
index 46a63da33b7..ab840406dd2 100644
--- a/forge-gui/res/cardsfolder/upcoming/redshift_rocketeer_chief.txt
+++ b/forge-gui/res/cardsfolder/upcoming/redshift_rocketeer_chief.txt
@@ -1,10 +1,10 @@
-Name:Redshift, Rocketeer Chief
-ManaCost:R G
-Types:Legendary Creature Goblin Pilot
-PT:2/3
-K:Vigilance
-A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ X | RestrictValid$ Activated | SpellDescription$ Add X mana of any one color, where X is NICKNAME's power. Spend this mana only to activate abilities.
-A:AB$ ChangeZone | Cost$ 10 R G | Origin$ Hand | Destination$ Battlefield | ChangeType$ Permanent | ChangeNum$ Y | Exhaust$ True | SpellDescription$ Put any number of permanent cards from your hand onto the battlefield. (Activate each exhaust ability only once.)
-SVar:X:Count$CardPower
-SVar:Y:Count$InYourHand.Permanent
+Name:Redshift, Rocketeer Chief
+ManaCost:R G
+Types:Legendary Creature Goblin Pilot
+PT:2/3
+K:Vigilance
+A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ X | RestrictValid$ Activated | SpellDescription$ Add X mana of any one color, where X is NICKNAME's power. Spend this mana only to activate abilities.
+A:AB$ ChangeZone | Cost$ 10 R G | Origin$ Hand | Destination$ Battlefield | ChangeType$ Permanent | ChangeNum$ Y | Exhaust$ True | SpellDescription$ Put any number of permanent cards from your hand onto the battlefield. (Activate each exhaust ability only once.)
+SVar:X:Count$CardPower
+SVar:Y:Count$InYourHand.Permanent
Oracle:Vigilance\n{T}: Add X mana of any one color, where X is Redshift's power. Spend this mana only to activate abilities.\nExhaust — {10}{R}{G}: Put any number of permanent cards from your hand onto the battlefield. (Activate each exhaust ability only once.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/repurposing_bay.txt b/forge-gui/res/cardsfolder/upcoming/repurposing_bay.txt
index 18efec4fd00..aaaa985040d 100644
--- a/forge-gui/res/cardsfolder/upcoming/repurposing_bay.txt
+++ b/forge-gui/res/cardsfolder/upcoming/repurposing_bay.txt
@@ -1,8 +1,8 @@
-Name:Repurposing Bay
-ManaCost:2 U
-Types:Artifact
-A:AB$ ChangeZone | Cost$ 2 T Sac<1/Artifact.Other/another artifact> | Origin$ Library | Destination$ Battlefield | ChangeType$ Artifact.cmcEQX | ChangeNum$ 1 | SorcerySpeed$ True | AILogic$ SacAndUpgrade | StackDescription$ Search your library for an artifact card with mana value equal to 1 plus the sacrificed artifact's mana value, put that card onto the battlefield, then shuffle. | SpellDescription$ Search your library for an artifact card with mana value equal to 1 plus the sacrificed artifact's mana value, put that card onto the battlefield, then shuffle. Activate only as a sorcery.
-SVar:X:Sacrificed$CardManaCost/Plus.1
-# AI Preference is needed to make the AI consider the ability. Further constraints are defined by AILogic SacAndUpgrade.
-SVar:AIPreference:SacCost$Artifact
+Name:Repurposing Bay
+ManaCost:2 U
+Types:Artifact
+A:AB$ ChangeZone | Cost$ 2 T Sac<1/Artifact.Other/another artifact> | Origin$ Library | Destination$ Battlefield | ChangeType$ Artifact.cmcEQX | ChangeNum$ 1 | SorcerySpeed$ True | AILogic$ SacAndUpgrade | StackDescription$ Search your library for an artifact card with mana value equal to 1 plus the sacrificed artifact's mana value, put that card onto the battlefield, then shuffle. | SpellDescription$ Search your library for an artifact card with mana value equal to 1 plus the sacrificed artifact's mana value, put that card onto the battlefield, then shuffle. Activate only as a sorcery.
+SVar:X:Sacrificed$CardManaCost/Plus.1
+# AI Preference is needed to make the AI consider the ability. Further constraints are defined by AILogic SacAndUpgrade.
+SVar:AIPreference:SacCost$Artifact
Oracle:{2}, {T}, Sacrifice another artifact: Search your library for an artifact card with mana value equal to 1 plus the sacrificed artifact's mana value, put that card onto the battlefield, then shuffle. Activate only as a sorcery.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/riverpyre_verge.txt b/forge-gui/res/cardsfolder/upcoming/riverpyre_verge.txt
index 80e63d45763..91150e78111 100644
--- a/forge-gui/res/cardsfolder/upcoming/riverpyre_verge.txt
+++ b/forge-gui/res/cardsfolder/upcoming/riverpyre_verge.txt
@@ -1,6 +1,6 @@
-Name:Riverpyre Verge
-ManaCost:no cost
-Types:Land
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
-A:AB$ Mana | Cost$ T | Produced$ U | IsPresent$ Island.YouCtrl,Mountain.YouCtrl | SpellDescription$ Add {U}. Activate only if you control an Island or a Mountain.
-Oracle:{T}: Add {R}.\n{T}: Add {U}. Activate only if you control an Island or a Mountain.
+Name:Riverpyre Verge
+ManaCost:no cost
+Types:Land
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
+A:AB$ Mana | Cost$ T | Produced$ U | IsPresent$ Island.YouCtrl,Mountain.YouCtrl | SpellDescription$ Add {U}. Activate only if you control an Island or a Mountain.
+Oracle:{T}: Add {R}.\n{T}: Add {U}. Activate only if you control an Island or a Mountain.
diff --git a/forge-gui/res/cardsfolder/upcoming/rocketeer_boostbuggy.txt b/forge-gui/res/cardsfolder/upcoming/rocketeer_boostbuggy.txt
index 8a65e5ebe54..8daa704824b 100644
--- a/forge-gui/res/cardsfolder/upcoming/rocketeer_boostbuggy.txt
+++ b/forge-gui/res/cardsfolder/upcoming/rocketeer_boostbuggy.txt
@@ -1,11 +1,11 @@
-Name:Rocketeer Boostbuggy
-ManaCost:R G
-Types:Artifact Vehicle
-PT:3/2
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ Whenever this Vehicle attacks, create a Treasure token. (It's an artifact with "{T}, Sacrifice this token: Add one mana of any color.")
-SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_treasure_sac | TokenOwner$ You
-A:AB$ Animate | Cost$ 3 | Defined$ Self | Types$ Artifact,Creature | Exhaust$ True | SubAbility$ DBPutCounter | SpellDescription$ This Vehicle becomes an artifact creature. Put a +1/+1 counter on it. (Activate each exhaust ability only once.)
-SVar:DBPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
-K:Crew:1
-DeckHas:Ability$Token|Counters
+Name:Rocketeer Boostbuggy
+ManaCost:R G
+Types:Artifact Vehicle
+PT:3/2
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ Whenever this Vehicle attacks, create a Treasure token. (It's an artifact with "{T}, Sacrifice this token: Add one mana of any color.")
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_treasure_sac | TokenOwner$ You
+A:AB$ Animate | Cost$ 3 | Defined$ Self | Types$ Artifact,Creature | Exhaust$ True | SubAbility$ DBPutCounter | SpellDescription$ This Vehicle becomes an artifact creature. Put a +1/+1 counter on it. (Activate each exhaust ability only once.)
+SVar:DBPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
+K:Crew:1
+DeckHas:Ability$Token|Counters
Oracle:Whenever this Vehicle attacks, create a Treasure token. (It's an artifact with "{T}, Sacrifice this token: Add one mana of any color.")\nExhaust — {3}: This Vehicle becomes an artifact creature. Put a +1/+1 counter on it. (Activate each exhaust ability only once.)\nCrew 1
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/sab_sunen_luxa_embodied.txt b/forge-gui/res/cardsfolder/upcoming/sab_sunen_luxa_embodied.txt
index b4c5a529595..5fa84eeb827 100644
--- a/forge-gui/res/cardsfolder/upcoming/sab_sunen_luxa_embodied.txt
+++ b/forge-gui/res/cardsfolder/upcoming/sab_sunen_luxa_embodied.txt
@@ -1,14 +1,14 @@
-Name:Sab-Sunen, Luxa Embodied
-ManaCost:3 G U
-Types:Legendary Creature God
-PT:6/6
-K:Reach
-K:Trample
-K:Indestructible
-S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CARDNAME can't attack or block. | CheckSVar$ X | SVarCompare$ EQ1 | Description$ NICKNAME can't attack or block unless it has an even number of counters on it. (Zero is even.)
-T:Mode$ Phase | Phase$ Main1 | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ At the beginning of your first main phase, put a +1/+1 counter on NICKNAME. Then if it has an odd number of counters on it, draw two cards.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBDraw
-SVar:TrigDraw:DB$ Draw | NumCards$ 2 | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ1
-SVar:X:Count$CardCounters.ALL/Mod.2
-DeckHas:Ability$Counters
+Name:Sab-Sunen, Luxa Embodied
+ManaCost:3 G U
+Types:Legendary Creature God
+PT:6/6
+K:Reach
+K:Trample
+K:Indestructible
+S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CARDNAME can't attack or block. | CheckSVar$ X | SVarCompare$ EQ1 | Description$ NICKNAME can't attack or block unless it has an even number of counters on it. (Zero is even.)
+T:Mode$ Phase | Phase$ Main1 | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ At the beginning of your first main phase, put a +1/+1 counter on NICKNAME. Then if it has an odd number of counters on it, draw two cards.
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBDraw
+SVar:TrigDraw:DB$ Draw | NumCards$ 2 | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ1
+SVar:X:Count$CardCounters.ALL/Mod.2
+DeckHas:Ability$Counters
Oracle:Reach, trample, indestructible\nSab-Sunen can't attack or block unless it has an even number of counters on it. (Zero is even.)\nAt the beginning of your first main phase, put a +1/+1 counter on Sab-Sunen. Then if it has an odd number of counters on it, draw two cards.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/saheeli_radiant_creator.txt b/forge-gui/res/cardsfolder/upcoming/saheeli_radiant_creator.txt
index 5d7063c1933..b1281ed6849 100644
--- a/forge-gui/res/cardsfolder/upcoming/saheeli_radiant_creator.txt
+++ b/forge-gui/res/cardsfolder/upcoming/saheeli_radiant_creator.txt
@@ -1,11 +1,11 @@
-Name:Saheeli, Radiant Creator
-ManaCost:1 G U R
-Types:Legendary Creature Human Artificer
-PT:4/4
-T:Mode$ SpellCast | ValidCard$ Artificer,Artifact | ValidActivatingPlayer$ You | Execute$ TrigEnergy | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast an Artificer or artifact spell, you get {E} (an energy counter).
-SVar:TrigEnergy:DB$ PutCounter | Defined$ You | CounterType$ ENERGY | CounterNum$ 1
-T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigImmediateTrig | TriggerDescription$ At the beginning of combat on your turn, you may pay {E}{E}{E}. When you do, create a token that's a copy of target permanent you control, except it's a 5/5 artifact creature in addition to its other types and has haste. Sacrifice it at the beginning of the next end step.
-SVar:TrigImmediateTrig:AB$ ImmediateTrigger | Cost$ PayEnergy<3> | Execute$ TrigCopy | TriggerDescription$ When you do, create a token that's a copy of target permanent you control, except it's a 5/5 artifact creature in addition to its other types and has haste. Sacrifice it at the beginning of the next end step.
-SVar:TrigCopy:DB$ CopyPermanent | ValidTgts$ Permanent.YouCtrl | TgtPrompt$ Select target permanent you control | SetPower$ 5 | SetToughness$ 5 | AddTypes$ Artifact,Creature | AddKeywords$ Haste | AtEOT$ Sacrifice
-DeckNeeds:Type$Artifact
-Oracle:Whenever you cast an Artificer or artifact spell, you get {E} (an energy counter).\nAt the beginning of combat on your turn, you may pay {E}{E}{E}. When you do, create a token that's a copy of target permanent you control, except it's a 5/5 artifact creature in addition to its other types and has haste. Sacrifice it at the beginning of the next end step.
+Name:Saheeli, Radiant Creator
+ManaCost:1 G U R
+Types:Legendary Creature Human Artificer
+PT:4/4
+T:Mode$ SpellCast | ValidCard$ Artificer,Artifact | ValidActivatingPlayer$ You | Execute$ TrigEnergy | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast an Artificer or artifact spell, you get {E} (an energy counter).
+SVar:TrigEnergy:DB$ PutCounter | Defined$ You | CounterType$ ENERGY | CounterNum$ 1
+T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigImmediateTrig | TriggerDescription$ At the beginning of combat on your turn, you may pay {E}{E}{E}. When you do, create a token that's a copy of target permanent you control, except it's a 5/5 artifact creature in addition to its other types and has haste. Sacrifice it at the beginning of the next end step.
+SVar:TrigImmediateTrig:AB$ ImmediateTrigger | Cost$ PayEnergy<3> | Execute$ TrigCopy | TriggerDescription$ When you do, create a token that's a copy of target permanent you control, except it's a 5/5 artifact creature in addition to its other types and has haste. Sacrifice it at the beginning of the next end step.
+SVar:TrigCopy:DB$ CopyPermanent | ValidTgts$ Permanent.YouCtrl | TgtPrompt$ Select target permanent you control | SetPower$ 5 | SetToughness$ 5 | AddTypes$ Artifact,Creature | AddKeywords$ Haste | AtEOT$ Sacrifice
+DeckNeeds:Type$Artifact
+Oracle:Whenever you cast an Artificer or artifact spell, you get {E} (an energy counter).\nAt the beginning of combat on your turn, you may pay {E}{E}{E}. When you do, create a token that's a copy of target permanent you control, except it's a 5/5 artifact creature in addition to its other types and has haste. Sacrifice it at the beginning of the next end step.
diff --git a/forge-gui/res/cardsfolder/upcoming/sita_varma_masker_racer.txt b/forge-gui/res/cardsfolder/upcoming/sita_varma_masker_racer.txt
index e8dcf9545b5..2291992a15c 100644
--- a/forge-gui/res/cardsfolder/upcoming/sita_varma_masker_racer.txt
+++ b/forge-gui/res/cardsfolder/upcoming/sita_varma_masker_racer.txt
@@ -1,10 +1,10 @@
-Name:Sita Varma, Masked Racer
-ManaCost:G U
-Types:Legendary Creature Human Rogue
-PT:2/3
-A:AB$ PutCounter | Cost$ X G G U | Defined$ Self | CounterType$ P1P1 | CounterNum$ X | Exhaust$ True | SubAbility$ DBAnimateAll | SpellDescription$ Put X +1/+1 counters on NICKNAME. Then you may have the base power and toughness of each other creature you control become equal to NICKNAME's power until end of turn. (Activate each exhaust ability only once.)
-SVar:DBAnimateAll:DB$ Animate | Power$ Y | Toughness$ Y | Defined$ Valid Creature.YouCtrl+Other | Optional$ True
-DeckHas:Ability$Counters
-SVar:X:Count$xPaid
-SVar:Y:Count$CardPower
-Oracle:Exhaust — {X}{G}{G}{U}: Put X +1/+1 counters on Sita Varma. Then you may have the base power and toughness of each other creature you control become equal to Sita Varma's power until end of turn. (Activate each exhaust ability only once.)
+Name:Sita Varma, Masked Racer
+ManaCost:G U
+Types:Legendary Creature Human Rogue
+PT:2/3
+A:AB$ PutCounter | Cost$ X G G U | Defined$ Self | CounterType$ P1P1 | CounterNum$ X | Exhaust$ True | SubAbility$ DBAnimateAll | SpellDescription$ Put X +1/+1 counters on NICKNAME. Then you may have the base power and toughness of each other creature you control become equal to NICKNAME's power until end of turn. (Activate each exhaust ability only once.)
+SVar:DBAnimateAll:DB$ Animate | Power$ Y | Toughness$ Y | Defined$ Valid Creature.YouCtrl+Other | Optional$ True
+DeckHas:Ability$Counters
+SVar:X:Count$xPaid
+SVar:Y:Count$CardPower
+Oracle:Exhaust — {X}{G}{G}{U}: Put X +1/+1 counters on Sita Varma. Then you may have the base power and toughness of each other creature you control become equal to Sita Varma's power until end of turn. (Activate each exhaust ability only once.)
diff --git a/forge-gui/res/cardsfolder/upcoming/sunbillow_verge.txt b/forge-gui/res/cardsfolder/upcoming/sunbillow_verge.txt
index ffd019ecd75..1b0589f07cc 100644
--- a/forge-gui/res/cardsfolder/upcoming/sunbillow_verge.txt
+++ b/forge-gui/res/cardsfolder/upcoming/sunbillow_verge.txt
@@ -1,6 +1,6 @@
-Name:Sunbillow Verge
-ManaCost:no cost
-Types:Land
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
-A:AB$ Mana | Cost$ T | Produced$ R | IsPresent$ Mountain.YouCtrl,Plains.YouCtrl | SpellDescription$ Add {R}. Activate only if you control a Mountain or a Plains.
-Oracle:{T}: Add {W}.\n{T}: Add {R}. Activate only if you control a Mountain or a Plains.
+Name:Sunbillow Verge
+ManaCost:no cost
+Types:Land
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
+A:AB$ Mana | Cost$ T | Produced$ R | IsPresent$ Mountain.YouCtrl,Plains.YouCtrl | SpellDescription$ Add {R}. Activate only if you control a Mountain or a Plains.
+Oracle:{T}: Add {W}.\n{T}: Add {R}. Activate only if you control a Mountain or a Plains.
diff --git a/forge-gui/res/cardsfolder/upcoming/temmet_naktamuns_will.txt b/forge-gui/res/cardsfolder/upcoming/temmet_naktamuns_will.txt
index 023297807ae..5f95d94cde5 100644
--- a/forge-gui/res/cardsfolder/upcoming/temmet_naktamuns_will.txt
+++ b/forge-gui/res/cardsfolder/upcoming/temmet_naktamuns_will.txt
@@ -1,13 +1,13 @@
-Name:Temmet, Naktamun's Will
-ManaCost:2 W U B
-Types:Legendary Creature Zombie Wizard
-PT:4/4
-K:Vigilance
-K:Menace
-T:Mode$ AttackersDeclared | AttackingPlayer$ You | Execute$ TrigDraw | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack, draw a card, then discard a card.
-SVar:TrigDraw:DB$ Draw | SubAbility$ DBDiscard
-SVar:DBDiscard:DB$ Discard | Defined$ You | NumCards$ 1 | Mode$ TgtChoose
-T:Mode$ Drawn | ValidCard$ Card.YouOwn | TriggerZones$ Battlefield | Execute$ TrigPumpAll | TriggerDescription$ Whenever you draw a card, Zombies you control get +1/+1 until end of turn.
-SVar:TrigPumpAll:DB$ PumpAll | ValidCards$ Zombie.YouCtrl | NumAtt$ +1 | NumDef$ +1
-SVar:PlayMain1:TRUE
+Name:Temmet, Naktamun's Will
+ManaCost:2 W U B
+Types:Legendary Creature Zombie Wizard
+PT:4/4
+K:Vigilance
+K:Menace
+T:Mode$ AttackersDeclared | AttackingPlayer$ You | Execute$ TrigDraw | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack, draw a card, then discard a card.
+SVar:TrigDraw:DB$ Draw | SubAbility$ DBDiscard
+SVar:DBDiscard:DB$ Discard | Defined$ You | NumCards$ 1 | Mode$ TgtChoose
+T:Mode$ Drawn | ValidCard$ Card.YouOwn | TriggerZones$ Battlefield | Execute$ TrigPumpAll | TriggerDescription$ Whenever you draw a card, Zombies you control get +1/+1 until end of turn.
+SVar:TrigPumpAll:DB$ PumpAll | ValidCards$ Zombie.YouCtrl | NumAtt$ +1 | NumDef$ +1
+SVar:PlayMain1:TRUE
Oracle:Vigilance, menace\nWhenever you attack, draw a card, then discard a card.\nWhenever you draw a card, Zombies you control get +1/+1 until end of turn.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/the_aetherspark.txt b/forge-gui/res/cardsfolder/upcoming/the_aetherspark.txt
index c80d3b9ed84..6d0e377f10a 100644
--- a/forge-gui/res/cardsfolder/upcoming/the_aetherspark.txt
+++ b/forge-gui/res/cardsfolder/upcoming/the_aetherspark.txt
@@ -1,15 +1,15 @@
-Name:The Aetherspark
-ManaCost:4
-Types:Legendary Artifact Planeswalker Equipment
-Loyalty:4
-S:Mode$ CantAttack | ValidCard$ Creature | Target$ Card.Self+AttachedTo Creature | Description$ As long as CARDNAME is attached to a creature, CARDNAME can't be attacked and has "Whenever equipped creature deals combat damage during your turn, put that many loyalty counters on CARDNAME."
-S:Mode$ Continuous | Affected$ Card.Self+AttachedTo Creature | Secondary$ True | AddTrigger$ TrigDamageDoneOnce | Description$ As long as CARDNAME is attached to a creature, CARDNAME can't be attacked and has "Whenever equipped creature deals combat damage during your turn, put that many loyalty counters on CARDNAME."
-SVar:TrigDamageDoneOnce:Mode$ DamageDealtOnce | CombatDamage$ True | ValidSource$ Creature.EquippedBy | Execute$ TrigPutCounter | TriggerZones$ Battlefield | PlayerTurn$ True | TriggerDescription$ Whenever equipped creature deals combat damage during your turn, put that many loyalty counters on CARDNAME.
-SVar:TrigPutCounter:DB$ PutCounter | CounterType$ LOYALTY | CounterNum$ X
-A:AB$ Attach | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | ValidTgts$ Creature.YouCtrl | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select target creature you control | SubAbility$ DBPutCounter | SpellDescription$ Attach CARDNAME to up to one target creature you control. Put a +1/+1 counter on that creature.
-SVar:DBPutCounter:DB$ PutCounter | Defined$ Targeted | CounterType$ P1P1 | CounterNum$ 1
-A:AB$ Draw | Cost$ SubCounter<5/LOYALTY> | Planeswalker$ True | NumCards$ 2 | SpellDescription$ Draw two cards.
-A:AB$ Mana | Cost$ SubCounter<10/LOYALTY> | Planeswalker$ True | Ultimate$ True | Produced$ Any | Amount$ 10 | SpellDescription$ Add ten mana of any one color.
-DeckHas:Ability$Counters
-SVar:X:TriggerCount$DamageAmount
-Oracle:As long as The Aetherspark is attached to a creature, The Aetherspark can't be attacked and has "Whenever equipped creature deals combat damage during your turn, put that many loyalty counters on The Aetherspark."\n[+1]: Attach The Aetherspark to up to one target creature you control. Put a +1/+1 counter on that creature.\n[-5]: Draw two cards.\n[-10]: Add ten mana of any one color.
+Name:The Aetherspark
+ManaCost:4
+Types:Legendary Artifact Planeswalker Equipment
+Loyalty:4
+S:Mode$ CantAttack | ValidCard$ Creature | Target$ Card.Self+AttachedTo Creature | Description$ As long as CARDNAME is attached to a creature, CARDNAME can't be attacked and has "Whenever equipped creature deals combat damage during your turn, put that many loyalty counters on CARDNAME."
+S:Mode$ Continuous | Affected$ Card.Self+AttachedTo Creature | Secondary$ True | AddTrigger$ TrigDamageDoneOnce | Description$ As long as CARDNAME is attached to a creature, CARDNAME can't be attacked and has "Whenever equipped creature deals combat damage during your turn, put that many loyalty counters on CARDNAME."
+SVar:TrigDamageDoneOnce:Mode$ DamageDealtOnce | CombatDamage$ True | ValidSource$ Creature.EquippedBy | Execute$ TrigPutCounter | TriggerZones$ Battlefield | PlayerTurn$ True | TriggerDescription$ Whenever equipped creature deals combat damage during your turn, put that many loyalty counters on CARDNAME.
+SVar:TrigPutCounter:DB$ PutCounter | CounterType$ LOYALTY | CounterNum$ X
+A:AB$ Attach | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | ValidTgts$ Creature.YouCtrl | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select target creature you control | SubAbility$ DBPutCounter | SpellDescription$ Attach CARDNAME to up to one target creature you control. Put a +1/+1 counter on that creature.
+SVar:DBPutCounter:DB$ PutCounter | Defined$ Targeted | CounterType$ P1P1 | CounterNum$ 1
+A:AB$ Draw | Cost$ SubCounter<5/LOYALTY> | Planeswalker$ True | NumCards$ 2 | SpellDescription$ Draw two cards.
+A:AB$ Mana | Cost$ SubCounter<10/LOYALTY> | Planeswalker$ True | Ultimate$ True | Produced$ Any | Amount$ 10 | SpellDescription$ Add ten mana of any one color.
+DeckHas:Ability$Counters
+SVar:X:TriggerCount$DamageAmount
+Oracle:As long as The Aetherspark is attached to a creature, The Aetherspark can't be attacked and has "Whenever equipped creature deals combat damage during your turn, put that many loyalty counters on The Aetherspark."\n[+1]: Attach The Aetherspark to up to one target creature you control. Put a +1/+1 counter on that creature.\n[-5]: Draw two cards.\n[-10]: Add ten mana of any one color.
diff --git a/forge-gui/res/cardsfolder/upcoming/the_last_ride.txt b/forge-gui/res/cardsfolder/upcoming/the_last_ride.txt
index dda4fb450f2..7d598315e70 100644
--- a/forge-gui/res/cardsfolder/upcoming/the_last_ride.txt
+++ b/forge-gui/res/cardsfolder/upcoming/the_last_ride.txt
@@ -1,9 +1,9 @@
-Name:The Last Ride
-ManaCost:B
-Types:Legendary Artifact Vehicle
-PT:13/13
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ -X | AddToughness$ -X | Description$ CARDNAME gets -X/-X, where X is your life total.
-A:AB$ Draw | Cost$ 2 B PayLife<2> | SpellDescription$ Draw a card.
-SVar:X:Count$YourLifeTotal
-K:Crew:2
+Name:The Last Ride
+ManaCost:B
+Types:Legendary Artifact Vehicle
+PT:13/13
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ -X | AddToughness$ -X | Description$ CARDNAME gets -X/-X, where X is your life total.
+A:AB$ Draw | Cost$ 2 B PayLife<2> | SpellDescription$ Draw a card.
+SVar:X:Count$YourLifeTotal
+K:Crew:2
Oracle:The Last Ride gets -X/-X, where X is your life total.\n{2}{B}, Pay 2 life: Draw a card.\nCrew 2
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/thopter_fabricator.txt b/forge-gui/res/cardsfolder/upcoming/thopter_fabricator.txt
index dd40c06981e..a69f8b76e71 100644
--- a/forge-gui/res/cardsfolder/upcoming/thopter_fabricator.txt
+++ b/forge-gui/res/cardsfolder/upcoming/thopter_fabricator.txt
@@ -1,10 +1,10 @@
-Name:Thopter Fabricator
-ManaCost:2 U
-Types:Artifact Vehicle
-PT:4/4
-K:Flying
-T:Mode$ Drawn | ValidCard$ Card.YouCtrl | Number$ 2 | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever you draw your second card each turn, create a 1/1 colorless Thopter artifact creature token with flying.
-SVar:TrigToken:DB$ Token | TokenScript$ c_1_1_a_thopter_flying
-K:Crew:2
-DeckHas:Ability$Token
+Name:Thopter Fabricator
+ManaCost:2 U
+Types:Artifact Vehicle
+PT:4/4
+K:Flying
+T:Mode$ Drawn | ValidCard$ Card.YouCtrl | Number$ 2 | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever you draw your second card each turn, create a 1/1 colorless Thopter artifact creature token with flying.
+SVar:TrigToken:DB$ Token | TokenScript$ c_1_1_a_thopter_flying
+K:Crew:2
+DeckHas:Ability$Token
Oracle:Flying\nWhenever you draw your second card each turn, create a 1/1 colorless Thopter artifact creature token with flying.\nCrew 2
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/thunderous_velocipede.txt b/forge-gui/res/cardsfolder/upcoming/thunderous_velocipede.txt
index ee6ae595928..0392f15ea1f 100644
--- a/forge-gui/res/cardsfolder/upcoming/thunderous_velocipede.txt
+++ b/forge-gui/res/cardsfolder/upcoming/thunderous_velocipede.txt
@@ -1,10 +1,10 @@
-Name:Thunderous Velocipede
-ManaCost:1 G G
-Types:Artifact Vehicle
-PT:5/5
-K:Trample
-K:ETBReplacement:Other:AddExtraCounter:Mandatory:Battlefield:Creature.YouCtrl+Other,Vehicle.YouCtrl+Other
-SVar:AddExtraCounter:DB$ PutCounter | ETB$ True | Defined$ ReplacedCard | CounterType$ P1P1 | CounterNum$ X | SpellDescription$ Each other Vehicle and creature you control enters with an additional +1/+1 counter on it if its mana value is 4 or less. Otherwise, it enters with three additional +1/+1 counters on it.
-SVar:X:Count$Compare ReplacedCard$CardManaCost LE4.1.3
-K:Crew:3
+Name:Thunderous Velocipede
+ManaCost:1 G G
+Types:Artifact Vehicle
+PT:5/5
+K:Trample
+K:ETBReplacement:Other:AddExtraCounter:Mandatory:Battlefield:Creature.YouCtrl+Other,Vehicle.YouCtrl+Other
+SVar:AddExtraCounter:DB$ PutCounter | ETB$ True | Defined$ ReplacedCard | CounterType$ P1P1 | CounterNum$ X | SpellDescription$ Each other Vehicle and creature you control enters with an additional +1/+1 counter on it if its mana value is 4 or less. Otherwise, it enters with three additional +1/+1 counters on it.
+SVar:X:Count$Compare ReplacedCard$CardManaCost LE4.1.3
+K:Crew:3
Oracle:Trample\nEach other Vehicle and creature you control enters with an additional +1/+1 counter on it if its mana value is 4 or less. Otherwise, it enters with three additional +1/+1 counters on it.\nCrew 3
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/venomsac_lagac.txt b/forge-gui/res/cardsfolder/upcoming/venomsac_lagac.txt
index fae77678518..84e36dfbc32 100644
--- a/forge-gui/res/cardsfolder/upcoming/venomsac_lagac.txt
+++ b/forge-gui/res/cardsfolder/upcoming/venomsac_lagac.txt
@@ -1,9 +1,9 @@
-Name:Venomsac Lagac
-ManaCost:1 G
-Types:Creature Lizard Mount
-PT:2/1
-K:Deathtouch
-T:Mode$ Attacks | ValidCard$ Card.Self+IsSaddled | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever this creature attacks while saddled, it gets +0/+3 until end of turn.
-SVar:TrigPump:DB$ Pump | NumDef$ 3
-K:Saddle:2
+Name:Venomsac Lagac
+ManaCost:1 G
+Types:Creature Lizard Mount
+PT:2/1
+K:Deathtouch
+T:Mode$ Attacks | ValidCard$ Card.Self+IsSaddled | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever this creature attacks while saddled, it gets +0/+3 until end of turn.
+SVar:TrigPump:DB$ Pump | NumDef$ 3
+K:Saddle:2
Oracle:Deathtouch\nWhenever this creature attacks while saddled, it gets +0/+3 until end of turn.\nSaddle 2 (Tap any number of other creatures you control with total power 2 or more: This Mount becomes saddled until end of turn. Saddle only as a sorcery.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/voyager_glidecar.txt b/forge-gui/res/cardsfolder/upcoming/voyager_glidecar.txt
index cf34e49b977..a5fd38f18d9 100644
--- a/forge-gui/res/cardsfolder/upcoming/voyager_glidecar.txt
+++ b/forge-gui/res/cardsfolder/upcoming/voyager_glidecar.txt
@@ -1,11 +1,11 @@
-Name:Voyager Glidecar
-ManaCost:W
-Types:Artifact Vehicle
-PT:2/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigScry | TriggerDescription$ When this Vehicle enters, scry 1.
-SVar:TrigScry:DB$ Scry | ScryNum$ 1
-A:AB$ Animate | Cost$ tapXType<3/Creature.Other/other creature> | Defined$ Self | Types$ Artifact,Creature | Keywords$ Flying | SubAbility$ DBPutCounter | SpellDescription$ Until end of turn, this Vehicle becomes an artifact creature and gains flying. Put a +1/+1 counter on it.
-SVar:DBPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
-K:Crew:1
-DeckHas:Ability$Counters
+Name:Voyager Glidecar
+ManaCost:W
+Types:Artifact Vehicle
+PT:2/3
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigScry | TriggerDescription$ When this Vehicle enters, scry 1.
+SVar:TrigScry:DB$ Scry | ScryNum$ 1
+A:AB$ Animate | Cost$ tapXType<3/Creature.Other/other creature> | Defined$ Self | Types$ Artifact,Creature | Keywords$ Flying | SubAbility$ DBPutCounter | SpellDescription$ Until end of turn, this Vehicle becomes an artifact creature and gains flying. Put a +1/+1 counter on it.
+SVar:DBPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
+K:Crew:1
+DeckHas:Ability$Counters
Oracle:When this Vehicle enters, scry 1.\nTap three other untapped creatures you control: Until end of turn, this Vehicle becomes an artifact creature and gains flying. Put a +1/+1 counter on it.\nCrew 1
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/wastewood_verge.txt b/forge-gui/res/cardsfolder/upcoming/wastewood_verge.txt
index 32a2b0f7979..79f93ca5800 100644
--- a/forge-gui/res/cardsfolder/upcoming/wastewood_verge.txt
+++ b/forge-gui/res/cardsfolder/upcoming/wastewood_verge.txt
@@ -1,6 +1,6 @@
-Name:Wastewood Verge
-ManaCost:no cost
-Types:Land
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
-A:AB$ Mana | Cost$ T | Produced$ B | IsPresent$ Swamp.YouCtrl,Forest.YouCtrl | SpellDescription$ Add {B}. Activate only if you control a Swamp or a Forest.
-Oracle:{T}: Add {G}.\n{T}: Add {B}. Activate only if you control a Swamp or a Forest.
+Name:Wastewood Verge
+ManaCost:no cost
+Types:Land
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
+A:AB$ Mana | Cost$ T | Produced$ B | IsPresent$ Swamp.YouCtrl,Forest.YouCtrl | SpellDescription$ Add {B}. Activate only if you control a Swamp or a Forest.
+Oracle:{T}: Add {G}.\n{T}: Add {B}. Activate only if you control a Swamp or a Forest.
diff --git a/forge-gui/res/cardsfolder/upcoming/willowrush_verge.txt b/forge-gui/res/cardsfolder/upcoming/willowrush_verge.txt
index f518ebffb27..17910ce6145 100644
--- a/forge-gui/res/cardsfolder/upcoming/willowrush_verge.txt
+++ b/forge-gui/res/cardsfolder/upcoming/willowrush_verge.txt
@@ -1,6 +1,6 @@
-Name:Willowrush Verge
-ManaCost:no cost
-Types:Land
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
-A:AB$ Mana | Cost$ T | Produced$ G | IsPresent$ Forest.YouCtrl,Island.YouCtrl | SpellDescription$ Add {G}. Activate only if you control a Forest or an Island.
-Oracle:{T}: Add {U}.\n{T}: Add {G}. Activate only if you control a Forest or an Island.
+Name:Willowrush Verge
+ManaCost:no cost
+Types:Land
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
+A:AB$ Mana | Cost$ T | Produced$ G | IsPresent$ Forest.YouCtrl,Island.YouCtrl | SpellDescription$ Add {G}. Activate only if you control a Forest or an Island.
+Oracle:{T}: Add {U}.\n{T}: Add {G}. Activate only if you control a Forest or an Island.
diff --git a/forge-gui/res/cardsfolder/upcoming/winter_cursed_raider.txt b/forge-gui/res/cardsfolder/upcoming/winter_cursed_raider.txt
index 572f611094b..4b537e36bb7 100644
--- a/forge-gui/res/cardsfolder/upcoming/winter_cursed_raider.txt
+++ b/forge-gui/res/cardsfolder/upcoming/winter_cursed_raider.txt
@@ -1,11 +1,11 @@
-Name:Winter, Cursed Rider
-ManaCost:U B
-Types:Legendary Creature Human Warlock
-PT:3/2
-K:Ward:PayLife<2>
-S:Mode$ Continuous | Affected$ Artifact.YouCtrl | AddKeyword$ Ward:PayLife<2> | Description$ Artifacts you control have "Ward—Pay 2 life."
-A:AB$ PumpAll | Cost$ 2 U B T ExileFromGrave | ValidCards$ Creature.nonArtifact+Other | NumAtt$ -X | NumDef$ -X | IsCurse$ True | Exhaust$ True | SpellDescription$ Each other nonartifact creature gets -X/-X until end of turn. (Activate each exhaust ability only once.)
-SVar:X:Count$xPaid
-DeckHints:Type$Artifact
-DeckHas:Keyword$Ward
+Name:Winter, Cursed Rider
+ManaCost:U B
+Types:Legendary Creature Human Warlock
+PT:3/2
+K:Ward:PayLife<2>
+S:Mode$ Continuous | Affected$ Artifact.YouCtrl | AddKeyword$ Ward:PayLife<2> | Description$ Artifacts you control have "Ward—Pay 2 life."
+A:AB$ PumpAll | Cost$ 2 U B T ExileFromGrave | ValidCards$ Creature.nonArtifact+Other | NumAtt$ -X | NumDef$ -X | IsCurse$ True | Exhaust$ True | SpellDescription$ Each other nonartifact creature gets -X/-X until end of turn. (Activate each exhaust ability only once.)
+SVar:X:Count$xPaid
+DeckHints:Type$Artifact
+DeckHas:Keyword$Ward
Oracle:Ward—Pay 2 life.\nArtifacts you control have "Ward—Pay 2 life."\nExhaust — {2}{U}{B}, {T}, Exile X artifact cards from your graveyard: Each other nonartifact creature gets -X/-X until end of turn. (Activate each exhaust ability only once.)
\ No newline at end of file
From 2f390114b5f3d2db4e154da124ea70fbb52f2a7e Mon Sep 17 00:00:00 2001
From: Fulgur14 <54345051+Fulgur14@users.noreply.github.com>
Date: Thu, 23 Jan 2025 09:10:12 +0100
Subject: [PATCH 13/13] 3 DFT cards plus update of Sab-Sunen (#6839)
---
.../upcoming/ketramose_the_new_dawn.txt | 12 ++++++++
.../cardsfolder/upcoming/marauding_mako.txt | 9 ++++++
.../upcoming/marketback_walker.txt | 12 ++++++++
.../upcoming/sab_sunen_luxa_embodied.txt | 28 +++++++++----------
4 files changed, 47 insertions(+), 14 deletions(-)
create mode 100644 forge-gui/res/cardsfolder/upcoming/ketramose_the_new_dawn.txt
create mode 100644 forge-gui/res/cardsfolder/upcoming/marauding_mako.txt
create mode 100644 forge-gui/res/cardsfolder/upcoming/marketback_walker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ketramose_the_new_dawn.txt b/forge-gui/res/cardsfolder/upcoming/ketramose_the_new_dawn.txt
new file mode 100644
index 00000000000..9d46599f2f3
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/ketramose_the_new_dawn.txt
@@ -0,0 +1,12 @@
+Name:Ketramose, the New Dawn
+ManaCost:1 W B
+Types:Legendary Creature God
+PT:4/4
+K:Menace
+K:Lifelink
+K:Indestructible
+S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CARDNAME can't attack or block. | IsPresent$ Card | PresentZone$ Exile | PresentCompare$ LT7 | Description$ NICKNAME can't attack or block unless there are seven or more cards in exile.
+T:Mode$ ChangesZoneAll | ValidCards$ Card.nonToken | Origin$ Battlefield,Graveyard | Destination$ Exile | TriggerZones$ Battlefield | PlayerTurn$ True | Execute$ TrigDraw | TriggerDescription$ Whenever one or more cards are put into exile from graveyards and/or the battlefield during your turn, you draw a card and lose 1 life.
+SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1 | SubAbility$ DBLoseLife
+SVar:DBLoseLife:DB$ LoseLife | Defined$ You | LifeAmount$ 1
+Oracle:Menace, lifelink, indestructible\nKetramose can't attack or block unless there are seven or more cards in exile.\nWhenever one or more cards are put into exile from graveyards and/or the battlefield during your turn, you draw a card and lose 1 life.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/marauding_mako.txt b/forge-gui/res/cardsfolder/upcoming/marauding_mako.txt
new file mode 100644
index 00000000000..6b9015579a5
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/marauding_mako.txt
@@ -0,0 +1,9 @@
+Name:Marauding Mako
+ManaCost:R
+Types:Creature Shark Pirate
+PT:1/1
+T:Mode$ DiscardedAll | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever you discard one or more cards, put that many +1/+1 counters on this creature.
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ X
+SVar:X:TriggerCount$Amount
+K:Cycling:2
+Oracle:Whenever you discard one or more cards, put that many +1/+1 counters on this creature.\nCycling {2} ({2}, Discard this card: Draw a card.)
diff --git a/forge-gui/res/cardsfolder/upcoming/marketback_walker.txt b/forge-gui/res/cardsfolder/upcoming/marketback_walker.txt
new file mode 100644
index 00000000000..85bc29c4c7e
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/marketback_walker.txt
@@ -0,0 +1,12 @@
+Name:Marketback Walker
+ManaCost:X X
+Types:Artifact Creature Construct
+PT:0/0
+K:etbCounter:P1P1:X
+A:AB$ PutCounter | Cost$ 4 | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Put a +1/+1 counter on this creature.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When this creature dies, draw a card for each +1/+1 counter on it.
+SVar:TrigDraw:DB$ Draw | NumCards$ Y
+SVar:X:Count$xPaid
+SVar:Y:TriggeredCard$CardCounters.P1P1
+DeckHas:Ability$Token
+Oracle:This creature enters with X +1/+1 counters on it.\n{4}: Put a +1/+1 counter on this creature.\nWhen this creature dies, draw a card for each +1/+1 counter on it.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/sab_sunen_luxa_embodied.txt b/forge-gui/res/cardsfolder/upcoming/sab_sunen_luxa_embodied.txt
index 5fa84eeb827..85b1e988459 100644
--- a/forge-gui/res/cardsfolder/upcoming/sab_sunen_luxa_embodied.txt
+++ b/forge-gui/res/cardsfolder/upcoming/sab_sunen_luxa_embodied.txt
@@ -1,14 +1,14 @@
-Name:Sab-Sunen, Luxa Embodied
-ManaCost:3 G U
-Types:Legendary Creature God
-PT:6/6
-K:Reach
-K:Trample
-K:Indestructible
-S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CARDNAME can't attack or block. | CheckSVar$ X | SVarCompare$ EQ1 | Description$ NICKNAME can't attack or block unless it has an even number of counters on it. (Zero is even.)
-T:Mode$ Phase | Phase$ Main1 | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ At the beginning of your first main phase, put a +1/+1 counter on NICKNAME. Then if it has an odd number of counters on it, draw two cards.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBDraw
-SVar:TrigDraw:DB$ Draw | NumCards$ 2 | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ1
-SVar:X:Count$CardCounters.ALL/Mod.2
-DeckHas:Ability$Counters
-Oracle:Reach, trample, indestructible\nSab-Sunen can't attack or block unless it has an even number of counters on it. (Zero is even.)\nAt the beginning of your first main phase, put a +1/+1 counter on Sab-Sunen. Then if it has an odd number of counters on it, draw two cards.
\ No newline at end of file
+Name:Sab-Sunen, Luxa Embodied
+ManaCost:3 G U
+Types:Legendary Creature God
+PT:6/6
+K:Reach
+K:Trample
+K:Indestructible
+S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CARDNAME can't attack or block. | CheckSVar$ X | SVarCompare$ EQ1 | Description$ NICKNAME can't attack or block unless it has an even number of counters on it. (Zero is even.)
+T:Mode$ Phase | Phase$ Main1 | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ At the beginning of your first main phase, put a +1/+1 counter on NICKNAME. Then if it has an odd number of counters on it, draw two cards.
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBDraw
+SVar:DBDraw:DB$ Draw | NumCards$ 2 | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ1
+SVar:X:Count$CardCounters.ALL/Mod.2
+DeckHas:Ability$Counters
+Oracle:Reach, trample, indestructible\nSab-Sunen can't attack or block unless it has an even number of counters on it. (Zero is even.)\nAt the beginning of your first main phase, put a +1/+1 counter on Sab-Sunen. Then if it has an odd number of counters on it, draw two cards.