Macros for Enraged and Blocked

Removing macros that are not necessary. Added enrage and blocked macross. Corrosive Ooze didn't have a code and was causing problems.
2021-08-06 20:36:03 -05:00
parent b70e03a5cf
commit b97bd275e4
3 changed files with 173 additions and 185 deletions
--- a/projects/mtg/bin/Res/sets/primitives/_macros.txt
+++ b/projects/mtg/bin/Res/sets/primitives/_macros.txt
@@ -15,26 +15,56 @@
 # Dies, Evergreen
 #AUTO_DEFINE _DIES_ @movedTo(this|graveyard) from(battlefield):

+# Populate
+#AUTO_DEFINE _POPULATE_ name(Populate) clone notAtarget(creature[token]|myBattlefield)
+
+# Ferocious
+#AUTO_DEFINE _FEROCIOUS_ if type(creature[power>=4]|myBattlefield)~morethan~0 then
+
+# Attacking
+#AUTO_DEFINE _ATTACKING_ @combat(attacking) source(this):
+
+# Blocked
+#AUTO_DEFINE _BLOCKED_ @combat(blocked,turnlimited) source(this):
+
+# Heroic
+#AUTO_DEFINE _HEROIC_ @targeted(this) from(*[instant;sorcery;aura]|myCastingzone):
+
+# Rally
+#AUTO_DEFINE _RALLY_ @movedTo(other ally|myBattlefield):
+
+# Landfall
+#AUTO_DEFINE _LANDFALL_ @movedTo(land|myBattlefield):
+
+# Addendum
+#AUTO_DEFINE _ADDENDUM_ if compare(restriction{assorcery}~morethan~0) then
+
+# Constellation
+#AUTO_DEFINE _CONSTELLATION_ @movedTo(enchantment|myBattlefield):
+
+# Amass, Set WAR
+#AUTO_DEFINE _AMASS_($c) if type(army|mybattlefield)~morethan~0 then counter(1/1,$c) notATarget(army|myBattlefield) else create(Zombie Army:creature Zombie Army:0/0:black) and!(counter(1/1,$c) notATarget(army|myBattlefield))!
+
 # Scry, Evergreen
 #AUTO_DEFINE _SCRY_($c) scry:$c scrycore delayed dontshow donothing scrycoreend scryend

-# Rampage
-#AUTO_DEFINE _RAMPAGE_($c) @combat(blocked) source(this):foreach(<>=1>creature[blocking]|opponentBattlefield) $c/$c ueot
+# Fabricate
+#AUTO_DEFINE _FABRICATE_($c) transforms((,newability[choice counter(1/1.$c)],newability[choice create(Servo:Artifact Creature Servo:1/1)*$c])) ueot
+
+# Enrage
+#AUTO_DEFINE _ENRAGE_ @damaged(this):
+
+# Champion
+#AUTO_DEFINE _CHAMPION_($Word) aslongas(other $word|myBattlefield) choice notAtarget(other $word|myBattlefield) (blink)forsrc oneshot
+
+# Metalcraft
+#AUTO_DEFINE _METALCRAFT_ aslongas(artifact|mybattlefield) >2

 # Echo
 #AUTO_DEFINE _ECHO_($cost) $cost[{$c};next upkeep] sacrifice

 # Threshold
-#AUTO_DEFINE _THRESHOLD_ aslongas(*|myGraveyard) >6
-
-# Affinity
-#AUTO_DEFINE _AFFINITY_($Word) anyzone=foreach($Word|myZones) altercost(colorless,-1)
-
-# Bushido
-#AUTO_DEFINE _BUSHIDO_($c) @combat(blocking,blocked) source(this): $c/$c ueot
-
-# Soulshift
-#AUTO_DEFINE _SOULSHIFT_($c) @movedTo(this|myGraveyard) from(battlefield):may moveTo(myHand) target(creature[spirit;manacost<=$c]|myGraveyard)
+#AUTO_DEFINE _THRESHOLD_ if type(*|mygraveyard)~morethan~6

 # Splice onto Arcane
 #AUTO_DEFINE _SPLICEARCANE_ movedTo(*[Arcane]|myStack):may castcard(copied noevent) target(*[Arcane]|myHand)
@@ -42,24 +72,15 @@
 # Ripple
 #AUTO_DEFINE _RIPPLE_($c) autostack=if casted(this) then reveal:$c optionone name(Cast Card) target(<upto:$c>[share!name!]|reveal) moveTo(mylibrary) and!( becomes(tobecast) ueot )! optiononeend optiontwo name(put on bottom) target(<$c>*|reveal) bottomoflibrary optiontwoend afterrevealed all(tobecast|mylibrary) moveTo(myLibrary) and!( activate castcard(normal) )! afterrevealedend revealend

-# Recover
+# Recover                              
 #AUTO_DEFINE _RECOVER_($cost) @movedTo(creature|myGraveyard) from(Battlefield):may pay{$cost} name(Return to owner Hand) moveTo(ownerHand) all(this) donothing?moveTo(exile) all(this)

-# Champion
-#AUTO_DEFINE _CHAMPION_($Word) aslongas(other $word|myBattlefield) choice notAtarget(other $word|myBattlefield) (blink)forsrc oneshot
-
-# Evoke
-#AUTO_DEFINE _EVOKE_($cost) {$cost}:sacrifice
-
 # Clash
 $AUTO_DEFINE _CLASH_ Put here a code if compare the casting cost based on Erratic Explosion. Meaby it would work with a few fix

 # Conspire
 #AUTO_DEFINE _CONSPIRE_ @movedTo(this|myStak):may {T(creature|myBattlefield)}{T(creature|myBattlefield)} castcard(copied noevent) target(*|myStack)

-# Metalcraft
-#AUTO_DEFINE _METALCRAFT_ aslongas(artifact|mybattlefield) >2
-
 # Proliferate
 #AUTO_DEFINE _PROLIFERATE_ name(Proliferate) notatarget(<anyamount>*[artifact;creature;enchantment;land;planeswalker;player]) duplicatecounters(single)

@@ -67,44 +88,20 @@ $AUTO_DEFINE _CLASH_ Put here a code if compare the casting cost based on Errati
 #AUTO_DEFINE _OLDPROLIFERATE_ name(Proliferate) notAtarget(<anyamount>*[artifact;creature;enchantment;land;planeswalker;player]) propagate
 #AUTO_DEFINE _OLDOLDPROLIFERATE_ name(proliferate) notatarget(<anyamount>*[artifact;creature;enchantment;land;planeswalker;player]) proliferate

-# Populate
-#AUTO_DEFINE _POPULATE_ name(Populate) clone notAtarget(creature[token]|myBattlefield)
-
 # Scavenge
 #AUTO_DEFINE _SCAVENGE_($cost) name(Scavenge) autograveyard={$cost}{E}:counter(1/1,$c) target(creature) asSorcery

 # Monstrosity
 #AUTO_DEFINE _MONSTROSITY_($cost) name(Monstrosity) this(cantargetcard(*[-monstrous]) {$cost}:becomes(monstrous) forever && counter(1/1,$c)

-# Heroic
-#AUTO_DEFINE _HEROIC_ @targeted(this) from(*[instant;sorcery;aura]|myCastingzone):
-
 # Outlast
 #AUTO_DEFINE _OUTLAST_($cost) {$cost}{$cost}:counter(1/1,1) all(this) asSorcery

-# Ferocious
-#AUTO_DEFINE _FEROCIOUS_ if type(creature[power>=4]|myBattlefield)~morethan~0 then
-
-# Rally
-#AUTO_DEFINE _RALLY_ @movedTo(other ally|myBattlefield):
-
-# Landfall
-#AUTO_DEFINE _LANDFALL_ @movedTo(land|myBattlefield):
-
 # Investigate token, Shadows over Innistrad SOI
 #AUTO_DEFINE _INVESTIGATE_ create(Clue:Artifact:0/0:"{2}, Sacrifice this artifact: Draw a card.") and!( transforms((,newability[{2}{S}:draw:1 controller])) forever )!

-# Fabricate
-#AUTO_DEFINE _FABRICATE_($c) transforms((,newability[choice counter(1/1.$c)],newability[choice create(Servo:Artifact Creature Servo:1/1)*$c])) ueot
-
-# Attacking
-#AUTO_DEFINE _ATTACKING_ @combat(attacking) source(this):
-
-# Afflict
-#AUTO_DEFINE _AFFLICT_ @combat(blocked,turnlimited) source(this):life:-3 opponent
-
-# Enrage
-#AUTO_DEFINE _ENRAGE_ @damaged(this):
+# Soulshift
+#AUTO_DEFINE _SOULSHIFT_($c) @movedTo(this|myGraveyard) from(battlefield):may moveTo(myHand) target(creature[spirit;manacost<=$c]|myGraveyard)

 # Ascend, Set XLN
 #AUTO_DEFINE _ASCEND_ if type(*[city's_blessing]|mybattlefield)~lessthan~1 then transforms((,newability[if type(*|mybattlefield)~morethan~9 then create(city's_blessing:city's_blessing:0/0:shroud:indestructible)]))
@@ -133,9 +130,6 @@ $AUTO_DEFINE _CLASH_ Put here a code if compare the casting cost based on Errati
 # Adapt
 #AUTO_DEFINE _ADAPT_($c) aslongas(this[counter{1/1}<1]|myBattlefield):counter(1/1,$c)

