cards: update all cards that use DamageDone Replacement with DealDamage Effect

2025-11-16 02:38:02 +00:00 · 2017-01-07 17:25:16 +00:00
parent 7d6b639ed6
commit 286e47439e
48 changed files with 207 additions and 342 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -12673,6 +12673,7 @@ forge-gui/res/cardsfolder/r/revenant.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/r/revenant_patriarch.txt -text
 forge-gui/res/cardsfolder/r/revenge_of_the_hunted.txt -text
 forge-gui/res/cardsfolder/r/reverberate.txt svneol=native#text/plain
+forge-gui/res/cardsfolder/r/reverberation.txt -text
 forge-gui/res/cardsfolder/r/revered_dead.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/r/revered_elder.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/r/revered_unicorn.txt -text svneol=unset#text/plain
--- a/forge-gui/res/cardsfolder/a/aegis_of_honor.txt
+++ b/forge-gui/res/cardsfolder/a/aegis_of_honor.txt
@@ -1,11 +1,10 @@
 Name:Aegis of Honor
 ManaCost:W
 Types:Enchantment
-A:AB$ Effect | Cost$ 1 | ReplacementEffects$ AegisRedirect | SVars$ AegisDmg,ExileEffect,AegisX | References$ AegisRedirect,AegisDmg,ExileEffect,AegisX | AILogic$ RedirectSpellDamageFromPlayer | Stackable$ False | SpellDescription$ The next time an instant or sorcery spell would deal damage to you this turn, that spell deals that damage to its controller instead.
-SVar:AegisRedirect:Event$ DamageDone | ValidTarget$ You | ValidSource$ Instant,Sorcery | IsCombat$ False | ReplaceWith$ AegisDmg | Description$ The next time an instant or sorcery spell would deal damage to you this turn, that spell deals that damage to its controller instead.
-SVar:AegisDmg:AB$ DealDamage | Cost$ 0 | Defined$ ReplacedSourceController | DamageSource$ ReplacedSource | NumDmg$ AegisX | SubAbility$ ExileEffect
+A:AB$ Effect | Cost$ 1 | ReplacementEffects$ SelflessDamage | SVars$ SelflessDmg,ExileEffect | References$ SelflessDamage,SelflessDmg,ExileEffect | AILogic$ RedirectSpellDamageFromPlayer | Stackable$ False | SpellDescription$ The next time an instant or sorcery spell would deal damage to you this turn, that spell deals that damage to its controller instead.
+SVar:SelflessDamage:Event$ DamageDone | ValidTarget$ You | ValidSource$ Instant,Sorcery | 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$ ReplacedSourceController | VarType$ Player | SubAbility$ ExileEffect
 SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
-SVar:AegisX:ReplaceCount$DamageAmount
 SVar:NonStackingEffect:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aegis_of_honor.jpg
 Oracle:{1}: The next time an instant or sorcery spell would deal damage to you this turn, that spell deals that damage to its controller instead.
--- a/forge-gui/res/cardsfolder/a/ajani_steadfast.txt
+++ b/forge-gui/res/cardsfolder/a/ajani_steadfast.txt
@@ -5,10 +5,8 @@ Loyalty:4
 A:AB$ Pump | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | NumAtt$ +1 | NumDef$ +1 | KW$ First Strike & Vigilance & Lifelink | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ Until end of turn, up to one target creature gets +1/+1 and gains first strike, vigilance, and lifelink.
 A:AB$ PutCounterAll | Cost$ SubCounter<2/LOYALTY> | ValidCards$ Creature.YouCtrl | CounterType$ P1P1 | CounterNum$ 1 | Planeswalker$ True | SubAbility$ DBPutCounterAll | SpellDescription$ Put a +1/+1 counter on each creature you control and a loyalty counter on each other planeswalker you control.
 SVar:DBPutCounterAll:DB$ PutCounterAll | ValidCards$ Planeswalker.YouCtrl+Other | CounterType$ LOYALTY | CounterNum$ 1
-A:AB$ Effect | Cost$ SubCounter<7/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Ajani Steadfast emblem | Image$ ajani_steadfast_emblem | ReplacementEffects$ RCombatDamage,RNonCombatDamage | SVars$ DBCombatDmg,DBNonCombatDmg | Stackable$ False | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "If a source would deal damage to you or a planeswalker you control, prevent all but 1 of that damage."
-SVar:RCombatDamage:Event$ DamageDone | ValidTarget$ You,Planeswalker.YouCtrl | ReplaceWith$ DBCombatDmg | PreventionEffect$ True | IsCombat$ True | Description$ If a source would deal damage to you or a planeswalker you control, prevent all but 1 of that damage.
-SVar:DBCombatDmg:DB$ DealDamage | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ 1
-SVar:RNonCombatDamage:Event$ DamageDone | ValidTarget$ You,Planeswalker.YouCtrl | ReplaceWith$ DBNonCombatDmg | PreventionEffect$ True | IsCombat$ False | Secondary$ True | Description$ If a source would deal damage to you or a planeswalker you control, prevent all but 1 of that damage.
-SVar:DBNonCombatDmg:DB$ DealDamage | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ 1
+A:AB$ Effect | Cost$ SubCounter<7/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Ajani Steadfast emblem | Image$ ajani_steadfast_emblem | ReplacementEffects$ RPreventDamage | SVars$ PreventDmg | References$ RPreventDamage,PreventDmg | Stackable$ False | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "If a source would deal damage to you or a planeswalker you control, prevent all but 1 of that damage."
+SVar:RPreventDamage:Event$ DamageDone | ValidTarget$ You,Planeswalker.YouCtrl | ReplaceWith$ PreventDmg | PreventionEffect$ True | Description$ If a source would deal damage to you or a planeswalker you control, prevent all but 1 of that damage.
+SVar:PreventDmg:DB$ ReplaceEffect | VarName$ DamageAmount | VarValue$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ajani_steadfast.jpg
 Oracle:[+1] Until end of turn, up to one target creature gets +1/+1 and gains first strike, vigilance, and lifelink.\n[-2] Put a +1/+1 counter on each creature you control and a loyalty counter on each other planeswalker you control.\n[-7] You get an emblem with "If a source would deal damage to you or a planeswalker you control, prevent all but 1 of that damage."
--- a/forge-gui/res/cardsfolder/b/beacon_of_destiny.txt
+++ b/forge-gui/res/cardsfolder/b/beacon_of_destiny.txt
@@ -2,16 +2,19 @@ Name:Beacon of Destiny
 ManaCost:1 W
 Types:Creature Human Cleric
 PT:1/3
-A:AB$ ChooseSource | Cost$ T | Choices$ Card | RememberChosen$ True | AILogic$ NeedsPrevention | SubAbility$ DBEffect | SpellDescription$ The next time a source of your choice would deal damage to you this turn, that damage is dealt to CARDNAME instead.
-SVar:DBEffect:DB$ Effect | ReplacementEffects$ SelflessCombat,SelflessNonCombat | Triggers$ OutOfSight | SVars$ CombatDmg,NonCombatDmg,ExileEffect,X | References$ SelflessCombat,SelflessNonCombat,OutOfSight,CombatDmg,NonCombatDmg,ExileEffect,X | RememberObjects$ Remembered | ImprintCards$ Self | SubAbility$ DBCleanup | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ GE1
-SVar:SelflessCombat:Event$ DamageDone | ValidTarget$ You | ValidSource$ Card.IsRemembered | IsCombat$ True | ReplaceWith$ CombatDmg | Description$ The next time a source of your choice would deal damage to you this turn, that damage is dealt to CARDNAME instead.
-SVar:SelflessNonCombat:Event$ DamageDone | ValidTarget$ You | ValidSource$ Card.IsRemembered | IsCombat$ False | ReplaceWith$ NonCombatDmg | Secondary$ True | Description$ The next time a source of your choice would deal damage to you this turn, that damage is dealt to CARDNAME instead.
-SVar:CombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Imprinted | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ X | SubAbility$ ExileEffect
-SVar:NonCombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Imprinted | DamageSource$ ReplacedSource | NumDmg$ X | SubAbility$ ExileEffect
-SVar:OutOfSight:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | Defined$ Imprinted | Execute$ ExileEffect | Static$ True
+A:AB$ ChooseSource | Cost$ T | Choices$ Card | AILogic$ NeedsPrevention | SubAbility$ DBEffect | SpellDescription$ The next time a source of your choice would deal damage to you this turn, that damage is dealt to CARDNAME instead.
+
+SVar:DBEffect:DB$ Effect | ReplacementEffects$ SelflessDamage | Triggers$ OutOfSight | SVars$ SelflessDamage,ExileEffect | References$ SelflessDamage,OutOfSight,SelflessDamage,ExileEffect | Duration$ HostLeavesOrEOT | SubAbility$ DBCleanup | ConditionDefined$ ChosenCard | ConditionPresent$ Card | ConditionCompare$ GE1
+
+SVar:SelflessDamage:Event$ DamageDone | ValidTarget$ You | ValidSource$ Card.ChosenCard | ReplaceWith$ SelflessDmg | DamageTarget$ EffectSource | Description$ The next time a source of your choice would deal damage to you this turn, that damage is dealt to EFFECTSOURCE instead.
+
+SVar:SelflessDmg:DB$ ReplaceEffect | VarName$ Affected | VarValue$ EffectSource | VarType$ Card | SubAbility$ ExileEffect
+
+#Zone Change for the source of your choice
+SVar:OutOfSight:Mode$ ChangesZone | Origin$ Any | Destination$ Any | Defined$ ChosenCard | Execute$ ExileEffect | Static$ True
 SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile | Static$ True
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:ReplaceCount$DamageAmount
+
+SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/beacon_of_destiny.jpg
 Oracle:{T}: The next time a source of your choice would deal damage to you this turn, that damage is dealt to Beacon of Destiny instead.
--- a/forge-gui/res/cardsfolder/b/benevolent_unicorn.txt
+++ b/forge-gui/res/cardsfolder/b/benevolent_unicorn.txt
@@ -3,7 +3,7 @@ ManaCost:1 W
 Types:Creature Unicorn
 PT:1/2
 R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Spell | ValidTarget$ Creature,Player | ReplaceWith$ DmgMinus1 | Description$ If a spell would deal damage to a creature or player, it deals that much damage minus 1 to that creature or player instead.
-SVar:DmgMinus1:AB$DealDamage | Cost$ 0 | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ X | References$ X
+SVar:DmgMinus1:DB$ ReplaceEffect | VarName$ DamageAmount | VarValue$ X | References$ X
 SVar:X:ReplaceCount$DamageAmount/Minus.1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/benevolent_unicorn.jpg
 Oracle:If a spell would deal damage to a creature or player, it deals that much damage minus 1 to that creature or player instead.
--- a/forge-gui/res/cardsfolder/c/captains_maneuver.txt
+++ b/forge-gui/res/cardsfolder/c/captains_maneuver.txt
@@ -6,37 +6,23 @@ Types:Instant
 A:SP$ ChoosePlayer | Cost$ X R W | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | Choices$ TargetedPlayer | Defined$ You | SubAbility$ DBChooseCreature | StackDescription$ SpellDescription | SpellDescription$ The next X damage that would be dealt to target creature or player this turn is dealt to another target creature or player instead.
 SVar:DBChooseCreature:DB$ ChooseCard | DefinedCards$ Targeted | Mandatory$ True | Defined$ You | SubAbility$ DBSetVarBefore

-SVar:DBSetVarBefore:DB$ StoreSVar | SVar$ Z | Type$ CountSVar | Expression$ X | SubAbility$ DBEffect
+SVar:DBSetVarBefore:DB$ StoreSVar | SVar$ Y | Type$ CountSVar | Expression$ X | SubAbility$ DBEffect

-SVar:DBEffect:DB$ Effect | ValidTgts$ Creature,Player | TargetUnique$ True | TgtPrompt$ Select target creature or player to redirect the damage to | ReplacementEffects$ Combat,NonCombat | Triggers$ OutOfSight | SVars$ Combat,NonCombat,CombatDmg,NonCombatDmg,RestDmgCombat,RestDmg,DBSetVar,ExileEffect,ExileEffect2,OutOfSight,X,Y,Z,MinDmg,RC,RCP,RCC | References$ Combat,NonCombat,OutOfSight,CombatDmg,NonCombatDmg,RestDmgCombat,RestDmg,ExileEffect,ExileEffect2,X,Y,Z,MinDmg,RC,RCP,RCC | RememberObjects$ ThisTargetedCard,ThisTargetedPlayer | SubAbility$ DBCleanup
+SVar:DBEffect:DB$ Effect | ValidTgts$ Creature,Player | TargetUnique$ True | TgtPrompt$ Select target creature or player to redirect the damage to | ReplacementEffects$ ManeuverDamage | Triggers$ OutOfSight | SVars$ ManeuverDamage,ManeuverDmg,ExileEffect,OutOfSight,Y | References$ ManeuverDamage,OutOfSight,ManeuverDmg,ExileEffect,Y | RememberObjects$ ThisTargetedCard,ThisTargetedPlayer | SubAbility$ DBCleanup

-SVar:Combat:Event$ DamageDone | ValidTarget$ Card.Creature+ChosenCard,Player.Chosen | IsCombat$ True | ReplaceWith$ CombatDmg | CheckSVar$ RC | Description$ The next Z damage that would be dealt to target creature or player this turn is dealt to another target creature or player instead.
-SVar:NonCombat:Event$ DamageDone | ValidTarget$ Card.Creature+ChosenCard,Player.Chosen | IsCombat$ False | ReplaceWith$ NonCombatDmg | CheckSVar$ RC | Secondary$ True | Description$ The next Z damage that would be dealt to target creature or player this turn is dealt to another target creature or player instead.
+SVar:ManeuverDamage:Event$ DamageDone | ValidTarget$ Card.Creature+ChosenCard,Player.Chosen | ReplaceWith$ ManeuverDmg | DamageTarget$ Remembered | References$ Y | Description$ The next Y damage that would be dealt to target creature or player this turn is dealt to another target creature or player instead.

-SVar:CombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Remembered | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ MinDmg | SubAbility$ RestDmgCombat | ConditionCheckSVar$ MinDmg | ConditionSVarCompare$ GE1
-SVar:NonCombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Remembered | DamageSource$ ReplacedSource | NumDmg$ MinDmg | SubAbility$ RestDmg | ConditionCheckSVar$ MinDmg | ConditionSVarCompare$ GE1
-
-SVar:RestDmgCombat:DB$ DealDamage | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ Y | SubAbility$ DBSetVar | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1
-SVar:RestDmg:DB$ DealDamage | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ Y | SubAbility$ DBSetVar | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1
-
-SVar:DBSetVar:DB$ StoreSVar | SVar$ Z | Type$ CountSVar | Expression$ Z/Minus.MinDmg | SubAbility$ ExileEffect2
-SVar:ExileEffect2:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile | ConditionCheckSVar$ Z | ConditionSVarCompare$ LE0
+SVar:ManeuverDmg:DB$ ReplaceSplitDamage | DamageTarget$ Remembered | VarName$ Y | References$ Y

 SVar:OutOfSight:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.ChosenCard,Card.IsRemembered | Execute$ ExileEffect | Static$ True
 SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile

 SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True | ClearChosenPlayer$ True

