mirror of
https://github.com/correl/mage.git
synced 2024-12-26 03:00:11 +00:00
* Some minor fixed to tooltip texts.
This commit is contained in:
parent
5dbd5401fa
commit
bc990ad24a
4 changed files with 17 additions and 12 deletions
|
@ -33,6 +33,7 @@ import mage.constants.Outcome;
|
||||||
import mage.constants.Rarity;
|
import mage.constants.Rarity;
|
||||||
import mage.constants.Zone;
|
import mage.constants.Zone;
|
||||||
import mage.MageInt;
|
import mage.MageInt;
|
||||||
|
import mage.MageObject;
|
||||||
import mage.abilities.Ability;
|
import mage.abilities.Ability;
|
||||||
import mage.abilities.common.EntersBattlefieldTriggeredAbility;
|
import mage.abilities.common.EntersBattlefieldTriggeredAbility;
|
||||||
import mage.abilities.effects.OneShotEffect;
|
import mage.abilities.effects.OneShotEffect;
|
||||||
|
@ -56,7 +57,6 @@ public class BalustradeSpy extends CardImpl {
|
||||||
this.subtype.add("Vampire");
|
this.subtype.add("Vampire");
|
||||||
this.subtype.add("Rogue");
|
this.subtype.add("Rogue");
|
||||||
|
|
||||||
this.color.setBlack(true);
|
|
||||||
this.power = new MageInt(2);
|
this.power = new MageInt(2);
|
||||||
this.toughness = new MageInt(3);
|
this.toughness = new MageInt(3);
|
||||||
|
|
||||||
|
@ -97,24 +97,25 @@ class BalustradeSpyEffect extends OneShotEffect {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean apply(Game game, Ability source) {
|
public boolean apply(Game game, Ability source) {
|
||||||
Player player = game.getPlayer(getTargetPointer().getFirst(game, source));
|
Player controller = game.getPlayer(getTargetPointer().getFirst(game, source));
|
||||||
if (player == null) {
|
MageObject sourceObject = source.getSourceObject(game);
|
||||||
|
if (controller == null || sourceObject == null) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
CardsImpl cards = new CardsImpl();
|
CardsImpl cards = new CardsImpl();
|
||||||
boolean landFound = false;
|
boolean landFound = false;
|
||||||
while (player.getLibrary().size() > 0 && !landFound) {
|
while (controller.getLibrary().size() > 0 && !landFound) {
|
||||||
Card card = player.getLibrary().removeFromTop(game);
|
Card card = controller.getLibrary().removeFromTop(game);
|
||||||
if (card != null) {
|
if (card != null) {
|
||||||
cards.add(card);
|
cards.add(card);
|
||||||
card.moveToZone(Zone.GRAVEYARD, source.getSourceId(), game, false);
|
|
||||||
if (card.getCardType().contains(CardType.LAND)) {
|
if (card.getCardType().contains(CardType.LAND)) {
|
||||||
landFound = true;
|
landFound = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (!cards.isEmpty()) {
|
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;
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
|
|
|
@ -63,7 +63,6 @@ public class Ichorid extends CardImpl {
|
||||||
this.expansionSetCode = "TOR";
|
this.expansionSetCode = "TOR";
|
||||||
this.subtype.add("Horror");
|
this.subtype.add("Horror");
|
||||||
|
|
||||||
this.color.setBlack(true);
|
|
||||||
this.power = new MageInt(3);
|
this.power = new MageInt(3);
|
||||||
this.toughness = new MageInt(1);
|
this.toughness = new MageInt(1);
|
||||||
|
|
||||||
|
@ -118,7 +117,7 @@ class IchoridTriggerdAbility extends BeginningOfUpkeepTriggeredAbility{
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getRule() {
|
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.";
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -47,7 +47,11 @@ public class DoIfCostPaid extends OneShotEffect {
|
||||||
if (player != null && mageObject != null) {
|
if (player != null && mageObject != null) {
|
||||||
String message;
|
String message;
|
||||||
if (chooseUseText == null) {
|
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 {
|
} else {
|
||||||
message = chooseUseText;
|
message = chooseUseText;
|
||||||
}
|
}
|
||||||
|
@ -82,13 +86,14 @@ public class DoIfCostPaid extends OneShotEffect {
|
||||||
if (!staticText.isEmpty()) {
|
if (!staticText.isEmpty()) {
|
||||||
return staticText;
|
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() {
|
protected String getCostText() {
|
||||||
StringBuilder sb = new StringBuilder();
|
StringBuilder sb = new StringBuilder();
|
||||||
String costText = cost.getText();
|
String costText = cost.getText();
|
||||||
if (costText != null
|
if (costText != null
|
||||||
|
&& !costText.toLowerCase().startsWith("exile")
|
||||||
&& !costText.toLowerCase().startsWith("discard")
|
&& !costText.toLowerCase().startsWith("discard")
|
||||||
&& !costText.toLowerCase().startsWith("sacrifice")
|
&& !costText.toLowerCase().startsWith("sacrifice")
|
||||||
&& !costText.toLowerCase().startsWith("remove")
|
&& !costText.toLowerCase().startsWith("remove")
|
||||||
|
|
|
@ -96,7 +96,7 @@ public class ReturnSourceFromGraveyardToBattlefieldEffect extends OneShotEffect
|
||||||
}
|
}
|
||||||
|
|
||||||
private void setText() {
|
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) {
|
if (tapped) {
|
||||||
sb.append(" tapped");
|
sb.append(" tapped");
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue