diff --git a/forge-gui/res/cardsfolder/a/acidic_soil.txt b/forge-gui/res/cardsfolder/a/acidic_soil.txt
index 73e791f34fd..4399d0b16c4 100644
--- a/forge-gui/res/cardsfolder/a/acidic_soil.txt
+++ b/forge-gui/res/cardsfolder/a/acidic_soil.txt
@@ -1,10 +1,9 @@
 Name:Acidic Soil
 ManaCost:2 R
 Types:Sorcery
-A:SP$ RepeatEach | Cost$ 2 R | RepeatPlayers$ Player | RepeatSubAbility$ DBDamageOpp | SpellDescription$ CARDNAME deals damage to each player equal to the number of lands he or she controls.
-SVar:DBDamageOpp:DB$ DealDamage | Defined$ Remembered | NumDmg$ X | References$ X
+A:SP$ RepeatEach | Cost$ 2 R | RepeatPlayers$ Player | RepeatSubAbility$ DBDamage | DamageMap$ True | SpellDescription$ CARDNAME deals damage to each player equal to the number of lands he or she controls.
+SVar:DBDamage:DB$ DealDamage | Defined$ Remembered | NumDmg$ X | References$ X
 SVar:X:Count$Valid Land.RememberedPlayerCtrl
-SVar:AIPlayForSub:True
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/acidic_soil.jpg
 Oracle:Acidic Soil deals damage to each player equal to the number of lands he or she controls.
diff --git a/forge-gui/res/cardsfolder/a/arc_trail.txt b/forge-gui/res/cardsfolder/a/arc_trail.txt
index f4c7192b9b1..1c98a17b99e 100644
--- a/forge-gui/res/cardsfolder/a/arc_trail.txt
+++ b/forge-gui/res/cardsfolder/a/arc_trail.txt
@@ -1,7 +1,8 @@
 Name:Arc Trail
 ManaCost:1 R
 Types:Sorcery
-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
+A:SP$ DealDamage | Cost$ 1 R | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player (2 damage) | NumDmg$ 2 | DamageMap$ True | 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 | SubAbility$ DBDamageResolve
+SVar:DBDamageResolve:DB$ DamageResolve
 SVar:Picture:http://www.wizards.com/global/images/magic/general/arc_trail.jpg
 Oracle:Arc Trail deals 2 damage to target creature or player and 1 damage to another target creature or player.
diff --git a/forge-gui/res/cardsfolder/b/bakis_curse.txt b/forge-gui/res/cardsfolder/b/bakis_curse.txt
index 8807db0178f..3b0ccb3c103 100644
--- a/forge-gui/res/cardsfolder/b/bakis_curse.txt
+++ b/forge-gui/res/cardsfolder/b/bakis_curse.txt
@@ -1,7 +1,7 @@
 Name:Baki's Curse
 ManaCost:2 U U
 Types:Sorcery
-A:SP$ RepeatEach | Cost$ 2 U U | RepeatCards$ Creature | Zone$ Battlefield | RepeatSubAbility$ DBDmg | SpellDescription$ CARDNAME deals 2 damage to each creature for each Aura attached to that creature.
+A:SP$ RepeatEach | Cost$ 2 U U | RepeatCards$ Creature | Zone$ Battlefield | RepeatSubAbility$ DBDmg | DamageMap$ True | SpellDescription$ CARDNAME deals 2 damage to each creature for each Aura attached to that creature.
 SVar:DBDmg:DB$ DealDamage | Defined$ Remembered | NumDmg$ X | References$ X
 SVar:X:Count$Valid Aura.AttachedTo Creature.IsRemembered/Times.2
 SVar:RemRandomDeck:True
