- Minor edits to a number of the AF_DealDamage cards.

2025-11-20 12:48:00 +00:00 · 2011-08-06 12:59:05 +00:00
parent 82b05d45ec
commit 1f8941fe12
106 changed files with 49 additions and 147 deletions
--- a/res/cardsfolder/aeolipile.txt
+++ b/res/cardsfolder/aeolipile.txt
@@ -2,7 +2,6 @@ Name:Aeolipile
 ManaCost:2
 Types:Artifact
 Text:no text
-#K:abDamageTgtCP 1 T Sac<1/CARDNAME>:2
 A:AB$DealDamage | Cost$ 1 T Sac<1/CARDNAME> | Tgt$ TgtCP | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target creature or player.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aeolipile.jpg
--- a/res/cardsfolder/aerie_ouphes.txt
+++ b/res/cardsfolder/aerie_ouphes.txt
@@ -4,8 +4,7 @@ Types:Creature Ouphe
 Text:no text
 PT:3/3
 K:Persist
-#K:abDamageTgtV Sac<1/CARDNAME>:X:Creature.withFlying:Aerie Ouphes deals damage equal to its power to target creature with flying.
-A:AB$DealDamage | Cost$ Sac<1/CARDNAME> | ValidTgts$ Creature.withFlying | NumDmg$ X | SpellDescription$ CARDNAME deals damage equal to it's power to target creature with flying.
+A:AB$DealDamage | Cost$ Sac<1/CARDNAME> | ValidTgts$ Creature.withFlying | TgtPrompt$ Select target creature with flying | NumDmg$ X | SpellDescription$ CARDNAME deals damage equal to it's power to target creature with flying.
 SVar:X:Count$CardPower
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aerie_ouphes.jpg
--- a/res/cardsfolder/aladdins_ring.txt
+++ b/res/cardsfolder/aladdins_ring.txt
@@ -2,7 +2,6 @@ Name:Aladdin's Ring
 ManaCost:8
 Types:Artifact
 Text:no text
-#K:abDamageTgtCP 8 T:4
 A:AB$DealDamage | Cost$ 8 T | Tgt$ TgtCP | NumDmg$ 4 | SpellDescription$ CARDNAME deals 4 damage to target creature or player.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aladdins_ring.jpg
--- a/res/cardsfolder/anaba_shaman.txt
+++ b/res/cardsfolder/anaba_shaman.txt
@@ -3,7 +3,6 @@ ManaCost:3 R
 Types:Creature Minotaur Shaman
 Text:no text
 PT:2/2
-#K:abDamageTgtCP R T:1
 A:AB$DealDamage | Cost$ R T | Tgt$ TgtCP | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature or player.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/anaba_shaman.jpg
--- a/res/cardsfolder/ancient_hydra.txt
+++ b/res/cardsfolder/ancient_hydra.txt
@@ -4,7 +4,6 @@ Types:Creature Hydra
 Text:no text
 PT:5/1
 K:Fading:5
-#K:abDamageTgtCP 1 SubCounter<1/FADE>:1
 A:AB$DealDamage | Cost$ 1 SubCounter<1/FADE> | Tgt$ TgtCP | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature or player.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ancient_hydra.jpg
--- a/res/cardsfolder/arms_dealer.txt
+++ b/res/cardsfolder/arms_dealer.txt
@@ -3,8 +3,7 @@ ManaCost:2 R
 Types:Creature Goblin
 Text:no text
 PT:1/1
-#K:abDamageTgtC 1 R Sac<1/Goblin>:4
-A:AB$DealDamage | Cost$ 1 R Sac<1/Goblin> | Tgt$ TgtC | NumDmg$ 4 | SpellDescription$ CARDNAME deals 4 damage to target creature.
+A:AB$DealDamage | Cost$ 1 R Sac<1/Goblin> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 4 | SpellDescription$ CARDNAME deals 4 damage to target creature.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/arms_dealer.jpg
 SetInfo:MMQ|Uncommon|http://magiccards.info/scans/en/mm/172.jpg
--- a/res/cardsfolder/aven_archer.txt
+++ b/res/cardsfolder/aven_archer.txt
@@ -4,8 +4,7 @@ Types:Creature Bird Soldier Archer
 Text:no text
 PT:2/2
 K:Flying
-#K:abDamageTgtV 2 W T:2:Creature.attacking,Creature.blocking:Aven Archer deals 2 damage to target attacking or blocking creature.
-A:AB$DealDamage | Cost$ 2 W T | ValidTgts$Creature.attacking,Creature.blocking | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target attacking or blocking creature.
+A:AB$DealDamage | Cost$ 2 W T | ValidTgts$Creature.attacking,Creature.blocking | TgtPrompt$ Select target attacking or blocking creature | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target attacking or blocking creature.
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aven_archer.jpg
--- a/res/cardsfolder/barbarian_lunatic.txt
+++ b/res/cardsfolder/barbarian_lunatic.txt
@@ -3,8 +3,7 @@ ManaCost:2 R
 Types:Creature Human Barbarian
 Text:no text
 PT:2/1
-#K:abDamageTgtC 2 R Sac<1/CARDNAME>:2
-A:AB$DealDamage | Cost$ 2 R Sac<1/CARDNAME> | Tgt$ TgtC | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target creature.
+A:AB$DealDamage | Cost$ 2 R Sac<1/CARDNAME> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target creature.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/barbarian_lunatic.jpg
 SetInfo:ODY|Common|http://magiccards.info/scans/en/od/175.jpg
--- a/res/cardsfolder/blasting_station.txt
+++ b/res/cardsfolder/blasting_station.txt
@@ -2,7 +2,6 @@ Name:Blasting Station
 ManaCost:3
 Types:Artifact
 Text:no text
-#K:abDamageTgtCP T Sac<1/Creature>:1
 A:AB$DealDamage | Cost$ T Sac<1/Creature> | Tgt$ TgtCP | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature or player.
 K:WheneverKeyword:EntersBattleField:Type/Creature:Play:UntapPermanent:Self:ASAP:Yes_No:No Special Condition:Whenever a creature enters the battlefield, you may untap Blasting Station.
 SVar:RemAIDeck:True
--- a/res/cardsfolder/blood_rites.txt
+++ b/res/cardsfolder/blood_rites.txt
@@ -2,7 +2,6 @@ Name:Blood Rites
 ManaCost:3 R R
 Types:Enchantment
 Text:no text
-#K:abDamageTgtCP 1 R Sac<1/Creature>:2
 A:AB$DealDamage | Cost$ 1 R Sac<1/Creature> | Tgt$ TgtCP | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target creature or player.
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
--- a/res/cardsfolder/bloodpyre_elemental.txt
+++ b/res/cardsfolder/bloodpyre_elemental.txt
@@ -3,7 +3,7 @@ ManaCost:4 R
 Types:Creature Elemental
 Text:no text
 PT:4/1
-A:AB$DealDamage | Cost$ Sac<1/CARDNAME> | Tgt$ TgtC | NumDmg$ 4 | SorcerySpeed$ True | SpellDescription$ Bloodpyre Elemental deals 4 damage to target creature. Activate this ability only any time you could cast a sorcery.
+A:AB$DealDamage | Cost$ Sac<1/CARDNAME> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 4 | SorcerySpeed$ True | SpellDescription$ Bloodpyre Elemental deals 4 damage to target creature. Activate this ability only any time you could cast a sorcery.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/bloodpyre_elemental.jpg
 SetInfo:ALA|Common|http://magiccards.info/scans/en/ala/93.jpg
--- a/res/cardsfolder/catapult_squad.txt
+++ b/res/cardsfolder/catapult_squad.txt
@@ -3,8 +3,7 @@ ManaCost:1 W
 Types:Creature Human Soldier
 Text:no text
 PT:2/1
-#K:abDamageTgtV tapXType<2/Soldier>:2:Creature.attacking,Creature.blocking:Catapult Squad deals 2 damage to target attacking or blocking creature.
-A:AB$DealDamage | Cost$ tapXType<2/Soldier> | ValidTgts$ Creature.attacking,Creature.blocking | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target attacking or blocking creature.
+A:AB$DealDamage | Cost$ tapXType<2/Soldier> | ValidTgts$ Creature.attacking,Creature.blocking | TgtPrompt$ Select target attacking or blocking creature | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target attacking or blocking creature.
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/catapult_squad.jpg
--- a/res/cardsfolder/centaur_archer.txt
+++ b/res/cardsfolder/centaur_archer.txt
@@ -3,8 +3,7 @@ ManaCost:1 R G
 Types:Creature Centaur Archer
 Text:no text
 PT:3/2
