X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=tictactoe.js;h=98564799c438e57460c96a1a1feaac243cd11318;hb=cf23efebe1600d10396b674e20e7cdf7f88bb58f;hp=11b4295df247ced277c82d8f1501369483a7a4e0;hpb=7b21a4eb7ed2d6d479842b01c35ba6931c3acdc7;p=empires-server

diff --git a/tictactoe.js b/tictactoe.js
index 11b4295..9856479 100644
--- a/tictactoe.js
+++ b/tictactoe.js
@@ -1,69 +1,52 @@
 const express = require("express");
 const Game = require("./game.js");
 
-const router = express.Router();
-
 class TicTacToe extends Game {
-  constructor() {
-    super();
-    this.moves = [];
-    this.board = Array(9).fill(null);
+  constructor(id) {
+    super(id);
+    this.state = {
+      moves: [],
+      board: Array(9).fill(""),
+      team_to_play: "X",
+    };
+    this.teams = ["X", "O"];
   }
 
-  /* Returns Boolean indicating whether move was legal and added. */
-  add_move(square) {
-    /* Cannot move to an occupied square. */
-    if (this.board[square])
-      return false;
+  /* Returns true if move was legal and added, false otherwise. */
+  add_move(player, square) {
 
-    this.board[square] = 'X';
-    this.moves.push(square);
+    const state = this.state;
+    const result = super.add_move(player, square);
 
-    return true;
-  }
-
-  broadcast_move(square) {
-    this.broadcast_event("move", square);
-  }
+    /* 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;
 
-  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`);
+    /* Cannot move to an occupied square. */
+    if (state.board[square])
+    {
+      return { legal: false,
+               message: "Square is already occupied" };
     }
-  }
-}
 
-router.post('/move', (request, response) => {
-  const game = request.game;
-  const square = request.body.square;
+    state.board[square] = state.team_to_play;
+    state.moves.push(square);
 
-  const legal = game.add_move(square);
+    if (state.team_to_play === "X")
+      state.team_to_play = "O";
+    else
+      state.team_to_play = "X";
 
-  /* Inform this client whether the move was legal. */
-  response.send(JSON.stringify(legal));
-
-  /* And only if legal, inform all clients. */
-  if (! legal)
-    return;
-
-  game.broadcast_move(square);
-});
-
-router.get('/events', (request, response) => {
-  const game = request.game;
-
-  game.handle_events(request, response);
-});
+    return { legal: true };
+  }
+}
 
-exports.router = router;
-exports.Game = TicTacToe;
+TicTacToe.router = express.Router();
 
 TicTacToe.meta = {
   name: "Tic Tac Toe",
   identifier: "tictactoe"
 };
 
-exports.meta = TicTacToe.meta;
+exports.Game = TicTacToe;