From ffb8c78e60e41cac646a0fdc68d13e0d83e5a8ea Mon Sep 17 00:00:00 2001 From: Doublestrike Date: Fri, 28 Sep 2012 06:40:53 +0000 Subject: [PATCH] Mulligan prompt now informs user whose turn it is: "You're going first. Do you want to mulligan?" --- src/main/java/forge/control/input/InputMulligan.java | 6 +++++- src/main/java/forge/model/FModel.java | 3 +-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/forge/control/input/InputMulligan.java b/src/main/java/forge/control/input/InputMulligan.java index fc71ae17a2c..8a0d6506946 100644 --- a/src/main/java/forge/control/input/InputMulligan.java +++ b/src/main/java/forge/control/input/InputMulligan.java @@ -63,7 +63,11 @@ public class InputMulligan extends Input { ButtonUtil.enableAll(); VMatchUI.SINGLETON_INSTANCE.getBtnOK().setText("No"); VMatchUI.SINGLETON_INSTANCE.getBtnCancel().setText("Yes"); - CMatchUI.SINGLETON_INSTANCE.showMessage("Do you want to Mulligan?"); + + final String str = + (Singletons.getModel().getGameState().getPhaseHandler().getPlayerTurn().equals(AllZone.getHumanPlayer()) + ? "You're going first. " : "The computer is going first. "); + CMatchUI.SINGLETON_INSTANCE.showMessage(str + "Do you want to Mulligan?"); } /** {@inheritDoc} */ diff --git a/src/main/java/forge/model/FModel.java b/src/main/java/forge/model/FModel.java index 28132cb5f04..e68dc1010df 100644 --- a/src/main/java/forge/model/FModel.java +++ b/src/main/java/forge/model/FModel.java @@ -86,8 +86,7 @@ public enum FModel { private final IStorageView blocks; private final IStorageView fantasyBlocks; - // have to implement lazy initialization - at the moment of FModel.ctor() - // CardDb is not ready yet. + // Lazy, since CardDb not ready. private CardCollections decks; /**