diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index 4fd835989..cd641fcf2 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -574,8 +574,8 @@ toughness=1
 [card]
 name=Accorder's Shield
 auto={3}:equip
-auto=0/3
-auto=vigilance
+auto=teach(creature) 0/3
+auto=teach(creature) vigilance
 text=Equipped creature gets +0/+3 and vigilance. -- Equip {3}
 mana={0}
 type=Artifact
@@ -906,7 +906,7 @@ type=Instant
 [card]
 name=Adventuring Gear
 auto={1}:equip
-auto=@movedTo(land|myBattlefield):2/2 ueot
+auto=teach(creature) transforms((,newability[@movedTo(land|myBattlefield):2/2]))
 text=Landfall - Whenever a land enters the battlefield under your control, equipped creature gets +2/+2 until end of turn. -- Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.)
 mana={1}
 type=Artifact
@@ -3530,8 +3530,8 @@ toughness=6
 [card]
 name=Angelic Armaments
 auto={4}:equip
-auto=2/2
-auto=flying
+auto=teach(creature) 2/2
+auto=teach(creature) flying
 auto=teach(creature) becomes(Angel,newcolors[white])
 text=Equipped creature gets +2/+2, has flying, and is a white Angel in addition to its other colors and types. -- Equip {4}
 mana={3}
@@ -5227,8 +5227,8 @@ toughness=3
 [/card]
 [card]
 name=Argentum Armor
-auto=6/6
-auto=@combat(attacking) source(mytgt) :destroy target(*)
+auto=teach(creature) 6/6
+auto=@combat(attacking) source(mytgt):destroy target(*)
 auto={6}:equip
 text=Equipped creature gets +6/+6. -- Whenever equipped creature attacks, destroy target permanent. -- Equip {6}
 mana={6}
@@ -8566,7 +8566,7 @@ toughness=2
 [card]
 name=Barbed Battlegear
 auto={2}:equip
-auto=4/-1
+auto=teach(creature) 4/-1
 text=Equipped creature gets +4/-1. -- Equip {2}
 mana={3}
 type=Artifact
@@ -8967,8 +8967,8 @@ toughness=2
 [card]
 name=Basilisk Collar
 auto={2}:equip
-auto=deathtouch
-auto=lifelink
+auto=teach(creature) deathtouch
+auto=teach(creature) lifelink
 text=Equipped creature has deathtouch and lifelink. -- Equip {2}
 mana={1}
 type=Artifact
@@ -9094,7 +9094,7 @@ toughness=3
 name=Batterskull
 auto={5}:equip
 auto={3}:moveTo(ownerhand)
-auto=4/4
+auto=teach(creature) 4/4
 auto=teach(creature) vigilance
 auto=teach(creature) lifelink
 auto=livingweapontoken(Germ,Creature Germ,0/0,black)
@@ -9697,9 +9697,9 @@ toughness=1
 [card]
 name=Behemoth Sledge
 auto={3}:equip
-auto=2/2
-auto=lifelink
-auto=trample
+auto=teach(creature) 2/2
+auto=teach(creature) lifelink
+auto=teach(creature) trample
 text=Equipped creature gets +2/+2 and has lifelink and trample. -- Equip {3}
 mana={1}{G}{W}
 type=Artifact
@@ -10595,7 +10595,7 @@ toughness=1
 [card]
 name=Bladed Bracers
 auto={2}:equip
-auto=1/1
+auto=teach(creature) 1/1
 auto=teach(human,angel) vigilance
 text=Equipped creature gets +1/+1. -- As long as equipped creature is a Human or an Angel, it has vigilance. -- Equip {2} ({2}: Attach to target creature you control. Equip only as a sorcery.)
 mana={1}
@@ -10605,8 +10605,8 @@ subtype=Equipment
 [card]
 name=Bladed Pinions
 auto={2}:equip
-auto=flying
-auto=first strike
+auto=teach(creature) flying
+auto=teach(creature) first strike
 text=Equipped creature has flying and first strike. -- Equip {2}
 mana={2}
 type=Artifact
@@ -10979,8 +10979,8 @@ toughness=1
 [card]
 name=Blight Sickle
 auto={2}:equip
-auto=wither
-auto=1/0
+auto=teach(creature) wither
+auto=teach(creature) 1/0
 text=Equipped creature gets +1/+0 and has wither. (It deals damage to creatures in the form of -1/-1 counters.) -- Equip {2}
 mana={2}
 type=Artifact
@@ -12980,7 +12980,7 @@ type=Instant
 [card]
 name=Bone Saw
 auto={1}:equip
-auto=1/0
+auto=teach(creature) 1/0
 text=Equipped creature gets +1/+0. -- Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.)
 mana={0}
 type=Artifact
@@ -13025,7 +13025,7 @@ toughness=4
 [card]
 name=Bonehoard
 auto={2}:equip
-auto=foreach(creature|graveyard) 1/1
+auto=teach(creature) type:creature:graveyard/type:creature:graveyard nonstatic
 auto=livingweapontoken(Germ,Creature Germ,0/0,black)
 text=Living weapon (When this Equipment enters the battlefield, put a 0/0 black Germ creature token onto the battlefield, then attach this to it.) -- Equipped creature gets +X/+X, where X is the number of creature cards in all graveyards. -- Equip {2}
 mana={4}
@@ -13079,7 +13079,7 @@ toughness=2
 [card]
 name=Bonesplitter
 auto={1}:equip
-auto=2/0
+auto=teach(creature) 2/0
 text=Equipped creature gets +2/+0. -- Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery. This card enters the battlefield unattached and stays on the battlefield if the creature leaves.)
 mana={1}
 type=Artifact
@@ -15323,7 +15323,7 @@ toughness=4
 [card]
 name=Butcher's Cleaver
 auto={3}:equip
-auto=3/0
+auto=teach(creature) 3/0
 auto=teach(human) lifelink
 text=Equipped creature gets +3/+0. -- As long as equipped creature is a Human, it has lifelink. -- Equip {3}
 mana={3}
@@ -17888,7 +17888,7 @@ toughness=1
 [card]
 name=Champion's Helm
 auto={1}:equip
