convert G-M equipment to new Equip keyword. added check to attach ability macro to prevent Equip if artifact is creature.

res/cardsfolder/a/accorders_shield.txt

@@ -3,7 +3,7 @@ ManaCost:0
 Types:Artifact Equipment
 Text:no text
 K:Equip 3
-S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 0 | AddToughness$ 3 | AddKeyword$ Vigilance | Description$ Equipped creature gets +0/+3 and has vigilance.
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddToughness$ 3 | AddKeyword$ Vigilance | Description$ Equipped creature gets +0/+3 and has vigilance.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/accorders_shield.jpg
 SetInfo:SOM|Common|http://magiccards.info/scans/en/som/136.jpg

res/cardsfolder/a/avacyns_collar.txt

@@ -3,7 +3,7 @@ ManaCost:1
 Types:Artifact Equipment
 Text:no text
 K:Equip 2
-S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 1 | AddToughness$ 0 | AddKeyword$ Vigilance | Description$ Equipped creature gets +1/+0 and has vigilance.
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 1 | AddKeyword$ Vigilance | Description$ Equipped creature gets +1/+0 and has vigilance.
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.AttachedBy+Human | Execute$ TrigToken | TriggerDescription$ Whenever equipped creature dies, if it was a Human, put a 1/1 white Spirit creature token with flying onto the battlefield.
 SVar:TrigToken:AB$Token | Cost$ 0 | TokenImage$ W 1 1 Spirit | TokenAmount$ 1 | TokenName$ Spirit | TokenTypes$ Creature,Spirit | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying
 SVar:Rarity:Uncommon

res/cardsfolder/b/blade_of_the_bloodchief.txt

@@ -2,7 +2,7 @@ Name:Blade of the Bloodchief
 ManaCost:1
 Types:Artifact Equipment
 Text:no text
-# TODO - Convert this to scrip
+# TODO - Convert this to script
 K:Equip 1
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/blade_of_the_bloodchief.jpg

res/cardsfolder/b/blight_sickle.txt

@@ -3,7 +3,7 @@ ManaCost:2
 Types:Artifact Equipment
 Text:no text
 K:Equip 2
-S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 1 | AddToughness$ 0 | AddKeyword$ Wither | Description$ Equipped creature gets +1/+0 and has wither.
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 1 | AddKeyword$ Wither | Description$ Equipped creature gets +1/+0 and has wither.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/blight_sickle.jpg
 SetInfo:SHM|Common|http://magiccards.info/scans/en/shm/247.jpg

res/cardsfolder/b/bone_saw.txt

@@ -3,7 +3,7 @@ ManaCost:0
 Types:Artifact Equipment
 Text:no text
 K:Equip 1
-S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 1 | AddToughness$ 0 | Description$ Equipped creature gets +1/+0.
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 1 | Description$ Equipped creature gets +1/+0.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/bone_saw.jpg
 SetInfo:CFX|Common|http://magiccards.info/scans/en/cfx/135.jpg

res/cardsfolder/b/bonesplitter.txt

@@ -2,8 +2,8 @@ Name:Bonesplitter
 ManaCost:1
 Types:Artifact Equipment
 Text:no text
-K:Equip 1:+2/+0
-S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 2 | AddToughness$ 0 | Description$ Equipped creature gets +2/+0.
+K:Equip 1
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 2 | Description$ Equipped creature gets +2/+0.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/bonesplitter.jpg
 SetInfo:MRD|Common|http://magiccards.info/scans/en/mi/146.jpg

res/cardsfolder/b/butchers_cleaver.txt

@@ -3,7 +3,7 @@ ManaCost:3
 Types:Artifact Equipment
 Text:no text
 K:Equip 3
-S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 3 | AddToughness$ 0 | Description$ Equipped creature gets +3/+0.
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 3 | Description$ Equipped creature gets +3/+0.
 S:Mode$ Continuous | Affected$ Card.EquippedBy+Human | AddKeyword$ Lifelink | Description$ As long as equipped creature is a Human, it has lifelink.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/butchers_cleaver.jpg

res/cardsfolder/d/darksteel_axe.txt

@@ -4,7 +4,7 @@ Types:Artifact Equipment
 Text:no text
 K:Indestructible
 K:Equip 2
