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

diff --git a/empathy/empathy.jsx b/empathy/empathy.jsx
index 683f92d..82bb5ff 100644
--- a/empathy/empathy.jsx
+++ b/empathy/empathy.jsx
@@ -77,6 +77,8 @@ events.addEventListener("game-state", event => {
 
   window.game.set_players_judging(state.players_judging);
 
+  window.game.set_judging_idle(state.judging_idle);
+
   window.game.set_end_judging(state.end_judging);
 
   window.game.set_scores(state.scores);
@@ -142,6 +144,12 @@ events.addEventListener("player-judging", event => {
   window.game.set_player_judging(player);
 });
 
+events.addEventListener("judging-idle", event => {
+  const value = JSON.parse(event.data);
+
+  window.game.set_judging_idle(value);
+});
+
 events.addEventListener("vote-end-judging", event => {
   const player = JSON.parse(event.data);
 
@@ -197,16 +205,18 @@ const PlayerInfo = React.memo(props => {
   if (! props.player.id)
     return null;
 
+  const sorted_players = [props.player, ...props.other_players].sort((a,b) => {
+    return b.score - a.score;
+  });
+
   return (
     <div className="player-info">
       <span className="players-header">Players: </span>
-      {props.player.name}
-      {props.player.score > 0 ? ` (${props.player.score})` : ""}
-      {props.other_players.map(other => (
-        <span key={other.id}>
-          {", "}
-          {other.name}
-          {other.score > 0 ? ` (${other.score})` : ""}
+      {sorted_players.map(player => (
+        <span key={player.id}>
+          {player.name}
+          {player.score > 0 ? ` (${player.score})` : ""}
+          {" "}
         </span>
       ))}
     </div>
@@ -509,6 +519,31 @@ class Ambiguities 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-judging/${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>
+      );
+    }
+
     if (this.props.players_judged.has(this.props.player.name)) {
       return (
         <div className="please-wait">
@@ -533,24 +568,7 @@ class Ambiguities extends React.PureComponent {
               );
             })}
           </ul>
-          <button
-            className="vote-button"
-            onClick={() => fetch_post_json(`end-judging/${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>
+          {move_on_button}
 
         </div>
       );
@@ -775,6 +793,7 @@ class Game extends React.PureComponent {
       ambiguities: null,
       players_judged: new Set(),
       players_judging: {},
+      judging_idle: false,
       end_judging_votes: new Set(),
       scores: null
     };
@@ -816,6 +835,7 @@ class Game extends React.PureComponent {
       ambiguities: null,
       players_judged: new Set(),
       players_judging: {},
+      judging_idle: false,
       end_judging_votes: new Set(),
       scores: null
     });
@@ -946,6 +966,13 @@ class Game extends React.PureComponent {
     });
   }
 
+  set_judging_idle(value) {
+    console.log("Setting judging idle to " + value);
+    this.setState({
+      judging_idle: value
+    });
+  }
+
   set_end_judging(players) {
     this.setState({
       end_judging_votes: new Set(players)
@@ -1014,6 +1041,7 @@ class Game extends React.PureComponent {
                player={state.player_info}
                players_judged={state.players_judged}
                players_judging={state.players_judging}
+               idle={state.judging_idle}
                votes={state.end_judging_votes}
              />;
     }