-#K:abDamageTgtV T:1:Creature.withFlying:Centaur Archer deals 1 damage to target creature with flying.
-A:AB$DealDamage | Cost$ T | ValidTgts$ Creature.withFlying | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature with flying.
+A:AB$DealDamage | Cost$ T | ValidTgts$ Creature.withFlying | TgtPrompt$ Select target creature with flying | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature with flying.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/centaur_archer.jpg
 SetInfo:ICE|Uncommon|http://magiccards.info/scans/en/ia/360.jpg
--- a/res/cardsfolder/cinder_pyromancer.txt
+++ b/res/cardsfolder/cinder_pyromancer.txt
@@ -3,7 +3,6 @@ ManaCost:2 R
 Types:Creature Elemental Shaman
 Text:Whenever you cast a red spell, you may untap Cinder Pyromancer.
 PT:0/1
-#K:abDamageTgtP T:1
 A:AB$DealDamage | Cost$ T | Tgt$ TgtP | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target player.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cinder_pyromancer.jpg
--- a/res/cardsfolder/cinder_shade.txt
+++ b/res/cardsfolder/cinder_shade.txt
@@ -4,8 +4,7 @@ Types:Creature Shade
 Text:no text
 PT:1/1
 A:AB$Pump | Cost$ B | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ Cinder Shade gets +1/+1 until end of turn.
-#K:abDamageTgtC R Sac<1/CARDNAME>:X:Cinder Shade deals damage equal to its power to target creature.
-A:AB$DealDamage | Cost$ R Sac<1/CARDNAME> | Tgt$ TgtC | NumDmg$ X | SpellDescription$ CARDNAME deals damage equal to its power to target creature.
+A:AB$DealDamage | Cost$ R Sac<1/CARDNAME> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ X | SpellDescription$ CARDNAME deals damage equal to its power to target creature.
 SVar:X:Count$CardPower
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cinder_shade.jpg
--- a/res/cardsfolder/crackling_club.txt
+++ b/res/cardsfolder/crackling_club.txt
@@ -4,7 +4,7 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant creature
 K:enPump:+1/+0
-A:AB$DealDamage | Cost$ Sac<1/CARDNAME> | Tgt$C | NumDmg$1 | SpellDescription$ Crackling Club deals 1 damage to target creature.
+A:AB$DealDamage | Cost$ Sac<1/CARDNAME> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 1 | SpellDescription$ Crackling Club deals 1 damage to target creature.
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/crackling_club.jpg
--- a/res/cardsfolder/crimson_manticore.txt
+++ b/res/cardsfolder/crimson_manticore.txt
@@ -4,8 +4,7 @@ Types:Creature Manticore
 Text:no text
 PT:2/2
 K:Flying
-#K:abDamageTgtV R T:1:Creature.attacking,Creature.blocking:Crimson Manticore deals 1 damage to target attacking or blocking creature.
-A:AB$DealDamage | Cost$ R T | ValidTgts$ Creature.attacking,Creature.blocking | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target attacking or blocking creature.
+A:AB$DealDamage | Cost$ R T | ValidTgts$ Creature.attacking,Creature.blocking | TgtPrompt$ Select target attacking or blocking creature | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target attacking or blocking creature.
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/crimson_manticore.jpg
--- a/res/cardsfolder/crossbow_infantry.txt
+++ b/res/cardsfolder/crossbow_infantry.txt
@@ -3,8 +3,7 @@ ManaCost:1 W
 Types:Creature Human Soldier Archer
 Text:no text
 PT:1/1
-#K:abDamageTgtV T:1:Creature.attacking,Creature.blocking:Crossbow Infantry deals 1 damage to target attacking or blocking creature.
-A:AB$DealDamage | Cost$ T | ValidTgts$ Creature.attacking,Creature.blocking | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target attacking or blocking creature.
+A:AB$DealDamage | Cost$ T | ValidTgts$ Creature.attacking,Creature.blocking | TgtPrompt$ Select target attacking or blocking creature | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target attacking or blocking creature.
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/crossbow_infantry.jpg
--- a/res/cardsfolder/cunning_sparkmage.txt
+++ b/res/cardsfolder/cunning_sparkmage.txt
@@ -4,7 +4,6 @@ Types:Creature Human Shaman
 Text:no text
 PT:0/1
 K:Haste
-#K:abDamageTgtCP T:1
 A:AB$DealDamage | Cost$ T | Tgt$ TgtCP | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature or player.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cunning_sparkmage.jpg
--- a/res/cardsfolder/davenant_archer.txt
+++ b/res/cardsfolder/davenant_archer.txt
@@ -3,8 +3,7 @@ ManaCost:2 W
 Types:Creature Human Soldier Archer
 Text:no text
 PT:1/2
-#K:abDamageTgtV T:1:Creature.attacking,Creature.blocking:D'Avenant Archer deals 1 damage to target attacking or blocking creature.
-A:AB$DealDamage | Cost$ T | ValidTgts$ Creature.attacking,Creature.blocking | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target attacking or blocking creature.
+A:AB$DealDamage | Cost$ T | ValidTgts$ Creature.attacking,Creature.blocking | TgtPrompt$ Select target attacking or blocking creature | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target attacking or blocking creature.
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/davenant_archer.jpg
--- a/res/cardsfolder/dawnray_archer.txt
+++ b/res/cardsfolder/dawnray_archer.txt
@@ -4,8 +4,7 @@ Types:Creature Human Archer
 Text:no text
 PT:1/1
 K:Exalted
-#K:abDamageTgtV W T:1:Creature.attacking,Creature.blocking:Dawnray Archer deals 1 damage to target attacking or blocking creature.
-A:AB$DealDamage | Cost$ W T | ValidTgts$ Creature.attacking,Creature.blocking | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target attacking or blocking creature.
+A:AB$DealDamage | Cost$ W T | ValidTgts$ Creature.attacking,Creature.blocking | TgtPrompt$ Select target attacking or blocking creature | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target attacking or blocking creature.
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dawnray_archer.jpg
--- a/res/cardsfolder/deadapult.txt
+++ b/res/cardsfolder/deadapult.txt
@@ -2,7 +2,6 @@ Name:Deadapult
 ManaCost:2 R
 Types:Enchantment
 Text:no text
-#K:abDamageTgtCP R Sac<1/Zombie>:2
 A:AB$DealDamage | Cost$ R Sac<1/Zombie> | Tgt$ TgtCP | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature or player.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/deadapult.jpg
--- a/res/cardsfolder/deathbringer_thoctar.txt
+++ b/res/cardsfolder/deathbringer_thoctar.txt
@@ -4,7 +4,6 @@ Types:Creature Zombie Beast
 Text:no text
 PT:3/3
 K:WheneverKeyword:PermanentIntoGraveyard:Type/Creature:Play:+1+1 Counters/1:Self:ASAP:Yes_No:Initiator - Other than Self:Whenever another creature is put into a graveyard from the battlefield, you may put a +1/+1 counter on Deathbringer Thoctar.
-#K:abDamageTgtCP SubCounter<1/P1P1>:1
 A:AB$DealDamage | Cost$ SubCounter<1/P1P1> | Tgt$ TgtCP | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature or player.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/deathbringer_thoctar.jpg
--- a/res/cardsfolder/dive_bomber.txt
+++ b/res/cardsfolder/dive_bomber.txt
@@ -4,8 +4,7 @@ Types:Creature Bird Soldier
 Text:no text
 PT:2/2
 K:Flying
-#K:abDamageTgtV T Sac<1/CARDNAME>:2:Creature.attacking,Creature.blocking:Dive Bomber deals 2 damage to target attacking or blocking creature.
-A:AB$DealDamage | Cost$ T Sac<1/CARDNAME> | ValidTgts$ Creature.attacking,Creature.blocking | NumDmg$ 2 | SpellDescription$ CARDNAME deals 1 damage to target attacking or blocking creature.
+A:AB$DealDamage | Cost$ T Sac<1/CARDNAME> | ValidTgts$ Creature.attacking,Creature.blocking | TgtPrompt$ Select target attacking or blocking creature | NumDmg$ 2 | SpellDescription$ CARDNAME deals 1 damage to target attacking or blocking creature.
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dive_bomber.jpg
--- a/res/cardsfolder/divebomber_griffin.txt
+++ b/res/cardsfolder/divebomber_griffin.txt
@@ -4,8 +4,7 @@ Types:Creature Griffin
 Text:no text
 PT:3/2
 K:Flying