-auto=2/2
+auto=teach(creature) 2/2
 auto=teach(creature[legendary]) opponentshroud
 text=Equipped creature gets +2/+2. -- As long as equipped creature is legendary, it has hexproof. (It can't be the target of spells or abilities your opponents control.) -- Equip {1}
 mana={3}
@@ -18287,9 +18287,9 @@ type=Artifact
 [card]
 name=Chariot of Victory
 auto={1}:equip
-auto=first strike
-auto=trample
-auto=haste
+auto=teach(creature) first strike
+auto=teach(creature) trample
+auto=teach(creature) haste
 text=Equipped creature has first strike, trample, and haste.
 mana={3}
 type=Artifact
@@ -18645,7 +18645,7 @@ toughness=2
 [card]
 name=Chitinous Cloak
 auto={3}:equip
-auto=2/2
+auto=teach(creature) 2/2
 auto=teach(creature) menace
 text=Equipped creature gets +2/+2 and has menace. (It can't be blocked except by two or more creatures.) -- Equip {3}
 mana={3}
@@ -20381,7 +20381,7 @@ toughness=2
 [card]
 name=Cobbled Wings
 auto={1}:equip
-auto=flying
+auto=teach(creature) flying
 text=Equipped creature has flying. -- Equip {1}
 mana={2}
 type=Artifact
@@ -21489,8 +21489,8 @@ type=Instant
 [card]
 name=Copper Carapace
 auto={3}:equip
-auto=2/2
-auto=cantblock
+auto=teach(creature) 2/2
+auto=teach(creature) cantblock
 text=Equipped creature gets +2/+2 and can't block. -- Equip {3}
 mana={1}
 type=Artifact
@@ -22337,7 +22337,7 @@ type=Artifact
 [/card]
 [card]
 name=Cranial Plating
-auto=foreach(artifact|mybattlefield) 1/0
+auto=teach(creature) type:artifact:mybattlefield/0 nonstatic
 auto={B}{B}:name(attach) rehook target(creature|mybattlefield)
 auto={1}:equip
 text=Equipped creature gets +1/+0 for each artifact you control. -- {B}{B}: Attach Cranial Plating to target creature you control. -- Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.)
@@ -24874,7 +24874,7 @@ type=Land
 name=Darksteel Axe
 abilities=indestructible
 auto={2}:equip
-auto=2/0
+auto=teach(creature) 2/0
 text=Darksteel Axe is indestructible. -- Equipped creature gets +2/+0. -- Equip {2} ({1}: Attach to target creature you control. Equip only as a sorcery. This card enters the battlefield unattached and stays on the battlefield if the creature leaves.)
 mana={1}
 type=Artifact
@@ -24977,7 +24977,7 @@ type=Artifact
 name=Darksteel Plate
 abilities=indestructible
 auto={2}:equip
-auto=indestructible
+auto=teach(creature) indestructible
 text=Darksteel Plate is indestructible. -- Equipped creature is indestructible. -- Equip {2}
 mana={3}
 type=Artifact
@@ -26182,7 +26182,7 @@ type=Enchantment
 [/card]
 [card]
 name=Deathrender
-auto=+2/+2
+auto=teach(creature) 2/2
 auto=@movedto(mytgt|graveyard):may moveto(mybattlefield) target(creature|myhand) and!(rehook)!
 auto={2}:equip
 text=Equipped creature gets +2/+2. -- Whenever equipped creature is put into a graveyard, you may put a creature card from your hand onto the battlefield and attach Deathrender to it. -- Equip {2}
@@ -27160,7 +27160,7 @@ toughness=4
 [card]
 name=Demonmail Hauberk
 auto={S(creature|myBattlefield)}:equip
-auto=4/2
+auto=teach(creature) 4/2
 text=Equipped creature gets +4/+2. -- Equip - Sacrifice a creature
 mana={4}
 type=Artifact
@@ -32754,7 +32754,7 @@ type=Enchantment
 [card]
 name=Elbrus, the Binding Blade
 auto={1}:equip
-auto=1/0
+auto=teach(creature) 1/0
 auto=@combatdamaged(player) from(mytgt):all(this) moveto(mybattlefield) and!(flip(Withengar Unbound))!
 text=Equipped creature gets +1/+0. -- Whenever equipped creature deals combat damage to a player, transform Elbrus, the Binding Blade. -- Equip {1}
 mana={7}
@@ -34181,7 +34181,7 @@ subtype=Aura
 [card]
 name=Empyrial Plate
 auto={2}:equip
-auto=foreach(*|myhand) 1/1
+auto=teach(creature) type:*:myhand/type:*:myhand nonstatic
 text=Equipped creature gets +1/+1 for each card in your hand. -- Equip {2} ({2}: Attach to target creature you control. Equip only as a sorcery. This card enters the battlefield unattached and stays on the battlefield if the creature leaves.)
 mana={2}
 type=Artifact
@@ -36146,7 +36146,7 @@ type=Artifact
 [card]
 name=Executioner's Hood
 auto={2}:equip
-auto=intimidate
+auto=teach(creature) intimidate
 text=Equipped creature has intimidate. -- Equip {2}
 mana={2}
 type=Artifact
@@ -39224,7 +39224,7 @@ toughness=2
 [card]
 name=Fireshrieker
 auto={2}:equip
-auto=double strike
+auto=teach(creature) double strike
 text=Equipped creature has double strike. (It deals both first-strike and regular combat damage.) -- Equip {2} ({2}: Attach to target creature you control. Equip only as a sorcery. This card enters the battlefield unattached and stays on the battlefield if the creature leaves.)
 mana={3}
 type=Artifact
@@ -39816,7 +39816,7 @@ toughness=1
 [card]
 name=Flayer Husk
 auto={2}:equip
-auto=1/1
+auto=teach(creature) 1/1
 auto=livingweapontoken(Germ,Creature Germ,0/0,black)
 text=Living weapon (When this Equipment enters the battlefield, put a 0/0 black Germ creature token onto the battlefield, then attach this to it.) -- Equipped creature gets +1/+1. -- Equip {2}
 mana={1}
@@ -47064,8 +47064,8 @@ toughness=5
 [card]
 name=Gorgon Flail
 auto={2}:equip
-auto=1/1
-auto=deathtouch
+auto=teach(creature) 1/1
+auto=teach(creature) deathtouch
 text=Equipped creature gets +1/+1 and has deathtouch. (Creatures dealt damage by this creature are destroyed. You can divide its combat damage among any of the creatures blocking or blocked by it.) -- Equip {2} ({2}: Attach to target creature you control. Equip only as a sorcery.)
 mana={2}
 type=Artifact
@@ -47985,7 +47985,7 @@ toughness=5
 [card]
 name=Greatsword
 auto={3}:equip
-auto=3/0
+auto=teach(creature) 3/0
 text=Equipped creature gets +3/+0. -- Equip {3}
 mana={3}
 type=Artifact
@@ -48227,7 +48227,7 @@ toughness=3
 name=Grifter's Blade
 abilities=flash
 auto={1}:equip
-auto=1/1
+auto=teach(creature) 1/1
 auto=aslongas(parents) rehook target(creature|mybattlefield) <1
 text=Flash -- As Grifter's Blade enters the battlefield, choose a creature you control it could be attached to. If you do, it enters the battlefield attached to that creature. -- Equipped creature gets +1/+1. -- Equip {1}
 mana={3}
@@ -49926,7 +49926,7 @@ type=Legendary Enchantment Artifact
 [card]
 name=Hammer of Ruin
 auto={2}:equip
-auto=2/0
+auto=teach(creature) 2/0
 auto=teach(creature) transforms((,newability[@combatdamageof(player) from(this):may destroy target(equipment|myBattlefield)]))
 auto=teach(creature) transforms((,newability[@combatdamagefoeof(player) from(this):may destroy target(equipment|opponentBattlefield)]))
 text=Equipped creature gets +2/+0. -- Whenever equipped creature deals combat damage to a player, you may destroy target Equipment that player controls. -- Equip {2}
@@ -50598,7 +50598,7 @@ toughness=1
 [card]
 name=Haunted Plate Mail
 auto={4}:equip
-auto=4/4
+auto=teach(creature) 4/4
 auto={0}:all(this) loseabilities ueot && becomes(Spirit Artifact Creature,4/4) ueot restriction{type(creature|mybattlefield)~lessthan~1}
 text=Equipped creature gets +4/+4. -- {0}: Until end of turn, Haunted Plate Mail becomes a 4/4 Spirit artifact creature that's no longer an Equipment. Activate this ability only if you control no creatures.
 mana={4}
@@ -50881,7 +50881,7 @@ toughness=3
 [card]
 name=Healer's Headdress
 auto={1}:equip
-auto=0/2
+auto=teach(creature) 0/2
 auto=teach(creature) {T}:prevent:1 target(creature,player)
 auto={W}{W}:name(attach) rehook target(creature|mybattlefield)
 text=Equipped creature gets +0/+2 and has "{T}: Prevent the next 1 damage that would be dealt to target creature or player this turn." -- {W}{W}: Attach Healer's Headdress to target creature you control. -- Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.)
@@ -51093,7 +51093,7 @@ toughness=2
 [card]
 name=Heart-Piercer Bow
 auto={1}:equip
-auto=@combat(attacking) source(mytgt) :damage:1 target(creature|opponentbattlefield)
+auto=@combat(attacking) source(mytgt):damage:1 target(creature|opponentbattlefield)
 text=Whenever equipped creature attacks, Heart-Piercer Bow deals 1 damage to target creature defending player controls.
 mana={2}
 type=Artifact
@@ -51102,7 +51102,7 @@ subtype=Equipment
 [card]
 name=Heartseeker
 auto={5}:equip
-auto=2/1
+auto=teach(creature) 2/1
 auto=teach(creature) {unattach}{t}:destroy target(creature)
 text=Equipped creature gets +2/+1 and has "{T}, Unattach Heartseeker: Destroy target creature." -- Equip {5} ({5}: Attach to target creature you control. Equip only as a sorcery. This card enters the battlefield unattached and stays on the battlefield if the creature leaves.)
 mana={4}
@@ -51212,7 +51212,7 @@ type=Instant
 [card]
 name=Heavy Arbalest
 auto={4}:equip
-auto=doesnotuntap
+auto=teach(creature) doesnotuntap
 auto=teach(creature) {T}:damage:2 target(creature,player)
 text=Equipped creature doesn't untap during its controller's untap step. -- Equipped creature has "{T}: This creature deals 2 damage to target creature or player." -- Equip {4}
 mana={3}
@@ -51250,7 +51250,7 @@ toughness=4
 [card]
 name=Heavy Mattock
 auto={2}:equip
-auto=1/1
+auto=teach(creature) 1/1
 auto=teach(human) 1/1
 text=Equipped creature gets +1/+1. -- As long as equipped creature is a Human, it gets an additional +1/+1.. -- Equip {2}
 mana={3}
@@ -51335,7 +51335,7 @@ toughness=1
 [/card]
 [card]
 name=Hedron Matrix
-auto=manacost/manacost
+auto=teach(creature) transforms((,newability[manacost/manacost]))
 auto={4}:equip
 text=Equipped creature gets +X/+X, where X is its converted mana cost. -- Equip {4}
 mana={4}
@@ -51718,9 +51718,9 @@ type=Artifact
 [/card]
 [card]
 name=Helm of Kaldra
-auto=first strike
-auto=trample
-auto=haste
+auto=teach(creature) first strike
+auto=teach(creature) trample
+auto=teach(creature) haste
 auto={2}:equip
 auto={1}:aslongas(Sword of Kaldra|mybattlefield)aslongas(Shield of Kaldra|mybattlefield)aslongas(Helm of Kaldra|mybattlefield) token(-47449)
 text=Equipped creature has first strike, trample, and haste. -- {1}: If you control Equipment named Helm of Kaldra, Sword of Kaldra, and Shield of Kaldra, put a legendary 4/4 colorless Avatar creature token named Kaldra onto the battlefield and attach those Equipment to it. -- Equip {2}
@@ -52046,7 +52046,7 @@ toughness=3
 [card]
 name=Hero's Blade
 auto={4}:equip
-auto=3/2
+auto=teach(creature) 3/2
 auto=@movedto(creature[legendary]|mybattlefield):may all(trigger[to]) rehook
 text=Equipped creature gets +3/+2. -- Whenever a legendary creature enters the battlefield under your control, you may attach Hero's Blade to it.
 mana={2}
@@ -53250,8 +53250,8 @@ toughness=2
 [/card]
 [card]
 name=Horned Helm
-auto=1/1
-auto=trample
+auto=teach(creature) 1/1
+auto=teach(creature) trample
 auto={G}{G}:name(attach) rehook target(creature|mybattlefield)
 auto={1}:equip
 text=Equipped creature gets +1/+1 and has trample. -- {G}{G}: Attach Horned Helm to target creature you control. -- Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.)
