diff --git a/forge-gui/res/cardsfolder/b/brightflame.txt b/forge-gui/res/cardsfolder/b/brightflame.txt
index 8684b7e0f94..58ca5ef40ad 100644
--- a/forge-gui/res/cardsfolder/b/brightflame.txt
+++ b/forge-gui/res/cardsfolder/b/brightflame.txt
@@ -4,7 +4,7 @@ Types:Sorcery
 A:SP$DealDamage | Cost$ X R R W W | ValidTgts$ Creature | Radiance$ True | NumDmg$ X | SubAbility$ DBGainLife | References$ X | SpellDescription$ Radiance — Brightflame deals X damage to target creature and each other creature that shares a color with it. You gain life equal to the damage dealt this way.
 SVar:DBGainLife:DB$GainLife | Defined$ You | LifeAmount$ Y | References$ Y
 SVar:X:Count$xPaid
-SVar:Y:Count$DamageDoneThisTurn
+SVar:Y:Count$TotalDamageDoneByThisTurn
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/brightflame.jpg
 Oracle:Radiance — Brightflame deals X damage to target creature and each other creature that shares a color with it. You gain life equal to the damage dealt this way.
diff --git a/forge-gui/res/cardsfolder/b/brothers_of_fire.txt b/forge-gui/res/cardsfolder/b/brothers_of_fire.txt
index 895dfb423ca..9da8dd46227 100644
--- a/forge-gui/res/cardsfolder/b/brothers_of_fire.txt
+++ b/forge-gui/res/cardsfolder/b/brothers_of_fire.txt
@@ -2,7 +2,8 @@ Name:Brothers of Fire
 ManaCost:1 R R
 Types:Creature Human Shaman
 PT:2/2
-A:AB$ DealDamage | Cost$ 1 R R | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 1 | SubAbility$ DBDealDamage | SpellDescription$ CARDNAME deals 1 damage to any target and 1 damage to you.
-SVar:DBDealDamage:DB$DealDamage | Defined$ You | NumDmg$ 1
+A:AB$ DealDamage | Cost$ 1 R R | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 1 | SubAbility$ DBDealDamage | DamageMap$ True | SpellDescription$ CARDNAME deals 1 damage to any target and 1 damage to you.
+SVar:DBDealDamage:DB$DealDamage | Defined$ You | NumDmg$ 1 | SubAbility$ DBDamageResolve
+SVar:DBDamageResolve:DB$ DamageResolve
 SVar:Picture:http://www.wizards.com/global/images/magic/general/brothers_of_fire.jpg
 Oracle:{1}{R}{R}: Brothers of Fire deals 1 damage to any target and 1 damage to you.
diff --git a/forge-gui/res/cardsfolder/c/chandra_pyromaster.txt b/forge-gui/res/cardsfolder/c/chandra_pyromaster.txt
index 01bc087dc45..493d1919a15 100644
--- a/forge-gui/res/cardsfolder/c/chandra_pyromaster.txt
+++ b/forge-gui/res/cardsfolder/c/chandra_pyromaster.txt
@@ -2,8 +2,9 @@ Name:Chandra, Pyromaster
 ManaCost:2 R R
 Types:Legendary Planeswalker Chandra
 Loyalty:4
-A:AB$ DealDamage | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select target player or planeswalker | NumDmg$ 1 | SubAbility$ ChandraDamage | SpellDescription$ CARDNAME deals 1 damage to target player or planeswalker and 1 damage to up to one target creature that player or that planeswalker's controller controls. That creature can't block this turn.
-SVar:ChandraDamage:DB$ DealDamage | ValidTgts$ Creature.ControlledBy TargetedOrController | TgtPrompt$ Select target creature that player or that planeswalker's controller controls | TargetMin$ 0 | TargetMax$ 1 | NumDmg$ 1 | SubAbility$ DBPump
+A:AB$ DealDamage | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select target player or planeswalker | NumDmg$ 1 | DamageMap$ True | SubAbility$ ChandraDamage | SpellDescription$ CARDNAME deals 1 damage to target player or planeswalker and 1 damage to up to one target creature that player or that planeswalker's controller controls. That creature can't block this turn.
+SVar:ChandraDamage:DB$ DealDamage | ValidTgts$ Creature.ControlledBy TargetedOrController | TgtPrompt$ Select target creature that player or that planeswalker's controller controls | TargetMin$ 0 | TargetMax$ 1 | NumDmg$ 1 | SubAbility$ DBDamageResolve
+SVar:DBDamageResolve:DB$ DamageResolve | SubAbility$ DBPump
 SVar:DBPump:DB$ Pump | Defined$ Targeted | IsCurse$ True | KW$ HIDDEN CARDNAME can't block. | ConditionDefined$ Targeted | ConditionPresent$ Creature | ConditionCompare$ GE1
 A:AB$ Mill | Cost$ AddCounter<0/LOYALTY> | Planeswalker$ True | Defined$ You | NumCards$ 1 | Destination$ Exile | RememberMilled$ True | SubAbility$ DBEffect | SpellDescription$ Exile the top card of your library. You may play it this turn.
 SVar:DBEffect:DB$ Effect | RememberObjects$ RememberedCard | StaticAbilities$ Play | SubAbility$ DBCleanup | ExileOnMoved$ Exile
