From ef87367ae65ac69db8a62360f1eefe14527d98ae Mon Sep 17 00:00:00 2001
From: Hanmac <hanmac@cardforge.org>
Date: Thu, 29 Dec 2016 13:45:46 +0000
Subject: [PATCH] cards: update cards with ReplaceCount/Twice using new
 ReplaceEffect

---
 forge-gui/res/cardsfolder/a/anthem_of_rakdos.txt      |  7 +++----
 .../res/cardsfolder/a/approach_my_molten_realm.txt    |  8 +++-----
 forge-gui/res/cardsfolder/b/bitter_feud.txt           | 11 ++++-------
 forge-gui/res/cardsfolder/b/blind_fury.txt            |  6 +++---
 forge-gui/res/cardsfolder/c/curse_of_bloodletting.txt |  6 ++----
 .../res/cardsfolder/d/dictate_of_the_twin_gods.txt    |  6 ++----
 forge-gui/res/cardsfolder/f/fire_servant.txt          |  2 +-
 .../res/cardsfolder/g/gisela_blade_of_goldnight.txt   |  6 ++----
 forge-gui/res/cardsfolder/g/goldnight_castigator.txt  |  9 +++------
 forge-gui/res/cardsfolder/g/gratuitous_violence.txt   |  6 ++----
 .../cardsfolder/l/lyzolda_the_blood_witch_avatar.txt  |  7 +++----
 forge-gui/res/cardsfolder/m/mishra.txt                |  6 ++----
 forge-gui/res/cardsfolder/q/quest_for_pure_flame.txt  |  8 +++-----
 forge-gui/res/cardsfolder/s/stronghold_furnace.txt    |  6 ++----
 14 files changed, 35 insertions(+), 59 deletions(-)

diff --git a/forge-gui/res/cardsfolder/a/anthem_of_rakdos.txt b/forge-gui/res/cardsfolder/a/anthem_of_rakdos.txt
index 46f184eebd9..5c570d2e57d 100644
--- a/forge-gui/res/cardsfolder/a/anthem_of_rakdos.txt
+++ b/forge-gui/res/cardsfolder/a/anthem_of_rakdos.txt
@@ -4,12 +4,11 @@ Types:Enchantment
 T:Mode$ Attacks | ValidCard$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ AnthemPump | TriggerDescription$ Whenever a creature you control attacks, it gets +2/+0 until end of turn and CARDNAME deals 1 damage to you.
 SVar:AnthemPump:AB$ Pump | Cost$ 0 | Defined$ TriggeredAttacker | NumAtt$ 2 | SubAbility$ RakdosBurn
 SVar:RakdosBurn:DB$ DealDamage | Defined$ You | NumDmg$ 1
-R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Card.YouCtrl | ValidTarget$ Creature,Player | Hellbent$ True | ReplaceWith$ DmgTwice | IsCombat$ False | Description$ Hellbent - As long as you have no cards in hand, if a source you control would deal damage to a creature or player, it deals double that damage to that creature or player instead.
-R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Card.YouCtrl | ValidTarget$ Creature,Player | Hellbent$ True | ReplaceWith$ DmgTwiceCombat | IsCombat$ True | Secondary$ True | Description$ Hellbent - As long as you have no cards in hand, if a source you control would deal damage to a creature or player, it deals double that damage to that creature or player instead.
-SVar:DmgTwice:AB$ DealDamage | Cost$ 0 | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ X | References$ X
-SVar:DmgTwiceCombat:AB$ DealDamage | Cost$ 0 | CombatDamage$ True | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ X | References$ X
+R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Card.YouCtrl | ValidTarget$ Creature,Player | Hellbent$ True | ReplaceWith$ DmgTwice | Description$ Hellbent - As long as you have no cards in hand, if a source you control would deal damage to a creature or player, it deals double that damage to that creature or player instead.
+SVar:DmgTwice:DB$ ReplaceEffect | VarName$ DamageAmount | VarValue$ X | References$ X
 SVar:X:ReplaceCount$DamageAmount/Twice
 SVar:PlayMain1:TRUE
 SVar:BuffedBy:Card
