X-Git-Url: https://git.cworth.org/git?p=lmno.games;a=blobdiff_plain;f=empathy%2Fempathy.jsx;h=001dcd5eeeb5ac3f943d368f971f8a78d19981d3;hp=5782b7879076bdd8812bccffc58a281b63760d5b;hb=49a7e9338a8160363ede955ae0d036abc360a359;hpb=5d49d1235592034458ce875b5d73d024ef23355d

diff --git a/empathy/empathy.jsx b/empathy/empathy.jsx
index 5782b78..001dcd5 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
@@ -427,14 +433,14 @@ const PromptOptions = React.memo(props => {
 
 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;
 
-  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];
 
@@ -502,8 +508,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
+          }))
       }
     );
 
@@ -595,7 +604,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
           <div className="vote-choices">
             {[...this.props.votes].map(v => {
               return (
@@ -783,29 +792,6 @@ class ActivePrompt extends React.PureComponent {
   }
 
   render() {
-    let move_on_button = null;
-    if (this.props.idle) {
-      move_on_button =(
-        <button
-          className="vote-button"
-          onClick={() => fetch_post_json(`end-answers/${this.props.prompt.id}`) }
-        >
-          Move On
-          <div className="vote-choices">
-            {[...this.props.votes].map(v => {
-              return (
-                <div
-                  key={v}
-                  className="vote-choice"
-                >
-                  {v}
-                </div>
-              );
-            })}
-          </div>
-        </button>
-      );
-    }
 
     let still_waiting = null;
     const answering_players = Object.keys(this.props.players_answering);;
@@ -839,6 +825,32 @@ class ActivePrompt extends React.PureComponent {
       );
     }
 
+    let move_on_button = null;
+    if (this.props.idle) {
+      move_on_button =(
+        <button
+          className="vote-button"
+          onClick={() => fetch_post_json(`end-answers/${this.props.prompt.id}`) }
+        >
+          {answering_players.length ?
+           "Move On Without Their Answers" :
+           "Move On Without Anyone Else"}
+          <div className="vote-choices">
+            {[...this.props.votes].map(v => {
+              return (
+                <div
+                  key={v}
+                  className="vote-choice"
+                >
+                  {v}
+                </div>
+              );
+            })}
+          </div>
+        </button>
+      );
+    }
+
     if (this.props.players_answered.has(this.props.player.name)) {
       return (
         <div className="please-wait">
@@ -1206,12 +1218,18 @@ class Game extends React.PureComponent {
           <ul>
             {state.scores.scores.map(score => {
               let perfect = null;
-              if (score.score == perfect_score) {
-                perfect = <span className="label">Perfect!</span>;
+              if (score.score === perfect_score) {
+                perfect = <span className="achievement">Perfect!</span>;
+              }
+              let quirkster = null;
+              if (score.score === state.active_prompt.items) {
+                quirkster = <span className="achievement">Quirkster!</span>;
               }
               return (
                 <li key={score.players[0]}>
-                  {score.players.join("/")}: {score.score} {perfect}
+                  {score.players.join("/")}: {score.score}
+                  {score.kudos ? `, ${'★'.repeat(score.kudos)}` : ""}
+                  {perfect} {quirkster}
                 </li>
               );
             })}
@@ -1221,7 +1239,9 @@ class Game extends React.PureComponent {
             {state.scores.words.map(word => {
               return (
                 <li key={word.word}>
-                  {word.word} ({word.players.length}): {word.players.join(', ')}
+                  {word.word} ({word.players.length}
+                  {word.kudos.length ? `, ${'★'.repeat(word.kudos.length)}` : ""}
+                  ): {word.players.join(', ')}
                 </li>
               );
             })}
@@ -1290,15 +1310,15 @@ class Game extends React.PureComponent {
       <CategoryRequest
         key="category-request"
       />,
-      <PromptOptions
-        key="prompts"
-        prompts={state.prompts}
-        player={state.player_info}
-      />,
       <LetsPlay
         key="lets-play"
         num_players={1+state.other_players.length}
         prompts={state.prompts}
+      />,
+      <PromptOptions
+        key="prompts"
+        prompts={state.prompts}
+        player={state.player_info}
       />
     ];
   }