diff --git a/forge-gui/res/cardsfolder/c/chandras_fury.txt b/forge-gui/res/cardsfolder/c/chandras_fury.txt
index 4d6ea1b3682..42335a89150 100644
--- a/forge-gui/res/cardsfolder/c/chandras_fury.txt
+++ b/forge-gui/res/cardsfolder/c/chandras_fury.txt
@@ -1,7 +1,8 @@
 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 | 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
+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: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/c/char.txt b/forge-gui/res/cardsfolder/c/char.txt
index fb2cb22489a..1722ec2b511 100644
--- a/forge-gui/res/cardsfolder/c/char.txt
+++ b/forge-gui/res/cardsfolder/c/char.txt
@@ -1,7 +1,8 @@
 Name:Char
 ManaCost:2 R
 Types:Instant
-A:SP$ DealDamage | Cost$ 2 R | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 4 | SubAbility$ DBDealDamage | SpellDescription$ CARDNAME deals 4 damage to any target and 2 damage to you.
-SVar:DBDealDamage:DB$DealDamage | Defined$ You | NumDmg$ 2
+A:SP$ DealDamage | Cost$ 2 R | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 4  | DamageMap$ True | SubAbility$ DBDealDamage | SpellDescription$ CARDNAME deals 4 damage to any target and 2 damage to you.
+SVar:DBDealDamage:DB$DealDamage | Defined$ You | NumDmg$ 2 | SubAbility$ DBDamageResolve
+SVar:DBDamageResolve:DB$ DamageResolve
 SVar:Picture:http://resources.wizards.com/magic/cards/rav/en-us/card87942.jpg
 Oracle:Char deals 4 damage to any target and 2 damage to you.
diff --git a/forge-gui/res/cardsfolder/f/fireslinger.txt b/forge-gui/res/cardsfolder/f/fireslinger.txt
index 04bd53235fd..b37b29c5ca7 100644
--- a/forge-gui/res/cardsfolder/f/fireslinger.txt
+++ b/forge-gui/res/cardsfolder/f/fireslinger.txt
@@ -2,8 +2,9 @@ Name:Fireslinger
 ManaCost:1 R
 Types:Creature Human Wizard
 PT:1/1
-A:AB$ DealDamage | Cost$ T | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 1 | SubAbility$ DBDealDamage | AILogic$ SelfDamage | SpellDescription$ Fireslinger deals 1 damage to any target and 1 damage to you.
+A:AB$ DealDamage | Cost$ T | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 1 | SubAbility$ DBDealDamage | AILogic$ SelfDamage | DamageMap$ True | SpellDescription$ Fireslinger deals 1 damage to any target and 1 damage to you.
+SVar:DBDealDamage:DB$DealDamage | Defined$ You | NumDmg$ 1 | SubAbility$ DBDamageResolve
+SVar:DBDamageResolve:DB$ DamageResolve
 SVar:SelfDamageAmount:1
-SVar:DBDealDamage:DB$DealDamage | Defined$ You | NumDmg$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/fireslinger.jpg
 Oracle:{T}: Fireslinger deals 1 damage to any target and 1 damage to you.
diff --git a/forge-gui/res/cardsfolder/f/flaming_gambit.txt b/forge-gui/res/cardsfolder/f/flaming_gambit.txt
index 7dd6849fd6a..9607799aed2 100644
--- a/forge-gui/res/cardsfolder/f/flaming_gambit.txt
+++ b/forge-gui/res/cardsfolder/f/flaming_gambit.txt
@@ -2,11 +2,11 @@ Name:Flaming Gambit
 ManaCost:X R
 Types:Instant
 K:Flashback X R R