diff --git a/forge-gui/res/cardsfolder/b/builders_bane.txt b/forge-gui/res/cardsfolder/b/builders_bane.txt
index fbbe9b846b7..90136ebc1c6 100644
--- a/forge-gui/res/cardsfolder/b/builders_bane.txt
+++ b/forge-gui/res/cardsfolder/b/builders_bane.txt
@@ -4,7 +4,7 @@ Types:Sorcery
 A:SP$ Destroy | Cost$ X X R | ValidTgts$ Artifact | TargetMin$ 0 | TargetMax$ Maxtgt | References$ X,Maxtgt | RememberTargets$ True | SubAbility$ DBRepeat | StackDescription$ SpellDescription | SpellDescription$ Destroy X target artifacts. CARDNAME deals damage to each player equal to the number of artifacts he or she controlled put into a graveyard this way.
 SVar:Maxtgt:Count$Valid Artifact
 SVar:X:TargetedObjects$Amount
-SVar:DBRepeat:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ DBDmg | SubAbility$ DBCleanup
+SVar:DBRepeat:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ DBDmg | SubAbility$ DBCleanup | DamageMap$ True
 SVar:DBDmg:DB$ DealDamage | Defined$ Player.IsRemembered | NumDmg$ Y | References$ Y
 SVar:Y:Count$ValidGraveyard Artifact.IsRemembered+RememberedPlayerCtrl
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
diff --git a/forge-gui/res/cardsfolder/c/cone_of_flame.txt b/forge-gui/res/cardsfolder/c/cone_of_flame.txt
index 9584fa87b12..145509c6c32 100644
--- a/forge-gui/res/cardsfolder/c/cone_of_flame.txt
+++ b/forge-gui/res/cardsfolder/c/cone_of_flame.txt
@@ -1,8 +1,9 @@
 Name:Cone of Flame
 ManaCost:3 R R
 Types:Sorcery
-A:SP$ DealDamage | Cost$ 3 R R | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player to deal 1 damage to | 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.
+A:SP$ DealDamage | Cost$ 3 R R | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player to deal 1 damage to | NumDmg$ 1 | DamageMap$ True | 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 | ValidTgts$ Creature,Player | TgtPrompt$ Select another target creature or player to deal 2 damage to | NumDmg$ 2 | TargetUnique$ True | SubAbility$ DBDamageThree
-SVar:DBDamageThree:DB$ DealDamage | ValidTgts$ Creature,Player | TgtPrompt$ Select another target creature or player to deal 3 damage to | NumDmg$ 3 |TargetUnique$ True
+SVar:DBDamageThree:DB$ DealDamage | ValidTgts$ Creature,Player | TgtPrompt$ Select another target creature or player to deal 3 damage to | NumDmg$ 3 |TargetUnique$ True | SubAbility$ DBDamageResolve
+SVar:DBDamageResolve:DB$ DamageResolve
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cone_of_flame.jpg
 Oracle:Cone of Flame 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.
diff --git a/forge-gui/res/cardsfolder/c/crackling_doom.txt b/forge-gui/res/cardsfolder/c/crackling_doom.txt
index 5026b1e54ae..8c47bc36c3e 100644
--- a/forge-gui/res/cardsfolder/c/crackling_doom.txt
+++ b/forge-gui/res/cardsfolder/c/crackling_doom.txt
@@ -1,8 +1,8 @@
 Name:Crackling Doom
 ManaCost:R W B
 Types:Instant
-A:SP$ RepeatEach | Cost$ R B W | RepeatPlayers$ Player.Opponent | RepeatSubAbility$ DBDealDamage | AILogic$ OpponentHasCreatures | SpellDescription$ CARDNAME deals 2 damage to each opponent. Each opponent sacrifices a creature with the greatest power among creatures he or she controls.
-SVar:DBDealDamage:DB$ DealDamage | Defined$ Player.IsRemembered | NumDmg$ 2 | SubAbility$ DBChooseCard
+A:SP$ DealDamage | Cost$ R B W | Defined$ Player.Opponent | NumDmg$ 2 | AILogic$ OpponentHasCreatures | SpellDescription$ CARDNAME deals 2 damage to each opponent. Each opponent sacrifices a creature with the greatest power among creatures he or she controls.
+SVar:DBRepeat:DB$ RepeatEach | RepeatPlayers$ Player.Opponent | RepeatSubAbility$ DBChooseCard
 SVar:DBChooseCard:DB$ ChooseCard | Defined$ Player.IsRemembered | Choices$ Creature.greatestPowerControlledByRemembered | Mandatory$ True | SubAbility$ DBSac
 SVar:DBSac:DB$ Sacrifice | Defined$ Player.IsRemembered | SacValid$ Card.ChosenCard | SacMessage$ the creature with the highest power
 SVar:Picture:http://www.wizards.com/global/images/magic/general/crackling_doom.jpg
