Consistently use null value to reset the ambiguities list

[empires-server] / empathy.js

diff --git a/empathy.js b/empathy.js
index 79a0c441218a33b6b3b9219b12ca3d67d18fc8cf..b7d01a0566c2d5b379db9ab90c3c77f4c8928bbd 100644 (file)
--- a/empathy.js
+++ b/empathy.js
@@ -55,7 +55,7 @@ class Empathy extends Game {
     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();
@@ -167,7 +167,7 @@ class Empathy extends Game {
       this.answering_idle_timer = setTimeout(() => {
         this.state_answering_idle = true;
         this.broadcast_event_object('answering-idle', true);
-      }, 30 * 1000);
+      }, 10 * 1000);
     }
 
     /* Notify all players that this player is actively answering. */
@@ -309,7 +309,7 @@ class Empathy extends Game {
   }
 
   canonize(word) {
-    return word.toLowerCase();
+    return word.trim().toLowerCase();
   }
 
   compute_scores() {
@@ -481,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) => {
@@ -513,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) => {
@@ -540,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 = {