Rename identifiers from square to move

[empires-server] / tictactoe.js

diff --git a/tictactoe.js b/tictactoe.js
index 12bf6801ac0f20e4f36e444bbb9fab1909fce116..15216952b3577ceb7cdee0dc4b20c924b67181f3 100644 (file)
--- a/tictactoe.js
+++ b/tictactoe.js
@@ -1,48 +1,45 @@
 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);
+  constructor(id) {
+    super(id);
+    this.state = {
+      moves: [],
+      board: Array(9).fill(""),
+      next_player: "X",
+    };
   }
 
   /* Returns Boolean indicating whether move was legal and added. */
   add_move(square) {
     /* Cannot move to an occupied square. */
-    if (this.board[square])
+    if (this.state.board[square])
       return false;
 
-    this.board[square] = 'X';
-    this.moves.push(square);
+    this.state.board[square] = this.state.next_player;
+    this.state.moves.push(square);
 
-    return true;
-  }
+    if (this.state.next_player === "X")
+      this.state.next_player = "O";
+    else
+      this.state.next_player = "X";
 
-  broadcast_move(square) {
-    this.broadcast_event("move", square);
+    return true;
   }
 
-  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`);
-    }
+  broadcast_move(move) {
+    this.broadcast_event("move", move);
   }
 }
 
 router.post('/move', (request, response) => {
   const game = request.game;
-  const square = request.body.square;
+  const move = request.body.move;
 
-  const legal = game.add_move(square);
+  const legal = game.add_move(move);
 
   /* Inform this client whether the move was legal. */
   response.send(JSON.stringify(legal));
@@ -51,13 +48,7 @@ router.post('/move', (request, response) => {
   if (! legal)
     return;
 
-  game.broadcast_move(square);
-});
-
-router.get('/events', (request, response) => {
-  const game = request.game;
-
-  game.handle_events(request, response);
+  game.broadcast_move(move);
 });
 
 exports.router = router;
@@ -67,5 +58,3 @@ TicTacToe.meta = {
   name: "Tic Tac Toe",
   identifier: "tictactoe"
 };
-
-exports.meta = TicTacToe.meta;