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

diff --git a/empathy/empathy.jsx b/empathy/empathy.jsx
index c216e49..9b37d07 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                           *
  *********************************************************/
@@ -560,7 +574,7 @@ class Ambiguities extends React.PureComponent {
         <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>
@@ -722,7 +736,7 @@ class ActivePrompt extends React.PureComponent {
         <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>
@@ -807,6 +821,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 +871,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 +1031,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
@@ -1033,7 +1067,7 @@ class Game extends React.PureComponent {
             {state.scores.scores.map(score => {
               return (
                 <li key={score.player}>
-                  {score.player}: {score.score}
+                  {score.players.join("/")}: {score.score}
                 </li>
               );
             })}
@@ -1043,16 +1077,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>
       );