diff --git a/forge-gui/res/cardsfolder/a/angrath_minotaur_pirate.txt b/forge-gui/res/cardsfolder/a/angrath_minotaur_pirate.txt
index 64d069ceb04..3f63ecfedf5 100644
--- a/forge-gui/res/cardsfolder/a/angrath_minotaur_pirate.txt
+++ b/forge-gui/res/cardsfolder/a/angrath_minotaur_pirate.txt
@@ -2,7 +2,9 @@ Name:Angrath, Minotaur Pirate
 ManaCost:4 B R
 Types:Legendary Planeswalker Angrath
 Loyalty:5
-A:AB$ DamageAll | Cost$ AddCounter<2/LOYALTY> | Planeswalker$ True | NumDmg$ 1 | ValidTgts$ Opponent,Planeswalker | TgtPrompt$ Select an opponent | ValidCards$ Creature | ValidPlayers$ TargetedOrController | ValidDescription$ target opponent and each creature he or she controls. | SpellDescription$ CARDNAME deals 1 damage to target opponent or planeswalker and each creature that player or that planeswalker's controller controls.
+A:AB$ DealDamage | Cost$ AddCounter<2/LOYALTY> | Planeswalker$ True | NumDmg$ 1 | ValidTgts$ Opponent,Planeswalker | TgtPrompt$ Select an opponent or planeswalker | SubAbility$ DmgAll | DamageMap$ True | SpellDescription$ CARDNAME deals 1 damage to target opponent or planeswalker and each creature that player or that planeswalker's controller controls.
+SVar:DmgAll:DB$ DamageAll | NumDmg$ 1 | ValidCards$ Creature.ControlledBy TargetedOrController | SubAbility$ DBDamageResolve
+SVar:DBDamageResolve:DB$ DamageResolve
 A:AB$ ChangeZone | Cost$ SubCounter<3/LOYALTY> | Planeswalker$ True | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Card.Pirate+YouCtrl | TgtPrompt$ Select target Pirate card in your graveyard. | SpellDescription$ Return target Pirate card from your graveyard to the battlefield.
 A:AB$ DestroyAll | Cost$ SubCounter<11/LOYALTY> | Planeswalker$ True | Ultimate$ True | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | ValidCards$ Creature | ValidDescription$ all creatures targeted opponent controls | RememberAllObjects$ True | SubAbility$ DBDealDamage | SpellDescription$ Destroy all creatures target opponent controls. CARDNAME deals damage to that player equal to their total power.
 SVar:DBDealDamage:DB$ DealDamage | Defined$ Targeted | NumDmg$ X | References$ X
diff --git a/forge-gui/res/cardsfolder/b/bonfire_of_the_damned.txt b/forge-gui/res/cardsfolder/b/bonfire_of_the_damned.txt
index 2ea298711f4..2ae0744f85d 100644
--- a/forge-gui/res/cardsfolder/b/bonfire_of_the_damned.txt
+++ b/forge-gui/res/cardsfolder/b/bonfire_of_the_damned.txt
@@ -1,7 +1,9 @@
 Name:Bonfire of the Damned
 ManaCost:X X R
 Types:Sorcery
-A:SP$ DamageAll | Cost$ X X R | NumDmg$ X | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select a player or planeswalker | ValidCards$ Creature | ValidPlayers$ TargetedOrController | ValidDescription$ target player or planeswalker and each creature that player or that planeswalker's controller controls. | References$ X | SpellDescription$ CARDNAME deals X damage to target player or planeswalker and each creature that player or that planeswalker's controller controls.
+A:SP$ DealDamage | Cost$ X X R | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select a player or planeswalker | NumDmg$ X | References$ X | SubAbility$ DmgAll | DamageMap$ True | SpellDescription$ CARDNAME deals X damage to target player or planeswalker and each creature that player or that planeswalker's controller controls.
+SVar:DmgAll:DB$ DamageAll | NumDmg$ X | References$ X | ValidCards$ Creature.ControlledBy TargetedOrController | SubAbility$ DBDamageResolve
+SVar:DBDamageResolve:DB$ DamageResolve
 K:Miracle:X R
 SVar:X:Count$xPaid
 SVar:Picture:http://www.wizards.com/global/images/magic/general/bonfire_of_the_damned.jpg
