X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=tictactoe.js;h=da55c9f48e42c663f3e4016acaf6f4f083f15061;hb=ee64666099c0401afdc1e51fe378359f943d3f69;hp=ca67834ecc5790da0a1d125b9a0038d4a58a28cf;hpb=d833f614abee21f1fce8e3ba0a0cdf25636aded9;p=empires-server

diff --git a/tictactoe.js b/tictactoe.js
index ca67834..da55c9f 100644
--- a/tictactoe.js
+++ b/tictactoe.js
@@ -1,72 +1,39 @@
 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. */
+  /* Returns true if move was legal and added, false otherwise. */
   add_move(square) {
     /* Cannot move to an occupied square. */
-    if (this.board[square])
-      return false;
-
-    this.board[square] = 'X';
-    this.moves.push(square);
-
-    return true;
-  }
+    if (this.state.board[square])
+      return { legal: false, message: "Square is already occupied" };
 
-  broadcast_move(square) {
-    this.broadcast_event("move", square);
-  }
+    this.state.board[square] = this.state.next_player;
+    this.state.moves.push(square);
 
-  handle_events(request, response) {
-    super.handle_events(request, response);
+    if (this.state.next_player === "X")
+      this.state.next_player = "O";
+    else
+      this.state.next_player = "X";
 
-    /* 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`);
-    }
+    return { legal: true };
   }
 }
 
-router.post('/move', (request, response) => {
-  const game = request.game;
-  const square = request.body.square;
-
-  const legal = game.add_move(square);
-
-  /* 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);
-});
-
-exports.router = router;
-exports.name = engine_name;
-exports.Game = TicTacToe;
+TicTacToe.router = express.Router();
 
 TicTacToe.meta = {
   name: "Tic Tac Toe",
   identifier: "tictactoe"
 };
 
-exports.meta = TicTacToe.meta;
+exports.Game = TicTacToe;