-A:SP$ Pump | Cost$ X R | IsCurse$ True | ValidTgts$ Player | TgtPrompt$ Select target player | References$ X | SubAbility$ DBChooseCard | StackDescription$ SpellDescription | SpellDescription$ CARDNAME deals X damage to target player. That player may choose a creature they control and have CARDNAME deal that damage to it instead.
-SVar:DBChooseCard:DB$ ChooseCard | Choices$ Card.Creature | Defined$ ParentTarget | MinAmount$ 0 | TargetControls$ True | AILogic$ WorstCard | SubAbility$ DBDamagePlayer
+A:SP$ Pump | Cost$ X R | IsCurse$ True | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select a player or planeswalker | References$ X | SubAbility$ DBChooseCard | StackDescription$ SpellDescription | SpellDescription$ CARDNAME deals X damage to target player. That player may choose a creature they control and have CARDNAME deal that damage to it instead.
+SVar:DBChooseCard:DB$ ChooseCard | Choices$ Card.Creature | Defined$ TargetedOrController | MinAmount$ 0 | TargetControls$ True | AILogic$ WorstCard | SubAbility$ DBDamagePlayer
 SVar:DBDamagePlayer:DB$ DealDamage | Defined$ ParentTarget | NumDmg$ X | References$ X | ConditionDefined$ ChosenCard | ConditionPresent$ Card | ConditionCompare$ EQ0 | SubAbility$ DBDamageCreature
 SVar:DBDamageCreature:DB$ DealDamage | Defined$ ChosenCard | NumDmg$ X | References$ X | ConditionDefined$ ChosenCard | ConditionPresent$ Card | ConditionCompare$ GE1 | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True
 SVar:X:Count$xPaid
 SVar:Picture:http://www.wizards.com/global/images/magic/general/flaming_gambit.jpg
-Oracle:Flaming Gambit deals X damage to target player. That player may choose a creature they control and have Flaming Gambit deal that damage to it instead.\nFlashback {X}{R}{R} (You may cast this card from your graveyard for its flashback cost. Then exile it.)
\ No newline at end of file
+Oracle:Flaming Gambit deals X damage to target or planeswalker. That player or that planeswalker's controller may choose a creature they control and have Flaming Gambit deal that damage to it instead.\nFlashback {X}{R}{R} (You may cast this card from your graveyard for its flashback cost. Then exile it.)
diff --git a/forge-gui/res/cardsfolder/g/goblin_artillery.txt b/forge-gui/res/cardsfolder/g/goblin_artillery.txt
index 7c41323aa6b..360f8a0278a 100644
--- a/forge-gui/res/cardsfolder/g/goblin_artillery.txt
+++ b/forge-gui/res/cardsfolder/g/goblin_artillery.txt
@@ -2,7 +2,9 @@ Name:Goblin Artillery
 ManaCost:1 R R
 Types:Creature Goblin Warrior
 PT:1/3
-A:AB$ DealDamage | Cost$ T | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select target creature or player | NumDmg$ 2 | SubAbility$ DBDealDamage | SpellDescription$ CARDNAME deals 2 damage to any target and 3 damage to you.
-SVar:DBDealDamage:DB$DealDamage | Defined$ You | NumDmg$ 3
+A:AB$ DealDamage | Cost$ T | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 2 | DamageMap$ True | AILogic$ SelfDamage | SubAbility$ DBDealDamage | SpellDescription$ CARDNAME deals 2 damage to any target and 3 damage to you.
+SVar:DBDealDamage:DB$DealDamage | Defined$ You | NumDmg$ 3 | SubAbility$ DBDamageResolve
+SVar:DBDamageResolve:DB$ DamageResolve
+SVar:SelfDamageAmount:3
 SVar:Picture:http://www.wizards.com/global/images/magic/general/goblin_artillery.jpg
 Oracle:{T}: Goblin Artillery deals 2 damage to any target and 3 damage to you.
diff --git a/forge-gui/res/cardsfolder/h/huntmaster_of_the_fells_ravager_of_the_fells.txt b/forge-gui/res/cardsfolder/h/huntmaster_of_the_fells_ravager_of_the_fells.txt
index 7f98b108212..0597763c2e6 100644
--- a/forge-gui/res/cardsfolder/h/huntmaster_of_the_fells_ravager_of_the_fells.txt
+++ b/forge-gui/res/cardsfolder/h/huntmaster_of_the_fells_ravager_of_the_fells.txt
@@ -20,10 +20,11 @@ Colors:green,red
 Types:Creature Werewolf
 PT:4/4
 K:Trample
