From 1ea0c488670e32a45a3bf93fc5b88847a4879ef1 Mon Sep 17 00:00:00 2001
From: tool4EvEr <tool4EvEr@192.168.0.59>
Date: Wed, 19 Jan 2022 19:40:21 +0100
Subject: [PATCH] Trigger cleanup

---
 forge-gui/res/cardsfolder/c/cordial_vampire.txt               | 3 +--
 forge-gui/res/cardsfolder/c/cruel_celebrant.txt               | 3 +--
 forge-gui/res/cardsfolder/d/dross_scorpion.txt                | 4 +---
 forge-gui/res/cardsfolder/f/falkenrath_noble.txt              | 4 +---
 forge-gui/res/cardsfolder/h/headless_rider.txt                | 3 +--
 forge-gui/res/cardsfolder/k/kalastria_highborn.txt            | 4 +---
 forge-gui/res/cardsfolder/m/miara_thorn_of_the_glade.txt      | 3 +--
 forge-gui/res/cardsfolder/m/midnight_entourage.txt            | 4 +---
 forge-gui/res/cardsfolder/o/omnath_locus_of_rage.txt          | 3 +--
 forge-gui/res/cardsfolder/o/orah_skyclave_hierophant.txt      | 3 +--
 forge-gui/res/cardsfolder/p/pashalik_mons.txt                 | 3 +--
 forge-gui/res/cardsfolder/p/pawn_of_ulamog.txt                | 4 +---
 .../res/cardsfolder/p/pious_evangel_wayward_disciple.txt      | 4 +---
 forge-gui/res/cardsfolder/r/rotlung_reanimator.txt            | 4 +---
 forge-gui/res/cardsfolder/s/selhoff_occultist.txt             | 3 +--
 forge-gui/res/cardsfolder/s/skirk_drill_sergeant.txt          | 4 +---
 forge-gui/res/cardsfolder/u/undead_augur.txt                  | 3 +--
 forge-gui/res/cardsfolder/v/vengeful_dead.txt                 | 4 +---
 forge-gui/res/cardsfolder/x/xathrid_necromancer.txt           | 4 +---
 19 files changed, 19 insertions(+), 48 deletions(-)

diff --git a/forge-gui/res/cardsfolder/c/cordial_vampire.txt b/forge-gui/res/cardsfolder/c/cordial_vampire.txt
index 1d9e2ed75ad..2a24149f989 100644
--- a/forge-gui/res/cardsfolder/c/cordial_vampire.txt
+++ b/forge-gui/res/cardsfolder/c/cordial_vampire.txt
@@ -2,8 +2,7 @@ Name:Cordial Vampire
 ManaCost:B B
 Types:Creature Vampire
 PT:1/1
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.Other | TriggerZones$ Battlefield | Execute$ TrigPutCounters | TriggerDescription$ Whenever CARDNAME or another creature dies, put a +1/+1 counter on each Vampire you control.
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | TriggerController$ TriggeredCardController | Execute$ TrigPutCounters | Secondary$ True | TriggerDescription$ Whenever CARDNAME or another creature dies, put a +1/+1 counter on each Vampire you control.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.Other,Card.Self | TriggerZones$ Battlefield | Execute$ TrigPutCounters | TriggerDescription$ Whenever CARDNAME or another creature dies, put a +1/+1 counter on each Vampire you control.
 SVar:TrigPutCounters:DB$ PutCounterAll | ValidCards$ Creature.Vampire+YouCtrl | CounterType$ P1P1 | CounterNum$ 1
 DeckHas:Ability$Counters
 DeckNeeds:Type$Vampire
