From 0a7286fbd99557a98896c5808f8ccf47244b0d2c Mon Sep 17 00:00:00 2001
From: Sol <zenchristo@gmail.com>
Date: Sat, 26 Sep 2015 00:03:25 +0000
Subject: [PATCH] - Add Halimar Tidecaller

---
 .gitattributes                                           | 1 +
 .../src/main/java/forge/game/card/CardFactoryUtil.java   | 3 ++-
 forge-gui/res/cardsfolder/h/halimar_tidecaller.txt       | 9 +++++++++
 3 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 forge-gui/res/cardsfolder/h/halimar_tidecaller.txt

diff --git a/.gitattributes b/.gitattributes
index 74ab184c318..a66b6a4574a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -7060,6 +7060,7 @@ forge-gui/res/cardsfolder/h/halcyon_glaze.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/h/halfdane.txt -text
 forge-gui/res/cardsfolder/h/halimar_depths.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/h/halimar_excavator.txt svneol=native#text/plain
+forge-gui/res/cardsfolder/h/halimar_tidecaller.txt -text
 forge-gui/res/cardsfolder/h/halimar_wavewatch.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/h/hall_of_gemstone.txt -text
 forge-gui/res/cardsfolder/h/hall_of_the_bandit_lord.txt -text
diff --git a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
index b401f809bbe..f6d2e7cd08c 100644
--- a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
+++ b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
@@ -3079,7 +3079,8 @@ public class CardFactoryUtil {
         final String counters = k[1];
         final String suffix = !counters.equals("1") ? "s" : "";
         final Cost awakenCost = new Cost(k[2], false);
-        card.removeIntrinsicKeyword(awakenKeyword);
+        // Leave intrinsic Keyword for retrieval by Halimar Tidecaller
+        //card.removeIntrinsicKeyword(awakenKeyword);
         
         final SpellAbility awakenSpell = card.getFirstSpellAbility().copy();
         
diff --git a/forge-gui/res/cardsfolder/h/halimar_tidecaller.txt b/forge-gui/res/cardsfolder/h/halimar_tidecaller.txt
new file mode 100644
index 00000000000..208f9110a27
--- /dev/null
+++ b/forge-gui/res/cardsfolder/h/halimar_tidecaller.txt
@@ -0,0 +1,9 @@
+Name:Halimar Tidecaller
+ManaCost:2 U
+Types:Creature Human Wizard Ally
+PT:2/3
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, you may return target card with awaken from your graveyard to your hand.
+SVar:TrigChangeZone:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Card.YouCtrl+withAwaken
+S:Mode$ Continuous | Affected$ Creature.Land+YouCtrl | AddKeyword$ Flying | Description$ Land creatures you control have flying.
+SVar:Picture:http://www.wizards.com/global/images/magic/general/halimar_tidecaller.jpg
+Oracle:When Halimar Tidecaller enters the battlefield, you may return target card with awaken from your graveyard to your hand.\nLand creatures you control have flying.