-#K:abDamageTgtV T Sac<1/CARDNAME>:3:Creature.attacking,Creature.blocking:Divebomber Griffin deals 3 damage to target attacking or blocking creature.
-A:AB$DealDamage | Cost$ T Sac<1/CARDNAME> | ValidTgts$ Creature.attacking,Creature.blocking | NumDmg$ 3 | SpellDescription$ CARDNAME deals 1 damage to target attacking or blocking creature.
+A:AB$DealDamage | Cost$ T Sac<1/CARDNAME> | ValidTgts$ Creature.attacking,Creature.blocking | TgtPrompt$ Select target attacking or blocking creature | NumDmg$ 3 | SpellDescription$ CARDNAME deals 1 damage to target attacking or blocking creature.
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/divebomber_griffin.jpg
--- a/res/cardsfolder/duergar_assailant.txt
+++ b/res/cardsfolder/duergar_assailant.txt
@@ -3,8 +3,7 @@ ManaCost:RW
 Types:Creature Dwarf Soldier
 Text:no text
 PT:1/1
-#K:abDamageTgtV Sac<1/CARDNAME>:1:Creature.attacking,Creature.blocking:Duergar Assailant deals 1 damage to target attacking or blocking creature.
-A:AB$DealDamage | Cost$ Sac<1/CARDNAME> | ValidTgts$ Creature.attacking,Creature.blocking | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target attacking or blocking creature.
+A:AB$DealDamage | Cost$ Sac<1/CARDNAME> | ValidTgts$ Creature.attacking,Creature.blocking | TgtPrompt$ Select target attacking or blocking creature | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target attacking or blocking creature.
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/duergar_assailant.jpg
--- a/res/cardsfolder/elite_archers.txt
+++ b/res/cardsfolder/elite_archers.txt
@@ -3,8 +3,7 @@ ManaCost:5 W
 Types:Creature Human Soldier Archer
 Text:no text
 PT:3/3
-#K:abDamageTgtV T:3:Creature.attacking,Creature.blocking:Elite Archers deals 3 damage to target attacking or blocking creature.
-A:AB$DealDamage | Cost$ T | ValidTgts$ Creature.attacking,Creature.blocking | NumDmg$ 3 | SpellDescription$ CARDNAME deals 1 damage to target attacking or blocking creature.
+A:AB$DealDamage | Cost$ T | ValidTgts$ Creature.attacking,Creature.blocking | TgtPrompt$ Select target attacking or blocking creature | NumDmg$ 3 | SpellDescription$ CARDNAME deals 1 damage to target attacking or blocking creature.
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/elite_archers.jpg
--- a/res/cardsfolder/ember_hauler.txt
+++ b/res/cardsfolder/ember_hauler.txt
@@ -3,7 +3,6 @@ ManaCost:R R
 Types:Creature Goblin
 Text:no text
 PT:2/2
-#K:abDamageTgtCP 1 Sac<1/CARDNAME>:2
 A:AB$DealDamage | Cost$ 1 Sac<1/CARDNAME> | Tgt$ TgtCP | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target creature or player.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ember_hauler.jpg
--- a/res/cardsfolder/emberwilde_augur.txt
+++ b/res/cardsfolder/emberwilde_augur.txt
@@ -3,7 +3,7 @@ ManaCost:1 R
 Types:Creature Goblin Shaman
 Text:no text
 PT:2/1
-A:AB$DealDamage | Cost$ Sac<1/CARDNAME> | NumDmg$ 3 | PlayerTurn$ True | ActivatingPhases$ Upkeep | SpellDescription$ Emberwilde Augur deals 3 damage to target player. Activate this ability only during your upkeep.
+A:AB$DealDamage | Cost$ Sac<1/CARDNAME> | NumDmg$ 3 | Tgt$ TgtP | PlayerTurn$ True | ActivatingPhases$ Upkeep | SpellDescription$ Emberwilde Augur deals 3 damage to target player. Activate this ability only during your upkeep.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/emberwilde_augur.jpg
 SetInfo:FUT|Common|http://magiccards.info/scans/en/fut/97.jpg
--- a/res/cardsfolder/expendable_troops.txt
+++ b/res/cardsfolder/expendable_troops.txt
@@ -3,8 +3,7 @@ ManaCost:1 W
 Types:Creature Human Soldier
 Text:no text
 PT:2/1
-#K:abDamageTgtV Sac<1/CARDNAME>:2:Creature.attacking,Creature.blocking:Expendable Troops deals 2 damage to target attacking or blocking creature.
-A:AB$DealDamage | Cost$ Sac<1/CARDNAME> | ValidTgts$ Creature.attacking,Creature.blocking | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target attacking or blocking creature.
+A:AB$DealDamage | Cost$ Sac<1/CARDNAME> | ValidTgts$ Creature.attacking,Creature.blocking | TgtPrompt$ Select target attacking or blocking creature | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target attacking or blocking creature.
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/expendable_troops.jpg
--- a/res/cardsfolder/femeref_archers.txt
+++ b/res/cardsfolder/femeref_archers.txt
@@ -3,8 +3,7 @@ ManaCost:2 G
 Types:Creature Human Archer
 Text:no text
 PT:2/2
-#K:abDamageTgtV T:4:Creature.attacking+withFlying:Femeref Archers deals 4 damage to target attacking creature with flying.
-A:AB$DealDamage | Cost$ T | ValidTgts$ Creature.attacking+withFlying | NumDmg$ 4 | SpellDescription$ CARDNAME deals 4 damage to target attacking creature with flying.
+A:AB$DealDamage | Cost$ T | ValidTgts$ Creature.attacking+withFlying | TgtPrompt$ Select target attacking creature with flying | NumDmg$ 4 | SpellDescription$ CARDNAME deals 4 damage to target attacking creature with flying.
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/femeref_archers.jpg
--- a/res/cardsfolder/flame_elemental.txt
+++ b/res/cardsfolder/flame_elemental.txt
@@ -3,8 +3,7 @@ ManaCost:2 R R
 Types:Creature Elemental
 Text:no text
 PT:3/2
-#K:abDamageTgtC R Sac<1/CARDNAME>:X:Flame Elemental deals damage equal to its power to target creature.
-A:AB$DealDamage | Cost$ R Sac<1/CARDNAME> | Tgt$TgtC | NumDmg$ X | SpellDescription$ CARDNAME deals damage equal to its power to target creature.
+A:AB$DealDamage | Cost$ R Sac<1/CARDNAME> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ X | SpellDescription$ CARDNAME deals damage equal to its power to target creature.
 SVar:X:Count$CardPower
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/flame_elemental.jpg
--- a/res/cardsfolder/flamekin_spitfire.txt
+++ b/res/cardsfolder/flamekin_spitfire.txt
@@ -3,7 +3,6 @@ ManaCost:1 R
 Types:Creature Elemental Shaman
 Text:no text
 PT:1/1
-#K:abDamageTgtCP 3 R:1
 A:AB$DealDamage | Cost$ 3 R | Tgt$ TgtCP | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature or player.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/flamekin_spitfire.jpg
--- a/res/cardsfolder/flamewave_invoker.txt
+++ b/res/cardsfolder/flamewave_invoker.txt
@@ -3,7 +3,6 @@ ManaCost:2 R
 Types:Creature Goblin Mutant
 Text:no text
 PT:2/2
-#K:abDamageTgtP 7 R:5
 A:AB$DealDamage | Cost$ 7 R | Tgt$ TgtP | NumDmg$ 5 | SpellDescription$ CARDNAME deals 5 damage to target player.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/flamewave_invoker.jpg
--- a/res/cardsfolder/fledgling_mawcor.txt
+++ b/res/cardsfolder/fledgling_mawcor.txt
@@ -5,7 +5,6 @@ Text:no text
 PT:2/2
 K:Flying
 K:Morph:U U
