X-Git-Url: https://git.cworth.org/git?p=lmno.games;a=blobdiff_plain;f=empathy%2Fempathy.jsx;h=3869b3a249f12ff169a62e7dca85a789c4beb2da;hp=c216e4921b9b5d68d8731defddc353125a010d68;hb=533300fbcbfec8c219901cbde2d9c6f336939f97;hpb=71a123df898044213dd6703c036d6bbbea7f7f8f

diff --git a/empathy/empathy.jsx b/empathy/empathy.jsx
index c216e49..3869b3a 100644
--- a/empathy/empathy.jsx
+++ b/empathy/empathy.jsx
@@ -89,6 +89,8 @@ events.addEventListener("game-state", event => {
 
   window.game.set_scores(state.scores);
 
+  window.game.set_new_game_votes(state.new_game_votes);
+
   window.game.state_ready();
 });
 
@@ -176,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                           *
  *********************************************************/
@@ -555,30 +569,37 @@ class Ambiguities extends React.PureComponent {
       );
     }
 
+    let still_waiting = null;
+    if (Object.keys(this.props.players_judging).length) {
+      still_waiting = [
+        <p>
+          Still waiting for the following players:
+        </p>,
+        <ul>
+          {Object.keys(this.props.players_judging).map(player => {
+            return (
+              <li
+                key={player}
+              >
+                {player}
+                {this.props.players_judging[player] ?
+                 <span className="typing"/> : null }
+              </li>
+            );
+          })}
+        </ul>
+      ];
+    }
+
     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:
+            The following players have completed judging:{' '}
             {[...this.props.players_judged].join(', ')}
           </p>
-          <p>
-            Still waiting for the following players:
-          </p>
-          <ul>
-            {Object.keys(this.props.players_judging).map(player => {
-              return (
-                <li
-                  key={player}
-                >
-                  {player}
-                  {this.props.players_judging[player] ?
-                   <span className="typing"/> : null }
-                </li>
-              );
-            })}
-          </ul>
+          {still_waiting}
           {move_on_button}
 
         </div>
@@ -597,6 +618,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
@@ -717,30 +739,37 @@ class ActivePrompt extends React.PureComponent {
       );
     }
 
+    let still_waiting = null;
+    if (Object.keys(this.props.players_answering).length) {
+      still_waiting = [
+        <p>
+          Still waiting for the following players:
+        </p>,
+        <ul>
+           {Object.keys(this.props.players_answering).map(player => {
+             return (
+               <li
+                 key={player}
+               >
+                 {player}
+                 {this.props.players_answering[player] ?
+                  <span className="typing"/> : null }
+               </li>
+             );
+           })}
+        </ul>
+      ];
+    }
+
     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:
+            The following players have submitted their answers:{' '}
             {[...this.props.players_answered].join(', ')}
           </p>
-          <p>
-          Still waiting for the following players:
-          </p>
-          <ul>
-            {Object.keys(this.props.players_answering).map(player => {
-              return (
-                <li
-                  key={player}
-                >
-                  {player}
-                  {this.props.players_answering[player] ?
-                   <span className="typing"/> : null }
-                </li>
-              );
-            })}
-          </ul>
+          {still_waiting}
           {move_on_button}
 
         </div>
@@ -753,7 +782,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}>
@@ -807,6 +837,7 @@ class Game extends React.PureComponent {
       judging_idle: false,
       end_judging_votes: new Set(),
       scores: null,
+      new_game_votes: new Set(),
       ready: false
     };
   }
@@ -856,6 +887,7 @@ class Game extends React.PureComponent {
       judging_idle: false,
       end_judging_votes: new Set(),
       scores: null,
+      new_game_votes: new Set(),
       ready: false
     });
   }
@@ -1015,6 +1047,24 @@ 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
@@ -1028,12 +1078,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}
+                  {score.players.join("/")}: {score.score}
                 </li>
               );
             })}
@@ -1043,16 +1094,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>
       );