diff --git a/forge-gui/res/cardsfolder/c/chandra_nalaar.txt b/forge-gui/res/cardsfolder/c/chandra_nalaar.txt
index 57c520fcc66..0af9e968418 100644
--- a/forge-gui/res/cardsfolder/c/chandra_nalaar.txt
+++ b/forge-gui/res/cardsfolder/c/chandra_nalaar.txt
@@ -4,7 +4,9 @@ Types:Legendary Planeswalker Chandra
 Loyalty:6
 A:AB$ DealDamage | Cost$ AddCounter<1/LOYALTY> | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select target player or planeswalker | NumDmg$ 1 | Planeswalker$ True | SpellDescription$ CARDNAME deals 1 damage to target player or planeswalker.
 A:AB$ DealDamage | Cost$ SubCounter<X/LOYALTY> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ ChosenX | Planeswalker$ True | References$ X | SpellDescription$ CARDNAME deals X damage to target creature.
-A:AB$ DamageAll | Cost$ SubCounter<8/LOYALTY> | ValidTgts$ Player | TgtPrompt$ Select target player or planeswalker | NumDmg$ 10 | ValidCards$ Creature | ValidPlayers$ TargetedOrController | Planeswalker$ True | Ultimate$ True | ValidDescription$ target player or planeswalker and each creature that player or that planeswalker's controller controls. | SpellDescription$ CARDNAME deals 10 damage to target player or planeswalker and each creature that player or that planeswalker's controller controls.
+A:AB$ DealDamage | Cost$ SubCounter<8/LOYALTY> | Planeswalker$ True | Ultimate$ True | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select a player or planeswalker | NumDmg$ 10 | SubAbility$ DmgAll | DamageMap$ True | SpellDescription$ CARDNAME deals 10 damage to target player or planeswalker and each creature that player or that planeswalker's controller controls.
+SVar:DmgAll:DB$ DamageAll | NumDmg$ 10 | ValidCards$ Creature.ControlledBy TargetedOrController | SubAbility$ DBDamageResolve
+SVar:DBDamageResolve:DB$ DamageResolve
 SVar:X:XChoice
 SVar:Picture:http://resources.wizards.com/magic/cards/lrw/en/card140176.jpg
 Oracle:[+1]: Chandra Nalaar deals 1 damage to target player or planeswalker.\n[-X]: Chandra Nalaar deals X damage to target creature.\n[-8]: Chandra Nalaar deals 10 damage to target player or planeswalker and each creature that player or that planeswalker's controller controls.
diff --git a/forge-gui/res/cardsfolder/c/chandra_pyrogenius.txt b/forge-gui/res/cardsfolder/c/chandra_pyrogenius.txt
index 82969e39f8b..74b3bb0091a 100644
--- a/forge-gui/res/cardsfolder/c/chandra_pyrogenius.txt
+++ b/forge-gui/res/cardsfolder/c/chandra_pyrogenius.txt
@@ -4,7 +4,9 @@ Types:Legendary Planeswalker Chandra
 Loyalty:5
 A:AB$ DealDamage | Cost$ AddCounter<2/LOYALTY> | Planeswalker$ True | Defined$ Player.Opponent | NumDmg$ 2 | AILogic$ Good | SpellDescription$ CARDNAME deals 2 damage to each opponent.
 A:AB$ DealDamage | Cost$ SubCounter<3/LOYALTY> | Planeswalker$ True | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 4 | SpellDescription$ CARDNAME deals 4 damage to target creature.
-A:AB$ DamageAll | Cost$ SubCounter<10/LOYALTY> | Planeswalker$ True | Ultimate$ True | NumDmg$ 6 | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select a player or planeswalker | ValidCards$ Creature | ValidPlayers$ TargetedOrController | ValidDescription$ target player or planeswalker and each creature that player or that planeswalker's controller controls. | SpellDescription$ CARDNAME deals 6 damage to target player or planeswalker and each creature that player or that planeswalker's controller controls.
+A:AB$ DealDamage | Cost$ SubCounter<10/LOYALTY> | Planeswalker$ True | Ultimate$ True | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select a player or planeswalker | NumDmg$ 6 | SubAbility$ DmgAll | DamageMap$ True | SpellDescription$ CARDNAME deals 6 damage to target player or planeswalker and each creature that player or that planeswalker's controller controls.
+SVar:DmgAll:DB$ DamageAll | NumDmg$ 6 | ValidCards$ Creature.ControlledBy TargetedOrController | SubAbility$ DBDamageResolve
+SVar:DBDamageResolve:DB$ DamageResolve
 DeckHints:Name$Liberating Combustion
 SVar:Picture:http://www.wizards.com/global/images/magic/general/chandra_pyrogenius.jpg
 Oracle:[+2]: Chandra, Pyrogenius deals 2 damage to each opponent.\n[-3]: Chandra, Pyrogenius deals 4 damage to target creature.\n[-10]: Chandra, Pyrogenius deals 6 damage to target player or planeswalker and each creature that player or that planeswalker's controller controls.