diff --git a/forge-gui/res/cardsfolder/h/heartless_hidetsugu.txt b/forge-gui/res/cardsfolder/h/heartless_hidetsugu.txt
index 398203126bc..33828e88411 100644
--- a/forge-gui/res/cardsfolder/h/heartless_hidetsugu.txt
+++ b/forge-gui/res/cardsfolder/h/heartless_hidetsugu.txt
@@ -2,7 +2,7 @@ Name:Heartless Hidetsugu
 ManaCost:3 R R
 Types:Legendary Creature Ogre Shaman
 PT:4/3
-A:AB$ RepeatEach | Cost$ T | RepeatPlayers$ Player | RepeatSubAbility$ DBDealDamage | SpellDescription$ CARDNAME deals damage to each player equal to half that player's life total, rounded down.
+A:AB$ RepeatEach | Cost$ T | RepeatPlayers$ Player | RepeatSubAbility$ DBDealDamage | DamageMap$ True | SpellDescription$ CARDNAME deals damage to each player equal to half that player's life total, rounded down.
 SVar:DBDealDamage:DB$ DealDamage | Defined$ Remembered | NumDmg$ HeartlessX | References$ HeartlessX
 SVar:HeartlessX:PlayerCountRemembered$LifeTotal/HalfDown
 SVar:RemRandomDeck:True
diff --git a/forge-gui/res/cardsfolder/i/incite_rebellion.txt b/forge-gui/res/cardsfolder/i/incite_rebellion.txt
index 790f0b30f2d..1471ecfc29e 100644
--- a/forge-gui/res/cardsfolder/i/incite_rebellion.txt
+++ b/forge-gui/res/cardsfolder/i/incite_rebellion.txt
@@ -1,7 +1,7 @@
 Name:Incite Rebellion
 ManaCost:4 R R
 Types:Sorcery
-A:SP$ RepeatEach | Cost$ 4 R R | RepeatPlayers$ Player | RepeatSubAbility$ DmgEach | SpellDescription$ For each player, CARDNAME deals damage to that player and each creature that player controls equal to the number of creatures he or she controls.
+A:SP$ RepeatEach | Cost$ 4 R R | RepeatPlayers$ Player | RepeatSubAbility$ DmgEach | DamageMap$ True | SpellDescription$ For each player, CARDNAME deals damage to that player and each creature that player controls equal to the number of creatures he or she controls.
 SVar:DmgEach:DB$ DamageAll | ValidPlayers$ Remembered | ValidCards$ Creature.RememberedPlayerCtrl | NumDmg$ X | References$ X
 SVar:X:Count$Valid Creature.RememberedPlayerCtrl
 SVar:RemAIDeck:True
diff --git a/forge-gui/res/cardsfolder/k/kamahls_sledge.txt b/forge-gui/res/cardsfolder/k/kamahls_sledge.txt
index 7109e6a5aa5..a6a5ff47482 100644
--- a/forge-gui/res/cardsfolder/k/kamahls_sledge.txt
+++ b/forge-gui/res/cardsfolder/k/kamahls_sledge.txt
@@ -2,6 +2,7 @@ Name:Kamahl's Sledge
 ManaCost:5 R R
 Types:Sorcery
 A:SP$ DealDamage | Cost$ 5 R R | NumDmg$ 4 | ValidTgts$ Creature | TgtPrompt$ Select target creature | SubAbility$ DBDamage | SpellDescription$ CARDNAME deals 4 damage to target creature. Threshold — If seven or more cards are in your graveyard, instead CARDNAME deals 4 damage to that creature and 4 damage to that creature's controller.
