cards: updated cards with DelayedTrigger

2025-11-19 20:28:00 +00:00 · 2016-11-16 09:30:30 +00:00
parent 852f6b77d6
commit 72df8e241b
71 changed files with 277 additions and 275 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -15442,7 +15442,7 @@ forge-gui/res/cardsfolder/t/teferis_moat.txt -text
 forge-gui/res/cardsfolder/t/teferis_puzzle_box.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/t/teferis_realm.txt -text
 forge-gui/res/cardsfolder/t/teferis_response.txt svneol=native#text/plain
-forge-gui/res/cardsfolder/t/teferis_veil.txt.txt -text
+forge-gui/res/cardsfolder/t/teferis_veil.txt -text
 forge-gui/res/cardsfolder/t/tek.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/t/tel_jilad_archers.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/t/tel_jilad_chosen.txt svneol=native#text/plain
--- a/forge-gui/res/cardsfolder/a/abomination.txt
+++ b/forge-gui/res/cardsfolder/a/abomination.txt
@@ -2,11 +2,10 @@ Name:Abomination
 ManaCost:3 B B
 Types:Creature Horror
 PT:2/6
-T:Mode$ AttackerBlockedByCreature | ValidCard$ Creature.Green,Creature.White | ValidBlocker$ Card.Self | DelayedTrigger$ DelTrigBlocked | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a green or white creature, destroy that creature at end of combat.
-T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature.Green,Creature.White | DelayedTrigger$ DelTrigBlocker | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a green or white creature, destroy that creature at end of combat.
-SVar:DelTrigBlocked:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroyBlocked | TriggerDescription$ Destroy blocked creature at end of combat.
-SVar:DelTrigBlocker:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroyBlocker | TriggerDescription$ Destroy blocking creature at end of combat.
-SVar:TrigDestroyBlocked:AB$ Destroy | Cost$ 0 | Defined$ TriggeredAttacker
-SVar:TrigDestroyBlocker:AB$ Destroy | Cost$ 0 | Defined$ TriggeredBlocker
+T:Mode$ AttackerBlockedByCreature | ValidCard$ Creature.Green,Creature.White | ValidBlocker$ Card.Self | Execute$ DelTrigBlocked | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a green or white creature, destroy that creature at end of combat.
+T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature.Green,Creature.White | Execute$ DelTrigBlocker | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a green or white creature, destroy that creature at end of combat.
+SVar:DelTrigBlocked:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredAttacker | TriggerDescription$ Destroy blocked creature at end of combat.
+SVar:DelTrigBlocker:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredBlocker | TriggerDescription$ Destroy blocking creature at end of combat.
+SVar:TrigDestroy:DB$Destroy | Defined$ DelayTriggerRemembered
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abomination.jpg
 Oracle:Whenever Abomination blocks or becomes blocked by a green or white creature, destroy that creature at end of combat.
--- a/forge-gui/res/cardsfolder/a/aether_membrane.txt
+++ b/forge-gui/res/cardsfolder/a/aether_membrane.txt
@@ -1,12 +1,13 @@
-Name:AEther Membrane
+Name:Aether Membrane
+AltName:AEther Membrane
 ManaCost:1 R R
 Types:Creature Wall
 PT:0/5
 K:Defender
 K:Reach
-T:Mode$ AttackerBlocked | ValidCard$ Creature | ValidBlocker$ Card.Self | DelayedTrigger$ DelayedTrig | TriggerDescription$ Whenever CARDNAME blocks a creature, return that creature to its owner's hand at end of combat.
-SVar:DelayedTrig:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigBounce | TriggerDescription$ Return blocked creature to its owner's hand at end of combat.
-SVar:TrigBounce:AB$ ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Hand | Defined$ TriggeredAttacker
+T:Mode$ AttackerBlocked | ValidCard$ Creature | ValidBlocker$ Card.Self | Execute$ DelayedTrig | TriggerDescription$ Whenever CARDNAME blocks a creature, return that creature to its owner's hand at end of combat.
+SVar:DelayedTrig:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigBounce | RememberObjects$ TriggeredAttacker | TriggerDescription$ Return blocked creature to its owner's hand at end of combat.
+SVar:TrigBounce:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | Defined$ DelayTriggerRemembered
 SVar:HasBlockEffect:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aether_membrane.jpg
 Oracle:Defender, reach (This creature can block creatures with flying.)\nWhenever AEther Membrane blocks a creature, return that creature to its owner's hand at end of combat.
--- a/forge-gui/res/cardsfolder/a/arrogant_bloodlord.txt
+++ b/forge-gui/res/cardsfolder/a/arrogant_bloodlord.txt
@@ -2,9 +2,9 @@ Name:Arrogant Bloodlord
 ManaCost:1 B B
 Types:Creature Vampire Knight
 PT:4/4
-T:Mode$ AttackerBlockedByCreature | ValidCard$ Creature.powerLE1 | ValidBlocker$ Card.Self | DelayedTrigger$ DelTrig | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature with power 1 or less, destroy CARDNAME at end of combat.
-T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature.powerLE1 | DelayedTrigger$ DelTrig | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature with power 1 or less, destroy CARDNAME at end of combat.
-SVar:DelTrig:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | TriggerDescription$ Destroy the creature blocking or blocked by CARDNAME at end of combat.
-SVar:TrigDestroy:AB$ Destroy | Cost$ 0 | Defined$ Self
+T:Mode$ AttackerBlockedByCreature | ValidCard$ Creature.powerLE1 | ValidBlocker$ Card.Self | Execute$ DelTrig | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature with power 1 or less, destroy CARDNAME at end of combat.
+T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature.powerLE1 | Execute$ DelTrig | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature with power 1 or less, destroy CARDNAME at end of combat.
+SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | TriggerDescription$ Destroy the creature blocking or blocked by CARDNAME at end of combat.
+SVar:TrigDestroy:DB$ Destroy | Defined$ Self
 SVar:Picture:http://www.wizards.com/global/images/magic/general/arrogant_bloodlord.jpg
 Oracle:Whenever Arrogant Bloodlord blocks or becomes blocked by a creature with power 1 or less, destroy Arrogant Bloodlord at end of combat.
--- a/forge-gui/res/cardsfolder/b/basalt_golem.txt
+++ b/forge-gui/res/cardsfolder/b/basalt_golem.txt
@@ -3,11 +3,10 @@ ManaCost:5
 Types:Artifact Creature Golem
 PT:2/4
 K:CantBeBlockedBy Artifact.Creature
-T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature | DelayedTrigger$ TrigEndCombat | TriggerDescription$ Whenever CARDNAME becomes blocked by a creature, that creature's controller sacrifices it at end of combat. If the player does, he or she puts a 0/2 colorless Wall artifact creature token with defender onto the battlefield.
-SVar:TrigEndCombat:Mode$ Phase | Phase$ EndCombat | Execute$ TrigSacBlocker | TriggerDescription$ At end of combat, the controller of the creature that blocked CARDNAME sacrifices that creature. If the player does, he or she puts a 0/2 colorless Wall artifact creature token with defender onto the battlefield.
-SVar:TrigSacBlocker:AB$Destroy | Cost$ 0 | Defined$ TriggeredBlocker | Sacrifice$ True | SubAbility$ DBToken | RememberDestroyed$ True
-SVar:DBToken:DB$Token | TokenAmount$ 1 | TokenName$ Wall | TokenTypes$ Artifact,Creature,Wall | TokenOwner$ TriggeredBlockerController | TokenColors$ Colorless | TokenPower$ 0 | TokenToughness$ 2 | TokenKeywords$ Defender | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1 | References$ X | SubAbility$ DBCleanup
+T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature | Execute$ TrigEndCombat | TriggerDescription$ Whenever CARDNAME becomes blocked by a creature, that creature's controller sacrifices it at end of combat. If the player does, he or she puts a 0/2 colorless Wall artifact creature token with defender onto the battlefield.
+SVar:TrigEndCombat:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | Execute$ TrigSacBlocker | RememberObjects$ TriggeredBlocker | TriggerDescription$ At end of combat, the controller of the creature that blocked CARDNAME sacrifices that creature. If the player does, he or she puts a 0/2 colorless Wall artifact creature token with defender onto the battlefield.
+SVar:TrigSacBlocker:DB$Destroy | Defined$ DelayTriggerRemembered | Sacrifice$ True | SubAbility$ DBToken | RememberDestroyed$ True
+SVar:DBToken:DB$Token | TokenAmount$ 1 | TokenName$ Wall | TokenTypes$ Artifact,Creature,Wall | TokenOwner$ DelayTriggerRememberedController | TokenColors$ Colorless | TokenPower$ 0 | TokenToughness$ 2 | TokenKeywords$ Defender | ConditionDefined$ Remembered | ConditionPresent$ Card | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:Remembered$Amount
 SVar:Picture:http://www.wizards.com/global/images/magic/general/basalt_golem.jpg
 Oracle:Basalt Golem can't be blocked by artifact creatures.\nWhenever Basalt Golem becomes blocked by a creature, that creature's controller sacrifices it at end of combat. If the player does, he or she puts a 0/2 colorless Wall artifact creature token with defender onto the battlefield.
--- a/forge-gui/res/cardsfolder/b/battering_ram.txt
+++ b/forge-gui/res/cardsfolder/b/battering_ram.txt
@@ -4,9 +4,9 @@ Types:Artifact Creature Construct
 PT:1/1
 T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | Execute$ TrigBanding | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of combat on your turn, CARDNAME gains banding until end of combat.
 SVar:TrigBanding:AB$ Pump | Cost$ 0 | Defined$ Self | KW$ Banding | UntilEndOfCombat$ True
-T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature.Wall | DelayedTrigger$ DelayAttackTrig | TriggerDescription$ Whenever CARDNAME becomes blocked by a Wall, destroy that Wall at end of combat.
-SVar:DelayAttackTrig:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroyBlocker | TriggerDescription$ Destroy blocked creature at end of combat.
-SVar:TrigDestroyBlocker:AB$ Destroy | Cost$ 0 | Defined$ TriggeredBlocker
+T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature.Wall | Execute$ DelayAttackTrig | TriggerDescription$ Whenever CARDNAME becomes blocked by a Wall, destroy that Wall at end of combat.
+SVar:DelayAttackTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroyBlocker | RememberObjects$ TriggeredBlocker | TriggerDescription$ Destroy blocked creature at end of combat.
+SVar:TrigDestroyBlocker:DB$ Destroy | Defined$ DelayTriggerRemembered
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/battering_ram.jpg
 Oracle:At the beginning of combat on your turn, Battering Ram gains banding until end of combat. (Any creatures with banding, and up to one without, can attack in a band. Bands are blocked as a group. If any creatures with banding you control are being blocked by a creature, you divide that creature's combat damage, not its controller, among any of the creatures it's blocking.)\nWhenever Battering Ram becomes blocked by a Wall, destroy that Wall at end of combat.
--- a/forge-gui/res/cardsfolder/b/bearer_of_the_heavens.txt
+++ b/forge-gui/res/cardsfolder/b/bearer_of_the_heavens.txt
@@ -2,8 +2,8 @@ Name:Bearer of the Heavens
 ManaCost:7 R
 Types:Creature Giant
 PT:10/10
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | DelayedTrigger$ DelTrigLeaves | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, destroy all permanents at the beginning of the next end step.
-SVar:DelTrigLeaves:Mode$ Phase | Phase$ End of Turn | Execute$ TrigDestroyAll | TriggerController$ TriggeredCardController | TriggerDescription$ Destroy all permanents at the beginning of the next end step.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ DelTrigLeaves | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, destroy all permanents at the beginning of the next end step.
+SVar:DelTrigLeaves:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigDestroyAll | TriggerController$ TriggeredCardController | TriggerDescription$ Destroy all permanents at the beginning of the next end step.
 SVar:TrigDestroyAll:AB$ DestroyAll | Cost$ 0 | ValidCards$ Permanent
 SVar:Picture:http://www.wizards.com/global/images/magic/general/bearer_of_the_heavens.jpg
 Oracle:When Bearer of the Heavens dies, destroy all permanents at the beginning of the next end step.
--- a/forge-gui/res/cardsfolder/b/brood_of_cockroaches.txt
+++ b/forge-gui/res/cardsfolder/b/brood_of_cockroaches.txt
@@ -2,10 +2,10 @@ Name:Brood of Cockroaches
 ManaCost:1 B
 Types:Creature Insect
 PT:1/1
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | DelayedTrigger$ DelTrigLeaves | TriggerDescription$ When CARDNAME is put into your graveyard from the battlefield, at the beginning of the next end step, you lose 1 life and return CARDNAME to your hand.
-SVar:DelTrigLeaves:Mode$ Phase | Phase$ End of Turn | Execute$ TrigChange | TriggerDescription$ Lose 1 life and return CARDNAME to your hand.
-SVar:TrigChange:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Hand | SubAbility$ DBLoseLife
-SVar:DBLoseLife:DB$LoseLife | Defined$ You | LifeAmount$ 1
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ DelTrigLeaves | TriggerDescription$ When CARDNAME is put into your graveyard from the battlefield, at the beginning of the next end step, you lose 1 life and return CARDNAME to your hand.
+SVar:DelTrigLeaves:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ DBLoseLife | TriggerDescription$ Lose 1 life and return CARDNAME to your hand.
+SVar:DBLoseLife:DB$LoseLife | Defined$ You | LifeAmount$ 1 | SubAbility$ DBChange
+SVar:DBChange:DB$ChangeZone | Origin$ Graveyard | Destination$ Hand
 SVar:SacMe:1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/brood_of_cockroaches.jpg
 Oracle:When Brood of Cockroaches is put into your graveyard from the battlefield, at the beginning of the next end step, you lose 1 life and return Brood of Cockroaches to your hand.
--- a/forge-gui/res/cardsfolder/c/ceremonial_guard.txt
+++ b/forge-gui/res/cardsfolder/c/ceremonial_guard.txt
@@ -2,9 +2,9 @@ Name:Ceremonial Guard
 ManaCost:2 R
 Types:Creature Human Soldier
 PT:3/4
-T:Mode$ Attacks | ValidCard$ Card.Self | DelayedTrigger$ DelTrig | TriggerDescription$ Whenever CARDNAME attacks or blocks, destroy it at end of combat.
-T:Mode$ Blocks | ValidCard$ Card.Self | DelayedTrigger$ DelTrig | Secondary$ True | TriggerDescription$ Whenever CARDNAME attacks or blocks, destroy it at end of combat.
-SVar:DelTrig:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigSacrifice | TriggerDescription$ Destroy CARDNAME at end of combat.
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ DelTrig | TriggerDescription$ Whenever CARDNAME attacks or blocks, destroy it at end of combat.
+T:Mode$ Blocks | ValidCard$ Card.Self | Execute$ DelTrig | Secondary$ True | TriggerDescription$ Whenever CARDNAME attacks or blocks, destroy it at end of combat.
+SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigSacrifice | TriggerDescription$ Destroy CARDNAME at end of combat.
 SVar:TrigSacrifice:AB$Destroy | Cost$ 0 | Defined$ Self
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ceremonial_guard.jpg
 Oracle:When Ceremonial Guard attacks or blocks, destroy it at end of combat.
--- a/forge-gui/res/cardsfolder/c/cinder_wall.txt
+++ b/forge-gui/res/cardsfolder/c/cinder_wall.txt
@@ -3,8 +3,8 @@ ManaCost:R
 Types:Creature Wall
 PT:3/3
 K:Defender
-T:Mode$ Blocks | ValidCard$ Card.Self | DelayedTrigger$ DelTrig | TriggerDescription$ Whenever CARDNAME blocks, destroy it at end of combat.
-SVar:DelTrig:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | TriggerDescription$ Destroy CARDNAME at end of combat.
-SVar:TrigDestroy:AB$Destroy | Cost$ 0 | Defined$ Self
+T:Mode$ Blocks | ValidCard$ Card.Self | Execute$ DelTrig | TriggerDescription$ Whenever CARDNAME blocks, destroy it at end of combat.
+SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | TriggerDescription$ Destroy CARDNAME at end of combat.
+SVar:TrigDestroy:DB$Destroy | Defined$ Self
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cinder_wall.jpg
 Oracle:Defender\nWhen Cinder Wall blocks, destroy it at end of combat.
--- a/forge-gui/res/cardsfolder/c/clockwork_beetle.txt
+++ b/forge-gui/res/cardsfolder/c/clockwork_beetle.txt
@@ -3,9 +3,10 @@ ManaCost:1
 Types:Artifact Creature Insect
 PT:0/0
 K:etbCounter:P1P1:2