-#K:abDamageTgtCP T:1
 A:AB$DealDamage | Cost$ T | Tgt$ TgtCP | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature or player.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/fledgling_mawcor.jpg
--- a/res/cardsfolder/fodder_cannon.txt
+++ b/res/cardsfolder/fodder_cannon.txt
@@ -2,8 +2,7 @@ Name:Fodder Cannon
 ManaCost:4
 Types:Artifact
 Text:no text
-#K:abDamageTgtC 4 T Sac<1/Creature>:4
-A:AB$DealDamage | Cost$ 4 T Sac<1/Creature> | Tgt$ TgtC | NumDmg$ 4 | SpellDescription$ CARDNAME deals 4 damage to target creature.
+A:AB$DealDamage | Cost$ 4 T Sac<1/Creature> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 4 | SpellDescription$ CARDNAME deals 4 damage to target creature.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/fodder_cannon.jpg
 SetInfo:8ED|Uncommon|http://magiccards.info/scans/en/8e/302.jpg
--- a/res/cardsfolder/gelectrode.txt
+++ b/res/cardsfolder/gelectrode.txt
@@ -3,7 +3,6 @@ ManaCost:1 U R
 Types:Creature Weird
 Text:Whenever you play an instant or sorcery spell, you may untap Gelectrode.
 PT:0/1
-#K:abDamageTgtCP T:1
 A:AB$DealDamage | Cost$ T | Tgt$ TgtCP | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature or player.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/gelectrode.jpg
--- a/res/cardsfolder/ghitu_fire_eater.txt
+++ b/res/cardsfolder/ghitu_fire_eater.txt
@@ -3,7 +3,6 @@ ManaCost:2 R
 Types:Creature Human Nomad
 Text:no text
 PT:2/2
-#K:abDamageTgtCP Sac<1/CARDNAME>:X:Ghitu Fire-Eater deals damage equal to its power to target creature or player.
 A:AB$DealDamage | Cost$ Sac<1/CARDNAME> | Tgt$ TgtCP | NumDmg$ X | SpellDescription$ CARDNAME deals damage equal to its power to target creature or player.
 SVar:X:Count$CardPower
 SVar:Rarity:Uncommon
--- a/res/cardsfolder/ghost_lit_raider.txt
+++ b/res/cardsfolder/ghost_lit_raider.txt
@@ -2,8 +2,8 @@ Name:Ghost-Lit Raider
 ManaCost:2 R
 Types:Creature Spirit
 Text:no text
-A:AB$DealDamage | Cost$ 2 R T | Tgt$ TgtC | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target creature.
-A:AB$DealDamage | Cost$ 3 R Discard<1/CARDNAME> | Tgt$ TgtC | NumDmg$ 4 | ActivatingZone$ Hand | SpellDescription$ CARDNAME deals 4 damage to target creature.
+A:AB$DealDamage | Cost$ 2 R T | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target creature.
+A:AB$DealDamage | Cost$ 3 R Discard<1/CARDNAME> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 4 | ActivatingZone$ Hand | SpellDescription$ CARDNAME deals 4 damage to target creature.
 PT:2/1
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ghost_lit_raider.jpg
--- a/res/cardsfolder/goblin_bombardment.txt
+++ b/res/cardsfolder/goblin_bombardment.txt
@@ -2,7 +2,6 @@ Name:Goblin Bombardment
 ManaCost:1 R
 Types:Enchantment
 Text:no text
-#K:abDamageTgtCP Sac<1/Creature>:1
 A:AB$DealDamage | Cost$ Sac<1/Creature> | Tgt$ TgtCP | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature or player.
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
--- a/res/cardsfolder/goblin_sharpshooter.txt
+++ b/res/cardsfolder/goblin_sharpshooter.txt
@@ -3,7 +3,6 @@ ManaCost:2 R
 Types:Creature Goblin
 Text:no text
 PT:1/1
-#K:abDamageTgtCP T:1
 A:AB$DealDamage | Cost$ T | Tgt$ TgtCP | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature or player.
 K:CARDNAME doesn't untap during your untap step.
 K:Whenever a creature is put into a graveyard from the battlefield, untap Goblin Sharpshooter.
--- a/res/cardsfolder/granite_shard.txt
+++ b/res/cardsfolder/granite_shard.txt
@@ -2,8 +2,6 @@ Name:Granite Shard
 ManaCost:3
 Types:Artifact
 Text:no text
-#K:abDamageTgtCP 3 T:1
-#K:abDamageTgtCP R T:1
 A:AB$DealDamage | Cost$ 3 T | Tgt$ TgtCP | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature or player.
 A:AB$DealDamage | Cost$ R T | Tgt$ TgtCP | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature or player.
 SVar:Rarity:Uncommon
--- a/res/cardsfolder/grapeshot_catapult.txt
+++ b/res/cardsfolder/grapeshot_catapult.txt
@@ -3,8 +3,7 @@ ManaCost:4
 Types:Artifact Creature Construct
 Text:no text
 PT:2/3
-#K:abDamageTgtV T:1:Creature.withFlying:Grapeshot Catapult deals 1 damage to target creature with flying.
-A:AB$DealDamage | Cost$ T | ValidTgts$ Creature.withFlying | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature with flying.
+A:AB$DealDamage | Cost$ T | ValidTgts$ Creature.withFlying | TgtPrompt$ Select target creature with flying | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature with flying.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/grapeshot_catapult.jpg
 SetInfo:5ED|Common|http://magiccards.info/scans/en/5e/375.jpg
--- a/res/cardsfolder/gravel_slinger.txt
+++ b/res/cardsfolder/gravel_slinger.txt
@@ -3,8 +3,7 @@ ManaCost:3 W
 Types:Creature Human Soldier
 Text:no text
 PT:1/3
-#K:abDamageTgtV T:1:Creature.attacking,Creature.blocking:Gravel Slinger deals 1 damage to target attacking or blocking creature.
-A:AB$DealDamage | Cost$ T | ValidTgts$ Creature.attacking,Creature.blocking | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target attacking or blocking creature.
+A:AB$DealDamage | Cost$ T | ValidTgts$ Creature.attacking,Creature.blocking | TgtPrompt$ Select target attacking or blocking creature | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target attacking or blocking creature.
 K:Morph:1 W
 SVar:RemAIDeck:True
 SVar:Rarity:Common
--- a/res/cardsfolder/harpoon_sniper.txt
+++ b/res/cardsfolder/harpoon_sniper.txt
@@ -3,8 +3,7 @@ ManaCost:2 W
 Types:Creature Merfolk Archer
 Text:no text
 PT:2/2
-#K:abDamageTgtV W T:X:Creature.attacking,Creature.blocking:Harpoon Sniper deals X damage to target attacking or blocking creature, where X is the number of Merfolk you control.
-A:AB$DealDamage | Cost$ W T | ValidTtgs$ Creature.attacking,Creature.blocking | NumDmg$ X | SpellDescription$ CARDNAME deals X damage to target attacking or blocking creature, where X is the number of Merfolk you control.
+A:AB$DealDamage | Cost$ W T | ValidTtgs$ Creature.attacking,Creature.blocking | TgtPrompt$ Select target attacking or blocking creature | NumDmg$ X | SpellDescription$ CARDNAME deals X damage to target attacking or blocking creature, where X is the number of Merfolk you control.
 SVar:X:Count$TypeYouCtrl.Merfolk
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
--- a/res/cardsfolder/heavy_ballista.txt
+++ b/res/cardsfolder/heavy_ballista.txt
@@ -3,8 +3,7 @@ ManaCost:3 W
 Types:Creature Human Soldier
 Text:no text
 PT:2/3
-#K:abDamageTgtV T:2:Creature.attacking,Creature.blocking:Heavy Ballista deals 2 damage to target attacking or blocking creature.
-A:AB$DealDamage | Cost$ T | ValidTgts$ Creature.attacking,Creature.blocking | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target attacking or blocking creature.
+A:AB$DealDamage | Cost$ T | ValidTgts$ Creature.attacking,Creature.blocking | TgtPrompt$ Select target attacking or blocking creature | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target attacking or blocking creature.
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/heavy_ballista.jpg
--- a/res/cardsfolder/jeska_warrior_adept.txt
+++ b/res/cardsfolder/jeska_warrior_adept.txt
@@ -5,7 +5,6 @@ Text:no text
 PT:3/1
 K:First Strike
 K:Haste