-SVar:RCC:Count$Valid Creature.IsRemembered
-SVar:RCP:PlayerCountRemembered$Amount
-SVar:RC:SVar$RCC/Plus.RCP
-
 SVar:X:Count$xPaid
 #X Will get overwritten by Announce

-SVar:Y:ReplaceCount$DamageAmount/Minus.Z
-SVar:Z:Number$0
-SVar:MinDmg:ReplaceCount$DamageAmount/LimitMax.Z
+SVar:Y:Number$0

 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/captains_maneuver.jpg
--- a/forge-gui/res/cardsfolder/c/carom.txt
+++ b/forge-gui/res/cardsfolder/c/carom.txt
@@ -1,19 +1,18 @@
 Name:Carom
 ManaCost:1 W
 Types:Instant
-A:SP$ Pump | Cost$ 1 W | ValidTgts$ Creature | TgtPrompt$ Select target creature to redirect damage to | ImprintTargets$ True | SubAbility$ DBEffect | StackDescription$ SpellDescription | SpellDescription$ The next 1 damage that would be dealt to target creature this turn is dealt to another target creature instead. Draw a card.
-SVar:DBEffect:DB$ Effect | ValidTgts$ Creature | TgtPrompt$ Select target creature to redirect damage from | TargetUnique$ True | ReplacementEffects$ SelflessCombat,SelflessNonCombat | Triggers$ OutOfSight | SVars$ CombatDmg,NonCombatDmg,RestDmgCombat,RestDmg,ExileEffect,X,Y | References$ SelflessCombat,SelflessNonCombat,OutOfSight,CombatDmg,NonCombatDmg,RestDmgCombat,RestDmg,ExileEffect,X,Y | RememberObjects$ Targeted | ImprintCards$ Imprinted | SubAbility$ DBCleanup
-SVar:SelflessCombat:Event$ DamageDone | ValidTarget$ Card.IsRemembered | IsCombat$ True | ReplaceWith$ CombatDmg  | IsPresent$ Creature.IsImprinted | Description$ The next 1 damage that would be dealt to target creature this turn is dealt to another target creature instead.
-SVar:SelflessNonCombat:Event$ DamageDone | ValidTarget$ Card.IsRemembered | IsCombat$ False | ReplaceWith$ NonCombatDmg | Secondary$ True | IsPresent$ Creature.IsImprinted | Description$ The next 1 damage that would be dealt to target creature this turn is dealt to another target creature instead.
-SVar:CombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Imprinted | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ 1 | SubAbility$ RestDmgCombat | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1
-SVar:NonCombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Imprinted | DamageSource$ ReplacedSource | NumDmg$ 1 | SubAbility$ RestDmg | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1
-SVar:RestDmgCombat:DB$ DealDamage | Defined$ Remembered | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ X | SubAbility$ ExileEffect
-SVar:RestDmg:DB$ DealDamage | Defined$ Remembered | DamageSource$ ReplacedSource | NumDmg$ X | SubAbility$ ExileEffect
-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/Minus.1
-SVar:Y:ReplaceCount$DamageAmount
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearImprinted$ True | SubAbility$ DBDraw
+
+A:SP$ Pump | Cost$ 1 W | ValidTgts$ Creature | TgtPrompt$ Select target creature to redirect the damage from | SubAbility$ DBEffect | StackDescription$ SpellDescription | SpellDescription$ The next 1 damage that would be dealt to target creature this turn is dealt to another target creature instead. Draw a card.
+
+SVar:DBEffect:DB$ Effect | ValidTgts$ Creature | TargetUnique$ True | TgtPrompt$ Select target creature to redirect the damage to | ReplacementEffects$ CaromDamage | Triggers$ OutOfSight | SVars$ CaromDamage,CaromDmg,ExileEffect,OutOfSight | References$ CaromDamage,OutOfSight,CaromDmg,ExileEffect | RememberObjects$ ParentTarget | ImprintCards$ ThisTargetedCard | ExileOnMoved$ Battlefield | ConditionDefined$ ParentTarget | ConditionPresent$ Creature | ConditionCompare$ GE1 | SubAbility$ DBDraw
+
+SVar:CaromDamage:Event$ DamageDone | ValidTarget$ Creature.IsRemembered | ReplaceWith$ CaromDmg | DamageTarget$ Imprinted | Description$ The next 1 damage that would be dealt to target creature this turn is dealt to another target creature instead.
+
+SVar:CaromDmg:DB$ ReplaceSplitDamage | DamageTarget$ Imprinted
+
+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:DBDraw:DB$ Draw | NumCards$ 1
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/carom.jpg
--- a/forge-gui/res/cardsfolder/c/channel_harm.txt
+++ b/forge-gui/res/cardsfolder/c/channel_harm.txt
@@ -1,11 +1,9 @@
 Name:Channel Harm
 ManaCost:5 W
 Types:Instant
-A:SP$ Effect | Cost$ 5 W | ValidTgts$ Creature | Name$ Channel Harm Effect | ReplacementEffects$ ChannelHarmRep | Triggers$ OutOfSight | SVars$ DBCleanup,DamageSourceInstead,X | RememberObjects$ Targeted | AILogic$ Fog | SpellDescription$ Prevent all damage that would be dealt to you and permanents you control this turn by sources you don't control. If damage is prevented this way, you may have CARDNAME deal that much damage to target creature.
-SVar:ChannelHarmRep:Event$ DamageDone | ActiveZones$ Command | ValidTarget$ You,Permanent.YouCtrl | ValidSource$ Card.YouDontCtrl | ReplaceWith$ DamageSourceInstead | PreventionEffect$ True | Description$ Prevent all damage that would be dealt to you and permanents you control this turn by sources you don't control. If damage is prevented this way, you may have Channel Harm deal that much damage to target creature.
-SVar:DamageSourceInstead:AB$ DealDamage | Cost$ 0 | NumDmg$ X | Defined$ Remembered | DamageSouce$ EffectSource | References$ X | OptionalDecider$ You
-SVar:OutOfSight:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Creature.IsRemembered | Execute$ DBCleanup | Static$ True
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:SP$ Effect | Cost$ 5 W | ValidTgts$ Creature | ReplacementEffects$ ChannelHarmRep | Triggers$ OutOfSight | SVars$ DamageSourceInstead,X | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | AILogic$ Fog | SpellDescription$ Prevent all damage that would be dealt to you and permanents you control this turn by sources you don't control. If damage is prevented this way, you may have CARDNAME deal that much damage to target creature.
+SVar:ChannelHarmRep:Event$ DamageDone | ActiveZones$ Command | ValidTarget$ You,Permanent.YouCtrl | ValidSource$ Card.YouDontCtrl | ReplaceWith$ DamageSourceInstead | PreventionEffect$ True | Description$ Prevent all damage that would be dealt to you and permanents you control this turn by sources you don't control. If damage is prevented this way, you may have EFFECTHOST deal that much damage to target creature.
+SVar:DamageSourceInstead:DB$ DealDamage | NumDmg$ X | Defined$ Remembered | DamageSouce$ EffectSource | References$ X | OptionalDecider$ You
 SVar:X:ReplaceCount$DamageAmount
 SVar:Picture:http://www.wizards.com/global/images/magic/general/channel_harm.jpg
 Oracle:Prevent all damage that would be dealt to you and permanents you control this turn by sources you don't control. If damage is prevented this way, you may have Channel Harm deal that much damage to target creature.
--- a/forge-gui/res/cardsfolder/d/daughter_of_autumn.txt
+++ b/forge-gui/res/cardsfolder/d/daughter_of_autumn.txt
@@ -2,17 +2,11 @@ Name:Daughter of Autumn
 ManaCost:2 G G
 Types:Legendary Creature Avatar
 PT:2/4
-A:AB$ Effect | Name$ Daughter of Autumn's Effect | Cost$ W | ValidTgts$ Creature.White | TgtPrompt$ Select target white creature to redirect damage from | ReplacementEffects$ SelflessCombat,SelflessNonCombat | Triggers$ OutOfSight | SVars$ CombatDmg,NonCombatDmg,RestDmgCombat,RestDmg,ExileEffect,X,Y | References$ SelflessCombat,SelflessNonCombat,OutOfSight,CombatDmg,NonCombatDmg,RestDmgCombat,RestDmg,ExileEffect,X,Y | RememberObjects$ Targeted | ImprintCards$ Self | SpellDescription$ The next 1 damage that would be dealt to target white creature this turn is dealt to CARDNAME instead.
-SVar:SelflessCombat:Event$ DamageDone | ValidTarget$ Card.IsRemembered | IsCombat$ True | ReplaceWith$ CombatDmg | Description$ The next 1 damage that would be dealt to target white creature this turn is dealt to CARDNAME instead.
-SVar:SelflessNonCombat:Event$ DamageDone | ValidTarget$ Card.IsRemembered | IsCombat$ False | ReplaceWith$ NonCombatDmg | Secondary$ True | Description$ The next 1 damage that would be dealt to target white creature this turn is dealt to CARDNAME instead.
-SVar:CombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Imprinted | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ 1 | SubAbility$ RestDmgCombat | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1
-SVar:NonCombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Imprinted | DamageSource$ ReplacedSource | NumDmg$ 1 | SubAbility$ RestDmg | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1
-SVar:RestDmgCombat:DB$ DealDamage | Defined$ Remembered | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ X | SubAbility$ ExileEffect
-SVar:RestDmg:DB$ DealDamage | Defined$ Remembered | DamageSource$ ReplacedSource | NumDmg$ X | SubAbility$ ExileEffect
-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/Minus.1
-SVar:Y:ReplaceCount$DamageAmount
+A:AB$ Effect | Cost$ W | Name$ Daughter of Autumn's Effect | ValidTgts$ Creature.White | TgtPrompt$ Select target white creature to redirect damage from | ReplacementEffects$ DamageEvent | SVars$ DamageEventDmg | References$ DamageEvent,DamageEventDmg | Duration$ HostLeavesOrEOT | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | SpellDescription$ The next 1 damage that would be dealt to target white creature this turn is dealt to CARDNAME instead.
+SVar:DamageEvent:Event$ DamageDone | ValidTarget$ Creature.IsRemembered | ReplaceWith$ DamageEventDmg | DamageTarget$ EffectSource | Description$ The next 1 damage that would be dealt to target white creature this turn is dealt to EFFECTSOURCE instead.
+
+SVar:DamageEventDmg:DB$ ReplaceSplitDamage | DamageTarget$ EffectSource
+
 SVar:RemAIDeck:True
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/daughter_of_autumn.jpg
--- a/forge-gui/res/cardsfolder/d/deflecting_palm.txt
+++ b/forge-gui/res/cardsfolder/d/deflecting_palm.txt
@@ -1,13 +1,13 @@
 Name:Deflecting Palm
 ManaCost:R W
 Types:Instant
-A:SP$ ChooseSource | Cost$ R W | Choices$ Card | RememberChosen$ True | AILogic$ NeedsPrevention | SubAbility$ DBEffect | SpellDescription$ The next time a source of your choice would deal damage to you this turn, prevent that damage. If damage is prevented this way, CARDNAME deals that much damage to that source's controller.
-SVar:DBEffect:DB$ Effect | ReplacementEffects$ RPreventNextFromSource | RememberObjects$ Remembered | ImprintCards$ Self | SVars$ RPreventNextFromSource,ExileEffect,DamageControllerInstead,X | SubAbility$ DBCleanup | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ GE1
-SVar:RPreventNextFromSource:Event$ DamageDone | ValidSource$ Card.IsRemembered | ValidTarget$ You | ReplaceWith$ DamageControllerInstead | PreventionEffect$ True | Description$ The next time the chosen source deals damage to you, prevent that damage.
-SVar:DamageControllerInstead:DB$ DealDamage | Defined$ RememberedController | DamageSource$ Imprinted | NumDmg$ X | References$ X | SubAbility$ ExileEffect
+A:SP$ ChooseSource | Cost$ R W | Choices$ Card | AILogic$ NeedsPrevention | SubAbility$ DBEffect | SpellDescription$ The next time a source of your choice would deal damage to you this turn, prevent that damage. If damage is prevented this way, CARDNAME deals that much damage to that source's controller.
+SVar:DBEffect:DB$ Effect | ReplacementEffects$ RPreventNextFromSource | SVars$ RPreventNextFromSource,ExileEffect,DamageControllerInstead,X | SubAbility$ DBCleanup | ConditionDefined$ ChosenCard | ConditionPresent$ Card
+SVar:RPreventNextFromSource:Event$ DamageDone | ValidSource$ Card.ChosenCard | ValidTarget$ You | ReplaceWith$ DamageControllerInstead | PreventionEffect$ True | Description$ The next time the chosen source deals damage to you, prevent that damage.
+SVar:DamageControllerInstead:DB$ DealDamage | Defined$ ChosenCardController | DamageSource$ EffectSource | NumDmg$ X | References$ X | SubAbility$ ExileEffect
 SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
 SVar:X:ReplaceCount$DamageAmount
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearImprinted$ True
+SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/deflecting_palm.jpg
 Oracle:The next time a source of your choice would deal damage to you this turn, prevent that damage. If damage is prevented this way, Deflecting Palm deals that much damage to that source's controller.
--- a/forge-gui/res/cardsfolder/e/eladamri.txt
+++ b/forge-gui/res/cardsfolder/e/eladamri.txt
@@ -2,17 +2,9 @@ Name:Eladamri
 ManaCost:no cost
 Types:Vanguard
 HandLifeModifier:-1/+15
-A:AB$ Effect | ActivationZone$ Command | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature to redirect damage from | ReplacementEffects$ SelflessCombat,SelflessNonCombat | Triggers$ OutOfSight | SVars$ CombatDmg,NonCombatDmg,RestDmgCombat,RestDmg,ExileEffect,X,Y | References$ SelflessCombat,SelflessNonCombat,OutOfSight,CombatDmg,NonCombatDmg,RestDmgCombat,RestDmg,ExileEffect,X,Y | RememberObjects$ Targeted | Duration$ Permanent | SpellDescription$ The next 1 damage that would be dealt to target creature you control is dealt to you instead.
-SVar:SelflessCombat:Event$ DamageDone | ActiveZones$ Command | ValidTarget$ Card.IsRemembered | IsCombat$ True | ReplaceWith$ CombatDmg | Description$ The next 1 damage that would be dealt to target creature you control is dealt to you instead.
-SVar:SelflessNonCombat:Event$ DamageDone | ActiveZones$ Command | ValidTarget$ Card.IsRemembered | IsCombat$ False | ReplaceWith$ NonCombatDmg | Secondary$ True | Description$ The next 1 damage that would be dealt to target creature you control is dealt to you instead.
-SVar:CombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ You | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ 1 | SubAbility$ RestDmgCombat | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1
-SVar:NonCombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ You | DamageSource$ ReplacedSource | NumDmg$ 1 | SubAbility$ RestDmg | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1
-SVar:RestDmgCombat:DB$ DealDamage | Defined$ Remembered | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ X | SubAbility$ ExileEffect
-SVar:RestDmg:DB$ DealDamage | Defined$ Remembered | DamageSource$ ReplacedSource | NumDmg$ X | SubAbility$ ExileEffect
-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/Minus.1
-SVar:Y:ReplaceCount$DamageAmount
+A:AB$ Effect | ActivationZone$ Command | Cost$ 0 | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature to redirect damage from | ReplacementEffects$ RedirectDamage | SVars$ RedirectDmg | References$ RedirectDamage,RedirectDmg | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | Duration$ Permanent | SpellDescription$ The next 1 damage that would be dealt to target creature you control is dealt to you instead.
+SVar:RedirectDamage:Event$ DamageDone | ValidTarget$ Creature.IsRemembered | ReplaceWith$ RedirectDmg | DamageTarget$ You | Description$ The next 1 damage that would be dealt to target creature you control is dealt to you instead.
+SVar:RedirectDmg:DB$ ReplaceSplitDamage | DamageTarget$ You
 SVar:Picture:http://downloads.cardforge.link/images/cards/VAN/Eladamri.full.jpg
 SVar:RemAIDeck:True
 Oracle:Hand -1, life +15\n{0}: The next 1 damage that would be dealt to target creature you control is dealt to you instead.
