From 04e55cacb62211c22aa5c79c2c1d356b4da8b54d Mon Sep 17 00:00:00 2001
From: Hanmac <hanmac@cardforge.org>
Date: Sat, 10 Jun 2017 17:15:34 +0000
Subject: [PATCH] cards: update cards with ReplaceDyingDefined

---
 forge-gui/res/cardsfolder/a/anger_of_the_gods.txt    |  3 +--
 forge-gui/res/cardsfolder/a/annihilating_fire.txt    |  4 ++--
 forge-gui/res/cardsfolder/b/brutal_expulsion.txt     |  3 +--
 forge-gui/res/cardsfolder/b/burn_from_within.txt     |  5 ++---
 forge-gui/res/cardsfolder/c/carbonize.txt            |  4 ++--
 forge-gui/res/cardsfolder/d/demonfire.txt            |  6 +++---
 forge-gui/res/cardsfolder/d/disintegrate.txt         |  4 ++--
 forge-gui/res/cardsfolder/i/incendiary_flow.txt      | 10 +---------
 forge-gui/res/cardsfolder/m/magma_spray.txt          |  3 +--
 forge-gui/res/cardsfolder/n/nine_ringed_bo.txt       |  3 +--
 forge-gui/res/cardsfolder/p/pillar_of_flame.txt      |  4 ++--
 forge-gui/res/cardsfolder/r/red_suns_zenith.txt      |  4 ++--
 forge-gui/res/cardsfolder/r/reduce_to_ashes.txt      |  3 +--
 forge-gui/res/cardsfolder/s/scorching_lava.txt       |  4 ++--
 forge-gui/res/cardsfolder/s/serpentine_spike.txt     |  3 +--
 forge-gui/res/cardsfolder/t/touch_of_the_void.txt    |  3 +--
 forge-gui/res/cardsfolder/u/unnatural_aggression.txt |  4 +---
 forge-gui/res/cardsfolder/y/yamabushis_flame.txt     |  4 ++--
 forge-gui/res/cardsfolder/y/yamabushis_storm.txt     |  3 +--
 19 files changed, 29 insertions(+), 48 deletions(-)

diff --git a/forge-gui/res/cardsfolder/a/anger_of_the_gods.txt b/forge-gui/res/cardsfolder/a/anger_of_the_gods.txt
index 1c462d90a4f..f44537f3f89 100644
--- a/forge-gui/res/cardsfolder/a/anger_of_the_gods.txt
+++ b/forge-gui/res/cardsfolder/a/anger_of_the_gods.txt
@@ -1,8 +1,7 @@
 Name:Anger of the Gods
 ManaCost:1 R R
 Types:Sorcery
-A:SP$ DamageAll | Cost$ 1 R R | ValidCards$ Creature | NumDmg$ 3 | RememberDamaged$ True | SubAbility$ DBPumpAll | SpellDescription$ CARDNAME deals 3 damage to each creature. If a creature dealt damage this way would die this turn, exile it instead.
-SVar:DBPumpAll:DB$ PumpAll | KW$ HIDDEN If CARDNAME would be put into a graveyard, exile it instead. | ValidCards$ Creature.IsRemembered | SubAbility$ DBCleanup
+A:SP$ DamageAll | Cost$ 1 R R | ValidCards$ Creature | NumDmg$ 3 | RememberDamaged$ True | ReplaceDyingDefined$ Remembered | SubAbility$ DBCleanup | SpellDescription$ CARDNAME deals 3 damage to each creature. If a creature dealt damage this way would die this turn, exile it instead.
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/anger_of_the_gods.jpg
 Oracle:Anger of the Gods deals 3 damage to each creature. If a creature dealt damage this way would die this turn, exile it instead.
diff --git a/forge-gui/res/cardsfolder/a/annihilating_fire.txt b/forge-gui/res/cardsfolder/a/annihilating_fire.txt
index 9f664e6acc6..864fc31daa8 100644
--- a/forge-gui/res/cardsfolder/a/annihilating_fire.txt
+++ b/forge-gui/res/cardsfolder/a/annihilating_fire.txt
@@ -1,7 +1,7 @@
 Name:Annihilating Fire
 ManaCost:1 R R
 Types:Instant
