diff --git a/res/cardsfolder/a/arc_lightning.txt b/res/cardsfolder/a/arc_lightning.txt
index 54bfdc508ea..5a3dd353dd0 100644
--- a/res/cardsfolder/a/arc_lightning.txt
+++ b/res/cardsfolder/a/arc_lightning.txt
@@ -2,9 +2,9 @@ Name:Arc Lightning
 ManaCost:2 R
 Types:Sorcery
 Text:no text
-A:SP$ DealDamage | Cost$ 2 R | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select target creature or player (1) | NumDmg$ 1 | SubAbility$ DBDamage2 | SpellDescription$ CARDNAME deals 3 damage divided as you choose among one, two, or three target creatures and/or players.
-SVar:DBDamage2:DB$DealDamage | Cost$ 0 | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select target creature or player (2) | NumDmg$ 1 | SubAbility$ DBDamage3
-SVar:DBDamage3:DB$DealDamage | Cost$ 0 | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select target creature or player (3) | NumDmg$ 1
+A:SP$ DealDamage | Cost$ 2 R | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player (1) | NumDmg$ 1 | SubAbility$ DBDamage2 | SpellDescription$ CARDNAME deals 3 damage divided as you choose among one, two, or three target creatures and/or players.
+SVar:DBDamage2:DB$DealDamage | Cost$ 0 | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player (2) | NumDmg$ 1 | SubAbility$ DBDamage3
+SVar:DBDamage3:DB$DealDamage | Cost$ 0 | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player (3) | NumDmg$ 1
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/arc_lightning.jpg
 SetInfo:USG|Common|http://magiccards.info/scans/en/us/174.jpg
diff --git a/res/cardsfolder/a/arc_mage.txt b/res/cardsfolder/a/arc_mage.txt
index 355a4bf296b..0b2fa402a36 100644
--- a/res/cardsfolder/a/arc_mage.txt
+++ b/res/cardsfolder/a/arc_mage.txt
@@ -3,8 +3,8 @@ ManaCost:2 R
 Types:Creature Human Spellshaper
 Text:no text
 PT:2/2
-A:AB$ DealDamage | Cost$ 2 R T Discard<1/Card> | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select target creature or player (1) | NumDmg$ 1 | SubAbility$ DBDamage | SpellDescription$ CARDNAME deals 2 damage divided as you choose among any number of target creatures and/or players.
-SVar:DBDamage:DB$DealDamage | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select target creature or player (2) | NumDmg$ 1
+A:AB$ DealDamage | Cost$ 2 R T Discard<1/Card> | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player (1) | NumDmg$ 1 | SubAbility$ DBDamage | SpellDescription$ CARDNAME deals 2 damage divided as you choose among any number of target creatures and/or players.
+SVar:DBDamage:DB$DealDamage | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player (2) | NumDmg$ 1
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/arc_mage.jpg
 SetInfo:NMS|Uncommon|http://magiccards.info/scans/en/ne/77.jpg
diff --git a/res/cardsfolder/a/arc_trail.txt b/res/cardsfolder/a/arc_trail.txt
index 674d7ae20ad..80aeace9688 100644
--- a/res/cardsfolder/a/arc_trail.txt
+++ b/res/cardsfolder/a/arc_trail.txt
@@ -2,8 +2,8 @@ Name:Arc Trail
 ManaCost:1 R
 Types:Sorcery
 Text:no text
-A:SP$ DealDamage | Cost$ 1 R | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select target creature or player (2 damage) | NumDmg$ 2 | SubAbility$ DBDealDamage | SpellDescription$ CARDNAME deals 2 damage to target creature or player and 1 damage to another target creature or player.
-SVar:DBDealDamage:DB$ DealDamage | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select target creature or player (1 damage) | TargetUnique$ True | NumDmg$ 1
+A:SP$ DealDamage | Cost$ 1 R | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player (2 damage) | NumDmg$ 2 | SubAbility$ DBDealDamage | SpellDescription$ CARDNAME deals 2 damage to target creature or player and 1 damage to another target creature or player.
+SVar:DBDealDamage:DB$ DealDamage | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player (1 damage) | TargetUnique$ True | NumDmg$ 1
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/arc_trail.jpg
 SetInfo:SOM|Uncommon|http://magiccards.info/scans/en/som/81.jpg
