From 6970265c0fb64e2acff009fc6c96a80023f18436 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sun, 19 Oct 2014 11:21:02 +0200 Subject: [PATCH] * Changed draw message if a revealed card is drawn (e.g. Courser of Kruphix in play). --- Mage/src/mage/actions/MageDrawAction.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Mage/src/mage/actions/MageDrawAction.java b/Mage/src/mage/actions/MageDrawAction.java index 3c2d604455..90d80b7474 100644 --- a/Mage/src/mage/actions/MageDrawAction.java +++ b/Mage/src/mage/actions/MageDrawAction.java @@ -24,7 +24,7 @@ public class MageDrawAction extends MageAction { private final Player player; private final int amount; private final ArrayList appliedEffects; - private List drawnCards; + private final List drawnCards; private static final int NEGATIVE_VALUE = -1000000; @@ -32,6 +32,7 @@ public class MageDrawAction extends MageAction { this.player = player; this.amount = amount; this.appliedEffects = appliedEffects; + this.drawnCards = new ArrayList<>(); } /** @@ -52,7 +53,7 @@ public class MageDrawAction extends MageAction { numDrawn++; score += value; } - if (numDrawn > 0) { + if (!player.isTopCardRevealed() && numDrawn > 0) { game.fireInformEvent(player.getName() + " draws " + CardUtil.numberToText(numDrawn, "a") + " card" + (numDrawn > 1 ? "s" : "")); } if (player.isEmptyDraw()) { @@ -78,7 +79,12 @@ public class MageDrawAction extends MageAction { if (!game.replaceEvent(event)) { Card card = player.getLibrary().removeFromTop(game); if (card != null) { + drawnCards.add(card); 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())); return ArtificialScoringSystem.inst.getCardScore(card); }