From 14b5da90d8bb65a10fe0d5c32655c4c362d051e8 Mon Sep 17 00:00:00 2001
From: paulsnoops <paulhammerton1@hotmail.co.uk>
Date: Sat, 2 Sep 2023 14:19:26 +0100
Subject: [PATCH] UB/SLX rebranded script merging

---
 .../cardsfolder/a/aisha_of_sparks_and_smoke.txt   | 11 -----------
 .../res/cardsfolder/a/arvinox_the_mind_flail.txt  | 12 ------------
 .../cardsfolder/b/baldin_century_herdmaster.txt   | 10 ----------
 .../cardsfolder/b/bjorna_nightfall_alchemist.txt  | 12 ------------
 .../res/cardsfolder/b/blanka_ferocious_friend.txt |  1 +
 .../res/cardsfolder/c/cecily_haunted_mage.txt     | 14 --------------
 forge-gui/res/cardsfolder/c/chief_jim_hopper.txt  |  1 +
 .../res/cardsfolder/c/chun_li_countless_kicks.txt |  1 +
 .../res/cardsfolder/d/daryl_hunter_of_walkers.txt |  1 +
 .../cardsfolder/d/dhalsim_pliable_pacifist.txt    |  1 +
 .../res/cardsfolder/d/dustin_gadget_genius.txt    |  1 +
 .../res/cardsfolder/e/e_honda_sumo_champion.txt   |  1 +
 forge-gui/res/cardsfolder/e/eleven_the_mage.txt   |  1 +
 .../cardsfolder/e/elmar_ulvenwald_informant.txt   | 11 -----------
 .../res/cardsfolder/g/glenn_the_voice_of_calm.txt |  1 +
 .../res/cardsfolder/g/guile_sonic_soldier.txt     |  1 +
 .../cardsfolder/h/hargilde_kindly_runechanter.txt |  8 --------
 .../res/cardsfolder/i/immard_the_stormcleaver.txt | 14 --------------
 .../res/cardsfolder/k/ken_burning_brawler.txt     |  1 +
 .../res/cardsfolder/l/lucas_the_sharpshooter.txt  |  1 +
 forge-gui/res/cardsfolder/l/lucille.txt           |  1 +
 .../cardsfolder/m/maarika_brutal_gladiator.txt    |  9 ---------
 forge-gui/res/cardsfolder/m/max_the_daredevil.txt |  1 +
 .../cardsfolder/m/michonne_ruthless_survivor.txt  |  1 +
 .../res/cardsfolder/m/mike_the_dungeon_master.txt |  1 +
 .../res/cardsfolder/m/mind_flayer_the_shadow.txt  |  1 +
 .../res/cardsfolder/n/negan_the_cold_blooded.txt  |  1 +
 .../cardsfolder/o/othelm_sigardian_outcast.txt    |  7 -------
 .../res/cardsfolder/r/rick_steadfast_leader.txt   |  1 +
 forge-gui/res/cardsfolder/r/ryu_world_warrior.txt |  1 +
 .../cardsfolder/s/sophina_spearsage_deserter.txt  | 12 ------------
 .../cardsfolder/t/tadeas_juniper_ascendant.txt    | 15 ---------------
 .../res/cardsfolder/t/the_howling_abomination.txt | 11 -----------
 .../cardsfolder/v/vikya_scorching_stalwart.txt    | 10 ----------
 .../res/cardsfolder/w/wernog_riders_chaplain.txt  | 15 ---------------
 forge-gui/res/cardsfolder/w/will_the_wise.txt     |  1 +
 .../res/cardsfolder/z/zangief_the_red_cyclone.txt |  1 +
 .../cardsfolder/z/zethi_arcane_blademaster.txt    | 13 -------------
 .../res/editions/30th Anniversary Misc Promos.txt |  2 +-
 forge-gui/res/editions/Doctor Who Commander.txt   |  3 ---
 40 files changed, 23 insertions(+), 188 deletions(-)
 delete mode 100644 forge-gui/res/cardsfolder/a/aisha_of_sparks_and_smoke.txt
 delete mode 100644 forge-gui/res/cardsfolder/a/arvinox_the_mind_flail.txt
 delete mode 100644 forge-gui/res/cardsfolder/b/baldin_century_herdmaster.txt
 delete mode 100644 forge-gui/res/cardsfolder/b/bjorna_nightfall_alchemist.txt
 delete mode 100644 forge-gui/res/cardsfolder/c/cecily_haunted_mage.txt
 delete mode 100644 forge-gui/res/cardsfolder/e/elmar_ulvenwald_informant.txt
 delete mode 100644 forge-gui/res/cardsfolder/h/hargilde_kindly_runechanter.txt
 delete mode 100644 forge-gui/res/cardsfolder/i/immard_the_stormcleaver.txt
 delete mode 100644 forge-gui/res/cardsfolder/m/maarika_brutal_gladiator.txt
 delete mode 100644 forge-gui/res/cardsfolder/o/othelm_sigardian_outcast.txt
 delete mode 100644 forge-gui/res/cardsfolder/s/sophina_spearsage_deserter.txt
 delete mode 100644 forge-gui/res/cardsfolder/t/tadeas_juniper_ascendant.txt
 delete mode 100644 forge-gui/res/cardsfolder/t/the_howling_abomination.txt
 delete mode 100644 forge-gui/res/cardsfolder/v/vikya_scorching_stalwart.txt
 delete mode 100644 forge-gui/res/cardsfolder/w/wernog_riders_chaplain.txt
 delete mode 100644 forge-gui/res/cardsfolder/z/zethi_arcane_blademaster.txt

