From e60234615d960b2ebada1b1a99df992b6a4d0799 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Sun, 4 Jan 2015 01:28:44 +0100
Subject: [PATCH] Some minor changes.

---
 .../sets/scarsofmirrodin/KuldothaPhoenix.java | 26 +++++++-------
 .../src/mage/sets/visions/Necromancy.java     | 36 -------------------
 Mage/src/mage/abilities/AbilityImpl.java      |  2 +-
 3 files changed, 15 insertions(+), 49 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/KuldothaPhoenix.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/KuldothaPhoenix.java
index da1be2c3b89..84bee600a1e 100644
--- a/Mage.Sets/src/mage/sets/scarsofmirrodin/KuldothaPhoenix.java
+++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/KuldothaPhoenix.java
@@ -28,20 +28,22 @@
 package mage.sets.scarsofmirrodin;
 
 import java.util.UUID;
-import mage.constants.CardType;
-import mage.constants.Rarity;
-import mage.constants.Zone;
 import mage.MageInt;
 import mage.abilities.Ability;
+import mage.abilities.condition.CompoundCondition;
 import mage.abilities.condition.common.IsStepCondition;
-import mage.abilities.costs.common.MetalcraftCost;
+import mage.abilities.condition.common.MetalcraftCondition;
 import mage.abilities.costs.mana.ManaCostsImpl;
 import mage.abilities.decorator.ConditionalActivatedAbility;
 import mage.abilities.effects.common.ReturnSourceFromGraveyardToBattlefieldEffect;
 import mage.abilities.keyword.FlyingAbility;
 import mage.abilities.keyword.HasteAbility;
 import mage.cards.CardImpl;
+import mage.constants.AbilityWord;
+import mage.constants.CardType;
 import mage.constants.PhaseStep;
+import mage.constants.Rarity;
+import mage.constants.Zone;
 
 /**
  *
@@ -57,19 +59,19 @@ public class KuldothaPhoenix extends CardImpl {
         this.power = new MageInt(4);
         this.toughness = new MageInt(4);
 
-        // Flying, haste
-        
+        // Flying, haste        
         this.addAbility(FlyingAbility.getInstance());
         this.addAbility(HasteAbility.getInstance());
-        // Metalcraft - : Return Kuldotha Phoenix from your graveyard to the battlefield. 
+        
+        // Metalcraft - {4}: Return Kuldotha Phoenix from your graveyard to the battlefield.
         // Activate this ability only during your upkeep and only if you control three or more artifacts.        
         Ability ability = new ConditionalActivatedAbility(Zone.GRAVEYARD, 
-                new ReturnSourceFromGraveyardToBattlefieldEffect(true), 
+                new ReturnSourceFromGraveyardToBattlefieldEffect(), 
                 new ManaCostsImpl("{4}"), 
-                new IsStepCondition(PhaseStep.UPKEEP),
-                null
-        );        
-        ability.addCost(new MetalcraftCost());       
+                new CompoundCondition("during your upkeep and only if you control three or more artifacts",
+                        new IsStepCondition(PhaseStep.UPKEEP), new MetalcraftCondition())
+        );
+        ability.setAbilityWord(AbilityWord.METALCRAFT);
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/visions/Necromancy.java b/Mage.Sets/src/mage/sets/visions/Necromancy.java
index 1eded8df041..25cc9e6aff7 100644
--- a/Mage.Sets/src/mage/sets/visions/Necromancy.java
+++ b/Mage.Sets/src/mage/sets/visions/Necromancy.java
@@ -248,42 +248,6 @@ class NecromancyLeavesBattlefieldTriggeredEffect extends OneShotEffect {
     }
 }
 
-//class NecromancyAttachEffect extends OneShotEffect {
-//
-//    public NecromancyAttachEffect(Outcome outcome) {
-//        super(outcome);
-//    }
-//
-//    public NecromancyAttachEffect(Outcome outcome, String rule) {
-//        super(outcome);
-//        staticText = rule;
-//    }
-//
-//    public NecromancyAttachEffect(final NecromancyAttachEffect effect) {
-//        super(effect);
-//    }
-//
-//    @Override
-//    public NecromancyAttachEffect copy() {
-//        return new NecromancyAttachEffect(this);
-//    }
-//
-//    @Override
-//    public boolean apply(Game game, Ability source) {
-//        Card card = game.getCard(source.getFirstTarget());
-//        if (card != null && game.getState().getZone(source.getFirstTarget()).equals(Zone.GRAVEYARD)) {
-//            // Card have no attachedTo attribute yet so write ref only to enchantment now
-//            Permanent enchantment = game.getPermanent(source.getSourceId());
-//            if (enchantment != null) {
-//                enchantment.attachTo(card.getId(), game);
-//            }
-//            return true;
-//        }
-//        return false;
-//    }
-//
-//}
-
 class NecromancyChangeAbilityEffect extends ContinuousEffectImpl implements SourceEffect {
 
     private final static Ability newAbility = new EnchantAbility("creature put onto the battlefield with Necromancy");
diff --git a/Mage/src/mage/abilities/AbilityImpl.java b/Mage/src/mage/abilities/AbilityImpl.java
index a3b3126d8e6..54890c9ef58 100644
--- a/Mage/src/mage/abilities/AbilityImpl.java
+++ b/Mage/src/mage/abilities/AbilityImpl.java
@@ -631,7 +631,7 @@ public abstract class AbilityImpl implements Ability {
             }
         }
         if (abilityWord != null) {
-            sbRule.insert(0, new StringBuilder("<i>").append(abilityWord.toString()).append("</i> - "));
+            sbRule.insert(0, new StringBuilder("<i>").append(abilityWord.toString()).append("</i> &mdash; "));
         }         
         String text = modes.getText();
         if (!text.isEmpty()) {