yolkbot 0.1.1-alpha.40 → 0.1.1-alpha.42

package/README.md

@@ -2,7 +2,7 @@
   <h1>yolkbot</h1>
   <h3>creating bots in 10 lines since 2025</h3>
   <p>
-    <a href='https://github.com/enbyte/yolkbot'>github</a> | 
+    <a href='https://github.com/yolkorg/yolkbot'>github</a> | 
     <a href='https://yolkbot.villainsrule.xyz'>documentation</a> |
     <a href='https://npmjs.com/yolkbot'>npm</a> |
     <a href='https://discord.gg/gYugVUCaMr'>discord</a>
@@ -23,6 +23,6 @@
 <h3 align='center'>credits</h3>
 
 <p align='center'>
-  this repository was created & imagined by <a href='https://github.com/enbyte'>hijinks</a> & <a href='https://github.com/villainsrule'>1ust</a> :trollface:<br>
+  this codebase was written by <a href='https://github.com/villainsrule'>1ust</a> with large contributions from <a href='https://github.com/enbyte'>hijinks</a> :trollface: <br>
   special thanks to BWD for leaking the source, which made development 100x easier ❤️
 </p>

package/package.json

@@ -1,24 +1,22 @@
 {
     "name": "yolkbot",
-    "description": "create a shell shockers (self) bot in under 10 lines.",
-    "version": "0.1.1-alpha.40",
+    "description": "create a shell shockers bot in under 10 lines.",
+    "version": "0.1.1-alpha.42",
     "keywords": [
         "shell shockers",
         "shellshock.io",
         "blue wizard",
         "yolkbot"
     ],
-    "homepage": "https://github.com/enbyte/yolkbot#readme",
+    "homepage": "https://github.com/yolkorg/yolkbot#readme",
     "bugs": {
-        "url": "https://github.com/enbyte/yolkbot/issues"
+        "url": "https://github.com/yolkorg/yolkbot/issues"
     },
-    "author": "hijinks",
-    "contributors": [
-        "1ust"
-    ],
+    "author": "1ust",
+    "contributors": ["hijinks"],
     "repository": {
         "type": "git",
-        "url": "git+https://github.com/enbyte/yolkbot.git"
+        "url": "git+https://github.com/yolkorg/yolkbot.git"
     },
     "type": "module",
     "files": [
@@ -41,7 +39,6 @@
             "import": "./src/matchmaker.js",
             "types": "./src/types/matchmaker.d.ts"
         },
-        "./packets": "./src/packet.js",
         "./pathing/*": "./src/pathing/*.js",
         "./pathing/*.js": "./src/pathing/*.js",
         "./bot": {
@@ -94,16 +91,6 @@
         "globals": "^15.15.0"
     },
     "scripts": {
-        "lint": "eslint --fix",
-        "prod": "./prod.sh",
-        "test": "./build.sh"
-    },
-    "imports": {
-        "#api": "./src/api.js",
-        "#bot": "./src/bot.js",
-        "#constants": "./src/constants/index.js",
-        "#dispatch/*": "./src/dispatches/*",
-        "#matchmaker": "./src/matchmaker.js",
-        "#packet": "./src/packet.js"
+        "lint": "eslint --fix"
     }
 }

package/src/api.js

@@ -2,7 +2,7 @@ import axios from 'axios';
 
 import yolkws from './socket.js';
 
-import { FirebaseKey, ProxiesEnabled, UserAgent } from '#constants';
+import { FirebaseKey, ProxiesEnabled, UserAgent } from './constants/index.js';
 
 let SocksProxyAgent;
 if (ProxiesEnabled) SocksProxyAgent = (await import('smallsocks')).SocksProxyAgent;

package/src/bot/GamePlayer.js

