Add a ready bit to client state, and render nothing before ready

[lmno.games] / empathy / empathy.jsx

diff --git a/empathy/empathy.jsx b/empathy/empathy.jsx
index 0c1fccfe0b60e1a399c2d2bf2c27082c46c1c5eb..c216e4921b9b5d68d8731defddc353125a010d68 100644 (file)
--- a/empathy/empathy.jsx
+++ b/empathy/empathy.jsx
@@ -45,6 +45,12 @@ events.addEventListener("player-enter", event => {
   window.game.set_other_player_info(info);
 });
 
   window.game.set_other_player_info(info);
 });
 

+events.addEventListener("player-exit", event => {
+  const info = JSON.parse(event.data);
+
+  window.game.remove_player(info);
+});
+

 events.addEventListener("player-update", event => {
   const info = JSON.parse(event.data);
 
 events.addEventListener("player-update", event => {
   const info = JSON.parse(event.data);
 


@@ -82,6 +88,8 @@ events.addEventListener("game-state", event => {
   window.game.set_end_judging(state.end_judging);
 
   window.game.set_scores(state.scores);
   window.game.set_end_judging(state.end_judging);
 
   window.game.set_scores(state.scores);

+
+  window.game.state_ready();

 });
 
 events.addEventListener("prompt", event => {
 });
 
 events.addEventListener("prompt", event => {


@@ -798,7 +806,8 @@ class Game extends React.PureComponent {
       players_judging: {},
       judging_idle: false,
       end_judging_votes: new Set(),
       players_judging: {},
       judging_idle: false,
       end_judging_votes: new Set(),

-      scores: null
+      scores: null,
+      ready: false

     };
   }
 
     };
   }
 


@@ -827,6 +836,12 @@ class Game extends React.PureComponent {
     });
   }
 
     });
   }
 

+  remove_player(info) {
+    this.setState({
+      other_players: this.state.other_players.filter(o => o.id !== info.id)
+    });
+  }
+

   reset_game_state() {
     this.setState({
       prompts: [],
   reset_game_state() {
     this.setState({
       prompts: [],


@@ -840,7 +855,8 @@ class Game extends React.PureComponent {
       players_judging: {},
       judging_idle: false,
       end_judging_votes: new Set(),
       players_judging: {},
       judging_idle: false,
       end_judging_votes: new Set(),

-      scores: null
+      scores: null,
+      ready: false

     });
   }
 
     });
   }
 


@@ -970,7 +986,6 @@ class Game extends React.PureComponent {
   }
 
   set_judging_idle(value) {
   }
 
   set_judging_idle(value) {

-    console.log("Setting judging idle to " + value);

     this.setState({
       judging_idle: value
     });
     this.setState({
       judging_idle: value
     });


@@ -1000,6 +1015,12 @@ class Game extends React.PureComponent {
     });
   }
 
     });
   }
 

+  state_ready() {
+    this.setState({
+      ready: true
+    });
+  }
+

   render() {
     const state = this.state;
     const players_total = 1 + state.other_players.length;
   render() {
     const state = this.state;
     const players_total = 1 + state.other_players.length;


@@ -1060,6 +1081,9 @@ class Game extends React.PureComponent {
              />;
     }
 
              />;
     }
 

+    if (! state.ready)
+      return null;
+

     return [
       <GameInfo
         key="game-info"
     return [
       <GameInfo
         key="game-info"