X-Git-Url: https://git.cworth.org/git?p=lmno.games;a=blobdiff_plain;f=tictactoe%2Ftictactoe.jsx;h=3c7de0b014ca5481b5b64a46882032d29096b0ce;hp=71690b91e2ecf7692790eeb5517080aa35ef5653;hb=ee68b32ca39f0b664de49cb23695d0786e987c2c;hpb=e804009ec5cc7bb804c229915ce1c8ebedaa88c7
diff --git a/tictactoe/tictactoe.jsx b/tictactoe/tictactoe.jsx
index 71690b9..3c7de0b 100644
--- a/tictactoe/tictactoe.jsx
+++ b/tictactoe/tictactoe.jsx
@@ -72,6 +72,9 @@ events.addEventListener("game-state", event => {
*********************************************************/
function GameInfo(props) {
+ if (! props.id)
+ return null;
+
return (
{props.id}
@@ -81,10 +84,14 @@ function GameInfo(props) {
}
function PlayerInfo(props) {
+ if (! props.id)
+ return null;
+
return (
Player
- {props.name}, ID: {props.id}, on team: {props.team}
+ {props.name}, ID: {props.id},
+ {props.team ? ` on team ${props.team}` : " not on a team"}
);
}
@@ -114,7 +121,7 @@ class Board extends React.Component {
return (
this.props.onClick(i)}
/>
);
@@ -241,35 +248,53 @@ 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);
+ var board_active;
let status;
if (winner) {
status = "Winner: " + winner;
+ board_active = false;
} else {
- status = "Next player: " + (Team.properties[this.state.next_to_play].name);
+ if (state.player_info.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)}
/>