X-Git-Url: https://git.cworth.org/git?p=empires-server;a=blobdiff_plain;f=tictactoe.js;h=a7e6cfae290af760a9fedcef349b5a2f58136c44;hp=7d7450c5ab6c4504e16aba53e9c011bd02757286;hb=771e0ce4711a7ed723d216c28ab8d1472463d3ef;hpb=9e5bf65868eaafcb11d09c0fee02e0d3d7c2121f

diff --git a/tictactoe.js b/tictactoe.js
index 7d7450c..a7e6cfa 100644
--- a/tictactoe.js
+++ b/tictactoe.js
@@ -1,60 +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) {
+  /* Returns true if move was legal and added, false otherwise. */
+  add_move(player, square) {
+
+    const state = this.state;
+    const result = super.add_move(player, square);
+
+    /* 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;
+
     /* Cannot move to an occupied square. */
-    if (this.state.board[square])
-      return false;
+    if (state.board[square])
+    {
+      return { legal: false,
+               message: "Square is already occupied" };
+    }
 
-    this.state.board[square] = this.state.next_player;
-    this.state.moves.push(square);
+    state.board[square] = state.team_to_play;
+    state.moves.push(square);
 
-    if (this.state.next_player === "X")
-      this.state.next_player = "O";
+    if (state.team_to_play.id === 0)
+      state.team_to_play = this.teams[1];
     else
-      this.state.next_player = "X";
+      state.team_to_play = this.teams[0];
 
-    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"
+  identifier: "tictactoe",
+  options: {
+    allow_guest: true
+  }
 };
+
+exports.Game = TicTacToe;