From a6255402e3664c0c71ed1597013c07442866dfa8 Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Mon, 15 Feb 2021 10:19:43 -0500 Subject: [PATCH] updated language for various user choices --- Mage.Sets/src/mage/cards/a/AsForetold.java | 2 +- .../src/mage/cards/a/AssassinsTrophy.java | 2 +- Mage.Sets/src/mage/cards/c/CaravanVigil.java | 2 +- .../src/mage/cards/c/ChandraPyromaster.java | 6 +- .../src/mage/cards/c/ChecksAndBalances.java | 2 +- .../src/mage/cards/c/ChorusOfTheConclave.java | 2 +- .../src/mage/cards/c/CloakOfConfusion.java | 3 +- Mage.Sets/src/mage/cards/c/CoralFighters.java | 2 +- .../src/mage/cards/d/DelverOfSecrets.java | 2 +- Mage.Sets/src/mage/cards/d/DreamCoat.java | 2 +- Mage.Sets/src/mage/cards/e/ElderSpawn.java | 2 +- .../src/mage/cards/e/EtherwroughtPage.java | 2 +- Mage.Sets/src/mage/cards/e/Evershrike.java | 2 +- .../src/mage/cards/g/GargantuanGorilla.java | 2 +- .../src/mage/cards/g/GemstoneCaverns.java | 2 +- .../src/mage/cards/g/GeomancersGambit.java | 2 +- Mage.Sets/src/mage/cards/g/GhostQuarter.java | 2 +- Mage.Sets/src/mage/cards/i/IzzetKeyrune.java | 59 +++++-------------- .../src/mage/cards/j/JaceTheMindSculptor.java | 2 +- Mage.Sets/src/mage/cards/m/Metamorphose.java | 2 +- .../src/mage/cards/m/MinionOfLeshrac.java | 2 +- .../src/mage/cards/m/MishrasWarMachine.java | 2 +- .../src/mage/cards/m/MitoticManipulation.java | 2 +- Mage.Sets/src/mage/cards/m/MurderOfCrows.java | 2 +- Mage.Sets/src/mage/cards/o/Outmaneuver.java | 4 +- Mage.Sets/src/mage/cards/p/Precognition.java | 2 +- .../src/mage/cards/p/PsychicSurgery.java | 2 +- .../src/mage/cards/p/PuresightMerrow.java | 2 +- .../src/mage/cards/q/QuestForUlasTemple.java | 2 +- .../src/mage/cards/r/RummagingWizard.java | 2 +- .../src/mage/cards/s/SearchForAzcanta.java | 2 +- .../src/mage/cards/s/ShellOfTheLastKappa.java | 3 +- Mage.Sets/src/mage/cards/s/SiegeBehemoth.java | 3 +- Mage.Sets/src/mage/cards/t/ThinkTank.java | 2 +- .../src/mage/cards/v/VolrathsDungeon.java | 2 +- .../abilities/common/ChancellorAbility.java | 2 +- .../LookLibraryAndPickControllerEffect.java | 10 ++-- .../LookLibraryTopCardTargetPlayerEffect.java | 2 +- .../ShuffleIntoLibraryTargetEffect.java | 2 +- .../BecomesColorOrColorsTargetEffect.java | 2 +- .../abilities/keyword/LeylineAbility.java | 2 +- .../main/java/mage/game/combat/Combat.java | 4 +- .../java/mage/game/combat/CombatGroup.java | 5 +- 43 files changed, 66 insertions(+), 99 deletions(-) diff --git a/Mage.Sets/src/mage/cards/a/AsForetold.java b/Mage.Sets/src/mage/cards/a/AsForetold.java index fa556007537..daac6857456 100644 --- a/Mage.Sets/src/mage/cards/a/AsForetold.java +++ b/Mage.Sets/src/mage/cards/a/AsForetold.java @@ -105,7 +105,7 @@ class AsForetoldAlternativeCost extends AlternativeCostSourceAbility { Permanent asForetold = game.getPermanent(getSourceId()); if (controller != null && asForetold != null) { - if (controller.chooseUse(Outcome.Neutral, "Do you wish to use " + if (controller.chooseUse(Outcome.Neutral, "Use " + asForetold.getLogName() + " to pay the alternative cost ?", ability, game)) { wasActivated = super.askToActivateAlternativeCosts(ability, game); if (wasActivated) { diff --git a/Mage.Sets/src/mage/cards/a/AssassinsTrophy.java b/Mage.Sets/src/mage/cards/a/AssassinsTrophy.java index 00432187d64..694fcc13e40 100644 --- a/Mage.Sets/src/mage/cards/a/AssassinsTrophy.java +++ b/Mage.Sets/src/mage/cards/a/AssassinsTrophy.java @@ -74,7 +74,7 @@ class AssassinsTrophyEffect extends OneShotEffect { if (permanent != null) { Player controller = game.getPlayer(permanent.getControllerId()); if (controller != null) { - if (controller.chooseUse(Outcome.PutLandInPlay, "Do you wish to search for a basic land, put it onto the battlefield and then shuffle your library?", source, game)) { + if (controller.chooseUse(Outcome.PutLandInPlay, "Search for a basic land, put it onto the battlefield and then shuffle your library?", source, game)) { TargetCardInLibrary target = new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND); if (controller.searchLibrary(target, source, game)) { Card card = controller.getLibrary().getCard(target.getFirstTarget(), game); diff --git a/Mage.Sets/src/mage/cards/c/CaravanVigil.java b/Mage.Sets/src/mage/cards/c/CaravanVigil.java index 00e8f3079f4..678f408b284 100644 --- a/Mage.Sets/src/mage/cards/c/CaravanVigil.java +++ b/Mage.Sets/src/mage/cards/c/CaravanVigil.java @@ -67,7 +67,7 @@ class CaravanVigilEffect extends OneShotEffect { if (card != null) { Cards cards = new CardsImpl(card); if (MorbidCondition.instance.apply(game, source) - && controller.chooseUse(Outcome.PutLandInPlay, "Do you wish to put the card onto the battlefield instead?", source, game)) { + && controller.chooseUse(Outcome.PutLandInPlay, "Put the card onto the battlefield instead?", source, game)) { controller.moveCards(card, Zone.BATTLEFIELD, source, game); } else { controller.moveCards(card, Zone.HAND, source, game); diff --git a/Mage.Sets/src/mage/cards/c/ChandraPyromaster.java b/Mage.Sets/src/mage/cards/c/ChandraPyromaster.java index e0ea599dbde..48f06046a40 100644 --- a/Mage.Sets/src/mage/cards/c/ChandraPyromaster.java +++ b/Mage.Sets/src/mage/cards/c/ChandraPyromaster.java @@ -231,21 +231,21 @@ class ChandraPyromasterEffect3 extends OneShotEffect { Card card = cards.get(target.getFirstTarget(), game); if (card != null) { ApprovingObject approvingObject = new ApprovingObject(source, game); - if (controller.chooseUse(outcome, "Do you wish to cast copy 1 of " + card.getName(), source, game)) { + if (controller.chooseUse(outcome, "Cast copy 1 of " + card.getName(), source, game)) { Card copy1 = game.copyCard(card, source, source.getControllerId()); game.getState().setValue("PlayFromNotOwnHandZone" + copy1.getId(), Boolean.TRUE); controller.cast(controller.chooseAbilityForCast(copy1, game, true), game, true, approvingObject); game.getState().setValue("PlayFromNotOwnHandZone" + copy1.getId(), null); } - if (controller.chooseUse(outcome, "Do you wish to cast copy 2 of " + card.getName(), source, game)) { + if (controller.chooseUse(outcome, "Cast copy 2 of " + card.getName(), source, game)) { Card copy2 = game.copyCard(card, source, source.getControllerId()); game.getState().setValue("PlayFromNotOwnHandZone" + copy2.getId(), Boolean.TRUE); controller.cast(controller.chooseAbilityForCast(copy2, game, true), game, true, approvingObject); game.getState().setValue("PlayFromNotOwnHandZone" + copy2.getId(), null); } - if (controller.chooseUse(outcome, "Do you wish to cast copy 3 of " + card.getName(), source, game)) { + if (controller.chooseUse(outcome, "Cast copy 3 of " + card.getName(), source, game)) { Card copy3 = game.copyCard(card, source, source.getControllerId()); game.getState().setValue("PlayFromNotOwnHandZone" + copy3.getId(), Boolean.TRUE); controller.cast(controller.chooseAbilityForCast(copy3, game, true), diff --git a/Mage.Sets/src/mage/cards/c/ChecksAndBalances.java b/Mage.Sets/src/mage/cards/c/ChecksAndBalances.java index 619a9c71b4a..0407872b7c6 100644 --- a/Mage.Sets/src/mage/cards/c/ChecksAndBalances.java +++ b/Mage.Sets/src/mage/cards/c/ChecksAndBalances.java @@ -90,7 +90,7 @@ class ChecksAndBalancesEffect extends OneShotEffect { for (UUID uuid : game.getOpponents(spell.getControllerId())) { Player player = game.getPlayer(uuid); if (player != null) { - if (!player.chooseUse(outcome, "Do you wish to discard a card to counter " + spell.getLogName() + '?', source, game)) { + if (!player.chooseUse(outcome, "Discard a card to counter " + spell.getLogName() + '?', source, game)) { game.informPlayers(player.getLogName() + " refuses to discard a card to counter " + spell.getLogName()); return true; } else { diff --git a/Mage.Sets/src/mage/cards/c/ChorusOfTheConclave.java b/Mage.Sets/src/mage/cards/c/ChorusOfTheConclave.java index 712be1e5b35..767bb402a59 100644 --- a/Mage.Sets/src/mage/cards/c/ChorusOfTheConclave.java +++ b/Mage.Sets/src/mage/cards/c/ChorusOfTheConclave.java @@ -90,7 +90,7 @@ class ChorusOfTheConclaveReplacementEffect extends ReplacementEffectImpl { int xCost = 0; Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { - if (controller.chooseUse(Outcome.Benefit, "Do you wish to pay the additonal cost to add +1/+1 counters to the creature you cast?", source, game)) { + if (controller.chooseUse(Outcome.Benefit, "Pay the additonal cost to add +1/+1 counters to the creature you cast?", source, game)) { xCost += ManaUtil.playerPaysXGenericMana(false, "Chorus of the Conclave", controller, source, game); // save the x value to be available for ETB replacement effect Object object = game.getState().getValue("spellX" + source.getSourceId()); diff --git a/Mage.Sets/src/mage/cards/c/CloakOfConfusion.java b/Mage.Sets/src/mage/cards/c/CloakOfConfusion.java index 7d60886faa4..8aa29ebbf23 100644 --- a/Mage.Sets/src/mage/cards/c/CloakOfConfusion.java +++ b/Mage.Sets/src/mage/cards/c/CloakOfConfusion.java @@ -124,8 +124,7 @@ class CloakOfConfusionEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); Permanent enchantedCreature = game.getPermanent(game.getPermanent(source.getSourceId()).getAttachedTo()); - if (controller != null && controller.chooseUse(outcome, "Do you wish to not assign combat damage from " - + enchantedCreature.getName() + " and have the defending player discard a card at random?", source, game)) { + if (controller != null && controller.chooseUse(outcome, "Have defending player discard a card at random? " + enchantedCreature.getName() + " will not assign combat damage.", source, game)) { ContinuousEffect effect = new AssignNoCombatDamageTargetEffect(); effect.setTargetPointer(new FixedTarget(enchantedCreature.getId())); game.addEffect(effect, source); diff --git a/Mage.Sets/src/mage/cards/c/CoralFighters.java b/Mage.Sets/src/mage/cards/c/CoralFighters.java index 169ff7fbb83..7b2869a92e6 100644 --- a/Mage.Sets/src/mage/cards/c/CoralFighters.java +++ b/Mage.Sets/src/mage/cards/c/CoralFighters.java @@ -66,7 +66,7 @@ class CoralFightersEffect extends OneShotEffect { if(card != null) { Cards cards = new CardsImpl(card); controller.lookAtCards("Coral Fighters", cards, game); - if (controller.chooseUse(outcome, "Do you wish to put card on the bottom of player's library?", source, game)) { + if (controller.chooseUse(outcome, "Put that card on the bottom of its owner's library?", source, game)) { controller.moveCardToLibraryWithInfo(card, source, game, Zone.LIBRARY, false, false); } else { diff --git a/Mage.Sets/src/mage/cards/d/DelverOfSecrets.java b/Mage.Sets/src/mage/cards/d/DelverOfSecrets.java index f6cd8e72ea5..b0c282c70dc 100644 --- a/Mage.Sets/src/mage/cards/d/DelverOfSecrets.java +++ b/Mage.Sets/src/mage/cards/d/DelverOfSecrets.java @@ -82,7 +82,7 @@ class DelverOfSecretsEffect extends OneShotEffect { Cards cards = new CardsImpl(); cards.add(card); player.lookAtCards(sourcePermanent.getName(), cards, game); - if (player.chooseUse(Outcome.DrawCard, "Do you wish to reveal the card at the top of the library?", source, game)) { + if (player.chooseUse(Outcome.DrawCard, "Reveal the top card of your library?", source, game)) { player.revealCards(sourcePermanent.getName(), cards, game); if (filter.match(card, game)) { return new TransformSourceEffect(true, true).apply(game, source); diff --git a/Mage.Sets/src/mage/cards/d/DreamCoat.java b/Mage.Sets/src/mage/cards/d/DreamCoat.java index eb470ab79a1..caa7f5a7e7f 100644 --- a/Mage.Sets/src/mage/cards/d/DreamCoat.java +++ b/Mage.Sets/src/mage/cards/d/DreamCoat.java @@ -83,7 +83,7 @@ class BecomesColorOrColorsEnchantedEffect extends OneShotEffect { } for (int i = 0; i < 5; i++) { if (i > 0) { - if (!controller.chooseUse(Outcome.Neutral, "Do you wish to choose another color?", source, game)) { + if (!controller.chooseUse(Outcome.Neutral, "Choose another color?", source, game)) { break; } } diff --git a/Mage.Sets/src/mage/cards/e/ElderSpawn.java b/Mage.Sets/src/mage/cards/e/ElderSpawn.java index 5fc01de792d..1e6d943c501 100644 --- a/Mage.Sets/src/mage/cards/e/ElderSpawn.java +++ b/Mage.Sets/src/mage/cards/e/ElderSpawn.java @@ -84,7 +84,7 @@ class ElderSpawnEffect extends OneShotEffect { if (controller != null && sourcePermanent != null) { TargetControlledPermanent target = new TargetControlledPermanent(1, 1, filter, true); SacrificeTargetCost cost = new SacrificeTargetCost(target); - if (!controller.chooseUse(Outcome.AIDontUseIt, "Do you wish to sacrifice an Island?", source, game) + if (!controller.chooseUse(Outcome.AIDontUseIt, "Sacrifice an Island?", source, game) || !cost.canPay(source, source, source.getControllerId(), game) || !cost.pay(source, game, source, source.getControllerId(), true)) { sourcePermanent.sacrifice(source, game); diff --git a/Mage.Sets/src/mage/cards/e/EtherwroughtPage.java b/Mage.Sets/src/mage/cards/e/EtherwroughtPage.java index cf24984ba4e..d30cf50f6d2 100644 --- a/Mage.Sets/src/mage/cards/e/EtherwroughtPage.java +++ b/Mage.Sets/src/mage/cards/e/EtherwroughtPage.java @@ -84,7 +84,7 @@ class EtherwroughtPageEffect extends OneShotEffect { CardsImpl cards = new CardsImpl(); cards.add(card); controller.lookAtCards("Etherwrought Page", cards, game); - if (controller.chooseUse(Outcome.Neutral, "Do you wish to put the card into your graveyard?", source, game)) { + if (controller.chooseUse(Outcome.Neutral, "Put that card into your graveyard?", source, game)) { return controller.moveCards(card, Zone.GRAVEYARD, source, game); } return true; diff --git a/Mage.Sets/src/mage/cards/e/Evershrike.java b/Mage.Sets/src/mage/cards/e/Evershrike.java index 77541a6a944..f51432d37a1 100644 --- a/Mage.Sets/src/mage/cards/e/Evershrike.java +++ b/Mage.Sets/src/mage/cards/e/Evershrike.java @@ -87,7 +87,7 @@ class EvershrikeEffect extends OneShotEffect { filterAuraCard.add(new AuraCardCanAttachToPermanentId(evershrikePermanent.getId())); filterAuraCard.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, xAmount)); int count = controller.getHand().count(filterAuraCard, game); - if (count > 0 && controller.chooseUse(Outcome.Benefit, "Do you wish to put an Aura card from your hand onto " + evershrikeCard.getIdName() + "?", source, game)) { + if (count > 0 && controller.chooseUse(Outcome.Benefit, "Put an Aura card from your hand onto the battlefield attached to " + evershrikeCard.getIdName() + "?", source, game)) { TargetCard targetAura = new TargetCard(Zone.HAND, filterAuraCard); if (controller.choose(Outcome.Benefit, controller.getHand(), targetAura, game)) { Card aura = game.getCard(targetAura.getFirstTarget()); diff --git a/Mage.Sets/src/mage/cards/g/GargantuanGorilla.java b/Mage.Sets/src/mage/cards/g/GargantuanGorilla.java index 2d16cebed06..121b1f724f6 100644 --- a/Mage.Sets/src/mage/cards/g/GargantuanGorilla.java +++ b/Mage.Sets/src/mage/cards/g/GargantuanGorilla.java @@ -88,7 +88,7 @@ class GargantuanGorillaSacrificeEffect extends OneShotEffect { if (controller != null && sourcePermanent != null) { TargetControlledPermanent target = new TargetControlledPermanent(1, 1, filter, true); SacrificeTargetCost cost = new SacrificeTargetCost(target); - if (!controller.chooseUse(Outcome.Benefit, "Do you wish to sacrifice a Forest?", source, game) + if (!controller.chooseUse(Outcome.Benefit, "Sacrifice a Forest?", source, game) || !cost.canPay(source, source, source.getControllerId(), game) || !cost.pay(source, game, source, source.getControllerId(), true)) { sourcePermanent.sacrifice(source, game); diff --git a/Mage.Sets/src/mage/cards/g/GemstoneCaverns.java b/Mage.Sets/src/mage/cards/g/GemstoneCaverns.java index 44f6010d85d..d04721cd29c 100644 --- a/Mage.Sets/src/mage/cards/g/GemstoneCaverns.java +++ b/Mage.Sets/src/mage/cards/g/GemstoneCaverns.java @@ -87,7 +87,7 @@ class GemstoneCavernsAbility extends StaticAbility implements OpeningHandAction @Override public boolean askUseOpeningHandAction(Card card, Player player, Game game) { - return player.chooseUse(Outcome.PutCardInPlay, "Do you wish to put " + card.getIdName() + " into play?", this, game); + return player.chooseUse(Outcome.PutCardInPlay, "Put " + card.getIdName() + " onto the battlefield?", this, game); } @Override diff --git a/Mage.Sets/src/mage/cards/g/GeomancersGambit.java b/Mage.Sets/src/mage/cards/g/GeomancersGambit.java index e1bcac24d81..4488cf268e2 100644 --- a/Mage.Sets/src/mage/cards/g/GeomancersGambit.java +++ b/Mage.Sets/src/mage/cards/g/GeomancersGambit.java @@ -74,7 +74,7 @@ class GeomancersGambitEffect extends OneShotEffect { if (controller == null) { return false; } - if (!controller.chooseUse(Outcome.PutLandInPlay, "Do you wish to search for a basic land, put it onto the battlefield and then shuffle your library?", source, game)) { + if (!controller.chooseUse(Outcome.PutLandInPlay, "Search for a basic land, put it onto the battlefield, and then shuffle your library?", source, game)) { return true; } TargetCardInLibrary target = new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND); diff --git a/Mage.Sets/src/mage/cards/g/GhostQuarter.java b/Mage.Sets/src/mage/cards/g/GhostQuarter.java index 2cb44a1d198..5f8fdf189bf 100644 --- a/Mage.Sets/src/mage/cards/g/GhostQuarter.java +++ b/Mage.Sets/src/mage/cards/g/GhostQuarter.java @@ -71,7 +71,7 @@ class GhostQuarterEffect extends OneShotEffect { Permanent permanent = getTargetPointer().getFirstTargetPermanentOrLKI(game, source); if (permanent != null) { Player controller = game.getPlayer(permanent.getControllerId()); - if (controller != null && controller.chooseUse(Outcome.PutLandInPlay, "Do you wish to search for a basic land, put it onto the battlefield and then shuffle your library?", source, game)) { + if (controller != null && controller.chooseUse(Outcome.PutLandInPlay, "Search for a basic land, put it onto the battlefield, and then shuffle your library?", source, game)) { TargetCardInLibrary target = new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND); if (controller.searchLibrary(target, source, game)) { Card card = controller.getLibrary().getCard(target.getFirstTarget(), game); diff --git a/Mage.Sets/src/mage/cards/i/IzzetKeyrune.java b/Mage.Sets/src/mage/cards/i/IzzetKeyrune.java index 1cda0ffffa3..b9776d3fb38 100644 --- a/Mage.Sets/src/mage/cards/i/IzzetKeyrune.java +++ b/Mage.Sets/src/mage/cards/i/IzzetKeyrune.java @@ -1,26 +1,21 @@ - package mage.cards.i; -import java.util.UUID; import mage.MageInt; -import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.OneShotEffect; +import mage.abilities.effects.common.DrawDiscardControllerEffect; import mage.abilities.effects.common.continuous.BecomesCreatureSourceEffect; import mage.abilities.mana.BlueManaAbility; import mage.abilities.mana.RedManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.SubType; import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; -import mage.game.Game; +import mage.constants.SubType; import mage.game.permanent.token.TokenImpl; -import mage.players.Player; + +import java.util.UUID; /** * @author LevelX2 @@ -28,17 +23,23 @@ import mage.players.Player; public final class IzzetKeyrune extends CardImpl { public IzzetKeyrune(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); + super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}"); // {T}: Add {U} or {R}. this.addAbility(new BlueManaAbility()); this.addAbility(new RedManaAbility()); // {U}{R}: Until end of turn, Izzet Keyrune becomes a 2/1 blue and red Elemental artifact creature. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new IzzetKeyruneToken(), "", Duration.EndOfTurn), new ManaCostsImpl("{U}{R}"))); + this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect( + new IzzetKeyruneToken(), "", Duration.EndOfTurn + ), new ManaCostsImpl("{U}{R}"))); // Whenever Izzet Keyrune deals combat damage to a player, you may draw a card. If you do, discard a card. - this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new IzzetKeyruneEffect(), true)); + this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility( + new DrawDiscardControllerEffect(1, 1, true) + .setText("you may draw a card. If you do, discard a card"), + false + )); } private IzzetKeyrune(final IzzetKeyrune card) { @@ -50,37 +51,8 @@ public final class IzzetKeyrune extends CardImpl { return new IzzetKeyrune(this); } - private static class IzzetKeyruneEffect extends OneShotEffect { - - public IzzetKeyruneEffect() { - super(Outcome.DrawCard); - this.staticText = "you may draw a card. If you do, discard a card"; - } - - public IzzetKeyruneEffect(final IzzetKeyruneEffect effect) { - super(effect); - } - - @Override - public IzzetKeyruneEffect copy() { - return new IzzetKeyruneEffect(this); - } - - @Override - public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(source.getControllerId()); - if (player != null && player.chooseUse(Outcome.DrawCard, "Do you wish to draw a card? If you do, discard a card.", source, game)) { - if (player.drawCards(1, source, game) > 0) { - player.discard(1, false, false, source, game); - } - return true; - } - return false; - } - } - private static class IzzetKeyruneToken extends TokenImpl { - IzzetKeyruneToken() { + private IzzetKeyruneToken() { super("", "2/1 blue and red Elemental artifact creature"); cardType.add(CardType.ARTIFACT); cardType.add(CardType.CREATURE); @@ -91,7 +63,7 @@ public final class IzzetKeyrune extends CardImpl { toughness = new MageInt(1); } - public IzzetKeyruneToken(final IzzetKeyruneToken token) { + private IzzetKeyruneToken(final IzzetKeyruneToken token) { super(token); } @@ -100,4 +72,3 @@ public final class IzzetKeyrune extends CardImpl { } } } - diff --git a/Mage.Sets/src/mage/cards/j/JaceTheMindSculptor.java b/Mage.Sets/src/mage/cards/j/JaceTheMindSculptor.java index 7b829873b19..b4ae3b8e6cf 100644 --- a/Mage.Sets/src/mage/cards/j/JaceTheMindSculptor.java +++ b/Mage.Sets/src/mage/cards/j/JaceTheMindSculptor.java @@ -92,7 +92,7 @@ class JaceTheMindSculptorEffect1 extends OneShotEffect { if (card != null) { Cards cards = new CardsImpl(card); controller.lookAtCards("Jace, the Mind Sculptor", cards, game); - if (controller.chooseUse(outcome, "Do you wish to put card on the bottom of player's library?", source, game)) { + if (controller.chooseUse(outcome, "Put that card on the bottom of its owner's library?", source, game)) { controller.moveCardToLibraryWithInfo(card, source, game, Zone.LIBRARY, false, false); } else { game.informPlayers(controller.getLogName() + " puts the card back on top of the library."); diff --git a/Mage.Sets/src/mage/cards/m/Metamorphose.java b/Mage.Sets/src/mage/cards/m/Metamorphose.java index d4f908d11b1..0fd6d8937e1 100644 --- a/Mage.Sets/src/mage/cards/m/Metamorphose.java +++ b/Mage.Sets/src/mage/cards/m/Metamorphose.java @@ -77,7 +77,7 @@ class MetamorphoseEffect extends OneShotEffect { Permanent permanent = getTargetPointer().getFirstTargetPermanentOrLKI(game, source); if (permanent != null) { Player controller = game.getPlayer(permanent.getControllerId()); - if (controller != null && controller.canRespond() && controller.chooseUse(Outcome.PutCardInPlay, "Do you wish to put an artifact, creature, enchantment, or land card onto the battlefield?", source, game)) { + if (controller != null && controller.canRespond() && controller.chooseUse(Outcome.PutCardInPlay, "Put an artifact, creature, enchantment, or land card onto the battlefield?", source, game)) { TargetCardInHand target = new TargetCardInHand(filter); target.clearChosen(); if (controller.chooseTarget(outcome, target, source, game)) { diff --git a/Mage.Sets/src/mage/cards/m/MinionOfLeshrac.java b/Mage.Sets/src/mage/cards/m/MinionOfLeshrac.java index 93ef2ce618d..da88da9d58f 100644 --- a/Mage.Sets/src/mage/cards/m/MinionOfLeshrac.java +++ b/Mage.Sets/src/mage/cards/m/MinionOfLeshrac.java @@ -89,7 +89,7 @@ class MinionLeshracEffect extends OneShotEffect { filterCreature.add(AnotherPredicate.instance); TargetControlledPermanent target = new TargetControlledPermanent(filterCreature); SacrificeTargetCost cost = new SacrificeTargetCost(target); - if (controller.chooseUse(Outcome.AIDontUseIt, "Do you wish to sacrifice another creature to prevent the 5 damage to you?", source, game) + if (controller.chooseUse(Outcome.AIDontUseIt, "Sacrifice another creature to prevent the damage?", source, game) && cost.canPay(source, source, source.getControllerId(), game) && cost.pay(source, game, source, source.getControllerId(), true)) { return true; diff --git a/Mage.Sets/src/mage/cards/m/MishrasWarMachine.java b/Mage.Sets/src/mage/cards/m/MishrasWarMachine.java index 9687f11135c..f4f2dc9dbf9 100644 --- a/Mage.Sets/src/mage/cards/m/MishrasWarMachine.java +++ b/Mage.Sets/src/mage/cards/m/MishrasWarMachine.java @@ -66,7 +66,7 @@ class MishrasWarMachineEffect extends OneShotEffect { if (controller != null && sourcePermanent != null) { DiscardCardCost cost = new DiscardCardCost(); - if (controller.chooseUse(Outcome.Benefit, "Do you wish to discard a card to prevent the 3 damage to you?", source, game) + if (controller.chooseUse(Outcome.Benefit, "Discard a card to prevent the damage?", source, game) && cost.canPay(source, source, source.getControllerId(), game) && cost.pay(source, game, source, source.getControllerId(), true)) { return true; diff --git a/Mage.Sets/src/mage/cards/m/MitoticManipulation.java b/Mage.Sets/src/mage/cards/m/MitoticManipulation.java index 1ae31dcecf0..19e57b7565b 100644 --- a/Mage.Sets/src/mage/cards/m/MitoticManipulation.java +++ b/Mage.Sets/src/mage/cards/m/MitoticManipulation.java @@ -81,7 +81,7 @@ class MitoticManipulationEffect extends OneShotEffect { filter.add(Predicates.or(namePredicates)); TargetCard target = new TargetCard(Zone.LIBRARY, filter); if (cardsFromTop.count(filter, source.getSourceId(), source.getControllerId(), game) > 0 - && controller.chooseUse(Outcome.PutCardInPlay, "Do you wish to put a card on the battlefield?", source, game)) { + && controller.chooseUse(Outcome.PutCardInPlay, "Put a card on the battlefield?", source, game)) { if (controller.choose(Outcome.PutCardInPlay, cardsFromTop, target, game)) { Card card = cardsFromTop.get(target.getFirstTarget(), game); if (card != null) { diff --git a/Mage.Sets/src/mage/cards/m/MurderOfCrows.java b/Mage.Sets/src/mage/cards/m/MurderOfCrows.java index 74b7086d4ca..0d630d292bc 100644 --- a/Mage.Sets/src/mage/cards/m/MurderOfCrows.java +++ b/Mage.Sets/src/mage/cards/m/MurderOfCrows.java @@ -62,7 +62,7 @@ class MurderOfCrowsEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player player = game.getPlayer(source.getControllerId()); - if (player != null && player.chooseUse(Outcome.DrawCard, "Do you wish to draw a card? If you do, discard a card.", source, game)) { + if (player != null && player.chooseUse(Outcome.DrawCard, "Draw a card? If you do, discard a card.", source, game)) { if (player.drawCards(1, source, game) > 0) { player.discard(1, false, false, source, game); } diff --git a/Mage.Sets/src/mage/cards/o/Outmaneuver.java b/Mage.Sets/src/mage/cards/o/Outmaneuver.java index d6a4c6b9c1c..3d30c92a09b 100644 --- a/Mage.Sets/src/mage/cards/o/Outmaneuver.java +++ b/Mage.Sets/src/mage/cards/o/Outmaneuver.java @@ -77,8 +77,8 @@ class OutmaneuverEffect extends AsThoughEffectImpl { if (blockedCreature != null) { Player controller = game.getPlayer(blockedCreature.getControllerId()); if (controller != null) { - return controller.chooseUse(Outcome.Damage, "Do you wish to assign combat damage for " - + blockedCreature.getLogName() + " as though it weren't blocked?", source, game); + return controller.chooseUse(Outcome.Damage, "have " + + blockedCreature.getLogName() + "assign combat damage as though it weren't blocked?", source, game); } } return false; diff --git a/Mage.Sets/src/mage/cards/p/Precognition.java b/Mage.Sets/src/mage/cards/p/Precognition.java index c773497f350..173bb3013ec 100644 --- a/Mage.Sets/src/mage/cards/p/Precognition.java +++ b/Mage.Sets/src/mage/cards/p/Precognition.java @@ -70,7 +70,7 @@ class PrecognitionEffect extends OneShotEffect { if (card != null) { Cards cards = new CardsImpl(card); controller.lookAtCards("Precognition", cards, game); - if (controller.chooseUse(outcome, "Do you wish to put card on the bottom of player's library?", source, game)) { + if (controller.chooseUse(outcome, "Put that card on the bottom of its owner's library?", source, game)) { controller.moveCardToLibraryWithInfo(card, source, game, Zone.LIBRARY, false, false); } else { game.informPlayers(controller.getLogName() + " puts the card back on top of the library."); diff --git a/Mage.Sets/src/mage/cards/p/PsychicSurgery.java b/Mage.Sets/src/mage/cards/p/PsychicSurgery.java index f98892c7866..1447a72813e 100644 --- a/Mage.Sets/src/mage/cards/p/PsychicSurgery.java +++ b/Mage.Sets/src/mage/cards/p/PsychicSurgery.java @@ -104,7 +104,7 @@ class PsychicSurgeryEffect extends OneShotEffect { if (controller != null && opponent != null) { Cards cards = new CardsImpl(opponent.getLibrary().getTopCards(game, 2)); controller.lookAtCards(source, null, cards, game); - if (!cards.isEmpty() && controller.chooseUse(Outcome.Exile, "Do you wish to exile a card?", source, game)) { + if (!cards.isEmpty() && controller.chooseUse(Outcome.Exile, "Exile a card?", source, game)) { TargetCard target = new TargetCard(Zone.LIBRARY, new FilterCard("card to exile")); if (controller.choose(Outcome.Exile, cards, target, game)) { Card card = cards.get(target.getFirstTarget(), game); diff --git a/Mage.Sets/src/mage/cards/p/PuresightMerrow.java b/Mage.Sets/src/mage/cards/p/PuresightMerrow.java index 7a6bab13819..1c1e36342f9 100644 --- a/Mage.Sets/src/mage/cards/p/PuresightMerrow.java +++ b/Mage.Sets/src/mage/cards/p/PuresightMerrow.java @@ -77,7 +77,7 @@ class PuresightMerrowEffect extends OneShotEffect { if (card != null) { Cards cards = new CardsImpl(card); controller.lookAtCards("Puresight Merrow", cards, game); - if (controller.chooseUse(Outcome.Removal, "Do you wish to exile the card from the top of your library?", source, game)) { + if (controller.chooseUse(Outcome.Removal, "Exile the card from the top of your library?", source, game)) { controller.moveCardToExileWithInfo(card, source.getSourceId(), sourceObject.getIdName(), source, game, Zone.LIBRARY, true); } else { game.informPlayers(controller.getLogName() + " puts the card back on top of their library."); diff --git a/Mage.Sets/src/mage/cards/q/QuestForUlasTemple.java b/Mage.Sets/src/mage/cards/q/QuestForUlasTemple.java index 52bf7a08599..c50d55078e1 100644 --- a/Mage.Sets/src/mage/cards/q/QuestForUlasTemple.java +++ b/Mage.Sets/src/mage/cards/q/QuestForUlasTemple.java @@ -79,7 +79,7 @@ class QuestForUlasTempleEffect extends OneShotEffect { Cards cards = new CardsImpl(card); controller.lookAtCards(sourcePermanent.getName(), cards, game); if (card.isCreature()) { - if (controller.chooseUse(Outcome.DrawCard, "Do you wish to reveal the creature card at the top of the library?", source, game)) { + if (controller.chooseUse(Outcome.DrawCard, "Reveal the top card of your library?", source, game)) { controller.revealCards(sourcePermanent.getName(), cards, game); Permanent questForUlasTemple = game.getPermanent(source.getSourceId()); if (questForUlasTemple != null) { diff --git a/Mage.Sets/src/mage/cards/r/RummagingWizard.java b/Mage.Sets/src/mage/cards/r/RummagingWizard.java index 74b104beb06..1e5aee50329 100644 --- a/Mage.Sets/src/mage/cards/r/RummagingWizard.java +++ b/Mage.Sets/src/mage/cards/r/RummagingWizard.java @@ -71,7 +71,7 @@ class RummagingWizardLookLibraryEffect extends OneShotEffect { CardsImpl cards = new CardsImpl(); cards.add(card); controller.lookAtCards("Rummaging Wizard", cards, game); - if (controller.chooseUse(Outcome.Neutral, "Do you wish to put the card into your graveyard?", source, game)) { + if (controller.chooseUse(Outcome.Neutral, "Put that card into your graveyard?", source, game)) { return controller.moveCards(card, Zone.GRAVEYARD, source, game); } diff --git a/Mage.Sets/src/mage/cards/s/SearchForAzcanta.java b/Mage.Sets/src/mage/cards/s/SearchForAzcanta.java index 0d35d779632..32cb3ac1446 100644 --- a/Mage.Sets/src/mage/cards/s/SearchForAzcanta.java +++ b/Mage.Sets/src/mage/cards/s/SearchForAzcanta.java @@ -76,7 +76,7 @@ class SearchForAzcantaLookLibraryEffect extends OneShotEffect { Card card = controller.getLibrary().getFromTop(game); if (card != null) { controller.lookAtCards(sourceObject.getIdName(), new CardsImpl(card), game); - if (controller.chooseUse(Outcome.Neutral, "Do you wish to put the card into your graveyard?", source, game)) { + if (controller.chooseUse(Outcome.Neutral, "Put that card into your graveyard?", source, game)) { controller.moveCards(card, Zone.GRAVEYARD, source, game); } if (controller.getGraveyard().size() > 6 && controller.chooseUse(Outcome.Neutral, "Transform " + sourceObject.getLogName() + "?", source, game)) { diff --git a/Mage.Sets/src/mage/cards/s/ShellOfTheLastKappa.java b/Mage.Sets/src/mage/cards/s/ShellOfTheLastKappa.java index 03636b629e9..f7f3022ab0f 100644 --- a/Mage.Sets/src/mage/cards/s/ShellOfTheLastKappa.java +++ b/Mage.Sets/src/mage/cards/s/ShellOfTheLastKappa.java @@ -143,8 +143,7 @@ class ShellOfTheLastKappaCastEffect extends OneShotEffect { sourcePermanent.getZoneChangeCounter(game))), target, game)) { Card card = game.getCard(target.getFirstTarget()); if (card != null - && controller.chooseUse(outcome, "Do you wish to cast card exiled with " - + sourcePermanent.getLogName() + "?", source, game)) { + && controller.chooseUse(outcome, "Cast " + card.getLogName() + " without paying its mana cost?", source, game)) { game.getState().setValue("PlayFromNotOwnHandZone" + card.getId(), Boolean.TRUE); Boolean cardWasCast = controller.cast(controller.chooseAbilityForCast(card, game, true), game, true, new ApprovingObject(source, game)); diff --git a/Mage.Sets/src/mage/cards/s/SiegeBehemoth.java b/Mage.Sets/src/mage/cards/s/SiegeBehemoth.java index 9d58bd9c63f..30c7f066232 100644 --- a/Mage.Sets/src/mage/cards/s/SiegeBehemoth.java +++ b/Mage.Sets/src/mage/cards/s/SiegeBehemoth.java @@ -65,8 +65,7 @@ class SiegeBehemothEffect extends AsThoughEffectImpl { Player controller = game.getPlayer(source.getControllerId()); Permanent otherCreature = game.getPermanent(sourceId); if (controller != null && otherCreature != null && otherCreature.isControlledBy(controller.getId())){ - return controller.chooseUse(Outcome.Damage, "Do you wish to assign damage for " - + otherCreature.getLogName() + " as though it weren't blocked?", source, game); + return controller.chooseUse(Outcome.Damage, "Have " + otherCreature.getLogName() + " assign damage as though it weren't blocked?", source, game); } } return false; diff --git a/Mage.Sets/src/mage/cards/t/ThinkTank.java b/Mage.Sets/src/mage/cards/t/ThinkTank.java index 655a726f9c9..996f0180997 100644 --- a/Mage.Sets/src/mage/cards/t/ThinkTank.java +++ b/Mage.Sets/src/mage/cards/t/ThinkTank.java @@ -67,7 +67,7 @@ class ThinkTankLookLibraryEffect extends OneShotEffect { CardsImpl cards = new CardsImpl(); cards.add(card); controller.lookAtCards("Think Tank", cards, game); - if (controller.chooseUse(Outcome.Neutral, "Do you wish to put the card into your graveyard?", source, game)) { + if (controller.chooseUse(Outcome.Neutral, "Put that card into your graveyard?", source, game)) { return controller.moveCards(card, Zone.GRAVEYARD, source, game); } diff --git a/Mage.Sets/src/mage/cards/v/VolrathsDungeon.java b/Mage.Sets/src/mage/cards/v/VolrathsDungeon.java index 99d0737061a..9e5eba42dbb 100644 --- a/Mage.Sets/src/mage/cards/v/VolrathsDungeon.java +++ b/Mage.Sets/src/mage/cards/v/VolrathsDungeon.java @@ -94,7 +94,7 @@ class PayLifeActivePlayerCost extends CostImpl { } int lifeToPayAmount = amount.calculate(game, ability, null); - if (activatingPlayer.chooseUse(Outcome.LoseLife, "Do you wish to pay " + lifeToPayAmount + " life?", ability, game)) { + if (activatingPlayer.chooseUse(Outcome.LoseLife, "Pay " + lifeToPayAmount + " life?", ability, game)) { this.paid = CardUtil.tryPayLife(lifeToPayAmount, activatingPlayer, source, game); return this.paid; } diff --git a/Mage/src/main/java/mage/abilities/common/ChancellorAbility.java b/Mage/src/main/java/mage/abilities/common/ChancellorAbility.java index 4bea26b75b8..478bd2907ed 100644 --- a/Mage/src/main/java/mage/abilities/common/ChancellorAbility.java +++ b/Mage/src/main/java/mage/abilities/common/ChancellorAbility.java @@ -44,7 +44,7 @@ public class ChancellorAbility extends StaticAbility implements OpeningHandActio @Override public boolean askUseOpeningHandAction(Card card, Player player, Game game) { - return player.chooseUse(Outcome.PutCardInPlay, "Do you wish to reveal " + card.getIdName() + '?', this, game); + return player.chooseUse(Outcome.PutCardInPlay, "Reveal " + card.getIdName() + '?', this, game); } @Override diff --git a/Mage/src/main/java/mage/abilities/effects/common/LookLibraryAndPickControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/LookLibraryAndPickControllerEffect.java index 9dca85f4064..3427d5c3e61 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/LookLibraryAndPickControllerEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/LookLibraryAndPickControllerEffect.java @@ -233,20 +233,20 @@ public class LookLibraryAndPickControllerEffect extends LookLibraryControllerEff } private String getMayText() { - StringBuilder sb = new StringBuilder("Do you wish to "); + StringBuilder sb = new StringBuilder(); switch (targetPickedCards) { case HAND: if (revealPickedCards) { - sb.append("reveal ").append(filter.getMessage()).append(" and put into your hand"); + sb.append("Reveal ").append(filter.getMessage()).append(" and put into your hand"); } else { - sb.append("put ").append(filter.getMessage()).append(" into your hand"); + sb.append("Put ").append(filter.getMessage()).append(" into your hand"); } break; case BATTLEFIELD: - sb.append("put ").append(filter.getMessage()).append(" onto the battlefield"); + sb.append("Put ").append(filter.getMessage()).append(" onto the battlefield"); break; case GRAVEYARD: - sb.append("put ").append(filter.getMessage()).append(" into your graveyard"); + sb.append("Put ").append(filter.getMessage()).append(" into your graveyard"); break; } return sb.append('?').toString(); 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 c45555bcbc0..e356c3d95b2 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/LookLibraryTopCardTargetPlayerEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/LookLibraryTopCardTargetPlayerEffect.java @@ -74,7 +74,7 @@ public class LookLibraryTopCardTargetPlayerEffect extends OneShotEffect { player.lookAtCards(sourceObject.getIdName(), cards, game); if (putToGraveyard) { for (Card card : cards.getCards(game)) { - if (player.chooseUse(outcome, "Do you wish to put card into the player's graveyard?", source, game)) { + if (player.chooseUse(outcome, "Put that card into its owner's graveyard?", source, game)) { player.moveCardToGraveyardWithInfo(card, source, game, Zone.LIBRARY); } else { game.informPlayers(player.getLogName() + " puts the card back on top of the library."); diff --git a/Mage/src/main/java/mage/abilities/effects/common/ShuffleIntoLibraryTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ShuffleIntoLibraryTargetEffect.java index 1ff0f8b936e..f75be6580bc 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ShuffleIntoLibraryTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ShuffleIntoLibraryTargetEffect.java @@ -42,7 +42,7 @@ public class ShuffleIntoLibraryTargetEffect extends OneShotEffect { Player controller = game.getPlayer(source.getControllerId()); if (cardObject != null && controller != null && cardObject instanceof Card) { if (!optional - || controller.chooseUse(Outcome.Benefit, "Do you wish to shuffle " + cardObject.getIdName() + " into " + || controller.chooseUse(Outcome.Benefit, "Shuffle " + cardObject.getIdName() + " into " + (((Card) cardObject).getOwnerId().equals(source.getControllerId()) ? "your" : "its owners") + " library?", source, game)) { Player owner = game.getPlayer(((Card) cardObject).getOwnerId()); diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesColorOrColorsTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesColorOrColorsTargetEffect.java index cdcf19baf9b..752659b5013 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesColorOrColorsTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesColorOrColorsTargetEffect.java @@ -48,7 +48,7 @@ public class BecomesColorOrColorsTargetEffect extends OneShotEffect { if (controller != null && target != null) { for (int i = 0; i < 5; i++) { if (i > 0) { - if (!controller.chooseUse(Outcome.Neutral, "Do you wish to choose another color?", source, game)) { + if (!controller.chooseUse(Outcome.Neutral, "Choose another color?", source, game)) { break; } } diff --git a/Mage/src/main/java/mage/abilities/keyword/LeylineAbility.java b/Mage/src/main/java/mage/abilities/keyword/LeylineAbility.java index d2b31e2071f..1fc20d2d029 100644 --- a/Mage/src/main/java/mage/abilities/keyword/LeylineAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/LeylineAbility.java @@ -43,7 +43,7 @@ public class LeylineAbility extends StaticAbility implements MageSingleton, Open @Override public boolean askUseOpeningHandAction(Card card, Player player, Game game) { - return player.chooseUse(Outcome.PutCardInPlay, "Do you wish to put " + card.getName() + " on the battlefield?", this, game); + return player.chooseUse(Outcome.PutCardInPlay, "Put " + card.getName() + " on the battlefield?", this, game); } @Override diff --git a/Mage/src/main/java/mage/game/combat/Combat.java b/Mage/src/main/java/mage/game/combat/Combat.java index 3784ff1c72a..3abe7b08d9a 100644 --- a/Mage/src/main/java/mage/game/combat/Combat.java +++ b/Mage/src/main/java/mage/game/combat/Combat.java @@ -352,8 +352,8 @@ public class Combat implements Serializable, Copyable { if (game.replaceEvent(GameEvent.getEvent(GameEvent.EventType.DECLARING_ATTACKERS, attackingPlayerId, attackingPlayerId)) || (!canBand && !canBandWithOther) || !player.chooseUse(Outcome.Benefit, - "Do you wish to " + (isBanded ? "band " + attacker.getLogName() - + " with another " : "form a band with " + attacker.getLogName() + " and an ") + (isBanded ? "Band " + attacker.getLogName() + + " with another " : "Form a band with " + attacker.getLogName() + " and an ") + "attacking creature?", null, game)) { break; } diff --git a/Mage/src/main/java/mage/game/combat/CombatGroup.java b/Mage/src/main/java/mage/game/combat/CombatGroup.java index 4831dc23158..0b501594cab 100644 --- a/Mage/src/main/java/mage/game/combat/CombatGroup.java +++ b/Mage/src/main/java/mage/game/combat/CombatGroup.java @@ -167,8 +167,7 @@ public class CombatGroup implements Serializable, Copyable { } else { Player player = game.getPlayer(defenderAssignsCombatDamage(game) ? defendingPlayerId : attacker.getControllerId()); if ((attacker.getAbilities().containsKey(DamageAsThoughNotBlockedAbility.getInstance().getId()) && - player.chooseUse(Outcome.Damage, "Do you wish to assign damage for " - + attacker.getLogName() + " as though it weren't blocked?", null, game)) || + player.chooseUse(Outcome.Damage, "Have " + attacker.getLogName() + " assign damage as though it weren't blocked?", null, game)) || game.getContinuousEffects().asThough(attacker.getId(), AsThoughEffectType.DAMAGE_NOT_BLOCKED, null, attacker.getControllerId(), game) != null) { // for handling creatures like Thorn Elemental @@ -887,7 +886,7 @@ public class CombatGroup implements Serializable, Copyable { // 10/4/2004 If it is blocked but then all of its blockers are removed before combat damage is assigned, then it won't be able to deal combat damage and you won't be able to use its ability. // (same principle should apply if it's blocking and its blocked attacker is removed from combat) if (!((blocked && blockers.isEmpty() && isAttacking) || (attackers.isEmpty() && !isAttacking)) && canDamage(creature, first)) { - if (player.chooseUse(Outcome.Damage, "Do you wish to assign " + creature.getLogName() + "'s combat damage divided among defending player and/or any number of defending creatures?", null, game)) { + if (player.chooseUse(Outcome.Damage, "Have " + creature.getLogName() + " assign its combat damage divided among defending player and/or any number of defending creatures?", null, game)) { defendingPlayerAndOrDefendingCreaturesDividedDamage(creature, player, first, game, isAttacking); return true; }