+DeckHints:Ability$Discard
 SVar:Picture:http://www.wizards.com/global/images/magic/general/anthem_of_rakdos.jpg
 Oracle:Whenever a creature you control attacks, it gets +2/+0 until end of turn and Anthem of Rakdos deals 1 damage to you.\nHellbent - As long as you have no cards in hand, if a source you control would deal damage to a creature or player, it deals double that damage to that creature or player instead.
diff --git a/forge-gui/res/cardsfolder/a/approach_my_molten_realm.txt b/forge-gui/res/cardsfolder/a/approach_my_molten_realm.txt
index 1c02dd8fcdf..8a2a1a720cf 100644
--- a/forge-gui/res/cardsfolder/a/approach_my_molten_realm.txt
+++ b/forge-gui/res/cardsfolder/a/approach_my_molten_realm.txt
@@ -2,11 +2,9 @@ Name:Approach My Molten Realm
 ManaCost:no cost
 Types:Scheme
 T:Mode$ SetInMotion | ValidCard$ Card.Self | Execute$ MoltenEffect | TriggerZones$ Command | TriggerDescription$ When you set this scheme in motion, until your next turn, if a source would deal damage, it deals double that damage instead.
-SVar:MoltenEffect:AB$ Effect | Cost$ 0 | Name$ Molten Realm Effect | ReplacementEffects$ MoltenRealm,MoltenRealmCombat | SVars$ DmgTimes2,DmgTimes2Combat,MoltenX | Duration$ UntilYourNextTurn
-SVar:MoltenRealm:Event$ DamageDone | ActiveZones$ Command | ValidSource$ Card | ReplaceWith$ DmgTimes2 | IsCombat$ False | Description$ Until your next turn, if a source would deal damage, it deals double that damage instead.
-SVar:MoltenRealmCombat:Event$ DamageDone | ActiveZones$ Command | ValidSource$ Card | ReplaceWith$ DmgTimes2Combat | IsCombat$ True | Secondary$ True | Description$ Until your next turn, if a source would deal damage, it deals double that damage instead.
-SVar:DmgTimes2:AB$ DealDamage | Cost$ 0 | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ MoltenX | References$ MoltenX
-SVar:DmgTimes2Combat:AB$ DealDamage | Cost$ 0 | CombatDamage$ True | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ MoltenX | References$ MoltenX
+SVar:MoltenEffect:DB$ Effect | Name$ Molten Realm Effect | ReplacementEffects$ MoltenRealm | SVars$ DmgTwice,MoltenX | Duration$ UntilYourNextTurn
+SVar:MoltenRealm:Event$ DamageDone | ActiveZones$ Command | ValidSource$ Card | ReplaceWith$ DmgTwice | Description$ Until your next turn, if a source would deal damage, it deals double that damage instead.
+SVar:DmgTwice:DB$ ReplaceEffect | VarName$ DamageAmount | VarValue$ MoltenX | References$ MoltenX
 SVar:MoltenX:ReplaceCount$DamageAmount/Twice
 SVar:Picture:http://downloads.cardforge.link/images/cards/ARC/Approach My Molten Realm.full.jpg
 Oracle:When you set this scheme in motion, until your next turn, if a source would deal damage, it deals double that damage instead.
diff --git a/forge-gui/res/cardsfolder/b/bitter_feud.txt b/forge-gui/res/cardsfolder/b/bitter_feud.txt
index 22ce6b6ce19..86dc0f99c9c 100644
--- a/forge-gui/res/cardsfolder/b/bitter_feud.txt
+++ b/forge-gui/res/cardsfolder/b/bitter_feud.txt
@@ -5,14 +5,11 @@ K:ETBReplacement:Other:ChooseP
 SVar:ChooseP:DB$ ChoosePlayer | Defined$ You | Choices$ Player | AILogic$ Curse | RememberChosen$ True | SubAbility$ ChoosePTwo | SpellDescription$ As CARDNAME enters the battlefield, choose two players.
 SVar:ChoosePTwo:DB$ ChoosePlayer | Defined$ You | Choices$ NonChosenPlayer | AILogic$ Curse
 
