From bc990ad24aca60746964fc7a9e059c48dba99d2f Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Wed, 6 May 2015 15:58:18 +0200 Subject: [PATCH] * Some minor fixed to tooltip texts. --- .../src/mage/sets/gatecrash/BalustradeSpy.java | 15 ++++++++------- Mage.Sets/src/mage/sets/torment/Ichorid.java | 3 +-- .../abilities/effects/common/DoIfCostPaid.java | 9 +++++++-- ...urnSourceFromGraveyardToBattlefieldEffect.java | 2 +- 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/Mage.Sets/src/mage/sets/gatecrash/BalustradeSpy.java b/Mage.Sets/src/mage/sets/gatecrash/BalustradeSpy.java index 636e8649aa..6d5cda6300 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/BalustradeSpy.java +++ b/Mage.Sets/src/mage/sets/gatecrash/BalustradeSpy.java @@ -33,6 +33,7 @@ import mage.constants.Outcome; import mage.constants.Rarity; import mage.constants.Zone; import mage.MageInt; +import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.OneShotEffect; @@ -56,7 +57,6 @@ public class BalustradeSpy extends CardImpl { this.subtype.add("Vampire"); this.subtype.add("Rogue"); - this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(3); @@ -97,24 +97,25 @@ class BalustradeSpyEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); - if (player == null) { + Player controller = game.getPlayer(getTargetPointer().getFirst(game, source)); + MageObject sourceObject = source.getSourceObject(game); + if (controller == null || sourceObject == null) { return false; } CardsImpl cards = new CardsImpl(); boolean landFound = false; - while (player.getLibrary().size() > 0 && !landFound) { - Card card = player.getLibrary().removeFromTop(game); + while (controller.getLibrary().size() > 0 && !landFound) { + Card card = controller.getLibrary().removeFromTop(game); if (card != null) { cards.add(card); - card.moveToZone(Zone.GRAVEYARD, source.getSourceId(), game, false); if (card.getCardType().contains(CardType.LAND)) { landFound = true; } } } if (!cards.isEmpty()) { - player.revealCards("Balustrade Spy", cards, game); + controller.moveCardsToGraveyardWithInfo(cards, source, game, Zone.LIBRARY); + controller.revealCards(sourceObject.getLogName(), cards, game); return true; } return true; diff --git a/Mage.Sets/src/mage/sets/torment/Ichorid.java b/Mage.Sets/src/mage/sets/torment/Ichorid.java index ab02a3e834..28187951a6 100644 --- a/Mage.Sets/src/mage/sets/torment/Ichorid.java +++ b/Mage.Sets/src/mage/sets/torment/Ichorid.java @@ -63,7 +63,6 @@ public class Ichorid extends CardImpl { this.expansionSetCode = "TOR"; this.subtype.add("Horror"); - this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(1); @@ -118,7 +117,7 @@ class IchoridTriggerdAbility extends BeginningOfUpkeepTriggeredAbility{ @Override public String getRule() { - return "At the beginning of your upkeep, if {source} is in your graveyard, you may exile a black creature card other than {source} from your graveyard. If you do, return {source} to the battlefield"; + return "At the beginning of your upkeep, if {source} is in your graveyard, you may exile a black creature card other than {source} from your graveyard. If you do, return {source} to the battlefield."; } } diff --git a/Mage/src/mage/abilities/effects/common/DoIfCostPaid.java b/Mage/src/mage/abilities/effects/common/DoIfCostPaid.java index edae3a4ba2..344e6aadc6 100644 --- a/Mage/src/mage/abilities/effects/common/DoIfCostPaid.java +++ b/Mage/src/mage/abilities/effects/common/DoIfCostPaid.java @@ -47,7 +47,11 @@ public class DoIfCostPaid extends OneShotEffect { if (player != null && mageObject != null) { String message; if (chooseUseText == null) { - message = new StringBuilder(getCostText()).append(" and ").append(executingEffects.getText(source.getModes().getMode())).append("?").toString(); + String effectText = executingEffects.getText(source.getModes().getMode()); + if (effectText.length() > 0 && effectText.charAt(effectText.length()-1)=='.') { + effectText = effectText.substring(0, effectText.length()-1); + } + message = getCostText() +" and " + effectText + "?"; } else { message = chooseUseText; } @@ -82,13 +86,14 @@ public class DoIfCostPaid extends OneShotEffect { if (!staticText.isEmpty()) { return staticText; } - return new StringBuilder("you may ").append(getCostText()).append(". If you do, ").append(executingEffects.getText(mode)).toString(); + return "you may " + getCostText() + ". If you do, " + executingEffects.getText(mode); } protected String getCostText() { StringBuilder sb = new StringBuilder(); String costText = cost.getText(); if (costText != null + && !costText.toLowerCase().startsWith("exile") && !costText.toLowerCase().startsWith("discard") && !costText.toLowerCase().startsWith("sacrifice") && !costText.toLowerCase().startsWith("remove") diff --git a/Mage/src/mage/abilities/effects/common/ReturnSourceFromGraveyardToBattlefieldEffect.java b/Mage/src/mage/abilities/effects/common/ReturnSourceFromGraveyardToBattlefieldEffect.java index f5ef7cf47c..a87f0360ff 100644 --- a/Mage/src/mage/abilities/effects/common/ReturnSourceFromGraveyardToBattlefieldEffect.java +++ b/Mage/src/mage/abilities/effects/common/ReturnSourceFromGraveyardToBattlefieldEffect.java @@ -96,7 +96,7 @@ public class ReturnSourceFromGraveyardToBattlefieldEffect extends OneShotEffect } private void setText() { - StringBuilder sb = new StringBuilder("Return {this} from your graveyard to the battlefield"); + StringBuilder sb = new StringBuilder("return {this} from your graveyard to the battlefield"); if (tapped) { sb.append(" tapped"); }