diff --git a/forge-gui/res/cardsfolder/a/aisha_of_sparks_and_smoke.txt b/forge-gui/res/cardsfolder/a/aisha_of_sparks_and_smoke.txt
deleted file mode 100644
index f5003cac6fa..00000000000
--- a/forge-gui/res/cardsfolder/a/aisha_of_sparks_and_smoke.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Name:Aisha of Sparks and Smoke
-ManaCost:1 R R
-Types:Legendary Creature Human Warrior
-PT:4/2
-K:Prowess
-A:AB$ Pump | Cost$ RW | Defined$ Self | KW$ First Strike | SpellDescription$ NICKNAME gains first strike until end of turn.
-T:Mode$ DamageDealtOnce | CombatDamage$ True | ValidSource$ Card.Self | Execute$ TrigCast | OptionalDecider$ You | TriggerDescription$ Whenever NICKNAME deals combat damage, you may cast a sorcery spell from your hand with mana value less than or equal to that damage without paying its mana cost.
-SVar:TrigCast:DB$ Play | Valid$ Sorcery.YouOwn+cmcLEX | ValidSA$ Spell | ValidZone$ Hand | WithoutManaCost$ True | Amount$ 1 | Optional$ True
-SVar:X:TriggerCount$DamageAmount
-DeckHints:Type$Sorcery
-Oracle:Prowess (Whenever you cast a noncreature spell, this creature gets +1/+1 until end of turn.)\n{R/W}: Aisha gains first strike until end of turn.\nWhenever Aisha deals combat damage, you may cast a sorcery spell from your hand with mana value less than or equal to that damage without paying its mana cost.
diff --git a/forge-gui/res/cardsfolder/a/arvinox_the_mind_flail.txt b/forge-gui/res/cardsfolder/a/arvinox_the_mind_flail.txt
deleted file mode 100644
index a0f49a70b57..00000000000
--- a/forge-gui/res/cardsfolder/a/arvinox_the_mind_flail.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Name:Arvinox, the Mind Flail
-ManaCost:4 B B B
-Types:Legendary Enchantment Creature Horror
-PT:9/9
-S:Mode$ Continuous | Affected$ Card.Self | RemoveType$ Creature | IsPresent$ Permanent.YouCtrl+YouDontOwn | PresentCompare$ LT3 | Description$ CARDNAME isn't a creature unless you control three or more permanents you don't own.
-T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | Execute$ TrigExile | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your end step, exile the bottom card of each opponent's library face down. For as long as those cards remain exiled, you may look at them, you may cast permanent spells from among them, and you may spend mana as though it were mana of any color to cast those spells.
-SVar:TrigExile:DB$ ChangeZoneAll | Defined$ Opponent | ChangeType$ Card.BottomLibrary | Origin$ Library | Destination$ Exile | ExileFaceDown$ True | RememberChanged$ True | SubAbility$ DBEffect
-SVar:DBEffect:DB$ Effect | RememberObjects$ Remembered | StaticAbilities$ STLook,STPlay | Duration$ Permanent | ForgetOnMoved$ Exile | SubAbility$ DBCleanup
-SVar:STLook:Mode$ Continuous | MayLookAt$ You | EffectZone$ Command | Affected$ Card.IsRemembered | AffectedZone$ Exile | Description$ For as long as those cards remain exiled, you may look at them, you may cast permanent spells from among them, and you may spend mana as though it were mana of any color to cast those spells.
-SVar:STPlay:Mode$ Continuous | MayPlay$ True | MayPlayIgnoreType$ True | EffectZone$ Command | Affected$ Card.IsRemembered+Permanent+nonLand | AffectedZone$ Exile | Secondary$ True | Description$ For as long as those cards remain exiled, you may look at them, you may cast permanent spells from among them, and you may spend mana as though it were mana of any color to cast those spells.
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-Oracle:Arvinox, the Mind Flail isn't a creature unless you control three or more permanents you don't own.\nAt the beginning of your end step, exile the bottom card of each opponent's library face down. For as long as those cards remain exiled, you may look at them, you may cast permanent spells from among them, and you may spend mana as though it were mana of any color to cast those spells.
diff --git a/forge-gui/res/cardsfolder/b/baldin_century_herdmaster.txt b/forge-gui/res/cardsfolder/b/baldin_century_herdmaster.txt
deleted file mode 100644
index 824a84426b6..00000000000
--- a/forge-gui/res/cardsfolder/b/baldin_century_herdmaster.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Name:Baldin, Century Herdmaster
-ManaCost:4 W W
-Types:Legendary Creature Human Warrior
-PT:0/7
-S:Mode$ CombatDamageToughness | Condition$ PlayerTurn | ValidCard$ Creature | Description$ As long as it's your turn, each creature assigns combat damage equal to its toughness rather than its power.
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, up to one hundred target creatures each get +0/+X until end of turn, where X is the number of cards in your hand.
-SVar:TrigPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | TargetMin$ 0 | TargetMax$ 100 | NumDef$ +X | AILogic$ Pump
-SVar:HasAttackEffect:TRUE
-SVar:X:Count$CardsInYourHand
-Oracle:As long as it's your turn, each creature assigns combat damage equal to its toughness rather than its power.\nWhenever Baldin, Century Herdmaster attacks, up to one hundred target creatures each get +0/+X until end of turn, where X is the number of cards in your hand.
diff --git a/forge-gui/res/cardsfolder/b/bjorna_nightfall_alchemist.txt b/forge-gui/res/cardsfolder/b/bjorna_nightfall_alchemist.txt
deleted file mode 100644
index ceb04fc37d7..00000000000
--- a/forge-gui/res/cardsfolder/b/bjorna_nightfall_alchemist.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Name:Bjorna, Nightfall Alchemist
-ManaCost:U R
-Types:Legendary Creature Human
-PT:1/3
-A:AB$ DealDamage | Cost$ T Sac<1/Artifact> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 1 | SubAbility$ DBGoad | SpellDescription$ CARDNAME deals 1 damage to target creature. Goad that creature. (Until your next turn, that creature attacks each combat if able and attacks a player other than you if able.)
-SVar:DBGoad:DB$ Goad | Defined$ Targeted | StackDescription$ Goad {c:Targeted}.
-K:Friends forever
-SVar:AIPreference:SacCost$Artifact.token,Artifact.cmcLE1
-DeckNeeds:Type$Artifact
-DeckHas:Ability$Sacrifice
-DeckHints:Ability$Investigate
-Oracle:{T}, Sacrifice an artifact: Bjorna, Nightfall Alchemist deals 1 damage to target creature. Goad that creature. (Until your next turn, that creature attacks each combat if able and attacks a player other than you if able.)\nFriends forever (You can have two commanders if both have friends forever.)
diff --git a/forge-gui/res/cardsfolder/b/blanka_ferocious_friend.txt b/forge-gui/res/cardsfolder/b/blanka_ferocious_friend.txt
index f9889aa702c..236ae1b6974 100644
--- a/forge-gui/res/cardsfolder/b/blanka_ferocious_friend.txt
+++ b/forge-gui/res/cardsfolder/b/blanka_ferocious_friend.txt
@@ -1,4 +1,5 @@
 Name:Blanka, Ferocious Friend
