Add new failing test case for a reactivated player

[empires-server] / empathy.js

diff --git a/empathy.js b/empathy.js
index 35d5fc7e737726f7426ff58d2c7950ae77fccc6a..56ac53f9c32f95d5b6cbefdebb21d69ed68918e0 100644 (file)
--- a/empathy.js
+++ b/empathy.js
@@ -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();
 });