X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;ds=sidebyside;f=tictactoe%2Ftictactoe.jsx;h=dbfc5ef93e9ba41d21f026a14653e179828fbd4a;hb=32571a0fc39e51a53763a2033aa1388ffaaa4c6b;hp=46cee2a7f42e9f4bc3a7809e7d93b3855eb383ed;hpb=7b54e4a8c6a461c186125b5e36d4d312ee9b41b2;p=lmno.games
diff --git a/tictactoe/tictactoe.jsx b/tictactoe/tictactoe.jsx
index 46cee2a..dbfc5ef 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_other_player_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_other_player_info(info);
});
events.addEventListener("move", event => {
@@ -83,15 +91,59 @@ function GameInfo(props) {
);
}
+function TeamButton(props) {
+ return ;
+}
+
+function TeamChoices(props) {
+ let other_team;
+ if (props.player.team === "X")
+ other_team = "O";
+ else
+ other_team = "X";
+
+ if (props.player.team === "") {
+ if (props.first_move) {
+ return null;
+ } else {
+ return [
+ ,
+ " ",
+
+ ];
+ }
+ } else {
+ return ;
+ }
+}
+
function PlayerInfo(props) {
- if (! props.id)
+ if (! props.player.id)
return null;
+ const choices = ;
+
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.first_move ? "" : " "}
+ {choices}
+ {props.other_players.map(other => (
+
+ {", "}
+ {other.name}
+ {other.team ? ` (${other.team})` : ""}
+
+ ))}
);
}
@@ -175,6 +227,7 @@ class Game extends React.Component {
this.state = {
game_info: {},
player_info: {},
+ other_players: [],
history: [
{
squares: Array(9).fill(null)
@@ -197,6 +250,19 @@ class Game extends React.Component {
});
}
+ set_other_player_info(info) {
+ const other_players_copy = [...this.state.other_players];
+ const idx = other_players_copy.findIndex(o => o.id === info.id);
+ if (idx >= 0) {
+ other_players_copy[idx] = info;
+ } else {
+ other_players_copy.push(info);
+ }
+ this.setState({
+ other_players: other_players_copy
+ });
+ }
+
reset_board() {
this.setState({
history: [
@@ -276,7 +342,17 @@ class Game extends React.Component {
}
else if (first_move)
{
- status = "Either player can make the first move.";
+ if (state.other_players.length == 0) {
+ status = "You can move or wait for another player to join.";
+ } else {
+ let qualifier;
+ if (state.other_players.length == 1) {
+ qualifier = "Either";
+ } else {
+ qualifier = "Any";
+ }
+ status = `${qualifier} player can make the first move.`;
+ }
board_active = true;
}
else if (my_team === "")
@@ -291,7 +367,12 @@ class Game extends React.Component {
}
else
{
- status = "Waiting for your opponent to move.";
+ status = "Waiting for another player to ";
+ if (state.other_players.length == 0) {
+ status += "join.";
+ } else {
+ status += "move.";
+ }
board_active = false;
}
@@ -303,16 +384,12 @@ class Game extends React.Component {
/>,
,
-
-
-
{status}