-T:Mode$ Attacks | ValidCard$ Card.Self | DelayedTrigger$ DelTrig | TriggerDescription$ Whenever CARDNAME attacks or blocks, remove a +1/+1 counter from it at end of combat.
-T:Mode$ Blocks | ValidCard$ Card.Self | DelayedTrigger$ DelTrig | Secondary$ True | TriggerDescription$ Whenever CARDNAME attacks or blocks, remove a +1/+1 counter from it at end of combat.
-SVar:DelTrig:Mode$ Phase | Phase$ EndCombat | Execute$ TrigRemoveCounter | TriggerDescription$ Remove a +1/+1 counter from CARDNAME.
-SVar:TrigRemoveCounter:AB$RemoveCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ DelTrig | TriggerDescription$ Whenever CARDNAME attacks or blocks, remove a +1/+1 counter from it at end of combat.
+T:Mode$ Blocks | ValidCard$ Card.Self | Execute$ DelTrig | Secondary$ True | TriggerDescription$ Whenever CARDNAME attacks or blocks, remove a +1/+1 counter from it at end of combat.
+SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | Execute$ TrigRemoveCounter | TriggerDescription$ Remove a +1/+1 counter from CARDNAME.
+SVar:TrigRemoveCounter:DB$RemoveCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
+DeckHas:Ability$Counters
 SVar:Picture:http://www.wizards.com/global/images/magic/general/clockwork_beetle.jpg
 Oracle:Clockwork Beetle enters the battlefield with two +1/+1 counters on it.\nWhenever Clockwork Beetle attacks or blocks, remove a +1/+1 counter from it at end of combat.
--- a/forge-gui/res/cardsfolder/c/clockwork_condor.txt
+++ b/forge-gui/res/cardsfolder/c/clockwork_condor.txt
@@ -4,9 +4,10 @@ Types:Artifact Creature Bird
 PT:0/0
 K:Flying
 K:etbCounter:P1P1:3
-T:Mode$ Attacks | ValidCard$ Card.Self | DelayedTrigger$ DelTrig | TriggerDescription$ Whenever CARDNAME attacks or blocks, remove a +1/+1 counter from it at end of combat.
-T:Mode$ Blocks | ValidCard$ Card.Self | DelayedTrigger$ DelTrig | Secondary$ True | TriggerDescription$ Whenever CARDNAME attacks or blocks, remove a +1/+1 counter from it at end of combat.
-SVar:DelTrig:Mode$ Phase | Phase$ EndCombat | Execute$ TrigRemoveCounter | TriggerDescription$ Remove a +1/+1 counter from CARDNAME.
-SVar:TrigRemoveCounter:AB$RemoveCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ DelTrig | TriggerDescription$ Whenever CARDNAME attacks or blocks, remove a +1/+1 counter from it at end of combat.
+T:Mode$ Blocks | ValidCard$ Card.Self | Execute$ DelTrig | Secondary$ True | TriggerDescription$ Whenever CARDNAME attacks or blocks, remove a +1/+1 counter from it at end of combat.
+SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | Execute$ TrigRemoveCounter | TriggerDescription$ Remove a +1/+1 counter from CARDNAME.
+SVar:TrigRemoveCounter:DB$RemoveCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
+DeckHas:Ability$Counters
 SVar:Picture:http://www.wizards.com/global/images/magic/general/clockwork_condor.jpg
 Oracle:Flying\nClockwork Condor enters the battlefield with three +1/+1 counters on it.\nWhenever Clockwork Condor attacks or blocks, remove a +1/+1 counter from it at end of combat.
--- a/forge-gui/res/cardsfolder/c/clockwork_dragon.txt
+++ b/forge-gui/res/cardsfolder/c/clockwork_dragon.txt
@@ -5,9 +5,10 @@ PT:0/0
 K:Flying
 K:etbCounter:P1P1:6
 A:AB$ PutCounter | Cost$ 3 | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Put a +1/+1 counter on CARDNAME.
-T:Mode$ Attacks | ValidCard$ Card.Self | DelayedTrigger$ DelTrig | TriggerDescription$ Whenever CARDNAME attacks or blocks, remove a +1/+1 counter from it at end of combat.
-T:Mode$ Blocks | ValidCard$ Card.Self | DelayedTrigger$ DelTrig | Secondary$ True | TriggerDescription$ Whenever CARDNAME attacks or blocks, remove a +1/+1 counter from it at end of combat.
-SVar:DelTrig:Mode$ Phase | Phase$ EndCombat | Execute$ TrigRemoveCounter | TriggerDescription$ Remove a +1/+1 counter from CARDNAME.
-SVar:TrigRemoveCounter:AB$RemoveCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ DelTrig | TriggerDescription$ Whenever CARDNAME attacks or blocks, remove a +1/+1 counter from it at end of combat.
+T:Mode$ Blocks | ValidCard$ Card.Self | Execute$ DelTrig | Secondary$ True | TriggerDescription$ Whenever CARDNAME attacks or blocks, remove a +1/+1 counter from it at end of combat.
+SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | Execute$ TrigRemoveCounter | TriggerDescription$ Remove a +1/+1 counter from CARDNAME.
+SVar:TrigRemoveCounter:DB$RemoveCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
+DeckHas:Ability$Counters
 SVar:Picture:http://www.wizards.com/global/images/magic/general/clockwork_dragon.jpg
 Oracle:Flying\nClockwork Dragon enters the battlefield with six +1/+1 counters on it.\nWhenever Clockwork Dragon attacks or blocks, remove a +1/+1 counter from it at end of combat.\n{3}: Put a +1/+1 counter on Clockwork Dragon.
--- a/forge-gui/res/cardsfolder/c/clockwork_vorrac.txt
+++ b/forge-gui/res/cardsfolder/c/clockwork_vorrac.txt
@@ -5,9 +5,10 @@ PT:0/0
 K:Trample
 K:etbCounter:P1P1:4
 A:AB$ PutCounter | Cost$ T | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Put a +1/+1 counter on CARDNAME.
-T:Mode$ Attacks | ValidCard$ Card.Self | DelayedTrigger$ DelTrig | TriggerDescription$ Whenever CARDNAME attacks or blocks, remove a +1/+1 counter from it at end of combat.
-T:Mode$ Blocks | ValidCard$ Card.Self | DelayedTrigger$ DelTrig | Secondary$ True | TriggerDescription$ Whenever CARDNAME attacks or blocks, remove a +1/+1 counter from it at end of combat.
-SVar:DelTrig:Mode$ Phase | Phase$ EndCombat | Execute$ TrigRemoveCounter | TriggerDescription$ Remove a +1/+1 counter from CARDNAME.
-SVar:TrigRemoveCounter:AB$RemoveCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ DelTrig | TriggerDescription$ Whenever CARDNAME attacks or blocks, remove a +1/+1 counter from it at end of combat.
+T:Mode$ Blocks | ValidCard$ Card.Self | Execute$ DelTrig | Secondary$ True | TriggerDescription$ Whenever CARDNAME attacks or blocks, remove a +1/+1 counter from it at end of combat.
+SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | Execute$ TrigRemoveCounter | TriggerDescription$ Remove a +1/+1 counter from CARDNAME.
+SVar:TrigRemoveCounter:DB$RemoveCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
+DeckHas:Ability$Counters
 SVar:Picture:http://www.wizards.com/global/images/magic/general/clockwork_vorrac.jpg
 Oracle:Trample\nClockwork Vorrac enters the battlefield with four +1/+1 counters on it.\nWhenever Clockwork Vorrac attacks or blocks, remove a +1/+1 counter from it at end of combat.\n{T}: Put a +1/+1 counter on Clockwork Vorrac.
--- a/forge-gui/res/cardsfolder/c/cockatrice.txt
+++ b/forge-gui/res/cardsfolder/c/cockatrice.txt
@@ -3,11 +3,10 @@ ManaCost:3 G G
 Types:Creature Cockatrice
 PT:2/4
 K:Flying
-T:Mode$ AttackerBlockedByCreature | ValidCard$ Creature.nonWall | ValidBlocker$ Card.Self | DelayedTrigger$ DelTrigBlocked | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a non-Wall creature, destroy that creature at end of combat.
-T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature.nonWall | DelayedTrigger$ DelTrigBlocker | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a non-Wall creature, destroy that creature at end of combat.
-SVar:DelTrigBlocked:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroyBlocked | TriggerDescription$ Destroy blocked creature at end of combat.
-SVar:DelTrigBlocker:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroyBlocker | TriggerDescription$ Destroy blocking creature at end of combat.
-SVar:TrigDestroyBlocked:AB$Destroy | Cost$ 0 | Defined$ TriggeredAttacker
-SVar:TrigDestroyBlocker:AB$Destroy | Cost$ 0 | Defined$ TriggeredBlocker
+T:Mode$ AttackerBlockedByCreature | ValidCard$ Creature.nonWall | ValidBlocker$ Card.Self | Execute$ DelTrigBlocked | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a non-Wall creature, destroy that creature at end of combat.
+T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature.nonWall | Execute$ DelTrigBlocker | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a non-Wall creature, destroy that creature at end of combat.
+SVar:DelTrigBlocked:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredAttacker | TriggerDescription$ Destroy blocked creature at end of combat.
+SVar:DelTrigBlocker:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredBlocker | TriggerDescription$ Destroy blocking creature at end of combat.
+SVar:TrigDestroy:DB$Destroy | Defined$ DelayTriggerRemembered
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cockatrice.jpg
 Oracle:Flying\nWhenever Cockatrice blocks or becomes blocked by a non-Wall creature, destroy that creature at end of combat.
--- a/forge-gui/res/cardsfolder/c/contempt.txt
+++ b/forge-gui/res/cardsfolder/c/contempt.txt
@@ -3,8 +3,8 @@ ManaCost:1 U
 Types:Enchantment Aura
 K:Enchant creature
 A:SP$ Attach | Cost$ 1 U | ValidTgts$ Creature | AILogic$ Curse
-T:Mode$ Attacks | ValidCard$ Card.EnchantedBy | DelayedTrigger$ DelBounce | TriggerZones$ Battlefield | TriggerDescription$ When enchanted creature attacks, return it and CARDNAME to their owners' hands at end of combat.
-SVar:DelBounce:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ BounceCritter | TriggerDescription$ Return enchanted creature and CARDNAME to their owners' hands.
+T:Mode$ Attacks | ValidCard$ Card.EnchantedBy | Execute$ DelBounce | TriggerZones$ Battlefield | TriggerDescription$ When enchanted creature attacks, return it and CARDNAME to their owners' hands at end of combat.
+SVar:DelBounce:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ BounceCritter | TriggerDescription$ Return enchanted creature and CARDNAME to their owners' hands.
 SVar:BounceCritter:DB$ ChangeZone | Defined$ Enchanted | Origin$ Battlefield | Destination$ Hand | SubAbility$ BounceSelf
 SVar:BounceSelf:DB$ ChangeZone | Defined$ Self | Origin$ Battlefield | Destination$ Hand
 SVar:NonStackingAttachEffect:True
--- a/forge-gui/res/cardsfolder/c/crumbling_colossus.txt
+++ b/forge-gui/res/cardsfolder/c/crumbling_colossus.txt
@@ -3,9 +3,9 @@ ManaCost:5
 Types:Artifact Creature Golem
 PT:7/4
 K:Trample
-T:Mode$ Attacks | ValidCard$ Card.Self | DelayedTrigger$ DelTrig | TriggerDescription$ When CARDNAME attacks, sacrifice it at end of combat.
-SVar:DelTrig:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigSacrifice | TriggerDescription$ Sacrifice CARDNAME at end of combat.
-SVar:TrigSacrifice:AB$ Sacrifice | Cost$ 0 | Defined$ Self
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ DelTrig | TriggerDescription$ When CARDNAME attacks, sacrifice it at end of combat.
+SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigSacrifice | TriggerDescription$ Sacrifice CARDNAME at end of combat.
+SVar:TrigSacrifice:DB$ Sacrifice | Defined$ Self
 SVar:SacrificeEndCombat:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/crumbling_colossus.jpg
 Oracle:Trample (If this creature would assign enough damage to its blockers to destroy them, you may have it assign the rest of its damage to defending player or planeswalker.)\nWhen Crumbling Colossus attacks, sacrifice it at end of combat.
--- a/forge-gui/res/cardsfolder/c/cunning.txt
+++ b/forge-gui/res/cardsfolder/c/cunning.txt
@@ -4,9 +4,9 @@ Types:Enchantment Aura
 K:Enchant creature
 A:SP$ Attach | Cost$ 1 U | ValidTgts$ Creature | AILogic$ Pump
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 3 | AddToughness$ 3 | Description$ Enchanted creature gets +3/+3.
-T:Mode$ Attacks | ValidCard$ Card.AttachedBy | TriggerZones$ Battlefield | DelayedTrigger$ DelayedTrig | TriggerDescription$ When enchanted creature attacks or blocks, sacrifice CARDNAME at the beginning of the next cleanup step.
-T:Mode$ Blocks | ValidCard$ Card.AttachedBy | TriggerZones$ Battlefield| DelayedTrigger$ DelayedTrig | Secondary$ True | TriggerDescription$ When enchanted creature attacks or blocks, sacrifice CARDNAME at the beginning of the next cleanup step.
-SVar:DelayedTrig:Mode$ Phase | Phase$ Cleanup | ValidPlayer$ Player | Execute$ TrigSac | TriggerDescription$ Sacrifice CARDNAME.
-SVar:TrigSac:AB$Sacrifice | Cost$ 0 | Defined$ Self
+T:Mode$ Attacks | ValidCard$ Card.AttachedBy | TriggerZones$ Battlefield | Execute$ DelayedTrig | TriggerDescription$ When enchanted creature attacks or blocks, sacrifice CARDNAME at the beginning of the next cleanup step.
+T:Mode$ Blocks | ValidCard$ Card.AttachedBy | TriggerZones$ Battlefield| Execute$ DelayedTrig | Secondary$ True | TriggerDescription$ When enchanted creature attacks or blocks, sacrifice CARDNAME at the beginning of the next cleanup step.
+SVar:DelayedTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ Cleanup | ValidPlayer$ Player | Execute$ TrigSac | TriggerDescription$ Sacrifice CARDNAME.
+SVar:TrigSac:DB$Sacrifice | Defined$ Self
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cunning.jpg
 Oracle:Enchant creature\nEnchanted creature gets +3/+3.\nWhen enchanted creature attacks or blocks, sacrifice Cunning at the beginning of the next cleanup step.
--- a/forge-gui/res/cardsfolder/d/daretti_scrap_savant.txt
+++ b/forge-gui/res/cardsfolder/d/daretti_scrap_savant.txt
@@ -10,9 +10,9 @@ SVar:X:Remembered$Amount
 A:AB$ Sacrifice | Cost$ SubCounter<2/LOYALTY> | SacValid$ Artifact | RememberSacrificed$ True | StackDescription$ SpellDescription | Planeswalker$ True | SubAbility$ DBChangeZone | SpellDescription$ Sacrifice an artifact. If you do, return target artifact card from your graveyard to the battlefield.
 SVar:DBChangeZone:DB$ ChangeZone | ValidTgts$ Artifact.YouCtrl | TgtPrompt$ Select target artifact card in your graveyard | Origin$ Graveyard | Destination$ Battlefield | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1 | References$ X | StackDescription$ None | SubAbility$ DBCleanup
 A:AB$ Effect | Cost$ SubCounter<10/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Daretti, Scrap Savant emblem | Image$ daretti_scrap_savant_emblem | Stackable$ False | Triggers$ TrigChangesZone | SVars$ DelTrigReturn,DBReturn | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "Whenever an artifact is put into your graveyard from the battlefield, return that card to the battlefield at the beginning of the next end step."
-SVar:TrigChangesZone:Mode$ ChangesZone | ValidCard$ Artifact.YouOwn | Origin$ Battlefield | Destination$ Graveyard | DelayedTrigger$ DelTrigReturn | TriggerZones$ Command | TriggerDescription$ Whenever an artifact is put into your graveyard from the battlefield, return that card to the battlefield at the beginning of the next end step.
-SVar:DelTrigReturn:Mode$ Phase | Phase$ End Of Turn | Execute$ DBReturn | TriggerDescription$ Return that card to the battlefield at the beginning of the next end step.
-SVar:DBReturn:DB$ ChangeZone | Defined$ TriggeredCard | Origin$ Graveyard | Destination$ Battlefield
+SVar:TrigChangesZone:Mode$ ChangesZone | ValidCard$ Artifact.YouOwn | Origin$ Battlefield | Destination$ Graveyard | Execute$ DelTrigReturn | TriggerZones$ Command | TriggerDescription$ Whenever an artifact is put into your graveyard from the battlefield, return that card to the battlefield at the beginning of the next end step.
+SVar:DelTrigReturn:DB$ DelayedTrigger | Mode$ Phase | Phase$ End Of Turn | Execute$ DBReturn | RememberObjects$ TriggeredCard | TriggerDescription$ Return that card to the battlefield at the beginning of the next end step.
+SVar:DBReturn:DB$ ChangeZone | Defined$ DelayTriggerRemembered | Origin$ Graveyard | Destination$ Battlefield
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/daretti_scrap_savant.jpg
 Oracle:[+2] Discard up to two cards, then draw that many cards.\n[-2] Sacrifice an artifact. If you do, return target artifact card from your graveyard to the battlefield.\n[-10] You get an emblem with "Whenever an artifact is put into your graveyard from the battlefield, return that card to the battlefield at the beginning of the next end step."\nDaretti, Scrap Savant can be your commander.
