refactored some instances of Player::moveCardToExileWithInfo

This commit is contained in:
Evan Kranzler 2022-03-14 21:14:12 -04:00
parent 8198322ba5
commit 83c94322c6
18 changed files with 183 additions and 213 deletions

View file

@ -1,4 +1,3 @@
package mage.abilities.effects.common;
import mage.abilities.Ability;
@ -12,25 +11,20 @@ import mage.players.Player;
import mage.target.TargetCard;
/**
*
* @author LevelX2
*/
public class ExileCardYouChooseTargetOpponentEffect extends OneShotEffect {
private FilterCard filter;
public ExileCardYouChooseTargetOpponentEffect() {
this(new FilterCard("a card"));
}
private final FilterCard filter;
public ExileCardYouChooseTargetOpponentEffect(FilterCard filter) {
super(Outcome.Discard);
staticText = new StringBuilder("Target opponent reveals their hand. You choose ")
.append(filter.getMessage()).append(" from it and exile that card").toString();
this.staticText = "Target opponent reveals their hand. You choose "
+ filter.getMessage() + " from it and exile that card";
this.filter = filter;
}
public ExileCardYouChooseTargetOpponentEffect(final ExileCardYouChooseTargetOpponentEffect effect) {
private ExileCardYouChooseTargetOpponentEffect(final ExileCardYouChooseTargetOpponentEffect effect) {
super(effect);
this.filter = effect.filter;
}
@ -39,26 +33,22 @@ public class ExileCardYouChooseTargetOpponentEffect extends OneShotEffect {
public boolean apply(Game game, Ability source) {
Player controller = game.getPlayer(source.getControllerId());
Player opponent = game.getPlayer(source.getFirstTarget());
Card sourceCard = game.getCard(source.getSourceId());
if (controller != null && opponent != null) {
if (!opponent.getHand().isEmpty()) {
opponent.revealCards(sourceCard != null ? sourceCard.getIdName() + " (" + sourceCard.getZoneChangeCounter(game) + ')' : "Exile", opponent.getHand(), game);
TargetCard target = new TargetCard(Zone.HAND, filter);
if (controller.choose(Outcome.Exile, opponent.getHand(), target, game)) {
Card card = opponent.getHand().get(target.getFirstTarget(), game);
if (card != null) {
controller.moveCardToExileWithInfo(card, null, "", source, game, Zone.HAND, true);
}
}
}
return true;
if (controller == null || opponent == null
|| opponent.getHand().count(filter, game) < 1) {
return false;
}
return false;
opponent.revealCards(source, opponent.getHand(), game);
TargetCard target = new TargetCard(Zone.HAND, filter);
controller.choose(Outcome.Exile, opponent.getHand(), target, game);
Card card = opponent.getHand().get(target.getFirstTarget(), game);
if (card != null) {
controller.moveCards(card, Zone.EXILED, source, game);
}
return true;
}
@Override
public ExileCardYouChooseTargetOpponentEffect copy() {
return new ExileCardYouChooseTargetOpponentEffect(this);
}
}