yolkbot 0.1.1-alpha.9 → 0.1.1

package/src/pathing/mapnode.js

@@ -1,24 +1,7 @@
 /* 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) {
-        const now = Date.now();
         this.list = [];
         const addedPositions = {};
 
@@ -28,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));
             }
         }
 
@@ -40,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 }));
                     }
                 }
             }
@@ -69,16 +52,6 @@ class NodeList {
                 }
             }
         }
-
-        console.log(`NodeList created in ${Date.now() - now}ms`);
-    }
-
-    add(node) {
-        this.list.push(node);
-    }
-
-    remove(node) {
-        this.list.splice(this.list.indexOf(node), 1);
     }
 
     at(x, y, z) {
@@ -122,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;
@@ -189,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;
@@ -208,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 },
@@ -246,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,
@@ -267,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}`;
     }

package/src/socket.js

@@ -1,18 +1,12 @@
-import NodeWebSocket from 'ws';
+import globals from './globals.js';
+import { IsBrowser, UserAgent } from './constants/index.js';
 
-import { IsBrowser, ProxiesEnabled, UserAgent } from '#constants';
-
-const WS = IsBrowser ? window.WebSocket : NodeWebSocket;
-
-let SocksProxyAgent;
-if (ProxiesEnabled) SocksProxyAgent = (await import('smallsocks')).SocksProxyAgent;
-
-class yolkws extends WS {
+class yolkws extends globals.WebSocket {
     constructor(url, proxy) {
         if (IsBrowser) super(url);
         else {
             super(url, {
-                agent: proxy ? new SocksProxyAgent(proxy) : undefined,
+                agent: proxy ? new globals.SocksProxyAgent(proxy) : undefined,
                 headers: {
                     'user-agent': UserAgent,
                     'accept-language': 'en-US,en;q=0.9'

package/src/types/bot/GamePlayer.d.ts

@@ -14,7 +14,7 @@ export interface View {
 
 export interface Character {
     eggColor: string;
-    primaryGun: Item;
+    primaryGun: Item | number;
     secondaryGun: Item | number;
     stamp: Item | number;
     hat: Item | number;
@@ -29,28 +29,51 @@ export interface Buffer {
 }
 
 export interface PlayerData {
-    name_: string;
+    id_: string;
     uniqueId_: string;
-    playing_: boolean;
-    social_: string;
-    hideBadge_: boolean;
+    name_: string;
+    safename_: string;
+    charClass_: number;
+    team_: 0 | 1 | 2;
+    primaryWeaponItem_: Item | number;
+    secondaryWeaponItem_: Item | number;
+    shellColor_: 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13;
+    hatItem_: Item | number;
+    stampItem_: Item | number;
+    _unused: number;
+    _unused2: number;
+    grenadeItem_: Item | number;
+    meleeItem_: Item | number;
     x_: number;
     y_: number;
     z_: number;
+    dx_: number;
+    dy_: number;
+    dz_: number;
     yaw_: number;
     pitch_: number;
-    shellColor_: string;
-    primaryWeaponItem_: Item;
-    secondaryWeaponItem_: Item | number;
-    stampItem_: Item | number;
-    hatItem_: Item | number;
-    grenadeItem_: Item | number;
-    meleeItem_: Item | number;
+    score_: number;
+    kills_: number;
+    deaths_: number;
+    streak_: number;
+    totalKills_: number;
+    totalDeaths_: number;
+    bestGameStreak_: number;
+    bestOverallStreak_: number;
+    shield_: number;
+    hp_: number;
+    playing_: boolean;
     weaponIdx_: number;
+    controlKeys_: number;
+    upgradeProductId_: number;
+    activeShellStreaks_: number;
+    social_: string;
+    hideBadge_: boolean;
 }
 
 export interface Social {
     id: number;
+    type: 'Facebook' | 'Instagram' | 'Tiktok' | 'Discord' | 'Youtube' | 'Twitter' | 'Twitch';
     url: string;
     active: boolean;
 }
@@ -58,11 +81,12 @@ export interface Social {
 export class GamePlayer {
     id: string;
     team: 0 | 1 | 2;
-    data: PlayerData;
+    raw: PlayerData;
     name: string;
     uniqueId: string;
     playing: boolean;
-    social: Social[];
+    socials: Social[];
+    isVip: boolean;
     showBadge: boolean;
     position: Position;
     jumping: boolean;
@@ -74,7 +98,7 @@ export class GamePlayer {
     weapons: AnyGun[];
     grenades: number;
     buffer: Buffer;
-    kills: number;
+    streak: number;
     hp: number;
     hpShield: number;
     streakRewards: number[];

package/src/types/bot.d.ts

@@ -231,7 +231,7 @@ export class Bot {
     update(): void;
 
     canSee(player: GamePlayer): boolean;
-    getBestTarget(): GamePlayer | undefined;
+    getBestTarget(customFilter: (player: GamePlayer) => boolean): GamePlayer | undefined;
 
     onAny(cb: Function): void;
 

package/src/types/constants/guns.d.ts

@@ -30,6 +30,7 @@ declare class Eggk47 extends Gun {
     longReloadTime: number;
     shortReloadTime: number;
     weaponName: string;
+    internalName: string;
     standardMeshName: string;
     rof: number;
     recoil: number;
@@ -53,6 +54,7 @@ declare class DozenGauge extends Gun {
     longReloadTime: number;
     shortReloadTime: number;
     weaponName: string;
+    internalName: string;
     standardMeshName: string;
     rof: number;
     recoil: number;
@@ -80,6 +82,7 @@ declare class CSG1 extends Gun {
     shortReloadTime: number;
     highPrecision: boolean;
     weaponName: string;
+    internalName: string;
     standardMeshName: string;
     rof: number;
     recoil: number;
@@ -103,6 +106,7 @@ declare class Cluck9mm extends Gun {
     longReloadTime: number;
     shortReloadTime: number;
     weaponName: string;
+    internalName: string;
     standardMeshName: string;
     rof: number;
     recoil: number;
@@ -129,6 +133,7 @@ declare class RPEGG extends Gun {
     longReloadTime: number;
     shortReloadTime: number;
     weaponName: string;
+    internalName: string;
     standardMeshName: string;
     rof: number;
     recoil: number;
@@ -158,6 +163,7 @@ declare class SMG extends Gun {
     longReloadTime: number;
     shortReloadTime: number;
     weaponName: string;
+    internalName: string;
     standardMeshName: string;
     rof: number;
     recoil: number;
@@ -184,6 +190,7 @@ declare class M24 extends Gun {
     longReloadTime: number;
     shortReloadTime: number;
     weaponName: string;
+    internalName: string;
     standardMeshName: string;
     rof: number;
     recoil: number;
@@ -210,6 +217,7 @@ declare class AUG extends Gun {
     longReloadTime: number;
     shortReloadTime: number;
     weaponName: string;
+    internalName: string;
     standardMeshName: string;
     rof: number;
     recoil: number;

package/src/types/constants/index.d.ts

@@ -82,6 +82,16 @@ export declare const ShellStreaks: {
     MiniEgg: number;
 };
 
+export declare const SocialMedias: {
+    0: string;
+    1: string;
+    2: string;
+    3: string;
+    4: string;
+    5: string;
+    6: string;
+};
+
 export declare const SocialRewards: {
     Discord: string;
     Tiktok: string;
@@ -99,4 +109,4 @@ export declare const Teams: {
 
 export declare const URLRewards: string[];
 
-export declare const UserAgent: string;
+export declare const UserAgent: string | undefined;

package/src/types/matchmaker.d.ts

@@ -40,20 +40,26 @@ type CommandSend = {
 export declare class Matchmaker {
     connected: boolean;
     onceConnected: Function[];
+
     proxy: string | null;
     sessionId: string;
-    forceClose: boolean;
     onListeners: Map<string, Function[]>;
     onceListeners: Map<string, Function[]>;
 
+    regionList: Region[] | null;
+    ws: yolkws;
+
     constructor(params?: MatchmakerParams);
 
     send(msg: CommandSend): void;
-    waitForConnect(): Promise<void>;
+
     getRegions(): Promise<Region[]>;
     findPublicGame(params: FindGameParams): Promise<RawGameData>;
+
     getRandomRegion(): string;
     getRandomGameMode(): keyof typeof GameModes;
+
+    waitForConnect(): Promise<void>;
     close(): void;
 
     on(event: string, callback: Function): void;