X-Git-Url: https://git.cworth.org/git?p=lmno.games;a=blobdiff_plain;f=empathy%2Fempathy.jsx;h=37fd910e75eeca154e304b08dda107414456a9dc;hp=4151cf729edf1de6a53151ad49b947aeb2e504d9;hb=58de8528fda4fe0afee507d5ac0c9fc1c5429736;hpb=e4c308c3331de77071170b0711505a990eaba617;ds=sidebyside
diff --git a/empathy/empathy.jsx b/empathy/empathy.jsx
index 4151cf7..37fd910 100644
--- a/empathy/empathy.jsx
+++ b/empathy/empathy.jsx
@@ -283,7 +283,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("");
}
}
@@ -311,6 +311,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
@@ -414,21 +420,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 => )}
+ {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.";
+ }
+
+ return (
+
+
+ {text}
+
+
+ );
+ }
- const candidates = props.prompts.filter(p => p.votes.length >= quorum);
+ const candidates = props.prompts.filter(p => p.votes.length >= max_votes);
const index = Math.floor(Math.random() * candidates.length);
const winner = candidates[index];
@@ -462,11 +494,9 @@ class Ambiguities extends React.PureComponent {
for (let word of props.words) {
const word_canon = canonize(word);
- console.log("Canonized " + word + " to " + word_canon);
let found_match = false;
for (let set of word_sets) {
const set_canon = canonize(set.values().next().value);
- console.log("Comparing " + word_canon + " to " + set_canon);
if (word_canon === set_canon) {
set.add(word);
found_match = true;;
@@ -498,8 +528,11 @@ class Ambiguities extends React.PureComponent {
const response = await fetch_post_json(
`judged/${this.props.prompt.id}`,{
- word_groups: this.state.word_sets.map(set => Array.from(set)),
- kudos: Array.from(this.state.starred)
+ word_groups: this.state.word_sets.map(
+ set => ({
+ words: Array.from(set),
+ kudos: this.state.starred === set ? true : false
+ }))
}
);
@@ -591,7 +624,7 @@ class Ambiguities extends React.PureComponent {
className="vote-button"
onClick={() => fetch_post_json(`end-judging/${this.props.prompt.id}`) }
>
- Move On
+ Move On Without Their Input
{[...this.props.votes].map(v => {
return (
@@ -779,29 +812,6 @@ class ActivePrompt extends React.PureComponent {
}
render() {
- let move_on_button = null;
- if (this.props.idle) {
- move_on_button =(
-
- );
- }
let still_waiting = null;
const answering_players = Object.keys(this.props.players_answering);;
@@ -835,6 +845,32 @@ class ActivePrompt extends React.PureComponent {
);
}
+ let move_on_button = null;
+ if (this.props.idle) {
+ move_on_button =(
+
+ );
+ }
+
if (this.props.players_answered.has(this.props.player.name)) {
return (
@@ -1202,12 +1238,18 @@ class Game extends React.PureComponent {
{state.scores.scores.map(score => {
let perfect = null;
- if (score.score == perfect_score) {
- perfect = Perfect!;
+ if (score.score === perfect_score) {
+ perfect = Perfect!;
+ }
+ let quirkster = null;
+ if (score.score === state.active_prompt.items) {
+ quirkster = Quirkster!;
}
return (