- Converted all cards with "When CARDNAME dies,..." to use TriggerController.

2025-11-16 10:48:00 +00:00 · 2012-04-02 14:15:15 +00:00
parent 8df85456bd
commit 7c152bc374
37 changed files with 167 additions and 167 deletions
--- a/res/cardsfolder/a/abu_jafar.txt
+++ b/res/cardsfolder/a/abu_jafar.txt
@@ -3,7 +3,7 @@ ManaCost:W
 Types:Creature Human
 Text:no text
 PT:0/1
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME dies, destroy all creatures blocking or blocked by it. They can't be regenerated.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, destroy all creatures blocking or blocked by it. They can't be regenerated.
 SVar:TrigDestroy:AB$ DestroyAll | Cost$ 0 | ValidCards$ Creature.blockingSource,Creature.blockedBySource | NoRegen$ True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abu_jafar.jpg
--- a/res/cardsfolder/a/anodet_lurker.txt
+++ b/res/cardsfolder/a/anodet_lurker.txt
@@ -3,7 +3,7 @@ ManaCost:5
 Types:Artifact Creature Construct
 Text:no text
 PT:3/3
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigSac | TriggerDescription$ When CARDNAME dies, you gain 3 life.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigSac | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, you gain 3 life.
 SVar:TrigSac:AB$GainLife | Cost$ 0 | Defined$ TriggeredCardController | LifeAmount$ 3
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/anodet_lurker.jpg
--- a/res/cardsfolder/a/arctic_nishoba.txt
+++ b/res/cardsfolder/a/arctic_nishoba.txt
@@ -5,7 +5,7 @@ Text:no text
 PT:6/6
 K:Trample
 K:Cumulative upkeep:GW
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | TriggerZones$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGain | TriggerDescription$ When CARDNAME dies, you gain 2 life for each age counter on it.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | TriggerZones$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGain | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, you gain 2 life for each age counter on it.
 SVar:TrigGain:AB$GainLife | Cost$ 0 | Defined$ TriggeredCardController | LifeAmount$ X
 SVar:X:TriggeredCard$CardCounters.AGE/Times.2
 SVar:Rarity:Uncommon
