X-Git-Url: https://git.cworth.org/git?p=lmno.games;a=blobdiff_plain;f=empathy%2Fempathy.jsx;h=2867dab55c1873f97f79650f2774879c80ff8c11;hp=82bb5ff681989470aa2a78e10d9f7eedc5f42d51;hb=746e9ae5db16b40b47ef7669fcba6de2229e9eea;hpb=9e08b1b85cc467336129e22bc0ece6dfe74d204e

diff --git a/empathy/empathy.jsx b/empathy/empathy.jsx
index 82bb5ff..2867dab 100644
--- a/empathy/empathy.jsx
+++ b/empathy/empathy.jsx
@@ -45,6 +45,12 @@ events.addEventListener("player-enter", event => {
   window.game.set_other_player_info(info);
 });
 
+events.addEventListener("player-exit", event => {
+  const info = JSON.parse(event.data);
+
+  window.game.remove_player(info);
+});
+
 events.addEventListener("player-update", event => {
   const info = JSON.parse(event.data);
 
@@ -82,6 +88,10 @@ events.addEventListener("game-state", event => {
   window.game.set_end_judging(state.end_judging);
 
   window.game.set_scores(state.scores);
+
+  window.game.set_new_game_votes(state.new_game_votes);
+
+  window.game.state_ready();
 });
 
 events.addEventListener("prompt", event => {
@@ -168,6 +178,18 @@ events.addEventListener("scores", event => {
   window.game.set_scores(scores);
 });
 
+events.addEventListener("vote-new-game", event => {
+  const player = JSON.parse(event.data);
+
+  window.game.set_player_vote_new_game(player);
+});
+
+events.addEventListener("unvote-new-game", event => {
+  const player = JSON.parse(event.data);
+
+  window.game.set_player_unvote_new_game(player);
+});
+
 /*********************************************************
  * Game and supporting classes                           *
  *********************************************************/
@@ -205,20 +227,23 @@ const PlayerInfo = React.memo(props => {
   if (! props.player.id)
     return null;
 
-  const sorted_players = [props.player, ...props.other_players].sort((a,b) => {
+  const all_players = [props.player, ...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 (
     <div className="player-info">
       <span className="players-header">Players: </span>
-      {sorted_players.map(player => (
-        <span key={player.id}>
-          {player.name}
-          {player.score > 0 ? ` (${player.score})` : ""}
-          {" "}
-        </span>
-      ))}
+      <span>{names_and_scores}</span>
     </div>
   );
 });
@@ -338,6 +363,45 @@ class CategoryRequest extends React.PureComponent {
   }
 }
 
+const PromptOption = React.memo(props => {
+
+  const prompt = props.prompt;
+
+  if (prompt.votes_against.find(v => v === props.player.name))
+    return false;
+
+  return (
+    <button
+      className="vote-button"
+      key={prompt.id}
+      onClick={() => fetch_post_json(`vote/${prompt.id}`) }
+    >
+      <span
+        className="hide-button"
+        onClick={(event) => {
+          event.stopPropagation();
+          fetch_post_json(`vote_against/${prompt.id}`);
+        }}
+      >
+        &times;
+      </span>
+      {prompt.prompt}
+      <div className="vote-choices">
+        {prompt.votes.map(v => {
+          return (
+            <div
+              key={v}
+              className="vote-choice"
+            >
+              {v}
+            </div>
+          );
+        })}
+      </div>
+    </button>
+  );
+});
+
 const PromptOptions = React.memo(props => {
 
   if (props.prompts.length === 0)
@@ -350,29 +414,7 @@ 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 => {
-        return (
-          <button
-            className="vote-button"
-            key={p.id}
-            onClick={() => fetch_post_json(`vote/${p.id}`) }
-          >
-            {p.prompt}
-            <div className="vote-choices">
-              {p.votes.map(v => {
-                return (
-                  <div
-                    key={v}
-                    className="vote-choice"
-                  >
-                    {v}
-                  </div>
-                );
-              })}
-            </div>
-          </button>
-        );
-      })}
+    {props.prompts.map(p => <PromptOption prompt={p} player={props.player} />)}
     </div>
   );
 });
@@ -544,30 +586,47 @@ class Ambiguities extends React.PureComponent {
       );
     }
 
-    if (this.props.players_judged.has(this.props.player.name)) {
-      return (
-        <div className="please-wait">
-          <h2>Submission received</h2>
-          <p>
-            The following players have completed judging:
-            {[...this.props.players_judged].join(', ')}
-          </p>
+    let still_waiting = null;
+    const judging_players = Object.keys(this.props.players_judging);
+    if (judging_players.length) {
+      still_waiting = (
+        <div>
           <p>
-            Still waiting for the following players:
+            Still waiting for the following player
+            {judging_players.length > 1 ? 's' : '' }
+            :
           </p>
           <ul>
-            {Object.keys(this.props.players_judging).map(player => {
+            {judging_players.map(player => {
               return (
                 <li
                   key={player}
                 >
-                  {player}
-                  {this.props.players_judging[player] ?
-                   <span className="typing"/> : null }
+                  {player}{' '}
+                  <span className=
+                  {this.props.players_judging[player].active ?
+                   "typing active"
+                   :
+                   "typing idle"}>
+                    <span>{'.'}</span><span>{'.'}</span><span>{'.'}</span>
+                  </span>
                 </li>
               );
             })}
           </ul>
+        </div>
+      );
+    }
+
+    if (this.props.players_judged.has(this.props.player.name)) {
+      return (
+        <div className="please-wait">
+          <h2>Submission received</h2>
+          <p>
+            The following players have completed judging:{' '}
+            {[...this.props.players_judged].join(', ')}
+          </p>
+          {still_waiting}
           {move_on_button}
 
         </div>
@@ -586,6 +645,7 @@ class Ambiguities extends React.PureComponent {
           what goes around comes around, so it's best to be generous when
           judging.
         </p>
+        <h2>{this.props.prompt.prompt}</h2>
         {this.state.word_sets.map(set => {
           return (
             <div
@@ -706,30 +766,47 @@ class ActivePrompt extends React.PureComponent {
       );
     }
 
-    if (this.props.players_answered.has(this.props.player.name)) {
-      return (
-        <div className="please-wait">
-          <h2>Submission received</h2>
-          <p>
-            The following players have submitted their answers:
-            {[...this.props.players_answered].join(', ')}
-          </p>
+    let still_waiting = null;
+    const answering_players = Object.keys(this.props.players_answering);;
+    if (answering_players.length) {
+      still_waiting = (
+        <div>
           <p>
-          Still waiting for the following players:
+            Still waiting for the following player
+            {answering_players.length > 1 ? 's' : ''}
+            :
           </p>
           <ul>
-            {Object.keys(this.props.players_answering).map(player => {
+            {answering_players.map(player => {
               return (
                 <li
                   key={player}
                 >
-                  {player}
-                  {this.props.players_answering[player] ?
-                   <span className="typing"/> : null }
+                  {player}{' '}
+                  <span className=
+                  {this.props.players_answering[player].active ?
+                   "typing active"
+                   :
+                   "typing idle"}>
+                    <span>{'.'}</span><span>{'.'}</span><span>{'.'}</span>
+                  </span>
                 </li>
               );
             })}
           </ul>
+        </div>
+      );
+    }
+
+    if (this.props.players_answered.has(this.props.player.name)) {
+      return (
+        <div className="please-wait">
+          <h2>Submission received</h2>
+          <p>
+            The following players have submitted their answers:{' '}
+            {[...this.props.players_answered].join(', ')}
+          </p>
+          {still_waiting}
           {move_on_button}
 
         </div>
@@ -742,7 +819,8 @@ class ActivePrompt extends React.PureComponent {
         <p>
           Remember, you're trying to match your answers with
           what the other players submit.
-          Give {this.props.prompt.items} answers for the following prompt:
+          Give {this.props.prompt.items} answer
+          {this.props.prompt.items > 1 ? 's' : ''} for the following prompt:
         </p>
         <h2>{this.props.prompt.prompt}</h2>
         <form onSubmit={this.handle_submit}>
@@ -795,7 +873,9 @@ class Game extends React.PureComponent {
       players_judging: {},
       judging_idle: false,
       end_judging_votes: new Set(),
-      scores: null
+      scores: null,
+      new_game_votes: new Set(),
+      ready: false
     };
   }
 
@@ -824,6 +904,12 @@ class Game extends React.PureComponent {
     });
   }
 
+  remove_player(info) {
+    this.setState({
+      other_players: this.state.other_players.filter(o => o.id !== info.id)
+    });
+  }
+
   reset_game_state() {
     this.setState({
       prompts: [],
@@ -837,7 +923,9 @@ class Game extends React.PureComponent {
       players_judging: {},
       judging_idle: false,
       end_judging_votes: new Set(),
-      scores: null
+      scores: null,
+      new_game_votes: new Set(),
+      ready: false
     });
   }
 
@@ -893,12 +981,29 @@ class Game extends React.PureComponent {
   }
 
   set_player_answering(player) {
+    /* Set the player as actively answering now. */
     this.setState({
       players_answering: {
         ...this.state.players_answering,
         [player]: {active: true}
       }
     });
+    /* And arrange to have them marked idle very shortly.
+     *
+     * Note: This timeout is intentionally very, very short. We only
+     * need it long enough that the browser has latched onto the state
+     * change to "active" above. We actually use a CSS transition
+     * delay to control the user-perceptible length of time after
+     * which an active player appears inactive.
+     */
+    setTimeout(() => {
+      this.setState({
+        players_answering: {
+          ...this.state.players_answering,
+          [player]: {active: false}
+        }
+      });
+    }, 100);
   }
 
   set_answering_idle(value) {
@@ -958,16 +1063,33 @@ class Game extends React.PureComponent {
   }
 
   set_player_judging(player) {
+    /* Set the player as actively judging now. */
     this.setState({
       players_judging: {
         ...this.state.players_judging,
         [player]: {active: true}
       }
     });
+    /* And arrange to have them marked idle very shortly.
+     *
+     * Note: This timeout is intentionally very, very short. We only
+     * need it long enough that the browser has latched onto the state
+     * change to "active" above. We actually use a CSS transition
+     * delay to control the user-perceptible length of time after
+     * which an active player appears inactive.
+     */
+    setTimeout(() => {
+      this.setState({
+        players_judging: {
+          ...this.state.players_judging,
+          [player]: {active: false}
+        }
+      });
+    }, 100);
+
   }
 
   set_judging_idle(value) {
-    console.log("Setting judging idle to " + value);
     this.setState({
       judging_idle: value
     });
@@ -997,6 +1119,30 @@ class Game extends React.PureComponent {
     });
   }
 
+  set_new_game_votes(players) {
+    this.setState({
+      new_game_votes: new Set(players)
+    });
+  }
+
+  set_player_vote_new_game(player) {
+    this.setState({
+      new_game_votes: new Set([...this.state.new_game_votes, player])
+    });
+  }
+
+  set_player_unvote_new_game(player) {
+    this.setState({
+      new_game_votes: new Set([...this.state.new_game_votes].filter(p => p !== player))
+    });
+  }
+
+  state_ready() {
+    this.setState({
+      ready: true
+    });
+  }
+
   render() {
     const state = this.state;
     const players_total = 1 + state.other_players.length;
@@ -1004,12 +1150,13 @@ class Game extends React.PureComponent {
     if (state.scores) {
       return (
         <div className="scores">
+          <h2>{state.active_prompt.prompt}</h2>
           <h2>Scores</h2>
           <ul>
             {state.scores.scores.map(score => {
               return (
-                <li key={score.player}>
-                  {score.player}: {score.score}
+                <li key={score.players[0]}>
+                  {score.players.join("/")}: {score.score} {perfect}
                 </li>
               );
             })}
@@ -1019,16 +1166,28 @@ class Game extends React.PureComponent {
             {state.scores.words.map(word => {
               return (
                 <li key={word.word}>
-                  {`${word.word}: ${word.players.join(', ')}`}
+                  {word.word} ({word.players.length}): {word.players.join(', ')}
                 </li>
               );
             })}
           </ul>
           <button
-            className="new-game"
-            onClick={() => fetch_post_json('reset') }
+            className="vote-button"
+            onClick={() => fetch_post_json(`new-game/${state.active_prompt.id}`) }
           >
             New Game
+            <div className="vote-choices">
+              {[...state.new_game_votes].map(v => {
+                return (
+                  <div
+                    key={v}
+                    className="vote-choice"
+                  >
+                    {v}
+                  </div>
+                );
+              })}
+            </div>
           </button>
         </div>
       );
@@ -1057,6 +1216,9 @@ class Game extends React.PureComponent {
              />;
     }
 
+    if (! state.ready)
+      return null;
+
     return [
       <GameInfo
         key="game-info"
@@ -1076,6 +1238,7 @@ class Game extends React.PureComponent {
       <PromptOptions
         key="prompts"
         prompts={state.prompts}
+        player={state.player_info}
       />,
       <LetsPlay
         key="lets-play"