-A:SP$ DealDamage | Cost$ 1 R R | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 3 | SubAbility$ Annihilate | SpellDescription$ CARDNAME deals 3 damage to target creature or player. If a creature dealt damage this way would die this turn, exile it instead.
-SVar:Annihilate:DB$ Pump | KW$ HIDDEN If CARDNAME would be put into a graveyard, exile it instead. | Defined$ Targeted
+A:SP$ DealDamage | Cost$ 1 R R | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 3 | RememberDamaged$ True | ReplaceDyingDefined$ Remembered | SubAbility$ DBCleanup | SpellDescription$ CARDNAME deals 3 damage to target creature or player. If a creature dealt damage this way would die this turn, exile it instead.
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/annihilating_fire.jpg
 Oracle:Annihilating Fire deals 3 damage to target creature or player. If a creature dealt damage this way would die this turn, exile it instead.
diff --git a/forge-gui/res/cardsfolder/b/brutal_expulsion.txt b/forge-gui/res/cardsfolder/b/brutal_expulsion.txt
index 868dd4b6c06..40c0a7ac95b 100644
--- a/forge-gui/res/cardsfolder/b/brutal_expulsion.txt
+++ b/forge-gui/res/cardsfolder/b/brutal_expulsion.txt
@@ -4,8 +4,7 @@ Types:Instant
 K:Devoid
 A:SP$ Charm | Cost$ 2 U R | MinCharmNum$ 1 | CharmNum$ 2 | Choices$ DBReturn,DBDmg | SpellDescription$ Choose one or both — Return target spell or creature to its owner's hand; CARDNAME deals 2 damage to target creature or planeswalker. If that permanent would be put into a graveyard this turn, exile it instead.
 SVar:DBReturn:DB$ ChangeZone | ValidTgts$ Creature,Card.inZoneStack | TgtZone$ Stack,Battlefield | Origin$ Battlefield,Stack | Fizzle$ True | Destination$ Hand | SpellDescription$ Return target spell or creature to its owner's hand.
-SVar:DBDmg:DB$ DealDamage | ValidTgts$ Creature,Planeswalker | TgtPrompt$ Select target creature or planeswalker. | NumDmg$ 2 | SubAbility$ DBPump | SpellDescription$ CARDNAME deals 2 damage to target creature or planeswalker. If that permanent would be put into a graveyard this turn, exile it instead.
-SVar:DBPump:DB$Pump | KW$ HIDDEN If CARDNAME would be put into a graveyard, exile it instead. | Defined$ Targeted
+SVar:DBDmg:DB$ DealDamage | ValidTgts$ Creature,Planeswalker | TgtPrompt$ Select target creature or planeswalker. | NumDmg$ 2 | ReplaceDyingDefined$ Targeted | SpellDescription$ CARDNAME deals 2 damage to target creature or planeswalker. If that permanent would be put into a graveyard this turn, exile it instead.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/brutal_expulsion.jpg
 Oracle:Devoid (This card has no color.)\nChoose one or both —\n• Return target spell or creature to its owner's hand.\n• Brutal Expulsion deals 2 damage to target creature or planeswalker. If that permanent would be put into a graveyard this turn, exile it instead.
diff --git a/forge-gui/res/cardsfolder/b/burn_from_within.txt b/forge-gui/res/cardsfolder/b/burn_from_within.txt
index 3c62437044d..52d5bf1d98d 100644
--- a/forge-gui/res/cardsfolder/b/burn_from_within.txt
+++ b/forge-gui/res/cardsfolder/b/burn_from_within.txt
@@ -1,9 +1,8 @@
 Name:Burn from Within
 ManaCost:X R
 Types:Sorcery