-SVar:DBDamage:DB$ DealDamage | NumDmg$ 4 | Condition$ Threshold | Defined$ TargetedController
+SVar:DBDamage:DB$ DealDamage | NumDmg$ 4 | Condition$ Threshold | Defined$ TargetedController | SubAbility$ DBDamageResolve
+SVar:DBDamageResolve:DB$ DamageResolve
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kamahls_sledge.jpg
 Oracle:Kamahl's Sledge deals 4 damage to target creature.\nThreshold — If seven or more cards are in your graveyard, instead Kamahl's Sledge deals 4 damage to that creature and 4 damage to that creature's controller.
diff --git a/forge-gui/res/cardsfolder/k/know_naught_but_fire.txt b/forge-gui/res/cardsfolder/k/know_naught_but_fire.txt
index a3c7b43830d..b1374a6bdb9 100644
--- a/forge-gui/res/cardsfolder/k/know_naught_but_fire.txt
+++ b/forge-gui/res/cardsfolder/k/know_naught_but_fire.txt
@@ -2,7 +2,7 @@ Name:Know Naught but Fire
 ManaCost:no cost
 Types:Scheme
 T:Mode$ SetInMotion | ValidCard$ Card.Self | Execute$ DmgAll | TriggerZones$ Command | TriggerDescription$ When you set this scheme in motion, it deals damage to each opponent equal to the number of cards in that player's hand.
-SVar:DmgAll:DB$ RepeatEach | RepeatPlayers$ Player.Opponent | RepeatSubAbility$ DBDamage
+SVar:DmgAll:DB$ RepeatEach | RepeatPlayers$ Player.Opponent | RepeatSubAbility$ DBDamage | DamageMap$ True
 SVar:DBDamage:DB$ DealDamage | Defined$ Player.IsRemembered | NumDmg$ X | References$ X
 SVar:X:PlayerCountRemembered$CardsInHand
 SVar:Picture:https://downloads.cardforge.org/images/cards/ARC/Know Naught but Fire.full.jpg
diff --git a/forge-gui/res/cardsfolder/m/moonlight_hunt.txt b/forge-gui/res/cardsfolder/m/moonlight_hunt.txt
index f6a951a5bdd..37f9f9f949f 100644
--- a/forge-gui/res/cardsfolder/m/moonlight_hunt.txt
+++ b/forge-gui/res/cardsfolder/m/moonlight_hunt.txt
@@ -2,7 +2,7 @@ Name:Moonlight Hunt
 ManaCost:1 G
 Types:Instant
 A:SP$ DealDamage | Cost$ 1 G | ValidTgts$ Creature.YouDontCtrl | TgtPrompt$ Select target creature you don't control | NumDmg$ 0 | SubAbility$ MoonlightDamage | SpellDescription$ Choose target creature you don't control. Each creature you control that's a Wolf or a Werewolf deals damage equal to its power to that creature.
-SVar:MoonlightDamage:DB$ RepeatEach | RepeatSubAbility$ WolfStrike | UseImprinted$ True | RepeatCards$ Creature.Wolf+YouCtrl,Creature.Werewolf+YouCtrl | StackDescription$ None 
+SVar:MoonlightDamage:DB$ RepeatEach | RepeatSubAbility$ WolfStrike | UseImprinted$ True | RepeatCards$ Creature.Wolf+YouCtrl,Creature.Werewolf+YouCtrl | StackDescription$ None | DamageMap$ True
 SVar:WolfStrike:DB$ DealDamage | DamageSource$ Imprinted | NumDmg$ X | References$ X | Defined$ ParentTarget | StackDescription$ None 
 SVar:X:Imprinted$CardPower 
 SVar:RemRandomDeck:True
