From 8044940a97953ccc7dd26418ca89cf68cb15fd74 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Wed, 30 Sep 2015 00:53:33 +0200 Subject: [PATCH] * Fixed a bug that if all targets (if targets were set) of a spell with an up to target definition (e.g. Adverse Conditions) became illegal the spell did not fizzle as it should. --- .../sets/battleforzendikar/MortuaryMire.java | 2 +- .../src/mage/sets/dissension/RiseFall.java | 2 +- .../activated/PutToGraveyardTest.java | 75 +++++++++++++++++++ .../abilities/other/SpellFizzlesTest.java | 66 ++++++++++++++++ Mage/src/mage/target/TargetImpl.java | 16 ++-- 5 files changed, 153 insertions(+), 8 deletions(-) create mode 100644 Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/PutToGraveyardTest.java create mode 100644 Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/SpellFizzlesTest.java diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/MortuaryMire.java b/Mage.Sets/src/mage/sets/battleforzendikar/MortuaryMire.java index d21925c8ea..b97e7232c2 100644 --- a/Mage.Sets/src/mage/sets/battleforzendikar/MortuaryMire.java +++ b/Mage.Sets/src/mage/sets/battleforzendikar/MortuaryMire.java @@ -54,7 +54,7 @@ public class MortuaryMire extends CardImpl { // When Mortuary Mire enters the battlefield, you may put target creature card from your graveyard on top of your library. Ability ability = new EntersBattlefieldTriggeredAbility(new PutOnLibraryTargetEffect(true), true); - ability.addTarget(new TargetCardInYourGraveyard(new FilterCreatureCard())); + ability.addTarget(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard"))); this.addAbility(ability); // {T}: Add {B} to your mana pool. diff --git a/Mage.Sets/src/mage/sets/dissension/RiseFall.java b/Mage.Sets/src/mage/sets/dissension/RiseFall.java index 91403495f2..56d0d46b25 100644 --- a/Mage.Sets/src/mage/sets/dissension/RiseFall.java +++ b/Mage.Sets/src/mage/sets/dissension/RiseFall.java @@ -148,7 +148,7 @@ class FallEffect extends OneShotEffect { } while (cards.contains(card.getId())); cards.add(card); } - targetPlayer.revealCards(sourceObject.getName(), cards, game); + targetPlayer.revealCards(sourceObject.getIdName(), cards, game); for (Card cardToDiscard : cards.getCards(game)) { if (!cardToDiscard.getCardType().contains(CardType.LAND)) { targetPlayer.discard(cardToDiscard, source, game); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/PutToGraveyardTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/PutToGraveyardTest.java new file mode 100644 index 0000000000..1b72964a69 --- /dev/null +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/PutToGraveyardTest.java @@ -0,0 +1,75 @@ +/* + * 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.abilities.activated; + +import mage.constants.PhaseStep; +import mage.constants.Zone; +import org.junit.Test; +import org.mage.test.serverside.base.CardTestPlayerBase; + +/** + * + * @author LevelX2 + */ +public class PutToGraveyardTest extends CardTestPlayerBase { + + /** + * Void Attendant The usable "Prozessor-Effect" doesnt put the card back + * into the graveyard from the exile. + */ + @Test + public void testExileToGraveyard() { + // Devoid + // {1}{G}, Put a card an opponent owns from exile into that player's graveyard: Put a 1/1 colorless Eldrazi Scion creature token onto the battlefield. It has "Sacrifice this creature: Add {1} to your mana pool." + addCard(Zone.BATTLEFIELD, playerA, "Void Attendant"); + addCard(Zone.BATTLEFIELD, playerA, "Plains", 2); + addCard(Zone.BATTLEFIELD, playerA, "Forest", 3); + // Flash (You may cast this spell any time you could cast an instant.) + // When Stasis Snare enters the battlefield, exile target creature an opponent controls until Stasis Snare leaves the battlefield. (That creature returns under its owner's control.) + addCard(Zone.HAND, playerA, "Stasis Snare", 1); // {1}{W}{W} + + addCard(Zone.BATTLEFIELD, playerB, "Silvercoat Lion"); + + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Stasis Snare"); + addTarget(playerA, "Silvercoat Lion"); + + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{1}{G},", NO_TARGET, ""); + addTarget(playerA, "Silvercoat Lion"); + + setStopAt(1, PhaseStep.BEGIN_COMBAT); + execute(); + + assertPermanentCount(playerA, "Stasis Snare", 1); + assertPermanentCount(playerB, "Silvercoat Lion", 0); + assertExileCount(playerB, 0); + assertGraveyardCount(playerB, "Silvercoat Lion", 1); + assertPermanentCount(playerA, "Eldrazi Scion", 1); + + } + +} diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/SpellFizzlesTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/SpellFizzlesTest.java new file mode 100644 index 0000000000..4deddfc8c0 --- /dev/null +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/SpellFizzlesTest.java @@ -0,0 +1,66 @@ +/* + * 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.abilities.other; + +import mage.constants.PhaseStep; +import mage.constants.Zone; +import org.junit.Test; +import org.mage.test.serverside.base.CardTestPlayerBase; + +/** + * + * @author LevelX2 + */ +public class SpellFizzlesTest extends CardTestPlayerBase { + + @Test + public void testSpellFizzlesWithNoLegalTargets() throws Exception { + addCard(Zone.BATTLEFIELD, playerA, "Island", 4); + // Devoid + // Tap up to two target creatures. Those creatures don't untap during their controller's next untap step. + // Put a 1/1 colorless Eldrazi Scion creature token onto the battlefield. It has "Sacrifice this creature: Add {1} to your mana pool." + addCard(Zone.HAND, playerA, "Adverse Conditions"); // {3}{U} + + addCard(Zone.BATTLEFIELD, playerB, "Silvercoat Lion", 1); + addCard(Zone.BATTLEFIELD, playerB, "Mountain", 1); + addCard(Zone.HAND, playerB, "Lightning Bolt", 1); + + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Adverse Conditions", "Silvercoat Lion"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Lightning Bolt", "Silvercoat Lion", "Adverse Conditions"); + + setStopAt(1, PhaseStep.BEGIN_COMBAT); + execute(); + + assertGraveyardCount(playerA, "Adverse Conditions", 1); + assertGraveyardCount(playerB, "Lightning Bolt", 1); + assertGraveyardCount(playerB, "Silvercoat Lion", 1); + assertPermanentCount(playerA, "Eldrazi Scion", 0); // All targets were illegal - spell fizzles + + } + +} diff --git a/Mage/src/mage/target/TargetImpl.java b/Mage/src/mage/target/TargetImpl.java index ee54c12a77..ce0a8790f4 100644 --- a/Mage/src/mage/target/TargetImpl.java +++ b/Mage/src/mage/target/TargetImpl.java @@ -345,7 +345,6 @@ public abstract class TargetImpl implements Target { public boolean isLegal(Ability source, Game game) { //20101001 - 608.2b Set illegalTargets = new HashSet<>(); -// int replacedTargets = 0; for (UUID targetId : targets.keySet()) { Card card = game.getCard(targetId); if (card != null) { @@ -367,12 +366,17 @@ public abstract class TargetImpl implements Target { for (UUID targetId : illegalTargets) { targets.remove(targetId); } -// if (replacedTargets > 0 && replacedTargets == targets.size()) { -// return false; -// } - if (getNumberOfTargets() == 0 && targets.isEmpty()) { - return true; + if (targets.isEmpty()) { + // If all targets that were set before are illegal now, the target is no longer legal + if (!illegalTargets.isEmpty()) { + return false; + } + // if no targets have to be set and no targets are set, that's legal + if (getNumberOfTargets() == 0) { + return true; + } } + return targets.size() > 0; }