--- a/forge-gui/res/cardsfolder/e/eye_for_an_eye.txt
+++ b/forge-gui/res/cardsfolder/e/eye_for_an_eye.txt
@@ -1,16 +1,13 @@
 Name:Eye for an Eye
 ManaCost:W W
 Types:Instant
-A:SP$ ChooseSource | Cost$ W W | Choices$ Card | RememberChosen$ True | AILogic$ NeedsPrevention | SubAbility$ DBEffect | SpellDescription$ The next time a source of your choice would deal damage to you this turn, instead that source deals that much damage to you and CARDNAME deals that much damage to that source's controller.
-SVar:DBEffect:DB$ Effect | ReplacementEffects$ SelflessCombat,SelflessNonCombat | SVars$ CombatDmg,NonCombatDmg,ExileEffect,X,EyeforEyeCombat,EyeforEyenonCombat | RememberObjects$ Remembered | ImprintCards$ Self | SubAbility$ DBCleanup | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ GE1
-SVar:SelflessCombat:Event$ DamageDone | ValidTarget$ You | ValidSource$ Card.IsRemembered | IsCombat$ True | ReplaceWith$ CombatDmg | Description$ The next time a source of your choice would deal damage to you this turn, instead that source deals that much damage to you and this card deals that much damage to that source's controller.
-SVar:SelflessNonCombat:Event$ DamageDone | ValidTarget$ You | ValidSource$ Card.IsRemembered | IsCombat$ False | ReplaceWith$ NonCombatDmg | Secondary$ True | Description$ The next time a source of your choice would deal damage to you this turn, instead that source deals that much damage to you and this card deals that much damage to that source's controller.
-SVar:CombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ You | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ X | SubAbility$ EyeforEyeCombat
-SVar:EyeforEyeCombat:DB$ DealDamage | Defined$ RememberedController | DamageSource$ Imprinted | CombatDamage$ True | NumDmg$ X | SubAbility$ ExileEffect
-SVar:NonCombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ You | DamageSource$ ReplacedSource | NumDmg$ X | SubAbility$ EyeforEyenonCombat
-SVar:EyeforEyenonCombat:DB$ DealDamage | Defined$ RememberedController | DamageSource$ Imprinted | CombatDamage$ False | NumDmg$ X | SubAbility$ ExileEffect
+A:SP$ ChooseSource | Cost$ W W | Choices$ Card | AILogic$ NeedsPrevention | SubAbility$ DBEffect | SpellDescription$ The next time a source of your choice would deal damage to you this turn, instead that source deals that much damage to you and CARDNAME deals that much damage to that source's controller.
+SVar:DBEffect:DB$ Effect | ReplacementEffects$ SelflessDamage | SVars$ SelflessDmg,ExileEffect,X,EyeforEye | References$ SelflessDamage,SelflessDmg,EyeforEye,ExileEffect,X | ImprintCards$ Self | SubAbility$ DBCleanup | ConditionDefined$ ChosenCard | ConditionPresent$ Card | ConditionCompare$ GE1
+SVar:SelflessDamage:Event$ DamageDone | ValidTarget$ You | ValidSource$ Card.ChosenCard | ReplaceWith$ SelflessDmg | Description$ The next time a source of your choice would deal damage to you this turn, instead that source deals that much damage to you and this card deals that much damage to that source's controller.
+SVar:SelflessDmg:DB$ ReplaceEffect | VarName$ Affected | VarValue$ You | VarType$ Player | SubAbility$ EyeforEye
+SVar:EyeforEye:DB$ DealDamage | Defined$ ReplacedSourceController | DamageSource$ EffectSource | NumDmg$ X | SubAbility$ ExileEffect
 SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile | Static$ True
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True
 SVar:X:ReplaceCount$DamageAmount
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/eye_for_an_eye.jpg
--- a/forge-gui/res/cardsfolder/f/forcefield.txt
+++ b/forge-gui/res/cardsfolder/f/forcefield.txt
@@ -1,12 +1,14 @@
 Name:Forcefield
 ManaCost:3
 Types:Artifact
-A:AB$ ChooseCard | Cost$ 1 | Choices$ Creature.unblocked | RememberChosen$ True | AILogic$ NeedsPrevention | SubAbility$ DBEffect | SVars$ DBEffect,RPreventNextFromCreature,CombatDmg,ExileEffect | SpellDescription$ The next time an unblocked creature of your choice would deal combat damage to you this turn, prevent all but 1 of that damage.
-SVar:DBEffect:DB$ Effect | ReplacementEffects$ RPreventNextFromCreature | RememberObjects$ Remembered | SVars$ RPreventNextFromCreature,CombatDmg,ExileEffect | SubAbility$ DBCleanup | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ GE1
-SVar:RPreventNextFromCreature:Event$ DamageDone | ValidSource$ Card.IsRemembered | ValidTarget$ You | ReplaceWith$ CombatDmg | PreventionEffect$ True | IsCombat$ True | Description$ The next time an unblocked creature of your choice would deal combat damage to you this turn, prevent all but 1 of that damage.
-SVar:CombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ 1 | SubAbility$ ExileEffect
+A:AB$ ChooseCard | Cost$ 1 | Choices$ Creature.unblocked | AILogic$ NeedsPrevention | SubAbility$ DBEffect | SpellDescription$ The next time an unblocked creature of your choice would deal combat damage to you this turn, prevent all but 1 of that damage.
+SVar:DBEffect:DB$ Effect | ReplacementEffects$ RPreventDamage | SVars$ RPreventDamage,PreventDmg,ExileEffect | References$ PreventDmg,ExileEffect | SubAbility$ DBCleanup | ConditionDefined$ ChosenCard | ConditionPresent$ Card | ConditionCompare$ GE1
+
+SVar:RPreventDamage:Event$ DamageDone | ValidSource$ Card.ChosenCard | ValidTarget$ You | ReplaceWith$ PreventDmg | PreventionEffect$ True | IsCombat$ True | Description$ The next time an unblocked creature of your choice would deal combat damage to you this turn, prevent all but 1 of that damage.
+SVar:PreventDmg:DB$ ReplaceEffect | VarName$ DamageAmount | VarValue$ 1 | SubAbility$ ExileEffect
 SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+
+SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True
 SVar:NonStackingEffect:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/forcefield.jpg
 Oracle:{1}: The next time an unblocked creature of your choice would deal combat damage to you this turn, prevent all but 1 of that damage.
--- a/forge-gui/res/cardsfolder/f/forethought_amulet.txt
+++ b/forge-gui/res/cardsfolder/f/forethought_amulet.txt
@@ -3,7 +3,7 @@ ManaCost:5
 Types:Artifact
 K:UpkeepCost:3
 R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Instant,Sorcery | ValidTarget$ You | DamageAmount$ GE3 | ReplaceWith$ Dmg2 | Description$ If an instant or sorcery source would deal 3 or more damage to you, it deals 2 damage to you instead.
-SVar:Dmg2:AB$DealDamage | Cost$ 0 | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ 2
+SVar:Dmg2:DB$ ReplaceEffect | VarName$ DamageAmount | VarValue$ 2
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/forethought_amulet.jpg
 Oracle:At the beginning of your upkeep, sacrifice Forethought Amulet unless you pay {3}.\nIf an instant or sorcery source would deal 3 or more damage to you, it deals 2 damage to you instead.
--- a/forge-gui/res/cardsfolder/g/generals_regalia.txt
+++ b/forge-gui/res/cardsfolder/g/generals_regalia.txt
@@ -1,16 +1,13 @@
 Name:General's Regalia
 ManaCost:3
 Types:Artifact
-A:AB$ ChooseSource | Cost$ 3 | Choices$ Card | RememberChosen$ True | AILogic$ NeedsPrevention | SubAbility$ DBEffect | SpellDescription$ The next time a source of your choice would deal damage to you this turn, that damage is dealt to target creature you control instead.
-SVar:DBEffect:DB$ Effect | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control to redirect damage to | ReplacementEffects$ SelflessCombat,SelflessNonCombat | Triggers$ OutOfSight | SVars$ CombatDmg,NonCombatDmg,ExileEffect,X | References$ SelflessCombat,SelflessNonCombat,OutOfSight,CombatDmg,NonCombatDmg,ExileEffect,X | RememberObjects$ Remembered | ImprintCards$ Targeted | SubAbility$ DBCleanup | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ GE1
-SVar:SelflessCombat:Event$ DamageDone | ValidTarget$ You | ValidSource$ Card.IsRemembered | IsCombat$ True | ReplaceWith$ CombatDmg | Description$ The next time a source of your choice would deal damage to you this turn, that damage is dealt to target creature you control instead.
-SVar:SelflessNonCombat:Event$ DamageDone | ValidTarget$ You | ValidSource$ Card.IsRemembered | IsCombat$ False | ReplaceWith$ NonCombatDmg | Secondary$ True | Description$ The next time a source of your choice would deal damage to you this turn, that damage is dealt to target creature you control instead.
-SVar:CombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Imprinted | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ X | SubAbility$ ExileEffect
-SVar:NonCombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Imprinted | DamageSource$ ReplacedSource | NumDmg$ X | SubAbility$ ExileEffect
+A:AB$ ChooseSource | Cost$ 3 | Choices$ Card | AILogic$ NeedsPrevention | SubAbility$ DBEffect | SpellDescription$ The next time a source of your choice would deal damage to you this turn, that damage is dealt to target creature you control instead.
+SVar:DBEffect:DB$ Effect | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control to redirect damage to | ReplacementEffects$ GeneralDamage | Triggers$ OutOfSight | SVars$ GeneralDmg,ExileEffect | References$ GeneralDamage,OutOfSight,GeneralDmg,ExileEffect | RememberObjects$ Targeted | SubAbility$ DBCleanup
+SVar:GeneralDamage:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Creature.ChosenCard | ValidTarget$ You | DamageTarget$ Remembered | ReplaceWith$ GeneralDmg | Description$ The next time a source of your choice would deal damage to you this turn, that damage is dealt to target creature you control instead.
+SVar:GeneralDmg:DB$ ReplaceEffect | VarName$ Affected | VarValue$ Remembered | VarType$ Card | SubAbility$ ExileEffect
 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 | ClearRemembered$ True
-SVar:X:ReplaceCount$DamageAmount
+SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/generals_regalia.jpg
 Oracle:{3}: The next time a source of your choice would deal damage to you this turn, that damage is dealt to target creature you control instead.
--- a/forge-gui/res/cardsfolder/g/ghosts_of_the_innocent.txt
+++ b/forge-gui/res/cardsfolder/g/ghosts_of_the_innocent.txt
@@ -3,7 +3,6 @@ ManaCost:5 W W
 Types:Creature Spirit
 PT:4/5
 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: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
--- a/forge-gui/res/cardsfolder/g/glarecaster.txt
+++ b/forge-gui/res/cardsfolder/g/glarecaster.txt
@@ -3,18 +3,13 @@ ManaCost:4 W W
 Types:Creature Bird Cleric
 PT:3/3
 K:Flying
-A:AB$ Effect | Cost$ 5 W | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player to redirect damamge | ReplacementEffects$ SelfCombat,SelfNonCombat | Triggers$ OutOfSight | SVars$ MirrorwoodDmgCombat,MirrorwoodDmgnonCombat,MirrorwoodX,ExileEffect,X,Y,Z | RememberObjects$ Targeted | ImprintCards$ Self | SpellDescription$ The next time damage would be dealt to CARDNAME and/or you this turn, that damage is dealt to target creature or player instead.
-SVar:SelfCombat:Event$ DamageDone | ValidTarget$ Creature.IsImprinted,You | IsCombat$ True | ReplaceWith$ MirrorwoodDmgCombat | CheckSVar$ Z | Description$ The next time damage would be dealt to this creature and/or you this turn, that damage is dealt to target creature or player instead.
-SVar:SelfNonCombat:Event$ DamageDone | ValidTarget$ Creature.IsImprinted,You | IsCombat$ False | ReplaceWith$ MirrorwoodDmgnonCombat | Secondary$ True | CheckSVar$ Z | Description$ The next time damage would be dealt to this creature and/or you this turn, that damage is dealt to target creature or player instead.
-SVar:MirrorwoodDmgCombat:AB$ DealDamage | Cost$ 0 | CombatDamage$ True | Defined$ Remembered | DamageSource$ ReplacedSource | NumDmg$ MirrorwoodX | References$ MirrorwoodX | SubAbility$ ExileEffect
-SVar:MirrorwoodDmgnonCombat:AB$ DealDamage | Cost$ 0 | CombatDamage$ False | Defined$ Remembered | DamageSource$ ReplacedSource | NumDmg$ MirrorwoodX | References$ MirrorwoodX | SubAbility$ ExileEffect
-SVar:MirrorwoodX:ReplaceCount$DamageAmount
-SVar:OutOfSight:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.IsImprinted,Card.IsRemembered | Execute$ ExileEffect | Static$ True
-SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
+A:AB$ Effect | Cost$ 5 W | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player to redirect the damage to | ReplacementEffects$ SelflessDamage | SVars$ SelflessDamage,SelflessDmg,ExileEffect | References$ SelflessDamage,SelflessDmg,ExileEffect | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | SpellDescription$ The next time damage would be dealt to CARDNAME and/or you this turn, that damage is dealt to target creature or player instead.

-SVar:X:PlayerCountRemembered$Amount
-SVar:Y:Count$Valid Creature.IsRemembered
-SVar:Z:SVar$X/Plus.Y
+SVar:SelflessDamage:Event$ DamageDone | ValidTarget$ Creature.EffectSource,You | ReplaceWith$ WardDmg | DamageTarget$ Remembered | Description$ The next time damage would be dealt to EFFECTSOURCE and/or you this turn, that damage is dealt to target creature or player instead.
+
+SVar:SelflessDmg:DB$ ReplaceEffect | VarName$ Affected | VarValue$ Remembered | VarType$ Card | SubAbility$ ExileEffect
+
+SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile | Static$ True

 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/glarecaster.jpg
