X-Git-Url: https://git.cworth.org/git?p=lmno.games;a=blobdiff_plain;f=empathy%2Fempathy.jsx;h=d7e6f6f63df15514bfcec0758616797c54655fdc;hp=566ad105c5e3cdb3727ffe504d74ca52e9c0efc4;hb=34fdb156080fd1c5fead664ab06a175884e1efa5;hpb=04b3139e734606e5281f7a784c3a04ce1b02cc4d diff --git a/empathy/empathy.jsx b/empathy/empathy.jsx index 566ad10..d7e6f6f 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); @@ -67,6 +73,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,9 +83,15 @@ 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); + + window.game.set_new_game_votes(state.new_game_votes); + + window.game.state_ready(); }); events.addEventListener("prompt", event => { @@ -104,6 +118,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 +154,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); @@ -152,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 * *********************************************************/ @@ -189,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 (
- The following players have completed judging: + The following players have completed judging:{' '} {[...this.props.players_judged].join(', ')}
@@ -522,27 +593,11 @@ class Ambiguities extends React.PureComponent { ); })} - + {move_on_button}
- The following players have submitted their answers: + The following players have submitted their answers:{' '} {[...this.props.players_answered].join(', ')}
@@ -676,27 +756,11 @@ class ActivePrompt extends React.PureComponent { ); })} - + {move_on_button}