-#K:abDamageTgtCP T:1
 A:AB$DealDamage | Cost$ T | Tgt$ TgtCP | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature or player.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jeska_warrior_adept.jpg
--- a/res/cardsfolder/kamahl_pit_fighter.txt
+++ b/res/cardsfolder/kamahl_pit_fighter.txt
@@ -4,7 +4,6 @@ Types:Legendary Creature Human Barbarian
 Text:no text
 PT:6/1
 K:Haste
-#K:abDamageTgtCP T:3
 A:AB$DealDamage | Cost$ T | Tgt$ TgtCP | NumDmg$ 3 | SpellDescription$ CARDNAME deals 3 damage to target creature or player.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kamahl_pit_fighter.jpg
--- a/res/cardsfolder/keldon_necropolis.txt
+++ b/res/cardsfolder/keldon_necropolis.txt
@@ -3,7 +3,6 @@ ManaCost:no cost
 Types:Legendary Land
 Text:no text
 K:tap: add 1
-#K:abDamageTgtCP 4 R T Sac<1/Creature>:2
 A:AB$DealDamage | Cost$ 4 R T Sac<1/Creature> | Tgt$ TgtCP | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target creature or player.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/keldon_necropolis.jpg
--- a/res/cardsfolder/kjeldoran_javelineer.txt
+++ b/res/cardsfolder/kjeldoran_javelineer.txt
@@ -4,8 +4,7 @@ Types:Creature Human Soldier
 Text:no text
 PT:1/2
 K:Cumulative upkeep:W
-#K:abDamageTgtV T:X:Creature.attacking,Creature.blocking:Kjeldoran Javelineer deals damage equal to the number of age counters on it to target attacking or blocking creature.
-A:AB$DealDamage | Cost$ T | ValidTgts$ Creature.attacking,Creature.blocking | NumDmg$ X | SpellDescription$ CARDNAME deals damage equal to the number of age counters on it to target attacking or blocking creature.
+A:AB$DealDamage | Cost$ T | ValidTgts$ Creature.attacking,Creature.blocking | TgtPrompt$ Select target attacking or blocking creature | NumDmg$ X | SpellDescription$ CARDNAME deals damage equal to the number of age counters on it to target attacking or blocking creature.
 SVar:X:Count$CardCounters.AGE
 SVar:RemAIDeck:True
 SVar:Rarity:Common
--- a/res/cardsfolder/kris_mage.txt
+++ b/res/cardsfolder/kris_mage.txt
@@ -3,7 +3,6 @@ ManaCost:R
 Types:Creature Human Spellshaper
 Text:no text
 PT:1/1
-#K:abDamageTgtCP R T Discard<1/Any>:1
 A:AB$DealDamage | Cost$ R T Discard<1/Any> | Tgt$ TgtCP | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature or player.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kris_mage.jpg
--- a/res/cardsfolder/kyren_negotiations.txt
+++ b/res/cardsfolder/kyren_negotiations.txt
@@ -2,7 +2,6 @@ Name:Kyren Negotiations
 ManaCost:2 R R
 Types:Enchantment
 Text:no text
-#K:abDamageTgtP tapXType<1/Creature>:1
 A:AB$DealDamage | Cost$ tapXType<1/Creature> | Tgt$ TgtP | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target player.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kyren_negotiations.jpg
--- a/res/cardsfolder/lady_caleria.txt
+++ b/res/cardsfolder/lady_caleria.txt
@@ -3,8 +3,7 @@ ManaCost:3 G G W W
 Types:Legendary Creature Human Archer
 Text:no text
 PT:3/6
-#K:abDamageTgtV T:3:Creature.attacking,Creature.blocking:Lady Caleria deals 3 damage to target attacking or blocking creature.
-A:AB$DealDamage | Cost$ T | ValidTgts$ Creature.attacking,Creature.blocking | NumDmg$ 3 | SpellDescription$ CARDNAME deals 3 damage to target attacking or blocking creature.
+A:AB$DealDamage | Cost$ T | ValidTgts$ Creature.attacking,Creature.blocking | TgtPrompt$ Select target attacking or blocking creature | NumDmg$ 3 | SpellDescription$ CARDNAME deals 3 damage to target attacking or blocking creature.
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/lady_caleria.jpg
--- a/res/cardsfolder/lightning_crafter.txt
+++ b/res/cardsfolder/lightning_crafter.txt
@@ -3,7 +3,6 @@ ManaCost:3 R
 Types:Creature Goblin Shaman
 Text:no text
 PT:3/3
-#K:abDamageTgtCP T:3
 A:AB$DealDamage | Cost$ T | Tgt$ TgtCP | NumDmg$ 3 | SpellDescription$ CARDNAME deals 3 damage to target creature or player.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/lightning_crafter.jpg
--- a/res/cardsfolder/mage_il_vec.txt
+++ b/res/cardsfolder/mage_il_vec.txt
@@ -3,7 +3,6 @@ ManaCost:2 R
 Types:Creature Human Wizard
 Text:no text
 PT:2/2
-#K:abDamageTgtCP T Discard<1/Random>:1
 A:AB$DealDamage | Cost$ T Discard<1/Random> | Tgt$ TgtCP | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature or player.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mage_il_vec.jpg
--- a/res/cardsfolder/masticore.txt
+++ b/res/cardsfolder/masticore.txt
@@ -4,8 +4,7 @@ Types:Artifact Creature Masticore
 Text:Choose and discard a card during your upkeep, or sacrifice Masticore.
 PT:4/4
 A:AB$Regenerate | Cost$ 2 | SpellDescription$ Regenerate CARDNAME.
-#K:abDamageTgtC 2:1
-A:AB$DealDamage | Cost$ 2 | Tgt$ TgtC | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature.
+A:AB$DealDamage | Cost$ 2 | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/masticore.jpg
 SetInfo:UDS|Rare|http://magiccards.info/scans/en/ud/134.jpg
--- a/res/cardsfolder/mawcor.txt
+++ b/res/cardsfolder/mawcor.txt
@@ -4,7 +4,6 @@ Types:Creature Beast
 Text:no text
 PT:3/3
 K:Flying
-#K:abDamageTgtCP T:1
 A:AB$DealDamage | Cost$ T | Tgt$ TgtCP | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature or player.
 SVar:Rarity:Rare
 SVar:Picture:http://resources.wizards.com/magic/cards/te/en-us/card4712.jpg
--- a/res/cardsfolder/meteor_storm.txt
+++ b/res/cardsfolder/meteor_storm.txt
@@ -2,7 +2,6 @@ Name:Meteor Storm
 ManaCost:R G
 Types:Enchantment
 Text:no text
-#K:abDamageTgtCP 2 R G Discard<2/Random>:4
 A:AB$DealDamage | Cost$ 2 R G Discard<2/Random> | Tgt$ TgtCP | NumDmg$ 4 | SpellDescription$ CARDNAME deals 4 damage to target creature or player.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/meteor_storm.jpg
--- a/res/cardsfolder/mogg_fanatic.txt
+++ b/res/cardsfolder/mogg_fanatic.txt
@@ -3,7 +3,6 @@ ManaCost:R
 Types:Creature Goblin
 Text:no text
 PT:1/1
-#K:abDamageTgtCP Sac<1/CARDNAME>:1
 A:AB$DealDamage | Cost$ Sac<1/CARDNAME> | Tgt$ TgtCP | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature or player.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mogg_fanatic.jpg
--- a/res/cardsfolder/mouth_of_ronom.txt
+++ b/res/cardsfolder/mouth_of_ronom.txt
@@ -3,8 +3,7 @@ ManaCost:no cost
 Types:Snow Land
 Text:no text
 K:tap: add 1
-#K:abDamageTgtC 4 S T Sac<1/CARDNAME>:4
-A:AB$DealDamage | Cost$ 4 S T Sac<1/CARDNAME> | Tgt$ TgtC | NumDmg$ 4 | SpellDescription$ CARDNAME deals 4 damage to target creature.
+A:AB$DealDamage | Cost$ 4 S T Sac<1/CARDNAME> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 4 | SpellDescription$ CARDNAME deals 4 damage to target creature.
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mouth_of_ronom.jpg
--- a/res/cardsfolder/nightscape_master.txt
+++ b/res/cardsfolder/nightscape_master.txt
@@ -4,8 +4,7 @@ Types:Creature Zombie Wizard
 Text:no text
 PT:2/2
 A:AB$Bounce | Cost$ U U T | ValidTgts$ Creature | TgtPrompt$ Select target Creature | Destination$ Hand | SpellDescription$ Return target creature to its owner's hand.
