mirrors
/
PretendYoureXyzzy
mirror of https://github.com/ajanata/PretendYoureXyzzy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Comment and variable name cleanup. Change default spectators to 0.

This commit is contained in:
Andy Janata 2013-12-02 03:28:46 +00:00
parent 97414c287a
commit e58e436285
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/net/socialgamer/cah/data/Game.java
View File

@ -102,10 +102,18 @@ public class Game {
private final Object blackCardLock = new Object(); private final Object blackCardLock = new Object();
private WhiteDeck whiteDeck; private WhiteDeck whiteDeck;
private GameState state; private GameState state;
private int maxBlanks = 0;
private int maxPlayers = 6; // These are the default values new games get.
private int maxSpectators = 6; private int blanksInDeck = 0;
private int playerLimit = 6;
private int spectatorLimit = 0;
private int judgeIndex = 0; private int judgeIndex = 0;
// All of these delays could be moved to pyx.properties.
/**
* Time, in milliseconds, to delay before starting a new round.
*/
private final static int ROUND_INTERMISSION = 8 * 1000; private final static int ROUND_INTERMISSION = 8 * 1000;
/** /**
* Duration, in milliseconds, for the minimum timeout a player has to choose a card to play. * Duration, in milliseconds, for the minimum timeout a player has to choose a card to play.
@ -191,7 +199,7 @@ public class Game {
public void addPlayer(final User user) throws TooManyPlayersException, IllegalStateException { public void addPlayer(final User user) throws TooManyPlayersException, IllegalStateException {
logger.info(String.format("%s joined game %d.", user.toString(), id)); logger.info(String.format("%s joined game %d.", user.toString(), id));
synchronized (players) { synchronized (players) {
if (maxPlayers >= 3 && players.size() >= maxPlayers) { if (playerLimit >= 3 && players.size() >= playerLimit) {
throw new TooManyPlayersException(); throw new TooManyPlayersException();
} }
// this will throw IllegalStateException if the user is already in a game, including this one. // this will throw IllegalStateException if the user is already in a game, including this one.
@ -330,7 +338,7 @@ public class Game {
IllegalStateException { IllegalStateException {
logger.info(String.format("%s joined game %d as a spectator.", user.toString(), id)); logger.info(String.format("%s joined game %d as a spectator.", user.toString(), id));
synchronized (spectators) { synchronized (spectators) {
if (spectators.size() >= maxSpectators) { if (spectators.size() >= spectatorLimit) {
throw new TooManySpectatorsException(); throw new TooManySpectatorsException();
} }
// this will throw IllegalStateException if the user is already in a game, including this one. // this will throw IllegalStateException if the user is already in a game, including this one.
@ -442,13 +450,13 @@ public class Game {
final int newMaxSpectators, final Set<CardSet> newCardSets, final int newMaxBlanks, final int newMaxSpectators, final Set<CardSet> newCardSets, final int newMaxBlanks,
final String newPassword, final boolean newUseTimer) { final String newPassword, final boolean newUseTimer) {
this.scoreGoal = newScoreGoal; this.scoreGoal = newScoreGoal;
this.maxPlayers = newMaxPlayers; this.playerLimit = newMaxPlayers;
this.maxSpectators = newMaxSpectators; this.spectatorLimit = newMaxSpectators;
synchronized (this.cardSets) { synchronized (this.cardSets) {
this.cardSets.clear(); this.cardSets.clear();
this.cardSets.addAll(newCardSets); this.cardSets.addAll(newCardSets);
} }
this.maxBlanks = newMaxBlanks; this.blanksInDeck = newMaxBlanks;
this.password = newPassword; this.password = newPassword;
this.useIdleTimer = newUseTimer; this.useIdleTimer = newUseTimer;
@ -497,9 +505,9 @@ public class Game {
} }
} }
info.put(GameInfo.CARD_SETS, cardSetIds); info.put(GameInfo.CARD_SETS, cardSetIds);
info.put(GameInfo.BLANKS_LIMIT, maxBlanks); info.put(GameInfo.BLANKS_LIMIT, blanksInDeck);
info.put(GameInfo.PLAYER_LIMIT, maxPlayers); info.put(GameInfo.PLAYER_LIMIT, playerLimit);
info.put(GameInfo.SPECTATOR_LIMIT, maxSpectators); info.put(GameInfo.SPECTATOR_LIMIT, spectatorLimit);
info.put(GameInfo.SCORE_LIMIT, scoreGoal); info.put(GameInfo.SCORE_LIMIT, scoreGoal);
info.put(GameInfo.USE_TIMER, useIdleTimer); info.put(GameInfo.USE_TIMER, useIdleTimer);
if (includePassword) { if (includePassword) {
@ -648,7 +656,7 @@ public class Game {
// time, and not at the same time as trying to lock users, which has caused deadlocks // time, and not at the same time as trying to lock users, which has caused deadlocks
synchronized (cardSets) { synchronized (cardSets) {
blackDeck = new BlackDeck(cardSets); blackDeck = new BlackDeck(cardSets);
whiteDeck = new WhiteDeck(cardSets, maxBlanks); whiteDeck = new WhiteDeck(cardSets, blanksInDeck);
} }
startNextRound(); startNextRound();
gameManager.broadcastGameListRefresh(); gameManager.broadcastGameListRefresh();