-T:Mode$ Transformed | ValidCard$ Card.Self | Execute$ DamageAndMoreDamage | TriggerDescription$ Whenever this creature transforms into CARDNAME, it deals 2 damage to target opponent and 2 damage to up to one target creature that player controls.
-SVar:DamageAndMoreDamage:DB$ DealDamage | ValidTgts$ Opponent | NumDmg$ 2 | SubAbility$ MoreDamage
-SVar:MoreDamage:DB$ DealDamage | ValidTgts$ Creature | TargetsWithDefinedController$ ParentTarget | NumDmg$ 2 | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select target creature opponent controls
+T:Mode$ Transformed | ValidCard$ Card.Self | Execute$ DamageAndMoreDamage | TriggerDescription$ Whenever this creature transforms into CARDNAME, it deals 2 damage to target opponent or planeswalker and 2 damage to to up one target creature that player or that planeswalker's controller controls.
+SVar:DamageAndMoreDamage:DB$ DealDamage | ValidTgts$ Opponent,Planeswalker | TgtPrompt$ Select target player or planeswalker | NumDmg$ 2 | DamageMap$ True | SubAbility$ MoreDamage
+SVar:MoreDamage:DB$ DealDamage | ValidTgts$ Creature.ControlledBy TargetedOrController | TgtPrompt$ Select target creature that player or that planeswalker's controller controls | TargetMin$ 0 | TargetMax$ 1 | NumDmg$ 2 | SubAbility$ DBDamageResolve
+SVar:DBDamageResolve:DB$ DamageResolve
 T:Mode$ Phase | Phase$ Upkeep | WerewolfUntransformCondition$ True | TriggerZones$ Battlefield | Execute$ TrigTransform | TriggerDescription$ At the beginning of each upkeep, if a player cast two or more spells last turn, transform CARDNAME.
 SVar:TrigTransform:DB$ SetState | Defined$ Self | Mode$ Transform
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ravager_of_the_fells.jpg
-Oracle:Trample\nWhenever this creature transforms into Ravager of the Fells, it deals 2 damage to target opponent and 2 damage to up to one target creature that player controls.\nAt the beginning of each upkeep, if a player cast two or more spells last turn, transform Ravager of the Fells.
+Oracle:Trample\nWhenever this creature transforms into Ravager of the Fells, it deals 2 damage to target opponent or planeswalker and 2 damage to to up one target creature that player or that planeswalker's controller controls.\nAt the beginning of each upkeep, if a player cast two or more spells last turn, transform Ravager of the Fells.
diff --git a/forge-gui/res/cardsfolder/o/orcish_artillery.txt b/forge-gui/res/cardsfolder/o/orcish_artillery.txt
index afd009cd141..0fcc5f1c35b 100644
--- a/forge-gui/res/cardsfolder/o/orcish_artillery.txt
+++ b/forge-gui/res/cardsfolder/o/orcish_artillery.txt
@@ -2,8 +2,9 @@ Name:Orcish Artillery
 ManaCost:1 R R
 Types:Creature Orc Warrior
 PT:1/3
-A:AB$ DealDamage | Cost$ T | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 2 | AILogic$ SelfDamage | SubAbility$ DBDealDamage | SpellDescription$ CARDNAME deals 2 damage to any target and 3 damage to you.
-SVar:DBDealDamage:DB$DealDamage | Defined$ You | NumDmg$ 3
+A:AB$ DealDamage | Cost$ T | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 2 | DamageMap$ True | AILogic$ SelfDamage | SubAbility$ DBDealDamage | SpellDescription$ CARDNAME deals 2 damage to any target and 3 damage to you.
+SVar:DBDealDamage:DB$DealDamage | Defined$ You | NumDmg$ 3 | SubAbility$ DBDamageResolve
+SVar:DBDamageResolve:DB$ DamageResolve
 SVar:SelfDamageAmount:3
 SVar:RemRandomDeck:True
 SVar:Picture:http://resources.wizards.com/magic/cards/9ed/en-us/card83193.jpg
diff --git a/forge-gui/res/cardsfolder/o/orcish_cannonade.txt b/forge-gui/res/cardsfolder/o/orcish_cannonade.txt
index 530b79e1457..7d47bf73ba6 100644
--- a/forge-gui/res/cardsfolder/o/orcish_cannonade.txt
+++ b/forge-gui/res/cardsfolder/o/orcish_cannonade.txt
@@ -1,9 +1,11 @@
 Name:Orcish Cannonade
 ManaCost:1 R R
 Types:Instant
-A:SP$ DealDamage | Cost$ 1 R R | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 2 | SubAbility$ DB1 | SpellDescription$ CARDNAME deals 2 damage to any target and 3 damage to you. Draw a card.
-SVar:DB1:DB$DealDamage | NumDmg$ 3 | Defined$ You | SubAbility$ DB2
+A:SP$ DealDamage | Cost$ 1 R R | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 2 | DamageMap$ True | AILogic$ SelfDamage | SubAbility$ DB1 | SpellDescription$ CARDNAME deals 2 damage to any target and 3 damage to you. Draw a card.
+SVar:DB1:DB$DealDamage | NumDmg$ 3 | Defined$ You | SubAbility$ DBDamageResolve
+SVar:DBDamageResolve:DB$ DamageResolve | SubAbility$ DB2
 SVar:DB2:DB$Draw | NumCards$ 1
-SVar:RemAIDeck:True
+SVar:SelfDamageAmount:3
+SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orcish_cannonade.jpg
 Oracle:Orcish Cannonade deals 2 damage to any target and 3 damage to you.\nDraw a card.
