From 2c4c7492075e1f2e2adfa948c811ecc9bc8632b2 Mon Sep 17 00:00:00 2001
From: Hanmac <hanmac@cardforge.org>
Date: Fri, 30 Dec 2016 14:54:10 +0000
Subject: [PATCH] cards: update cards with ReplaceEffect

---
 .gitattributes                                   |  1 +
 .../res/cardsfolder/b/blood_of_the_martyr.txt    |  9 +++------
 forge-gui/res/cardsfolder/d/divine_presence.txt  |  6 ++----
 .../res/cardsfolder/e/empyrial_archangel.txt     |  7 ++-----
 forge-gui/res/cardsfolder/e/equal_treatment.txt  |  8 +++-----
 .../res/cardsfolder/g/ghosts_of_the_innocent.txt |  5 ++---
 forge-gui/res/cardsfolder/h/hardened_scales.txt  |  2 +-
 forge-gui/res/cardsfolder/h/harsh_judgment.txt   |  5 ++---
 forge-gui/res/cardsfolder/k/karonas_zealot.txt   |  9 +++------
 forge-gui/res/cardsfolder/k/kor_chant.txt        | 11 +++++------
 forge-gui/res/cardsfolder/k/kor_dirge.txt        | 11 +++++------
 .../res/cardsfolder/l/lashknife_barrier.txt      |  6 ++----
 .../res/cardsfolder/m/martyrs_of_korlis.txt      |  7 ++-----
 forge-gui/res/cardsfolder/m/mirror_strike.txt    |  5 ++---
 .../res/cardsfolder/o/oracles_attendants.txt     |  9 +++------
 forge-gui/res/cardsfolder/p/palisade_giant.txt   |  7 ++-----
 forge-gui/res/cardsfolder/p/pariah.txt           |  7 ++-----
 forge-gui/res/cardsfolder/p/pariahs_shield.txt   |  7 ++-----
 .../res/cardsfolder/p/protector_of_the_crown.txt |  9 +++------
 forge-gui/res/cardsfolder/r/reflect_damage.txt   | 16 ++++++++++++++++
 .../res/cardsfolder/s/shimian_night_stalker.txt  |  9 +++------
 forge-gui/res/cardsfolder/s/sivvis_valor.txt     | 11 ++++-------
 forge-gui/res/cardsfolder/t/treacherous_link.txt |  7 ++-----
 forge-gui/res/cardsfolder/t/turn_the_tables.txt  |  5 ++---
 .../res/cardsfolder/v/veteran_bodyguard.txt      |  7 ++-----
 .../res/cardsfolder/w/weathered_bodyguards.txt   |  3 +--
 26 files changed, 77 insertions(+), 112 deletions(-)
 create mode 100644 forge-gui/res/cardsfolder/r/reflect_damage.txt

diff --git a/.gitattributes b/.gitattributes
index a6d708677e0..3854839f438 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -12456,6 +12456,7 @@ forge-gui/res/cardsfolder/r/redwood_treefolk.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/r/reef_pirates.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/r/reef_shaman.txt -text
 forge-gui/res/cardsfolder/r/reef_worm.txt -text
+forge-gui/res/cardsfolder/r/reflect_damage.txt -text
 forge-gui/res/cardsfolder/r/reflecting_mirror.txt -text
 forge-gui/res/cardsfolder/r/reflecting_pool.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/r/reflector_mage.txt -text
diff --git a/forge-gui/res/cardsfolder/b/blood_of_the_martyr.txt b/forge-gui/res/cardsfolder/b/blood_of_the_martyr.txt
index bde7b3ac9a7..614735a51a1 100644
--- a/forge-gui/res/cardsfolder/b/blood_of_the_martyr.txt
+++ b/forge-gui/res/cardsfolder/b/blood_of_the_martyr.txt
@@ -1,12 +1,9 @@
 Name:Blood of the Martyr
 ManaCost:W W W
 Types:Instant
-A:SP$ Effect | Cost$ W W W | Name$ Blood of the Martyr Effect | ReplacementEffects$ MartyrCombat,MartyrNonCombat | SVars$ CombatDmgToYou,NonCombatDmgToYou,X | SpellDescription$ Until end of turn, if damage would be dealt to any creature, you may have that damage dealt to you instead.
-SVar:MartyrCombat:Event$ DamageDone | ValidTarget$ Creature | Optional$ True | OptionalDecider$ You | IsCombat$ True | ReplaceWith$ CombatDmgToYou | Description$ Until end of turn, if damage would be dealt to any creature, you may have that damage dealt to you instead.
-SVar:MartyrNonCombat:Event$ DamageDone | ValidTarget$ Creature | Optional$ True | OptionalDecider$ You | IsCombat$ False | ReplaceWith$ NonCombatDmgToYou | Secondary$ True | Description$ Until end of turn, if damage would be dealt to any creature, you may have that damage dealt to you instead.
-SVar:CombatDmgToYou:AB$DealDamage | Cost$ 0 | Defined$ You | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ X
-SVar:NonCombatDmgToYou:AB$DealDamage | Cost$ 0 | Defined$ You | DamageSource$ ReplacedSource | NumDmg$ X
-SVar:X:ReplaceCount$DamageAmount
+A:SP$ Effect | Cost$ W W W | Name$ Blood of the Martyr Effect | ReplacementEffects$ MartyrDamage | SVars$ DmgYou | SpellDescription$ Until end of turn, if damage would be dealt to any creature, you may have that damage dealt to you instead.
+SVar:Damage:Event$ DamageDone | ValidTarget$ Creature | Optional$ True | OptionalDecider$ You | ReplaceWith$ DmgYou | Description$ Until end of turn, if damage would be dealt to any creature, you may have that damage dealt to you instead.
+SVar:DmgYou:DB$ ReplaceEffect | VarName$ Affected | VarValue$ You | VarType$ Player
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/blood_of_the_martyr.jpg
 Oracle:Until end of turn, if damage would be dealt to any creature, you may have that damage dealt to you instead.
diff --git a/forge-gui/res/cardsfolder/d/divine_presence.txt b/forge-gui/res/cardsfolder/d/divine_presence.txt
index 5f0ebaef3ec..4695735f16c 100644
--- a/forge-gui/res/cardsfolder/d/divine_presence.txt
+++ b/forge-gui/res/cardsfolder/d/divine_presence.txt
@@ -1,10 +1,8 @@
 Name:Divine Presence
 ManaCost:2 W
 Types:Enchantment
-R:Event$ DamageDone | ActiveZones$ Battlefield | ValidTarget$ Creature,Player | DamageAmount$ GE4 | ReplaceWith$ Dmg3 | IsCombat$ False | Description$ If a source would deal 4 or more damage to a creature or player, that source deals 3 damage to that creature or player instead.
-R:Event$ DamageDone | ActiveZones$ Battlefield | ValidTarget$ Creature,Player | DamageAmount$ GE4 | IsCombat$ True | ReplaceWith$ Dmg3Combat | Secondary$ True | Description$ If a source would deal 4 or more damage to a creature or player, that source deals 3 damage to that creature or player instead.
-SVar:Dmg3:AB$DealDamage | Cost$ 0 | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ 3
-SVar:Dmg3Combat:AB$DealDamage | Cost$ 0 | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ 3
+R:Event$ DamageDone | ActiveZones$ Battlefield | ValidTarget$ Creature,Player | DamageAmount$ GE4 | ReplaceWith$ Dmg3 | Description$ If a source would deal 4 or more damage to a creature or player, that source deals 3 damage to that creature or player instead.
+SVar:Dmg3:DB$ ReplaceEffect | VarName$ DamageAmount | VarValue$ 3
 SVar:NonStackingEffect:True
 SVar:PlayMain1:TRUE
 SVar:RemRandomDeck:True