--- a/forge-gui/res/cardsfolder/g/goblin_psychopath.txt
+++ b/forge-gui/res/cardsfolder/g/goblin_psychopath.txt
@@ -5,9 +5,9 @@ PT:5/5
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ CoinFlip | TriggerDescription$ Whenever CARDNAME attacks or blocks, flip a coin. If you lose the flip, the next time it would deal combat damage this turn, it deals that damage to you instead.
 T:Mode$ Blocks | ValidCard$ Card.Self | Execute$ CoinFlip | Secondary$ True | TriggerDescription$ Whenever CARDNAME attacks or blocks, flip a coin. If you lose the flip, the next time it would deal combat damage this turn, it deals that damage to you instead.
 SVar:CoinFlip:DB$ FlipACoin | LoseSubAbility$ CreateEffect
-SVar:CreateEffect:DB$ Effect | Name$ Goblin Psychopath Effect | ReplacementEffects$ EventPsychoDamageDone | SVars$ DamagePsychoYou,PsychoX,ExileEffect | References$ EventPsychoDamageDone,DamagePsychoYou,PsychoX,ExileEffect | ImprintCards$ Self
-SVar:EventPsychoDamageDone:Event$ DamageDone | ValidSource$ Card.IsImprinted | ReplaceWith$ DamagePsychoYou | IsCombat$ True | Description$ The next time Goblin Psychopath would deal combat damage this turn, it deals that damage to you instead.
-SVar:DamagePsychoYou:AB$ DealDamage | Cost$ 0 | CombatDamage$ True | NumDmg$ PsychoX | References$ PsychoX | Defined$ You | DamageSource$ Imprinted | SubAbility$ ExileEffect
+SVar:CreateEffect:DB$ Effect | Name$ Goblin Psychopath Effect | ReplacementEffects$ EventDamageDone | SVars$ DamageYouExileEffect | References$ EventDamageDone,DamageYou,ExileEffect
+SVar:EventDamageDone:Event$ DamageDone | ValidSource$ Card.EffectSource | ReplaceWith$ DamageYou | IsCombat$ True | Description$ The next time EFFECTSOURCE would deal combat damage this turn, it deals that damage to you instead.
+SVar:DamageYou:DB$ ReplaceEffect | VarName$ Affected | VarValue$ You | VarType$ Player | SubAbility$ ExileEffect
 SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
 SVar:PsychoX:ReplaceCount$DamageAmount
 SVar:RemAIDeck:True
--- a/forge-gui/res/cardsfolder/h/honorable_passage.txt
+++ b/forge-gui/res/cardsfolder/h/honorable_passage.txt
@@ -4,19 +4,16 @@ Types:Instant

 A:SP$ ChooseSource | Cost$ 1 W | Choices$ Card | AILogic$ NeedsPrevention | SubAbility$ DBEffect | StackDescription$ SpellDescription | SpellDescription$ The next time a source of your choice would deal damage to target creature or player this turn, prevent that damage. If damage from a red source is prevented this way, Honorable Passage deals that much damage to the source's controller.

-SVar:DBEffect:DB$ Effect | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player to prevent damage to | ReplacementEffects$ RepDmg | SVars$ RepDmg,DealDamage,OutOfSight,ExileEffect,X,Y | RememberObjects$ Targeted | Triggers$ OutOfSight | SubAbility$ DBCleanup | ConditionDefined$ ChosenCard | ConditionPresent$ Card | ConditionCompare$ GE1
-
-SVar:OutOfSight:Mode$ ChangesZone | TriggerZones$ Command | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.IsRemembered | Execute$ ExileEffect | Static$ True
+SVar:DBEffect:DB$ Effect | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player to prevent damage to | ReplacementEffects$ RepDmg | SVars$ RepDmg,DealDamage,ExileEffect,X,Y | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | SubAbility$ DBCleanup | ConditionDefined$ ChosenCard | ConditionPresent$ Card | ConditionCompare$ GE1

 SVar:RepDmg:Event$ DamageDone | ValidTarget$ Card.IsRemembered,Player.IsRemembered | ValidSource$ Card.ChosenCard | ReplaceWith$ DealDamage | PreventionEffect$ True | Description$ The next time a source of your choice would deal damage to target creature or player this turn, prevent that damage. If damage from a red source is prevented this way, Honorable Passage deals that much damage to the source's controller.

-SVar:DealDamage:AB$ DealDamage | Cost$ 0 | Defined$ ReplacedSourceController | DamageSource$ EffectSource | NumDmg$ X | References$ X,Y | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1 | SubAbility$ ExileEffect
+SVar:DealDamage:DB$ DealDamage | Defined$ ReplacedSourceController | DamageSource$ EffectSource | NumDmg$ X | References$ X | ConditionDefined$ ReplacedSource | ConditionPresent$ Card.RedSource | SubAbility$ ExileEffect

 SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
 SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True

 SVar:X:ReplaceCount$DamageAmount
-SVar:Y:ReplacedSource$Valid Card.RedSource

 SVar:Picture:http://www.wizards.com/global/images/magic/general/honorable_passage.jpg
 Oracle:The next time a source of your choice would deal damage to target creature or player this turn, prevent that damage. If damage from a red source is prevented this way, Honorable Passage deals that much damage to the source's controller.
--- a/forge-gui/res/cardsfolder/j/jade_monolith.txt
+++ b/forge-gui/res/cardsfolder/j/jade_monolith.txt
@@ -1,16 +1,21 @@
 Name:Jade Monolith
 ManaCost:4
 Types:Artifact
-A:AB$ ChooseSource | Cost$ 1 | Choices$ Card | RememberChosen$ True | AILogic$ NeedsPrevention | SubAbility$ DBEffect | SpellDescription$ The next time a source of your choice would deal damage to target creature this turn, that source deals that damage to you instead.
-SVar:DBEffect:DB$ Effect | 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$ Remembered | ImprintCards$ Targeted | SubAbility$ DBCleanup | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ GE1
-SVar:SelflessCombat:Event$ DamageDone | ValidTarget$ Card.IsImprinted | ValidSource$ Card.IsRemembered | IsCombat$ True | ReplaceWith$ CombatDmg | Description$ The next time a source of your choice would deal damage to target creature this turn, that source deals that damage to you instead.
-SVar:SelflessNonCombat:Event$ DamageDone | ValidTarget$ Card.IsImprinted | ValidSource$ Card.IsRemembered | IsCombat$ False | ReplaceWith$ NonCombatDmg | Secondary$ True | Description$ The next time a source of your choice would deal damage to target creature this turn, that source deals that damage to you instead.
-SVar:CombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ You | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ X | SubAbility$ ExileEffect
-SVar:NonCombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ You | DamageSource$ ReplacedSource | NumDmg$ X | SubAbility$ ExileEffect
-SVar:OutOfSight:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | Defined$ Imprinted | Execute$ ExileEffect | Static$ True
+
+A:AB$ ChooseSource | Cost$ 1 | Choices$ Card | AILogic$ NeedsPrevention | SubAbility$ DBEffect | SpellDescription$ The next time a source of your choice would deal damage to target creature this turn, that damage is dealt to you instead.
+
+SVar:DBEffect:DB$ Effect | ValidTgts$ Creature | TgtPrompt$ Select target creature to redirect the damage from | ReplacementEffects$ SelflessDamage | Triggers$ OutOfSight | SVars$ SelflessDamage,ExileEffect | References$ SelflessDamage,OutOfSight,SelflessDamage,ExileEffect | Duration$ HostLeavesOrEOT | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | SubAbility$ DBCleanup | ConditionDefined$ ChosenCard | ConditionPresent$ Card | ConditionCompare$ GE1
+
+SVar:SelflessDamage:Event$ DamageDone | ValidTarget$ Creature.IsRemembered | ValidSource$ Card.ChosenCard | ReplaceWith$ SelflessDmg | Description$ The next time a source of your choice would deal damage to target creature this turn, that damage is dealt to you instead.
+
+SVar:SelflessDmg:DB$ ReplaceEffect | VarName$ Affected | VarValue$ You | VarType$ Player | SubAbility$ ExileEffect
+
+#Zone Change for the source of your choice
+SVar:OutOfSight:Mode$ ChangesZone | Origin$ Any | Destination$ Any | Defined$ ChosenCard | Execute$ ExileEffect | Static$ True
 SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile | Static$ True
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:ReplaceCount$DamageAmount
+
+SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True
+
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jade_monolith.jpg
 Oracle:{1}: The next time a source of your choice would deal damage to target creature this turn, that source deals that damage to you instead.
--- a/forge-gui/res/cardsfolder/k/karonas_zealot.txt
+++ b/forge-gui/res/cardsfolder/k/karonas_zealot.txt
@@ -4,11 +4,9 @@ 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$ 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:KaronaEffect:DB$ Effect | ValidTgts$ Creature | TgtPrompt$ Select target creature to redirect the damage to | ReplacementEffects$ ZealotDamage | SVars$ MirrorStrikeDmg | Duration$ HostLeavesOrEOT | RememberObjects$ Targeted | ExileOnMoved$ Battlefield
+SVar:ZealotDamage:Event$ DamageDone | ValidTarget$ Creature.EffectSource | ReplaceWith$ MirrorStrikeDmg | DamageTarget$ Remembered | 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$ Remembered | VarType$ Card
 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.
--- a/forge-gui/res/cardsfolder/k/kill_suit_cultist.txt
+++ b/forge-gui/res/cardsfolder/k/kill_suit_cultist.txt
@@ -3,11 +3,9 @@ ManaCost:R
 Types:Creature Goblin Berserker
 PT:1/1
 K:CARDNAME attacks each turn if able.
-A:AB$ Effect | Cost$ B Sac<1/CARDNAME> | Name$ Kill-Suit Cultist Effect | ValidTgts$ Creature | ReplacementEffects$ SelfCombat,SelfNonCombat | Triggers$ OutOfSight | SVars$ CultistDestroy,ExileEffect | References$ SelfCombat,SelfNonCombat,OutOfSight,CultistDestroy,ExileEffect | RememberObjects$ Targeted | SpellDescription$ The next time damage would be dealt to target creature this turn, destroy that creature instead.
-SVar:SelfCombat:Event$ DamageDone | ValidTarget$ Creature.IsRemembered | IsCombat$ True | ReplaceWith$ CultistDestroy | Description$ The next time damage would be dealt to target creature this turn, destroy that creature instead.
-SVar:SelfNonCombat:Event$ DamageDone | ValidTarget$ Creature.IsRemembered | IsCombat$ False | ReplaceWith$ CultistDestroy | Secondary$ True | Description$ The next time damage would be dealt to target creature this turn, destroy that creature instead.
-SVar:CultistDestroy:AB$ Destroy | Cost$ 0 | Defined$ ReplacedTarget | SubAbility$ ExileEffect
-SVar:OutOfSight:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.IsRemembered | Execute$ ExileEffect | Static$ True
+A:AB$ Effect | Cost$ B Sac<1/CARDNAME> | ValidTgts$ Creature | ReplacementEffects$ SelfDamage | SVars$ CultistDestroy,ExileEffect | References$ SelfDamage,CultistDestroy,ExileEffect | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | SpellDescription$ The next time damage would be dealt to target creature this turn, destroy that creature instead.
+SVar:SelfDamage:Event$ DamageDone | ValidTarget$ Creature.IsRemembered | ReplaceWith$ CultistDestroy | Description$ The next time damage would be dealt to target creature this turn, destroy that creature instead.
+SVar:CultistDestroy:DB$ Destroy | Defined$ ReplacedTarget | SubAbility$ ExileEffect
 SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kill_suit_cultist.jpg
--- a/forge-gui/res/cardsfolder/k/kjeldoran_royal_guard.txt
+++ b/forge-gui/res/cardsfolder/k/kjeldoran_royal_guard.txt
@@ -2,9 +2,8 @@ Name:Kjeldoran Royal Guard
 ManaCost:3 W W
 Types:Creature Human Soldier
 PT:2/5
-A:AB$ Effect | Cost$ T | Name$ Kjeldoran Royal Guard Effect | ReplacementEffects$ DamageEvent | SVars$ RoyalGuardIntercept,InterceptedX | RememberObjects$ Self | AILogic$ Fog | SpellDescription$ All combat damage that would be dealt to you by unblocked creatures this turn is dealt to CARDNAME instead.
-SVar:DamageEvent:Event$ DamageDone | ValidSource$ Creature.unblocked | ValidTarget$ You | ReplaceWith$ RoyalGuardIntercept | IsCombat$ True | Description$ All combat damage that would be dealt to you by unblocked creatures this turn is dealt to Kjeldoran Royal Guard instead.
-SVar:RoyalGuardIntercept:AB$DealDamage | Cost$ 0 | CombatDamage$ True | Defined$ Remembered | DamageSource$ ReplacedSource | NumDmg$ InterceptedX | References$ InterceptedX
-SVar:InterceptedX:ReplaceCount$DamageAmount
+A:AB$ Effect | Cost$ T | Name$ Kjeldoran Royal Guard Effect | ReplacementEffects$ DamageEvent | SVars$ DmgSelf | AILogic$ Fog | SpellDescription$ All combat damage that would be dealt to you by unblocked creatures this turn is dealt to CARDNAME instead.
+SVar:DamageEvent:Event$ DamageDone | ValidSource$ Creature.unblocked | ValidTarget$ You | ReplaceWith$ DmgSelf | IsCombat$ True | DamageTarget$ EffectSource | Description$ All combat damage that would be dealt to you by unblocked creatures this turn is dealt to Kjeldoran Royal Guard instead.
+SVar:DmgSelf:DB$ ReplaceEffect | VarName$ Affected | VarValue$ EffectSource | VarType$ Card
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kjeldoran_royal_guard.jpg
 Oracle:{T}: All combat damage that would be dealt to you by unblocked creatures this turn is dealt to Kjeldoran Royal Guard instead.
--- a/forge-gui/res/cardsfolder/k/kor_chant.txt
+++ b/forge-gui/res/cardsfolder/k/kor_chant.txt
@@ -8,7 +8,7 @@ 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$ 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:SelflessDamage:Event$ DamageDone | ValidTarget$ Creature.IsImprinted | ValidSource$ Card.ChosenCard | ReplaceWith$ SelflessDmg | DamageTarget$ Remembered | 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

--- a/forge-gui/res/cardsfolder/k/kor_dirge.txt
+++ b/forge-gui/res/cardsfolder/k/kor_dirge.txt
@@ -8,7 +8,7 @@ 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$ 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:SelflessDamage:Event$ DamageDone | ValidTarget$ Creature.IsImprinted | ValidSource$ Card.ChosenCard | ReplaceWith$ SelflessDmg | DamageTarget$ Remembered | 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

--- a/forge-gui/res/cardsfolder/l/lancers_en_kor.txt
+++ b/forge-gui/res/cardsfolder/l/lancers_en_kor.txt
@@ -3,17 +3,9 @@ ManaCost:3 W W
 Types:Creature Kor Soldier
 PT:3/3
 K:Trample
