External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-29 15:02:13 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: remove notTarget targets from abilities (#13651)

Browse source 
Adds OneShotNonTargetEffect and PutCountersTargetCost
Fixes the target timing of spells/abilities, as non-targets should be chosen on resolution.
This commit is contained in:
ssk97 2025-05-31 20:36:15 -07:00 • committed by GitHub
parent 8b2a81cb42
commit 3223d99b2a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
28 changed files with 449 additions and 384 deletions
Download patch file Download diff file Expand all files Collapse all files

77
Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/OneShotNonTargetTest.java Normal file
View file

@ -0,0 +1,77 @@
package org.mage.test.cards.abilities.oneshot;
import mage.constants.PhaseStep;
import mage.constants.Zone;
import org.junit.Test;
import org.mage.test.player.TestPlayer;
import org.mage.test.serverside.base.CardTestPlayerBase;
/**
*
* @author notgreat
*/
public class OneShotNonTargetTest extends CardTestPlayerBase {
@Test
public void YorionChooseAfterTriggerTest() {
addCard(Zone.HAND, playerA, "Yorion, Sky Nomad");
addCard(Zone.BATTLEFIELD, playerA, "Plains", 7);
addCard(Zone.HAND, playerA, "Resolute Reinforcements");
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Yorion, Sky Nomad");
waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN, true);
checkPermanentCount("Yorion on battlefield", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Yorion, Sky Nomad", 1);
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Resolute Reinforcements");
setChoice(playerA, "Resolute Reinforcements");
setStrictChooseMode(true);
setStopAt(1, PhaseStep.END_TURN);
execute();
assertTokenCount(playerA, "Soldier Token", 2);
assertPermanentCount(playerA, "Yorion, Sky Nomad", 1);
assertPermanentCount(playerA, "Resolute Reinforcements", 1);
assertTappedCount("Plains", true, 7);
}
@Test
public void NonTargetAdjusterTest() {
addCard(Zone.HAND, playerA, "Temporal Firestorm");
addCard(Zone.BATTLEFIELD, playerA, "Plains", 2);
addCard(Zone.BATTLEFIELD, playerA, "Island", 2);
addCard(Zone.BATTLEFIELD, playerA, "Mountain", 5);
addCard(Zone.BATTLEFIELD, playerA, "Squire");
addCard(Zone.BATTLEFIELD, playerA, "Python");
addCard(Zone.BATTLEFIELD, playerA, "Watchwolf");
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Temporal Firestorm");
setChoice(playerA, true);
setChoice(playerA, true);
setChoice(playerA, "Squire^Python");
setStrictChooseMode(true);
setStopAt(1, PhaseStep.END_TURN);
execute();
assertGraveyardCount(playerA, "Squire", 0);
assertGraveyardCount(playerA, "Python", 0);
assertGraveyardCount(playerA, "Watchwolf", 1);
}
@Test
public void ModeSelectionTest() {
addCard(Zone.HAND, playerA, "SOLDIER Military Program");
addCard(Zone.BATTLEFIELD, playerA, "Plains", 3);
addCard(Zone.BATTLEFIELD, playerA, "Squire", 1);
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "SOLDIER Military Program");
setModeChoice(playerA, "2");
setChoice(playerA, "Squire");
setChoice(playerA, TestPlayer.CHOICE_SKIP);
setModeChoice(playerA, "1");
setModeChoice(playerA, "2");
setChoice(playerA, "Squire^Soldier Token");
setStrictChooseMode(true);
setStopAt(5, PhaseStep.END_TURN);
execute();
assertPowerToughness(playerA, "Squire", 3, 4);
assertPowerToughness(playerA, "Soldier Token", 2, 2);
}
}