diff --git a/forge-gui/res/cardsfolder/c/cruel_celebrant.txt b/forge-gui/res/cardsfolder/c/cruel_celebrant.txt
index 74d9caa7dbc..08ada87da08 100644
--- a/forge-gui/res/cardsfolder/c/cruel_celebrant.txt
+++ b/forge-gui/res/cardsfolder/c/cruel_celebrant.txt
@@ -2,8 +2,7 @@ Name:Cruel Celebrant
 ManaCost:W B
 Types:Creature Vampire
 PT:1/2
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.Other+YouCtrl,Planeswalker.YouCtrl+Other | TriggerZones$ Battlefield | Execute$ TrigDrain | TriggerDescription$ Whenever CARDNAME or another creature or planeswalker you control dies, each opponent loses 1 life and you gain 1 life.
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | TriggerController$ TriggeredCardController | Execute$ TrigDrain | Secondary$ True | TriggerDescription$ Whenever CARDNAME or another creature or planeswalker you control dies, each opponent loses 1 life and you gain 1 life.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.Other+YouCtrl,Planeswalker.YouCtrl+Other,Card.Self | TriggerZones$ Battlefield | Execute$ TrigDrain | TriggerDescription$ Whenever CARDNAME or another creature or planeswalker you control dies, each opponent loses 1 life and you gain 1 life.
 SVar:TrigDrain:DB$ LoseLife | Defined$ Player.Opponent | LifeAmount$ 1 | SubAbility$ DBGainLife
 SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 1
 DeckHas:Ability$LifeGain
diff --git a/forge-gui/res/cardsfolder/d/dross_scorpion.txt b/forge-gui/res/cardsfolder/d/dross_scorpion.txt
index 6991d83e618..ccf2caf1b3e 100644
--- a/forge-gui/res/cardsfolder/d/dross_scorpion.txt
+++ b/forge-gui/res/cardsfolder/d/dross_scorpion.txt
@@ -2,8 +2,6 @@ Name:Dross Scorpion
 ManaCost:4
 Types:Artifact Creature Scorpion
 PT:3/1
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Artifact.Creature+Other | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigUntap | TriggerDescription$ Whenever CARDNAME or another artifact creature dies, you may untap target artifact.
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | OptionalDecider$ You | Execute$ TrigUntap | Secondary$ True | TriggerDescription$ Whenever CARDNAME or another artifact creature dies, you may untap target artifact.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Artifact.Creature+Other,Card.Self | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigUntap | TriggerDescription$ Whenever CARDNAME or another artifact creature dies, you may untap target artifact.
 SVar:TrigUntap:DB$ Untap | ValidTgts$ Artifact | TgtPrompt$ Choose target artifact.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/dross_scorpion.jpg
 Oracle:Whenever Dross Scorpion or another artifact creature dies, you may untap target artifact.
diff --git a/forge-gui/res/cardsfolder/f/falkenrath_noble.txt b/forge-gui/res/cardsfolder/f/falkenrath_noble.txt
index 33dab1edc37..127b536d645 100644
--- a/forge-gui/res/cardsfolder/f/falkenrath_noble.txt
+++ b/forge-gui/res/cardsfolder/f/falkenrath_noble.txt
@@ -3,9 +3,7 @@ ManaCost:3 B
 Types:Creature Vampire Noble
 PT:2/2
 K:Flying
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.Other | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ Whenever CARDNAME or another creature dies, target player loses 1 life and you gain 1 life.
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigLoseLife | Secondary$ True | TriggerDescription$ Whenever CARDNAME or another creature dies, target player loses 1 life and you gain 1 life.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.Other,Card.Self | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ Whenever CARDNAME or another creature dies, target player loses 1 life and you gain 1 life.
 SVar:TrigLoseLife:DB$ LoseLife | ValidTgts$ Player | TgtPrompt$ Choose a player | LifeAmount$ 1 | SubAbility$ DBGainLife
 SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 1
-SVar:Picture:http://www.wizards.com/global/images/magic/general/falkenrath_noble.jpg
 Oracle:Flying\nWhenever Falkenrath Noble or another creature dies, target player loses 1 life and you gain 1 life.