--- a/res/cardsfolder/a/aura_thief.txt
+++ b/res/cardsfolder/a/aura_thief.txt
@@ -4,7 +4,7 @@ Types:Creature Illusion
 Text:no text
 PT:2/2
 K:Flying
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigGainControl | TriggerDescription$ When CARDNAME dies, you gain control of all enchantments. (You don't get to move Auras.)
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigGainControl | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, you gain control of all enchantments. (You don't get to move Auras.)
 SVar:TrigGainControl:DB$ GainControl | AllValid$ Enchantment | NewController$ You
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aura_thief.jpg
--- a/res/cardsfolder/a/aven_fisher.txt
+++ b/res/cardsfolder/a/aven_fisher.txt
@@ -4,7 +4,7 @@ Types:Creature Bird Soldier
 Text:no text
 PT:2/2
 K:Flying
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | OptionalDecider$ TriggeredCardController | TriggerController$ TriggeredCardController | Execute$ TrigDraw | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, you may draw a card.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | OptionalDecider$ TriggeredCardController | TriggerController$ TriggeredCardController | Execute$ TrigDraw | TriggerDescription$ When CARDNAME dies, you may draw a card.
 SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1
 SVar:SacMe:1
 SVar:Rarity:Common
--- a/res/cardsfolder/b/bitterheart_witch.txt
+++ b/res/cardsfolder/b/bitterheart_witch.txt
@@ -4,7 +4,7 @@ Types:Creature Human Shaman
 Text:no text
 PT:1/2
 K:Deathtouch
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME dies, you may search your library for a Curse card, put it onto the battlefield attached to target player, then shuffle your library.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigChangeZone | OptionalDecider$ TriggeredCardController | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, you may search your library for a Curse card, put it onto the battlefield attached to target player, then shuffle your library.
 SVar:TrigChangeZone:AB$ ChangeZone | Cost$ 0 | Origin$ Library | Destination$ Battlefield | ChangeType$ Card.Curse | ChangeNum$ 1
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/bitterheart_witch.jpg
--- a/res/cardsfolder/b/black_cat.txt
+++ b/res/cardsfolder/b/black_cat.txt
@@ -3,7 +3,7 @@ ManaCost:1 B
 Types:Creature Zombie Cat
 Text:no text
 PT:1/1
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDiscard | TriggerDescription$ When CARDNAME dies, target opponent discards a card at random.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDiscard | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, target opponent discards a card at random.
 SVar:TrigDiscard:AB$ Discard | Cost$ 0 | ValidTgts$ Opponent | NumCards$ 1 | Mode$ Random
 SVar:Picture:http://www.wizards.com/global/images/magic/general/black_cat.jpg
 SetInfo:DKA|Common|http://magiccards.info/scans/en/dka/54.jpg
--- a/res/cardsfolder/b/body_snatcher.txt
+++ b/res/cardsfolder/b/body_snatcher.txt
@@ -7,7 +7,7 @@ T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefi
 SVar:TrigBodySnatcherDiscardCreature:AB$ Discard | Cost$ 0 | Mode$ TgtChoose | DiscardValid$ Creature | RememberDiscarded$ True | Optional$ True | SubAbility$ DBBodySnatcherExileMe
 SVar:DBBodySnatcherExileMe:DB$ ChangeZone | Defined$ Self | Origin$ Battlefield | Destination$ Exile | ConditionDefined$ Remembered | ConditionPresent$ Creature | ConditionCompare$ EQ0 | SubAbility$ DBBodySnatcherCleanup
 SVar:DBBodySnatcherCleanup:DB$ Cleanup | ClearRemembered$ True
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigBodySnatcherExileMe | TriggerDescription$ When CARDNAME dies, exile CARDNAME and return target creature card from your graveyard to the battlefield.
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigBodySnatcherExileMe | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, exile CARDNAME and return target creature card from your graveyard to the battlefield.
 SVar:TrigBodySnatcherExileMe:AB$ ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Graveyard | Destination$ Exile | SubAbility$ DBBodySnatcherReturnCreature
 SVar:DBBodySnatcherReturnCreature:DB$ ChangeZone | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature from your graveyard | Origin$ Graveyard | Destination$ Battlefield
 SVar:NeedsToPlayVar:Y GE2
--- a/res/cardsfolder/b/bogardan_phoenix.txt
+++ b/res/cardsfolder/b/bogardan_phoenix.txt
@@ -4,7 +4,7 @@ Types:Creature Phoenix
 Text:no text
 PT:3/3
 K:Flying
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME dies, exile it if it had a death counter on it. Otherwise, return it to the battlefield under your control and put a death counter on it.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, exile it if it had a death counter on it. Otherwise, return it to the battlefield under your control and put a death counter on it.
 SVar:TrigReturn:AB$ ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Graveyard | Destination$ Exile | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1 | SubAbility$ DBReturn
 SVar:DBReturn:DB$ ChangeZone | Defined$ Self | Origin$ Graveyard | Destination$ Battlefield | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ0 | SubAbility$ DBPutCounter
 SVar:DBPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ DEATH | CounterNum$ 1 | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ0
--- a/res/cardsfolder/c/celestial_gatekeeper.txt
+++ b/res/cardsfolder/c/celestial_gatekeeper.txt
@@ -4,7 +4,7 @@ Types:Creature Bird Cleric
 Text:no text
 PT:2/2
 K:Flying
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigExile | TriggerDescription$ When CARDNAME dies, exile it, then return up to two target Bird and/or Cleric permanent cards from your graveyard to the battlefield.
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigExile | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, exile it, then return up to two target Bird and/or Cleric permanent cards from your graveyard to the battlefield.
 SVar:TrigExile:AB$ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Graveyard | Destination$ Exile | SubAbility$ DBChangeZone
 SVar:DBChangeZone:DB$ChangeZone | ValidTgts$ Permanent.Bird+YouCtrl,Permanent.Cleric+YouCtrl | TargetMin$ 0 | TargetMax$ 2 | Origin$ Graveyard | Destination$ Battlefield
 SVar:Rarity:Rare
--- a/res/cardsfolder/c/chronozoa.txt
+++ b/res/cardsfolder/c/chronozoa.txt
@@ -5,7 +5,7 @@ Text:no text
 PT:3/3
 K:Flying
 K:Vanishing:3
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigCopyPermanent | TriggerDescription$ When CARDNAME dies, if it had no time counters on it, put two tokens that are copies of it onto the battlefield.
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigCopyPermanent | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, if it had no time counters on it, put two tokens that are copies of it onto the battlefield.
 SVar:TrigCopyPermanent:AB$ CopyPermanent | Cost$ 0 | Defined$ TriggeredCard | NumCopies$ 2 | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ0
 SVar:X:TriggeredCard$CardCounters.TIME
 SVar:Rarity:Rare
--- a/res/cardsfolder/c/clone_shell.txt
+++ b/res/cardsfolder/c/clone_shell.txt
@@ -5,7 +5,7 @@ Text:no text
 PT:2/2
 T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDig | TriggerDescription$ Imprint - When CARDNAME enters the battlefield, look at the top four cards of your library, exile one face down, then put the rest on the bottom of your library in any order.
 SVar:TrigDig:AB$ Dig | Cost$ 0  | Defined$ You | DigNum$ 4 | DestinationZone$ Exile | ExileFaceDown$ True | Imprint$ True
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigFaceUp | TriggerDescription$ When CARDNAME dies, turn the exiled card face up. If it's a creature card, put it onto the battlefield under your control.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigFaceUp | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, turn the exiled card face up. If it's a creature card, put it onto the battlefield under your control.
 SVar:TrigFaceUp:AB$ SetState | Cost$ 0 | Defined$ Imprinted | SubAbility$ DBChangeZone | Mode$ TurnFace
 SVar:DBChangeZone:DB$ ChangeZone | Defined$ Imprinted | Origin$ Exile | Destination$ Battlefield | ConditionDefined$ Imprinted | ConditionPresent$ Creature | GainControl$ True | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearImprinted$ True
--- a/res/cardsfolder/d/deadly_grub.txt
+++ b/res/cardsfolder/d/deadly_grub.txt
@@ -4,7 +4,7 @@ Types:Creature Insect
 Text:no text
 PT:3/1
 K:Vanishing:3
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self+counters_EQ0_TIME | Execute$ TrigToken | TriggerDescription$ When CARDNAME dies, if it had no time counters on it, put a 6/1 green Insect creature token with shroud onto the battlefield. (It can't be the target of spells or abilities.)
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self+counters_EQ0_TIME | Execute$ TrigToken | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, if it had no time counters on it, put a 6/1 green Insect creature token with shroud onto the battlefield. (It can't be the target of spells or abilities.)
 SVar:TrigToken:AB$Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Insect | TokenTypes$ Creature,Insect | TokenOwner$ TriggeredCardController | TokenColors$ Green | TokenPower$ 6 | TokenToughness$ 1 | TokenKeywords$ Shroud
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/deadly_grub.jpg
--- a/res/cardsfolder/d/deathcurse_ogre.txt
+++ b/res/cardsfolder/d/deathcurse_ogre.txt
@@ -3,7 +3,7 @@ ManaCost:5 B
 Types:Creature Ogre Warrior
 Text:no text
 PT:3/3
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigLoseLife | TriggerDescription$ When CARDNAME dies, each player loses 3 life.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigLoseLife | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, each player loses 3 life.
 SVar:TrigLoseLife:AB$LoseLife | Cost$ 0 | LifeAmount$ 3 | Defined$ Each
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/deathcurse_ogre.jpg
--- a/res/cardsfolder/d/doomed_traveler.txt
+++ b/res/cardsfolder/d/doomed_traveler.txt
@@ -3,7 +3,7 @@ ManaCost:W
 Types:Creature Human Soldier
 Text:no text
 PT:1/1
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME dies, put a 1/1 white Spirit creature token with flying onto the battlefield.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, put a 1/1 white Spirit creature token with flying onto the battlefield.
 SVar:TrigToken:AB$Token | Cost$ 0 | TokenImage$ W 1 1 Spirit | TokenAmount$ 1 | TokenName$ Spirit | TokenTypes$ Creature,Spirit | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying
 SVar:SacMe:1
 SVar:Rarity:Common
--- a/res/cardsfolder/d/dusk_urchins.txt
+++ b/res/cardsfolder/d/dusk_urchins.txt
@@ -6,7 +6,7 @@ PT:4/3
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME attacks or blocks, put a -1/-1 counter on it.
 T:Mode$ Blocks | ValidCard$ Card.Self | Execute$ TrigPutCounter | Secondary$ True | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME attacks or blocks, put a -1/-1 counter on it.
 SVar:TrigPutCounter:AB$ PutCounter | Cost$ 0 | CounterType$ M1M1 | CounterNum$ 1
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME dies, draw a card for each -1/-1 counter on it.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, draw a card for each -1/-1 counter on it.
 SVar:TrigDraw:AB$ Draw | Cost$ 0 | NumCards$ X
 SVar:X:TriggeredCard$CardCounters.M1M1
 SVar:Rarity:Rare
--- a/res/cardsfolder/e/elder_cathar.txt
+++ b/res/cardsfolder/e/elder_cathar.txt
@@ -3,7 +3,7 @@ ManaCost:2 W
 Types:Creature Human Soldier
 Text:no text
 PT:2/2
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerDescription$ When CARDNAME dies, put a +1/+1 counter on target creature you control. If that creature is a Human, put two +1/+1 counters on it instead.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, put a +1/+1 counter on target creature you control. If that creature is a Human, put two +1/+1 counters on it instead.
 SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | CounterType$ P1P1 | CounterNum$ X
 SVar:X:Targeted$Valid Creature.Human/Plus.1
 SVar:Rarity:Common
--- a/res/cardsfolder/e/elgaud_inquisitor.txt
+++ b/res/cardsfolder/e/elgaud_inquisitor.txt
@@ -4,7 +4,7 @@ Types:Creature Human Cleric
 Text:no text
 PT:2/2
 K:Lifelink
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME dies, put a 1/1 white Spirit creature token with flying onto the battlefield.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, put a 1/1 white Spirit creature token with flying onto the battlefield.
 SVar:TrigToken:AB$Token | Cost$ 0 | TokenImage$ W 1 1 Spirit | TokenAmount$ 1 | TokenName$ Spirit | TokenTypes$ Creature,Spirit | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying
 SVar:SacMe:1
 SVar:Rarity:Common
--- a/res/cardsfolder/e/elvish_soultiller.txt
+++ b/res/cardsfolder/e/elvish_soultiller.txt
@@ -3,7 +3,7 @@ ManaCost:3 G G
 Types:Creature Elf Mutant
 Text:no text
 PT:5/4
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigChoose | TriggerDescription$ When CARDNAME dies, choose a creature type. Shuffle all creature cards of that type from your graveyard into your library.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigChoose | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, choose a creature type. Shuffle all creature cards of that type from your graveyard into your library.
 SVar:TrigChoose:AB$ ChooseType | Cost$ 0 | Defined$ You | Type$ Creature | AILogic$ MostProminentInComputerGraveyard | SubAbility$ ShuffleInto
 SVar:ShuffleInto:DB$ ChangeZoneAll | ChangeType$ Creature.ChosenType+YouOwn | Origin$ Graveyard | Destination$ Library | Shuffle$ True
 SVar:Rarity:Rare
--- a/res/cardsfolder/e/enatu_golem.txt
+++ b/res/cardsfolder/e/enatu_golem.txt
@@ -3,7 +3,7 @@ ManaCost:6
 Types:Artifact Creature Golem
 Text:no text
 PT:3/5
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME dies, you gain 4 life.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, you gain 4 life.
 SVar:TrigGainLife:AB$GainLife | Cost$ 0 | Defined$ TriggeredCardController | LifeAmount$ 4
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/enatu_golem.jpg
--- a/res/cardsfolder/f/fyndhorn_druid.txt
+++ b/res/cardsfolder/f/fyndhorn_druid.txt
@@ -3,7 +3,7 @@ ManaCost:2 G
 Types:Creature Elf Druid
 Text:no text
 PT:2/2
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self+gotBlockedThisTurn | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME dies, if it was blocked this turn, you gain 4 life.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self+gotBlockedThisTurn | Execute$ TrigGainLife | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, if it was blocked this turn, you gain 4 life.
 SVar:TrigGainLife:AB$GainLife | Cost$ 0 | Defined$ TriggeredCardController | LifeAmount$ 4
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/fyndhorn_druid.jpg
--- a/res/cardsfolder/g/gamekeeper.txt
+++ b/res/cardsfolder/g/gamekeeper.txt
@@ -3,7 +3,7 @@ ManaCost:3 G
 Types:Creature Elf
 Text:no text
 PT:2/2
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigExile | OptionalDecider$ You | TriggerDescription$ When CARDNAME dies, you may exile it. If you do, reveal cards from the top of your library until you reveal a creature card. Put that card onto the battlefield and put all other cards revealed this way into your graveyard.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigExile | OptionalDecider$ TriggeredCardController | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, you may exile it. If you do, reveal cards from the top of your library until you reveal a creature card. Put that card onto the battlefield and put all other cards revealed this way into your graveyard.
 SVar:TrigExile:AB$ ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Graveyard | Destination$ Exile | SubAbility$ DBDigUntil
 SVar:DBDigUntil:DB$ DigUntil | Valid$ Creature | ValidDescription$ Creature | FoundDestination$ Battlefield | RevealedDestination$ Graveyard
 SVar:Rarity:Uncommon
--- a/res/cardsfolder/g/grief_tyrant.txt
+++ b/res/cardsfolder/g/grief_tyrant.txt
@@ -4,7 +4,7 @@ Types:Creature Horror
 Text:no text
 PT:8/8
 K:etbCounter:M1M1:4
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigCurse | TriggerDescription$ When CARDNAME dies, put a -1/-1 counter on target creature for each -1/-1 counter on CARDNAME.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigCurse | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, put a -1/-1 counter on target creature for each -1/-1 counter on CARDNAME.
 SVar:TrigCurse:AB$ PutCounter | Cost$ 0 | ValidTgts$ Creature | CounterType$ M1M1 | CounterNum$ X
 SVar:X:TriggeredCard$CardCounters.M1M1
 SVar:Rarity:Uncommon
--- a/res/cardsfolder/h/haakon_stromgald_scourge.txt
+++ b/res/cardsfolder/h/haakon_stromgald_scourge.txt
@@ -6,7 +6,7 @@ PT:3/3
 S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ HIDDEN May be played | AffectedZone$ Graveyard | EffectZone$ Graveyard
 S:Mode$ CantBeCast | ValidCard$ Card.Self | Origin$ Exile,Hand,Library | EffectZone$ Graveyard,Hand,Library | Description$ You may cast CARDNAME from your graveyard, but not from anywhere else.
 S:Mode$ Continuous | Affected$ Knight.YouCtrl | AddHiddenKeyword$ HIDDEN May be played | EffectZone$ Battlefield | AffectedZone$ Graveyard | Description$ As long as CARDNAME is on the battlefield, you may play Knight cards from your graveyard.
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigLose  | TriggerDescription$ When CARDNAME dies, you lose 2 life.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigLose  | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, you lose 2 life.
 SVar:TrigLose:AB$ LoseLife | Cost$ 0 | Defined$ You | LifeAmount$ 2
 SVar:RemRandomDeck:True
 SVar:DiscardMe:5
--- a/res/cardsfolder/h/hoarding_dragon.txt
+++ b/res/cardsfolder/h/hoarding_dragon.txt
@@ -6,7 +6,7 @@ PT:4/4
 K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, you may search your library for an artifact card, exile it, then shuffle your library.
 SVar:TrigChange:AB$ChangeZone | Cost$ 0 | Origin$ Library | Destination$ Exile | ChangeType$ Artifact | ChangeNum$ 1 | RememberChanged$ True
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME dies, you may put the exiled card into its owner's hand.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigReturn | OptionalDecider$ TriggeredCardController | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, you may put the exiled card into its owner's hand.
 SVar:TrigReturn:DB$ChangeZone | Cost$ 0 | Defined$ Remembered | Origin$ Exile | Destination$ Hand
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hoarding_dragon.jpg
--- a/res/cardsfolder/h/homura_human_ascendant_homuras_essence.txt
+++ b/res/cardsfolder/h/homura_human_ascendant_homuras_essence.txt
@@ -4,7 +4,7 @@ Types:Legendary Creature Human Monk
 Text:no text
 PT:4/4
 K:CARDNAME can't block.
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME dies, return it to the battlefield flipped.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, return it to the battlefield flipped.
 SVar:TrigReturn:AB$ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Graveyard | Destination$ Battlefield | SubAbility$ TrigFlip
 SVar:TrigFlip:DB$SetState | Defined$ Self | Mode$ Flip
 SVar:Picture:http://www.wizards.com/global/images/magic/general/homura_human_ascendant.jpg
--- a/res/cardsfolder/i/iname_as_one.txt
+++ b/res/cardsfolder/i/iname_as_one.txt
@@ -5,7 +5,7 @@ Text:no text
 PT:8/8
 T:Mode$ ChangesZone | ValidCard$ Card.wasCastFromHand+Self | Destination$ Battlefield | Execute$ TrigSearch | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, if you cast it from your hand, you may search your library for a Spirit permanent card, put it onto the battlefield, then shuffle your library.
 SVar:TrigSearch:AB$ChangeZone | Cost$ 0 | Origin$ Library | Destination$ Battlefield | ChangeType$ Spirit.YouCtrl | ChangeNum$ 1
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigExile | OptionalDecider$ You | TriggerDescription$ When CARDNAME dies, you may exile it. If you do, return target Spirit permanent card from your graveyard to the battlefield.
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigExile | OptionalDecider$ TriggeredCardController | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, you may exile it. If you do, return target Spirit permanent card from your graveyard to the battlefield.
 SVar:TrigExile:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Exile | ValidCard$ Card.Self | SubAbility$ DBReturn
 SVar:DBReturn:DB$ChangeZone | Origin$ Graveyard | Destination$ Battlefield | Hidden$ True | ChangeType$ Spirit.YouCtrl | ChangeNum$ 1
 SVar:Rarity:Rare
--- a/res/cardsfolder/i/iname_life_aspect.txt
+++ b/res/cardsfolder/i/iname_life_aspect.txt
@@ -3,7 +3,7 @@ ManaCost:4 G G
 Types:Legendary Creature Spirit
 Text:no text
 PT:4/4
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigExile | OptionalDecider$ You | TriggerDescription$ When CARDNAME dies, you may exile it. If you do, return any number of target Spirit cards from your graveyard to your hand.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigExile | OptionalDecider$ TriggeredCardController | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, you may exile it. If you do, return any number of target Spirit cards from your graveyard to your hand.
 SVar:TrigExile:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Exile | ValidCard$ Card.Self | SubAbility$ DBReturn
 SVar:DBReturn:DB$ChangeZone | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Spirit.YouCtrl | TargetMin$ 0 | TargetMax$ X
 SVar:X:Count$TypeInYourYard.Spirit
--- a/res/cardsfolder/i/ivory_gargoyle.txt
+++ b/res/cardsfolder/i/ivory_gargoyle.txt
@@ -4,7 +4,7 @@ Types:Creature Gargoyle
 Text:no text
 PT:2/2
 K:Flying
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigDelay | TriggerDescription$ When CARDNAME dies, return it to the battlefield under its owner's control at the beginning of the next end step and you skip your next draw step.
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigDelay | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, return it to the battlefield under its owner's control at the beginning of the next end step and you skip your next draw step.
 SVar:TrigDelay:AB$ DelayedTrigger | Cost$ 0 | Mode$ Phase | Phase$ End of Turn | Execute$ TrigReturn | TriggerDescription$ Return CARDNAME to the battlefield.
 SVar:TrigReturn:AB$ ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Graveyard | Destination$ Battlefield | SubAbility$ DBSkipDraw
 SVar:DBSkipDraw:DB$ Pump | Defined$ You | KW$ Skip your next draw step. | Permanent$ True
--- a/res/cardsfolder/j/jotun_owl_keeper.txt
+++ b/res/cardsfolder/j/jotun_owl_keeper.txt
@@ -4,7 +4,7 @@ Types:Creature Giant
 Text:no text
 PT:3/3
 K:Cumulative upkeep:WU
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME dies, put a 1/1 white Bird creature token with flying onto the battlefield for each age counter on it.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, put a 1/1 white Bird creature token with flying onto the battlefield for each age counter on it.
 SVar:TrigToken:AB$Token | Cost$ 0 | TokenAmount$ X | TokenName$ Bird | TokenImage$ W 1 1 Bird Flying | TokenTypes$ Creature,Bird | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying
 SVar:X:TriggeredCard$CardCounters.AGE
 SVar:Rarity:Uncommon
--- a/res/cardsfolder/l/loyal_cathar_unhallowed_cathar.txt
+++ b/res/cardsfolder/l/loyal_cathar_unhallowed_cathar.txt
@@ -4,7 +4,7 @@ Types:Creature Human Soldier
 Text:no text
 PT:2/2
 K:Vigilance
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDelay | TriggerDescription$ When CARDNAME dies, return it to the battlefield transformed under your control at the beginning of the next end step.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDelay | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, return it to the battlefield transformed under your control at the beginning of the next end step.
 SVar:TrigDelay:AB$ DelayedTrigger | Cost$ 0 | Mode$ Phase | Phase$ End of Turn | Execute$ TrigReturn | TriggerDescription$ return CARDNAME to the battlefield transformed
 SVar:TrigReturn:AB$ ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Graveyard | Destination$ Battlefield | SubAbility$ TrigTransform
 SVar:TrigTransform:DB$ SetState | Cost$ 0 | Defined$ Self | Mode$ Transform
--- a/res/cardsfolder/m/mausoleum_guard.txt
+++ b/res/cardsfolder/m/mausoleum_guard.txt
@@ -3,7 +3,7 @@ ManaCost:3 W
 Types:Creature Human Scout
 Text:no text
 PT:2/2
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME dies, put two 1/1 white Spirit creature tokens with flying onto the battlefield.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, put two 1/1 white Spirit creature tokens with flying onto the battlefield.
 SVar:TrigToken:AB$Token | Cost$ 0 | TokenImage$ W 1 1 Spirit | TokenAmount$ 2 | TokenName$ Spirit | TokenTypes$ Creature,Spirit | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying
 SVar:SacMe:1
 SVar:Rarity:Uncommon
--- a/res/cardsfolder/m/moldgraf_monstrosity.txt
+++ b/res/cardsfolder/m/moldgraf_monstrosity.txt
@@ -4,7 +4,7 @@ Types:Creature Insect
 Text:no text
 PT:8/8
 K:Trample
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigExile | TriggerDescription$ When CARDNAME dies, exile it, then return two creature cards at random from your graveyard to the battlefield.
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigExile | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, exile it, then return two creature cards at random from your graveyard to the battlefield.
 SVar:TrigExile:AB$ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Graveyard | Destination$ Exile | SubAbility$ DBChangeZone
 SVar:DBChangeZone:DB$ChangeZone | ChangeType$ Creature.YouCtrl | ChangeNum$ 2 | Hidden$ True | Origin$ Graveyard | AtRandom$ True | Destination$ Battlefield
 SVar:Rarity:Rare
--- a/res/cardsfolder/m/molten_firebird.txt
+++ b/res/cardsfolder/m/molten_firebird.txt
@@ -4,7 +4,7 @@ Types:Creature Phoenix
 Text:no text
 PT:2/2
 K:Flying
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigDelay | TriggerDescription$ When CARDNAME dies, return it to the battlefield under its owner's control at the beginning of the next end step and you skip your next draw step.
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigDelay | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, return it to the battlefield under its owner's control at the beginning of the next end step and you skip your next draw step.
 SVar:TrigDelay:AB$ DelayedTrigger | Cost$ 0 | Mode$ Phase | Phase$ End of Turn | Execute$ TrigReturn | TriggerDescription$ Return CARDNAME to the battlefield.
 SVar:TrigReturn:AB$ ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Graveyard | Destination$ Battlefield | SubAbility$ DBSkipDraw
 SVar:DBSkipDraw:DB$ Pump | Defined$ You | KW$ Skip your next draw step. | Permanent$ True
--- a/res/cardsfolder/p/pitchburn_devils.txt
+++ b/res/cardsfolder/p/pitchburn_devils.txt
@@ -3,7 +3,7 @@ ManaCost:4 R
 Types:Creature Devil
 Text:no text
 PT:3/3
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDamage | TriggerDescription$ When CARDNAME dies, it deals 3 damage to target creature or player.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDamage | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, it deals 3 damage to target creature or player.
 SVar:TrigDamage:AB$ DealDamage | Cost$ 0 | Tgt$ TgtCP | NumDmg$ 3
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/pitchburn_devils.jpg
--- a/res/cardsfolder/r/rooting_kavu.txt
+++ b/res/cardsfolder/r/rooting_kavu.txt
@@ -3,7 +3,7 @@ ManaCost:2 G G
 Types:Creature Kavu
 Text:no text
 PT:4/3
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigExile | OptionalDecider$ You| TriggerDescription$ When CARDNAME dies, you may exile it. If you do, shuffle all creature cards from your graveyard into your library.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigExile | OptionalDecider$ TriggeredCardController | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, you may exile it. If you do, shuffle all creature cards from your graveyard into your library.
 SVar:TrigExile:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Exile | SubAbility$ DBShuffle
 SVar:DBShuffle:DB$ChangeZoneAll | ChangeType$ Creature.YouCtrl | Origin$ Graveyard | Destination$ Library | Shuffle$ True
 SVar:Rarity:Uncommon
--- a/res/cardsfolder/t/treacherous_werewolf.txt
+++ b/res/cardsfolder/t/treacherous_werewolf.txt
@@ -4,7 +4,7 @@ Types:Creature Werewolf Minion
 Text:no text
 PT:2/2
 S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 2 | AddToughness$ 2 | AddTrigger$ Dies | AddSVar$ TrigLose | Threshold$ True | Description$ Threshold - As long as seven or more cards are in your graveyard, CARDNAME gets +2/+2 and has "When CARDNAME dies, you lose 4 life."
-SVar:Dies:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigLose  | Secondary$ True | TriggerDescription$ When CARDNAME dies, you lose 4 life.
+SVar:Dies:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigLose  | Secondary$ True | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, you lose 4 life.
 SVar:TrigLose:AB$ LoseLife | Cost$ 0 | Defined$ You | LifeAmount$ 4
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/treacherous_werewolf.jpg