X-Git-Url: https://git.cworth.org/git?p=lmno.games;a=blobdiff_plain;f=empathy%2Fempathy.jsx;h=ab45be913f109e782349529af805f8edd82105e1;hp=546df87acbbb0129f33deffc8e4996209460800d;hb=00002a9f80dae904c1629f2d0b06d2acc89e94bf;hpb=d016635ce24d1502f77c610d1a4afbfeca3ec5e8
diff --git a/empathy/empathy.jsx b/empathy/empathy.jsx
index 546df87..ab45be9 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);
@@ -63,9 +69,29 @@ 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_answering_idle(state.answering_idle);
+
+ 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_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 => {
@@ -92,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);
@@ -122,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);
@@ -140,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 *
*********************************************************/
@@ -177,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 (
Players:
- {props.player.name}
- {props.player.score > 0 ? ` (${props.player.score})` : ""}
- {props.other_players.map(other => (
-
- {", "}
- {other.name}
- {other.score > 0 ? ` (${other.score})` : ""}
-
- ))}
+ {names_and_scores}
);
});
@@ -308,6 +363,50 @@ class CategoryRequest extends React.PureComponent {
}
}
+const PromptOption = React.memo(props => {
+
+ const prompt = props.prompt;
+ const [show_prompt, set_show_prompt] = React.useState(true);
+
+ if (! show_prompt)
+ return false;
+
+ if (prompt.votes_against.find(v => v === props.player.name))
+ return false;
+
+ return (
+ fetch_post_json(`vote/${prompt.id}`) }
+ >
+ {
+ event.stopPropagation();
+ fetch_post_json(`vote_against/${prompt.id}`);
+ set_show_prompt(false);
+ }}
+ >
+ ×
+
+ {prompt.prompt}
+
+ {prompt.votes.map(v => {
+ return (
+
+ {v}
+
+ );
+ })}
+
+
+ );
+});
+
const PromptOptions = React.memo(props => {
if (props.prompts.length === 0)
@@ -320,29 +419,7 @@ const PromptOptions = React.memo(props => {
Select any categories below that you'd like to play.
You can choose as many as you'd like.
- {props.prompts.map(p => {
- return (
- fetch_post_json(`vote/${p.id}`) }
- >
- {p.prompt}
-
- {p.votes.map(v => {
- return (
-
- {v}
-
- );
- })}
-
-
- );
- })}
+ {props.prompts.map(p => )}
);
});
@@ -390,14 +467,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 +497,7 @@ class Ambiguities extends React.PureComponent {
return;
}
- this.setState({
- submitted: true
- });
+ this.submitted = true;
}
handle_click(word) {
@@ -436,8 +516,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,51 +566,77 @@ class Ambiguities extends React.PureComponent {
}
render() {
- if (this.state.submitted)
- return (
-
-
Submission received
-
- The following players have completed judging:
- {[...this.props.players_judged].join(', ')}
-
+ let move_on_button = null;
+
+ if (this.props.idle) {
+ move_on_button = (
+
fetch_post_json(`end-judging/${this.props.prompt.id}`) }
+ >
+ Move On
+
+ {[...this.props.votes].map(v => {
+ return (
+
+ {v}
+
+ );
+ })}
+
+
+ );
+ }
+
+ let still_waiting = null;
+ const judging_players = Object.keys(this.props.players_judging);
+ if (judging_players.length) {
+ still_waiting = (
+
- Still waiting for the following players:
+ Still waiting for the following player
+ {judging_players.length > 1 ? 's' : '' }
+ :
- {Object.keys(this.props.players_judging).map(player => {
+ {judging_players.map(player => {
return (
- {player}
- {this.props.players_judging[player] ?
- : null }
+ {player}{' '}
+
+ {'.'} {'.'} {'.'}
+
);
})}
-
fetch_post_json(`end-judging/${this.props.prompt.id}`) }
- >
- Move On
-
- {[...this.props.votes].map(v => {
- return (
-
- {v}
-
- );
- })}
-
-
+
+ );
+ }
+
+ if (this.props.players_judged.has(this.props.player.name)) {
+ return (
+
+
Submission received
+
+ The following players have completed judging:{' '}
+ {[...this.props.players_judged].join(', ')}
+
+ {still_waiting}
+ {move_on_button}
);
+ }
const btn_class = "ambiguity-button";
const btn_selected_class = btn_class + " selected";
@@ -537,6 +650,7 @@ class Ambiguities extends React.PureComponent {
what goes around comes around, so it's best to be generous when
judging.
+
{this.props.prompt.prompt}
{this.state.word_sets.map(set => {
return (
React.createRef());
this.answering_sent_recently = false;
@@ -611,6 +723,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,57 +743,80 @@ 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)
- return (
-
-
Submission received
-
- The following players have submitted their answers:
- {[...this.props.players_answered].join(', ')}
-
+ let move_on_button = null;
+ if (this.props.idle) {
+ move_on_button =(
+
fetch_post_json(`end-answers/${this.props.prompt.id}`) }
+ >
+ Move On
+
+ {[...this.props.votes].map(v => {
+ return (
+
+ {v}
+
+ );
+ })}
+
+
+ );
+ }
+
+ 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' : ''}
+ :
- {Object.keys(this.props.players_answering).map(player => {
+ {answering_players.map(player => {
return (
- {player}
- {this.props.players_answering[player] ?
- : null }
+ {player}{' '}
+
+ {'.'} {'.'} {'.'}
+
);
})}
-
fetch_post_json(`end-answers/${this.props.prompt.id}`) }
- >
- Move On
-
- {[...this.props.votes].map(v => {
- return (
-
- {v}
-
- );
- })}
-
-
+
+ );
+ }
+
+ if (this.props.players_answered.has(this.props.player.name)) {
+ return (
+
+
Submission received
+
+ The following players have submitted their answers:{' '}
+ {[...this.props.players_answered].join(', ')}
+
+ {still_waiting}
+ {move_on_button}
);
+ }
return (
@@ -685,7 +824,8 @@ class ActivePrompt extends React.PureComponent {
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:
{this.props.prompt.prompt}