X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=tictactoe.js;h=9140b89da9bad2d2b69e2aca9e3f53ff1c2372f9;hb=143c01e643c36e87c6bfc377ad1cf4edcc79e62c;hp=7b7df8d4ac912da483348cb78354330eb74f5cfa;hpb=49d955e6e751bbed7b4239805f046c16cb5f52d4;p=empires-server

diff --git a/tictactoe.js b/tictactoe.js
index 7b7df8d..9140b89 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;
   }
@@ -27,26 +33,8 @@ class TicTacToe extends Game {
   broadcast_move(square) {
     this.broadcast_event("move", square);
   }
-
-  handle_events(request, response) {
-    super.handle_events(request, response);
-
-    /* When a new client joins, replay all previous moves to it. */
-    for (let move of this.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('tictactoe-game.html');
-});
-
 router.post('/move', (request, response) => {
   const game = request.game;
   const square = request.body.square;
@@ -70,11 +58,9 @@ router.get('/events', (request, response) => {
 });
 
 exports.router = router;
-exports.name = engine_name;
 exports.Game = TicTacToe;
 
 TicTacToe.meta = {
-  name: "Tic Tac Toe"
+  name: "Tic Tac Toe",
+  identifier: "tictactoe"
 };
-
-exports.meta = TicTacToe.meta;