Merge pull request #1952 from aastrand/master

Make it possible to play lands using hideaway
This commit is contained in:
LevelX2 2016-05-29 10:18:45 +02:00
commit fc4133e098
2 changed files with 120 additions and 1 deletions

View file

@ -118,6 +118,110 @@ public class HideawayTest extends CardTestPlayerBase {
Permanent permanent = getPermanent("Ulamog, the Ceaseless Hunger", playerA);
Card card = currentGame.getCard(permanent.getId());
Assert.assertFalse("Previous exiled card may be no longer face down", card.isFaceDown(currentGame));
}
@Test
public void testCannotPlayLandIfPlayedLand() {
addCard(Zone.HAND, playerA, "Windbrisk Heights");
addCard(Zone.HAND, playerA, "Plains");
addCard(Zone.LIBRARY, playerA, "Ghost Quarter");
skipInitShuffling();
addCard(Zone.BATTLEFIELD, playerA, "Plains", 1);
addCard(Zone.BATTLEFIELD, playerA, "Auriok Champion", 3);
playLand(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Windbrisk Heights");
setChoice(playerA, "Ghost Quarter");
playLand(3, PhaseStep.PRECOMBAT_MAIN, playerA, "Plains");
attack(3, playerA, "Auriok Champion");
attack(3, playerA, "Auriok Champion");
attack(3, playerA, "Auriok Champion");
activateAbility(3, PhaseStep.DECLARE_BLOCKERS, playerA, "{W},");
setStopAt(3, PhaseStep.END_COMBAT);
execute();
assertPermanentCount(playerA, "Ghost Quarter", 0);
assertTapped("Windbrisk Heights", true);
}
@Test
public void testCannotPlayLandIfNotOwnTurn() {
addCard(Zone.HAND, playerA, "Mosswort Bridge");
addCard(Zone.LIBRARY, playerA, "Ghost Quarter");
skipInitShuffling();
addCard(Zone.BATTLEFIELD, playerA, "Forest", 1);
addCard(Zone.BATTLEFIELD, playerA, "Dross Crocodile", 2);// 5/1
playLand(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Mosswort Bridge");
setChoice(playerA, "Ghost Quarter");
activateAbility(2, PhaseStep.PRECOMBAT_MAIN, playerA, "{G},");
setStopAt(2, PhaseStep.BEGIN_COMBAT);
execute();
assertPermanentCount(playerA, "Ghost Quarter", 0);
assertTapped("Mosswort Bridge", true);
}
@Test
public void testCanPlayLandIfNotPlayedLand() {
addCard(Zone.HAND, playerA, "Windbrisk Heights");
addCard(Zone.LIBRARY, playerA, "Ghost Quarter");
skipInitShuffling();
addCard(Zone.BATTLEFIELD, playerA, "Plains", 1);
addCard(Zone.BATTLEFIELD, playerA, "Auriok Champion", 3);
playLand(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Windbrisk Heights");
setChoice(playerA, "Ghost Quarter");
attack(3, playerA, "Auriok Champion");
attack(3, playerA, "Auriok Champion");
attack(3, playerA, "Auriok Champion");
activateAbility(3, PhaseStep.DECLARE_BLOCKERS, playerA, "{W},");
setStopAt(3, PhaseStep.END_COMBAT);
execute();
assertPermanentCount(playerA, "Ghost Quarter", 1);
assertTapped("Windbrisk Heights", true);
Assert.assertEquals(playerA.getLandsPlayed(), 1);
}
@Test
public void testCanPlayMoreLandsIfAble() {
addCard(Zone.HAND, playerA, "Windbrisk Heights");
addCard(Zone.LIBRARY, playerA, "Ghost Quarter");
addCard(Zone.HAND, playerA, "Plains");
skipInitShuffling();
addCard(Zone.BATTLEFIELD, playerA, "Plains", 1);
addCard(Zone.BATTLEFIELD, playerA, "Auriok Champion", 3);
addCard(Zone.BATTLEFIELD, playerA, "Fastbond", 1);
playLand(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Windbrisk Heights");
setChoice(playerA, "Ghost Quarter");
playLand(3, PhaseStep.PRECOMBAT_MAIN, playerA, "Plains");
attack(3, playerA, "Auriok Champion");
attack(3, playerA, "Auriok Champion");
attack(3, playerA, "Auriok Champion");
activateAbility(3, PhaseStep.DECLARE_BLOCKERS, playerA, "{W},");
setStopAt(3, PhaseStep.END_COMBAT);
execute();
assertPermanentCount(playerA, "Ghost Quarter", 1);
assertTapped("Windbrisk Heights", true);
Assert.assertEquals(playerA.getLandsPlayed(), 2);
}
}

View file

@ -30,12 +30,15 @@ package mage.abilities.effects.common;
import mage.abilities.Ability;
import mage.abilities.effects.OneShotEffect;
import mage.cards.Card;
import mage.constants.CardType;
import mage.constants.Outcome;
import mage.game.ExileZone;
import mage.game.Game;
import mage.players.Player;
import mage.util.CardUtil;
import java.util.UUID;
/**
* @author LevelX2
*
@ -68,7 +71,19 @@ public class HideawayPlayEffect extends OneShotEffect {
if (controller.chooseUse(Outcome.PlayForFree, "Do you want to play " + card.getIdName() + " for free now?", source, game)) {
card.setFaceDown(false, game);
int zcc = card.getZoneChangeCounter(game);
if (!controller.playCard(card, game, true, false)) {
/* 702.74. Hideaway, rulings:
* If the removed card is a land, you may play it as a result of the last ability only if it's your turn
* and you haven't already played a land that turn. This counts as your land play for the turn.
*/
if (card.getCardType().contains(CardType.LAND)) {
UUID playerId = controller.getId();
if (!game.getActivePlayerId().equals(playerId) || !game.getPlayer(playerId).canPlayLand()) {
return false;
}
}
if (!controller.playCard(card, game, true, true)) {
if (card.getZoneChangeCounter(game) == zcc) {
card.setFaceDown(true, game);
}