@@ -60589,7 +60589,7 @@ toughness=2
 [card]
 name=Kite Shield
 auto={3}:equip
-auto=0/3
+auto=teach(creature) 0/3
 text=Equipped creature gets +0/+3. -- Equip {3}
 mana={0}
 type=Artifact
@@ -60619,8 +60619,8 @@ toughness=1
 [card]
 name=Kitesail
 auto={2}:equip
-auto=1/0
-auto=flying
+auto=teach(creature) 1/0
+auto=teach(creature) flying
 text=Equipped creature gets +1/+0 and has flying. -- Equip {2} ({2}: Attach to target creature you control. Equip only as a sorcery.)
 mana={2}
 type=Artifact
@@ -63004,7 +63004,7 @@ toughness=4
 [card]
 name=Lashwrithe
 auto={p(B)}{p(B)}:equip
-auto=foreach(swamp|mybattlefield) 1/1
+auto=teach(creature) type:swamp:mybattlefield/type:swamp:mybattlefield nonstatic
 auto=livingweapontoken(Germ,Creature Germ,0/0,black)
 text=Living weapon (When this Equipment enters the battlefield, put a 0/0 black Germ creature token onto the battlefield, then attach this to it.) -- Equip {p(B)}{p(B)} ({p(B)} may be paid for with either {B} or 2 life.) -- Equipped creature gets +1/+1 for each Swamp you control.
 mana={4}
@@ -63590,7 +63590,7 @@ subtype=Swamp
 [card]
 name=Leering Emblem
 auto={2}:equip
-auto=@movedTo(*|mystack):2/2 ueot
+auto=teach(creature) transforms((,newability[@movedTo(*|mystack):2/2]))
 text=Whenever you cast a spell, equipped creature gets +2/+2 until end of turn. -- Equip {2}
 mana={2}
 type=Artifact
@@ -63770,7 +63770,7 @@ toughness=2
 [card]
 name=Leonin Scimitar
 auto={1}:equip
-auto=1/1
+auto=teach(creature) 1/1
 text=Equipped creature gets +1/+1. -- Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.)
 mana={1}
 type=Artifact
@@ -64449,7 +64449,7 @@ toughness=1
 name=Lightning Greaves
 auto={0}:equip
 auto=teach(creature) shroud