diff --git a/forge-gui/res/cardsfolder/h/headless_rider.txt b/forge-gui/res/cardsfolder/h/headless_rider.txt
index 17eea2fdfb5..49d86d9eff9 100644
--- a/forge-gui/res/cardsfolder/h/headless_rider.txt
+++ b/forge-gui/res/cardsfolder/h/headless_rider.txt
@@ -2,8 +2,7 @@ Name:Headless Rider
 ManaCost:2 B
 Types:Creature Zombie
 PT:3/1
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Zombie.nonToken+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME or another nontoken Zombie you control dies, create a 2/2 black Zombie creature token.
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | Secondary$ True | TriggerDescription$ Whenever CARDNAME or another nontoken Zombie you control dies, create a 2/2 black Zombie creature token.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Zombie.nonToken+YouCtrl+Other,Card.Self | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME or another nontoken Zombie you control dies, create a 2/2 black Zombie creature token.
 SVar:TrigToken:DB$ Token | TokenScript$ b_2_2_zombie
 DeckHas:Ability$Token
 DeckHints:Type$Zombie
diff --git a/forge-gui/res/cardsfolder/k/kalastria_highborn.txt b/forge-gui/res/cardsfolder/k/kalastria_highborn.txt
index 312d3750e7d..4f50648e25c 100644
--- a/forge-gui/res/cardsfolder/k/kalastria_highborn.txt
+++ b/forge-gui/res/cardsfolder/k/kalastria_highborn.txt
@@ -2,9 +2,7 @@ Name:Kalastria Highborn
 ManaCost:B B
 Types:Creature Vampire Shaman
 PT:2/2
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Vampire.Other+YouCtrl | Execute$ TrigLoseLife | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME or another Vampire you control dies, you may pay {B}. If you do, target player loses 2 life and you gain 2 life.
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigLoseLife | OptionalDecider$ You | Secondary$ True | TriggerDescription$ Whenever CARDNAME or another Vampire you control dies, you may pay {B}. If you do, target player loses 2 life and you gain 2 life.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Vampire.Other+YouCtrl,Card.Self | Execute$ TrigLoseLife | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME or another Vampire you control dies, you may pay {B}. If you do, target player loses 2 life and you gain 2 life.
 SVar:TrigLoseLife:AB$LoseLife | Cost$ B | ValidTgts$ Player | TgtPrompt$ Select target player | LifeAmount$ 2 | SubAbility$ DBGainLife
 SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 2
-SVar:Picture:http://www.wizards.com/global/images/magic/general/kalastria_highborn.jpg
 Oracle:Whenever Kalastria Highborn or another Vampire you control dies, you may pay {B}. If you do, target player loses 2 life and you gain 2 life.
diff --git a/forge-gui/res/cardsfolder/m/miara_thorn_of_the_glade.txt b/forge-gui/res/cardsfolder/m/miara_thorn_of_the_glade.txt
index beabac1634b..0a6d8ade86c 100644
--- a/forge-gui/res/cardsfolder/m/miara_thorn_of_the_glade.txt
+++ b/forge-gui/res/cardsfolder/m/miara_thorn_of_the_glade.txt
@@ -3,8 +3,7 @@ ManaCost:1 B
 Types:Legendary Creature Elf Scout
 PT:1/2
 K:Partner
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigDraw | TriggerController$ TriggeredCardController | TriggerDescription$ Whenever CARDNAME or another Elf you control dies, you may pay {1} and 1 life. If you do, draw a card.
-T:Mode$ ChangesZone | ValidCard$ Elf.Other+YouCtrl | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigDraw | TriggerZones$ Battlefield | Secondary$ True | TriggerDescription$ Whenever CARDNAME or another Elf you control dies, you may pay {1} and 1 life. If you do, draw a card.
+T:Mode$ ChangesZone | ValidCard$ Card.Self,Elf.Other+YouCtrl | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigDraw | TriggerController$ TriggeredCardController | TriggerDescription$ Whenever CARDNAME or another Elf you control dies, you may pay {1} and 1 life. If you do, draw a card.
 SVar:TrigDraw:AB$ Draw | Cost$ 1 PayLife<1> | Defined$ You | NumCards$ 1
 DeckNeeds:Type$Elf
 Oracle:Whenever Miara, Thorn of the Glade or another Elf you control dies, you may pay {1} and 1 life. If you do, draw a card.\nPartner (You can have two commanders if both have partner.)
