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

Some minor fixes to game log / card rules text /messages.

Browse source
This commit is contained in:
LevelX2 2016-09-15 16:10:17 +02:00
parent 4e3ec26dbd
commit 0042dc1ad9
4 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Mage.Sets/src/mage/sets/kaladesh/BomatCourier.java
View file

@ -29,6 +29,7 @@ package mage.sets.kaladesh;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.MageObject;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.common.AttacksTriggeredAbility;
import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleActivatedAbility;
@ -103,12 +104,13 @@ class BomatCourierExileEffect extends OneShotEffect {
@Override @Override
public boolean apply(Game game, Ability source) { public boolean apply(Game game, Ability source) {
Player controller = game.getPlayer(source.getControllerId()); Player controller = game.getPlayer(source.getControllerId());
if (controller != null) { MageObject sourceObject = source.getSourceObject(game);
if (controller != null && sourceObject != null) {
Card card = controller.getLibrary().getFromTop(game); Card card = controller.getLibrary().getFromTop(game);
if (card != null) { if (card != null) {
UUID exileZoneId = CardUtil.getCardExileZoneId(game, source); UUID exileZoneId = CardUtil.getCardExileZoneId(game, source);
card.setFaceDown(true, game); card.setFaceDown(true, game);
controller.moveCardsToExile(card, source, game, false, exileZoneId, "Bomat Courier"); controller.moveCardsToExile(card, source, game, false, exileZoneId, sourceObject.getIdName());
card.setFaceDown(true, game); card.setFaceDown(true, game);
return true; return true;
} }

5
Mage.Sets/src/mage/sets/kaladesh/WispweaverAngel.java
View file

@ -58,7 +58,7 @@ import mage.util.CardUtil;
*/ */
public class WispweaverAngel extends CardImpl { public class WispweaverAngel extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another creature you control"); private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another taget creature you control");
static { static {
filter.add(new AnotherPredicate()); filter.add(new AnotherPredicate());
@ -121,8 +121,7 @@ class WispweaverAngelEffect extends OneShotEffect {
for (UUID targetId : this.getTargetPointer().getTargets(game, source)) { for (UUID targetId : this.getTargetPointer().getTargets(game, source)) {
if (exileZone.contains(targetId)) { if (exileZone.contains(targetId)) {
cardsToBattlefield.add(targetId); cardsToBattlefield.add(targetId);
} } else {
else {
Card card = game.getCard(targetId); Card card = game.getCard(targetId);
if (card != null && card instanceof MeldCard) { if (card != null && card instanceof MeldCard) {
MeldCard meldCard = (MeldCard) card; MeldCard meldCard = (MeldCard) card;

5
Mage/src/main/java/mage/abilities/effects/common/ExileTargetForSourceEffect.java
View file

@ -76,8 +76,7 @@ public class ExileTargetForSourceEffect extends OneShotEffect {
} }
} }
} }
} } else {
else {
for (UUID targetId : targetPointer.getTargets(game, source)) { for (UUID targetId : targetPointer.getTargets(game, source)) {
MageObject mageObject = game.getObject(targetId); MageObject mageObject = game.getObject(targetId);
if (mageObject != null) { if (mageObject != null) {
@ -99,6 +98,8 @@ public class ExileTargetForSourceEffect extends OneShotEffect {
if (mode.getTargets().isEmpty()) { if (mode.getTargets().isEmpty()) {
return "exile it"; return "exile it";
} else if (mode.getTargets().get(0).getTargetName().startsWith("another")) {
return "exile " + mode.getTargets().get(0).getTargetName();
} else { } else {
return "exile target " + mode.getTargets().get(0).getTargetName(); return "exile target " + mode.getTargets().get(0).getTargetName();
} }

11
Mage/src/main/java/mage/players/PlayerImpl.java
View file

@ -3146,7 +3146,7 @@ public abstract class PlayerImpl implements Player, Serializable {
successfulMovedCards = moveCardsToGraveyardWithInfo(cards, source, game, fromZone); successfulMovedCards = moveCardsToGraveyardWithInfo(cards, source, game, fromZone);
return successfulMovedCards.size() > 0; return successfulMovedCards.size() > 0;
case BATTLEFIELD: // new logic that does not yet add the permanents to battlefield while replacement effects are handled case BATTLEFIELD: // new logic that does not yet add the permanents to battlefield while replacement effects are handled
List<ZoneChangeInfo> infoList = new ArrayList<ZoneChangeInfo>(); List<ZoneChangeInfo> infoList = new ArrayList<>();
for (Card card : cards) { for (Card card : cards) {
fromZone = game.getState().getZone(card.getId()); fromZone = game.getState().getZone(card.getId());
ZoneChangeEvent event = new ZoneChangeEvent(card.getId(), source.getSourceId(), byOwner ? card.getOwnerId() : getId(), fromZone, Zone.BATTLEFIELD, appliedEffects); ZoneChangeEvent event = new ZoneChangeEvent(card.getId(), source.getSourceId(), byOwner ? card.getOwnerId() : getId(), fromZone, Zone.BATTLEFIELD, appliedEffects);
@ -3158,9 +3158,12 @@ public abstract class PlayerImpl implements Player, Serializable {
if (permanent != null) { if (permanent != null) {
successfulMovedCards.add(permanent); successfulMovedCards.add(permanent);
if (!game.isSimulation()) { if (!game.isSimulation()) {
game.informPlayers(game.getPlayer(info.event.getPlayerId()) + " puts " Player eventPlayer = game.getPlayer(info.event.getPlayerId());
+ (info.faceDown ? "a card face down " : permanent.getLogName()) + " from " if (eventPlayer != null && fromZone != null) {
+ fromZone.toString().toLowerCase(Locale.ENGLISH) + " onto the Battlefield"); game.informPlayers(eventPlayer.getLogName() + " puts "
+ (info.faceDown ? "a card face down " : permanent.getLogName()) + " from "
+ fromZone.toString().toLowerCase(Locale.ENGLISH) + " onto the Battlefield");
}
} }
} }
} }