From c67965a67340fc891aa201e0c44ed329179268e2 Mon Sep 17 00:00:00 2001 From: swordshine Date: Mon, 16 Mar 2015 13:08:53 +0000 Subject: [PATCH] - DTK: Added Qarsi Deceiver --- .../src/main/java/forge/game/card/CardFactoryUtil.java | 2 +- .../java/forge/game/spellability/AbilityManaPart.java | 9 +++++++++ .../main/java/forge/game/spellability/SpellAbility.java | 8 ++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java index f25229f22cc..818a3536c02 100644 --- a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java +++ b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java @@ -209,7 +209,7 @@ public class CardFactoryUtil { final StringBuilder sbStack = new StringBuilder(); sbStack.append(sourceCard.getName()).append(" - turn this card face up."); manifestUp.setStackDescription(sbStack.toString()); - //manifestUp.setIsMorphUp(true); + manifestUp.setIsManifestUp(true); return manifestUp; } diff --git a/forge-game/src/main/java/forge/game/spellability/AbilityManaPart.java b/forge-game/src/main/java/forge/game/spellability/AbilityManaPart.java index 0d6dcc131a3..2f83dc908ce 100644 --- a/forge-game/src/main/java/forge/game/spellability/AbilityManaPart.java +++ b/forge-game/src/main/java/forge/game/spellability/AbilityManaPart.java @@ -310,6 +310,14 @@ public class AbilityManaPart implements java.io.Serializable { } continue; } + if (restriction.equals("MorphOrManifest")) { + if ((sa.isSpell() && sa.getHostCard().isCreature() && ((Spell) sa).isCastFaceDown()) + || sa.isManifestUp() || sa.isMorphUp()) { + return true; + } else { + continue; + } + } if (sa.isAbility()) { if (restriction.startsWith("Activated")) { @@ -320,6 +328,7 @@ public class AbilityManaPart implements java.io.Serializable { } } + if (sa.getHostCard() != null) { if (sa.getHostCard().isValid(restriction, this.getSourceCard().getController(), this.getSourceCard())) { return true; diff --git a/forge-game/src/main/java/forge/game/spellability/SpellAbility.java b/forge-game/src/main/java/forge/game/spellability/SpellAbility.java index eece6aa29c2..3876020059e 100644 --- a/forge-game/src/main/java/forge/game/spellability/SpellAbility.java +++ b/forge-game/src/main/java/forge/game/spellability/SpellAbility.java @@ -94,6 +94,7 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit private boolean dash = false; private boolean offering = false; private boolean morphup = false; + private boolean manifestUp = false; private boolean cumulativeupkeep = false; private boolean outlast = false; private SplitSide splitSide = null; @@ -286,6 +287,13 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit morphup = b; } + public boolean isManifestUp() { + return manifestUp; + } + public final void setIsManifestUp(final boolean b) { + manifestUp = b; + } + public boolean isCycling() { return cycling; }