-R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Card.RememberedPlayerCtrl | ValidTarget$ Permanent.ChosenCtrl,Player.Chosen | ReplaceWith$ DmgTwice | IsCombat$ False | Description$ If a source controlled by one of the chosen players would deal damage to the other chosen player or a permanent that player controls, that source deals double that damage to that player or permanent instead.
-R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Card.RememberedPlayerCtrl | ValidTarget$ Permanent.ChosenCtrl,Player.Chosen | ReplaceWith$ DmgTwiceCombat | IsCombat$ True | Secondary$ True | Description$ If a source controlled by one of the chosen players would deal damage to the other chosen player or a permanent that player controls, that source deals double that damage to that player or permanent instead.
+R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Card.RememberedPlayerCtrl | ValidTarget$ Permanent.ChosenCtrl,Player.Chosen | ReplaceWith$ DmgTwice | Description$ If a source controlled by one of the chosen players would deal damage to the other chosen player or a permanent that player controls, that source deals double that damage to that player or permanent instead.
 
-R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Card.ChosenCtrl | ValidTarget$ Permanent.RememberedPlayerCtrl,Player.Remembered | ReplaceWith$ DmgTwice | IsCombat$ False | Secondary$ True | Description$ If a source controlled by one of the chosen players would deal damage to the other chosen player or a permanent that player controls, that source deals double that damage to that player or permanent instead.
-R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Card.ChosenCtrl | ValidTarget$ Permanent.RememberedPlayerCtrl,Player.Remembered | ReplaceWith$ DmgTwiceCombat | IsCombat$ True | Secondary$ True | Description$ If a source controlled by one of the chosen players would deal damage to the other chosen player or a permanent that player controls, that source deals double that damage to that player or permanent instead.
+R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Card.ChosenCtrl | ValidTarget$ Permanent.RememberedPlayerCtrl,Player.Remembered | ReplaceWith$ DmgTwice | Secondary$ True | Description$ If a source controlled by one of the chosen players would deal damage to the other chosen player or a permanent that player controls, that source deals double that damage to that player or permanent instead.
 
-SVar:DmgTwice:AB$ DealDamage | Cost$ 0 | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ X | References$ X
-SVar:DmgTwiceCombat:AB$ DealDamage | Cost$ 0 | CombatDamage$ True | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ X | References$ X
+SVar:DmgTwice:DB$ ReplaceEffect | VarName$ DamageAmount | VarValue$ X | References$ X
 SVar:X:ReplaceCount$DamageAmount/Twice
 
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ DBCleanup | Static$ True
@@ -20,4 +17,4 @@ T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.S
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 
 SVar:Picture:http://www.wizards.com/global/images/magic/general/bitter_feud.jpg
-Oracle:As Bitter Feud enters the battlefield, choose two players.\nIf a source controlled by one of the chosen players would deal damage to the other chosen player or a permanent that player controls, that source deals double that damage to that player or permanent instead.
\ No newline at end of file
+Oracle:As Bitter Feud enters the battlefield, choose two players.\nIf a source controlled by one of the chosen players would deal damage to the other chosen player or a permanent that player controls, that source deals double that damage to that player or permanent instead.
diff --git a/forge-gui/res/cardsfolder/b/blind_fury.txt b/forge-gui/res/cardsfolder/b/blind_fury.txt
index c3f3aa1ae62..83b0ed0126e 100644
--- a/forge-gui/res/cardsfolder/b/blind_fury.txt
+++ b/forge-gui/res/cardsfolder/b/blind_fury.txt
@@ -2,9 +2,9 @@ Name:Blind Fury
 ManaCost:2 R R
 Types:Instant
 A:SP$ AnimateAll | Cost$ 2 R R | ValidCards$ Creature | RemoveKeywords$ Trample | SubAbility$ BlindFuryEffect | SpellDescription$ All creatures lose trample until end of turn. If a creature would deal combat damage to a creature this turn, it deals double that damage to that creature instead.
-SVar:BlindFuryEffect:DB$ Effect | Name$ Blind Fury Effect | ReplacementEffects$ FuryCombatEvent | SVars$ DmgTwiceCombat,X
-SVar:FuryCombatEvent:Event$ DamageDone | ValidSource$ Creature | ValidTarget$ Creature | ReplaceWith$ DmgTwiceCombat | IsCombat$ True | Description$ If a creature would deal combat damage to a creature this turn, it deals double that damage to that creature instead.
-SVar:DmgTwiceCombat:AB$DealDamage | Cost$ 0 | CombatDamage$ True | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ X
+SVar:BlindFuryEffect:DB$ Effect | Name$ Blind Fury Effect | ReplacementEffects$ FuryCombatEvent | SVars$ DmgTwice,X
+SVar:FuryCombatEvent:Event$ DamageDone | ValidSource$ Creature | ValidTarget$ Creature | ReplaceWith$ DmgTwice | IsCombat$ True | Description$ If a creature would deal combat damage to a creature this turn, it deals double that damage to that creature instead.
+SVar:DmgTwice:DB$ ReplaceEffect | VarName$ DamageAmount | VarValue$ X | References$ X
 SVar:X:ReplaceCount$DamageAmount/Twice
 SVar:PlayMain1:TRUE
 SVar:RemAIDeck:True
