From 364205cd9b1ea437806f1bcc8323003adf85da6d Mon Sep 17 00:00:00 2001
From: Agetian <stavdev@mail.ru>
Date: Fri, 4 Aug 2017 10:22:41 +0000
Subject: [PATCH] - Added Hazduhr the Abbot.

---
 .gitattributes                                 |  1 +
 .../game/ability/effects/EffectEffect.java     |  1 +
 .../src/main/java/forge/game/card/Card.java    |  7 ++++++-
 .../res/cardsfolder/h/hazduhr_the_abbot.txt    | 18 ++++++++++++++++++
 4 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 forge-gui/res/cardsfolder/h/hazduhr_the_abbot.txt

diff --git a/.gitattributes b/.gitattributes
index b425fdfe66f..dec0c165f3f 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -7971,6 +7971,7 @@ forge-gui/res/cardsfolder/h/havoc_festival.txt -text
 forge-gui/res/cardsfolder/h/havoc_sower.txt -text
 forge-gui/res/cardsfolder/h/hawkeater_moth.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/h/hazardous_conditions.txt -text
+forge-gui/res/cardsfolder/h/hazduhr_the_abbot.txt -text
 forge-gui/res/cardsfolder/h/haze_frog.txt -text
 forge-gui/res/cardsfolder/h/haze_of_pollen.txt -text
 forge-gui/res/cardsfolder/h/haze_of_rage.txt svneol=native#text/plain
diff --git a/forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java b/forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java
index 74727440305..8bb74b68844 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java
@@ -111,6 +111,7 @@ public class EffectEffect extends SpellAbilityEffect {
         }
 
         final Card eff = createEffect(hostCard, controller, name, image);
+        eff.setEffectSource(hostCard);
 
         // Grant SVars first in order to give references to granted abilities
         if (effectSVars != null) {
diff --git a/forge-game/src/main/java/forge/game/card/Card.java b/forge-game/src/main/java/forge/game/card/Card.java
index 42a388b4551..c78a48beb8a 100644
--- a/forge-game/src/main/java/forge/game/card/Card.java
+++ b/forge-game/src/main/java/forge/game/card/Card.java
@@ -1863,7 +1863,12 @@ public class Card extends GameEntity implements Comparable<Card> {
             sb.replace(start, start + 4, "\r\n");
         }
 
-        return sb.toString().replaceAll("CARDNAME", state.getName()).trim();
+        String desc = sb.toString().replaceAll("CARDNAME", state.getName());
+        if (getEffectSource() != null) {
+            desc = desc.replace("EFFECTSOURCE", getEffectSource().getName());
+        }
+
+        return desc;
     }
 
     private StringBuilder abilityTextInstantSorcery(CardState state) {
diff --git a/forge-gui/res/cardsfolder/h/hazduhr_the_abbot.txt b/forge-gui/res/cardsfolder/h/hazduhr_the_abbot.txt
new file mode 100644
index 00000000000..443e29d4ea5
--- /dev/null
+++ b/forge-gui/res/cardsfolder/h/hazduhr_the_abbot.txt
@@ -0,0 +1,18 @@
+Name:Hazduhr the Abbot
+ManaCost:3 W W
+Types:Legendary Creature Human Cleric
+PT:2/5
+A:AB$ ChooseCard | Cost$ T X | ValidTgts$ Creature.White+YouCtrl | TgtPrompt$ Select target white creature you control | Mandatory$ True | Defined$ You | RememberChosen$ True | SubAbility$ DBSetVarBefore | SpellDescription$ The next X damage that would be dealt this turn to target white creature you control is dealt to CARDNAME instead. | StackDescription$ SpellDescription
+SVar:DBSetVarBefore:DB$ StoreSVar | SVar$ Y | Type$ CountSVar | Expression$ X | SubAbility$ DBEffect
+SVar:DBEffect:DB$ Effect | ReplacementEffects$ HazduhrDamage | Triggers$ OutOfSight | SVars$ HazduhrDamage,HazduhrDmg,ExileEffect,OutOfSight,Y | References$ HazduhrDamage,OutOfSight,HazduhrDmg,ExileEffect,Y | RememberObjects$ Targeted | ImprintCards$ Self | SubAbility$ DBCleanup
+SVar:HazduhrDamage:Event$ DamageDone | ValidTarget$ Card.IsRemembered | ReplaceWith$ HazduhrDmg | DamageTarget$ Imprinted | References$ Y | Description$ The next X damage that would be dealt this turn to target white creature you control is dealt to EFFECTSOURCE instead.
+SVar:HazduhrDmg:DB$ ReplaceSplitDamage | DamageTarget$ Imprinted | 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
+SVar:X:Count$xPaid
+#X Will get overwritten by Announce
+SVar:Y:Number$0
+SVar:RemAIDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/hazduhr_the_abbot.jpg
+Oracle:{X}, {T}: The next X damage that would be dealt this turn to target white creature you control is dealt to Hazduhr the Abbot instead.