X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;ds=sidebyside;f=empathy%2Fempathy.jsx;h=0c1fccfe0b60e1a399c2d2bf2c27082c46c1c5eb;hb=e79802f7979a2b3162efb0968c223f527d354410;hp=dee5a677ff47da93c0307b84af7cec0be8399db6;hpb=2f53ad28854b9d68fcbd19ca02002c5883234638;p=lmno.games
diff --git a/empathy/empathy.jsx b/empathy/empathy.jsx
index dee5a67..0c1fccf 100644
--- a/empathy/empathy.jsx
+++ b/empathy/empathy.jsx
@@ -57,13 +57,31 @@ events.addEventListener("player-update", event => {
events.addEventListener("game-state", event => {
const state = JSON.parse(event.data);
+ window.game.reset_game_state();
+
window.game.set_prompts(state.prompts);
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);
});
events.addEventListener("prompt", event => {
@@ -78,10 +96,34 @@ events.addEventListener("start", event => {
window.game.set_active_prompt(prompt);
});
-events.addEventListener("answered", event => {
- const players_answered = JSON.parse(event.data);
+events.addEventListener("player-answered", event => {
+ const player = JSON.parse(event.data);
- window.game.set_players_answered(players_answered);
+ window.game.set_player_answered(player);
+});
+
+events.addEventListener("player-answering", event => {
+ const player = JSON.parse(event.data);
+
+ 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);
+
+ window.game.set_player_vote_end_answers(player);
+});
+
+events.addEventListener("unvote-end-answers", event => {
+ const player = JSON.parse(event.data);
+
+ window.game.set_player_unvote_end_answers(player);
});
events.addEventListener("ambiguities", event => {
@@ -90,10 +132,34 @@ events.addEventListener("ambiguities", event => {
window.game.set_ambiguities(ambiguities);
});
-events.addEventListener("judged", event => {
- const players_judged = JSON.parse(event.data);
+events.addEventListener("player-judged", event => {
+ const player = JSON.parse(event.data);
+
+ window.game.set_player_judged(player);
+});
+
+events.addEventListener("player-judging", event => {
+ const player = JSON.parse(event.data);
- window.game.set_players_judged(players_judged);
+ 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);
+
+ window.game.set_player_vote_end_judging(player);
+});
+
+events.addEventListener("unvote-end-judging", event => {
+ const player = JSON.parse(event.data);
+
+ window.game.set_player_unvote_end_judging(player);
});
events.addEventListener("scores", event => {
@@ -139,18 +205,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}
);
});
@@ -225,7 +296,6 @@ class CategoryRequest extends React.PureComponent {
if (response.status === 200) {
const result = await response.json();
- console.log(result);
if (! result.valid) {
add_message("danger", result.message);
return;
@@ -312,10 +382,6 @@ const PromptOptions = React.memo(props => {
const LetsPlay = React.memo(props => {
- function handle_click(prompt_id) {
- fetch_post_json
- }
-
const quorum = Math.round((props.num_players + 1) / 2);
const max_votes = props.prompts.reduce(
(max_so_far, v) => Math.max(max_so_far, v.votes.length), 0);
@@ -357,14 +423,21 @@ 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(
- `judging/${this.props.prompt.id}`,{
+ `judged/${this.props.prompt.id}`,{
word_groups: this.state.word_sets.map(set => Array.from(set))
}
);
@@ -376,22 +449,38 @@ class Ambiguities extends React.PureComponent {
return;
}
} else {
- add_message("danger", "An error occurred submitting your answers");
+ add_message("danger", "An error occurred submitting the results of your judging");
return;
}
- this.setState({
- submitted: true
- });
+ this.submitted = true;
}
handle_click(word) {
+
+ /* Let the server know we are doing some judging, (but rate limit
+ * this so we don't send a "judging" notification more frquently
+ * than necessary.
+ */
+ if (! this.judging_sent_recently) {
+ fetch_post_json(`judging/${this.props.prompt.id}`);
+ this.judging_sent_recently = true;
+ setTimeout(() => { this.judging_sent_recently = false; }, 1000);
+ }
+
if (this.state.selected == word) {
/* 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,
@@ -433,16 +522,60 @@ 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}
+
+ );
+ })}
+
+
+ );
+ }
+
+ if (this.props.players_judged.has(this.props.player.name)) {
return (
-
{this.props.players_judged}/
- {this.props.players_total} players have responded
+
Submission received
+
+ The following players have completed judging:
+ {[...this.props.players_judged].join(', ')}
+
- Please wait for the rest of the players to complete judging.
+ Still waiting for the following players:
+
+ {Object.keys(this.props.players_judging).map(player => {
+ return (
+
+ {player}
+ {this.props.players_judging[player] ?
+ : null }
+
+ );
+ })}
+
+ {move_on_button}
+
);
+ }
const btn_class = "ambiguity-button";
const btn_selected_class = btn_class + " selected";
@@ -496,12 +629,30 @@ 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;
+
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) {
@@ -510,6 +661,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)
});
@@ -526,22 +681,63 @@ 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 (
-
{this.props.players_answered}/
- {this.props.players_total} players have responded
+
Submission received
- Please wait for the rest of the players to submit 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 }
+
+ );
+ })}
+
+ {move_on_button}
+
);
+ }
return (
@@ -563,6 +759,7 @@ class ActivePrompt extends React.PureComponent {
name={`answer_${i}`}
required
autoComplete="off"
+ onChange={this.handle_change}
ref={this.answers[i]}
/>
@@ -592,9 +789,16 @@ class Game extends React.PureComponent {
other_players: [],
prompts: [],
active_prompt: null,
- players_answered: 0,
+ players_answered: new Set(),
+ players_answering: {},
+ answering_idle: false,
+ end_answers_votes: new Set(),
ambiguities: null,
- players_judged: 0
+ players_judged: new Set(),
+ players_judging: {},
+ judging_idle: false,
+ end_judging_votes: new Set(),
+ scores: null
};
}
@@ -623,6 +827,23 @@ class Game extends React.PureComponent {
});
}
+ 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
+ });
+ }
+
set_prompts(prompts) {
this.setState({
prompts: prompts
@@ -648,9 +869,62 @@ class Game extends React.PureComponent {
});
}
- set_players_answered(players_answered) {
+ 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];
+
+ this.setState({
+ players_answered: new Set([...this.state.players_answered, player]),
+ players_answering: new_players_answering
+ });
+ }
+
+ set_players_answering(players) {
+ const players_answering = {};
+ for (let player of players) {
+ players_answering[player] = {active: false};
+ }
this.setState({
- players_answered: players_answered
+ players_answering: players_answering
+ });
+ }
+
+ set_player_answering(player) {
+ this.setState({
+ players_answering: {
+ ...this.state.players_answering,
+ [player]: {active: true}
+ }
+ });
+ }
+
+ 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])
+ });
+ }
+
+ set_player_unvote_end_answers(player) {
+ this.setState({
+ end_answers_votes: new Set([...this.state.end_answers_votes].filter(p => p !== player))
});
}
@@ -660,9 +934,63 @@ class Game extends React.PureComponent {
});
}
- set_players_judged(players_judged) {
+ 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];
+
+ this.setState({
+ players_judged: new Set([...this.state.players_judged, player]),
+ players_judging: new_players_judging
+ });
+ }
+
+ 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: {
+ ...this.state.players_judging,
+ [player]: {active: true}
+ }
+ });
+ }
+
+ set_judging_idle(value) {
+ console.log("Setting judging idle to " + 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({
+ end_judging_votes: new Set([...this.state.end_judging_votes, player])
+ });
+ }
+
+ set_player_unvote_end_judging(player) {
this.setState({
- players_judged: players_judged
+ end_judging_votes: new Set([...this.state.end_judging_votes].filter(p => p !== player))
});
}
@@ -713,16 +1041,22 @@ class Game extends React.PureComponent {
return ;
}
if (state.active_prompt) {
return ;
}