diff --git a/forge-gui/res/cardsfolder/o/orcish_cannoneers.txt b/forge-gui/res/cardsfolder/o/orcish_cannoneers.txt
index 0719fc99f93..143a1facb97 100644
--- a/forge-gui/res/cardsfolder/o/orcish_cannoneers.txt
+++ b/forge-gui/res/cardsfolder/o/orcish_cannoneers.txt
@@ -2,8 +2,10 @@ Name:Orcish Cannoneers
 ManaCost:1 R R
 Types:Creature Orc Warrior
 PT:1/3
-A:AB$ DealDamage | Cost$ T | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 2 | SubAbility$ DBDealDamage | SpellDescription$ CARDNAME deals 2 damage to any target and 3 damage to you.
-SVar:DBDealDamage:DB$DealDamage | Defined$ You | NumDmg$ 3
-SVar:RemAIDeck:True
+A:AB$ DealDamage | Cost$ T | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 2 | DamageMap$ True | AILogic$ SelfDamage | SubAbility$ DBDealDamage | SpellDescription$ CARDNAME deals 2 damage to any target and 3 damage to you.
+SVar:DBDealDamage:DB$DealDamage | Defined$ You | NumDmg$ 3 | SubAbility$ DBDamageResolve
+SVar:DBDamageResolve:DB$ DamageResolve
+SVar:SelfDamageAmount:3
+SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orcish_cannoneers.jpg
 Oracle:{T}: Orcish Cannoneers deals 2 damage to any target and 3 damage to you.
diff --git a/forge-gui/res/cardsfolder/p/punish_the_enemy.txt b/forge-gui/res/cardsfolder/p/punish_the_enemy.txt
index 824d88a3868..13366676837 100644
--- a/forge-gui/res/cardsfolder/p/punish_the_enemy.txt
+++ b/forge-gui/res/cardsfolder/p/punish_the_enemy.txt
@@ -1,7 +1,8 @@
 Name:Punish the Enemy
 ManaCost:4 R
 Types:Instant
-A:SP$ DealDamage | Cost$ 4 R | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 3 | SubAbility$ DB1 | SpellDescription$ CARDNAME deals 3 damage to target player or planeswalker and 3 damage to target creature.
-SVar:DB1:DB$ DealDamage | NumDmg$ 3 | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select target player or planeswalker
+A:SP$ DealDamage | Cost$ 4 R | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select target player or planeswalker | NumDmg$ 3 | DamageMap$ True | SubAbility$ DB1 | SpellDescription$ CARDNAME deals 3 damage to target player or planeswalker and 3 damage to target creature.
+SVar:DB1:DB$ DealDamage | NumDmg$ 3 | ValidTgts$ Creature | TgtPrompt$ Select target creature | SubAbility$ DBDamageResolve
+SVar:DBDamageResolve:DB$ DamageResolve
 SVar:Picture:http://www.wizards.com/global/images/magic/general/punish_the_enemy.jpg
 Oracle:Punish the Enemy deals 3 damage to target player or planeswalker and 3 damage to target creature.
diff --git a/forge-gui/res/cardsfolder/r/radiating_lightning.txt b/forge-gui/res/cardsfolder/r/radiating_lightning.txt
index 6ace47fec7d..fd1440d7077 100644
--- a/forge-gui/res/cardsfolder/r/radiating_lightning.txt
+++ b/forge-gui/res/cardsfolder/r/radiating_lightning.txt
@@ -1,6 +1,7 @@
 Name:Radiating Lightning
 ManaCost:3 R
 Types:Instant
-A:SP$ DealDamage | Cost$ 3 R | ValidTgts$ Player | NumDmg$ 3 | SubAbility$ DmgAll | SpellDescription$ CARDNAME deals 3 damage to target player and 1 damage to each creature that player controls.
-SVar:DmgAll:DB$ DamageAll | NumDmg$ 1 | ValidCards$ Creature.TargetedPlayerCtrl
+A:SP$ DealDamage | Cost$ 3 R | ValidTgts$ Player | NumDmg$ 3 | SubAbility$ DmgAll | DamageMap$ True | SpellDescription$ CARDNAME deals 3 damage to target player and 1 damage to each creature that player controls.
+SVar:DmgAll:DB$ DamageAll | NumDmg$ 1 | ValidCards$ Creature.TargetedPlayerCtrl | SubAbility$ DBDamageResolve
+SVar:DBDamageResolve:DB$ DamageResolve
 Oracle:Radiating Lightning deals 3 damage to target player and 1 damage to each creature that player controls.
diff --git a/forge-gui/res/cardsfolder/r/reckless_embermage.txt b/forge-gui/res/cardsfolder/r/reckless_embermage.txt
index 4c6d2d5ec71..2ec5d061632 100644
--- a/forge-gui/res/cardsfolder/r/reckless_embermage.txt
+++ b/forge-gui/res/cardsfolder/r/reckless_embermage.txt
@@ -2,7 +2,8 @@ Name:Reckless Embermage
 ManaCost:3 R
 Types:Creature Human Wizard
 PT:2/2