-A:SP$ DealDamage | Cost$ X R | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ X | References$ X | RememberDamaged$ True | SubAbility$ DBDebuff | SpellDescription$ CARDNAME deals X damage to target creature or player. If a creature is dealt damage this way, it loses indestructible until end of turn. If that creature would die this turn, exile it instead.
-SVar:DBDebuff:DB$ Debuff | Defined$ Remembered | Keywords$ Indestructible | SubAbility$ DBBurn
-SVar:DBBurn:DB$ Pump | KW$ HIDDEN If CARDNAME would be put into a graveyard, exile it instead. | Defined$ Remembered | SubAbility$ DBCleanup
+A:SP$ DealDamage | Cost$ X R | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ X | References$ X | RememberDamaged$ True | ReplaceDyingDefined$ Remembered | SubAbility$ DBDebuff | SpellDescription$ CARDNAME deals X damage to target creature or player. If a creature is dealt damage this way, it loses indestructible until end of turn. If that creature would die this turn, exile it instead.
+SVar:DBDebuff:DB$ Debuff | Defined$ Remembered | Keywords$ Indestructible | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Count$xPaid 
 SVar:Picture:http://www.wizards.com/global/images/magic/general/burn_from_within.jpg
diff --git a/forge-gui/res/cardsfolder/c/carbonize.txt b/forge-gui/res/cardsfolder/c/carbonize.txt
index f8952ec7641..fb7c9cbfeaa 100644
--- a/forge-gui/res/cardsfolder/c/carbonize.txt
+++ b/forge-gui/res/cardsfolder/c/carbonize.txt
@@ -1,7 +1,7 @@
 Name:Carbonize
 ManaCost:2 R
 Types:Instant
-A:SP$ DealDamage | Cost$ 2 R | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 3 | SubAbility$ DB | SpellDescription$ CARDNAME deals 3 damage to target creature or player. That creature can't be regenerated this turn. If the creature would be put into a graveyard this turn, exile it instead.
-SVar:DB:DB$Pump | KW$ HIDDEN CARDNAME can't be regenerated. & HIDDEN If CARDNAME would be put into a graveyard, exile it instead. | Defined$ Targeted
+A:SP$ DealDamage | Cost$ 2 R | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 3 | SubAbility$ DB | ReplaceDyingDefined$ Targeted | SpellDescription$ CARDNAME deals 3 damage to target creature or player. That creature can't be regenerated this turn. If the creature would be put into a graveyard this turn, exile it instead.
+SVar:DB:DB$Pump | KW$ HIDDEN CARDNAME can't be regenerated. | Defined$ Targeted
 SVar:Picture:http://www.wizards.com/global/images/magic/general/carbonize.jpg
 Oracle:Carbonize deals 3 damage to target creature or player. That creature can't be regenerated this turn. If the creature would die this turn, exile it instead.
diff --git a/forge-gui/res/cardsfolder/d/demonfire.txt b/forge-gui/res/cardsfolder/d/demonfire.txt
index 2b5e6fc543c..72e752b77b2 100644
--- a/forge-gui/res/cardsfolder/d/demonfire.txt
+++ b/forge-gui/res/cardsfolder/d/demonfire.txt
@@ -1,9 +1,9 @@
 Name:Demonfire
 ManaCost:X R
 Types:Sorcery
-A:SP$ DealDamage | Cost$ X R | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ X | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1 | SubAbility$ DBDemonfire | References$ X,Y | SpellDescription$ CARDNAME deals X damage to target creature or player. If a creature dealt damage this way would die this turn, exile it instead.
-SVar:DBDemonfire:DB$ DealDamage | Defined$ Targeted | NumDmg$ X | NoPrevention$ True | ConditionCheckSVar$ Y | References$ X,Y | ConditionSVarCompare$ EQ0 | SubAbility$ Annihilate
-SVar:Annihilate:DB$ Pump | KW$ HIDDEN If CARDNAME would be put into a graveyard, exile it instead. | Defined$ Targeted
+A:SP$ DealDamage | Cost$ X R | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ X | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1 | RememberDamaged$ True | ReplaceDyingDefined$ Remembered | SubAbility$ DBDemonfire | References$ X,Y | SpellDescription$ CARDNAME deals X damage to target creature or player. If a creature dealt damage this way would die this turn, exile it instead.
+SVar:DBDemonfire:DB$ DealDamage | Defined$ Targeted | NumDmg$ X | NoPrevention$ True | ConditionCheckSVar$ Y | References$ X,Y | ConditionSVarCompare$ EQ0 | RememberDamaged$ True | ReplaceDyingDefined$ Remembered | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 S:Mode$ Continuous | Affected$ Self | AffectedZone$ Stack | EffectZone$ All | CharacteristicDefining$ True | AddHiddenKeyword$ CARDNAME can't be countered. | CheckSVar$ Y | SVarCompare$ EQ0 | Description$ Hellbent — If you have no cards in hand, CARDNAME can't be countered by spells or abilities and the damage can't be prevented.
 SVar:X:Count$xPaid
 SVar:Y:Count$InYourHand