diff --git a/forge-gui/res/cardsfolder/c/curse_of_bloodletting.txt b/forge-gui/res/cardsfolder/c/curse_of_bloodletting.txt
index 091c82b4368..5fe5bd7e462 100644
--- a/forge-gui/res/cardsfolder/c/curse_of_bloodletting.txt
+++ b/forge-gui/res/cardsfolder/c/curse_of_bloodletting.txt
@@ -3,10 +3,8 @@ ManaCost:3 R R
 Types:Enchantment Aura Curse
 K:Enchant player
 A:SP$ Attach | Cost$ 3 R R | ValidTgts$ Player | AILogic$ Curse
-R:Event$ DamageDone | ActiveZones$ Battlefield | ValidTarget$ Player.EnchantedBy | ReplaceWith$ DmgTimes2 | IsCombat$ False | Description$ If a source would deal damage to enchanted player, it deals double that damage instead.
-R:Event$ DamageDone | ActiveZones$ Battlefield | ValidTarget$ Player.EnchantedBy | ReplaceWith$ DmgTimes2Combat | IsCombat$ True | Secondary$ True | Description$ If a source would deal damage to enchanted player, it deals double that damage instead.
-SVar:DmgTimes2:AB$DealDamage | Cost$ 0 | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ X | References$ X
-SVar:DmgTimes2Combat:AB$DealDamage | Cost$ 0 | CombatDamage$ True | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ X | References$ X
+R:Event$ DamageDone | ActiveZones$ Battlefield | ValidTarget$ Player.EnchantedBy | ReplaceWith$ DmgTwice | Description$ If a source would deal damage to enchanted player, it deals double that damage instead.
+SVar:DmgTwice:DB$ ReplaceEffect | VarName$ DamageAmount | VarValue$ X | References$ X
 SVar:X:ReplaceCount$DamageAmount/Twice
 SVar:Picture:http://www.wizards.com/global/images/magic/general/curse_of_bloodletting.jpg
 Oracle:Enchant player\nIf a source would deal damage to enchanted player, it deals double that damage to that player instead.
diff --git a/forge-gui/res/cardsfolder/d/dictate_of_the_twin_gods.txt b/forge-gui/res/cardsfolder/d/dictate_of_the_twin_gods.txt
index a09026bb175..5199731e287 100644
--- a/forge-gui/res/cardsfolder/d/dictate_of_the_twin_gods.txt
+++ b/forge-gui/res/cardsfolder/d/dictate_of_the_twin_gods.txt
@@ -2,10 +2,8 @@ Name:Dictate of the Twin Gods
 ManaCost:3 R R
 Types:Enchantment
 K:Flash
-R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Card | ValidTarget$ Permanent,Player | ReplaceWith$ DmgTwice | IsCombat$ False | Description$ If a source would deal damage to a permanent or player, it deals double that damage to that permanent or player instead.
-R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Card | ValidTarget$ Permanent,Player | ReplaceWith$ DmgTwiceCombat | IsCombat$ True | Secondary$ True | Description$ If a source would deal damage to a permanent or player, it deals double that damage to that permanent or player instead.
-SVar:DmgTwice:AB$ DealDamage | Cost$ 0 | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ X | References$ X
-SVar:DmgTwiceCombat:AB$ DealDamage | Cost$ 0 | CombatDamage$ True | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ X | References$ X
+R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Card | ValidTarget$ Permanent,Player | ReplaceWith$ DmgTwice | Description$ If a source would deal damage to a permanent or player, it deals double that damage to that permanent or player instead.
+SVar:DmgTwice:DB$ ReplaceEffect | VarName$ DamageAmount | VarValue$ X | References$ X
 SVar:X:ReplaceCount$DamageAmount/Twice
 SVar:PlayMain1:TRUE
 SVar:RemRandomDeck:True
