X-Git-Url: https://git.cworth.org/git?p=lmno.games;a=blobdiff_plain;f=empathy%2Fempathy.jsx;h=3869b3a249f12ff169a62e7dca85a789c4beb2da;hp=566ad105c5e3cdb3727ffe504d74ca52e9c0efc4;hb=533300fbcbfec8c219901cbde2d9c6f336939f97;hpb=04b3139e734606e5281f7a784c3a04ce1b02cc4d
diff --git a/empathy/empathy.jsx b/empathy/empathy.jsx
index 566ad10..3869b3a 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 (
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}
);
});
@@ -402,14 +445,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))
@@ -427,9 +475,7 @@ class Ambiguities extends React.PureComponent {
return;
}
- this.setState({
- submitted: true
- });
+ this.submitted = true;
}
handle_click(word) {
@@ -498,51 +544,67 @@ class Ambiguities extends React.PureComponent {
}
render() {
- if (this.state.submitted)
+ 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;
+ if (Object.keys(this.props.players_judging).length) {
+ still_waiting = [
+
+ Still waiting for the following players:
+
,
+
+ {Object.keys(this.props.players_judging).map(player => {
+ return (
+
+ {player}
+ {this.props.players_judging[player] ?
+ : null }
+
+ );
+ })}
+
+ ];
+ }
+
+ if (this.props.players_judged.has(this.props.player.name)) {
return (
Submission received
- The following players have completed judging:
+ The following players have completed judging:{' '}
{[...this.props.players_judged].join(', ')}
-
- Still waiting for the following players:
-
-
- {Object.keys(this.props.players_judging).map(player => {
- return (
-
- {player}
- {this.props.players_judging[player] ?
- : null }
-
- );
- })}
-
-
fetch_post_json(`end-judging/${this.props.prompt.id}`) }
- >
- Move On
-
- {[...this.props.votes].map(v => {
- return (
-
- {v}
-
- );
- })}
-
-
+ {still_waiting}
+ {move_on_button}
);
+ }
const btn_class = "ambiguity-button";
const btn_selected_class = btn_class + " selected";
@@ -556,6 +618,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;
@@ -630,6 +691,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)
});
@@ -646,57 +711,70 @@ 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)
+ 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;
+ if (Object.keys(this.props.players_answering).length) {
+ still_waiting = [
+
+ Still waiting for the following players:
+
,
+
+ {Object.keys(this.props.players_answering).map(player => {
+ return (
+
+ {player}
+ {this.props.players_answering[player] ?
+ : null }
+
+ );
+ })}
+
+ ];
+ }
+
+ if (this.props.players_answered.has(this.props.player.name)) {
return (
Submission received
- The following players have submitted their answers:
+ The following players have submitted their answers:{' '}
{[...this.props.players_answered].join(', ')}
-
- Still waiting for the following players:
-
-
- {Object.keys(this.props.players_answering).map(player => {
- return (
-
- {player}
- {this.props.players_answering[player] ?
- : null }
-
- );
- })}
-
-
fetch_post_json(`end-answers/${this.props.prompt.id}`) }
- >
- Move On
-
- {[...this.props.votes].map(v => {
- return (
-
- {v}
-
- );
- })}
-
-
+ {still_waiting}
+ {move_on_button}
);
+ }
return (
@@ -704,7 +782,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}