-#K:abDamageTgtC R R T:2
-A:AB$DealDamage | Cost$ R R T | Tgt$ TgtC | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target creature.
+A:AB$DealDamage | Cost$ R R T | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target creature.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nightscape_master.jpg
 SetInfo:INV|Rare|http://magiccards.info/scans/en/in/113.jpg
--- a/res/cardsfolder/ogre_shaman.txt
+++ b/res/cardsfolder/ogre_shaman.txt
@@ -3,7 +3,6 @@ ManaCost:3 R R
 Types:Creature Ogre Shaman
 Text:no text
 PT:3/3
-#K:abDamageTgtCP 2 Discard<1/Random>:2
 A:AB$DealDamage | Cost$ 2 Discard<1/Random> | Tgt$ TgtCP | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target creature or player.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ogre_shaman.jpg
--- a/res/cardsfolder/orcish_bloodpainter.txt
+++ b/res/cardsfolder/orcish_bloodpainter.txt
@@ -3,7 +3,6 @@ ManaCost:2 R
 Types:Creature Orc Shaman
 Text:no text
 PT:2/1
-#K:abDamageTgtCP T Sac<1/Creature>:2
 A:AB$DealDamage | Cost$ T Sac<1/Creature> | Tgt$ TgtCP | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target creature or player.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orcish_bloodpainter.jpg
--- a/res/cardsfolder/orcish_mechanics.txt
+++ b/res/cardsfolder/orcish_mechanics.txt
@@ -3,7 +3,6 @@ ManaCost:2 R
 Types:Creature Orc
 Text:no text
 PT:1/1
-#K:abDamageTgtCP T Sac<1/Artifact>:2
 A:AB$DealDamage | Cost$ T Sac<1/Artifact> | Tgt$ TgtCP | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target creature or player.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orcish_mechanics.jpg
--- a/res/cardsfolder/pirate_ship.txt
+++ b/res/cardsfolder/pirate_ship.txt
@@ -5,7 +5,6 @@ Text:no text
 PT:4/3
 K:CARDNAME can't attack unless defending player controls an Island.
 K:When you control no Islands, sacrifice CARDNAME.
-#K:abDamageTgtCP T:1
 A:AB$DealDamage | Cost$ T | Tgt$ TgtCP | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature or player.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/pirate_ship.jpg
--- a/res/cardsfolder/pyre_zombie.txt
+++ b/res/cardsfolder/pyre_zombie.txt
@@ -3,7 +3,6 @@ ManaCost:1 B R
 Types:Creature Zombie
 Text:no text
 PT:2/1
-#K:abDamageTgtCP 1 R R Sac<1/CARDNAME>:2
 A:AB$DealDamage | Cost$ 1 R R Sac<1/CARDNAME> | Tgt$ TgtCP | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target creature or player.
 K:WheneverKeyword:BeginningOfUpkeep:No_Initiator:Graveyard:MoveFrom-Graveyard-Hand:Self:ASAP:PayMana/1 B B:ControllerUpkeep:At the beginning of your upkeep, if Pyre Zombie is in your graveyard, you may pay 1 B B. If you do, return Pyre Zombie from your graveyard to your hand.
 SVar:Rarity:Rare
--- a/res/cardsfolder/pyrite_spellbomb.txt
+++ b/res/cardsfolder/pyrite_spellbomb.txt
@@ -3,7 +3,6 @@ ManaCost:1
 Types:Artifact
 Text:no text
 A:AB$Draw | Cost$ 1 Sac<1/CARDNAME> | NumCards$ 1 | SpellDescription$ Draw a card.
-#K:abDamageTgtCP R Sac<1/CARDNAME>:2
 A:AB$DealDamage | Cost$ R Sac<1/CARDNAME> | Tgt$ TgtCP | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target creature or player.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/pyrite_spellbomb.jpg
--- a/res/cardsfolder/raths_edge.txt
+++ b/res/cardsfolder/raths_edge.txt
@@ -3,7 +3,6 @@ ManaCost:no cost
 Types:Legendary Land
 Text:no text
 K:tap: add 1
-#K:abDamageTgtCP 4 T Sac<1/Land>:1
 A:AB$DealDamage | Cost$ 4 T Sac<1/Land> | Tgt$ TgtCP | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature or player.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/raths_edge.jpg
--- a/res/cardsfolder/razorfin_hunter.txt
+++ b/res/cardsfolder/razorfin_hunter.txt
@@ -3,7 +3,6 @@ ManaCost:U R
 Types:Creature Merfolk Goblin
 Text:no text
 PT:1/1
-#K:abDamageTgtCP T:1
 A:AB$DealDamage | Cost$ T | Tgt$ TgtCP | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature or player.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/razorfin_hunter.jpg
--- a/res/cardsfolder/reckless_assault.txt
+++ b/res/cardsfolder/reckless_assault.txt
@@ -2,7 +2,6 @@ Name:Reckless Assault
 ManaCost:2 B R
 Types:Enchantment
 Text:no text
-#K:abDamageTgtCP 1 PayLife<2>:1
 A:AB$DealDamage | Cost$ 1 PayLife<2> | Tgt$ TgtCP | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature or player.
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
--- a/res/cardsfolder/rod_of_ruin.txt
+++ b/res/cardsfolder/rod_of_ruin.txt
@@ -2,7 +2,6 @@ Name:Rod of Ruin
 ManaCost:4
 Types:Artifact
 Text:no text
-#K:abDamageTgtCP 3 T:1
 A:AB$DealDamage | Cost$ 3 T | Tgt$ TgtCP | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature or player.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rod_of_ruin.jpg
--- a/res/cardsfolder/rootwater_hunter.txt
+++ b/res/cardsfolder/rootwater_hunter.txt
@@ -3,7 +3,6 @@ ManaCost:2 U
 Types:Creature Merfolk
 Text:no text
 PT:1/1
-#K:abDamageTgtCP T:1
 A:AB$DealDamage | Cost$ T | Tgt$ TgtCP | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature or player.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rootwater_hunter.jpg
--- a/res/cardsfolder/sacellum_archers.txt
+++ b/res/cardsfolder/sacellum_archers.txt
@@ -3,8 +3,7 @@ ManaCost:2 G
 Types:Creature Elf Archer
 Text:no text
 PT:2/3
-#K:abDamageTgtV R W T:2:Creature.attacking,Creature.blocking:Sacellum Archers deals 2 damage to target attacking or blocking creature.
-A:AB$DealDamage | Cost$ R W T | ValidTgts$ Creature.attacking,Creature.blocking | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target attacking or blocking creature.
+A:AB$DealDamage | Cost$ R W T | ValidTgts$ Creature.attacking,Creature.blocking | TgtPrompt$ Select target attacking or blocking creature | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target attacking or blocking creature.
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sacellum_archers.jpg
--- a/res/cardsfolder/scorched_rusalka.txt
+++ b/res/cardsfolder/scorched_rusalka.txt
@@ -3,7 +3,6 @@ ManaCost:R
 Types:Creature Spirit
 Text:no text
 PT:1/1
-#K:abDamageTgtP R Sac<1/Creature>:1
 A:AB$DealDamage | Cost$ R Sac<1/Creature> | Tgt$ TgtP | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target player.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/scorched_rusalka.jpg
--- a/res/cardsfolder/scorching_missile.txt
+++ b/res/cardsfolder/scorching_missile.txt
@@ -2,7 +2,7 @@ Name:Scorching Missile
 ManaCost:3 R
 Types:Sorcery
 Text:no text
-A:SP$DealDamage | Cost$ 3 R | ValidTgts$ Player | TgtPrompt$ Select target player | NumDmg$ 4 | SpellDescription$ CARDNAME deals 4 damage to target player.
+A:SP$DealDamage | Cost$ 3 R | Tgt$ TgtP | NumDmg$ 4 | SpellDescription$ CARDNAME deals 4 damage to target player.
 K:Flashback:9 R
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/scorching_missile.jpg
--- a/res/cardsfolder/seismic_assault.txt
+++ b/res/cardsfolder/seismic_assault.txt
@@ -2,7 +2,6 @@ Name:Seismic Assault
 ManaCost:R R R
 Types:Enchantment
 Text:no text
