Rename "next_player" property to "team_to_play"

[lmno-server] / tictactoe.js

diff --git a/tictactoe.js b/tictactoe.js
index 7d7450c5ab6c4504e16aba53e9c011bd02757286..256afecde34d86fd12af215d089c0b6cae9edcee 100644 (file)
--- a/tictactoe.js
+++ b/tictactoe.js
@@ -1,60 +1,58 @@
 const express = require("express");
 const Game = require("./game.js");
 
-const router = express.Router();
-
 class TicTacToe extends Game {
   constructor(id) {
     super(id);
     this.state = {
       moves: [],
       board: Array(9).fill(""),
-      next_player: "X",
+      team_to_play: "X",
     };
+    this.teams = ["X", "O"];
   }
 
-  /* Returns Boolean indicating whether move was legal and added. */
-  add_move(square) {
+  /* Returns true if move was legal and added, false otherwise. */
+  add_move(player, square) {
+
+    /* 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" };
+    }
+
+    /* Cannot move if it's not this player's team's turn. */
+    if (player.team !== this.state.team_to_play)
+    {
+      return { legal: false,
+               message: "It's not your turn to move" };
+    }
+
     /* Cannot move to an occupied square. */
     if (this.state.board[square])
-      return false;
+    {
+      return { legal: false,
+               message: "Square is already occupied" };
+    }
 
-    this.state.board[square] = this.state.next_player;
+    this.state.board[square] = this.state.team_to_play;
     this.state.moves.push(square);
 
-    if (this.state.next_player === "X")
-      this.state.next_player = "O";
+    if (this.state.team_to_play === "X")
+      this.state.team_to_play = "O";
     else
-      this.state.next_player = "X";
+      this.state.team_to_play = "X";
 
-    return true;
-  }
-
-  broadcast_move(square) {
-    this.broadcast_event("move", square);
+    return { legal: true };
   }
 }
 
-router.post('/move', (request, response) => {
-  const game = request.game;
-  const square = request.body.move;
-
-  const legal = game.add_move(square);
-
-  /* Inform this client whether the move was legal. */
-  response.send(JSON.stringify(legal));
-
-  /* And only if legal, inform all clients. */
-  if (! legal)
-    return;
-
-  game.broadcast_move(square);
-});
-
-exports.router = router;
-exports.Game = TicTacToe;
+TicTacToe.router = express.Router();
 
 TicTacToe.meta = {
   name: "Tic Tac Toe",
   identifier: "tictactoe"
 };
+
+exports.Game = TicTacToe;