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

- Moved the "Start Game" stuff to only after Mulliganing and Leylining is finished.

Browse Source
This commit is contained in:
Sol
2012-04-27 18:56:06 +00:00
parent 64a612dec3
commit 1ea3431eea
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -94,6 +94,7 @@ public class InputMulligan extends Input {
for (int i = 0; i < newHand; i++) { for (int i = 0; i < newHand; i++) {
player.drawCard(); player.drawCard();
} }
AllZone.getGameLog().add("Mulligan", player + " has mulliganed down to " + newHand + " cards.", 0);
playerRating.notifyHasMulliganed(); playerRating.notifyHasMulliganed();
playerRating.notifyOpeningHandSize(newHand); playerRating.notifyOpeningHandSize(newHand);
return newHand; return newHand;
@@ -210,6 +211,10 @@ public class InputMulligan extends Input {
ga.checkStateEffects(); ga.checkStateEffects();
PhaseHandler.setGameBegins(1); PhaseHandler.setGameBegins(1);
AllZone.getGameLog().add("Turn",
"Turn " + Singletons.getModel().getGameState().getPhaseHandler().getTurn()
+ " (" + Singletons.getModel().getGameState().getPhaseHandler().getPlayerTurn() + ")",
0);
Singletons.getModel().getGameState().getPhaseHandler().setNeedToNextPhase(false); Singletons.getModel().getGameState().getPhaseHandler().setNeedToNextPhase(false);
PhaseUtil.visuallyActivatePhase(Singletons.getModel().getGameState().getPhaseHandler().getPhase()); PhaseUtil.visuallyActivatePhase(Singletons.getModel().getGameState().getPhaseHandler().getPhase());

6
src/main/java/forge/game/GameNew.java
View File

@@ -290,12 +290,6 @@ public class GameNew {
CMatchUI.SINGLETON_INSTANCE.setCard(AllZone.getHumanPlayer().getCardsIn(ZoneType.Hand).get(0)); CMatchUI.SINGLETON_INSTANCE.setCard(AllZone.getHumanPlayer().getCardsIn(ZoneType.Hand).get(0));
AllZone.getInputControl().setInput(new InputMulligan()); AllZone.getInputControl().setInput(new InputMulligan());
PhaseHandler.setGameBegins(1); // is this needed? It's already in InputMulligan...
AllZone.getGameLog().add("Turn",
"Turn " + Singletons.getModel().getGameState().getPhaseHandler().getTurn()
+ " (" + Singletons.getModel().getGameState().getPhaseHandler().getPlayerTurn() + ")",
0);
} // newGame() } // newGame()
private static void newGameCleanup() { private static void newGameCleanup() {