-#K:abDamageTgtCP Discard<1/Land>:2
 A:AB$DealDamage | Cost$ Discard<1/Land> | Tgt$ TgtCP | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target creature or player.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/seismic_assault.jpg
--- a/res/cardsfolder/shaukus_minion.txt
+++ b/res/cardsfolder/shaukus_minion.txt
@@ -3,8 +3,7 @@ ManaCost:1 B R
 Types:Creature Human Minion
 Text:no text
 PT:2/2
-#K:abDamageTgtV B R T:2:Creature.White:Shauku's Minion deals 2 damage to target white creature.
-A:AB$DealDamage | Cost$ B R T | ValidTgts$ Creature.White | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target white creature.
+A:AB$DealDamage | Cost$ B R T | ValidTgts$ Creature.White | TgtPrompt$ Select target white creature | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target white creature.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/shaukus_minion.jpg
 SetInfo:MIR|Uncommon|http://magiccards.info/scans/en/mr/343.jpg
--- a/res/cardsfolder/shivan_hellkite.txt
+++ b/res/cardsfolder/shivan_hellkite.txt
@@ -4,7 +4,6 @@ Types:Creature Dragon
 Text:no text
 PT:5/5
 K:Flying
-#K:abDamageTgtCP 1 R:1
 A:AB$DealDamage | Cost$ 1 R | Tgt$ TgtCP | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature or player.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/shivan_hellkite.jpg
--- a/res/cardsfolder/shock_troops.txt
+++ b/res/cardsfolder/shock_troops.txt
@@ -3,7 +3,6 @@ ManaCost:3 R
 Types:Creature Human Soldier
 Text:no text
 PT:2/2
-#K:abDamageTgtCP 0 Sac<1/CARDNAME>:2
 A:AB$DealDamage | Cost$ Sac<1/CARDNAME> | Tgt$ TgtCP | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target creature or player.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/shock_troops.jpg
--- a/res/cardsfolder/skull_catapult.txt
+++ b/res/cardsfolder/skull_catapult.txt
@@ -2,7 +2,6 @@ Name:Skull Catapult
 ManaCost:4
 Types:Artifact
 Text:no text
-#K:abDamageTgtCP 1 T Sac<1/Creature>:2
 A:AB$DealDamage | Cost$ 1 T Sac<1/Creature> | Tgt$ TgtCP | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target creature or player.
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
--- a/res/cardsfolder/slingshot_goblin.txt
+++ b/res/cardsfolder/slingshot_goblin.txt
@@ -3,8 +3,7 @@ ManaCost:2 R
 Types:Creature Goblin
 Text:no text
 PT:2/2
-#K:abDamageTgtV R T:2:Creature.Blue:Slingshot Goblin deals 2 damage to target blue creature.
-A:AB$DealDamage | Cost$  R T | ValidTgts$ Creature.Blue | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target creature or player.
+A:AB$DealDamage | Cost$  R T | Tgt$ TgtCP | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target creature or player.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/slingshot_goblin.jpg
 SetInfo:PLS|Common|http://magiccards.info/scans/en/ps/72.jpg
--- a/res/cardsfolder/soldier_replica.txt
+++ b/res/cardsfolder/soldier_replica.txt
@@ -3,8 +3,7 @@ ManaCost:3
 Types:Artifact Creature Soldier
 Text:no text
 PT:1/3
-#K:abDamageTgtV 1 W Sac<1/CARDNAME>:3:Creature.attacking,Creature.blocking:Soldier Replica deals 3 damage to target attacking or blocking creature.
-A:AB$DealDamage | Cost$ 1 W Sac<1/CARDNAME> | ValidTgts$ Creature.attacking,Creature.blocking | NumDmg$ 3 | SpellDescription$ CARDNAME deals 3 damage to target attacking or blocking creature.
+A:AB$DealDamage | Cost$ 1 W Sac<1/CARDNAME> | ValidTgts$ Creature.attacking,Creature.blocking | TgtPrompt$ Select target attacking or blocking creature | NumDmg$ 3 | SpellDescription$ CARDNAME deals 3 damage to target attacking or blocking creature.
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/soldier_replica.jpg
--- a/res/cardsfolder/spikeshot_elder.txt
+++ b/res/cardsfolder/spikeshot_elder.txt
@@ -3,7 +3,6 @@ ManaCost:R
 Types:Creature Goblin Shaman
 Text:no text
 PT:1/1
-#K:abDamageTgtCP 1 R R:X:Spikeshot Elder deals damage equal to its power to target creature or player.:Spikeshot Elder - deal X damage to creature or player.
 A:AB$DealDamage | Cost$ 1 R R | Tgt$ TgtCP | NumDmg$ X | SpellDescription$ CARDNAME deals damage equal to its power to target creature or player.
 SVar:X:Count$CardPower
 SVar:Rarity:Rare
--- a/res/cardsfolder/spikeshot_goblin.txt
+++ b/res/cardsfolder/spikeshot_goblin.txt
@@ -3,7 +3,6 @@ ManaCost:2 R
 Types:Creature Goblin Shaman
 Text:no text
 PT:1/2
-#K:abDamageTgtCP R T:X:Spikeshot Goblin deals damage equal to its power to target creature or player.:Spikeshot Goblin - deal X damage to creature or player.
 A:AB$DealDamage | Cost$ R T | Tgt$ TgtCP | NumDmg$ X | SpellDescription$ CARDNAME deals damage equal to its power to target creature or player.
 SVar:X:Count$CardPower
 SVar:Rarity:Common
--- a/res/cardsfolder/spitting_hydra.txt
+++ b/res/cardsfolder/spitting_hydra.txt
@@ -4,7 +4,7 @@ Types:Creature Hydra
 Text:Spitting Hydra enters the battlefield with four +1/+1 counters.
 PT:0/0
 K:etbCounter:P1P1:4
-A:AB$DealDamage | Cost$1 R SubCounter<1/P1P1> | Tgt$TgtC | NumDmg$1 | SpellDescription$CARDNAME deals 1 damage to target creature.
+A:AB$DealDamage | Cost$1 R SubCounter<1/P1P1> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$1 | SpellDescription$CARDNAME deals 1 damage to target creature.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/spitting_hydra.jpg
 SetInfo:STH|Rare|http://magiccards.info/scans/en/sh/99.jpg
--- a/res/cardsfolder/stinging_barrier.txt
+++ b/res/cardsfolder/stinging_barrier.txt
@@ -4,7 +4,6 @@ Types:Creature Wall
 Text:no text
 PT:0/4
 K:Defender
-#K:abDamageTgtCP U T:1
 A:AB$DealDamage | Cost$ U T | Tgt$ TgtCP | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature or player.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stinging_barrier.jpg
--- a/res/cardsfolder/storm_spirit.txt
+++ b/res/cardsfolder/storm_spirit.txt
@@ -4,8 +4,7 @@ Types:Creature Elemental Spirit
 Text:no text
 PT:3/3
 K:Flying
-#K:abDamageTgtC T:2
-A:AB$DealDamage | Cost$ T | Tgt$ TgtC | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target creature.
+A:AB$DealDamage | Cost$ T | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target creature.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/storm_spirit.jpg
 SetInfo:ICE|Rare|http://magiccards.info/scans/en/ia/381.jpg
--- a/res/cardsfolder/stormbind.txt
+++ b/res/cardsfolder/stormbind.txt
@@ -2,7 +2,6 @@ Name:Stormbind
 ManaCost:1 R G
 Types:Enchantment
 Text:no text
-#K:abDamageTgtCP 2 Discard<1/Random>:2
 A:AB$DealDamage | Cost$ 2 Discard<1/Random> | Tgt$ TgtCP | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target creature or player.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stormbind.jpg
--- a/res/cardsfolder/tar_pitcher.txt
+++ b/res/cardsfolder/tar_pitcher.txt
@@ -3,7 +3,6 @@ ManaCost:3 R
 Types:Creature Goblin Shaman
 Text:no text
 PT:2/2