diff --git a/res/cardsfolder/b/banshees_blade.txt b/res/cardsfolder/b/banshees_blade.txt
index e8e58986934..1b7d76139e1 100644
--- a/res/cardsfolder/b/banshees_blade.txt
+++ b/res/cardsfolder/b/banshees_blade.txt
@@ -4,7 +4,7 @@ Types:Artifact Equipment
 Text:no text
 K:Equip 2
 S:Mode$ Continuous | Affected$ Card.EquippedBy | AddPower$ X | AddToughness$ X | Description$ Equipped creature gets +1/+1 for each charge counter on CARDNAME.
-T:Mode$ DamageDone | ValidSource$ Creature.AttachedBy | ValidTarget$ Player,Creature,Planeswalker | CombatDamage$ True | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever equipped creature deals combat damage, put a charge counter on CARDNAME.
+T:Mode$ DamageDone | ValidSource$ Creature.AttachedBy | CombatDamage$ True | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever equipped creature deals combat damage, put a charge counter on CARDNAME.
 SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | CounterType$ CHARGE | CounterNum$ 1
 SVar:X:Count$CardCounters.CHARGE
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/c/cone_of_flame.txt b/res/cardsfolder/c/cone_of_flame.txt
index 074c1b42245..2a75b26d395 100644
--- a/res/cardsfolder/c/cone_of_flame.txt
+++ b/res/cardsfolder/c/cone_of_flame.txt
@@ -2,9 +2,9 @@ Name:Cone of Flame
 ManaCost:3 R R
 Types:Sorcery
 Text:no text
-A:SP$ DealDamage | Cost$ 3 R R | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select target creature or player | NumDmg$ 1 | SubAbility$ DBDamageTwo | SpellDescription$ CARDNAME deals 1 damage to target creature or player, 2 damage to another target creature or player, and 3 damage to a third target creature or player.
-SVar:DBDamageTwo:DB$ DealDamage | Cost$ 0 | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select another target creature or player | NumDmg$ 2 | TargetUnique$ True | SubAbility$ DBDamageThree
-SVar:DBDamageThree:DB$ DealDamage | Cost$ 0 | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select another target creature or player | NumDmg$ 3 |TargetUnique$ True
+A:SP$ DealDamage | Cost$ 3 R R | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 1 | SubAbility$ DBDamageTwo | SpellDescription$ CARDNAME deals 1 damage to target creature or player, 2 damage to another target creature or player, and 3 damage to a third target creature or player.
+SVar:DBDamageTwo:DB$ DealDamage | Cost$ 0 | ValidTgts$ Creature,Player | TgtPrompt$ Select another target creature or player | NumDmg$ 2 | TargetUnique$ True | SubAbility$ DBDamageThree
+SVar:DBDamageThree:DB$ DealDamage | Cost$ 0 | ValidTgts$ Creature,Player | TgtPrompt$ Select another target creature or player | NumDmg$ 3 |TargetUnique$ True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cone_of_flame.jpg
 SetInfo:WTH|Uncommon|http://magiccards.info/scans/en/wl/95.jpg
diff --git a/res/cardsfolder/e/electrolyze.txt b/res/cardsfolder/e/electrolyze.txt
index 02feb5519a6..94518452d89 100644
--- a/res/cardsfolder/e/electrolyze.txt
+++ b/res/cardsfolder/e/electrolyze.txt
@@ -2,8 +2,8 @@ Name:Electrolyze
 ManaCost:1 U R
 Types:Instant
 Text:no text
-A:SP$ DealDamage | Cost$ 1 U R | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select target creature, player or planeswalker (1) | NumDmg$ 1 | SubAbility$ DBDamage2 | SpellDescription$ CARDNAME deals 2 damage divided as you choose among one or two target creatures and/or players. Draw a card.
-SVar:DBDamage2:DB$DealDamage | Cost$ 0 | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select target creature, player or planeswalker (2) | NumDmg$ 1 | SubAbility$ DBDraw
+A:SP$ DealDamage | Cost$ 1 U R | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature, player or planeswalker (1) | NumDmg$ 1 | SubAbility$ DBDamage2 | SpellDescription$ CARDNAME deals 2 damage divided as you choose among one or two target creatures and/or players. Draw a card.
+SVar:DBDamage2:DB$DealDamage | Cost$ 0 | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature, player or planeswalker (2) | NumDmg$ 1 | SubAbility$ DBDraw
 SVar:DBDraw:DB$Draw | Cost$ 0 | NumCards$ 1
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/electrolyze.jpg
diff --git a/res/cardsfolder/f/flames_of_the_firebrand.txt b/res/cardsfolder/f/flames_of_the_firebrand.txt
index 49c37097f37..ff0b4ff6a60 100644
--- a/res/cardsfolder/f/flames_of_the_firebrand.txt
+++ b/res/cardsfolder/f/flames_of_the_firebrand.txt
@@ -2,9 +2,9 @@ Name:Flames of the Firebrand
 ManaCost:2 R
 Types:Sorcery
 Text:no text