diff --git a/forge-gui/res/cardsfolder/c/chandras_fury.txt b/forge-gui/res/cardsfolder/c/chandras_fury.txt
index 42335a89150..79360e1f268 100644
--- a/forge-gui/res/cardsfolder/c/chandras_fury.txt
+++ b/forge-gui/res/cardsfolder/c/chandras_fury.txt
@@ -2,7 +2,7 @@ Name:Chandra's Fury
 ManaCost:4 R
 Types:Instant
 A:SP$ DealDamage | Cost$ 4 R | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select a player or planeswalker | NumDmg$ 4 | SubAbility$ DmgAll | DamageMap$ True | SpellDescription$ CARDNAME deals 4 damage to target player or planeswalker and 1 damage to each creature that player or that planeswalker's controller controls.
-SVar:DmgAll:DB$ DamageAll | NumDmg$ 1 | ValidCards$ Creature | ValidPlayers$ TargetedOrController | SubAbility$ DBDamageResolve
+SVar:DmgAll:DB$ DamageAll | NumDmg$ 1 | ValidCards$ Creature.ControlledBy TargetedOrController | SubAbility$ DBDamageResolve
 SVar:DBDamageResolve:DB$ DamageResolve
 SVar:Picture:http://www.wizards.com/global/images/magic/general/chandras_fury.jpg
 Oracle:Chandra's Fury deals 4 damage to target player or planeswalker and 1 damage to each creature that player or that planeswalker's controller controls.
diff --git a/forge-gui/res/cardsfolder/f/flame_wave.txt b/forge-gui/res/cardsfolder/f/flame_wave.txt
index 439846634f4..f9628f443e2 100644
--- a/forge-gui/res/cardsfolder/f/flame_wave.txt
+++ b/forge-gui/res/cardsfolder/f/flame_wave.txt
@@ -1,6 +1,8 @@
 Name:Flame Wave
 ManaCost:3 R R R R
 Types:Sorcery
-A:SP$ DamageAll | Cost$ 3 R R R R | NumDmg$ 4 | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select a player or planeswalker | ValidCards$ Creature | ValidPlayers$ TargetedOrController | ValidDescription$ target player or planeswalker and each creature that player or that planeswalker's controller controls. | SpellDescription$ CARDNAME deals 4 damage to target player or planeswalker and each creature that player or that planeswalker's controller controls.
+A:SP$ DealDamage | Cost$ 3 R R R R | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select a player or planeswalker | NumDmg$ 4 | SubAbility$ DmgAll | DamageMap$ True | SpellDescription$ CARDNAME deals 4 damage to target player or planeswalker and each creature that player or that planeswalker's controller controls.
+SVar:DmgAll:DB$ DamageAll | NumDmg$ 4 | ValidCards$ Creature.ControlledBy TargetedOrController | SubAbility$ DBDamageResolve
+SVar:DBDamageResolve:DB$ DamageResolve
 SVar:Picture:http://www.wizards.com/global/images/magic/general/flame_wave.jpg
 Oracle:Flame Wave deals 4 damage to target player or planeswalker and each creature that player or that planeswalker's controller controls.
diff --git a/forge-gui/res/cardsfolder/h/heart_of_bogardan.txt b/forge-gui/res/cardsfolder/h/heart_of_bogardan.txt
index cb1f9b2c9e5..f8d7a2962e2 100644
--- a/forge-gui/res/cardsfolder/h/heart_of_bogardan.txt
+++ b/forge-gui/res/cardsfolder/h/heart_of_bogardan.txt
@@ -3,7 +3,9 @@ ManaCost:2 R R
 Types:Enchantment
 K:Cumulative upkeep:2
 T:Mode$ PayCumulativeUpkeep | ValidCard$ Card.Self | Paid$ False | Execute$ TrigDmg | TriggerDescription$ When a player doesn't pay CARDNAME's cumulative upkeep, CARDNAME deals X damage to target player or planeswalker and each creature that player or planeswalker's controller controls, where X is twice the number of age counters on CARDNAME minus 2.