-auto=haste
+auto=teach(creature) haste
 text=Equipped creature has haste and shroud. (It can't be the target of spells or abilities.) -- Equip {0} ({0}: Attach to target creature you control. Equip only as a sorcery. This card enters the battlefield unattached and stays on the battlefield if the creature leaves.)
 mana={2}
 type=Artifact
@@ -65980,9 +65980,9 @@ toughness=3
 [card]
 name=Loxodon Warhammer
 auto={3}:equip
-auto=3/0
-auto=lifelink
-auto=trample
+auto=teach(creature) 3/0
+auto=teach(creature) lifelink
+auto=teach(creature) trample
 text=Equipped creature gets +3/+0 and has trample and lifelink. (If the creature would deal enough damage to its blockers to destroy them, you may have it deal the rest of its damage to defending player or planeswalker. Damage dealt by the creature also causes its controller to gain that much life.) -- Equip {3} ({3}: Attach to target creature you control. Equip only as a sorcery.)
 mana={3}
 type=Artifact
@@ -66727,8 +66727,8 @@ subtype=Equipment
 [card]
 name=Magebane Armor
 auto={2}:equip
-auto=-flying
-auto=2/4
+auto=teach(creature) -flying
+auto=teach(creature) 2/4
 auto=teach(creature) preventAllNoncombatDamage to(this)
 text=Equipped creature gets +2/+4 and loses flying. -- Prevent all noncombat damage that would be dealt to equipped creature. -- Equip {2} ({2}: Attach to target creature you control. Equip only as a sorcery.)
 mana={3}
@@ -67705,11 +67705,11 @@ subtype=Aura
 [card]
 name=Manaforce Mace
 auto={3}:equip
-auto=aslongas(forest|myBattlefield) 1/1
-auto=aslongas(mountain|myBattlefield) 1/1
-auto=aslongas(plains|myBattlefield) 1/1
-auto=aslongas(swamp|myBattlefield) 1/1
-auto=aslongas(island|myBattlefield) 1/1
+auto=teach(creature) transforms((,newability[aslongas(forest|myBattlefield) 1/1]))
+auto=teach(creature) transforms((,newability[aslongas(mountain|myBattlefield) 1/1]))
+auto=teach(creature) transforms((,newability[aslongas(plains|myBattlefield) 1/1]))
+auto=teach(creature) transforms((,newability[aslongas(island|myBattlefield) 1/1]))
+auto=teach(creature) transforms((,newability[aslongas(swamp|myBattlefield) 1/1]))
 text=Domain - Equipped creature gets +1/+1 for each basic land type among lands you control. -- Equip {3}
 mana={4}
 type=Artifact
@@ -67904,7 +67904,7 @@ toughness=2
 [card]
 name=Manriki-Gusari
 auto={1}:equip
-auto=1/2
+auto=teach(creature) 1/2
 auto=teach(creature) {T}:destroy target(equipment)
 text=Equipped creature gets +1/+2 and has "{T}: Destroy target Equipment." -- Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.)
 mana={2}
@@ -68760,8 +68760,8 @@ toughness=1
 [card]
 name=Mask of Avacyn
 auto={3}:equip
-auto=opponentshroud
-auto=1/2
+auto=teach(creature) opponentshroud
+auto=teach(creature) 1/2
 text=Equipped creature gets +1/+2 and has hexproof. -- Equip {3}
 mana={2}
 type=Artifact
@@ -68807,7 +68807,7 @@ subtype=Equipment
 [card]
 name=Mask of Riddles
 auto={2}:equip