diff --git a/forge-gui/res/cardsfolder/m/midnight_entourage.txt b/forge-gui/res/cardsfolder/m/midnight_entourage.txt
index 60137908564..5d9e9f326ff 100644
--- a/forge-gui/res/cardsfolder/m/midnight_entourage.txt
+++ b/forge-gui/res/cardsfolder/m/midnight_entourage.txt
@@ -2,12 +2,10 @@ Name:Midnight Entourage
 ManaCost:2 B B
 Types:Creature Aetherborn Rogue
 PT:3/3
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | TriggerController$ TriggeredCardController | Execute$ TrigDraw | TriggerDescription$ Whenever CARDNAME or another Aetherborn you control dies, you draw a card and you lose 1 life.
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Aetherborn.Other+YouCtrl | TriggerZones$ Battlefield | TriggerController$ TriggeredCardController | Execute$ TrigDraw | Secondary$ True | TriggerDescription$ Whenever CARDNAME or another Aetherborn you control dies, you draw a card and you lose 1 life.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self,Aetherborn.Other+YouCtrl | Execute$ TrigDraw | TriggerDescription$ Whenever CARDNAME or another Aetherborn you control dies, you draw a card and you lose 1 life.
 SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1 | SubAbility$ DBLoseLife
 SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ 1
 S:Mode$ Continuous | Affected$ Aetherborn.Other+YouCtrl | AddPower$ 1 | AddToughness$ 1 | Description$ Other Aetherborn you control get +1/+1.
 SVar:PlayMain1:TRUE
 SVar:BuffedBy:Aetherborn
-SVar:Picture:http://www.wizards.com/global/images/magic/general/midnight_entourage.jpg
 Oracle:Other Aetherborn you control get +1/+1.\nWhenever Midnight Entourage or another Aetherborn you control dies, you draw a card and you lose 1 life.
diff --git a/forge-gui/res/cardsfolder/o/omnath_locus_of_rage.txt b/forge-gui/res/cardsfolder/o/omnath_locus_of_rage.txt
index 7ba753e9a0b..faecc70be98 100644
--- a/forge-gui/res/cardsfolder/o/omnath_locus_of_rage.txt
+++ b/forge-gui/res/cardsfolder/o/omnath_locus_of_rage.txt
@@ -4,7 +4,6 @@ Types:Legendary Creature Elemental
 PT:5/5
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Landfall — Whenever a land enters the battlefield under your control, create a 5/5 red and green Elemental creature token.
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ rg_5_5_elemental | TokenOwner$ You | LegacyImage$ rg 5 5 elemental
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDealDamage | TriggerController$ TriggeredCardController | TriggerDescription$ Whenever CARDNAME or another Elemental you control dies, CARDNAME deals 3 damage to any target.
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Elemental.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigDealDamage | TriggerController$ TriggeredCardController | Secondary$ True | TriggerDescription$ Whenever CARDNAME or another Elemental you control dies, CARDNAME deals 3 damage to any target.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self,Elemental.Other+YouCtrl | Execute$ TrigDealDamage | TriggerController$ TriggeredCardController | TriggerDescription$ Whenever CARDNAME or another Elemental you control dies, CARDNAME deals 3 damage to any target.
 SVar:TrigDealDamage:DB$ DealDamage | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 3
 Oracle:Landfall — Whenever a land enters the battlefield under your control, create a 5/5 red and green Elemental creature token.\nWhenever Omnath, Locus of Rage or another Elemental you control dies, Omnath deals 3 damage to any target.
