diff --git a/Mage.Sets/src/mage/sets/planeshift/OrimsChant.java b/Mage.Sets/src/mage/sets/planeshift/OrimsChant.java index 772178ab7bd..57f1c09d70d 100644 --- a/Mage.Sets/src/mage/sets/planeshift/OrimsChant.java +++ b/Mage.Sets/src/mage/sets/planeshift/OrimsChant.java @@ -35,16 +35,12 @@ import mage.Constants.Rarity; import mage.abilities.Ability; import mage.abilities.condition.common.KickedCondition; import mage.abilities.costs.mana.KickerManaCost; -import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.ReplacementEffectImpl; -import mage.abilities.effects.common.DrawCardControllerEffect; -import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; import mage.game.Game; import mage.game.events.GameEvent; import mage.players.Player; import mage.target.TargetPlayer; -import mage.target.common.TargetNonlandPermanent; /** * diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/EchoCirclet.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/EchoCirclet.java index a5ce7b2d702..adf82c8fb8a 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/EchoCirclet.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/EchoCirclet.java @@ -27,8 +27,10 @@ */ package mage.sets.scarsofmirrodin; +import java.util.UUID; import mage.Constants; import mage.Constants.CardType; +import mage.Constants.Layer; import mage.Constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -39,7 +41,6 @@ import mage.cards.CardImpl; import mage.game.Game; import mage.game.permanent.Permanent; -import java.util.UUID; /** * @author nantuko @@ -51,9 +52,11 @@ public class EchoCirclet extends CardImpl { this.expansionSetCode = "SOM"; this.subtype.add("Equipment"); - this.addAbility(new EquipAbility(Constants.Outcome.AddAbility, new GenericManaCost(1))); - // Equipped creature can block an additional creature. + // Equipped creature can block an additional creature. (static abilit of equipment, no ability that will be gained to equiped creature!) this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new EchoCircletEffect())); + + // Equip {1} + this.addAbility(new EquipAbility(Constants.Outcome.AddAbility, new GenericManaCost(1))); } public EchoCirclet(final EchoCirclet card) { @@ -83,7 +86,7 @@ class EchoCircletEffect extends ContinuousEffectImpl { } @Override - public boolean apply(Constants.Layer layer, Constants.SubLayer sublayer, Ability source, Game game) { + public boolean apply(Layer layer, Constants.SubLayer sublayer, Ability source, Game game) { Permanent perm = game.getPermanent(source.getSourceId()); if (perm != null && perm.getAttachedTo() != null) { Permanent equipped = game.getPermanent(perm.getAttachedTo()); @@ -108,8 +111,8 @@ class EchoCircletEffect extends ContinuousEffectImpl { } @Override - public boolean hasLayer(Constants.Layer layer) { - return layer == Constants.Layer.RulesEffects; + public boolean hasLayer(Layer layer) { + return layer == Layer.RulesEffects; } }