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

client/assets/c1.svg

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+              "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+
+<svg xmlns="http://www.w3.org/2000/svg"
+     width="13.8889in" height="13.8889in"
+     viewBox="0 0 1000 1000">
+  <path id="Unnamed"
+        fill="none" stroke="black" stroke-width="1"
+        d="M 250.00,-1.00
+           C 250.00,-1.00 0.00,300.00 0.00,300.00
+             0.00,300.00 1000.00,300.00 1000.00,300.00
+             1000.00,300.00 750.00,2.00 750.00,2.00M 500.00,300.00
+           C 500.00,300.00 500.00,700.00 500.00,700.00M 250.00,1000.00
+           C 250.00,1000.00 0.00,700.00 0.00,700.00
+             0.00,700.00 999.00,700.00 1000.00,700.00
+             1001.00,700.00 750.00,1000.00 750.00,1000.00" />
+</svg>

client/assets/c2.svg

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+              "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+
+<svg xmlns="http://www.w3.org/2000/svg"
+     width="13.8889in" height="13.8889in"
+     viewBox="0 0 1000 1000">
+  <path id="c2"
+        fill="none" stroke="black" stroke-width="1"
+        d="M 250.00,-1.00
+           C 250.00,-1.00 250.00,300.00 250.00,300.00
+             250.00,300.00 750.00,299.00 750.00,299.00
+             750.00,299.00 750.00,2.00 750.00,2.00M 500.00,100.00
+           C 500.00,100.00 500.00,300.00 500.00,300.00
+             500.00,300.00 500.00,700.00 500.00,700.00M 250.00,1000.00
+           C 250.00,1000.00 500.00,700.00 500.00,700.00
+             500.00,700.00 750.00,1000.00 750.00,1000.00M 750.00,700.00
+           C 750.00,700.00 500.00,400.00 500.00,400.00
+             500.00,400.00 249.00,699.00 249.00,699.00" />
+</svg>

client/assets/c3.svg

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+              "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+
+<svg xmlns="http://www.w3.org/2000/svg"
+     width="13.8889in" height="13.8889in"
+     viewBox="0 0 1000 1000">
+  <path id="c3"
+        fill="none" stroke="black" stroke-width="1"
+        d="M 250.00,-1.00
+           C 250.00,-1.00 250.00,300.00 250.00,300.00
+             250.00,300.00 750.00,299.00 750.00,299.00
+             750.00,299.00 750.00,2.00 750.00,2.00M 500.00,300.00
+           C 500.00,300.00 500.00,700.00 500.00,700.00M 250.00,1000.00
+           C 250.00,1000.00 250.00,700.00 250.00,700.00
+             250.00,700.00 500.00,700.00 500.00,700.00
+             500.00,700.00 750.00,700.00 750.00,700.00
+             750.00,700.00 750.00,1000.00 750.00,1000.00M 250.00,500.00
+           C 250.00,500.00 750.00,500.00 750.00,500.00" />
+</svg>

client/src/scenes/menu.navigation.js

@@ -67,7 +67,6 @@ class MenuNavigation extends Phaser.Scene {
             pveText.destroy();
             pvp.destroy();
             pvpText.destroy();
-            ws.sendGameJoinableList();
         });
 
         const cancel = this.add

client/src/socket.js

@@ -77,10 +77,6 @@ function createSocket(events) {
         send({ method: 'game_join', params: { game_id: gameId, cryp_ids: crypIds } });
     }
 
-    function sendGameJoinableList() {
-        send({ method: 'game_joinable_list', params: { } });
-    }
-
     function sendSpecForget(id, spec) {
         send({ method: 'cryp_unspec', params: { id, spec } });
     }
@@ -105,18 +101,10 @@ function createSocket(events) {
         send({ method: 'player_vbox_combine', params: { instance_id: instanceId, indices } });
     }
 
-
     function sendVboxDrop(instanceId, index) {
         send({ method: 'player_vbox_drop', params: { instance_id: instanceId, index } });
     }
 
-
-    function sendPressR() {
-        send({ method: 'press_r', params: { } });
-    }
-
-    window.pressR = sendPressR;
-
     function sendGameSkill(gameId, crypId, targetCrypId, skill) {
         send({
             method: 'game_skill',
@@ -154,7 +142,6 @@ function createSocket(events) {
         account = login;
         events.setAccount(login);
         sendAccountCryps();
-        // sendGameJoinableList();
     }
 
     function accountCryps(response) {
@@ -167,11 +154,6 @@ function createSocket(events) {
         events.setGame(game);
     }
 
-    function gameJoinableList(response) {
-        const [structName, gameList] = response;
-        events.setGameList(gameList);
-    }
-
     function crypSpawn(response) {
         const [structName, cryp] = response;
     }
@@ -202,7 +184,6 @@ function createSocket(events) {
         cryp_learn: () => true,
         game_pve: gamePve,
         game_state: gameState,
-        game_joinable_list: gameJoinableList,
         account_login: accountLogin,
         account_create: accountLogin,
         account_cryps: accountCryps,
@@ -290,7 +271,6 @@ function createSocket(events) {
         sendGamePve,
         sendGamePvp,
         sendGameJoin,
-        sendGameJoinableList,
         sendGameSkill,
         sendGameTarget,
         sendCrypSpawn,