--- a/forge-gui/res/cardsfolder/d/deathgazer.txt
+++ b/forge-gui/res/cardsfolder/d/deathgazer.txt
@@ -2,11 +2,10 @@ Name:Deathgazer
 ManaCost:3 B
 Types:Creature Lizard
 PT:2/2
-T:Mode$ AttackerBlockedByCreature | ValidCard$ Creature.nonBlack | ValidBlocker$ Card.Self | DelayedTrigger$ DelTrigBlocked | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a nonblack creature, destroy that creature at end of combat.
-T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature.nonBlack | DelayedTrigger$ DelTrigBlocker | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a nonblack creature, destroy that creature at end of combat.
-SVar:DelTrigBlocked:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroyBlocked | TriggerDescription$ Destroy blocked creature at end of combat.
-SVar:DelTrigBlocker:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroyBlocker | TriggerDescription$ Destroy blocking creature at end of combat.
-SVar:TrigDestroyBlocked:AB$Destroy | Cost$ 0 | Defined$ TriggeredAttacker
-SVar:TrigDestroyBlocker:AB$Destroy | Cost$ 0 | Defined$ TriggeredBlocker
+T:Mode$ AttackerBlockedByCreature | ValidCard$ Creature.nonBlack | ValidBlocker$ Card.Self | Execute$ DelTrigBlocked | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a nonblack creature, destroy that creature at end of combat.
+T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature.nonBlack | Execute$ DelTrigBlocker | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a nonblack creature, destroy that creature at end of combat.
+SVar:DelTrigBlocked:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredAttacker | TriggerDescription$ Destroy blocked creature at end of combat.
+SVar:DelTrigBlocker:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredBlocker | TriggerDescription$ Destroy blocking creature at end of combat.
+SVar:TrigDestroy:DB$Destroy | Defined$ DelayTriggerRemembered
 SVar:Picture:http://www.wizards.com/global/images/magic/general/deathgazer.jpg
 Oracle:Whenever Deathgazer blocks or becomes blocked by a nonblack creature, destroy that creature at end of combat.
--- a/forge-gui/res/cardsfolder/d/defiant_vanguard.txt
+++ b/forge-gui/res/cardsfolder/d/defiant_vanguard.txt
@@ -3,8 +3,8 @@ ManaCost:2 W
 Types:Creature Human Rebel
 PT:2/2
 A:AB$ ChangeZone | Cost$ 5 T | Origin$ Library | Destination$ Battlefield | ChangeType$ Permanent.Rebel+cmcLE4 | ChangeNum$ 1 | SpellDescription$ Search your library for a Rebel permanent card with converted mana cost 4 or less and put it onto the battlefield. Then shuffle your library.
-T:Mode$ Blocks | ValidCard$ Card.Self | DelayedTrigger$ DelTrig | TriggerDescription$ When CARDNAME blocks, at end of combat, destroy it and all creatures it blocked this turn.
-SVar:DelTrig:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | TriggerDescription$ Destroy CARDNAME at end of combat.
+T:Mode$ Blocks | ValidCard$ Card.Self | Execute$ DelTrig | TriggerDescription$ When CARDNAME blocks, at end of combat, destroy it and all creatures it blocked this turn.
+SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | TriggerDescription$ Destroy CARDNAME at end of combat.
 SVar:TrigDestroy:AB$ DestroyAll | Cost$ 0 | ValidCards$ Card.Self,Card.blockedBySourceThisTurn
 SVar:Picture:http://www.wizards.com/global/images/magic/general/defiant_vanguard.jpg
 Oracle:When Defiant Vanguard blocks, at end of combat, destroy it and all creatures it blocked this turn.\n{5}, {T}: Search your library for a Rebel permanent card with converted mana cost 4 or less and put it onto the battlefield. Then shuffle your library.
--- a/forge-gui/res/cardsfolder/d/dread_specter.txt
+++ b/forge-gui/res/cardsfolder/d/dread_specter.txt
@@ -2,11 +2,10 @@ Name:Dread Specter
 ManaCost:3 B
 Types:Creature Specter
 PT:2/2
-T:Mode$ AttackerBlockedByCreature | ValidCard$ Creature.nonBlack | ValidBlocker$ Card.Self | DelayedTrigger$ DelTrigBlocked | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a nonblack creature, destroy that creature at end of combat.
-T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature.nonBlack | DelayedTrigger$ DelTrigBlocker | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a nonblack creature, destroy that creature at end of combat.
-SVar:DelTrigBlocked:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroyBlocked | TriggerDescription$ Destroy blocked creature at end of combat.
-SVar:DelTrigBlocker:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroyBlocker | TriggerDescription$ Destroy blocking creature at end of combat.
-SVar:TrigDestroyBlocked:AB$Destroy | Cost$ 0 | Defined$ TriggeredAttacker
-SVar:TrigDestroyBlocker:AB$Destroy | Cost$ 0 | Defined$ TriggeredBlocker
+T:Mode$ AttackerBlockedByCreature | ValidCard$ Creature.nonBlack | ValidBlocker$ Card.Self | Execute$ DelTrigBlocked | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a nonblack creature, destroy that creature at end of combat.
+T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature.nonBlack | Execute$ DelTrigBlocker | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a nonblack creature, destroy that creature at end of combat.
+SVar:DelTrigBlocked:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredAttacker | TriggerDescription$ Destroy blocked creature at end of combat.
+SVar:DelTrigBlocker:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredBlocker | TriggerDescription$ Destroy blocking creature at end of combat.
+SVar:TrigDestroy:DB$Destroy | Defined$ DelayTriggerRemembered
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dread_specter.jpg
 Oracle:Whenever Dread Specter blocks or becomes blocked by a nonblack creature, destroy that creature at end of combat.
--- a/forge-gui/res/cardsfolder/d/dread_wight.txt
+++ b/forge-gui/res/cardsfolder/d/dread_wight.txt
@@ -2,17 +2,19 @@ Name:Dread Wight
 ManaCost:3 B B
 Types:Creature Zombie
 PT:3/4
-T:Mode$ AttackerBlocked | ValidCard$ Creature | ValidBlocker$ Card.Self | DelayedTrigger$ DelTrigBlocked | TriggerDescription$At end of combat, put a paralyzation counter on each creature blocking or blocked by CARDNAME and tap those creatures. Each of those creatures doesn't untap during its controller's untap step for as long as it has a paralyzation counter on it. Each of those creatures gains "{4}: Remove a paralyzation counter from this creature."
-T:Mode$ Blocks | ValidCard$ Creature | ValidBlocked$ Card.Self | DelayedTrigger$ DelTrigBlocker | Secondary$ True | TriggerDescription$ At end of combat, put a paralyzation counter on each creature blocking or blocked by CARDNAME and tap those creatures. Each of those creatures doesn't untap during its controller's untap step for as long as it has a paralyzation counter on it. Each of those creatures gains "{4}: Remove a paralyzation counter from this creature."
-SVar:DelTrigBlocked:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Opponent | Execute$ TrigCounterBlocked | TriggerDescription$ At the end of combat, put a paralyzation counter on creature
-SVar:DelTrigBlocker:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ You | Execute$ TrigCounterBlocker | TriggerDescription$ At the end of combat, put a paralyzation counter on creature
-SVar:TrigCounterBlocked:AB$ PutCounter | Cost$ 0 | CounterType$ PARALYZATION | CounterNum$ 1 | Defined$ TriggeredAttacker | SubAbility$ DBTapBlocked | SpellDescription$ Put paralyzation counter on creature
-SVar:TrigCounterBlocker:AB$ PutCounter | Cost$ 0 | CounterType$ PARALYZATION | CounterNum$ 1 | Defined$ TriggeredBlocker | SubAbility$ DBTapBlocker | SpellDescription$ Put paralyzation counter on creature
-SVar:DBTapBlocked:DB$ Tap | Defined$ TriggeredAttacker | SpellDescription$ Tap creature | SubAbility$ DBAnimateAttacker
-SVar:DBTapBlocker:DB$ Tap | Defined$ TriggeredBlocker | SpellDescription$ Tap creature | SubAbility$ DBAnimateBlocker
-SVar:DBAnimateAttacker:DB$ Animate | Defined$ TriggeredAttacker | staticAbilities$ Static | Abilities$ ABRemoveCounter | Permanent$ True
-SVar:DBAnimateBlocker:DB$ Animate | Defined$ TriggeredBlocker | staticAbilities$ Static | Abilities$ ABRemoveCounter | Permanent$ True
+T:Mode$ AttackerBlocked | ValidCard$ Creature | ValidBlocker$ Card.Self | Execute$ DelTrigBlocked | TriggerDescription$ At end of combat, put a paralyzation counter on each creature blocking or blocked by CARDNAME and tap those creatures. Each of those creatures doesn't untap during its controller's untap step for as long as it has a paralyzation counter on it. Each of those creatures gains "{4}: Remove a paralyzation counter from this creature."
+T:Mode$ Blocks | ValidCard$ Creature | ValidBlocked$ Card.Self | Execute$ DelTrigBlocker | Secondary$ True | TriggerDescription$ At end of combat, put a paralyzation counter on each creature blocking or blocked by CARDNAME and tap those creatures. Each of those creatures doesn't untap during its controller's untap step for as long as it has a paralyzation counter on it. Each of those creatures gains "{4}: Remove a paralyzation counter from this creature."
+SVar:DelTrigBlocked:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Opponent | Execute$ TrigCounter | RememberObjects$ TriggeredAttacker | TriggerDescription$ At the end of combat, put a paralyzation counter on creature
+SVar:DelTrigBlocker:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ You | Execute$ TrigCounter | RememberObjects$ TriggeredBlocker | TriggerDescription$ At the end of combat, put a paralyzation counter on creature
+
+SVar:TrigCounter:DB$ PutCounter | CounterType$ PARALYZATION | CounterNum$ 1 | Defined$ DelayTriggerRemembered | SubAbility$ DBTap | SpellDescription$ Put paralyzation counter on creature
+
+SVar:DBTap:DB$ Tap | Defined$ DelayTriggerRemembered | SpellDescription$ Tap creature | SubAbility$ DBAnimate
+
+SVar:DBAnimate:DB$ Animate | Defined$ DelayTriggerRemembered | staticAbilities$ Static | Abilities$ ABRemoveCounter | Permanent$ True
+
 SVar:ABRemoveCounter:AB$ RemoveCounter | Defined$ Self | Cost$ 4 | CounterType$ PARALYZATION | CounterNum$ 1 | SpellDescription$ Remove a paralyzation counter from this creature.
 SVar:Static:Mode$ Continuous | Affected$ Card.Self+counters_GE1_PARALYZATION | AddHiddenKeyword$ CARDNAME doesn't untap during your untap step. | AffectedZone$ Battlefield
+
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dread_wight.jpg
 Oracle:At end of combat, put a paralyzation counter on each creature blocking or blocked by Dread Wight and tap those creatures. Each of those creatures doesn't untap during its controller's untap step for as long as it has a paralyzation counter on it. Each of those creatures gains "{4}: Remove a paralyzation counter from this creature."
--- a/forge-gui/res/cardsfolder/f/fickle_efreet.txt
+++ b/forge-gui/res/cardsfolder/f/fickle_efreet.txt
@@ -2,9 +2,9 @@ Name:Fickle Efreet
 ManaCost:3 R
 Types:Creature Efreet
 PT:5/2
-T:Mode$ Blocks | ValidCard$ Card.Self | TriggerZones$ Battlefield | DelayedTrigger$ DelayTrig | TriggerDescription$ Whenever CARDNAME attacks or blocks, flip a coin at end of combat. If you lose the flip, an opponent gains control of CARDNAME.
-T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | DelayedTrigger$ DelayTrig | Secondary$ True | TriggerDescription$ Whenever CARDNAME attacks or blocks, flip a coin at end of combat. If you lose the flip, an opponent gains control of CARDNAME.
-SVar:DelayTrig:Mode$ Phase | Phase$ EndCombat | Execute$ TrigFlip | TriggerDescription$ flip a coin at end of combat. If you lose the flip, an opponent gains control of CARDNAME.
+T:Mode$ Blocks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ DelayTrig | TriggerDescription$ Whenever CARDNAME attacks or blocks, flip a coin at end of combat. If you lose the flip, an opponent gains control of CARDNAME.
+T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ DelayTrig | Secondary$ True | TriggerDescription$ Whenever CARDNAME attacks or blocks, flip a coin at end of combat. If you lose the flip, an opponent gains control of CARDNAME.
+SVar:DelayTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | Execute$ TrigFlip | TriggerDescription$ flip a coin at end of combat. If you lose the flip, an opponent gains control of CARDNAME.
 SVar:TrigFlip:AB$ FlipACoin | Cost$ 0 | LoseSubAbility$ DBGiveControl
 SVar:DBGiveControl:DB$ GainControl | Cost$ 0 | Defined$ Self | NewController$ Opponent | Permanent$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/fickle_efreet.jpg
--- a/forge-gui/res/cardsfolder/f/foe_razer_regent.txt
+++ b/forge-gui/res/cardsfolder/f/foe_razer_regent.txt
@@ -5,9 +5,9 @@ PT:4/5
 K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigFight | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, you may have it fight target creature you don't control.
 SVar:TrigFight:AB$ Fight | Cost$ 0 | Defined$ TriggeredCard | ValidTgts$ Creature.YouDontCtrl | TgtPrompt$ Choose target creature you don't control
-T:Mode$ Fight | ValidCard$ Creature.YouCtrl | TriggerZones$ Battlefield | DelayedTrigger$ DelTrigPutCounter | TriggerDescription$ Whenever a creature you control fights, put two +1/+1 counters on it at the beginning of the next end step.
-SVar:DelTrigPutCounter:Mode$ Phase | Phase$ End of Turn | Execute$ TrigPutCounter | TriggerDescription$ Put two +1/+1 counters on it at the beginning of the next end step.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ TriggeredFighter | CounterType$ P1P1 | CounterNum$ 2
+T:Mode$ Fight | ValidCard$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ DelTrigPutCounter | TriggerDescription$ Whenever a creature you control fights, put two +1/+1 counters on it at the beginning of the next end step.
+SVar:DelTrigPutCounter:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigPutCounter | RememberObjects$ TriggeredFighter | TriggerDescription$ Put two +1/+1 counters on it at the beginning of the next end step.
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ DelayTriggerRemembered | CounterType$ P1P1 | CounterNum$ 2
 DeckHas:Ability$Counters
 SVar:Picture:http://www.wizards.com/global/images/magic/general/foe_razer_regent.jpg
 Oracle:Flying\nWhen Foe-Razer Regent enters the battlefield, you may have it fight target creature you don't control.\nWhenever a creature you control fights, put two +1/+1 counters on it at the beginning of the next end step.
--- a/forge-gui/res/cardsfolder/f/fog_elemental.txt
+++ b/forge-gui/res/cardsfolder/f/fog_elemental.txt
@@ -3,10 +3,10 @@ ManaCost:2 U
 Types:Creature Elemental
 PT:4/4
 K:Flying