diff --git a/forge-gui/res/cardsfolder/p/polukranos_world_eater.txt b/forge-gui/res/cardsfolder/p/polukranos_world_eater.txt
index 6264e7abb45..4707eff3bbe 100644
--- a/forge-gui/res/cardsfolder/p/polukranos_world_eater.txt
+++ b/forge-gui/res/cardsfolder/p/polukranos_world_eater.txt
@@ -5,7 +5,7 @@ PT:5/5
 K:Monstrosity:X:X X G
 T:Mode$ BecomeMonstrous | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigDmg | TriggerDescription$ When CARDNAME becomes monstrous, it deals X damage divided as you choose among any number of target creatures your opponents control. Each of those creatures deals damage equal to its power to CARDNAME.
 SVar:TrigDmg:DB$ DealDamage | ValidTgts$ Creature.OppCtrl | AILogic$ Polukranos | TgtPrompt$ Select target creature your opponents control distribute damage to | NumDmg$ MonstrosityX | TargetMin$ 1 | TargetMax$ MaxTgts | DividedAsYouChoose$ MonstrosityX | References$ MonstrosityX,MaxTgts | SubAbility$ DBDmg
-SVar:DBDmg:DB$ RepeatEach | RepeatSubAbility$ PolukranosFight | UseImprinted$ True | DefinedCards$ Targeted | StackDescription$ None
+SVar:DBDmg:DB$ RepeatEach | RepeatSubAbility$ PolukranosFight | UseImprinted$ True | DefinedCards$ Targeted | StackDescription$ None | DamageMap$ True
 SVar:PolukranosFight:DB$ DealDamage | DamageSource$ Imprinted | NumDmg$ Y | References$ Y | Defined$ Self | StackDescription$ None
 SVar:X:Count$xPaid
 SVar:Y:Imprinted$CardPower
diff --git a/forge-gui/res/cardsfolder/p/price_of_progress.txt b/forge-gui/res/cardsfolder/p/price_of_progress.txt
index 5ec231452b8..6d73eda5c24 100644
--- a/forge-gui/res/cardsfolder/p/price_of_progress.txt
+++ b/forge-gui/res/cardsfolder/p/price_of_progress.txt
@@ -1,7 +1,7 @@
 Name:Price of Progress
 ManaCost:1 R
 Types:Instant
-A:SP$ RepeatEach | Cost$ 1 R | RepeatPlayers$ Player | RepeatSubAbility$ DBDamage | AILogic$ PriceOfProgress | SpellDescription$ CARDNAME deals 2 damage to each player for each nonbasic land he or she controls.
+A:SP$ RepeatEach | Cost$ 1 R | RepeatPlayers$ Player | RepeatSubAbility$ DBDamage | DamageMap$ True | AILogic$ PriceOfProgress | SpellDescription$ CARDNAME deals 2 damage to each player for each nonbasic land he or she controls.
 SVar:DBDamage:DB$ DealDamage | Defined$ Remembered | NumDmg$ X | References$ X
 SVar:X:Count$Valid Land.nonBasic+RememberedPlayerCtrl/Times.2
 SVar:RemRandomDeck:True
diff --git a/forge-gui/res/cardsfolder/r/rakdos_charm.txt b/forge-gui/res/cardsfolder/r/rakdos_charm.txt
index aa9f8235ec6..606d2bcbc92 100644
--- a/forge-gui/res/cardsfolder/r/rakdos_charm.txt
+++ b/forge-gui/res/cardsfolder/r/rakdos_charm.txt
@@ -4,7 +4,7 @@ Types:Instant
 A:SP$ Charm | Cost$ B R | Choices$ Exile,Smash,CreatureDamage | CharmNum$ 1
 SVar:Exile:DB$ ChangeZoneAll | ValidTgts$ Player | TgtPrompt$ Select target player | Origin$ Graveyard | Destination$ Exile | ChangeType$ Card | IsCurse$ True | SpellDescription$ Exile all cards from target player's graveyard.
 SVar:Smash:DB$ Destroy | ValidTgts$ Artifact | TgtPrompt$ Select target artifact | SpellDescription$ Destroy target artifact.
