Assign new players to the first team with no players

[empires-server] / tictactoe.js

diff --git a/tictactoe.js b/tictactoe.js
index d123c5718f01b5fb93280447d003f91e4eac1e1a..476821eec57039d5735fab0b8f4f021f5d8c5cad 100644 (file)
--- a/tictactoe.js
+++ b/tictactoe.js
@@ -4,17 +4,26 @@ 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(""),
-      team_to_play: "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) {
 
+    const state = this.state;
     const result = super.add_move(player, square);
 
     /* If the generic Game class can reject this move, then we don't
@@ -23,19 +32,19 @@ class TicTacToe extends Game {
       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.team_to_play;
-    this.state.moves.push(square);
+    state.board[square] = state.team_to_play;
+    state.moves.push(square);
 
-    if (this.state.team_to_play === "X")
-      this.state.team_to_play = "O";
+    if (state.team_to_play.id === 0)
+      state.team_to_play = this.teams[1];
     else
-      this.state.team_to_play = "X";
+      state.team_to_play = this.teams[0];
 
     return { legal: true };
   }