X-Git-Url: https://git.cworth.org/git?p=lmno.games;a=blobdiff_plain;f=empathy%2Fempathy.jsx;h=20612e35336576b229c4a8f9fccc7e7bd1179e97;hp=683f92d9318a6afa6628fd238edacccf9f90f183;hb=351aafa7ed0e7839d9308d9e2302852eb0688b6a;hpb=1896a4e7c03026eb1ef2aa084b55e1434265fd9d;ds=sidebyside
diff --git a/empathy/empathy.jsx b/empathy/empathy.jsx
index 683f92d..20612e3 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);
@@ -77,6 +83,8 @@ events.addEventListener("game-state", event => {
window.game.set_players_judging(state.players_judging);
+ window.game.set_judging_idle(state.judging_idle);
+
window.game.set_end_judging(state.end_judging);
window.game.set_scores(state.scores);
@@ -142,6 +150,12 @@ events.addEventListener("player-judging", event => {
window.game.set_player_judging(player);
});
+events.addEventListener("judging-idle", event => {
+ const value = JSON.parse(event.data);
+
+ window.game.set_judging_idle(value);
+});
+
events.addEventListener("vote-end-judging", event => {
const player = JSON.parse(event.data);
@@ -197,18 +211,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}
);
});
@@ -509,6 +528,31 @@ class Ambiguities extends React.PureComponent {
}
render() {
+ let move_on_button = null;
+
+ if (this.props.idle) {
+ move_on_button = (
+
+ );
+ }
+
if (this.props.players_judged.has(this.props.player.name)) {
return (
@@ -533,24 +577,7 @@ class Ambiguities extends React.PureComponent {
);
})}
-
+ {move_on_button}
);
@@ -775,6 +802,7 @@ class Game extends React.PureComponent {
ambiguities: null,
players_judged: new Set(),
players_judging: {},
+ judging_idle: false,
end_judging_votes: new Set(),
scores: null
};
@@ -805,6 +833,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: [],
@@ -816,6 +850,7 @@ class Game extends React.PureComponent {
ambiguities: null,
players_judged: new Set(),
players_judging: {},
+ judging_idle: false,
end_judging_votes: new Set(),
scores: null
});
@@ -946,6 +981,13 @@ class Game extends React.PureComponent {
});
}
+ set_judging_idle(value) {
+ console.log("Setting judging idle to " + value);
+ this.setState({
+ judging_idle: value
+ });
+ }
+
set_end_judging(players) {
this.setState({
end_judging_votes: new Set(players)
@@ -1014,6 +1056,7 @@ class Game extends React.PureComponent {
player={state.player_info}
players_judged={state.players_judged}
players_judging={state.players_judging}
+ idle={state.judging_idle}
votes={state.end_judging_votes}
/>;
}