-SVar:CreatureDamage:DB$ RepeatEach | RepeatCards$ Creature | RepeatSubAbility$ DBDamage | SpellDescription$ Each creature deals 1 damage to its controller.
+SVar:CreatureDamage:DB$ RepeatEach | RepeatCards$ Creature | RepeatSubAbility$ DBDamage | DamageMap$ True | SpellDescription$ Each creature deals 1 damage to its controller.
 SVar:DBDamage:DB$ DealDamage | Defined$ RememberedController | DamageSource$ Remembered | NumDmg$ 1
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rakdos_charm.jpg
diff --git a/forge-gui/res/cardsfolder/s/searing_rays.txt b/forge-gui/res/cardsfolder/s/searing_rays.txt
index 115db810f20..8412b54d317 100644
--- a/forge-gui/res/cardsfolder/s/searing_rays.txt
+++ b/forge-gui/res/cardsfolder/s/searing_rays.txt
@@ -2,7 +2,7 @@ Name:Searing Rays
 ManaCost:2 R
 Types:Sorcery
 A:SP$ ChooseColor | Cost$ 2 R | Defined$ You | SubAbility$ DBDmgEach | AILogic$ MostProminentHumanCreatures | SpellDescription$ Choose a color. CARDNAME deals damage to each player equal to the number of creatures of that color that player controls.
-SVar:DBDmgEach:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ DBDmg
+SVar:DBDmgEach:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ DBDmg | DamageMap$ True
 SVar:DBDmg:DB$ DealDamage | Defined$ Remembered | NumDmg$ X | References$ X
 SVar:X:Count$Valid Creature.RememberedPlayerCtrl+ChosenColor
 SVar:RemAIDeck:True
diff --git a/forge-gui/res/cardsfolder/s/serpentine_spike.txt b/forge-gui/res/cardsfolder/s/serpentine_spike.txt
index 8f17ab88107..e611ed4f554 100644
--- a/forge-gui/res/cardsfolder/s/serpentine_spike.txt
+++ b/forge-gui/res/cardsfolder/s/serpentine_spike.txt
@@ -2,9 +2,10 @@ Name:Serpentine Spike
 ManaCost:5 R R
 Types:Sorcery
 K:Devoid
-A:SP$ DealDamage | Cost$ 5 R R | ValidTgts$ Creature | TgtPrompt$ Select target creature to deal 2 damage to | NumDmg$ 2 | RememberDamaged$ True | SubAbility$ DBDamageTwo | SpellDescription$ CARDNAME deals 2 damage to target creature, 3 damage to another target creature, and 4 damage to a third target creature. If a creature dealt damage this way would die this turn, exile it instead.
+A:SP$ DealDamage | Cost$ 5 R R | ValidTgts$ Creature | TgtPrompt$ Select target creature to deal 2 damage to | NumDmg$ 2 | RememberDamaged$ True | DamageMap$ True | SubAbility$ DBDamageTwo | SpellDescription$ CARDNAME deals 2 damage to target creature, 3 damage to another target creature, and 4 damage to a third target creature. If a creature dealt damage this way would die this turn, exile it instead.
 SVar:DBDamageTwo:DB$ DealDamage | ValidTgts$ Creature | TgtPrompt$ Select another target creature to deal 3 damage to | NumDmg$ 3 | RememberDamaged$ True | TargetUnique$ True | SubAbility$ DBDamageThree
-SVar:DBDamageThree:DB$ DealDamage | ValidTgts$ Creature | TgtPrompt$ Select another target creature to deal 4 damage to | NumDmg$ 4 | RememberDamaged$ True | TargetUnique$ True | ReplaceDyingDefined$ Remembered | SubAbility$ DBCleanup
+SVar:DBDamageThree:DB$ DealDamage | ValidTgts$ Creature | TgtPrompt$ Select another target creature to deal 4 damage to | NumDmg$ 4 | RememberDamaged$ True | TargetUnique$ True | ReplaceDyingDefined$ Remembered | SubAbility$ DBDamageResolve
+SVar:DBDamageResolve:DB$ DamageResolve | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/serpentine_spike.jpg
 Oracle:Devoid (This card has no color.)\nSerpentine Spike deals 2 damage to target creature, 3 damage to another target creature, and 4 damage to a third target creature. If a creature dealt damage this way would die this turn, exile it instead.
