Only consider active players when counting players needed for prompt voting

[lmno.games] / empathy / empathy.jsx

diff --git a/empathy/empathy.jsx b/empathy/empathy.jsx
index b1f4ab201c71bff8265c88f79186c8234021369a..7ac92e01e4532eb35bd73fd2c878afca01fcc597 100644 (file)
--- a/empathy/empathy.jsx
+++ b/empathy/empathy.jsx
@@ -433,14 +433,34 @@ 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;
+  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 (
+      <div className="before-we-play">
+        <p>
+          {text}
+        </p>
+      </div>
+    );
+  }
 
-  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];
 
@@ -508,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: this.state.starred ? Array.from(this.state.starred) : null
+        word_groups: this.state.word_sets.map(
+          set => ({
+            words: Array.from(set),
+            kudos: this.state.starred === set ? true : false
+          }))
       }
     );
 
@@ -672,11 +695,16 @@ class Ambiguities extends React.PureComponent {
       <div className="ambiguities">
         <h2>Judging Answers</h2>
         <p>
-          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.
         </p>
+        <p>
+          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.
+        </p>
         <h2>{this.props.prompt.prompt}</h2>
         {this.state.word_sets.map(set => {
           return (
@@ -702,9 +730,15 @@ class Ambiguities extends React.PureComponent {
                           }
                 onClick={(event) => {
                   event.stopPropagation();
-                  this.setState({
-                    starred: set
-                  });
+                  if (this.state.starred === set) {
+                    this.setState({
+                      starred: null
+                    });
+                  } else {
+                    this.setState({
+                      starred: set
+                    });
+                  }
                 }}
               >
               {this.state.starred === set ?
@@ -1195,10 +1229,11 @@ class Game extends React.PureComponent {
 
   render() {
     const state = this.state;
-    const players_total = 1 + state.other_players.length;
 
     if (state.scores) {
 
+      const players_total = state.players_answered.size;
+
       let perfect_score = 0;
       for (let i = 0;
            i < state.active_prompt.items &&
@@ -1222,9 +1257,15 @@ class Game extends React.PureComponent {
               if (score.score === state.active_prompt.items) {
                 quirkster = <span className="achievement">Quirkster!</span>;
               }
+              let kudos_slam = null;
+              if (score.kudos > 0 && score.kudos >= players_total - 1) {
+                kudos_slam = <span className="achievement">Kudos Slam!</span>;
+              }
               return (
                 <li key={score.players[0]}>
-                {score.players.join("/")}: {score.score} {perfect} {quirkster}
+                  {score.players.join("/")}: {score.score}
+                  {score.kudos ? `, ${'★'.repeat(score.kudos)}` : ""}
+                  {' '}{perfect} {quirkster} {kudos_slam}
                 </li>
               );
             })}
@@ -1232,9 +1273,20 @@ class Game extends React.PureComponent {
           <h2>Words submitted</h2>
           <ul>
             {state.scores.words.map(word => {
+              let great_minds = null;
+              if (word.kudos.length && word.players.length > 1) {
+                great_minds = <span className="achievement">Great Minds!</span>;
+              }
+              let kudos_slam = null;
+              if (word.kudos.length > 0 && word.kudos.length >= players_total - 1) {
+                kudos_slam = <span className="achievement">Kudos Slam!</span>;
+              }
               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(', ')}
+                  {' '}{great_minds}{kudos_slam}
                 </li>
               );
             })}
@@ -1303,15 +1355,15 @@ class Game extends React.PureComponent {
       <CategoryRequest
         key="category-request"
       />,
+      <LetsPlay
+        key="lets-play"
+        num_players={1+state.other_players.filter(p => p.active).length}
+        prompts={state.prompts}
+      />,
       <PromptOptions
         key="prompts"
         prompts={state.prompts}
         player={state.player_info}
-      />,
-      <LetsPlay
-        key="lets-play"
-        num_players={1+state.other_players.length}
-        prompts={state.prompts}
       />
     ];
   }