diff --git a/forge-gui/res/cardsfolder/o/orah_skyclave_hierophant.txt b/forge-gui/res/cardsfolder/o/orah_skyclave_hierophant.txt
index ec6b5e8c027..c410724e34e 100644
--- a/forge-gui/res/cardsfolder/o/orah_skyclave_hierophant.txt
+++ b/forge-gui/res/cardsfolder/o/orah_skyclave_hierophant.txt
@@ -3,8 +3,7 @@ ManaCost:2 W B
 Types:Legendary Creature Kor Cleric
 PT:3/3
 K:Lifelink
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ Whenever CARDNAME or another Cleric you control dies, return target Cleric with lesser mana value from your graveyard to the battlefield.
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Cleric.YouCtrl+Other | Execute$ TrigReturn | Secondary$ True | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME or another Cleric you control dies, return target Cleric card with lesser mana value from your graveyard to the battlefield.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self,Cleric.YouCtrl+Other | Execute$ TrigReturn | TriggerDescription$ Whenever CARDNAME or another Cleric you control dies, return target Cleric with lesser mana value from your graveyard to the battlefield.
 SVar:TrigReturn:DB$ ChangeZone | ValidTgts$ Cleric.cmcLTX+YouOwn | TgtPrompt$ Choose target Cleric card with lesser mana value | Origin$ Graveyard | Destination$ Battlefield
 SVar:X:TriggeredCard$CardManaCost
 DeckHas:Ability$Graveyard
diff --git a/forge-gui/res/cardsfolder/p/pashalik_mons.txt b/forge-gui/res/cardsfolder/p/pashalik_mons.txt
index 7a5ffe7817f..0755e1f7c19 100644
--- a/forge-gui/res/cardsfolder/p/pashalik_mons.txt
+++ b/forge-gui/res/cardsfolder/p/pashalik_mons.txt
@@ -2,8 +2,7 @@ Name:Pashalik Mons
 ManaCost:2 R
 Types:Legendary Creature Goblin Warrior
 PT:2/2
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ DBDamage | TriggerController$ TriggeredCardController | TriggerDescription$ Whenever CARDNAME or another Goblin you control dies, CARDNAME deals 1 damage to any target.
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Goblin.Other+YouCtrl | Execute$ DBDamage | TriggerZones$ Battlefield | TriggerController$ TriggeredCardController | Secondary$ True | TriggerDescription$ Whenever CARDNAME or another Goblin you control dies, CARDNAME deals 1 damage to any target.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self,Goblin.Other+YouCtrl | Execute$ DBDamage | TriggerController$ TriggeredCardController | TriggerDescription$ Whenever CARDNAME or another Goblin you control dies, CARDNAME deals 1 damage to any target.
 SVar:DBDamage:DB$ DealDamage | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 1
 A:AB$ Token | Cost$ 3 R Sac<1/Goblin> | TokenAmount$ 2 | TokenScript$ r_1_1_goblin | TokenOwner$ You | SpellDescription$ Create two 1/1 red Goblin creature tokens.
 SVar:AIPreference:SacCost$Goblin.token+powerLE1,Goblin.cmcLE1+powerLE1
diff --git a/forge-gui/res/cardsfolder/p/pawn_of_ulamog.txt b/forge-gui/res/cardsfolder/p/pawn_of_ulamog.txt
index 02840fff38e..3588f865400 100644
--- a/forge-gui/res/cardsfolder/p/pawn_of_ulamog.txt
+++ b/forge-gui/res/cardsfolder/p/pawn_of_ulamog.txt
@@ -2,10 +2,8 @@ Name:Pawn of Ulamog
 ManaCost:1 B B
 Types:Creature Vampire Shaman
 PT:2/2
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.Other+nonToken+YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME or another nontoken creature you control dies, create a 0/1 colorless Eldrazi Spawn creature token. It has "Sacrifice this creature: Add {C}."
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | OptionalDecider$ You | Secondary$ True | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME or another nontoken creature you control dies, you may create a 0/1 colorless Eldrazi Spawn creature token. It has "Sacrifice this creature: Add {C}."
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.Other+nonToken+YouCtrl,Card.Self | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME or another nontoken creature you control dies, create a 0/1 colorless Eldrazi Spawn creature token. It has "Sacrifice this creature: Add {C}."
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_0_1_eldrazi_spawn_sac | TokenOwner$ You | LegacyImage$ c 0 1 eldrazi spawn sac roe
 DeckHints:Type$Eldrazi
 DeckHas:Ability$Mana.Colorless & Ability$Token