diff --git a/forge-gui/res/cardsfolder/d/disintegrate.txt b/forge-gui/res/cardsfolder/d/disintegrate.txt
index f717e6e7b12..106e8a15ea7 100644
--- a/forge-gui/res/cardsfolder/d/disintegrate.txt
+++ b/forge-gui/res/cardsfolder/d/disintegrate.txt
@@ -1,8 +1,8 @@
 Name:Disintegrate
 ManaCost:X R
 Types:Sorcery
-A:SP$ DealDamage | Cost$ X R | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ X | SubAbility$ DB | References$ X | SpellDescription$ CARDNAME deals X damage to target creature or player. That creature can't be regenerated this turn. If the creature would be put into a graveyard this turn, exile it instead.
+A:SP$ DealDamage | Cost$ X R | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ X | SubAbility$ DB | References$ X | ReplaceDyingDefined$ Targeted | SpellDescription$ CARDNAME deals X damage to target creature or player. That creature can't be regenerated this turn. If the creature would be put into a graveyard this turn, exile it instead.
 SVar:X:Count$xPaid
-SVar:DB:DB$Pump | KW$ HIDDEN CARDNAME can't be regenerated. & HIDDEN If CARDNAME would be put into a graveyard, exile it instead. | Defined$ Targeted
+SVar:DB:DB$Pump | KW$ HIDDEN CARDNAME can't be regenerated. | Defined$ Targeted
 SVar:Picture:http://www.wizards.com/global/images/magic/general/disintegrate.jpg
 Oracle:Disintegrate deals X damage to target creature or player. That creature can't be regenerated this turn. If the creature would die this turn, exile it instead.
diff --git a/forge-gui/res/cardsfolder/i/incendiary_flow.txt b/forge-gui/res/cardsfolder/i/incendiary_flow.txt
index d4dabc46d5a..0d6190a8896 100644
--- a/forge-gui/res/cardsfolder/i/incendiary_flow.txt
+++ b/forge-gui/res/cardsfolder/i/incendiary_flow.txt
@@ -1,16 +1,8 @@
 Name:Incendiary Flow
-
 ManaCost:1 R
-
 Types:Sorcery
-
-A:SP$ DealDamage | Cost$ 1 R | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 3 | RememberDamaged$ True | SubAbility$ DBPumpAll | SpellDescription$ CARDNAME deals 3 damage to target creature or player. If a creature dealt damage this way would die this turn, exile it instead.
-
-SVar:DBPumpAll:DB$ PumpAll | KW$ HIDDEN If CARDNAME would be put into a graveyard, exile it instead. | ValidCards$ Creature.IsRemembered | SubAbility$ DBCleanup
-
+A:SP$ DealDamage | Cost$ 1 R | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 3 | RememberDamaged$ True | ReplaceDyingDefined$ Remembered | SubAbility$ DBCleanup | SpellDescription$ CARDNAME deals 3 damage to target creature or player. If a creature dealt damage this way would die this turn, exile it instead.
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True 
-
 SVar:Picture:http://www.wizards.com/global/images/magic/general/incendiary_flow.jpg
-
 Oracle:Incendiary Flow deals 3 damage to target creature or player. If a creature dealt damage this way would die this turn, exile it instead. 
 
