tictactoe: Enforce only legal moves with regard to team membership

[empires-server] / tictactoe.js

diff --git a/tictactoe.js b/tictactoe.js
index 12bf6801ac0f20e4f36e444bbb9fab1909fce116..f9198432826376426d5d5a527e145bfe71f9e172 100644 (file)
--- a/tictactoe.js
+++ b/tictactoe.js
@@ -1,71 +1,58 @@
 const express = require("express");
 const Game = require("./game.js");
 
-const engine_name = "tictactoe";
-
-const router = express.Router();
-
 class TicTacToe extends Game {
-  constructor() {
-    super(engine_name);
-    this.moves = [];
-    this.board = Array(9).fill(null);
-  }
-
-  /* Returns Boolean indicating whether move was legal and added. */
-  add_move(square) {
-    /* Cannot move to an occupied square. */
-    if (this.board[square])
-      return false;
-
-    this.board[square] = 'X';
-    this.moves.push(square);
-
-    return true;
+  constructor(id) {
+    super(id);
+    this.state = {
+      moves: [],
+      board: Array(9).fill(""),
+      next_player: "X",
+    };
+    this.teams = ["X", "O"];
   }
 
-  broadcast_move(square) {
-    this.broadcast_event("move", square);
-  }
+  /* Returns true if move was legal and added, false otherwise. */
+  add_move(player, square) {
 
-  handle_events(request, response) {
-    super.handle_events(request, response);
-
-    /* When a new client joins, replay all previous moves to it. */
-    for (let move of this.moves) {
-      response.write(`event: move\ndata: ${move}\n\n`);
+    /* Cannot move if you are not on a team. */
+    if (player.team === "")
+    {
+      return { legal: false,
+               message: "You must be on a team to take a turn" };
     }
-  }
-}
-
-router.post('/move', (request, response) => {
-  const game = request.game;
-  const square = request.body.square;
-
-  const legal = game.add_move(square);
 
-  /* Inform this client whether the move was legal. */
-  response.send(JSON.stringify(legal));
+    /* Cannot move if it's not this player's team's turn. */
+    if (player.team !== this.state.next_player)
+    {
+      return { legal: false,
+               message: "It's not your turn to move" };
+    }
 
-  /* And only if legal, inform all clients. */
-  if (! legal)
-    return;
+    /* Cannot move to an occupied square. */
+    if (this.state.board[square])
+    {
+      return { legal: false,
+               message: "Square is already occupied" };
+    }
 
-  game.broadcast_move(square);
-});
+    this.state.board[square] = this.state.next_player;
+    this.state.moves.push(square);
 
-router.get('/events', (request, response) => {
-  const game = request.game;
+    if (this.state.next_player === "X")
+      this.state.next_player = "O";
+    else
+      this.state.next_player = "X";
 
-  game.handle_events(request, response);
-});
+    return { legal: true };
+  }
+}
 
-exports.router = router;
-exports.Game = TicTacToe;
+TicTacToe.router = express.Router();
 
 TicTacToe.meta = {
   name: "Tic Tac Toe",
   identifier: "tictactoe"
 };
 
-exports.meta = TicTacToe.meta;
+exports.Game = TicTacToe;