-auto=fear
+auto=teach(creature) fear
 auto=@combatdamaged(player) from(mytgt):may draw:1 controller
 text=Equipped creature has fear. (It can't be blocked except by artifact creatures and/or black creatures.) -- Whenever equipped creature deals combat damage to a player, you may draw a card. -- Equip {2}
 mana={U}{B}
@@ -73107,7 +73107,7 @@ toughness=2
 [card]
 name=Moonsilver Spear
 auto={4}:equip
-auto=first strike
+auto=teach(creature) first strike
 auto=@combat(attacking) source(mytgt):token(Angel,Angel Creature,4/4,white,flying)
 text=Equipped creature has first strike. -- Whenever equipped creature attacks, put a 4/4 white Angel creature token with flying onto the battlefield. -- Equip {4}
 mana={4}
@@ -73461,7 +73461,7 @@ type=Instant
 [card]
 name=Mortarpod
 auto={2}:equip
-auto=0/1
+auto=teach(creature) 0/1
 auto=teach(creature) {S}:damage:1 target(creature,player)
 auto=livingweapontoken(Germ,Creature Germ,0/0,black)
 text=Living weapon (When this Equipment enters the battlefield, put a 0/0 black Germ creature token onto the battlefield, then attach this to it.) -- Equipped creature gets +0/+1 and has "Sacrifice this creature: This creature deals 1 damage to target creature or player." -- Equip {2}
@@ -74083,7 +74083,7 @@ toughness=4
 [card]
 name=Murderer's Axe
 auto={D(*|myhand)}:equip
-auto=2/2
+auto=teach(creature) 2/2
 text=Equipped creature gets +2/+2. -- Equip—Discard a card.
 mana={4}
 type=Artifact
@@ -75688,8 +75688,8 @@ toughness=1
 [card]
 name=Necropouncer
 auto={2}:equip
-auto=3/1
-auto=haste
+auto=teach(creature) 3/1
+auto=teach(creature) haste
 auto=livingweapontoken(Germ,Creature Germ,0/0,black)
 text=Living weapon (When this Equipment enters the battlefield, put a 0/0 black Germ creature token onto the battlefield, then attach this to it.) -- Equipped creature gets +3/+1 and has haste. -- Equip {2}
 mana={6}
@@ -75888,7 +75888,7 @@ toughness=5
 [card]
 name=Nemesis Mask
 auto={3}:equip
-auto=lure
+auto=teach(creature) lure
 text=All creatures able to block equipped creature do so. -- Equip {3} ({3}: Attach to target creature you control. Equip only as a sorcery. This card enters the battlefield unattached and stays on the battlefield if the creature leaves.)
 mana={3}
 type=Artifact
@@ -76159,7 +76159,7 @@ toughness=1
 [card]
 name=Neurok Hoversail
 auto={2}:equip
-auto=flying
+auto=teach(creature) flying
 text=Equipped creature has flying. -- Equip {2} ({2}: Attach to target creature you control. Equip only as a sorcery. This card enters the battlefield unattached and stays on the battlefield if the creature leaves.)
 mana={1}
 type=Artifact
@@ -76582,7 +76582,7 @@ type=Sorcery
 [card]
 name=Nightmare Lash
 auto={L:3}:equip
-auto=foreach(swamp|myBattlefield) 1/1
+auto=teach(creature) type:swamp:mybattlefield/type:swamp:mybattlefield nonstatic
 text=Equipped creature gets +1/+1 for each Swamp you control. -- Equip - Pay 3 life. (Pay 3 life: Attach to target creature you control. Equip only as a sorcery. This card enters the battlefield unattached and stays on the battlefield if the creature leaves.)
 mana={4}
 type=Artifact
@@ -77298,8 +77298,8 @@ type=Instant
 [card]
 name=No-Dachi
 auto={3}:equip
-auto=2/0
-auto=first strike
+auto=teach(creature) 2/0
+auto=teach(creature) first strike
 text=Equipped creature gets +2/+0 and has first strike. -- Equip {3} ({3}: Attach to target creature you control. Equip only as a sorcery.)
 mana={2}
 type=Artifact
@@ -78699,7 +78699,7 @@ toughness=3
 [card]
 name=Ogre's Cleaver
 auto={5}:equip
-auto=5/0
+auto=teach(creature) 5/0
 text=Equipped creature gets +5/+0. -- Equip {5}
 mana={2}
 type=Artifact
@@ -78936,7 +78936,7 @@ type=Enchantment
 [/card]
 [card]
 name=O-Naginata
-auto={2}:equip target(creature[power >=3]|mybattlefield)
+auto={2}:equip target(creature[power>=3]|mybattlefield)
 auto=teach(creature) 3/0
 auto=teach(creature) trample
 text=O-Naginata can be attached only to a creature with 3 or more power. -- Equipped creature gets +3/+0 and has trample. -- Equip {2} ({2}: Attach to target creature you control. Equip only as a sorcery.)
@@ -81797,7 +81797,7 @@ type=Enchantment
 [card]
 name=Pennon Blade
 auto={4}:equip
-auto=foreach(creature|mybattlefield) 1/1
+auto=teach(creature) type:creature:mybattlefield/type:creature:mybattlefield nonstatic
 text=Equipped creature gets +1/+1 for each creature you control. -- Equip {4}
 mana={3}
 type=Artifact
@@ -81944,9 +81944,9 @@ toughness=4
 [card]
 name=Peregrine Mask
 auto={2}:equip
-auto=defender
-auto=first strike
-auto=flying
+auto=teach(creature) defender
+auto=teach(creature) first strike
+auto=teach(creature) flying
 text=Equipped creature has defender, flying, and first strike. -- Equip {2}
 mana={1}
 type=Artifact
@@ -91575,7 +91575,7 @@ toughness=2
 name=Ring of Evos Isle
 auto={1}:equip
 autoskill={2}:opponentshroud ueot
-auto=@each my upkeep:if cantargetcard(creature[blue]) then counter(1/1,1)
+auto=teach(creature[blue]) transforms((,newability[@each my upkeep:counter(1/1.1)]))
 text={2}: Equipped creature gains hexproof until end of turn. (It can't be the target of spells or abilities your opponents control.) -- At the beginning of your upkeep, put a +1/+1 counter on equipped creature if it's blue. -- Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.)
 mana={2}
 type=Artifact
@@ -91592,8 +91592,8 @@ type=Artifact
 [card]
 name=Ring of Kalonia
 auto={1}:equip
-auto=trample
-auto=@each my upkeep:if cantargetcard(creature[green]) then counter(1/1,1)
+auto=teach(creature) trample
+auto=teach(creature[green]) transforms((,newability[@each my upkeep:counter(1/1.1)]))
 text=Equipped creature has trample. (If it 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.) -- At the beginning of your upkeep, put a +1/+1 counter on equipped creature if it's green. -- Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.)
 mana={2}
 type=Artifact
@@ -91617,8 +91617,8 @@ type=Artifact
 [card]
 name=Ring of Thune
 auto={1}:equip
-auto=vigilance
-auto=@each my upkeep:if cantargetcard(creature[white]) then counter(1/1,1)
+auto=teach(creature) vigilance
+auto=teach(creature[white]) transforms((,newability[@each my upkeep:counter(1/1.1)]))
 text=Equipped creature has vigilance. (Attacking doesn't cause it to tap.) -- At the beginning of your upkeep, put a +1/+1 counter on equipped creature if it's white. -- Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.)
 mana={2}
 type=Artifact
@@ -91627,8 +91627,8 @@ subtype=Equipment
 [card]
 name=Ring of Valkas
 auto={1}:equip
-auto=haste
-auto=@each my upkeep:if cantargetcard(creature[red]) then counter(1/1,1)
+auto=teach(creature) haste
+auto=teach(creature[red]) transforms((,newability[@each my upkeep:counter(1/1.1)]))
 text=Equipped creature has haste. (It can attack and {T} no matter when it came under your control.) -- At the beginning of your upkeep, put a +1/+1 counter on equipped creature if it's red. -- Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.)
 mana={2}
 type=Artifact
@@ -91638,7 +91638,7 @@ subtype=Equipment
 name=Ring of Xathrid
 auto={1}:equip
 autoskill={2}:regenerate
-auto=@each my upkeep:if cantargetcard(creature[black]) then counter(1/1,1)
+auto=teach(creature[black]) transforms((,newability[@each my upkeep:counter(1/1.1)]))
 text={2}: Regenerate equipped creature. (The next time that creature would be destroyed this turn, it isn't. Instead tap it, remove all damage from it, and remove it from combat.) -- At the beginning of your upkeep, put a +1/+1 counter on equipped creature if it's black. -- Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.)
 mana={2}
 type=Artifact
@@ -91674,7 +91674,7 @@ toughness=3
 [card]
 name=Riot Gear
 auto={2}:equip
-auto=1/2
+auto=teach(creature) 1/2
 text=Equipped creature gets +1/+2. -- Equip {2} ({2}: Attach to target creature you control. Equip only as a sorcery.)
 mana={2}
 type=Artifact
@@ -92647,7 +92647,7 @@ toughness=2
 [card]
 name=Ronin Warclub
 auto=@movedto(creature|myBattlefield):all(trigger[to]) rehook
-auto=+2/+1
+auto=teach(creature) 2/1
 text=Equipped creature gets +2/+1. -- Whenever a creature enters the battlefield under your control, attach Ronin Warclub to that creature. -- Equip {5} ({5}: Attach to target creature you control. Equip only as a sorcery.)
 mana={3}
 auto={5}:equip
@@ -93496,7 +93496,7 @@ toughness=2
 [card]
 name=Runechanter's Pike
 auto={2}:equip
-auto=first strike
+auto=teach(creature) first strike
 auto=teach(creature) type:*[instant]:mygraveyard/0 nonstatic
 auto=teach(creature) type:*[sorcery]:mygraveyard/0 nonstatic
 text=Equipped creature has first strike and gets +X/+0 where X is the number of instant and sorcery cards in your graveyard. -- Equip {2}
@@ -94412,7 +94412,7 @@ toughness=6
 [card]
 name=Sai of the Shinobi
 auto={2}:equip
-auto=1/1
+auto=teach(creature) 1/1
 auto=@movedto(creature|mybattlefield):may all(trigger[to]) rehook
 text=Equipped creature gets +1/+1. -- Whenever a creature enters the battlefield under your control, you may attach Sai of the Shinobi to it. -- Equip {2}
 mana={1}
@@ -96775,7 +96775,7 @@ toughness=3
 [card]
 name=Scrounged Scythe
 auto={2}:equip
-auto=1/1
+auto=teach(creature) 1/1
 auto=teach(human) menace
 text=Equipped creature gets +1/+1. -- As long as equipped creature is a Human, it has menace. (It can't be blocked except by two or more creatures.) -- Equip {2}
 type=Artifact
@@ -99378,7 +99378,7 @@ toughness=3
 [card]
 name=Shard of Broken Glass
 auto={1}:equip
-auto=1/0
+auto=teach(creature) 1/0
 auto=@combat(attacking) source(mytgt):may deplete:2 controller
 text=Equipped creature gets +1/+0. -- Whenever equipped creature attacks, you may put the top two cards of your library into your graveyard. -- Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.)
 mana={1}
@@ -99442,7 +99442,7 @@ type=Enchantment
 [card]
 name=Sharpened Pitchfork
 auto={1}:equip
-auto=first strike
+auto=teach(creature) first strike
 auto=teach(human) 1/1
 text=Equipped creature has first strike. -- As long as equipped creature is a Human, it gets +1/+1. -- Equip {1}
 mana={2}
@@ -99759,8 +99759,8 @@ subtype=Aura
 [card]
 name=Shield of the Righteous
 auto={2}:equip
-auto=0/2
-auto=vigilance
+auto=teach(creature) 0/2
+auto=teach(creature) vigilance
 auto=@combat(blocking) source(mytgt) from(creature):all(trigger[from]) frozen
 text=Equipped creature gets +0/+2 and has vigilance. -- Whenever equipped creature blocks a creature, that creature doesn't untap during its controller's next untap step. -- Equip {2}
 mana={W}{U}
@@ -100710,7 +100710,7 @@ toughness=2
 [card]
 name=Shuko
 auto={0}:equip
-auto=1/0
+auto=teach(creature) 1/0
 text=Equipped creature gets +1/+0. -- Equip {0} ({0}: Attach to target creature you control. Equip only as a sorcery.)
 mana={1}
 type=Artifact
@@ -100810,7 +100810,7 @@ toughness=1
 [card]
 name=Sickleslicer
 auto={4}:equip
-auto=2/2
+auto=teach(creature) 2/2
 auto=livingweapontoken(Germ,Creature Germ,0/0,black)
 text=Living weapon (When this Equipment enters the battlefield, put a 0/0 black Germ creature token onto the battlefield, then attach this to it.) -- Equipped creature gets +2/+2. -- Equip {4}
 mana={3}
@@ -101621,7 +101621,7 @@ toughness=1
 [card]
 name=Silver-Inlaid Dagger
 auto={2}:equip
-auto=2/0
+auto=teach(creature) 2/0
 auto=teach(human) 1/0
 text=Equipped creature gets +2/+0 -- As long as equipped creature is a Human, it gets and additional +1/+0. -- Equip {2}
 mana={1}
@@ -101642,7 +101642,7 @@ toughness=5
 [card]
 name=Silverskin Armor
 auto={2}:equip
-auto=1/1
+auto=teach(creature) 1/1
 auto=teach(creature) transforms((artifact))
 text=Equipped creature gets +1/+1 and is an artifact in addition to its other types. -- Equip {2}
 mana={2}
@@ -102350,8 +102350,8 @@ toughness=1
 [card]
 name=Skinwing
 auto={4}:equip
-auto=2/2
-auto=flying
+auto=teach(creature) 2/2
+auto=teach(creature) flying
 auto=livingweapontoken(Germ,Creature Germ,0/0,black)
 text=Living weapon (When this Equipment enters the battlefield, put a 0/0 black Germ creature token onto the battlefield, then attach this to it.) -- Equipped creature gets +2/+2 and has flying. -- Equip {4}
 mana={4}
@@ -102703,7 +102703,7 @@ type=Artifact
 [/card]
 [card]
 name=Skullclamp
-auto=1/-1
+auto=teach(creature) 1/-1
 auto=@movedto(graveyard) from(mytgt|battlefield):draw:2 controller
 auto={1}:equip
 text=Equipped creature gets +1/-1. -- When equipped creature is put into a graveyard, draw two cards. -- Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery. This card enters the battlefield unattached and stays on the battlefield if the creature leaves.)