-T:Mode$ Attacks | ValidCard$ Card.Self | DelayedTrigger$ DelTrig | TriggerDescription$ Whenever CARDNAME attacks or blocks, sacrifice it at end of combat.
-T:Mode$ Blocks | ValidCard$ Card.Self | DelayedTrigger$ DelTrig | Secondary$ True | TriggerDescription$ Whenever CARDNAME attacks or blocks, sacrifice it at end of combat.
-SVar:DelTrig:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigSacrifice | TriggerDescription$ Sacrifice CARDNAME at end of combat.
-SVar:TrigSacrifice:AB$Sacrifice | Cost$ 0 | Defined$ Self
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ DelTrig | TriggerDescription$ Whenever CARDNAME attacks or blocks, sacrifice it at end of combat.
+T:Mode$ Blocks | ValidCard$ Card.Self | Execute$ DelTrig | Secondary$ True | TriggerDescription$ Whenever CARDNAME attacks or blocks, sacrifice it at end of combat.
+SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigSacrifice | TriggerDescription$ Sacrifice CARDNAME at end of combat.
+SVar:TrigSacrifice:DB$Sacrifice | Defined$ Self
 SVar:SacrificeEndCombat:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/fog_elemental.jpg
 Oracle:Flying (This creature can't be blocked except by creatures with flying or reach.)\nWhen Fog Elemental attacks or blocks, sacrifice it at end of combat.
--- a/forge-gui/res/cardsfolder/f/frostweb_spider.txt
+++ b/forge-gui/res/cardsfolder/f/frostweb_spider.txt
@@ -3,8 +3,9 @@ ManaCost:2 G
 Types:Snow Creature Spider
 PT:1/3
 K:Reach
-T:Mode$ AttackerBlocked | ValidCard$ Creature.withFlying | ValidBlocker$ Card.Self  | DelayedTrigger$ DelayedTrig | TriggerDescription$ Whenever CARDNAME blocks a creature with flying, put a +1/+1 counter on CARDNAME at end of combat.
-SVar:DelayedTrig:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigPutCounter | TriggerDescription$ Put a +1/+1 counter on CARDNAME.
-SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
+T:Mode$ AttackerBlocked | ValidCard$ Creature.withFlying | ValidBlocker$ Card.Self  | Execute$ DelayedTrig | TriggerDescription$ Whenever CARDNAME blocks a creature with flying, put a +1/+1 counter on CARDNAME at end of combat.
+SVar:DelayedTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigPutCounter | TriggerDescription$ Put a +1/+1 counter on CARDNAME.
+SVar:TrigPutCounter:DB$PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
+DeckHas:Ability$Counters
 SVar:Picture:http://resources.wizards.com/magic/cards/csp/en-us/card121197.jpg
 Oracle:Reach (This creature can block creatures with flying.)\nWhenever Frostweb Spider blocks a creature with flying, put a +1/+1 counter on Frostweb Spider at end of combat.
--- a/forge-gui/res/cardsfolder/g/gorgon_recluse.txt
+++ b/forge-gui/res/cardsfolder/g/gorgon_recluse.txt
@@ -2,12 +2,11 @@ Name:Gorgon Recluse
 ManaCost:3 B B
 Types:Creature Gorgon
 PT:2/4
-T:Mode$ AttackerBlockedByCreature | ValidCard$ Creature.nonBlack | ValidBlocker$ Card.Self | DelayedTrigger$ DelTrigBlocked | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a nonblack creature, destroy that creature at end of combat.
-T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature.nonBlack | DelayedTrigger$ DelTrigBlocker | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a nonblack creature, destroy that creature at end of combat.
-SVar:DelTrigBlocked:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroyBlocked | TriggerDescription$ Destroy blocked creature at end of combat.
-SVar:DelTrigBlocker:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroyBlocker | TriggerDescription$ Destroy blocking creature at end of combat.
-SVar:TrigDestroyBlocked:AB$Destroy | Cost$ 0 | Defined$ TriggeredAttackerLKICopy
-SVar:TrigDestroyBlocker:AB$Destroy | Cost$ 0 | Defined$ TriggeredBlockerLKICopy
+T:Mode$ AttackerBlockedByCreature | ValidCard$ Creature.nonBlack | ValidBlocker$ Card.Self | Execute$ DelTrigBlocked | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a nonblack creature, destroy that creature at end of combat.
+T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature.nonBlack | Execute$ DelTrigBlocker | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a nonblack creature, destroy that creature at end of combat.
+SVar:DelTrigBlocked:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredAttacker | TriggerDescription$ Destroy blocked creature at end of combat.
+SVar:DelTrigBlocker:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredBlocker | TriggerDescription$ Destroy blocking creature at end of combat.
+SVar:TrigDestroy:DB$Destroy | Defined$ DelayTriggerRemembered
 K:Madness:B B
 SVar:Picture:http://www.wizards.com/global/images/magic/general/gorgon_recluse.jpg
 Oracle:Whenever Gorgon Recluse blocks or becomes blocked by a nonblack creature, destroy that creature at end of combat.\nMadness {B}{B} (If you discard this card, you may cast it for its madness cost instead of putting it into your graveyard.)
--- a/forge-gui/res/cardsfolder/h/hazezon_tamar.txt
+++ b/forge-gui/res/cardsfolder/h/hazezon_tamar.txt
@@ -2,11 +2,11 @@ Name:Hazezon Tamar
 ManaCost:4 R G W
 Types:Legendary Creature Human Warrior
 PT:2/4
-T:Mode$ ChangesZone | ValidCard$ Creature.Self | Origin$ Any | Destination$ Battlefield | DelayedTrigger$ DelTrig | TriggerDescription$ When CARDNAME enters the battlefield, put X 1/1 Sand Warrior tokens that are green, red, and white onto the battlefield at the beginning of your next upkeep, where X is the number of lands you control at that time.
-SVar:DelTrig: Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigTokens | TriggerController$ TriggeredCardController | TriggerDescription$ Create a 1/1 GRW Sand Warrior token for each land you control.
-SVar:TrigTokens:AB$ Token | Cost$ 0 | TokenAmount$ X | TokenName$ Sand Warrior | TokenTypes$ Creature,Sand,Warrior | TokenOwner$ TriggeredCardController | TokenColors$ Green,Red,White | TokenPower$ 1 | TokenToughness$ 1 | References$ X
+T:Mode$ ChangesZone | ValidCard$ Creature.Self | Origin$ Any | Destination$ Battlefield | Execute$ DelTrig | TriggerDescription$ When CARDNAME enters the battlefield, create X 1/1 Sand Warrior creature tokens that are red, green, and white at the beginning of your next upkeep, where X is the number of lands you control at that time.
+SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigTokens | TriggerController$ TriggeredCardController |  RememberObjects$ TriggeredCardController | TriggerDescription$ Create a 1/1 Sand Warrior creature token that are red, green, and white for each land you control.
+SVar:TrigTokens:DB$ Token | TokenAmount$ X | TokenName$ Sand Warrior | TokenTypes$ Creature,Sand,Warrior | TokenOwner$ DelayTriggerRemembered | TokenColors$ Green,Red,White | TokenPower$ 1 | TokenToughness$ 1 | References$ X
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Any | Execute$ TrigExile | TriggerDescription$ When Hazezon leaves the battlefield, exile all Sand Warriors.
 SVar:TrigExile:AB$ ChangeZoneAll | Cost$ 0 | Origin$ Battlefield | Destination$ Exile | ChangeType$ Sand.Warrior
 SVar:X:Count$Valid Land.YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hazezon_tamar.jpg
-Oracle:When Hazezon Tamar enters the battlefield, put X 1/1 Sand Warrior creature tokens that are red, green, and white onto the battlefield at the beginning of your next upkeep, where X is the number of lands you control at that time.\nWhen Hazezon leaves the battlefield, exile all Sand Warriors.
+Oracle:When Hazezon Tamar enters the battlefield, create X 1/1 Sand Warrior creature tokens that are red, green, and white at the beginning of your next upkeep, where X is the number of lands you control at that time.\nWhen Hazezon leaves the battlefield, exile all Sand Warriors.
--- a/forge-gui/res/cardsfolder/i/infernal_medusa.txt
+++ b/forge-gui/res/cardsfolder/i/infernal_medusa.txt
@@ -2,11 +2,10 @@ Name:Infernal Medusa
 ManaCost:3 B B
 Types:Creature Gorgon
 PT:2/4
-T:Mode$ AttackerBlockedByCreature | ValidCard$ Creature | ValidBlocker$ Card.Self | DelayedTrigger$ DelTrigBlocked | TriggerDescription$ Whenever CARDNAME blocks a creature, destroy that creature at end of combat.
-T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature.nonWall | DelayedTrigger$ DelTrigBlocker | TriggerDescription$ Whenever CARDNAME becomes blocked by a non-Wall creature, destroy that creature at end of combat.
-SVar:DelTrigBlocked:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroyBlocked | TriggerDescription$ Destroy blocked creature at end of combat.
-SVar:DelTrigBlocker:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroyBlocker | TriggerDescription$ Destroy blocking creature at end of combat.
-SVar:TrigDestroyBlocked:AB$Destroy | Cost$ 0 | Defined$ TriggeredAttacker
-SVar:TrigDestroyBlocker:AB$Destroy | Cost$ 0 | Defined$ TriggeredBlocker
+T:Mode$ AttackerBlockedByCreature | ValidCard$ Creature | ValidBlocker$ Card.Self | Execute$ DelTrigBlocked | TriggerDescription$ Whenever CARDNAME blocks a creature, destroy that creature at end of combat.
+T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature.nonWall | Execute$ DelTrigBlocker | TriggerDescription$ Whenever CARDNAME becomes blocked by a non-Wall creature, destroy that creature at end of combat.
+SVar:DelTrigBlocked:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredAttacker | TriggerDescription$ Destroy blocked creature at end of combat.
+SVar:DelTrigBlocker:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredBlocker | TriggerDescription$ Destroy blocking creature at end of combat.
+SVar:TrigDestroy:DB$Destroy | Defined$ DelayTriggerRemembered
 SVar:Picture:http://www.wizards.com/global/images/magic/general/infernal_medusa.jpg
 Oracle:Whenever Infernal Medusa blocks a creature, destroy that creature at end of combat.\nWhenever Infernal Medusa becomes blocked by a non-Wall creature, destroy that creature at end of combat.
--- a/forge-gui/res/cardsfolder/i/infinite_authority.txt
+++ b/forge-gui/res/cardsfolder/i/infinite_authority.txt
@@ -3,15 +3,22 @@ ManaCost:W W W
 Types:Enchantment Aura
 K:Enchant creature
 A:SP$ Attach | Cost$ W W W | ValidTgts$ Creature | AILogic$ Pump
-T:Mode$ AttackerBlockedByCreature | ValidCard$ Creature.EnchantedBy | ValidBlocker$ Creature.toughnessLE3 | DelayedTrigger$ DelTrigBlocker | TriggerZones$ Battlefield | TriggerDescription$ Whenever enchanted creature blocks or becomes blocked by a creature with toughness 3 or less, destroy the other creature at end of combat. At the beginning of the next end step, if that creature was destroyed this way, put a +1/+1 counter on the first creature.
-T:Mode$ AttackerBlockedByCreature | ValidCard$ Creature.toughnessLE3 | ValidBlocker$ Creature.EnchantedBy | DelayedTrigger$ DelTrigBlocked | Secondary$ True | TriggerZones$ Battlefield | TriggerDescription$ Whenever enchanted creature blocks or becomes blocked by a creature with toughness 3 or less, destroy the other creature at end of combat. At the beginning of the next end step, if that creature was destroyed this way, put a +1/+1 counter on the first creature.
-SVar:DelTrigBlocked:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroyBlocked | TriggerDescription$ Destroy blocked creature at end of combat.
-SVar:DelTrigBlocker:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroyBlocker | TriggerDescription$ Destroy blocking creature at end of combat.
+
+T:Mode$ AttackerBlockedByCreature | ValidCard$ Creature.EnchantedBy | ValidBlocker$ Creature.toughnessLE3 | Execute$ DelTrigBlocker | TriggerZones$ Battlefield | TriggerDescription$ Whenever enchanted creature blocks or becomes blocked by a creature with toughness 3 or less, destroy the other creature at end of combat. At the beginning of the next end step, if that creature was destroyed this way, put a +1/+1 counter on the first creature.
+T:Mode$ AttackerBlockedByCreature | ValidCard$ Creature.toughnessLE3 | ValidBlocker$ Creature.EnchantedBy | Execute$ DelTrigBlocked | Secondary$ True | TriggerZones$ Battlefield | TriggerDescription$ Whenever enchanted creature blocks or becomes blocked by a creature with toughness 3 or less, destroy the other creature at end of combat. At the beginning of the next end step, if that creature was destroyed this way, put a +1/+1 counter on the first creature.
+
+SVar:DelTrigBlocked:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroyBlocked | CopyTriggeringObjects$ True | TriggerDescription$ Destroy blocked creature at end of combat.
+SVar:DelTrigBlocker:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroyBlocker | CopyTriggeringObjects$ True | TriggerDescription$ Destroy blocking creature at end of combat.
+
 SVar:TrigDestroyBlocked:AB$ Destroy | Cost$ 0 | Defined$ TriggeredAttacker | RememberDestroyed$ True | SubAbility$ DBDelTrigAttacker
-SVar:DBDelTrigAttacker:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ DBPutCounter | RememberObjects$ TriggeredBlocker | TriggerDescription$ At the beginning of the next end step, if that creature was destroyed this way, put a +1/+1 counter on the first creature. | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ GE1 | SubAbility$ DBCleanup
-SVar:DBPutCounter:DB$ PutCounter | Defined$ DelayTriggerRemembered | CounterType$ P1P1 | CounterNum$ 1
 SVar:TrigDestroyBlocker:AB$ Destroy | Cost$ 0 | Defined$ TriggeredBlocker | RememberDestroyed$ True | SubAbility$ DBDelTrigBlocker
+
+SVar:DBDelTrigAttacker:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ DBPutCounter | RememberObjects$ TriggeredBlocker | TriggerDescription$ At the beginning of the next end step, if that creature was destroyed this way, put a +1/+1 counter on the first creature. | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ GE1 | SubAbility$ DBCleanup
+
 SVar:DBDelTrigBlocker:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ DBPutCounter | RememberObjects$ TriggeredAttacker | TriggerDescription$ At the beginning of the next end step, if that creature was destroyed this way, put a +1/+1 counter on the first creature. | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ GE1 | SubAbility$ DBCleanup
+
+SVar:DBPutCounter:DB$ PutCounter | Defined$ DelayTriggerRemembered | CounterType$ P1P1 | CounterNum$ 1
+
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/infinite_authority.jpg
 Oracle:Enchant creature\nWhenever enchanted creature blocks or becomes blocked by a creature with toughness 3 or less, destroy the other creature at end of combat. At the beginning of the next end step, if that creature was destroyed this way, put a +1/+1 counter on the first creature.
--- a/forge-gui/res/cardsfolder/k/kaijin_of_the_vanishing_touch.txt
+++ b/forge-gui/res/cardsfolder/k/kaijin_of_the_vanishing_touch.txt
@@ -3,9 +3,9 @@ ManaCost:1 U
 Types:Creature Spirit
 PT:0/3
 K:Defender
-T:Mode$ AttackerBlocked | ValidCard$ Creature | ValidBlocker$ Card.Self | DelayedTrigger$ DelayedTrig | TriggerDescription$ Whenever CARDNAME blocks a creature, return that creature to its owner's hand at end of combat.
-SVar:DelayedTrig:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigBounce | TriggerDescription$ Return blocked creature to its owner's hand at end of combat.
-SVar:TrigBounce:AB$ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Hand | Defined$ TriggeredAttacker
+T:Mode$ AttackerBlocked | ValidCard$ Creature | ValidBlocker$ Card.Self | Execute$ DelayedTrig | TriggerDescription$ Whenever CARDNAME blocks a creature, return that creature to its owner's hand at end of combat.
+SVar:DelayedTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigBounce | RememberObjects$ TriggeredAttacker | TriggerDescription$ Return blocked creature to its owner's hand at end of combat.
+SVar:TrigBounce:DB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Defined$ DelayTriggerRemembered
 SVar:HasBlockEffect:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kaijin_of_the_vanishing_touch.jpg
 Oracle:Defender (This creature can't attack.)\nWhenever Kaijin of the Vanishing Touch blocks a creature, return that creature to its owner's hand at end of combat. (Return it only if it's on the battlefield.)
--- a/forge-gui/res/cardsfolder/k/keldon_battlewagon.txt
+++ b/forge-gui/res/cardsfolder/k/keldon_battlewagon.txt
@@ -4,9 +4,9 @@ Types:Artifact Creature Juggernaut
 PT:0/3
 K:Trample
 K:CARDNAME can't block.
-T:Mode$ Attacks | ValidCard$ Card.Self | DelayedTrigger$ DelTrig | TriggerDescription$ When CARDNAME attacks, sacrifice it at end of combat.
-SVar:DelTrig:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigSacrifice | TriggerDescription$ Sacrifice CARDNAME at end of combat.
-SVar:TrigSacrifice:AB$Sacrifice | Cost$ 0 | Defined$ Self
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ DelTrig | TriggerDescription$ When CARDNAME attacks, sacrifice it at end of combat.
+SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigSacrifice | TriggerDescription$ Sacrifice CARDNAME at end of combat.
+SVar:TrigSacrifice:DB$Sacrifice | Defined$ Self
 SVar:SacrificeEndCombat:True
 A:AB$ Pump | Cost$ tapXType<1/Creature> | NumAtt$ +X | References$ X | SpellDescription$ CARDNAME gets +X/+0 until end of turn, where X is the power of the creature tapped this way.
 SVar:X:Tapped$CardPower
--- a/forge-gui/res/cardsfolder/l/liliana_heretical_healer.txt
+++ b/forge-gui/res/cardsfolder/l/liliana_heretical_healer.txt
@@ -22,9 +22,9 @@ Loyalty:3
 A:AB$ Discard | Cost$ AddCounter<2/LOYALTY> | Planeswalker$ True | Defined$ Player | NumCards$ 1 | Mode$ TgtChoose | SpellDescription$ Each player discards a card.
 A:AB$ ChangeZone | Cost$ SubCounter<X/LOYALTY> | Planeswalker$ True | Origin$ Graveyard | Destination$ Battlefield | TgtPrompt$ Choose target creature in your graveyard | ValidTgts$ Creature.YouCtrl+nonLegendary | SpellDescription$ Return target nonlegendary creature card with converted mana cost X from your graveyard to the battlefield.
 A:AB$ Effect | Cost$ SubCounter<8/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Liliana, Defiant Necromancer emblem | Image$ liliana_defiant_necromancer_emblem | Stackable$ False | Triggers$ TrigChangesZone | SVars$ DelTrigReturn,DBReturn | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "Whenever a creature dies, return it to the battlefield under your control at the beginning of the next end step."
-SVar:TrigChangesZone:Mode$ ChangesZone | ValidCard$ Creature | Origin$ Battlefield | Destination$ Graveyard | DelayedTrigger$ DelTrigReturn | TriggerZones$ Command | TriggerDescription$ Whenever a creature dies, return it to the battlefield under your control at the beginning of the next end step.
-SVar:DelTrigReturn:Mode$ Phase | Phase$ End Of Turn | Execute$ DBReturn | TriggerDescription$ Return that card to the battlefield at the beginning of the next end step.
-SVar:DBReturn:DB$ ChangeZone | Defined$ TriggeredCard | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True
+SVar:TrigChangesZone:Mode$ ChangesZone | ValidCard$ Creature | Origin$ Battlefield | Destination$ Graveyard | Execute$ DelTrigReturn | TriggerZones$ Command | TriggerDescription$ Whenever a creature dies, return it to the battlefield under your control at the beginning of the next end step.
+SVar:DelTrigReturn:DB$ DelayedTrigger | Mode$ Phase | Phase$ End Of Turn | Execute$ DBReturn | RememberObjects$ TriggeredCard | TriggerDescription$ Return that card to the battlefield at the beginning of the next end step.
+SVar:DBReturn:DB$ ChangeZone | Defined$ DelayTriggerRemembered | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True
 SVar:X:Targeted$CardManaCost
 SVar:Picture:http://www.wizards.com/global/images/magic/general/liliana_defiant_necromancer.jpg
 Oracle:[+2] Each player discards a card.\n[-X] Return target nonlegendary creature card with converted mana cost X from your graveyard to the battlefield.\n[-8] You get an emblem with "Whenever a creature dies, return it to the battlefield under your control at the beginning of the next end step."
--- a/forge-gui/res/cardsfolder/l/lowland_basilisk.txt
+++ b/forge-gui/res/cardsfolder/l/lowland_basilisk.txt
@@ -2,8 +2,8 @@ Name:Lowland Basilisk
 ManaCost:2 G
 Types:Creature Basilisk
 PT:1/3
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Creature | TriggerZones$ Battlefield | DelayedTrigger$ DelTrig | TriggerDescription$ Whenever CARDNAME deals damage to a creature, destroy that creature at end of combat.
-SVar:DelTrig:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | TriggerDescription$ Destroy damaged creature at end of combat.
-SVar:TrigDestroy:AB$Destroy | Cost$ 0 | Defined$ TriggeredTarget
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Creature | TriggerZones$ Battlefield | Execute$ DelTrig | TriggerDescription$ Whenever CARDNAME deals damage to a creature, destroy that creature at end of combat.
+SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredTarget | TriggerDescription$ Destroy damaged creature at end of combat.
+SVar:TrigDestroy:DB$Destroy | Defined$ DelayTriggerRemembered
 SVar:Picture:http://www.wizards.com/global/images/magic/general/lowland_basilisk.jpg
 Oracle:Whenever Lowland Basilisk deals damage to a creature, destroy that creature at end of combat.
--- a/forge-gui/res/cardsfolder/m/marchesa_the_black_rose.txt
+++ b/forge-gui/res/cardsfolder/m/marchesa_the_black_rose.txt
@@ -4,8 +4,8 @@ Types:Legendary Creature Human Wizard
 PT:3/3
 K:Dethrone
 S:Mode$ Continuous | Affected$ Creature.Other+YouCtrl | AddKeyword$ Dethrone | Description$ Other creatures you control have dethrone.
-T:Mode$ ChangesZone | ValidCard$ Card.YouCtrl+counters_GE1_P1P1 | Origin$ Battlefield | Destination$ Graveyard | DelayedTrigger$ DelTrigReturn | TriggerZones$ Battlefield | TriggerDescription$ Whenever a creature you control with a +1/+1 counter on it dies, return that card to the battlefield under your control at the beginning of the next end step.
-SVar:DelTrigReturn:Mode$ Phase | Phase$ End Of Turn | Execute$ DBReturn | TriggerDescription$ Return that card to the battlefield at the beginning under your control of the next end step.
-SVar:DBReturn:DB$ ChangeZone | Defined$ TriggeredCard | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True
+T:Mode$ ChangesZone | ValidCard$ Card.YouCtrl+counters_GE1_P1P1 | Origin$ Battlefield | Destination$ Graveyard | Execute$ DelTrigReturn | TriggerZones$ Battlefield | TriggerDescription$ Whenever a creature you control with a +1/+1 counter on it dies, return that card to the battlefield under your control at the beginning of the next end step.
+SVar:DelTrigReturn:DB$ DelayedTrigger | Mode$ Phase | Phase$ End Of Turn | Execute$ DBReturn | RememberObjects$ TriggeredCard | TriggerDescription$ Return that card to the battlefield at the beginning under your control of the next end step.
+SVar:DBReturn:DB$ ChangeZone | Defined$ DelayTriggerRemembered | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/marchesa_the_black_rose.jpg
 Oracle:Dethrone (Whenever this creature attacks the player with the most life or tied for most life, put a +1/+1 counter on it.)\nOther creatures you control have dethrone.\nWhenever a creature you control with a +1/+1 counter on it dies, return that card to the battlefield under your control at the beginning of the next end step.
--- a/forge-gui/res/cardsfolder/m/mardu_blazebringer.txt
+++ b/forge-gui/res/cardsfolder/m/mardu_blazebringer.txt
@@ -2,10 +2,10 @@ Name:Mardu Blazebringer
 ManaCost:2 R
 Types:Creature Ogre Warrior
 PT:4/4
-T:Mode$ Attacks | ValidCard$ Card.Self | DelayedTrigger$ DelTrig | TriggerDescription$ When CARDNAME attacks or blocks, sacrifice it at end of combat.
-T:Mode$ Blocks | ValidCard$ Card.Self | DelayedTrigger$ DelTrig | Secondary$ True | TriggerDescription$ Whenever CARDNAME attacks or blocks, sacrifice it at end of combat.
-SVar:DelTrig:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigSacrifice | TriggerDescription$ Sacrifice CARDNAME at end of combat.
-SVar:TrigSacrifice:AB$ Sacrifice | Cost$ 0 | Defined$ Self
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ DelTrig | TriggerDescription$ When CARDNAME attacks or blocks, sacrifice it at end of combat.
+T:Mode$ Blocks | ValidCard$ Card.Self | Execute$ DelTrig | Secondary$ True | TriggerDescription$ Whenever CARDNAME attacks or blocks, sacrifice it at end of combat.
+SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigSacrifice | TriggerDescription$ Sacrifice CARDNAME at end of combat.
+SVar:TrigSacrifice:DB$ Sacrifice | Defined$ Self
 SVar:SacrificeEndCombat:True
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mardu_blazebringer.jpg
--- a/forge-gui/res/cardsfolder/n/nature_shields_its_own.txt
+++ b/forge-gui/res/cardsfolder/n/nature_shields_its_own.txt
@@ -3,9 +3,9 @@ ManaCost:no cost
 Types:Ongoing Scheme
 T:Mode$ AttackerUnblocked | ValidCard$ Creature | ValidDefender$ You,Planeswalker.YouCtrl | TriggerZones$ Command | Execute$ TrigToken | TriggerDescription$ Whenever a creature attacks and isn't blocked, if you're the defending player, put a 0/1 green Plant creature token onto the battlefield blocking that creature.
 SVar:TrigToken:AB$ Token | Cost$ 0 | TokenOwner$ You | TokenAmount$ 1 | TokenName$ Plant | TokenColors$ Green | TokenTypes$ Creature,Plant | TokenPower$ 0 | TokenToughness$ 1 | TokenBlocking$ TriggeredAttacker
-T:Mode$ AttackersDeclared | DelayedTrigger$ DelTrigEOC | CheckSVar$ NatureShields | SVarCompare$ GE4 | NoResolvingCheck$ True | TriggerZones$ Command | AttackedTarget$ You | TriggerDescription$ When four or more creatures attack you, abandon this scheme at end of combat.
-SVar:DelTrigEOC:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ Abandon | TriggerDescription$ Abandon this scheme at end of combat.
-SVar:Abandon:AB$ Abandon | Cost$ 0
+T:Mode$ AttackersDeclared | Execute$ DelTrigEOC | CheckSVar$ NatureShields | SVarCompare$ GE4 | NoResolvingCheck$ True | TriggerZones$ Command | AttackedTarget$ You | TriggerDescription$ When four or more creatures attack you, abandon this scheme at end of combat.
+SVar:DelTrigEOC:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ Abandon | TriggerDescription$ Abandon this scheme at end of combat.
+SVar:Abandon:DB$ Abandon
 SVar:NatureShields:Count$Valid Creature.attackingYou
 SVar:Picture:http://downloads.cardforge.link/images/cards/ARC/Nature Shields Its Own.full.jpg
 Oracle:(An ongoing scheme remains face up until it's abandoned.)\nWhenever a creature attacks and isn't blocked, if you're the defending player, put a 0/1 green Plant creature token onto the battlefield blocking that creature.\nWhen four or more creatures attack you, abandon this scheme at end of combat.
--- a/forge-gui/res/cardsfolder/o/ohran_viper.txt
+++ b/forge-gui/res/cardsfolder/o/ohran_viper.txt
@@ -2,9 +2,9 @@ Name:Ohran Viper
 ManaCost:1 G G
 Types:Snow Creature Snake
 PT:1/3
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Creature | CombatDamage$ True | TriggerZones$ Battlefield | DelayedTrigger$ DelTrig | TriggerDescription$ Whenever CARDNAME deals combat damage to a creature, destroy that creature at end of combat.
-SVar:DelTrig:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | TriggerDescription$ Destroy damaged creature at end of combat.
-SVar:TrigDestroy:AB$Destroy | Cost$ 0 | Defined$ TriggeredTarget
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Creature | CombatDamage$ True | TriggerZones$ Battlefield | Execute$ DelTrig | TriggerDescription$ Whenever CARDNAME deals combat damage to a creature, destroy that creature at end of combat.
+SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredTarget | TriggerDescription$ Destroy damaged creature at end of combat.
+SVar:TrigDestroy:DB$Destroy | Defined$ DelayTriggerRemembered
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | OptionalDecider$ You | Execute$ TrigDraw | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may draw a card.
 SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ohran_viper.jpg
--- a/forge-gui/res/cardsfolder/p/phantom_whelp.txt
+++ b/forge-gui/res/cardsfolder/p/phantom_whelp.txt
@@ -2,9 +2,9 @@ Name:Phantom Whelp
 ManaCost:1 U
 Types:Creature Illusion Hound
 PT:2/2
-T:Mode$ Attacks | ValidCard$ Card.Self | DelayedTrigger$ DelTrig | TriggerDescription$ Whenever CARDNAME attacks or blocks, return it to its owner's hand at end of combat. (Return it only if it's on the battlefield.)
-T:Mode$ Blocks | ValidCard$ Card.Self | DelayedTrigger$ DelTrig | Secondary$ True | TriggerDescription$ Whenever CARDNAME attacks or blocks, return it to its owner's hand at end of combat. (Return it only if it's on the battlefield.)
-SVar:DelTrig:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigBounce | TriggerDescription$ Return CARDNAME to it's owner's hand.
-SVar:TrigBounce:AB$ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Hand | Defined$ Self
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ DelTrig | TriggerDescription$ Whenever CARDNAME attacks or blocks, return it to its owner's hand at end of combat. (Return it only if it's on the battlefield.)
+T:Mode$ Blocks | ValidCard$ Card.Self | Execute$ DelTrig | Secondary$ True | TriggerDescription$ Whenever CARDNAME attacks or blocks, return it to its owner's hand at end of combat. (Return it only if it's on the battlefield.)
+SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigBounce | TriggerDescription$ Return CARDNAME to it's owner's hand.
+SVar:TrigBounce:DB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Defined$ Self
 SVar:Picture:http://www.wizards.com/global/images/magic/general/phantom_whelp.jpg
 Oracle:When Phantom Whelp attacks or blocks, return it to its owner's hand at end of combat. (Return it only if it's on the battlefield.)