-A:AB$ DealDamage | Cost$ 1 R | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 1 | SubAbility$ DBDealDamage | SpellDescription$ CARDNAME deals 1 damage to any target and 1 damage to itself.
-SVar:DBDealDamage:DB$DealDamage | NumDmg$ 1 | Defined$ Self
+A:AB$ DealDamage | Cost$ 1 R | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 1 | DamageMap$ True | SubAbility$ DBDealDamage | SpellDescription$ CARDNAME deals 1 damage to any target and 1 damage to itself.
+SVar:DBDealDamage:DB$DealDamage | NumDmg$ 1 | Defined$ Self | SubAbility$ DBDamageResolve
+SVar:DBDamageResolve:DB$ DamageResolve
 SVar:Picture:http://www.wizards.com/global/images/magic/general/reckless_embermage.jpg
 Oracle:{1}{R}: Reckless Embermage deals 1 damage to any target and 1 damage to itself.
diff --git a/forge-gui/res/cardsfolder/r/rite_of_consumption.txt b/forge-gui/res/cardsfolder/r/rite_of_consumption.txt
index cb2b2a3bd6c..600d63374f8 100644
--- a/forge-gui/res/cardsfolder/r/rite_of_consumption.txt
+++ b/forge-gui/res/cardsfolder/r/rite_of_consumption.txt
@@ -1,9 +1,9 @@
 Name:Rite of Consumption
 ManaCost:1 B
 Types:Sorcery
-A:SP$ DealDamage | Cost$ 1 B Sac<1/Creature> | ValidTgts$ Player | NumDmg$ X | References$ X | SubAbility$ DBGainLife | SpellDescription$ CARDNAME deals damage equal to the sacrificed creature's power to target player. You gain life equal to the damage dealt this way.
+A:SP$ DealDamage | Cost$ 1 B Sac<1/Creature> | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select target player or planeswalker | NumDmg$ X | References$ X | SubAbility$ DBGainLife | SpellDescription$ CARDNAME deals damage equal to the sacrificed creature's power to target player or planeswalker. You gain life equal to the damage dealt this way.
 SVar:DBGainLife:DB$GainLife | Defined$ You | LifeAmount$ Y | References$ Y | StackDescription$ You gain life equal to the damage dealt this way.
 SVar:X:Sacrificed$CardPower
-SVar:Y:TargetedPlayer$DamageDoneToPlayerBy
+SVar:Y:Count$TotalDamageDoneByThisTurn
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rite_of_consumption.jpg
-Oracle:As an additional cost to cast Rite of Consumption, sacrifice a creature.\nRite of Consumption deals damage equal to the sacrificed creature's power to target player. You gain life equal to the damage dealt this way.
+Oracle:As an additional cost to cast Rite of Consumption, sacrifice a creature.\nRite of Consumption deals damage equal to the sacrificed creature's power to target player or planeswalker. You gain life equal to the damage dealt this way.
diff --git a/forge-gui/res/cardsfolder/s/searing_blaze.txt b/forge-gui/res/cardsfolder/s/searing_blaze.txt
index 83d9c1f51b6..5f2f0553616 100644
--- a/forge-gui/res/cardsfolder/s/searing_blaze.txt
+++ b/forge-gui/res/cardsfolder/s/searing_blaze.txt
@@ -1,8 +1,9 @@
 Name:Searing Blaze
 ManaCost:R R
 Types:Instant
-A:SP$ DealDamage | Cost$ R R | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select target player or planeswalker | NumDmg$ SearingX | SubAbility$ SearingDamage | References$ SearingX | SpellDescription$ CARDNAME deals 1 damage to target player or planeswalker and 1 damage to target creature that player or that planeswalker's controller controls. Landfall — If you had a land enter the battlefield under your control this turn, CARDNAME deals 3 damage to that player or planeswalker and 3 damage to that creature instead.
-SVar:SearingDamage:DB$ DealDamage | ValidTgts$ Creature.ControlledBy TargetedOrController | TgtPrompt$ Select target creature that player or that planeswalker's controller controls | NumDmg$ SearingX | References$ SearingX
+A:SP$ DealDamage | Cost$ R R | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select target player or planeswalker | NumDmg$ SearingX | DamageMap$ True | SubAbility$ SearingDamage | References$ SearingX | SpellDescription$ CARDNAME deals 1 damage to target player or planeswalker and 1 damage to target creature that player or that planeswalker's controller controls. Landfall — If you had a land enter the battlefield under your control this turn, CARDNAME deals 3 damage to that player or planeswalker and 3 damage to that creature instead.
+SVar:SearingDamage:DB$ DealDamage | ValidTgts$ Creature.ControlledBy TargetedOrController | TgtPrompt$ Select target creature that player or that planeswalker's controller controls | NumDmg$ SearingX | References$ SearingX | SubAbility$ DBDamageResolve
+SVar:DBDamageResolve:DB$ DamageResolve
 SVar:SearingX:Count$Landfall.3.1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/searing_blaze.jpg
 Oracle:Searing Blaze deals 1 damage to target player or planeswalker and 1 damage to target creature that player or that planeswalker's controller controls.\nLandfall — If you had a land enter the battlefield under your control this turn, Searing Blaze deals 3 damage to that player or planeswalker and 3 damage to that creature instead.
