* Animate Artifact - Fixed some problems.

Mage.Sets/src/mage/cards/a/AnimateArtifact.java

@@ -28,20 +28,18 @@
 package mage.cards.a;
 
 import java.util.UUID;
-import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.SimpleStaticAbility;
-import mage.abilities.condition.common.EquippedMatchesFilterCondition;
-import mage.abilities.decorator.ConditionalContinuousEffect;
-import mage.abilities.effects.Effect;
+import mage.abilities.effects.ContinuousEffectImpl;
 import mage.abilities.effects.common.AttachEffect;
-import mage.abilities.effects.common.continuous.BecomesCreatureAttachedEffect;
 import mage.abilities.keyword.EnchantAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.Duration;
+import mage.constants.Layer;
 import mage.constants.Outcome;
+import mage.constants.SubLayer;
 import mage.constants.Zone;
 import mage.filter.FilterPermanent;
 import mage.filter.common.FilterArtifactPermanent;
@@ -49,7 +47,6 @@ import mage.filter.predicate.Predicates;
 import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
-import mage.game.permanent.token.Token;
 import mage.target.TargetPermanent;
 import mage.target.common.TargetArtifactPermanent;
 
@@ -67,7 +64,6 @@ public class AnimateArtifact extends CardImpl {
 
     public AnimateArtifact(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{U}");
-        
         this.subtype.add("Aura");
 
         // Enchant artifact
@@ -78,9 +74,7 @@ public class AnimateArtifact extends CardImpl {
         this.addAbility(ability);
 
         // As long as enchanted artifact isn't a creature, it's an artifact creature with power and toughness each equal to its converted mana cost.
-	ConvertedManaCost cost = new ConvertedManaCost();
-	int amount = cost.getConvertedManaCost();
-        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BecomesCreatureAttachedEffect(new AnimateArtifactToken(amount, amount), "it's an artifact creature with power and toughness each equal to its converted mana cost.", Duration.WhileOnBattlefield), new EquippedMatchesFilterCondition(filter), "As long as enchanted artifact isn't a creature")));
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AnimateArtifactContinuousEffect(Duration.WhileOnBattlefield)));
     }
 
     public AnimateArtifact(final AnimateArtifact card) {
@@ -93,28 +87,49 @@ public class AnimateArtifact extends CardImpl {
     }
 }
 
