External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-27 14:02:05 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Some changes to tooltip texts.

Browse source
This commit is contained in:
LevelX2 2014-04-12 22:23:46 +02:00
parent 50e82ef930
commit bc0bd754dd
6 changed files with 30 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Mage/src/mage/abilities/effects/common/ExileCardYouChooseTargetOpponentEffect.java
View file

@ -64,7 +64,7 @@ public class ExileCardYouChooseTargetOpponentEffect extends OneShotEffect<ExileC
@Override
public boolean apply(Game game, Ability source) {
Player player = game.getPlayer(source.getFirstTarget());
if (player != null) {
if (player != null && !player.getHand().isEmpty()) {
player.revealCards("Exile " + filter.getMessage(), player.getHand(), game);
Player you = game.getPlayer(source.getControllerId());
if (you != null) {
@ -73,7 +73,7 @@ public class ExileCardYouChooseTargetOpponentEffect extends OneShotEffect<ExileC
if (you.choose(Outcome.Benefit, player.getHand(), target, game)) {
Card card = player.getHand().get(target.getFirstTarget(), game);
if (card != null) {
card.moveToExile(null, null , source.getSourceId(), game);
player.moveCardToExileWithInfo(card, null, null, source.getSourceId(), game, Zone.HAND);
}
}
}

17
Mage/src/mage/abilities/effects/common/ReturnFromExileEffect.java
View file

@ -29,13 +29,17 @@
package mage.abilities.effects.common;
import java.util.UUID;
import mage.constants.Outcome;
import mage.constants.Zone;
import mage.abilities.Ability;
import mage.abilities.effects.OneShotEffect;
import mage.cards.Card;
import mage.constants.Outcome;
import mage.constants.Zone;
import static mage.constants.Zone.BATTLEFIELD;
import static mage.constants.Zone.GRAVEYARD;
import static mage.constants.Zone.HAND;
import mage.game.ExileZone;
import mage.game.Game;
import mage.players.Player;
/**
*
@ -79,11 +83,13 @@ public class ReturnFromExileEffect extends OneShotEffect<ReturnFromExileEffect>
@Override
public boolean apply(Game game, Ability source) {
ExileZone exile = game.getExile().getExileZone(exileId);
if (exile != null) {
Player controller = game.getPlayer(source.getControllerId());
if (controller != null && exile != null) {
exile = exile.copy();
for (UUID cardId: exile) {
Card card = game.getCard(cardId);
card.moveToZone(zone, source.getId(), game, tapped);
card.moveToZone(zone, source.getSourceId(), game, tapped);
game.informPlayers(new StringBuilder(controller.getName()).append(" moves ").append(card.getName()).append(" to ").append(zone.toString()).toString());
}
game.getExile().getExileZone(exileId).clear();
return true;
@ -97,8 +103,9 @@ public class ReturnFromExileEffect extends OneShotEffect<ReturnFromExileEffect>
switch(zone) {
case BATTLEFIELD:
sb.append("to the battlefield under its owner's control");
if (tapped)
if (tapped) {
sb.append(" tapped");
}
break;
case HAND:
sb.append("to their owner's hand");