diff --git a/res/cardsfolder/abomination.txt b/res/cardsfolder/abomination.txt
index ead3228c611..bb988d8d968 100644
--- a/res/cardsfolder/abomination.txt
+++ b/res/cardsfolder/abomination.txt
@@ -1,10 +1,14 @@
 Name:Abomination
 ManaCost:3 B B
 Types:Creature Horror
-Text:Whenever Abomination blocks or becomes blocked by a green or white creature, destroy that creature at end of combat.
+Text:no text
 PT:2/6
-K:Whenever CARDNAME blocks a creature, destroy that creature at end of combat:Creature.Green,Creature.White
-K:Whenever CARDNAME becomes blocked by a creature, destroy that creature at end of combat:Creature.Green,Creature.White
+T:Mode$ Blocks | ValidCard$ Card.Self | ValidBlocked$ Creature.Green,Creature.White | DelayedTrigger$ DelTrigBlocked | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a green or white creature, destroy that creature at end of combat.
+T:Mode$ AttackerBlocked | 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$ Each | Execute$ TrigDestroyBlocked | TriggerDescription$ Destroy blocked creature at end of combat.
+SVar:DelTrigBlocker:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Each | 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
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abomination.jpg
 SetInfo:4ED|Uncommon|http://magiccards.info/scans/en/4e/1.jpg
diff --git a/res/cardsfolder/cockatrice.txt b/res/cardsfolder/cockatrice.txt
index 772079794f9..1f7d498e9c5 100644
--- a/res/cardsfolder/cockatrice.txt
+++ b/res/cardsfolder/cockatrice.txt
@@ -1,11 +1,15 @@
 Name:Cockatrice
 ManaCost:3 G G
 Types:Creature Cockatrice
-Text:Whenever Cockatrice blocks or becomes blocked by a non-Wall creature, destroy that creature at end of combat.
+Text:no text
 PT:2/4
 K:Flying
-K:Whenever CARDNAME blocks a creature, destroy that creature at end of combat:Creature.nonWall
-K:Whenever CARDNAME becomes blocked by a creature, destroy that creature at end of combat:Creature.nonWall
+T:Mode$ Blocks | ValidCard$ Card.Self | ValidBlocked$ Creature.nonWall | DelayedTrigger$ DelTrigBlocked | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a non-Wall creature, destroy that creature at end of combat.
+T:Mode$ AttackerBlocked | 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$ Each | Execute$ TrigDestroyBlocked | TriggerDescription$ Destroy blocked creature at end of combat.
+SVar:DelTrigBlocker:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Each | 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
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cockatrice.jpg
 SetInfo:LEA|Rare|http://magiccards.info/scans/en/al/98.jpg
diff --git a/res/cardsfolder/deathgazer.txt b/res/cardsfolder/deathgazer.txt
index be6bbe41100..e3ebfbf8c5a 100644
--- a/res/cardsfolder/deathgazer.txt
+++ b/res/cardsfolder/deathgazer.txt
@@ -1,10 +1,14 @@
 Name:Deathgazer
 ManaCost:3 B
 Types:Creature Lizard
-Text:Whenever Deathgazer blocks or becomes blocked by a nonblack creature, destroy that creature at end of combat.
+Text:no text
 PT:2/2
-K:Whenever CARDNAME blocks a creature, destroy that creature at end of combat:Creature.nonBlack
-K:Whenever CARDNAME becomes blocked by a creature, destroy that creature at end of combat:Creature.nonBlack
+T:Mode$ Blocks | ValidCard$ Card.Self | ValidBlocked$ Creature.nonBlack | DelayedTrigger$ DelTrigBlocked | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a nonblack creature, destroy that creature at end of combat.
+T:Mode$ AttackerBlocked | 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$ Each | Execute$ TrigDestroyBlocked | TriggerDescription$ Destroy blocked creature at end of combat.
+SVar:DelTrigBlocker:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Each | 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
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/deathgazer.jpg
 SetInfo:8ED|Uncommon|http://magiccards.info/scans/en/8e/126.jpg
