diff --git a/src/magic/data/HighQualityCardImagesProvider.java b/src/magic/data/HighQualityCardImagesProvider.java index 78a8a2173f..9d0331a7c7 100644 --- a/src/magic/data/HighQualityCardImagesProvider.java +++ b/src/magic/data/HighQualityCardImagesProvider.java @@ -47,6 +47,9 @@ public class HighQualityCardImagesProvider implements CardImagesProvider { if (cardDefinition == MagicCardDefinition.UNKNOWN) { return IconImages.MISSING_CARD; } + if (cardDefinition == MagicCardDefinition.MORPH) { + return IconImages.CARD_BACK; + } if (cardDefinition.isMissing() || !cardDefinition.isValid()) { if (!Files.exists(Paths.get(getFilename(cardDefinition, index)))) { return IconImages.MISSING_CARD; diff --git a/src/magic/model/MagicCardDefinition.java b/src/magic/model/MagicCardDefinition.java index 4e299b6464..a3dafbb4b6 100644 --- a/src/magic/model/MagicCardDefinition.java +++ b/src/magic/model/MagicCardDefinition.java @@ -56,13 +56,12 @@ public class MagicCardDefinition implements MagicAbilityStore { } }; - public static final MagicCardDefinition FACE_DOWN = new MagicCardDefinition() { + public static final MagicCardDefinition MORPH = new MagicCardDefinition() { //definition for face down cards @Override protected void initialize() { setName(""); setFullName("2/2 face-down creature"); - setImageURL("http://1-media-cdn.foolz.us/ffuuka/board/tg/image/1384/33/1384330114735.jpg"); setValue(1); addType(MagicType.Creature); setCost(MagicManaCost.create("{0}")); diff --git a/src/magic/model/MagicPermanent.java b/src/magic/model/MagicPermanent.java index 54907a8d89..184ac74c06 100644 --- a/src/magic/model/MagicPermanent.java +++ b/src/magic/model/MagicPermanent.java @@ -232,7 +232,7 @@ public class MagicPermanent extends MagicObjectImpl implements MagicSource,Magic @Override public MagicCardDefinition getCardDefinition() { if (isFaceDown()) { - return MagicCardDefinition.FACE_DOWN; + return MagicCardDefinition.MORPH; } else { return cardDefinition; } diff --git a/src/magic/model/action/MagicPlayMod.java b/src/magic/model/action/MagicPlayMod.java index 252a017e58..961553682c 100644 --- a/src/magic/model/action/MagicPlayMod.java +++ b/src/magic/model/action/MagicPlayMod.java @@ -88,7 +88,7 @@ public enum MagicPlayMod implements MagicPermanentAction { game.doAction(new MagicAddStaticAction(perm, MagicStatic.Bestowed)); } }, - FACE_DOWN() { + MORPH() { protected void doAction(final MagicGame game, final MagicPermanent perm) { perm.setState(MagicPermanentState.FaceDown); } diff --git a/src/magic/model/event/MagicMorphCastActivation.java b/src/magic/model/event/MagicMorphCastActivation.java index 7cd0f02a8b..0b91a61bc1 100644 --- a/src/magic/model/event/MagicMorphCastActivation.java +++ b/src/magic/model/event/MagicMorphCastActivation.java @@ -65,32 +65,32 @@ public class MagicMorphCastActivation extends MagicCardActivation { ) { @Override public boolean hasColor(final MagicColor color) { - return MagicCardDefinition.FACE_DOWN.hasColor(color); + return MagicCardDefinition.MORPH.hasColor(color); } @Override public boolean hasAbility(final MagicAbility ability) { - return MagicCardDefinition.FACE_DOWN.hasAbility(ability); + return MagicCardDefinition.MORPH.hasAbility(ability); } @Override public boolean hasSubType(final MagicSubType subType) { - return MagicCardDefinition.FACE_DOWN.hasSubType(subType); + return MagicCardDefinition.MORPH.hasSubType(subType); } @Override public boolean hasType(final MagicType type) { - return MagicCardDefinition.FACE_DOWN.hasType(type); + return MagicCardDefinition.MORPH.hasType(type); } @Override public boolean canBeCountered() { - return MagicCardDefinition.FACE_DOWN.hasAbility(MagicAbility.CannotBeCountered) == false; + return MagicCardDefinition.MORPH.hasAbility(MagicAbility.CannotBeCountered) == false; } @Override public ImageIcon getIcon() { - return MagicCardDefinition.FACE_DOWN.getIcon(); + return MagicCardDefinition.MORPH.getIcon(); } @Override public String getName() { - return MagicCardDefinition.FACE_DOWN.getName(); + return MagicCardDefinition.MORPH.getName(); } }; @@ -109,6 +109,6 @@ public class MagicMorphCastActivation extends MagicCardActivation { @Override public void executeEvent(final MagicGame game, final MagicEvent event) { - game.doAction(new MagicPlayCardFromStackAction(event.getCardOnStack(), MagicPlayMod.FACE_DOWN)); + game.doAction(new MagicPlayCardFromStackAction(event.getCardOnStack(), MagicPlayMod.MORPH)); } }