-SVar:TrigDmg:DB$ DamageAll | NumDmg$ Y | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select a player or planeswalker | ValidCards$ Creature | ValidPlayers$ TargetedOrController | ValidDescription$ target player or planeswalker and each creature that player or planeswalker's controller controls. | References$ X,Y | SpellDescription$ CARDNAME deals X damage to target player or planeswalker and each creature that player or planeswalker's controller controls.
+SVar:TrigDmg:DB$ DealDamage | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select a player or planeswalker | NumDmg$ Y | References$ X,Y | SubAbility$ DmgAll | DamageMap$ True | SpellDescription$  CARDNAME deals X damage to target player or planeswalker and each creature that player or planeswalker's controller controls.
+SVar:DmgAll:DB$ DamageAll | NumDmg$ Y | References$ X,Y | ValidCards$ Creature.ControlledBy TargetedOrController | SubAbility$ DBDamageResolve
+SVar:DBDamageResolve:DB$ DamageResolve
 SVar:X:TriggeredCard$CardCounters.AGE/Twice
 SVar:Y:SVar$X/Minus.2
 SVar:Picture:http://www.wizards.com/global/images/magic/general/heart_of_bogardan.jpg
diff --git a/forge-gui/res/cardsfolder/l/lavalanche.txt b/forge-gui/res/cardsfolder/l/lavalanche.txt
index bfb0b889963..2f6615a53f1 100644
--- a/forge-gui/res/cardsfolder/l/lavalanche.txt
+++ b/forge-gui/res/cardsfolder/l/lavalanche.txt
@@ -1,7 +1,9 @@
 Name:Lavalanche
 ManaCost:X B R G
 Types:Sorcery
-A:SP$ DamageAll | Cost$ X B R G | NumDmg$ X | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select a player or planeswalker | ValidCards$ Creature | ValidPlayers$ TargetedOrController | ValidDescription$ target player or planeswalker and each creature that player or that planeswalker's controller controls. | References$ X | SpellDescription$ CARDNAME deals X damage to target player or planeswalker and each creature that player or that planeswalker's controller controls.
+A:SP$ DealDamage | Cost$ X B R G | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select a player or planeswalker | NumDmg$ X | References$ X | SubAbility$ DmgAll | DamageMap$ True | SpellDescription$ CARDNAME deals X damage to target player or planeswalker and each creature that player or that planeswalker's controller controls.
+SVar:DmgAll:DB$ DamageAll | NumDmg$ X | References$ X | ValidCards$ Creature.ControlledBy TargetedOrController | SubAbility$ DBDamageResolve
+SVar:DBDamageResolve:DB$ DamageResolve
 SVar:X:Count$xPaid
 SVar:Picture:http://www.wizards.com/global/images/magic/general/lavalanche.jpg
 Oracle:Lavalanche deals X damage to target player or planeswalker and each creature that player or that planeswalker's controller controls.
diff --git a/forge-gui/res/cardsfolder/l/liliana_untouched_by_death.txt b/forge-gui/res/cardsfolder/l/liliana_untouched_by_death.txt
index c6eccbbfd69..c44f387538d 100644
--- a/forge-gui/res/cardsfolder/l/liliana_untouched_by_death.txt
+++ b/forge-gui/res/cardsfolder/l/liliana_untouched_by_death.txt
@@ -6,9 +6,9 @@ A:AB$ Mill | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | NumCards$ 3 | De
 SVar:ZombieMIll:Mode$ ChangesZone | ValidCard$ Zombie | Origin$ Library | Destination$ Graveyard | Execute$ DBLifeDrain | TriggerDescription$ If at least one of them is a Zombie card, each opponent loses 2 life and you gain 2 life.
 SVar:DBLifeDrain:DB$ LoseLife | Defined$ Player.Opponent | LifeAmount$ 2 | SubAbility$ DBGainLife
 SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 2