@@ -1,4 +1,4 @@
-import { GunList, ShellStreaks, SocialMedias } from '#constants';
+import { GunList, ShellStreaks, SocialMedias } from '../constants/index.js';
 import { Cluck9mm } from '../constants/guns.js';
 
 export class GamePlayer {

package/src/bot.js

@@ -1,4 +1,4 @@
-import { createAccount, loginAnonymously, loginWithCredentials, loginWithRefreshToken, queryServices } from '#api';
+import { createAccount, loginAnonymously, loginWithCredentials, loginWithRefreshToken, queryServices } from './api.js';
 
 import CommIn from './comm/CommIn.js';
 import CommOut from './comm/CommOut.js';
@@ -23,7 +23,7 @@ import {
     PlayTypes,
     ProxiesEnabled,
     ShellStreaks
-} from '#constants';
+} from './constants/index.js';
 
 import LookAtPosDispatch from './dispatches/LookAtPosDispatch.js';
 import MovementDispatch from './dispatches/MovementDispatch.js';
@@ -363,7 +363,7 @@ export class Bot {
                     this.matchmaker.off('msg', listener);
 
                     this.game.raw = mes;
-                    this.game.code = code;
+                    this.game.code = mes.id;
 
                     resolve();
                 }
@@ -636,7 +636,7 @@ export class Bot {
     }
 
     update() {
-        if (!this.state.joinedGame) throw new Error('Not playing, can\'t update. ');
+        if (!this.state.joinedGame) throw new Error('You cannot call update() if the bot is not in a game.');
 
         // process pathfinding
         if (this.pathing.followingPath && this.intents.includes(this.Intents.PATHFINDING)) this.#processPathfinding();
@@ -1210,7 +1210,7 @@ export class Bot {
                 }
 
                 // secondary, always cluck9mm
-                if (player.weapons[1] && player.weapons[0].ammo) {
+                if (player.weapons[1] && player.weapons[1].ammo) {
                     player.weapons[1].ammo.rounds = player.weapons[1].ammo.capacity;
                     player.weapons[1].ammo.store = player.weapons[1].ammo.storeMax;
                 }

package/src/dispatches/BootPlayerDispatch.js

@@ -1,4 +1,5 @@
-import packet from '#packet';
+import CommOut from '../comm/CommOut.js';
+import { CommCode } from '../constants/codes.js';
 
 export class BootPlayerDispatch {
     constructor(uniqueId) {
@@ -10,7 +11,10 @@ export class BootPlayerDispatch {
     }
 
     execute(bot) {
-        new packet.BootPacket(this.uniqueId).execute(bot.game.socket);
+        const out = CommOut.getBuffer();
+        out.packInt8(CommCode.bootPlayer);
+        out.packString(this.uniqueId);
+        out.send(bot.game.socket);
     }
 }
 

package/src/dispatches/ChatDispatch.js

@@ -1,4 +1,5 @@
-import packet from '#packet';
+import CommOut from '../comm/CommOut.js';
+import { CommCode } from '../constants/codes.js';
 
 export class ChatDispatch {
     constructor(msg, noLimit = false) {
@@ -17,7 +18,11 @@ export class ChatDispatch {
     }
 
     execute(bot) {
-        new packet.ChatPacket(this.msg).execute(bot.game.socket);
+        const out = CommOut.getBuffer();
+        out.packInt8(CommCode.chat);
+        out.packString(this.msg);
+        out.send(bot.game.socket);
+
         bot.lastChatTime = Date.now();
     }
 }

package/src/dispatches/GameOptionsDispatch.js

@@ -1,4 +1,5 @@
-import packet from '#packet';
+import CommOut from '../comm/CommOut.js';
+import { CommCode } from '../constants/codes.js';
 
 const regenScale = [0, 0.25, 0.5, 0.75, 1, 1.25, 1.5, 1.75, 2, 2.25, 2.5, 2.75, 3, 3.25, 3.5, 3.75, 4];
 
@@ -21,7 +22,24 @@ export class GameOptionsDispatch {
     }
 
     execute(bot) {
-        new packet.GameOptionsPacket(bot.game.options).execute(bot.game.socket);
+        const flags =
+            (bot.game.options.locked ? 1 : 0) |
+            (bot.game.options.noTeamChange ? 2 : 0) |
+            (bot.game.options.noTeamShuffle ? 4 : 0);
+
+        const out = CommOut.getBuffer();
+
+        out.packInt8(CommCode.gameOptions);
+        out.packInt8(bot.game.options.gravity * 4);
+        out.packInt8(bot.game.options.damage * 4);
+        out.packInt8(bot.game.options.healthRegen * 4);
+        out.packInt8(flags);
+
+        bot.game.options.weaponsDisabled.forEach((v) => {
+            out.packInt8(v ? 1 : 0);
+        });
+
+        out.send(bot.game.socket);
     }
 }
 

package/src/dispatches/MeleeDispatch.js

@@ -1,4 +1,5 @@
-import packet from '#packet';
+import CommOut from '../comm/CommOut.js';
+import { CommCode } from '../constants/codes.js';
 
 export class MeleeDispatch {
     check(bot) {
@@ -6,17 +7,18 @@ export class MeleeDispatch {
     }
 
     execute(bot) {
-        new packet.MeleePacket().execute(bot.game.socket);
+        const out = CommOut.getBuffer();
+        out.packInt8(CommCode.melee);
+        out.send(bot.game.socket);
+
         bot.usingMelee = true;
 
         // gameloop every 33.33 (repeating) ms, 17 ticks, so 566.61 is the closest you get
         setTimeout(() => {
-            // new ChatDispatch('end melee, start swap gun').execute(player);
             bot.usingMelee = false
             bot.swappingGun = true
 
             setTimeout(() => {
-                // new ChatDispatch('end swap gun').execute(player);
                 bot.swappingGun = false
             }, 0.5 * bot.me.weapons[0].equipTime)
         }, 566.61);

package/src/dispatches/PauseDispatch.js

@@ -1,4 +1,5 @@
-import packet from '#packet';
+import CommOut from '../comm/CommOut.js';
+import { CommCode } from '../constants/codes.js';
 
 export class PauseDispatch {
     check(bot) {
@@ -6,8 +7,11 @@ export class PauseDispatch {
     }
 
     execute(bot) {
-        new packet.PausePacket().execute(bot.game.socket);
-        setTimeout(() => bot.me.playing = false, 3000); 
+        const out = CommOut.getBuffer();
+        out.packInt8(CommCode.pause);
+        out.send(bot.game.socket);
+
+        setTimeout(() => bot.me.playing = false, 3000);
     }
 }
 

package/src/dispatches/ReloadDispatch.js

@@ -1,4 +1,5 @@
-import packet from '#packet';
+import CommOut from '../comm/CommOut.js';
+import { CommCode } from '../constants/codes.js';
 
 export class ReloadDispatch {
     check(bot) {
@@ -6,7 +7,9 @@ export class ReloadDispatch {
     }
 
     execute(bot) {
-        new packet.ReloadPacket().execute(bot.game.socket);
+        const out = CommOut.getBuffer();
+        out.packInt8(CommCode.reload);
+        out.send(bot.game.socket);
 
         const playerActiveWeapon = bot.me.weapons[bot.me.activeGun];
 

package/src/dispatches/ReportPlayerDispatch.js

@@ -1,4 +1,5 @@
-import packet from '#packet';
+import CommOut from '../comm/CommOut.js';
+import { CommCode } from '../constants/codes.js';
 
 export class ReportPlayerDispatch {
     constructor(idOrName, reasons = {}) {
@@ -39,7 +40,11 @@ export class ReportPlayerDispatch {
 
         if (!target) throw new Error('target player for ReportPlayerDispatch not found')
 
-        new packet.ReportPacket(target, this.reasonInt).execute(bot.game.socket);
+        const out = CommOut.getBuffer();
+        out.packInt8(CommCode.reportPlayer);
+        out.packString(target);
+        out.packInt8(this.reasonInt);
+        out.send(bot.game.socket);
     }
 }
 

package/src/dispatches/SaveLoadoutDispatch.js

@@ -1,9 +1,10 @@
 /* eslint-disable stylistic/max-len */
 
-import { queryServices } from '#api';
-import { findItemById, GunList, ItemTypes } from '#constants';
+import { queryServices } from '../api.js';
+import { findItemById, GunList, ItemTypes } from '../constants/index.js';
 
-import packet from '#packet';
+import CommOut from '../comm/CommOut.js';
+import { CommCode } from '../constants/codes.js';
 
 const isDefault = (itemId) => findItemById(itemId) && findItemById(itemId).unlock == 'default';
 const isType = (itemId, type) => findItemById(itemId) && findItemById(itemId).item_type_id == type;
@@ -89,8 +90,12 @@ export class SaveLoadoutDispatch {
         bot.account.loadout = loadout;
 
         saveLoadout.then(() => {
-            if (bot.state.joinedGame)
-                new packet.ChangeCharacterPacket(this.changes?.classIdx || bot.me.selectedGun).execute(bot.game.socket);
+            if (bot.state.joinedGame) {
+                const out = CommOut.getBuffer();
+                out.packInt8(CommCode.changeCharacter);
+                out.packInt8(this.changes?.classIdx || bot.me.selectedGun);
+                out.send(bot.game.socket);
+            }
 
             const findCosmetics = bot.intents.includes(bot.Intents.COSMETIC_DATA);
 

package/src/dispatches/SpawnDispatch.js

@@ -1,4 +1,5 @@
-import packet from '#packet';
+import CommOut from '../comm/CommOut.js';
+import { CommCode } from '../constants/codes.js';
 
 export class SpawnDispatch {
     check(bot) {
@@ -8,7 +9,9 @@ export class SpawnDispatch {
     }
 
     execute(bot) {
-        new packet.RespawnPacket().execute(bot.game.socket);
+        const out = CommOut.getBuffer();
+        out.packInt8(CommCode.requestRespawn);
+        out.send(bot.game.socket);
 
         bot.lastSpawnedTime = Date.now();
         bot.me.playing = true;

package/src/dispatches/SwapWeaponDispatch.js

@@ -1,4 +1,5 @@
-import packet from '#packet';
+import CommOut from '../comm/CommOut.js';
+import { CommCode } from '../constants/codes.js';
 
 export class SwapWeaponDispatch {
     check(bot) {
@@ -7,7 +8,11 @@ export class SwapWeaponDispatch {
 
     execute(bot) {
         bot.me.activeGun = +!bot.me.activeGun;
-        new packet.SwapWeaponPacket(bot.me.activeGun).execute(bot.game.socket);
+        
+        const out = CommOut.getBuffer();
+        out.packInt8(CommCode.swapWeapon);
+        out.packInt8(bot.me.activeGun);
+        out.send(bot.game.socket);
     }
 }
 

package/src/dispatches/SwitchTeamDispatch.js

@@ -1,4 +1,5 @@
-import packet from '#packet';
+import CommOut from '../comm/CommOut.js';
+import { CommCode } from '../constants/codes.js';
 
 export class SwitchTeamDispatch {
     check(bot) {
@@ -24,7 +25,9 @@ export class SwitchTeamDispatch {
     }
 
     execute(bot) {
-        new packet.TeamSwitchingTraitorPacket().execute(bot.game.socket);
+        const out = CommOut.getBuffer();
+        out.packInt8(CommCode.switchTeam);
+        out.send(bot.game.socket);
     }
 }
 

package/src/dispatches/ThrowGrenadeDispatch.js

@@ -1,4 +1,5 @@
-import packet from '#packet';
+import CommOut from '../comm/CommOut.js';
+import { CommCode } from '../constants/codes.js';
 
 export class ThrowGrenadeDispatch {
     constructor(power = 1) {
@@ -15,7 +16,10 @@ export class ThrowGrenadeDispatch {
     }
 
     execute(bot) {
-        new packet.ThrowGrenadePacket(this.power).execute(bot.game.socket);
+        const out = CommOut.getBuffer();
+        out.packInt8(CommCode.throwGrenade);
+        out.packFloat(this.power);
+        out.send(bot.game.socket);
     }
 }
 

package/src/matchmaker.js

@@ -1,5 +1,5 @@
-import { loginAnonymously } from '#api';
-import { GameModes, PlayTypes, ProxiesEnabled } from '#constants';
+import { loginAnonymously } from './api.js';
+import { GameModes, PlayTypes, ProxiesEnabled } from './constants/index.js';
 
 import yolkws from './socket.js';
 
@@ -15,9 +15,6 @@ export class Matchmaker {
 
     #forceClose = false;
 
-    // sessionId: string, a custom session id
-    // proxy: a socks5 proxy string
-    // instance: a custom game instance
     constructor(params = {}) {
         if (!params.instance) params.instance = 'shellshock.io';
 

package/src/pathing/astar.js

@@ -1,27 +1,17 @@
-import { NodeList } from './mapnode.js';
 import { BinaryHeap } from './binaryheap.js';
 
-function printPath(path) {
-    for (const item of path) {
-        console.log(item.position);
-    }
-} // have it your way eslint
-
 export default class AStar {
     constructor(list) {
         this.list = list;
-
-        if (!typeof list == NodeList) {
-            throw new Error('AStar requires a NodeList');
-        }
     }
 
-    heuristic(pos1, pos2) { // @1ust Taxicab3D!
+    heuristic(pos1, pos2) {
         return Math.abs(pos1.x - pos2.x) + Math.abs(pos1.y - pos2.y) + Math.abs(pos1.z - pos2.z);
     }
 
     reversePath(node) {
         const path = [];
+
         while (node.parent) {
             path.push(node);
             node = node.parent;
@@ -35,7 +25,6 @@ export default class AStar {
         this.list.clean();
 
         const heap = new BinaryHeap(node => node.f);
-
         const closedSet = [];
 
         start.h = this.heuristic(start, end);
@@ -48,9 +37,7 @@ export default class AStar {
             const current = heap.pop();
 
             if (current === end) {
-                // console.log('done with astar - path found')
                 const val = this.reversePath(current);
-                printPath(val);
                 return val;
             }
 
@@ -61,29 +48,24 @@ export default class AStar {
             for (let i = 0; i < neighbors.length; i++) {
                 const neighbor = neighbors[i];
 
-                if (closedSet.includes(neighbor)) {
-                    continue;
-                }
+                if (closedSet.includes(neighbor)) continue;
 
                 const tentativeGScore = current.g + 1;
                 const visited = neighbor.visited;
+
                 if (!visited || tentativeGScore < neighbor.g) {
                     neighbor.visited = true;
                     neighbor.parent = current;
                     neighbor.g = tentativeGScore;
                     neighbor.h = this.heuristic(neighbor.position, end.position);
                     neighbor.f = neighbor.g + neighbor.h;
-                    if (!visited) {
-                        heap.push(neighbor);
-                    } else {
-                        heap.rescoreElement(neighbor);
-                    }
+
+                    if (!visited) heap.push(neighbor);
+                    else heap.rescoreElement(neighbor);
                 }
             }
         }
 
-        // console.log('done with astar - no path found')
-        // return null if no path has been found
         return null
     }
 }

package/src/pathing/binaryheap.js

@@ -34,13 +34,13 @@ class BinaryHeap {
         // To remove a value, we must search through the array to find
         // it.
         for (let i = 0; i < length; i++) {
-            if (this.content[i] != node) { continue; }
+            if (this.content[i] != node) continue;
             // When it is found, the process seen in 'pop' is repeated
             // to fill up the hole.
             const end = this.content.pop();
             // If the element we popped was the one we needed to remove,
             // we're done.
-            if (i == length - 1) { break; }
+            if (i == length - 1) break;
             // Otherwise, we replace the removed element with the popped
             // one, and allow it to float up or sink down as appropriate.
             this.content[i] = end;
@@ -63,7 +63,7 @@ class BinaryHeap {
             const parentN = Math.floor((n + 1) / 2) - 1, parent = this.content[parentN];
             // If the parent has a lesser score, things are in order and we
             // are done.
-            if (score >= this.scoreFunction(parent)) { break; }
+            if (score >= this.scoreFunction(parent)) break;
 
             // Otherwise, swap the parent with the current element and
             // continue.
@@ -94,16 +94,16 @@ class BinaryHeap {
                 const child1 = this.content[child1N];
                 child1Score = this.scoreFunction(child1);
                 // If the score is less than our element's, we need to swap.
-                if (child1Score < elemScore) { swap = child1N; }
+                if (child1Score < elemScore) swap = child1N;
             }
             // Do the same checks for the other child.
             if (child2N < length) {
                 const child2 = this.content[child2N], child2Score = this.scoreFunction(child2);
-                if (child2Score < (swap == null ? elemScore : child1Score)) { swap = child2N; }
+                if (child2Score < (swap == null ? elemScore : child1Score)) swap = child2N;
             }
 
             // No need to swap further, we are done.
-            if (swap == null) { break; }
+            if (swap == null) break;
 
             // Otherwise, swap and continue.
             this.content[n] = this.content[swap];

package/src/pathing/mapnode.js

@@ -1,20 +1,4 @@
 /* eslint-disable stylistic/max-len */
-/*function stringifyCircular(obj) {
-    const cache = [];
-    return JSON.stringify(obj, (_, value) => {
-        if (typeof value === 'object' && value !== null) {
-
-            // Duplicate reference found, discard key
-            if (cache.includes(value)) {
-                return '* Circular';
-            }
-
-            // Store value in our collection
-            cache.push(value);
-        }
-        return value;
-    }, 4);
-}*/
 
 class NodeList {
     constructor(raw) {
@@ -27,7 +11,7 @@ class NodeList {
                     (nodeData.x << 16) |
                     (nodeData.y << 8) |
                     (nodeData.z))] = true;
-                this.add(new MapNode(meshName, nodeData));
+                this.list.push(new MapNode(meshName, nodeData));
             }
         }
 
@@ -39,7 +23,7 @@ class NodeList {
                         (y << 8) |
                         (z)
                     )]) {
-                        this.add(new MapNode('SPECIAL.__yolkbot_air__.none', { x: x, y: y, z: z }));
+                        this.list.push(new MapNode('SPECIAL.air.none', { x: x, y: y, z: z }));
                     }
                 }
             }
@@ -70,14 +54,6 @@ class NodeList {
         }
     }
 
-    add(node) {
-        this.list.push(node);
-    }
-
-    remove(node) {
-        this.list.splice(this.list.indexOf(node), 1);
-    }
-
     at(x, y, z) {
         if (!this.nodeMap) {
             this.nodeMap = new Map();
@@ -119,9 +95,7 @@ class NodeList {
 
         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;
-            }
+            if (node && node.isSolid()) return false;
             x += xStep;
             y += yStep;
             z += zStep;
@@ -186,10 +160,6 @@ class MapNode {
         return this.meshType == 'none';
     }
 
-    canPassThroughOnAllFaces() {
-        return this.isAir();
-    }
-
     canLink(node, list) {
         const dx0 = this.x - node.x;
         const dz0 = this.z - node.z;
@@ -205,10 +175,7 @@ class MapNode {
 
         const belowMe = list.at(this.x, this.y - 1, this.z);
         const belowOther = list.at(node.x, node.y - 1, node.z);
-
-        if (!belowMe || !belowOther) {
-            return false;
-        }
+        if (!belowMe || !belowOther) return false;
 
         const FORWARD_RY_WEDGE_MAPPING = {
             0: { x: 0, z: -1 },
@@ -243,14 +210,6 @@ class MapNode {
         }
     }
 
-    trueCenter() {
-        return {
-            x: this.x + 0.5,
-            y: this.y + 0.5,
-            z: this.z + 0.5
-        }
-    }
-
     flatCenter() {
         return {
             x: this.x + 0.5,
@@ -264,11 +223,6 @@ class MapNode {
         return Math.hypot(pos.x - position.x, pos.z - position.z);
     }
 
-    floorCollides(position) {
-        const posFloor = Object.entries(position).map(entry => Math.floor(entry[1]));
-        return this.x == posFloor[0] && this.y == posFloor[1] && this.z == posFloor[2];
-    }
-
     positionStr() {
         return `${this.x},${this.y},${this.z}`;
     }