diff --git a/forge-gui/res/cardsfolder/m/magma_spray.txt b/forge-gui/res/cardsfolder/m/magma_spray.txt
index b89a159ed8b..482d1f8ab64 100644
--- a/forge-gui/res/cardsfolder/m/magma_spray.txt
+++ b/forge-gui/res/cardsfolder/m/magma_spray.txt
@@ -1,7 +1,6 @@
 Name:Magma Spray
 ManaCost:R
 Types:Instant
-A:SP$ DealDamage | Cost$ R | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 2 | SubAbility$ DB | SpellDescription$ CARDNAME deals 2 damage to target creature. If that creature would die this turn, exile it instead.
-SVar:DB:DB$Pump | KW$ HIDDEN If CARDNAME would be put into a graveyard, exile it instead. | Defined$ Targeted
+A:SP$ DealDamage | Cost$ R | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 2 | | ReplaceDyingDefined$ Targeted | SpellDescription$ CARDNAME deals 2 damage to target creature. If that creature would die this turn, exile it instead.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/magma_spray.jpg
 Oracle:Magma Spray deals 2 damage to target creature. If that creature would die this turn, exile it instead.
diff --git a/forge-gui/res/cardsfolder/n/nine_ringed_bo.txt b/forge-gui/res/cardsfolder/n/nine_ringed_bo.txt
index 5ce43310423..6e83064a1ed 100644
--- a/forge-gui/res/cardsfolder/n/nine_ringed_bo.txt
+++ b/forge-gui/res/cardsfolder/n/nine_ringed_bo.txt
@@ -1,8 +1,7 @@
 Name:Nine-Ringed Bo
 ManaCost:3
 Types:Artifact
-A:AB$ DealDamage | Cost$ T |  ValidTgts$ Creature.Spirit | NumDmg$ 1 | SubAbility$ DB | SpellDescription$ CARDNAME deals 1 damage to target Spirit creature. If that creature would die this turn, exile it instead.
-SVar:DB:DB$Pump | KW$ HIDDEN If CARDNAME would be put into a graveyard, exile it instead. | Defined$ Targeted
+A:AB$ DealDamage | Cost$ T |  ValidTgts$ Creature.Spirit | NumDmg$ 1 | ReplaceDyingDefined$ Targeted | SpellDescription$ CARDNAME deals 1 damage to target Spirit creature. If that creature would die this turn, exile it instead.
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nine_ringed_bo.jpg
 Oracle:{T}: Nine-Ringed Bo deals 1 damage to target Spirit creature. If that creature would die this turn, exile it instead.
diff --git a/forge-gui/res/cardsfolder/p/pillar_of_flame.txt b/forge-gui/res/cardsfolder/p/pillar_of_flame.txt
index 3b43c0c9d49..0312f0f3d39 100644
--- a/forge-gui/res/cardsfolder/p/pillar_of_flame.txt
+++ b/forge-gui/res/cardsfolder/p/pillar_of_flame.txt
@@ -1,7 +1,7 @@
 Name:Pillar of Flame
 ManaCost:R
 Types:Sorcery
-A:SP$ DealDamage | Cost$ R | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 2 | SubAbility$ Toast | SpellDescription$ CARDNAME deals 2 damage to target creature or player. If a creature dealt damage this way would die this turn, exile it instead.
-SVar:Toast:DB$Pump | KW$ HIDDEN If CARDNAME would be put into a graveyard, exile it instead. | Defined$ Targeted
+A:SP$ DealDamage | Cost$ R | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 2 | RememberDamaged$ True | ReplaceDyingDefined$ Remembered | SubAbility$ DBCleanup | SpellDescription$ CARDNAME deals 2 damage to target creature or player. If a creature dealt damage this way would die this turn, exile it instead.
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/pillar_of_flame.jpg
 Oracle:Pillar of Flame deals 2 damage to target creature or player. If a creature dealt damage this way would die this turn, exile it instead.
diff --git a/forge-gui/res/cardsfolder/r/red_suns_zenith.txt b/forge-gui/res/cardsfolder/r/red_suns_zenith.txt
index 9875c4de3f4..dc5e0036352 100644
--- a/forge-gui/res/cardsfolder/r/red_suns_zenith.txt
+++ b/forge-gui/res/cardsfolder/r/red_suns_zenith.txt
@@ -1,9 +1,9 @@
 Name:Red Sun's Zenith
 ManaCost:X R
 Types:Sorcery