-A:SP$ DealDamage | Cost$ 2 R | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select target creature or player (1) | NumDmg$ 1 | SubAbility$ DBDamage2 | SpellDescription$ CARDNAME deals 3 damage divided as you choose among one, two, or three target creatures and/or players.
-SVar:DBDamage2:DB$DealDamage | Cost$ 0 | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select target creature or player (2) | NumDmg$ 1 | SubAbility$ DBDamage3
-SVar:DBDamage3:DB$DealDamage | Cost$ 0 | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select target creature or player (3) | NumDmg$ 1
+A:SP$ DealDamage | Cost$ 2 R | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player (1) | NumDmg$ 1 | SubAbility$ DBDamage2 | SpellDescription$ CARDNAME deals 3 damage divided as you choose among one, two, or three target creatures and/or players.
+SVar:DBDamage2:DB$DealDamage | Cost$ 0 | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player (2) | NumDmg$ 1 | SubAbility$ DBDamage3
+SVar:DBDamage3:DB$DealDamage | Cost$ 0 | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player (3) | NumDmg$ 1
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/flames_of_the_firebrand.jpg
 SetInfo:M13|Uncommon|http://magiccards.info/scans/en/m13/132.jpg
diff --git a/res/cardsfolder/g/goblin_festival.txt b/res/cardsfolder/g/goblin_festival.txt
index 628a6907df0..440630cbc84 100644
--- a/res/cardsfolder/g/goblin_festival.txt
+++ b/res/cardsfolder/g/goblin_festival.txt
@@ -2,7 +2,7 @@ Name:Goblin Festival
 ManaCost:1 R
 Types:Enchantment
 Text:no text
-A:AB$ DealDamage | Cost$ 2 | NumDmg$ 1 | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select target creature or player | SubAbility$ RememberActivator | SpellDescription$ CARDNAME deals 1 damage to target creature or player. Flip a coin. If you lose the flip, choose one of your opponents. That player gains control of CARDNAME.
+A:AB$ DealDamage | Cost$ 2 | NumDmg$ 1 | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | SubAbility$ RememberActivator | SpellDescription$ CARDNAME deals 1 damage to target creature or player. Flip a coin. If you lose the flip, choose one of your opponents. That player gains control of CARDNAME.
 SVar:RememberActivator:DB$ Pump | RememberObjects$ You | Static$ True | StackDescription$ None | SubAbility$ ControlFlip
 SVar:ControlFlip:DB$ FlipACoin | Defined$ Remembered | LoseSubAbility$ ChooseOpp | WinSubAbility$ DBCleanup
 SVar:ChooseOpp:DB$ ChoosePlayer | Defined$ Remembered | Choices$ RememberedOpponent | AILogic$ Curse | SubAbility$ LoseControl
diff --git a/res/cardsfolder/g/grab_the_reins.txt b/res/cardsfolder/g/grab_the_reins.txt
index d3ed605c9e1..64cd6dda2e9 100644
--- a/res/cardsfolder/g/grab_the_reins.txt
+++ b/res/cardsfolder/g/grab_the_reins.txt
@@ -6,7 +6,7 @@ A:SP$ GainControl | Cost$ 3 R | ValidTgts$ Creature | TgtPrompt$ Select target c
 A:SP$ Sacrifice | Cost$ 3 R | Amount$ 1 | SacValid$ Creature | RememberSacrificed$ True | SubAbility$ GrabDmg | SpellDescription$ or sacrifice a creature, then CARDNAME deals damage equal to that creature's power to target creature or player.
 A:SP$ GainControl | Cost$ 5 R R | ValidTgts$ Creature | TgtPrompt$ Select target creature to gain control of | LoseControl$ EOT | AddKWs$ Haste | SubAbility$ GrabASacrifice | PrecostDesc$ Entwine | CostDesc$ 2 R | SpellDescription$ (Choose both if you pay the entwine cost.)
 SVar:GrabASacrifice:DB$ Sacrifice | Amount$ 1 | SacValid$ Creature | RememberSacrificed$ True | SubAbility$ GrabDmg
