X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=tictactoe.js;h=476821eec57039d5735fab0b8f4f021f5d8c5cad;hb=c381788fa303d9ca392fc4b7b25c4d55344717da;hp=f9198432826376426d5d5a527e145bfe71f9e172;hpb=92382a8dd4bfc9c83b7cf5fa1c0981b01096efd0;p=empires-server

diff --git a/tictactoe.js b/tictactoe.js
index f919843..476821e 100644
--- a/tictactoe.js
+++ b/tictactoe.js
@@ -4,45 +4,47 @@ const Game = require("./game.js");
 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],
     };
-    this.teams = ["X", "O"];
   }
 
   /* 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" };
-    }
+    const state = this.state;
+    const result = super.add_move(player, square);
 
-    /* Cannot move if it's not this player's team's turn. */
-    if (player.team !== this.state.next_player)
-    {
-      return { legal: false,
-               message: "It's not your turn to move" };
-    }
+    /* 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])
+    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 { legal: true };
   }