--- a/forge-gui/res/cardsfolder/p/phytotitan.txt
+++ b/forge-gui/res/cardsfolder/p/phytotitan.txt
@@ -2,9 +2,9 @@ Name:Phytotitan
 ManaCost:4 G G
 Types:Creature Plant Elemental
 PT:7/2
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | TriggerController$ TriggeredCardController | DelayedTrigger$ DelTrig | TriggerDescription$ When CARDNAME dies, return it to the battlefield tapped under its owner's control at the beginning of his or her next upkeep.
-SVar:DelTrig:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigChange | TriggerDescription$ Return CARDNAME to the battlefield tapped under its owner's control at the beginning of his or her next upkeep.
-SVar:TrigChange:AB$ ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Battlefield | Defined$ TriggeredCard | Tapped$ True
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | TriggerController$ TriggeredCardController | Execute$ DelTrig | TriggerDescription$ When CARDNAME dies, return it to the battlefield tapped under its owner's control at the beginning of his or her next upkeep.
+SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigChange | RememberObjects$ TriggeredCard | TriggerDescription$ Return CARDNAME to the battlefield tapped under its owner's control at the beginning of his or her next upkeep.
+SVar:TrigChange:AB$ ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Battlefield | Defined$ DelayTriggerRemembered | Tapped$ True
 SVar:SacMe:1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/phytotitan.jpg
 Oracle:When Phytotitan dies, return it to the battlefield tapped under its owner's control at the beginning of his or her next upkeep.
--- a/forge-gui/res/cardsfolder/p/protean_hydra.txt
+++ b/forge-gui/res/cardsfolder/p/protean_hydra.txt
@@ -7,8 +7,8 @@ SVar:X:Count$xPaid
 R:Event$ DamageDone | ActiveZones$ Battlefield | ValidTarget$ Card.Self | ReplaceWith$ Counters | PreventionEffect$ True | Description$ If damage would be dealt to CARDNAME, prevent that damage and remove that many +1/+1 counters from it.
 SVar:Counters:AB$ RemoveCounter | Cost$ 0 | Defined$ ReplacedTarget | CounterType$ P1P1 | CounterNum$ Y | References$ Y
 SVar:Y:ReplaceCount$DamageAmount
-T:Mode$ CounterRemoved | ValidCard$ Card.Self | TriggerZones$ Battlefield | CounterType$ P1P1 | DelayedTrigger$ ProteanPutCounter | TriggerDescription$ Whenever a +1/+1 counter is removed from CARDNAME, put two +1/+1 counters on it at the beginning of the next end step.
-SVar:ProteanPutCounter:Mode$ Phase | Phase$ End of Turn | Execute$ DBPutCounters | TriggerDescription$ Put two +1/+1 counters on it at the beginning of the next end step.
-SVar:DBPutCounters:AB$ PutCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ 2
+T:Mode$ CounterRemoved | ValidCard$ Card.Self | TriggerZones$ Battlefield | CounterType$ P1P1 | Execute$ ProteanPutCounter | TriggerDescription$ Whenever a +1/+1 counter is removed from CARDNAME, put two +1/+1 counters on it at the beginning of the next end step.
+SVar:ProteanPutCounter:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ DBPutCounters | TriggerDescription$ Put two +1/+1 counters on it at the beginning of the next end step.
+SVar:DBPutCounters:DB$ PutCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ 2
 SVar:Picture:http://www.wizards.com/global/images/magic/general/protean_hydra.jpg
 Oracle:Protean Hydra enters the battlefield with X +1/+1 counters on it.\nIf damage would be dealt to Protean Hydra, prevent that damage and remove that many +1/+1 counters from it.\nWhenever a +1/+1 counter is removed from Protean Hydra, put two +1/+1 counters on it at the beginning of the next end step.
