X-Git-Url: https://git.cworth.org/git?p=lmno.games;a=blobdiff_plain;f=empathy%2Fempathy.jsx;h=b58f9359ff5bdc7bed3bef174cc6119ee7cee0b7;hp=37fd910e75eeca154e304b08dda107414456a9dc;hb=6e3daa0768dafe57ad8f045b8314502316dc7c66;hpb=58de8528fda4fe0afee507d5ac0c9fc1c5429736

diff --git a/empathy/empathy.jsx b/empathy/empathy.jsx
index 37fd910..b58f935 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>
   );
 });
@@ -695,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 (
@@ -725,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 ?
@@ -965,21 +996,29 @@ class Game extends React.PureComponent {
   }
 
   set_other_player_info(info) {
+    const player_object = {...info, active: true};
     const other_players_copy = [...this.state.other_players];
     const idx = other_players_copy.findIndex(o => o.id === info.id);
     if (idx >= 0) {
-      other_players_copy[idx] = info;
+      other_players_copy[idx] = player_object;
     } else {
-      other_players_copy.push(info);
+      other_players_copy.push(player_object);
     }
     this.setState({
       other_players: other_players_copy
     });
   }
 
-  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
     });
   }
 
@@ -1218,10 +1257,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 &&
@@ -1245,11 +1285,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}
                   {score.kudos ? `, ${'★'.repeat(score.kudos)}` : ""}
-                  {perfect} {quirkster}
+                  {' '}{perfect} {quirkster} {kudos_slam}
                 </li>
               );
             })}
@@ -1257,11 +1301,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.kudos.length ? `, ${'★'.repeat(word.kudos.length)}` : ""}
                   ): {word.players.join(', ')}
+                  {' '}{great_minds}{kudos_slam}
                 </li>
               );
             })}
@@ -1332,7 +1385,7 @@ class Game extends React.PureComponent {
       />,
       <LetsPlay
         key="lets-play"
-        num_players={1+state.other_players.length}
+        num_players={1+state.other_players.filter(p => p.active).length}
         prompts={state.prompts}
       />,
       <PromptOptions