-SVar:Picture:http://www.wizards.com/global/images/magic/general/pawn_of_ulamog.jpg
 Oracle:Whenever Pawn of Ulamog or another nontoken creature you control dies, you may create a 0/1 colorless Eldrazi Spawn creature token. It has "Sacrifice this creature: Add {C}."
diff --git a/forge-gui/res/cardsfolder/p/pious_evangel_wayward_disciple.txt b/forge-gui/res/cardsfolder/p/pious_evangel_wayward_disciple.txt
index 0c6cdfea4c5..a9e5220fcb6 100644
--- a/forge-gui/res/cardsfolder/p/pious_evangel_wayward_disciple.txt
+++ b/forge-gui/res/cardsfolder/p/pious_evangel_wayward_disciple.txt
@@ -4,8 +4,7 @@ Types:Creature Human Cleric
 PT:2/2
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigGainLife | ValidCard$ Card.Self,Creature.Other+YouCtrl | TriggerDescription$ Whenever CARDNAME or another creature enters the battlefield under your control, you gain 1 life.
 SVar:TrigGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 1
-A:AB$SetState | Cost$ 2 T Sac<1/Permanent.Other/another permanent> | Defined$ Self | Mode$ Transform | SpellDescription$ Transform CARDNAME.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/pious_evangel.jpg
+A:AB$ SetState | Cost$ 2 T Sac<1/Permanent.Other/another permanent> | Defined$ Self | Mode$ Transform | SpellDescription$ Transform CARDNAME.
 AlternateMode:DoubleFaced
 Oracle:Whenever Pious Evangel or another creature enters the battlefield under your control, you gain 1 life.\n{2}, {T}, Sacrifice another permanent: Transform Pious Evangel.
 
@@ -19,5 +18,4 @@ PT:2/4
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self,Creature.Other+YouCtrl | Execute$ TrigDrain | TriggerDescription$ Whenever CARDNAME or another creature you control dies, target opponent loses 1 life and you gain 1 life.
 SVar:TrigDrain:DB$ LoseLife | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | LifeAmount$ 1 | SubAbility$ DBGainLife
 SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 1
-SVar:Picture:http://www.wizards.com/global/images/magic/general/wayward_disciple.jpg
 Oracle:Whenever Wayward Disciple or another creature you control dies, target opponent loses 1 life and you gain 1 life.
diff --git a/forge-gui/res/cardsfolder/r/rotlung_reanimator.txt b/forge-gui/res/cardsfolder/r/rotlung_reanimator.txt
index 95438b7d58c..cfa55b039ca 100644
--- a/forge-gui/res/cardsfolder/r/rotlung_reanimator.txt
+++ b/forge-gui/res/cardsfolder/r/rotlung_reanimator.txt
@@ -2,8 +2,6 @@ Name:Rotlung Reanimator
 ManaCost:2 B
 Types:Creature Zombie Cleric
 PT:2/2
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Cleric.Other | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME or another Cleric dies, create a 2/2 black Zombie creature token.
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | Secondary$ True | TriggerDescription$ Whenever CARDNAME or another Cleric dies, create a 2/2 black Zombie creature token.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Cleric.Other,Card.Self | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME or another Cleric dies, create a 2/2 black Zombie creature token.
 SVar:TrigToken:DB$ Token | LegacyImage$ b 2 2 zombie ons | TokenScript$ b_2_2_zombie | TokenOwner$ You | TokenAmount$ 1
