yolkbot 0.1.0-alpha.5 → 0.1.0-alpha.50

package/src/constants/maps.js

@@ -23,7 +23,7 @@ export const Maps = [
             "Spatula": true,
             "King": true
         },
-        "availability": "private",
+        "availability": "both",
         "numPlayers": "14"
     },
     {
@@ -88,7 +88,7 @@ export const Maps = [
             "Spatula": true,
             "King": true
         },
-        "availability": "private",
+        "availability": "both",
         "numPlayers": "14"
     },
     {
@@ -166,7 +166,7 @@ export const Maps = [
             "Spatula": true,
             "King": true
         },
-        "availability": "private",
+        "availability": "both",
         "numPlayers": "18"
     },
     {
@@ -322,7 +322,7 @@ export const Maps = [
             "Spatula": true,
             "King": true
         },
-        "availability": "both",
+        "availability": "private",
         "numPlayers": "16"
     },
     {
@@ -390,6 +390,19 @@ export const Maps = [
         "availability": "private",
         "numPlayers": "18"
     },
+    {
+        "filename": "foundation",
+        "hash": "1s6kfr5u037",
+        "name": "Foundation",
+        "modes": {
+            "FFA": true,
+            "Teams": true,
+            "Spatula": true,
+            "King": true
+        },
+        "availability": "both",
+        "numPlayers": "18"
+    },
     {
         "filename": "fourQuarters",
         "hash": "1a0w7vbz8is",
@@ -517,7 +530,7 @@ export const Maps = [
             "Spatula": true,
             "King": true
         },
-        "availability": "both",
+        "availability": "private",
         "numPlayers": "18"
     },
     {
@@ -559,6 +572,19 @@ export const Maps = [
         "availability": "both",
         "numPlayers": "18"
     },
+    {
+        "filename": "metamorphosis",
+        "hash": "hlpma5zbhi",
+        "name": "Metamorphosis",
+        "modes": {
+            "FFA": true,
+            "Teams": true,
+            "Spatula": true,
+            "King": false
+        },
+        "availability": "both",
+        "numPlayers": "14"
+    },
     {
         "filename": "moonbase",
         "hash": "1yzocf1mex3",
@@ -595,7 +621,7 @@ export const Maps = [
             "Spatula": true,
             "King": true
         },
-        "availability": "both",
+        "availability": "private",
         "numPlayers": "18"
     },
     {
@@ -738,7 +764,7 @@ export const Maps = [
             "Spatula": true,
             "King": true
         },
-        "availability": "private",
+        "availability": "both",
         "numPlayers": "14"
     },
     {
@@ -790,7 +816,7 @@ export const Maps = [
             "Spatula": true,
             "King": true
         },
-        "availability": "private",
+        "availability": "both",
         "numPlayers": "16"
     },
     {
@@ -803,7 +829,7 @@ export const Maps = [
             "Spatula": true,
             "King": true
         },
-        "availability": "private",
+        "availability": "both",
         "numPlayers": "18"
     },
     {
@@ -868,7 +894,7 @@ export const Maps = [
             "Spatula": true,
             "King": true
         },
-        "availability": "both",
+        "availability": "private",
         "numPlayers": "12"
     },
     {
@@ -881,7 +907,7 @@ export const Maps = [
             "Spatula": true,
             "King": true
         },
-        "availability": "private",
+        "availability": "both",
         "numPlayers": "18"
     },
     {
@@ -920,7 +946,7 @@ export const Maps = [
             "Spatula": true,
             "King": true
         },
-        "availability": "both",
+        "availability": "private",
         "numPlayers": "18"
     },
     {
@@ -988,6 +1014,19 @@ export const Maps = [
         "availability": "private",
         "numPlayers": "18"
     },
+    {
+        "filename": "uncovered",
+        "hash": "bxrd0zdvtn",
+        "name": "Uncovered",
+        "modes": {
+            "FFA": true,
+            "Teams": true,
+            "Spatula": true,
+            "King": true
+        },
+        "availability": "both",
+        "numPlayers": "12"
+    },
     {
         "filename": "vert",
         "hash": "25a9ikled77",

package/src/dispatches/BootPlayerDispatch.js

@@ -10,7 +10,7 @@ export class BootPlayerDispatch {
     }
 
     execute(bot) {
-        new packet.BootPacket(this.uniqueId).execute(bot.gameSocket);
+        new packet.BootPacket(this.uniqueId).execute(bot.game.socket);
     }
 }
 

package/src/dispatches/ChatDispatch.js

@@ -17,7 +17,7 @@ export class ChatDispatch {
     }
 
     execute(bot) {
-        new packet.ChatPacket(this.msg).execute(bot.gameSocket);
+        new packet.ChatPacket(this.msg).execute(bot.game.socket);
         bot.lastChatTime = Date.now();
     }
 }

package/src/dispatches/GameOptionsDispatch.js

@@ -21,7 +21,7 @@ export class GameOptionsDispatch {
     }
 
     execute(bot) {
-        new packet.GameOptionsPacket(bot.game.options).execute(bot.gameSocket);
+        new packet.GameOptionsPacket(bot.game.options).execute(bot.game.socket);
     }
 }
 

package/src/dispatches/GoToAmmoDispatch.js

@@ -0,0 +1,44 @@
+import AStar from '../pathing/astar.js';
+
+export class GoToAmmoDispatch {
+    check(bot) {
+        return bot.me.playing && bot.game.collectables[0].length && bot.intents.includes(bot.Intents.PATHFINDING);
+    }
+
+    execute(bot) {
+        this.pather = new AStar(bot.pathing.nodeList);
+
+        let minDistance = 200;
+        let closestAmmo = null;
+
+        for (const ammo of bot.game.collectables[0]) {
+            const dx = ammo.x - bot.me.position.x;
+            const dy = ammo.y - bot.me.position.y;
+            const dz = ammo.z - bot.me.position.z;
+
+            const distance = Math.sqrt(dx * dx + dy * dy + dz * dz);
+
+            if (distance < minDistance) {
+                minDistance = distance;
+                closestAmmo = ammo;
+            }
+        }
+
+        const position = Object.entries(bot.me.position).map(entry => Math.floor(entry[1]));
+        const targetPos = Object.entries(closestAmmo).map(entry => Math.floor(entry[1]));
+
+        const myNode = bot.pathing.nodeList.at(...position);
+        const targetNode = bot.pathing.nodeList.at(...targetPos);
+
+        bot.pathing.activePath = this.pather.path(myNode, targetNode);
+
+        if (!bot.pathing.activePath) return console.error('no path found');
+        if (bot.pathing.activePath.length < 2) return console.error('path too short');
+
+        bot.pathing.followingPath = true;
+        bot.pathing.activeNode = bot.pathing.activePath[1];
+        bot.pathing.activeNodeIdx = 1;
+    }
+}
+
+export default GoToAmmoDispatch;

package/src/dispatches/GoToCoopDispatch.js

@@ -0,0 +1,44 @@
+import AStar from '../pathing/astar.js';
+
+export class GoToCoopDispatch {
+    check(bot) {
+        return bot.me.playing && bot.game.zoneNumber && bot.game.activeZone && bot.intents.includes(bot.Intents.PATHFINDING);
+    }
+
+    execute(bot) {
+        this.pather = new AStar(bot.pathing.nodeList);
+
+        let minDistance = 200;
+        let closestZone = null;
+
+        for (const zone of bot.game.activeZone) {
+            const dx = zone.x - bot.me.position.x;
+            const dy = zone.y - bot.me.position.y;
+            const dz = zone.z - bot.me.position.z;
+
+            const distance = Math.sqrt(dx * dx + dy * dy + dz * dz);
+
+            if (distance < minDistance) {
+                minDistance = distance;
+                closestZone = zone;
+            }
+        }
+
+        const position = Object.entries(bot.me.position).map(entry => Math.floor(entry[1]));
+        const targetPos = Object.entries(closestZone).map(entry => Math.floor(entry[1]));
+
+        const myNode = bot.pathing.nodeList.at(...position);
+        const targetNode = bot.pathing.nodeList.at(...targetPos);
+
+        bot.pathing.activePath = this.pather.path(myNode, targetNode);
+
+        if (!bot.pathing.activePath) return console.error('no path found');
+        if (bot.pathing.activePath.length < 2) return console.error('path too short');
+
+        bot.pathing.followingPath = true;
+        bot.pathing.activeNode = bot.pathing.activePath[1];
+        bot.pathing.activeNodeIdx = 1;
+    }
+}
+
+export default GoToCoopDispatch;

package/src/dispatches/GoToGrenadeDispatch.js

@@ -0,0 +1,44 @@
+import AStar from '../pathing/astar.js';
+
+export class GoToGrenadeDispatch {
+    check(bot) {
+        return bot.me.playing && bot.game.collectables[1].length && bot.intents.includes(bot.Intents.PATHFINDING);
+    }
+
+    execute(bot) {
+        this.pather = new AStar(bot.pathing.nodeList);
+
+        let minDistance = 200;
+        let closestGrenade = null;
+
+        for (const grenade of bot.game.collectables[1]) {
+            const dx = grenade.x - bot.me.position.x;
+            const dy = grenade.y - bot.me.position.y;
+            const dz = grenade.z - bot.me.position.z;
+
+            const distance = Math.sqrt(dx * dx + dy * dy + dz * dz);
+
+            if (distance < minDistance) {
+                minDistance = distance;
+                closestGrenade = grenade;
+            }
+        }
+
+        const position = Object.entries(bot.me.position).map(entry => Math.floor(entry[1]));
+        const targetPos = Object.entries(closestGrenade).map(entry => Math.floor(entry[1]));
+
+        const myNode = bot.pathing.nodeList.at(...position);
+        const targetNode = bot.pathing.nodeList.at(...targetPos);
+
+        bot.pathing.activePath = this.pather.path(myNode, targetNode);
+
+        if (!bot.pathing.activePath) return console.error('no path found');
+        if (bot.pathing.activePath.length < 2) return console.error('path too short');
+
+        bot.pathing.followingPath = true;
+        bot.pathing.activeNode = bot.pathing.activePath[1];
+        bot.pathing.activeNodeIdx = 1;
+    }
+}
+
+export default GoToGrenadeDispatch;

package/src/dispatches/GoToPlayerDispatch.js

@@ -6,7 +6,11 @@ export class GoToPlayerDispatch {
     }
 
     check(bot) {
-        return bot.me.playing && this.target && this.target.playing && this.target.position && !bot.disablePathing;
+        return bot.me.playing &&
+            this.target &&
+            this.target.playing &&
+            this.target.position &&
+            bot.intents.includes(bot.Intents.PATHFINDING);
     }
 
     execute(bot) {

package/src/dispatches/GoToSpatulaDispatch.js

@@ -2,7 +2,11 @@ import AStar from '../pathing/astar.js';
 
 export class GoToSpatulaDispatch {
     check(bot) {
-        return bot.me.playing && !bot.disablePathing && bot.game.spatula && bot.game.spatula.coords && bot.game.spatula.coords.x;
+        return bot.me.playing &&
+            bot.game.spatula &&
+            bot.game.spatula.coords &&
+            bot.game.spatula.coords.x &&
+            bot.intents.includes(bot.Intents.PATHFINDING);
     }
 
     execute(bot) {

package/src/dispatches/MeleeDispatch.js

@@ -6,7 +6,7 @@ export class MeleeDispatch {
     }
 
     execute(bot) {
-        new packet.MeleePacket().execute(bot.gameSocket);
+        new packet.MeleePacket().execute(bot.game.socket);
         bot.usingMelee = true;
 
         // gameloop every 33.33 (repeating) ms, 17 ticks, so 566.61 is the closest you get

package/src/dispatches/PauseDispatch.js

@@ -6,7 +6,7 @@ export class PauseDispatch {
     }
 
     execute(bot) {
-        new packet.PausePacket().execute(bot.gameSocket);
+        new packet.PausePacket().execute(bot.game.socket);
         setTimeout(() => bot.me.playing = false, 3000); 
     }
 }

package/src/dispatches/ReloadDispatch.js

@@ -6,7 +6,7 @@ export class ReloadDispatch {
     }
 
     execute(bot) {
-        new packet.ReloadPacket().execute(bot.gameSocket);
+        new packet.ReloadPacket().execute(bot.game.socket);
 
         bot.processReloadPacket(bot.me.id, true);
 

package/src/dispatches/ReportPlayerDispatch.js

@@ -39,7 +39,7 @@ export class ReportPlayerDispatch {
 
         if (!target) throw new Error('target player for ReportPlayerDispatch not found')
 
-        new packet.ReportPacket(target, this.reasonInt).execute(bot.gameSocket);
+        new packet.ReportPacket(target, this.reasonInt).execute(bot.game.socket);
     }
 }
 

package/src/dispatches/SaveLoadoutDispatch.js

@@ -90,43 +90,20 @@ export class SaveLoadoutDispatch {
 
         saveLoadout.then(() => {
             if (bot.state.joinedGame)
-                new packet.ChangeCharacterPacket(this.changes?.classIdx || bot.me.selectedGun).execute(bot.gameSocket);
+                new packet.ChangeCharacterPacket(this.changes?.classIdx || bot.me.selectedGun).execute(bot.game.socket);
+
+            const findCosmetics = this.intents.includes(this.Intents.COSMETIC_DATA);
 
             // apply changes to the bot
             Object.entries(this.changes).forEach(([changeKey, changeValue]) => {
-                switch (changeKey) {
-                    case 'classIdx':
-                        bot.me.selectedGun = changeValue;
-                        break;
-
-                    case 'hatId':
-                        bot.me.character.hat = findItemById(changeValue);
-                        break;
-
-                    case 'stampId':
-                        bot.me.character.stamp = findItemById(changeValue);
-                        break;
-
-                    case 'grenadeId':
-                        bot.me.character.grenade = findItemById(changeValue);
-                        break;
-
-                    case 'meleeId':
-                        bot.me.character.melee = findItemById(changeValue);
-                        break;
-
-                    case 'colorIdx':
-                        bot.me.character.eggColor = changeValue;
-                        break;
-
-                    case 'primaryId':
-                        bot.me.character.primaryGun = findItemById(changeValue[bot.me.selectedGun]);
-                        break;
-
-                    case 'secondaryId':
-                        bot.me.character.secondaryGun = findItemById(changeValue[bot.me.selectedGun]);
-                        break;
-                }
+                if (changeKey === 'classIdx') bot.me.selectedGun = changeValue;
+                else if (changeKey === 'hatId') bot.me.character.hat = findCosmetics ? findItemById(changeValue) : changeValue;
+                else if (changeKey === 'stampId') bot.me.character.stamp = findCosmetics ? findItemById(changeValue) : changeValue;
+                else if (changeKey === 'grenadeId') bot.me.character.grenade = findCosmetics ? findItemById(changeValue) : changeValue;
+                else if (changeKey === 'meleeId') bot.me.character.melee = findCosmetics ? findItemById(changeValue) : changeValue;
+                else if (changeKey === 'colorIdx') bot.me.character.eggColor = changeValue;
+                else if (changeKey === 'primaryId') bot.me.character.primaryGun = findItemById(changeValue[bot.me.selectedGun]);
+                else if (changeKey === 'secondaryId') bot.me.character.secondaryGun = findCosmetics ? findItemById(changeValue[bot.me.selectedGun]) : changeValue;
             })
         })
     }

package/src/dispatches/SpawnDispatch.js

@@ -8,7 +8,7 @@ export class SpawnDispatch {
     }
 
     execute(bot) {
-        new packet.RespawnPacket().execute(bot.gameSocket);
+        new packet.RespawnPacket().execute(bot.game.socket);
 
         bot.lastSpawnedTime = Date.now();
         bot.me.playing = true;

package/src/dispatches/SwapWeaponDispatch.js

@@ -7,7 +7,7 @@ export class SwapWeaponDispatch {
 
     execute(bot) {
         bot.me.activeGun = +!bot.me.activeGun;
-        new packet.SwapWeaponPacket(bot.me.activeGun).execute(bot.gameSocket);
+        new packet.SwapWeaponPacket(bot.me.activeGun).execute(bot.game.socket);
     }
 }
 

package/src/dispatches/SwitchTeamDispatch.js

@@ -24,7 +24,7 @@ export class SwitchTeamDispatch {
     }
 
     execute(bot) {
-        new packet.TeamSwitchingTraitorPacket().execute(bot.gameSocket);
+        new packet.TeamSwitchingTraitorPacket().execute(bot.game.socket);
     }
 }
 

package/src/dispatches/ThrowGrenadeDispatch.js

@@ -15,7 +15,7 @@ export class ThrowGrenadeDispatch {
     }
 
     execute(bot) {
-        new packet.ThrowGrenadePacket(this.power).execute(bot.gameSocket);
+        new packet.ThrowGrenadePacket(this.power).execute(bot.game.socket);
     }
 }
 

package/src/dispatches/index.js

@@ -2,6 +2,9 @@ import BootPlayerDispatch from './BootPlayerDispatch.js';
 import ChatDispatch from './ChatDispatch.js';
 import FireDispatch from './FireDispatch.js';
 import GameOptionsDispatch from './GameOptionsDispatch.js';
+import GoToAmmoDispatch from './GoToAmmoDispatch.js';
+import GoToCoopDispatch from './GoToCoopDispatch.js';
+import GoToGrenadeDispatch from './GoToGrenadeDispatch.js';
 import GoToPlayerDispatch from './GoToPlayerDispatch.js';
 import GoToSpatulaDispatch from './GoToSpatulaDispatch.js';
 import LookAtDispatch from './LookAtDispatch.js';
@@ -15,12 +18,16 @@ import SaveLoadoutDispatch from './SaveLoadoutDispatch.js';
 import SpawnDispatch from './SpawnDispatch.js';
 import SwapWeaponDispatch from './SwapWeaponDispatch.js';
 import SwitchTeamDispatch from './SwitchTeamDispatch.js';
+import ThrowGrenadeDispatch from './ThrowGrenadeDispatch.js';
 
 export {
     BootPlayerDispatch,
     ChatDispatch,
     FireDispatch,
     GameOptionsDispatch,
+    GoToAmmoDispatch,
+    GoToCoopDispatch,
+    GoToGrenadeDispatch,
     GoToPlayerDispatch,
     GoToSpatulaDispatch,
     LookAtDispatch,
@@ -33,7 +40,8 @@ export {
     SaveLoadoutDispatch,
     SpawnDispatch,
     SwapWeaponDispatch,
-    SwitchTeamDispatch
+    SwitchTeamDispatch,
+    ThrowGrenadeDispatch
 }
 
 export default {
@@ -41,6 +49,9 @@ export default {
     ChatDispatch,
     FireDispatch,
     GameOptionsDispatch,
+    GoToAmmoDispatch,
+    GoToCoopDispatch,
+    GoToGrenadeDispatch,
     GoToPlayerDispatch,
     GoToSpatulaDispatch,
     LookAtDispatch,
@@ -53,5 +64,6 @@ export default {
     SaveLoadoutDispatch,
     SpawnDispatch,
     SwapWeaponDispatch,
-    SwitchTeamDispatch
+    SwitchTeamDispatch,
+    ThrowGrenadeDispatch
 }

package/src/matchmaker.js

@@ -33,8 +33,17 @@ export class Matchmaker {
         this.#createSocket(params.instance);
     }
 
-    #createSocket(instance) {
-        this.ws = new yolkws(`wss://${instance}/matchmaker/`, this.proxy);
+    async #createSocket(instance) {
+        const attempt = async () => {
+            try {
+                this.ws = new yolkws(`wss://${instance}/matchmaker/`, this.proxy);
+            } catch {
+                await new Promise((resolve) => setTimeout(resolve, 100));
+                await attempt();
+            }
+        }
+
+        await attempt();
 
         this.ws.onopen = () => {
             this.connected = true;

package/src/pathing/mapnode.js

@@ -1,5 +1,5 @@
 /* eslint-disable stylistic/max-len */
-function stringifyCircular(obj) {
+/*function stringifyCircular(obj) {
     const cache = [];
     return JSON.stringify(obj, (_, value) => {
         if (typeof value === 'object' && value !== null) {
@@ -14,7 +14,7 @@ function stringifyCircular(obj) {
         }
         return value;
     }, 4);
-}
+}*/
 
 class NodeList {
     constructor(raw) {
@@ -87,6 +87,34 @@ class NodeList {
             node.closed = undefined;
         }
     }
+
+    hasLineOfSight(bot, target) {
+        const dx = target.x - bot.x;
+        const dy = target.y - bot.y;
+        const dz = target.z - bot.z;
+
+        const steps = Math.max(Math.abs(dx), Math.abs(dy), Math.abs(dz));
+
+        const xStep = dx / steps;
+        const yStep = dy / steps;
+        const zStep = dz / steps;
+
+        let x = bot.x;
+        let y = bot.y;
+        let z = bot.z;
+
+        for (let i = 0; i <= steps; i++) {
+            const node = this.at(Math.round(x), Math.round(y), Math.round(z));
+            if (node && node.isSolid()) {
+                return false;
+            }
+            x += xStep;
+            y += yStep;
+            z += zStep;
+        }
+
+        return true;
+    }
 }
 
 class MapNode {
@@ -309,7 +337,7 @@ class MapNode {
                             if (this.y - 1 == node.y) {
                                 return true;
                             }
-                            console.log(`Wedge at ${stringifyCircular(this.position)} can't walk to wedge/air at ${stringifyCircular(node.position)}`);
+                            // console.log(`Wedge at ${stringifyCircular(this.position)} can't walk to wedge/air at ${stringifyCircular(node.position)}`);
                             return false;
                         }
                         return false;
@@ -404,7 +432,8 @@ class MapNode {
         // console.log('My meshtype, below meshtype: ', this.meshType, belowMe.meshType, 'Other meshtype, below other meshtype: ', node.meshType, belowOther.meshType);
         // console.log('My ry, other ry: ', this.ry, node.ry);
         // console.log('dx0, dy0, dz0: ', dx0, dy0, dz0);
-        throw new Error(`Unrecognized node meshType, me: ${stringifyCircular(this)}, other: ${stringifyCircular(node)}, below me: ${stringifyCircular(belowMe)}, below other: ${stringifyCircular(belowOther)}\n\nThis is NOT your fault. This is an internal error related to pathfinding.\nIf you need an immediate fix and don't use pathfinding features, set "doPathing" to false when creating a Bot.\n\nPlease paste this full error to our support server and **include the map the bot is on**.`);
+        // console.error(`Unrecognized node meshType, me: ${stringifyCircular(this)}, other: ${stringifyCircular(node)}, below me: ${stringifyCircular(belowMe)}, below other: ${stringifyCircular(belowOther)}\n\nThis is NOT your fault. This is an internal error related to pathfinding.\nIf you need an immediate fix and don't use pathfinding features, remove the "PATHFINDING" intent.\n\nPlease paste this full error to our support server and **include the map the bot is on**.`);
+        return false;
     }
 
     trueCenter() {

package/src/socket.js

@@ -6,7 +6,7 @@ import { IsBrowser, UserAgent } from '#constants';
 const WS = IsBrowser ? window.WebSocket : NodeWebSocket;
 
 let SocksProxyAgent;
-if (!IsBrowser) SocksProxyAgent = (await import('socks-proxy-agent')).SocksProxyAgent;
+if (!IsBrowser) SocksProxyAgent = (await import('smallsocks')).SocksProxyAgent;
 
 class yolkws extends WS {
     constructor(url, proxy) {