X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;ds=sidebyside;f=empathy%2Fempathy.jsx;h=d7e6f6f63df15514bfcec0758616797c54655fdc;hb=34fdb156080fd1c5fead664ab06a175884e1efa5;hp=011e196b04c86c5c521fd4e1c15029415a20f546;hpb=a5afefc58f656f68f660a3b17093cb64631f7b6b;p=lmno.games
diff --git a/empathy/empathy.jsx b/empathy/empathy.jsx
index 011e196..d7e6f6f 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 (
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) {
@@ -582,6 +684,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)
});
@@ -598,25 +704,47 @@ 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}
+
+ );
+ })}
+
+
+ );
+ }
+
+ 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.entries(this.props.players_answering).map(player => {
+ {Object.keys(this.props.players_answering).map(player => {
return (
- fetch_post_json(`end-answers/${this.props.prompt.id}`) }
- >
- Move On
-
- {[...this.props.votes].map(v => {
- return (
-
- {v}
-
- );
- })}
-
-
+ {move_on_button}
);
+ }
return (
@@ -670,6 +782,7 @@ class ActivePrompt extends React.PureComponent {
name={`answer_${i}`}
required
autoComplete="off"
+ onChange={this.handle_change}
ref={this.answers[i]}
/>
@@ -701,12 +814,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
};
}
@@ -735,18 +852,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
});
}
@@ -775,6 +902,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];
@@ -785,6 +918,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: {
@@ -794,6 +937,18 @@ 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)
+ });
+ }
+
set_player_vote_end_answers(player) {
this.setState({
end_answers_votes: new Set([...this.state.end_answers_votes, player])
@@ -812,6 +967,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];
@@ -822,6 +983,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: {
@@ -831,6 +1002,17 @@ 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)
+ });
+ }
set_player_vote_end_judging(player) {
this.setState({
@@ -850,6 +1032,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;
@@ -857,12 +1063,13 @@ class Game extends React.PureComponent {
if (state.scores) {
return (
+
{state.active_prompt.prompt}
Scores
{state.scores.scores.map(score => {
return (
- {score.player}: {score.score}
+ {score.players.join("/")}: {score.score}
);
})}
@@ -872,16 +1079,28 @@ class Game extends React.PureComponent {
{state.scores.words.map(word => {
return (
- {`${word.word}: ${word.players.join(', ')}`}
+ {word.word} ({word.players.length}): {word.players.join(', ')}
);
})}
fetch_post_json('reset') }
+ className="vote-button"
+ onClick={() => fetch_post_json(`new-game/${state.active_prompt.id}`) }
>
New Game
+
+ {[...state.new_game_votes].map(v => {
+ return (
+
+ {v}
+
+ );
+ })}
+
);
@@ -891,8 +1110,10 @@ class Game extends React.PureComponent {
return
;
}
@@ -900,12 +1121,17 @@ class Game extends React.PureComponent {
if (state.active_prompt) {
return
;
}
+ if (! state.ready)
+ return null;
+
return [