-SVar:Picture:http://www.wizards.com/global/images/magic/general/rotlung_reanimator.jpg
 Oracle:Whenever Rotlung Reanimator or another Cleric dies, create a 2/2 black Zombie creature token.
diff --git a/forge-gui/res/cardsfolder/s/selhoff_occultist.txt b/forge-gui/res/cardsfolder/s/selhoff_occultist.txt
index 6bbfc68e19c..7fda0ee426d 100644
--- a/forge-gui/res/cardsfolder/s/selhoff_occultist.txt
+++ b/forge-gui/res/cardsfolder/s/selhoff_occultist.txt
@@ -2,7 +2,6 @@ Name:Selhoff Occultist
 ManaCost:2 U
 Types:Creature Human Rogue
 PT:2/3
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.Other | TriggerZones$ Battlefield | Execute$ TrigMill | TriggerDescription$ Whenever CARDNAME or another creature dies, target player mills a card.
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigMill | Secondary$ True | TriggerDescription$ Whenever CARDNAME or another creature dies, target player mills a card.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.Other,Card.Self | TriggerZones$ Battlefield | Execute$ TrigMill | TriggerDescription$ Whenever CARDNAME or another creature dies, target player mills a card.
 SVar:TrigMill:DB$ Mill | NumCards$ 1 | ValidTgts$ Player | TgtPrompt$ Choose a player
 Oracle:Whenever Selhoff Occultist or another creature dies, target player mills a card.
diff --git a/forge-gui/res/cardsfolder/s/skirk_drill_sergeant.txt b/forge-gui/res/cardsfolder/s/skirk_drill_sergeant.txt
index a4d8c8bc88e..2951c357f3a 100644
--- a/forge-gui/res/cardsfolder/s/skirk_drill_sergeant.txt
+++ b/forge-gui/res/cardsfolder/s/skirk_drill_sergeant.txt
@@ -2,8 +2,6 @@ Name:Skirk Drill Sergeant
 ManaCost:1 R
 Types:Creature Goblin
 PT:2/1
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Goblin.Other | TriggerZones$ Battlefield | Execute$ TrigDig | TriggerDescription$ Whenever CARDNAME or another Goblin dies, you may pay {2}{R}. If you do, reveal the top card of your library. If it's a Goblin permanent card, put it onto the battlefield. Otherwise, put it into your graveyard.
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDig | Secondary$ True | TriggerDescription$ Whenever CARDNAME or another Goblin dies, you may pay {2}{R}. If you do, reveal the top card of your library. If it's a Goblin permanent card, put it onto the battlefield. Otherwise, put it into your graveyard.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Goblin.Other,Card.Self | TriggerZones$ Battlefield | Execute$ TrigDig | TriggerDescription$ Whenever CARDNAME or another Goblin dies, you may pay {2}{R}. If you do, reveal the top card of your library. If it's a Goblin permanent card, put it onto the battlefield. Otherwise, put it into your graveyard.
 SVar:TrigDig:AB$ Dig | Cost$ 2 R | DigNum$ 1 | Reveal$ True | ChangeNum$ All | ChangeValid$ Permanent.Goblin | DestinationZone$ Battlefield | DestinationZone2$ Graveyard
-SVar:Picture:http://www.wizards.com/global/images/magic/general/skirk_drill_sergeant.jpg
 Oracle:Whenever Skirk Drill Sergeant or another Goblin dies, you may pay {2}{R}. If you do, reveal the top card of your library. If it's a Goblin permanent card, put it onto the battlefield. Otherwise, put it into your graveyard.
