X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=tictactoe.js;h=74cf3436334f214123981d8698b17b0cacf8ae21;hb=bceb4cb3eb1b150aedc562978df01cb0ac4ce628;hp=5b5270d21c41a001e0df9c81ca5deda95ba4778b;hpb=340097dad8362771d0ec541fe6cb7f9097472b25;p=empires-server

diff --git a/tictactoe.js b/tictactoe.js
index 5b5270d..74cf343 100644
--- a/tictactoe.js
+++ b/tictactoe.js
@@ -1,25 +1,31 @@
 const express = require("express");
 const Game = require("./game.js");
 
-const engine_name = "tictactoe";
-
 const router = express.Router();
 
 class TicTacToe extends Game {
-  constructor() {
-    super(engine_name);
-    this.moves = [];
-    this.board = Array(9).fill(null);
+  constructor(id) {
+    super(id);
+    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] = 'X';
-    this.moves.push(square);
+    this.state.board[square] = this.state.next_player;
+    this.state.moves.push(square);
+
+    if (this.state.next_player === "X")
+      this.state.next_player = "O";
+    else
+      this.state.next_player = "X";
 
     return true;
   }
@@ -32,21 +38,12 @@ 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`);
     }
   }
 }
 
-router.get('/', (request, response) => {
-  const game = request.game;
-
-  if (! request.session.nickname)
-    response.render('choose-nickname.html', { game_name: game.meta.name });
-  else
-    response.render(`${game.meta.identifier}-game.html`);
-});
-
 router.post('/move', (request, response) => {
   const game = request.game;
   const square = request.body.square;
@@ -70,12 +67,9 @@ router.get('/events', (request, response) => {
 });
 
 exports.router = router;
-exports.name = engine_name;
 exports.Game = TicTacToe;
 
 TicTacToe.meta = {
   name: "Tic Tac Toe",
   identifier: "tictactoe"
 };
-
-exports.meta = TicTacToe.meta;