yolkbot 0.1.0-alpha.9 → 0.1.1-alpha.10

package/src/constants/maps.js

@@ -10,7 +10,7 @@ export const Maps = [
             "Spatula": true,
             "King": true
         },
-        "availability": "both",
+        "availability": "private",
         "numPlayers": "18"
     },
     {
@@ -88,7 +88,7 @@ export const Maps = [
             "Spatula": true,
             "King": true
         },
-        "availability": "private",
+        "availability": "both",
         "numPlayers": "14"
     },
     {
@@ -127,7 +127,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"
     },
     {
@@ -387,7 +387,20 @@ export const Maps = [
             "Spatula": true,
             "King": true
         },
-        "availability": "private",
+        "availability": "both",
+        "numPlayers": "18"
+    },
+    {
+        "filename": "foundation",
+        "hash": "11y636vc64b",
+        "name": "Foundation",
+        "modes": {
+            "FFA": true,
+            "Teams": true,
+            "Spatula": true,
+            "King": true
+        },
+        "availability": "both",
         "numPlayers": "18"
     },
     {
@@ -413,7 +426,7 @@ export const Maps = [
             "Spatula": true,
             "King": true
         },
-        "availability": "private",
+        "availability": "both",
         "numPlayers": "12"
     },
     {
@@ -452,7 +465,7 @@ export const Maps = [
             "Spatula": true,
             "King": true
         },
-        "availability": "both",
+        "availability": "private",
         "numPlayers": "18"
     },
     {
@@ -517,7 +530,7 @@ export const Maps = [
             "Spatula": true,
             "King": true
         },
-        "availability": "both",
+        "availability": "private",
         "numPlayers": "18"
     },
     {
@@ -530,7 +543,7 @@ export const Maps = [
             "Spatula": true,
             "King": true
         },
-        "availability": "both",
+        "availability": "private",
         "numPlayers": "18"
     },
     {
@@ -556,9 +569,22 @@ export const Maps = [
             "Spatula": true,
             "King": true
         },
-        "availability": "both",
+        "availability": "private",
         "numPlayers": "18"
     },
+    {
+        "filename": "metamorph",
+        "hash": "hlpma5zbhi",
+        "name": "Metamorph",
+        "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"
     },
     {
@@ -647,7 +673,7 @@ export const Maps = [
             "Spatula": true,
             "King": true
         },
-        "availability": "private",
+        "availability": "both",
         "numPlayers": "14"
     },
     {
@@ -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"
     },
     {
@@ -920,7 +946,7 @@ export const Maps = [
             "Spatula": true,
             "King": true
         },
-        "availability": "both",
+        "availability": "private",
         "numPlayers": "18"
     },
     {
@@ -985,9 +1011,22 @@ export const Maps = [
             "Spatula": true,
             "King": true
         },
-        "availability": "private",
+        "availability": "both",
         "numPlayers": "18"
     },
+    {
+        "filename": "uncovered",
+        "hash": "bxrd0zdvtn",
+        "name": "Uncovered",
+        "modes": {
+            "FFA": true,
+            "Teams": true,
+            "Spatula": true,
+            "King": false
+        },
+        "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/LookAtPosDispatch.js

@@ -7,8 +7,6 @@ const calculateYaw = (pos) => setPrecision(mod(Math.atan2(-pos.x, -pos.z), PI2))
 const calculatePitch = (pos) => setPrecision(Math.atan2(pos.y, Math.hypot(pos.x, pos.z)));
 
 export class LookAtPosDispatch {
-    idOrName;
-
     constructor(pos) {
         this.pos = pos;
     }

package/src/dispatches/LookDispatch2.js

@@ -0,0 +1,18 @@
+export class LookDispatch2 {
+    check(bot) {
+        return bot.me.playing;
+    }
+
+    execute(bot) {
+        let x = 0;
+
+        (() => setInterval(() => {
+            x += 0.1;
+            x %= 2 * Math.PI;
+            bot.me.view.yaw = x - Math.PI;
+            bot.me.view.pitch = x;
+        }, 20))();
+    }
+}
+
+export default LookDispatch2;

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,9 +6,21 @@ export class ReloadDispatch {
     }
 
     execute(bot) {
-        new packet.ReloadPacket().execute(bot.gameSocket);
+        new packet.ReloadPacket().execute(bot.game.socket);
 
-        bot.processReloadPacket(bot.me.id, true);
+        const playerActiveWeapon = bot.me.weapons[bot.me.activeGun];
+
+        if (playerActiveWeapon.ammo) {
+            const newRounds = Math.min(
+                Math.min(playerActiveWeapon.ammo.capacity, playerActiveWeapon.ammo.reload) - playerActiveWeapon.ammo.rounds,
+                playerActiveWeapon.ammo.store
+            );
+
+            playerActiveWeapon.ammo.rounds += newRounds;
+            playerActiveWeapon.ammo.store -= newRounds;
+        }
+
+        bot.emit('playerReload', bot.me, playerActiveWeapon);
 
         const activeWeapon = bot.me.weapons[bot.me.activeGun];
         const isLongTime = activeWeapon.ammo.rounds < 1;

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 = bot.intents.includes(bot.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';
@@ -22,6 +25,9 @@ export {
     ChatDispatch,
     FireDispatch,
     GameOptionsDispatch,
+    GoToAmmoDispatch,
+    GoToCoopDispatch,
+    GoToGrenadeDispatch,
     GoToPlayerDispatch,
     GoToSpatulaDispatch,
     LookAtDispatch,
@@ -43,6 +49,9 @@ export default {
     ChatDispatch,
     FireDispatch,
     GameOptionsDispatch,
+    GoToAmmoDispatch,
+    GoToCoopDispatch,
+    GoToGrenadeDispatch,
     GoToPlayerDispatch,
     GoToSpatulaDispatch,
     LookAtDispatch,

package/src/matchmaker.js

@@ -1,5 +1,5 @@
 import { loginAnonymously } from '#api';
-import { GameModes, IsBrowser, PlayTypes } from '#constants';
+import { GameModes, PlayTypes, ProxiesEnabled } from '#constants';
 
 import yolkws from './socket.js';
 
@@ -21,20 +21,26 @@ export class Matchmaker {
     constructor(params = {}) {
         if (!params.instance) params.instance = 'shellshock.io';
 
-        if (params.proxy && IsBrowser)
-            throw new Error('proxies do not work and hence are not supported in the browser');
-
         if (params.sessionId) this.sessionId = params.sessionId;
         else this.#createSessionId(params.instance);
 
-        if (params.proxy && IsBrowser) throw new Error('proxies do not work and hence are not supported in the browser');
+        if (params.proxy && !ProxiesEnabled) throw new Error('proxies do not work and hence are not supported in the browser');
         else if (params.proxy) this.proxy = params.proxy;
 
         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;