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

Reworked selected modes handling. That fixed the Subtle Strike targeting problem.

Browse source
This commit is contained in:
LevelX2 2016-09-24 01:12:01 +02:00
parent 0b118d074e
commit c9bb0be016
33 changed files with 163 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Mage.Tests/src/test/java/org/mage/test/AI/basic/CastDestroySpellsTest.java
View file

@ -38,10 +38,6 @@ import org.mage.test.serverside.base.CardTestPlayerBaseAI;
*/
public class CastDestroySpellsTest extends CardTestPlayerBaseAI {
/**
*
*
*/
@Test
public void testOrzhovCharm() {
// Choose one -
@ -58,6 +54,8 @@ public class CastDestroySpellsTest extends CardTestPlayerBaseAI {
// Cycling abilities you activate cost you up to {2} less to activate.
addCard(Zone.BATTLEFIELD, playerB, "Silvercoat Lion");
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Orzhov Charm", "Silvercoat Lion");
setModeChoice(playerA, "2");
setStopAt(1, PhaseStep.BEGIN_COMBAT);
execute();

4
Mage.Tests/src/test/java/org/mage/test/cards/modal/OneOrBothTest.java
View file

@ -49,8 +49,9 @@ public class OneOrBothTest extends CardTestPlayerBase {
addCard(Zone.BATTLEFIELD, playerA, "Silvercoat Lion");
addCard(Zone.BATTLEFIELD, playerB, "Pillarfield Ox");
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Subtle Strike", "Silvercoat Lion");
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Subtle Strike", "Pillarfield Ox");
setModeChoice(playerA, "1");
setModeChoice(playerA, null);
setStopAt(1, PhaseStep.BEGIN_COMBAT);
execute();
@ -72,6 +73,7 @@ public class OneOrBothTest extends CardTestPlayerBase {
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Subtle Strike", "Pillarfield Ox");
setModeChoice(playerA, "2");
setModeChoice(playerA, null);
setStopAt(1, PhaseStep.BEGIN_COMBAT);
execute();

24
Mage.Tests/src/test/java/org/mage/test/cards/single/bfz/BrutalExpulsionTest.java
View file

@ -39,20 +39,22 @@ import org.mage.test.serverside.base.CardTestPlayerBase;
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.
* 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");
addCard(Zone.HAND, playerA, "Brutal Expulsion"); // {2}{U}{R}
// 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);
addCard(Zone.HAND, playerA, "Shock"); // {R}
addCard(Zone.BATTLEFIELD, playerA, "Island", 1);
addCard(Zone.BATTLEFIELD, playerA, "Mountain", 4);
// Planeswalker with 4 loyalty.
addCard(Zone.BATTLEFIELD, playerB, "Gideon, Ally of Zendikar");
@ -60,12 +62,12 @@ public class BrutalExpulsionTest extends CardTestPlayerBase {
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Brutal Expulsion", playerB);
setModeChoice(playerA, "2");
setModeChoice(playerA, null);
setChoice(playerA, "Yes");
setChoice(playerA, "Yes"); // Redirect to planeswalker
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Shock", playerB);
setChoice(playerA, "Yes");
castSpell(1, PhaseStep.BEGIN_COMBAT, playerA, "Shock", playerB);
setChoice(playerA, "Yes"); // Redirect to planeswalker
setStopAt(1, PhaseStep.POSTCOMBAT_MAIN);
setStopAt(1, PhaseStep.END_COMBAT);
execute();
assertPermanentCount(playerB, "Gideon, Ally of Zendikar", 0);

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

@ -287,7 +287,8 @@ public class TestPlayer implements Player {
}
UUID modeId = ability.getModes().getModeId(modeNr);
for (Mode mode : ability.getModes().getSelectedModes()) {
for (UUID currentModeId : ability.getModes().getSelectedModes()) {
Mode mode = ability.getModes().get(currentModeId);
if (mode.getId().equals(modeId)) {
selectedMode = mode;
ability.getModes().setActiveMode(mode);