-#K:abDamageTgtCP T Sac<1/Goblin>:2
 A:AB$DealDamage | Cost$ T Sac<1/Goblin> | Tgt$ TgtCP | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target creature or player.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tar_pitcher.jpg
--- a/res/cardsfolder/task_mage_assembly.txt
+++ b/res/cardsfolder/task_mage_assembly.txt
@@ -3,7 +3,7 @@ ManaCost:2 R
 Types:Enchantment
 Text:no text
 K:When there are no creatures on the battlefield, sacrifice CARDNAME.
-A:AB$DealDamage | Cost$ 2 | Tgt$ TgtC | NumDmg$ 1 | AnyPlayer$ True | SorcerySpeed$ True | SpellDescription$ CARDNAME deals 1 damage to target creature. Any player may activate this ability but only any time he or she could cast a sorcery.
+A:AB$DealDamage | Cost$ 2 | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 1 | AnyPlayer$ True | SorcerySpeed$ True | SpellDescription$ CARDNAME deals 1 damage to target creature. Any player may activate this ability but only any time he or she could cast a sorcery.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/task_mage_assembly.jpg
 SetInfo:PCY|Rare|http://magiccards.info/scans/en/pr/105.jpg
--- a/res/cardsfolder/telimtors_darts.txt
+++ b/res/cardsfolder/telimtors_darts.txt
@@ -2,7 +2,6 @@ Name:Telim'Tor's Darts
 ManaCost:2
 Types:Artifact
 Text:no text
-#K:abDamageTgtP 2 T:1
 A:AB$DealDamage | Cost$ 2 T | Tgt$ TgtP | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target player.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/telimtors_darts.jpg
--- a/res/cardsfolder/thornscape_master.txt
+++ b/res/cardsfolder/thornscape_master.txt
@@ -3,7 +3,7 @@ ManaCost:2 G G
 Types:Creature Human Wizard
 Text:no text
 PT:2/2
-A:AB$DealDamage | Cost$ R R T | Tgt$ TgtC | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target creature or player.
+A:AB$DealDamage | Cost$ R R T | Tgt$ TgtCP | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target creature or player.
 A:AB$Pump | Cost$ W W T | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Protection from white | SpellDescription$ Target creature has Protection from white until end of turn.
 A:AB$Pump | Cost$ W W T | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Protection from white | SpellDescription$ Target creature has Protection from blue until end of turn.
 A:AB$Pump | Cost$ W W T | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Protection from white | SpellDescription$ Target creature has Protection from black until end of turn.
--- a/res/cardsfolder/thornwind_faeries.txt
+++ b/res/cardsfolder/thornwind_faeries.txt
@@ -4,7 +4,6 @@ Types:Creature Faerie
 Text:no text
 PT:1/1
 K:Flying
-#K:abDamageTgtCP T:1
 A:AB$DealDamage | Cost$ T | Tgt$ TgtCP | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature or player.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/thornwind_faeries.jpg
--- a/res/cardsfolder/ticking_gnomes.txt
+++ b/res/cardsfolder/ticking_gnomes.txt
@@ -4,7 +4,6 @@ Types:Artifact Creature Gnome
 Text:no text
 PT:3/3
 K:Echo:3
-#K:abDamageTgtCP Sac<1/CARDNAME>:1
 A:AB$DealDamage | Cost$ Sac<1/CARDNAME> | Tgt$ TgtCP | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature or player.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ticking_gnomes.jpg
--- a/res/cardsfolder/tor_wauki.txt
+++ b/res/cardsfolder/tor_wauki.txt
@@ -3,8 +3,7 @@ ManaCost:2 B B R
 Types:Legendary Creature Human Archer
 Text:no text
 PT:3/3
-#K:abDamageTgtV T:2:Creature.attacking,Creature.blocking:Tor Wauki deals 2 damage to target attacking or blocking creature.
-A:AB$DealDamage | Cost$ T | ValidTgts$ Creature.attacking,Creature.blocking | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target attacking or blocking creature.
+A:AB$DealDamage | Cost$ T | ValidTgts$ Creature.attacking,Creature.blocking | TgtPrompt$ Select target attacking or blocking creature | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target attacking or blocking creature.
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tor_wauki.jpg
--- a/res/cardsfolder/tower_of_calamities.txt
+++ b/res/cardsfolder/tower_of_calamities.txt
@@ -2,8 +2,7 @@ Name:Tower of Calamities
 ManaCost:4
 Types:Artifact
 Text:no text
-#K:abDamageTgtC 8 T:12
-A:AB$DealDamage | Cost$ 8 T | Tgt$ TgtC | NumDmg$ 12 | SpellDescription$ CARDNAME deals 12 damage to target creature.
+A:AB$DealDamage | Cost$ 8 T | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 12 | SpellDescription$ CARDNAME deals 12 damage to target creature.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tower_of_calamities.jpg
 SetInfo:SOM|Rare|http://magiccards.info/scans/en/som/212.jpg
--- a/res/cardsfolder/triskelavus.txt
+++ b/res/cardsfolder/triskelavus.txt
@@ -5,9 +5,7 @@ Text:(NOTE: Triskelavites do not have sacrifice abilities yet).
 PT:1/1
 K:Flying
 K:etbCounter:P1P1:3
-#K:abMakeToken 1 SubCounter<1/P1P1><>1<>Triskelavite<>1 1 Triskelavite<>Controller<>0<>Artifact;Creature;Triskelavite<>1<>1<>Flying<>Put a 1/1 colorless Triskelavite artifact creature token with flying onto the battlefield.
 A:AB$Token | Cost$ 1 SubCounter<1/P1P1> | TokenAmount$ 1 | TokenName$ Triskelavite | TokenTypes$ Artifact,Creature,Triskelavite | TokenOwner$ Controller | TokenColors$ Colorless | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying | SpellDescription$ Put a 1/1 colorless Triskelavite artifact creature token with flying onto the battlefield.
-#K:abDamageTgtCP Sac<1/Triskelavite>:1
 A:AB$DealDamage | Cost$ Sac<1/Triskelavite> | Tgt$ TgtCP | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature or player.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/triskelavus.jpg
--- a/res/cardsfolder/triskelion.txt
+++ b/res/cardsfolder/triskelion.txt
@@ -4,7 +4,6 @@ Types:Artifact Creature Construct
 Text:no text
 PT:1/1
 K:etbCounter:P1P1:3
-#K:abDamageTgtCP SubCounter<1/P1P1>:1
 A:AB$DealDamage | Cost$ SubCounter<1/P1P1> | Tgt$ TgtCP | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature or player.
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
--- a/res/cardsfolder/vampiric_dragon.txt
+++ b/res/cardsfolder/vampiric_dragon.txt
@@ -5,8 +5,7 @@ Text:no text
 PT:5/5
 K:Flying
 K:Whenever a creature dealt damage by CARDNAME this turn is put into a graveyard, put a +1/+1 counter on CARDNAME.
-#K:abDamageTgtC 1 R:1
-A:AB$DealDamage | Cost$ 1 R | Tgt$ TgtC | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature.
+A:AB$DealDamage | Cost$ 1 R | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/vampiric_dragon.jpg
 SetInfo:ODY|Rare|http://magiccards.info/scans/en/od/296.jpg
--- a/res/cardsfolder/venomspout_brackus.txt
+++ b/res/cardsfolder/venomspout_brackus.txt
@@ -3,8 +3,7 @@ ManaCost:6 G
 Types:Creature Beast
 Text:no text
 PT:5/5
-#K:abDamageTgtV 1 G T:5:Creature.attacking+withFlying,Creature.blocking+withFlying:Venomspout Brackus deals 5 damage to target attacking or blocking creature with flying.
-A:AB$DealDamage | Cost$ 1 G T | ValidTgts$ Creature.attacking+withFlying,Creature.blocking+withFlying | NumDmg$ 5 | SpellDescription$ CARDNAME deals 5 damage to target attacking or blocking creature with flying.
+A:AB$DealDamage | Cost$ 1 G T | ValidTgts$ Creature.attacking+withFlying,Creature.blocking+withFlying | TgtPrompt$ Select target attacking or blocking creature with flying | NumDmg$ 5 | SpellDescription$ CARDNAME deals 5 damage to target attacking or blocking creature with flying.
 K:Morph:3 G G
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
--- a/Show More
+++ b/Show More