--- a/forge-gui/res/cardsfolder/q/quicksilver_behemoth.txt
+++ b/forge-gui/res/cardsfolder/q/quicksilver_behemoth.txt
@@ -2,10 +2,10 @@ Name:Quicksilver Behemoth
 ManaCost:6 U
 Types:Creature Beast
 PT:4/5
-T:Mode$ Attacks | ValidCard$ Card.Self | DelayedTrigger$ DelayedTrig | TriggerDescription$ When CARDNAME attacks or blocks, return it to its owner's hand at end of combat. (Return it only if it's on the battlefield.)
-T:Mode$ Blocks | ValidCard$ Card.Self | DelayedTrigger$ DelayedTrig | Secondary$ True | TriggerDescription$ When CARDNAME attacks or blocks, return it to its owner's hand at end of combat. (Return it only if it's on the battlefield.)
-SVar:DelayedTrig:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigReturn | TriggerDescription$ Return CARDNAME to its owner's hand at end of combat. (Return it only if it's on the battlefield.)
-SVar:TrigReturn:AB$ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Battlefield | Destination$ Hand
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ DelayedTrig | TriggerDescription$ When CARDNAME attacks or blocks, return it to its owner's hand at end of combat. (Return it only if it's on the battlefield.)
+T:Mode$ Blocks | ValidCard$ Card.Self | Execute$ DelayedTrig | Secondary$ True | TriggerDescription$ When CARDNAME attacks or blocks, return it to its owner's hand at end of combat. (Return it only if it's on the battlefield.)
+SVar:DelayedTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigReturn | TriggerDescription$ Return CARDNAME to its owner's hand at end of combat. (Return it only if it's on the battlefield.)
+SVar:TrigReturn:DB$ChangeZone | Defined$ Self | Origin$ Battlefield | Destination$ Hand
 S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ X | EffectZone$ All | Description$ Affinity for artifacts (This spell costs {1} less to cast for each artifact you control.)
 SVar:X:Count$Valid Artifact.YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/quicksilver_behemoth.jpg
--- a/forge-gui/res/cardsfolder/r/rock_basilisk.txt
+++ b/forge-gui/res/cardsfolder/r/rock_basilisk.txt
@@ -2,11 +2,10 @@ Name:Rock Basilisk
 ManaCost:4 R G
 Types:Creature Basilisk
 PT:4/5
-T:Mode$ AttackerBlockedByCreature | ValidCard$ Creature.nonWall | ValidBlocker$ Card.Self | DelayedTrigger$ DelTrigBlocked | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a non-Wall creature, destroy that creature at end of combat.
-T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature.nonWall | DelayedTrigger$ DelTrigBlocker | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a non-Wall creature, destroy that creature at end of combat.
-SVar:DelTrigBlocked:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroyBlocked | TriggerDescription$ Destroy blocked creature at end of combat.
-SVar:DelTrigBlocker:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroyBlocker | TriggerDescription$ Destroy blocking creature at end of combat.
-SVar:TrigDestroyBlocked:AB$Destroy | Cost$ 0 | Defined$ TriggeredAttacker
-SVar:TrigDestroyBlocker:AB$Destroy | Cost$ 0 | Defined$ TriggeredBlocker
+T:Mode$ AttackerBlockedByCreature | ValidCard$ Creature.nonWall | ValidBlocker$ Card.Self | Execute$ DelTrigBlocked | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a non-Wall creature, destroy that creature at end of combat.
+T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature.nonWall | Execute$ DelTrigBlocker | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a non-Wall creature, destroy that creature at end of combat.
+SVar:DelTrigBlocked:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredAttacker | TriggerDescription$ Destroy blocked creature at end of combat.
+SVar:DelTrigBlocker:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredBlocker | TriggerDescription$ Destroy blocking creature at end of combat.
+SVar:TrigDestroy:DB$Destroy | Defined$ DelayTriggerRemembered
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rock_basilisk.jpg
 Oracle:Whenever Rock Basilisk blocks or becomes blocked by a non-Wall creature, destroy that creature at end of combat.
--- a/forge-gui/res/cardsfolder/r/rukh_egg.txt
+++ b/forge-gui/res/cardsfolder/r/rukh_egg.txt
@@ -2,8 +2,8 @@ Name:Rukh Egg
 ManaCost:3 R
 Types:Creature Bird
 PT:0/3
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | DelayedTrigger$ DelTrigLeaves | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, put a 4/4 red Bird creature token with flying onto the battlefield at the beginning of the next end step.
-SVar:DelTrigLeaves:Mode$ Phase | Phase$ End of Turn | Execute$ TrigToken | TriggerController$ TriggeredCardController | TriggerDescription$ Put a 4/4 red Bird creature token with flying onto the battlefield at the beginning of the next end step.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ DelTrigLeaves | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, put a 4/4 red Bird creature token with flying onto the battlefield at the beginning of the next end step.
+SVar:DelTrigLeaves:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigToken | TriggerController$ TriggeredCardController | TriggerDescription$ Put a 4/4 red Bird creature token with flying onto the battlefield at the beginning of the next end step.
 SVar:TrigToken:AB$ Token | Cost$ 0 | TokenOwner$ You | TokenName$ Bird | TokenTypes$ Creature,Bird | TokenColors$ Red | TokenKeywords$ Flying | TokenPower$ 4 | TokenToughness$ 4 | TokenAmount$ 1
 SVar:SacMe:4
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rukh_egg.jpg
--- a/forge-gui/res/cardsfolder/r/runaway_carriage.txt
+++ b/forge-gui/res/cardsfolder/r/runaway_carriage.txt
@@ -3,10 +3,10 @@ ManaCost:4
 Types:Artifact Creature Construct
 PT:5/6
 K:Trample
-T:Mode$ Attacks | ValidCard$ Card.Self | DelayedTrigger$ DelTrig | TriggerDescription$ Whenever CARDNAME attacks or blocks, sacrifice it at end of combat.
-T:Mode$ Blocks | ValidCard$ Card.Self | DelayedTrigger$ DelTrig | Secondary$ True | TriggerDescription$ Whenever CARDNAME attacks or blocks, sacrifice it at end of combat.
-SVar:DelTrig:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigSacrifice | TriggerDescription$ Sacrifice CARDNAME at end of combat.
-SVar:TrigSacrifice:AB$Sacrifice | Cost$ 0 | Defined$ Self
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ DelTrig | TriggerDescription$ Whenever CARDNAME attacks or blocks, sacrifice it at end of combat.
+T:Mode$ Blocks | ValidCard$ Card.Self | Execute$ DelTrig | Secondary$ True | TriggerDescription$ Whenever CARDNAME attacks or blocks, sacrifice it at end of combat.
+SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigSacrifice | TriggerDescription$ Sacrifice CARDNAME at end of combat.
+SVar:TrigSacrifice:DB$Sacrifice | Defined$ Self
 SVar:SacrificeEndCombat:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/runaway_carriage.jpg
 Oracle:Trample\nWhen Runaway Carriage attacks or blocks, sacrifice it at end of combat.
--- a/forge-gui/res/cardsfolder/s/saprazzan_outrigger.txt
+++ b/forge-gui/res/cardsfolder/s/saprazzan_outrigger.txt
@@ -2,10 +2,10 @@ Name:Saprazzan Outrigger
 ManaCost:3 U
 Types:Creature Merfolk
 PT:5/5
-T:Mode$ Attacks | ValidCard$ Card.Self | DelayedTrigger$ DelTrig | TriggerDescription$ Whenever CARDNAME attacks or blocks, put it on top of its owner's library at end of combat.
-T:Mode$ Blocks | ValidCard$ Card.Self | DelayedTrigger$ DelTrig | Secondary$ True | TriggerDescription$ Whenever CARDNAME attacks or blocks, put it on top of its owner<65>s library at end of combat.
-SVar:DelTrig:Mode$ Phase | Phase$ EndCombat | Execute$ TrigChange | TriggerDescription$ Put CARDNAME on top of its owner's library.
-SVar:TrigChange:AB$ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Library | LibraryPosition$ 0 | Defined$ Self
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ DelTrig | TriggerDescription$ Whenever CARDNAME attacks or blocks, put it on top of its owner's library at end of combat.
+T:Mode$ Blocks | ValidCard$ Card.Self | Execute$ DelTrig | Secondary$ True | TriggerDescription$ Whenever CARDNAME attacks or blocks, put it on top of its owner<65>s library at end of combat.
+SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | Execute$ TrigChange | TriggerDescription$ Put CARDNAME on top of its owner's library.
+SVar:TrigChange:DB$ChangeZone | Origin$ Battlefield | Destination$ Library | LibraryPosition$ 0 | Defined$ Self
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/saprazzan_outrigger.jpg
 Oracle:When Saprazzan Outrigger attacks or blocks, put it on top of its owner's library at end of combat.
--- a/forge-gui/res/cardsfolder/s/sawtooth_ogre.txt
+++ b/forge-gui/res/cardsfolder/s/sawtooth_ogre.txt
@@ -2,11 +2,10 @@ Name:Sawtooth Ogre
 ManaCost:2 R R
 Types:Creature Ogre
 PT:3/3
-T:Mode$ AttackerBlockedByCreature | ValidCard$ Creature | ValidBlocker$ Card.Self | DelayedTrigger$ DelTrigBlocked | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, Sawtooth Ogre deals 1 damage to that creature at end of combat.
-T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature | DelayedTrigger$ DelTrigBlocker | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, Sawtooth Ogre deals 1 damage to that creature at end of combat.
-SVar:DelTrigBlocked:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDamageBlocked | TriggerDescription$ CARDNAME deals 1 damage to blocked creature at end of combat.
-SVar:DelTrigBlocker:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDamageBlocker | TriggerDescription$ CARDNAME deals 1 damage to blocking creature at end of combat.
-SVar:TrigDamageBlocked:AB$ DealDamage | Cost$ 0 | Defined$ TriggeredAttacker | NumDmg$ 1
-SVar:TrigDamageBlocker:AB$ DealDamage | Cost$ 0 | Defined$ TriggeredBlocker | NumDmg$ 1
+T:Mode$ AttackerBlockedByCreature | ValidCard$ Creature | ValidBlocker$ Card.Self | Execute$ DelTrigBlocked | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, Sawtooth Ogre deals 1 damage to that creature at end of combat.
+T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature | Execute$ DelTrigBlocker | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, Sawtooth Ogre deals 1 damage to that creature at end of combat.
+SVar:DelTrigBlocked:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDamage | RememberObjects$ TriggeredAttacker | TriggerDescription$ CARDNAME deals 1 damage to blocked creature at end of combat.
+SVar:DelTrigBlocker:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDamage | RememberObjects$ TriggeredBlocker | TriggerDescription$ CARDNAME deals 1 damage to blocking creature at end of combat.
+SVar:TrigDamage:DB$ DealDamage | Defined$ DelayTriggerRemembered | NumDmg$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sawtooth_ogre.jpg
 Oracle:Whenever Sawtooth Ogre blocks or becomes blocked by a creature, Sawtooth Ogre deals 1 damage to that creature at end of combat.
--- a/forge-gui/res/cardsfolder/s/seraph.txt
+++ b/forge-gui/res/cardsfolder/s/seraph.txt
@@ -3,9 +3,9 @@ ManaCost:6 W
 Types:Creature Angel
 PT:4/4
 K:Flying
-T:Mode$ ChangesZone | ValidCard$ Creature.DamagedBy | Origin$ Battlefield | Destination$ Graveyard | DelayedTrigger$ DelTrigReturn | TriggerZones$ Battlefield | TriggerDescription$ Whenever a creature dealt damage by CARDNAME this turn dies, put that card onto the battlefield under your control at the beginning of the next end step. Sacrifice the creature when you lose control of CARDNAME.
-SVar:DelTrigReturn:Mode$ Phase | Phase$ End Of Turn | Execute$ DBReturn | TriggerDescription$ Return that card to the battlefield at the beginning of the next end step.
-SVar:DBReturn:DB$ ChangeZone | Defined$ TriggeredCard | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | RememberChanged$ True
+T:Mode$ ChangesZone | ValidCard$ Creature.DamagedBy | Origin$ Battlefield | Destination$ Graveyard | Execute$ DelTrigReturn | TriggerZones$ Battlefield | TriggerDescription$ Whenever a creature dealt damage by CARDNAME this turn dies, put that card onto the battlefield under your control at the beginning of the next end step. Sacrifice the creature when you lose control of CARDNAME.
+SVar:DelTrigReturn:DB$ DelayedTrigger | Mode$ Phase | Phase$ End Of Turn | Execute$ DBReturn | RememberObjects$ TriggeredCard | TriggerDescription$ Return that card to the battlefield at the beginning of the next end step.
+SVar:DBReturn:DB$ ChangeZone | Defined$ DelayTriggerRemembered | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | RememberChanged$ True

 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | Static$ True | ValidCard$ Card.IsRemembered | Execute$ DBForget
 SVar:DBForget:DB$ Pump | Defined$ Card.Self | ForgetObjects$ TriggeredCard
--- a/forge-gui/res/cardsfolder/s/serpentine_basilisk.txt
+++ b/forge-gui/res/cardsfolder/s/serpentine_basilisk.txt
@@ -2,9 +2,9 @@ Name:Serpentine Basilisk
 ManaCost:2 G G
 Types:Creature Basilisk
 PT:2/3
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Creature | CombatDamage$ True | TriggerZones$ Battlefield | DelayedTrigger$ DelTrig | TriggerDescription$ Whenever CARDNAME deals combat damage to a creature, destroy that creature at end of combat.
-SVar:DelTrig:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | TriggerDescription$ Destroy damaged creature at end of combat.
-SVar:TrigDestroy:AB$Destroy | Cost$ 0 | Defined$ TriggeredTarget
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Creature | CombatDamage$ True | TriggerZones$ Battlefield | Execute$ DelTrig | TriggerDescription$ Whenever CARDNAME deals combat damage to a creature, destroy that creature at end of combat.
+SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredTarget | TriggerDescription$ Destroy damaged creature at end of combat.
+SVar:TrigDestroy:DB$Destroy | Defined$ DelayTriggerRemembered
 K:Morph:1 G G
 SVar:Picture:http://www.wizards.com/global/images/magic/general/serpentine_basilisk.jpg
 Oracle:Whenever Serpentine Basilisk deals combat damage to a creature, destroy that creature at end of combat.\nMorph {1}{G}{G} (You may cast this card face down as a 2/2 creature for {3}. Turn it face up any time for its morph cost.)
--- a/forge-gui/res/cardsfolder/s/shirei_shizos_caretaker.txt
+++ b/forge-gui/res/cardsfolder/s/shirei_shizos_caretaker.txt
@@ -2,9 +2,9 @@ Name:Shirei, Shizo's Caretaker
 ManaCost:4 B
 Types:Legendary Creature Spirit
 PT:2/2
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | TriggerZones$ Battlefield | ValidCard$ Creature.powerLE1+YouOwn | OptionalDecider$ You | DelayedTrigger$ DelTrig | TriggerDescription$ Whenever a creature with power 1 or less is put into your graveyard from the battlefield, you may return that card to the battlefield at the beginning of the next end step if CARDNAME is still on the battlefield.
-SVar:DelTrig:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ Player | Execute$ TrigReturn | IsPresent$ Card.Self | PresentZone$ Battlefield | TriggerDescription$ Return creature to the battlefield.
-SVar:TrigReturn:AB$ ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Battlefield | Defined$ TriggeredCard
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | TriggerZones$ Battlefield | ValidCard$ Creature.powerLE1+YouOwn | OptionalDecider$ You | Execute$ DelTrig | TriggerDescription$ Whenever a creature with power 1 or less is put into your graveyard from the battlefield, you may return that card to the battlefield at the beginning of the next end step if CARDNAME is still on the battlefield.
+SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | ValidPlayer$ Player | Execute$ TrigReturn | IsPresent$ Card.Self | PresentZone$ Battlefield | RememberObjects$ TriggeredCard | TriggerDescription$ Return creature to the battlefield.
+SVar:TrigReturn:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | Defined$ DelayTriggerRemembered | IsPresent$ Card.Self+StrictlySelf | PresentZone$ Battlefield
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Static$ True | Execute$ DBCleanup
 SVar:DBCleanup:DB$Cleanup | ClearTriggered$ True
 S:Mode$ Continuous | Affected$ Creature.YouCtrl+powerLE1+YouOwn | AddSVar$ Sac
--- a/forge-gui/res/cardsfolder/s/simic_basilisk.txt
+++ b/forge-gui/res/cardsfolder/s/simic_basilisk.txt
@@ -3,10 +3,10 @@ ManaCost:4 G G
 Types:Creature Basilisk Mutant
 PT:0/0
 K:Graft:3
