X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;ds=inline;f=tictactoe%2Ftictactoe.jsx;h=49c6005c38fe395c610502853f1ec69ab28d3438;hb=e92b0500735ed3f70c218cb38ad421483a497d18;hp=f1426ecff4f443c8837237fffd8caeef3f751153;hpb=80b53fb35b2026f0100572fc744d659532efe3f0;p=lmno.games
diff --git a/tictactoe/tictactoe.jsx b/tictactoe/tictactoe.jsx
index f1426ec..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 (
{props.id}
@@ -81,10 +92,21 @@ function GameInfo(props) {
}
function PlayerInfo(props) {
+ if (! props.player.id)
+ return null;
+
return (
-
Player
- {props.name}, ID: {props.id}, on team: {props.team}
+ Players
+ {props.player.name}
+ {props.player.team ? ` (${props.player.team})` : ""}
+ {props.opponents.map(opponent => (
+
+ {", "}
+ {opponent.name}
+ {opponent.team ? ` (${opponent.team})` : ""}
+
+ ))}
);
}
@@ -114,7 +136,7 @@ class Board extends React.Component {
return (
this.props.onClick(i)}
/>
);
@@ -168,6 +190,7 @@ class Game extends React.Component {
this.state = {
game_info: {},
player_info: {},
+ opponent_info: [],
history: [
{
squares: Array(9).fill(null)
@@ -190,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() {
@@ -230,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)
@@ -246,41 +282,71 @@ class Game extends React.Component {
}
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 [
,
,
-
+ {" "}
{status}
this.handle_click(i)}
+ onClick={i => this.handle_click(i, first_move)}
/>