From 50bd6cbc32f33b8563036ef1fadb076e08523cf7 Mon Sep 17 00:00:00 2001 From: ssouders412 Date: Fri, 6 Dec 2019 15:17:44 -0500 Subject: [PATCH] More pronoun fixes --- .../main/java/mage/client/dialog/NewTableDialog.form | 2 +- .../java/mage/client/dialog/NewTournamentDialog.form | 6 +++--- .../src/main/resources/tokens-mtg-onl-list.csv | 4 ++-- .../main/java/mage/server/game/GameController.java | 2 +- Mage.Sets/src/mage/cards/b/BendOrBreak.java | 2 +- Mage.Sets/src/mage/cards/d/DeathOrGlory.java | 2 +- Mage.Sets/src/mage/cards/d/DistantMemories.java | 2 +- Mage.Sets/src/mage/cards/e/EunuchsIntrigues.java | 2 +- Mage.Sets/src/mage/cards/g/GoblinWarCry.java | 2 +- Mage.Sets/src/mage/cards/l/LifesFinale.java | 2 +- Mage.Sets/src/mage/cards/s/StruggleSurvive.java | 2 +- Mage.Sets/src/mage/cards/w/WordOfCommand.java | 2 +- .../test/cards/abilities/flicker/CloudshiftTest.java | 2 +- .../cards/abilities/keywords/SpliceOnArcaneTest.java | 12 ++++++------ .../oneshot/exile/RoonOfTheHiddenRealmTest.java | 2 +- .../mage/test/cards/conditional/TragicSlipTest.java | 2 +- .../org/mage/test/cards/copy/CryptoplasmTest.java | 8 ++++---- .../test/cards/copy/FlameshadowConjuringTest.java | 2 +- .../mage/test/cards/copy/PhyrexianMetamorphTest.java | 6 +++--- .../mage/test/cards/copy/ProgenitorMimicTest.java | 2 +- .../cards/enchantments/AuraTargetRemovedTest.java | 2 +- .../mage/test/cards/single/NecroticPlagueTest.java | 4 ++-- .../mage/test/cards/single/emn/SpellQuellerTest.java | 2 +- .../mage/test/cards/triggers/BurningEarthTest.java | 2 +- .../test/cards/triggers/ShuffleTriggeredTest.java | 2 +- .../test/cards/triggers/dies/AngelicDestinyTest.java | 2 +- .../test/cards/triggers/dies/BrainMaggotTest.java | 4 ++-- .../test/multiplayer/PlayerLeftGameRange1Test.java | 6 +++--- .../test/multiplayer/PlayerLeftGameRangeAllTest.java | 6 +++--- .../mage/abilities/costs/common/PayLifeCost.java | 4 ++-- Mage/src/main/java/mage/players/PlayerImpl.java | 2 +- Utils/mtg-cards-data.txt | 4 ++-- 32 files changed, 53 insertions(+), 53 deletions(-) diff --git a/Mage.Client/src/main/java/mage/client/dialog/NewTableDialog.form b/Mage.Client/src/main/java/mage/client/dialog/NewTableDialog.form index 9cd42978e4a..9765b0e0636 100644 --- a/Mage.Client/src/main/java/mage/client/dialog/NewTableDialog.form +++ b/Mage.Client/src/main/java/mage/client/dialog/NewTableDialog.form @@ -359,7 +359,7 @@ - + diff --git a/Mage.Client/src/main/java/mage/client/dialog/NewTournamentDialog.form b/Mage.Client/src/main/java/mage/client/dialog/NewTournamentDialog.form index 391bb71c50b..903c8c6bf03 100644 --- a/Mage.Client/src/main/java/mage/client/dialog/NewTournamentDialog.form +++ b/Mage.Client/src/main/java/mage/client/dialog/NewTournamentDialog.form @@ -362,7 +362,7 @@ - + @@ -370,13 +370,13 @@ - + - + diff --git a/Mage.Client/src/main/resources/tokens-mtg-onl-list.csv b/Mage.Client/src/main/resources/tokens-mtg-onl-list.csv index 04a297d1447..6c22071ee7b 100644 --- a/Mage.Client/src/main/resources/tokens-mtg-onl-list.csv +++ b/Mage.Client/src/main/resources/tokens-mtg-onl-list.csv @@ -655,7 +655,7 @@ Elemental, 008, G, 2|2, -, Creature - Elemental, Marco Nelor, - Elf Warrior, 009, G, 1|1, -, Creature - Elf Warrior, William O'Connor, - Thopter, 010, -, 1|1, -, Artifact Creature - Thopter, Adam Paquette, Flying Thopter, 011, -, 1|1, -, Artifact Creature - Thopter, Svetlin Velinov, Flying -Jace Emblem, 012, -, -, -, Emblem - Jace, Jaime Jones, Whenever you cast a spell� target opponent puts the top five cards of his or her library into his or her graveyard. +Jace Emblem, 012, -, -, -, Emblem - Jace, Jaime Jones, Whenever you cast a spell� target opponent puts the top five cards of their library into their graveyard. Liliana Emblem, 013, -, -, -, Emblem - Liliana, Karla Ortiz, Whenever a creature dies� return it to the battlefield under your control at the beginning of the next end step. Chandra Emblem, 014, -, -, -, Emblem - Chandra, Eric Deschamps, At the beginning of your upkeep� this emblem deals 3 damage to you. @@ -743,7 +743,7 @@ Clue, 013, -, -, -, Artifact - Clue, Zezhou Chen, {2}‚ Sacrifice this Artifact Clue, 014, -, -, -, Artifact - Clue, Cliff Childs, {2}‚ Sacrifice this Artifact: Draw a card. Clue, 015, -, -, -, Artifact - Clue, James Paick, {2}‚ Sacrifice this Artifact: Draw a card. Clue, 016, -, -, -, Artifact - Clue, Franz Vohwinkel, {2}‚ Sacrifice this Artifact: Draw a card. -Jace Emblem, 017, -, -, -, Emblem - Jace, Tyler Jacobson, Whenever an opponent casts his or her first spell each turn� counter that spell. +Jace Emblem, 017, -, -, -, Emblem - Jace, Tyler Jacobson, Whenever an opponent casts their first spell each turn� counter that spell. Arlinn Emblem, 018, -, -, -, Emblem - Arlinn, Winona Nelson, Creatures you control have haste and '{T}: This creature deals damage equal to its power to any target.' diff --git a/Mage.Server/src/main/java/mage/server/game/GameController.java b/Mage.Server/src/main/java/mage/server/game/GameController.java index 83033d9bb94..356b57ac331 100644 --- a/Mage.Server/src/main/java/mage/server/game/GameController.java +++ b/Mage.Server/src/main/java/mage/server/game/GameController.java @@ -235,7 +235,7 @@ public class GameController implements GameCallback { /** * We create a timer that will run every 250 ms individually for a player - * decreasing his internal game counter. Later on this counter is used to + * decreasing their internal game counter. Later on this counter is used to * get time left to play the whole match. *

