From b3712b88c7b3b2aee9ecb929a11809cf0a4037bc Mon Sep 17 00:00:00 2001
From: Evan Kranzler <theelk801@gmail.com>
Date: Sat, 16 Sep 2017 21:06:29 -0400
Subject: [PATCH] updated Hakim, Loreweaver

---
 Mage.Sets/src/mage/cards/h/HakimLoreweaver.java  | 16 ++++++++++++----
 Mage.Sets/src/mage/sets/Mirage.java              |  1 +
 .../decorator/ConditionalActivatedAbility.java   |  2 +-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/Mage.Sets/src/mage/cards/h/HakimLoreweaver.java b/Mage.Sets/src/mage/cards/h/HakimLoreweaver.java
index 2855978c7f..ba3efa7f1d 100644
--- a/Mage.Sets/src/mage/cards/h/HakimLoreweaver.java
+++ b/Mage.Sets/src/mage/cards/h/HakimLoreweaver.java
@@ -64,11 +64,10 @@ import mage.target.common.TargetCardInYourGraveyard;
 
 /**
  *
- * @author jeffwadsworth
+ * @author jeffwadsworth, TheElk801
  */
 public class HakimLoreweaver extends CardImpl {
 
-    private final static String rule = "Return target Aura card from your graveyard to the battlefield attached to Hakim, Loreweaver. Activate this ability only during your upkeep and only if Hakim isn't enchanted.";
     private static final FilterCard filter = new FilterCard("target Aura card from your graveyard");
 
     static {
@@ -90,7 +89,11 @@ public class HakimLoreweaver extends CardImpl {
         this.addAbility(FlyingAbility.getInstance());
 
         // {U}{U}: Return target Aura card from your graveyard to the battlefield attached to Hakim, Loreweaver. Activate this ability only during your upkeep and only if Hakim isn't enchanted.
-        Ability ability = new ConditionalActivatedAbility(Zone.BATTLEFIELD, new HakimLoreweaverEffect(), new ManaCostsImpl("{U}{U}"), new HakimLoreweaverCondition(), rule);
+        Ability ability = new ConditionalActivatedAbility(
+                Zone.BATTLEFIELD,
+                new HakimLoreweaverEffect(),
+                new ManaCostsImpl("{U}{U}"),
+                new HakimLoreweaverCondition());
         ability.addTarget(new TargetCardInYourGraveyard(filter));
         this.addAbility(ability);
 
@@ -121,7 +124,7 @@ class HakimLoreweaverEffect extends OneShotEffect {
 
     public HakimLoreweaverEffect() {
         super(Outcome.Benefit);
-        this.staticText = "Return target Aura card from your graveyard to the battlefield attached to {this}. Activate this ability only during your upkeep and only if Hakim isn't enchanted";
+        this.staticText = "Return target Aura card from your graveyard to the battlefield attached to {this}.";
     }
 
     public HakimLoreweaverEffect(final HakimLoreweaverEffect effect) {
@@ -177,4 +180,9 @@ class HakimLoreweaverCondition implements Condition {
         }
         return false;
     }
+
+    @Override
+    public String toString() {
+        return "only during your upkeep and only if {this} isn't enchanted";
+    }
 }
diff --git a/Mage.Sets/src/mage/sets/Mirage.java b/Mage.Sets/src/mage/sets/Mirage.java
index 1106b3b3f1..1ef4ede70d 100644
--- a/Mage.Sets/src/mage/sets/Mirage.java
+++ b/Mage.Sets/src/mage/sets/Mirage.java
@@ -154,6 +154,7 @@ public class Mirage extends ExpansionSet {
         cards.add(new SetCardInfo("Gravebane Zombie", 25, Rarity.COMMON, mage.cards.g.GravebaneZombie.class));
         cards.add(new SetCardInfo("Grave Servitude", 24, Rarity.COMMON, mage.cards.g.GraveServitude.class));
         cards.add(new SetCardInfo("Grinning Totem", 268, Rarity.RARE, mage.cards.g.GrinningTotem.class));
+        cards.add(new SetCardInfo("Hakim, Loreweaver", 68, Rarity.RARE, mage.cards.h.HakimLoreweaver.class));
         cards.add(new SetCardInfo("Hall of Gemstone", 119, Rarity.RARE, mage.cards.h.HallOfGemstone.class));
         cards.add(new SetCardInfo("Hammer of Bogardan", 181, Rarity.RARE, mage.cards.h.HammerOfBogardan.class));
         cards.add(new SetCardInfo("Harbinger of Night", 26, Rarity.RARE, mage.cards.h.HarbingerOfNight.class));
diff --git a/Mage/src/main/java/mage/abilities/decorator/ConditionalActivatedAbility.java b/Mage/src/main/java/mage/abilities/decorator/ConditionalActivatedAbility.java
index 86186e4b01..5f6cc15444 100644
--- a/Mage/src/main/java/mage/abilities/decorator/ConditionalActivatedAbility.java
+++ b/Mage/src/main/java/mage/abilities/decorator/ConditionalActivatedAbility.java
@@ -71,6 +71,6 @@ public class ConditionalActivatedAbility extends ActivatedAbilityImpl {
         if (ruleText != null && !ruleText.isEmpty()) {
             return ruleText;
         }
-        return super.getRule() + " Activate this ability only " + condition.toString();
+        return super.getRule() + " Activate this ability only " + condition.toString() + ".";
     }
 }