-A:AB$ Pump | Cost$ SubCounter<2/LOYALTY> | ValidTgts$ Creature | TgtPrompt$ Select target creature | IsCurse$ True | NumAtt$ -X | NumDef$ -X | References$ X | SpellDescription$ Target creature gets -X/-X until end of turn, where X is the number of Zombies you control.
+A:AB$ Pump | Cost$ SubCounter<2/LOYALTY> | Planeswalker$ True | ValidTgts$ Creature | TgtPrompt$ Select target creature | IsCurse$ True | NumAtt$ -X | NumDef$ -X | References$ X | SpellDescription$ Target creature gets -X/-X until end of turn, where X is the number of Zombies you control.
 SVar:X:Count$Valid Zombie.YouCtrl
 A:AB$ Effect | Cost$ SubCounter<3/LOYALTY> | Planeswalker$ True | Ultimate$ True | Stackable$ False | StaticAbilities$ ZombieCast | SpellDescription$ Until end of turn you may cast Zombie cards from your graveyard.
 SVar:ZombieCast:Mode$ Continuous | Affected$ Zombie.YouCtrl | MayPlay$ True | EffectZone$ Command | AffectedZone$ Graveyard | Description$ You may cast Zombie cards from your graveyard this turn.
 DeckHints:Type$Zombie
-Oracle:[+1]:Put the top three cards of your library into your graveyard. If at least one of them is a Zombie card, each opponent loses 2 life and you gain 2 life.\n[-2]:Target creature gets -X/-X until end of turn, where X is the number of Zombies you control.\n[-3]: You may cast Zombie cards from your graveyard this turn.
\ No newline at end of file
+Oracle:[+1]:Put the top three cards of your library into your graveyard. If at least one of them is a Zombie card, each opponent loses 2 life and you gain 2 life.\n[-2]:Target creature gets -X/-X until end of turn, where X is the number of Zombies you control.\n[-3]: You may cast Zombie cards from your graveyard this turn.
diff --git a/forge-gui/res/cardsfolder/v/vine_mare.txt b/forge-gui/res/cardsfolder/v/vine_mare.txt
index 542950b4793..eb76fdca105 100644
--- a/forge-gui/res/cardsfolder/v/vine_mare.txt
+++ b/forge-gui/res/cardsfolder/v/vine_mare.txt
@@ -2,6 +2,6 @@ Name:Vine Mare
 ManaCost:2 G G
 Types:Creature Elemental Horse
 K:Hexproof
-K:CantBeBlockedBy:Creature.Black
+K:CantBeBlockedBy Creature.Black
 Oracle:Hexproof (This creature can't be the target of spells or abilities your opponents control.)\nVine Mare can't be blocked by black creatures.
 PT:5/3
diff --git a/forge-gui/res/cardsfolder/w/which_of_you_burns_brightest.txt b/forge-gui/res/cardsfolder/w/which_of_you_burns_brightest.txt
index 47358819502..f3ed2a15c5e 100644
--- a/forge-gui/res/cardsfolder/w/which_of_you_burns_brightest.txt
+++ b/forge-gui/res/cardsfolder/w/which_of_you_burns_brightest.txt
@@ -2,7 +2,8 @@ Name:Which of You Burns Brightest?
 ManaCost:no cost
 Types:Scheme
 T:Mode$ SetInMotion | ValidCard$ Card.Self | Execute$ DarkEffect | TriggerZones$ Command | OptionalDecider$ You | TriggerDescription$ When you set this scheme in motion, you may pay {X}. If you do, this scheme deals X damage to target opponent or planeswalker and each creature or that planeswalker's controller controls.
-SVar:DarkEffect:AB$ DamageAll | Cost$ X | NumDmg$ X | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select a player or planeswalker | ValidCards$ Creature | ValidPlayers$ TargetedOrController | ValidDescription$ target opponent or planeswalker and each creature or that planeswalker's controller controls. | References$ X
+SVar:DarkEffect:AB$ DealDamage | Cost$ X | ValidTgts$ Opponent,Planeswalker | TgtPrompt$ Select an opponent or planeswalker | NumDmg$ X | References$ X | SubAbility$ DmgAll | DamageMap$ True
+SVar:DmgAll:DB$ DamageAll | NumDmg$ X | References$ X | ValidCards$ Creature.ControlledBy TargetedOrController | SubAbility$ DBDamageResolve
 SVar:X:Count$xPaid
 SVar:Picture:https://downloads.cardforge.org/images/cards/ARC/Which of You Burns Brightest.full.jpg
 Oracle:When you set this scheme in motion, you may pay {X}. If you do, this scheme deals X damage to target opponent or planeswalker and each creature or that planeswalker's controller controls.