X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;ds=sidebyside;f=empathy%2Fempathy.jsx;h=044d4e07ad5e3e62885648410f0d6977d5b62525;hb=5e235932d1940d4849d2f3adbee33f6ecef4ed6b;hp=566ad105c5e3cdb3727ffe504d74ca52e9c0efc4;hpb=04b3139e734606e5281f7a784c3a04ce1b02cc4d;p=lmno.games
diff --git a/empathy/empathy.jsx b/empathy/empathy.jsx
index 566ad10..044d4e0 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,7 +544,32 @@ class Ambiguities extends React.PureComponent {
}
render() {
- if (this.state.submitted)
+ let move_on_button = null;
+
+ if (this.props.idle) {
+ move_on_button = (
+
+ );
+ }
+
+ if (this.props.players_judged.has(this.props.player.name)) {
return (
Submission received
@@ -522,27 +593,11 @@ class Ambiguities extends React.PureComponent {
);
})}
-
+ {move_on_button}
);
+ }
const btn_class = "ambiguity-button";
const btn_selected_class = btn_class + " selected";
@@ -596,9 +651,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;
@@ -630,6 +683,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,13 +703,35 @@ 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 =(
+
+ );
+ }
+
+ if (this.props.players_answered.has(this.props.player.name)) {
return (
Submission received
@@ -676,27 +755,11 @@ class ActivePrompt extends React.PureComponent {
);
})}
-
+ {move_on_button}
);
+ }
return (
@@ -750,12 +813,16 @@ class Game extends React.PureComponent {
active_prompt: null,
players_answered: new Set(),
players_answering: {},
+ answering_idle: false,
end_answers_votes: new Set(),
ambiguities: null,
players_judged: new Set(),
players_judging: {},
+ judging_idle: false,
end_judging_votes: new Set(),
- scores: null
+ scores: null,
+ new_game_votes: new Set(),
+ ready: false
};
}
@@ -784,18 +851,28 @@ class Game extends React.PureComponent {
});
}
+ remove_player(info) {
+ this.setState({
+ other_players: this.state.other_players.filter(o => o.id !== info.id)
+ });
+ }
+
reset_game_state() {
this.setState({
prompts: [],
active_prompt: null,
players_answered: new Set(),
players_answering: {},
+ answering_idle: false,
end_answers_votes: new Set(),
ambiguities: null,
players_judged: new Set(),
players_judging: {},
+ judging_idle: false,
end_judging_votes: new Set(),
- scores: null
+ scores: null,
+ new_game_votes: new Set(),
+ ready: false
});
}
@@ -859,6 +936,12 @@ class Game extends React.PureComponent {
});
}
+ set_answering_idle(value) {
+ this.setState({
+ answering_idle: value
+ });
+ }
+
set_end_answers(players) {
this.setState({
end_answers_votes: new Set(players)
@@ -918,6 +1001,12 @@ class Game extends React.PureComponent {
});
}
+ set_judging_idle(value) {
+ this.setState({
+ judging_idle: value
+ });
+ }
+
set_end_judging(players) {
this.setState({
end_judging_votes: new Set(players)
@@ -942,6 +1031,30 @@ class Game extends React.PureComponent {
});
}
+ set_new_game_votes(players) {
+ this.setState({
+ new_game_votes: new Set(players)
+ });
+ }
+
+ set_player_vote_new_game(player) {
+ this.setState({
+ new_game_votes: new Set([...this.state.new_game_votes, player])
+ });
+ }
+
+ set_player_unvote_new_game(player) {
+ this.setState({
+ new_game_votes: new Set([...this.state.new_game_votes].filter(p => p !== player))
+ });
+ }
+
+ state_ready() {
+ this.setState({
+ ready: true
+ });
+ }
+
render() {
const state = this.state;
const players_total = 1 + state.other_players.length;
@@ -954,7 +1067,7 @@ class Game extends React.PureComponent {
{state.scores.scores.map(score => {
return (
- {score.player}: {score.score}
+ {score.players.join("/")}: {score.score}
);
})}
@@ -964,16 +1077,28 @@ class Game extends React.PureComponent {
{state.scores.words.map(word => {
return (
- {`${word.word}: ${word.players.join(', ')}`}
+ {word.word}: {word.players.join(', ')}
);
})}
);
@@ -983,8 +1108,10 @@ class Game extends React.PureComponent {
return ;
}
@@ -992,12 +1119,17 @@ class Game extends React.PureComponent {
if (state.active_prompt) {
return ;
}
+ if (! state.ready)
+ return null;
+
return [