-A:AB$ Effect | Cost$ 0 | Name$ en-Kor Redirection | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control to redirect the damage to | ReplacementEffects$ EnKorCombat,EnKorNonCombat | Triggers$ OutOfSight | SVars$ CombatDmg,NonCombatDmg,ExileEffect,RestDmgCombat,RestDmg,X,Y | References$ EnKorCombat,EnKorNonCombat,OutOfSight,CombatDmg,NonCombatDmg,ExileEffect,RestDmgCombat,RestDmg,X,Y | Duration$ HostLeavesOrEOT | RememberObjects$ Self | ImprintCards$ Targeted | SpellDescription$ The next 1 damage that would be dealt to CARDNAME this turn is dealt to target creature you control instead.
-SVar:EnKorCombat:Event$ DamageDone | ValidTarget$ Creature.IsRemembered | IsCombat$ True | ReplaceWith$ CombatDmg | IsPresent$ Creature.IsImprinted | Description$ The next 1 damage that would be dealt to Lancers en-Kor this turn is dealt to target creature you control instead.
-SVar:EnKorNonCombat:Event$ DamageDone | ValidTarget$ Creature.IsRemembered | IsCombat$ False | ReplaceWith$ NonCombatDmg | Secondary$ True | IsPresent$ Creature.IsImprinted | Description$ The next 1 damage that would be dealt to Lancers en-Kor this turn is dealt to target creature you control instead.
-SVar:CombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Imprinted | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ 1 | SubAbility$ RestDmgCombat | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1 | References$ Y
-SVar:NonCombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Imprinted | DamageSource$ ReplacedSource | NumDmg$ 1 | SubAbility$ RestDmg | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1 | References$ Y
-SVar:RestDmgCombat:DB$ DealDamage | Defined$ Remembered | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ X | SubAbility$ ExileEffect | References$ X
-SVar:RestDmg:DB$ DealDamage | Defined$ Remembered | DamageSource$ ReplacedSource | NumDmg$ X | SubAbility$ ExileEffect | References$ X
-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:X:ReplaceCount$DamageAmount/Minus.1
-SVar:Y:ReplaceCount$DamageAmount
+A:AB$ Effect | Cost$ 0 | Name$ en-Kor Redirection | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control to redirect the damage to | ReplacementEffects$ EnKor | SVars$ EnKorDmg | References$ EnKor,EnKorDmg | Duration$ HostLeavesOrEOT | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | SpellDescription$ The next 1 damage that would be dealt to CARDNAME this turn is dealt to target creature you control instead.
+SVar:EnKor:Event$ DamageDone | ValidTarget$ Creature.EffectSource | ReplaceWith$ EnKorDmg | DamageTarget$ Remembered | Description$ The next 1 damage that would be dealt to EFFECTSOURCE this turn is dealt to target creature you control instead.
+SVar:EnKorDmg:DB$ ReplaceSplitDamage | DamageTarget$ Remembered
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/lancers_en_kor.jpg
 Oracle:Trample\n{0}: The next 1 damage that would be dealt to Lancers en-Kor this turn is dealt to target creature you control instead.
--- a/forge-gui/res/cardsfolder/m/mirror_strike.txt
+++ b/forge-gui/res/cardsfolder/m/mirror_strike.txt
@@ -1,8 +1,8 @@
 Name:Mirror Strike
 ManaCost:3 W
 Types:Instant
-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.
+A:SP$ Effect | Cost$ 3 W | Name$ Mirror Strike Effect | ReplacementEffects$ DamageEvent | SVars$ MirrorStrikeDmg | | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | 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.IsRemembered | 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:DB$ ReplaceEffect | VarName$ Affected | VarValue$ ReplacedSourceController | VarType$ Player
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mirror_strike.jpg
--- a/forge-gui/res/cardsfolder/m/mirrorwood_treefolk.txt
+++ b/forge-gui/res/cardsfolder/m/mirrorwood_treefolk.txt
@@ -2,19 +2,13 @@ Name:Mirrorwood Treefolk
 ManaCost:3 G
 Types:Creature Treefolk
 PT:2/4
-A:AB$ Effect | Cost$ 2 R W | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player to redirect damamge | ReplacementEffects$ SelfCombat,SelfNonCombat | Triggers$ OutOfSight | SVars$ MirrorwoodDmgCombat,MirrorwoodDmgnonCombat,MirrorwoodX,ExileEffect,X,Y,Z | RememberObjects$ Targeted | ImprintCards$ Self | SpellDescription$ The next time damage would be dealt to CARDNAME this turn, that damage is dealt to target creature or player instead.
-SVar:SelfCombat:Event$ DamageDone | ValidTarget$ Creature.IsImprinted | IsCombat$ True | ReplaceWith$ MirrorwoodDmgCombat | CheckSVar$ Z | Description$ The next time damage would be dealt to this creature this turn, that damage is dealt to target creature or player instead.
-SVar:SelfNonCombat:Event$ DamageDone | ValidTarget$ Creature.IsImprinted | IsCombat$ False | ReplaceWith$ MirrorwoodDmgnonCombat | Secondary$ True | CheckSVar$ Z | Description$ The next time damage would be dealt to this creature this turn, that damage is dealt to target creature or player instead.
-SVar:MirrorwoodDmgCombat:AB$ DealDamage | Cost$ 0 | CombatDamage$ True | Defined$ Remembered | DamageSource$ ReplacedSource | NumDmg$ MirrorwoodX | References$ MirrorwoodX | SubAbility$ ExileEffect
-SVar:MirrorwoodDmgnonCombat:AB$ DealDamage | Cost$ 0 | CombatDamage$ False | Defined$ Remembered | DamageSource$ ReplacedSource | NumDmg$ MirrorwoodX | References$ MirrorwoodX | SubAbility$ ExileEffect
-SVar:MirrorwoodX:ReplaceCount$DamageAmount
-SVar:OutOfSight:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.IsImprinted,Card.IsRemembered | Execute$ ExileEffect | Static$ True
-SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
+A:AB$ Effect | Cost$ 2 R W | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player to redirect the damage to | ReplacementEffects$ SelflessDamage | SVars$ SelflessDamage,SelflessDmg,ExileEffect | References$ SelflessDamage,SelflessDmg,ExileEffect | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | SpellDescription$ The next time damage would be dealt to CARDNAME this turn, that damage is dealt to target creature or player instead.

-SVar:X:PlayerCountRemembered$Amount
-SVar:Y:Count$Valid Creature.IsRemembered
-SVar:Z:SVar$X/Plus.Y
+SVar:SelflessDamage:Event$ DamageDone | ValidTarget$ Creature.EffectSource | ReplaceWith$ WardDmg | DamageTarget$ Remembered | Description$ The next time damage would be dealt to EFFECTSOURCE this turn, that damage is dealt to target creature or player instead.

+SVar:SelflessDmg:DB$ ReplaceEffect | VarName$ Affected | VarValue$ Remembered | VarType$ Card | SubAbility$ ExileEffect
+
+SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile | Static$ True
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mirrorwood_treefolk.jpg
 Oracle:{2}{R}{W}: The next time damage would be dealt to Mirrorwood Treefolk this turn, that damage is dealt to target creature or player instead.
--- a/forge-gui/res/cardsfolder/n/nomads_en_kor.txt
+++ b/forge-gui/res/cardsfolder/n/nomads_en_kor.txt
@@ -2,17 +2,9 @@ Name:Nomads en-Kor
 ManaCost:W
 Types:Creature Kor Nomad Soldier
 PT:1/1
-A:AB$ Effect | Cost$ 0 | Name$ en-Kor Redirection | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control to redirect the damage to | ReplacementEffects$ EnKorCombat,EnKorNonCombat | Triggers$ OutOfSight | SVars$ CombatDmg,NonCombatDmg,ExileEffect,RestDmgCombat,RestDmg,X,Y | References$ EnKorCombat,EnKorNonCombat,OutOfSight,CombatDmg,NonCombatDmg,ExileEffect,RestDmgCombat,RestDmg,X,Y | Duration$ HostLeavesOrEOT | RememberObjects$ Self | ImprintCards$ Targeted | SpellDescription$ The next 1 damage that would be dealt to CARDNAME this turn is dealt to target creature you control instead.
-SVar:EnKorCombat:Event$ DamageDone | ValidTarget$ Creature.IsRemembered | IsCombat$ True | ReplaceWith$ CombatDmg | IsPresent$ Creature.IsImprinted | Description$ The next 1 damage that would be dealt to Nomads en-Kor this turn is dealt to target creature you control instead.
-SVar:EnKorNonCombat:Event$ DamageDone | ValidTarget$ Creature.IsRemembered | IsCombat$ False | ReplaceWith$ NonCombatDmg | Secondary$ True | IsPresent$ Creature.IsImprinted | Description$ The next 1 damage that would be dealt to Nomads en-Kor this turn is dealt to target creature you control instead.
-SVar:CombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Imprinted | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ 1 | SubAbility$ RestDmgCombat | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1
-SVar:NonCombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Imprinted | DamageSource$ ReplacedSource | NumDmg$ 1 | SubAbility$ RestDmg | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1
-SVar:RestDmgCombat:DB$ DealDamage | Defined$ Remembered | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ X | SubAbility$ ExileEffect
-SVar:RestDmg:DB$ DealDamage | Defined$ Remembered | DamageSource$ ReplacedSource | NumDmg$ X | SubAbility$ ExileEffect
-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:X:ReplaceCount$DamageAmount/Minus.1
-SVar:Y:ReplaceCount$DamageAmount
+A:AB$ Effect | Cost$ 0 | Name$ en-Kor Redirection | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control to redirect the damage to | ReplacementEffects$ EnKor | SVars$ EnKorDmg | References$ EnKor,EnKorDmg | Duration$ HostLeavesOrEOT | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | SpellDescription$ The next 1 damage that would be dealt to CARDNAME this turn is dealt to target creature you control instead.
+SVar:EnKor:Event$ DamageDone | ValidTarget$ Creature.EffectSource | ReplaceWith$ EnKorDmg | DamageTarget$ Remembered | Description$ The next 1 damage that would be dealt to EFFECTSOURCE this turn is dealt to target creature you control instead.
+SVar:EnKorDmg:DB$ ReplaceSplitDamage | DamageTarget$ Remembered
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nomads_en_kor.jpg
 Oracle:{0}: The next 1 damage that would be dealt to Nomads en-Kor this turn is dealt to target creature you control instead.
--- a/forge-gui/res/cardsfolder/n/nova_pentacle.txt
+++ b/forge-gui/res/cardsfolder/n/nova_pentacle.txt
@@ -1,22 +1,20 @@
 Name:Nova Pentacle
 ManaCost: 4
 Types:Artifact
-A:AB$ ChooseSource | Cost$ 3 T | Choices$ Card | AILogic$ NeedsPrevention | SubAbility$ DBEffect | SpellDescription$ The next time a black source of your choice would deal damage to you this turn, prevent that damage.

-SVar:DBEffect:DB$ Effect | TargetingPlayer$ Player.Opponent | ValidTgts$ Creature.YouDontCtrl | TgtPrompt$ Select target creature the caster of this spell don't control | ReplacementEffects$ SelflessCombat,SelflessNonCombat | SVars$ SelflessCombat,SelflessNonCombat,ExileEffect,OutOfSight,X | RememberObjects$ Targeted | SubAbility$ DBCleanup | ConditionDefined$ ChosenCard | ConditionPresent$ Card | ConditionCompare$ GE1
+A:AB$ ChooseSource | Cost$ 3 T | Choices$ Card | AILogic$ NeedsPrevention | SubAbility$ DBEffect | SpellDescription$ The next time a source of your choice would deal damage to target creature this turn, that damage is dealt to you instead.

-SVar:SelflessCombat:Event$ DamageDone | ValidTarget$ You | ValidSource$ Card.ChosenCard | IsCombat$ True | ReplaceWith$ CombatDmg | IsPresent$ Creature.IsRemembered | Description$ The next time a source of your choice would deal damage to you this turn, that damage is dealt to target creature of an opponent's choice instead.
+SVar:DBEffect:DB$ Effect | TargetingPlayer$ Player.Opponent | ValidTgts$ Creature | TgtPrompt$ Select target creature to redirect the damage from | ReplacementEffects$ SelflessDamage | Triggers$ OutOfSight | SVars$ SelflessDamage,ExileEffect | References$ SelflessDamage,OutOfSight,SelflessDamage,ExileEffect | Duration$ HostLeavesOrEOT | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | SubAbility$ DBCleanup | ConditionDefined$ ChosenCard | ConditionPresent$ Card | ConditionCompare$ GE1

-SVar:SelflessNonCombat:Event$ DamageDone | ValidTarget$ You | ValidSource$ Card.ChosenCard | IsCombat$ False | ReplaceWith$ NonCombatDmg | Secondary$ True | IsPresent$ Creature.IsRemembered | Description$ The next time a source of your choice would deal damage to you this turn, that damage is dealt to target creature of an opponent's choice instead.
+SVar:SelflessDamage:Event$ DamageDone | ValidTarget$ Creature.IsRemembered | ValidSource$ Card.ChosenCard | ReplaceWith$ SelflessDmg | Description$ The next time a source of your choice would deal damage to target creature this turn, that damage is dealt to you instead.

-SVar:CombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Remembered | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ X | SubAbility$ ExileEffect
-SVar:NonCombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Remembered | DamageSource$ ReplacedSource | NumDmg$ X | SubAbility$ ExileEffect
-
-SVar:OutOfSight:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | Defined$ Remembered | Execute$ ExileEffect | Static$ True
+SVar:SelflessDmg:DB$ ReplaceEffect | VarName$ Affected | VarValue$ You | VarType$ Player | SubAbility$ ExileEffect

+#Zone Change for the source of your choice
+SVar:OutOfSight:Mode$ ChangesZone | Origin$ Any | Destination$ Any | Defined$ ChosenCard | 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:RemRandomDeck:True
--- a/forge-gui/res/cardsfolder/o/opal_eye_kondas_yojimbo.txt
+++ b/forge-gui/res/cardsfolder/o/opal_eye_kondas_yojimbo.txt
@@ -4,15 +4,13 @@ Types:Legendary Creature Fox Samurai
 PT:1/4
 K:Defender
 K:Bushido 1
-A:AB$ ChooseSource | Cost$ T | Choices$ Card | RememberChosen$ True | AILogic$ NeedsPrevention | SubAbility$ DBEffect | SpellDescription$ The next time a source of your choice would deal damage this turn, that damage is dealt to CARDNAME instead.
-SVar:DBEffect:DB$ Effect | ReplacementEffects$ SelflessCombat,SelflessNonCombat | SVars$ ShamanCombatDmg,ShamanNonCombatDmg,ExileEffect,Y | References$ SelflessCombat,SelflessNonCombat,ShamanCombatDmg,ShamanNonCombatDmg,ExileEffect,Y | Duration$ HostLeavesOrEOT | RememberObjects$ Remembered | SubAbility$ DBCleanup
-SVar:SelflessCombat:Event$ DamageDone | ValidSource$ Card.IsRemembered | IsCombat$ True | ReplaceWith$ ShamanCombatDmg | Description$ The next time the source of your choice would deal damage this turn, that damage is dealt to Opal-Eye, Konda's Yojimbo instead.
-SVar:SelflessNonCombat:Event$ DamageDone | ValidSource$ Card.IsRemembered | IsCombat$ False | ReplaceWith$ ShamanNonCombatDmg | Secondary$ True | Description$ The next time the source of your choice would deal damage this turn, that damage is dealt to Opal-Eye, Konda's Yojimbo instead.
-SVar:ShamanCombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ EffectSource | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ Y | SubAbility$ ExileEffect
-SVar:ShamanNonCombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ EffectSource | DamageSource$ ReplacedSource | NumDmg$ Y | SubAbility$ ExileEffect
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:AB$ ChooseSource | Cost$ T | Choices$ Card | AILogic$ NeedsPrevention | SubAbility$ DBEffect | SpellDescription$ The next time a source of your choice would deal damage this turn, that damage is dealt to CARDNAME instead.
+SVar:DBEffect:DB$ Effect | ReplacementEffects$ OpalDamage | Triggers$ OutOfSight | SVars$ OpalDmg,ExileEffect | References$ OpalDamage,OutOfSight,OpalDmg,ExileEffect | RememberObjects$ Targeted | Duration$ HostLeavesOrEOT | SubAbility$ DBCleanup
+SVar:OpalDamage:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Creature.ChosenCard | ReplaceWith$ OpalDmg | DamageTarget$ EffectSource | Description$ The next time a source of your choice would deal damage this turn, that damage is dealt to EFFECTSOURCE instead.
+SVar:OpalDmg:DB$ ReplaceEffect | VarName$ Affected | VarValue$ EffectSource | VarType$ Card | SubAbility$ ExileEffect
+SVar:OutOfSight:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | Defined$ ChosenCard | Execute$ ExileEffect | Static$ True
 SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile | Static$ True
