empathy: Don't allow a prompt with 0 items

[empires-server] / empathy.js

diff --git a/empathy.js b/empathy.js
index 50d18d59dce942115f19d5852df191c49ae601d3..c1d150f354d9bb4207f985b7da65540d4caa8ccd 100644 (file)
--- a/empathy.js
+++ b/empathy.js
@@ -19,7 +19,7 @@ const PHASE_MINIMUM_TIME = 30;
  *
  * Specified in seconds
  */
-const PHASE_IDLE_TIMEOUT = 30;
+const PHASE_IDLE_TIMEOUT = 15;
 
 class Empathy extends Game {
   constructor(id) {
@@ -115,11 +115,19 @@ class Empathy extends Game {
   }
 
   add_prompt(items, prompt_string) {
-    if (items > MAX_PROMPT_ITEMS)
+    if (items > MAX_PROMPT_ITEMS) {
       return {
         valid: false,
         message: `Maximum number of items is ${MAX_PROMPT_ITEMS}`
       };
+    }
+
+    if (items < 1) {
+      return {
+        valid: false,
+        message: "Category must require at least one item"
+      };
+    }
 
     const prompt = new Prompt(this.next_prompt_id, items, prompt_string);
     this.next_prompt_id++;
@@ -598,10 +606,14 @@ class Prompt {
   }
 
   toggle_vote_against(player_name) {
-    if (this.votes_against.find(v => v === player_name))
+    if (this.votes_against.find(v => v === player_name)) {
       this.votes_against = this.votes_against.filter(v => v !== player_name);
-    else
+    } else {
       this.votes_against.push(player_name);
+      /* When voting against, we also remove any vote _for_ the same
+       * prompt. */
+      this.votes = this.votes.filter(v => v !== player_name);
+    }
   }
 }