diff --git a/forge-gui/res/cardsfolder/u/undead_augur.txt b/forge-gui/res/cardsfolder/u/undead_augur.txt
index e45033b3f0c..7502147ea2d 100644
--- a/forge-gui/res/cardsfolder/u/undead_augur.txt
+++ b/forge-gui/res/cardsfolder/u/undead_augur.txt
@@ -2,8 +2,7 @@ Name:Undead Augur
 ManaCost:B B
 Types:Creature Zombie Wizard
 PT:2/2
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | TriggerController$ TriggeredCardController | Execute$ TrigDraw | TriggerDescription$ Whenever CARDNAME or another Zombie you control dies, you draw a card and you lose 1 life.
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Zombie.Other+YouCtrl | TriggerZones$ Battlefield | TriggerController$ TriggeredCardController | Secondary$ True | Execute$ TrigDraw | TriggerDescription$ Whenever CARDNAME or another Zombie you control dies, you draw a card and you lose 1 life.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self,Zombie.Other+YouCtrl | Execute$ TrigDraw | TriggerDescription$ Whenever CARDNAME or another Zombie you control dies, you draw a card and you lose 1 life.
 SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1 | SubAbility$ DBLoseLife
 SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ 1
 Oracle:Whenever Undead Augur or another Zombie you control dies, you draw a card and you lose 1 life.
diff --git a/forge-gui/res/cardsfolder/v/vengeful_dead.txt b/forge-gui/res/cardsfolder/v/vengeful_dead.txt
index 7a88e08e91f..e386b041351 100644
--- a/forge-gui/res/cardsfolder/v/vengeful_dead.txt
+++ b/forge-gui/res/cardsfolder/v/vengeful_dead.txt
@@ -2,8 +2,6 @@ Name:Vengeful Dead
 ManaCost:3 B
 Types:Creature Zombie
 PT:3/2
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigLoseLife | TriggerDescription$ Whenever CARDNAME or another Zombie dies, each opponent loses 1 life.
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Zombie.Other | TriggerZones$ Battlefield | Secondary$ True | Execute$ TrigLoseLife | TriggerDescription$ Whenever CARDNAME or another Zombie is put into a graveyard from the battlefield, each opponent loses 1 life.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self,Zombie.Other | Execute$ TrigLoseLife | TriggerDescription$ Whenever CARDNAME or another Zombie dies, each opponent loses 1 life.
 SVar:TrigLoseLife:DB$ LoseLife | Defined$ Player.Opponent | LifeAmount$ 1
-SVar:Picture:http://www.wizards.com/global/images/magic/general/vengeful_dead.jpg
 Oracle:Whenever Vengeful Dead or another Zombie dies, each opponent loses 1 life.
diff --git a/forge-gui/res/cardsfolder/x/xathrid_necromancer.txt b/forge-gui/res/cardsfolder/x/xathrid_necromancer.txt
index ab315111a8e..65d0add5e01 100644
--- a/forge-gui/res/cardsfolder/x/xathrid_necromancer.txt
+++ b/forge-gui/res/cardsfolder/x/xathrid_necromancer.txt
@@ -2,10 +2,8 @@ Name:Xathrid Necromancer
 ManaCost:2 B
 Types:Creature Human Wizard
 PT:2/2
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.Human+YouCtrl+Other | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME or another Human creature you control dies, create a tapped 2/2 black Zombie creature token.
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | TriggerController$ TriggeredCardController | Execute$ TrigToken | Secondary$ True | TriggerDescription$ Whenever CARDNAME or another Human creature you control dies, create a tapped 2/2 black Zombie creature token.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.Human+YouCtrl+Other,Card.Self | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME or another Human creature you control dies, create a tapped 2/2 black Zombie creature token.
 SVar:TrigToken:DB$ Token | LegacyImage$ b 2 2 zombie m14 | TokenScript$ b_2_2_zombie | TokenOwner$ You | TokenAmount$ 1 | TokenTapped$ True
 DeckHints:Type$Human
 DeckHas:Ability$Token
-SVar:Picture:http://www.wizards.com/global/images/magic/general/xathrid_necromancer.jpg
 Oracle:Whenever Xathrid Necromancer or another Human creature you control dies, create a tapped 2/2 black Zombie creature token.