diff --git a/Mage.Sets/src/mage/sets/morningtide/Scapeshift.java b/Mage.Sets/src/mage/sets/morningtide/Scapeshift.java index bbd5dafd2dc..6cea8992ee2 100644 --- a/Mage.Sets/src/mage/sets/morningtide/Scapeshift.java +++ b/Mage.Sets/src/mage/sets/morningtide/Scapeshift.java @@ -112,7 +112,7 @@ class ScapeshiftEffect extends OneShotEffect { for (UUID cardId: (List)target.getTargets()) { Card card = player.getLibrary().getCard(cardId, game); if (card != null) { - card.putOntoBattlefield(game, Zone.LIBRARY, source.getSourceId(), source.getControllerId(), true); + player.putOntoBattlefieldWithInfo(card, game, Zone.LIBRARY, source.getControllerId(), true); } } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/ValakutTheMoltenPinnacleTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/ValakutTheMoltenPinnacleTest.java new file mode 100644 index 00000000000..c29cd7a736b --- /dev/null +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/ValakutTheMoltenPinnacleTest.java @@ -0,0 +1,169 @@ +/* + /* + * 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.enters; + +import mage.constants.PhaseStep; +import mage.constants.Zone; +import mage.game.permanent.Permanent; +import org.junit.Assert; +import org.junit.Test; +import org.mage.test.serverside.base.CardTestPlayerBase; + +/** + * + * @author LevelX2 + */ + +public class ValakutTheMoltenPinnacleTest extends CardTestPlayerBase { + + /** + * Valakut, the Molten Pinnacle + * Land + * Valakut, the Molten Pinnacle enters the battlefield tapped. + * Whenever a Mountain enters the battlefield under your control, if you control at least five other Mountains, you may have Valakut, the Molten Pinnacle deal 3 damage to target creature or player. + * {T}: Add {R} to your mana pool. + */ + + @Test + public void onlyFourMountainsNoDamage() { + + addCard(Zone.BATTLEFIELD, playerA, "Valakut, the Molten Pinnacle"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 4); + + playLand(3, PhaseStep.PRECOMBAT_MAIN, playerA, "Mountain"); + setStopAt(3, PhaseStep.BEGIN_COMBAT); + execute(); + + assertPermanentCount(playerA, "Valakut, the Molten Pinnacle", 1); + assertPermanentCount(playerA, "Mountain", 5); + + assertLife(playerA, 20); + assertLife(playerB, 20); + } + + @Test + public void fiveMountainsDamageToPlayerB() { + + addCard(Zone.BATTLEFIELD, playerA, "Valakut, the Molten Pinnacle"); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 5); + + playLand(3, PhaseStep.PRECOMBAT_MAIN, playerA, "Mountain"); // 3 damage because already 5 Mountains on battlefield + + setStopAt(3, PhaseStep.BEGIN_COMBAT); + execute(); + + assertPermanentCount(playerA, "Valakut, the Molten Pinnacle", 1); + assertPermanentCount(playerA, "Mountain", 6); + + assertLife(playerA, 20); + assertLife(playerB, 17); + + + } + + // Scapeshift {2}{G}{G} + // Sorcery + // Sacrifice any number of lands. Search your library for that many land cards, put them onto the battlefield tapped, then shuffle your library. + + @Test + public void sixEnterWithScapeshiftDamageToPlayerB() { + + addCard(Zone.LIBRARY, playerA, "Mountain", 6); + addCard(Zone.BATTLEFIELD, playerA, "Valakut, the Molten Pinnacle"); + addCard(Zone.BATTLEFIELD, playerA, "Forest", 6); + addCard(Zone.HAND, playerA, "Scapeshift"); + + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Scapeshift"); + addTarget(playerA, "Forest^Forest^Forest^Forest^Forest^Forest"); + + setStopAt(3, PhaseStep.BEGIN_COMBAT); + execute(); + + assertPermanentCount(playerA, "Valakut, the Molten Pinnacle", 1); + assertGraveyardCount(playerA, "Forest", 6); + assertPermanentCount(playerA, "Mountain", 6); + + assertLife(playerA, 20); + assertLife(playerB, 2); // 6 * 3 damage = 18 + + + } + + @Test + public void sixAndValakutEnterWithScapeshiftDamageToPlayerB() { + + addCard(Zone.LIBRARY, playerA, "Mountain", 6); + addCard(Zone.LIBRARY, playerA, "Valakut, the Molten Pinnacle"); + addCard(Zone.BATTLEFIELD, playerA, "Forest", 7); + addCard(Zone.HAND, playerA, "Scapeshift"); + + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Scapeshift"); + addTarget(playerA, "Forest^Forest^Forest^Forest^Forest^Forest^Forest"); + + setStopAt(3, PhaseStep.BEGIN_COMBAT); + execute(); + + assertPermanentCount(playerA, "Valakut, the Molten Pinnacle", 1); + assertGraveyardCount(playerA, "Forest", 7); + assertPermanentCount(playerA, "Mountain", 6); + + assertLife(playerA, 20); + assertLife(playerB, 2); // 6 * 3 damage = 18 + + } + + // using some shock lands instead of only mountains + @Test + public void sixWithShocklandsAndValakutEnterWithScapeshiftDamageToPlayerB() { + + addCard(Zone.LIBRARY, playerA, "Mountain", 3); + addCard(Zone.LIBRARY, playerA, "Stomping Ground", 3); + addCard(Zone.LIBRARY, playerA, "Valakut, the Molten Pinnacle"); + addCard(Zone.BATTLEFIELD, playerA, "Forest", 7); + addCard(Zone.HAND, playerA, "Scapeshift"); + + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Scapeshift"); + addTarget(playerA, "Forest^Forest^Forest^Forest^Forest^Forest^Forest"); + setChoice(playerA, "No"); // Stomping Ground can be tapped + setChoice(playerA, "No"); // Stomping Ground can be tapped + setChoice(playerA, "No"); // Stomping Ground can be tapped + setStopAt(3, PhaseStep.BEGIN_COMBAT); + execute(); + + assertPermanentCount(playerA, "Valakut, the Molten Pinnacle", 1); + assertGraveyardCount(playerA, "Forest", 7); + assertPermanentCount(playerA, "Mountain", 3); + assertPermanentCount(playerA, "Stomping Ground", 3); + + assertLife(playerA, 20); + assertLife(playerB, 2); // 6 * 3 damage = 18 + + } +} 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 56263a1a57b..23ceaf4daa3 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 @@ -305,6 +305,21 @@ public class TestPlayer extends ComputerPlayer { } } } + if (target instanceof TargetPlayer) { + for (String targetDefinition: targets) { + if (targetDefinition.startsWith("targetPlayer=")) { + String playerName = targetDefinition.substring(targetDefinition.indexOf("targetPlayer=") + 13); + for (Player player: game.getPlayers().values()) { + if (player.getName().equals(playerName) + && ((TargetPlayer) target).canTarget(playerId, player.getId(), source, game)) { + target.add(player.getId(), game); + return true; + } + } + } + } + + } } return super.chooseTarget(outcome, target, source, game); } diff --git a/Mage.Tests/src/test/java/org/mage/test/serverside/base/impl/CardTestPlayerAPIImpl.java b/Mage.Tests/src/test/java/org/mage/test/serverside/base/impl/CardTestPlayerAPIImpl.java index 533b895b03d..44626f06274 100644 --- a/Mage.Tests/src/test/java/org/mage/test/serverside/base/impl/CardTestPlayerAPIImpl.java +++ b/Mage.Tests/src/test/java/org/mage/test/serverside/base/impl/CardTestPlayerAPIImpl.java @@ -765,7 +765,7 @@ public abstract class CardTestPlayerAPIImpl extends MageTestPlayerBase implement } /** - * Set target Permanents + * Set target permanents * * @param player * @param target you can add multiple targets by seperating them by the "^" character @@ -776,4 +776,15 @@ public abstract class CardTestPlayerAPIImpl extends MageTestPlayerBase implement public void addTarget(TestPlayer player, String target) { player.addTarget(target); } + + /** + * Sets a player as target + * + * @param player + * @param targetPlayer + */ + public void addTarget(TestPlayer player, TestPlayer targetPlayer) { + player.addTarget("targetPlayer="+targetPlayer.getName()); + } + } diff --git a/Mage/src/mage/cards/CardImpl.java b/Mage/src/mage/cards/CardImpl.java index d0fa3b11620..d56d3e45bd4 100644 --- a/Mage/src/mage/cards/CardImpl.java +++ b/Mage/src/mage/cards/CardImpl.java @@ -535,7 +535,6 @@ public abstract class CardImpl extends MageObjectImpl implements Card { game.addPermanent(permanent); game.setZone(objectId, Zone.BATTLEFIELD); game.setScopeRelevant(true); - //game.applyEffects(); // issue #493 permanent.setTapped(tapped); permanent.entersBattlefield(sourceId, game, event.getFromZone(), true); game.setScopeRelevant(false); diff --git a/Mage/src/mage/cards/CardsImpl.java b/Mage/src/mage/cards/CardsImpl.java index 2062a4ef6fe..79391d49391 100644 --- a/Mage/src/mage/cards/CardsImpl.java +++ b/Mage/src/mage/cards/CardsImpl.java @@ -30,8 +30,6 @@ package mage.cards; import java.io.Serializable; import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; import java.util.HashMap; import java.util.LinkedHashSet; import java.util.List;