Merge branch 'zones' of ssh://cryps.gg:40022/~/cryps into zones

client/src/scenes/cryps.js

@@ -3,6 +3,7 @@ const Phaser = require('phaser');
 const Header = require('./header');
 const Menu = require('./menu');
 const Combat = require('./combat');
+const Missions = require('./missions');
 
 function renderCryps() {
     const config = {
@@ -35,6 +36,11 @@ function renderCryps() {
             if (!data || game.registry.get('inGame')) return false;
             return game.scene.add('Combat', Combat, true);
         }
+
+        if (key === 'zone') {
+            return game.scene.add('Missions', Missions, true, data);
+        }
+
         return true;
     }
 

client/src/scenes/menu.game.list.js

@@ -1,5 +1,4 @@
 const Phaser = require('phaser');
-const Missions = require('./missions');
 
 const {
     TEXT,
@@ -123,8 +122,8 @@ class MenuGameList extends Phaser.Scene {
         });
 
         zones.on('pointerdown', () => {
-            this.scene.add('Missions', Missions, true);
-            return ws.sendZoneCreate();
+            if (this.scene.get('Missions')) return false;
+            return ws.sendAccountZone();
         });
 
 

client/src/scenes/missions.js

@@ -15,8 +15,7 @@ class Missions extends Phaser.Scene {
         this.load.image('eye', 'https://labs.phaser.io/assets/particles/green-orb.png');
     }
 
-    create() {
-        const zone = this.registry.get('zone');
+    create(zone) {
         if (!zone) return false;
         console.log(zone);
 

client/src/socket.js

@@ -195,6 +195,7 @@ function createSocket(events) {
         console.log(res);
 
         // check for error and split into response type and data
+        if (res.err === 'no active zone') sendZoneCreate();
         if (res.err) return errorToast(res.err);
         const { method, params } = res;
         if (!handlers[method]) return errorToast(`${method} handler missing`);