X-Git-Url: https://git.cworth.org/git?p=lmno.games;a=blobdiff_plain;f=tictactoe%2Ftictactoe.jsx;h=f0e9e88d6a83f6a9262cbb47a467f293a431b3a7;hp=3c7de0b014ca5481b5b64a46882032d29096b0ce;hb=d3a035c38d6deff85f63e313430ac7e45955e2a9;hpb=ee68b32ca39f0b664de49cb23695d0786e987c2c
diff --git a/tictactoe/tictactoe.jsx b/tictactoe/tictactoe.jsx
index 3c7de0b..f0e9e88 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 => {
@@ -84,14 +92,17 @@ function GameInfo(props) {
}
function PlayerInfo(props) {
- if (! props.id)
+ if (! props.player.id)
return null;
return (
-
Player
- {props.name}, ID: {props.id},
- {props.team ? ` on team ${props.team}` : " not on a team"}
+ Players
+ {props.player.name}
+ {props.player.team ? ` (${props.player.team})` : ""}
+ {", "}
+ {props.opponent.name}
+ {props.opponent.team ? ` (${props.opponent.team})` : ""}
);
}
@@ -175,6 +186,7 @@ class Game extends React.Component {
this.state = {
game_info: {},
player_info: {},
+ opponent_info: {},
history: [
{
squares: Array(9).fill(null)
@@ -197,8 +209,10 @@ class Game extends React.Component {
});
}
- send_move(i) {
- return fetch_post_json("move", { move: i });
+ set_opponent_info(info) {
+ this.setState({
+ opponent_info: info
+ });
}
reset_board() {
@@ -237,8 +251,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)
@@ -257,20 +275,42 @@ class Game extends React.Component {
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;
- board_active = false;
- } else {
- 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;
+ 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 [
@@ -281,14 +321,13 @@ class Game extends React.Component {
/>,
,
-
+ {" "}
{status}
@@ -296,7 +335,7 @@ class Game extends React.Component {
this.handle_click(i)}
+ onClick={i => this.handle_click(i, first_move)}
/>