Move some checks from TicTacToe.add_move to Game.add_move

[empires-server] / tictactoe.js

diff --git a/tictactoe.js b/tictactoe.js
index f9198432826376426d5d5a527e145bfe71f9e172..d123c5718f01b5fb93280447d003f91e4eac1e1a 100644 (file)
--- a/tictactoe.js
+++ b/tictactoe.js
@@ -7,7 +7,7 @@ class TicTacToe extends Game {
     this.state = {
       moves: [],
       board: Array(9).fill(""),
-      next_player: "X",
+      team_to_play: "X",
     };
     this.teams = ["X", "O"];
   }
@@ -15,19 +15,12 @@ class TicTacToe extends Game {
   /* 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 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])
@@ -36,13 +29,13 @@ class TicTacToe extends Game {
                message: "Square is already occupied" };
     }
 
-    this.state.board[square] = this.state.next_player;
+    this.state.board[square] = this.state.team_to_play;
     this.state.moves.push(square);
 
-    if (this.state.next_player === "X")
-      this.state.next_player = "O";
+    if (this.state.team_to_play === "X")
+      this.state.team_to_play = "O";
     else
-      this.state.next_player = "X";
+      this.state.team_to_play = "X";
 
     return { legal: true };
   }