-A:SP$ DealDamage | Cost$ X R | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ X | References$ X | SubAbility$ DBCurse | SpellDescription$ CARDNAME deals X damage to target creature or player. If a creature dealt damage this way would die this turn, exile it instead. Shuffle CARDNAME into its owner's library.
+A:SP$ DealDamage | Cost$ X R | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ X | References$ X | RememberDamaged$ True | ReplaceDyingDefined$ Remembered | SubAbility$ DBCleanup | SpellDescription$ CARDNAME deals X damage to target creature or player. If a creature dealt damage this way would die this turn, exile it instead. Shuffle CARDNAME into its owner's library.
 SVar:X:Count$xPaid
-SVar:DBCurse:DB$Pump | KW$ HIDDEN If CARDNAME would be put into a graveyard, exile it instead. | Defined$ Targeted | SubAbility$ DBShuffle
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | SubAbility$ DBShuffle
 SVar:DBShuffle:DB$ChangeZone | Origin$ Stack | Destination$ Library | Shuffle$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/red_suns_zenith.jpg
 Oracle:Red Sun's Zenith deals X damage to target creature or player. If a creature dealt damage this way would die this turn, exile it instead. Shuffle Red Sun's Zenith into its owner's library.
diff --git a/forge-gui/res/cardsfolder/r/reduce_to_ashes.txt b/forge-gui/res/cardsfolder/r/reduce_to_ashes.txt
index a02a50d0a84..22fafd71a78 100644
--- a/forge-gui/res/cardsfolder/r/reduce_to_ashes.txt
+++ b/forge-gui/res/cardsfolder/r/reduce_to_ashes.txt
@@ -1,8 +1,7 @@
 Name:Reduce to Ashes
 ManaCost:4 R
 Types:Sorcery
-A:SP$ DealDamage | Cost$ 4 R | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 5 | SubAbility$ DB | SpellDescription$ CARDNAME deals 5 damage to target creature or player. If that creature would be put into a graveyard this turn, exile it instead.
-SVar:DB:DB$Pump | KW$ HIDDEN If CARDNAME would be put into a graveyard, exile it instead. | Defined$ Targeted
+A:SP$ DealDamage | Cost$ 4 R | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 5 | ReplaceDyingDefined$ Targeted | SpellDescription$ CARDNAME deals 5 damage to target creature or player. If that creature would be put into a graveyard this turn, exile it instead.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/reduce_to_ashes.jpg
 Oracle:Reduce to Ashes deals 5 damage to target creature. If that creature would die this turn, exile it instead.
 
diff --git a/forge-gui/res/cardsfolder/s/scorching_lava.txt b/forge-gui/res/cardsfolder/s/scorching_lava.txt
index de454d0d791..8aa602e19ba 100644
--- a/forge-gui/res/cardsfolder/s/scorching_lava.txt
+++ b/forge-gui/res/cardsfolder/s/scorching_lava.txt
@@ -2,7 +2,7 @@ Name:Scorching Lava
 ManaCost:1 R
 Types:Instant
 K:Kicker:R
-A:SP$ DealDamage | Cost$ 1 R | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 2 | SubAbility$ KickingLava | SpellDescription$ CARDNAME deals 2 damage to target creature or player. If CARDNAME was kicked, that creature can't be regenerated this turn and if it would die this turn, exile it instead.
-SVar:KickingLava:DB$Pump | KW$ HIDDEN CARDNAME can't be regenerated. & HIDDEN If CARDNAME would be put into a graveyard, exile it instead. | Defined$ Targeted | Condition$ Kicked | ConditionDescription$ If Scorching Lava was kicked,
+A:SP$ DealDamage | Cost$ 1 R | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 2 | ReplaceDyingDefined$ Targeted | ReplaceDyingCondition$ Kicked | SubAbility$ KickingLava | SpellDescription$ CARDNAME deals 2 damage to target creature or player. If CARDNAME was kicked, that creature can't be regenerated this turn and if it would die this turn, exile it instead.
+SVar:KickingLava:DB$Pump | KW$ HIDDEN CARDNAME can't be regenerated. | Defined$ Targeted | Condition$ Kicked | ConditionDescription$ If Scorching Lava was kicked,
 SVar:Picture:http://www.wizards.com/global/images/magic/general/scorching_lava.jpg
 Oracle:Kicker {R} (You may pay an additional {R} as you cast this spell.)\nScorching Lava deals 2 damage to target creature or player. If Scorching Lava was kicked, that creature can't be regenerated this turn and if it would die this turn, exile it instead.