@@ -102852,8 +102852,8 @@ type=Enchantment
 [card]
 name=Skyblinder Staff
 auto={3}:equip
-auto=1/0
-auto=cantbeblockedby(creature[flying])
+auto=teach(creature) 1/0
+auto=teach(creature) cantbeblockedby(creature[flying])
 text=Equipped creature gets +1/+0 and can't be blocked by creatures with flying. -- Equip {3} ({3}: Attach to target creature you control. Equip only as a sorcery.)
 mana={1}
 type=Artifact
@@ -103384,7 +103384,7 @@ type=Sorcery
 [card]
 name=Slagwurm Armor
 auto={3}:equip
-auto=0/6
+auto=teach(creature) 0/6
 text=Equipped creature gets +0/+6. -- Equip {3} ({3}: Attach to target creature you control. Equip only as a sorcery. This card enters the battlefield unattached and stays on the battlefield if the creature leaves.)
 mana={1}
 type=Artifact
@@ -103522,8 +103522,8 @@ toughness=2
 [card]
 name=Slayer's Plate
 auto={3}:equip
-auto=4/2
-auto=@movedto(mytgt[human]|mygraveyard):token(Spirit,creature Spirit,1/1,white,flying)
+auto=teach(creature) 4/2
+auto=teach(human) transforms((,newability[@movedTo(this|graveyard) from(battlefield):makecardt(Spirit:Creature Spirit:1/1:white:flying)]))
 text=Equipped creature gets +4/+2. -- Whenever equipped creature dies, if it was a Human, put a 1/1 white Spirit creature token with flying onto the battlefield. -- Equip {3}
 mana={3}
 type=Artifact
@@ -105908,7 +105908,7 @@ toughness=3
 [/card]
 [card]
 name=Sparring Collar
-auto=first strike
+auto=teach(creature) first strike
 auto={R}{R}:name(attach) rehook target(creature|mybattlefield)
 auto={1}:equip
 text=Equipped creature has first strike. -- {R}{R}: Attach Sparring Collar to target creature you control. -- Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.)
@@ -106076,7 +106076,7 @@ toughness=6
 [card]
 name=Specter's Shroud
 auto={1}:equip
-auto=1/0
+auto=teach(creature) 1/0
 auto=@combatdamaged(player) from(mytgt):ability$!name(discard) target(*|myhand) reject!$ opponent
 text=Equipped creature gets +1/+0. -- Whenever equipped creature deals combat damage to a player, that player discards a card. -- Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery. This card enters the battlefield unattached and stays on the battlefield if the creature leaves.)
 mana={2}
@@ -106568,8 +106568,8 @@ type=Enchantment
 [card]
 name=Spidersilk Net
 auto={2}:equip
-auto=reach
-auto=0/2
+auto=teach(creature) reach
+auto=teach(creature) 0/2
 text=Equipped creature gets +0/+2 and has reach. (It can block creatures with flying.) -- Equip {2} ({2}: Attach to target creature you control. Equip only as a sorcery.)
 mana={0}
 type=Artifact
@@ -109146,14 +109146,6 @@ power=1
 toughness=2
 [/card]
 [card]