diff --git a/forge-gui/res/cardsfolder/s/soul_of_shandalar.txt b/forge-gui/res/cardsfolder/s/soul_of_shandalar.txt
index e00b3567e29..286e3717a76 100644
--- a/forge-gui/res/cardsfolder/s/soul_of_shandalar.txt
+++ b/forge-gui/res/cardsfolder/s/soul_of_shandalar.txt
@@ -3,8 +3,9 @@ ManaCost:4 R R
 Types:Creature Avatar
 PT:6/6
 K:First Strike
-A:AB$ DealDamage | Cost$ 3 R R | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select target player or planeswalker | NumDmg$ 3 | SubAbility$ DBDamage | SpellDescription$ CARDNAME deals 3 damage to target player or planeswalker and 3 damage to up to one target creature that player or that planeswalker's controller controls.
-SVar:DBDamage:DB$ DealDamage | ValidTgts$ Creature.ControlledBy TargetedOrController | TgtPrompt$ Select target creature that player or that planeswalker's controller controls | TargetMin$ 0 | TargetMax$ 1 | NumDmg$ 3
-A:AB$ DealDamage | Cost$ 3 R R ExileFromGrave<1/CARDNAME> | ActivationZone$ Graveyard | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select target player or planeswalker | NumDmg$ 3 | SubAbility$ DBDamage | SpellDescription$ CARDNAME deals 3 damage to target player or planeswalker and 3 damage to up to one target creature that player or that planeswalker's controller controls.
+A:AB$ DealDamage | Cost$ 3 R R | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select target player or planeswalker | NumDmg$ 3 | SubAbility$ DBDamage | DamageMap$ True | SpellDescription$ CARDNAME deals 3 damage to target player or planeswalker and 3 damage to up to one target creature that player or that planeswalker's controller controls.
+SVar:DBDamage:DB$ DealDamage | ValidTgts$ Creature.ControlledBy TargetedOrController | TgtPrompt$ Select target creature that player or that planeswalker's controller controls | TargetMin$ 0 | TargetMax$ 1 | NumDmg$ 3 | SubAbility$ DBDamageResolve
+SVar:DBDamageResolve:DB$ DamageResolve
+A:AB$ DealDamage | Cost$ 3 R R ExileFromGrave<1/CARDNAME> | ActivationZone$ Graveyard | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select target player or planeswalker | NumDmg$ 3 | SubAbility$ DBDamage | DamageMap$ True | SpellDescription$ CARDNAME deals 3 damage to target player or planeswalker and 3 damage to up to one target creature that player or that planeswalker's controller controls.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/soul_of_shandalar.jpg
 Oracle:First strike\n{3}{R}{R}: Soul of Shandalar deals 3 damage to target player and 3 damage to up to one target creature that player controls.\n{3}{R}{R}, Exile Soul of Shandalar from your graveyard: Soul of Shandalar deals 3 damage to target player or planeswalker and 3 damage to up to one target creature that player or that planeswalker's controller controls.
diff --git a/forge-gui/res/cardsfolder/s/stuffy_doll_avatar.txt b/forge-gui/res/cardsfolder/s/stuffy_doll_avatar.txt
index df3b819dba1..c54401a9aa6 100644
--- a/forge-gui/res/cardsfolder/s/stuffy_doll_avatar.txt
+++ b/forge-gui/res/cardsfolder/s/stuffy_doll_avatar.txt
@@ -2,13 +2,13 @@ Name:Stuffy Doll Avatar
 ManaCost:no cost
 Types:Vanguard
 HandLifeModifier:+0/-6
