X-Git-Url: https://git.cworth.org/git?p=lmno.games;a=blobdiff_plain;f=tictactoe%2Ftictactoe.jsx;h=49c6005c38fe395c610502853f1ec69ab28d3438;hp=498e708fbf9cc3d733517ff91215300952afee31;hb=e92b0500735ed3f70c218cb38ad421483a497d18;hpb=a203a3aca4fb8428bfa47d7f05c3478780d69554

diff --git a/tictactoe/tictactoe.jsx b/tictactoe/tictactoe.jsx
index 498e708..49c6005 100644
--- a/tictactoe/tictactoe.jsx
+++ b/tictactoe/tictactoe.jsx
@@ -44,11 +44,19 @@ events.addEventListener("player-info", event => {
   window.game.set_player_info(info);
 });
 
+events.addEventListener("player-enter", event => {
+  const info = JSON.parse(event.data);
+
+  window.game.set_opponent_info(info);
+});
+
 events.addEventListener("player-update", event => {
   const info = JSON.parse(event.data);
 
   if (info.id === window.game.state.player_info.id)
     window.game.set_player_info(info);
+  else
+    window.game.set_opponent_info(info);
 });
 
 events.addEventListener("move", event => {
@@ -72,6 +80,9 @@ events.addEventListener("game-state", event => {
  *********************************************************/
 
 function GameInfo(props) {
+  if (! props.id)
+    return null;
+
   return (
     <div className="game-info">
       <h2>{props.id}</h2>
@@ -81,10 +92,21 @@ function GameInfo(props) {
 }
 
 function PlayerInfo(props) {
+  if (! props.player.id)
+    return null;
+
   return (
     <div className="player-info">
-      <h2>Player</h2>
-      {props.name}, ID: {props.id}, on team: {props.team}
+      <h2>Players</h2>
+      {props.player.name}
+      {props.player.team ? ` (${props.player.team})` : ""}
+      {props.opponents.map(opponent => (
+        <span key={opponent.id}>
+          {", "}
+          {opponent.name}
+          {opponent.team ? ` (${opponent.team})` : ""}
+        </span>
+      ))}
     </div>
   );
 }
@@ -114,7 +136,7 @@ class Board extends React.Component {
     return (
       <Square
         value={value}
-        active={! this.props.game_over && ! value}
+        active={this.props.active && ! value}
         onClick={() => this.props.onClick(i)}
       />
     );
@@ -143,9 +165,9 @@ class Board extends React.Component {
   }
 }
 
-function fetch_post_json(api = '', data = {}) {
+function fetch_method_json(method, api = '', data = {}) {
   const response = fetch(api, {
-    method: 'POST',
+    method: method,
     headers: {
       'Content-Type': 'application/json'
     },
@@ -154,12 +176,21 @@ function fetch_post_json(api = '', data = {}) {
   return response;
 }
 
+function fetch_post_json(api = '', data = {}) {
+  return fetch_method_json('POST', api, data);
+}
+
+async function fetch_put_json(api = '', data = {}) {
+  return fetch_method_json('PUT', api, data);
+}
+
 class Game extends React.Component {
   constructor(props) {
     super(props);
     this.state = {
       game_info: {},
       player_info: {},
+      opponent_info: [],
       history: [
         {
           squares: Array(9).fill(null)
@@ -182,8 +213,17 @@ class Game extends React.Component {
     });
   }
 
-  send_move(i) {
-    return fetch_post_json("move", { move: i });
+  set_opponent_info(info) {
+    const new_opponents = [...this.state.opponent_info];
+    const idx = new_opponents.findIndex(o => o.id === info.id);
+    if (idx >= 0) {
+      new_opponents[idx] = info;
+    } else {
+      new_opponents.push(info);
+    }
+    this.setState({
+      opponent_info: new_opponents
+    });
   }
 
   reset_board() {
@@ -222,8 +262,12 @@ class Game extends React.Component {
     });
   }
 
-  async handle_click(i) {
-    const response = await this.send_move(i);
+  async handle_click(i, first_move) {
+    let move = { move: i };
+    if (first_move) {
+      move.assert_first_move = true;
+    }
+    const response = await fetch_post_json("move", move);
     if (response.status == 200) {
       const result = await response.json();
       if (! result.legal)
@@ -233,35 +277,76 @@ class Game extends React.Component {
     }
   }
 
+  join_team(team) {
+    fetch_put_json("player", {team: team});
+  }
+
   render() {
-    const history = this.state.history;
-    const current = history[this.state.step_number];
+    const state = this.state;
+    const history = state.history;
+    const current = history[state.step_number];
     const winner = calculate_winner(current.squares);
+    const first_move = state.step_number === 0;
+    const my_team = state.player_info.team;
+    var board_active;
 
     let status;
-    if (winner) {
-      status = "Winner: " + winner;
-    } else {
-      status = "Next player: " + (Team.properties[this.state.next_to_play].name);
+    if (winner)
+    {
+      status = winner + " wins!";
+      if (state.player_info.team != "")
+      {
+        if (my_team === winner)
+          status += " Congratulations!";
+        else
+          status += " Better luck next time.";
+      }
+      board_active = false;
+    }
+    else if (first_move)
+    {
+      status = "Either player can make the first move.";
+      board_active = true;
+    }
+    else if (my_team === "")
+    {
+      status = "You're just watching the game.";
+      board_active = false;
+    }
+    else if (my_team === Team.properties[state.next_to_play].name)
+    {
+      status = "Your turn. Make a move.";
+      board_active = true;
+    }
+    else
+    {
+      status = "Waiting for your opponent to move.";
+      board_active = false;
     }
 
     return [
       <GameInfo
-        id={this.state.game_info.id}
-        url={this.state.game_info.url}
+        key="game-info"
+        id={state.game_info.id}
+        url={state.game_info.url}
       />,
       <PlayerInfo
-        id={this.state.player_info.id}
-        name={this.state.player_info.name}
-        team={this.state.player_info.team}
+        key="player-info"
+        player={state.player_info}
+        opponents={state.opponent_info}
       />,
-      <div className="game">
+      <div key="game" className="game">
+        <button className="inline"
+                onClick={() => this.join_team('X')}>Join Team X</button>
+        {" "}
+        <button className="inline"
+                onClick={() => this.join_team('O')}>Join Team O</button>
         <div>{status}</div>
         <div className="game-board">
           <Board
-            game_over={winner}
+            active={board_active}
             squares={current.squares}
-            onClick={i => this.handle_click(i)}
+            onClick={i => this.handle_click(i, first_move)}
           />
         </div>
       </div>