-SVar:GrabDmg:DB$DealDamage | Cost$ 0 | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select target creature or player to deal the damage to | NumDmg$ X | SubAbility$ DBCleanup | References$ X
+SVar:GrabDmg:DB$DealDamage | Cost$ 0 | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player to deal the damage to | NumDmg$ X | SubAbility$ DBCleanup | References$ X
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Remembered$CardPower
 SVar:RemAIDeck:True
diff --git a/res/cardsfolder/k/kuldotha_flamefiend.txt b/res/cardsfolder/k/kuldotha_flamefiend.txt
index 5a101a4cd2d..25c085f55ca 100644
--- a/res/cardsfolder/k/kuldotha_flamefiend.txt
+++ b/res/cardsfolder/k/kuldotha_flamefiend.txt
@@ -4,10 +4,10 @@ Types:Creature Elemental
 Text:no text
 PT:4/4
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | OptionalDecider$ You | Execute$ TrigDealDamage | TriggerDescription$ When CARDNAME enters the battlefield, you may sacrifice an artifact. If you do, CARDNAME deals 4 damage divided as you choose among any number of target creatures and/or players.
-SVar:TrigDealDamage:AB$ DealDamage | Cost$ Sac<1/Artifact> | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select target creature or player (1) | NumDmg$ 1 | SubAbility$ DBDamage2
-SVar:DBDamage2:DB$DealDamage | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select target creature or player (2) | NumDmg$ 1 | SubAbility$ DBDamage3
-SVar:DBDamage3:DB$DealDamage | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select target creature or player (3) | NumDmg$ 1 | SubAbility$ DBDamage4
-SVar:DBDamage4:DB$DealDamage | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select target creature or player (4) | NumDmg$ 1
+SVar:TrigDealDamage:AB$ DealDamage | Cost$ Sac<1/Artifact> | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player (1) | NumDmg$ 1 | SubAbility$ DBDamage2
+SVar:DBDamage2:DB$DealDamage | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player (2) | NumDmg$ 1 | SubAbility$ DBDamage3
+SVar:DBDamage3:DB$DealDamage | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player (3) | NumDmg$ 1 | SubAbility$ DBDamage4
+SVar:DBDamage4:DB$DealDamage | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player (4) | NumDmg$ 1
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kuldotha_flamefiend.jpg
diff --git a/res/cardsfolder/m/mage_slayer.txt b/res/cardsfolder/m/mage_slayer.txt
index 0f4005a144f..29ff8ab3eba 100644
--- a/res/cardsfolder/m/mage_slayer.txt
+++ b/res/cardsfolder/m/mage_slayer.txt
@@ -4,7 +4,7 @@ Types:Artifact Equipment
 Text:no text
 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:TrigDamage:AB$DealDamage | Cost$ 0 | ValidTgts$ Opponent | DamageSource$ Equipped | TgtPrompt$ Select target opponent or planeswalker | NumDmg$ X | References$ X
 SVar:X:TriggeredAttacker$CardPower
 S:Mode$ Continuous | Affected$ Creature.AttachedBy | AddSVar$ AE
 SVar:AE:SVar:HasAttackEffect:TRUE
diff --git a/res/cardsfolder/m/magma_burst.txt b/res/cardsfolder/m/magma_burst.txt
index 1988c4c4bdd..beaa10847b3 100644
--- a/res/cardsfolder/m/magma_burst.txt
+++ b/res/cardsfolder/m/magma_burst.txt
@@ -3,8 +3,8 @@ ManaCost:3 R
 Types:Instant
 Text:no text
 A:SP$ DealDamage | Cost$ 3 R | Tgt$ TgtCP | NumDmg$ 3 | SpellDescription$ CARDNAME deals 3 damage to target creature or player. If CARDNAME was kicked, it deals 3 damage to another target creature or player.