diff --git a/forge-gui/res/cardsfolder/f/fire_servant.txt b/forge-gui/res/cardsfolder/f/fire_servant.txt
index cddeb8d0f85..0743457f0b7 100644
--- a/forge-gui/res/cardsfolder/f/fire_servant.txt
+++ b/forge-gui/res/cardsfolder/f/fire_servant.txt
@@ -3,7 +3,7 @@ ManaCost:3 R R
 Types:Creature Elemental
 PT:4/3
 R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Instant.YouCtrl,Sorcery.YouCtrl | ReplaceWith$ DmgTwice | Description$ If a red instant or sorcery spell you control would deal damage, it deals double that damage instead.
-SVar:DmgTwice:AB$DealDamage | Cost$ 0 | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ X | References$ X
+SVar:DmgTwice:DB$ ReplaceEffect | VarName$ DamageAmount | VarValue$ X | References$ X
 SVar:X:ReplaceCount$DamageAmount/Twice
 SVar:Picture:http://www.wizards.com/global/images/magic/general/fire_servant.jpg
 Oracle:If a red instant or sorcery spell you control would deal damage, it deals double that damage instead.
diff --git a/forge-gui/res/cardsfolder/g/gisela_blade_of_goldnight.txt b/forge-gui/res/cardsfolder/g/gisela_blade_of_goldnight.txt
index cda9fc59353..8adc4173d61 100644
--- a/forge-gui/res/cardsfolder/g/gisela_blade_of_goldnight.txt
+++ b/forge-gui/res/cardsfolder/g/gisela_blade_of_goldnight.txt
@@ -4,10 +4,8 @@ Types:Legendary Creature Angel
 PT:5/5
 K:Flying
 K:First Strike
-R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Card | ValidTarget$ Opponent,Permanent.OppCtrl | ReplaceWith$ DmgTwice | IsCombat$ False | Description$ If a source would deal damage to an opponent or a permanent an opponent controls, that source deals double that damage to that player or permanent instead.
-R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Card | ValidTarget$ Opponent,Permanent.OppCtrl | ReplaceWith$ DmgTwiceCombat | IsCombat$ True | Secondary$ True | Description$ If a source would deal damage to an opponent or a permanent an opponent controls, that source deals double that damage to that player or permanent instead.
-SVar:DmgTwice:AB$ DealDamage | Cost$ 0 | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ X | References$ X
-SVar:DmgTwiceCombat:AB$ DealDamage | Cost$ 0 | CombatDamage$ True | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ X | References$ X
+R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Card | ValidTarget$ Opponent,Permanent.OppCtrl | ReplaceWith$ DmgTwice | Description$ If a source would deal damage to an opponent or a permanent an opponent controls, that source deals double that damage to that player or permanent instead.
+SVar:DmgTwice:DB$ ReplaceEffect | VarName$ DamageAmount | VarValue$ X | References$ X
 SVar:X:ReplaceCount$DamageAmount/Twice
 S:Mode$ PreventDamage | Target$ You,Permanent.YouCtrl | Amount$ HalfUp | Description$ If a source would deal damage to you or a permanent you control, prevent half that damage, rounded up.
 SVar:PlayMain1:TRUE
diff --git a/forge-gui/res/cardsfolder/g/goldnight_castigator.txt b/forge-gui/res/cardsfolder/g/goldnight_castigator.txt
index 85c758d77bd..702c6d10280 100644
--- a/forge-gui/res/cardsfolder/g/goldnight_castigator.txt
+++ b/forge-gui/res/cardsfolder/g/goldnight_castigator.txt
@@ -4,12 +4,9 @@ Types:Creature Angel
 PT:4/9
 K:Flying
 K:Haste
