* When Kellan Joins Up enters the battlefield, you may exile a nonland card with mana value 3 or less from your hand. If you do, it becomes plotted. (You may cast it as a sorcery on a later turn without paying its mana cost.) *
- * Whenever a legendary creature enters the battlefield under your control, put a +1/+1 counter on each creature you control. + * Whenever a legendary creature you control enters, put a +1/+1 counter on each creature you control. */ private static final String kellanJoinsUp = "Kellan Joins Up"; diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/PrototypeTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/PrototypeTest.java index aec12935658..26edf9e5db8 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/PrototypeTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/PrototypeTest.java @@ -683,7 +683,7 @@ public class PrototypeTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Slimebind", "Drizzt Do'Urden"); checkPT("Drizzt is shrunk",1, PhaseStep.BEGIN_COMBAT, playerA, "Drizzt Do'Urden",1, 1); castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, automatonWithPrototype); // 5/0 - setChoice(playerA, "Whenever a creature enters"); //Stack the trigger + setChoice(playerA, "Whenever a creature you control enters"); //Stack the trigger addTarget(playerA, playerB); setStopAt(1, PhaseStep.END_TURN); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/TransformTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/TransformTest.java index 7e1f3864be3..ad94dfaed49 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/TransformTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/TransformTest.java @@ -21,7 +21,7 @@ public class TransformTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Forest", 5); addCard(Zone.BATTLEFIELD, playerA, "Swamp", 1); // When Nissa, Vastwood Seer enters the battlefield, you may search your library for a basic Forest card, reveal it, put it into your hand, then shuffle your library. - // Whenever a land enters the battlefield under your control, if you control seven or more lands, exile Nissa, then return her to the battlefield transformed under her owner's control. + // Whenever a land you control enters, if you control seven or more lands, exile Nissa, then return her to the battlefield transformed under her owner's control. addCard(Zone.HAND, playerA, "Nissa, Vastwood Seer"); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/GainMenaceAbilityAsSingletonTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/GainMenaceAbilityAsSingletonTest.java index 21fb6ae501c..a725f08ff76 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/GainMenaceAbilityAsSingletonTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/GainMenaceAbilityAsSingletonTest.java @@ -21,7 +21,7 @@ public class GainMenaceAbilityAsSingletonTest extends CardTestPlayerBase { // https://github.com/magefree/mage/issues/6720 // {3}{R}{R} - // Whenever Sethron, Hurloon General or another nontoken Minotaur enters the battlefield under your control, create a 2/3 red Minotaur creature token. + // Whenever Sethron, Hurloon General or another nontoken Minotaur you control enters, create a 2/3 red Minotaur creature token. // {2}{B/R}: Minotaurs you control get +1/+0 and gain menace and haste until end of turn. ({B/R} can be paid with either {B} or {R}.) addCard(Zone.HAND, playerA, "Sethron, Hurloon General", 7); addCard(Zone.BATTLEFIELD, playerA, "Mountain", 5 + 3 * 3); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/asthough/PlayFromNonHandZoneTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/asthough/PlayFromNonHandZoneTest.java index a8b11e5ea66..f305b9e80f8 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/asthough/PlayFromNonHandZoneTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/asthough/PlayFromNonHandZoneTest.java @@ -17,7 +17,7 @@ public class PlayFromNonHandZoneTest extends CardTestPlayerBaseWithAIHelps { // Creature - Phoenix {3}{R} // Flying // You may cast Worldheart Phoenix from your graveyard by paying {W}{U}{B}{R}{G} rather than paying its mana cost. - // If you do, it enters the battlefield with two +1/+1 counters on it. + // If you do, it enters with two +1/+1 counters on it. addCard(Zone.HAND, playerA, "Worldheart Phoenix"); addCard(Zone.BATTLEFIELD, playerA, "Mountain", 4); @@ -35,7 +35,7 @@ public class PlayFromNonHandZoneTest extends CardTestPlayerBaseWithAIHelps { // Creature - Phoenix {3}{R} // Flying // You may cast Worldheart Phoenix from your graveyard by paying {W}{U}{B}{R}{G} rather than paying its mana cost. - // If you do, it enters the battlefield with two +1/+1 counters on it. + // If you do, it enters with two +1/+1 counters on it. addCard(Zone.GRAVEYARD, playerA, "Worldheart Phoenix"); addCard(Zone.BATTLEFIELD, playerA, "Mountain", 4); @@ -61,7 +61,7 @@ public class PlayFromNonHandZoneTest extends CardTestPlayerBaseWithAIHelps { // Creature - Phoenix {3}{R} // Flying // You may cast Worldheart Phoenix from your graveyard by paying {W}{U}{B}{R}{G} rather than paying its mana cost. - // If you do, it enters the battlefield with two +1/+1 counters on it. + // If you do, it enters with two +1/+1 counters on it. addCard(Zone.GRAVEYARD, playerA, "Worldheart Phoenix"); addCard(Zone.BATTLEFIELD, playerA, "Mountain", 1); addCard(Zone.BATTLEFIELD, playerA, "Island", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/CommandersCastTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/CommandersCastTest.java index e7a88471d9a..8f5617f23dd 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/CommandersCastTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/CommandersCastTest.java @@ -586,7 +586,7 @@ public class CommandersCastTest extends CardTestCommander4PlayersWithAIHelps { checkPlayableAbility("escape cast not allowed", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Uro, Titan of Nature's Wrath with Escape", false); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Uro, Titan of Nature's Wrath"); - setChoice(playerA, "Whenever {this} enters the battlefield or attacks"); // gain life trigger first, sacrifice next + setChoice(playerA, "Whenever {this} enters or attacks"); // gain life trigger first, sacrifice next setChoice(playerA, false); // keep in graveyard setChoice(playerA, true); // put land to battlefield setChoice(playerA, "Swamp"); // put a Swamp diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/control/ExileAndReturnUnderYourControl.java b/Mage.Tests/src/test/java/org/mage/test/cards/control/ExileAndReturnUnderYourControl.java index f4c1a116d14..9fdff5e76f2 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/control/ExileAndReturnUnderYourControl.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/control/ExileAndReturnUnderYourControl.java @@ -51,7 +51,7 @@ public class ExileAndReturnUnderYourControl extends CardTestPlayerBase { // Courser of Kruphix {1}{G}{G} // Play with the top card of your library revealed. // You may play the top card of your library if it's a land card. - // Whenever a land enters the battlefield under your control, you gain 1 life. + // Whenever a land you control enters, you gain 1 life. addCard(Zone.LIBRARY, playerB, "Courser of Kruphix"); skipInitShuffling(); // to keep this card on top of library diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/CopySpellTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/CopySpellTest.java index d8b9b9886b0..9c13397692f 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/CopySpellTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/CopySpellTest.java @@ -531,7 +531,7 @@ public class CopySpellTest extends CardTestPlayerBase { // treated as 0, even if the value of X is defined somewhere within its text. // Whenever you cast an instant or sorcery spell, you may pay {U}{R}. If you do, copy that spell. You may choose new targets for the copy. - // Whenever another nontoken creature enters the battlefield under your control, you may pay {G}{U}. If you do, create a token that’s a copy of that creature. + // Whenever another nontoken creature you control enters, you may pay {G}{U}. If you do, create a token that’s a copy of that creature. addCard(Zone.BATTLEFIELD, playerA, "Riku of Two Reflections", 1); addCard(Zone.BATTLEFIELD, playerA, "Forest", 2); addCard(Zone.BATTLEFIELD, playerA, "Island", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/EldraziMimicTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/EldraziMimicTest.java index e5057528a7c..aad428106a2 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/EldraziMimicTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/EldraziMimicTest.java @@ -24,7 +24,7 @@ public class EldraziMimicTest extends CardTestPlayerBase { // Whenever you cast a colorless spell, target opponent exiles the top card of their library. addCard(Zone.HAND, playerA, "Thought Harvester", 1); // {3}{U} 2/4 addCard(Zone.BATTLEFIELD, playerA, "Island", 4); - // Whenever another colorless creature enters the battlefield under your control, you may have the base power and toughness of Eldrazi Mimic + // Whenever another colorless creature you control enters, you may have the base power and toughness of Eldrazi Mimic // become that creature's power and toughness until end of turn. addCard(Zone.BATTLEFIELD, playerA, "Eldrazi Mimic", 1); // 2/1 @@ -55,7 +55,7 @@ public class EldraziMimicTest extends CardTestPlayerBase { public void testNormalCopy() { addCard(Zone.HAND, playerA, "Composite Golem", 1); // 4/4 addCard(Zone.BATTLEFIELD, playerA, "Plains", 6); - // Whenever another colorless creature enters the battlefield under your control, you may have the base power and toughness of Eldrazi Mimic + // Whenever another colorless creature you control enters, you may have the base power and toughness of Eldrazi Mimic // become that creature's power and toughness until end of turn. addCard(Zone.BATTLEFIELD, playerA, "Eldrazi Mimic", 1); // 2/1 diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/FlameshadowConjuringTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/FlameshadowConjuringTest.java index 9940d8d5511..dacc3937164 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/FlameshadowConjuringTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/FlameshadowConjuringTest.java @@ -26,7 +26,7 @@ public class FlameshadowConjuringTest extends CardTestPlayerBase { public void testCopyAndItsEffectsRemoved() { addCard(Zone.BATTLEFIELD, playerA, "Mountain", 4); addCard(Zone.BATTLEFIELD, playerA, "Swamp", 2); - // Whenever a nontoken creature enters the battlefield under your control, you may pay {R}. If you do, put a token onto the battlefield that's a copy of that creature. + // Whenever a nontoken creature you control enters, you may pay {R}. If you do, put a token onto the battlefield that's a copy of that creature. // That token gains haste. Exile it at the beginning of the next end step. addCard(Zone.BATTLEFIELD, playerA, "Flameshadow Conjuring", 1); @@ -52,7 +52,7 @@ public class FlameshadowConjuringTest extends CardTestPlayerBase { @Test public void testWurmcoilEngine() { addCard(Zone.BATTLEFIELD, playerA, "Mountain", 7); - // Whenever a nontoken creature enters the battlefield under your control, you may pay {R}. If you do, put a token onto the battlefield that's a copy of that creature. + // Whenever a nontoken creature you control enters, you may pay {R}. If you do, put a token onto the battlefield that's a copy of that creature. // That token gains haste. Exile it at the beginning of the next end step. addCard(Zone.BATTLEFIELD, playerA, "Flameshadow Conjuring", 1); // Deathtouch, lifelink diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/MirrorworksTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/MirrorworksTest.java index e54c358d344..3826abaaf4d 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/MirrorworksTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/MirrorworksTest.java @@ -26,7 +26,7 @@ public class MirrorworksTest extends CardTestPlayerBase { // {T}: Add one mana of any color. addCard(Zone.HAND, playerA, "Mox Diamond", 1); // Artifact {0} - // Whenever another nontoken artifact enters the battlefield under your control, you may pay {2}. + // Whenever another nontoken artifact you control enters, you may pay {2}. // If you do, create a token that's a copy of that artifact. addCard(Zone.BATTLEFIELD, playerA, "Mirrorworks", 1); // Artifact {5} @@ -51,7 +51,7 @@ public class MirrorworksTest extends CardTestPlayerBase { // {T}: Add one mana of any color. addCard(Zone.HAND, playerA, "Mox Diamond", 1); // Artifact {0} - // Whenever another nontoken artifact enters the battlefield under your control, you may pay {2}. + // Whenever another nontoken artifact you control enters, you may pay {2}. // If you do, create a token that's a copy of that artifact. addCard(Zone.BATTLEFIELD, playerA, "Mirrorworks", 1); // Artifact {5} diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/TheMimeoplasmTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/TheMimeoplasmTest.java index 07b8232ab30..5329f05e8a5 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/TheMimeoplasmTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/TheMimeoplasmTest.java @@ -28,7 +28,7 @@ public class TheMimeoplasmTest extends CardTestPlayerBase { @Test public void testCloneMimeoplasm() { // As The Mimeoplasm enters the battlefield, you may exile two creature cards from graveyards. - // If you do, it enters the battlefield as a copy of one of those cards with a number of additional +1/+1 counters on it equal to the power of the other card. + // If you do, it enters as a copy of one of those cards with a number of additional +1/+1 counters on it equal to the power of the other card. addCard(Zone.HAND, playerA, "The Mimeoplasm", 1); // {2}{G}{U}{B} addCard(Zone.HAND, playerA, "Clone", 1); // {3}{U} @@ -65,4 +65,4 @@ public class TheMimeoplasmTest extends CardTestPlayerBase { } -} \ No newline at end of file +} diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/cost/modaldoublefaced/ModalDoubleFacedCardsInCommanderTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/cost/modaldoublefaced/ModalDoubleFacedCardsInCommanderTest.java index a5e186ea3a6..126615307e2 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/cost/modaldoublefaced/ModalDoubleFacedCardsInCommanderTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/cost/modaldoublefaced/ModalDoubleFacedCardsInCommanderTest.java @@ -21,7 +21,7 @@ public class ModalDoubleFacedCardsInCommanderTest extends CardTestCommanderDuelB // Esika, God of the Tree // creature, 1/4 - // Landfall — Whenever a land enters the battlefield under your control, Kazandu Mammoth gets +2/+2 until end of turn. + // Landfall — Whenever a land you control enters, Kazandu Mammoth gets +2/+2 until end of turn. // // The Prismatic Bridge // Enchantment diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/cost/modaldoublefaced/ModalDoubleFacedCardsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/cost/modaldoublefaced/ModalDoubleFacedCardsTest.java index 360bdfad8cc..7fd088c4ec0 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/cost/modaldoublefaced/ModalDoubleFacedCardsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/cost/modaldoublefaced/ModalDoubleFacedCardsTest.java @@ -769,7 +769,7 @@ public class ModalDoubleFacedCardsTest extends CardTestPlayerBase { // Kazandu Mammoth // creature 3/3 - // Landfall — Whenever a land enters the battlefield under your control, Kazandu Mammoth gets +2/+2 until end of turn. + // Landfall — Whenever a land you control enters, Kazandu Mammoth gets +2/+2 until end of turn. // // Kazandu Valley // land diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/RoleTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/RoleTest.java index 478e787bdd5..eb1ebac5d1a 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/RoleTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/RoleTest.java @@ -13,7 +13,7 @@ public class RoleTest extends CardTestPlayerBase { private static final String courtier = "Cursed Courtier"; // When Cursed Courtier enters the battlefield, create a Cursed Role token attached to it. private static final String rage = "Monstrous Rage"; // Target creature gets +2/+0 until end of turn. Create a Monster Role token attached to it. - private static final String wardens = "Nexus Wardens"; // Whenever an enchantment enters the battlefield under your control, you gain 2 life. + private static final String wardens = "Nexus Wardens"; // Whenever an enchantment you control enters, you gain 2 life. private static final String murder = "Murder"; @Test diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/mana/HybridManaTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/mana/HybridManaTest.java index 8e4e4a1a7de..a5123ba1fd6 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/mana/HybridManaTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/mana/HybridManaTest.java @@ -21,7 +21,7 @@ public class HybridManaTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Plains", 1); // Other Scarecrow creatures you control get +1/+1. - // Whenever another Scarecrow enters the battlefield under your control, destroy target permanent. + // Whenever another Scarecrow you control enters, destroy target permanent. addCard(Zone.HAND, playerA, "Reaper King", 1); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Reaper King"); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/modal/OnlyOnceModeTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/modal/OnlyOnceModeTest.java index 56d3300a0f7..4afb8e73047 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/modal/OnlyOnceModeTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/modal/OnlyOnceModeTest.java @@ -51,7 +51,7 @@ public class OnlyOnceModeTest extends CardTestPlayerBase { public void test_OncePerTurn() { int triggerCalls = 5; - // Whenever another creature enters the battlefield under your control, choose one that hasn't been chosen this turn + // Whenever another creature you control enters, choose one that hasn't been chosen this turn // Add {G}{G}{G}. // Put a +1/+1 counter on each creature you control. // Scry 2, then draw a card. diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/LilianaTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/LilianaTest.java index 08e03d397c0..078f2971888 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/LilianaTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/LilianaTest.java @@ -19,7 +19,7 @@ public class LilianaTest extends CardTestPlayerBase { /* Binding Mummy {1}{W} Creature - Zombie 2/2 - Whenever another Zombie enters the battlefield under your control, you may tap target artifact or creature. + Whenever another Zombie you control enters, you may tap target artifact or creature. */ String bMummy = "Binding Mummy"; diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/NissaVastwoodSeerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/NissaVastwoodSeerTest.java index 19eb0af491b..9730b2de6f0 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/NissaVastwoodSeerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/NissaVastwoodSeerTest.java @@ -39,7 +39,7 @@ Later I used her -2 to kill her, which (after putting another spell on the stack // When Nissa, Vastwood Seer enters the battlefield, you may search your library for a basic Forest card, // reveal it, put it into your hand, then shuffle your library. - // Whenever a land enters the battlefield under your control, if you control seven or more lands, + // Whenever a land you control enters, if you control seven or more lands, // exile Nissa, then return her to the battlefield transformed under her owner's control. // Nissa, Sage Animist // +1: Reveal the top card of your library. If it's a land card, put it onto the battlefield. Otherwise, put it into your hand. diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/UginTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/UginTest.java index 18556c2a31a..b3f0360fad5 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/UginTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/UginTest.java @@ -26,7 +26,7 @@ public class UginTest extends CardTestPlayerBase { addCard(Zone.LIBRARY, playerB, "Forest", 2); addCard(Zone.BATTLEFIELD, playerB, "Forest", 6); // When Nissa, Vastwood Seer enters the battlefield, you may search your library for a basic Forest card, reveal it, put it into your hand, then shuffle your library. - // Whenever a land enters the battlefield under your control, if you control seven or more lands, exile Nissa, then return her to the battlefield transformed under her owner's control. + // Whenever a land you control enters, if you control seven or more lands, exile Nissa, then return her to the battlefield transformed under her owner's control. // +1: Reveal the top card of your library. If it's a land card, put it onto the battlefield. Otherwise, put it into your hand. // -2: Create a legendary 4/4 green Elemental creature token named Ashaya, the Awoken World. // -7: Untap up to six target lands. They become 6/6 Elemental creatures. They're still lands. diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/prevention/PreventDamageRemoveCountersTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/prevention/PreventDamageRemoveCountersTest.java index bb9407453f1..24c35a7b2be 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/prevention/PreventDamageRemoveCountersTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/prevention/PreventDamageRemoveCountersTest.java @@ -135,7 +135,7 @@ public class PreventDamageRemoveCountersTest extends CardTestPlayerBase { // Undergrowth Champion {1}{G}{G} // Creature — Elemental // If damage would be dealt to Undergrowth Champion while it has a +1/+1 counter on it, prevent that damage and remove a +1/+1 counter from Undergrowth Champion. - // Landfall — Whenever a land enters the battlefield under your control, put a +1/+1 counter on Undergrowth Champion. + // Landfall — Whenever a land you control enters, put a +1/+1 counter on Undergrowth Champion. // 2/2 addCard(Zone.BATTLEFIELD, playerA, "Undergrowth Champion"); addCard(Zone.HAND, playerA, "Plains"); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/DamageEffectsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/DamageEffectsTest.java index fa4d3b42146..1bbaf0077b9 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/DamageEffectsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/DamageEffectsTest.java @@ -18,7 +18,7 @@ public class DamageEffectsTest extends CardTestPlayerBase { */ @Test public void testDamageIsDoubledWithLifelink() { - // Landfall - Whenever a land enters the battlefield under your control, you may have target player lose 3 life. + // Landfall - Whenever a land you control enters, you may have target player lose 3 life. // If you do, put three +1/+1 counters on Ob Nixilis, the Fallen. addCard(Zone.BATTLEFIELD, playerB, "Ob Nixilis, the Fallen"); addCard(Zone.HAND, playerB, "Mountain"); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/entersBattlefield/PrimalClayTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/entersBattlefield/PrimalClayTest.java index 4af7e9f19c1..059d81948ed 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/entersBattlefield/PrimalClayTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/entersBattlefield/PrimalClayTest.java @@ -242,7 +242,7 @@ public class PrimalClayTest extends CardTestPlayerBase { addCard(Zone.HAND, playerA, clay); addCard(Zone.HAND, playerA, cloudshift); addCard(Zone.BATTLEFIELD, playerA, "Waterkin Shaman"); - // 2/1; Whenever a creature with flying enters the battlefield under your control, Waterkin Shaman gets +1/+1 until end of turn. + // 2/1; Whenever a creature with flying you control enters, Waterkin Shaman gets +1/+1 until end of turn. addCard(Zone.BATTLEFIELD, playerA, "Plains", 5); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, clay); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/afr/ProsperousInnkeeperTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/afr/ProsperousInnkeeperTest.java index 710a5e2c1c7..6f2f06141ef 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/afr/ProsperousInnkeeperTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/afr/ProsperousInnkeeperTest.java @@ -8,7 +8,7 @@ import org.mage.test.serverside.base.CardTestPlayerBase; public class ProsperousInnkeeperTest extends CardTestPlayerBase { // When Prosperous Innkeeper enters the battlefield, create a Treasure token. - // Whenever another creature enters the battlefield under your control, you gain 1 life. + // Whenever another creature you control enters, you gain 1 life. private final String innkeeper = "Prosperous Innkeeper"; @Test diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/bfz/EmeriaShepherdTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/bfz/EmeriaShepherdTest.java index 2e57988a20b..274691fc5ff 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/bfz/EmeriaShepherdTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/bfz/EmeriaShepherdTest.java @@ -20,7 +20,7 @@ public class EmeriaShepherdTest extends CardTestPlayerBase { * * Emeria Shepherd (5)(W)(W) Flying 4/4 Creature Angel - Landfall — Whenever a land enters the battlefield under your control, you may return target nonland permanent card from your graveyard to your hand. + Landfall — Whenever a land you control enters, you may return target nonland permanent card from your graveyard to your hand. If that land is a Plains, you may return that nonland permanent card to the battlefield instead. */ String emeria = "Emeria Shepherd"; diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/clb/JadeOrbOfDragonkindTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/clb/JadeOrbOfDragonkindTest.java index 144dcd5eabf..fdb16333551 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/clb/JadeOrbOfDragonkindTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/clb/JadeOrbOfDragonkindTest.java @@ -11,7 +11,7 @@ import org.mage.test.serverside.base.CardTestPlayerBase; * {@link mage.cards.j.JadeOrbOfDragonkind Jade Orb of Dragonkind} * {2}{G} * Artifact - * {T}: Add {G}. When you spend this mana to cast a Dragon creature spell, it enters the battlefield with an additional +1/+1 counter on it and gains hexproof until your next turn. + * {T}: Add {G}. When you spend this mana to cast a Dragon creature spell, it enters with an additional +1/+1 counter on it and gains hexproof until your next turn. * @author NicolasCamachoP, Zelane */ @@ -43,7 +43,7 @@ public class JadeOrbOfDragonkindTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Plains", 1); addCard(Zone.BATTLEFIELD, playerA, jadeOrb); addCard(Zone.BATTLEFIELD, playerA, "Kronch Wrangler"); - // Whenever a creature with power 4 or greater enters the battlefield under your control, put a +1/+1 counter on Kronch Wrangler. + // Whenever a creature with power 4 or greater you control enters, put a +1/+1 counter on Kronch Wrangler. castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, arcades); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/dmu/ThranPortalTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/dmu/ThranPortalTest.java index bc91ba78f67..214a6985c81 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/dmu/ThranPortalTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/dmu/ThranPortalTest.java @@ -53,7 +53,7 @@ public class ThranPortalTest extends CardTestPlayerBase { */ @Test public void seenAsChoice() { - // Whenever a Mountain enters the battlefield under your control, if you control at least five other Mountains, + // Whenever a Mountain you control enters, if you control at least five other Mountains, // you may have Valakut, the Molten Pinnacle deal 3 damage to any target. String valakut = "Valakut, the Molten Pinnacle"; diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/lci/TarriansJournalTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/lci/TarriansJournalTest.java index 6d76fb218ab..02a1eb21002 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/lci/TarriansJournalTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/lci/TarriansJournalTest.java @@ -15,7 +15,7 @@ public class TarriansJournalTest extends CardTestPlayerBase { private static final String tj = "Tarrian's Journal"; private static final String transformAbility = "{2}, {T}, Discard your hand: Transform"; private static final String mayCastAbility = "{T}: You may cast a creature spell from your graveyard this turn. "; - // If you do, it enters the battlefield with a finality counter on it and is a Vampire in addition to its other types. + // If you do, it enters with a finality counter on it and is a Vampire in addition to its other types. private static final String edgarMarkov = "Edgar Markov"; // Whenever you cast another Vampire spell, if Edgar Markov is in the command zone or on the battlefield, create a 1/1 black Vampire creature token. private static final String kraken = "Kraken Hatchling"; // not a vampire diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/ltc/GilraenDunedainProtectorTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/ltc/GilraenDunedainProtectorTest.java index ef4d4121683..33ab9a0b542 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/ltc/GilraenDunedainProtectorTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/ltc/GilraenDunedainProtectorTest.java @@ -26,7 +26,7 @@ public class GilraenDunedainProtectorTest extends CardTestPlayerBase { * {W} * Enchantment *
- * Whenever a creature enters the battlefield under your control, you gain 1 life. + * Whenever a creature you control enters, you gain 1 life. */ private final String welcome = "Ajani's Welcome"; diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m3c/PyrogoyfTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m3c/PyrogoyfTest.java index bd70674d80f..76f37901d7a 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m3c/PyrogoyfTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m3c/PyrogoyfTest.java @@ -14,7 +14,7 @@ public class PyrogoyfTest extends CardTestPlayerBase { * {@link mage.cards.p.Pyrogoyf} {3}{R} * Creature — Lhurgoyf * Pyrogoyf's power is equal to the number of card types among cards in all graveyards and its toughness is equal to that number plus 1. - * Whenever Pyrogoyf or another Lhurgoyf creature enters the battlefield under your control, that creature deals damage equal to its power to any target. + * Whenever Pyrogoyf or another Lhurgoyf creature you control enters, that creature deals damage equal to its power to any target. * * / 1+* */ private static final String pyrogoyf = "Pyrogoyf"; diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/mh3/GristVoraciousLarvaTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/mh3/GristVoraciousLarvaTest.java index ef4207f1a29..c7956021bf3 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/mh3/GristVoraciousLarvaTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/mh3/GristVoraciousLarvaTest.java @@ -18,7 +18,7 @@ public class GristVoraciousLarvaTest extends CardTestPlayerBase { * {@link mage.cards.g.GristVoraciousLarva Grist, Voracious Larva} {G} * Legendary Creature — Insect * Deathtouch - * Whenever Grist, Voracious Larva or another creature enters the battlefield under your control, if it entered from your graveyard or you cast it from your graveyard, you may pay {G}. If you do, exile Grist, then return it to the battlefield transformed under its owner’s control. + * Whenever Grist, Voracious Larva or another creature you control enters, if it entered from your graveyard or you cast it from your graveyard, you may pay {G}. If you do, exile Grist, then return it to the battlefield transformed under its owner’s control. * 1/2 * // {@link mage.cards.g.GristThePlagueSwarm Grist, the Plague Swarm} * Legendary Planeswalker — Grist diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/mh3/SpringheartNantukoTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/mh3/SpringheartNantukoTest.java index 4e798cf59ef..23b51ded160 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/mh3/SpringheartNantukoTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/mh3/SpringheartNantukoTest.java @@ -14,7 +14,7 @@ public class SpringheartNantukoTest extends CardTestPlayerBase { * {@link mage.cards.s.SpringheartNantuko Springheart Nantuko} {1}{G} * Bestow {1}{G} * Enchanted creature gets +1/+1 - * Landfall — Whenever a land enters the battlefield under your control, you may pay {1}{G} if Springheart Nantuko is attached to a creature you control. If you do, create a token that's a copy of that creature. If you didn't create a token this way, create a 1/1 green Insect creature token. + * Landfall — Whenever a land you control enters, you may pay {1}{G} if Springheart Nantuko is attached to a creature you control. If you do, create a token that's a copy of that creature. If you didn't create a token this way, create a 1/1 green Insect creature token. */ private static final String nantuko = "Springheart Nantuko"; diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/mkm/ProjektorInspectorTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/mkm/ProjektorInspectorTest.java index 04feb3bd06d..759ce346e8a 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/mkm/ProjektorInspectorTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/mkm/ProjektorInspectorTest.java @@ -13,7 +13,7 @@ public class ProjektorInspectorTest extends CardTestPlayerBase { /** * {@link mage.cards.p.ProjektorInspector} {U} * Creature — Human Detective - * Whenever Projektor Inspector or another Detective enters the battlefield under your control and + * Whenever Projektor Inspector or another Detective you control enters and * whenever a Detective you control is turned face up, you may draw a card. If you do, discard a card. * 3/2 */ diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/one/EleshNornMotherOfMachinesTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/one/EleshNornMotherOfMachinesTest.java index c84a350033b..aa4bd1167a5 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/one/EleshNornMotherOfMachinesTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/one/EleshNornMotherOfMachinesTest.java @@ -53,7 +53,7 @@ public class EleshNornMotherOfMachinesTest extends CardTestPlayerBase { // // Bloodghast can't block. // Bloodghast has haste as long as an opponent has 10 or less life. - // Landfall — Whenever a land enters the battlefield under your control, + // Landfall — Whenever a land you control enters, // you may return Bloodghast from your graveyard to the battlefield. addCard(Zone.GRAVEYARD, playerA, "Bloodghast"); addCard(Zone.HAND, playerA, "Forest"); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/ThingInTheIceTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/ThingInTheIceTest.java index d431e5a4c39..7383b410709 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/ThingInTheIceTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/ThingInTheIceTest.java @@ -25,7 +25,7 @@ public class ThingInTheIceTest extends CardTestPlayerBase { */ @Test public void testClueTokens() { - // Whenever a land enters the battlefield under your control, investigate. (Create a colorless Clue artifact token onto the battlefield with "{2}, Sacrifice this artifact: Draw a card.") + // Whenever a land you control enters, investigate. (Create a colorless Clue artifact token onto the battlefield with "{2}, Sacrifice this artifact: Draw a card.") // Whenever you sacrifice a Clue, put a +1/+1 counter on Tireless Tracker. addCard(Zone.BATTLEFIELD, playerA, "Tireless Tracker", 1); // Human, Scout 3/2 addCard(Zone.HAND, playerA, "Forest", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/TirelessTrackerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/TirelessTrackerTest.java index 2b39ad28c22..976dceaeb10 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/TirelessTrackerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/TirelessTrackerTest.java @@ -8,7 +8,7 @@ import org.mage.test.serverside.base.CardTestPlayerBase; /** * 2G Creature - Human Scout -Whenever a land enters the battlefield under your control, investigate. +Whenever a land you control enters, investigate. Whenever you sacrifice a Clue, put a +1/+1 counter on Tireless Tracker. * diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/sws/ImagesOfThePastTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/sws/ImagesOfThePastTest.java index 2db9d7eeb54..b8a077dd01f 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/sws/ImagesOfThePastTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/sws/ImagesOfThePastTest.java @@ -25,7 +25,7 @@ public class ImagesOfThePastTest extends CardTestPlayerBase { addCard(Zone.GRAVEYARD, playerA, "Lightning Bolt"); // // Healer of the Pride - // Whenever another creature enters the battlefield under your control, you gain 2 life. + // Whenever another creature you control enters, you gain 2 life. addCard(Zone.BATTLEFIELD, playerA, "Healer of the Pride", 1); // // Syr Konrad, the Grim @@ -37,7 +37,7 @@ public class ImagesOfThePastTest extends CardTestPlayerBase { // activate and rise 2x dies triggers (adds 2x Spirit) castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Images of the Past", "Balduvian Bears^Silvercoat Lion"); setChoice(playerA, "Whenever another creature dies", 2); // 2x triggers from Syr - setChoice(playerA, "Whenever another creature enters"); // 2x triggers from Healer + setChoice(playerA, "Whenever another creature you control enters"); // 2x triggers from Healer waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); // checkExileCount("after", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Balduvian Bears", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/ths/PurphorosGodOfTheForgeTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/ths/PurphorosGodOfTheForgeTest.java index 58478771272..27cbdcefe33 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/ths/PurphorosGodOfTheForgeTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/ths/PurphorosGodOfTheForgeTest.java @@ -25,7 +25,7 @@ public class PurphorosGodOfTheForgeTest extends CardTestPlayerBase { // Indestructible // As long as your devotion to red is less than five, Purphoros isn't a creature. - // Whenever another creature enters the battlefield under your control, Purphoros deals 2 damage to each opponent. + // Whenever another creature you control enters, Purphoros deals 2 damage to each opponent. // {2}{R}: Creatures you control get +1/+0 until end of turn. addCard(Zone.BATTLEFIELD, playerA, "Purphoros, God of the Forge"); @@ -59,7 +59,7 @@ public class PurphorosGodOfTheForgeTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Mountain", 3); // Indestructible // As long as your devotion to red is less than five, Purphoros isn't a creature. - // Whenever another creature enters the battlefield under your control, Purphoros deals 2 damage to each opponent. + // Whenever another creature you control enters, Purphoros deals 2 damage to each opponent. // {2}{R}: Creatures you control get +1/+0 until end of turn. addCard(Zone.BATTLEFIELD, playerA, "Purphoros, God of the Forge"); @@ -93,7 +93,7 @@ public class PurphorosGodOfTheForgeTest extends CardTestPlayerBase { // Indestructible // As long as your devotion to red is less than five, Purphoros isn't a creature. - // Whenever another creature enters the battlefield under your control, Purphoros deals 2 damage to each opponent. + // Whenever another creature you control enters, Purphoros deals 2 damage to each opponent. // {2}{R}: Creatures you control get +1/+0 until end of turn. addCard(Zone.BATTLEFIELD, playerA, "Purphoros, God of the Forge"); // {3}{R} addCard(Zone.BATTLEFIELD, playerA, "Goblin Guide", 1); // {R} diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/woe/CurseOfTheWerefoxTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/woe/CurseOfTheWerefoxTest.java index 6095dcc866a..645f66c70cf 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/woe/CurseOfTheWerefoxTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/woe/CurseOfTheWerefoxTest.java @@ -24,7 +24,7 @@ public class CurseOfTheWerefoxTest extends CardTestPlayerBase { * Creature — Satyr Archer *
* Reach - * Constellation — Whenever an enchantment enters the battlefield under your control, you gain 2 life. + * Constellation — Whenever an enchantment you control enters, you gain 2 life. *
* 1/4 */ @@ -85,4 +85,4 @@ public class CurseOfTheWerefoxTest extends CardTestPlayerBase { assertDamageReceived(playerB, wardens, 2); assertPermanentCount(playerA, "Monster", 1); } -} \ No newline at end of file +} diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/AbilityOwnershipTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/AbilityOwnershipTest.java index c526e68be35..5c7406b8121 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/AbilityOwnershipTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/AbilityOwnershipTest.java @@ -32,7 +32,7 @@ public class AbilityOwnershipTest extends CardTestPlayerBase { // - SO Obelisk Spider must triggers 3x times castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Rise of the Dark Realms"); setChoice(playerA, "When "); // two triggers - // * Ability: Soul Snuffers - EntersBattlefieldTriggeredAbility: When {this} enters the battlefield, put a -1/-1 counter on each creature. + // * Ability: Soul Snuffers - EntersBattlefieldTriggeredAbility: When {this} enters, put a -1/-1 counter on each creature. // * Ability: Minister of Pain - ExploitAbility: Exploit (When this creature enters the battlefield, you may sacrifice a creature.) setChoice(playerA, false); // no exploit // 3x life triggers diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/FathomMageTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/FathomMageTest.java index ec88b1bc393..7270525d623 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/FathomMageTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/FathomMageTest.java @@ -16,7 +16,7 @@ public class FathomMageTest extends CardTestPlayerBase { /** * Fathom Mage - Creature — Human Wizard 1/1, 2UG * - * Evolve (Whenever a creature enters the battlefield under your control, if + * Evolve (Whenever a creature you control enters, if * that creature has greater power or toughness than this creature, put a * +1/+1 counter on this creature.) Whenever a +1/+1 counter is placed on * Fathom Mage, you may draw a card. diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/GoldnightCommanderTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/GoldnightCommanderTest.java index 56450ef3b0a..8f6e3c68b42 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/GoldnightCommanderTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/GoldnightCommanderTest.java @@ -15,7 +15,7 @@ public class GoldnightCommanderTest extends CardTestPlayerBase { /* * Goldnight Commander {3}{W} Human Cleric Soldier - * Whenever another creature enters the battlefield under your control, creatures you control get + * Whenever another creature you control enters, creatures you control get * +1/+1 until end of turn. */ @Test diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/StrictProctorTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/StrictProctorTest.java index 4910cd20443..706b9e2866f 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/StrictProctorTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/StrictProctorTest.java @@ -23,7 +23,7 @@ public class StrictProctorTest extends CardTestPlayerBase { // Whenever a permanent entering the battlefield causes a triggered ability to // trigger, counter that ability unless its controller pays {2}. addCard(Zone.BATTLEFIELD, playerA, "Strict Proctor", 1); - // Whenever a land enters the battlefield under your control, you gain 3 life. + // Whenever a land you control enters, you gain 3 life. addCard(Zone.BATTLEFIELD, playerA, "Primeval Bounty", 1); // land to play for trigger addCard(Zone.HAND, playerA, "Swamp", 1); @@ -45,7 +45,7 @@ public class StrictProctorTest extends CardTestPlayerBase { // Whenever a permanent entering the battlefield causes a triggered ability to // trigger, counter that ability unless its controller pays {2}. addCard(Zone.BATTLEFIELD, playerA, "Strict Proctor", 1); - // Whenever a land enters the battlefield under your control, you gain 3 life. + // Whenever a land you control enters, you gain 3 life. addCard(Zone.BATTLEFIELD, playerA, "Primeval Bounty", 1); // land to play for trigger addCard(Zone.HAND, playerA, "Swamp", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/WorldgorgerDragonTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/WorldgorgerDragonTest.java index ded02887314..3fbfb6678a6 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/WorldgorgerDragonTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/WorldgorgerDragonTest.java @@ -85,46 +85,46 @@ public class WorldgorgerDragonTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Animate Dead", "Worldgorger Dragon"); setChoice(playerA, "Worldgorger Dragon"); - setChoice(playerA, "When {this} enters the battlefield, if it's"); + setChoice(playerA, "When {this} enters, if it's"); activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {R}"); activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {R}"); activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {R}"); setChoice(playerA, "Worldgorger Dragon"); - setChoice(playerA, "When {this} enters the battlefield, if it's"); + setChoice(playerA, "When {this} enters, if it's"); activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {R}"); activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {R}"); activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {R}"); setChoice(playerA, "Worldgorger Dragon"); - setChoice(playerA, "When {this} enters the battlefield, if it's"); + setChoice(playerA, "When {this} enters, if it's"); activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {R}"); activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {R}"); activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {R}"); setChoice(playerA, "Worldgorger Dragon"); - setChoice(playerA, "When {this} enters the battlefield, if it's"); + setChoice(playerA, "When {this} enters, if it's"); setChoice(playerA, false); activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {R}"); activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {R}"); activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {R}"); setChoice(playerA, "Worldgorger Dragon"); - setChoice(playerA, "When {this} enters the battlefield, if it's"); + setChoice(playerA, "When {this} enters, if it's"); activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {R}"); activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {R}"); activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {R}"); setChoice(playerA, "Worldgorger Dragon"); - setChoice(playerA, "When {this} enters the battlefield, if it's"); + setChoice(playerA, "When {this} enters, if it's"); activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {R}"); activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {R}"); activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {R}"); setChoice(playerA, "Worldgorger Dragon"); - setChoice(playerA, "When {this} enters the battlefield, if it's"); + setChoice(playerA, "When {this} enters, if it's"); activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {R}"); activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {R}"); activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {R}"); @@ -192,14 +192,14 @@ public class WorldgorgerDragonTest extends CardTestPlayerBase { activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {R}"); activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {R}"); setChoice(playerA, "Worldgorger Dragon"); - setChoice(playerA, "When {this} enters the battlefield, if it's"); + setChoice(playerA, "When {this} enters, if it's"); activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {R}"); activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {R}"); activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {R}"); setChoice(playerA, "Silvercoat Lion"); - setChoice(playerA, "When {this} enters the battlefield, if it's"); + setChoice(playerA, "When {this} enters, if it's"); activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {R}"); activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {R}"); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/AngelicDestinyTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/AngelicDestinyTest.java index 0bbabe8c79e..d7af773bd93 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/AngelicDestinyTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/AngelicDestinyTest.java @@ -28,7 +28,7 @@ public class AngelicDestinyTest extends CardTestPlayerBase { // When enchanted creature dies, return Angelic Destiny to its owner's hand. addCard(Zone.HAND, playerA, "Angelic Destiny", 1); // Champion of the Parish - // Whenever another Human enters the battlefield under your control, put a +1/+1 counter on Champion of the Parish. + // Whenever another Human you control enters, put a +1/+1 counter on Champion of the Parish. addCard(Zone.BATTLEFIELD, playerA, "Champion of the Parish", 1); addCard(Zone.BATTLEFIELD, playerB, "Mountain", 1); @@ -49,4 +49,4 @@ public class AngelicDestinyTest extends CardTestPlayerBase { } -} \ No newline at end of file +} diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/OmnathLocusOfRageTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/OmnathLocusOfRageTest.java index a3392ccdf90..c4922076997 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/OmnathLocusOfRageTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/OmnathLocusOfRageTest.java @@ -19,7 +19,7 @@ public class OmnathLocusOfRageTest extends CardTestPlayerBase { */ @Test public void testDiesTriggeredAbility() { - // Landfall — Whenever a land enters the battlefield under your control, put a 5/5 red and green Elemental creature token onto the battlefield. + // Landfall — Whenever a land you control enters, put a 5/5 red and green Elemental creature token onto the battlefield. // Whenever Omnath, Locus of Rage or another Elemental you control dies, Omnath deals 3 damage to any target. addCard(Zone.BATTLEFIELD, playerA, "Omnath, Locus of Rage", 1); @@ -46,7 +46,7 @@ public class OmnathLocusOfRageTest extends CardTestPlayerBase { @Test public void testDiesTriggeredAbilityOnlyIfPresent() { - // Landfall — Whenever a land enters the battlefield under your control, put a 5/5 red and green Elemental creature token onto the battlefield. + // Landfall — Whenever a land you control enters, put a 5/5 red and green Elemental creature token onto the battlefield. // Whenever Omnath, Locus of Rage or another Elemental you control dies, Omnath deals 3 damage to any target. addCard(Zone.BATTLEFIELD, playerA, "Omnath, Locus of Rage", 1); addCard(Zone.BATTLEFIELD, playerA, "Lightning Elemental", 1); // 4/1 Elemental - Haste diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/SidisiBroodTyrantTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/SidisiBroodTyrantTest.java index a8c70f52ace..c0ea9d2c5dd 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/SidisiBroodTyrantTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/SidisiBroodTyrantTest.java @@ -34,7 +34,7 @@ public class SidisiBroodTyrantTest extends CardTestPlayerBase { addCard(Zone.HAND, playerB, "Lightning Bolt"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Sidisi, Brood Tyrant"); - castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Lightning Bolt", "Sidisi, Brood Tyrant", "Whenever {this} enters the battlefield"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Lightning Bolt", "Sidisi, Brood Tyrant", "Whenever {this} enters"); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/combat/AttackBlockRestrictionsTest.java b/Mage.Tests/src/test/java/org/mage/test/combat/AttackBlockRestrictionsTest.java index 2e53b53e544..c6ae191e7d8 100644 --- a/Mage.Tests/src/test/java/org/mage/test/combat/AttackBlockRestrictionsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/combat/AttackBlockRestrictionsTest.java @@ -184,7 +184,7 @@ public class AttackBlockRestrictionsTest extends CardTestPlayerBase { public void testChampionOfLambholt() { // Champion of Lambholt: Creature — Human Warrior 1/1, 1GG // - Creatures with power less than Champion of Lambholt's power can't block creatures you control. - // - Whenever another creature enters the battlefield under your control, put a +1/+1 counter on Champion of Lambholt. + // - Whenever another creature you control enters, put a +1/+1 counter on Champion of Lambholt. addCard(Zone.BATTLEFIELD, playerB, "Champion of Lambholt"); // Elite Vanguard: Creature — Human Soldier 2/1, W @@ -306,7 +306,7 @@ public class AttackBlockRestrictionsTest extends CardTestPlayerBase { */ @Test public void testTurntimberBasilisk() { - // Landfall - Whenever a land enters the battlefield under your control, you may + // Landfall - Whenever a land you control enters, you may // have target creature block Turntimber Basilisk this turn if able. addCard(Zone.BATTLEFIELD, playerA, "Turntimber Basilisk"); addCard(Zone.BATTLEFIELD, playerA, "Grizzly Bears"); diff --git a/Mage.Tests/src/test/java/org/mage/test/combat/FirstStrikeTest.java b/Mage.Tests/src/test/java/org/mage/test/combat/FirstStrikeTest.java index 89b2d4e434b..0fa8e2f26d4 100644 --- a/Mage.Tests/src/test/java/org/mage/test/combat/FirstStrikeTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/combat/FirstStrikeTest.java @@ -391,7 +391,7 @@ public class FirstStrikeTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Underground Sea", 5); addCard(Zone.HAND, playerA, ambusher); addCard(Zone.BATTLEFIELD, playerA, "Celebrity Fencer"); - // Whenever another creature enters the battlefield under your control, put a +1/+1 counter on Celebrity Fencer. + // Whenever another creature you control enters, put a +1/+1 counter on Celebrity Fencer. addCard(Zone.BATTLEFIELD, playerA, "Knighthood"); // Creatures you control have first strike attack(1, playerA, moonblade, playerB); diff --git a/Mage.Tests/src/test/java/org/mage/test/commander/duel/AnafenzaTest.java b/Mage.Tests/src/test/java/org/mage/test/commander/duel/AnafenzaTest.java index 6b77b93eb71..c42ded29331 100644 --- a/Mage.Tests/src/test/java/org/mage/test/commander/duel/AnafenzaTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/commander/duel/AnafenzaTest.java @@ -77,7 +77,7 @@ public class AnafenzaTest extends CardTestCommanderDuelBase { addCard(Zone.BATTLEFIELD, playerA, "Acidic Slime", 1); addCard(Zone.HAND, playerB, "Forest", 2); - // Landfall — Whenever a land enters the battlefield under your control, put a 5/5 red and green Elemental creature token onto the battlefield. + // Landfall — Whenever a land you control enters, put a 5/5 red and green Elemental creature token onto the battlefield. // Whenever Omnath, Locus of Rage or another Elemental you control dies, Omnath deals 3 damage to any target. addCard(Zone.BATTLEFIELD, playerB, "Omnath, Locus of Rage", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/commander/duel/OpalPalaceTest.java b/Mage.Tests/src/test/java/org/mage/test/commander/duel/OpalPalaceTest.java index 0aa1ba3fa20..ae7e4f262a2 100644 --- a/Mage.Tests/src/test/java/org/mage/test/commander/duel/OpalPalaceTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/commander/duel/OpalPalaceTest.java @@ -23,7 +23,7 @@ public class OpalPalaceTest extends CardTestCommanderDuelBase { // {T}: Add {C}. // {1}, {T}: Add one mana of any color in your commander's color identity. - // If you spend this mana to cast your commander, it enters the battlefield with a number of +1/+1 counters on it + // If you spend this mana to cast your commander, it enters with a number of +1/+1 counters on it // equal to the number of times it's been cast from the command zone this game. addCard(Zone.BATTLEFIELD, playerA, "Opal Palace", 1); 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 fd3a2d52adf..afa4e9ac2c5 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 @@ -14,7 +14,7 @@ public class YorvoLordOfGarenbrigOnCommandersTest extends CardTestCommanderDuelB @Test public void test_TriggerOnSimpleCommander() { // Yorvo, Lord of Garenbrig enters the battlefield with four +1/+1 counters on it. - // Whenever another green creature enters the battlefield under your control, put a +1/+1 counter on Yorvo. Then if that creature’s power is greater than Yorvo’s power, put another +1/+1 counter on Yorvo. + // Whenever another green creature you control enters, put a +1/+1 counter on Yorvo. Then if that creature’s power is greater than Yorvo’s power, put another +1/+1 counter on Yorvo. addCard(Zone.HAND, playerA, "Yorvo, Lord of Garenbrig", 5); // {G}{G}{G} addCard(Zone.BATTLEFIELD, playerA, "Forest", 3); // @@ -39,7 +39,7 @@ public class YorvoLordOfGarenbrigOnCommandersTest extends CardTestCommanderDuelB @Test public void test_TriggerOnUroTitanOfNaturesWrath() { // Yorvo, Lord of Garenbrig enters the battlefield with four +1/+1 counters on it. - // Whenever another green creature enters the battlefield under your control, put a +1/+1 counter on Yorvo. Then if that creature’s power is greater than Yorvo’s power, put another +1/+1 counter on Yorvo. + // Whenever another green creature you control enters, put a +1/+1 counter on Yorvo. Then if that creature’s power is greater than Yorvo’s power, put another +1/+1 counter on Yorvo. addCard(Zone.HAND, playerA, "Yorvo, Lord of Garenbrig", 5); // {G}{G}{G} addCard(Zone.BATTLEFIELD, playerA, "Forest", 3); // @@ -62,9 +62,9 @@ public class YorvoLordOfGarenbrigOnCommandersTest extends CardTestCommanderDuelB // (2019-10-04) // order triggers to remove commander first - setChoice(playerA, "Whenever {this} enters the battlefield or attacks"); // draw 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, "Whenever {this} enters or attacks"); // draw trigger + setChoice(playerA, "Whenever another green creature you control enters"); // get counters trigger + //setChoice(playerA, "When {this} enters, sacrifice it"); // sacrifice trigger must be on top setChoice(playerA, true); // return commander to command zone setChoice(playerA, false); // do not put land to battlefield diff --git a/Mage.Tests/src/test/java/org/mage/test/game/ends/GameIsADrawTest.java b/Mage.Tests/src/test/java/org/mage/test/game/ends/GameIsADrawTest.java index 2759fb2ea02..0ad7ca2cc85 100644 --- a/Mage.Tests/src/test/java/org/mage/test/game/ends/GameIsADrawTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/game/ends/GameIsADrawTest.java @@ -123,7 +123,7 @@ public class GameIsADrawTest extends CardTestPlayerBase { public void GameDrawByInfiniteLoopNot() { addCard(Zone.BATTLEFIELD, playerA, "Plains", 43); - // Whenever a creature enters the battlefield under your control, you gain life equal to its toughness. + // Whenever a creature you control enters, you gain life equal to its toughness. addCard(Zone.BATTLEFIELD, playerA, "Angelic Chorus", 1); // Enchantment {5} // Create X 4/4 white Angel creature tokens with flying. diff --git a/Mage.Tests/src/test/java/org/mage/test/lki/LastKnownInformationTest.java b/Mage.Tests/src/test/java/org/mage/test/lki/LastKnownInformationTest.java index 5f956d889f4..f0c13d4d918 100644 --- a/Mage.Tests/src/test/java/org/mage/test/lki/LastKnownInformationTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/lki/LastKnownInformationTest.java @@ -65,7 +65,7 @@ public class LastKnownInformationTest extends CardTestPlayerBase { */ @Test public void testTrostaniSelesnyasVoice1() { - // Whenever another creature enters the battlefield under your control, you gain life equal to that creature's toughness. + // Whenever another creature you control enters, you gain life equal to that creature's toughness. // {1}{G}{W}, {T}: Populate. (Create a tokenonto the battlefield that's a copy of a creature token you control.) addCard(Zone.BATTLEFIELD, playerA, "Trostani, Selesnya's Voice"); diff --git a/Mage.Tests/src/test/java/org/mage/test/serverside/CardIconsTest.java b/Mage.Tests/src/test/java/org/mage/test/serverside/CardIconsTest.java index 4d882b976dd..8b3e47bccbf 100644 --- a/Mage.Tests/src/test/java/org/mage/test/serverside/CardIconsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/serverside/CardIconsTest.java @@ -291,7 +291,7 @@ public class CardIconsTest extends CardTestPlayerBase { // // Agadeem, the Undercrypt // Land - // As Agadeem, the Undercrypt enters the battlefield, you may pay 3 life. If you don't, it enters the battlefield tapped. + // As Agadeem, the Undercrypt enters the battlefield, you may pay 3 life. If you don't, it enters tapped. addCard(Zone.HAND, playerA, "Agadeem's Awakening", 2); addCard(Zone.BATTLEFIELD, playerA, "Swamp", 5); diff --git a/Mage/src/main/java/mage/abilities/abilityword/ConstellationAbility.java b/Mage/src/main/java/mage/abilities/abilityword/ConstellationAbility.java index 3169bc49e9c..8bc86477e2a 100644 --- a/Mage/src/main/java/mage/abilities/abilityword/ConstellationAbility.java +++ b/Mage/src/main/java/mage/abilities/abilityword/ConstellationAbility.java @@ -33,7 +33,7 @@ public class ConstellationAbility extends TriggeredAbilityImpl { this.thisOr = thisOr; setAbilityWord(AbilityWord.CONSTELLATION); setTriggerPhrase("Whenever " + (thisOr ? "{this} or another" : "an") - + " enchantment enters the battlefield under your control, "); + + " enchantment you control enters, "); } protected ConstellationAbility(final ConstellationAbility ability) { diff --git a/Mage/src/main/java/mage/abilities/common/AllyEntersBattlefieldTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/AllyEntersBattlefieldTriggeredAbility.java index c58ff0c0542..acaa906f668 100644 --- a/Mage/src/main/java/mage/abilities/common/AllyEntersBattlefieldTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/AllyEntersBattlefieldTriggeredAbility.java @@ -18,7 +18,7 @@ public class AllyEntersBattlefieldTriggeredAbility extends TriggeredAbilityImpl public AllyEntersBattlefieldTriggeredAbility(Effect effect, boolean optional) { super(Zone.BATTLEFIELD, effect, optional); this.setAbilityWord(AbilityWord.RALLY); - setTriggerPhrase("Whenever {this} or another Ally enters the battlefield under your control, "); + setTriggerPhrase("Whenever {this} or another Ally you control enters, "); } public AllyEntersBattlefieldTriggeredAbility(AllyEntersBattlefieldTriggeredAbility ability) { diff --git a/Mage/src/main/java/mage/abilities/common/AnimateDeadTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/AnimateDeadTriggeredAbility.java index 570bd3f9341..bc3631c80ad 100644 --- a/Mage/src/main/java/mage/abilities/common/AnimateDeadTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/AnimateDeadTriggeredAbility.java @@ -44,7 +44,7 @@ public class AnimateDeadTriggeredAbility extends EntersBattlefieldTriggeredAbili super(new AnimateDeadReplaceAbilityEffect(becomesAura)); addEffect(new AnimateDeadPutOntoBattlefieldEffect(becomesAura, tapped)); addWatcher(new AnimateDeadWatcher()); - setTriggerPhrase("When {this} enters the battlefield, if it's on the battlefield, "); + setTriggerPhrase("When {this} enters, if it's on the battlefield, "); } private AnimateDeadTriggeredAbility(final AnimateDeadTriggeredAbility ability) { diff --git a/Mage/src/main/java/mage/abilities/common/AsEntersBattlefieldAbility.java b/Mage/src/main/java/mage/abilities/common/AsEntersBattlefieldAbility.java index 4839c6fbb7b..51442aabbe4 100644 --- a/Mage/src/main/java/mage/abilities/common/AsEntersBattlefieldAbility.java +++ b/Mage/src/main/java/mage/abilities/common/AsEntersBattlefieldAbility.java @@ -47,6 +47,6 @@ public class AsEntersBattlefieldAbility extends StaticAbility { @Override public String getRule() { - return "As {this} enters the battlefield, " + super.getRule(); + return "As {this} enters, " + super.getRule(); } } diff --git a/Mage/src/main/java/mage/abilities/common/BecomeDayAsEntersAbility.java b/Mage/src/main/java/mage/abilities/common/BecomeDayAsEntersAbility.java index 80ec12f0dca..ef2f131e05d 100644 --- a/Mage/src/main/java/mage/abilities/common/BecomeDayAsEntersAbility.java +++ b/Mage/src/main/java/mage/abilities/common/BecomeDayAsEntersAbility.java @@ -27,7 +27,7 @@ public class BecomeDayAsEntersAbility extends EntersBattlefieldAbility { @Override public String getRule() { - return "If it's neither day nor night, it becomes day as {this} enters the battlefield."; + return "If it's neither day nor night, it becomes day as {this} enters."; } } diff --git a/Mage/src/main/java/mage/abilities/common/CaseAbility.java b/Mage/src/main/java/mage/abilities/common/CaseAbility.java index 929853b83ac..3eb53d35b5e 100644 --- a/Mage/src/main/java/mage/abilities/common/CaseAbility.java +++ b/Mage/src/main/java/mage/abilities/common/CaseAbility.java @@ -74,7 +74,7 @@ public class CaseAbility extends SimpleStaticAbility { super(Zone.ALL, null); if (initialAbility instanceof EntersBattlefieldTriggeredAbility) { - ((EntersBattlefieldTriggeredAbility) initialAbility).setTriggerPhrase("When this Case enters the battlefield, "); + ((EntersBattlefieldTriggeredAbility) initialAbility).setTriggerPhrase("When this Case enters, "); } addSubAbility(initialAbility); diff --git a/Mage/src/main/java/mage/abilities/common/EntersBattlefieldAbility.java b/Mage/src/main/java/mage/abilities/common/EntersBattlefieldAbility.java index 6799a077f52..fad90076953 100644 --- a/Mage/src/main/java/mage/abilities/common/EntersBattlefieldAbility.java +++ b/Mage/src/main/java/mage/abilities/common/EntersBattlefieldAbility.java @@ -89,8 +89,8 @@ public class EntersBattlefieldAbility extends StaticAbility { } else { prefix = null; } - String rule = (optional ? "you may have " : "") + "{this} enter" + (optional ? "" : "s") + - " the battlefield" + (!superRule.isEmpty() && superRule.charAt(0) == ' ' ? "" : " ") + superRule; + String rule = (optional ? "you may have " : "") + "{this} enter" + (optional ? "" : "s") + + (!superRule.isEmpty() && superRule.charAt(0) == ' ' ? "" : " ") + superRule; if (prefix != null) { return prefix + CardUtil.getTextWithFirstCharUpperCase(rule); } diff --git a/Mage/src/main/java/mage/abilities/common/EntersBattlefieldAllTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/EntersBattlefieldAllTriggeredAbility.java index 7b1b42aaa07..cc1a5544469 100644 --- a/Mage/src/main/java/mage/abilities/common/EntersBattlefieldAllTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/EntersBattlefieldAllTriggeredAbility.java @@ -34,7 +34,7 @@ public class EntersBattlefieldAllTriggeredAbility extends TriggeredAbilityImpl { super(zone, effect, optional); this.filter = filter; this.setTargetPointer = setTargetPointer; - setTriggerPhrase(getTriggerPhraseFromFilter() + ", "); + makeTriggerPhrase(); } protected EntersBattlefieldAllTriggeredAbility(final EntersBattlefieldAllTriggeredAbility ability) { @@ -68,12 +68,12 @@ public class EntersBattlefieldAllTriggeredAbility extends TriggeredAbilityImpl { return true; } - protected final String getTriggerPhraseFromFilter() { + private void makeTriggerPhrase() { String filterMessage = filter.getMessage(); if (filterMessage.startsWith("one or more")) { - return getWhen() + filterMessage + " enter"; + setTriggerPhrase(getWhen() + filterMessage + " enter, "); } - return getWhen() + CardUtil.addArticle(filterMessage) + " enters"; + setTriggerPhrase(getWhen() + CardUtil.addArticle(filterMessage) + " enters, "); } @Override diff --git a/Mage/src/main/java/mage/abilities/common/EntersBattlefieldCastTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/EntersBattlefieldCastTriggeredAbility.java index d5dae814798..fd5e93231be 100644 --- a/Mage/src/main/java/mage/abilities/common/EntersBattlefieldCastTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/EntersBattlefieldCastTriggeredAbility.java @@ -6,6 +6,7 @@ import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.game.Game; import mage.game.events.GameEvent; +import mage.util.CardUtil; import mage.watchers.common.PermanentWasCastWatcher; /** @@ -22,7 +23,8 @@ public class EntersBattlefieldCastTriggeredAbility extends EntersBattlefieldCont super(zone, effect, filter, optional, setTargetPointer); this.mustCast = mustCast; this.addWatcher(new PermanentWasCastWatcher()); - setTriggerPhrase(getTriggerPhraseFromFilter() + " under your control, if it " + (mustCast ? "was" : "wasn't") + " cast, " ); + setTriggerPhrase(getWhen() + CardUtil.addArticle(filter.getMessage()) + + " you control enters, if it " + (mustCast ? "was" : "wasn't") + " cast, " ); } protected EntersBattlefieldCastTriggeredAbility(final EntersBattlefieldCastTriggeredAbility ability) { diff --git a/Mage/src/main/java/mage/abilities/common/EntersBattlefieldControlledTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/EntersBattlefieldControlledTriggeredAbility.java index f1d88a2b851..d589bf16a8b 100644 --- a/Mage/src/main/java/mage/abilities/common/EntersBattlefieldControlledTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/EntersBattlefieldControlledTriggeredAbility.java @@ -7,6 +7,7 @@ import mage.filter.FilterPermanent; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; +import mage.util.CardUtil; /** * @@ -27,7 +28,7 @@ public class EntersBattlefieldControlledTriggeredAbility extends EntersBattlefie public EntersBattlefieldControlledTriggeredAbility(Zone zone, Effect effect, FilterPermanent filter, boolean optional, SetTargetPointer setTargetPointer) { super(zone, effect, filter, optional, setTargetPointer); - setTriggerPhrase(getTriggerPhraseFromFilter() + " under your control, "); + makeTriggerPhrase(); } protected EntersBattlefieldControlledTriggeredAbility(final EntersBattlefieldControlledTriggeredAbility ability) { @@ -43,6 +44,14 @@ public class EntersBattlefieldControlledTriggeredAbility extends EntersBattlefie return super.checkTrigger(event, game); } + private void makeTriggerPhrase() { + String filterMessage = filter.getMessage(); + if (filterMessage.startsWith("one or more")) { + setTriggerPhrase(getWhen() + filterMessage + " you control enter, "); + } + setTriggerPhrase(getWhen() + CardUtil.addArticle(filterMessage) + " you control enters, "); + } + @Override public EntersBattlefieldControlledTriggeredAbility copy() { return new EntersBattlefieldControlledTriggeredAbility(this); diff --git a/Mage/src/main/java/mage/abilities/common/EntersBattlefieldFromGraveyardTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/EntersBattlefieldFromGraveyardTriggeredAbility.java index 6b92e837bbe..d691e99082b 100644 --- a/Mage/src/main/java/mage/abilities/common/EntersBattlefieldFromGraveyardTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/EntersBattlefieldFromGraveyardTriggeredAbility.java @@ -50,7 +50,7 @@ public class EntersBattlefieldFromGraveyardTriggeredAbility extends TriggeredAbi } private String generateTriggerPhrase() { - StringBuilder sb = new StringBuilder("When {this} enters the battlefield from "); + StringBuilder sb = new StringBuilder("When {this} enters from "); switch (targetController) { case YOU: sb.append("your"); diff --git a/Mage/src/main/java/mage/abilities/common/EntersBattlefieldOpponentTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/EntersBattlefieldOpponentTriggeredAbility.java index a86228e8026..c6c166dd741 100644 --- a/Mage/src/main/java/mage/abilities/common/EntersBattlefieldOpponentTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/EntersBattlefieldOpponentTriggeredAbility.java @@ -7,6 +7,7 @@ import mage.filter.FilterPermanent; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; +import mage.util.CardUtil; /** * @author xenohedron @@ -19,7 +20,7 @@ public class EntersBattlefieldOpponentTriggeredAbility extends EntersBattlefield public EntersBattlefieldOpponentTriggeredAbility(Zone zone, Effect effect, FilterPermanent filter, boolean optional, SetTargetPointer setTargetPointer) { super(zone, effect, filter, optional, setTargetPointer); - setTriggerPhrase(getTriggerPhraseFromFilter() + " under an opponent's control, "); + setTriggerPhrase(getWhen() + CardUtil.addArticle(filter.getMessage()) + " an opponent controls enters, "); } protected EntersBattlefieldOpponentTriggeredAbility(final EntersBattlefieldOpponentTriggeredAbility ability) { diff --git a/Mage/src/main/java/mage/abilities/common/EntersBattlefieldOrAttacksSourceTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/EntersBattlefieldOrAttacksSourceTriggeredAbility.java index 68ddc996dd3..c073bc3e6d8 100644 --- a/Mage/src/main/java/mage/abilities/common/EntersBattlefieldOrAttacksSourceTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/EntersBattlefieldOrAttacksSourceTriggeredAbility.java @@ -18,7 +18,7 @@ public class EntersBattlefieldOrAttacksSourceTriggeredAbility extends TriggeredA public EntersBattlefieldOrAttacksSourceTriggeredAbility(Effect effect, boolean optional) { super(Zone.BATTLEFIELD, effect, optional); - setTriggerPhrase("Whenever {this} enters the battlefield or attacks, "); + setTriggerPhrase("Whenever {this} enters or attacks, "); } protected EntersBattlefieldOrAttacksSourceTriggeredAbility(final EntersBattlefieldOrAttacksSourceTriggeredAbility ability) { diff --git a/Mage/src/main/java/mage/abilities/common/EntersBattlefieldOrDiesSourceTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/EntersBattlefieldOrDiesSourceTriggeredAbility.java index ef35c7308db..ab7ab16432f 100644 --- a/Mage/src/main/java/mage/abilities/common/EntersBattlefieldOrDiesSourceTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/EntersBattlefieldOrDiesSourceTriggeredAbility.java @@ -22,7 +22,7 @@ public class EntersBattlefieldOrDiesSourceTriggeredAbility extends TriggeredAbil super(Zone.BATTLEFIELD, effect, optional); this.diesText = diesText; setLeavesTheBattlefieldTrigger(true); - setTriggerPhrase("When {this} enters the battlefield or " + + setTriggerPhrase("When {this} enters or " + (diesText ? "dies" : "is put into a graveyard from the battlefield") + ", "); } diff --git a/Mage/src/main/java/mage/abilities/common/EntersBattlefieldOrTurnedFaceUpTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/EntersBattlefieldOrTurnedFaceUpTriggeredAbility.java index e52291659be..1606aed82cc 100644 --- a/Mage/src/main/java/mage/abilities/common/EntersBattlefieldOrTurnedFaceUpTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/EntersBattlefieldOrTurnedFaceUpTriggeredAbility.java @@ -21,7 +21,7 @@ public class EntersBattlefieldOrTurnedFaceUpTriggeredAbility extends TriggeredAb public EntersBattlefieldOrTurnedFaceUpTriggeredAbility(Effect effect, boolean optional) { super(Zone.BATTLEFIELD, effect, optional); this.setWorksFaceDown(true); - this.setTriggerPhrase("When {this} enters the battlefield or is turned face up, "); + this.setTriggerPhrase("When {this} enters or is turned face up, "); } private EntersBattlefieldOrTurnedFaceUpTriggeredAbility(final EntersBattlefieldOrTurnedFaceUpTriggeredAbility ability) { diff --git a/Mage/src/main/java/mage/abilities/common/EntersBattlefieldTappedAsItEntersChooseColorAbility.java b/Mage/src/main/java/mage/abilities/common/EntersBattlefieldTappedAsItEntersChooseColorAbility.java index 0b74ebd385d..e8071385522 100644 --- a/Mage/src/main/java/mage/abilities/common/EntersBattlefieldTappedAsItEntersChooseColorAbility.java +++ b/Mage/src/main/java/mage/abilities/common/EntersBattlefieldTappedAsItEntersChooseColorAbility.java @@ -42,6 +42,6 @@ public class EntersBattlefieldTappedAsItEntersChooseColorAbility extends StaticA @Override public String getRule() { - return "{this} enters the battlefield tapped. As it enters, choose a color."; + return "{this} enters tapped. As it enters, choose a color."; } -} \ No newline at end of file +} diff --git a/Mage/src/main/java/mage/abilities/common/EntersBattlefieldUntappedTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/EntersBattlefieldUntappedTriggeredAbility.java index c3f9f5d05b8..88e435d8e97 100644 --- a/Mage/src/main/java/mage/abilities/common/EntersBattlefieldUntappedTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/EntersBattlefieldUntappedTriggeredAbility.java @@ -12,7 +12,7 @@ public class EntersBattlefieldUntappedTriggeredAbility extends EntersBattlefield public EntersBattlefieldUntappedTriggeredAbility(Effect effect, boolean optional) { super(effect, optional); - setTriggerPhrase("When {this} enters the battlefield untapped, "); + setTriggerPhrase("When {this} enters untapped, "); } private EntersBattlefieldUntappedTriggeredAbility(final EntersBattlefieldUntappedTriggeredAbility ability) { diff --git a/Mage/src/main/java/mage/abilities/common/LandfallAbility.java b/Mage/src/main/java/mage/abilities/common/LandfallAbility.java index 9a6548cfd03..8014e85887d 100644 --- a/Mage/src/main/java/mage/abilities/common/LandfallAbility.java +++ b/Mage/src/main/java/mage/abilities/common/LandfallAbility.java @@ -34,7 +34,7 @@ public class LandfallAbility extends TriggeredAbilityImpl { super(zone, effect, optional); this.setTargetPointer = setTargetPointer; this.setAbilityWord(AbilityWord.LANDFALL); - setTriggerPhrase("Whenever a land enters the battlefield under your control, "); + setTriggerPhrase("Whenever a land you control enters, "); } protected LandfallAbility(final LandfallAbility ability) { diff --git a/Mage/src/main/java/mage/abilities/keyword/EvolveAbility.java b/Mage/src/main/java/mage/abilities/keyword/EvolveAbility.java index 4caf6ce7a30..09fb8dee62a 100644 --- a/Mage/src/main/java/mage/abilities/keyword/EvolveAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/EvolveAbility.java @@ -17,7 +17,7 @@ import mage.game.permanent.Permanent; * 702.98. Evolve *
* 702.98a Evolve is a triggered ability. "Evolve" means "Whenever a creature - * enters the battlefield under your control, if that creature's power is + * you control enters, if that creature's power is * greater than this creature's power and/or that creature's toughness is * greater than this creature's toughness, put a +1/+1 counter on this * creature." @@ -91,7 +91,7 @@ public class EvolveAbility extends EntersBattlefieldAllTriggeredAbility { @Override public String getRule() { - return "Evolve (Whenever a creature enters the battlefield under your control, if that creature has greater power or toughness than this creature, put a +1/+1 counter on this creature.)"; + return "Evolve (Whenever a creature you control enters, if that creature has greater power or toughness than this creature, put a +1/+1 counter on this creature.)"; } @Override diff --git a/Mage/src/main/java/mage/abilities/keyword/ForMirrodinAbility.java b/Mage/src/main/java/mage/abilities/keyword/ForMirrodinAbility.java index 7136be07080..4128912cb0f 100644 --- a/Mage/src/main/java/mage/abilities/keyword/ForMirrodinAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/ForMirrodinAbility.java @@ -20,7 +20,7 @@ public class ForMirrodinAbility extends EntersBattlefieldTriggeredAbility { @Override public String getRule() { - return "For Mirrodin! (When this Equipment enters the battlefield, " + + return "For Mirrodin! (When this Equipment enters, " + "create a 2/2 red Rebel creature token, then attach this to it.)"; } diff --git a/Mage/src/main/java/mage/abilities/keyword/HauntAbility.java b/Mage/src/main/java/mage/abilities/keyword/HauntAbility.java index fb9124f495a..c6343ba97e8 100644 --- a/Mage/src/main/java/mage/abilities/keyword/HauntAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/HauntAbility.java @@ -44,7 +44,7 @@ public class HauntAbility extends TriggeredAbilityImpl { super(Zone.ALL, effect, false); boolean creatureHaunt = card.isCreature(); addSubAbility(new HauntExileAbility(creatureHaunt)); - setTriggerPhrase((creatureHaunt ? "When {this} enters the battlefield or the creature it haunts dies, " + setTriggerPhrase((creatureHaunt ? "When {this} enters or the creature it haunts dies, " : "When the creature {this} haunts dies, ") ); } diff --git a/Mage/src/main/java/mage/abilities/keyword/LivingWeaponAbility.java b/Mage/src/main/java/mage/abilities/keyword/LivingWeaponAbility.java index 0bda93f32d9..f48f37f038c 100644 --- a/Mage/src/main/java/mage/abilities/keyword/LivingWeaponAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/LivingWeaponAbility.java @@ -16,7 +16,7 @@ public class LivingWeaponAbility extends EntersBattlefieldTriggeredAbility { @Override public String getRule() { - return "Living weapon (When this Equipment enters the battlefield, " + + return "Living weapon (When this Equipment enters, " + "create a 0/0 black Phyrexian Germ creature token, then attach this to it.)"; } diff --git a/Mage/src/main/java/mage/abilities/keyword/RavenousAbility.java b/Mage/src/main/java/mage/abilities/keyword/RavenousAbility.java index 1d74ff16803..77cbbdc64e0 100644 --- a/Mage/src/main/java/mage/abilities/keyword/RavenousAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/RavenousAbility.java @@ -20,7 +20,7 @@ public class RavenousAbility extends EntersBattlefieldAbility { super(new EntersBattlefieldWithXCountersEffect(CounterType.P1P1.createInstance())); Ability ability = new ConditionalInterveningIfTriggeredAbility( new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1)), - RavenousAbilityCondition.instance, "When this creature enters the battlefield, " + + RavenousAbilityCondition.instance, "When this creature enters, " + "if X is 5 or more, draw a card" ); ability.setRuleVisible(false); @@ -50,4 +50,4 @@ enum RavenousAbilityCondition implements Condition { public boolean apply(Game game, Ability source) { return GetXValue.instance.calculate(game, source, null) >= 5; } -} \ No newline at end of file +} diff --git a/Mage/src/main/java/mage/abilities/keyword/SoulbondAbility.java b/Mage/src/main/java/mage/abilities/keyword/SoulbondAbility.java index 43cf0b3c08b..93ebcea9b29 100644 --- a/Mage/src/main/java/mage/abilities/keyword/SoulbondAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/SoulbondAbility.java @@ -29,7 +29,7 @@ import mage.util.GameLog; * both this creature and another creature and both are unpaired, you may pair * this creature with another unpaired creature you control for as long as both * remain creatures on the battlefield under your control” and “Whenever another - * creature enters the battlefield under your control, if you control both that + * creature you control enters, if you control both that * creature and this one and both are unpaired, you may pair that creature with * this creature for as long as both remain creatures on the battlefield under * your control.” @@ -159,7 +159,7 @@ class SoulboundEntersSelfEffect extends OneShotEffect { } /** - * “Whenever another creature enters the battlefield under your control, if you + * “Whenever another creature you control enters, if you * control both that creature and this one and both are unpaired, you may pair * that creature with this creature for as long as both remain creatures on the * battlefield under your control.” diff --git a/Mage/src/main/java/mage/abilities/keyword/SquadAbility.java b/Mage/src/main/java/mage/abilities/keyword/SquadAbility.java index 6abac80a6ca..7ecb7903e15 100644 --- a/Mage/src/main/java/mage/abilities/keyword/SquadAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/SquadAbility.java @@ -112,7 +112,7 @@ public class SquadAbility extends StaticAbility implements OptionalAdditionalSou @Override public String getRule() { return "Squad " + cost.getText() + " (As an additional cost to cast this spell, you may pay " + - cost.getText() + "any number of times. When this creature enters the battlefield, " + + cost.getText() + "any number of times. When this creature enters, " + "create that many tokens that are copies of it.)"; } } diff --git a/Mage/src/main/java/mage/game/command/emblems/HuatliRadiantChampionEmblem.java b/Mage/src/main/java/mage/game/command/emblems/HuatliRadiantChampionEmblem.java index 818ca32af37..853cfd42fd2 100644 --- a/Mage/src/main/java/mage/game/command/emblems/HuatliRadiantChampionEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/HuatliRadiantChampionEmblem.java @@ -15,7 +15,7 @@ public final class HuatliRadiantChampionEmblem extends Emblem { public HuatliRadiantChampionEmblem() { super("Emblem Huatli"); - // Whenever a creature enters the battlefield under your control, you may draw a card. + // Whenever a creature you control enters, you may draw a card. Ability ability = new EntersBattlefieldControlledTriggeredAbility(Zone.COMMAND, new DrawCardSourceControllerEffect(1), StaticFilters.FILTER_CONTROLLED_A_CREATURE, true); this.getAbilities().add(ability); diff --git a/Mage/src/main/java/mage/game/command/emblems/KothFireOfResistanceEmblem.java b/Mage/src/main/java/mage/game/command/emblems/KothFireOfResistanceEmblem.java index 0a5e8762863..98866ed7392 100644 --- a/Mage/src/main/java/mage/game/command/emblems/KothFireOfResistanceEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/KothFireOfResistanceEmblem.java @@ -20,7 +20,7 @@ public final class KothFireOfResistanceEmblem extends Emblem { filterMountain.add(SubType.MOUNTAIN.getPredicate()); } - // −7: You get an emblem with "Whenever a Mountain enters the battlefield under your control, this emblem deals 4 damage to any target." + // −7: You get an emblem with "Whenever a Mountain you control enters, this emblem deals 4 damage to any target." public KothFireOfResistanceEmblem() { super("Emblem Koth"); diff --git a/Mage/src/main/java/mage/game/command/emblems/LukkaWaywardBonderEmblem.java b/Mage/src/main/java/mage/game/command/emblems/LukkaWaywardBonderEmblem.java index 0bd37b2d9db..ba0000c3b24 100644 --- a/Mage/src/main/java/mage/game/command/emblems/LukkaWaywardBonderEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/LukkaWaywardBonderEmblem.java @@ -17,7 +17,7 @@ import mage.target.common.TargetAnyTarget; */ public final class LukkaWaywardBonderEmblem extends Emblem { - // −7: You get an emblem with "Whenever a creature enters the battlefield under your control, it deals damage equal to its power to any target." + // −7: You get an emblem with "Whenever a creature you control enters, it deals damage equal to its power to any target." public LukkaWaywardBonderEmblem() { super("Emblem Lukka"); Ability ability = new EntersBattlefieldControlledTriggeredAbility( diff --git a/Mage/src/main/java/mage/game/command/emblems/NissaVitalForceEmblem.java b/Mage/src/main/java/mage/game/command/emblems/NissaVitalForceEmblem.java index aec187a3c40..5345cee7b6d 100644 --- a/Mage/src/main/java/mage/game/command/emblems/NissaVitalForceEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/NissaVitalForceEmblem.java @@ -11,7 +11,7 @@ import mage.game.command.Emblem; * @author spjspj */ public final class NissaVitalForceEmblem extends Emblem { - // You get an emblem with "Whenever a land enters the battlefield under your control, you may draw a card." + // You get an emblem with "Whenever a land you control enters, you may draw a card." public NissaVitalForceEmblem() { super("Emblem Nissa"); diff --git a/Mage/src/main/java/mage/game/permanent/token/OutlawsMerrimentRogueToken.java b/Mage/src/main/java/mage/game/permanent/token/OutlawsMerrimentRogueToken.java index 2e7cd9bf643..be167767ae7 100644 --- a/Mage/src/main/java/mage/game/permanent/token/OutlawsMerrimentRogueToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/OutlawsMerrimentRogueToken.java @@ -26,7 +26,7 @@ public final class OutlawsMerrimentRogueToken extends TokenImpl { this.addAbility(HasteAbility.getInstance()); Ability ability = new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(1, "it")) - .setTriggerPhrase("When this creature enters the battlefield, "); + .setTriggerPhrase("When this creature enters, "); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); }