diff --git a/res/cardsfolder/dread_specter.txt b/res/cardsfolder/dread_specter.txt
index c32c4c8dad8..09beeceef27 100644
--- a/res/cardsfolder/dread_specter.txt
+++ b/res/cardsfolder/dread_specter.txt
@@ -1,10 +1,14 @@
 Name:Dread Specter
 ManaCost:3 B
 Types:Creature Specter
-Text:Whenever Dread Specter blocks or becomes blocked by a nonblack creature, destroy that creature at end of combat.
+Text:no text
 PT:2/2
-K:Whenever CARDNAME blocks a creature, destroy that creature at end of combat:Creature.nonBlack
-K:Whenever CARDNAME becomes blocked by a creature, destroy that creature at end of combat:Creature.nonBlack
+T:Mode$ Blocks | ValidCard$ Card.Self | ValidBlocked$ Creature.nonBlack | DelayedTrigger$ DelTrigBlocked | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a nonblack creature, destroy that creature at end of combat.
+T:Mode$ AttackerBlocked | 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$ Each | Execute$ TrigDestroyBlocked | TriggerDescription$ Destroy blocked creature at end of combat.
+SVar:DelTrigBlocker:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Each | 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
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dread_specter.jpg
 SetInfo:MIR|Uncommon|http://magiccards.info/scans/en/mr/17.jpg
diff --git a/res/cardsfolder/gorgon_recluse.txt b/res/cardsfolder/gorgon_recluse.txt
index a7e50397763..25198418ce3 100644
--- a/res/cardsfolder/gorgon_recluse.txt
+++ b/res/cardsfolder/gorgon_recluse.txt
@@ -3,8 +3,12 @@ ManaCost:3 B B
 Types:Creature Gorgon
 Text:Whenever Gorgon Recluse blocks or becomes blocked by a nonblack creature, destroy that creature at end of combat.
 PT:2/4
-K:Whenever CARDNAME blocks a creature, destroy that creature at end of combat:Creature.nonBlack
-K:Whenever CARDNAME becomes blocked by a creature, destroy that creature at end of combat:Creature.nonBlack
+T:Mode$ Blocks | ValidCard$ Card.Self | ValidBlocked$ Creature.nonBlack | DelayedTrigger$ DelTrigBlocked | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a nonblack creature, destroy that creature at end of combat.
+T:Mode$ AttackerBlocked | 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$ Each | Execute$ TrigDestroyBlocked | TriggerDescription$ Destroy blocked creature at end of combat.
+SVar:DelTrigBlocker:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Each | 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
 K:Madness:B B
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/gorgon_recluse.jpg
diff --git a/res/cardsfolder/infernal_medusa.txt b/res/cardsfolder/infernal_medusa.txt
index 116e5520e29..8eadaf181a0 100644
--- a/res/cardsfolder/infernal_medusa.txt
+++ b/res/cardsfolder/infernal_medusa.txt
@@ -1,10 +1,14 @@
 Name:Infernal Medusa
 ManaCost:3 B B
 Types:Creature Gorgon
-Text:Whenever Infernal Medusa blocks a creature, destroy that creature at end of combat.\r\nWhenever Infernal Medusa becomes blocked by a non-Wall creature, destroy that creature at end of combat.
+Text:no text
 PT:2/4
-K:Whenever CARDNAME blocks a creature, destroy that creature at end of combat:Creature
-K:Whenever CARDNAME becomes blocked by a creature, destroy that creature at end of combat:Creature.nonWall
+T:Mode$ Blocks | ValidCard$ Card.Self | ValidBlocked$ Creature | DelayedTrigger$ DelTrigBlocked | TriggerDescription$ Whenever CARDNAME blocks a creature, destroy that creature at end of combat.
+T:Mode$ AttackerBlocked | 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$ Each | Execute$ TrigDestroyBlocked | TriggerDescription$ Destroy blocked creature at end of combat.
+SVar:DelTrigBlocker:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Each | 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
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/infernal_medusa.jpg
 SetInfo:LEG|Uncommon|http://magiccards.info/scans/en/lg/22.jpg
