X-Git-Url: https://git.cworth.org/git?p=lmno.games;a=blobdiff_plain;f=empathy%2Fempathy.jsx;h=973a9537f591e34917ff5a476c997cb795ac3de5;hp=dee5a677ff47da93c0307b84af7cec0be8399db6;hb=dd52f7568bff0f2125176829ba8b4bd928844d2d;hpb=2f53ad28854b9d68fcbd19ca02002c5883234638 diff --git a/empathy/empathy.jsx b/empathy/empathy.jsx index dee5a67..973a953 100644 --- a/empathy/empathy.jsx +++ b/empathy/empathy.jsx @@ -57,6 +57,8 @@ events.addEventListener("player-update", event => { events.addEventListener("game-state", event => { const state = JSON.parse(event.data); + window.game.reset_game_state(); + window.game.set_prompts(state.prompts); window.game.set_active_prompt(state.active_prompt); @@ -78,10 +80,28 @@ events.addEventListener("start", event => { window.game.set_active_prompt(prompt); }); -events.addEventListener("answered", event => { - const players_answered = JSON.parse(event.data); +events.addEventListener("player-answered", event => { + const player = JSON.parse(event.data); + + window.game.set_player_answered(player); +}); + +events.addEventListener("player-answering", event => { + const player = JSON.parse(event.data); - window.game.set_players_answered(players_answered); + window.game.set_player_answering(player); +}); + +events.addEventListener("vote-end-answers", event => { + const player = JSON.parse(event.data); + + window.game.set_player_vote_end_answers(player); +}); + +events.addEventListener("unvote-end-answers", event => { + const player = JSON.parse(event.data); + + window.game.set_player_unvote_end_answers(player); }); events.addEventListener("ambiguities", event => { @@ -90,10 +110,28 @@ events.addEventListener("ambiguities", event => { window.game.set_ambiguities(ambiguities); }); -events.addEventListener("judged", event => { - const players_judged = JSON.parse(event.data); +events.addEventListener("player-judged", event => { + const player = JSON.parse(event.data); + + window.game.set_player_judged(player); +}); + +events.addEventListener("player-judging", event => { + const player = JSON.parse(event.data); + + window.game.set_player_judging(player); +}); + +events.addEventListener("vote-end-judging", event => { + const player = JSON.parse(event.data); + + window.game.set_player_vote_end_judging(player); +}); + +events.addEventListener("unvote-end-judging", event => { + const player = JSON.parse(event.data); - window.game.set_players_judged(players_judged); + window.game.set_player_unvote_end_judging(player); }); events.addEventListener("scores", event => { @@ -225,7 +263,6 @@ class CategoryRequest extends React.PureComponent { if (response.status === 200) { const result = await response.json(); - console.log(result); if (! result.valid) { add_message("danger", result.message); return; @@ -312,10 +349,6 @@ const PromptOptions = React.memo(props => { const LetsPlay = React.memo(props => { - function handle_click(prompt_id) { - fetch_post_json - } - const quorum = Math.round((props.num_players + 1) / 2); const max_votes = props.prompts.reduce( (max_so_far, v) => Math.max(max_so_far, v.votes.length), 0); @@ -360,11 +393,13 @@ class Ambiguities extends React.PureComponent { submitted: false, selected: null }; + + this.judging_sent_recently = false; } async handle_submit() { const response = await fetch_post_json( - `judging/${this.props.prompt.id}`,{ + `judged/${this.props.prompt.id}`,{ word_groups: this.state.word_sets.map(set => Array.from(set)) } ); @@ -376,7 +411,7 @@ class Ambiguities extends React.PureComponent { return; } } else { - add_message("danger", "An error occurred submitting your answers"); + add_message("danger", "An error occurred submitting the results of your judging"); return; } @@ -386,12 +421,30 @@ class Ambiguities extends React.PureComponent { } handle_click(word) { + + /* Let the server know we are doing some judging, (but rate limit + * this so we don't send a "judging" notification more frquently + * than necessary. + */ + if (! this.judging_sent_recently) { + fetch_post_json(`judging/${this.props.prompt.id}`); + this.judging_sent_recently = true; + setTimeout(() => { this.judging_sent_recently = false; }, 1000); + } + if (this.state.selected == word) { /* Second click on same word removes the word from the group. */ const idx = this.state.word_sets.findIndex(s => s.has(word)); const set = this.state.word_sets[idx]; - if (set.size === 1) + if (set.size === 1) { + /* When the word is already alone, there's nothing to do but + * to un-select it. */ + this.setState({ + selected: null + }); return; + } + const new_set = new Set([...set].filter(w => w !== word)); this.setState({ selected: null, @@ -436,11 +489,46 @@ class Ambiguities extends React.PureComponent { if (this.state.submitted) return (
- Please wait for the rest of the players to complete judging. + The following players have completed judging: + {[...this.props.players_judged].join(', ')}
++ Still waiting for the following players: +
+- Please wait for the rest of the players to submit their answers. + The following players have submitted their answers: + {[...this.props.players_answered].join(', ')}
++ Still waiting for the following players: +
+