-S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 2 | AddToughness$ 0 | Description$ Equipped creature gets +2/+0.
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 2 | Description$ Equipped creature gets +2/+0.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/darksteel_axe.jpg
 SetInfo:SOM|Uncommon|http://magiccards.info/scans/en/som/149.jpg

res/cardsfolder/d/darksteel_plate.txt

@@ -1,9 +1,10 @@
 Name:Darksteel Plate
 ManaCost:3
 Types:Artifact Equipment
-Text:Equipped creature is indestructible.
+Text:no text
 K:Indestructible
-K:eqPump 2:HIDDEN Indestructible
+K:Equip 2
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddHiddenKeyword$ HIDDEN Indestructible | Description$ Equipped creature is indestructible.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/darksteel_plate.jpg
 SetInfo:MBS|Rare|http://magiccards.info/scans/en/mbs/104.jpg

res/cardsfolder/d/dead_iron_sledge.txt

@@ -2,7 +2,7 @@ Name:Dead-Iron Sledge
 ManaCost:1
 Types:Artifact Equipment
 Text:no text
-K:eqPump 2:0/0
+K:Equip 2
 T:Mode$ Blocks | ValidCard$ Creature.AttachedBy | TriggerZones$ Battlefield | Execute$ TrigDestroy | TriggerDescription$ Whenever equipped creature blocks or becomes blocked by a creature, destroy both creatures.
 T:Mode$ Blocks | ValidCard$ Creature | ValidBlocked$ Creature.AttachedBy | TriggerZones$ Battlefield | Execute$ TrigDestroy | Secondary$ True | TriggerDescription$ Whenever equipped creature blocks or becomes blocked by a creature, destroy both creatures.
 SVar:TrigDestroy:AB$Destroy | Cost$ 0 | Defined$ TriggeredAttacker | SubAbility$ DBDestroy

res/cardsfolder/d/deathrender.txt

@@ -1,8 +1,9 @@
 Name:Deathrender
 ManaCost:4
 Types:Artifact Equipment
-Text:Equipped creature gets +2/+2.
-K:eqPump 2:+2/+2
+Text:no text
+K:Equip 2
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 2 | AddToughness$ 2 | Description$ Equipped creature gets +2/+2.
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.AttachedBy | Execute$ CleanTheBlade | OptionalDecider$ You | TriggerDescription$ Whenever equipped creature dies, you may put a creature card from your hand onto the battlefield and attach CARDNAME to it.
 SVar:CleanTheBlade:DB$ Cleanup | Cost$ 0 | ClearRemembered$ True | SubAbility$ DeathrendersCall
 SVar:DeathrendersCall:DB$ ChangeZone | Cost$ 0 | Origin$ Hand | Destination$ Battlefield | ChangeType$ Creature | ChangeNum$ 1 | RememberChanged$ True | SubAbility$ DeathrenderAttach

res/cardsfolder/d/demonmail_hauberk.txt

@@ -2,7 +2,7 @@ Name:Demonmail Hauberk
 ManaCost:4
 Types:Artifact Equipment
 Text:no text
-A:AB$ Attach | Cost$ Sac<1/Creature> | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | SorcerySpeed$ True | PrecostDesc$ Equip - | SpellDescription$ Attach CARDNAME to target creature you control.
+K:Equip Sac<1/Creature>
 S:Mode$ Continuous | Affected$ Card.EquippedBy | AddPower$ 4 | AddToughness$ 2 | Description$ Equipped creature gets +4/+2.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/demonmail_hauberk.jpg

res/cardsfolder/d/demonspine_whip.txt

@@ -2,7 +2,7 @@ Name:Demonspine Whip
 ManaCost:B R
 Types:Artifact Equipment
 Text:no text
-K:eqPump 1:+0/+0
+K:Equip 1
 A:AB$ Pump | Cost$ X | Defined$ Equipped | NumAtt$ +X | References$ X | SpellDescription$ Equipped creature gets +X/+0 until end of turn.
 SVar:X:Count$xPaid
 SVar:RemAIDeck:True

res/cardsfolder/e/ensouled_scimitar.txt

@@ -2,8 +2,8 @@ Name:Ensouled Scimitar
 ManaCost:3
 Types:Artifact Equipment
 Text:no text