-A:SP$ DealDamage | SetAsKicked$ True | Cost$ 3 R Sac<2/Land> | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select target creature or player | NumDmg$ 3 | TargetUnique$ True | SubAbility$ DBKicker | CostDesc$ Kicker-Sacrifice two lands. | SpellDescription$ (You may sacrifice two lands in addition to any other costs as you cast this spell.)
-SVar:DBKicker:DB$ DealDamage | Cost$ 0 | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select another target creature or player | NumDmg$ 3 | TargetUnique$ True
+A:SP$ DealDamage | SetAsKicked$ True | Cost$ 3 R Sac<2/Land> | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 3 | TargetUnique$ True | SubAbility$ DBKicker | CostDesc$ Kicker-Sacrifice two lands. | SpellDescription$ (You may sacrifice two lands in addition to any other costs as you cast this spell.)
+SVar:DBKicker:DB$ DealDamage | Cost$ 0 | ValidTgts$ Creature,Player | TgtPrompt$ Select another target creature or player | NumDmg$ 3 | TargetUnique$ True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/magma_burst.jpg
 SetInfo:PLS|Common|http://magiccards.info/scans/en/ps/66.jpg
diff --git a/res/cardsfolder/p/pyrotechnics.txt b/res/cardsfolder/p/pyrotechnics.txt
index 222448fb3de..224a9e3baa3 100644
--- a/res/cardsfolder/p/pyrotechnics.txt
+++ b/res/cardsfolder/p/pyrotechnics.txt
@@ -2,10 +2,10 @@ Name:Pyrotechnics
 ManaCost:4 R
 Types:Sorcery
 Text:no text
-A:SP$ DealDamage | Cost$ 4 R | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select target creature or player (1) | NumDmg$ 1 | SubAbility$ DBDamage2 | SpellDescription$ CARDNAME deals 4 damage divided as you choose among any number of target creatures and/or players.
-SVar:DBDamage2:DB$DealDamage | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select target creature or player (2) | NumDmg$ 1 | SubAbility$ DBDamage3
-SVar:DBDamage3:DB$DealDamage | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select target creature or player (3) | NumDmg$ 1 | SubAbility$ DBDamage4
-SVar:DBDamage4:DB$DealDamage | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select target creature or player (4) | NumDmg$ 1
+A:SP$ DealDamage | Cost$ 4 R | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player (1) | NumDmg$ 1 | SubAbility$ DBDamage2 | SpellDescription$ CARDNAME deals 4 damage divided as you choose among any number of target creatures and/or players.
+SVar:DBDamage2:DB$DealDamage | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player (2) | NumDmg$ 1 | SubAbility$ DBDamage3
+SVar:DBDamage3:DB$DealDamage | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player (3) | NumDmg$ 1 | SubAbility$ DBDamage4
+SVar:DBDamage4:DB$DealDamage | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player (4) | NumDmg$ 1
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/pyrotechnics.jpg
 SetInfo:8ED|Uncommon|http://magiccards.info/scans/en/8e/211.jpg
diff --git a/res/cardsfolder/v/violent_eruption.txt b/res/cardsfolder/v/violent_eruption.txt
index 2100551c4e4..b20457e34e7 100644
--- a/res/cardsfolder/v/violent_eruption.txt
+++ b/res/cardsfolder/v/violent_eruption.txt
@@ -2,10 +2,10 @@ Name:Violent Eruption
 ManaCost:1 R R R
 Types:Instant
 Text:no text
-A:SP$ DealDamage | Cost$ 1 R R R | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select target creature or player (1) | NumDmg$ 1 | SubAbility$ DBDamage2 | SpellDescription$ CARDNAME deals 4 damage divided as you choose among any number of target creatures and/or players.
-SVar:DBDamage2:DB$DealDamage | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select target creature or player (2) | NumDmg$ 1 | SubAbility$ DBDamage3
-SVar:DBDamage3:DB$DealDamage | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select target creature or player (3) | NumDmg$ 1 | SubAbility$ DBDamage4
-SVar:DBDamage4:DB$DealDamage | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select target creature or player (4) | NumDmg$ 1
+A:SP$ DealDamage | Cost$ 1 R R R | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player (1) | NumDmg$ 1 | SubAbility$ DBDamage2 | SpellDescription$ CARDNAME deals 4 damage divided as you choose among any number of target creatures and/or players.
+SVar:DBDamage2:DB$DealDamage | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player (2) | NumDmg$ 1 | SubAbility$ DBDamage3
+SVar:DBDamage3:DB$DealDamage | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player (3) | NumDmg$ 1 | SubAbility$ DBDamage4
+SVar:DBDamage4:DB$DealDamage | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player (4) | NumDmg$ 1
 K:Madness:1 R R
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/violent_eruption.jpg