external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 03:08:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Mulligan prompt now informs user whose turn it is:

Browse Source 
"You're going first. Do you want to mulligan?"
This commit is contained in:
Doublestrike
2012-09-28 06:40:53 +00:00
parent 6271207087
commit ffb8c78e60
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/forge/control/input/InputMulligan.java
View File

@@ -63,7 +63,11 @@ public class InputMulligan extends Input {
ButtonUtil.enableAll(); ButtonUtil.enableAll();
VMatchUI.SINGLETON_INSTANCE.getBtnOK().setText("No"); VMatchUI.SINGLETON_INSTANCE.getBtnOK().setText("No");
VMatchUI.SINGLETON_INSTANCE.getBtnCancel().setText("Yes"); 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} */ /** {@inheritDoc} */

3
src/main/java/forge/model/FModel.java
View File

@@ -86,8 +86,7 @@ public enum FModel {
private final IStorageView<CardBlock> blocks; private final IStorageView<CardBlock> blocks;
private final IStorageView<CardBlock> fantasyBlocks; private final IStorageView<CardBlock> fantasyBlocks;
// have to implement lazy initialization - at the moment of FModel.ctor() // Lazy, since CardDb not ready.
// CardDb is not ready yet.
private CardCollections decks; private CardCollections decks;
/** /**