-R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Card | ValidTarget$ You | ReplaceWith$ DmgTwice | IsCombat$ False | Description$ If a source would deal damage to you, it deals double that damage to you instead.
-R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Card | ValidTarget$ You | ReplaceWith$ DmgTwiceCombat | IsCombat$ True | Secondary$ True | Description$ If a source would deal damage to you, it deals double that damage to you instead.
-R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Card | ValidTarget$ Card.Self | ReplaceWith$ DmgTwice | IsCombat$ False | Description$ If a source would deal damage to CARDNAME, it deals double that damage to CARDNAME instead.
-R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Card | ValidTarget$ Card.Self | ReplaceWith$ DmgTwiceCombat | IsCombat$ True | Secondary$ True | Description$ If a source would deal damage to CARDNAME, it deals double that damage to CARDNAME instead.
-SVar:DmgTwice:AB$DealDamage | Cost$ 0 | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ X | References$ X
-SVar:DmgTwiceCombat:AB$DealDamage | Cost$ 0 | CombatDamage$ True | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ X | References$ X
+R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Card | ValidTarget$ You | ReplaceWith$ DmgTwice | Description$ If a source would deal damage to you, it deals double that damage to you instead.
+R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Card | ValidTarget$ Card.Self | ReplaceWith$ DmgTwice | Description$ If a source would deal damage to CARDNAME, it deals double that damage to CARDNAME instead.
+SVar:DmgTwice:DB$ ReplaceEffect | VarName$ DamageAmount | VarValue$ X | References$ X
 SVar:X:ReplaceCount$DamageAmount/Twice 
 SVar:Picture:http://www.wizards.com/global/images/magic/general/goldnight_castigator.jpg
 Oracle:Flying, haste\nIf a source would deal damage to you, it deals double that damage to you instead.\nIf a source would deal damage to Goldnight Castigator, it deals double that damage to Goldnight Castigator instead.
diff --git a/forge-gui/res/cardsfolder/g/gratuitous_violence.txt b/forge-gui/res/cardsfolder/g/gratuitous_violence.txt
index 986ca5be5d4..888384fa362 100644
--- a/forge-gui/res/cardsfolder/g/gratuitous_violence.txt
+++ b/forge-gui/res/cardsfolder/g/gratuitous_violence.txt
@@ -1,10 +1,8 @@
 Name:Gratuitous Violence
 ManaCost:2 R R R
 Types:Enchantment
-R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Creature.YouCtrl | ValidTarget$ Creature,Player | ReplaceWith$ DmgTwice | IsCombat$ False | Description$ If a creature you control would deal damage to a creature or player, it deals double that damage to that creature or player instead.
-R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Creature.YouCtrl | ValidTarget$ Creature,Player | ReplaceWith$ DmgTwiceCombat | IsCombat$ True | Secondary$ True | Description$ If a creature you control would deal damage to a creature or player, it deals double that damage to that creature or player instead.
-SVar:DmgTwice:AB$DealDamage | Cost$ 0 | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ X | References$ X
-SVar:DmgTwiceCombat:AB$DealDamage | Cost$ 0 | CombatDamage$ True | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ X | References$ X
+R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Creature.YouCtrl | ValidTarget$ Creature,Player | ReplaceWith$ DmgTwice | Description$ If a creature you control would deal damage to a creature or player, it deals double that damage to that creature or player instead.
+SVar:DmgTwice:DB$ ReplaceEffect | VarName$ DamageAmount | VarValue$ X | References$ X
 SVar:X:ReplaceCount$DamageAmount/Twice
 SVar:PlayMain1:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/gratuitous_violence.jpg
diff --git a/forge-gui/res/cardsfolder/l/lyzolda_the_blood_witch_avatar.txt b/forge-gui/res/cardsfolder/l/lyzolda_the_blood_witch_avatar.txt
index 3f17a054429..cd1529c930f 100644
--- a/forge-gui/res/cardsfolder/l/lyzolda_the_blood_witch_avatar.txt
+++ b/forge-gui/res/cardsfolder/l/lyzolda_the_blood_witch_avatar.txt
@@ -2,12 +2,11 @@ Name:Lyzolda, the Blood Witch Avatar
 ManaCost:no cost
 Types:Vanguard
 HandLifeModifier:-1/-1