diff --git a/res/cardsfolder/rock_basilisk.txt b/res/cardsfolder/rock_basilisk.txt
index 4d2206213c4..4067ac49c03 100644
--- a/res/cardsfolder/rock_basilisk.txt
+++ b/res/cardsfolder/rock_basilisk.txt
@@ -1,10 +1,14 @@
 Name:Rock Basilisk
 ManaCost:4 R G
 Types:Creature Basilisk
-Text:Whenever Rock Basilisk blocks or becomes blocked by a non-Wall creature, destroy that creature at end of combat.
+Text:no text
 PT:4/5
-K:Whenever CARDNAME blocks a creature, destroy that creature at end of combat:Creature.nonWall
-K:Whenever CARDNAME becomes blocked by a creature, destroy that creature at end of combat:Creature.nonWall
+T:Mode$ Blocks | ValidCard$ Card.Self | ValidBlocked$ Creature.nonWall | DelayedTrigger$ DelTrigBlocked | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a non-Wall creature, destroy that creature at end of combat.
+T:Mode$ AttackerBlocked | 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$ Each | Execute$ TrigDestroyBlocked | TriggerDescription$ Destroy blocked creature at end of combat.
+SVar:DelTrigBlocker:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Each | 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
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rock_basilisk.jpg
 SetInfo:MIR|Rare|http://magiccards.info/scans/en/mr/339.jpg
diff --git a/res/cardsfolder/tangle_asp.txt b/res/cardsfolder/tangle_asp.txt
index e0260effe39..4669afaadb4 100644
--- a/res/cardsfolder/tangle_asp.txt
+++ b/res/cardsfolder/tangle_asp.txt
@@ -1,10 +1,14 @@
 Name:Tangle Asp
 ManaCost:1 G
 Types:Creature Snake
-Text:Whenever Tangle Asp blocks or becomes blocked by a creature, destroy that creature at end of combat.
+Text:no text
 PT:1/2
-K:Whenever CARDNAME blocks a creature, destroy that creature at end of combat:Creature
-K:Whenever CARDNAME becomes blocked by a creature, destroy that creature at end of combat:Creature
+T:Mode$ Blocks | ValidCard$ Card.Self | ValidBlocked$ Creature | DelayedTrigger$ DelTrigBlocked | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, destroy that creature at end of combat.
+T:Mode$ AttackerBlocked | 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$ Each | Execute$ TrigDestroyBlocked | TriggerDescription$ Destroy blocked creature at end of combat.
+SVar:DelTrigBlocker:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Each | 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
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tangle_asp.jpg
 SetInfo:5DN|Common|http://magiccards.info/scans/en/5dn/94.jpg
diff --git a/res/cardsfolder/venomous_dragonfly.txt b/res/cardsfolder/venomous_dragonfly.txt
index f81470f5476..c934df5c6b7 100644
--- a/res/cardsfolder/venomous_dragonfly.txt
+++ b/res/cardsfolder/venomous_dragonfly.txt
@@ -1,11 +1,15 @@
 Name:Venomous Dragonfly
 ManaCost:3 G
 Types:Creature Insect
-Text:Whenever Venomous Dragonfly blocks or becomes blocked by a creature, destroy that creature at end of combat.
+Text:no text
 PT:1/1
 K:Flying
-K:Whenever CARDNAME blocks a creature, destroy that creature at end of combat:Creature
-K:Whenever CARDNAME becomes blocked by a creature, destroy that creature at end of combat:Creature
+T:Mode$ Blocks | ValidCard$ Card.Self | ValidBlocked$ Creature | DelayedTrigger$ DelTrigBlocked | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, destroy that creature at end of combat.
+T:Mode$ AttackerBlocked | 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$ Each | Execute$ TrigDestroyBlocked | TriggerDescription$ Destroy blocked creature at end of combat.
+SVar:DelTrigBlocker:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Each | 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
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/venomous_dragonfly.jpg
 SetInfo:MMQ|Common|http://magiccards.info/scans/en/mm/282.jpg