-name=Stitcher's Graft
-auto={2}:equip
-text=Equipped creature gets +3/+3. -- Whenever equipped creature attacks, it doesn't untap during its controller's next untap step. -- Whenever Stitcher's Graft becomes unattached from a permanent, sacrifice that permanent. -- Equip {2}
-mana={1}
-type=Artifact
-subtype=Equipment
-[/card]
-[card]
 name=Stitchwing Skaab
 abilities=flying
 auto={1}{U}{D(*|myhand)}{D(*|myhand)}:moveto(mybattlefield) and!(tap(noevent))!
@@ -109805,7 +109797,7 @@ toughness=3
 [card]
 name=Stormrider Rig
 auto={2}:equip
-auto=1/1
+auto=teach(creature) 1/1
 auto=@movedto(creature|mybattlefield):may all(trigger[to]) rehook
 text=Equipped creature gets +1/+1. -- Whenever a creature enters the battlefield under your control, you may attach Stormrider Rig to it. -- Equip {2}
 mana={2}
@@ -109924,8 +109916,8 @@ subtype=Aura
 [card]
 name=Strandwalker
 auto={4}:equip
-auto=2/4
-auto=reach
+auto=teach(creature) 2/4
+auto=teach(creature) reach
 auto=livingweapontoken(Germ,Creature Germ,0/0,black)
 text=Living weapon (When this Equipment enters the battlefield, put a 0/0 black Germ creature token onto the battlefield, then attach this to it.) -- Equipped creature gets +2/+4 and has reach. -- Equip {4}
 mana={5}
@@ -110201,8 +110193,8 @@ subtype=Aura
 [card]
 name=Strider Harness
 auto={1}:equip
-auto=1/1
-auto=haste
+auto=teach(creature) 1/1
+auto=teach(creature) haste
 text=Equipped creature gets +1/+1 and has haste. -- Equip {1}
 mana={3}
 type=Artifact
@@ -111160,7 +111152,7 @@ toughness=1
 [card]
 name=Sunforger
 auto={3}:equip
-auto=4/0
+auto=teach(creature) 4/0
 auto=teach(creature) {unattach}{R}{W}:castcard(restricted) notatarget(instant[red;white;manacost<=4]|mylibrary)
 text=Equipped creature gets +4/+0. -- {R}{W}, Unattach Sunforger: Search your library for a red or white instant card with converted mana cost 4 or less and cast that card without paying its mana cost. Then shuffle your library. -- Equip {3}
 mana={3}
@@ -112136,7 +112128,7 @@ name=Sword of Body and Mind
 auto={2}:equip
 auto=teach(creature) protection from green
 auto=teach(creature) protection from blue
-auto=2/2
+auto=teach(creature) 2/2
 auto=@combatdamaged(player) from(mytgt):token(Wolf,Creature Wolf,2/2,green)
 auto=@combatdamaged(player) from(mytgt):deplete:10 opponent
 text=Equipped creature gets +2/+2 and has protection from green and from blue. -- Whenever equipped creature deals combat damage to a player, you put a 2/2 green Wolf creature token onto the battlefield and that player puts the top ten cards of his or her library into his or her graveyard. -- Equip {2}
@@ -112146,7 +112138,7 @@ subtype=Equipment
 [/card]
 [card]
 name=Sword of Feast and Famine
-auto=2/2
+auto=teach(creature) 2/2
 auto=teach(creature) protection from black
 auto=teach(creature) protection from green
 auto=@combatdamaged(player) from(mytgt):ability$!name(discard) target(*|myhand) reject!$ opponent
@@ -112162,7 +112154,7 @@ name=Sword of Fire and Ice
 auto={2}:equip
 auto=teach(creature) protection from red
 auto=teach(creature) protection from blue
-auto=2/2
+auto=teach(creature) 2/2
 auto=@combatdamaged(player) from(mytgt):draw:1 controller
 auto=@combatdamaged(player) from(mytgt):damage:2 target(creature,player)
 text=Equipped creature gets +2/+2 and has protection from red and from blue. -- Whenever equipped creature deals combat damage to a player, Sword of Fire and Ice deals 2 damage to target creature or player and you draw a card. -- Equip {2}
@@ -112173,7 +112165,7 @@ subtype=Equipment
 [card]
 name=Sword of Kaldra
 auto={4}:equip
-auto=5/5
+auto=teach(creature) 5/5
 auto=@damaged(creature) from(mytgt):all(trigger[to]) moveto(exile)
 text=Equipped creature gets +5/+5. -- Whenever equipped creature deals damage to a creature, exile that creature. -- Equip {4} ({4}: Attach to target creature you control. Equip only as a sorcery. This card enters the battlefield unattached and stays on the battlefield if the creature leaves.)
 mana={4}
@@ -112185,7 +112177,7 @@ name=Sword of Light and Shadow
 auto={2}:equip
 auto=teach(creature) protection from white
 auto=teach(creature) protection from black
-auto=2/2
+auto=teach(creature) 2/2
 auto=@combatdamaged(player) from(mytgt):life:3
 auto=@combatdamaged(player) from(mytgt):may moveTo(myhand) target(creature|mygraveyard)
 text=Equipped creature gets +2/+2 and has protection from white and from black. -- Whenever equipped creature deals combat damage to a player, you gain 3 life and you may return up to one target creature card from your graveyard to your hand. -- Equip {2}
@@ -112213,7 +112205,7 @@ type=Legendary Artifact
 [card]
 name=Sword of the Meek
 auto={2}:equip
-auto=1/2
+auto=teach(creature) 1/2
 autograveyard=@movedto(creature[power=1;toughness=1]|mybattlefield):may all(trigger[to]) rehook
 text=Equipped creature gets +1/+2. -- Equip {2} -- Whenever a 1/1 creature enters the battlefield under your control, you may return Sword of the Meek from your graveyard to the battlefield, then attach it to that creature.
 mana={2}
@@ -112235,11 +112227,11 @@ subtype=Equipment
 [card]
 name=Sword of Vengeance
 auto={3}:equip
-auto=2/0
-auto=first strike
-auto=vigilance
-auto=trample
-auto=haste
+auto=teach(creature) 2/0
+auto=teach(creature) first strike
+auto=teach(creature) vigilance
+auto=teach(creature) trample
+auto=teach(creature) haste
 text=Equipped creature gets +2/+0 and has first strike, vigilance, trample, and haste. -- Equip {3} ({3}: Attach to target creature you control. Equip only as a sorcery.)
 mana={3}
 type=Artifact
@@ -112250,7 +112242,7 @@ name=Sword of War and Peace
 auto={2}:equip
 auto=teach(creature) protection from red
 auto=teach(creature) protection from white
-auto=2/2
+auto=teach(creature) 2/2
 auto=@combatdamaged(player) from(mytgt):damage:ohandcount opponent
 auto=@combatdamaged(player) from(mytgt):life:phandcount controller
 text=Equipped creature gets +2/+2 and has protection from red and from white. -- Whenever equipped creature deals combat damage to a player, Sword of War and Peace deals damage to that player equal to the number of cards in his or her hand and you gain 1 life for each card in your hand. -- Equip {2}
@@ -112457,7 +112449,7 @@ toughness=1
 [/card]
 [card]
 name=Sylvok Lifestaff
