mirror/liberty-bikes
2
0
Fork 0
mirror of https://github.com/OpenLiberty/liberty-bikes.git synced 2024-11-21 00:51:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove ability to pause games

Browse Source
This commit is contained in:
Andrew Guibert 2018-02-09 23:41:47 -06:00
parent 4f7a0846e8
commit f150f69568
5 changed files with 28 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/prebuild/src/app/game/game.component.html
View File

@ -21,7 +21,6 @@
</div>
<div class="panel-footer">
<button type="button" class="btn btn-success" (click)="startGame()">Start Game</button>
<button type="button" class="btn btn-danger" (click)="pauseGame()">Pause Game</button>
<button type="button" class="btn btn-warning" (click)="requeue()">Requeue</button>
</div>
</div>

4
frontend/prebuild/src/app/game/game.component.ts
View File

@ -18,10 +18,6 @@ export class GameComponent implements OnInit {
this.gameBoard.startGame();
}
pauseGame() {
this.gameBoard.pauseGame();
}
requeue() {
this.gameBoard.requeue();
}

4
frontend/prebuild/src/app/game/whiteboard.ts
View File

@ -67,10 +67,6 @@ export class Whiteboard {
this.gamesocket.sendText(JSON.stringify({ message: 'GAME_START' }));
}
pauseGame() {
this.gamesocket.sendText(JSON.stringify({ message: 'GAME_PAUSE' }));
}
requeue() {
this.gamesocket.sendText(JSON.stringify({ message: 'GAME_REQUEUE' }));
}

1
game-service/src/main/java/org/libertybikes/game/core/ClientMessage.java
View File

@ -9,7 +9,6 @@ public class ClientMessage {
public static enum GameEvent {
GAME_START,
GAME_PAUSE,
GAME_REQUEUE
}

57
game-service/src/main/java/org/libertybikes/game/core/GameRound.java
View File

@ -10,6 +10,7 @@ import java.util.Random;
import java.util.Set;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
import javax.json.Json;
@ -31,6 +32,7 @@ public class GameRound implements Runnable {
public static final int BOARD_SIZE = 121;
private static final Random r = new Random();
private static final AtomicInteger runningGames = new AtomicInteger();
public final String id;
public final String nextRoundId;
@ -41,6 +43,7 @@ public class GameRound implements Runnable {
private boolean[][] board = new boolean[BOARD_SIZE][BOARD_SIZE];
private AtomicBoolean gameRunning = new AtomicBoolean(false);
private AtomicBoolean paused = new AtomicBoolean(false);
private int ticksWithoutMoves = 0;
// Get a string of 6 random uppercase letters (A-Z)
private static String getRandomId() {
@ -59,32 +62,29 @@ public class GameRound implements Runnable {
nextRoundId = getRandomId();
}
public void handleMessage(ClientMessage msg, Session client) {
if (msg.event != null) {
if (GameEvent.GAME_START == msg.event)
startGame();
else if (GameEvent.GAME_PAUSE == msg.event)
pause();
}
public void handleMessage(ClientMessage msg, Session session) {
if (GameEvent.GAME_START == msg.event)
startGame();
if (msg.direction != null) {
Player p = clients.get(client).player;
p.setDirection(msg.direction);
Client c = clients.get(session);
if (c.isPlayer())
c.player.setDirection(msg.direction);
}
if (msg.playerJoinedId != null) {
addPlayer(client, msg.playerJoinedId);
addPlayer(session, msg.playerJoinedId);
}
if (Boolean.TRUE == msg.isSpectator) {
addSpectator(client);
addSpectator(session);
}
}
public void addPlayer(Session s, String playerId) {
Player p = PlayerFactory.initNextPlayer(this, playerId);
clients.put(s, new Client(s, p));
System.out.println("Player " + getPlayers().size() + " has joined.");
System.out.println("Player " + playerId + " has joined.");
broadcastPlayerList();
broadcastPlayerLocations();
}
@ -123,14 +123,16 @@ public class GameRound implements Runnable {
Arrays.fill(board[i], true);
gameRunning.set(true);
System.out.println("Starting round: " + id);
int numGames = runningGames.incrementAndGet();
if (numGames > 3)
System.out.println("WARNING: There are currently " + numGames + " game instances running.");
while (gameRunning.get()) {
while (!paused.get()) {
delay(GAME_TICK_SPEED);
gameTick();
}
delay(500); // don't thrash when game is paused
delay(GAME_TICK_SPEED);
gameTick();
if (ticksWithoutMoves > 5)
gameRunning.set(false); // end the game if nobody can move anymore
}
runningGames.decrementAndGet();
System.out.println("Finished round: " + id);
}
@ -150,8 +152,13 @@ public class GameRound implements Runnable {
}
}
if (playersMoved)
if (playersMoved) {
ticksWithoutMoves = 0;
broadcastPlayerLocations();
} else {
ticksWithoutMoves++;
}
if (playerStatusChange)
broadcastPlayerList();
}
@ -200,8 +207,9 @@ public class GameRound implements Runnable {
alive = cur;
}
}
if (alivePlayers == 1)
if (alivePlayers == 1) {
alive.setStatus(STATUS.Winner);
}
}
public void startGame() {
@ -220,13 +228,4 @@ public class GameRound implements Runnable {
}
}
}
public void pause() {
paused.set(true);
}
public void stopGame() {
gameRunning.set(false);
}
}