External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-28 22:42:03 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix [OTJ] Fortune, Loyal Steed — DelayedAbility's zcc was wrong when started from another trigger (#12154)

Browse source
This commit is contained in:
Susucre 2024-05-04 19:26:11 +02:00 • committed by GitHub
parent fa728eafb1
commit d8959f1588
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 312 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/SaddleTest.java
View file

@ -1,9 +1,11 @@
package org.mage.test.cards.abilities.keywords;
import mage.MageObjectReference;
import mage.abilities.keyword.MenaceAbility;
import mage.constants.PhaseStep;
import mage.constants.Zone;
import mage.game.permanent.Permanent;
import mage.watchers.common.SaddledMountWatcher;
import org.junit.Assert;
import org.junit.Test;
import org.mage.test.serverside.base.CardTestPlayerBase;
@ -20,7 +22,7 @@ public class SaddleTest extends CardTestPlayerBase {
Permanent permanent = getPermanent(name);
Assert.assertEquals(
name + " should " + (saddled ? "" : "not ") + "be saddled",
saddled, permanent.isSaddled()
saddled, SaddledMountWatcher.hasBeenSaddledThisTurn(new MageObjectReference(permanent.getId(), currentGame), currentGame)
);
}
@ -78,13 +80,10 @@ public class SaddleTest extends CardTestPlayerBase {
setChoice(playerA, bear);
activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Saddle");
setStrictChooseMode(true);
setStopAt(1, PhaseStep.PRECOMBAT_MAIN);
execute();
attack(1, playerA, possum, playerB);
setChoice(playerA, bear);
setStrictChooseMode(true);
setStopAt(1, PhaseStep.END_TURN);
execute();

223
Mage.Tests/src/test/java/org/mage/test/cards/single/otj/FortuneLoyalSteedTest.java Normal file
View file

@ -0,0 +1,223 @@
package org.mage.test.cards.single.otj;
import mage.constants.PhaseStep;
import mage.constants.Zone;
import org.junit.Test;
import org.mage.test.serverside.base.CardTestPlayerBase;
/**
* @author Susucr
*/
public class FortuneLoyalSteedTest extends CardTestPlayerBase {
/**
* {@link mage.cards.f.FortuneLoyalSteed Fortune, Loyal Steed} {W}
* Legendary Creature — Beast Mount
* When Fortune, Loyal Steed enters the battlefield, scry 2.
* Whenever Fortune attacks while saddled, at end of combat, exile it and up to one creature that saddled it this turn, then return those cards to the battlefield under their owner’s control.
* Saddle 1
* 2/4
*/
private static final String fortune = "Fortune, Loyal Steed";
@Test
public void test_Saddling() {
setStrictChooseMode(true);
skipInitShuffling();
addCard(Zone.BATTLEFIELD, playerA, fortune);
addCard(Zone.BATTLEFIELD, playerA, "Lone Missionary"); // ETB, gain 4 life
addCard(Zone.LIBRARY, playerA, "Taiga", 2);
setChoice(playerA, "Lone Missionary"); // Saddling choice
activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Saddle");
attack(1, playerA, fortune, playerB);
setChoice(playerA, "Lone Missionary"); // Choose to blink Lone Missionary
setChoice(playerA, "When {this} enters the battlefield, you gain 4 life"); // stack triggers
addTarget(playerA, "Taiga"); // for the scry trigger
setStopAt(1, PhaseStep.POSTCOMBAT_MAIN);
execute();
assertLife(playerA, 20 + 4);
assertHandCount(playerA, 0);
assertTapped(fortune, false);
assertTapped("Lone Missionary", false);
}
@Test
public void test_Saddling_FortuneDies() {
setStrictChooseMode(true);
addCard(Zone.BATTLEFIELD, playerA, fortune);
addCard(Zone.BATTLEFIELD, playerA, "Lone Missionary"); // ETB, gain 4 life
addCard(Zone.BATTLEFIELD, playerB, "Ankle Biter"); // 1/1 Deathtouch
setChoice(playerA, "Lone Missionary"); // Saddling choice
activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Saddle");
attack(1, playerA, fortune, playerB);
block(1, playerB, "Ankle Biter", fortune);
setChoice(playerA, "Lone Missionary"); // Choose to blink Lone Missionary
setStopAt(1, PhaseStep.POSTCOMBAT_MAIN);
execute();
assertLife(playerA, 20 + 4);
assertGraveyardCount(playerA, fortune, 1);
assertTapped("Lone Missionary", false);
}
@Test
public void test_Saddling_FortuneBlinks() {
setStrictChooseMode(true);
skipInitShuffling();
addCard(Zone.BATTLEFIELD, playerA, fortune);
addCard(Zone.BATTLEFIELD, playerA, "Lone Missionary"); // ETB, gain 4 life
addCard(Zone.BATTLEFIELD, playerA, "Plains");
addCard(Zone.HAND, playerA, "Ephemerate");
addCard(Zone.LIBRARY, playerA, "Taiga", 2);
setChoice(playerA, "Lone Missionary"); // Saddling choice
activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Saddle");
attack(1, playerA, fortune, playerB);
castSpell(1, PhaseStep.DECLARE_ATTACKERS, playerA, "Ephemerate", fortune);
addTarget(playerA, "Taiga"); // for the scry trigger
setChoice(playerA, "Lone Missionary"); // Choose to blink Lone Missionary
setStopAt(1, PhaseStep.POSTCOMBAT_MAIN);
execute();
assertLife(playerA, 20 + 4);
assertTapped(fortune, false);
assertTapped("Lone Missionary", false);
}
@Test
public void test_Saddling_FortuneBlinksBefore() {
setStrictChooseMode(true);
skipInitShuffling();
addCard(Zone.BATTLEFIELD, playerA, fortune);
addCard(Zone.BATTLEFIELD, playerA, "Fervor"); // To give haste
addCard(Zone.BATTLEFIELD, playerA, "Lone Missionary"); // ETB, gain 4 life
addCard(Zone.BATTLEFIELD, playerA, "Plains", 2);
addCard(Zone.HAND, playerA, "Ephemerate", 2);
addCard(Zone.LIBRARY, playerA, "Taiga", 2);
// Just to check zcc
castSpell(1, PhaseStep.UPKEEP, playerA, "Ephemerate", fortune);
addTarget(playerA, "Taiga"); // for the scry trigger
setChoice(playerA, "Lone Missionary"); // Saddling choice
activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Saddle");
attack(1, playerA, fortune, playerB);
castSpell(1, PhaseStep.DECLARE_ATTACKERS, playerA, "Ephemerate", fortune);
addTarget(playerA, "Taiga"); // for the scry trigger
setChoice(playerA, "Lone Missionary"); // Choose to blink Lone Missionary
setStopAt(1, PhaseStep.POSTCOMBAT_MAIN);
execute();
assertLife(playerA, 20 + 4);
assertTapped(fortune, false);
assertTapped("Lone Missionary", false);
}
@Test
public void test_Saddling_FortuneBlinksAfterSaddlingBeforeCombat() {
setStrictChooseMode(true);
skipInitShuffling();
addCard(Zone.BATTLEFIELD, playerA, fortune);
addCard(Zone.BATTLEFIELD, playerA, "Fervor"); // To give haste
addCard(Zone.BATTLEFIELD, playerA, "Lone Missionary"); // ETB, gain 4 life
addCard(Zone.BATTLEFIELD, playerA, "Plains");
addCard(Zone.HAND, playerA, "Ephemerate");
addCard(Zone.LIBRARY, playerA, "Taiga", 2);
setChoice(playerA, "Lone Missionary"); // Saddling choice
activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Saddle");
waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN, playerA);
// That would make Fortune no longer saddled, so not trigger at beginning of combat
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Ephemerate", fortune);
addTarget(playerA, "Taiga"); // for the scry trigger
attack(1, playerA, fortune, playerB);
setStopAt(1, PhaseStep.POSTCOMBAT_MAIN);
execute();
assertLife(playerA, 20);
assertTapped(fortune, true);
assertTapped("Lone Missionary", true);
}
@Test
public void test_Saddling_FortuneBlinksInResponseOfSaddling() {
setStrictChooseMode(true);
skipInitShuffling();
addCard(Zone.BATTLEFIELD, playerA, fortune);
addCard(Zone.BATTLEFIELD, playerA, "Fervor"); // To give haste
addCard(Zone.BATTLEFIELD, playerA, "Lone Missionary"); // ETB, gain 4 life
addCard(Zone.BATTLEFIELD, playerA, "Plains");
addCard(Zone.HAND, playerA, "Ephemerate");
addCard(Zone.LIBRARY, playerA, "Taiga", 2);
setChoice(playerA, "Lone Missionary"); // Saddling choice
activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Saddle");
// That would make Fortune no longer saddled, so not trigger at beginning of combat
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Ephemerate", fortune);
addTarget(playerA, "Taiga"); // for the scry trigger
attack(1, playerA, fortune, playerB);
setStopAt(1, PhaseStep.POSTCOMBAT_MAIN);
execute();
assertLife(playerA, 20);
assertTapped(fortune, true);
assertTapped("Lone Missionary", true);
}
@Test
public void test_Saddling_FortuneBlinksTwice() {
setStrictChooseMode(true);
skipInitShuffling();
addCard(Zone.BATTLEFIELD, playerA, fortune);
addCard(Zone.BATTLEFIELD, playerA, "Lone Missionary"); // ETB, gain 4 life
addCard(Zone.BATTLEFIELD, playerA, "Plains", 2);
addCard(Zone.HAND, playerA, "Ephemerate", 2);
addCard(Zone.LIBRARY, playerA, "Taiga", 2);
setChoice(playerA, "Lone Missionary"); // Saddling choice
activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Saddle");
attack(1, playerA, fortune, playerB);
castSpell(1, PhaseStep.DECLARE_ATTACKERS, playerA, "Ephemerate", fortune, true);
addTarget(playerA, "Taiga"); // for the scry trigger
castSpell(1, PhaseStep.DECLARE_ATTACKERS, playerA, "Ephemerate", fortune);
addTarget(playerA, "Taiga"); // for the scry trigger
setChoice(playerA, "Lone Missionary"); // Choose to blink Lone Missionary
setStopAt(1, PhaseStep.POSTCOMBAT_MAIN);
execute();
assertLife(playerA, 20 + 4);
assertTapped(fortune, false);
assertTapped("Lone Missionary", false);
}
}