Consistently use null value to reset the ambiguities list

[empires-server] / empathy.js

diff --git a/empathy.js b/empathy.js
index eeb33c2c6be229e83155a622ee07e63be3212e9b..b7d01a0566c2d5b379db9ab90c3c77f4c8928bbd 100644 (file)
--- a/empathy.js
+++ b/empathy.js
@@ -11,6 +11,7 @@ class Empathy extends Game {
       active_prompt: null,
       players_answered: [],
       players_answering: new Set(),
+      answering_idle: false,
       end_answers: new Set(),
       ambiguities: null,
       players_judged: [],
@@ -19,6 +20,7 @@ class Empathy extends Game {
       scores: null
     };
     this.answers = [];
+    this.answering_idle_timer = 0;
     this.next_prompt_id = 1;
     this.equivalencies = {};
   }
@@ -51,8 +53,9 @@ class Empathy extends Game {
     this.state.active_prompt = null;
     this.state.players_answered = [];
     this.state.players_answering = new Set();
+    this.state.answering_idle = false;
     this.state.end_answers = new Set();
-    this.state.ambiguities = 0;
+    this.state.ambiguities = null;
     this.state.players_judged = [];
     this.state.players_judging = new Set();
     this.state.end_judging = new Set();
@@ -157,6 +160,16 @@ class Empathy extends Game {
     if (prompt !== this.state.active_prompt)
       return { valid: false, message: "Prompt no longer active" };
 
+    if (this.answering_idle_timer) {
+      clearTimeout(this.answering_idle_timer);
+    }
+    if (! this.state.answering_idle) {
+      this.answering_idle_timer = setTimeout(() => {
+        this.state_answering_idle = true;
+        this.broadcast_event_object('answering-idle', true);
+      }, 10 * 1000);
+    }
+
     /* Notify all players that this player is actively answering. */
     this.state.players_answering.add(player.name);
     this.broadcast_event_object('player-answering', player.name);
@@ -296,7 +309,7 @@ class Empathy extends Game {
   }
 
   canonize(word) {
-    return word.toLowerCase();
+    return word.trim().toLowerCase();
   }
 
   compute_scores() {
@@ -468,6 +481,11 @@ router.post('/answer/:prompt_id([0-9]+)', (request, response) => {
                                      request.session.id,
                                      request.body.answers);
   response.json(result);
+
+  /* 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)
+    game.perform_judging();
 });
 
 router.post('/answering/:prompt_id([0-9]+)', (request, response) => {
@@ -500,6 +518,11 @@ router.post('/judged/:prompt_id([0-9]+)', (request, response) => {
                                      request.session.id,
                                      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)
+    game.compute_scores();
 });
 
 router.post('/judging/:prompt_id([0-9]+)', (request, response) => {
@@ -527,6 +550,8 @@ router.post('/end-judging/:prompt_id([0-9]+)', (request, response) => {
 router.post('/reset', (request, response) => {
   const game = request.game;
   game.reset();
+
+  response.send('');
 });
 
 Empathy.meta = {