forked from External/mage
Fix typo in method name.
This commit is contained in:
parent
aa767f68ce
commit
4dbce1132c
19 changed files with 22 additions and 27 deletions
|
|
@ -78,7 +78,7 @@ class AminatousAuguryEffect extends OneShotEffect {
|
||||||
}
|
}
|
||||||
|
|
||||||
// move cards from library to exile
|
// move cards from library to exile
|
||||||
controller.moveCardsToExile(controller.getLibrary().getTopCards(game, 8), source, game, true, source.getSourceId(), CardUtil.createObjectRealtedWindowTitle(source, game, null));
|
controller.moveCardsToExile(controller.getLibrary().getTopCards(game, 8), source, game, true, source.getSourceId(), CardUtil.createObjectRelatedWindowTitle(source, game, null));
|
||||||
ExileZone auguryExileZone = game.getExile().getExileZone(source.getSourceId());
|
ExileZone auguryExileZone = game.getExile().getExileZone(source.getSourceId());
|
||||||
if (auguryExileZone == null) {
|
if (auguryExileZone == null) {
|
||||||
return true;
|
return true;
|
||||||
|
|
|
||||||
|
|
@ -144,7 +144,7 @@ class AnzragsRampageEffect extends OneShotEffect {
|
||||||
controller.moveCardsToExile(
|
controller.moveCardsToExile(
|
||||||
cards.getCards(game), source, game, true,
|
cards.getCards(game), source, game, true,
|
||||||
CardUtil.getExileZoneId(game, source),
|
CardUtil.getExileZoneId(game, source),
|
||||||
CardUtil.createObjectRealtedWindowTitle(source, game, null));
|
CardUtil.createObjectRelatedWindowTitle(source, game, null));
|
||||||
|
|
||||||
// You may put a creature card exiled this way onto the battlefield.
|
// You may put a creature card exiled this way onto the battlefield.
|
||||||
TargetCard targetCard = new TargetCardInExile(
|
TargetCard targetCard = new TargetCardInExile(
|
||||||
|
|
|
||||||
|
|
@ -92,7 +92,7 @@ class AsmodeusTheArchfiendReplacementEffect extends ReplacementEffectImpl {
|
||||||
Card card = controller.getLibrary().getFromTop(game);
|
Card card = controller.getLibrary().getFromTop(game);
|
||||||
if (card != null) {
|
if (card != null) {
|
||||||
UUID exileZoneId = CardUtil.getExileZoneId(game, sourcePermanent.getId(), sourcePermanent.getZoneChangeCounter(game));
|
UUID exileZoneId = CardUtil.getExileZoneId(game, sourcePermanent.getId(), sourcePermanent.getZoneChangeCounter(game));
|
||||||
String exileName = CardUtil.createObjectRealtedWindowTitle(source, game, null);
|
String exileName = CardUtil.createObjectRelatedWindowTitle(source, game, null);
|
||||||
controller.moveCardsToExile(card, source, game, false, exileZoneId, exileName);
|
controller.moveCardsToExile(card, source, game, false, exileZoneId, exileName);
|
||||||
card.setFaceDown(true, game);
|
card.setFaceDown(true, game);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -73,7 +73,7 @@ class CloneShellEffect extends OneShotEffect {
|
||||||
Card card = cards.get(target1.getFirstTarget(), game);
|
Card card = cards.get(target1.getFirstTarget(), game);
|
||||||
if (card != null) {
|
if (card != null) {
|
||||||
cards.remove(card);
|
cards.remove(card);
|
||||||
controller.moveCardsToExile(card, source, game, false, CardUtil.getCardExileZoneId(game, source), CardUtil.createObjectRealtedWindowTitle(source, game, "(Imprint)"));
|
controller.moveCardsToExile(card, source, game, false, CardUtil.getCardExileZoneId(game, source), CardUtil.createObjectRelatedWindowTitle(source, game, "(Imprint)"));
|
||||||
card.setFaceDown(true, game);
|
card.setFaceDown(true, game);
|
||||||
Permanent permanent = game.getPermanentOrLKIBattlefield(source.getSourceId());
|
Permanent permanent = game.getPermanentOrLKIBattlefield(source.getSourceId());
|
||||||
if (permanent != null) {
|
if (permanent != null) {
|
||||||
|
|
|
||||||
|
|
@ -73,7 +73,7 @@ class ColfenorsPlansExileEffect extends OneShotEffect {
|
||||||
Cards toExile = new CardsImpl(controller.getLibrary().getTopCards(game, 7));
|
Cards toExile = new CardsImpl(controller.getLibrary().getTopCards(game, 7));
|
||||||
UUID exileId = CardUtil.getCardExileZoneId(game, source);
|
UUID exileId = CardUtil.getCardExileZoneId(game, source);
|
||||||
controller.moveCardsToExile(toExile.getCards(game), source, game, false,
|
controller.moveCardsToExile(toExile.getCards(game), source, game, false,
|
||||||
exileId, CardUtil.createObjectRealtedWindowTitle(source, game, null));
|
exileId, CardUtil.createObjectRelatedWindowTitle(source, game, null));
|
||||||
ExileZone exileZone = game.getExile().getExileZone(exileId);
|
ExileZone exileZone = game.getExile().getExileZone(exileId);
|
||||||
if (exileZone != null) {
|
if (exileZone != null) {
|
||||||
for (Card card : exileZone.getCards(game)) {
|
for (Card card : exileZone.getCards(game)) {
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,6 @@ import mage.cards.CardSetInfo;
|
||||||
import mage.constants.CardType;
|
import mage.constants.CardType;
|
||||||
import mage.constants.Duration;
|
import mage.constants.Duration;
|
||||||
import mage.constants.Outcome;
|
import mage.constants.Outcome;
|
||||||
import mage.constants.Zone;
|
|
||||||
import mage.game.Game;
|
import mage.game.Game;
|
||||||
import mage.players.Player;
|
import mage.players.Player;
|
||||||
import mage.util.CardUtil;
|
import mage.util.CardUtil;
|
||||||
|
|
@ -64,7 +63,7 @@ class ElkinBottleExileEffect extends OneShotEffect {
|
||||||
if (controller != null) {
|
if (controller != null) {
|
||||||
Card card = controller.getLibrary().getFromTop(game);
|
Card card = controller.getLibrary().getFromTop(game);
|
||||||
if (card != null) {
|
if (card != null) {
|
||||||
controller.moveCardsToExile(card, source, game, true, source.getSourceId(), CardUtil.createObjectRealtedWindowTitle(source, game, null));
|
controller.moveCardsToExile(card, source, game, true, source.getSourceId(), CardUtil.createObjectRelatedWindowTitle(source, game, null));
|
||||||
CardUtil.makeCardPlayable(game, source, card, false, Duration.UntilYourNextUpkeepStep, false);
|
CardUtil.makeCardPlayable(game, source, card, false, Duration.UntilYourNextUpkeepStep, false);
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
|
|
|
||||||
|
|
@ -77,7 +77,7 @@ class FlamesOfRemembranceExileEffect extends OneShotEffect {
|
||||||
if (controller != null) {
|
if (controller != null) {
|
||||||
Cards cards = new CardsImpl(controller.getLibrary().getTopCards(game, amount.calculate(game, source, this)));
|
Cards cards = new CardsImpl(controller.getLibrary().getTopCards(game, amount.calculate(game, source, this)));
|
||||||
if (!cards.isEmpty()) {
|
if (!cards.isEmpty()) {
|
||||||
controller.moveCardsToExile(cards.getCards(game), source, game, true, source.getSourceId(), CardUtil.createObjectRealtedWindowTitle(source, game, ""));
|
controller.moveCardsToExile(cards.getCards(game), source, game, true, source.getSourceId(), CardUtil.createObjectRelatedWindowTitle(source, game, ""));
|
||||||
ContinuousEffect effect = new FlamesOfRemembranceMayPlayExiledEffect();
|
ContinuousEffect effect = new FlamesOfRemembranceMayPlayExiledEffect();
|
||||||
effect.setTargetPointer(new FixedTargets(cards, game));
|
effect.setTargetPointer(new FixedTargets(cards, game));
|
||||||
game.addEffect(effect, source);
|
game.addEffect(effect, source);
|
||||||
|
|
|
||||||
|
|
@ -95,7 +95,7 @@ class KingNarfisBetrayalFirstEffect extends OneShotEffect {
|
||||||
TargetCard target = new TargetCardInYourGraveyard(filter);
|
TargetCard target = new TargetCardInYourGraveyard(filter);
|
||||||
target.withNotTarget(true);
|
target.withNotTarget(true);
|
||||||
if (controller.chooseTarget(outcome, controller.getGraveyard(), target, source, game)) {
|
if (controller.chooseTarget(outcome, controller.getGraveyard(), target, source, game)) {
|
||||||
controller.moveCardsToExile(game.getCard(target.getFirstTarget()), source, game, true, CardUtil.getCardExileZoneId(game, source), CardUtil.createObjectRealtedWindowTitle(source, game, null));
|
controller.moveCardsToExile(game.getCard(target.getFirstTarget()), source, game, true, CardUtil.getCardExileZoneId(game, source), CardUtil.createObjectRelatedWindowTitle(source, game, null));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -112,7 +112,7 @@ class KingNarfisBetrayalFirstEffect extends OneShotEffect {
|
||||||
TargetCard target = new TargetCardInOpponentsGraveyard(1, 1, filter, true);
|
TargetCard target = new TargetCardInOpponentsGraveyard(1, 1, filter, true);
|
||||||
target.withNotTarget(true);
|
target.withNotTarget(true);
|
||||||
if (controller.chooseTarget(outcome, opponent.getGraveyard(), target, source, game)) {
|
if (controller.chooseTarget(outcome, opponent.getGraveyard(), target, source, game)) {
|
||||||
controller.moveCardsToExile(game.getCard(target.getFirstTarget()), source, game, true, CardUtil.getCardExileZoneId(game, source), CardUtil.createObjectRealtedWindowTitle(source, game, null));
|
controller.moveCardsToExile(game.getCard(target.getFirstTarget()), source, game, true, CardUtil.getCardExileZoneId(game, source), CardUtil.createObjectRelatedWindowTitle(source, game, null));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,6 @@ import mage.constants.TargetController;
|
||||||
import mage.constants.Zone;
|
import mage.constants.Zone;
|
||||||
import mage.game.Game;
|
import mage.game.Game;
|
||||||
import mage.game.events.GameEvent;
|
import mage.game.events.GameEvent;
|
||||||
import mage.game.events.GameEvent.EventType;
|
|
||||||
import mage.players.Player;
|
import mage.players.Player;
|
||||||
import mage.target.targetpointer.FixedTarget;
|
import mage.target.targetpointer.FixedTarget;
|
||||||
import mage.util.CardUtil;
|
import mage.util.CardUtil;
|
||||||
|
|
@ -111,7 +110,7 @@ class NecropotenceEffect extends OneShotEffect {
|
||||||
Card card = controller.getLibrary().getFromTop(game);
|
Card card = controller.getLibrary().getFromTop(game);
|
||||||
if (card != null && controller.moveCardsToExile(card, source, game, false,
|
if (card != null && controller.moveCardsToExile(card, source, game, false,
|
||||||
CardUtil.getCardExileZoneId(game, source),
|
CardUtil.getCardExileZoneId(game, source),
|
||||||
CardUtil.createObjectRealtedWindowTitle(source, game, null))) {
|
CardUtil.createObjectRelatedWindowTitle(source, game, null))) {
|
||||||
card.setFaceDown(true, game);
|
card.setFaceDown(true, game);
|
||||||
Effect returnToHandEffect = new ReturnToHandTargetEffect();
|
Effect returnToHandEffect = new ReturnToHandTargetEffect();
|
||||||
returnToHandEffect.setText("put that face down card into your hand");
|
returnToHandEffect.setText("put that face down card into your hand");
|
||||||
|
|
|
||||||
|
|
@ -83,7 +83,7 @@ class NightveilSpecterExileEffect extends OneShotEffect {
|
||||||
if (player != null) {
|
if (player != null) {
|
||||||
Card card = player.getLibrary().getFromTop(game);
|
Card card = player.getLibrary().getFromTop(game);
|
||||||
if (card != null) {
|
if (card != null) {
|
||||||
player.moveCardsToExile(card, source, game, true, CardUtil.getCardExileZoneId(game, source), CardUtil.createObjectRealtedWindowTitle(source, game, null));
|
player.moveCardsToExile(card, source, game, true, CardUtil.getCardExileZoneId(game, source), CardUtil.createObjectRelatedWindowTitle(source, game, null));
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -72,7 +72,7 @@ class NivixAerieOfTheFiremindEffect extends OneShotEffect {
|
||||||
if (library.hasCards()) {
|
if (library.hasCards()) {
|
||||||
Card card = library.getFromTop(game);
|
Card card = library.getFromTop(game);
|
||||||
if (card != null
|
if (card != null
|
||||||
&& controller.moveCardsToExile(card, source, game, true, source.getSourceId(), CardUtil.createObjectRealtedWindowTitle(source, game, null))
|
&& controller.moveCardsToExile(card, source, game, true, source.getSourceId(), CardUtil.createObjectRelatedWindowTitle(source, game, null))
|
||||||
&& card.isInstantOrSorcery(game)) {
|
&& card.isInstantOrSorcery(game)) {
|
||||||
ContinuousEffect effect = new NivixAerieOfTheFiremindCanCastEffect();
|
ContinuousEffect effect = new NivixAerieOfTheFiremindCanCastEffect();
|
||||||
effect.setTargetPointer(new FixedTarget(card.getId()));
|
effect.setTargetPointer(new FixedTarget(card.getId()));
|
||||||
|
|
|
||||||
|
|
@ -78,7 +78,7 @@ class PropheticFlamespeakerExileEffect extends OneShotEffect {
|
||||||
Card card = controller.getLibrary().getFromTop(game);
|
Card card = controller.getLibrary().getFromTop(game);
|
||||||
if (card != null) {
|
if (card != null) {
|
||||||
if (controller.moveCardsToExile(card, source, game, true, source.getSourceId(),
|
if (controller.moveCardsToExile(card, source, game, true, source.getSourceId(),
|
||||||
CardUtil.createObjectRealtedWindowTitle(source, game, "<this card may be played the turn it was exiled>"))) {
|
CardUtil.createObjectRelatedWindowTitle(source, game, "<this card may be played the turn it was exiled>"))) {
|
||||||
ContinuousEffect effect = new PropheticFlamespeakerCastFromExileEffect();
|
ContinuousEffect effect = new PropheticFlamespeakerCastFromExileEffect();
|
||||||
effect.setTargetPointer(new FixedTarget(card.getId()));
|
effect.setTargetPointer(new FixedTarget(card.getId()));
|
||||||
game.addEffect(effect, source);
|
game.addEffect(effect, source);
|
||||||
|
|
|
||||||
|
|
@ -3,8 +3,6 @@ package mage.cards.s;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
|
||||||
import mage.abilities.Ability;
|
import mage.abilities.Ability;
|
||||||
import mage.abilities.effects.AsThoughEffectImpl;
|
|
||||||
import mage.abilities.effects.ContinuousEffect;
|
|
||||||
import mage.abilities.effects.OneShotEffect;
|
import mage.abilities.effects.OneShotEffect;
|
||||||
import mage.abilities.effects.common.asthought.PlayFromNotOwnHandZoneTargetEffect;
|
import mage.abilities.effects.common.asthought.PlayFromNotOwnHandZoneTargetEffect;
|
||||||
import mage.cards.Card;
|
import mage.cards.Card;
|
||||||
|
|
@ -14,7 +12,6 @@ import mage.constants.*;
|
||||||
import mage.game.Game;
|
import mage.game.Game;
|
||||||
import mage.players.Player;
|
import mage.players.Player;
|
||||||
import mage.target.common.TargetOpponent;
|
import mage.target.common.TargetOpponent;
|
||||||
import mage.target.targetpointer.FixedTarget;
|
|
||||||
import mage.util.CardUtil;
|
import mage.util.CardUtil;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -69,7 +66,7 @@ class StolenGoodsEffect extends OneShotEffect {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if (card.isLand(game)) {
|
if (card.isLand(game)) {
|
||||||
if (!opponent.moveCardsToExile(card, source, game, true, source.getSourceId(), CardUtil.createObjectRealtedWindowTitle(source, game, null))) {
|
if (!opponent.moveCardsToExile(card, source, game, true, source.getSourceId(), CardUtil.createObjectRelatedWindowTitle(source, game, null))) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|
|
||||||
|
|
@ -93,7 +93,7 @@ class TibaltsTrickeryEffect extends OneShotEffect {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
controller.moveCardsToExile(cardsToExile, source, game, true, source.getSourceId(),
|
controller.moveCardsToExile(cardsToExile, source, game, true, source.getSourceId(),
|
||||||
CardUtil.createObjectRealtedWindowTitle(source, game, null));
|
CardUtil.createObjectRelatedWindowTitle(source, game, null));
|
||||||
if (cardToCast != null) {
|
if (cardToCast != null) {
|
||||||
if (controller.chooseUse(Outcome.PlayForFree, "Cast " + cardToCast.getLogName() + " for free?", source, game)) {
|
if (controller.chooseUse(Outcome.PlayForFree, "Cast " + cardToCast.getLogName() + " for free?", source, game)) {
|
||||||
game.getState().setValue("PlayFromNotOwnHandZone" + cardToCast.getId(), Boolean.TRUE);
|
game.getState().setValue("PlayFromNotOwnHandZone" + cardToCast.getId(), Boolean.TRUE);
|
||||||
|
|
|
||||||
|
|
@ -109,7 +109,7 @@ class VivienChampionOfTheWildsEffect extends OneShotEffect {
|
||||||
Card cardToExile = game.getCard(target.getFirstTarget());
|
Card cardToExile = game.getCard(target.getFirstTarget());
|
||||||
if (!player.moveCardsToExile(cardToExile, source, game, false,
|
if (!player.moveCardsToExile(cardToExile, source, game, false,
|
||||||
CardUtil.getCardExileZoneId(game, source),
|
CardUtil.getCardExileZoneId(game, source),
|
||||||
CardUtil.createObjectRealtedWindowTitle(source, game, " (look and cast)"))) {
|
CardUtil.createObjectRelatedWindowTitle(source, game, " (look and cast)"))) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
cardToExile.setFaceDown(true, game);
|
cardToExile.setFaceDown(true, game);
|
||||||
|
|
|
||||||
|
|
@ -86,7 +86,7 @@ class YggdrasilRebirthEngineExileAllCreaturesGraveyardEffect extends OneShotEffe
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
UUID exileZoneId = CardUtil.getExileZoneId(game, source);
|
UUID exileZoneId = CardUtil.getExileZoneId(game, source);
|
||||||
String exileZoneName = CardUtil.createObjectRealtedWindowTitle(source, game, null);
|
String exileZoneName = CardUtil.createObjectRelatedWindowTitle(source, game, null);
|
||||||
Cards cards = new CardsImpl(controller.getGraveyard().getCards(StaticFilters.FILTER_CARD_CREATURE, game));
|
Cards cards = new CardsImpl(controller.getGraveyard().getCards(StaticFilters.FILTER_CARD_CREATURE, game));
|
||||||
if (cards.isEmpty()){
|
if (cards.isEmpty()){
|
||||||
return true;
|
return true;
|
||||||
|
|
|
||||||
|
|
@ -76,7 +76,7 @@ public class ExileCardsFromTopOfLibraryControllerEffect extends OneShotEffect {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
exileZoneId = CardUtil.getExileZoneId(game, source);
|
exileZoneId = CardUtil.getExileZoneId(game, source);
|
||||||
exileZoneName = CardUtil.createObjectRealtedWindowTitle(source, game, null);
|
exileZoneName = CardUtil.createObjectRelatedWindowTitle(source, game, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
Set<Card> cards = controller.getLibrary().getTopCards(game, amount);
|
Set<Card> cards = controller.getLibrary().getTopCards(game, amount);
|
||||||
|
|
|
||||||
|
|
@ -1895,9 +1895,9 @@ public abstract class PlayerImpl implements Player, Serializable {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (postToLog) {
|
if (postToLog) {
|
||||||
game.getState().getRevealed().add(CardUtil.createObjectRealtedWindowTitle(source, game, titleSuffix), cards);
|
game.getState().getRevealed().add(CardUtil.createObjectRelatedWindowTitle(source, game, titleSuffix), cards);
|
||||||
} else {
|
} else {
|
||||||
game.getState().getRevealed().update(CardUtil.createObjectRealtedWindowTitle(source, game, titleSuffix), cards);
|
game.getState().getRevealed().update(CardUtil.createObjectRelatedWindowTitle(source, game, titleSuffix), cards);
|
||||||
}
|
}
|
||||||
if (postToLog && !game.isSimulation()) {
|
if (postToLog && !game.isSimulation()) {
|
||||||
StringBuilder sb = new StringBuilder(getLogName()).append(" reveals ");
|
StringBuilder sb = new StringBuilder(getLogName()).append(" reveals ");
|
||||||
|
|
@ -1928,7 +1928,7 @@ public abstract class PlayerImpl implements Player, Serializable {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void lookAtCards(Ability source, String titleSuffix, Cards cards, Game game) {
|
public void lookAtCards(Ability source, String titleSuffix, Cards cards, Game game) {
|
||||||
game.getState().getLookedAt(this.playerId).add(CardUtil.createObjectRealtedWindowTitle(source, game, titleSuffix), cards);
|
game.getState().getLookedAt(this.playerId).add(CardUtil.createObjectRelatedWindowTitle(source, game, titleSuffix), cards);
|
||||||
game.fireUpdatePlayersEvent();
|
game.fireUpdatePlayersEvent();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -749,7 +749,7 @@ public final class CardUtil {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String createObjectRealtedWindowTitle(Ability source, Game game, String textSuffix) {
|
public static String createObjectRelatedWindowTitle(Ability source, Game game, String textSuffix) {
|
||||||
String title;
|
String title;
|
||||||
if (source != null) {
|
if (source != null) {
|
||||||
MageObject sourceObject = game.getObject(source);
|
MageObject sourceObject = game.getObject(source);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue