diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/BrutalExpulsion.java b/Mage.Sets/src/mage/sets/battleforzendikar/BrutalExpulsion.java index fcddf947e1b..9bd5b1cf575 100644 --- a/Mage.Sets/src/mage/sets/battleforzendikar/BrutalExpulsion.java +++ b/Mage.Sets/src/mage/sets/battleforzendikar/BrutalExpulsion.java @@ -79,7 +79,7 @@ public class BrutalExpulsion extends CardImpl { effect.setText("If that permanent would be put into a graveyard this turn, exile it instead"); mode.getEffects().add(effect); this.getSpellAbility().addMode(mode); - this.getSpellAbility().addWatcher(new DamagedByWatcher()); + this.getSpellAbility().addWatcher(new DamagedByWatcher(true)); } public BrutalExpulsion(final BrutalExpulsion card) { diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/bfz/BrutalExpulsionTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/bfz/BrutalExpulsionTest.java new file mode 100644 index 00000000000..195666c6097 --- /dev/null +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/bfz/BrutalExpulsionTest.java @@ -0,0 +1,76 @@ +/* + * 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.single.bfz; + +import mage.constants.PhaseStep; +import mage.constants.Zone; +import org.junit.Test; +import org.mage.test.serverside.base.CardTestPlayerBase; + +/** + * + * @author Quercitron + */ +public class BrutalExpulsionTest extends CardTestPlayerBase { + + /** + * Brutal Expulsion targeting Gideon, Ally of Zendikar. Gideon has 3 loyalty. Brutal Expulsion resolves, + * leaves 1 loyalty. I attack Gideon for 1 with a Scion token, Gideon dies. Instead of going to graveyard, + * Expulsion sends Gideon to exile. However, in game Gideon went to graveyard. + */ + @Test + public void testPlaneswalkerExile() { + // Choose one or both + // - Return target spell or creature to its owner's hand; + // or Brutal Expulsion deals 2 damage to target creature or planeswalker. If that permanent would be put into a graveyard this turn, exile it instead. + addCard(Zone.HAND, playerA, "Brutal Expulsion"); + // Shock deals 2 damage to target creature or player. + addCard(Zone.HAND, playerA, "Shock"); + addCard(Zone.BATTLEFIELD, playerA, "Island", 4); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 5); + + // Planeswalker with 4 loyalty. + addCard(Zone.BATTLEFIELD, playerB, "Gideon, Ally of Zendikar"); + + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Brutal Expulsion", playerB); + setModeChoice(playerA, "2"); + setModeChoice(playerA, null); + setChoice(playerA, "Yes"); + + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Shock", playerB); + setChoice(playerA, "Yes"); + + setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); + execute(); + + assertPermanentCount(playerB, "Gideon, Ally of Zendikar", 0); + assertGraveyardCount(playerB, "Gideon, Ally of Zendikar", 0); + assertExileCount("Gideon, Ally of Zendikar", 1); + } + +} diff --git a/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java b/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java index a4e73e15331..87d245772d3 100644 --- a/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java +++ b/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java @@ -521,6 +521,11 @@ public class TestPlayer implements Player { @Override public Mode chooseMode(Modes modes, Ability source, Game game) { if (!modesSet.isEmpty() && modes.getMaxModes() > modes.getSelectedModes().size()) { + // set mode to null to select less than maximum modes if multiple modes are allowed + if (modesSet.get(0) == null) { + modesSet.remove(0); + return null; + } int selectedMode = Integer.parseInt(modesSet.get(0)); int i = 1; for (Mode mode : modes.getAvailableModes(source, game)) { diff --git a/Mage/src/main/java/mage/watchers/common/DamagedByWatcher.java b/Mage/src/main/java/mage/watchers/common/DamagedByWatcher.java index e4b82c01c67..ed6bd2efdcb 100644 --- a/Mage/src/main/java/mage/watchers/common/DamagedByWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/DamagedByWatcher.java @@ -45,15 +45,23 @@ import mage.watchers.Watcher; */ public class DamagedByWatcher extends Watcher { - public Set damagedCreatures = new HashSet<>(); + public Set damagedBySource = new HashSet<>(); + + private final boolean watchPlaneswalkers; public DamagedByWatcher() { + this(false); + } + + public DamagedByWatcher(boolean watchPlaneswalkers) { super("DamagedByWatcher", WatcherScope.CARD); + this.watchPlaneswalkers = watchPlaneswalkers; } public DamagedByWatcher(final DamagedByWatcher watcher) { super(watcher); - this.damagedCreatures.addAll(watcher.damagedCreatures); + this.damagedBySource.addAll(watcher.damagedBySource); + this.watchPlaneswalkers = watcher.watchPlaneswalkers; } @Override @@ -63,10 +71,12 @@ public class DamagedByWatcher extends Watcher { @Override public void watch(GameEvent event, Game game) { - if (event.getType() == EventType.DAMAGED_CREATURE && sourceId.equals(event.getSourceId())) { + boolean eventHasAppropriateType = (event.getType() == EventType.DAMAGED_CREATURE) || + (watchPlaneswalkers && event.getType() == EventType.DAMAGED_PLANESWALKER); + if (eventHasAppropriateType && sourceId.equals(event.getSourceId())) { MageObjectReference mor = new MageObjectReference(event.getTargetId(), game); - if (!damagedCreatures.contains(mor)) { - damagedCreatures.add(mor); + if (!damagedBySource.contains(mor)) { + damagedBySource.add(mor); } } } @@ -74,7 +84,7 @@ public class DamagedByWatcher extends Watcher { @Override public void reset() { super.reset(); - damagedCreatures.clear(); + damagedBySource.clear(); } public boolean wasDamaged(UUID sourceId, Game game) { @@ -86,6 +96,6 @@ public class DamagedByWatcher extends Watcher { } public boolean wasDamaged(Permanent permanent, Game game) { - return damagedCreatures.contains(new MageObjectReference(permanent, game)); + return damagedBySource.contains(new MageObjectReference(permanent, game)); } }