X-Git-Url: https://git.cworth.org/git?p=empires-server;a=blobdiff_plain;f=tictactoe.js;h=a7e6cfae290af760a9fedcef349b5a2f58136c44;hp=74cf3436334f214123981d8698b17b0cacf8ae21;hb=7cfa4c75739452a6022e2266cc4d6444ef79f4a5;hpb=bceb4cb3eb1b150aedc562978df01cb0ac4ce628

diff --git a/tictactoe.js b/tictactoe.js
index 74cf343..a7e6cfa 100644
--- a/tictactoe.js
+++ b/tictactoe.js
@@ -1,75 +1,63 @@
 const express = require("express");
 const Game = require("./game.js");
 
-const router = express.Router();
-
 class TicTacToe extends Game {
   constructor(id) {
     super(id);
+    this.teams = [
+      {
+        id: 0,
+        name: "X"
+      },
+      {
+        id: 1,
+        name: "O"
+      }];
     this.state = {
       moves: [],
       board: Array(9).fill(""),
-      next_player: "X",
+      team_to_play: this.teams[0],
     };
   }
 
-  /* Returns Boolean indicating whether move was legal and added. */
-  add_move(square) {
-    /* Cannot move to an occupied square. */
-    if (this.state.board[square])
-      return false;
+  /* Returns true if move was legal and added, false otherwise. */
+  add_move(player, square) {
 
-    this.state.board[square] = this.state.next_player;
-    this.state.moves.push(square);
+    const state = this.state;
+    const result = super.add_move(player, square);
 
-    if (this.state.next_player === "X")
-      this.state.next_player = "O";
-    else
-      this.state.next_player = "X";
+    /* If the generic Game class can reject this move, then we don't
+     * need to look at it any further. */
+    if (! result.legal)
+      return result;
 
-    return true;
-  }
+    /* Cannot move to an occupied square. */
+    if (state.board[square])
+    {
+      return { legal: false,
+               message: "Square is already occupied" };
+    }
 
-  broadcast_move(square) {
-    this.broadcast_event("move", square);
-  }
+    state.board[square] = state.team_to_play;
+    state.moves.push(square);
 
-  handle_events(request, response) {
-    super.handle_events(request, response);
+    if (state.team_to_play.id === 0)
+      state.team_to_play = this.teams[1];
+    else
+      state.team_to_play = this.teams[0];
 
-    /* When a new client joins, replay all previous moves to it. */
-    for (let move of this.state.moves) {
-      response.write(`event: move\ndata: ${move}\n\n`);
-    }
+    return { legal: true };
   }
 }
 
-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));
-
-  /* And only if legal, inform all clients. */
-  if (! legal)
-    return;
-
-  game.broadcast_move(square);
-});
-
-router.get('/events', (request, response) => {
-  const game = request.game;
-
-  game.handle_events(request, response);
-});
-
-exports.router = router;
-exports.Game = TicTacToe;
+TicTacToe.router = express.Router();
 
 TicTacToe.meta = {
   name: "Tic Tac Toe",
-  identifier: "tictactoe"
+  identifier: "tictactoe",
+  options: {
+    allow_guest: true
+  }
 };
+
+exports.Game = TicTacToe;