X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;ds=inline;f=empathy%2Fempathy.jsx;h=044d4e07ad5e3e62885648410f0d6977d5b62525;hb=5e235932d1940d4849d2f3adbee33f6ecef4ed6b;hp=e67bbc87afbc91941c7460bb52aeb865aeac0d5b;hpb=c94f971a08bd2e26c0b81dc0b029b2ca59941d96;p=lmno.games
diff --git a/empathy/empathy.jsx b/empathy/empathy.jsx
index e67bbc8..044d4e0 100644
--- a/empathy/empathy.jsx
+++ b/empathy/empathy.jsx
@@ -45,6 +45,12 @@ events.addEventListener("player-enter", event => {
window.game.set_other_player_info(info);
});
+events.addEventListener("player-exit", event => {
+ const info = JSON.parse(event.data);
+
+ window.game.remove_player(info);
+});
+
events.addEventListener("player-update", event => {
const info = JSON.parse(event.data);
@@ -82,6 +88,10 @@ events.addEventListener("game-state", event => {
window.game.set_end_judging(state.end_judging);
window.game.set_scores(state.scores);
+
+ window.game.set_new_game_votes(state.new_game_votes);
+
+ window.game.state_ready();
});
events.addEventListener("prompt", event => {
@@ -168,6 +178,18 @@ events.addEventListener("scores", event => {
window.game.set_scores(scores);
});
+events.addEventListener("vote-new-game", event => {
+ const player = JSON.parse(event.data);
+
+ window.game.set_player_vote_new_game(player);
+});
+
+events.addEventListener("unvote-new-game", event => {
+ const player = JSON.parse(event.data);
+
+ window.game.set_player_unvote_new_game(player);
+});
+
/*********************************************************
* Game and supporting classes *
*********************************************************/
@@ -205,18 +227,23 @@ const PlayerInfo = React.memo(props => {
if (! props.player.id)
return null;
+ const all_players = [props.player, ...props.other_players];
+
+ const sorted_players = all_players.sort((a,b) => {
+ return b.score - a.score;
+ });
+
+ const names_and_scores = sorted_players.map(player => {
+ if (player.score)
+ return `${player.name} (${player.score})`;
+ else
+ return player.name;
+ }).join(', ');
+
return (
Players:
- {props.player.name}
- {props.player.score > 0 ? ` (${props.player.score})` : ""}
- {props.other_players.map(other => (
-
- {", "}
- {other.name}
- {other.score > 0 ? ` (${other.score})` : ""}
-
- ))}
+ {names_and_scores}
);
});
@@ -793,7 +820,9 @@ class Game extends React.PureComponent {
players_judging: {},
judging_idle: false,
end_judging_votes: new Set(),
- scores: null
+ scores: null,
+ new_game_votes: new Set(),
+ ready: false
};
}
@@ -822,6 +851,12 @@ class Game extends React.PureComponent {
});
}
+ remove_player(info) {
+ this.setState({
+ other_players: this.state.other_players.filter(o => o.id !== info.id)
+ });
+ }
+
reset_game_state() {
this.setState({
prompts: [],
@@ -835,7 +870,9 @@ class Game extends React.PureComponent {
players_judging: {},
judging_idle: false,
end_judging_votes: new Set(),
- scores: null
+ scores: null,
+ new_game_votes: new Set(),
+ ready: false
});
}
@@ -965,7 +1002,6 @@ class Game extends React.PureComponent {
}
set_judging_idle(value) {
- console.log("Setting judging idle to " + value);
this.setState({
judging_idle: value
});
@@ -995,6 +1031,30 @@ class Game extends React.PureComponent {
});
}
+ set_new_game_votes(players) {
+ this.setState({
+ new_game_votes: new Set(players)
+ });
+ }
+
+ set_player_vote_new_game(player) {
+ this.setState({
+ new_game_votes: new Set([...this.state.new_game_votes, player])
+ });
+ }
+
+ set_player_unvote_new_game(player) {
+ this.setState({
+ new_game_votes: new Set([...this.state.new_game_votes].filter(p => p !== player))
+ });
+ }
+
+ state_ready() {
+ this.setState({
+ ready: true
+ });
+ }
+
render() {
const state = this.state;
const players_total = 1 + state.other_players.length;
@@ -1007,7 +1067,7 @@ class Game extends React.PureComponent {
{state.scores.scores.map(score => {
return (
- {score.player}: {score.score}
+ {score.players.join("/")}: {score.score}
);
})}
@@ -1017,16 +1077,28 @@ class Game extends React.PureComponent {
{state.scores.words.map(word => {
return (
- {`${word.word}: ${word.players.join(', ')}`}
+ {word.word}: {word.players.join(', ')}
);
})}
);
@@ -1055,6 +1127,9 @@ class Game extends React.PureComponent {
/>;
}
+ if (! state.ready)
+ return null;
+
return [