X-Git-Url: https://git.cworth.org/git?p=lmno.games;a=blobdiff_plain;f=empathy%2Fempathy.jsx;h=80069426d941666e2a812434bef72d2663995bbf;hp=546df87acbbb0129f33deffc8e4996209460800d;hb=fbd247880d7fa0d04aecb61c8960876a3c7a6033;hpb=d016635ce24d1502f77c610d1a4afbfeca3ec5e8;ds=sidebyside
diff --git a/empathy/empathy.jsx b/empathy/empathy.jsx
index 546df87..8006942 100644
--- a/empathy/empathy.jsx
+++ b/empathy/empathy.jsx
@@ -63,9 +63,21 @@ events.addEventListener("game-state", event => {
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 => {
@@ -390,14 +402,19 @@ class Ambiguities extends React.PureComponent {
this.state = {
word_sets: word_sets,
- submitted: false,
selected: null
};
+ this.submitted = false;
this.judging_sent_recently = false;
}
async handle_submit() {
+
+ /* Don't submit a second time. */
+ if (this.submitted)
+ return;
+
const response = await fetch_post_json(
`judged/${this.props.prompt.id}`,{
word_groups: this.state.word_sets.map(set => Array.from(set))
@@ -415,9 +432,7 @@ class Ambiguities extends React.PureComponent {
return;
}
- this.setState({
- submitted: true
- });
+ this.submitted = true;
}
handle_click(word) {
@@ -436,8 +451,15 @@ class Ambiguities extends React.PureComponent {
/* 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,
@@ -479,7 +501,7 @@ class Ambiguities extends React.PureComponent {
}
render() {
- if (this.state.submitted)
+ if (this.props.players_judged.has(this.props.player.name)) {
return (
Submission received
@@ -524,6 +546,7 @@ class Ambiguities extends React.PureComponent {
);
+ }
const btn_class = "ambiguity-button";
const btn_selected_class = btn_class + " selected";
@@ -577,9 +600,7 @@ class ActivePrompt extends React.PureComponent {
super(props);
const items = props.prompt.items;
- this.state = {
- submitted: false
- };
+ this.submitted = false;
this.answers = [...Array(items)].map(() => React.createRef());
this.answering_sent_recently = false;
@@ -611,6 +632,10 @@ class ActivePrompt extends React.PureComponent {
/* Prevent the default page-changing form-submission behavior. */
event.preventDefault();
+ /* And don't submit a second time. */
+ if (this.submitted)
+ return;
+
const response = await fetch_post_json(`answer/${this.props.prompt.id}`, {
answers: this.answers.map(r => r.current.value)
});
@@ -627,13 +652,11 @@ class ActivePrompt extends React.PureComponent {
/* Everything worked. Server is happy with our answers. */
form.reset();
- this.setState({
- submitted: true
- });
+ this.submitted = true;
}
render() {
- if (this.state.submitted)
+ if (this.props.players_answered.has(this.props.player.name)) {
return (
Submission received
@@ -678,6 +701,7 @@ class ActivePrompt extends React.PureComponent {
);
+ }
return (
@@ -805,6 +829,12 @@ class Game extends React.PureComponent {
});
}
+ set_players_answered(players) {
+ this.setState({
+ players_answered: new Set(players)
+ });
+ }
+
set_player_answered(player) {
const new_players_answering = {...this.state.players_answering};
delete new_players_answering[player];
@@ -815,6 +845,16 @@ class Game extends React.PureComponent {
});
}
+ set_players_answering(players) {
+ const players_answering = {};
+ for (let player of players) {
+ players_answering[player] = {active: false};
+ }
+ this.setState({
+ players_answering: players_answering
+ });
+ }
+
set_player_answering(player) {
this.setState({
players_answering: {
@@ -824,6 +864,12 @@ class Game extends React.PureComponent {
});
}
+ set_end_answers(players) {
+ this.setState({
+ end_answers_votes: new Set(players)
+ });
+ }
+
set_player_vote_end_answers(player) {
this.setState({
end_answers_votes: new Set([...this.state.end_answers_votes, player])
@@ -842,6 +888,12 @@ class Game extends React.PureComponent {
});
}
+ set_players_judged(players) {
+ this.setState({
+ players_judged: new Set(players)
+ });
+ }
+
set_player_judged(player) {
const new_players_judging = {...this.state.players_judging};
delete new_players_judging[player];
@@ -852,6 +904,16 @@ class Game extends React.PureComponent {
});
}
+ set_players_judging(players) {
+ const players_judging = {};
+ for (let player of players) {
+ players_judging[player] = {active: false};
+ }
+ this.setState({
+ players_judging: players_judging
+ });
+ }
+
set_player_judging(player) {
this.setState({
players_judging: {
@@ -861,6 +923,11 @@ class Game extends React.PureComponent {
});
}
+ set_end_judging(players) {
+ this.setState({
+ end_judging_votes: new Set(players)
+ });
+ }
set_player_vote_end_judging(player) {
this.setState({
@@ -921,6 +988,7 @@ class Game extends React.PureComponent {
return