diff --git a/forge-gui/res/cardsfolder/s/stench_of_evil.txt b/forge-gui/res/cardsfolder/s/stench_of_evil.txt
index b08e1b6b576..00a2b24857a 100644
--- a/forge-gui/res/cardsfolder/s/stench_of_evil.txt
+++ b/forge-gui/res/cardsfolder/s/stench_of_evil.txt
@@ -2,7 +2,7 @@ Name:Stench of Evil
 ManaCost:2 B B
 Types:Sorcery
 A:SP$ DestroyAll | Cost$ 2 B B | ValidCards$ Plains | RememberDestroyed$ True | SubAbility$ DBPay | SpellDescription$ Destroy all Plains. For each land destroyed this way, Stench of Evil deals 1 damage to that land's controller unless he or she pays {2}.
-SVar:DBPay:DB$ RepeatEach | DefinedCards$ DirectRemembered | UseImprinted$ True| RepeatSubAbility$ DBDmg | SubAbility$ DBCleanup
+SVar:DBPay:DB$ RepeatEach | DefinedCards$ DirectRemembered | UseImprinted$ True| RepeatSubAbility$ DBDmg | SubAbility$ DBCleanup | DamageMap$ True
 SVar:DBDmg:DB$ DealDamage | NumDmg$ 1 | Defined$ ImprintedController | UnlessCost$ 2 | UnlessPayer$ ImprintedController | ShowCurrentCard$ Imprinted
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:RemRandomDeck:True
diff --git a/forge-gui/res/cardsfolder/s/stormbreath_dragon.txt b/forge-gui/res/cardsfolder/s/stormbreath_dragon.txt
index 066edce8e7c..0eb04200e2f 100644
--- a/forge-gui/res/cardsfolder/s/stormbreath_dragon.txt
+++ b/forge-gui/res/cardsfolder/s/stormbreath_dragon.txt
@@ -7,7 +7,7 @@ K:Haste
 K:Protection from white
 K:Monstrosity:3:5 R R
 T:Mode$ BecomeMonstrous | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigDmg | TriggerDescription$ When CARDNAME becomes monstrous, it deals damage to each opponent equal to the number of cards in that player's hand.
-SVar:TrigDmg:DB$ RepeatEach | RepeatPlayers$ Player.Opponent | RepeatSubAbility$ DBDmg
+SVar:TrigDmg:DB$ RepeatEach | RepeatPlayers$ Player.Opponent | RepeatSubAbility$ DBDmg | DamageMap$ True
 SVar:DBDmg:DB$ DealDamage | Defined$ Player.IsRemembered | NumDmg$ X | References$ X
 SVar:X:Count$ValidHand Card.RememberedPlayerCtrl
 DeckHas:Ability$Counters
diff --git a/forge-gui/res/cardsfolder/t/treacherous_terrain.txt b/forge-gui/res/cardsfolder/t/treacherous_terrain.txt
index c8bf27f54c0..390a100e2f7 100644
--- a/forge-gui/res/cardsfolder/t/treacherous_terrain.txt
+++ b/forge-gui/res/cardsfolder/t/treacherous_terrain.txt
@@ -1,11 +1,11 @@
 Name:Treacherous Terrain
 ManaCost:6 R G
 Types:Sorcery
-A:SP$ RepeatEach | Cost$ 6 R G | RepeatPlayers$ Player.Opponent | RepeatSubAbility$ DmgOpp | SpellDescription$ CARDNAME deals damage to each opponent equal to the number of lands that player controls.
+A:SP$ RepeatEach | Cost$ 6 R G | RepeatPlayers$ Player.Opponent | RepeatSubAbility$ DmgOpp | DamageMap$ True | SpellDescription$ CARDNAME deals damage to each opponent equal to the number of lands that player controls.
 SVar:DmgOpp:DB$ DealDamage | Defined$ Remembered | NumDmg$ X | References$ X
 SVar:X:Count$Valid Land.RememberedPlayerCtrl
 K:TypeCycling:Basic:2
 SVar:AIPlayForSub:True
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/treacherous_terrain.jpg
-Oracle:Treacherous Terrain deals damage to each opponent equal to the number of lands that player controls.\nBasic landcycling {2} ({2}, Discard this card: Search your library for a basic land card, reveal it, and put it into your hand. Then shuffle your library.)
\ No newline at end of file
+Oracle:Treacherous Terrain deals damage to each opponent equal to the number of lands that player controls.\nBasic landcycling {2} ({2}, Discard this card: Search your library for a basic land card, reveal it, and put it into your hand. Then shuffle your library.)
diff --git a/forge-gui/res/cardsfolder/t/typhoon.txt b/forge-gui/res/cardsfolder/t/typhoon.txt
index c26027761ee..8f1710a4639 100644
--- a/forge-gui/res/cardsfolder/t/typhoon.txt
+++ b/forge-gui/res/cardsfolder/t/typhoon.txt
@@ -1,7 +1,7 @@
 Name:Typhoon
 ManaCost:2 G
 Types:Sorcery
