X-Git-Url: https://git.cworth.org/git?p=lmno.games;a=blobdiff_plain;f=empathy%2Fempathy.jsx;h=163b977cbb8c474560a4dfa9cf24c1a03926e56b;hp=c216e4921b9b5d68d8731defddc353125a010d68;hb=f9c9dec19b3ee6e272683301d49c3add6fb176f8;hpb=71a123df898044213dd6703c036d6bbbea7f7f8f diff --git a/empathy/empathy.jsx b/empathy/empathy.jsx index c216e49..163b977 100644 --- a/empathy/empathy.jsx +++ b/empathy/empathy.jsx @@ -89,6 +89,8 @@ events.addEventListener("game-state", event => { window.game.set_scores(state.scores); + window.game.set_new_game_votes(state.new_game_votes); + window.game.state_ready(); }); @@ -176,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 * *********************************************************/ @@ -555,19 +569,18 @@ class Ambiguities extends React.PureComponent { ); } - if (this.props.players_judged.has(this.props.player.name)) { - return ( -
- The following players have completed judging: - {[...this.props.players_judged].join(', ')} -
-- Still waiting for the following players: + Still waiting for the following player + {judging_players.length > 1 ? 's' : '' } + :
+ The following players have completed judging:{' '} + {[...this.props.players_judged].join(', ')} +
+ {still_waiting} {move_on_button}- The following players have submitted their answers: - {[...this.props.players_answered].join(', ')} -
+ let still_waiting = null; + const answering_players = Object.keys(this.props.players_answering);; + if (answering_players.length) { + still_waiting = ( +- Still waiting for the following players: + Still waiting for the following player + {answering_players.length > 1 ? 's' : ''} + :
+ The following players have submitted their answers:{' '} + {[...this.props.players_answered].join(', ')} +
+ {still_waiting} {move_on_button}Remember, you're trying to match your answers with what the other players submit. - Give {this.props.prompt.items} answers for the following prompt: + Give {this.props.prompt.items} answer + {this.props.prompt.items > 1 ? 's' : ''} for the following prompt: