X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=empathy.js;h=3e32a8bc294e31268c4fa3a0bbd9a802e308db5a;hb=239210c6be9b15e3ee31cc28d4e7e5f83ababd89;hp=5e59dd20ef4fb710e242850fd1dc34fa1f06d218;hpb=60c56d50f8ada21f0dc9eea0bf4485cc7fcf1375;p=empires-server

diff --git a/empathy.js b/empathy.js
index 5e59dd2..3e32a8b 100644
--- a/empathy.js
+++ b/empathy.js
@@ -97,7 +97,7 @@ class Empathy extends Game {
     this.judging_start_time_ms = 0;
     this.equivalencies = {};
 
-    this.broadcast_event_object('game-state', this.state);
+    this.broadcast_event('game-state', this.game_state_json());
   }
 
   add_prompt(items, prompt_string) {
@@ -266,6 +266,12 @@ class Empathy extends Game {
     }
 
     this.broadcast_event_object('ambiguities', this.state.ambiguities);
+
+    /* Notify all players of every player that is judging. */
+    for (let player_name of this.state.players_answered) {
+      this.state.players_judging.add(player_name);
+      this.broadcast_event_object('player-judging', player_name);
+    }
   }
 
   reset_judging_timeout() {
@@ -404,7 +410,7 @@ class Empathy extends Game {
 
     /* Perform a (non-strict) majority ruling on equivalencies,
      * dropping all that didn't get enough votes. */
-    const quorum = Math.floor((this.players.length + 1)/2);
+    const quorum = Math.floor((this.state.players_judged.length + 1)/2);
     const agreed_equivalencies = Object.values(this.equivalencies).filter(
       eq => eq.count >= quorum);
 
@@ -475,7 +481,7 @@ class Empathy extends Game {
       group.players.forEach(p => p.round_score += group.players.size);
     }
 
-    const scores = this.players.map(p => {
+    const scores = this.players.filter(p => p.active).map(p => {
       return {
         player: p.name,
         score: p.round_score
@@ -571,7 +577,7 @@ router.post('/answer/:prompt_id([0-9]+)', (request, response) => {
 
   /* If every registered player has answered, then there's no need to
    * wait for anything else. */
-  if (game.state.players_answered.length >= game.players.length)
+  if (game.state.players_answered.length >= game.active_players)
     game.perform_judging();
 });
 
@@ -611,9 +617,9 @@ router.post('/judged/:prompt_id([0-9]+)', (request, response) => {
                                      request.body.word_groups);
   response.json(result);
 
-  /* If every registered player has judged, then there's no need to
-   * wait for anything else. */
-  if (game.state.players_judged.length >= game.players.length)
+  /* If every player who answered has also judged, then there's no
+   * need to wait for anything else. */
+  if (game.state.players_judged.length >= game.state.players_answered.length)
     game.compute_scores();
 });