+AltName:The Howling Abomination
 ManaCost:3 R G
 Types:Legendary Creature Human Beast Warrior
 PT:5/5
diff --git a/forge-gui/res/cardsfolder/c/cecily_haunted_mage.txt b/forge-gui/res/cardsfolder/c/cecily_haunted_mage.txt
deleted file mode 100644
index 4292d826abd..00000000000
--- a/forge-gui/res/cardsfolder/c/cecily_haunted_mage.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Name:Cecily, Haunted Mage
-ManaCost:1 U B R
-Types:Legendary Creature Human Wizard
-PT:3/5
-S:Mode$ Continuous | Affected$ You | SetMaxHandSize$ 11 | Description$ Your maximum hand size is eleven.
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME attacks, you draw a card and you lose 1 life. Then if you have eleven or more cards in your hand, you may cast an instant or sorcery spell from your hand without paying its mana cost.
-SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1 | SubAbility$ DBLoseLife
-SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ 1 | SubAbility$ DBPlay
-SVar:DBPlay:DB$ Play | ConditionCheckSVar$ HandSize | ConditionSVarCompare$ GE11 | Valid$ Card.YouOwn | ValidSA$ Instant,Sorcery | ValidZone$ Hand | WithoutManaCost$ True | Amount$ 1 | Controller$ You | Optional$ True
-SVar:HandSize:Count$InYourHand
-K:Friends forever
-SVar:HasAttackEffect:TRUE
-DeckHints:Type$Instant|Sorcery
-Oracle:Your maximum hand size is eleven.\nWhenever Cecily, Haunted Mage attacks, you draw a card and you lose 1 life. Then if you have eleven or more cards in your hand, you may cast an instant or sorcery spell from your hand without paying its mana cost.\nFriends forever (You can have two commanders if both have friends forever.)
diff --git a/forge-gui/res/cardsfolder/c/chief_jim_hopper.txt b/forge-gui/res/cardsfolder/c/chief_jim_hopper.txt
index d76cf8f16a4..be5bd44c60c 100644
--- a/forge-gui/res/cardsfolder/c/chief_jim_hopper.txt
+++ b/forge-gui/res/cardsfolder/c/chief_jim_hopper.txt
@@ -1,4 +1,5 @@
 Name:Chief Jim Hopper
+AltName:Sophina, Spearsage Deserter
 ManaCost:2 R W
 Types:Legendary Creature Human Soldier
 PT:4/4
diff --git a/forge-gui/res/cardsfolder/c/chun_li_countless_kicks.txt b/forge-gui/res/cardsfolder/c/chun_li_countless_kicks.txt
index 3b1ca708a47..e6f756dee34 100644
--- a/forge-gui/res/cardsfolder/c/chun_li_countless_kicks.txt
+++ b/forge-gui/res/cardsfolder/c/chun_li_countless_kicks.txt
@@ -1,4 +1,5 @@
 Name:Chun-Li, Countless Kicks
+AltName:Zethi, Arcane Blademaster
 ManaCost:1 W U
 Types:Legendary Creature Human Soldier
 PT:3/3
diff --git a/forge-gui/res/cardsfolder/d/daryl_hunter_of_walkers.txt b/forge-gui/res/cardsfolder/d/daryl_hunter_of_walkers.txt
index 607cd96adea..dfb82083e1f 100644
--- a/forge-gui/res/cardsfolder/d/daryl_hunter_of_walkers.txt
+++ b/forge-gui/res/cardsfolder/d/daryl_hunter_of_walkers.txt
@@ -1,4 +1,5 @@
 Name:Daryl, Hunter of Walkers
+AltName:Hansk, Slayer Zealot
 ManaCost:2 R G
 Types:Legendary Creature Human Archer
 PT:4/4
diff --git a/forge-gui/res/cardsfolder/d/dhalsim_pliable_pacifist.txt b/forge-gui/res/cardsfolder/d/dhalsim_pliable_pacifist.txt
index 566dbc3a41b..8b7f7c67db1 100644
--- a/forge-gui/res/cardsfolder/d/dhalsim_pliable_pacifist.txt
+++ b/forge-gui/res/cardsfolder/d/dhalsim_pliable_pacifist.txt
@@ -1,4 +1,5 @@
 Name:Dhalsim, Pliable Pacifist
+AltName:Tadeas, Juniper Ascendant
 ManaCost:2 G W
 Types:Legendary Creature Human Monk
 PT:1/3