-R:Event$ DamageDone | ValidSource$ Card.YouCtrl | ValidTarget$ Creature,Player | Hellbent$ True | ReplaceWith$ DmgTwice | IsCombat$ False | Description$ Hellbent - As long as you have no cards in hand, if a source you control would deal damage to a creature or player, it deals double that damage to that creature or player instead.
-R:Event$ DamageDone | ValidSource$ Card.YouCtrl | ValidTarget$ Creature,Player | Hellbent$ True | ReplaceWith$ DmgTwiceCombat | IsCombat$ True | Secondary$ True | Description$ Hellbent - As long as you have no cards in hand, if a source you control would deal damage to a creature or player, it deals double that damage to that creature or player instead.
-SVar:DmgTwice:AB$ DealDamage | Cost$ 0 | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ X | References$ X
-SVar:DmgTwiceCombat:AB$ DealDamage | Cost$ 0 | CombatDamage$ True | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ X | References$ X
+R:Event$ DamageDone | ValidSource$ Card.YouCtrl | ValidTarget$ Creature,Player | Hellbent$ True | ReplaceWith$ DmgTwice | Description$ Hellbent - As long as you have no cards in hand, if a source you control would deal damage to a creature or player, it deals double that damage to that creature or player instead.
+SVar:DmgTwice:DB$ ReplaceEffect | VarName$ DamageAmount | VarValue$ X | References$ X
 SVar:X:ReplaceCount$DamageAmount/Twice
 T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Command | Hellbent$ True | Execute$ LyzoldasDiscard | TriggerDescription$ Hellbent - At the beginning of your end step, if you have no cards in hand, each of your opponents discards a card.
 SVar:LyzoldasDiscard:AB$ Discard | Cost$ 0 | Defined$ Player.Opponent | NumCards$ 1 | Mode$ TgtChoose
+DeckHints:Ability$Discard
 SVar:Picture:http://downloads.cardforge.link/images/cards/VAN/Lyzolda, the Blood Witch Avatar.full.jpg
 Oracle:Hand -1, life -1\nHellbent - As long as you have no cards in hand, if a source you control would deal damage to a creature or player, it deals double that damage to that creature or player instead.\nHellbent - At the beginning of your end step, if you have no cards in hand, each of your opponents discards a card.
diff --git a/forge-gui/res/cardsfolder/m/mishra.txt b/forge-gui/res/cardsfolder/m/mishra.txt
index e9d660a2d57..8adb4c31207 100644
--- a/forge-gui/res/cardsfolder/m/mishra.txt
+++ b/forge-gui/res/cardsfolder/m/mishra.txt
@@ -2,10 +2,8 @@ Name:Mishra
 ManaCost:no cost
 Types:Vanguard
 HandLifeModifier:+0/-3
-R:Event$ DamageDone | ActiveZones$ Command | ValidSource$ Creature.YouCtrl | ReplaceWith$ DmgTimes2 | IsCombat$ False | Description$ If a creature you control would deal damage, it deals double that damage instead.
-R:Event$ DamageDone | ActiveZones$ Command | ValidSource$ Creature.YouCtrl | ReplaceWith$ DmgTimes2Combat | IsCombat$ True | Secondary$ True | Description$ If a creature you control would deal damage, it deals double that damage instead.
-SVar:DmgTimes2:AB$ DealDamage | Cost$ 0 | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ X | References$ X
-SVar:DmgTimes2Combat:AB$ DealDamage | Cost$ 0 | CombatDamage$ True | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ X | References$ X
+R:Event$ DamageDone | ActiveZones$ Command | ValidSource$ Creature.YouCtrl | ReplaceWith$ DmgTwice | Description$ If a creature you control would deal damage, it deals double that damage instead.
+SVar:DmgTwice:DB$ ReplaceEffect | VarName$ DamageAmount | VarValue$ X | References$ X
 SVar:X:ReplaceCount$DamageAmount/Twice
 SVar:Picture:http://downloads.cardforge.link/images/cards/VAN/Mishra.full.jpg
 Oracle:Hand +0, life -3\nIf a creature you control would deal damage, it deals double that damage instead.
diff --git a/forge-gui/res/cardsfolder/q/quest_for_pure_flame.txt b/forge-gui/res/cardsfolder/q/quest_for_pure_flame.txt
index a261be6795b..3fe21b6f2e7 100644
--- a/forge-gui/res/cardsfolder/q/quest_for_pure_flame.txt
+++ b/forge-gui/res/cardsfolder/q/quest_for_pure_flame.txt
@@ -3,11 +3,9 @@ ManaCost:R
 Types:Enchantment
 T:Mode$ DamageDone | ValidSource$ Card.YouCtrl | ValidTarget$ Opponent | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigPutCounter | TriggerDescription$ Whenever a source you control deals damage to an opponent, you may put a quest counter on CARDNAME.
 SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ QUEST | CounterNum$ 1