* What we also do here is passing Action to PriorityTimer that is the diff --git a/Mage.Sets/src/mage/cards/b/BendOrBreak.java b/Mage.Sets/src/mage/cards/b/BendOrBreak.java index 19cd360d8f9..bc522120400 100644 --- a/Mage.Sets/src/mage/cards/b/BendOrBreak.java +++ b/Mage.Sets/src/mage/cards/b/BendOrBreak.java @@ -146,7 +146,7 @@ class BendOrBreakEffect extends OneShotEffect { if (chosenOpponent != null) { List firstPile = playerPiles.getValue().get(0); List secondPile = playerPiles.getValue().get(1); - game.informPlayers(player.getLogName() + " chose " + chosenOpponent.getLogName() + " to choose his pile"); + game.informPlayers(player.getLogName() + " chose " + chosenOpponent.getLogName() + " to choose their pile"); if (chosenOpponent.choosePile(outcome, "Piles of " + player.getName(), firstPile, secondPile, game)) { List> lists = playerPiles.getValue(); lists.clear(); diff --git a/Mage.Sets/src/mage/cards/d/DeathOrGlory.java b/Mage.Sets/src/mage/cards/d/DeathOrGlory.java index 85efe75cd08..e6d24d81266 100644 --- a/Mage.Sets/src/mage/cards/d/DeathOrGlory.java +++ b/Mage.Sets/src/mage/cards/d/DeathOrGlory.java @@ -100,7 +100,7 @@ class DeathOrGloryEffect extends OneShotEffect { Target targetOpponent = new TargetOpponent(true); if (controller.chooseTarget(Outcome.Neutral, targetOpponent, source, game)) { opponent = game.getPlayer(targetOpponent.getFirstTarget()); - game.informPlayers(controller.getLogName() + " chose " + opponent.getLogName() + " to choose his pile"); + game.informPlayers(controller.getLogName() + " chose " + opponent.getLogName() + " to choose their pile"); } } if (opponent != null) { diff --git a/Mage.Sets/src/mage/cards/d/DistantMemories.java b/Mage.Sets/src/mage/cards/d/DistantMemories.java index 68d8ffe9e72..66d93d9610f 100644 --- a/Mage.Sets/src/mage/cards/d/DistantMemories.java +++ b/Mage.Sets/src/mage/cards/d/DistantMemories.java @@ -70,7 +70,7 @@ class DistantMemoriesEffect extends OneShotEffect { StringBuilder sb = new StringBuilder(); sb.append("Have ").append(player.getLogName()).append(" put ").append(card.getName()); - sb.append(" in his hand? If none of his opponents says yes, he'll draw three cards."); + sb.append(" in their hand? If none of their opponents says yes, they will draw three cards."); boolean putInHand = false; Set opponents = game.getOpponents(source.getControllerId()); diff --git a/Mage.Sets/src/mage/cards/e/EunuchsIntrigues.java b/Mage.Sets/src/mage/cards/e/EunuchsIntrigues.java index 2863433eac6..bb021d44efc 100644 --- a/Mage.Sets/src/mage/cards/e/EunuchsIntrigues.java +++ b/Mage.Sets/src/mage/cards/e/EunuchsIntrigues.java @@ -73,7 +73,7 @@ class EunuchsIntriguesEffect extends OneShotEffect { } Permanent permanent = game.getPermanent(target.getFirstTarget()); if (permanent != null) { - game.informPlayers(player.getLogName() + " has chosen " + permanent.getLogName() + " as his only creature able to block this turn"); + game.informPlayers(player.getLogName() + " has chosen " + permanent.getLogName() + " as their only creature able to block this turn"); } } game.addEffect(new EunuchsIntriguesRestrictionEffect(target.getFirstTarget()), source); diff --git a/Mage.Sets/src/mage/cards/g/GoblinWarCry.java b/Mage.Sets/src/mage/cards/g/GoblinWarCry.java index b7b93d75f8f..57cec6bf6df 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinWarCry.java +++ b/Mage.Sets/src/mage/cards/g/GoblinWarCry.java @@ -73,7 +73,7 @@ class GoblinWarCryEffect extends OneShotEffect { } Permanent permanent = game.getPermanent(target.getFirstTarget()); if (permanent != null) { - game.informPlayers(player.getLogName() + " has chosen " + permanent.getLogName() + " as his only creature able to block this turn"); + game.informPlayers(player.getLogName() + " has chosen " + permanent.getLogName() + " as their only creature able to block this turn"); } } game.addEffect(new GoblinWarCryRestrictionEffect(target.getFirstTarget()), source); diff --git a/Mage.Sets/src/mage/cards/l/LifesFinale.java b/Mage.Sets/src/mage/cards/l/LifesFinale.java index 5c8d83a1384..181dedf212c 100644 --- a/Mage.Sets/src/mage/cards/l/LifesFinale.java +++ b/Mage.Sets/src/mage/cards/l/LifesFinale.java @@ -69,7 +69,7 @@ class LifesFinaleEffect extends OneShotEffect { Player opponent = game.getPlayer(source.getFirstTarget()); Player player = game.getPlayer(source.getControllerId()); if (player != null && opponent != null) { - TargetCardInLibrary target = new TargetCardInLibrary(0, 3, new FilterCreatureCard("creature cards from his library to put in his graveyard")); + TargetCardInLibrary target = new TargetCardInLibrary(0, 3, new FilterCreatureCard("creature cards from their library to put in their graveyard")); if (player.searchLibrary(target, source, game, opponent.getId())) { player.moveCards(new CardsImpl(target.getTargets()), Zone.GRAVEYARD, source, game); } diff --git a/Mage.Sets/src/mage/cards/s/StruggleSurvive.java b/Mage.Sets/src/mage/cards/s/StruggleSurvive.java index fbe4e1050ef..f9a9b6428a8 100644 --- a/Mage.Sets/src/mage/cards/s/StruggleSurvive.java +++ b/Mage.Sets/src/mage/cards/s/StruggleSurvive.java @@ -40,7 +40,7 @@ public final class StruggleSurvive extends SplitCard { // Survive // Aftermath getRightHalfCard().addAbility(new AftermathAbility().setRuleAtTheTop(true)); - // Each player shuffles his or graveyard into their library. + // Each player shuffles their graveyard into their library. getRightHalfCard().getSpellAbility().addEffect(new SurviveEffect()); } diff --git a/Mage.Sets/src/mage/cards/w/WordOfCommand.java b/Mage.Sets/src/mage/cards/w/WordOfCommand.java index 66ed9cacf6e..1feced23134 100644 --- a/Mage.Sets/src/mage/cards/w/WordOfCommand.java +++ b/Mage.Sets/src/mage/cards/w/WordOfCommand.java @@ -98,7 +98,7 @@ class WordOfCommandEffect extends OneShotEffect { controller.controlPlayersTurn(game, targetPlayer.getId()); while (controller.canRespond()) { if (controller.chooseUse(Outcome.Benefit, "Resolve " + sourceObject.getLogName() + " now" + (card != null ? " and play " + card.getLogName() : "") + '?', source, game)) { - // this is used to give the controller a little space to utilize his player controlling effect (look at face down creatures, hand, etc.) + // this is used to give the controller a little space to utilize their player controlling effect (look at face down creatures, hand, etc.) break; } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/flicker/CloudshiftTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/flicker/CloudshiftTest.java index c43846eda9b..edce17b2494 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/flicker/CloudshiftTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/flicker/CloudshiftTest.java @@ -157,7 +157,7 @@ public class CloudshiftTest extends CardTestPlayerBase { /* I had a Stoneforge Mystic equipped with a Umesawa's Jitte. I activated Jitte 4 times to make - Stoneforge Mystic 9/10. My opponent put into play a Flickerwisp with his Aether Vial and + Stoneforge Mystic 9/10. My opponent put into play a Flickerwisp with their Aether Vial and targeted my Stoneforge Mystic. At the end of my turn, Stoneforge Mystic came back as a 9/10, before going down to 1/2 normally once my turn ended. */ diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/SpliceOnArcaneTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/SpliceOnArcaneTest.java index 48f77593810..b0bc8a24a22 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/SpliceOnArcaneTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/SpliceOnArcaneTest.java @@ -133,12 +133,12 @@ public class SpliceOnArcaneTest extends CardTestPlayerBase { * The scenario was that I cast a Nourishing Shoal with a Goryo's Vengeance * spliced to it targeting Griselbrand in my graveyard and exiling * Worldspine Wurm. My opponent responded with a Snapcaster Mage, so to - * deprive him of his ability to reuse his counterspell, I cast the Goryo's - * Vengeance on the Griselbrand. This one resolved. He then used Terminate - * on the Griselbrand after I had activated it once. When the Shoal tried to - * resolve, it should have been countered due to no legal target. However, - * it caused me to gain 11 life. It did not resurrect Griselbrand - * (correctly), but it should have done nothing at all. + * deprive them of their ability to reuse their counterspell, I cast the + * Goryo's Vengeance on the Griselbrand. This one resolved. They then used + * Terminate on the Griselbrand after I had activated it once. When the + * Shoal tried to resolve, it should have been countered due to no legal + * target. However, it caused me to gain 11 life. It did not resurrect + * Griselbrand (correctly), but it should have done nothing at all. *

* I include the info about the Terminate because thinking through, it could * be pertinent. I would guess what is going on here is one of two things. diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/exile/RoonOfTheHiddenRealmTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/exile/RoonOfTheHiddenRealmTest.java index db763c23905..b2c87409486 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/exile/RoonOfTheHiddenRealmTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/exile/RoonOfTheHiddenRealmTest.java @@ -16,7 +16,7 @@ public class RoonOfTheHiddenRealmTest extends CardTestPlayerBase { * Roon of the Hidden Realm is returning cards to their controler's control * instead of the owner's control at the end of the turn. I used his ability * on a Perplexing Chimera I gave my opponent and in the end of the turn it - * returned to the battlefield in his control. + * returned to the battlefield in their control. */ @Test public void testReturnToBattlefieldForOwner() { diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/conditional/TragicSlipTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/conditional/TragicSlipTest.java index 8d272382fbb..012ad3851e0 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/conditional/TragicSlipTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/conditional/TragicSlipTest.java @@ -76,7 +76,7 @@ public class TragicSlipTest extends CardTestPlayerBase { } /* - Killed an opponent's Young Pyromancer with Ulcerate then flashed back Tragic Slip with Snapcaster Mage targeting his Tarmogoyf. + Killed an opponent's Young Pyromancer with Ulcerate then flashed back Tragic Slip with Snapcaster Mage targeting their Tarmogoyf. Morbid didn't seem to work and only applied -1/-1 to the Tarmogoyf. */ @Test diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/CryptoplasmTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/CryptoplasmTest.java index 34c014aed2b..ccd96aab7e7 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/CryptoplasmTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/CryptoplasmTest.java @@ -80,17 +80,17 @@ public class CryptoplasmTest extends CardTestPlayerBase { * that ETB copying the first Cryptoplasm and is currently also a copy of * the Divinity. * - * Opponent attacks with his only Divinity of Pride (4/4) and a Serra + * Opponent attacks with their only Divinity of Pride (4/4) and a Serra * Avenger (3/3). I block the Divinity with two of my Divinity copies (the * Clever Impersonator and unenchanted Cryptoplasm) and the Avenger with the * enchanted Divinity (originally a Cryptoplasm). My opponent's Divinity - * kills my two copies and dies, and then his Avenger dies and kills the + * kills my two copies and dies, and then their Avenger dies and kills the * Divinity blocking it, also sending my Followed Footsteps down with it. * - * How does any of that add up? Not only should his Divinity only kill one + * How does any of that add up? Not only should their Divinity only kill one * of mine since it was a 4/4 and only becomes an 8/8 after dealing its * damage (at which point it should be too late to go back and say the 4 - * damage are now 8, since it was that exact damage that put him at 25 + * damage are now 8, since it was that exact damage that put them at 25 * life), but even more confusing is how the Serra Avenger, which is a 3/3, * somehow kills my 4/4 that had suffered no other damage that turn. * 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 45f73814ff0..c44d26f8f1a 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 @@ -14,7 +14,7 @@ public class FlameshadowConjuringTest extends CardTestPlayerBase { /** * My opponent ran into an issue with Priest of the Blood Rite being copied - * with Flameshadow Conjuring. His copy was made and removed correctly at + * with Flameshadow Conjuring. Their copy was made and removed correctly at * the end of the turn, but the "lose two life a turn" trigger still * happened twice. * diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/PhyrexianMetamorphTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/PhyrexianMetamorphTest.java index 3f460b1b7d8..2ee953c2cca 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/PhyrexianMetamorphTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/PhyrexianMetamorphTest.java @@ -52,9 +52,9 @@ public class PhyrexianMetamorphTest extends CardTestPlayerBase { * An opponent cast Phyrexian Metamorph and cloned another opponent's * Maelstrom Wanderer(his Commander). The first opponent then dealt combat * damage with Brago, King Eternal and chose to flicker several permanents, - * including the Phyrexian Metamorph/Maelstrom Wanderer, but he was not able - * to choose a new creature to clone when the Phyrexian Metamorph re-entered - * the battlefield. + * including the Phyrexian Metamorph/Maelstrom Wanderer, but that player was + * not able to choose a new creature to clone when the Phyrexian Metamorph + * re-entered the battlefield. */ @Test public void testFlickerWithBrago() { diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/ProgenitorMimicTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/ProgenitorMimicTest.java index fe8749ad39f..099e844a8c5 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/ProgenitorMimicTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/ProgenitorMimicTest.java @@ -140,7 +140,7 @@ public class ProgenitorMimicTest extends CardTestPlayerBase { * In a Commander FFA game, I controlled 5 vampires (one of which was * Captivating Vampire). My opponent cast Progenitor Mimic, copying * Captivating Vampire. I used the ability of my Captivating Vampire to gain - * control of his Mimic/Vampire but the buff didn't switch control. His + * control of their Mimic/Vampire but the buff didn't switch control. Their * other vampire still got the buff even after I gained control of the * Mimic/Vampire. * diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/AuraTargetRemovedTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/AuraTargetRemovedTest.java index e43e34d3054..ce3cc0de6ae 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/AuraTargetRemovedTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/AuraTargetRemovedTest.java @@ -18,7 +18,7 @@ public class AuraTargetRemovedTest extends CardTestPlayerBase { /** * Spreading Seas is bugged, opp casted it on my Field of Ruin, I sacced - * with the spell on stack but it resolved anyway and let him draw. + * with the spell on stack but it resolved anyway and let them draw. * * 303.4. Some enchantments have the subtype “Aura.” An Aura enters the * battlefield attached to an object or player. What an Aura can be attached diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/NecroticPlagueTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/NecroticPlagueTest.java index 92b75b2363b..5279a89f60c 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/NecroticPlagueTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/NecroticPlagueTest.java @@ -49,8 +49,8 @@ public class NecroticPlagueTest extends CardTestPlayerBase { * Enchantment — Aura, 2BB * Enchant creature * Enchanted creature has "At the beginning of your upkeep, sacrifice this creature." - * When enchanted creature dies, its controller chooses target creature one of his or - * her opponents controls. Return Necrotic Plague from its owner's graveyard to the + * When enchanted creature dies, its controller chooses target creature one of their + * opponents controls. Return Necrotic Plague from its owner's graveyard to the * battlefield attached to that creature. */ addCard(Zone.HAND, playerA, "Necrotic Plague"); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/emn/SpellQuellerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/emn/SpellQuellerTest.java index 9e3444e4434..d22b896bb53 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/emn/SpellQuellerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/emn/SpellQuellerTest.java @@ -99,7 +99,7 @@ public class SpellQuellerTest extends CardTestPlayerBase { } /* - Reported bug: "...Spell Queller exiled my Nissa, Vastwood Seeker. Next turn he processed Nissa with Wasteland Strangler and killed my Tireless Tracker. + Reported bug: "...Spell Queller exiled my Nissa, Vastwood Seeker. Next turn they processed Nissa with Wasteland Strangler and killed my Tireless Tracker. I then cast Quarantine Field, targeting Spell Queller and Wasteland Strangler. That's when the error message occurred. (fatal exception)" */ @Test diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/BurningEarthTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/BurningEarthTest.java index bbac577627d..aa508dbc3c3 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/BurningEarthTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/BurningEarthTest.java @@ -15,7 +15,7 @@ public class BurningEarthTest extends CardTestPlayerBase { /** * Burning Earth - It doesn't cause the damage it should. My opponent taps a * Blood Crypt and an Overgrown Tomb for black and green mana respectively - * and casts his card all the while without taking any damage. + * and casts their card all the while without taking any damage. * */ @Test diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/ShuffleTriggeredTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/ShuffleTriggeredTest.java index cf9d060c258..a9a4441891e 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/ShuffleTriggeredTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/ShuffleTriggeredTest.java @@ -40,7 +40,7 @@ public class ShuffleTriggeredTest extends CardTestPlayerBase { * lasse, dann triggert Widespread Panic für ihn (sollte garnicht triggern). * Bei Bribery ist es genauso. * - * If I have an opponent shuffle his library using Knowledge Exploitation, Widespread Panic triggers for him (shoudn't trigger at all). Same thing with Bribery. + * If I have an opponent shuffle their library using Knowledge Exploitation, Widespread Panic triggers for them (shoudn't trigger at all). Same thing with Bribery. */ @Test public void testWidespreadPanicDoesNotTriggerIfOpponentShufflesPlayersLibrary() { 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 6573112ac98..0bbabe8c79e 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 @@ -16,7 +16,7 @@ public class AngelicDestinyTest extends CardTestPlayerBase { /** * I killed my opponent's Champion of the Parish, which was enchanted with Angelic Destiny. - * However the Angelic Destiny went to the graveyard instead of returning his hand. + * However the Angelic Destiny went to the graveyard instead of returning to their hand. * */ @Test diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/BrainMaggotTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/BrainMaggotTest.java index f77652b4dd0..02a8f7760c2 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/BrainMaggotTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/BrainMaggotTest.java @@ -11,8 +11,8 @@ import org.mage.test.serverside.base.CardTestPlayerBase; public class BrainMaggotTest extends CardTestPlayerBase { /** - * When Brain Maggot enters the battlefield, target opponent reveals his or - * her hand and you choose a nonland card from it. Exile that card until + * When Brain Maggot enters the battlefield, target opponent reveals their + * hand and you choose a nonland card from it. Exile that card until * Brain Maggot leaves the battlefield. */ @Test diff --git a/Mage.Tests/src/test/java/org/mage/test/multiplayer/PlayerLeftGameRange1Test.java b/Mage.Tests/src/test/java/org/mage/test/multiplayer/PlayerLeftGameRange1Test.java index 33caa0d94ab..c37ce869a23 100644 --- a/Mage.Tests/src/test/java/org/mage/test/multiplayer/PlayerLeftGameRange1Test.java +++ b/Mage.Tests/src/test/java/org/mage/test/multiplayer/PlayerLeftGameRange1Test.java @@ -125,9 +125,9 @@ public class PlayerLeftGameRange1Test extends CardTestMultiPlayerBase { * source if it has a proc. To reproduce, a Planeswalker was taken from an * original player's control, such as using Scrambleverse to shuffle Jace, * Unraveler of Secrets, to a second player and then the second player uses - * Jace's ability to create an emblem ("Whenever an opponent casts his or - * her first spell each turn, counter that spell."). Then the original - * player concedes the game and removes the Planeswalker. Once it becomes an + * Jace's ability to create an emblem ("Whenever an opponent casts their + * first spell each turn, counter that spell."). Then the original player + * concedes the game and removes the Planeswalker. Once it becomes an * opponent of the original player's turn and that opponent plays a spell, * Xmage throws an error and rollsback the turn. *

diff --git a/Mage.Tests/src/test/java/org/mage/test/multiplayer/PlayerLeftGameRangeAllTest.java b/Mage.Tests/src/test/java/org/mage/test/multiplayer/PlayerLeftGameRangeAllTest.java index caef3748b3e..d01e7938ed3 100644 --- a/Mage.Tests/src/test/java/org/mage/test/multiplayer/PlayerLeftGameRangeAllTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/multiplayer/PlayerLeftGameRangeAllTest.java @@ -124,9 +124,9 @@ public class PlayerLeftGameRangeAllTest extends CardTestMultiPlayerBase { * source if it has a proc. To reproduce, a Planeswalker was taken from an * original player's control, such as using Scrambleverse to shuffle Jace, * Unraveler of Secrets, to a second player and then the second player uses - * Jace's ability to create an emblem ("Whenever an opponent casts his or - * her first spell each turn, counter that spell."). Then the original - * player concedes the game and removes the Planeswalker. Once it becomes an + * Jace's ability to create an emblem ("Whenever an opponent casts their + * first spell each turn, counter that spell."). Then the original player + * concedes the game and removes the Planeswalker. Once it becomes an * opponent of the original player's turn and that opponent plays a spell, * Xmage throws an error and rollsback the turn. *

diff --git a/Mage/src/main/java/mage/abilities/costs/common/PayLifeCost.java b/Mage/src/main/java/mage/abilities/costs/common/PayLifeCost.java index a2905ea8313..332b6545b01 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/PayLifeCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/PayLifeCost.java @@ -36,8 +36,8 @@ public class PayLifeCost extends CostImpl { public boolean canPay(Ability ability, UUID sourceId, UUID controllerId, Game game) { //118.4. If a cost or effect allows a player to pay an amount of life greater than 0, //the player may do so only if their life total is greater than or equal to the - //amount of the payment. If a player pays life, the payment is subtracted from his or - //her life total; in other words, the player loses that much life. (Players can always pay 0 life.) + //amount of the payment. If a player pays life, the payment is subtracted from their + //life total; in other words, the player loses that much life. (Players can always pay 0 life.) int lifeToPayAmount = amount.calculate(game, ability, null); // Paying 0 life is not considered paying any life. if (lifeToPayAmount > 0 && !game.getPlayer(controllerId).canPayLifeCost()) { diff --git a/Mage/src/main/java/mage/players/PlayerImpl.java b/Mage/src/main/java/mage/players/PlayerImpl.java index 93768f59e92..77aa858ddc6 100644 --- a/Mage/src/main/java/mage/players/PlayerImpl.java +++ b/Mage/src/main/java/mage/players/PlayerImpl.java @@ -112,7 +112,7 @@ public abstract class PlayerImpl implements Player, Serializable { protected boolean passedUntilEndStepBeforeMyTurn; // F11 protected boolean skippedAtLeastOnce; // used to track if passed started in specific phase /** - * This indicates that player passed all turns until his own turn starts + * This indicates that player passed all turns until their own turn starts * (F9). Note! This differs from passedTurn as it doesn't care about spells * and abilities in the stack and will pass them as well. */ diff --git a/Utils/mtg-cards-data.txt b/Utils/mtg-cards-data.txt index e14ac90dabf..d56646a2141 100644 --- a/Utils/mtg-cards-data.txt +++ b/Utils/mtg-cards-data.txt @@ -32242,7 +32242,7 @@ Unraveling Mummy|Hour of Devastation|147|U|{1}{W}{B}|Creature - Zombie|2|3|{1}{W Farm // Market|Hour of Devastation|148|U|{2}{W}|Instant|||Destroy target attacking or blocking creature.$Market {2}{U}$Sorcery$Aftermath (Cast this spell only from your graveyard. Then exile it.)$Draw two cards, then discard two cards| Consign // Oblivion|Hour of Devastation|149|U|{1}{U}|Instant|||Return target nonland permanent to its owner's hand.$Oblivion {4}{B}$Sorcery$Aftermath (Cast this spell only from your graveyard. Then exile it.)$Target opponent discards two cards.| Claim // Fame|Hour of Devastation|150|U|{B}|Sorcery|||Return target creature card with converted mana cost 2 or less from your graveyard to the battlefield.$Fame {1}{R}$Sorcery$Aftermath (Cast this spell only from your graveyard. Then exile it.)$Target creature gets +2/+0 and gains haste until end of turn.| -Struggle // Survive|Hour of Devastation|151|U|{2}{R}|Instant|||Struggle deals damage to target creature equal to the number of lands you control.$Survive {1}{G}$Sorcery$Aftermath (Cast this spell only from your graveyard. Then exile it.)$Each player shuffles his or graveyard into their library.| +Struggle // Survive|Hour of Devastation|151|U|{2}{R}|Instant|||Struggle deals damage to target creature equal to the number of lands you control.$Survive {1}{G}$Sorcery$Aftermath (Cast this spell only from your graveyard. Then exile it.)$Each player shuffles their graveyard into their library.| Appeal // Authority|Hour of Devastation|152|U|{G}|Sorcery|||Until end of turn, target creature gains trample and gets +X/+X, where X is the number of creatures you control.$Authority {1}{W}$Sorcery$Aftermath (Cast this spell only from your graveyard. Then exile it.)$Tap up to two target creatures your opponents control. Creatures you control gain vigilance until end of turn.| Leave // Chance|Hour of Devastation|153|R|{1}{W}|Instant|||Return any number of target permanents you own to your hand.$Chance {3}{R}$Sorcery$Aftermath (Cast this spell only from your graveyard. Then exile it.)$Discard any number of cards, then draw that many cards.| Reason // Believe|Hour of Devastation|154|R|{U}|Sorcery|||Scry 3.$Believe {4}{G}$Sorcery$Aftermath$Look at the top card of your library. You may put it onto the battlefield if it's a creature card. If you don't, put it into your hand.| @@ -32901,7 +32901,7 @@ Gnome-Made Engine|Unstable|148|C|{4}|Host Creature - Construct|2|2|When this cre Ground Pounder|Unstable|110|C|{1}{G}|Creature - Goblin Warrior|2|2|3G: Roll a six-sided die. Ground Pounder gets +X/+X until end of turn, where X is the result.$Whenever you roll a 5 or higher on a die, Ground Pounder gains trample until end of turn.| Hammer Helper|Unstable|85|C|{3}{R}|Sorcery|||Gain control of target creature until end of turn. Untap that creature and roll a six-sided die. Until end of turn, it gains haste and gets +X/+0, where X is the result.| Hammer Jammer|Unstable|86|U|{3}{R}|Creature - Goblin Warrior|0|0|As Hammer Jammer enters the battlefield, roll a six-sided die. Hammer Jammer enters the battlefield with a number of +1/+1 counters on it equal to the result.$Whenever you roll a die, remove all +1/+1 counters from Hammer Jammer, then put a number of +1/+1 counters on it equal to the result.| -Hangman|Unstable|56|R|{B}|Creature - Human Villain|1|1|As Hangman enters the battlefield, secretly note a word with six to eight letters.$1: Target player who doesn't control Hangman guesses he noted word or an unguessed letter in that word. If they guess wrong, put a +1/+1 counter on Hangman. Any player may activate this ability.$When a player guesses the noted word of all of its letters, sacrifice Hangman.| +Hangman|Unstable|56|R|{B}|Creature - Human Villain|1|1|As Hangman enters the battlefield, secretly note a word with six to eight letters.$1: Target player who doesn't control Hangman guesses the noted word or an unguessed letter in that word. If they guess wrong, put a +1/+1 counter on Hangman. Any player may activate this ability.$When a player guesses the noted word of all of its letters, sacrifice Hangman.| Hazmat Suit (Used)|Unstable|57|C|{3}{B}|Enchantment - Aura|||Enchant creature$Enchanted creature gets +2/+1 and has menace.$Whenever a player's skin or fingernail touches enchanted creature, that player loses 2 life.| Hot Fix|Unstable|133|R|{4}{W}{U}|Sorcery||| You have ten seconds to look at and rearrange the cards in your library. At the end of those ten seconds, if you're touching one or more of those cards, shuffle your library.| Hydradoodle|Unstable|112|R|{X}{X}{G}{G}|Creature - Hydra Hound|0|0|As Hydradoodle enters the battlefield, roll X six-sided dice. Hydradoodle enters the battlefield with s number of +1/+1 counters on it equal to the total of those results.$Reach, trample|