yolkbot 0.1.0-alpha.57 → 0.1.0-alpha.59

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "yolkbot",
     "description": "create a shell shockers (self) bot in under 10 lines.",
-    "version": "0.1.0-alpha.57",
+    "version": "0.1.0-alpha.59",
     "keywords": [
         "shell shockers",
         "shellshock.io",

package/src/bot.js

@@ -58,7 +58,7 @@ export class Bot {
         this.proxy = params.proxy || '';
 
         this.autoUpdate = params.doUpdate || true;
-        this.updateInterval = params.updateInterval || 11;
+        this.updateInterval = params.updateInterval || 16.5;
 
         this._hooks = {};
         this._globalHooks = [];
@@ -228,19 +228,6 @@ export class Bot {
         this._dispatches.push(disp);
     }
 
-    #drain() {
-        for (let i = 0; i < this._dispatches.length; i++) {
-            const disp = this._dispatches[i];
-            if (disp.check(this)) {
-                disp.execute(this);
-                this._dispatches.splice(i, 1);
-                return; // only 1 dispatch per update
-            } else {
-                // console.log("Dispatch failed", this.state.joinedGame, this.lastChatTime)
-            }
-        }
-    }
-
     async createAccount(email, pass) {
         this.account.email = email;
         this.account.password = pass;
@@ -605,10 +592,20 @@ export class Bot {
         while (this._packetQueue.length > 0) this.#handlePacket(this._packetQueue.shift());
 
         // process dispatches
-        if (this._dispatches.length > 0) this.#drain();
+        if (this._dispatches.length > 0) {
+            for (let i = 0; i < this._dispatches.length; i++) {
+                const disp = this._dispatches[i];
+                if (disp.check(this)) {
+                    disp.execute(this);
+                    this._dispatches.splice(i, 1);
+                    break; // only 1 dispatch per update
+                }
+            }
+        }
 
         // process syncMe
-        if (Date.now() - this.lastUpdateTime >= 50) {
+        const now = Date.now();
+        if (now - this.lastUpdateTime >= 50) {
             this.#emit('tick');
 
             // Send out update packet
@@ -625,7 +622,7 @@ export class Bot {
             }
             out.send(this.game.socket);
 
-            this.lastUpdateTime = Date.now();
+            this.lastUpdateTime = now;
             this.state.shotsFired = 0;
         }
 
@@ -888,7 +885,7 @@ export class Bot {
         }
     }
 
-    #processExternalSyncPacket() {
+    #processSyncThemPacket() {
         const id = CommIn.unPackInt8U();
         const x = CommIn.unPackFloat();
         const y = CommIn.unPackFloat();
@@ -1513,7 +1510,7 @@ export class Bot {
 
             switch (cmd) {
                 case CommCode.syncThem:
-                    this.#processExternalSyncPacket(packet);
+                    this.#processSyncThemPacket(packet);
                     break;
 
                 case CommCode.fire:

package/src/pathing/mapnode.js

@@ -20,49 +20,51 @@ class NodeList {
     constructor(raw) {
         const now = Date.now();
         this.list = [];
-
-        const addedPositions = [];
+        const addedPositions = new Set();
 
         for (const meshName of Object.keys(raw.data)) {
             for (const nodeData of raw.data[meshName]) {
-                addedPositions.push(nodeData);
+                addedPositions.add(`${nodeData.x},${nodeData.y},${nodeData.z}`);
                 this.add(new MapNode(meshName, nodeData));
             }
         }
 
-        // data doesn't include air, but we need to include them anyway 
-        // addedPositions stores all the blocks with nodes - create a node for every block not in there.
-        // width/height/depth are given by raw.width/height/depth
         for (let x = 0; x < raw.width; x++) {
             for (let y = 0; y < raw.height; y++) {
                 for (let z = 0; z < raw.depth; z++) {
-                    if (!addedPositions.find(node => node.x == x && node.y == y && node.z == z)) {
-                        this.add(new MapNode('SPECIAL.fuckitweball.none', { x: x, y: y, z: z }));
+                    const posKey = `${x},${y},${z}`;
+                    if (!addedPositions.has(posKey)) {
+                        this.add(new MapNode('SPECIAL.__yolkbot_air__.none', { x: x, y: y, z: z }));
                     }
                 }
             }
         }
 
+        const nodeMap = new Map();
         for (const node of this.list) {
-            // add all nodes around it
-            for (const other of this.list) {
-                const dx = Math.abs(node.x - other.x);
-                const dy = Math.abs(node.y - other.y);
-                const dz = Math.abs(node.z - other.z);
-                if (dx > 1 || dy > 1 || dz > 1) {
-                    continue;
-                }
-                if (other == this) {
-                    continue;
-                }
-                if (node.canLink(other, this)) {
-                    node.addLink(other);
+            nodeMap.set(node.positionStr(), node);
+        }
+
+        for (const node of this.list) {
+            const neighbors = [
+                { x: node.x + 1, y: node.y, z: node.z },
+                { x: node.x - 1, y: node.y, z: node.z },
+                { x: node.x, y: node.y + 1, z: node.z },
+                { x: node.x, y: node.y - 1, z: node.z },
+                { x: node.x, y: node.y, z: node.z + 1 },
+                { x: node.x, y: node.y, z: node.z - 1 }
+            ];
+
+            for (const neighborPos of neighbors) {
+                const neighborKey = `${neighborPos.x},${neighborPos.y},${neighborPos.z}`;
+                const neighborNode = nodeMap.get(neighborKey);
+                if (neighborNode && node.canLink(neighborNode, this)) {
+                    node.addLink(neighborNode);
                 }
             }
         }
 
         console.log(`NodeList created in ${Date.now() - now}ms`);
-
     }
 
     add(node) {