+K:Equip 2
 A:AB$ Animate | Cost$ 3 | Defined$ Self | Power$ 1 | Toughness$ 5 | Types$ Creature,Artifact,Spirit | Keywords$ Flying | OverwriteTypes$ True | SpellDescription$ CARDNAME becomes a 1/5 Spirit artifact creature with flying until end of turn. (Equipment that's a creature can't equip a creature.)
-A:AB$ Attach | Cost$ 2 | ValidTgts$ Creature.YouCtrl | IsPresent$ Card.Self+nonCreature | TgtPrompt$ Select target creature you control | SorcerySpeed$ True | PrecostDesc$ Equip - | SpellDescription$ Attach CARDNAME to target creature you control.
 S:Mode$ Continuous | Affected$ Card.EquippedBy | IsPresent$ Card.Self+nonCreature | AddPower$ 1 | AddToughness$ 5 | Description$ Equipped creature gets +1/+5.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ensouled_scimitar.jpg

res/cardsfolder/g/generals_kabuto.txt

@@ -1,8 +1,9 @@
 Name:General's Kabuto
 ManaCost:4
 Types:Artifact Equipment
-Text:Equipped creature has shroud. (It can't be the target of spells or abilities.)\r\nPrevent all combat damage that would be dealt to equipped creature.
-K:eqPump 2:Shroud & HIDDEN Prevent all combat damage that would be dealt to CARDNAME.
+Text:Equipped creature has shroud. (It can't be the target of spells or abilities.)\r\n\r\nPrevent all combat damage that would be dealt to equipped creature.
+K:Equip 2
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddKeyword$ Shroud | AddHiddenKeyword$ HIDDEN Prevent all combat damage that would be dealt to CARDNAME.  
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/generals_kabuto.jpg
 SetInfo:CHK|Rare|http://magiccards.info/scans/en/chk/251.jpg

res/cardsfolder/g/golem_skin_gauntlets.txt

@@ -2,7 +2,7 @@ Name:Golem-Skin Gauntlets
 ManaCost:1
 Types:Artifact Equipment
 Text:no text
-K:eqPump 2:0/0
+K:Equip 2
 S:Mode$ Continuous | Affected$ Card.EquippedBy | AddPower$ X | Description$ Equipped creature gets +1/+0 for each Equipment attached to it.
 SVar:X:Count$Valid Equipment.AttachedTo Creature.EquippedBy
 SVar:Rarity:Uncommon

res/cardsfolder/g/gorgon_flail.txt

@@ -1,8 +1,9 @@
 Name:Gorgon Flail
 ManaCost:2
 Types:Artifact Equipment
-Text:Equipped creature gets +1/+1 and has deathtouch.
-K:eqPump 2:+1/+1/Deathtouch
+Text:no text
+K:Equip 2
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ Deathtouch | Description$ Equipped creature gets +1/+1 and has deathtouch.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/gorgon_flail.jpg
 SetInfo:M10|Uncommon|http://magiccards.info/scans/en/m10/211.jpg

res/cardsfolder/g/grafted_exoskeleton.txt

@@ -1,8 +1,9 @@
 Name:Grafted Exoskeleton
 ManaCost:4
 Types:Artifact Equipment
-Text:Equipped creature gets +2/+2 and has infect. (It deals damage to creatures in the form of -1/-1 counters and to players in the form of poison counters.)
-K:eqPump 2:+2/+2/Infect
+Text:no text
+K:Equip 2
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 2 | AddToughness$ 2 | AddKeyword$ Infect | Description$ Equipped creature gets +2/+2 and has infect. (It deals damage to creatures in the form of -1/-1 counters and to players in the form of poison counters.)
 T:Mode$ Unequip | ValidEquipment$ Card.Self | ValidCard$ Permanent | TriggerZones$ Battlefield | Execute$ TrigSac | TriggerDescription$ Whenever CARDNAME becomes unattached from a permanent, sacrifice that permanent.
 SVar:TrigSac:AB$Sacrifice | Cost$ 0 | Defined$ You | SacValid$ TriggeredCard
 SVar:Rarity:Uncommon

res/cardsfolder/g/grafted_wargear.txt

@@ -1,8 +1,9 @@
 Name:Grafted Wargear
 ManaCost:3
 Types:Artifact Equipment
-Text:Equipped creature gets +3/+2.
-K:eqPump 0:+3/+2
+Text:no text
+K:Equip 0
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 3 | AddToughness$ 2 | Description$ Equipped creature gets +3/+2.
 T:Mode$ Unequip | ValidEquipment$ Card.Self | ValidCard$ Permanent | TriggerZones$ Battlefield | Execute$ TrigSac | TriggerDescription$ Whenever CARDNAME becomes unattached from a permanent, sacrifice that permanent.
 SVar:TrigSac:AB$Sacrifice | Cost$ 0 | Defined$ You | SacValid$ TriggeredCard
 SVar:Rarity:Uncommon

res/cardsfolder/g/grappling_hook.txt

@@ -1,8 +1,9 @@
 Name:Grappling Hook
 ManaCost:4
 Types:Artifact Equipment
-Text:Equipped creature has double strike.
-K:eqPump 4:+0/+0/Double Strike
+Text:no text
+K:Equip 4
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddKeyword$ Double Strike| Description$ Equipped creature has double strike.
 T:Mode$ Attacks | ValidCard$ Card.AttachedBy | Execute$ TrigProvoke | OptionalDecider$ You | TriggerDescription$ Whenever equipped creature attacks, you may have target creature block it this turn if able.
 SVar:TrigProvoke:AB$ MustBlock | Cost$ 0 | ValidTgts$ Creature | DefinedAttacker$ Equipped | TgtPrompt$ Select target creature
 SVar:Rarity:Rare

res/cardsfolder/g/greatsword.txt

@@ -1,8 +1,9 @@
 Name:Greatsword
 ManaCost:3
 Types:Artifact Equipment
-Text:Equipped creature gets +3/+0.
-K:eqPump 3:+3/+0
+Text:no text
+K:Equip 3
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 3 | Description$ Equipped creature gets +3/+0.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/greatsword.jpg
 SetInfo:M12|Uncommon|http://magiccards.info/scans/en/m12/209.jpg

res/cardsfolder/h/hammer_of_ruin.txt

@@ -1,9 +1,10 @@
 Name:Hammer of Ruin
 ManaCost:2
 Types:Artifact Equipment
-Text:Equipped creature gets +2/+0.
-K:eqPump 2:+2/+0
-T:Mode$ DamageDone | ValidSource$ Creature.AttachedBy | ValidTarget$ Opponent | CombatDamage$ True | OptionalDecider$ You | Execute$ TrigDestroy | TriggerZones$ Battlefield | TriggerDescription$ Whenever equipped creature deals combat damage to a player, you may destroy target Equipment that player controls.
+Text:no text
+K:Equip 2
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 2 | Description$ Equipped creature gets +2/+0.
+T:Mode$ DamageDone | ValidSource$ Creature.EquippedBy | ValidTarget$ Opponent | CombatDamage$ True | OptionalDecider$ You | Execute$ TrigDestroy | TriggerZones$ Battlefield | TriggerDescription$ Whenever equipped creature deals combat damage to a player, you may destroy target Equipment that player controls.
 SVar:TrigDestroy:AB$Destroy | Cost$ 0 | ValidTgts$ Equipment.YouDontCtrl | TgtPrompt$ Select target equipment defending player controls
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hammer_of_ruin.jpg
 SVar:Rarity:Uncommon

res/cardsfolder/h/healers_headdress.txt

@@ -2,7 +2,7 @@ Name:Healer's Headdress
 ManaCost:2
 Types:Artifact Equipment
 Text:no text
-A:AB$ Attach | Cost$ 1 | ValidTgts$ Creature.YouCtrl | AILogic$ Pump | IsPresent$ Card.Self+nonCreature | TgtPrompt$ Select target creature you control | SorcerySpeed$ True | PrecostDesc$ Equip | SpellDescription$ Attach CARDNAME to target creature you control.
+K:Equip 1
 A:AB$ Attach | Cost$ W W | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | SpellDescription$ Attach CARDNAME to target creature you control.
 S:Mode$ Continuous | Affected$ Card.EquippedBy | AddAbility$ Prevent  | AddToughness$ 2 | Description$ Equipped creature gets +0/+2 and has "T: Prevent the next 1 damage that would be dealt to target creature or player this turn."
 SVar:Prevent:AB$ PreventDamage | Cost$ T | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | Amount$ 1 | SpellDescription$ Prevent the next 1 damage that would be dealt to target creature or player this turn.

res/cardsfolder/h/heavy_arbalest.txt

@@ -2,7 +2,7 @@ Name:Heavy Arbalest
 ManaCost:3
 Types:Artifact Equipment
 Text:no text
-K:eqPump 4:0/0
+K:Equip 4
 S:Mode$ Continuous | Affected$ Card.EquippedBy | AddHiddenKeyword$ HIDDEN CARDNAME doesn't untap during your untap step. | Description$ Equipped creature doesn't untap during its controller's untap step.
 S:Mode$ Continuous | Affected$ Card.EquippedBy | AddAbility$ Damage | Description$ Equipped creature has "Tap: This creature deals 2 damage to target creature or player."
 SVar:Damage:AB$DealDamage | Cost$ T | Tgt$ TgtCP | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target creature or player.

res/cardsfolder/h/heavy_mattock.txt

@@ -1,8 +1,9 @@
 Name:Heavy Mattock
 ManaCost:3
 Types:Artifact Equipment
-Text:Equipped creature gets +1/+1.
-K:eqPump 2:+1/+1
+Text:no text
+K:Equip 2
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 1 | AddToughness$ 1 | Description$ Equipped creature gets +1/+1.
 S:Mode$ Continuous | Affected$ Human.EquippedBy | AddPower$ 1 | AddToughness$ 1 | Description$ As long as equipped creature is a Human, it gets an additional +1/+1.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/heavy_mattock.jpg

res/cardsfolder/h/hedron_matrix.txt

@@ -2,7 +2,7 @@ Name:Hedron Matrix
 ManaCost:4
 Types:Artifact Equipment
 Text:no text
-K:eqPump 4:+0/+0
+K:Equip 4
 S:Mode$ Continuous | Affected$ Card.EquippedBy | AddPower$ X | AddToughness$ X | Description$ Equipped creature gets +X/+X, where X is its converted mana cost.
 SVar:X:Count$EquippedCardManaCost
 SVar:Rarity:Rare

res/cardsfolder/h/horned_helm.txt

@@ -1,8 +1,9 @@
 Name:Horned Helm
 ManaCost:2
 Types:Artifact Equipment
-Text:Equipped creature gets +1/+1 and has trample.
-K:eqPump 1:+1/+1/Trample
+Text:no text
+K:Equip 1
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ Trample | Description$ Equipped creature gets +1/+1 and has trample.
 A:AB$ Attach | Cost$ G G | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | SpellDescription$ Attach CARDNAME to target creature you control.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/horned_helm.jpg

res/cardsfolder/i/infiltration_lens.txt

@@ -2,7 +2,7 @@ Name:Infiltration Lens
 ManaCost:1
 Types:Artifact Equipment
 Text:no text
-K:eqPump 1:0/0
+K:Equip 1
 T:Mode$ Blocks | ValidCard$ Creature | ValidBlocked$ Card.AttachedBy | OptionalDecider$ You | Execute$ TrigDraw | TriggerDescription$ Whenever equipped creature becomes blocked by a creature, you may draw two cards.
 SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 2
 SVar:Rarity:Uncommon

res/cardsfolder/i/inquisitors_flail.txt

@@ -2,7 +2,7 @@ Name:Inquisitor's Flail
 ManaCost:2
 Types:Artifact Equipment
 Text:no text
-A:AB$ Attach | Cost$ 2 | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | SorcerySpeed$ True | PrecostDesc$ Equip - | SpellDescription$ Attach CARDNAME to target creature you control.
+K:Equip 2
 R:Event$ DamageDone | ValidSource$ Creature.EquippedBy | ReplaceWith$ DmgTimes2 | IsCombat$ True | Description$ If equipped creature would deal combat damage, it deals double that damage instead.
 R:Event$ DamageDone | ValidTarget$ Creature.EquippedBy | ValidSource$ Creature.Other | ReplaceWith$ DmgTimes2 | IsCombat$ True | Description$ If another creature would deal combat damage to equipped creature, it deals double that damage to equipped creature instead.
 SVar:DmgTimes2:AB$ DealDamage | Cost$ 0 | CombatDamage$ True | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ X | References$ X

res/cardsfolder/k/kite_shield.txt

@@ -1,8 +1,9 @@
 Name:Kite Shield
 ManaCost:0
 Types:Artifact Equipment
-Text:Equipped creature gets +0/+3.
-K:eqPump 3:+0/+3
+Text:no text
+K:Equip 3
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddToughness$ 3 | Description$ Equipped creature gets +0/+3.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kite_shield.jpg
 SetInfo:M12|Uncommon|http://magiccards.info/scans/en/m12/210.jpg

res/cardsfolder/k/kitesail.txt

@@ -1,8 +1,9 @@
 Name:Kitesail
 ManaCost:2
 Types:Artifact Equipment
-Text:Equipped creature gets +1/+0 and has flying.
-K:eqPump 2:+1/+0/Flying
+Text:no text
+K:Equip 2
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 1 | AddKeyword$ Flying | Description$ Equipped creature gets +1/+0 and has flying.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kitesail.jpg
 SetInfo:M13|Uncommon|http://magiccards.info/scans/en/m13/208.jpg

res/cardsfolder/l/lashwrithe.txt

@@ -3,7 +3,7 @@ ManaCost:4
 Types:Artifact Equipment
 Text:no text
 K:Living Weapon
-K:eqPump PB PB:0/0
+K:Equip PB PB
 S:Mode$ Continuous | Affected$ Card.EquippedBy | AddPower$ X | AddToughness$ X | Description$ Equipped creature gets +1/+1 for each Swamp you control.
 SVar:X:Count$Valid Swamp.YouCtrl
 SVar:BuffedBy:Swamp

res/cardsfolder/l/leering_emblem.txt

@@ -2,7 +2,7 @@ Name:Leering Emblem
 ManaCost:2
 Types:Artifact Equipment
 Text:no text
-K:eqPump 2:+0/+0
+K:Equip 2
 T:Mode$ SpellCast | ValidCard$ Card | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever you cast a spell, equipped creature gets +2/+2 until end of turn.
 SVar:TrigPump:AB$Pump | Cost$ 0 | Defined$ Equipped | NumAtt$ +2 | NumDef$ +2
 SVar:Rarity:Rare

res/cardsfolder/l/leonin_scimitar.txt

@@ -1,8 +1,9 @@
 Name:Leonin Scimitar
 ManaCost:1
 Types:Artifact Equipment
-Text:Equipped creature gets +1/+1.
-K:eqPump 1:+1/+1
+Text:no text
+K:Equip 1
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 1 | AddToughness$ 1 | Description$ Equipped creature gets +1/+1.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/leonin_scimitar.jpg
 SetInfo:MRD|Common|http://magiccards.info/scans/en/mi/193.jpg

res/cardsfolder/l/lightning_greaves.txt

@@ -1,8 +1,9 @@
 Name:Lightning Greaves
 ManaCost:2
 Types:Artifact Equipment
-Text:Equipped creature has haste and shroud.
+Text:no text
 K:eqPump 0:Haste & Shroud
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddKeyword$ Haste & Shroud | Description$ Equipped creature has haste and shroud.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/lightning_greaves.jpg
 SetInfo:MRD|Uncommon|http://magiccards.info/scans/en/mi/199.jpg

res/cardsfolder/l/livewire_lash.txt

@@ -2,7 +2,7 @@ Name:Livewire Lash
 ManaCost:2
 Types:Artifact Equipment
 Text:no text
-K:eqPump 2:+0/+0
+K:Equip 2
 S:Mode$ Continuous | Affected$ Card.EquippedBy | AddPower$ 2 | AddTrigger$ PumpTrigger | AddSVar$ LivewireDamage | Description$ Equipped creature gets +2/+0 and has "Whenever this creature becomes the target of a spell, this creature deals 2 damage to target creature or player."
 SVar:PumpTrigger:Mode$ BecomesTarget | SourceType$ Spell | ValidTarget$ Card.Self | Execute$ LivewireDamage | TriggerDescription$ Whenever this creature becomes the target of a spell, this creature deals 2 damage to target creature or player.
 SVar:LivewireDamage:AB$DealDamage | Cost$ 0 | Tgt$ TgtCP | NumDmg$ 2

res/cardsfolder/l/loxodon_warhammer.txt

@@ -1,8 +1,9 @@
 Name:Loxodon Warhammer
 ManaCost:3
 Types:Artifact Equipment
-Text:Equipped creature gets +3/+0 and has lifelink and trample.
-K:eqPump 3:+3/+0/Trample & Lifelink
+Text:no text
+K:Equip 3
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 3 | AddKeyword$ Trample & Lifelink | Description$ Equipped creature gets +3/+0 and has lifelink and trample.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/loxodon_warhammer.jpg
 SetInfo:MRD|Uncommon|http://magiccards.info/scans/en/mi/201.jpg

res/cardsfolder/m/mage_slayer.txt

@@ -2,7 +2,7 @@ Name:Mage Slayer
 ManaCost:1 R G
 Types:Artifact Equipment
 Text:no text
-K:eqPump 3:0/0
+K:Equip 3
 T:Mode$ Attacks | ValidCard$ Card.AttachedBy | Execute$ TrigDamage | TriggerDescription$ Whenever equipped creature attacks, it deals damage equal to its power to defending player.
 SVar:TrigDamage:AB$DealDamage | Cost$ 0 | ValidTgts$ Opponent,Planeswalker.YouDontCtrl | DamageSource$ Equipped | TgtPrompt$ Select target opponent or planeswalker | NumDmg$ X | References$ X
 SVar:X:TriggeredAttacker$CardPower

res/cardsfolder/m/magebane_armor.txt

@@ -2,8 +2,8 @@ Name:Magebane Armor
 ManaCost:3
 Types:Artifact Equipment
 Text:no text
-K:eqPump 2:2/4
-S:Mode$ Continuous | Affected$ Card.EquippedBy | RemoveKeyword$ Flying | Description$ Equipped creature gets +2/+4 and loses flying.
+K:Equip 2
+S:Mode$ Continuous | Affected$ Card.EquippedBy | AddPower$ 2 | AddToughness$ 4 | RemoveKeyword$ Flying | Description$ Equipped creature gets +2/+4 and loses flying.
 S:Mode$ PreventDamage | Target$ Card.EquippedBy | CombatDamage$ False | Description$ Prevent all noncombat damage that would be dealt to equipped creature.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/magebane_armor.jpg

res/cardsfolder/m/manaforce_mace.txt

@@ -2,7 +2,7 @@ Name:Manaforce Mace
 ManaCost:4
 Types:Artifact Equipment
 Text:no text
-K:eqPump 3:+0/+0
+K:Equip 3
 S:Mode$ Continuous | Affected$ Card.EquippedBy | AddPower$ X | AddToughness$ X | References$ X | Description$ Domain - Equipped creature gets +1/+1 for each basic land type among lands you control.
 SVar:X:Count$Domain
 SVar:BuffedBy:Plains,Island,Swamp,Mountain,Forest

res/cardsfolder/m/manriki_gusari.txt

@@ -2,7 +2,7 @@ Name:Manriki-Gusari
 ManaCost:2
 Types:Artifact Equipment
 Text:no text
-K:eqPump 1:+0/+0
+K:Equip 1
 S:Mode$ Continuous | Affected$ Card.EquippedBy | AddPower$ 1 | AddToughness$ 2 | AddAbility$ ABDestroy | Description$ Equipped creature gets +1/+2 and has "Tap: Destroy target Equipment."
 SVar:ABDestroy:AB$Destroy | Cost$ T | ValidTgts$ Equipment | TgtPrompt$ Select target Equipment. | SpellDescription$ Destroy target Equipment.
 SVar:Rarity:Uncommon

res/cardsfolder/m/mask_of_avacyn.txt

@@ -1,8 +1,9 @@
 Name:Mask of Avacyn
 ManaCost:2
 Types:Artifact Equipment
-Text:Equipped creature gets +1/+2 and has hexproof.
-K:eqPump 3:+1/+2/Hexproof
+Text:no text
+K:Equip 3
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 1 | AddToughness$ 2 | AddKeyword$ Hexproof | Description$ Equipped creature gets +1/+2 and has hexproof.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mask_of_avacyn.jpg
 SetInfo:ISD|Uncommon|http://magiccards.info/scans/en/isd/229.jpg

res/cardsfolder/m/mask_of_memory.txt

@@ -2,7 +2,7 @@ Name:Mask of Memory
 ManaCost:2
 Types:Artifact Equipment
 Text:no text
-K:eqPump 1:+0/+0
+K:Equip 1
 T:Mode$ DamageDone | ValidSource$ Creature.AttachedBy | ValidTarget$ Opponent | CombatDamage$ True | Execute$ TrigDraw | TriggerZones$ Battlefield | TriggerDescription$ Whenever equipped creature deals combat damage to a player, you may draw two cards. If you do, discard a card.
 SVar:TrigDraw:AB$Draw | Cost$ 0 | NumCards$ 2 | SubAbility$ DBDiscard
 SVar:DBDiscard:DB$Discard | Defined$ You | Mode$ TgtChoose | NumCards$ 1

res/cardsfolder/m/mask_of_riddles.txt

@@ -1,8 +1,9 @@
 Name:Mask of Riddles
 ManaCost:U B
 Types:Artifact Equipment
-Text:Equipped creature has fear.
-K:eqPump 2:Fear
+Text:no text
+K:Equip 2
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddKeyword$ Fear | Description$ Equipped creature has fear.
 T:Mode$ DamageDone | ValidSource$ Card.AttachedBy | ValidTarget$ Player | CombatDamage$ True | TriggerZones$ Battlefield | Execute$ TrigDraw | OptionalDecider$ You | TriggerDescription$ Whenever equipped creature deals combat damage to a player, you may draw a card.
 SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1
 SVar:Rarity:Uncommon

res/cardsfolder/m/moonsilver_spear.txt

@@ -1,12 +1,11 @@
 Name:Moonsilver Spear
 ManaCost:4
 Types:Artifact Equipment
-Text:Equipped creature has first strike.
-K:eqPump 4:+0/+0/First Strike
+Text:no text
+K:Equip 4
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddKeyword$ First Strike | AddSVar$ AE | Description$ Equipped creature has first strike.
 T:Mode$ Attacks | ValidCard$ Card.AttachedBy | Execute$ TrigAngelToken | TriggerDescription$ Whenever equipped creature attacks, put a 4/4 white Angel token with flying onto the battlefield.
 SVar:TrigAngelToken:AB$Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Angel | TokenTypes$ Creature,Angel | TokenOwner$ You | TokenColors$ White | TokenPower$ 4 | TokenToughness$ 4 | TokenKeywords$ Flying | TokenImage$ w 4 4 angel avr
-S:Mode$ Continuous | Affected$ Creature.AttachedBy | AddSVar$ AE
-SVar:AE:SVar:HasAttackEffect:TRUE
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/moonsilver_spear.jpg
 SetInfo:AVR|Rare|http://magiccards.info/scans/en/avr/217.jpg

res/cardsfolder/m/mortarpod.txt

@@ -2,7 +2,7 @@ Name:Mortarpod
 ManaCost:2
 Types:Artifact Equipment
 Text:no text
-K:eqPump 2:+0/+0
+K:Equip 2
 S:Mode$ Continuous | Affected$ Card.EquippedBy | AddToughness$ 1 | AddAbility$ Damage | Description$ Equipped creature gets +0/+1 and has "Sacrifice this creature: This creature deals 1 damage to target creature or player."
 K:Living Weapon
 SVar:Damage:AB$DealDamage | Cost$ Sac<1/CARDNAME> | Tgt$ TgtCP | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature or player.

src/main/java/forge/card/cardfactory/CardFactoryUtil.java

@@ -4640,7 +4640,7 @@ public class CardFactoryUtil {
             abilityStr.append("AB$ Attach | Cost$ ");
             abilityStr.append(equipCost);
             abilityStr.append(" | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control ");
-            abilityStr.append("| SorcerySpeed$ True | Equip$ True | AILogic$ Pump ");
+            abilityStr.append("| SorcerySpeed$ True | Equip$ True | AILogic$ Pump | IsPresent$ Card.Self+nonCreature ");
             if (equipCost.matches(".+<.+>")) { //Something other than a mana cost
                 abilityStr.append("| PrecostDesc$ Equip - | SpellDescription$ (Attach to target creature you control. Equip only as a sorcery.)");
             }