-A:AB$ Animate | Cost$ 1 G | ValidTgts$ Creature.counters_GE1_P1P1 | TgtPrompt$ Select target creature with a +1/+1 counter on it | Triggers$ DestroyTrigger | sVars$ DelTrig,TrigDestroy | References$ DestroyTrigger,DelTrig,TrigDestroy | SpellDescription$ Until end of turn, target creature with a +1/+1 counter on it gains "Whenever this creature deals combat damage to a creature, destroy that creature at end of combat."
-SVar:DestroyTrigger:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Creature | CombatDamage$ True | TriggerZones$ Battlefield | DelayedTrigger$ DelTrig | TriggerDescription$ Whenever CARDNAME deals combat damage to a creature, destroy that creature at end of combat.
-SVar:DelTrig:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | TriggerDescription$ Destroy damaged creature at end of combat.
-SVar:TrigDestroy:AB$Destroy | Cost$ 0 | Defined$ TriggeredTarget
+A:AB$ Animate | Cost$ 1 G | ValidTgts$ Creature.counters_GE1_P1P1 | TgtPrompt$ Select target creature with a +1/+1 counter on it | Triggers$ DestroyTrigger | sVars$ DelTrigSimic,TrigDestroySimic | References$ DestroyTrigger,DelTrigSimic,TrigDestroySimic | SpellDescription$ Until end of turn, target creature with a +1/+1 counter on it gains "Whenever this creature deals combat damage to a creature, destroy that creature at end of combat."
+SVar:DestroyTrigger:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Creature | CombatDamage$ True | TriggerZones$ Battlefield | Execute$ DelTrig | TriggerDescription$ Whenever CARDNAME deals combat damage to a creature, destroy that creature at end of combat.
+SVar:DelTrigSimic:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroySimic | RememberObjects$ TriggeredTarget | TriggerDescription$ Destroy damaged creature at end of combat.
+SVar:TrigDestroySimic:DB$Destroy | Defined$ DelayTriggerRemembered
 DeckNeeds:Ability$Counters
 DeckHas:Ability$Counters
 SVar:RemAIDeck:True
--- a/forge-gui/res/cardsfolder/s/sosuke_son_of_seshiro.txt
+++ b/forge-gui/res/cardsfolder/s/sosuke_son_of_seshiro.txt
@@ -3,9 +3,9 @@ ManaCost:2 G G
 Types:Legendary Creature Snake Warrior
 PT:3/4
 S:Mode$ Continuous | Affected$ Creature.Snake+Other+YouCtrl | AddPower$ 1 | Description$ Other Snake creatures you control get +1/+0.
-T:Mode$ DamageDone | ValidSource$ Warrior.YouCtrl | ValidTarget$ Creature | CombatDamage$ True | TriggerZones$ Battlefield | DelayedTrigger$ DelTrig | TriggerDescription$ Whenever a Warrior you control deals combat damage to a creature, destroy that creature at end of combat.
-SVar:DelTrig:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | TriggerDescription$ Destroy damaged creature at end of combat.
-SVar:TrigDestroy:AB$Destroy | Cost$ 0 | Defined$ TriggeredTarget
+T:Mode$ DamageDone | ValidSource$ Warrior.YouCtrl | ValidTarget$ Creature | CombatDamage$ True | TriggerZones$ Battlefield | Execute$ DelTrig | TriggerDescription$ Whenever a Warrior you control deals combat damage to a creature, destroy that creature at end of combat.
+SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredTarget | TriggerDescription$ Destroy damaged creature at end of combat.
+SVar:TrigDestroy:DB$Destroy | Defined$ DelayTriggerRemembered
 DeckHints:Type$Snake|Warrior
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sosuke_son_of_seshiro.jpg
 Oracle:Other Snake creatures you control get +1/+0.\nWhenever a Warrior you control deals combat damage to a creature, destroy that creature at end of combat.
--- a/forge-gui/res/cardsfolder/s/stoic_ephemera.txt
+++ b/forge-gui/res/cardsfolder/s/stoic_ephemera.txt
@@ -4,9 +4,9 @@ Types:Creature Spirit
 PT:5/5
 K:Defender
 K:Flying
