From: Carl Worth <cworth@cworth.org>
Date: Mon, 1 Jun 2020 14:34:33 +0000 (-0700)
Subject: tictactoe: Move all state-related properties into a new "state" property
X-Git-Url: https://git.cworth.org/git?p=empires-server;a=commitdiff_plain;h=bceb4cb3eb1b150aedc562978df01cb0ac4ce628

tictactoe: Move all state-related properties into a new "state" property

Consolidating this into a single property is a step toward
standardizing game classes to treat state consistently, (which should
let us reduce some code duplication).
---

diff --git a/tictactoe.js b/tictactoe.js
index 8efc70f..74cf343 100644
--- a/tictactoe.js
+++ b/tictactoe.js
@@ -6,24 +6,26 @@ const router = express.Router();
 class TicTacToe extends Game {
   constructor(id) {
     super(id);
-    this.moves = [];
-    this.board = Array(9).fill("");
-    this.next_player = "X";
+    this.state = {
+      moves: [],
+      board: Array(9).fill(""),
+      next_player: "X",
+    };
   }
 
   /* Returns Boolean indicating whether move was legal and added. */
   add_move(square) {
     /* Cannot move to an occupied square. */
-    if (this.board[square])
+    if (this.state.board[square])
       return false;
 
-    this.board[square] = this.next_player;
-    this.moves.push(square);
+    this.state.board[square] = this.state.next_player;
+    this.state.moves.push(square);
 
-    if (this.next_player === "X")
-      this.next_player = "O";
+    if (this.state.next_player === "X")
+      this.state.next_player = "O";
     else
-      this.next_player = "X";
+      this.state.next_player = "X";
 
     return true;
   }
@@ -36,7 +38,7 @@ class TicTacToe extends Game {
     super.handle_events(request, response);
 
     /* When a new client joins, replay all previous moves to it. */
-    for (let move of this.moves) {
+    for (let move of this.state.moves) {
       response.write(`event: move\ndata: ${move}\n\n`);
     }
   }