diff --git a/forge-gui/res/cardsfolder/d/dustin_gadget_genius.txt b/forge-gui/res/cardsfolder/d/dustin_gadget_genius.txt
index 9760eab276b..02810ad435e 100644
--- a/forge-gui/res/cardsfolder/d/dustin_gadget_genius.txt
+++ b/forge-gui/res/cardsfolder/d/dustin_gadget_genius.txt
@@ -1,4 +1,5 @@
 Name:Dustin, Gadget Genius
+AltName:Hargilde, Kindly Runechanter
 ManaCost:2 W U
 Types:Legendary Creature Human
 PT:2/3
diff --git a/forge-gui/res/cardsfolder/e/e_honda_sumo_champion.txt b/forge-gui/res/cardsfolder/e/e_honda_sumo_champion.txt
index b749da6e600..2b8391ee18e 100644
--- a/forge-gui/res/cardsfolder/e/e_honda_sumo_champion.txt
+++ b/forge-gui/res/cardsfolder/e/e_honda_sumo_champion.txt
@@ -1,4 +1,5 @@
 Name:E. Honda, Sumo Champion
+AltName:Baldin, Century Herdmaster
 ManaCost:4 W W
 Types:Legendary Creature Human Warrior
 PT:0/7
diff --git a/forge-gui/res/cardsfolder/e/eleven_the_mage.txt b/forge-gui/res/cardsfolder/e/eleven_the_mage.txt
index 3567bc5c23c..b40634335c4 100644
--- a/forge-gui/res/cardsfolder/e/eleven_the_mage.txt
+++ b/forge-gui/res/cardsfolder/e/eleven_the_mage.txt
@@ -1,4 +1,5 @@
 Name:Eleven, the Mage
+AltName:Cecily, Haunted Mage
 ManaCost:1 U B R
 Types:Legendary Creature Human Wizard
 PT:3/5
