X-Git-Url: https://git.cworth.org/git?p=lmno.games;a=blobdiff_plain;f=empathy%2Fempathy.jsx;h=90bf0fd360829299facce85a1e3593c3a82db63a;hp=4151cf729edf1de6a53151ad49b947aeb2e504d9;hb=HEAD;hpb=e4c308c3331de77071170b0711505a990eaba617

diff --git a/empathy/empathy.jsx b/empathy/empathy.jsx
index 4151cf7..90bf0fd 100644
--- a/empathy/empathy.jsx
+++ b/empathy/empathy.jsx
@@ -48,7 +48,7 @@ events.addEventListener("player-enter", event => {
 events.addEventListener("player-exit", event => {
   const info = JSON.parse(event.data);
 
-  window.game.remove_player(info);
+  window.game.disable_player(info);
 });
 
 events.addEventListener("player-update", event => {
@@ -227,23 +227,43 @@ const PlayerInfo = React.memo(props => {
   if (! props.player.id)
     return null;
 
-  const all_players = [props.player, ...props.other_players];
+  const all_players = [{...props.player, active:true}, ...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 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 (
+        <span
+          key={player.name}
+          className={player.active ? "player-active" : "player-idle"}
+        >
+        {player.name} ({player.score})
+        </span>
+      );
+    } else {
+      if (player.active)
+        return player.name;
+      else
+        return null;
+    }
+  }).filter(component => component != null);
+
+  names_and_scores = intersperse(names_and_scores, ", ");
 
   return (
     <div className="player-info">
       <span className="players-header">Players: </span>
-      <span>{names_and_scores}</span>
+      {names_and_scores}
     </div>
   );
 });
@@ -283,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("");
     }
   }
@@ -311,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
@@ -414,21 +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.
       </p>
-    {props.prompts.map(p => <PromptOption prompt={p} player={props.player} />)}
+      {props.prompts.map(
+        prompt => <PromptOption
+                    key={prompt.id}
+                    prompt={prompt}
+                    player={props.player}
+                  />
+      )}
     </div>
   );
 });
 
 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];
 
@@ -462,11 +514,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 +548,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 +644,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 (
@@ -662,11 +715,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 (
@@ -692,9 +750,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 ?
@@ -779,29 +843,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);;
@@ -835,6 +876,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">
@@ -941,9 +1008,16 @@ class Game extends React.PureComponent {
     });
   }
 
-  remove_player(info) {
+  disable_player(info) {
+    const idx = this.state.other_players.findIndex(o => o.id === info.id);
+    if (idx < 0)
+      return;
+
+    const other_players_copy = [...this.state.other_players];
+    other_players_copy[idx].active = false;
+
     this.setState({
-      other_players: this.state.other_players.filter(o => o.id !== info.id)
+      other_players: other_players_copy
     });
   }
 
@@ -1182,10 +1256,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 &&
@@ -1202,12 +1277,22 @@ 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>;
+              }
+              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}
+                  {score.players.join("/")}: {score.score}
+                  {score.kudos ? `, ${'★'.repeat(score.kudos)}` : ""}
+                  {' '}{perfect} {quirkster} {kudos_slam}
                 </li>
               );
             })}
@@ -1215,9 +1300,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>
               );
             })}
@@ -1286,15 +1382,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}
       />
     ];
   }