X-Git-Url: https://git.cworth.org/git?p=lmno.games;a=blobdiff_plain;f=empathy%2Fempathy.jsx;h=566ad105c5e3cdb3727ffe504d74ca52e9c0efc4;hp=dee5a677ff47da93c0307b84af7cec0be8399db6;hb=04b3139e734606e5281f7a784c3a04ce1b02cc4d;hpb=2f53ad28854b9d68fcbd19ca02002c5883234638
diff --git a/empathy/empathy.jsx b/empathy/empathy.jsx
index dee5a67..566ad10 100644
--- a/empathy/empathy.jsx
+++ b/empathy/empathy.jsx
@@ -57,13 +57,27 @@ 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);
- window.game.set_scores(state.scores);
+ window.game.set_players_answered(state.players_answered);
+
+ window.game.set_players_answering(state.players_answering);
+
+ window.game.set_end_answers(state.end_answers);
window.game.set_ambiguities(state.ambiguities);
+
+ window.game.set_players_judged(state.players_judged);
+
+ window.game.set_players_judging(state.players_judging);
+
+ window.game.set_end_judging(state.end_judging);
+
+ window.game.set_scores(state.scores);
});
events.addEventListener("prompt", event => {
@@ -78,10 +92,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_player_answering(player);
+});
+
+events.addEventListener("vote-end-answers", event => {
+ const player = JSON.parse(event.data);
- window.game.set_players_answered(players_answered);
+ 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 +122,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_players_judged(players_judged);
+ 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_player_unvote_end_judging(player);
});
events.addEventListener("scores", event => {
@@ -225,7 +275,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 +361,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 +405,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 +423,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 +433,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 +501,46 @@ class Ambiguities extends React.PureComponent {
if (this.state.submitted)
return (
-
{this.props.players_judged}/
- {this.props.players_total} players have responded
+
Submission received
- Please wait for the rest of the players to complete judging.
+ The following players have completed judging:
+ {[...this.props.players_judged].join(', ')}
);
@@ -501,7 +601,27 @@ class ActivePrompt extends React.PureComponent {
};
this.answers = [...Array(items)].map(() => React.createRef());
+ this.answering_sent_recently = false;
+
this.handle_submit = this.handle_submit.bind(this);
+ this.handle_change = this.handle_change.bind(this);
+ }
+
+ handle_change(event) {
+ /* We don't care (or even look) at what the player is typing at
+ * this point. We simply want to be informed that the player _is_
+ * typing so that we can tell the server (which will tell other
+ * players) that there is activity here.
+ */
+
+ /* Rate limit so that we don't send an "answering" notification
+ * more frequently than necessary.
+ */
+ if (! this.answering_sent_recently) {
+ fetch_post_json(`answering/${this.props.prompt.id}`);
+ this.answering_sent_recently = true;
+ setTimeout(() => { this.answering_sent_recently = false; }, 1000);
+ }
}
async handle_submit(event) {
@@ -535,11 +655,46 @@ class ActivePrompt extends React.PureComponent {
if (this.state.submitted)
return (
-
{this.props.players_answered}/
- {this.props.players_total} players have responded
+
Submission received
- Please wait for the rest of the players to submit their answers.
+ The following players have submitted their answers:
+ {[...this.props.players_answered].join(', ')}