diff --git a/forge-gui/res/cardsfolder/e/elmar_ulvenwald_informant.txt b/forge-gui/res/cardsfolder/e/elmar_ulvenwald_informant.txt
deleted file mode 100644
index f16171bc07b..00000000000
--- a/forge-gui/res/cardsfolder/e/elmar_ulvenwald_informant.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Name:Elmar, Ulvenwald Informant
-ManaCost:1 R G
-Types:Legendary Creature Human
-PT:3/2
-K:Haste
-T:Mode$ SpellCast | ValidCard$ Card.YouCtrl | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigUntap | ActivatorThisTurnCast$ EQ2 | TriggerDescription$ Whenever you cast your second spell each turn, untap target creature, then investigate. (Create a Clue token. It's an artifact with "{2}, Sacrifice this artifact: Draw a card.")
-SVar:TrigUntap:DB$ Untap | ValidTgts$ Creature | TgtPrompt$ Select target creature | SubAbility$ DBInvestigate
-SVar:DBInvestigate:DB$ Investigate
-K:Friends forever
-DeckHas:Ability$Investigate|Token|Sacrifice
-Oracle:Haste\nWhenever you cast your second spell each turn, untap target creature, then investigate. (Create a Clue token. It's an artifact with "{2}, Sacrifice this artifact: Draw a card.")\nFriends forever (You can have two commanders if both have friends forever.)
diff --git a/forge-gui/res/cardsfolder/g/glenn_the_voice_of_calm.txt b/forge-gui/res/cardsfolder/g/glenn_the_voice_of_calm.txt
index e3c7baf5c71..193a31690fd 100644
--- a/forge-gui/res/cardsfolder/g/glenn_the_voice_of_calm.txt
+++ b/forge-gui/res/cardsfolder/g/glenn_the_voice_of_calm.txt
@@ -1,4 +1,5 @@
 Name:Glenn, the Voice of Calm
+AltName:Gregor, Shrewd Magistrate
 ManaCost:1 W U
 Types:Legendary Creature Human Advisor
 PT:1/3
diff --git a/forge-gui/res/cardsfolder/g/guile_sonic_soldier.txt b/forge-gui/res/cardsfolder/g/guile_sonic_soldier.txt
index 1fb2a6ef87b..e1c841e0399 100644
--- a/forge-gui/res/cardsfolder/g/guile_sonic_soldier.txt
+++ b/forge-gui/res/cardsfolder/g/guile_sonic_soldier.txt
@@ -1,4 +1,5 @@
 Name:Guile, Sonic Soldier
+AltName:Immard, the Stormcleaver
 ManaCost:1 U R W
 Types:Legendary Creature Human Soldier
 PT:4/4
diff --git a/forge-gui/res/cardsfolder/h/hargilde_kindly_runechanter.txt b/forge-gui/res/cardsfolder/h/hargilde_kindly_runechanter.txt
deleted file mode 100644
index 1aa9258945a..00000000000
--- a/forge-gui/res/cardsfolder/h/hargilde_kindly_runechanter.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Name:Hargilde, Kindly Runechanter
-ManaCost:2 W U
-Types:Legendary Creature Human
-PT:2/3
-A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 2 | RestrictValid$ Spell.Artifact,Activated.Artifact+inZoneBattlefield | SpellDescription$ Add {C}{C}. Spend this mana only to cast artifact spells or activate abilities of artifacts.
-K:Friends forever
-DeckNeeds:Type$Artifact
-Oracle:{T}: Add {C}{C}. Spend this mana only to cast artifact spells or activate abilities of artifacts.\nFriends forever (You can have two commanders if both have friends forever.)
diff --git a/forge-gui/res/cardsfolder/i/immard_the_stormcleaver.txt b/forge-gui/res/cardsfolder/i/immard_the_stormcleaver.txt
deleted file mode 100644
index 5bcd4a118f1..00000000000
--- a/forge-gui/res/cardsfolder/i/immard_the_stormcleaver.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Name:Immard, the Stormcleaver
-ManaCost:1 U R W
-Types:Legendary Creature Human Soldier
-PT:4/4
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigCharge | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, put a charge counter on him or remove one from him. When you remove a counter this way, ABILITY
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigCharge | Secondary$ True | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, put a charge counter on him or remove one from him. When you remove a counter this way, ABILITY
-SVar:TrigCharge:DB$ AddOrRemoveCounter | Defined$ Self | CounterType$ CHARGE | CounterNum$ 1 | RememberRemovedCards$ True | SubAbility$ DBImmediateTrigger
-SVar:DBImmediateTrigger:DB$ ImmediateTrigger | ConditionDefined$ Remembered | ConditionPresent$ Card.Self | ConditionCompare$ GE1 | Execute$ TrigCharm | SubAbility$ DBCleanup | TriggerDescription$ When you remove a counter this way, ABILITY
-SVar:TrigCharm:DB$ Charm | Choices$ DBDamage,DBPump
-SVar:DBDamage:DB$ DealDamage | ValidTgts$ Any | NumDmg$ 4 | SpellDescription$ CARDNAME deals 4 damage to any target.
-SVar:DBPump:DB$ Pump | Defined$ Self | KW$ Lifelink & Indestructible | SpellDescription$ CARDNAME gains lifelink and indestructible until end of turn.
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-DeckHas:Ability$Counters|LifeGain
-Oracle:Whenever Immard, the Stormcleaver enters the battlefield or attacks, put a charge counter on him or remove one from him. When you remove a counter this way, choose one—\n• Immard, the Stormcleaver deals 4 damage to any target.\n• Immard, the Stormcleaver gains lifelink and indestructible until end of turn.
diff --git a/forge-gui/res/cardsfolder/k/ken_burning_brawler.txt b/forge-gui/res/cardsfolder/k/ken_burning_brawler.txt
index 6bb5ad7b75e..7200be357be 100644
--- a/forge-gui/res/cardsfolder/k/ken_burning_brawler.txt
+++ b/forge-gui/res/cardsfolder/k/ken_burning_brawler.txt
@@ -1,4 +1,5 @@
 Name:Ken, Burning Brawler
+AltName:Aisha of Sparks and Smoke
 ManaCost:1 R R
 Types:Legendary Creature Human Warrior
 PT:4/2
diff --git a/forge-gui/res/cardsfolder/l/lucas_the_sharpshooter.txt b/forge-gui/res/cardsfolder/l/lucas_the_sharpshooter.txt
index 71f1c8ae9e9..c4c8e1eb650 100644
--- a/forge-gui/res/cardsfolder/l/lucas_the_sharpshooter.txt
+++ b/forge-gui/res/cardsfolder/l/lucas_the_sharpshooter.txt
@@ -1,4 +1,5 @@
 Name:Lucas, the Sharpshooter
+AltName:Bjorna, Nightfall Alchemist
 ManaCost:U R
 Types:Legendary Creature Human
 PT:1/3
diff --git a/forge-gui/res/cardsfolder/l/lucille.txt b/forge-gui/res/cardsfolder/l/lucille.txt
index 56d88fa3851..3806acc3687 100644
--- a/forge-gui/res/cardsfolder/l/lucille.txt
+++ b/forge-gui/res/cardsfolder/l/lucille.txt
@@ -1,4 +1,5 @@
 Name:Lucille
+AltName:Gisa's Favorite Shovel
 ManaCost:1 B
 Types:Legendary Artifact Equipment
 S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 2 | AddKeyword$ Menace | Description$ Equipped creature gets +2/+0 and has menace.
diff --git a/forge-gui/res/cardsfolder/m/maarika_brutal_gladiator.txt b/forge-gui/res/cardsfolder/m/maarika_brutal_gladiator.txt
deleted file mode 100644
index ce4bddeaaad..00000000000
--- a/forge-gui/res/cardsfolder/m/maarika_brutal_gladiator.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Name:Maarika, Brutal Gladiator
-ManaCost:2 B R G
-Types:Legendary Creature Human Warrior
-PT:7/4
-K:CARDNAME must be blocked if able.
-S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Indestructible | Condition$ PlayerTurn | Description$ As long as it's your turn, NICKNAME has indestructible.
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Creature.wasDealtExcessDamageThisTurn | Execute$ TrigSac | TriggerDescription$ Whenever NICKNAME deals damage to a creature, if that creature was dealt excess damage this turn, that creature's controller sacrifices a noncreature, nonland permanent.
-SVar:TrigSac:DB$ Sacrifice | SacValid$ Permanent.nonCreature+nonLand | SacMessage$ noncreature, nonland permanent | Defined$ TriggeredTargetController
-Oracle:Maarika, Brutal Gladiator must be blocked if able.\nAs long as it's your turn, Maarika has indestructible.\nWhenever Maarika deals damage to a creature, if that creature was dealt excess damage this turn, that creature's controller sacrifices a noncreature, nonland permanent.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/m/max_the_daredevil.txt b/forge-gui/res/cardsfolder/m/max_the_daredevil.txt
index 17ced970c37..0f3930452f0 100644
--- a/forge-gui/res/cardsfolder/m/max_the_daredevil.txt
+++ b/forge-gui/res/cardsfolder/m/max_the_daredevil.txt
@@ -1,4 +1,5 @@
 Name:Max, the Daredevil
+AltName:Elmar, Ulvenwald Informant
 ManaCost:1 R G
 Types:Legendary Creature Human
 PT:3/2
diff --git a/forge-gui/res/cardsfolder/m/michonne_ruthless_survivor.txt b/forge-gui/res/cardsfolder/m/michonne_ruthless_survivor.txt
index 4f6411abc93..4c40e8f92ab 100644
--- a/forge-gui/res/cardsfolder/m/michonne_ruthless_survivor.txt
+++ b/forge-gui/res/cardsfolder/m/michonne_ruthless_survivor.txt
@@ -1,4 +1,5 @@
 Name:Michonne, Ruthless Survivor
+AltName:Enkira, Hostile Scavenger
 Nickname:Michonne
 ManaCost:3 B G
 Types:Legendary Creature Human Warrior
diff --git a/forge-gui/res/cardsfolder/m/mike_the_dungeon_master.txt b/forge-gui/res/cardsfolder/m/mike_the_dungeon_master.txt
index cd9c6bd6da7..00ee1fe6e75 100644
--- a/forge-gui/res/cardsfolder/m/mike_the_dungeon_master.txt
+++ b/forge-gui/res/cardsfolder/m/mike_the_dungeon_master.txt
@@ -1,4 +1,5 @@
 Name:Mike, the Dungeon Master
+AltName:Othelm, Sigardian Outcast
 ManaCost:1 G W
 Types:Legendary Creature Human
 PT:2/2
diff --git a/forge-gui/res/cardsfolder/m/mind_flayer_the_shadow.txt b/forge-gui/res/cardsfolder/m/mind_flayer_the_shadow.txt
index 45009d61811..ab482f800e3 100644
--- a/forge-gui/res/cardsfolder/m/mind_flayer_the_shadow.txt
+++ b/forge-gui/res/cardsfolder/m/mind_flayer_the_shadow.txt
@@ -1,4 +1,5 @@
 Name:Mind Flayer, the Shadow
+AltName:Arvinox, the Mind Flail
 ManaCost:4 B B B
 Types:Legendary Enchantment Creature Horror
 PT:9/9
diff --git a/forge-gui/res/cardsfolder/n/negan_the_cold_blooded.txt b/forge-gui/res/cardsfolder/n/negan_the_cold_blooded.txt
index cf8387d179d..70b51797333 100644
--- a/forge-gui/res/cardsfolder/n/negan_the_cold_blooded.txt
+++ b/forge-gui/res/cardsfolder/n/negan_the_cold_blooded.txt
@@ -1,4 +1,5 @@
 Name:Negan, the Cold-Blooded
+AltName:Malik, Grim Manipulator
 ManaCost:2 R W B
 Types:Legendary Creature Human Rogue
 PT:4/3
diff --git a/forge-gui/res/cardsfolder/o/othelm_sigardian_outcast.txt b/forge-gui/res/cardsfolder/o/othelm_sigardian_outcast.txt
deleted file mode 100644
index baefbe387d4..00000000000
--- a/forge-gui/res/cardsfolder/o/othelm_sigardian_outcast.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-Name:Othelm, Sigardian Outcast
-ManaCost:1 G W
-Types:Legendary Creature Human
-PT:2/2
-A:AB$ ChangeZone | Cost$ 2 T | Origin$ Graveyard | Destination$ Battlefield | TgtPrompt$ Choose target creature card in your graveyard that was put there from the battlefield this turn | ValidTgts$ Card.Creature+ThisTurnEnteredFrom_Battlefield+YouOwn | Tapped$ True | SpellDescription$ Choose target creature card in your graveyard that was put there from the battlefield this turn. Return it to the battlefield tapped.
-K:Friends forever
-Oracle:{2}, {T}: Choose target creature card in your graveyard that was put there from the battlefield this turn. Return it to the battlefield tapped.\nFriends forever (You can have two commanders if both have friends forever.)
diff --git a/forge-gui/res/cardsfolder/r/rick_steadfast_leader.txt b/forge-gui/res/cardsfolder/r/rick_steadfast_leader.txt
index 271d26ea3ce..9b1c9a2e5d9 100644
--- a/forge-gui/res/cardsfolder/r/rick_steadfast_leader.txt
+++ b/forge-gui/res/cardsfolder/r/rick_steadfast_leader.txt
@@ -1,4 +1,5 @@
 Name:Rick, Steadfast Leader
+AltName:Greymond, Avacyn's Stalwart
 ManaCost:2 W W
 Types:Legendary Creature Human Soldier
 PT:3/4
diff --git a/forge-gui/res/cardsfolder/r/ryu_world_warrior.txt b/forge-gui/res/cardsfolder/r/ryu_world_warrior.txt
index 26637ae13b2..4a9bcc6ab5a 100644
--- a/forge-gui/res/cardsfolder/r/ryu_world_warrior.txt
+++ b/forge-gui/res/cardsfolder/r/ryu_world_warrior.txt
@@ -1,4 +1,5 @@
 Name:Ryu, World Warrior
+AltName:Vikya, Scorching Stalwart
 ManaCost:2 W
 Types:Legendary Creature Human Warrior
 PT:2/4
diff --git a/forge-gui/res/cardsfolder/s/sophina_spearsage_deserter.txt b/forge-gui/res/cardsfolder/s/sophina_spearsage_deserter.txt
deleted file mode 100644
index 877879e0aae..00000000000
--- a/forge-gui/res/cardsfolder/s/sophina_spearsage_deserter.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Name:Sophina, Spearsage Deserter
-ManaCost:2 R W
-Types:Legendary Creature Human Soldier
-PT:4/4
-K:Menace
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigInvestigate | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME attacks, investigate once for each nontoken attacking creature. (To investigate, create a Clue token. It's an artifact with "{2}, Sacrifice this artifact: Draw a card.")
-SVar:TrigInvestigate:DB$ Investigate | Num$ X
-SVar:X:Count$Valid Creature.attacking+nonToken
-K:Friends forever
-DeckHas:Ability$Investigate|Token|Sacrifice
-SVar:HasAttackEffect:TRUE
-Oracle:Menace\nWhenever Sophina, Spearsage Deserter attacks, investigate once for each nontoken attacking creature. (To investigate, create a Clue token. It's an artifact with "{2}, Sacrifice this artifact: Draw a card.")\nFriends forever (You can have two commanders if both have friends forever.)
diff --git a/forge-gui/res/cardsfolder/t/tadeas_juniper_ascendant.txt b/forge-gui/res/cardsfolder/t/tadeas_juniper_ascendant.txt
deleted file mode 100644
index 1928f1f5591..00000000000
--- a/forge-gui/res/cardsfolder/t/tadeas_juniper_ascendant.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-Name:Tadeas, Juniper Ascendant
-ManaCost:2 G W
-Types:Legendary Creature Human Monk
-PT:1/3
-K:Reach
-S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Hexproof | IsPresent$ Card.Self+notattacking | Description$ Teleport — CARDNAME has hexproof unless he's attacking.
-T:Mode$ Attacks | ValidCard$ Creature.YouCtrl+withReach | TriggerZones$ Battlefield | Execute$ TrigUntap | TriggerDescription$ Whenever a creature you control with reach attacks, untap it and it can't be blocked by creatures with greater power this combat.
-SVar:TrigUntap:DB$ Untap | Defined$ TriggeredAttackerLKICopy | SubAbility$ DBEffect
-SVar:DBEffect:DB$ Effect | RememberObjects$ TriggeredAttacker | StaticAbilities$ CantBeBlockedPow | ForgetOnMoved$ Battlefield | Duration$ UntilEndOfCombat
-SVar:CantBeBlockedPow:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | ValidBlocker$ Creature.powerGTX | Description$ CARDNAME can't be blocked by creatures with greater power this combat.
-SVar:X:Remembered$CardPower
-T:Mode$ DamageDoneOnce | CombatDamage$ True | ValidSource$ Creature.YouCtrl | TriggerZones$ Battlefield | ValidTarget$ Player | Execute$ TrigDraw | TriggerDescription$ Whenever one or more creatures you control deal combat damage to a player, draw a card.
-SVar:TrigDraw:DB$ Draw
-DeckHints:Keyword$Reach
-Oracle:Reach\nTadeas, Juniper Ascendant has hexproof unless he's attacking.\nWhenever a creature you control with reach attacks, untap it and it can't be blocked by creatures with greater power this combat.\nWhenever one or more creatures you control deal combat damage to a player, draw a card.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/t/the_howling_abomination.txt b/forge-gui/res/cardsfolder/t/the_howling_abomination.txt
deleted file mode 100644
index 7e6afc48e02..00000000000
--- a/forge-gui/res/cardsfolder/t/the_howling_abomination.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Name:The Howling Abomination
-ManaCost:3 R G
-Types:Legendary Creature Human Beast Warrior
-PT:5/5
-K:Haste
-S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Trample | CheckSVar$ X | SVarCompare$ GE3 | Description$ CARDNAME has trample as long as you've cast three or more spells this turn.
-T:Mode$ BecomesTarget | ValidTarget$ Card.Self | ValidSource$ Spell | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever NICKNAME becomes the target of a spell, he gets +2/+2 until end of turn and deals 2 damage to each opponent.
-SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ +2 | NumDef$ +2 | SubAbility$ DBDmg
-SVar:DBDmg:DB$ DealDamage | Defined$ Opponent | NumDmg$ 2
-SVar:X:Count$ThisTurnCast_Card.YouCtrl
-Oracle:Haste\nThe Howling Abomination has trample as long as you've cast three or more spells this turn.\nWhenever The Howling Abomination becomes the target of a spell, he gets +2/+2 until end of turn and deals 2 damage to each opponent.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/v/vikya_scorching_stalwart.txt b/forge-gui/res/cardsfolder/v/vikya_scorching_stalwart.txt
deleted file mode 100644
index a490b89cb52..00000000000
--- a/forge-gui/res/cardsfolder/v/vikya_scorching_stalwart.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Name:Vikya, Scorching Stalwart
-ManaCost:2 W
-Types:Legendary Creature Human Warrior
-PT:2/4
-K:Training
-A:AB$ DealDamage | Cost$ 4 R Untap Discard<1/Card> | ValidTgts$ Any | NumDmg$ X | AILogic$ PowerDmg | ExcessSVar$ Excess | ExcessSVarCondition$ Creature | SubAbility$ DBDraw | SpellDescription$ CARDNAME deals damage equal to his power to any target.
-SVar:DBDraw:DB$ Draw | ConditionCheckSVar$ Excess | IfDesc$ True | SpellDescription$ If excess damage was dealt to a creature this way, draw a card. ({Q} is the untap symbol.)
-SVar:X:Count$CardPower
-DeckHas:Ability$Counters|Discard
-Oracle:Training (Whenever this creature attacks with another creature with greater power, put a +1/+1 counter on this creature.)\n{4}{R}, {Q}, Discard a card: Vikya, Scorching Stalwart deals damage equal to his power to any target. If excess damage was dealt to a creature this way, draw a card. ({Q} is the untap symbol.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/w/wernog_riders_chaplain.txt b/forge-gui/res/cardsfolder/w/wernog_riders_chaplain.txt
deleted file mode 100644
index 7ecd225baf9..00000000000
--- a/forge-gui/res/cardsfolder/w/wernog_riders_chaplain.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-Name:Wernog, Rider's Chaplain
-ManaCost:W B
-Types:Legendary Creature Human
-PT:1/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigInvestigate | TriggerDescription$ When CARDNAME enters or leaves the battlefield, each opponent may investigate. Each opponent who doesn't loses 1 life. You investigate X times, where X is one plus the number of opponents who investigated this way. (To investigate, create a Clue token. It's an artifact with "{2}, Sacrifice this artifact: Draw a card.")
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigInvestigate | Secondary$ True | TriggerDescription$ When CARDNAME enters or leaves the battlefield, each opponent may investigate. Each opponent who doesn't loses 1 life. You investigate X times, where X is one plus the number of opponents who investigated this way.
-SVar:TrigInvestigate:DB$ Investigate | Defined$ Opponent | Optional$ True | RememberInvestigatingPlayers$ True | SubAbility$ DBLoseLife
-SVar:DBLoseLife:DB$ LoseLife | Defined$ Opponent.IsNotRemembered | LifeAmount$ 1 | SubAbility$ DBInvestigate
-SVar:DBInvestigate:DB$ Investigate | Num$ Y | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:PlayerCountRemembered$Amount
-SVar:Y:SVar$X/Plus.1
-K:Friends forever
-DeckHas:Ability$Investigate|Token|Sacrifice
-Oracle:When Wernog, Rider's Chaplain enters or leaves the battlefield, each opponent may investigate. Each opponent who doesn't loses 1 life. You investigate X times, where X is one plus the number of opponents who investigated this way. (To investigate, create a Clue token. It's an artifact with "{2}, Sacrifice this artifact: Draw a card.")\nFriends forever (You can have two commanders if both have friends forever.)
diff --git a/forge-gui/res/cardsfolder/w/will_the_wise.txt b/forge-gui/res/cardsfolder/w/will_the_wise.txt
index 0b91a8dfa0e..289983b17cb 100644
--- a/forge-gui/res/cardsfolder/w/will_the_wise.txt
+++ b/forge-gui/res/cardsfolder/w/will_the_wise.txt
@@ -1,4 +1,5 @@
 Name:Will the Wise
+AltName:Wernog, Rider's Chaplain
 ManaCost:W B
 Types:Legendary Creature Human
 PT:1/2
diff --git a/forge-gui/res/cardsfolder/z/zangief_the_red_cyclone.txt b/forge-gui/res/cardsfolder/z/zangief_the_red_cyclone.txt
index 35a92d6624b..fba681f03a2 100644
--- a/forge-gui/res/cardsfolder/z/zangief_the_red_cyclone.txt
+++ b/forge-gui/res/cardsfolder/z/zangief_the_red_cyclone.txt
@@ -1,4 +1,5 @@
 Name:Zangief, the Red Cyclone
+AltName:Maarika, Brutal Gladiator
 ManaCost:2 B R G
 Types:Legendary Creature Human Warrior
 PT:7/4
diff --git a/forge-gui/res/cardsfolder/z/zethi_arcane_blademaster.txt b/forge-gui/res/cardsfolder/z/zethi_arcane_blademaster.txt
deleted file mode 100644
index 1d22e90715f..00000000000
--- a/forge-gui/res/cardsfolder/z/zethi_arcane_blademaster.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Name:Zethi, Arcane Blademaster
-ManaCost:1 W U
-Types:Legendary Creature Human Soldier
-PT:3/3
-K:Multikicker:WU
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When NICKNAME enters the battlefield, exile up to X target instant cards from your graveyard, where X is the number of times NICKNAME was kicked. Put a kick counter on each of them.
-SVar:TrigExile:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | WithCountersType$ KICK | ValidTgts$ Instant.YouOwn | TargetMin$ 0 | TargetMax$ XKicked | TgtPrompt$ Select up to X target instant cards
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPlay | TriggerZones$ Battlefield | TriggerDescription$ Whenever NICKNAME attacks, copy each exiled card you own with a kick counter on it. You may cast the copies.
-SVar:TrigPlay:DB$ Play | Valid$ Card.counters_GE1_KICK | ValidSA$ Spell | ValidZone$ Exile | Amount$ All | CopyCard$ True | Optional$ True
-SVar:XKicked:Count$TimesKicked
-DeckHints:Type$Instant & Ability$Discard
-DeckHas:Ability$Graveyard
-Oracle:Multikicker {W/U}\nWhen Zethi enters the battlefield, exile up to X target instant cards from your graveyard, where X is the number of times Zethi was kicked. Put a kick counter on each of them.\nWhenever Zethi attacks, copy each exiled card you own with a kick counter on it. You may cast the copies.
\ No newline at end of file
diff --git a/forge-gui/res/editions/30th Anniversary Misc Promos.txt b/forge-gui/res/editions/30th Anniversary Misc Promos.txt
index 29d95e6ef71..0f6a528bb91 100644
--- a/forge-gui/res/editions/30th Anniversary Misc Promos.txt	
+++ b/forge-gui/res/editions/30th Anniversary Misc Promos.txt	
@@ -6,7 +6,7 @@ Type=Promo
 ScryfallCode=P30M
 
 [cards]
-1★ R Richard Garfield, Ph.D. @Dave Dorman
+F1★ R Richard Garfield, Ph.D. @Dave Dorman
 2 M Lotus Petal @April Lee
 1F R Arcane Signet @Gaboleps
 1F★ R Arcane Signet @Gaboleps
diff --git a/forge-gui/res/editions/Doctor Who Commander.txt b/forge-gui/res/editions/Doctor Who Commander.txt
index 54573df2238..6d08acc9d58 100644
--- a/forge-gui/res/editions/Doctor Who Commander.txt	
+++ b/forge-gui/res/editions/Doctor Who Commander.txt	
@@ -59,11 +59,8 @@ ScryfallCode=WHO
 547 R River Song @Aurore Folny
 551 U TARDIS @Dalton Pencarinha
 555 M The Fourth Doctor @Jack Hughes
-555z M The Fourth Doctor @Jack Hughes
 561 M The Tenth Doctor @Aurore Folny
-561z M The Tenth Doctor @Aurore Folny
 564 M The Thirteenth Doctor @Lenka Šimečková
-564z M The Thirteenth Doctor
 569 C Bad Wolf Bay @Kamila Szutenberg
 580 C The Doctor's Tomb @Anato Finnstark
 582 C Fixed Point in Time @Syd Mills