X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;ds=sidebyside;f=empathy%2Fempathy.jsx;h=0c1fccfe0b60e1a399c2d2bf2c27082c46c1c5eb;hb=e79802f7979a2b3162efb0968c223f527d354410;hp=80069426d941666e2a812434bef72d2663995bbf;hpb=fbd247880d7fa0d04aecb61c8960876a3c7a6033;p=lmno.games
diff --git a/empathy/empathy.jsx b/empathy/empathy.jsx
index 8006942..0c1fccf 100644
--- a/empathy/empathy.jsx
+++ b/empathy/empathy.jsx
@@ -67,6 +67,8 @@ events.addEventListener("game-state", event => {
window.game.set_players_answering(state.players_answering);
+ window.game.set_answering_idle(state.answering_idle);
+
window.game.set_end_answers(state.end_answers);
window.game.set_ambiguities(state.ambiguities);
@@ -75,6 +77,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);
@@ -104,6 +108,12 @@ events.addEventListener("player-answering", event => {
window.game.set_player_answering(player);
});
+events.addEventListener("answering-idle", event => {
+ const value = JSON.parse(event.data);
+
+ window.game.set_answering_idle(value);
+});
+
events.addEventListener("vote-end-answers", event => {
const player = JSON.parse(event.data);
@@ -134,6 +144,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);
@@ -189,18 +205,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}
);
});
@@ -501,6 +522,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 (
@@ -525,24 +571,7 @@ class Ambiguities extends React.PureComponent {
);
})}
-
+ {move_on_button}
);
@@ -656,6 +685,30 @@ class ActivePrompt extends React.PureComponent {
}
render() {
+ let move_on_button = null;
+ if (this.props.idle) {
+ move_on_button =(
+
+ );
+ }
+
if (this.props.players_answered.has(this.props.player.name)) {
return (
@@ -680,24 +733,7 @@ class ActivePrompt extends React.PureComponent {
);
})}
-
+ {move_on_button}
);
@@ -755,10 +791,12 @@ class Game extends React.PureComponent {
active_prompt: null,
players_answered: new Set(),
players_answering: {},
+ answering_idle: false,
end_answers_votes: new Set(),
ambiguities: null,
players_judged: new Set(),
players_judging: {},
+ judging_idle: false,
end_judging_votes: new Set(),
scores: null
};
@@ -795,10 +833,12 @@ class Game extends React.PureComponent {
active_prompt: null,
players_answered: new Set(),
players_answering: {},
+ answering_idle: false,
end_answers_votes: new Set(),
ambiguities: null,
players_judged: new Set(),
players_judging: {},
+ judging_idle: false,
end_judging_votes: new Set(),
scores: null
});
@@ -864,6 +904,12 @@ class Game extends React.PureComponent {
});
}
+ set_answering_idle(value) {
+ this.setState({
+ answering_idle: value
+ });
+ }
+
set_end_answers(players) {
this.setState({
end_answers_votes: new Set(players)
@@ -923,6 +969,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)
@@ -991,6 +1044,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}
/>;
}
@@ -1001,6 +1055,7 @@ class Game extends React.PureComponent {
player={state.player_info}
players_answered={state.players_answered}
players_answering={state.players_answering}
+ idle={state.answering_idle}
votes={state.end_answers_votes}
/>;
}