From 4674b18a51225c221e0f3a76a52273d93e43411b Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Fri, 4 Mar 2016 01:07:52 +0100 Subject: [PATCH] * Fixed some prroblems with can't cast effects and morph ability (related to Reflector Mage, Exclusion Ritual and Alhammarret High Arbiter). --- .../magicorigins/AlhammarretHighArbiter.java | 2 +- .../mage/sets/newphyrexia/ExclusionRitual.java | 13 +++++++------ .../sets/oathofthegatewatch/ReflectorMage.java | 11 +++++++++-- Mage/src/main/java/mage/players/PlayerImpl.java | 17 +++++++++++++---- 4 files changed, 30 insertions(+), 13 deletions(-) diff --git a/Mage.Sets/src/mage/sets/magicorigins/AlhammarretHighArbiter.java b/Mage.Sets/src/mage/sets/magicorigins/AlhammarretHighArbiter.java index 62dbe2cb352..8c3e6cd9fc5 100644 --- a/Mage.Sets/src/mage/sets/magicorigins/AlhammarretHighArbiter.java +++ b/Mage.Sets/src/mage/sets/magicorigins/AlhammarretHighArbiter.java @@ -173,7 +173,7 @@ class AlhammarretHighArbiterCantCastEffect extends ContinuousRuleModifyingEffect @Override public boolean checksEventType(GameEvent event, Game game) { - return event.getType() == EventType.CAST_SPELL; + return event.getType() == EventType.CAST_SPELL_LATE; } @Override diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ExclusionRitual.java b/Mage.Sets/src/mage/sets/newphyrexia/ExclusionRitual.java index 1477e7020d9..48f068bf5ca 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ExclusionRitual.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ExclusionRitual.java @@ -28,8 +28,6 @@ package mage.sets.newphyrexia; import java.util.UUID; - -import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -37,6 +35,7 @@ import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -50,6 +49,7 @@ import mage.target.TargetPermanent; * @author Loki */ public class ExclusionRitual extends CardImpl { + private static final FilterPermanent filter = new FilterPermanent("nonland permanent"); static { @@ -60,7 +60,6 @@ public class ExclusionRitual extends CardImpl { super(ownerId, 10, "Exclusion Ritual", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{4}{W}{W}"); this.expansionSetCode = "NPH"; - // Imprint - When Exclusion Ritual enters the battlefield, exile target nonland permanent. Ability ability = new EntersBattlefieldTriggeredAbility(new ExclusionRitualImprintEffect(), false); ability.addTarget(new TargetPermanent(filter)); @@ -80,6 +79,7 @@ public class ExclusionRitual extends CardImpl { } class ExclusionRitualImprintEffect extends OneShotEffect { + ExclusionRitualImprintEffect() { super(Outcome.Exile); staticText = "exile target nonland permanent"; @@ -108,6 +108,7 @@ class ExclusionRitualImprintEffect extends OneShotEffect { } class ExclusionRitualReplacementEffect extends ContinuousRuleModifyingEffectImpl { + ExclusionRitualReplacementEffect() { super(Duration.WhileOnBattlefield, Outcome.Detriment); staticText = "Players can't cast spells with the same name as the exiled card"; @@ -116,12 +117,12 @@ class ExclusionRitualReplacementEffect extends ContinuousRuleModifyingEffectImpl ExclusionRitualReplacementEffect(final ExclusionRitualReplacementEffect effect) { super(effect); } - + @Override public boolean checksEventType(GameEvent event, Game game) { - return event.getType() == GameEvent.EventType.CAST_SPELL; + return event.getType() == GameEvent.EventType.CAST_SPELL_LATE; } - + @Override public boolean applies(GameEvent event, Ability source, Game game) { Permanent sourcePermanent = game.getPermanent(source.getSourceId()); diff --git a/Mage.Sets/src/mage/sets/oathofthegatewatch/ReflectorMage.java b/Mage.Sets/src/mage/sets/oathofthegatewatch/ReflectorMage.java index c7b05e1e41d..e4a42df569e 100644 --- a/Mage.Sets/src/mage/sets/oathofthegatewatch/ReflectorMage.java +++ b/Mage.Sets/src/mage/sets/oathofthegatewatch/ReflectorMage.java @@ -47,6 +47,7 @@ import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; +import mage.game.stack.Spell; import mage.game.turn.Step; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; @@ -110,7 +111,9 @@ class ReflectorMageEffect extends OneShotEffect { Permanent targetCreature = game.getPermanent(getTargetPointer().getFirst(game, source)); if (targetCreature != null) { controller.moveCards(targetCreature, Zone.HAND, source, game); - game.addEffect(new ExclusionRitualReplacementEffect(targetCreature.getName(), targetCreature.getOwnerId()), source); + if (!targetCreature.getName().isEmpty()) { // if the creature had no name, no restrict effect will be created + game.addEffect(new ExclusionRitualReplacementEffect(targetCreature.getName(), targetCreature.getOwnerId()), source); + } } return true; } @@ -138,13 +141,17 @@ class ExclusionRitualReplacementEffect extends ContinuousRuleModifyingEffectImpl @Override public boolean checksEventType(GameEvent event, Game game) { - return event.getType() == GameEvent.EventType.CAST_SPELL; + return event.getType() == GameEvent.EventType.CAST_SPELL_LATE; } @Override public boolean applies(GameEvent event, Ability source, Game game) { Card card = game.getCard(event.getSourceId()); if (card != null) { + Spell spell = game.getState().getStack().getSpell(event.getSourceId()); + if (spell != null && spell.isFaceDown(game)) { + return false; // Face Down cast spell (Morph creature) has no name + } return card.getName().equals(creatureName); } return false; diff --git a/Mage/src/main/java/mage/players/PlayerImpl.java b/Mage/src/main/java/mage/players/PlayerImpl.java index 9f3612fb827..b3cc247fb5f 100644 --- a/Mage/src/main/java/mage/players/PlayerImpl.java +++ b/Mage/src/main/java/mage/players/PlayerImpl.java @@ -2580,9 +2580,17 @@ public abstract class PlayerImpl implements Player, Serializable { playable.add(ability); } } - } else if (card.getCardType().contains(CardType.LAND) && ability instanceof AlternativeSourceCosts) { - if (canLandPlayAlternateSourceCostsAbility(card, availableMana, ability, game)) { // e.g. Land with Morph - playable.add(ability); + } else if (ability instanceof AlternativeSourceCosts) { + if (card.getCardType().contains(CardType.LAND)) { + if (canLandPlayAlternateSourceCostsAbility(card, availableMana, ability, game)) { // e.g. Land with Morph + playable.add(ability); + } + } else if (card.getCardType().contains(CardType.CREATURE)) { // e.g. makes a card available for play by Morph if the card may not be cast normally + if (!playable.contains(card.getSpellAbility())) { + if (((AlternativeSourceCosts) ability).isAvailable(card.getSpellAbility(), game)) { + playable.add(card.getSpellAbility()); + } + } } } } @@ -2701,7 +2709,8 @@ public abstract class PlayerImpl implements Player, Serializable { * */ @Override - public Set getPlayableInHand(Game game) { + public Set getPlayableInHand(Game game + ) { Set playable = new HashSet<>(); if (!shouldSkipGettingPlayable(game)) { ManaOptions available = getManaAvailable(game);