From 36b31d097ea0958796bf247716e70dc664b5ca5b Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Wed, 10 Jun 2020 22:38:59 -0400 Subject: [PATCH] reinstated new mill wording --- .../cards/copy/LazavDimirMastermindTest.java | 22 +++++++++---------- .../cards/copy/VolrathsShapshifterTest.java | 7 +++--- .../PutLibraryIntoGraveTargetEffect.java | 8 +++---- 3 files changed, 18 insertions(+), 19 deletions(-) diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/LazavDimirMastermindTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/LazavDimirMastermindTest.java index f84140e942..36bcc01fbe 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/LazavDimirMastermindTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/LazavDimirMastermindTest.java @@ -28,7 +28,7 @@ public class LazavDimirMastermindTest extends CardTestPlayerBase { public void testCopySimpleCreature() { addCard(Zone.BATTLEFIELD, playerA, "Lazav, Dimir Mastermind", 1); // Codex Shredder - Artifact - // {T}: Target player puts the top card of their library into their graveyard. + // {T}: Target player mills a card. // {5}, {T}, Sacrifice Codex Shredder: Return target card from your graveyard to your hand. addCard(Zone.BATTLEFIELD, playerA, "Codex Shredder", 1); @@ -36,11 +36,10 @@ public class LazavDimirMastermindTest extends CardTestPlayerBase { addCard(Zone.LIBRARY, playerB, "Assault Griffin", 5); skipInitShuffling(); - activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Target player puts the top card", playerB); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Target player mills a card.", playerB); setStopAt(1, PhaseStep.END_TURN); execute(); - assertAllCommandsUsed(); assertPermanentCount(playerA, "Lazav, Dimir Mastermind", 1); assertPowerToughness(playerA, "Lazav, Dimir Mastermind", 3, 2); @@ -64,7 +63,7 @@ public class LazavDimirMastermindTest extends CardTestPlayerBase { addCard(Zone.LIBRARY, playerB, "Ogre Slumlord", 5); skipInitShuffling(); - activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Target player puts the top card", playerB); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Target player mills a card.", playerB); setStopAt(1, PhaseStep.END_TURN); execute(); @@ -98,7 +97,7 @@ public class LazavDimirMastermindTest extends CardTestPlayerBase { addCard(Zone.LIBRARY, playerB, "Nightveil Specter", 1); skipInitShuffling(); - activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Target player puts the top card", playerB); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Target player mills a card.", playerB); attack(3, playerA, "Lazav, Dimir Mastermind"); @@ -130,10 +129,10 @@ public class LazavDimirMastermindTest extends CardTestPlayerBase { skipInitShuffling(); // Lazav becomes a Nightveil Specter - activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Target player puts the top card", playerB); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Target player mills a card.", playerB); // Lazav becomes a Silvercoat Lion - activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Target player puts the top card", playerB); + activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Target player mills a card.", playerB); setStopAt(3, PhaseStep.END_TURN); execute(); @@ -157,7 +156,7 @@ public class LazavDimirMastermindTest extends CardTestPlayerBase { addCard(Zone.HAND, playerA, "Reanimate"); addCard(Zone.BATTLEFIELD, playerA, "Lazav, Dimir Mastermind", 1); // Codex Shredder - Artifact - // {T}: Target player puts the top card of their library into their graveyard. + // {T}: Target player mills a card. // {5}, {T}, Sacrifice Codex Shredder: Return target card from your graveyard to your hand. addCard(Zone.BATTLEFIELD, playerA, "Codex Shredder", 1); @@ -169,7 +168,7 @@ public class LazavDimirMastermindTest extends CardTestPlayerBase { skipInitShuffling(); - activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Target player puts the top card", playerB); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Target player mills a card.", playerB); castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerB, "Tribute to Hunger"); @@ -190,6 +189,7 @@ public class LazavDimirMastermindTest extends CardTestPlayerBase { Assert.assertFalse(lazav.getSubtype(currentGame).contains(SubType.GRIFFIN)); // no Griffin type Assert.assertFalse("Lazav, Dimir Mastermind must have flying", lazav.getAbilities().contains(FlyingAbility.getInstance())); + } /** @@ -199,7 +199,7 @@ public class LazavDimirMastermindTest extends CardTestPlayerBase { public void testCopyCreatureExiled() { addCard(Zone.BATTLEFIELD, playerA, "Lazav, Dimir Mastermind", 1); // Codex Shredder - Artifact - // {T}: Target player puts the top card of their library into their graveyard. + // {T}: Target player mills a card. // {5}, {T}, Sacrifice Codex Shredder: Return target card from your graveyard to your hand. addCard(Zone.BATTLEFIELD, playerA, "Codex Shredder", 1); @@ -211,7 +211,7 @@ public class LazavDimirMastermindTest extends CardTestPlayerBase { addCard(Zone.LIBRARY, playerB, "Assault Griffin", 5); skipInitShuffling(); - activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Target player puts the top card", playerB); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Target player mills a card.", playerB); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Rest in Peace"); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/VolrathsShapshifterTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/VolrathsShapshifterTest.java index 912088ef2f..f79cf477d3 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/VolrathsShapshifterTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/VolrathsShapshifterTest.java @@ -15,12 +15,11 @@ import org.mage.test.serverside.base.CardTestPlayerBase; /** * Volrath's Shapeshifter - * + *

* As long as the top card of your graveyard is a creature card, Volrath's * Shapeshifter has the full text of that card and has the text "2: Discard a * card." (Volrath's Shapeshifter has that card's name, mana cost, color, types, * abilities, power, and toughness.) - * */ public class VolrathsShapshifterTest extends CardTestPlayerBase { @@ -58,7 +57,7 @@ public class VolrathsShapshifterTest extends CardTestPlayerBase { public void testLosingCopy() { addCard(Zone.BATTLEFIELD, playerA, "Volrath's Shapeshifter", 1); // Codex Shredder - Artifact - // {T}: {T}: Target player puts the top card of their library into their graveyard. + // {T}: Target player mills a card. // {5}, {T}, Sacrifice Codex Shredder: Return target card from your graveyard to your hand. addCard(Zone.BATTLEFIELD, playerA, "Codex Shredder", 1); @@ -67,7 +66,7 @@ public class VolrathsShapshifterTest extends CardTestPlayerBase { addCard(Zone.LIBRARY, playerA, "Forest", 1); skipInitShuffling(); - activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Target player puts the top card of their library into their graveyard.", playerA); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Target player mills a card.", playerA); setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); diff --git a/Mage/src/main/java/mage/abilities/effects/common/PutLibraryIntoGraveTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PutLibraryIntoGraveTargetEffect.java index 0783542142..06c3743a18 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/PutLibraryIntoGraveTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/PutLibraryIntoGraveTargetEffect.java @@ -64,16 +64,16 @@ public class PutLibraryIntoGraveTargetEffect extends OneShotEffect { } else { sb.append("that target"); } - sb.append(" puts the top "); + + sb.append(" mills "); if (message.isEmpty()) { if (amount.toString().equals("1")) { - sb.append("card"); + sb.append("a card"); } else { sb.append(CardUtil.numberToText(amount.toString())).append(" cards"); } - sb.append(" of their library into their graveyard"); } else { - sb.append(" X cards, where X is the number of "); + sb.append("X cards, where X is the number of "); } if (!message.isEmpty()) {