-A:AB$ ChooseSource | Cost$ 0 | ActivationZone$ Command | Choices$ Card | RememberChosen$ True | AILogic$ NeedsPrevention | SubAbility$ DBTargetOpp | ActivationLimit$ 1 | SpellDescription$ If damage would be dealt to you this turn by a source of your choice, prevent that damage. CARDNAME deals damage to you and target opponent equal to half the damage prevented this way, rounded up. Activate this ability only once each turn.
-SVar:DBTargetOpp:DB$ Pump | ValidTgts$ Opponent | TgtPrompt$ Select target opponent to give damage | RememberObjects$ Targeted | StackDescription$ None | SubAbility$ DBEffect
-SVar:DBEffect:DB$ Effect | ReplacementEffects$ SelflessDamage | RememberObjects$ Remembered | SVars$ DamageEffectYou,DamageEffectPlayer,X | SubAbility$ DBCleanup | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ GE1
-SVar:SelflessDamage:Event$ DamageDone | ValidTarget$ You | ValidSource$ Card.IsRemembered | PreventionEffect$ True | ReplaceWith$ DamageEffectYou | Description$ If damage would be dealt to you this turn by a source of your choice, prevent that damage. Stuffy Doll Avatar deals damage to you and target opponent equal to half the damage prevented this way, rounded up. Activate this ability only once each turn.
-SVar:DamageEffectYou:DB$ DealDamage | Defined$ You | DamageSource$ EffectSource | NumDmg$ X | SubAbility$ AvatarCombat
-SVar:DamageEffectPlayer:DB$ DealDamage | Defined$ Player.IsRemembered | DamageSource$ EffectSource | NumDmg$ X
+A:AB$ ChooseSource | Cost$ 0 | ActivationZone$ Command | Choices$ Card,Emblem | AILogic$ NeedsPrevention | SubAbility$ DBEffect | ActivationLimit$ 1 | SpellDescription$ If damage would be dealt to you this turn by a source of your choice, prevent that damage. CARDNAME deals damage to you and target opponent or planeswalker equal to half the damage prevented this way, rounded up. Activate this ability only once each turn.
+SVar:DBEffect:DB$ Effect | ReplacementEffects$ SelflessDamage | RememberObjects$ Targeted | SVars$ DamageEffectYou,DamageEffectPlayer,DBDamageResolve,X | SubAbility$ DBCleanup | ConditionDefined$ ChosenCard | ConditionPresent$ Card | ConditionCompare$ GE1 | ValidTgts$ Opponent,Planeswalker | TgtPrompt$ Select target opponent or planeswalker to give damage
+SVar:SelflessDamage:Event$ DamageDone | ValidTarget$ You | ValidSource$ Card.ChosenCard | PreventionEffect$ True | ReplaceWith$ DamageEffectYou | Description$ If damage would be dealt to you this turn by a source of your choice, prevent that damage. Stuffy Doll Avatar deals damage to you and target opponent or planeswalker equal to half the damage prevented this way, rounded up. Activate this ability only once each turn.
+SVar:DamageEffectYou:DB$ DealDamage | Defined$ You | DamageSource$ EffectSource | NumDmg$ X | SubAbility$ DamageEffectPlayer | DamageMap$ True
+SVar:DamageEffectPlayer:DB$ DealDamage | Defined$ Remembered | DamageSource$ EffectSource | NumDmg$ X | SubAbility$ DBDamageResolve
+SVar:DBDamageResolve:DB$ DamageResolve
 SVar:X:ReplaceCount$DamageAmount/HalfUp
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearChosenCard$ True
 SVar:Picture:https://downloads.cardforge.org/images/cards/VAN/Stuffy Doll Avatar.full.jpg
-Oracle:Hand +0, life -6\n{0}: If damage would be dealt to you this turn by a source of your choice, prevent that damage. Stuffy Doll Avatar deals damage to you and target opponent equal to half the damage prevented this way, rounded up. Activate this ability only once each turn.
+Oracle:Hand +0, life -6\n{0}: If damage would be dealt to you this turn by a source of your choice, prevent that damage. Stuffy Doll Avatar deals damage to you and target opponent or planeswalker equal to half the damage prevented this way, rounded up. Activate this ability only once each turn.
diff --git a/forge-gui/res/cardsfolder/s/sunflare_shaman.txt b/forge-gui/res/cardsfolder/s/sunflare_shaman.txt
index 51981bf4ede..503479b7a6f 100644
--- a/forge-gui/res/cardsfolder/s/sunflare_shaman.txt
+++ b/forge-gui/res/cardsfolder/s/sunflare_shaman.txt
@@ -2,8 +2,9 @@ Name:Sunflare Shaman
 ManaCost:1 R
 Types:Creature Elemental Shaman
 PT:2/1
-A:AB$ DealDamage | Cost$ 1 R T | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ X | References$ X | SubAbility$ DBDealDamage | SpellDescription$ CARDNAME deals X damage to any target and X damage to itself, where X is the number of Elemental cards in your graveyard.
-SVar:DBDealDamage:DB$ DealDamage | NumDmg$ X | References$ X | Defined$ Self
+A:AB$ DealDamage | Cost$ 1 R T | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ X | References$ X | DamageMap$ True | SubAbility$ DBDealDamage | SpellDescription$ CARDNAME deals X damage to any target and X damage to itself, where X is the number of Elemental cards in your graveyard.
+SVar:DBDealDamage:DB$ DealDamage | NumDmg$ X | References$ X | Defined$ Self | SubAbility$ DBDamageResolve
+SVar:DBDamageResolve:DB$ DamageResolve
 SVar:X:Count$TypeInYourYard.Elemental
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sunflare_shaman.jpg