-# Addendum
-#AUTO_DEFINE _ADDENDUM_ if compare(restriction{assorcery}~morethan~0) then
-
 # Afterlife
 #AUTO_DEFINE _AFTERLIFE_($c) @movedTo(this|graveyard) from(battlefield):create(Spirit:Creature Spirit:1/1:white,black:flying)*$c

@@ -144,9 +138,3 @@ $AUTO_DEFINE _CLASH_ Put here a code if compare the casting cost based on Errati

 # Spectacle
 #AUTO_DEFINE _SPECTACLE_($cost) compare(oplifelost)~morethan~0 {$cost}:
-
-# Amass, Set WAR
-#AUTO_DEFINE _AMASS_($c) if type(army|mybattlefield)~morethan~0 then counter(1/1,$c) notATarget(army|myBattlefield) else create(Zombie Army:creature Zombie Army:0/0:black) and!(counter(1/1,$c) notATarget(army|myBattlefield))!
-
-# Constellation
-#AUTO_DEFINE _CONSTELLATION_ @movedTo(enchantment|myBattlefield):
--- a/projects/mtg/bin/Res/sets/primitives/borderline.txt
+++ b/projects/mtg/bin/Res/sets/primitives/borderline.txt
@@ -1456,7 +1456,7 @@ type=Instant
 name=Ammit Eternal
 auto=@combatdamaged(player) from(this):removeallcounters(-1/-1)
 auto=@movedTo(*|opponentstack):counter(-1/-1,1)
-auto=@combat(blocked,turnlimited) source(this):life:-3 opponent
+auto=_BLOCKED_life:-3 opponent
 text=Afflict 3 (Whenever this creature becomes blocked, defending player loses 3 life.) -- Whenever an opponent casts a spell, put a -1/-1 counter on Ammit Eternal. -- Whenever Ammit Eternal deals combat damage to a player, remove all -1/-1 counters from it.
 mana={2}{B}
 type=Creature