-A:SP$ RepeatEach | Cost$ 2 G | RepeatPlayers$ Player.Opponent | RepeatSubAbility$ TyphoonDmg | SpellDescription$ Typhoon deals damage to each opponent equal to the number of Islands that player controls.
+A:SP$ RepeatEach | Cost$ 2 G | RepeatPlayers$ Player.Opponent | RepeatSubAbility$ TyphoonDmg | DamageMap$ True | SpellDescription$ Typhoon deals damage to each opponent equal to the number of Islands that player controls.
 SVar:TyphoonDmg:DB$ DealDamage | Defined$ Remembered | NumDmg$ X | References$ X
 SVar:X:Count$Valid Island.RememberedPlayerCtrl
 SVar:AIPlayForSub:True
diff --git a/forge-gui/res/cardsfolder/v/vow_of_duty.txt b/forge-gui/res/cardsfolder/v/vow_of_duty.txt
index 0cecd5241e1..3507f534e8c 100644
--- a/forge-gui/res/cardsfolder/v/vow_of_duty.txt
+++ b/forge-gui/res/cardsfolder/v/vow_of_duty.txt
@@ -3,7 +3,7 @@ ManaCost:2 W
 Types:Enchantment Aura
 K:Enchant creature
 A:SP$ Attach | Cost$ 2 W | ValidTgts$ Creature | AILogic$ Pump
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 2 | AddToughness$ 2 | AddHiddenKeyword$ Vigilance | Description$ Enchanted creature gets +2/+2, has vigilance, and can't attack you or a planeswalker you control.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 2 | AddToughness$ 2 | AddKeyword$ Vigilance | Description$ Enchanted creature gets +2/+2, has vigilance, and can't attack you or a planeswalker you control.
 S:Mode$ CantAttack | ValidCard$ Creature.EnchantedBy | Target$ You,Planeswalker.YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/vow_of_duty.jpg
 Oracle:Enchant creature\nEnchanted creature gets +2/+2, has vigilance, and can't attack you or a planeswalker you control.
diff --git a/forge-gui/res/cardsfolder/w/wing_storm.txt b/forge-gui/res/cardsfolder/w/wing_storm.txt
index 0f7126b8923..ea541404417 100644
--- a/forge-gui/res/cardsfolder/w/wing_storm.txt
+++ b/forge-gui/res/cardsfolder/w/wing_storm.txt
@@ -1,7 +1,7 @@
 Name:Wing Storm
 ManaCost:2 G
 Types:Sorcery
-A:SP$ RepeatEach | Cost$ 2 G | RepeatPlayers$ Player | RepeatSubAbility$ DBDamage | SpellDescription$ CARDNAME deals damage to each player equal to twice the number of creatures with flying that player controls.
+A:SP$ RepeatEach | Cost$ 2 G | RepeatPlayers$ Player | RepeatSubAbility$ DBDamage | DamageMap$ True | SpellDescription$ CARDNAME deals damage to each player equal to twice the number of creatures with flying that player controls.
 SVar:DBDamage:DB$ DealDamage | Defined$ Remembered | NumDmg$ X | References$ X
 SVar:X:Count$Valid Creature.withFlying+RememberedPlayerCtrl/Times.2
 SVar:RemRandomDeck:True