X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;ds=sidebyside;f=empathy%2Fempathy.jsx;h=90bf0fd360829299facce85a1e3593c3a82db63a;hb=d3ae8ad65b770d0774dfffd0d853b15335f73e63;hp=973a9537f591e34917ff5a476c997cb795ac3de5;hpb=dd52f7568bff0f2125176829ba8b4bd928844d2d;p=lmno.games
diff --git a/empathy/empathy.jsx b/empathy/empathy.jsx
index 973a953..90bf0fd 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.disable_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,43 @@ const PlayerInfo = React.memo(props => {
if (! props.player.id)
return null;
+ const all_players = [{...props.player, active:true}, ...props.other_players];
+
+ const sorted_players = all_players.sort((a,b) => {
+ return b.score - a.score;
+ });
+
+ /* Return a new array with the separator interspersed between
+ * each element of the array passed in as the argument.
+ */
+ function intersperse(arr, sep) {
+ return arr.reduce((acc, val) => [...acc, sep, val], []).slice(1);
+ }
+
+ let names_and_scores = sorted_players.map(player => {
+ if (player.score) {
+ return (
+
+ {player.name} ({player.score})
+
+ );
+ } else {
+ if (player.active)
+ return player.name;
+ else
+ return null;
+ }
+ }).filter(component => component != null);
+
+ names_and_scores = intersperse(names_and_scores, ", ");
+
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}
);
});
@@ -228,7 +303,7 @@ class CategoryRequest extends React.PureComponent {
const match = category.match(/[0-9]+/);
if (match) {
const num_items = parseInt(match[0], 10);
- if (num_items <= MAX_PROMPT_ITEMS)
+ if (num_items > 0 && num_items <= MAX_PROMPT_ITEMS)
category_input.setCustomValidity("");
}
}
@@ -256,6 +331,12 @@ class CategoryRequest extends React.PureComponent {
return;
}
+ if (num_items < 1) {
+ category_input.setCustomValidity("Category must require at least one item.");
+ form.reportValidity();
+ return;
+ }
+
const response = await fetch_post_json("prompts", {
items: num_items,
prompt: category
@@ -308,6 +389,45 @@ class CategoryRequest extends React.PureComponent {
}
}
+const PromptOption = React.memo(props => {
+
+ const prompt = props.prompt;
+
+ 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}`);
+ }}
+ >
+ ×
+
+ {prompt.prompt}
+
+ {prompt.votes.map(v => {
+ return (
+
+ {v}
+
+ );
+ })}
+
+
+ );
+});
+
const PromptOptions = React.memo(props => {
if (props.prompts.length === 0)
@@ -320,43 +440,47 @@ 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(
+ prompt =>
+ )}
);
});
const LetsPlay = React.memo(props => {
- const quorum = Math.round((props.num_players + 1) / 2);
+ const quorum = Math.max(0, props.num_players - props.prompts.length);
const max_votes = props.prompts.reduce(
(max_so_far, v) => Math.max(max_so_far, v.votes.length), 0);
- if (max_votes < quorum)
- return null;
+ if (max_votes < quorum) {
+ let text = `Before we play, we should collect a bit
+ more information about what category would
+ be interesting for this group. So, either
+ type a new category option above, or else`;
+ if (props.prompts.length) {
+ if (props.prompts.length > 1)
+ text += " vote on some of the categories below.";
+ else
+ text += " vote on the category below.";
+ } else {
+ text += " wait for others to submit, and then vote on them below.";
+ }
- const candidates = props.prompts.filter(p => p.votes.length >= quorum);
+ return (
+
+ );
+ }
+
+ const candidates = props.prompts.filter(p => p.votes.length >= max_votes);
const index = Math.floor(Math.random() * candidates.length);
const winner = candidates[index];
@@ -382,25 +506,53 @@ class Ambiguities extends React.PureComponent {
constructor(props) {
super(props);
- const word_sets = props.words.map(word => {
- const set = new Set();
- set.add(word);
- return set;
- });
+ function canonize(word) {
+ return word.replace(/((a|an|the) )?(.*?)s?$/i, '$3');
+ }
+
+ const word_sets = [];
+
+ for (let word of props.words) {
+ const word_canon = canonize(word);
+ let found_match = false;
+ for (let set of word_sets) {
+ const set_canon = canonize(set.values().next().value);
+ if (word_canon === set_canon) {
+ set.add(word);
+ found_match = true;;
+ break;
+ }
+ }
+ if (! found_match) {
+ const set = new Set();
+ set.add(word);
+ word_sets.push(set);
+ }
+ }
this.state = {
word_sets: word_sets,
- submitted: false,
- selected: null
+ selected: null,
+ starred: 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))
+ word_groups: this.state.word_sets.map(
+ set => ({
+ words: Array.from(set),
+ kudos: this.state.starred === set ? true : false
+ }))
}
);
@@ -415,9 +567,7 @@ class Ambiguities extends React.PureComponent {
return;
}
- this.setState({
- submitted: true
- });
+ this.submitted = true;
}
handle_click(word) {
@@ -486,51 +636,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 Without Their Input
+
+ {[...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";
@@ -539,11 +715,17 @@ class Ambiguities extends React.PureComponent {
Judging Answers
- Click on each pair of answers that should be scored as equivalent,
- (and click any word twice to split it out from a group). Remember,
+ Click/tap on each pair of answers that should be scored as equivalent,
+ (or click a word twice to split it out from a group). Remember,
what goes around comes around, so it's best to be generous when
judging.
+
+ Also, for an especially fun or witty answer, you can give kudos
+ by clicking the star on the right. You may only do this for one
+ word/group.
+
+
{this.props.prompt.prompt}
{this.state.word_sets.map(set => {
return (
);
})}
+ {
+ event.stopPropagation();
+ if (this.state.starred === set) {
+ this.setState({
+ starred: null
+ });
+ } else {
+ this.setState({
+ starred: set
+ });
+ }
+ }}
+ >
+ {this.state.starred === set ?
+ 'â
' : 'â'
+ }
+
);
})}
@@ -584,9 +787,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;
@@ -618,6 +819,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)
});
@@ -634,57 +839,83 @@ 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 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}
-
- );
- })}
-
-
+
+ );
+ }
+
+ let move_on_button = null;
+ if (this.props.idle) {
+ move_on_button =(
+
fetch_post_json(`end-answers/${this.props.prompt.id}`) }
+ >
+ {answering_players.length ?
+ "Move On Without Their Answers" :
+ "Move On Without Anyone Else"}
+
+ {[...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 (
@@ -692,7 +923,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}