X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=empathy.js;h=eeb33c2c6be229e83155a622ee07e63be3212e9b;hb=4d8b4a63e6e51296da5829dd91efd781125fd659;hp=eaf12bf8deb0a6b74d8358922643052da1afc7c2;hpb=54f57abe8bc6753da1c6b1663f1efcd178e33a75;p=lmno-server

diff --git a/empathy.js b/empathy.js
index eaf12bf..eeb33c2 100644
--- a/empathy.js
+++ b/empathy.js
@@ -135,13 +135,35 @@ class Empathy extends Game {
       answers: answers
     });
 
-    /* And notify all players that this player has answered. */
+    /* Update state (to be sent out to any future clients) */
+    this.state.players_answering.delete(player.name);
     this.state.players_answered.push(player.name);
+
+    /* And notify all players that this player has answered. */
     this.broadcast_event_object('player-answered', player.name);
 
     return { valid: true };
   }
 
+  receive_answering(prompt_id, session_id) {
+    const player = this.players_by_session[session_id];
+    if (! player)
+      return { valid: false, message: "Player not found" };
+
+    const prompt = this.state.prompts.find(p => p.id === prompt_id);
+    if (! prompt)
+      return { valid: false, message: "Prompt not found" };
+
+    if (prompt !== this.state.active_prompt)
+      return { valid: false, message: "Prompt no longer active" };
+
+    /* Notify all players that this player is actively answering. */
+    this.state.players_answering.add(player.name);
+    this.broadcast_event_object('player-answering', player.name);
+
+    return { valid: true };
+  }
+
   /* Returns true if vote toggled, false for player or prompt not found */
   toggle_end_answers(prompt_id, session_id) {
     const player = this.players_by_session[session_id];
@@ -178,7 +200,7 @@ class Empathy extends Game {
     this.broadcast_event_object('ambiguities', this.state.ambiguities);
   }
 
-  receive_judging(prompt_id, session_id, word_groups) {
+  receive_judged(prompt_id, session_id, word_groups) {
     const player = this.players_by_session[session_id];
     if (! player)
       return { valid: false, message: "Player not found" };
@@ -225,13 +247,35 @@ class Empathy extends Game {
       }
     }
 
-    /* And notify all players this this player has judged. */
+    /* Update state (to be sent out to any future clients) */
+    this.state.players_judging.delete(player.name);
     this.state.players_judged.push(player.name);
+
+    /* And notify all players this this player has judged. */
     this.broadcast_event_object('player-judged', player.name);
 
     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" };
+
+    const prompt = this.state.prompts.find(p => p.id === prompt_id);
+    if (! prompt)
+      return { valid: false, message: "Prompt not found" };
+
+    if (prompt !== this.state.active_prompt)
+      return { valid: false, message: "Prompt no longer active" };
+
+    /* Notify all players this this player is actively judging. */
+    this.state.players_judging.add(player.name);
+    this.broadcast_event_object('player-judging', player.name);
+
+    return { valid: true };
+  }
+
   /* Returns true if vote toggled, false for player or prompt not found */
   toggle_end_judging(prompt_id, session_id) {
     const player = this.players_by_session[session_id];
@@ -426,6 +470,15 @@ router.post('/answer/:prompt_id([0-9]+)', (request, response) => {
   response.json(result);
 });
 
+router.post('/answering/:prompt_id([0-9]+)', (request, response) => {
+  const game = request.game;
+  const prompt_id = parseInt(request.params.prompt_id, 10);
+
+  const result = game.receive_answering(prompt_id,
+                                        request.session.id);
+  response.json(result);
+});
+
 router.post('/end-answers/:prompt_id([0-9]+)', (request, response) => {
   const game = request.game;
   const prompt_id = parseInt(request.params.prompt_id, 10);
@@ -439,13 +492,22 @@ router.post('/end-answers/:prompt_id([0-9]+)', (request, response) => {
     game.perform_judging();
 });
 
+router.post('/judged/:prompt_id([0-9]+)', (request, response) => {
+  const game = request.game;
+  const prompt_id = parseInt(request.params.prompt_id, 10);
+
+  const result = game.receive_judged(prompt_id,
+                                     request.session.id,
+                                     request.body.word_groups);
+  response.json(result);
+});
+
 router.post('/judging/:prompt_id([0-9]+)', (request, response) => {
   const game = request.game;
   const prompt_id = parseInt(request.params.prompt_id, 10);
 
   const result = game.receive_judging(prompt_id,
-                                      request.session.id,
-                                      request.body.word_groups);
+                                      request.session.id);
   response.json(result);
 });
 
@@ -458,7 +520,7 @@ router.post('/end-judging/:prompt_id([0-9]+)', (request, response) => {
   else
     response.sendStatus(404);
 
-  if (game.state.end_judging.size > (game.state.players_judged.length / 2))
+  if (game.state.end_judging.size > (game.state.players_answered.length / 2))
     game.compute_scores();
 });