-class AnimateArtifactToken extends Token {
+class AnimateArtifactContinuousEffect extends ContinuousEffectImpl {
 
-    AnimateArtifactToken(int power, int toughness) {
-        super("", "");
-        cardType.add(CardType.CREATURE);
-        this.power = new MageInt(power);
-        this.toughness = new MageInt(toughness);
-    }
-}
-
-class ConvertedManaCost {//need to figure out how this can be used to return CMC to variable amount in animate artifact token
-    
-    int cmc;
-
-    int calculate(Game game, Ability source, Effect effect) {
-        Permanent enchantment = game.getPermanentOrLKIBattlefield(source.getSourceId());
-        Permanent enchanted = game.getPermanentOrLKIBattlefield(enchantment.getAttachedTo());
-        cmc = enchanted.getConvertedManaCost();
-        return cmc;
-    }
-
-    int getConvertedManaCost () {
-        return cmc;
+    public AnimateArtifactContinuousEffect(Duration duration) {
+        super(duration, Outcome.Benefit);
+        staticText = "As long as enchanted artifact isn't a creature, it's an artifact creature with power and toughness each equal to its converted mana cost";
     }
+
+    public AnimateArtifactContinuousEffect(final AnimateArtifactContinuousEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public AnimateArtifactContinuousEffect copy() {
+        return new AnimateArtifactContinuousEffect(this);
+    }
+
+    @Override
+    public boolean apply(Layer layer, SubLayer sublayer, Ability source, Game game) {
+        // Not sure, if this is layerwise handled absolutely correctly
+        Permanent enchantment = game.getPermanent(source.getSourceId());
+        if (enchantment != null) {
+            Permanent permanent = game.getPermanent(enchantment.getAttachedTo());
+            if (permanent != null && !permanent.getCardType().contains(CardType.CREATURE)) {
+                if (sublayer == SubLayer.NA) {
+                    permanent.getCardType().add(CardType.CREATURE);
+                    permanent.getPower().setValue(permanent.getConvertedManaCost());
+                    permanent.getToughness().setValue(permanent.getConvertedManaCost());
+                }
+            }
+            return true;
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        return false;
+    }
+
+    @Override
+    public boolean hasLayer(Layer layer) {
+        return layer == Layer.TypeChangingEffects_4;
+    }
+
 }

Mage.Tests/src/test/java/org/mage/test/cards/enchantments/AnimateArtifactTest.java

@@ -0,0 +1,86 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package org.mage.test.cards.enchantments;
+
+import mage.constants.CardType;
+import mage.constants.PhaseStep;
+import mage.constants.Zone;
+import org.junit.Test;
+import org.mage.test.serverside.base.CardTestPlayerBase;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class AnimateArtifactTest extends CardTestPlayerBase {
+
+    @Test
+    public void testAnimateArtifact() {
+
+        addCard(Zone.BATTLEFIELD, playerA, "Crucible of Worlds");
+
+        addCard(Zone.BATTLEFIELD, playerA, "Island", 4);
+
+        // Enchant artifact
+        // As long as enchanted artifact isn't a creature, it's an artifact creature with power and toughness each equal to its converted mana cost.
+        addCard(Zone.HAND, playerA, "Animate Artifact", 1); // Enchantment {3}{U}
+
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Animate Artifact", "Crucible of Worlds");
+
+        setStopAt(1, PhaseStep.BEGIN_COMBAT);
+        execute();
+
+        assertPermanentCount(playerA, "Crucible of Worlds", 1);
+        assertPermanentCount(playerA, "Animate Artifact", 1);
+        assertType("Crucible of Worlds", CardType.CREATURE, null);
+        assertPowerToughness(playerA, "Crucible of Worlds", 3, 3);
+    }
+
+    @Test
+    public void testAnimateArtifactCreature() {
+
+        addCard(Zone.BATTLEFIELD, playerA, "Juggernaut");// Artifact Creature - Juggernaut {4}
+
+        addCard(Zone.BATTLEFIELD, playerA, "Island", 4);
+
+        // Enchant artifact
+        // As long as enchanted artifact isn't a creature, it's an artifact creature with power and toughness each equal to its converted mana cost.
+        addCard(Zone.HAND, playerA, "Animate Artifact", 1); // Enchantment {3}{U}
+
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Animate Artifact", "Juggernaut");
+
+        setStopAt(1, PhaseStep.BEGIN_COMBAT);
+        execute();
+
+        assertPermanentCount(playerA, "Juggernaut", 1);
+        assertPermanentCount(playerA, "Animate Artifact", 1);
+        assertType("Juggernaut", CardType.CREATURE, "Juggernaut");
+        assertPowerToughness(playerA, "Juggernaut", 5, 3);
+    }
+
+}

Mage.Tests/src/test/java/org/mage/test/serverside/base/impl/CardTestPlayerAPIImpl.java

@@ -714,9 +714,10 @@ public abstract class CardTestPlayerAPIImpl extends MageTestPlayerBase implement
         Assert.assertNotNull("There is no such permanent on the battlefield, cardName=" + cardName, found);
 
         Assert.assertTrue("(Battlefield) card type not found (" + cardName + ":" + type + ")", found.getCardType().contains(type));
-
+        if (subType != null) {
             Assert.assertTrue("(Battlefield) card sub-type not equal (" + cardName + ":" + subType + ")", found.getSubtype(currentGame).contains(subType));
         }
+    }
 
     /**
      * Assert whether a permanent is tapped or not