diff --git a/forge-gui/res/cardsfolder/s/serpentine_spike.txt b/forge-gui/res/cardsfolder/s/serpentine_spike.txt
index ff76ecb9c3f..2e143d438be 100644
--- a/forge-gui/res/cardsfolder/s/serpentine_spike.txt
+++ b/forge-gui/res/cardsfolder/s/serpentine_spike.txt
@@ -4,8 +4,7 @@ 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.
 SVar:DBDamageTwo:DB$ DealDamage | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select another target creature to deal 3 damage to | NumDmg$ 3 | RememberDamaged$ True | TargetUnique$ True | SubAbility$ DBDamageThree
-SVar:DBDamageThree:DB$ DealDamage | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select another target creature to deal 4 damage to | NumDmg$ 4 | RememberDamaged$ True | TargetUnique$ True | SubAbility$ DBPumpAll
-SVar:DBPumpAll:DB$ PumpAll | KW$ HIDDEN If CARDNAME would be put into a graveyard, exile it instead. | ValidCards$ Creature.IsRemembered | SubAbility$ DBCleanup
+SVar:DBDamageThree:DB$ DealDamage | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select another target creature to deal 4 damage to | NumDmg$ 4 | RememberDamaged$ True | TargetUnique$ True | ReplaceDyingDefined$ Remembered | 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/t/touch_of_the_void.txt b/forge-gui/res/cardsfolder/t/touch_of_the_void.txt
index df87fcd83db..73bda69365a 100644
--- a/forge-gui/res/cardsfolder/t/touch_of_the_void.txt
+++ b/forge-gui/res/cardsfolder/t/touch_of_the_void.txt
@@ -2,8 +2,7 @@ Name:Touch of the Void
 ManaCost:2 R
 Types:Sorcery
 K:Devoid
-A:SP$ DealDamage | Cost$ 2 R | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player  | NumDmg$ 3 | RememberDamaged$ True | SubAbility$ DBPumpAll | SpellDescription$ CARDNAME deals 3 damage to target creature or player. If a creature dealt damage this way would die this turn, exile it instead.
-SVar:DBPumpAll:DB$ PumpAll | KW$ HIDDEN If CARDNAME would be put into a graveyard, exile it instead. | ValidCards$ Creature.IsRemembered | SubAbility$ DBCleanup
+A:SP$ DealDamage | Cost$ 2 R | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player  | NumDmg$ 3 | RememberDamaged$ True | ReplaceDyingDefined$ Remembered | SubAbility$ DBCleanup | SpellDescription$ CARDNAME deals 3 damage to target creature or player. If a creature dealt damage this way would die this turn, exile it instead.
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/touch_of_the_void.jpg
 Oracle:Devoid (This card has no color.)\nTouch of the Void deals 3 damage to target creature or player. If a creature dealt damage this way would die this turn, exile it instead.
diff --git a/forge-gui/res/cardsfolder/u/unnatural_aggression.txt b/forge-gui/res/cardsfolder/u/unnatural_aggression.txt
index 0fa67d79b0c..91b1e1165c9 100644
--- a/forge-gui/res/cardsfolder/u/unnatural_aggression.txt
+++ b/forge-gui/res/cardsfolder/u/unnatural_aggression.txt
@@ -3,8 +3,6 @@ ManaCost:2 G
 Types:Instant
 K:Devoid
 A:SP$ Pump | Cost$ 2 G | AILogic$ Fight | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Choose target creature you control | SubAbility$ DBFight | StackDescription$ None | SpellDescription$ Target creature you control fights target creature an opponent controls. If the creature an opponent controls would die this turn, exile it instead.
