X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=tictactoe.js;h=98564799c438e57460c96a1a1feaac243cd11318;hb=cf23efebe1600d10396b674e20e7cdf7f88bb58f;hp=2a8dd06f9d580398e483e7a554883beee54bcc4e;hpb=fbf331eedc7d4579ec861c140e26a11b04278c1c;p=empires-server

diff --git a/tictactoe.js b/tictactoe.js
index 2a8dd06..9856479 100644
--- a/tictactoe.js
+++ b/tictactoe.js
@@ -1,40 +1,52 @@
 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) {
+
+    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 === "X")
+      state.team_to_play = "O";
     else
-      this.state.next_player = "X";
+      state.team_to_play = "X";
 
-    return true;
+    return { legal: true };
   }
 }
 
-exports.router = router;
-exports.Game = TicTacToe;
+TicTacToe.router = express.Router();
 
 TicTacToe.meta = {
   name: "Tic Tac Toe",
   identifier: "tictactoe"
 };
+
+exports.Game = TicTacToe;