@@ -2132,7 +2132,7 @@ type=Instant
 [card]
 name=Apex Altisaur
 auto=may name(Fights opponent's creature) target(creature|opponentbattlefield) dynamicability<!powerstrike eachother!>
-auto=@damaged(this):may name(Fights opponent's creature) target(creature|opponentbattlefield) dynamicability<!powerstrike eachother!>
+auto=_ENRAGE_may name(Fights opponent's creature) target(creature|opponentbattlefield) dynamicability<!powerstrike eachother!>
 text=When Apex Altisaur enters the battlefield, it fights up to one target creature you don't control. -- Enrage — Whenever Apex Altisaur is dealt damage, it fights up to one target creature you don't control.
 mana={7}{G}{G}
 type=Creature
@@ -2692,7 +2692,7 @@ toughness=5
 name=Archfiend of Spite
 abilities=flying,madness
 autoexile=restriction{discarded} pay({3}{B}{B}) name(pay 3BB to cast) activate name(pay 2G to cast) castcard(normal)?name(put in graveyard) moveto(ownergraveyard)
-auto=@damaged(this):life:-thatmuch opponent donothing?sacrifice notatarget(*|mybattlefield)!$ opponent
+auto=_ENRAGE_life:-thatmuch opponent donothing?sacrifice notatarget(*|mybattlefield)!$ opponent
 text=Flying -- Whenever a source an opponent controls deals damage to Archfiend of Spite, that source's controller loses that much life unless they sacrifice that many permanents. -- Madness {3}{B}{B} (If you discard this card, discard it into exile. When you do, cast it for its madness cost or put it into your graveyard.)
 mana={5}{B}{B}
 type=Creature
@@ -5277,7 +5277,7 @@ toughness=6
 [/card]
 [card]
 name=Bellowing Aegisaur
-auto=@damaged(this):counter(1/1,1) all(other creature|mybattlefield)
+auto=_ENRAGE_counter(1/1,1) all(other creature|mybattlefield)
 text=Enrage — Whenever Bellowing Aegisaur is dealt damage, put a +1/+1 counter on each other creature you control.
 mana={5}{W}
 type=Creature
@@ -6741,7 +6741,7 @@ toughness=3
 name=Body of Knowledge
 abilities=nomaxhand
 anyzone=type:*:myhand/type:*:myhand cdaactive
-auto=@damaged(this):draw:thatmuch controller
+auto=_ENRAGE_draw:thatmuch controller
 text=Body of Knowledge's power and toughness are each equal to the number of cards in your hand. -- You have no maximum hand size. -- Whenever Body of Knowledge is dealt damage, draw that many cards.
 mana={3}{U}{U}
 type=Creature
@@ -7514,7 +7514,7 @@ type=Land
 [card]
 name=Brash Taunter
 abilities=indestructible
-auto=@damaged(this):damage:thatmuch opponent
+auto=_ENRAGE_damage:thatmuch opponent
 auto={2}{R}{T}:transforms((,newability[target(other creature|battlefield) dynamicability<!powerstrike eachother!>])) oneshot
 text=Indestructible -- Whenever Brash Taunter is dealt damage, it deals that much damage to target opponent. -- {2}{R}, {T}: Brash Taunter fights another target creature.
 mana={4}{R}
@@ -8349,7 +8349,7 @@ toughness=1
 [/card]
 [card]
 name=Cacophodon
-auto=@damaged(this):untap target(*)
+auto=_ENRAGE_untap target(*)
 text=Enrage — Whenever Cacophodon is dealt damage, untap target permanent.
 mana={3}{G}
 type=Creature
@@ -8504,7 +8504,7 @@ type=Sorcery
 [card]
 name=Callous Giant
 abilities=undamageable
-auto=@damaged(this):if compare(thatmuch)~morethan~3 then 0/-thatmuch ueot
+auto=_ENRAGE_if compare(thatmuch)~morethan~3 then 0/-thatmuch ueot
 text=If a source would deal 3 or less damage to Callous Giant, prevent that damage.
 mana={4}{R}{R}
 type=Creature
@@ -12303,7 +12303,7 @@ toughness=4
 [/card]
 [card]
 name=Corrosive Ooze
-auto=@Corrosive Ooze blocks or becomes blocked by an equipped creaturedestroy all equipment attached that creature at end of combat
+auto=
 text=Whenever Corrosive Ooze blocks or becomes blocked by an equipped creature, destroy all Equipment attached to that creature at end of combat.
 mana={1}{G}
 type=Creature
@@ -13611,7 +13611,7 @@ toughness=3
 [card]
 name=Dagger of the Worthy
 auto=teach(creature) 2/0
-auto=teach(creature) transforms((,newability[@combat(blocked,turnlimited) source(this):life:-1 opponent])) forever
+auto=teach(creature) transforms((,newability[_BLOCKED_life:-1 opponent])) forever
 auto={2}:equip
 text=Equipped creature gets +2/+0 and has afflict 1. (Whenever it becomes blocked, defending player loses 1 life.) -- Equip {2} ({2}: Attach to target creature you control. Equip only as a sorcery.)
 mana={2}
@@ -16822,7 +16822,7 @@ toughness=7
 [card]
 name=Dralnu, Lich Lord
 abilities=undamageable
-auto=@damaged(this):ability$!name(sacrifice) notatarget(<storedthatmuch>*|mybattlefield) sacrifice!$ controller
+auto=_ENRAGE_ability$!name(sacrifice) notatarget(<storedthatmuch>*|mybattlefield) sacrifice!$ controller
 auto={T}:name(Instant or sorcery gains flashback) target(*[instant;sorcery]|myGraveyard) transforms((,newability[canplayfromgraveyard],newability[gainedexiledeath])) ueot
 text=If damage would be dealt to Dralnu, Lich Lord, sacrifice that many permanents instead.  -- {T}: Target instant or sorcery card in your graveyard gains flashback until end of turn. The flashback cost is equal to its mana cost. (You may cast that card from your graveyard for its flashback cost. Then exile it.)
 mana={3}{U}{B}
@@ -19640,7 +19640,7 @@ toughness=3
 [card]
 name=Eternal of Harsh Truths
 auto=@combat(notblocked) source(this):draw:1
-auto=@combat(blocked,turnlimited) source(this):life:-2 opponent
+auto=_BLOCKED_life:-2 opponent
 text=Afflict 2 (Whenever this creature becomes blocked, defending player loses 2 life.) -- Whenever Eternal of Harsh Truths attacks and isn't blocked, draw a card.
 mana={2}{U}
 type=Creature
@@ -19789,7 +19789,7 @@ toughness=2
 name=Everlasting Torment
 #MISSING:Damage can't be prevented
 abilities=nolifegain,nolifegainopponent
-auto=lord(creature|battlefield) transforms((,newability[undamageable],newability[@damaged(this):counter(-1/-1.thatmuch)]))
+auto=lord(creature|battlefield) transforms((,newability[undamageable],newability[_ENRAGE_counter(-1/-1.thatmuch)]))
 text=Players can't gain life. -- Damage can't be prevented. -- All damage is dealt as though its source had wither. (A source with wither deals damage to creatures in the form of -1/-1 counters.)
 mana={2}{BR}
 type=Enchantment
@@ -22596,7 +22596,7 @@ toughness=4
 [card]
 name=Flumph
 abilities=defender,flying
-auto=@damaged(this):name(Draw a card) draw:1 controller && draw:1 opponent
+auto=_ENRAGE_name(Draw a card) draw:1 controller && draw:1 opponent
 text=Defender, flying -- Whenever Flumph is dealt damage, you and target opponent each draw a card.
 mana={1}{W}
 type=Creature
@@ -23244,7 +23244,7 @@ type=Instant
 [/card]
 [card]
 name=Frilled Deathspitter
-auto=@damaged(this):damage:2 target(opponent,planeswalker)
+auto=_ENRAGE_damage:2 target(opponent,planeswalker)
 text=Enrage — Whenever Frilled Deathspitter is dealt damage, it deals 2 damage to target opponent or planeswalker.
 mana={2}{R}
 type=Creature
@@ -23340,7 +23340,7 @@ toughness=4
 [card]
 name=Frontline Devastator
 auto={1}{R}:1/0
-auto=@combat(blocked,turnlimited) source(this):life:-2 opponent
+auto=_BLOCKED_life:-2 opponent
 text=Afflict 2 (Whenever this creature becomes blocked, defending player loses 2 life.) -- {1}{R}: Frontline Devastator gets +1/+0 until end of turn.
 mana={3}{R}
 type=Creature
@@ -25089,7 +25089,7 @@ subtype=Equipment
 [card]
 name=Glarecaster
 abilities=flying
-auto={5}{W}:transforms((,newability[undamageable],newability[@damaged(this):damage:thatmuch target(player^creature)],newability[@damageof(player):life:thatmuch controller && damage:thatmuch target(player^creature)])) ueot
+auto={5}{W}:transforms((,newability[undamageable],newability[_ENRAGE_damage:thatmuch target(player^creature)],newability[@damageof(player):life:thatmuch controller && damage:thatmuch target(player^creature)])) ueot
 text=Flying -- {5}{W}: The next time damage would be dealt to Glarecaster and/or you this turn, that damage is dealt to target creature or player instead.
 mana={4}{W}{W}
 type=Creature
@@ -30054,7 +30054,7 @@ toughness=5
 name=Hungering Hydra
 abilities=oneblocker
 auto=counter(1/1,X)
-auto=@damaged(this):counter(1/1)*thatmuch
+auto=_ENRAGE_counter(1/1)*thatmuch
 text=Hungering Hydra enters the battlefield with X +1/+1 counters on it. -- Hungering Hydra can't be blocked by more than one creature. -- Whenever Hungering Hydra is dealt damage, put that many +1/+1 counters on it. (It must survive the damage to get the counters.)
 mana={X}{G}
 type=Creature
@@ -30958,7 +30958,7 @@ toughness=3
 [/card]
 [card]
 name=Imperial Ceratops
-auto=@damaged(this):life:2 controller
+auto=_ENRAGE_life:2 controller
 text=Enrage — Whenever Imperial Ceratops is dealt damage, you gain 2 life.
 mana={4}{W}
 type=Creature
@@ -34190,7 +34190,7 @@ toughness=3
 [/card]
 [card]
 name=Khenra Eternal
-auto=@combat(blocked,turnlimited) source(this):life:-1 opponent
+auto=_BLOCKED_life:-1 opponent
 text=Afflict 1 (Whenever this creature becomes blocked, defending player loses 1 life.)
 mana={1}{B}
 type=Creature
@@ -38442,7 +38442,7 @@ toughness=1
 [card]
 name=Manticore Eternal
 abilities=mustattack
-auto=@combat(blocked,turnlimited) source(this):life:-3 opponent
+auto=_BLOCKED_life:-3 opponent
 text=Afflict 3 (Whenever this creature becomes blocked, defending player loses 3 life.) -- Manticore Eternal attacks each combat if able.
 mana={3}{R}{R}
 type=Creature
@@ -39320,7 +39320,7 @@ toughness=2
 [card]
 name=Merciless Eternal
 auto={2}{B}{D}:+2/+2 ueot
-auto=@combat(blocked,turnlimited) source(this):life:-2 opponent
+auto=_BLOCKED_life:-2 opponent
 text=Afflict 2 (Whenever this creature becomes blocked, defending player loses 2 life.) -- {2}{B}, Discard a card: Merciless Eternal gets +2/+2 until end of turn.
 mana={2}{B}
 type=Creature
@@ -40052,7 +40052,7 @@ type=Enchantment
 [/card]
 [card]
 name=Mirrorwood Treefolk
-auto={2}{R}{W}:transforms((,newability[undamageable],newability[@damaged(this):damage:thatmuch target(player^creature)])) ueot
+auto={2}{R}{W}:transforms((,newability[undamageable],newability[_ENRAGE_damage:thatmuch target(player^creature)])) ueot
 text={2}{R}{W}: The next time damage would be dealt to Mirrorwood Treefolk this turn, that damage is dealt to target creature or player instead.
 mana={3}{G}
 type=Creature
@@ -41711,7 +41711,7 @@ toughness=1
 [/card]
 [card]
 name=Needletooth Raptor
-auto=@damaged(this):damage:5 target(creature|opponentBattlefield)
+auto=_ENRAGE_damage:5 target(creature|opponentBattlefield)
 text=Enrage — Whenever Needletooth Raptor is dealt damage, it deals 5 damage to target creature an opponent controls.
 mana={3}{R}
 type=Creature
@@ -41753,7 +41753,7 @@ toughness=4
 [/card]
 [card]
 name=Neheb, the Eternal
-auto=@combat(blocked,turnlimited) source(this):life:-3 opponent
+auto=_BLOCKED_life:-3 opponent
 auto=@each my secondmain:counter(0/0,oplifelost,redmana) && transforms((,newability[thisforeach(counter{0/0.oplifelost.redmana}) add{R}])) ueot
 auto=@each endofturn:removeallcounters(0/0,1,redmana)
 text=Afflict 3 (Whenever this creature becomes blocked, defending player loses 3 life.) -- At the beginning of your postcombat main phase, add {R} to your mana pool for each 1 life your opponents have lost this turn.
@@ -41812,7 +41812,7 @@ type=Land
 [card]
 name=Nessian Boar
 abilities=lure
-auto=@combat(blocking,blocked) source(this) from(creature):draw:1 opponent
+auto=_BLOCKED_draw:1 opponent
 text=All creatures able to block Nessian Boar do so. -- Whenever Nessian Boar becomes blocked by a creature, that creature’s controller draws a card.
 mana={3}{G}{G}
 type=Creature
@@ -43840,8 +43840,8 @@ toughness=1
 [/card]
 [card]
 name=Oracle's Attendants
-auto={T}:name(Target your creature) target(creature|mybattlefield) transforms((,newability[undamageable],newability[@damaged(this):damage:thatmuch target(Oracle's Attendants|mybattlefield)])) ueot
-auto={T}:name(Target opponent's creature) target(creature|opponentbattlefield) transforms((,newability[undamageable],newability[@damaged(this):damage:thatmuch target(Oracle's Attendants|opponentbattlefield)])) ueot
+auto={T}:name(Target your creature) target(creature|mybattlefield) transforms((,newability[undamageable],newability[_ENRAGE_damage:thatmuch target(Oracle's Attendants|mybattlefield)])) ueot
+auto={T}:name(Target opponent's creature) target(creature|opponentbattlefield) transforms((,newability[undamageable],newability[_ENRAGE_damage:thatmuch target(Oracle's Attendants|opponentbattlefield)])) ueot
 text={T}: All damage that would be dealt to target creature this turn by a source of your choice is dealt to Oracle's Attendants instead.
 mana={3}{W}
 type=Creature
@@ -44460,7 +44460,7 @@ toughness=4
 [/card]
 [card]
 name=Overgrown Armasaur
-auto=@damaged(this):create(saproling:creature saproling:1/1:green:)
+auto=_ENRAGE_create(saproling:creature saproling:1/1:green:)
 text=Enrage — Whenever Overgrown Armasaur is dealt damage, create a 1/1 green Saproling creature token.
 mana={3}{G}{G}
 type=Creature
@@ -44764,7 +44764,7 @@ toughness=7
 [card]
 name=Palladia-Mors, the Ruiner
 abilities=flying, opponentshroud, vigilance, trample
-auto=@damaged(this):-opponentshroud forever
+auto=_ENRAGE_-opponentshroud forever
 text=Flying, vigilance, trample -- Palladia-Mors, the Ruiner has hexproof if it hasn't dealt damage yet.
 mana={3}{R}{G}{W}
 type=Legendary Creature
@@ -46284,7 +46284,7 @@ type=Instant
 [/card]
 [card]
 name=Polyraptor
-auto=@damaged(this):token(polyraptor)
+auto=_ENRAGE_token(polyraptor)
 text=Enrage — Whenever Polyraptor is dealt damage, create a token that's a copy of Polyraptor.
 mana={6}{G}{G}
 type=Creature
@@ -47247,7 +47247,7 @@ toughness=1
 [card]
 name=Proud Wildbonder
 abilities=trample
-auto=lord(creature[trample]|myBattlefield) transforms((,newability[@combat(blocked,turnlimited) source(this):may name(assign combat damage to defending player) thisforeach(power>=1) damage:1 opponent && fog from(this)]))
+auto=lord(creature[trample]|myBattlefield) transforms((,newability[_BLOCKED_may name(assign combat damage to defending player) thisforeach(power>=1) damage:1 opponent && fog from(this)]))
 text=Trample -- Creatures you control with trample have "You may have this creature assign its combat damage as though it weren't blocked."
 mana={2}{RG}{RG}
 type=Creature
@@ -48299,7 +48299,7 @@ type=Artifact
 [/card]
 [card]
 name=Rakdos Roustabout
-auto=@combat(blocked,turnlimited) source(this):damage:1 opponent
+auto=_BLOCKED_damage:1 opponent
 text=Whenever Rakdos Roustabout becomes blocked, it deals 1 damage to the player or planeswalker it's attacking.
 mana={1}{B}{R}
 type=Creature
@@ -48644,7 +48644,7 @@ toughness=3
 [/card]
 [card]
 name=Ranging Raptors
-auto=@damaged(this):may moveto(mybattlefield) target(basic|mylibrary) && tap
+auto=_ENRAGE_may moveto(mybattlefield) target(basic|mylibrary) && tap
 text=Enrage — Whenever Ranging Raptors is dealt damage, you may search your library for a basic land card, put it onto the battlefield tapped, then shuffle your library.
 mana={2}{G}
 type=Creature
@@ -48706,7 +48706,7 @@ toughness=1
 [card]
 name=Raptor Hatchling
 abilities=trample
-auto=@damaged(this):token(Dinosaur,creature Dinosaur,3/3,green)
+auto=_ENRAGE_token(Dinosaur,creature Dinosaur,3/3,green)
 text=Enrage — Whenever Raptor Hatchling is dealt damage, create a 3/3 green Dinosaur creature token with trample.
 mana={1}{R}
 type=Creature
@@ -48803,7 +48803,7 @@ toughness=2
 [/card]
 [card]
 name=Ravenous Daggertooth
-auto=@damaged(this):life:2 controller
+auto=_ENRAGE_life:2 controller
 text=Enrage — Whenever Ravenous Daggertooth is dealt damage, you gain 2 life.
 mana={2}{G}
 type=Creature
@@ -50685,7 +50685,7 @@ type=Sorcery
 [/card]
 [card]
 name=Ripjaw Raptor
-auto=@damaged(this):draw:1 controller
+auto=_ENRAGE_draw:1 controller
 text=Enrage — Whenever Ripjaw Raptor is dealt damage, draw a card.
 mana={2}{G}{G}
 type=Creature
@@ -55880,7 +55880,7 @@ toughness=3
 [card]
 name=Siege Behemoth
 abilities=opponentshroud
-auto=_ATTACKING_all(creature|mybattlefield) transforms((,newability[@combat(blocked,turnlimited) source(this):may name(assign combat damage to defending player) thisforeach(power>=1) damage:1 opponent],newability[fog from(this)])) ueot
+auto=_ATTACKING_all(creature|mybattlefield) transforms((,newability[_BLOCKED_may name(assign combat damage to defending player) thisforeach(power>=1) damage:1 opponent],newability[fog from(this)])) ueot
 text=Hexproof -- As long as Siege Behemoth is attacking, for each creature you control, you may have that creature assign its combat damage as though it weren't blocked.
 mana={5}{G}{G}
 type=Creature
@@ -55939,7 +55939,7 @@ toughness=3
 [/card]
 [card]
 name=Siegehorn Ceratops
-auto=@damaged(this):counter(1/1,2)
+auto=_ENRAGE_counter(1/1,2)
 text=Enrage — Whenever Siegehorn Ceratops is dealt damage, put two +1/+1 counters on it. (It must survive the damage to get the counters.)
 mana={G}{W}
 type=Creature
@@ -56188,7 +56188,7 @@ type=Artifact Land
 [/card]
 [card]
 name=Silverclad Ferocidons
-auto=@damaged(this) from(*|opponentstack,opponentbattlefield):ability$!name(sacrifice a permanent) notatarget(*|mybattlefield) sacrifice!$ opponent
+auto=_ENRAGE_ability$!name(sacrifice a permanent) notatarget(*|mybattlefield) sacrifice!$ opponent
 text=Enrage — Whenever Silverclad Ferocidons is dealt damage, each opponent sacrifices a permanent.
 mana={5}{R}{R}
 type=Creature
@@ -56555,8 +56555,8 @@ toughness=5
 name=Sivvi's Valor
 other={T(creature[-tapped]|mybattlefield)} name(Tap a creature)
 otherrestriction=type(plains|mybattlefield)~morethan~0,type(creature[-tapped]|mybattlefield)~morethan~0
-auto=choice name(Target your creature) target(creature|mybattlefield) transforms((,newability[undamageable],newability[@damaged(this):damage:thatmuch controller])) ueot
-auto=choice name(Target opponent's creature) target(creature|opponentbattlefield) transforms((,newability[undamageable],newability[@damaged(this):damage:thatmuch opponent])) ueot
+auto=choice name(Target your creature) target(creature|mybattlefield) transforms((,newability[undamageable],newability[_ENRAGE_damage:thatmuch controller])) ueot
+auto=choice name(Target opponent's creature) target(creature|opponentbattlefield) transforms((,newability[undamageable],newability[_ENRAGE_damage:thatmuch opponent])) ueot
 text=If you control a Plains, you may tap an untapped creature you control rather than pay Sivvi's Valor's mana cost. -- All damage that would be dealt to target creature this turn is dealt to you instead.
 mana={2}{W}
 type=Instant
@@ -57627,7 +57627,7 @@ toughness=5
 [card]
 name=Snapping Sailback
 abilities=flash
-auto=@damaged(this):counter(1/1,1)
+auto=_ENRAGE_counter(1/1,1)
 text=Flash -- Enrage — Whenever Snapping Sailback is dealt damage, put a +1/+1 counter on it. (It must survive the damage to get the counter.)
 mana={4}{G}
 type=Creature
@@ -58907,7 +58907,7 @@ toughness=4
 name=Spellweaver Eternal
 abilities=prowess
 auto=@movedTo(*[-creature]|mystack):1/1 ueot
-auto=@combat(blocked,turnlimited) source(this):life:-2 opponent
+auto=_BLOCKED_life:-2 opponent
 text=Prowess (Whenever you cast a noncreature spell, this creature gets +1/+1 until end of turn.) -- Afflict 2 (Whenever this creature becomes blocked, defending player loses 2 life.)
 mana={1}{U}
 type=Creature
@@ -59527,7 +59527,7 @@ toughness=2
 name=Sporeweb Weaver
 abilities=reach
 auto=cantbetargetof(*[blue])
-auto=@damaged(this):life:1 controller && token(Saproling Spo)
+auto=_ENRAGE_life:1 controller && token(Saproling Spo)
 text=Reach, hexproof from blue -- Whenever Sporeweb Weaver is dealt damage, you gain 1 life and create a 1/1 green Saproling creature token.
 mana={2}{G}
 type=Creature
@@ -61288,7 +61288,7 @@ toughness=5
 [/card]
 [card]
 name=Sun-Crowned Hunters
-auto=@damaged(this):damage:3 target(opponent)
+auto=_ENRAGE_damage:3 target(opponent)
 text=Enrage — Whenever Sun-Crowned Hunters is dealt damage, it deals 3 damage to target opponent.
 mana={4}{R}{R}
 type=Creature
@@ -62983,7 +62983,7 @@ toughness=4
 [/card]
 [card]
 name=Temple Altisaur
-auto=lord(other dinosaur|mybattlefield) transforms((,newability[undamageable],newability[@damaged(this):0/-1 ueot]))
+auto=lord(other dinosaur|mybattlefield) transforms((,newability[undamageable],newability[_ENRAGE_0/-1 ueot]))
 text=If a source would deal damage to another Dinosaur you control, prevent all but 1 of that damage.
 mana={4}{W}
 type=Creature
@@ -65056,7 +65056,7 @@ subtype=Legend
 [/card]
 [card]
 name=Tin Street Cadet 
-auto=@combat(blocked) source(this):token(Goblin,Creature Goblin,1/1,red)
+auto=_BLOCKED_token(Goblin,Creature Goblin,1/1,red)
 text=Whenever Tin Street Cadet becomes blocked, create a 1/1 red Goblin creature token.
 mana={R}
 type=Creature
@@ -65864,7 +65864,7 @@ toughness=3
 [/card]
 [card]
 name=Trapjaw Tyrant
-auto=@damaged(this):(blink)forsrc target(creature|opponentbattlefield)
+auto=_ENRAGE_(blink)forsrc target(creature|opponentbattlefield)
 text=Enrage — Whenever Trapjaw Tyrant is dealt damage, exile target creature an opponent controls until Trapjaw Tyrant leaves the battlefield.
 mana={3}{W}{W}
 type=Creature
@@ -65916,7 +65916,7 @@ type=Enchantment
 [card]
 name=Treacherous Link
 target=creature
-auto=teach(creature) transforms((,newability[undamageable],newability[@damaged(this):damage:thatmuch controller]))
+auto=teach(creature) transforms((,newability[undamageable],newability[_ENRAGE_damage:thatmuch controller]))
 text=Enchant creature -- All damage that would be dealt to enchanted creature is dealt to its controller instead.
 mana={1}{B}
 type=Enchantment
@@ -66331,7 +66331,7 @@ toughness=1
 name=Truefire Captain
 abilities=mentor
 auto=_ATTACKING_name(Choose attacking creature) transforms((,newability[target(other creature[attacking;power<=pminus1minusend]|myBattlefield) counter(1/1)])) oneshot
-auto=@damaged(this):damage:thatmuch target(player)
+auto=_ENRAGE_damage:thatmuch target(player)
 text=Mentor (Whenever this creature attacks, put a +1/+1 counter on target attacking creature with lesser power.) -- Whenever Truefire Captain is dealt damage, it deals that much damage to target player.
 mana={R}{R}{W}{W}
 type=Creature
@@ -67506,7 +67506,7 @@ type=Instant
 [card]
 name=Urban Daggertooth
 abilities=vigilance
-auto=@damaged(this):_PROLIFERATE_
+auto=_ENRAGE__PROLIFERATE_
 text=Vigilance -- Enrage — Whenever Urban Daggertooth is dealt damage, proliferate. (Choose any number of permanents and/or players, then give each another counter of each kind already there.)
 mana={2}{G}{G}
 type=Creature
@@ -69736,7 +69736,7 @@ type=Sorcery
 [/card]
 [card]
 name=Vrondiss, Rage of Ancients
-auto=@damaged(this):may name(Create Dragon) token(Dragon Spirit,Creature Dragon Spirit,5/4,red,green) and!( transforms((,newability[@damaged(creature) from(this):all(this) sacrifice],newability[@damaged(player) from(this):all(this) sacrifice])) forever )! 
+auto=_ENRAGE_may name(Create Dragon) token(Dragon Spirit,Creature Dragon Spirit,5/4,red,green) and!( transforms((,newability[@damaged(creature) from(this):all(this) sacrifice],newability[@damaged(player) from(this):all(this) sacrifice])) forever )! 
 auto=@dierolled(*|battlefield) from(controller):may name(Deal 1 damage) damage:1 all(this)
 text=Enrage — Whenever Vrondiss, Rage of Ancients is dealt damage, you may create a 5/4 red and green Dragon Spirit creature token with "When this creature deals damage, sacrifice it." -- Whenever you roll one or more dice, you may have Vrondiss, Rage of Ancients deal 1 damage to itself.
 mana={3}{R}{G}
@@ -70908,7 +70908,7 @@ toughness=3
 [/card]
 [card]
 name=Wildfire Eternal
-auto=@combat(blocked) source(this):life:-4 opponent
+auto=_BLOCKED_life:-4 opponent
 auto=@combat(notblocked) source(this):target(*[instant;sorcery]|myHand) and! ( activate castcard(normal) )!
 text=Afflict 4 (Whenever this creature becomes blocked, defending player loses 4 life.) -- Whenever Wildfire Eternal attacks and isn’t blocked, you may cast an instant or sorcery card from your hand without paying its mana cost.
 mana={3}{R}
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -4958,7 +4958,7 @@ toughness=4
 [/card]
 [card]
 name=Arcbond
-auto=target(creature) transforms((,newability[@damaged(this):damage:thatmuch all(other creature|battlefield)],newability[@damaged(this):damage:thatmuch all(player)])) ueot
+auto=target(creature) transforms((,newability[_ENRAGE_damage:thatmuch all(other creature|battlefield)],newability[_ENRAGE_damage:thatmuch all(player)])) ueot
 text=Choose target creature. Whenever that creature is dealt damage this turn, it deals that much damage to each other creature and each player.
 mana={2}{R}
 type=Instant
@@ -13951,7 +13951,7 @@ toughness=2
 [/card]
 [card]
 name=Boros Reckoner
-auto=@damaged(this):damage:thatmuch target(creature,player)
+auto=_ENRAGE_damage:thatmuch target(creature,player)
 auto={RW}:first strike ueot
 text=Whenever Boros Reckoner is dealt damage, it deals that much damage to target creature or player. -- {RW}: Boros Reckoner gains first strike until end of turn.
 mana={RW}{RW}{RW}
@@ -15289,7 +15289,7 @@ toughness=3
 name=Broodhatch Nantuko
 facedown={3}
 autofacedown={2}{G}:morph
-auto=@damaged(this):may token(Insect,Creature Insect,1/1,green)*thatmuch
+auto=_ENRAGE_may token(Insect,Creature Insect,1/1,green)*thatmuch
 text=Whenever Broodhatch Nantuko is dealt damage, you may put that many 1/1 green Insect creature tokens onto the battlefield. -- Morph {2}{G} (You may cast this face down as a 2/2 creature for {3}. Turn it face up any time for its morph cost.)
 mana={1}{G}
 type=Creature
@@ -18571,7 +18571,7 @@ subtype=Aura
 [/card]
 [card]
 name=Chambered Nautilus
-auto=@combat(blocked,turnlimited) source(this):may draw:1 controller
+auto=_BLOCKED_may draw:1 controller
 text=Whenever Chambered Nautilus becomes blocked, you may draw a card.
 mana={2}{U}
 type=Creature
@@ -21025,7 +21025,7 @@ toughness=3
 [/card]
 [card]
 name=Coalhauler Swine
-auto=@damaged(this):damage:thatmuch all(player)
+auto=_ENRAGE_damage:thatmuch all(player)
 text=Whenever Coalhauler Swine is dealt damage, it deals that much damage to each player.
 mana={4}{R}{R}
 type=Creature
@@ -22753,7 +22753,7 @@ toughness=2
 [card]
 name=Corrupt Official
 auto={2}{B}:regenerate
-auto=@combat(blocked,turnlimited) source(this):discard:1 opponent
+auto=_BLOCKED_discard:1 opponent
 text={2}{B}: Regenerate Corrupt Official. -- Whenever Corrupt Official becomes blocked, defending player discards a card at random.
 mana={4}{B}
 type=Creature
@@ -27129,7 +27129,7 @@ toughness=1
 [/card]
 [card]
 name=Deathcoil Wurm
-auto=@combat(blocked,turnlimited) source(this):may name(assign combat damage to defending player) thisforeach(power>=1) damage:1 opponent && fog from(this)
+auto=_BLOCKED_may name(assign combat damage to defending player) thisforeach(power>=1) damage:1 opponent && fog from(this)
 text=You may have Deathcoil Wurm assign its combat damage as though it weren't blocked.
 mana={6}{G}{G}
 type=Creature
@@ -27718,7 +27718,7 @@ toughness=6
 name=Deep-Slumber Titan
 abilities=doesnotuntap
 auto=tap(noevent)
-auto=@damaged(this):untap
+auto=_ENRAGE_untap
 text=Deep-Slumber Titan enters the battlefield tapped. -- Deep-Slumber Titan doesn't untap during your untap step. -- Whenever Deep-Slumber Titan is dealt damage, untap it.
 mana={2}{R}{R}
 type=Creature
@@ -27805,7 +27805,7 @@ toughness=1
 [/card]
 [card]
 name=Deepwood Tantiv
-auto=@combat(blocked,turnlimited) source(this):life:2 controller
+auto=_BLOCKED_life:2 controller
 text=Whenever Deepwood Tantiv becomes blocked, you gain 2 life.
 mana={4}{G}
 type=Creature
@@ -27815,7 +27815,7 @@ toughness=4
 [/card]
 [card]
 name=Deepwood Wolverine
-auto=@combat(blocked,turnlimited) source(this):2/0 ueot
+auto=_BLOCKED_2/0 ueot
 text=Whenever Deepwood Wolverine becomes blocked, it gets +2/+0 until end of turn.
 mana={G}
 type=Creature
@@ -31995,7 +31995,7 @@ toughness=3
 [/card]
 [card]
 name=Drelnoch
-auto=@combat(blocked,turnlimited) source(this):may draw:2 controller
+auto=_BLOCKED_may draw:2 controller
 text=Whenever Drelnoch becomes blocked, you may draw two cards.
 mana={4}{U}
 type=Creature
@@ -32170,7 +32170,7 @@ toughness=3
 [/card]
 [card]
 name=Dromad Purebred
-auto=@damaged(this):life:1 controller
+auto=_ENRAGE_life:1 controller
 text=Whenever Dromad Purebred is dealt damage, you gain 1 life.
 mana={4}{W}
 type=Creature
@@ -33063,7 +33063,7 @@ toughness=2
 [/card]
 [card]
 name=Duskworker
-auto=@combat(blocked,turnlimited) source(this):all(this) regenerate
+auto=_BLOCKED_all(this) regenerate
 auto={3}:1/0
 text=Whenever Duskworker becomes blocked, regenerate it. -- {3}: Duskworker gets +1/+0 until end of turn.
 mana={4}
@@ -33180,7 +33180,7 @@ type=Enchantment
 [/card]
 [card]
 name=Dwarven Berserker
-auto=@combat(blocked,turnlimited) source(this):all(this) 3/0 ueot && all(this) trample ueot
+auto=_BLOCKED_all(this) 3/0 ueot && all(this) trample ueot
 text=Whenever Dwarven Berserker becomes blocked, it gets +3/+0 and gains trample until end of turn.
 mana={1}{R}
 type=Creature
@@ -40430,7 +40430,7 @@ toughness=2
 [/card]
 [card]
 name=Filthy Cur
-auto=@damaged(this):life:-thatmuch controller
+auto=_ENRAGE_life:-thatmuch controller
 text=Whenever Filthy Cur is dealt damage, you lose that much life.
 mana={1}{B}
 type=Creature
@@ -40688,7 +40688,7 @@ subtype=Aura
 [/card]
 [card]
 name=Firedrinker Satyr
-auto=@damaged(this):damage:thatmuch controller
+auto=_ENRAGE_damage:thatmuch controller
 auto={1}{R}:1/0 ueot && damage:1 controller
 text=Whenever Firedrinker Satyr is dealt damage, it deals that much damage to you. -- {1}{R}: Firedrinker Satyr gets +1/+0 until end of turn and deals 1 damage to you. 
 mana={R}
@@ -41870,7 +41870,7 @@ type=Instant
 [/card]
 [card]
 name=Flint Golem
-auto=@combat(blocked,turnlimited) source(this):deplete:3 opponent
+auto=_BLOCKED_deplete:3 opponent
 text=Whenever Flint Golem becomes blocked, defending player puts the top three cards of his or her library into his or her graveyard.
 mana={4}
 type=Artifact Creature
@@ -43988,7 +43988,7 @@ toughness=2
 [/card]
 [card]
 name=Fungusaur
-auto=@damaged(this):counter(1/1,1)
+auto=_ENRAGE_counter(1/1,1)
 text=Whenever Fungusaur is dealt damage, put a +1/+1 counter on it.
 mana={3}{G}
 type=Creature
@@ -48319,7 +48319,7 @@ toughness=1
 [/card]
 [card]
 name=Goblin Swine-Rider
-auto=@combat(blocked,turnlimited) source(this):damage:2 all(creature[attacking;blocking])
+auto=_BLOCKED_damage:2 all(creature[attacking;blocking])
 text=Whenever Goblin Swine-Rider becomes blocked, it deals 2 damage to each attacking creature and each blocking creature.
 mana={R}
 type=Creature
@@ -50726,7 +50726,7 @@ type=Sorcery
 [/card]
 [card]
 name=Groffskithur
-auto=@combat(blocked,turnlimited) source(this):may moveTo(myhand) target(groffskithur|mygraveyard)
+auto=_BLOCKED_may moveTo(myhand) target(groffskithur|mygraveyard)
 text=Whenever Groffskithur becomes blocked, you may return target card named Groffskithur from your graveyard to your hand.
 mana={5}{G}
 type=Creature
@@ -50736,7 +50736,7 @@ toughness=3
 [/card]
 [card]
 name=Grollub
-auto=@damaged(this):life:thatmuch opponent
+auto=_ENRAGE_life:thatmuch opponent
 text=Whenever Grollub is dealt damage, each opponent gains that much life.
 mana={2}{B}
 type=Creature
@@ -51459,7 +51459,7 @@ type=Instant
 name=Gustcloak Cavalier
 abilities=flanking
 auto=_ATTACKING_may tap target(creature)
-auto=@combat(blocked,turnlimited) source(this):may name(untap it and remove it from combat) untap && removefromcombat
+auto=_BLOCKED_may name(untap it and remove it from combat) untap && removefromcombat
 text=Flanking (Whenever a creature without flanking blocks this creature, the blocking creature gets -1/-1 until end of turn.) -- Whenever Gustcloak Cavalier attacks, you may tap target creature. -- Whenever Gustcloak Cavalier becomes blocked, you may untap Gustcloak Cavalier and remove it from combat.
 mana={3}{W}{W}
 type=Creature
@@ -51470,7 +51470,7 @@ toughness=2
 [card]
 name=Gustcloak Harrier
 abilities=flying
-auto=@combat(blocked,turnlimited) source(this):may name(untap it and remove it from combat) untap && removefromcombat
+auto=_BLOCKED_may name(untap it and remove it from combat) untap && removefromcombat
 text=Flying -- Whenever Gustcloak Harrier becomes blocked, you may untap it and remove it from combat.
 mana={1}{W}{W}
 type=Creature
@@ -51480,7 +51480,7 @@ toughness=2
 [/card]
 [card]
 name=Gustcloak Runner
-auto=@combat(blocked,turnlimited) source(this):may name(untap it and remove it from combat) untap && removefromcombat
+auto=_BLOCKED_may name(untap it and remove it from combat) untap && removefromcombat
 text=Whenever Gustcloak Runner becomes blocked, you may untap it and remove it from combat.
 mana={W}
 type=Creature
@@ -51501,7 +51501,7 @@ toughness=4
 [/card]
 [card]
 name=Gustcloak Sentinel
-auto=@combat(blocked,turnlimited) source(this):may name(untap it and remove it from combat) untap && removefromcombat
+auto=_BLOCKED_may name(untap it and remove it from combat) untap && removefromcombat
 text=Whenever Gustcloak Sentinel becomes blocked, you may untap it and remove it from combat.
 mana={2}{W}{W}
 type=Creature
@@ -51512,7 +51512,7 @@ toughness=3
 [card]
 name=Gustcloak Skirmisher
 abilities=flying
-auto=@combat(blocked,turnlimited) source(this):may name(untap it and remove it from combat) untap && removefromcombat
+auto=_BLOCKED_may name(untap it and remove it from combat) untap && removefromcombat
 text=Flying -- Whenever Gustcloak Skirmisher becomes blocked, you may untap it and remove it from combat.
 mana={3}{W}
 type=Creature
@@ -54455,7 +54455,7 @@ type=Land
 [/card]
 [card]
 name=High Priest of Penance
-auto=@damaged(this):may destroy target(*[-land])
+auto=_ENRAGE_may destroy target(*[-land])
 text=Whenever High Priest of Penance is dealt damage, you may destroy target nonland permanent.
 mana={W}{B}
 type=Creature
@@ -55603,7 +55603,7 @@ toughness=2
 [card]
 name=Hornet Nest
 abilities=defender
-auto=@damaged(this):token(Insect,Creature Insect,1/1,flying,deathtouch,green)*thatmuch
+auto=_ENRAGE_token(Insect,Creature Insect,1/1,flying,deathtouch,green)*thatmuch
 text=Defender. -- Whenever Hornet Nest is dealt damage, put that many 1/1 green Insect creature tokens with flying and deathtouch onto the battlefield. (Any amount of damage a creature with deathtouch deals to a creature is enough to destroy it.) 
 mana={2}{G}
 type=Creature
@@ -57013,7 +57013,7 @@ toughness=0
 [/card]
 [card]
 name=Ignoble Soldier
-auto=@combat(blocked,turnlimited) source(this):fog from(this)
+auto=_BLOCKED_fog from(this)
 text=Whenever Ignoble Soldier becomes blocked, prevent all combat damage that would be dealt by it this turn.
 mana={2}{W}
 type=Creature
@@ -57173,7 +57173,7 @@ type=Enchantment
 [card]
 name=Illusory Ambusher
 abilities=flash
-auto=@damaged(this):draw:thatmuch controller
+auto=_ENRAGE_draw:thatmuch controller
 text=Flash (You may cast this spell any time you could cast an instant.) -- Whenever Illusory Ambusher is dealt damage, draw that many cards.
 mana={4}{U}
 type=Creature
@@ -59705,7 +59705,7 @@ toughness=2
 [/card]
 [card]
 name=Jackal Pup
-auto=@damaged(this):damage:thatmuch controller
+auto=_ENRAGE_damage:thatmuch controller
 text=Whenever Jackal Pup is dealt damage, it deals that much damage to you.
 mana={R}
 type=Creature
@@ -59798,7 +59798,7 @@ type=Sorcery
 [/card]
 [card]
 name=Jagged Poppet
-auto=@damaged(this):ability$!name(discard) target(<storedthatmuch>*|myhand) reject!$ controller
+auto=_ENRAGE_ability$!name(discard) target(<storedthatmuch>*|myhand) reject!$ controller
 auto=@combatdamagefoeof(player) from(this) restriction{type(*|myhand)~lessthan~1}:ability$!name(discard) target(<storedthatmuch>*|myhand) reject!$ opponent
 text=Whenever Jagged Poppet is dealt damage, discard that many cards. -- Hellbent - Whenever Jagged Poppet deals combat damage to a player, if you have no cards in hand, that player discards cards equal to the damage.
 mana={1}{B}{R}
@@ -61438,7 +61438,7 @@ toughness=3
 [card]
 name=Kami of the Honored Dead
 abilities=flying
-auto=@damaged(this):life:thatmuch controller
+auto=_ENRAGE_life:thatmuch controller
 auto=_DIES_may moveTo(myhand) target(spirit[manacost<=6]|mygraveyard)
 text=Flying -- Whenever Kami of the Honored Dead is dealt damage, you gain that much life. -- Soulshift 6 (When this dies, you may return target Spirit card with converted mana cost 6 or less from your graveyard to your hand.)
 mana={5}{W}{W}
@@ -61732,7 +61732,7 @@ toughness=4
 [/card]
 [card]
 name=Karplusan Wolverine
-auto=@combat(blocked,turnlimited) source(this):may damage:1 target(creature,player)
+auto=_BLOCKED_may damage:1 target(creature,player)
 text=Whenever Karplusan Wolverine becomes blocked, you may have it deal 1 damage to target creature or player.
 mana={R}
 type=Snow Creature
@@ -65178,7 +65178,7 @@ toughness=4
 [/card]
 [card]
 name=Laccolith Grunt
-auto=@combat(blocked,turnlimited) source(this):may name(assign combat damage to a creature) target(creature) dynamicability<!powerstrike!> && fog from(this)
+auto=_BLOCKED_may name(assign combat damage to a creature) target(creature) dynamicability<!powerstrike!> && fog from(this)
 text=Whenever Laccolith Grunt becomes blocked, you may have it deal damage equal to its power to target creature. If you do, Laccolith Grunt assigns no combat damage this turn.
 mana={2}{R}
 type=Creature
@@ -65188,7 +65188,7 @@ toughness=2
 [/card]
 [card]
 name=Laccolith Titan
-auto=@combat(blocked,turnlimited) source(this):may name(assign combat damage to a creature) target(creature) dynamicability<!powerstrike!> && fog from(this)
+auto=_BLOCKED_may name(assign combat damage to a creature) target(creature) dynamicability<!powerstrike!> && fog from(this)
 text=Whenever Laccolith Titan becomes blocked, you may have it deal damage equal to its power to target creature. If you do, Laccolith Titan assigns no combat damage this turn.
 mana={5}{R}{R}
 type=Creature
@@ -65198,7 +65198,7 @@ toughness=6
 [/card]
 [card]
 name=Laccolith Warrior
-auto=@combat(blocked,turnlimited) source(this):may name(assign combat damage to a creature) target(creature) dynamicability<!powerstrike!> && fog from(this)
+auto=_BLOCKED_may name(assign combat damage to a creature) target(creature) dynamicability<!powerstrike!> && fog from(this)
 text=Whenever Laccolith Warrior becomes blocked, you may have it deal damage equal to its power to target creature. If you do, Laccolith Warrior assigns no combat damage this turn.
 mana={2}{R}{R}
 type=Creature
@@ -65208,7 +65208,7 @@ toughness=3
 [/card]
 [card]
 name=Laccolith Whelp
-auto=@combat(blocked,turnlimited) source(this):may name(assign combat damage to a creature) target(creature) dynamicability<!powerstrike!> && fog from(this)
+auto=_BLOCKED_may name(assign combat damage to a creature) target(creature) dynamicability<!powerstrike!> && fog from(this)
 text=Whenever Laccolith Whelp becomes blocked, you may have it deal damage equal to its power to target creature. If you do, Laccolith Whelp assigns no combat damage this turn.
 mana={R}
 type=Creature
@@ -66233,7 +66233,7 @@ toughness=2
 [/card]
 [card]
 name=Leery Fogbeast
-auto=@combat(blocked,turnlimited) source(this):fog
+auto=_BLOCKED_fog
 text=Whenever Leery Fogbeast becomes blocked, prevent all combat damage that would be dealt this turn.
 mana={2}{G}
 type=Creature
@@ -67364,7 +67364,7 @@ toughness=1
 name=Lim-Dul's Paladin
 abilities=trample
 auto=upcostmulti[{D(*|myhand)}] sacrifice && draw:1 controller
-auto=@combat(blocked,turnlimited) source(this):6/3 ueot
+auto=_BLOCKED_6/3 ueot
 auto=@combat(notblocked) source(this):preventAllCombatDamage from(this) ueot && life:-4 opponent
 text=Trample -- At the beginning of your upkeep, sacrifice Lim-Dul's Paladin unless you discard a card. If you sacrifice it this way, draw a card. -- Whenever Lim-Dul's Paladin becomes blocked, it gets +6/+3 until end of turn. -- Whenever Lim-Dul's Paladin attacks and isn't blocked, it assigns no combat damage this turn and defending player loses 4 life.
 mana={2}{B}{R}
@@ -68047,7 +68047,7 @@ toughness=5
 [/card]
 [card]
 name=Lone Wolf
-auto=@combat(blocked,turnlimited) source(this):may name(assign combat damage to defending player) thisforeach(power>=1) damage:1 opponent && fog from(this)
+auto=_BLOCKED_may name(assign combat damage to defending player) thisforeach(power>=1) damage:1 opponent && fog from(this)
 text=You may have Lone Wolf assign its combat damage as though it weren't blocked.
 mana={2}{G}
 type=Creature
@@ -75373,7 +75373,7 @@ toughness=2
 [/card]
 [card]
 name=Mogg Maniac
-auto=@damaged(this):damage:thatmuch opponent
+auto=_ENRAGE_damage:thatmuch opponent
 text=Whenever Mogg Maniac is dealt damage, it deals that much damage to target opponent.
 mana={1}{R}
 type=Creature
@@ -79103,7 +79103,7 @@ toughness=2
 [/card]
 [card]
 name=Nested Ghoul
-auto=@damaged(this):token(Zombie,Creature Zombie,2/2,black)
+auto=_ENRAGE_token(Zombie,Creature Zombie,2/2,black)
 text=Whenever a source deals damage to Nested Ghoul, put a 2/2 black Zombie creature token onto the battlefield.
 mana={3}{B}{B}
 type=Creature
@@ -80621,7 +80621,7 @@ toughness=3
 [/card]
 [card]
 name=Norwood Warrior
-auto=@combat(blocked,turnlimited) source(this):1/1 ueot
+auto=_BLOCKED_1/1 ueot
 text=Whenever Norwood Warrior becomes blocked, it gets +1/+1 until end of turn.
 mana={2}{G}
 type=Creature
@@ -86258,7 +86258,7 @@ toughness=2
 [card]
 name=Phyrexian Negator
 abilities=trample
-auto=@damaged(this):ability$!name(sacrifice) notatarget(<storedthatmuch>*|mybattlefield) sacrifice!$ controller
+auto=_ENRAGE_ability$!name(sacrifice) notatarget(<storedthatmuch>*|mybattlefield) sacrifice!$ controller
 text=Trample -- Whenever Phyrexian Negator is dealt damage, sacrifice that many permanents.
 mana={2}{B}
 type=Creature
@@ -86387,7 +86387,7 @@ toughness=4
 name=Phyrexian Totem
 auto={T}:Add{B}
 auto={2}{B}:transforms((Horror Artifact Creature,setpower=5,settoughness=5,trample,black)) ueot
-auto=@damaged(this):ability$!name(sacrifice) notatarget(<storedthatmuch>*|mybattlefield) sacrifice!$ controller
+auto=_ENRAGE_ability$!name(sacrifice) notatarget(<storedthatmuch>*|mybattlefield) sacrifice!$ controller
 text={T}: Add {B} to your mana pool. -- {2}{B}: Phyrexian Totem becomes a 5/5 black Horror artifact creature with trample until end of turn. -- Whenever Phyrexian Totem is dealt damage, if it's a creature, sacrifice that many permanents.
 mana={3}
 type=Artifact
@@ -87640,7 +87640,7 @@ type=Enchantment
 [card]
 name=Port Inspector
 aicode=name(look) activate name(look) target(<ohandcount>*|opponenthand) donothing
-auto=@combat(blocked,turnlimited) source(this):name(look) reveal:ohandcount revealzone(opponenthand) optionone name(look) target(<1>*|reveal) moveto(ownerhand) and!(all(*|reveal) moveto(ownerhand))! optiononeend revealend
+auto=_BLOCKED_name(look) reveal:ohandcount revealzone(opponenthand) optionone name(look) target(<1>*|reveal) moveto(ownerhand) and!(all(*|reveal) moveto(ownerhand))! optiononeend revealend
 text=Whenever Port Inspector becomes blocked, you may look at defending player's hand.
 mana={1}{U}
 type=Creature
@@ -88268,7 +88268,7 @@ toughness=3
 [/card]
 [card]
 name=Pride of Lions
-auto=@combat(blocked,turnlimited) source(this):may name(assign combat damage to defending player) thisforeach(power>=1) damage:1 opponent && fog from(this)
+auto=_BLOCKED_may name(assign combat damage to defending player) thisforeach(power>=1) damage:1 opponent && fog from(this)
 text=You may have Pride of Lions assign its combat damage as though it weren't blocked.
 mana={3}{G}{G}
 type=Creature
@@ -92434,7 +92434,7 @@ toughness=1
 [/card]
 [card]
 name=Razorclaw Bear
-auto=@combat(blocked,turnlimited) source(this):2/2 ueot
+auto=_BLOCKED_2/2 ueot
 text=Whenever Razorclaw Bear becomes blocked, it gets +2/+2 until end of turn.
 mana={2}{G}{G}
 type=Creature
@@ -94963,7 +94963,7 @@ toughness=4
 [card]
 name=Rhox
 auto={g}{2}:regenerate
-auto=@combat(blocked,turnlimited) source(this):may name(assign combat damage to defending player) thisforeach(power>=1) damage:1 opponent && fog from(this)
+auto=_BLOCKED_may name(assign combat damage to defending player) thisforeach(power>=1) damage:1 opponent && fog from(this)
 text=You may have Rhox assign its combat damage as though it weren't blocked. -- {2}{G}: Regenerate Rhox. (The next time this creature would be destroyed this turn, it isn't. Instead tap it, remove all damage from it, and remove it from combat.)
 mana={4}{G}{G}
 type=Creature
@@ -96084,7 +96084,7 @@ type=Sorcery
 [card]
 name=Robber Fly
 abilities=flying
-auto=@combat(blocked,turnlimited) source(this):all(*|opponenthand) transforms((,newability[reject],newability[draw:1])) ueot
+auto=_BLOCKED_all(*|opponenthand) transforms((,newability[reject],newability[draw:1])) ueot
 text=Flying -- Whenever Robber Fly becomes blocked, defending player discards all the cards in his or her hand, then draws that many cards.
 mana={2}{R}
 type=Creature
@@ -97807,7 +97807,7 @@ toughness=5
 [/card]
 [card]
 name=Saber Ants
-auto=@damaged(this):may token(Insect,Creature Insect,1/1,green)*thatmuch
+auto=_ENRAGE_may token(Insect,Creature Insect,1/1,green)*thatmuch
 text=Whenever Saber Ants is dealt damage, you may put that many 1/1 green Insect creature tokens onto the battlefield.
 mana={3}{G}
 type=Creature
@@ -97949,7 +97949,7 @@ type=Sorcery
 [/card]
 [card]
 name=Sacred Prey
-auto=@combat(blocked,turnlimited) source(this):life:1 controller
+auto=_BLOCKED_life:1 controller
 text=Whenever Sacred Prey becomes blocked, you gain 1 life.
 mana={G}
 type=Creature
@@ -99043,7 +99043,7 @@ type=Land
 [/card]
 [card]
 name=Saprazzan Heir
-auto=@combat(blocked,turnlimited) source(this):may draw:3 controller
+auto=_BLOCKED_may draw:3 controller
 text=Whenever Saprazzan Heir becomes blocked, you may draw three cards.
 mana={1}{U}
 type=Creature
@@ -99076,7 +99076,7 @@ toughness=5
 [/card]
 [card]
 name=Saprazzan Raider
-auto=@combat(blocked,turnlimited) source(this):moveTo(myhand) all(this)
+auto=_BLOCKED_moveTo(myhand) all(this)
 text=When Saprazzan Raider becomes blocked, return it to its owner's hand.
 mana={2}{U}
 type=Creature
@@ -104086,7 +104086,7 @@ toughness=0
 [/card]
 [card]
 name=Shinka Gatekeeper
-auto=@damaged(this):damage:thatmuch controller
+auto=_ENRAGE_damage:thatmuch controller
 text=Whenever Shinka Gatekeeper is dealt damage, it deals that much damage to you.
 mana={2}{R}
 type=Creature
@@ -105432,7 +105432,7 @@ toughness=3
 [/card]
 [card]
 name=Silkenfist Fighter
-auto=@combat(blocked,turnlimited) source(this):untap
+auto=_BLOCKED_untap
 text=Whenever Silkenfist Fighter becomes blocked, untap it.
 mana={1}{W}
 type=Creature
@@ -105442,7 +105442,7 @@ toughness=3
 [/card]
 [card]
 name=Silkenfist Order
-auto=@combat(blocked,turnlimited) source(this):untap
+auto=_BLOCKED_untap
 text=Whenever Silkenfist Order becomes blocked, untap it.
 mana={3}{W}{W}
 type=Creature
@@ -107586,7 +107586,7 @@ toughness=2
 [/card]
 [card]
 name=Slashing Tiger
-auto=@combat(blocked,turnlimited) source(this):2/2 ueot
+auto=_BLOCKED_2/2 ueot
 text=Whenever Slashing Tiger becomes blocked, it gets +2/+2 until end of turn.
 mana={2}{G}{G}
 type=Creature
@@ -107998,7 +107998,7 @@ toughness=1
 [/card]
 [card]
 name=Slith Strider
-auto=@combat(blocked,turnlimited) source(this):draw:1 controller
+auto=_BLOCKED_draw:1 controller
 auto=@combatdamaged(player) from(this):counter(1/1,1)
 text=Whenever Slith Strider becomes blocked, draw a card. -- Whenever Slith Strider deals combat damage to a player, put a +1/+1 counter on it.
 mana={1}{U}{U}
@@ -108623,7 +108623,7 @@ toughness=1
 [/card]
 [card]
 name=Snorting Gahr
-auto=@combat(blocked,turnlimited) source(this):2/2 ueot
+auto=_BLOCKED_2/2 ueot
 text=Whenever Snorting Gahr becomes blocked, it gets +2/+2 until end of turn.
 mana={2}{G}{G}
 type=Creature
@@ -111128,7 +111128,7 @@ type=Artifact
 [card]
 name=Spinebiter
 abilities=infect
-auto=@combat(blocked,turnlimited) source(this):may name(assign combat damage to defending player) thisforeach(power>=1) damage:1 opponent && fog from(this)
+auto=_BLOCKED_may name(assign combat damage to defending player) thisforeach(power>=1) damage:1 opponent && fog from(this)
 text=Infect -- You may have Spinebiter assign its combat damage as though it weren't blocked.
 mana={4}{G}{G}
 type=Creature
@@ -111629,7 +111629,7 @@ toughness=1
 [card]
 name=Spiteful Shadows
 target=creature
-auto=transforms((,newability[@damaged(this):damage:thatmuch controller]))
+auto=transforms((,newability[_ENRAGE_damage:thatmuch controller]))
 text=Enchant Creature -- Whenever enchanted creature is dealt damage, it deals that much damage to its controller.
 mana={1}{B}
 type=Enchantment
@@ -111647,7 +111647,7 @@ type=Enchantment
 [/card]
 [card]
 name=Spitemare
-auto=@damaged(this):damage:thatmuch target(creature,player)
+auto=_ENRAGE_damage:thatmuch target(creature,player)
 text=Whenever Spitemare is dealt damage, it deals that much damage to target creature or player.
 mana={2}{RW}{RW}
 type=Creature
@@ -112090,7 +112090,7 @@ type=Instant
 [card]
 name=Sprouting Phytohydra
 abilities=defender
-auto=@damaged(this):may token(Sprouting Phytohydra)
+auto=_ENRAGE_may token(Sprouting Phytohydra)
 text=Defender (This creature can't attack.) -- Whenever Sprouting Phytohydra is dealt damage, you may put a token that's a copy of Sprouting Phytohydra onto the battlefield.
 mana={4}{G}
 type=Creature
@@ -114846,7 +114846,7 @@ toughness=1
 [card]
 name=Stuffy Doll
 abilities=indestructible
-auto=@damaged(this):damage:thatmuch opponent
+auto=_ENRAGE_damage:thatmuch opponent
 auto={T}:damage:1
 text=As Stuffy Doll enters the battlefield, choose a player. -- Stuffy Doll is indestructible. -- Whenever Stuffy Doll is dealt damage, it deals that much damage to the chosen player. -- {T}: Stuffy Doll deals 1 damage to itself.
 mana={5}
@@ -120120,7 +120120,7 @@ toughness=0
 [/card]
 [card]
 name=Thorn Elemental
-auto=@combat(blocked,turnlimited) source(this):may name(assign combat damage to defending player) thisforeach(power>=1) damage:1 opponent && fog from(this)
+auto=_BLOCKED_may name(assign combat damage to defending player) thisforeach(power>=1) damage:1 opponent && fog from(this)
 text=You may have Thorn Elemental assign its combat damage as though it weren't blocked.
 mana={5}{G}{G}
 type=Creature
@@ -120737,7 +120737,7 @@ toughness=3
 name=Thrashing Mudspawn
 facedown={3}
 autofacedown={1}{B}{B}:morph
-auto=@damaged(this):life:-thatmuch controller
+auto=_ENRAGE_life:-thatmuch controller
 text=Whenever Thrashing Mudspawn is dealt damage, you lose that much life. -- Morph {1}{B}{B} (You may cast this face down as a 2/2 creature for {3}. Turn it face up any time for its morph cost.)
 mana={3}{B}{B}
 type=Creature
@@ -122555,7 +122555,7 @@ type=Artifact
 [card]
 name=Tornado Elemental
 auto=all(creature[flying]) damage:6
-auto=@combat(blocked,turnlimited) source(this):may name(assign combat damage to defending player) thisforeach(power>=1) damage:1 opponent && fog from(this)
+auto=_BLOCKED_may name(assign combat damage to defending player) thisforeach(power>=1) damage:1 opponent && fog from(this)
 text=When Tornado Elemental enters the battlefield, it deals 6 damage to each creature with flying. -- You may have Tornado Elemental assign its combat damage as though it weren't blocked.
 mana={5}{G}{G}
 type=Creature
@@ -123146,7 +123146,7 @@ toughness=1
 [/card]
 [card]
 name=Trained Cheetah
-auto=@combat(blocked,turnlimited) source(this):1/1 ueot
+auto=_BLOCKED_1/1 ueot
 text=Whenever Trained Cheetah becomes blocked, it gets +1/+1 until end of turn.
 mana={2}{G}
 type=Creature
@@ -127598,7 +127598,7 @@ toughness=4
 [/card]
 [card]
 name=Vedalken Ghoul
-auto=@combat(blocked,turnlimited) source(this):life:-4 opponent
+auto=_BLOCKED_life:-4 opponent
 text=Whenever Vedalken Ghoul becomes blocked, defending player loses 4 life.
 mana={U}{B}
 type=Creature
@@ -130099,7 +130099,7 @@ toughness=4
 [/card]
 [card]
 name=Volatile Rig
-auto=@damaged(this):flipacoin loseability sacrifice all(this) loseabilityend flipend
+auto=_ENRAGE_flipacoin loseability sacrifice all(this) loseabilityend flipend
 auto=_DIES_flipacoin loseability damage:4 all(creature,player) loseabilityend flipend
 abilities=trample,mustattack
 text=Trample -- Volatile Rig attacks each turn if able. -- Whenever Volatile Rig is dealt damage, flip a coin. If you lose the flip, sacrifice Volatile Rig. -- When Volatile Rig dies, flip a coin. If you lose the flip, it deals 4 damage to each creature and each player.
@@ -131138,7 +131138,7 @@ toughness=6
 [card]
 name=Wall of Hope
 abilities=defender
-auto=@damaged(this):life:thatmuch controller
+auto=_ENRAGE_life:thatmuch controller
 text=Defender (This creature can't attack.) -- Whenever Wall of Hope is dealt damage, you gain that much life.
 mana={W}
 type=Creature
@@ -135138,7 +135138,7 @@ toughness=5
 [/card]
 [card]
 name=Wolf Pack
-auto=@combat(blocked,turnlimited) source(this):may name(assign combat damage to defending player) damage:power opponent && fog from(this)
+auto=_BLOCKED_may name(assign combat damage to defending player) damage:power opponent && fog from(this)
 text=You may have Wolf Pack assign its combat damage as though it weren't blocked.
 mana={6}{G}{G}
 type=Creature