github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-01-13 11:01:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Changed draw message if a revealed card is drawn (e.g. Courser of Kruphix in play).

Browse source
This commit is contained in:
LevelX2 2014-10-19 11:21:02 +02:00
parent 58bbe60c72
commit 6970265c0f
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Mage/src/mage/actions/MageDrawAction.java
View file

@ -24,7 +24,7 @@ public class MageDrawAction extends MageAction {
private final Player player; private final Player player;
private final int amount; private final int amount;
private final ArrayList<UUID> appliedEffects; private final ArrayList<UUID> appliedEffects;
private List<Card> drawnCards; private final List<Card> drawnCards;
private static final int NEGATIVE_VALUE = -1000000; private static final int NEGATIVE_VALUE = -1000000;
@ -32,6 +32,7 @@ public class MageDrawAction extends MageAction {
this.player = player; this.player = player;
this.amount = amount; this.amount = amount;
this.appliedEffects = appliedEffects; this.appliedEffects = appliedEffects;
this.drawnCards = new ArrayList<>();
} }
/** /**
@ -52,7 +53,7 @@ public class MageDrawAction extends MageAction {
numDrawn++; numDrawn++;
score += value; score += value;
} }
if (numDrawn > 0) { if (!player.isTopCardRevealed() && numDrawn > 0) {
game.fireInformEvent(player.getName() + " draws " + CardUtil.numberToText(numDrawn, "a") + " card" + (numDrawn > 1 ? "s" : "")); game.fireInformEvent(player.getName() + " draws " + CardUtil.numberToText(numDrawn, "a") + " card" + (numDrawn > 1 ? "s" : ""));
} }
if (player.isEmptyDraw()) { if (player.isEmptyDraw()) {
@ -78,7 +79,12 @@ public class MageDrawAction extends MageAction {
if (!game.replaceEvent(event)) { if (!game.replaceEvent(event)) {
Card card = player.getLibrary().removeFromTop(game); Card card = player.getLibrary().removeFromTop(game);
if (card != null) { if (card != null) {
drawnCards.add(card);
card.moveToZone(Zone.HAND, null, game, false); card.moveToZone(Zone.HAND, null, game, false);
if (player.isTopCardRevealed()) {
game.fireInformEvent(player.getName() + " draws a revealed card (" + card.getLogName() + ")");
}
game.fireEvent(GameEvent.getEvent(GameEvent.EventType.DREW_CARD, card.getId(), player.getId())); game.fireEvent(GameEvent.getEvent(GameEvent.EventType.DREW_CARD, card.getId(), player.getId()));
return ArtificialScoringSystem.inst.getCardScore(card); return ArtificialScoringSystem.inst.getCardScore(card);
} }