-auto=1/0
+auto=teach(creature) 1/0
 auto=@movedTo(mytgt|graveyard) from(battlefield):all(trigger[to]) life:3 controller
 text=Equipped creature gets +1/+0. -- Whenever equipped creature is put into a graveyard, you gain 3 life. -- Equip {1}
 mana={1}
@@ -113485,7 +113477,7 @@ type=Sorcery
 [card]
 name=Tatsumasa, the Dragon's Fang
 auto={3}:equip
-auto=5/5
+auto=teach(creature) 5/5
 auto={6}:token(Dragon Spirit,Creature Dragon Spirit,5/5,flying,blue) && all(this) becomes(expelled) ueot && all(Dragon Spirit[token]) transforms((,newability[(blink)forsrc all(expelled|mybattlefield)])) forever
 text=Equipped creature gets +5/+5. -- {6}: Remove Tatsumasa, the Dragon's Fang from the game: Put a 5/5 blue Dragon Spirit token with flying into play. -- Return Tatsumasa, the Dragon's Fang to play under its owner's control when that token is put into a graveyard.
 mana={6}
@@ -114441,7 +114433,7 @@ toughness=4
 [card]
 name=Tenza, Godo's Maul
 auto={1}:equip
-auto=1/1
+auto=teach(creature) 1/1
 auto=teach(creature[legendary]) 2/2
 auto=teach(creature[red]) trample
 text=Equipped creature gets +1/+1. As long as it's legendary, it gets an additional +2/+2. As long as it's red, it has trample. -- Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.)
@@ -117849,8 +117841,8 @@ toughness=2
 [card]
 name=Tormentor's Trident
 auto={3}:equip
-auto=3/0
-auto=mustattack
+auto=teach(creature) 3/0
+auto=teach(creature) mustattack
 text=Equipped creature gets +3/+0 and attacks each turn if able. -- Equip {3}
 mana={2}
 type=Artifact
@@ -119745,8 +119737,8 @@ type=Enchantment
 [card]
 name=True-Faith Censer
 auto={2}:equip
-auto=1/1
-auto=vigilance
+auto=teach(creature) 1/1
+auto=teach(creature) vigilance
 auto=teach(human) 1/0
 text=Equipped creature gets +1/+1 and has vigilance. -- As long as equipped creature is a Human, it gets an additional +1/+0. -- Equip {2} ({2}: Attach to target creature you control. Equip only as a sorcery.)
 mana={2}
@@ -119797,7 +119789,7 @@ toughness=2
 [card]
 name=Trusty Machete
 auto={2}:equip
-auto=2/1
+auto=teach(creature) 2/1
 text=Equipped creature gets +2/+1. -- Equip {2}
 mana={1}
 type=Artifact
@@ -121370,8 +121362,8 @@ toughness=1
 [card]
 name=Unscythe, Killer of Kings
 auto={2}:equip
-auto=3/3
-auto=first strike
+auto=teach(creature) 3/3
+auto=teach(creature) first strike
 auto=@vampired(creature) from(mytgt):may all(trigger[to]) moveTo(exile) && token(Zombie,Creature Zombie,2/2,black)
 text=Equipped creature gets +3/+3 and has first strike. -- Whenever a creature dealt damage by equipped creature this turn is put into a graveyard, you may exile that card. If you do, put a 2/2 black Zombie creature token onto the battlefield. -- Equip {2}
 mana={U}{B}{B}{R}
@@ -124369,8 +124361,8 @@ toughness=1
 [card]
 name=Viridian Claw
 auto={1}:equip
-auto=1/0
-auto=first strike
+auto=teach(creature) 1/0
+auto=teach(creature) first strike
 text=Equipped creature gets +1/+0 and has first strike. -- Equip {2}
 mana={2}
 type=Artifact
@@ -125512,8 +125504,8 @@ toughness=6
 [card]
 name=Vorrac Battlehorns
 auto={1}:equip
-auto=trample
-auto=oneblocker
+auto=teach(creature) trample
+auto=teach(creature) oneblocker
 text=Equipped creature has trample and can't be blocked by more than one creature. -- Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery. This card enters the battlefield unattached and stays on the battlefield if the creature leaves.)
 mana={2}
 type=Artifact
@@ -125676,7 +125668,7 @@ toughness=5
 [card]
 name=Vulshok Battlegear
 auto={3}:equip
-auto=3/3
+auto=teach(creature) 3/3
 text=Equipped creature gets +3/+3. -- Equip {3} ({3}: Attach to target creature you control. Equip only as a sorcery. This card enters the battlefield unattached and stays on the battlefield if the creature leaves.)
 mana={3}
 type=Artifact
@@ -125706,8 +125698,8 @@ toughness=2
 [card]
 name=Vulshok Gauntlets
 auto={3}:equip
-auto=4/2
-auto=doesnotuntap
+auto=teach(creature) 4/2
+auto=teach(creature) doesnotuntap
 text=Equipped creature gets +4/+2 and doesn't untap during its controller's untap step. -- Equip {3} ({3}: Attach to target creature you control. Equip only as a sorcery. This card enters the battlefield unattached and stays on the battlefield if the creature leaves.)
 mana={2}
 type=Artifact
@@ -125726,7 +125718,7 @@ toughness=2
 [card]
 name=Vulshok Morningstar
 auto={2}:equip
-auto=2/2
+auto=teach(creature) 2/2
 text=Equipped creature gets +2/+2. -- Equip {2} ({2}: Attach to target creature you control. Equip only as a sorcery.)
 mana={2}
 type=Artifact
@@ -126956,7 +126948,7 @@ type=Instant
 [card]
 name=Warlord's Axe
 auto={4}:equip
-auto=3/1
+auto=teach(creature) 3/1
 text=Equipped creature gets +3/+1.
 mana={3}
 type=Artifact
@@ -126987,7 +126979,7 @@ toughness=5
 [card]
 name=Warmonger's Chariot
 auto={3}:equip
-auto=2/2
+auto=teach(creature) 2/2
 auto=teach(creature[defender]) canattack
 text=Equipped creature gets +2/+2. -- As long as equipped creature has defender, it can attack as though it didn't have defender. -- Equip {3}
 mana={2}
@@ -128402,7 +128394,7 @@ type=Instant
 [card]
 name=Whispersilk Cloak
 auto={2}:equip
-auto=unblockable
+auto=teach(creature) unblockable
 auto=teach(creature) shroud
 text=Equipped creature is unblockable. -- Equipped creature has shroud. (It can't be the target of spells or abilities.) -- Equip {2} ({2}: Attach to target creature you control. Equip only as a sorcery.)
 mana={3}
@@ -130126,7 +130118,7 @@ type=Artifact
 [/card]
 [card]
 name=Wooden Stake
-auto=1/0
+auto=teach(creature) 1/0
 auto=@combat(blocking,blocked) source(mytgt) from(vampire):all(trigger[from]) bury
 auto={1}:equip
 text=Equipped creature gets +1/+0. -- Whenever equipped creature blocks or becomes blocked by a Vampire, destroy that creature. It can't be regenerated. -- Equip {1}