External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-10 21:02:08 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed mode handling for modes that can be selected multiple times.

Browse source
This commit is contained in:
LevelX2 2016-10-03 19:41:46 +02:00
parent 8df5bfa251
commit 24fc597fe5
7 changed files with 188 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

99
Mage.Tests/src/test/java/org/mage/test/cards/modal/SameModeMoreThanOnceTest.java Normal file
View file

@ -0,0 +1,99 @@
/*
* 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.modal;
import mage.constants.PhaseStep;
import mage.constants.Zone;
import org.junit.Test;
import org.mage.test.serverside.base.CardTestPlayerBase;
/**
*
* @author LevelX2
*/
public class SameModeMoreThanOnceTest extends CardTestPlayerBase {
@Test
public void testEachModeOnce() {
addCard(Zone.BATTLEFIELD, playerA, "Swamp", 5);
// Choose three. You may choose the same mode more than once.
// - Target player draws a card and loses 1 life;
// - Target creature gets -2/-2 until end of turn;
// - Return target creature card from your graveyard to your hand.
addCard(Zone.HAND, playerA, "Wretched Confluence"); // Instant {3}{B}{B}
addCard(Zone.GRAVEYARD, playerA, "Silvercoat Lion");
addCard(Zone.BATTLEFIELD, playerB, "Pillarfield Ox");
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Wretched Confluence", "mode=1targetPlayer=PlayerA^mode=2Pillarfield Ox^mode=3Silvercoat Lion");
setModeChoice(playerA, "1");
setModeChoice(playerA, "2");
setModeChoice(playerA, "3");
setStopAt(1, PhaseStep.BEGIN_COMBAT);
execute();
assertGraveyardCount(playerA, "Wretched Confluence", 1);
assertLife(playerA, 19);
assertLife(playerB, 20);
assertHandCount(playerA, 2);
assertPowerToughness(playerB, "Pillarfield Ox", 0, 2);
assertGraveyardCount(playerA, "Silvercoat Lion", 0);
}
@Test
public void testSecondModeTwiceThridModeOnce() {
addCard(Zone.BATTLEFIELD, playerA, "Swamp", 5);
// Choose three. You may choose the same mode more than once.
// - Target player draws a card and loses 1 life;
// - Target creature gets -2/-2 until end of turn;
// - Return target creature card from your graveyard to your hand.
addCard(Zone.HAND, playerA, "Wretched Confluence"); // Instant {3}{B}{B}
addCard(Zone.BATTLEFIELD, playerB, "Wall of Air");
addCard(Zone.BATTLEFIELD, playerB, "Pillarfield Ox");
addCard(Zone.GRAVEYARD, playerA, "Silvercoat Lion");
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Wretched Confluence", "mode=1Pillarfield Ox^mode=2Wall of Air^mode=3Silvercoat Lion");
setModeChoice(playerA, "2");
setModeChoice(playerA, "2");
setModeChoice(playerA, "3");
setStopAt(1, PhaseStep.BEGIN_COMBAT);
execute();
assertGraveyardCount(playerA, "Wretched Confluence", 1);
assertLife(playerA, 20);
assertLife(playerB, 20);
assertPowerToughness(playerB, "Wall of Air", -1, 3);
assertPowerToughness(playerB, "Pillarfield Ox", 0, 2);
assertGraveyardCount(playerA, "Silvercoat Lion", 0);
}
}

15
Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java
View file

@ -282,19 +282,14 @@ public class TestPlayer implements Player {
Mode selectedMode = null;
if (targetName.startsWith("mode=")) {
int modeNr = Integer.parseInt(targetName.substring(5, 6));
if (modeNr == 0 || modeNr > ability.getModes().size()) {
if (modeNr == 0 || modeNr > (ability.getModes().isEachModeMoreThanOnce() ? ability.getModes().getSelectedModes().size() : ability.getModes().size())) {
throw new UnsupportedOperationException("Given mode number (" + modeNr + ") not available for " + ability.toString());
}
UUID modeId = ability.getModes().getModeId(modeNr);
for (UUID currentModeId : ability.getModes().getSelectedModes()) {
Mode mode = ability.getModes().get(currentModeId);
if (mode.getId().equals(modeId)) {
selectedMode = mode;
ability.getModes().setActiveMode(mode);
index = 0; // reset target index if mode changes
break;
}
selectedMode = ability.getModes().get(modeId);
if (modeId != ability.getModes().getMode().getId()) {
ability.getModes().setActiveMode(modeId);
index = 0; // reset target index if mode changes
}
targetName = targetName.substring(6);
} else {

3
Mage.Tests/src/test/java/org/mage/test/serverside/base/impl/CardTestPlayerAPIImpl.java
View file

@ -1131,7 +1131,8 @@ public abstract class CardTestPlayerAPIImpl extends MageTestPlayerBase implement
* additional by setcode e.g. "creatureName-M15" you can add [no copy] to
* the end of the target name to prohibite targets that are copied you can
* add [only copy] to the end of the target name to allow only targets that
* are copies
* are copies For modal spells use a prefix with the mode number:
* mode=1Lightning Bolt^mode=2Silvercoat Lion
*/
public void addTarget(TestPlayer player, String target) {
player.addTarget(target);