diff --git a/forge-gui/res/cardsfolder/e/empyrial_archangel.txt b/forge-gui/res/cardsfolder/e/empyrial_archangel.txt
index cbf83b62b4c..819363c9de1 100644
--- a/forge-gui/res/cardsfolder/e/empyrial_archangel.txt
+++ b/forge-gui/res/cardsfolder/e/empyrial_archangel.txt
@@ -4,10 +4,7 @@ Types:Creature Angel
 PT:5/8
 K:Flying
 K:Shroud
-R:Event$ DamageDone | ActiveZones$ Battlefield | ValidTarget$ You | ReplaceWith$ DmgSelf | IsCombat$ False | Description$ All damage that would be dealt to you is dealt to CARDNAME instead.
-R:Event$ DamageDone | ActiveZones$ Battlefield | ValidTarget$ You | ReplaceWith$ DmgSelfCombat | IsCombat$ True | Secondary$ True | Description$ All damage that would be dealt to you is dealt to CARDNAME instead.
-SVar:DmgSelf:AB$DealDamage | Cost$ 0 | Defined$ Self | DamageSource$ ReplacedSource | NumDmg$ X | References$ X
-SVar:DmgSelfCombat:AB$DealDamage | Cost$ 0 | CombatDamage$ True | Defined$ Self | DamageSource$ ReplacedSource | NumDmg$ X | References$ X
-SVar:X:ReplaceCount$DamageAmount
+R:Event$ DamageDone | ActiveZones$ Battlefield | ValidTarget$ You | ReplaceWith$ DmgSelf | Description$ All damage that would be dealt to you is dealt to CARDNAME instead.
+SVar:DmgSelf:DB$ ReplaceEffect | VarName$ Affected | VarValue$ Self | VarType$ Card
 SVar:Picture:http://www.wizards.com/global/images/magic/general/empyrial_archangel.jpg
 Oracle:Flying\nShroud (This creature can't be the target of spells or abilities.)\nAll damage that would be dealt to you is dealt to Empyrial Archangel instead.
diff --git a/forge-gui/res/cardsfolder/e/equal_treatment.txt b/forge-gui/res/cardsfolder/e/equal_treatment.txt
index 12915c3b900..4708f4f30a1 100644
--- a/forge-gui/res/cardsfolder/e/equal_treatment.txt
+++ b/forge-gui/res/cardsfolder/e/equal_treatment.txt
@@ -1,11 +1,9 @@
 Name:Equal Treatment
 ManaCost:1 W
 Types:Instant
-A:SP$ Effect | Cost$ 1 W | Name$ Equal Treatment Effect | ReplacementEffects$ EqualEvent,EqualEvent2 | SVars$ DmgTwo,DmgTwo2 | SubAbility$ DBDraw | SpellDescription$ If any source would deal 1 or more damage to a creature or player this turn, it deals 2 damage to that creature or player instead. Draw a card.
-SVar:EqualEvent:Event$ DamageDone | ActiveZones$ Battlefield | IsCombat$ False | ValidSource$ Card | ValidTarget$ Creature,Player | ReplaceWith$ DmgTwo | Description$ If any source would deal 1 or more damage to a creature or player this turn, it deals 2 damage to that creature or player instead.
-SVar:DmgTwo:AB$ DealDamage | Cost$ 0 | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ 2
-SVar:EqualEvent2:Event$ DamageDone | ActiveZones$ Battlefield | IsCombat$ True | Secondary$ True | ValidSource$ Card | ValidTarget$ Creature,Player | ReplaceWith$ DmgTwo2 | Description$ If any source would deal 1 or more damage to a creature or player this turn, it deals 2 damage to that creature or player instead.
-SVar:DmgTwo2:AB$ DealDamage | Cost$ 0 | CombatDamage$ True | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ 2
+A:SP$ Effect | Cost$ 1 W | Name$ Equal Treatment Effect | ReplacementEffects$ EqualEvent | SVars$ DmgTwo | SubAbility$ DBDraw | SpellDescription$ If any source would deal 1 or more damage to a creature or player this turn, it deals 2 damage to that creature or player instead. Draw a card.
+SVar:EqualEvent:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Card | ValidTarget$ Creature,Player | ReplaceWith$ DmgTwo | Description$ If any source would deal 1 or more damage to a creature or player this turn, it deals 2 damage to that creature or player instead.
+SVar:DmgTwo:DB$ ReplaceEffect | VarName$ DamageAmount | VarValue$ 2
 SVar:DBDraw:DB$ Draw | NumCards$ 1
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/equal_treatment.jpg
diff --git a/forge-gui/res/cardsfolder/g/ghosts_of_the_innocent.txt b/forge-gui/res/cardsfolder/g/ghosts_of_the_innocent.txt
index 064bee93979..af5332643db 100644
--- a/forge-gui/res/cardsfolder/g/ghosts_of_the_innocent.txt
+++ b/forge-gui/res/cardsfolder/g/ghosts_of_the_innocent.txt
@@ -2,10 +2,9 @@ Name:Ghosts of the Innocent
 ManaCost:5 W W
 Types:Creature Spirit
 PT:4/5
-R:Event$ DamageDone | ActiveZones$ Battlefield | ValidTarget$ Player,Creature | ReplaceWith$ DmgHalfDown | IsCombat$ False | Description$ If a source would deal damage to a creature or player, it deals half that damage, rounded down, to that creature or player instead.
-R:Event$ DamageDone | ActiveZones$ Battlefield | ValidTarget$ Player,Creature | ReplaceWith$ DmgHalfDownCombat | IsCombat$ True | Secondary$ True | Description$ If a source would deal damage to a creature or player, it deals half that damage, rounded down, to that creature or player instead.
+R:Event$ DamageDone | ActiveZones$ Battlefield | ValidTarget$ Player,Creature | ReplaceWith$ DmgHalfDown | Description$ If a source would deal damage to a creature or player, it deals half that damage, rounded down, to that creature or player instead.
 SVar:DmgHalfDown:AB$ DealDamage | Cost$ 0 | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ X | References$ X
-SVar:DmgHalfDownCombat:AB$ DealDamage | Cost$ 0 | CombatDamage$ True | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ X | References$ X
+SVar:DmgHalfDown:DB$ ReplaceEffect | VarName$ DamageAmount | VarValue$ X | References$ X
 SVar:X:ReplaceCount$DamageAmount/HalfDown
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ghosts_of_the_innocent.jpg
 SVar:RemAIDeck:True
diff --git a/forge-gui/res/cardsfolder/h/hardened_scales.txt b/forge-gui/res/cardsfolder/h/hardened_scales.txt
index 90c1ff8291c..89301661a30 100644
--- a/forge-gui/res/cardsfolder/h/hardened_scales.txt
+++ b/forge-gui/res/cardsfolder/h/hardened_scales.txt
@@ -2,7 +2,7 @@ Name:Hardened Scales
 ManaCost:G
 Types:Enchantment
 R:Event$ AddCounter | ActiveZones$ Battlefield | ValidCard$ Creature.YouCtrl | ValidCounterType$ P1P1 | ReplaceWith$ AddOneMoreCounters | Description$ If one or more +1/+1 counters would be placed on a creature you control, that many plus one +1/+1 counters are placed on it instead.
-SVar:AddOneMoreCounters:DB$ PutCounter | Defined$ ReplacedCard | CounterType$ ReplacedCounterType | CounterNum$ X | References$ X
+SVar:AddOneMoreCounters:DB$ ReplaceEffect | VarName$ CounterNum | VarValue$ X | References$ X
 SVar:X:ReplaceCount$CounterNum/Plus.1
 SVar:RemRandomDeck:True
 DeckNeeds:Ability$Counters
diff --git a/forge-gui/res/cardsfolder/h/harsh_judgment.txt b/forge-gui/res/cardsfolder/h/harsh_judgment.txt
index af3a99f8431..2e7fd9fe05d 100644
--- a/forge-gui/res/cardsfolder/h/harsh_judgment.txt
+++ b/forge-gui/res/cardsfolder/h/harsh_judgment.txt
@@ -3,9 +3,8 @@ ManaCost:2 W W
 Types:Enchantment
 K:ETBReplacement:Other:ChooseColor
 SVar:ChooseColor:DB$ ChooseColor | Defined$ You | AILogic$ MostProminentInHumanDeck | SpellDescription$ As CARDNAME enters the battlefield, choose a color.
-R:Event$ DamageDone | ValidTarget$ You | ActiveZones$ Battlefield | ValidSource$ Instant.ChosenColor,Sorcery.ChosenColor | IsCombat$ False | ReplaceWith$ HarshDmg | Description$ If an instant or sorcery spell of the chosen color would deal damage to you, it deals that damage to its controller instead.
-SVar:HarshDmg:AB$ DealDamage | Cost$ 0 | Defined$ ReplacedSourceController | DamageSource$ ReplacedSource | NumDmg$ HarshX | References$ HarshX
-SVar:HarshX:ReplaceCount$DamageAmount
+R:Event$ DamageDone | ValidTarget$ You | ActiveZones$ Battlefield | ValidSource$ Instant.ChosenColor,Sorcery.ChosenColor | ReplaceWith$ HarshDmg | Description$ If an instant or sorcery spell of the chosen color would deal damage to you, it deals that damage to its controller instead.
+SVar:HarshDmg:DB$ ReplaceEffect | VarName$ Affected | VarValue$ ReplacedSourceController | VarType$ Player
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/harsh_judgment.jpg
 Oracle:As Harsh Judgment enters the battlefield, choose a color.\nIf an instant or sorcery spell of the chosen color would deal damage to you, it deals that damage to its controller instead.
diff --git a/forge-gui/res/cardsfolder/k/karonas_zealot.txt b/forge-gui/res/cardsfolder/k/karonas_zealot.txt
index 2c33c36e540..a7582dbed58 100644
--- a/forge-gui/res/cardsfolder/k/karonas_zealot.txt
+++ b/forge-gui/res/cardsfolder/k/karonas_zealot.txt
@@ -4,14 +4,11 @@ Types:Creature Human Cleric
 PT:2/5
 K:Morph:3 W W
 T:Mode$ TurnFaceUp | ValidCard$ Card.Self | Execute$ KaronaEffect | TriggerZones$ Battlefield | TriggerDescription$ When CARDNAME is turned face up, all damage that would be dealt to it this turn is dealt to target creature instead.
-SVar:KaronaEffect:DB$ Effect | ValidTgts$ Creature | TgtPrompt$ Select target creature to redirect the damage to | ReplacementEffects$ ZealotCombat,ZealotNonCombat | Triggers$ OutOfSight | SVars$ ExileEffect,CombatDmg,NonCombatDmg,X | Duration$ HostLeavesOrEOT | RememberObjects$ Self | ImprintCards$ Targeted
-SVar:ZealotCombat:Event$ DamageDone | ValidTarget$ Creature.IsRemembered | IsCombat$ True | ReplaceWith$ CombatDmg | IsPresent$ Creature.IsImprinted | Description$ All damage that would be dealt to Karona's Zealot this turn is dealt to target creature instead.
-SVar:ZealotNonCombat:Event$ DamageDone | ValidTarget$ Creature.IsRemembered | IsCombat$ False | ReplaceWith$ NonCombatDmg | Secondary$ True | IsPresent$ Creature.IsImprinted | Description$ All damage that would be dealt to Karona's Zealot this turn is dealt to target creature instead.
-SVar:CombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Imprinted | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ X | References$ X
-SVar:NonCombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Imprinted | DamageSource$ ReplacedSource | NumDmg$ X | References$ X
+SVar:KaronaEffect:DB$ Effect | ValidTgts$ Creature | TgtPrompt$ Select target creature to redirect the damage to | ReplacementEffects$ ZealotDamage | Triggers$ OutOfSight | SVars$ ExileEffect,MirrorStrikeDmg | Duration$ HostLeavesOrEOT | ImprintCards$ Targeted
+SVar:ZealotDamage:Event$ DamageDone | ValidTarget$ Creature.EffectSource | ReplaceWith$ MirrorStrikeDmg | IsPresent$ Creature.IsImprinted | Description$ All damage that would be dealt to Karona's Zealot this turn is dealt to target creature instead.
+SVar:MirrorStrikeDmg:DB$ ReplaceEffect | VarName$ Affected | VarValue$ Imprinted | VarType$ Card
 SVar:OutOfSight:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | Defined$ Imprinted | Execute$ ExileEffect | Static$ True
 SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
-SVar:X:ReplaceCount$DamageAmount
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/karonas_zealot.jpg
 Oracle:Morph {3}{W}{W} (You may cast this card face down as a 2/2 creature for {3}. Turn it face up any time for its morph cost.)\nWhen Karona's Zealot is turned face up, all damage that would be dealt to it this turn is dealt to target creature instead.
diff --git a/forge-gui/res/cardsfolder/k/kor_chant.txt b/forge-gui/res/cardsfolder/k/kor_chant.txt
index 61c8d26c306..eafca1e88b5 100644
--- a/forge-gui/res/cardsfolder/k/kor_chant.txt
+++ b/forge-gui/res/cardsfolder/k/kor_chant.txt
@@ -6,17 +6,16 @@ A:SP$ Pump | Cost$ 2 W | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target
 
 SVar:DBChooseSource:DB$ ChooseSource | Choices$ Card | SubAbility$ DBEffect
 
-SVar:DBEffect:DB$ Effect | ValidTgts$ Creature | TargetUnique$ True | TgtPrompt$ Select target creature to redirect the damage to | ReplacementEffects$ SelflessCombat,SelflessNonCombat | Triggers$ OutOfSight | SVars$ CombatDmg,NonCombatDmg,ExileEffect,X | References$ Combat,NonCombat,OutOfSight,CombatDmg,NonCombatDmg,ExileEffect,X | ImprintCards$ ParentTarget | RememberObjects$ ThisTargetedCard | SubAbility$ DBCleanup | ConditionDefined$ ParentTarget | ConditionPresent$ Card | ConditionCompare$ GE1
+SVar:DBEffect:DB$ Effect | ValidTgts$ Creature | TargetUnique$ True | TgtPrompt$ Select target creature to redirect the damage to | ReplacementEffects$ SelflessDamage | Triggers$ OutOfSight | SVars$ SelflessDmg,ExileEffect | References$ SelflessDamage,OutOfSight,SelflessDmg,ExileEffect | ImprintCards$ ParentTarget | RememberObjects$ ThisTargetedCard | SubAbility$ DBCleanup | ConditionDefined$ ParentTarget | ConditionPresent$ Card | ConditionCompare$ GE1
+
+SVar:SelflessDamage:Event$ DamageDone | ValidTarget$ Creature.IsImprinted | ValidSource$ Card.ChosenCard | ReplaceWith$ SelflessDmg | IsPresent$ Creature.IsRemembered | Description$ All damage that would be dealt this turn to target creature you control by a source of your choice is dealt to another target creature instead.
+
+SVar:SelflessDmg:DB$ ReplaceEffect | VarName$ Affected | VarValue$ Remembered | VarType$ Card
 
-SVar:SelflessCombat:Event$ DamageDone | ValidTarget$ Creature.IsImprinted | ValidSource$ Card.ChosenCard | IsCombat$ True | ReplaceWith$ CombatDmg | IsPresent$ Creature.IsRemembered | Description$ All damage that would be dealt this turn to target creature you control by a source of your choice is dealt to another target creature instead.
-SVar:SelflessNonCombat:Event$ DamageDone | ValidTarget$ Creature.IsImprinted | ValidSource$ Card.ChosenCard | IsCombat$ False | ReplaceWith$ NonCombatDmg | Secondary$ True | IsPresent$ Creature.IsRemembered | Description$ All damage that would be dealt this turn to target creature you control by a source of your choice is dealt to another target creature instead.
-SVar:CombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Remembered | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ X
-SVar:NonCombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Remembered | DamageSource$ ReplacedSource | NumDmg$ X
 SVar:OutOfSight:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | Defined$ Imprinted,Remembered | Execute$ ExileEffect | Static$ True
 
 SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile | Static$ True
 SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True
-SVar:X:ReplaceCount$DamageAmount
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kor_chant.jpg
 Oracle:All damage that would be dealt this turn to target creature you control by a source of your choice is dealt to another target creature instead.
diff --git a/forge-gui/res/cardsfolder/k/kor_dirge.txt b/forge-gui/res/cardsfolder/k/kor_dirge.txt
index e86a5e8dd7e..d2c28ba57d3 100644
--- a/forge-gui/res/cardsfolder/k/kor_dirge.txt
+++ b/forge-gui/res/cardsfolder/k/kor_dirge.txt
@@ -6,17 +6,16 @@ A:SP$ Pump | Cost$ 2 B | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target
 
 SVar:DBChooseSource:DB$ ChooseSource | Choices$ Card | SubAbility$ DBEffect
 
-SVar:DBEffect:DB$ Effect | ValidTgts$ Creature | TargetUnique$ True | TgtPrompt$ Select target creature to redirect the damage to | ReplacementEffects$ SelflessCombat,SelflessNonCombat | Triggers$ OutOfSight | SVars$ CombatDmg,NonCombatDmg,ExileEffect,X | References$ Combat,NonCombat,OutOfSight,CombatDmg,NonCombatDmg,ExileEffect,X | ImprintCards$ ParentTarget | RememberObjects$ ThisTargetedCard | SubAbility$ DBCleanup | ConditionDefined$ ParentTarget | ConditionPresent$ Card | ConditionCompare$ GE1
+SVar:DBEffect:DB$ Effect | ValidTgts$ Creature | TargetUnique$ True | TgtPrompt$ Select target creature to redirect the damage to | ReplacementEffects$ SelflessDamage | Triggers$ OutOfSight | SVars$ SelflessDmg,ExileEffect | References$ SelflessDamage,OutOfSight,SelflessDmg,ExileEffect | ImprintCards$ ParentTarget | RememberObjects$ ThisTargetedCard | SubAbility$ DBCleanup | ConditionDefined$ ParentTarget | ConditionPresent$ Card | ConditionCompare$ GE1
+
+SVar:SelflessDamage:Event$ DamageDone | ValidTarget$ Creature.IsImprinted | ValidSource$ Card.ChosenCard | ReplaceWith$ SelflessDmg | IsPresent$ Creature.IsRemembered | Description$ All damage that would be dealt this turn to target creature you control by a source of your choice is dealt to another target creature instead.
+
+SVar:SelflessDmg:DB$ ReplaceEffect | VarName$ Affected | VarValue$ Remembered | VarType$ Card
 
-SVar:SelflessCombat:Event$ DamageDone | ValidTarget$ Creature.IsImprinted | ValidSource$ Card.ChosenCard | IsCombat$ True | ReplaceWith$ CombatDmg | IsPresent$ Creature.IsRemembered | Description$ All damage that would be dealt this turn to target creature you control by a source of your choice is dealt to another target creature instead.
-SVar:SelflessNonCombat:Event$ DamageDone | ValidTarget$ Creature.IsImprinted | ValidSource$ Card.ChosenCard | IsCombat$ False | ReplaceWith$ NonCombatDmg | Secondary$ True | IsPresent$ Creature.IsRemembered | Description$ All damage that would be dealt this turn to target creature you control by a source of your choice is dealt to another target creature instead.
-SVar:CombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Remembered | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ X
-SVar:NonCombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Remembered | DamageSource$ ReplacedSource | NumDmg$ X
 SVar:OutOfSight:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | Defined$ Imprinted,Remembered | Execute$ ExileEffect | Static$ True
 
 SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile | Static$ True
 SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True
-SVar:X:ReplaceCount$DamageAmount
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kor_dirge.jpg
 Oracle:All damage that would be dealt this turn to target creature you control by a source of your choice is dealt to another target creature instead.
diff --git a/forge-gui/res/cardsfolder/l/lashknife_barrier.txt b/forge-gui/res/cardsfolder/l/lashknife_barrier.txt
index ffe49f1da1e..f8e7da3cce2 100644
--- a/forge-gui/res/cardsfolder/l/lashknife_barrier.txt
+++ b/forge-gui/res/cardsfolder/l/lashknife_barrier.txt
@@ -1,10 +1,8 @@
 Name:Lashknife Barrier
 ManaCost:2 W
 Types:Enchantment
-R:Event$ DamageDone | ActiveZones$ Battlefield | ValidTarget$ Creature.YouCtrl | ReplaceWith$ DmgMinus1 | IsCombat$ False | Description$ If a source would deal damage to a creature you control, it deals that much damage minus 1 to that creature instead.
-R:Event$ DamageDone | ActiveZones$ Battlefield | ValidTarget$ Creature.YouCtrl | ReplaceWith$ DmgMinus1Combat | IsCombat$ True | Secondary$ True | Description$ If a source would deal damage to a creature you control, it deals that much damage minus 1 to that creature instead.
-SVar:DmgMinus1:AB$DealDamage | Cost$ 0 | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ X | References$ X
-SVar:DmgMinus1Combat:AB$DealDamage | Cost$ 0 | CombatDamage$ True | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ X | References$ X
+R:Event$ DamageDone | ActiveZones$ Battlefield | ValidTarget$ Creature.YouCtrl | ReplaceWith$ DmgMinus1 | Description$ If a source would deal damage to a creature you control, it deals that much damage minus 1 to that creature instead.
+SVar:DmgMinus1:DB$ ReplaceEffect | VarName$ DamageAmount | VarValue$ X | References$ X
 SVar:X:ReplaceCount$DamageAmount/Minus.1
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, draw a card.
 SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1
diff --git a/forge-gui/res/cardsfolder/m/martyrs_of_korlis.txt b/forge-gui/res/cardsfolder/m/martyrs_of_korlis.txt
index 1564a82caa3..d25ce4f61d8 100644
--- a/forge-gui/res/cardsfolder/m/martyrs_of_korlis.txt
+++ b/forge-gui/res/cardsfolder/m/martyrs_of_korlis.txt
@@ -2,10 +2,7 @@ Name:Martyrs of Korlis
 ManaCost:3 W W
 Types:Creature Human
 PT:1/6
-R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Artifact | ValidTarget$ You | ReplaceWith$ DmgMartyrsofKorlisSelf | IsCombat$ False | IsPresent$ Card.Self+untapped | Description$ As long as CARDNAME is untapped, all damage that would be dealt to you by artifacts is dealt to CARDNAME instead.
-R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Artifact | ValidTarget$ You | ReplaceWith$ DmgMartyrsofKorlisSelfCombat | IsCombat$ True | IsPresent$ Card.Self+untapped | Secondary$ True | Description$ As long as CARDNAME is untapped, all damage that would be dealt to you by artifacts is dealt to CARDNAME instead.
-SVar:DmgMartyrsofKorlisSelf:AB$DealDamage | Cost$ 0 | Defined$ Self | DamageSource$ ReplacedSource | NumDmg$ MartyrsofKorlisX | References$ MartyrsofKorlisX
-SVar:DmgMartyrsofKorlisSelfCombat:AB$DealDamage | Cost$ 0 | CombatDamage$ True | Defined$ Self | DamageSource$ ReplacedSource | NumDmg$ MartyrsofKorlisX | References$ MartyrsofKorlisX
-SVar:MartyrsofKorlisX:ReplaceCount$DamageAmount
+R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Artifact | ValidTarget$ You | ReplaceWith$ DmgMe | IsPresent$ Card.Self+untapped | Description$ As long as CARDNAME is untapped, all damage that would be dealt to you by artifacts is dealt to CARDNAME instead.
+SVar:DmgMe:DB$ ReplaceEffect | VarName$ Affected | VarValue$ Self | VarType$ Card
 SVar:Picture:http://www.wizards.com/global/images/magic/general/martyrs_of_korlis.jpg
 Oracle:As long as Martyrs of Korlis is untapped, all damage that would be dealt to you by artifacts is dealt to Martyrs of Korlis instead.
diff --git a/forge-gui/res/cardsfolder/m/mirror_strike.txt b/forge-gui/res/cardsfolder/m/mirror_strike.txt
index 8431cc96c92..d5717fa4c93 100644
--- a/forge-gui/res/cardsfolder/m/mirror_strike.txt
+++ b/forge-gui/res/cardsfolder/m/mirror_strike.txt
@@ -1,10 +1,9 @@
 Name:Mirror Strike
 ManaCost:3 W
 Types:Instant
-A:SP$ Effect | Cost$ 3 W | Name$ Mirror Strike Effect | ReplacementEffects$ DamageEvent | SVars$ MirrorStrikeDmg,MirroredX | RememberObjects$ TargetedController | ImprintCards$ Targeted | ValidTgts$ Creature.attacking+unblocked | TgtPrompt$ Select target unblocked creature | IsCurse$ True | SpellDescription$ All combat damage that would be dealt to you this turn by target unblocked creature is dealt to its controller instead.
+A:SP$ Effect | Cost$ 3 W | Name$ Mirror Strike Effect | ReplacementEffects$ DamageEvent | SVars$ MirrorStrikeDmg | ImprintCards$ Targeted | ValidTgts$ Creature.attacking+unblocked | TgtPrompt$ Select target unblocked creature | IsCurse$ True | SpellDescription$ All combat damage that would be dealt to you this turn by target unblocked creature is dealt to its controller instead.
 SVar:DamageEvent:Event$ DamageDone | ValidSource$ Creature.IsImprinted | ValidTarget$ You | ReplaceWith$ MirrorStrikeDmg | IsCombat$ True | Description$ All combat damage that would be dealt to you this turn by target unblocked creature is dealt to its controller instead.
-SVar:MirrorStrikeDmg:AB$ DealDamage | Cost$ 0 | CombatDamage$ True | Defined$ Remembered | DamageSource$ ReplacedSource | NumDmg$ MirroredX | References$ MirroredX
-SVar:MirroredX:ReplaceCount$DamageAmount
+SVar:MirrorStrikeDmg:DB$ ReplaceEffect | VarName$ Affected | VarValue$ ReplacedSourceController | VarType$ Player
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mirror_strike.jpg
 Oracle:All combat damage that would be dealt to you this turn by target unblocked creature is dealt to its controller instead.
diff --git a/forge-gui/res/cardsfolder/o/oracles_attendants.txt b/forge-gui/res/cardsfolder/o/oracles_attendants.txt
index 7692cce5502..265042e38d6 100644
--- a/forge-gui/res/cardsfolder/o/oracles_attendants.txt
+++ b/forge-gui/res/cardsfolder/o/oracles_attendants.txt
@@ -3,15 +3,12 @@ ManaCost:3 W
 Types:Creature Human Soldier
 PT:1/5
 A:AB$ ChooseSource | Cost$ T | Choices$ Card | AILogic$ NeedsPrevention | SubAbility$ DBEffect | SpellDescription$ All damage that would be dealt to target creature this turn by a source of your choice is dealt to CARDNAME instead.
-SVar:DBEffect:DB$ Effect | ValidTgts$ Creature | TgtPrompt$ Select target creature to redirect the damage from | ReplacementEffects$ SelflessCombat,SelflessNonCombat | Triggers$ OutOfSight | SVars$ CombatDmg,NonCombatDmg,ExileEffect,X | References$ SelflessCombat,SelflessNonCombat,OutOfSight,CombatDmg,NonCombatDmg,ExileEffect,X | Duration$ HostLeavesOrEOT | ImprintCards$ Targeted | SubAbility$ DBCleanup | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ GE1
-SVar:SelflessCombat:Event$ DamageDone | ValidTarget$ Creature.IsImprinted | ValidSource$ Card.ChosenCard | IsCombat$ True | ReplaceWith$ CombatDmg | Description$ All damage that would be dealt to target creature this turn by a source of your choice is dealt to Oracle's Attendants instead.
-SVar:SelflessNonCombat:Event$ DamageDone | ValidTarget$ Creature.IsImprinted | ValidSource$ Card.ChosenCard | IsCombat$ False | ReplaceWith$ NonCombatDmg | Secondary$ True | Description$ All damage that would be dealt to target creature this turn by a source of your choice is dealt to Oracle's Attendants instead.
-SVar:CombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ EffectSource | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ X
-SVar:NonCombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ EffectSource | DamageSource$ ReplacedSource | NumDmg$ X
+SVar:DBEffect:DB$ Effect | ValidTgts$ Creature | TgtPrompt$ Select target creature to redirect the damage from | ReplacementEffects$ SelflessCombat,SelflessNonCombat | Triggers$ OutOfSight | SVars$ DmgSelf,ExileEffect | References$ SelflessDamage,OutOfSight,DmgSelf,ExileEffect | Duration$ HostLeavesOrEOT | ImprintCards$ Targeted | SubAbility$ DBCleanup | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ GE1
+SVar:SelflessDamage:Event$ DamageDone | ValidTarget$ Creature.IsImprinted | ValidSource$ Card.ChosenCard | ReplaceWith$ DmgSelf | Description$ All damage that would be dealt to target creature this turn by a source of your choice is dealt to Oracle's Attendants instead.
+SVar:DmgSelf:DB$ ReplaceEffect | VarName$ Affected | VarValue$ EffectSource | VarType$ Card
 SVar:OutOfSight:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | Defined$ Imprinted | Execute$ ExileEffect | Static$ True
 SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile | Static$ True
 SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True
-SVar:X:ReplaceCount$DamageAmount
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/oracles_attendants.jpg
 Oracle:{T}: All damage that would be dealt to target creature this turn by a source of your choice is dealt to Oracle's Attendants instead.
diff --git a/forge-gui/res/cardsfolder/p/palisade_giant.txt b/forge-gui/res/cardsfolder/p/palisade_giant.txt
index eaec6ed25fe..0d89ec05ed0 100644
--- a/forge-gui/res/cardsfolder/p/palisade_giant.txt
+++ b/forge-gui/res/cardsfolder/p/palisade_giant.txt
@@ -2,10 +2,7 @@ Name:Palisade Giant
 ManaCost:4 W W
 Types:Creature Giant Soldier
 PT:2/7
-R:Event$ DamageDone | ActiveZones$ Battlefield | ValidTarget$ You,Permanent.Other+YouCtrl | ReplaceWith$ DmgMe | IsCombat$ False | Description$ All damage that would be dealt to you or another permanent you control is dealt to CARDNAME instead.
-R:Event$ DamageDone | ActiveZones$ Battlefield | ValidTarget$ You,Permanent.Other+YouCtrl | ReplaceWith$ DmgMeCombat | IsCombat$ True | Secondary$ True | Description$ All damage that would be dealt to you or another permanent you control is dealt to CARDNAME instead.
-SVar:DmgMe:AB$ DealDamage | Cost$ 0 | Defined$ Self | DamageSource$ ReplacedSource | NumDmg$ X | References$ X
-SVar:DmgMeCombat:AB$ DealDamage | Cost$ 0 | CombatDamage$ True | Defined$ Self | DamageSource$ ReplacedSource | NumDmg$ X | References$ X
-SVar:X:ReplaceCount$DamageAmount
+R:Event$ DamageDone | ActiveZones$ Battlefield | ValidTarget$ You,Permanent.Other+YouCtrl | ReplaceWith$ DmgMe | Description$ All damage that would be dealt to you or another permanent you control is dealt to CARDNAME instead.
+SVar:DmgMe:DB$ ReplaceEffect | VarName$ Affected | VarValue$ Self | VarType$ Card
 SVar:Picture:http://www.wizards.com/global/images/magic/general/palisade_giant.jpg
 Oracle:All damage that would be dealt to you or another permanent you control is dealt to Palisade Giant instead.
diff --git a/forge-gui/res/cardsfolder/p/pariah.txt b/forge-gui/res/cardsfolder/p/pariah.txt
index 3c6e340fc39..beae398daa2 100644
--- a/forge-gui/res/cardsfolder/p/pariah.txt
+++ b/forge-gui/res/cardsfolder/p/pariah.txt
@@ -3,11 +3,8 @@ ManaCost:2 W
 Types:Enchantment Aura
 K:Enchant creature
 A:SP$ Attach | Cost$ 2 W | ValidTgts$ Creature | TgtPrompt$ Select target creature | AILogic$ Curse
-R:Event$ DamageDone | ActiveZones$ Battlefield | ValidTarget$ You | ReplaceWith$ DmgEnchanted | IsCombat$ False | Description$ All damage that would be dealt to you is dealt to enchanted creature instead.
-R:Event$ DamageDone | ActiveZones$ Battlefield | ValidTarget$ You | ReplaceWith$ DmgEnchantedCombat | IsCombat$ True | Secondary$ True | Description$ All damage that would be dealt to you is dealt to enchanted creature instead.
-SVar:DmgEnchanted:AB$ DealDamage | Cost$ 0 | Defined$ Enchanted | DamageSource$ ReplacedSource | NumDmg$ X | References$ X
-SVar:DmgEnchantedCombat:AB$ DealDamage | Cost$ 0 | CombatDamage$ True | Defined$ Enchanted | DamageSource$ ReplacedSource | NumDmg$ X | References$ X
-SVar:X:ReplaceCount$DamageAmount
+R:Event$ DamageDone | ActiveZones$ Battlefield | ValidTarget$ You | ReplaceWith$ DmgEnchanted | Description$ All damage that would be dealt to you is dealt to enchanted creature instead.
+SVar:DmgEnchanted:DB$ ReplaceEffect | VarName$ Affected | VarValue$ Enchanted | VarType$ Card
 SVar:NonStackingAttachEffect:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/pariah.jpg
 Oracle:Enchant creature (Target a creature as you cast this. This card enters the battlefield attached to that creature.)\nAll damage that would be dealt to you is dealt to enchanted creature instead.
diff --git a/forge-gui/res/cardsfolder/p/pariahs_shield.txt b/forge-gui/res/cardsfolder/p/pariahs_shield.txt
index e483045c63e..648df9d5df4 100644
--- a/forge-gui/res/cardsfolder/p/pariahs_shield.txt
+++ b/forge-gui/res/cardsfolder/p/pariahs_shield.txt
@@ -2,10 +2,7 @@ Name:Pariah's Shield
 ManaCost:5
 Types:Artifact Equipment
 K:Equip 3
-R:Event$ DamageDone | ActiveZones$ Battlefield | ValidTarget$ You | ReplaceWith$ DmgEquipped | IsCombat$ False | IsEquipping$ True | Description$ All damage that would be dealt to you is dealt to equipped creature instead.
-R:Event$ DamageDone | ActiveZones$ Battlefield | ValidTarget$ You | ReplaceWith$ DmgEquippedCombat | IsCombat$ True | IsEquipping$ True | Secondary$ True | Description$ All damage that would be dealt to you is dealt to equipped creature instead.
-SVar:DmgEquipped:AB$DealDamage | Cost$ 0 | Defined$ Equipped | DamageSource$ ReplacedSource | NumDmg$ X | References$ X
-SVar:DmgEquippedCombat:AB$DealDamage | Cost$ 0 | CombatDamage$ True | Defined$ Equipped | DamageSource$ ReplacedSource | NumDmg$ X | References$ X
-SVar:X:ReplaceCount$DamageAmount
+R:Event$ DamageDone | ActiveZones$ Battlefield | ValidTarget$ You | ReplaceWith$ DmgEquipped | IsEquipping$ True | Description$ All damage that would be dealt to you is dealt to equipped creature instead.
+SVar:DmgEquipped:DB$ ReplaceEffect | VarName$ Affected | VarValue$ Equipped | VarType$ Card
 SVar:Picture:http://www.wizards.com/global/images/magic/general/pariahs_shield.jpg
 Oracle:All damage that would be dealt to you is dealt to equipped creature instead.\nEquip {3}
diff --git a/forge-gui/res/cardsfolder/p/protector_of_the_crown.txt b/forge-gui/res/cardsfolder/p/protector_of_the_crown.txt
index 49b4941a5b9..6b3be244564 100644
--- a/forge-gui/res/cardsfolder/p/protector_of_the_crown.txt
+++ b/forge-gui/res/cardsfolder/p/protector_of_the_crown.txt
@@ -4,10 +4,7 @@ Types:Creature Giant Soldier
 PT:2/5
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMonarch | TriggerDescription$ When CARDNAME enters the battlefield, you become the monarch.
 SVar:TrigMonarch:DB$ BecomeMonarch | Defined$ You
-R:Event$ DamageDone | ActiveZones$ Battlefield | ValidTarget$ You | ReplaceWith$ DmgSelf | IsCombat$ False | Description$ All damage that would be dealt to you is dealt to CARDNAME instead.
-R:Event$ DamageDone | ActiveZones$ Battlefield | ValidTarget$ You | ReplaceWith$ DmgSelfCombat | IsCombat$ True | Secondary$ True | Description$ All damage that would be dealt to you is dealt to CARDNAME instead.
-SVar:DmgSelf:AB$DealDamage | Cost$ 0 | Defined$ Self | DamageSource$ ReplacedSource | NumDmg$ X | References$ X
-SVar:DmgSelfCombat:AB$DealDamage | Cost$ 0 | CombatDamage$ True | Defined$ Self | DamageSource$ ReplacedSource | NumDmg$ X | References$ X
-SVar:X:ReplaceCount$DamageAmount
+R:Event$ DamageDone | ActiveZones$ Battlefield | ValidTarget$ You | ReplaceWith$ DmgSelf | Description$ All damage that would be dealt to you is dealt to CARDNAME instead.
+SVar:DmgSelf:DB$ ReplaceEffect | VarName$ Affected | VarValue$ Self | VarType$ Card
 SVar:Picture:http://www.wizards.com/global/images/magic/general/protector_of_the_crown.jpg
-Oracle:When Protector of the Crown enters the battlefield, you become the monarch.\nAll damage that would be dealt to you is dealt to Protector of the Crown instead.
\ No newline at end of file
+Oracle:When Protector of the Crown enters the battlefield, you become the monarch.\nAll damage that would be dealt to you is dealt to Protector of the Crown instead.
diff --git a/forge-gui/res/cardsfolder/r/reflect_damage.txt b/forge-gui/res/cardsfolder/r/reflect_damage.txt
new file mode 100644
index 00000000000..4b440bbec86
--- /dev/null
+++ b/forge-gui/res/cardsfolder/r/reflect_damage.txt
@@ -0,0 +1,16 @@
+Name:Reflect Damage
+ManaCost:3 W R
+Types:Instant
+A:SP$ ChooseSource | Cost$ 3 W R | Choices$ Card | SubAbility$ DBEffect | StackDescription$ SpellDescription | SpellDescription$ The next time a source of your choice would deal damage this turn, that damage is dealt to that source's controller instead.
+
+SVar:DBEffect:DB$ Effect | ReplacementEffects$ SelflessDamage | SVars$ SelflessDmg,ExileEffect | References$ SelflessDamage,SelflessDmg,ExileEffect | SubAbility$ DBCleanup
+
+SVar:SelflessDamage:Event$ DamageDone | ValidSource$ Card.ChosenCard | ReplaceWith$ SelflessDmg | Description$ The next time a source of your choice would deal damage this turn, that damage is dealt to that source's controller instead.
+
+SVar:SelflessDmg:DB$ ReplaceEffect | VarName$ Affected | VarValue$ ChosenCardController | VarType$ Player | SubAbility$ ExileEffect
+
+SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile | Static$ True
+SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True
+SVar:RemAIDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/reflect_damage.jpg
+Oracle:The next time a source of your choice would deal damage this turn, that damage is dealt to that source's controller instead.
diff --git a/forge-gui/res/cardsfolder/s/shimian_night_stalker.txt b/forge-gui/res/cardsfolder/s/shimian_night_stalker.txt
index fc33b670db2..6b8d399dfd4 100644
--- a/forge-gui/res/cardsfolder/s/shimian_night_stalker.txt
+++ b/forge-gui/res/cardsfolder/s/shimian_night_stalker.txt
@@ -2,11 +2,8 @@ Name:Shimian Night Stalker
 ManaCost:3 B B
 Types:Creature Nightstalker
 PT:4/4
-A:AB$ Effect | Cost$ B T | Name$ Shimian Night Stalker Effect | ReplacementEffects$ DamageEvent,CombatDamageEvent | SVars$ MirrorStrikeDmg,MirrorStrikeCombatDmg,MirroredX | References$ MirrorStrikeDmg,MirrorStrikeCombatDmg,MirroredX | ImprintCards$ Targeted | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature | AILogic$ Fog | SpellDescription$ All damage that would be dealt to you this turn by target attacking creature is dealt to CARDNAME instead.
-SVar:DamageEvent:Event$ DamageDone | ValidSource$ Creature.IsImprinted | ValidTarget$ You | ReplaceWith$ MirrorStrikeDmg |  IsCombat$ False | Description$ All damage that would be dealt to you this turn by the attacking creature is dealt to Shimian Night Stalker instead.
-SVar:CombatDamageEvent:Event$ DamageDone | ValidSource$ Creature.IsImprinted | ValidTarget$ You | ReplaceWith$ MirrorStrikeCombatDmg | IsCombat$ True | Secondary$ True | Description$ All damage that would be dealt to you this turn by the attacking creature is dealt to Shimian Night Stalker instead.
-SVar:MirrorStrikeDmg:AB$ DealDamage | Cost$ 0 | Defined$ EffectSource | DamageSource$ ReplacedSource | NumDmg$ MirroredX | References$ MirroredX
-SVar:MirrorStrikeCombatDmg:AB$ DealDamage | Cost$ 0 | CombatDamage$ True | Defined$ EffectSource | DamageSource$ ReplacedSource | NumDmg$ MirroredX | References$ MirroredX
-SVar:MirroredX:ReplaceCount$DamageAmount
+A:AB$ Effect | Cost$ B T | Name$ Shimian Night Stalker Effect | ReplacementEffects$ DamageEvent | SVars$ MirrorStrikeDmg | References$ MirrorStrikeDmg | ImprintCards$ Targeted | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature | AILogic$ Fog | SpellDescription$ All damage that would be dealt to you this turn by target attacking creature is dealt to CARDNAME instead.
+SVar:DamageEvent:Event$ DamageDone | ValidSource$ Creature.IsImprinted | ValidTarget$ You | ReplaceWith$ MirrorStrikeDmg | Description$ All damage that would be dealt to you this turn by the attacking creature is dealt to Shimian Night Stalker instead.
+SVar:MirrorStrikeDmg:DB$ ReplaceEffect | VarName$ Affected | VarValue$ EffectSource | VarType$ Card
 SVar:Picture:http://www.wizards.com/global/images/magic/general/shimian_night_stalker.jpg
 Oracle:{B}, {T}: All damage that would be dealt to you this turn by target attacking creature is dealt to Shimian Night Stalker instead.
diff --git a/forge-gui/res/cardsfolder/s/sivvis_valor.txt b/forge-gui/res/cardsfolder/s/sivvis_valor.txt
index e8d669ad619..0d5b908faa0 100644
--- a/forge-gui/res/cardsfolder/s/sivvis_valor.txt
+++ b/forge-gui/res/cardsfolder/s/sivvis_valor.txt
@@ -1,15 +1,12 @@
 Name:Sivvi's Valor
 ManaCost:2 W
 Types:Instant
-A:SP$ Effect | Name$ Sivvi's Effect | Cost$ tapXType<1/Creature> | ValidTgts$ Creature | TgtPrompt$ Select target creature to redirect damage from | ReplacementEffects$ SelflessCombat,SelflessNonCombat | Triggers$ OutOfSight | SVars$ CombatDmg,NonCombatDmg,ExileEffect,X | References$ SelflessCombat,SelflessNonCombat,OutOfSight,CombatDmg,NonCombatDmg,ExileEffect,X | RememberObjects$ Targeted | IsPresent$ Plains.YouCtrl | CostDesc$ If you control a Plains, | SpellDescription$ you may tap an untapped creature you control rather than pay CARDNAME's mana cost.
-A:SP$ Effect | Name$ Sivvi's Effect | Cost$ 2 W | ValidTgts$ Creature | TgtPrompt$ Select target creature to redirect damage from | ReplacementEffects$ SelflessCombat,SelflessNonCombat | Triggers$ OutOfSight | SVars$ CombatDmg,NonCombatDmg,ExileEffect,X | References$ SelflessCombat,SelflessNonCombat,OutOfSight,CombatDmg,NonCombatDmg,ExileEffect,X | RememberObjects$ Targeted | SpellDescription$ All damage that would be dealt to target creature this turn is dealt to you instead.
-SVar:SelflessCombat:Event$ DamageDone | ValidTarget$ Card.IsRemembered | IsCombat$ True | ReplaceWith$ CombatDmg | Description$ All damage that would be dealt to target creature this turn is dealt to you instead.
-SVar:SelflessNonCombat:Event$ DamageDone | ValidTarget$ Card.IsRemembered | IsCombat$ False | ReplaceWith$ NonCombatDmg | Secondary$ True | Description$ All damage that would be dealt to target creature this turn is dealt to you instead.
-SVar:CombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ You | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ X
-SVar:NonCombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ You | DamageSource$ ReplacedSource | NumDmg$ X
+A:SP$ Effect | Name$ Sivvi's Effect | Cost$ tapXType<1/Creature> | ValidTgts$ Creature | TgtPrompt$ Select target creature to redirect damage from | ReplacementEffects$ SelflessDamage | Triggers$ OutOfSight | SVars$ SelflessDmg,ExileEffect | References$ SelflessDamage,OutOfSight,SelflessDmg,ExileEffect | RememberObjects$ Targeted | IsPresent$ Plains.YouCtrl | CostDesc$ If you control a Plains, | SpellDescription$ you may tap an untapped creature you control rather than pay CARDNAME's mana cost.
+A:SP$ Effect | Name$ Sivvi's Effect | Cost$ 2 W | ValidTgts$ Creature | TgtPrompt$ Select target creature to redirect damage from | ReplacementEffects$ SelflessDamage | Triggers$ OutOfSight | SVars$ SelflessDmg,ExileEffect | References$ SelflessDamage,OutOfSight,SelflessDmg,ExileEffect | RememberObjects$ Targeted | SpellDescription$ All damage that would be dealt to target creature this turn is dealt to you instead.
+SVar:SelflessDamage:Event$ DamageDone | ValidTarget$ Card.IsRemembered | ReplaceWith$ SelflessDmg | Description$ All damage that would be dealt to target creature this turn is dealt to you instead.
+SVar:SelflessDmg:DB$ ReplaceEffect | VarName$ Affected | VarValue$ You | VarType$ Player
 SVar:OutOfSight:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Creature.IsRemembered | Execute$ ExileEffect | Static$ True
 SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile | Static$ True
-SVar:X:ReplaceCount$DamageAmount
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sivvis_valor.jpg
 Oracle:If you control a Plains, you may tap an untapped creature you control rather than pay Sivvi's Valor's mana cost.\nAll damage that would be dealt to target creature this turn is dealt to you instead.
diff --git a/forge-gui/res/cardsfolder/t/treacherous_link.txt b/forge-gui/res/cardsfolder/t/treacherous_link.txt
index 1e1b87578ff..f087d19d480 100644
--- a/forge-gui/res/cardsfolder/t/treacherous_link.txt
+++ b/forge-gui/res/cardsfolder/t/treacherous_link.txt
@@ -3,11 +3,8 @@ ManaCost:1 B
 Types:Enchantment Aura
 K:Enchant creature
 A:SP$ Attach | Cost$ 1 B | ValidTgts$ Creature | AILogic$ Curse
-R:Event$ DamageDone | ActiveZones$ Battlefield | ValidTarget$ Card.EnchantedBy | ReplaceWith$ DmgEnchanted | IsCombat$ False | Description$ All damage that would be dealt to enchanted creature is dealt to its controller instead.
-R:Event$ DamageDone | ActiveZones$ Battlefield | ValidTarget$ Card.EnchantedBy | ReplaceWith$ DmgEnchantedCombat | IsCombat$ True | Secondary$ True | Description$ All damage that would be dealt to enchanted creature is dealt to its controller instead.
-SVar:DmgEnchanted:AB$ DealDamage | Cost$ 0 | Defined$ EnchantedOwner | DamageSource$ ReplacedSource | NumDmg$ X | References$ X
-SVar:DmgEnchantedCombat:AB$ DealDamage | Cost$ 0 | CombatDamage$ True | Defined$ EnchantedOwner | DamageSource$ ReplacedSource | NumDmg$ X | References$ X
-SVar:X:ReplaceCount$DamageAmount
+R:Event$ DamageDone | ActiveZones$ Battlefield | ValidTarget$ Card.EnchantedBy | ReplaceWith$ DmgEnchanted | Description$ All damage that would be dealt to enchanted creature is dealt to its controller instead.
+SVar:DmgEnchanted:DB$ ReplaceEffect | VarName$ Affected | VarValue$ EnchantedController | VarType$ Player
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/treacherous_link.jpg
 Oracle:Enchant creature\nAll damage that would be dealt to enchanted creature is dealt to its controller instead.
diff --git a/forge-gui/res/cardsfolder/t/turn_the_tables.txt b/forge-gui/res/cardsfolder/t/turn_the_tables.txt
index e2c94e7669b..35f4baf5ddf 100644
--- a/forge-gui/res/cardsfolder/t/turn_the_tables.txt
+++ b/forge-gui/res/cardsfolder/t/turn_the_tables.txt
@@ -1,9 +1,8 @@
 Name:Turn the Tables
 ManaCost:3 W W
 Types:Instant
-A:SP$ Effect | Cost$ 3 W W | Name$ Turn the Tables Effect | ReplacementEffects$ DamageEvent | SVars$ TurnTheTables,ReturnedX | References$ TurnTheTables,ReturnedX | RememberObjects$ Targeted | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature | IsCurse$ True | AILogic$ Fog | SpellDescription$ All combat damage that would be dealt to you this turn is dealt to target attacking creature instead.
+A:SP$ Effect | Cost$ 3 W W | Name$ Turn the Tables Effect | ReplacementEffects$ DamageEvent | SVars$ TurnTheTables | References$ TurnTheTables | RememberObjects$ Targeted | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature | IsCurse$ True | AILogic$ Fog | SpellDescription$ All combat damage that would be dealt to you this turn is dealt to target attacking creature instead.
 SVar:DamageEvent:Event$ DamageDone | ValidSource$ Creature | ValidTarget$ You | ReplaceWith$ TurnTheTables | IsCombat$ True | Description$ All combat damage that would be dealt to you this turn is dealt to target attacking creature instead.
-SVar:TurnTheTables:AB$DealDamage | Cost$ 0 | CombatDamage$ True | Defined$ Remembered | DamageSource$ ReplacedSource | NumDmg$ ReturnedX
-SVar:ReturnedX:ReplaceCount$DamageAmount
+SVar:TurnTheTables:DB$ ReplaceEffect | VarName$ Affected | VarValue$ Remembered | VarType$ Card
 SVar:Picture:http://www.wizards.com/global/images/magic/general/turn_the_tables.jpg
 Oracle:All combat damage that would be dealt to you this turn is dealt to target attacking creature instead.
diff --git a/forge-gui/res/cardsfolder/v/veteran_bodyguard.txt b/forge-gui/res/cardsfolder/v/veteran_bodyguard.txt
index 6bca93837f5..c9ad5597c76 100644
--- a/forge-gui/res/cardsfolder/v/veteran_bodyguard.txt
+++ b/forge-gui/res/cardsfolder/v/veteran_bodyguard.txt
@@ -2,10 +2,7 @@ Name:Veteran Bodyguard
 ManaCost:3 W W
 Types:Creature Human
 PT:2/5
-R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Creature.unblocked | ValidTarget$ You | ReplaceWith$ DmgSelf | IsCombat$ False | IsPresent$ Card.Self+untapped | Description$ As long as CARDNAME is untapped, all damage that would be dealt to you by unblocked creatures is dealt to CARDNAME instead.
-R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Creature.unblocked | ValidTarget$ You | ReplaceWith$ DmgSelfCombat | IsCombat$ True | IsPresent$ Card.Self+untapped | Secondary$ True | Description$ As long as CARDNAME is untapped, all damage that would be dealt to you by unblocked creatures is dealt to CARDNAME instead.
-SVar:DmgSelf:AB$DealDamage | Cost$ 0 | Defined$ Self | DamageSource$ ReplacedSource | NumDmg$ X | References$ X
-SVar:DmgSelfCombat:AB$DealDamage | Cost$ 0 | CombatDamage$ True | Defined$ Self | DamageSource$ ReplacedSource | NumDmg$ X | References$ X
-SVar:X:ReplaceCount$DamageAmount
+R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Creature.unblocked | ValidTarget$ You | ReplaceWith$ DmgSelf | IsPresent$ Card.Self+untapped | Description$ As long as CARDNAME is untapped, all damage that would be dealt to you by unblocked creatures is dealt to CARDNAME instead.
+SVar:DmgSelf:DB$ ReplaceEffect | VarName$ Affected | VarValue$ Self | VarType$ Card
 SVar:Picture:http://www.wizards.com/global/images/magic/general/veteran_bodyguard.jpg
 Oracle:As long as Veteran Bodyguard is untapped, all damage that would be dealt to you by unblocked creatures is dealt to Veteran Bodyguard instead.
diff --git a/forge-gui/res/cardsfolder/w/weathered_bodyguards.txt b/forge-gui/res/cardsfolder/w/weathered_bodyguards.txt
index 23f59089167..3efc397ea2d 100644
--- a/forge-gui/res/cardsfolder/w/weathered_bodyguards.txt
+++ b/forge-gui/res/cardsfolder/w/weathered_bodyguards.txt
@@ -4,7 +4,6 @@ Types:Creature Human Soldier
 PT:2/5
 K:Morph:3 W
 R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Creature.unblocked | ValidTarget$ You | ReplaceWith$ DmgSelf | IsCombat$ True | IsPresent$ Card.Self+untapped | Description$ As long as CARDNAME is untapped, all combat damage that would be dealt to you by unblocked creatures is dealt to CARDNAME instead.
-SVar:DmgSelf:AB$DealDamage | Cost$ 0 | CombatDamage$ True | Defined$ Self | DamageSource$ ReplacedSource | NumDmg$ X | References$ X
-SVar:X:ReplaceCount$DamageAmount
+SVar:DmgSelf:DB$ ReplaceEffect | VarName$ Affected | VarValue$ Self | VarType$ Card
 SVar:Picture:http://www.wizards.com/global/images/magic/general/weathered_bodyguards.jpg
 Oracle:As long as Weathered Bodyguards is untapped, all combat damage that would be dealt to you by unblocked creatures is dealt to Weathered Bodyguards instead.\nMorph {3}{W} (You may cast this card face down as a 2/2 creature for {3}. Turn it face up any time for its morph cost.)