-T:Mode$ Blocks | ValidCard$ Card.Self | DelayedTrigger$ DelTrig | TriggerDescription$ When CARDNAME blocks, sacrifice it at end of combat.
-SVar:DelTrig:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Opponent | Execute$ TrigSacrifice | TriggerDescription$ Sacrifice CARDNAME at end of combat.
-SVar:TrigSacrifice:AB$Sacrifice | Cost$ 0 | Defined$ Self
+T:Mode$ Blocks | ValidCard$ Card.Self | Execute$ DelTrig | TriggerDescription$ When CARDNAME blocks, sacrifice it at end of combat.
+SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Opponent | Execute$ TrigSacrifice | TriggerDescription$ Sacrifice CARDNAME at end of combat.
+SVar:TrigSacrifice:DB$Sacrifice | Defined$ Self
 SVar:SacrificeEndCombat:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stoic_ephemera.jpg
 Oracle:Defender (This creature can't attack.)\nFlying\nWhen Stoic Ephemera blocks, sacrifice it at end of combat.
--- a/forge-gui/res/cardsfolder/s/stone_tongue_basilisk.txt
+++ b/forge-gui/res/cardsfolder/s/stone_tongue_basilisk.txt
@@ -3,8 +3,8 @@ ManaCost:4 G G G
 Types:Creature Basilisk
 PT:4/5
 S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ All creatures able to block CARDNAME do so. | Condition$ Threshold | Description$ Threshold - As long as seven or more cards are in your graveyard, all creatures able to block CARDNAME do so.
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Creature | CombatDamage$ True | TriggerZones$ Battlefield | DelayedTrigger$ DelTrig | TriggerDescription$ Whenever CARDNAME deals combat damage to a creature, destroy that creature at end of combat.
-SVar:DelTrig:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | TriggerDescription$ Destroy damaged creature at end of combat.
-SVar:TrigDestroy:AB$Destroy | Cost$ 0 | Defined$ TriggeredTarget
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Creature | CombatDamage$ True | TriggerZones$ Battlefield | Execute$ DelTrig | TriggerDescription$ Whenever CARDNAME deals combat damage to a creature, destroy that creature at end of combat.
+SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredTarget | TriggerDescription$ Destroy damaged creature at end of combat.
+SVar:TrigDestroy:DB$Destroy | Defined$ DelayTriggerRemembered
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stone_tongue_basilisk.jpg
 Oracle:Whenever Stone-Tongue Basilisk deals combat damage to a creature, destroy that creature at end of combat.\nThreshold - As long as seven or more cards are in your graveyard, all creatures able to block Stone-Tongue Basilisk do so.
--- a/forge-gui/res/cardsfolder/t/tangle_asp.txt
+++ b/forge-gui/res/cardsfolder/t/tangle_asp.txt
@@ -2,11 +2,10 @@ Name:Tangle Asp
 ManaCost:1 G
 Types:Creature Snake
 PT:1/2
-T:Mode$ AttackerBlockedByCreature | ValidCard$ Creature | ValidBlocker$ Card.Self | DelayedTrigger$ DelTrigBlocked | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, destroy that creature at end of combat.
-T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature | DelayedTrigger$ DelTrigBlocker | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, destroy that creature at end of combat.
-SVar:DelTrigBlocked:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroyBlocked | TriggerDescription$ Destroy blocked creature at end of combat.
-SVar:DelTrigBlocker:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroyBlocker | TriggerDescription$ Destroy blocking creature at end of combat.
-SVar:TrigDestroyBlocked:AB$ Destroy | Cost$ 0 | Defined$ TriggeredAttacker
-SVar:TrigDestroyBlocker:AB$ Destroy | Cost$ 0 | Defined$ TriggeredBlocker
+T:Mode$ AttackerBlockedByCreature | ValidCard$ Creature | ValidBlocker$ Card.Self | Execute$ DelTrigBlocked | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, destroy that creature at end of combat.
+T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature | Execute$ DelTrigBlocker | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, destroy that creature at end of combat.
+SVar:DelTrigBlocked:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredAttacker | TriggerDescription$ Destroy blocked creature at end of combat.
+SVar:DelTrigBlocker:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredBlocker | TriggerDescription$ Destroy blocking creature at end of combat.
+SVar:TrigDestroy:DB$Destroy | Defined$ DelayTriggerRemembered
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tangle_asp.jpg
 Oracle:Whenever Tangle Asp blocks or becomes blocked by a creature, destroy that creature at end of combat.
--- a/forge-gui/res/cardsfolder/t/tatsumasa_the_dragons_fang.txt
+++ b/forge-gui/res/cardsfolder/t/tatsumasa_the_dragons_fang.txt
@@ -3,7 +3,7 @@ ManaCost:6
 Types:Legendary Artifact Equipment
 K:Equip 3
 S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 5 | AddToughness$ 5 | Description$ Equipped creature gets +5/+5.
-A:AB$ Token | Cost$ 6 Exile<1/CARDNAME> | TokenAmount$ 1 | TokenName$ Dragon Spirit | TokenTypes$ Creature,Dragon,Spirit | TokenOwner$ You | TokenColors$ Blue | TokenPower$ 5 | TokenToughness$ 5 | RememberTokens$ True | DelayedTrigger$ DelTrigDies | TokenKeywords$ Flying | SpellDescription$ Put a 5/5 blue Dragon Spirit creature token with flying onto the battlefield. Return Tatsumasa to the battlefield under its owner's control when that token dies.
+A:AB$ Token | Cost$ 6 Exile<1/CARDNAME> | TokenAmount$ 1 | TokenName$ Dragon Spirit | TokenTypes$ Creature,Dragon,Spirit | TokenOwner$ You | TokenColors$ Blue | TokenPower$ 5 | TokenToughness$ 5 | RememberTokens$ True | TokenKeywords$ Flying | SpellDescription$ Put a 5/5 blue Dragon Spirit creature token with flying onto the battlefield. Return Tatsumasa to the battlefield under its owner's control when that token dies.
 T:Mode$ ChangesZone | ValidCard$ Creature.IsRemembered | Origin$ Battlefield | Destination$ Graveyard | TriggerZones$ Exile | Execute$ TrigReturn | Secondary$ True | TriggerDescription$ Return CARDNAME to the battlefield under its owner's control.
 SVar:TrigReturn:AB$ChangeZone | Cost$ 0 | Origin$ Exile | Destination$ Battlefield | Defined$ Self | SubAbility$ DBCleanUp
 SVar:DBCleanUp:DB$Cleanup | ClearRemembered$ True
--- a/forge-gui/res/cardsfolder/t/teferis_veil.txt
+++ b/forge-gui/res/cardsfolder/t/teferis_veil.txt
@@ -0,0 +1,9 @@
+Name:Teferi's Veil
+ManaCost:1 U
+Types:Enchantment
+T:Mode$ Attacks | ValidCard$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ DelayedTrig | TriggerDescription$ Whenever a creature you control attacks, it phases out at end of combat. (While it's phased out, it's treated as though it doesn't exist. It phases in before you untap during your next untap step.)
+SVar:DelayedTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigPhase | RememberObjects$ TriggeredAttacker | TriggerDescription$ Attacking creatures you control phase out at end of combat.
+SVar:TrigPhase:DB$Phases | Defined$ DelayTriggerRemembered
+SVar:RemAIDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/teferis_veil.jpg
+Oracle:Whenever a creature you control attacks, it phases out at end of combat. (While it's phased out, it's treated as though it doesn't exist. It phases in before you untap during your next untap step.)
--- a/forge-gui/res/cardsfolder/t/teferis_veil.txt.txt
+++ b/forge-gui/res/cardsfolder/t/teferis_veil.txt.txt
@@ -1,9 +0,0 @@
-Name:Teferi's Veil
-ManaCost:1 U
-Types:Enchantment
-T:Mode$ Attacks | ValidCard$ Creature.YouCtrl | TriggerZones$ Battlefield | DelayedTrigger$ DelayedTrig | TriggerDescription$ Whenever a creature you control attacks, it phases out at end of combat. (While it's phased out, it's treated as though it doesn't exist. It phases in before you untap during your next untap step.)
-SVar:DelayedTrig:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigPhase | TriggerDescription$ Attacking creatures you control phase out at end of combat.
-SVar:TrigPhase:AB$Phases | Cost$ 0 | Defined$ TriggeredAttacker
-SVar:RemAIDeck:True
-SVar:Picture:http://www.wizards.com/global/images/magic/general/teferis_veil.jpg
-Oracle:Whenever a creature you control attacks, it phases out at end of combat. (While it's phased out, it's treated as though it doesn't exist. It phases in before you untap during your next untap step.)
--- a/forge-gui/res/cardsfolder/t/thicket_basilisk.txt
+++ b/forge-gui/res/cardsfolder/t/thicket_basilisk.txt
@@ -2,11 +2,10 @@ Name:Thicket Basilisk
 ManaCost:3 G G
 Types:Creature Basilisk
 PT:2/4
-T:Mode$ AttackerBlockedByCreature | ValidCard$ Creature.nonWall | ValidBlocker$ Card.Self | DelayedTrigger$ DelayBlockTrig | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a non-Wall creature, destroy that creature at end of combat.
-T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature.nonWall | DelayedTrigger$ DelayAttackTrig | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a non-Wall creature, destroy that creature at end of combat.
-SVar:DelayBlockTrig:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroyAttacker | TriggerDescription$ Destroy attacking creature at end of combat.
-SVar:DelayAttackTrig:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroyBlocker | TriggerDescription$ Destroy blocking creature at end of combat.
-SVar:TrigDestroyAttacker:AB$Destroy | Cost$ 0 | Defined$ TriggeredAttacker
-SVar:TrigDestroyBlocker:AB$Destroy | Cost$ 0 | Defined$ TriggeredBlocker
+T:Mode$ AttackerBlockedByCreature | ValidCard$ Creature.nonWall | ValidBlocker$ Card.Self | Execute$ DelTrigBlocked | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a non-Wall creature, destroy that creature at end of combat.
+T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature.nonWall | Execute$ DelTrigBlocker | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a non-Wall creature, destroy that creature at end of combat.
+SVar:DelTrigBlocked:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredAttacker | TriggerDescription$ Destroy blocked creature at end of combat.
+SVar:DelTrigBlocker:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredBlocker | TriggerDescription$ Destroy blocking creature at end of combat.
+SVar:TrigDestroy:DB$Destroy | Defined$ DelayTriggerRemembered
 SVar:Picture:http://www.wizards.com/global/images/magic/general/thicket_basilisk.jpg
 Oracle:Whenever Thicket Basilisk blocks or becomes blocked by a non-Wall creature, destroy that creature at end of combat.
--- a/forge-gui/res/cardsfolder/t/time_elemental.txt
+++ b/forge-gui/res/cardsfolder/t/time_elemental.txt
@@ -3,9 +3,9 @@ ManaCost:2 U
 Types:Creature Elemental
 PT:0/2
 A:AB$ ChangeZone | Cost$ 2 U U T | ValidTgts$ Permanent.unenchanted | TgtPrompt$ Select target unenchanted permanent | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return target permanent that isn't enchanted to its owner's hand.
-T:Mode$ Attacks | ValidCard$ Card.Self | DelayedTrigger$ DelayedTrig | TriggerDescription$ When CARDNAME attacks or blocks, at end of combat, sacrifice it and it deals 5 damage to you.
-T:Mode$ Blocks | ValidCard$ Card.Self | DelayedTrigger$ DelayedTrig | Secondary$ True | TriggerDescription$ When CARDNAME attacks or blocks, at end of combat, sacrifice it and it deals 5 damage to you.
-SVar:DelayedTrig:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigSac | TriggerDescription$ At end of combat, sacrifice CARDNAME and CARDNAME deals 5 damage to you.
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ DelayedTrig | TriggerDescription$ When CARDNAME attacks or blocks, at end of combat, sacrifice it and it deals 5 damage to you.
+T:Mode$ Blocks | ValidCard$ Card.Self | Execute$ DelayedTrig | Secondary$ True | TriggerDescription$ When CARDNAME attacks or blocks, at end of combat, sacrifice it and it deals 5 damage to you.
+SVar:DelayedTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigSac | TriggerDescription$ At end of combat, sacrifice CARDNAME and CARDNAME deals 5 damage to you.
 SVar:TrigSac:AB$Sacrifice | Cost$ 0 | Defined$ Self | SubAbility$ DBDamage
 SVar:DBDamage:DB$DealDamage | NumDmg$ 5 | Defined$ You
 SVar:RemAIDeck:True
--- a/forge-gui/res/cardsfolder/t/tolarian_entrancer.txt
+++ b/forge-gui/res/cardsfolder/t/tolarian_entrancer.txt
@@ -2,9 +2,9 @@ Name:Tolarian Entrancer
 ManaCost:1 U
 Types:Creature Human Wizard
 PT:1/1
-T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature | DelayedTrigger$ DelTrig | TriggerDescription$ Whenever CARDNAME becomes blocked by a creature, gain control of that creature at end of combat.
-SVar:DelTrig:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigGainControl | TriggerDescription$ Gain control of blocking creature.
-SVar:TrigGainControl:AB$ GainControl | Cost$ 0 | Defined$ TriggeredBlocker | NewController$ TriggeredAttackerController
+T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature | Execute$ DelTrig | TriggerDescription$ Whenever CARDNAME becomes blocked by a creature, gain control of that creature at end of combat.
+SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigGainControl | RememberObjects$ TriggeredBlocker | TriggerDescription$ Gain control of blocking creature.
+SVar:TrigGainControl:DB$ GainControl | Defined$ DelayTriggerRemembered | NewController$ You
 SVar:HasAttackEffect:Blocked
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tolarian_entrancer.jpg
 Oracle:Whenever Tolarian Entrancer becomes blocked by a creature, gain control of that creature at end of combat.
--- a/forge-gui/res/cardsfolder/v/vebulid.txt
+++ b/forge-gui/res/cardsfolder/v/vebulid.txt
@@ -4,10 +4,11 @@ Types:Creature Horror
 PT:0/0
 K:etbCounter:P1P1:1
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigPutCounter | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerDescription$ At the beginning of your upkeep, you may put a +1/+1 counter on CARDNAME.
-T:Mode$ Attacks | ValidCard$ Card.Self | DelayedTrigger$ DelTrigDestroy | TriggerDescription$ When CARDNAME attacks or blocks, destroy it at end of combat.
-T:Mode$ Blocks | ValidCard$ Card.Self | DelayedTrigger$ DelTrigDestroy | Secondary$ True | TriggerDescription$ When CARDNAME attacks or blocks, destroy it at end of combat.
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ DelTrigDestroy | TriggerDescription$ When CARDNAME attacks or blocks, destroy it at end of combat.
+T:Mode$ Blocks | ValidCard$ Card.Self | Execute$ DelTrigDestroy | Secondary$ True | TriggerDescription$ When CARDNAME attacks or blocks, destroy it at end of combat.
 SVar:TrigPutCounter:AB$ PutCounter | Cost$ 0 | Defined$ Self | CounterNum$ 1 | CounterType$ P1P1
-SVar:DelTrigDestroy:Mode$ Phase | Phase$ EndCombat | Execute$ TrigDestroy | TriggerDescription$ Destroy CARDNAME at end of combat.
-SVar:TrigDestroy:AB$Destroy | Cost$ 0 | Defined$ Self
+SVar:DelTrigDestroy:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | Execute$ TrigDestroy | TriggerDescription$ Destroy CARDNAME at end of combat.
+SVar:TrigDestroy:DB$Destroy | Defined$ Self
+DeckHas:Ability$Counters
 SVar:Picture:http://www.wizards.com/global/images/magic/general/vebulid.jpg
 Oracle:Vebulid enters the battlefield with a +1/+1 counter on it.\nAt the beginning of your upkeep, you may put a +1/+1 counter on Vebulid.\nWhen Vebulid attacks or blocks, destroy it at end of combat.
--- a/forge-gui/res/cardsfolder/v/venom.txt
+++ b/forge-gui/res/cardsfolder/v/venom.txt
@@ -3,11 +3,10 @@ ManaCost:1 G G
 Types:Enchantment Aura
 K:Enchant creature
 A:SP$ Attach | Cost$ 1 G G | ValidTgts$ Creature | AILogic$ Pump
-T:Mode$ AttackerBlockedByCreature | ValidCard$ Creature.nonWall | ValidBlocker$ Card.AttachedBy | DelayedTrigger$ DelTrigBlocked | TriggerDescription$ Whenever enchanted creature blocks or becomes blocked by a non-Wall creature, destroy the other creature at end of combat.
-T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.AttachedBy | ValidBlocker$ Creature.nonWall | DelayedTrigger$ DelTrigBlocker | Secondary$ True | TriggerDescription$ Whenever enchanted creature blocks or becomes blocked by a non-Wall creature, destroy the other creature at end of combat.
-SVar:DelTrigBlocked:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroyBlocked | TriggerDescription$ Destroy blocked creature at end of combat.
-SVar:DelTrigBlocker:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroyBlocker | TriggerDescription$ Destroy blocking creature at end of combat.
-SVar:TrigDestroyBlocked:AB$Destroy | Cost$ 0 | Defined$ TriggeredAttacker
-SVar:TrigDestroyBlocker:AB$Destroy | Cost$ 0 | Defined$ TriggeredBlocker
+T:Mode$ AttackerBlockedByCreature | ValidCard$ Creature.nonWall | ValidBlocker$ Card.AttachedBy | Execute$ DelTrigBlocked | TriggerDescription$ Whenever enchanted creature blocks or becomes blocked by a non-Wall creature, destroy the other creature at end of combat.
+T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.AttachedBy | ValidBlocker$ Creature.nonWall | Execute$ DelTrigBlocker | Secondary$ True | TriggerDescription$ Whenever enchanted creature blocks or becomes blocked by a non-Wall creature, destroy the other creature at end of combat.
+SVar:DelTrigBlocked:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredAttacker | TriggerDescription$ Destroy blocked creature at end of combat.
+SVar:DelTrigBlocker:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredBlocker | TriggerDescription$ Destroy blocking creature at end of combat.
+SVar:TrigDestroy:DB$Destroy | Defined$ DelayTriggerRemembered
 SVar:Picture:http://www.wizards.com/global/images/magic/general/venom.jpg
 Oracle:Enchant creature\nWhenever enchanted creature blocks or becomes blocked by a non-Wall creature, destroy the other creature at end of combat.
--- a/forge-gui/res/cardsfolder/v/venomous_dragonfly.txt
+++ b/forge-gui/res/cardsfolder/v/venomous_dragonfly.txt
@@ -3,11 +3,10 @@ ManaCost:3 G
 Types:Creature Insect
 PT:1/1
 K:Flying
-T:Mode$ AttackerBlockedByCreature | ValidCard$ Creature | ValidBlocker$ Card.Self | DelayedTrigger$ DelTrigBlocked | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, destroy that creature at end of combat.
-T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature | DelayedTrigger$ DelTrigBlocker | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, destroy that creature at end of combat.
-SVar:DelTrigBlocked:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroyBlocked | TriggerDescription$ Destroy blocked creature at end of combat.
-SVar:DelTrigBlocker:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroyBlocker | TriggerDescription$ Destroy blocking creature at end of combat.
-SVar:TrigDestroyBlocked:AB$Destroy | Cost$ 0 | Defined$ TriggeredAttacker
-SVar:TrigDestroyBlocker:AB$Destroy | Cost$ 0 | Defined$ TriggeredBlocker
+T:Mode$ AttackerBlockedByCreature | ValidCard$ Creature | ValidBlocker$ Card.Self | Execute$ DelTrigBlocked | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, destroy that creature at end of combat.
+T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature | Execute$ DelTrigBlocker | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, destroy that creature at end of combat.
+SVar:DelTrigBlocked:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredAttacker | TriggerDescription$ Destroy blocked creature at end of combat.
+SVar:DelTrigBlocker:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredBlocker | TriggerDescription$ Destroy blocking creature at end of combat.
+SVar:TrigDestroy:DB$Destroy | Defined$ DelayTriggerRemembered
 SVar:Picture:http://www.wizards.com/global/images/magic/general/venomous_dragonfly.jpg
 Oracle:Flying\nWhenever Venomous Dragonfly blocks or becomes blocked by a creature, destroy that creature at end of combat.
--- a/forge-gui/res/cardsfolder/w/wall_of_dust.txt
+++ b/forge-gui/res/cardsfolder/w/wall_of_dust.txt
@@ -3,8 +3,8 @@ ManaCost:2 R
 Types:Creature Wall
 PT:1/4
 K:Defender
-T:Mode$ AttackerBlocked | ValidBlocker$ Card.Self | DelayedTrigger$ DelTrig | TriggerDescription$ Whenever CARDNAME blocks a creature, that creature can't attack during its controller's next turn.
-SVar:DelTrig:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Opponent | Execute$ TrigPump | TriggerDescription$ Creatures blocked by CARDNAME can't attack this turn.
-SVar:TrigPump:DB$ Pump | Cost$ 0 | IsCurse$ True | Defined$ TriggeredAttacker | KW$ HIDDEN CARDNAME can't attack.
+T:Mode$ AttackerBlocked | ValidBlocker$ Card.Self | Execute$ DelTrig | TriggerDescription$ Whenever CARDNAME blocks a creature, that creature can't attack during its controller's next turn.
+SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Opponent | Execute$ TrigPump | RememberObjects$ TriggeredAttacker | TriggerDescription$ Creatures blocked by CARDNAME can't attack this turn.
+SVar:TrigPump:DB$ Pump | IsCurse$ True | Defined$ DelayTriggerRemembered | KW$ HIDDEN CARDNAME can't attack.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/wall_of_dust.jpg
 Oracle:Defender (This creature can't attack.)\nWhenever Wall of Dust blocks a creature, that creature can't attack during its controller's next turn.
--- a/forge-gui/res/cardsfolder/w/wall_of_junk.txt
+++ b/forge-gui/res/cardsfolder/w/wall_of_junk.txt
@@ -3,8 +3,8 @@ ManaCost:2
 Types:Artifact Creature Wall
 PT:0/7
 K:Defender
-T:Mode$ Blocks | ValidCard$ Card.Self | DelayedTrigger$ DelTrig | TriggerDescription$ When CARDNAME blocks, return it to its owner's hand at end of combat. (Return it only if it's on the battlefield.)
-SVar:DelTrig:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Opponent | Execute$ TrigBounce | TriggerDescription$ Return CARDNAME to it's owner's hand.
-SVar:TrigBounce:AB$ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Hand | Defined$ Self
+T:Mode$ Blocks | ValidCard$ Card.Self | Execute$ DelTrig | TriggerDescription$ When CARDNAME blocks, return it to its owner's hand at end of combat. (Return it only if it's on the battlefield.)
+SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Opponent | Execute$ TrigBounce | TriggerDescription$ Return CARDNAME to it's owner's hand.
+SVar:TrigBounce:DB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Defined$ Self
 SVar:Picture:http://www.wizards.com/global/images/magic/general/wall_of_junk.jpg
 Oracle:Defender (This creature can't attack.)\nWhen Wall of Junk blocks, return it to its owner's hand at end of combat. (Return it only if it's on the battlefield.)
--- a/forge-gui/res/cardsfolder/w/wall_of_resistance.txt
+++ b/forge-gui/res/cardsfolder/w/wall_of_resistance.txt
@@ -4,8 +4,7 @@ Types:Creature Wall
 PT:0/3
 K:Flying
 K:Defender
-T:Mode$ DamageDone | ValidTarget$ Card.Self | DelayedTrigger$ DelTrig | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of each end step, if CARDNAME was dealt damage this turn, put a +0/+1 counter on it.
-SVar:DelTrig:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ Player | Execute$ TrigPutCounter | Secondary$ True | IsPresent$ Card.Self | TriggerDescription$ At the beginning of each end step, if Wall of Resistance was dealt damage this turn, put a +0/+1 counter on it.
-SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ P0P1 | CounterNum$ 1
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ Player | Execute$ TrigPutCounter | IsPresent$ Card.Self+wasDealtDamageThisTurn | TriggerDescription$ At the beginning of each end step, if CARDNAME was dealt damage this turn, put a +0/+1 counter on it.
+SVar:TrigPutCounter:DB$PutCounter | Defined$ Self | CounterType$ P0P1 | CounterNum$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/wall_of_resistance.jpg
 Oracle:Defender (This creature can't attack.)\nFlying\nAt the beginning of each end step, if Wall of Resistance was dealt damage this turn, put a +0/+1 counter on it.
--- a/forge-gui/res/cardsfolder/w/wall_of_tears.txt
+++ b/forge-gui/res/cardsfolder/w/wall_of_tears.txt
@@ -3,9 +3,9 @@ ManaCost:1 U
 Types:Creature Wall
 PT:0/4
 K:Defender
-T:Mode$ AttackerBlocked | ValidCard$ Creature | ValidBlocker$ Card.Self | DelayedTrigger$ DelayedTrig | TriggerDescription$ Whenever CARDNAME blocks a creature, return that creature to its owner's hand at end of combat.
-SVar:DelayedTrig:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigBounce | TriggerDescription$ Return blocked creature to its owner's hand at end of combat.
-SVar:TrigBounce:AB$ ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Hand | Defined$ TriggeredAttacker
+T:Mode$ AttackerBlocked | ValidCard$ Creature | ValidBlocker$ Card.Self | Execute$ DelTrig | TriggerDescription$ Whenever CARDNAME blocks a creature, return that creature to its owner's hand at end of combat.
+SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigBounce | RememberObjects$ TriggeredAttacker | TriggerDescription$ Return blocked creature to its owner's hand at end of combat.
+SVar:TrigBounce:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | Defined$ DelayTriggerRemembered
 SVar:HasBlockEffect:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/wall_of_tears.jpg
 Oracle:Defender (This creature can't attack.)\nWhenever Wall of Tears blocks a creature, return that creature to its owner's hand at end of combat.
--- a/forge-gui/res/cardsfolder/w/wicker_warcrawler.txt
+++ b/forge-gui/res/cardsfolder/w/wicker_warcrawler.txt
@@ -2,9 +2,9 @@ Name:Wicker Warcrawler
 ManaCost:5
 Types:Artifact Creature Scarecrow
 PT:6/6
-T:Mode$ Attacks | ValidCard$ Card.Self | DelayedTrigger$ DelTrig | TriggerDescription$ Whenever CARDNAME attacks or blocks, put a -1/-1 counter on it at end of combat.
-T:Mode$ Blocks | ValidCard$ Card.Self | DelayedTrigger$ DelTrig | Secondary$ True | TriggerDescription$ Whenever CARDNAME attacks or blocks, put a -1/-1 counter on it at end of combat.
-SVar:DelTrig:Mode$ Phase | Phase$ EndCombat | Execute$ TrigAddCounter | TriggerDescription$ Put a -1/-1 counter on CARDNAME.
-SVar:TrigAddCounter:AB$ PutCounter | Cost$ 0 | Defined$ Self | CounterType$ M1M1 | CounterNum$ 1
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ DelTrig | TriggerDescription$ Whenever CARDNAME attacks or blocks, put a -1/-1 counter on it at end of combat.
+T:Mode$ Blocks | ValidCard$ Card.Self | Execute$ DelTrig | Secondary$ True | TriggerDescription$ Whenever CARDNAME attacks or blocks, put a -1/-1 counter on it at end of combat.
+SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | Execute$ TrigAddCounter | TriggerDescription$ Put a -1/-1 counter on CARDNAME.
+SVar:TrigAddCounter:DB$ PutCounter | Defined$ Self | CounterType$ M1M1 | CounterNum$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/wicker_warcrawler.jpg
 Oracle:Whenever Wicker Warcrawler attacks or blocks, put a -1/-1 counter on it at end of combat.
--- a/forge-gui/res/cardsfolder/w/windscouter.txt
+++ b/forge-gui/res/cardsfolder/w/windscouter.txt
@@ -3,9 +3,9 @@ ManaCost:3 U
 Types:Creature Human Scout
 PT:3/3
 K:Flying
-T:Mode$ Attacks | ValidCard$ Card.Self | DelayedTrigger$ DelTrig | TriggerDescription$ When CARDNAME attacks or blocks, return it to its owner's hand at end of combat. (Return it only if it's on the battlefield.)
-T:Mode$ Blocks | ValidCard$ Card.Self | DelayedTrigger$ DelTrig | Secondary$ True | TriggerDescription$ When CARDNAME attacks or blocks, return it to its owner's hand at end of combat. (Return it only if it's on the battlefield.)
-SVar:DelTrig:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigBounce | TriggerDescription$ Return CARDNAME to it's owner's hand.
-SVar:TrigBounce:AB$ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Hand | Defined$ Self
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ DelTrig | TriggerDescription$ When CARDNAME attacks or blocks, return it to its owner's hand at end of combat. (Return it only if it's on the battlefield.)
+T:Mode$ Blocks | ValidCard$ Card.Self | Execute$ DelTrig | Secondary$ True | TriggerDescription$ When CARDNAME attacks or blocks, return it to its owner's hand at end of combat. (Return it only if it's on the battlefield.)
+SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigBounce | TriggerDescription$ Return CARDNAME to it's owner's hand.
+SVar:TrigBounce:DB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Defined$ Self
 SVar:Picture:http://www.wizards.com/global/images/magic/general/windscouter.jpg
 Oracle:Flying\nWhen Windscouter attacks or blocks, return it to its owner's hand at end of combat. (Return it only if it's on the battlefield.)