-SVar:Y:ReplaceCount$DamageAmount
+SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True
 A:AB$ PreventDamage | Cost$ 1 W | Defined$ Self | Amount$ 1 | SpellDescription$ Prevent the next 1 damage that would be dealt to CARDNAME this turn.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/opal_eye_kondas_yojimbo.jpg
--- a/forge-gui/res/cardsfolder/o/oracles_attendants.txt
+++ b/forge-gui/res/cardsfolder/o/oracles_attendants.txt
@@ -3,12 +3,16 @@ 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$ 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:DBEffect:DB$ Effect | ValidTgts$ Creature | TgtPrompt$ Select target creature to redirect the damage from | ReplacementEffects$ SelflessDamage | Triggers$ OutOfSight | SVars$ SelflessDmg,ExileEffect | References$ SelflessDamage,OutOfSight,SelflessDmg,ExileEffect | Duration$ HostLeavesOrEOT | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | SubAbility$ DBCleanup | ConditionDefined$ ChosenCard | ConditionPresent$ Card | ConditionCompare$ GE1
+SVar:SelflessDamage:Event$ DamageDone | ValidTarget$ Creature.IsRemembered | ValidSource$ Card.ChosenCard | ReplaceWith$ SelflessDmg | DamageTarget$ EffectSource | Description$ The next time a source of your choice would deal damage to target creature this turn, that damage is dealt to EFFECTSOURCE instead.
+SVar:SelflessDmg:DB$ ReplaceEffect | VarName$ Affected | VarValue$ EffectSource | VarType$ Card
+#Zone Change for the source of your choice
+SVar:OutOfSight:Mode$ ChangesZone | Origin$ Any | Destination$ Any | Defined$ ChosenCard | Execute$ ExileEffect | Static$ True
 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/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.
+
+
+
--- a/forge-gui/res/cardsfolder/o/outrider_en_kor.txt
+++ b/forge-gui/res/cardsfolder/o/outrider_en_kor.txt
@@ -3,17 +3,9 @@ ManaCost:2 W
 Types:Creature Kor Rebel Knight
 PT:2/2
 K:Flanking
-A:AB$ Effect | Cost$ 0 | Name$ en-Kor Redirection | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control to redirect the damage to | ReplacementEffects$ EnKorCombat,EnKorNonCombat | Triggers$ OutOfSight | SVars$ CombatDmg,NonCombatDmg,ExileEffect,RestDmgCombat,RestDmg,X,Y | References$ EnKorCombat,EnKorNonCombat,OutOfSight,CombatDmg,NonCombatDmg,ExileEffect,RestDmgCombat,RestDmg,X,Y | Duration$ HostLeavesOrEOT | RememberObjects$ Self | ImprintCards$ Targeted | SpellDescription$ The next 1 damage that would be dealt to CARDNAME this turn is dealt to target creature you control instead.
-SVar:EnKorCombat:Event$ DamageDone | ValidTarget$ Creature.IsRemembered | IsCombat$ True | ReplaceWith$ CombatDmg | IsPresent$ Creature.IsImprinted | Description$ The next 1 damage that would be dealt to Outrider en-Kor this turn is dealt to target creature you control instead.
-SVar:EnKorNonCombat:Event$ DamageDone | ValidTarget$ Creature.IsRemembered | IsCombat$ False | ReplaceWith$ NonCombatDmg | Secondary$ True | IsPresent$ Creature.IsImprinted | Description$ The next 1 damage that would be dealt to Outrider en-Kor this turn is dealt to target creature you control instead.
-SVar:CombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Imprinted | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ 1 | SubAbility$ RestDmgCombat | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1
-SVar:NonCombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Imprinted | DamageSource$ ReplacedSource | NumDmg$ 1 | SubAbility$ RestDmg | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1
-SVar:RestDmgCombat:DB$ DealDamage | Defined$ Remembered | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ X | SubAbility$ ExileEffect
-SVar:RestDmg:DB$ DealDamage | Defined$ Remembered | DamageSource$ ReplacedSource | NumDmg$ X | SubAbility$ ExileEffect
-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:X:ReplaceCount$DamageAmount/Minus.1
-SVar:Y:ReplaceCount$DamageAmount
+A:AB$ Effect | Cost$ 0 | Name$ en-Kor Redirection | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control to redirect the damage to | ReplacementEffects$ EnKor | SVars$ EnKorDmg | References$ EnKor,EnKorDmg | Duration$ HostLeavesOrEOT | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | SpellDescription$ The next 1 damage that would be dealt to CARDNAME this turn is dealt to target creature you control instead.
+SVar:EnKor:Event$ DamageDone | ValidTarget$ Creature.EffectSource | ReplaceWith$ EnKorDmg | DamageTarget$ Remembered | Description$ The next 1 damage that would be dealt to EFFECTSOURCE this turn is dealt to target creature you control instead.
+SVar:EnKorDmg:DB$ ReplaceSplitDamage | DamageTarget$ Remembered
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/outrider_en_kor.jpg
 Oracle:Flanking (Whenever a creature without flanking blocks this creature, the blocking creature gets -1/-1 until end of turn.)\n{0}: The next 1 damage that would be dealt to Outrider en-Kor this turn is dealt to target creature you control instead.
--- a/forge-gui/res/cardsfolder/p/personal_incarnation.txt
+++ b/forge-gui/res/cardsfolder/p/personal_incarnation.txt
@@ -2,16 +2,9 @@ Name:Personal Incarnation
 ManaCost:3 W W W
 Types:Creature Avatar Incarnation
 PT:6/6
-A:AB$ Effect | Cost$ 0 | Name$ Personal Incarnation Redirection | ReplacementEffects$ PersonalCombat,PersonalNonCombat | OwnerOnly$ True | SVars$ CombatDmg,NonCombatDmg,ExileEffect,RestDmgCombat,RestDmg,X,Y | References$ PersonalCombat,PersonalNonCombat,CombatDmg,NonCombatDmg,ExileEffect,RestDmgCombat,RestDmg,X,Y | Duration$ HostLeavesOrEOT | RememberObjects$ Self | EffectOwner$ CardOwner | SpellDescription$ The next 1 damage that would be dealt to CARDNAME this turn is dealt to its owner instead. Only CARDNAME's owner may activate this ability.
-SVar:PersonalCombat:Event$ DamageDone | ValidTarget$ Card.IsRemembered | IsCombat$ True | ReplaceWith$ CombatDmg | Description$ The next 1 damage that would be dealt to Personal Incarnation this turn is dealt to its owner instead.
-SVar:PersonalNonCombat:Event$ DamageDone | ValidTarget$ Card.IsRemembered | IsCombat$ False | ReplaceWith$ NonCombatDmg | Secondary$ True | Description$ The next 1 damage that would be dealt to Personal Incarnation this turn is dealt to its owner instead.
-SVar:CombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ You | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ 1 | SubAbility$ RestDmgCombat | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1 | References$ Y
-SVar:NonCombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ You | DamageSource$ ReplacedSource | NumDmg$ 1 | SubAbility$ RestDmg | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1 | References$ Y
-SVar:RestDmgCombat:DB$ DealDamage | Defined$ Remembered | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ X | SubAbility$ ExileEffect | References$ X
-SVar:RestDmg:DB$ DealDamage | Defined$ Remembered | DamageSource$ ReplacedSource | NumDmg$ X | SubAbility$ ExileEffect | References$ X
-SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile | Static$ True
-SVar:X:ReplaceCount$DamageAmount/Minus.1
-SVar:Y:ReplaceCount$DamageAmount
+A:AB$ Effect | Cost$ 0 | Name$ Personal Incarnation Redirection | ReplacementEffects$ RedirectDamage | SVars$ RedirectDmg | References$ RedirectDamage,RedirectDmg | Duration$ HostLeavesOrEOT | EffectOwner$ CardOwner | SpellDescription$ The next 1 damage that would be dealt to CARDNAME this turn is dealt to its owner instead. Only CARDNAME's owner may activate this ability.
+SVar:RedirectDamage:Event$ DamageDone | ValidTarget$ Creature.IsRemembered | ReplaceWith$ RedirectDmg | DamageTarget$ You | Description$ The next 1 damage that would be dealt to EFFECTSOURCE this turn is dealt to its owner instead. Only EFFECTSOURCE's owner may activate this ability.
+SVar:RedirectDmg:DB$ ReplaceSplitDamage | DamageTarget$ You
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigLoseLife | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, its owner loses half his or her life, rounded up.
 SVar:TrigLoseLife:AB$ Pump | Cost$ 0 | RememberObjects$ TriggeredCardOwner | SubAbility$ DBLoseLife
 SVar:DBLoseLife:DB$ LoseLife | Defined$ Remembered | LifeAmount$ HavocX | References$ HavocX | SubAbility$ DBCleanup
--- a/forge-gui/res/cardsfolder/r/razia_boros_archangel.txt
+++ b/forge-gui/res/cardsfolder/r/razia_boros_archangel.txt
@@ -7,26 +7,16 @@ K:Vigilance
 K:Haste
 A:AB$ Pump | Cost$ T | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control to redirect the damage from | SubAbility$ DBEffect | StackDescription$ SpellDescription | SpellDescription$ The next 3 damage that would be dealt to target creature you control this turn is dealt to another target creature instead.

-SVar:DBEffect:DB$ Effect | ValidTgts$ Creature | TargetUnique$ True | TgtPrompt$ Select target creature to redirect the damage to | ReplacementEffects$ Combat,NonCombat | Triggers$ OutOfSight | SVars$ Combat,NonCombat,CombatDmg,NonCombatDmg,RestDmgCombat,RestDmg,DBSetVar,ExileEffect,ExileEffect2,OutOfSight,X,Y,MinDmg | References$ Combat,NonCombat,OutOfSight,CombatDmg,NonCombatDmg,RestDmgCombat,RestDmg,ExileEffect,ExileEffect2,X,Y,MinDmg | RememberObjects$ ParentTarget | ImprintCards$ ThisTargetedCard | ConditionDefined$ ParentTarget | ConditionPresent$ Card | ConditionCompare$ GE1
+SVar:DBEffect:DB$ Effect | ValidTgts$ Creature | TargetUnique$ True | TgtPrompt$ Select target creature to redirect the damage to | ReplacementEffects$ RaziaDamage | Triggers$ OutOfSight | SVars$ RaziaDamage,RaziaDmg,ExileEffect,OutOfSight,X | References$ RaziaDamage,OutOfSight,RaziaDmg,ExileEffect,X | RememberObjects$ ParentTarget | ImprintCards$ ThisTargetedCard | ConditionDefined$ ParentTarget | ConditionPresent$ Creature | ConditionCompare$ GE1

-SVar:Combat:Event$ DamageDone | ValidTarget$ Creature.IsRemembered | IsCombat$ True | ReplaceWith$ CombatDmg | IsPresent$ Creature.IsImprinted | References$ X | Description$ The next X damage that would be dealt to target creature you control this turn is dealt to another target creature instead.
-SVar:NonCombat:Event$ DamageDone | ValidTarget$ Creature.IsRemembered | IsCombat$ False | ReplaceWith$ NonCombatDmg | Secondary$ True | IsPresent$ Creature.IsImprinted | References$ X | Description$ The next X damage that would be dealt to target creature you control this turn is dealt to another target creature instead.
+SVar:RaziaDamage:Event$ DamageDone | ValidTarget$ Creature.IsRemembered | ReplaceWith$ RaziaDmg | DamageTarget$ Imprinted | Description$ The next 3 damage that would be dealt to target creature this turn is dealt to target creature you control instead.

-SVar:CombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Imprinted | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ MinDmg | SubAbility$ RestDmgCombat | ConditionCheckSVar$ MinDmg | ConditionSVarCompare$ GE1
-SVar:NonCombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Imprinted | DamageSource$ ReplacedSource | NumDmg$ MinDmg | SubAbility$ RestDmg | ConditionCheckSVar$ MinDmg | ConditionSVarCompare$ GE1
-
-SVar:RestDmgCombat:DB$ DealDamage | Defined$ Remembered | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ Y | SubAbility$ DBSetVar | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1
-SVar:RestDmg:DB$ DealDamage | Defined$ Remembered | DamageSource$ ReplacedSource | NumDmg$ Y | SubAbility$ DBSetVar | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1
-
-SVar:DBSetVar:DB$ StoreSVar | SVar$ X | Type$ CountSVar | Expression$ X/Minus.MinDmg | SubAbility$ ExileEffect2
-SVar:ExileEffect2:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile | ConditionCheckSVar$ X | ConditionSVarCompare$ LE0
+SVar:RaziaDmg:DB$ ReplaceSplitDamage | DamageTarget$ Imprinted | VarName$ X | References$ X

 SVar:OutOfSight:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.IsImprinted,Card.IsRemembered | Execute$ ExileEffect | Static$ True
 SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile

 SVar:X:Number$3
-SVar:Y:ReplaceCount$DamageAmount/Minus.X
-SVar:MinDmg:ReplaceCount$DamageAmount/LimitMax.X

 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/razia_boros_archangel.jpg
--- a/forge-gui/res/cardsfolder/r/reflect_damage.txt
+++ b/forge-gui/res/cardsfolder/r/reflect_damage.txt
@@ -7,7 +7,7 @@ SVar:DBEffect:DB$ Effect | ReplacementEffects$ SelflessDamage | SVars$ SelflessD

 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:SelflessDmg:DB$ ReplaceEffect | VarName$ Affected | VarValue$ ReplacedSourceController | VarType$ Player | SubAbility$ ExileEffect

 SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile | Static$ True
 SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True
