* Palace Jailer - * + *
* When exile effect is on more than one target from the same palace jailer * card, and you lose monarch, only the most recent card is returned to play * instead of all of them @@ -63,17 +62,17 @@ public class PalaceJailerTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Pillarfield Ox", 1); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Palace Jailer"); - setChoice(playerA, "When {this} enters the battlefield, you become the monarch."); + setChoice(playerA, "When {this} enters, you become the monarch."); addTarget(playerA, "Silvercoat Lion"); waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN, playerA); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cloudshift", "Palace Jailer"); - setChoice(playerA, "When {this} enters the battlefield, you become the monarch."); + setChoice(playerA, "When {this} enters, you become the monarch."); addTarget(playerA, "Pillarfield Ox"); castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Palace Jailer"); - setChoice(playerB, "When {this} enters the battlefield, you become the monarch."); + setChoice(playerB, "When {this} enters, you become the monarch."); addTarget(playerB, "Silvercoat Lion"); setStopAt(2, PhaseStep.BEGIN_COMBAT); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/eve/PyrrhicRevivalTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/eve/PyrrhicRevivalTest.java index ea86dff6337..63c867de614 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/eve/PyrrhicRevivalTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/eve/PyrrhicRevivalTest.java @@ -29,7 +29,7 @@ public class PyrrhicRevivalTest extends CardTestPlayerBase { addCard(Zone.HAND, playerA, revival); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, revival); - setChoice(playerA, "When {this} enters the battlefield, you gain 3 life."); + setChoice(playerA, "When {this} enters, you gain 3 life."); setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/inv/SpreadingPlagueTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/inv/SpreadingPlagueTest.java index 14a36078b8c..dd2bfa150ed 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/inv/SpreadingPlagueTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/inv/SpreadingPlagueTest.java @@ -33,7 +33,7 @@ public class SpreadingPlagueTest extends CardTestPlayerBase { // play colorless creature and do not destroy anything castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Golos, Tireless Pilgrim"); - setChoice(playerA, "When {this} enters the battlefield"); // two replacement effects + setChoice(playerA, "When {this} enters"); // two replacement effects setChoice(playerA, false); // no search waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); checkPermanentCount("after colorless play", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Golos, Tireless Pilgrim", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/lrw/BurrentonForgeTenderTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/lrw/BurrentonForgeTenderTest.java index f5daef2fde2..e0db797747e 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/lrw/BurrentonForgeTenderTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/lrw/BurrentonForgeTenderTest.java @@ -46,7 +46,7 @@ public class BurrentonForgeTenderTest extends CardTestPlayerBase { castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Flametongue Kavu"); addTarget(playerB, "Soldier of the Pantheon"); activateAbility(2, PhaseStep.PRECOMBAT_MAIN, playerA, "Sacrifice {this}: Prevent all damage a red source of your choice would deal this turn.", - TestPlayer.NO_TARGET, "When {this} enters the battlefield, it deals 4 damage to target creature."); + TestPlayer.NO_TARGET, "When {this} enters, it deals 4 damage to target creature."); playerA.addChoice("Flametongue Kavu"); setStopAt(2, PhaseStep.BEGIN_COMBAT); @@ -73,7 +73,7 @@ public class BurrentonForgeTenderTest extends CardTestPlayerBase { castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Flametongue Kavu"); addTarget(playerB, "Soldier of the Pantheon"); activateAbility(2, PhaseStep.PRECOMBAT_MAIN, playerA, "Sacrifice {this}: Prevent all damage a red source of your choice would deal this turn.", - TestPlayer.NO_TARGET, "When {this} enters the battlefield, it deals 4 damage to target creature."); + TestPlayer.NO_TARGET, "When {this} enters, it deals 4 damage to target creature."); playerA.addChoice("Flametongue Kavu"); castSpell(2, PhaseStep.POSTCOMBAT_MAIN, playerB, "Cloudshift", "Flametongue Kavu"); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/mom/InvasionOfAlaraTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/mom/InvasionOfAlaraTest.java index a2cec573297..fbaac50b48e 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/mom/InvasionOfAlaraTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/mom/InvasionOfAlaraTest.java @@ -73,7 +73,7 @@ public class InvasionOfAlaraTest extends CardTestPlayerBase { addTargetAmount(playerA, behemoth, 1); // 3 chosen targets (max) waitStackResolved(1, PhaseStep.POSTCOMBAT_MAIN, 1); - setChoice(playerA, "When {this} enters the battlefield, you gain"); // order triggers + setChoice(playerA, "When {this} enters, you gain"); // order triggers addTarget(playerA, anthem); // to destroy setStopAt(1, PhaseStep.END_TURN); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/otj/FortuneLoyalSteedTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/otj/FortuneLoyalSteedTest.java index 048ed3391df..622adc04e08 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/otj/FortuneLoyalSteedTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/otj/FortuneLoyalSteedTest.java @@ -35,7 +35,7 @@ public class FortuneLoyalSteedTest extends CardTestPlayerBase { setChoice(playerA, "Lone Missionary"); // Choose to blink Lone Missionary - setChoice(playerA, "When {this} enters the battlefield, you gain 4 life"); // stack triggers + setChoice(playerA, "When {this} enters, you gain 4 life"); // stack triggers addTarget(playerA, "Taiga"); // for the scry trigger setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/tor/LaquatussChampionTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/tor/LaquatussChampionTest.java index 38707d74323..b391e47043c 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/tor/LaquatussChampionTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/tor/LaquatussChampionTest.java @@ -6,7 +6,6 @@ import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; /** - * * @author Quercitron */ public class LaquatussChampionTest extends CardTestPlayerBase { @@ -72,7 +71,7 @@ public class LaquatussChampionTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Laquatus's Champion"); addTarget(playerA, playerB); - castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Terminate", "Laquatus's Champion", "enters the battlefield", StackClause.WHILE_ON_STACK); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Terminate", "Laquatus's Champion", "enters", StackClause.WHILE_ON_STACK); setStopAt(1, PhaseStep.END_TURN); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/EntersTheBattlefieldTriggerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/EntersTheBattlefieldTriggerTest.java index 6ab605baecd..eb98cd65efb 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/EntersTheBattlefieldTriggerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/EntersTheBattlefieldTriggerTest.java @@ -402,7 +402,7 @@ public class EntersTheBattlefieldTriggerTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Uro, Titan of Nature's Wrath with Escape"); setChoice(playerA, "Balduvian Bears^Balduvian Bears^Balduvian Bears^Balduvian Bears^Balduvian Bears"); - setChoice(playerA, "When {this} enters the battlefield, sacrifice it"); // sacrifice trigger must go first + setChoice(playerA, "When {this} enters, sacrifice it"); // sacrifice trigger must go first setChoice(playerA, false); // do not put land to battlefield // sacrifice trigger must found escape ability by getSpellOrLKIStack and keep uro on battlefield diff --git a/Mage.Tests/src/test/java/org/mage/test/commander/duel/YorvoLordOfGarenbrigOnCommandersTest.java b/Mage.Tests/src/test/java/org/mage/test/commander/duel/YorvoLordOfGarenbrigOnCommandersTest.java index 4d7bbfd5539..fd3a2d52adf 100644 --- a/Mage.Tests/src/test/java/org/mage/test/commander/duel/YorvoLordOfGarenbrigOnCommandersTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/commander/duel/YorvoLordOfGarenbrigOnCommandersTest.java @@ -63,7 +63,7 @@ public class YorvoLordOfGarenbrigOnCommandersTest extends CardTestCommanderDuelB // order triggers to remove commander first setChoice(playerA, "Whenever {this} enters the battlefield or attacks"); // draw trigger - setChoice(playerA, "Whenever another green creature enters the battlefield"); // get counters trigger + setChoice(playerA, "Whenever another green creature enters"); // get counters trigger //setChoice(playerA, "When {this} enters the battlefield, sacrifice it"); // sacrifice trigger must be on top setChoice(playerA, true); // return commander to command zone