From a60aba3458092c3631dfb3e3f489804278fc0358 Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Thu, 20 May 2021 20:36:37 -0400 Subject: [PATCH] some user dialog changes --- .../src/mage/cards/a/AetherbornMarauder.java | 2 +- .../src/mage/cards/a/ArsenalThresher.java | 2 +- Mage.Sets/src/mage/cards/b/Bioshift.java | 2 +- .../src/mage/cards/b/BrilliantUltimatum.java | 2 +- Mage.Sets/src/mage/cards/c/Clockspinning.java | 4 +- .../src/mage/cards/d/DarkSupplicant.java | 6 +- Mage.Sets/src/mage/cards/d/Dismantle.java | 2 +- Mage.Sets/src/mage/cards/f/FalseOrders.java | 2 +- .../src/mage/cards/f/ForgottenAncient.java | 2 +- .../src/mage/cards/g/GateToTheAfterlife.java | 6 +- .../src/mage/cards/g/GrovetenderDruids.java | 50 ++------------ Mage.Sets/src/mage/cards/h/HeartlessAct.java | 2 +- Mage.Sets/src/mage/cards/h/HexParasite.java | 2 +- .../src/mage/cards/k/KefnetTheMindful.java | 2 +- .../src/mage/cards/m/MysticMeditation.java | 66 ++++--------------- .../src/mage/cards/p/PriceOfBetrayal.java | 4 +- Mage.Sets/src/mage/cards/q/QuarryHauler.java | 2 +- .../src/mage/cards/t/TergridGodOfFright.java | 4 +- Mage.Sets/src/mage/cards/w/WalkingSponge.java | 2 +- .../effects/common/HideawayPlayEffect.java | 2 +- .../LookLibraryTopCardTargetPlayerEffect.java | 2 +- ...seAbilityOrAnotherAbilityTargetEffect.java | 2 +- .../main/java/mage/players/PlayerImpl.java | 2 +- 23 files changed, 47 insertions(+), 125 deletions(-) diff --git a/Mage.Sets/src/mage/cards/a/AetherbornMarauder.java b/Mage.Sets/src/mage/cards/a/AetherbornMarauder.java index e2ef434a570..b2925e58532 100644 --- a/Mage.Sets/src/mage/cards/a/AetherbornMarauder.java +++ b/Mage.Sets/src/mage/cards/a/AetherbornMarauder.java @@ -89,7 +89,7 @@ class AetherbornMarauderEffect extends OneShotEffect { int numberOfCounters = fromPermanent.getCounters(game).getCount(CounterType.P1P1); int numberToMove = 1; if (numberOfCounters > 1) { - numberToMove = controller.getAmount(0, numberOfCounters, "How many +1/+1 counters do you want to move?", game); + numberToMove = controller.getAmount(0, numberOfCounters, "Choose how many +1/+1 counters to move", game); } if (numberToMove > 0) { fromPermanent.removeCounters(CounterType.P1P1.createInstance(numberToMove), source, game); diff --git a/Mage.Sets/src/mage/cards/a/ArsenalThresher.java b/Mage.Sets/src/mage/cards/a/ArsenalThresher.java index 34cd1a9338c..168f8b8e264 100644 --- a/Mage.Sets/src/mage/cards/a/ArsenalThresher.java +++ b/Mage.Sets/src/mage/cards/a/ArsenalThresher.java @@ -76,7 +76,7 @@ class ArsenalThresherEffect extends OneShotEffect { Permanent arsenalThresher = game.getPermanentEntering(source.getSourceId()); FilterArtifactCard filter = new FilterArtifactCard(); filter.add(new AnotherCardPredicate()); - if (controller.chooseUse(Outcome.Benefit, "Do you want to reveal other artifacts in your hand?", source, game)) { + if (controller.chooseUse(Outcome.Benefit, "Reveal other artifacts in your hand?", source, game)) { Cards cards = new CardsImpl(); if (controller.getHand().count(filter, source.getSourceId(), source.getControllerId(), game) > 0) { TargetCardInHand target = new TargetCardInHand(0, Integer.MAX_VALUE, filter); diff --git a/Mage.Sets/src/mage/cards/b/Bioshift.java b/Mage.Sets/src/mage/cards/b/Bioshift.java index edbd85651ed..9725347d4c7 100644 --- a/Mage.Sets/src/mage/cards/b/Bioshift.java +++ b/Mage.Sets/src/mage/cards/b/Bioshift.java @@ -87,7 +87,7 @@ class MoveCounterFromTargetToTargetEffect extends OneShotEffect { } int amountCounters = fromPermanent.getCounters(game).getCount(CounterType.P1P1); if (amountCounters > 0) { - int amountToMove = controller.getAmount(0, amountCounters, "How many counters do you want to move?", game); + int amountToMove = controller.getAmount(0, amountCounters, "Choose how many counters to move", game); if (amountToMove > 0) { fromPermanent.removeCounters(CounterType.P1P1.createInstance(amountToMove), source, game); toPermanent.addCounters(CounterType.P1P1.createInstance(amountToMove), source.getControllerId(), source, game); diff --git a/Mage.Sets/src/mage/cards/b/BrilliantUltimatum.java b/Mage.Sets/src/mage/cards/b/BrilliantUltimatum.java index d18eb554201..aa914cfbe47 100644 --- a/Mage.Sets/src/mage/cards/b/BrilliantUltimatum.java +++ b/Mage.Sets/src/mage/cards/b/BrilliantUltimatum.java @@ -106,7 +106,7 @@ class BrilliantUltimatumEffect extends OneShotEffect { selectedPile = pile2; } game.informPlayers(controller.getLogName() + " chose " + selectedPileName + '.'); - while (!selectedPileCards.isEmpty() && controller.chooseUse(Outcome.PlayForFree, "Do you want to play a card for free from " + selectedPileName + '?', source, game)) { + while (!selectedPileCards.isEmpty() && controller.chooseUse(Outcome.PlayForFree, "Play a card for free from " + selectedPileName + '?', source, game)) { TargetCard targetExiledCard = new TargetCard(Zone.EXILED, new FilterCard()); if (controller.chooseTarget(Outcome.PlayForFree, selectedPile, targetExiledCard, source, game)) { Card card = selectedPile.get(targetExiledCard.getFirstTarget(), game); diff --git a/Mage.Sets/src/mage/cards/c/Clockspinning.java b/Mage.Sets/src/mage/cards/c/Clockspinning.java index 644ed9988f9..5dcbb3b8adb 100644 --- a/Mage.Sets/src/mage/cards/c/Clockspinning.java +++ b/Mage.Sets/src/mage/cards/c/Clockspinning.java @@ -134,7 +134,7 @@ class ClockspinningAddOrRemoveCounterEffect extends OneShotEffect { Permanent permanent = game.getPermanent(source.getFirstTarget()); if (player != null && permanent != null) { - if (player.chooseUse(Outcome.Neutral, "Do you want to to remove a counter?", source, game)) { + if (player.chooseUse(Outcome.Neutral, "Remove a counter?", source, game)) { RemoveCounterTargetEffect effect = new RemoveCounterTargetEffect(); effect.setTargetPointer(new FixedTarget(source.getFirstTarget())); effect.apply(game, source); @@ -152,7 +152,7 @@ class ClockspinningAddOrRemoveCounterEffect extends OneShotEffect { Card card = game.getCard(source.getFirstTarget()); if (player != null && card != null) { - if (player.chooseUse(Outcome.Neutral, "Do you want to to remove a counter?", source, game)) { + if (player.chooseUse(Outcome.Neutral, "Remove a counter?", source, game)) { Counter counter = selectCounterType(game, source, card); RemoveCounterTargetEffect effect = new RemoveCounterTargetEffect(counter); effect.setTargetPointer(new FixedTarget(source.getFirstTarget())); diff --git a/Mage.Sets/src/mage/cards/d/DarkSupplicant.java b/Mage.Sets/src/mage/cards/d/DarkSupplicant.java index 779092d0184..401686a3013 100644 --- a/Mage.Sets/src/mage/cards/d/DarkSupplicant.java +++ b/Mage.Sets/src/mage/cards/d/DarkSupplicant.java @@ -87,7 +87,7 @@ class DarkSupplicantEffect extends OneShotEffect { } Card selectedCard = null; // Graveyard check - if (controller.chooseUse(Outcome.Benefit, "Do you want to search your graveyard for Scion of Darkness?", source, game)) { + if (controller.chooseUse(Outcome.Benefit, "Search your graveyard for Scion of Darkness?", source, game)) { TargetCardInYourGraveyard target = new TargetCardInYourGraveyard(1, 1, filter, true); if (controller.choose(outcome, controller.getGraveyard(), target, game)) { selectedCard = game.getCard(target.getFirstTarget()); @@ -95,7 +95,7 @@ class DarkSupplicantEffect extends OneShotEffect { } // Hand check if (selectedCard == null - && controller.chooseUse(Outcome.Benefit, "Do you want to search your hand for Scion of Darkness?", source, game)) { + && controller.chooseUse(Outcome.Benefit, "Search your hand for Scion of Darkness?", source, game)) { TargetCardInHand target = new TargetCardInHand(0, 1, filter); if (controller.choose(Outcome.PutCardInPlay, controller.getHand(), target, game)) { if (!target.getTargets().isEmpty()) { @@ -106,7 +106,7 @@ class DarkSupplicantEffect extends OneShotEffect { // Library check boolean librarySearched = false; if (selectedCard == null - && controller.chooseUse(Outcome.Benefit, "Do you want to search your library for Scion of Darkness?", source, game)) { + && controller.chooseUse(Outcome.Benefit, "Search your library for Scion of Darkness?", source, game)) { librarySearched = true; TargetCardInLibrary target = new TargetCardInLibrary(0, 1, filter); if (controller.searchLibrary(target, source, game)) { diff --git a/Mage.Sets/src/mage/cards/d/Dismantle.java b/Mage.Sets/src/mage/cards/d/Dismantle.java index 12737c8bd63..023f24e1121 100644 --- a/Mage.Sets/src/mage/cards/d/Dismantle.java +++ b/Mage.Sets/src/mage/cards/d/Dismantle.java @@ -76,7 +76,7 @@ class DismantleEffect extends OneShotEffect { controller.chooseTarget(Outcome.Benefit, target, source, game); Permanent artifact = game.getPermanent(target.getFirstTarget()); Counter counter; - if (controller.chooseUse(Outcome.BoostCreature, "What kind of counters do you want to add?", null, "+1/+1 counters", "Charge counters", source, game)) { + if (controller.chooseUse(Outcome.BoostCreature, "Choose which kind of counters to add", null, "+1/+1 counters", "Charge counters", source, game)) { counter = CounterType.P1P1.createInstance(counterCount); } else { counter = CounterType.CHARGE.createInstance(counterCount); diff --git a/Mage.Sets/src/mage/cards/f/FalseOrders.java b/Mage.Sets/src/mage/cards/f/FalseOrders.java index e574c8ffd5a..48ae91f3336 100644 --- a/Mage.Sets/src/mage/cards/f/FalseOrders.java +++ b/Mage.Sets/src/mage/cards/f/FalseOrders.java @@ -115,7 +115,7 @@ class FalseOrdersUnblockEffect extends OneShotEffect { } if (!permanent.isCreature() - || !controller.chooseUse(Outcome.Benefit, "Do you want " + permanent.getLogName() + " to block an attacking creature?", source, game)) { + || !controller.chooseUse(Outcome.Benefit, "Have " + permanent.getLogName() + " block an attacking creature?", source, game)) { return false; } // Choose new creature to block diff --git a/Mage.Sets/src/mage/cards/f/ForgottenAncient.java b/Mage.Sets/src/mage/cards/f/ForgottenAncient.java index 69b10c65aea..c255352f377 100644 --- a/Mage.Sets/src/mage/cards/f/ForgottenAncient.java +++ b/Mage.Sets/src/mage/cards/f/ForgottenAncient.java @@ -105,7 +105,7 @@ public final class ForgottenAncient extends CardImpl { break; } - int amountToMove = controller.getAmount(0, numCounters, "How many counters do you want to move? " + '(' + numCounters + ')' + " counters remaining.", game); + int amountToMove = controller.getAmount(0, numCounters, "Choose how many counters to move (" + numCounters + " counters remaining.)", game); if (amountToMove == 0) { break; } diff --git a/Mage.Sets/src/mage/cards/g/GateToTheAfterlife.java b/Mage.Sets/src/mage/cards/g/GateToTheAfterlife.java index 336f6185f0d..4f357053d6a 100644 --- a/Mage.Sets/src/mage/cards/g/GateToTheAfterlife.java +++ b/Mage.Sets/src/mage/cards/g/GateToTheAfterlife.java @@ -103,14 +103,14 @@ class GateToTheAfterlifeEffect extends OneShotEffect { filter.add(new NamePredicate(cardName)); Card card = null; // Graveyard check - if (controller.chooseUse(Outcome.Benefit, "Do you want to search your graveyard for " + cardName + "?", source, game)) { + if (controller.chooseUse(Outcome.Benefit, "Search your graveyard for " + cardName + "?", source, game)) { TargetCardInYourGraveyard target = new TargetCardInYourGraveyard(1, 1, filter, true); if (controller.choose(outcome, controller.getGraveyard(), target, game)) { card = game.getCard(target.getFirstTarget()); } } // Hand check - if (card == null && controller.chooseUse(Outcome.Benefit, "Do you want to search your hand for " + cardName + "?", source, game)) { + if (card == null && controller.chooseUse(Outcome.Benefit, "Search your hand for " + cardName + "?", source, game)) { TargetCardInHand target = new TargetCardInHand(0, 1, filter); if (controller.choose(Outcome.PutCardInPlay, controller.getHand(), target, game)) { card = game.getCard(target.getFirstTarget()); @@ -118,7 +118,7 @@ class GateToTheAfterlifeEffect extends OneShotEffect { } // Library check boolean librarySearched = false; - if (card == null && controller.chooseUse(Outcome.Benefit, "Do you want to search your library for " + cardName + "?", source, game)) { + if (card == null && controller.chooseUse(Outcome.Benefit, "Search your library for " + cardName + "?", source, game)) { librarySearched = true; TargetCardInLibrary target = new TargetCardInLibrary(filter); if (controller.searchLibrary(target, source, game)) { diff --git a/Mage.Sets/src/mage/cards/g/GrovetenderDruids.java b/Mage.Sets/src/mage/cards/g/GrovetenderDruids.java index 31aa434afbc..9dc4ed96cef 100644 --- a/Mage.Sets/src/mage/cards/g/GrovetenderDruids.java +++ b/Mage.Sets/src/mage/cards/g/GrovetenderDruids.java @@ -1,25 +1,19 @@ - package mage.cards.g; -import java.util.UUID; import mage.MageInt; -import mage.abilities.Ability; import mage.abilities.common.AllyEntersBattlefieldTriggeredAbility; -import mage.abilities.costs.Cost; -import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.OneShotEffect; +import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.CreateTokenEffect; +import mage.abilities.effects.common.DoIfCostPaid; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.constants.Outcome; -import mage.game.Game; import mage.game.permanent.token.GrovetenderDruidsPlantToken; -import mage.players.Player; + +import java.util.UUID; /** - * * @author fireshoes */ public final class GrovetenderDruids extends CardImpl { @@ -34,7 +28,9 @@ public final class GrovetenderDruids extends CardImpl { // Rally-Whenever Grovetender Druids or another Ally enters the battlefield under your control, you may pay {1}. // If you do, create a 1/1 green Plant creature token. - this.addAbility(new AllyEntersBattlefieldTriggeredAbility(new GrovetenderDruidsEffect(), false)); + this.addAbility(new AllyEntersBattlefieldTriggeredAbility(new DoIfCostPaid( + new CreateTokenEffect(new GrovetenderDruidsPlantToken()), new GenericManaCost(1) + ), false)); } private GrovetenderDruids(final GrovetenderDruids card) { @@ -46,35 +42,3 @@ public final class GrovetenderDruids extends CardImpl { return new GrovetenderDruids(this); } } - -class GrovetenderDruidsEffect extends OneShotEffect { - - GrovetenderDruidsEffect() { - super(Outcome.Benefit); - this.staticText = "you may pay {1}. If you do, create a 1/1 green Plant creature token"; - } - - GrovetenderDruidsEffect(final GrovetenderDruidsEffect effect) { - super(effect); - } - - @Override - public GrovetenderDruidsEffect copy() { - return new GrovetenderDruidsEffect(this); - } - - @Override - public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(source.getControllerId()); - if (player != null) { - if (player.chooseUse(Outcome.BoostCreature, "Do you want to to pay {1}?", source, game)) { - Cost cost = new ManaCostsImpl("{1}"); - if (cost.pay(source, game, source, source.getControllerId(), false, null)) { - new CreateTokenEffect(new GrovetenderDruidsPlantToken()).apply(game, source); - } - return true; - } - } - return false; - } -} diff --git a/Mage.Sets/src/mage/cards/h/HeartlessAct.java b/Mage.Sets/src/mage/cards/h/HeartlessAct.java index 756e690cf84..8d487fd7fb8 100644 --- a/Mage.Sets/src/mage/cards/h/HeartlessAct.java +++ b/Mage.Sets/src/mage/cards/h/HeartlessAct.java @@ -85,7 +85,7 @@ class HeartlessActEffect extends OneShotEffect { int removed = 0; String[] counterNames = permanent.getCounters(game).keySet().toArray(new String[0]); for (String counterName : counterNames) { - if (controller.chooseUse(Outcome.Neutral, "Do you want to remove " + counterName + " counters?", source, game)) { + if (controller.chooseUse(Outcome.Neutral, "Remove " + counterName + " counters?", source, game)) { if (permanent.getCounters(game).get(counterName).getCount() == 1 || (toRemove - removed == 1)) { permanent.removeCounters(counterName, 1, source, game); removed++; diff --git a/Mage.Sets/src/mage/cards/h/HexParasite.java b/Mage.Sets/src/mage/cards/h/HexParasite.java index 784bb1da1f4..1bcdd38ad9c 100644 --- a/Mage.Sets/src/mage/cards/h/HexParasite.java +++ b/Mage.Sets/src/mage/cards/h/HexParasite.java @@ -71,7 +71,7 @@ class HexParasiteEffect extends OneShotEffect { int removed = 0; String[] counterNames = permanent.getCounters(game).keySet().toArray(new String[0]); for (String counterName : counterNames) { - if (controller.chooseUse(Outcome.Neutral, "Do you want to remove " + counterName + " counters?", source, game)) { + if (controller.chooseUse(Outcome.Neutral, "Remove " + counterName + " counters?", source, game)) { if (permanent.getCounters(game).get(counterName).getCount() == 1 || (toRemove - removed == 1)) { permanent.removeCounters(counterName, 1, source, game); removed++; diff --git a/Mage.Sets/src/mage/cards/k/KefnetTheMindful.java b/Mage.Sets/src/mage/cards/k/KefnetTheMindful.java index 36cbea85870..8587996f804 100644 --- a/Mage.Sets/src/mage/cards/k/KefnetTheMindful.java +++ b/Mage.Sets/src/mage/cards/k/KefnetTheMindful.java @@ -116,7 +116,7 @@ class KefnetTheMindfulEffect extends OneShotEffect { Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { controller.drawCards(1, source, game); - if (controller.chooseUse(Outcome.AIDontUseIt, "Do you want to return a land you control to its owner's hand?", null, "Yes", "No", source, game)) { + if (controller.chooseUse(Outcome.AIDontUseIt, "Return a land you control to its owner's hand?", source, game)) { Effect effect = new ReturnToHandChosenControlledPermanentEffect(filterControlledLand); effect.apply(game, source); } diff --git a/Mage.Sets/src/mage/cards/m/MysticMeditation.java b/Mage.Sets/src/mage/cards/m/MysticMeditation.java index 5b58b3f3cff..92a2ae00520 100644 --- a/Mage.Sets/src/mage/cards/m/MysticMeditation.java +++ b/Mage.Sets/src/mage/cards/m/MysticMeditation.java @@ -1,34 +1,31 @@ - package mage.cards.m; -import java.util.UUID; -import mage.abilities.Ability; -import mage.abilities.costs.Cost; -import mage.abilities.costs.common.DiscardTargetCost; -import mage.abilities.effects.OneShotEffect; +import mage.abilities.costs.common.DiscardCardCost; +import mage.abilities.effects.common.DoIfCostPaid; import mage.abilities.effects.common.DrawCardSourceControllerEffect; +import mage.abilities.effects.common.discard.DiscardControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.Outcome; -import mage.filter.FilterCard; -import mage.game.Game; -import mage.players.Player; -import mage.target.common.TargetCardInHand; +import mage.filter.StaticFilters; + +import java.util.UUID; /** - * * @author LevelX2 */ public final class MysticMeditation extends CardImpl { public MysticMeditation(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{U}"); + super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{3}{U}"); // Draw three cards. Then discard two cards unless you discard a creature card. + DiscardCardCost cost = new DiscardCardCost(StaticFilters.FILTER_CARD_CREATURE_A); + cost.setText("discard a creature card instead of discarding two cards"); this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(3)); - this.getSpellAbility().addEffect(new MysticMeditationEffect()); - + this.getSpellAbility().addEffect(new DoIfCostPaid( + null, new DiscardControllerEffect(2), cost + ).setText("Then discard two cards unless you discard a creature card")); } private MysticMeditation(final MysticMeditation card) { @@ -40,42 +37,3 @@ public final class MysticMeditation extends CardImpl { return new MysticMeditation(this); } } - -class MysticMeditationEffect extends OneShotEffect { - - public MysticMeditationEffect() { - super(Outcome.Damage); - staticText = "Then discard two cards unless you discard a creature card"; - } - - public MysticMeditationEffect(final MysticMeditationEffect effect) { - super(effect); - } - - @Override - public MysticMeditationEffect copy() { - return new MysticMeditationEffect(this); - } - - @Override - public boolean apply(Game game, Ability source) { - Player controller = game.getPlayer(source.getControllerId()); - FilterCard filter = new FilterCard("creature card to discard"); - filter.add(CardType.CREATURE.getPredicate()); - if (controller != null - && controller.getHand().count(filter, game) > 0 - && controller.chooseUse(Outcome.Discard, "Do you want to discard a creature card? If you don't, you must discard 2 cards", source, game)) { - Cost cost = new DiscardTargetCost(new TargetCardInHand(filter)); - if (cost.canPay(source, source, controller.getId(), game)) { - if (cost.pay(source, game, source, controller.getId(), false, null)) { - return true; - } - } - } - if (controller != null) { - controller.discard(2, false, false, source, game); - return true; - } - return false; - } -} \ No newline at end of file diff --git a/Mage.Sets/src/mage/cards/p/PriceOfBetrayal.java b/Mage.Sets/src/mage/cards/p/PriceOfBetrayal.java index 9897e9400a9..30b7775498d 100644 --- a/Mage.Sets/src/mage/cards/p/PriceOfBetrayal.java +++ b/Mage.Sets/src/mage/cards/p/PriceOfBetrayal.java @@ -82,7 +82,7 @@ class PriceOfBetrayalEffect extends OneShotEffect { int removed = 0; String[] counterNames = permanent.getCounters(game).keySet().toArray(new String[0]); for (String counterName : counterNames) { - if (controller.chooseUse(Outcome.Neutral, "Do you want to remove " + counterName + " counters?", source, game)) { + if (controller.chooseUse(Outcome.Neutral, "Remove " + counterName + " counters?", source, game)) { if (permanent.getCounters(game).get(counterName).getCount() == 1 || (toRemove - removed == 1)) { permanent.removeCounters(counterName, 1, source, game); removed++; @@ -108,7 +108,7 @@ class PriceOfBetrayalEffect extends OneShotEffect { int removed = 0; String[] counterNames = player.getCounters().keySet().toArray(new String[0]); for (String counterName : counterNames) { - if (controller.chooseUse(Outcome.Neutral, "Do you want to remove " + counterName + " counters?", source, game)) { + if (controller.chooseUse(Outcome.Neutral, "Remove " + counterName + " counters?", source, game)) { if (player.getCounters().get(counterName).getCount() == 1 || (toRemove - removed == 1)) { player.removeCounters(counterName, 1, source, game); removed++; diff --git a/Mage.Sets/src/mage/cards/q/QuarryHauler.java b/Mage.Sets/src/mage/cards/q/QuarryHauler.java index 0c56468cda7..8de39c379fc 100644 --- a/Mage.Sets/src/mage/cards/q/QuarryHauler.java +++ b/Mage.Sets/src/mage/cards/q/QuarryHauler.java @@ -74,7 +74,7 @@ class QuarryHaulerEffect extends OneShotEffect { Counters counters = permanent.getCounters(game).copy(); CounterType counterType; for (Counter counter : counters.values()) { - if (controller.chooseUse(Outcome.BoostCreature, "Do you want to add or remove a " + counter.getName() + " counter?", null, "add", "remove", source, game)) { + if (controller.chooseUse(Outcome.BoostCreature, "Choose whether to add or remove a " + counter.getName() + " counter", null, "Add", "Remove", source, game)) { counterType = CounterType.findByName(counter.getName()); Counter counterToAdd; if (counterType != null) { diff --git a/Mage.Sets/src/mage/cards/t/TergridGodOfFright.java b/Mage.Sets/src/mage/cards/t/TergridGodOfFright.java index e5f66b6bd53..830f6133506 100644 --- a/Mage.Sets/src/mage/cards/t/TergridGodOfFright.java +++ b/Mage.Sets/src/mage/cards/t/TergridGodOfFright.java @@ -192,7 +192,7 @@ class TergridsLaternEffect extends OneShotEffect { // AI hint to discard/sacrifice before die Outcome aiOutcome = (targetedPlayer.getLife() <= 3 * 2) ? Outcome.Benefit : Outcome.Detriment; - if (targetedPlayer.chooseUse(aiOutcome, "Question 1 of 2: do you wish to sacrifice a nonland permanent to prevent the loss of 3 life?", source, game)) { + if (targetedPlayer.chooseUse(aiOutcome, "Question 1 of 2: Sacrifice a nonland permanent to prevent the loss of 3 life?", source, game)) { TargetPermanent target = new TargetPermanent(StaticFilters.FILTER_CONTROLLED_PERMANENT_NON_LAND); target.setNotTarget(true); if (targetedPlayer.choose(Outcome.Sacrifice, target, source.getSourceId(), game)) { @@ -205,7 +205,7 @@ class TergridsLaternEffect extends OneShotEffect { } } - if (targetedPlayer.chooseUse(aiOutcome, "Question 2 of 2: do you wish to discard a card to prevent the loss of 3 life?", source, game)) { + if (targetedPlayer.chooseUse(aiOutcome, "Question 2 of 2: Discard a card to prevent the loss of 3 life?", source, game)) { TargetCardInHand targetCard = new TargetCardInHand(); if (targetedPlayer.chooseTarget(Outcome.Discard, targetCard, source, game)) { Card chosenCard = game.getCard(targetCard.getFirstTarget()); diff --git a/Mage.Sets/src/mage/cards/w/WalkingSponge.java b/Mage.Sets/src/mage/cards/w/WalkingSponge.java index 5aabce47ea6..20b0083d482 100644 --- a/Mage.Sets/src/mage/cards/w/WalkingSponge.java +++ b/Mage.Sets/src/mage/cards/w/WalkingSponge.java @@ -77,7 +77,7 @@ class WalkingSpongeEffect extends OneShotEffect { Permanent permanent = game.getPermanent(source.getSourceId()); if (controller != null && permanent != null) { ChoiceImpl chooseAbility = new ChoiceImpl(); - chooseAbility.setMessage("What ability do you wish to remove? (default is Flying)"); + chooseAbility.setMessage("Choose an ability to remove (default is flying)"); Set choice = new LinkedHashSet<>(); choice.add("Flying"); choice.add("First strike"); diff --git a/Mage/src/main/java/mage/abilities/effects/common/HideawayPlayEffect.java b/Mage/src/main/java/mage/abilities/effects/common/HideawayPlayEffect.java index d1ac6824736..a5f3878dfdf 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/HideawayPlayEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/HideawayPlayEffect.java @@ -52,7 +52,7 @@ public class HideawayPlayEffect extends OneShotEffect { Card card = cards.iterator().next(); Player controller = game.getPlayer(source.getControllerId()); if (card != null && controller != null) { - if (controller.chooseUse(Outcome.PlayForFree, "Do you want to play " + card.getIdName() + " for free now?", source, game)) { + if (controller.chooseUse(Outcome.PlayForFree, "Play " + card.getIdName() + " for free?", source, game)) { card.setFaceDown(false, game); int zcc = card.getZoneChangeCounter(game); diff --git a/Mage/src/main/java/mage/abilities/effects/common/LookLibraryTopCardTargetPlayerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/LookLibraryTopCardTargetPlayerEffect.java index 996fcfb5e08..39b69998c8c 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/LookLibraryTopCardTargetPlayerEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/LookLibraryTopCardTargetPlayerEffect.java @@ -82,7 +82,7 @@ public class LookLibraryTopCardTargetPlayerEffect extends OneShotEffect { } } if (mayShuffleAfter) { - if (player.chooseUse(Outcome.Benefit, (player == targetPlayer ? "Shuffle your library?" : "Do you want the chosen player to shuffle?"), source, game)) { + if (player.chooseUse(Outcome.Benefit, (player == targetPlayer ? "Shuffle your library?" : "Have the chosen player shuffle?"), source, game)) { targetPlayer.shuffleLibrary(source, game); } } diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAbilityOrAnotherAbilityTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAbilityOrAnotherAbilityTargetEffect.java index 108f6f90544..78294e8155a 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAbilityOrAnotherAbilityTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAbilityOrAnotherAbilityTargetEffect.java @@ -44,7 +44,7 @@ public class LoseAbilityOrAnotherAbilityTargetEffect extends LoseAbilityTargetEf Permanent permanent = game.getPermanent(source.getFirstTarget()); if (permanent != null) { ChoiceImpl chooseAbility = new ChoiceImpl(); - chooseAbility.setMessage("What ability do you wish to remove?"); + chooseAbility.setMessage("Choose an ability to remove"); Set choice = new HashSet<>(); diff --git a/Mage/src/main/java/mage/players/PlayerImpl.java b/Mage/src/main/java/mage/players/PlayerImpl.java index 3ee256dbc29..1767a9962ec 100644 --- a/Mage/src/main/java/mage/players/PlayerImpl.java +++ b/Mage/src/main/java/mage/players/PlayerImpl.java @@ -2734,7 +2734,7 @@ public abstract class PlayerImpl implements Player, Serializable { return false; } - if (!targetPlayer.chooseUse(Outcome.AIDontUseIt, "Library have " + castableCards.size() + " castable cards on searching. Do you want to cast it?", null, game)) { + if (!targetPlayer.chooseUse(Outcome.AIDontUseIt, "There are " + castableCards.size() + " cards you can cast while searching your library. Cast any of them?", null, game)) { return false; }