X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=empathy.js;h=428627ce863d6913311aee67bd9caccdc0ee20c0;hb=af0746e6f592e8cc5940465e7688aac33afea4de;hp=354e3fac2e71838a8753ac71526af40363095782;hpb=4fbd72283671883caf0d6a9e5ef0181c4ae6f011;p=lmno-server

diff --git a/empathy.js b/empathy.js
index 354e3fa..428627c 100644
--- a/empathy.js
+++ b/empathy.js
@@ -19,7 +19,7 @@ const PHASE_MINIMUM_TIME = 30;
  *
  * Specified in seconds
  */
-const PHASE_IDLE_TIMEOUT = 10;
+const PHASE_IDLE_TIMEOUT = 30;
 
 class Empathy extends Game {
   constructor(id) {
@@ -34,19 +34,22 @@ class Empathy extends Game {
       ambiguities: null,
       players_judged: [],
       players_judging: new Set(),
+      judging_idle: false,
       end_judging: new Set(),
       scores: null
     };
     this.answers = [];
     this.answering_idle_timer = 0;
     this.answering_start_time_ms = 0;
+    this.judging_idle_timer = 0;
+    this.judging_start_time_ms = 0;
     this.next_prompt_id = 1;
     this.equivalencies = {};
   }
 
   reset() {
 
-    /* Before closing out the current round, we accumulate that score
+    /* Before closing out the current round, we accumulate the score
      * for each player into their runnning total. */
     for (let score of this.state.scores.scores) {
       const player = this.players.find(p => p.name === score.player);
@@ -77,6 +80,7 @@ class Empathy extends Game {
     this.state.ambiguities = null;
     this.state.players_judged = [];
     this.state.players_judging = new Set();
+    this.state.judging_idle = false;
     this.state.end_judging = new Set();
     this.state.scores = null;
 
@@ -86,6 +90,11 @@ class Empathy extends Game {
     }
     this.answering_idle_timer = 0;
     this.answering_start_time_ms = 0;
+    if (this.judging_idle_timer) {
+      clearTimeout(this.judging_idle_timer);
+    }
+    this.judging_idle_timer = 0;
+    this.judging_start_time_ms = 0;
     this.equivalencies = {};
 
     this.broadcast_event_object('game-state', this.state);
@@ -200,10 +209,11 @@ class Empathy extends Game {
 
     if (this.answering_idle_timer) {
       clearTimeout(this.answering_idle_timer);
+      this.ansering_idle_timer = 0;
     }
     if (! this.state.answering_idle) {
       this.answering_idle_timer = setTimeout(() => {
-        this.state_answering_idle = true;
+        this.state.answering_idle = true;
         this.broadcast_event_object('answering-idle', true);
       }, PHASE_IDLE_TIMEOUT * 1000);
     }
@@ -251,6 +261,10 @@ class Empathy extends Game {
       return a.toLowerCase().localeCompare(b.toLowerCase());
     });
 
+    if (this.judging_start_time_ms === 0) {
+      this.judging_start_time_ms = Date.now();
+    }
+
     this.broadcast_event_object('ambiguities', this.state.ambiguities);
   }
 
@@ -305,13 +319,28 @@ class Empathy extends Game {
     this.state.players_judging.delete(player.name);
     this.state.players_judged.push(player.name);
 
-    /* And notify all players this this player has judged. */
+    /* And notify all players that this player has judged. */
     this.broadcast_event_object('player-judged', player.name);
 
+    /* If no players are left in the judging list then we don't need
+     * to wait for the judging_idle_timer to fire, because a person
+     * who isn't there obviously can't be judging. So we can broadcast
+     * the idle event right away. Note that we do this only if the
+     * judging phase has been going for a while to avoid the case of
+     * the first player being super fast and emptying the
+     * players_judging list before anyone else even got in.
+     */
+    if (this.state.players_judging.size === 0 &&
+        ((Date.now() - this.judging_start_time_ms) / 1000) > PHASE_MINIMUM_TIME)
+    {
+      this.broadcast_event_object('judging-idle', true);
+    }
+
     return { valid: true };
   }
 
   receive_judging(prompt_id, session_id) {
+
     const player = this.players_by_session[session_id];
     if (! player)
       return { valid: false, message: "Player not found" };
@@ -323,7 +352,18 @@ class Empathy extends Game {
     if (prompt !== this.state.active_prompt)
       return { valid: false, message: "Prompt no longer active" };
 
-    /* Notify all players this this player is actively judging. */
+    if (this.judging_idle_timer) {
+      clearTimeout(this.judging_idle_timer);
+      this.judging_idle_timer = 0;
+    }
+    if (! this.state.judging_idle) {
+      this.judging_idle_timer = setTimeout(() => {
+        this.state.judging_idle = true;
+        this.broadcast_event_object('judging-idle', true);
+      }, PHASE_IDLE_TIMEOUT * 1000);
+    }
+
+    /* Notify all players that this player is actively judging. */
     this.state.players_judging.add(player.name);
     this.broadcast_event_object('player-judging', player.name);