-A:AB$ Effect | Name$ Pure Flame Effect | Cost$ SubCounter<4/QUEST> Sac<1/CARDNAME> | ReplacementEffects$ CombatEvent,NonCombatEvent | SVars$ DmgTwiceCombat,DmgTwice,X | References$ CombatEvent,NonCombatEvent,DmgTwiceCombat,DmgTwice,X | SpellDescription$ If any source you control would deal damage to a creature or player this turn, it deals double that damage to that creature or player instead.
-SVar:CombatEvent:Event$ DamageDone | ValidSource$ Card.YouCtrl | ValidTarget$ Creature,Player | ReplaceWith$ DmgTwiceCombat | IsCombat$ True | Description$ If any source you control would deal damage to a creature or player this turn, it deals double that damage to that creature or player instead.
-SVar:NonCombatEvent:Event$ DamageDone | ValidSource$ Card.YouCtrl | ValidTarget$ Creature,Player | ReplaceWith$ DmgTwice | IsCombat$ False | Secondary$ True | Description$ If any source you control would deal damage to a creature or player this turn, it deals double that damage to that creature or player instead.
-SVar:DmgTwiceCombat:AB$DealDamage | Cost$ 0 | CombatDamage$ True | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ X
-SVar:DmgTwice:AB$DealDamage | Cost$ 0 | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ X
+A:AB$ Effect | Name$ Pure Flame Effect | Cost$ SubCounter<4/QUEST> Sac<1/CARDNAME> | ReplacementEffects$ DamageEvent | SVars$ DmgTwice,X | References$ DamageEvent,DmgTwice,X | SpellDescription$ If any source you control would deal damage to a creature or player this turn, it deals double that damage to that creature or player instead.
+SVar:DamageEvent:Event$ DamageDone | ValidSource$ Card.YouCtrl | ValidTarget$ Creature,Player | ReplaceWith$ DmgTwice | Description$ If any source you control would deal damage to a creature or player this turn, it deals double that damage to that creature or player instead.
+SVar:DmgTwice:DB$ ReplaceEffect | VarName$ DamageAmount | VarValue$ X | References$ X
 SVar:X:ReplaceCount$DamageAmount/Twice
 SVar:PlayMain1:TRUE
 SVar:RemAIDeck:True
diff --git a/forge-gui/res/cardsfolder/s/stronghold_furnace.txt b/forge-gui/res/cardsfolder/s/stronghold_furnace.txt
index 82b13954898..762240bf20b 100644
--- a/forge-gui/res/cardsfolder/s/stronghold_furnace.txt
+++ b/forge-gui/res/cardsfolder/s/stronghold_furnace.txt
@@ -1,10 +1,8 @@
 Name:Stronghold Furnace
 ManaCost:no cost
 Types:Plane Rath
-R:Event$ DamageDone | ActiveZones$ Command | ValidSource$ Card | ValidTarget$ Creature,Player | ReplaceWith$ DmgTwice | IsCombat$ False | Description$ If a source would deal damage to a creature or player, it deals double that damage to that creature or player instead.
-R:Event$ DamageDone | ActiveZones$ Command | ValidSource$ Card | ValidTarget$ Creature,Player | ReplaceWith$ DmgTwiceCombat | IsCombat$ True | Secondary$ True | Description$ If a source would deal damage to a creature or player, it deals double that damage to that creature or player instead.
-SVar:DmgTwice:AB$ DealDamage | Cost$ 0 | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ Y | References$ Y
-SVar:DmgTwiceCombat:AB$DealDamage | Cost$ 0 | CombatDamage$ True | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ Y | References$ Y
+R:Event$ DamageDone | ActiveZones$ Command | ValidSource$ Card | ValidTarget$ Creature,Player | ReplaceWith$ DmgTwice | Description$ If a source would deal damage to a creature or player, it deals double that damage to that creature or player instead.
+SVar:DmgTwice:DB$ ReplaceEffect | VarName$ DamageAmount | VarValue$ Y | References$ Y
 SVar:Y:ReplaceCount$DamageAmount/Twice
 T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, CARDNAME deals 1 damage to target creature or player.
 SVar:RolledChaos:AB$ DealDamage | Cost$ 0 | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 1