--- a/forge-gui/res/cardsfolder/r/reverberation.txt
+++ b/forge-gui/res/cardsfolder/r/reverberation.txt
@@ -0,0 +1,15 @@
+Name:Reverberation
+ManaCost:2 U U
+Types:Instant
+# The target lists a second zone to a Card is returned instead of a SA
+A:SP$ Effect | Cost$ 2 U U | ValidTgts$ Sorcery | AILogic$ Prevent | TgtZone$ Stack,Battlefield | TgtPrompt$ Select target sorcery spell to redirect damage from | RememberObjects$ Targeted | ExileOnMoved$ Stack | ReplacementEffects$ SelflessDamage | SVars$ SelflessDmg | References$ SelflessDamage,SelflessDmg | StackDescription$ SpellDescription | SpellDescription$ All damage that would be dealt this turn by target sorcery spell is dealt to that spell's controller instead.
+
+SVar:SelflessDamage:Event$ DamageDone | ValidSource$ Card.IsRemembered | 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$ ReplacedSourceController | VarType$ Player
+
+SVar:RemAIDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/reverberation.jpg
+Oracle:All damage that would be dealt this turn by target sorcery spell is dealt to that spell's controller instead.
+
+
--- a/forge-gui/res/cardsfolder/s/shaman_en_kor.txt
+++ b/forge-gui/res/cardsfolder/s/shaman_en_kor.txt
@@ -2,31 +2,22 @@ Name:Shaman en-Kor
 ManaCost:1 W
 Types:Creature Kor Cleric Shaman
 PT:1/2
-A:AB$ Effect | Cost$ 0 | Name$ en-Kor Redirection | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control to redirect the damage to | ReplacementEffects$ EnKorCombat,EnKorNonCombat | Triggers$ OutOfSight | SVars$ CombatDmg,NonCombatDmg,ExileEffect,RestDmgCombat,RestDmg,X,Y | References$ EnKorCombat,EnKorNonCombat,OutOfSight,CombatDmg,NonCombatDmg,ExileEffect,RestDmgCombat,RestDmg,X,Y | Duration$ HostLeavesOrEOT | RememberObjects$ Self | ImprintCards$ Targeted | SpellDescription$ The next 1 damage that would be dealt to CARDNAME this turn is dealt to target creature you control instead.
+A:AB$ Effect | Cost$ 0 | Name$ en-Kor Redirection | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control to redirect the damage to | ReplacementEffects$ EnKor | SVars$ EnKorDmg | References$ EnKor,EnKorDmg | Duration$ HostLeavesOrEOT | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | SpellDescription$ The next 1 damage that would be dealt to CARDNAME this turn is dealt to target creature you control instead.
+SVar:EnKor:Event$ DamageDone | ValidTarget$ Creature.EffectSource | ReplaceWith$ EnKorDmg | DamageTarget$ Remembered | Description$ The next 1 damage that would be dealt to EFFECTSOURCE this turn is dealt to target creature you control instead.

-SVar:EnKorCombat:Event$ DamageDone | ValidTarget$ Creature.IsRemembered | IsCombat$ True | ReplaceWith$ CombatDmg | IsPresent$ Creature.IsImprinted | Description$ The next 1 damage that would be dealt to Shaman en-Kor this turn is dealt to target creature you control instead.
-SVar:EnKorNonCombat:Event$ DamageDone | ValidTarget$ Creature.IsRemembered | IsCombat$ False | ReplaceWith$ NonCombatDmg | Secondary$ True | IsPresent$ Creature.IsImprinted | Description$ The next 1 damage that would be dealt to Shaman en-Kor this turn is dealt to target creature you control instead.
-
-SVar:CombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Imprinted | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ 1 | SubAbility$ RestDmgCombat | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1
-SVar:NonCombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Imprinted | DamageSource$ ReplacedSource | NumDmg$ 1 | SubAbility$ RestDmg | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1
-SVar:RestDmgCombat:DB$ DealDamage | Defined$ Remembered | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ X | SubAbility$ ExileEffect
-SVar:RestDmg:DB$ DealDamage | Defined$ Remembered | DamageSource$ ReplacedSource | NumDmg$ X | SubAbility$ ExileEffect
-
-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:X:ReplaceCount$DamageAmount/Minus.1
-SVar:Y:ReplaceCount$DamageAmount
+SVar:EnKorDmg:DB$ ReplaceSplitDamage | DamageTarget$ Remembered

 A:AB$ ChooseSource | Cost$ 1 W | Choices$ Card | AILogic$ NeedsPrevention | SubAbility$ DBEffect | SpellDescription$ The next time a source of your choice would deal damage to target creature this turn, that damage 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$ ShamanCombatDmg,ShamanNonCombatDmg,ExileEffect,Y | References$ SelflessCombat,SelflessNonCombat,OutOfSight,ShamanCombatDmg,ShamanNonCombatDmg,ExileEffect,Y | Duration$ HostLeavesOrEOT | RememberObjects$ Self | ImprintCards$ Targeted | SubAbility$ DBCleanup | ConditionDefined$ ChosenCard | ConditionPresent$ Card | ConditionCompare$ GE1
+SVar:DBEffect:DB$ Effect | ValidTgts$ Creature | TgtPrompt$ Select target creature to redirect the damage from | ReplacementEffects$ SelflessDamage | Triggers$ OutOfSight | SVars$ SelflessDmg,ExileEffect | References$ SelflessDamage,OutOfSight,SelflessDmg,ExileEffect | Duration$ HostLeavesOrEOT | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | SubAbility$ DBCleanup | ConditionDefined$ ChosenCard | ConditionPresent$ Card | ConditionCompare$ GE1

-SVar:SelflessCombat:Event$ DamageDone | ValidTarget$ Creature.IsImprinted | ValidSource$ Card.ChosenCard | IsCombat$ True | ReplaceWith$ ShamanCombatDmg | IsPresent$ Creature.IsRemembered | Description$ The next time a source of your choice would deal damage to target creature this turn, that damage is dealt to Shaman en-Kor instead.
-SVar:SelflessNonCombat:Event$ DamageDone | ValidTarget$ Creature.IsImprinted | ValidSource$ Card.ChosenCard | IsCombat$ False | ReplaceWith$ ShamanNonCombatDmg | Secondary$ True | IsPresent$ Creature.IsRemembered | Description$ The next time a source of your choice would deal damage to target creature this turn, that damage is dealt to Shaman en-Kor instead.
+SVar:SelflessDamage:Event$ DamageDone | ValidTarget$ Creature.IsRemembered | ValidSource$ Card.ChosenCard | ReplaceWith$ SelflessDmg | DamageTarget$ EffectSource | Description$ The next time a source of your choice would deal damage to target creature this turn, that damage is dealt to EFFECTSOURCE instead.

-SVar:ShamanCombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ EffectSource | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ Y | SubAbility$ ExileEffect
-SVar:ShamanNonCombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ EffectSource | DamageSource$ ReplacedSource | NumDmg$ Y | SubAbility$ ExileEffect
+SVar:SelflessDmg:DB$ ReplaceEffect | VarName$ Affected | VarValue$ EffectSource | VarType$ Card | SubAbility$ ExileEffect
+
+#Zone Change for the source of your choice
+SVar:OutOfSight:Mode$ ChangesZone | Origin$ Any | Destination$ Any | Defined$ ChosenCard | Execute$ ExileEffect | Static$ True
+SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile | Static$ True

 SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True
 SVar:RemAIDeck:True
--- a/forge-gui/res/cardsfolder/s/shield_dancer.txt
+++ b/forge-gui/res/cardsfolder/s/shield_dancer.txt
@@ -2,11 +2,9 @@ Name:Shield Dancer
 ManaCost:2 W
 Types:Creature Human Rebel
 PT:1/3
-A:AB$ Effect | Cost$ 2 W | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature | Name$ Shield Dancing | IsCurse$ True | ReplacementEffects$ DamageShielded | Triggers$ OutOfSight | SVars$ ExileEffect,ReflectDmg,X | References$ DamageShielded,OutOfSight,ExileEffect,ReflectDmg,X  | RememberObjects$ Targeted | ImprintCards$ Self | AILogic$ Fog | SpellDescription$ The next time target attacking creature would deal combat damage to CARDNAME this turn, that creature deals that damage to itself instead.
-SVar:DamageShielded:Event$ DamageDone | IsCombat$ True | ValidSource$ Card.IsRemembered | ValidTarget$ Card.IsImprinted | ReplaceWith$ ReflectDmg | Description$ The next time the targeted attacking creature would deal combat damage to Shield Dancer this turn, that creature deals that damage to itself instead.
-SVar:ReflectDmg:AB$ DealDamage | Cost$ 0 | CombatDamage$ True | Defined$ Remembered | DamageSource$ ReplacedSource | NumDmg$ X | SubAbility$ ExileEffect | References$ X
-SVar:X:ReplaceCount$DamageAmount
-SVar:OutOfSight:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Creature.IsRemembered | Execute$ ExileEffect | Static$ True
+A:AB$ Effect | Cost$ 2 W | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature | IsCurse$ True | ReplacementEffects$ DamageShielded | SVars$ ExileEffect,DmgSelf | References$ DamageShielded,ExileEffect,DmgSelf | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | AILogic$ Fog | SpellDescription$ The next time target attacking creature would deal combat damage to CARDNAME this turn, that creature deals that damage to itself instead.
+SVar:DamageShielded:Event$ DamageDone | IsCombat$ True | ValidSource$ Card.IsRemembered | ValidTarget$ Card.EffectSource | ReplaceWith$ DmgSelf | Description$ The next time the targeted attacking creature would deal combat damage to EFFECTSOURCE this turn, that creature deals that damage to itself instead.
+SVar:DmgSelf:DB$ ReplaceEffect | VarName$ Affected | VarValue$ Remembered | VarType$ Card | SubAbility$ ExileEffect
 SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/shield_dancer.jpg
--- a/forge-gui/res/cardsfolder/s/spirit_en_kor.txt
+++ b/forge-gui/res/cardsfolder/s/spirit_en_kor.txt
@@ -3,17 +3,9 @@ ManaCost:3 W
 Types:Creature Kor Spirit
 PT:2/2
 K:Flying
-A:AB$ Effect | Cost$ 0 | Name$ en-Kor Redirection | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control to redirect the damage to | ReplacementEffects$ EnKorCombat,EnKorNonCombat | Triggers$ OutOfSight | SVars$ CombatDmg,NonCombatDmg,ExileEffect,RestDmgCombat,RestDmg,X,Y | References$ EnKorCombat,EnKorNonCombat,OutOfSight,CombatDmg,NonCombatDmg,ExileEffect,RestDmgCombat,RestDmg,X,Y | Duration$ HostLeavesOrEOT | RememberObjects$ Self | ImprintCards$ Targeted | SpellDescription$ The next 1 damage that would be dealt to CARDNAME this turn is dealt to target creature you control instead.
-SVar:EnKorCombat:Event$ DamageDone | ValidTarget$ Creature.IsRemembered | IsCombat$ True | ReplaceWith$ CombatDmg  | IsPresent$ Creature.IsImprinted | Description$ The next 1 damage that would be dealt to Spirit en-Kor this turn is dealt to target creature you control instead.
-SVar:EnKorNonCombat:Event$ DamageDone | ValidTarget$ Creature.IsRemembered | IsCombat$ False | ReplaceWith$ NonCombatDmg | Secondary$ True | IsPresent$ Creature.IsImprinted | Description$ The next 1 damage that would be dealt to Spirit en-Kor this turn is dealt to target creature you control instead.
-SVar:CombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Imprinted | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ 1 | SubAbility$ RestDmgCombat | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1
-SVar:NonCombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Imprinted | DamageSource$ ReplacedSource | NumDmg$ 1 | SubAbility$ RestDmg | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1
-SVar:RestDmgCombat:DB$ DealDamage | Defined$ Remembered | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ X | SubAbility$ ExileEffect
-SVar:RestDmg:DB$ DealDamage | Defined$ Remembered | DamageSource$ ReplacedSource | NumDmg$ X | SubAbility$ ExileEffect
-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:X:ReplaceCount$DamageAmount/Minus.1
-SVar:Y:ReplaceCount$DamageAmount
+A:AB$ Effect | Cost$ 0 | Name$ en-Kor Redirection | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control to redirect the damage to | ReplacementEffects$ EnKor | SVars$ EnKorDmg | References$ EnKor,EnKorDmg | Duration$ HostLeavesOrEOT | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | SpellDescription$ The next 1 damage that would be dealt to CARDNAME this turn is dealt to target creature you control instead.
+SVar:EnKor:Event$ DamageDone | ValidTarget$ Creature.EffectSource | ReplaceWith$ EnKorDmg | DamageTarget$ Remembered | Description$ The next 1 damage that would be dealt to EFFECTSOURCE this turn is dealt to target creature you control instead.
+SVar:EnKorDmg:DB$ ReplaceSplitDamage | DamageTarget$ Remembered
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/spirit_en_kor.jpg
 Oracle:Flying\n{0}: The next 1 damage that would be dealt to Spirit en-Kor this turn is dealt to target creature you control instead.
--- a/forge-gui/res/cardsfolder/t/treacherous_link.txt
+++ b/forge-gui/res/cardsfolder/t/treacherous_link.txt
@@ -4,7 +4,7 @@ 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 | 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:DmgEnchanted:DB$ ReplaceEffect | VarName$ Affected | VarValue$ ReplacedTargetController | 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.
--- a/forge-gui/res/cardsfolder/v/vassals_duty.txt
+++ b/forge-gui/res/cardsfolder/v/vassals_duty.txt
@@ -1,17 +1,11 @@
 Name:Vassal's Duty
 ManaCost:3 W
 Types:Enchantment
-A:AB$ Effect | Name$ Vassal's Effect | Cost$ 1 | ValidTgts$ Creature.Legendary | TgtPrompt$ Select target legendary creature to redirect damage from | ReplacementEffects$ SelflessCombat,SelflessNonCombat | Triggers$ OutOfSight | SVars$ CombatDmg,NonCombatDmg,RestDmgCombat,RestDmg,ExileEffect,X,Y | References$ SelflessCombat,SelflessNonCombat,OutOfSight,CombatDmg,NonCombatDmg,RestDmgCombat,RestDmg,ExileEffect,X,Y | RememberObjects$ Targeted | SpellDescription$ The next 1 damage that would be dealt to target legendary creature you control is dealt to you instead.
-SVar:SelflessCombat:Event$ DamageDone | ValidTarget$ Card.IsRemembered | IsCombat$ True | ReplaceWith$ CombatDmg | Description$ The next 1 damage that would be dealt to target legendary creature you control is dealt to you instead.
-SVar:SelflessNonCombat:Event$ DamageDone | ValidTarget$ Card.IsRemembered | IsCombat$ False | ReplaceWith$ NonCombatDmg | Secondary$ True | Description$ The next 1 damage that would be dealt to target legendary creature you control is dealt to you instead.
-SVar:CombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ You | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ 1 | SubAbility$ RestDmgCombat | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1
-SVar:NonCombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ You | DamageSource$ ReplacedSource | NumDmg$ 1 | SubAbility$ RestDmg | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1
-SVar:RestDmgCombat:DB$ DealDamage | Defined$ Remembered | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ X | SubAbility$ ExileEffect
-SVar:RestDmg:DB$ DealDamage | Defined$ Remembered | DamageSource$ ReplacedSource | NumDmg$ X | SubAbility$ ExileEffect
-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/Minus.1
-SVar:Y:ReplaceCount$DamageAmount
+A:AB$ Effect | Cost$ 1 | ValidTgts$ Creature.Legendary+YouCtrl | TgtPrompt$ Select target legendary creature to redirect damage from | ReplacementEffects$ DamageEvent | SVars$ DamageEventDmg | References$ DamageEvent,DamageEventDmg | Duration$ HostLeavesOrEOT | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | SpellDescription$ The next 1 damage that would be dealt to target legendary creature you control is dealt to you instead.
+SVar:DamageEvent:Event$ DamageDone | ValidTarget$ Creature.IsRemembered | ReplaceWith$ DamageEventDmg | Description$ The next 1 damage that would be dealt to target legendary creature you control is dealt to you instead.
+
+SVar:DamageEventDmg:DB$ ReplaceSplitDamage | DamageTarget$ You
+
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/vassals_duty.jpg
 Oracle:{1}: The next 1 damage that would be dealt to target legendary creature you control this turn is dealt to you instead.