-SVar:DBFight:DB$ Fight | Defined$ ParentTarget | ValidTgts$ Creature.OppCtrl | RememberObjects$ Targeted | SubAbility$ DBPumpAll | TgtPrompt$ Choose target creature an opponent controls to fight the first target
-SVar:DBPumpAll:DB$ PumpAll | KW$ HIDDEN If CARDNAME would be put into a graveyard, exile it instead. | ValidCards$ Creature.IsRemembered+OppCtrl | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:DBFight:DB$ Fight | Defined$ ParentTarget | ValidTgts$ Creature.OppCtrl | ReplaceDyingDefined$ Targeted | TgtPrompt$ Choose target creature an opponent controls to fight the first target
 SVar:Picture:http://www.wizards.com/global/images/magic/general/unnatural_aggression.jpg
 Oracle:Devoid (This card has no color.)\nTarget creature you control fights target creature an opponent controls. If the creature an opponent controls would die this turn, exile it instead.
diff --git a/forge-gui/res/cardsfolder/y/yamabushis_flame.txt b/forge-gui/res/cardsfolder/y/yamabushis_flame.txt
index efc689f3a04..ba84aee2a0a 100644
--- a/forge-gui/res/cardsfolder/y/yamabushis_flame.txt
+++ b/forge-gui/res/cardsfolder/y/yamabushis_flame.txt
@@ -1,7 +1,7 @@
 Name:Yamabushi's Flame
 ManaCost:2 R
 Types:Instant
-A:SP$ DealDamage | Cost$ 2 R | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 3 | SubAbility$ DB | SpellDescription$ CARDNAME deals 3 damage to target creature or player. If a creature dealt damage this way would die this turn, exile it instead.
-SVar:DB:DB$Pump | KW$ HIDDEN If CARDNAME would be put into a graveyard, exile it instead. | Defined$ Targeted
+A:SP$ DealDamage | Cost$ 2 R | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 3 | RememberDamaged$ True | ReplaceDyingDefined$ Remembered | SubAbility$ DBCleanup | SpellDescription$ CARDNAME deals 3 damage to target creature or player. If a creature dealt damage this way would die this turn, exile it instead.
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/yamabushis_flame.jpg
 Oracle:Yamabushi's Flame deals 3 damage to target creature or player. If a creature dealt damage this way would die this turn, exile it instead.
diff --git a/forge-gui/res/cardsfolder/y/yamabushis_storm.txt b/forge-gui/res/cardsfolder/y/yamabushis_storm.txt
index c12787c70aa..3fb691c1085 100644
--- a/forge-gui/res/cardsfolder/y/yamabushis_storm.txt
+++ b/forge-gui/res/cardsfolder/y/yamabushis_storm.txt
@@ -1,8 +1,7 @@
 Name:Yamabushi's Storm
 ManaCost:1 R
 Types:Sorcery
-A:SP$ DamageAll | Cost$ 1 R | ValidCards$ Creature | NumDmg$ 1 | RememberDamaged$ True | SubAbility$ DBPumpAll | SpellDescription$ CARDNAME deals 1 damage to each creature. If a creature dealt damage this way would die this turn, exile it instead.
-SVar:DBPumpAll:DB$ PumpAll | KW$ HIDDEN If CARDNAME would be put into a graveyard, exile it instead. | ValidCards$ Creature.IsRemembered | SubAbility$ DBCleanup
+A:SP$ DamageAll | Cost$ 1 R | ValidCards$ Creature | NumDmg$ 1 | RememberDamaged$ True | ReplaceDyingDefined$ Remembered | SubAbility$ DBCleanup | SpellDescription$ CARDNAME deals 1 damage to each creature. If a creature dealt damage this way would die this turn, exile it instead.
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/yamabushis_storm.jpg
 Oracle:Yamabushi's Storm deals 1 damage to each creature. If a creature dealt damage this way would die this turn, exile it instead.