--- a/forge-gui/res/cardsfolder/v/veteran_bodyguard.txt
+++ b/forge-gui/res/cardsfolder/v/veteran_bodyguard.txt
@@ -2,7 +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 | 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$ DmgSelf | IsPresent$ Card.Self+untapped | DamageTarget$ Self | 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.
--- a/forge-gui/res/cardsfolder/w/ward_of_piety.txt
+++ b/forge-gui/res/cardsfolder/w/ward_of_piety.txt
@@ -3,21 +3,12 @@ ManaCost:1 W
 Types:Enchantment Aura
 K:Enchant creature
 A:SP$ Attach | Cost$ 1 W | ValidTgts$ Creature | AILogic$ Pump
-A:AB$ Effect | Cost$ 1 W | Name$ Redirection Ward | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player to redirect the damage to | ReplacementEffects$ PietyCombat,PietyNonCombat | Triggers$ OutOfSight | SVars$ CombatDmg,NonCombatDmg,ExileEffect,RestDmgCombat,RestDmg,X,Y,RCP,RCC,RC | References$ PietyCombat,PietyNonCombat,OutOfSight,CombatDmg,NonCombatDmg,ExileEffect,RestDmgCombat,RestDmg,X,Y,RCP,RCC,RC | Duration$ HostLeavesOrEOT | ImprintCards$ Enchanted | RememberObjects$ Targeted | SpellDescription$ The next 1 damage that would be dealt to enchanted creature this turn is dealt to target creature or player instead.
-SVar:PietyCombat:Event$ DamageDone | ValidTarget$ Creature.IsImprinted | IsCombat$ True | ReplaceWith$ CombatDmg  | CheckSVar$ RC | Description$ The next 1 damage that would be dealt to enchanted creature this turn is dealt to target creature or player instead.
-SVar:PietyNonCombat:Event$ DamageDone | ValidTarget$ Creature.IsImprinted | IsCombat$ False | ReplaceWith$ NonCombatDmg | Secondary$ True | CheckSVar$ RC | Description$ The next 1 damage that would be dealt to enchanted creature this turn is dealt to target creature or player instead.
-SVar:CombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Remembered | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ 1 | SubAbility$ RestDmgCombat | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1
-SVar:NonCombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Remembered | DamageSource$ ReplacedSource | NumDmg$ 1 | SubAbility$ RestDmg | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1
-SVar:RestDmgCombat:DB$ DealDamage | Defined$ Imprinted | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ X | SubAbility$ ExileEffect
-SVar:RestDmg:DB$ DealDamage | Defined$ Imprinted | DamageSource$ ReplacedSource | NumDmg$ X | SubAbility$ ExileEffect
-SVar:OutOfSight:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | Defined$ Remembered | Execute$ ExileEffect | Static$ True
-SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile | Static$ True
-SVar:X:ReplaceCount$DamageAmount/Minus.1
-SVar:Y:ReplaceCount$DamageAmount

-SVar:RCP:PlayerCountRemembered$Amount
-SVar:RCC:Count$Valid Creature.IsRemembered
-SVar:RC:SVar$RCC/Plus.RCP
+A:AB$ Effect | Cost$ 1 W | Name$ Redirection Ward | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player to redirect the damage to | ReplacementEffects$ WardDamage | SVars$ WardDamage,WardDmg | References$ WardDamage,WardDmg | RememberObjects$ Targeted | ImprintCards$ Enchanted | ExileOnMoved$ Battlefield | SpellDescription$ The next 1 damage that would be dealt to enchanted creature this turn is dealt to target creature or player instead.
+
+SVar:WardDamage:Event$ DamageDone | ValidTarget$ Creature.IsImprinted | ReplaceWith$ WardDmg | DamageTarget$ Remembered | Description$ The next 1 damage that would be dealt to enchanted creature this turn is dealt to target creature or player instead.
+
+SVar:WardDmg:DB$ ReplaceSplitDamage | DamageTarget$ Remembered

 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ward_of_piety.jpg
--- a/forge-gui/res/cardsfolder/w/warrior_en_kor.txt
+++ b/forge-gui/res/cardsfolder/w/warrior_en_kor.txt
@@ -2,17 +2,9 @@ Name:Warrior en-Kor
 ManaCost:W W
 Types:Creature Kor Warrior Knight
 PT:2/2
-A:AB$ Effect | Cost$ 0 | Name$ en-Kor Redirection | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control to redirect the damage to | ReplacementEffects$ EnKorCombat,EnKorNonCombat | Triggers$ OutOfSight | SVars$ CombatDmg,NonCombatDmg,ExileEffect,RestDmgCombat,RestDmg,X,Y | References$ EnKorCombat,EnKorNonCombat,OutOfSight,CombatDmg,NonCombatDmg,ExileEffect,RestDmgCombat,RestDmg,X,Y | Duration$ HostLeavesOrEOT | RememberObjects$ Self | ImprintCards$ Targeted | SpellDescription$ The next 1 damage that would be dealt to CARDNAME this turn is dealt to target creature you control instead.
-SVar:EnKorCombat:Event$ DamageDone | ValidTarget$ Creature.IsRemembered | IsCombat$ True | ReplaceWith$ CombatDmg | IsPresent$ Creature.IsImprinted | Description$ The next 1 damage that would be dealt to Warrior en-Kor this turn is dealt to target creature you control instead.
-SVar:EnKorNonCombat:Event$ DamageDone | ValidTarget$ Creature.IsRemembered | IsCombat$ False | ReplaceWith$ NonCombatDmg | Secondary$ True | IsPresent$ Creature.IsImprinted | Description$ The next 1 damage that would be dealt to Warrior en-Kor this turn is dealt to target creature you control instead.
-SVar:CombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Imprinted | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ 1 | SubAbility$ RestDmgCombat | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1
-SVar:NonCombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Imprinted | DamageSource$ ReplacedSource | NumDmg$ 1 | SubAbility$ RestDmg | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1
-SVar:RestDmgCombat:DB$ DealDamage | Defined$ Remembered | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ X | SubAbility$ ExileEffect
-SVar:RestDmg:DB$ DealDamage | Defined$ Remembered | DamageSource$ ReplacedSource | NumDmg$ X | SubAbility$ ExileEffect
-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:X:ReplaceCount$DamageAmount/Minus.1
-SVar:Y:ReplaceCount$DamageAmount
+A:AB$ Effect | Cost$ 0 | Name$ en-Kor Redirection | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control to redirect the damage to | ReplacementEffects$ EnKor | SVars$ EnKorDmg | References$ EnKor,EnKorDmg | Duration$ HostLeavesOrEOT | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | SpellDescription$ The next 1 damage that would be dealt to CARDNAME this turn is dealt to target creature you control instead.
+SVar:EnKor:Event$ DamageDone | ValidTarget$ Creature.EffectSource | ReplaceWith$ EnKorDmg | DamageTarget$ Remembered | Description$ The next 1 damage that would be dealt to EFFECTSOURCE this turn is dealt to target creature you control instead.
+SVar:EnKorDmg:DB$ ReplaceSplitDamage | DamageTarget$ Remembered
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/warrior_en_kor.jpg
 Oracle:{0}: The next 1 damage that would be dealt to Warrior en-Kor this turn is dealt to target creature you control instead.
--- a/forge-gui/res/cardsfolder/w/weathered_bodyguards.txt
+++ b/forge-gui/res/cardsfolder/w/weathered_bodyguards.txt
@@ -3,7 +3,7 @@ ManaCost:5 W
 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.
+R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Creature.unblocked | ValidTarget$ You | ReplaceWith$ DmgSelf | IsCombat$ True | IsPresent$ Card.Self+untapped | DamageTarget$ Remembered | 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: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.)
--- a/forge-gui/res/cardsfolder/z/zealous_inquisitor.txt
+++ b/forge-gui/res/cardsfolder/z/zealous_inquisitor.txt
@@ -2,17 +2,11 @@ Name:Zealous Inquisitor
 ManaCost:2 W
 Types:Creature Human Cleric
 PT:2/2
-A:AB$ Effect | Cost$ 1 W | ValidTgts$ Creature | TgtPrompt$ Select target creature to redirect the damage to | ReplacementEffects$ InquisitorCombat,InquisitorNonCombat | Triggers$ OutOfSight | SVars$ CombatDmg,NonCombatDmg,ExileEffect,RestDmgCombat,RestDmg,X,Y | References$ InquisitorCombat,InquisitorNonCombat,OutOfSight,CombatDmg,NonCombatDmg,ExileEffect,RestDmgCombat,RestDmg,X,Y | Duration$ HostLeavesOrEOT | ImprintCards$ Self | RememberObjects$ Targeted | SpellDescription$ The next 1 damage that would be dealt to CARDNAME this turn is dealt to target creature instead.
-SVar:InquisitorCombat:Event$ DamageDone | ValidTarget$ Creature.IsImprinted | IsCombat$ True | ReplaceWith$ CombatDmg | IsPresent$ Creature.IsRemembered | Description$ The next 1 damage that would be dealt to Zealous Inquisitor this turn is dealt to target creature instead.
-SVar:InquisitorNonCombat:Event$ DamageDone | ValidTarget$ Creature.IsImprinted | IsCombat$ False | ReplaceWith$ NonCombatDmg | Secondary$ True | IsPresent$ Creature.IsRemembered | Description$ The next 1 damage that would be dealt to Zealous Inquisitor this turn is dealt to target creature instead.
-SVar:CombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Remembered | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ 1 | SubAbility$ RestDmgCombat | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1
-SVar:NonCombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Remembered | DamageSource$ ReplacedSource | NumDmg$ 1 | SubAbility$ RestDmg | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1
-SVar:RestDmgCombat:DB$ DealDamage | Defined$ Imprinted | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ X | SubAbility$ ExileEffect
-SVar:RestDmg:DB$ DealDamage | Defined$ Imprinted | DamageSource$ ReplacedSource | NumDmg$ X | SubAbility$ ExileEffect
-SVar:OutOfSight:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | Defined$ Remembered | Execute$ ExileEffect | Static$ True
-SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile | Static$ True
-SVar:X:ReplaceCount$DamageAmount/Minus.1
-SVar:Y:ReplaceCount$DamageAmount
+
+A:AB$ Effect | Cost$ 1 W | ValidTgts$ Creature | TgtPrompt$ Select target creature to redirect the damage to | ReplacementEffects$ Zealous | SVars$ ZealousDmg | References$ Zealous,ZealousDmg | Duration$ HostLeavesOrEOT | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | SpellDescription$ The next 1 damage that would be dealt to CARDNAME this turn is dealt to target creature you control instead.
+SVar:Zealous:Event$ DamageDone | ValidTarget$ Creature.EffectSource | ReplaceWith$ ZealousDmg | DamageTarget$ Remembered | Description$ The next 1 damage that would be dealt to EFFECTSOURCE this turn is dealt to target creature instead.
+SVar:ZealousDmg:DB$ ReplaceSplitDamage | DamageTarget$ Remembered
+
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/zealous_inquisitor.jpg
 Oracle:{1}{W}: The next 1 damage that would be dealt to Zealous Inquisitor this turn is dealt to target creature instead.
--- a/forge-gui/res/cardsfolder/z/zhalfirin_crusader.txt
+++ b/forge-gui/res/cardsfolder/z/zhalfirin_crusader.txt
@@ -3,21 +3,9 @@ ManaCost:1 W W
 Types:Creature Human Knight
 PT:2/2
 K:Flanking
-A:AB$ Effect | Cost$ 1 W | Name$ Zhalfirin Redirection | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player to redirect the damage to | ReplacementEffects$ CrusaderCombat,CrusaderNonCombat | Triggers$ OutOfSight | SVars$ CombatDmg,NonCombatDmg,ExileEffect,RestDmgCombat,RestDmg,X,Y,RCP,RCC,RC | References$ CrusaderCombat,CrusaderNonCombat,OutOfSight,CombatDmg,NonCombatDmg,ExileEffect,RestDmgCombat,RestDmg,X,Y,RCP,RCC,RC | Duration$ HostLeavesOrEOT | ImprintCards$ Self | RememberObjects$ Targeted | SpellDescription$ The next 1 damage that would be dealt to CARDNAME this turn is dealt to target creature or player instead.
-SVar:CrusaderCombat:Event$ DamageDone | ValidTarget$ Creature.IsImprinted | IsCombat$ True | ReplaceWith$ CombatDmg | CheckSVar$ RC | Description$ The next 1 damage that would be dealt to Zhalfirin Crusader this turn is dealt to target creature or player instead.
-SVar:CrusaderNonCombat:Event$ DamageDone | ValidTarget$ Creature.IsImprinted | IsCombat$ False | ReplaceWith$ NonCombatDmg | Secondary$ True | CheckSVar$ RC | Description$ The next 1 damage that would be dealt to Zhalfirin Crusader this turn is dealt to target creature or player instead.
-SVar:CombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Remembered | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ 1 | SubAbility$ RestDmgCombat | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1
-SVar:NonCombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Remembered | DamageSource$ ReplacedSource | NumDmg$ 1 | SubAbility$ RestDmg | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1
-SVar:RestDmgCombat:DB$ DealDamage | Defined$ Imprinted | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ X | SubAbility$ ExileEffect
-SVar:RestDmg:DB$ DealDamage | Defined$ Imprinted | DamageSource$ ReplacedSource | NumDmg$ X | SubAbility$ ExileEffect
-SVar:OutOfSight:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | Defined$ Remembered | Execute$ ExileEffect | Static$ True
-SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile | Static$ True
-SVar:X:ReplaceCount$DamageAmount/Minus.1
-SVar:Y:ReplaceCount$DamageAmount
-
-SVar:RCC:Remembered$Valid Creature
-SVar:RCP:Count$Valid Creature.IsRemembered
-SVar:RC:SVar$RCC/Plus.RCP
+A:AB$ Effect | Cost$ 1 W | Name$ Zhalfirin Redirection | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player to redirect the damage to | ReplacementEffects$ Zhalfirin | SVars$ ZhalfirinDmg | References$ Zhalfirin,ZhalfirinDmg | Duration$ HostLeavesOrEOT | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | SpellDescription$ The next 1 damage that would be dealt to CARDNAME this turn is dealt to target creature you control instead.
+SVar:Zhalfirin:Event$ DamageDone | ValidTarget$ Creature.EffectSource | ReplaceWith$ ZhalfirinDmg | DamageTarget$ Remembered | Description$ The next 1 damage that would be dealt to EFFECTSOURCE this turn is dealt to target creature you control instead.
+SVar:ZhalfirinDmg:DB$ ReplaceSplitDamage | DamageTarget$ Remembered

 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/zhalfirin_crusader.jpg