yolkbot 0.1.1-alpha.4 → 0.1.1-alpha.40

package/src/constants/maps.js

@@ -127,7 +127,7 @@ export const Maps = [
             "Spatula": true,
             "King": true
         },
-        "availability": "both",
+        "availability": "private",
         "numPlayers": "18"
     },
     {
@@ -335,7 +335,7 @@ export const Maps = [
             "Spatula": true,
             "King": true
         },
-        "availability": "private",
+        "availability": "both",
         "numPlayers": "18"
     },
     {
@@ -348,7 +348,7 @@ export const Maps = [
             "Spatula": true,
             "King": true
         },
-        "availability": "private",
+        "availability": "both",
         "numPlayers": "18"
     },
     {
@@ -400,7 +400,7 @@ export const Maps = [
             "Spatula": true,
             "King": true
         },
-        "availability": "both",
+        "availability": "private",
         "numPlayers": "18"
     },
     {
@@ -491,7 +491,7 @@ export const Maps = [
             "Spatula": true,
             "King": true
         },
-        "availability": "private",
+        "availability": "both",
         "numPlayers": "14"
     },
     {
@@ -574,7 +574,7 @@ export const Maps = [
     },
     {
         "filename": "metamorph",
-        "hash": "hlpma5zbhi",
+        "hash": "l9o69l8e1b",
         "name": "Metamorph",
         "modes": {
             "FFA": true,
@@ -582,7 +582,7 @@ export const Maps = [
             "Spatula": true,
             "King": false
         },
-        "availability": "both",
+        "availability": "private",
         "numPlayers": "14"
     },
     {
@@ -634,7 +634,7 @@ export const Maps = [
             "Spatula": true,
             "King": true
         },
-        "availability": "private",
+        "availability": "both",
         "numPlayers": "18"
     },
     {
@@ -764,7 +764,7 @@ export const Maps = [
             "Spatula": true,
             "King": true
         },
-        "availability": "both",
+        "availability": "private",
         "numPlayers": "14"
     },
     {
@@ -816,7 +816,7 @@ export const Maps = [
             "Spatula": true,
             "King": true
         },
-        "availability": "both",
+        "availability": "private",
         "numPlayers": "16"
     },
     {
@@ -829,7 +829,7 @@ export const Maps = [
             "Spatula": true,
             "King": true
         },
-        "availability": "both",
+        "availability": "private",
         "numPlayers": "18"
     },
     {
@@ -972,7 +972,7 @@ export const Maps = [
             "Spatula": true,
             "King": true
         },
-        "availability": "private",
+        "availability": "both",
         "numPlayers": "18"
     },
     {
@@ -1024,7 +1024,7 @@ export const Maps = [
             "Spatula": true,
             "King": false
         },
-        "availability": "both",
+        "availability": "private",
         "numPlayers": "12"
     },
     {
@@ -1076,7 +1076,20 @@ export const Maps = [
             "Spatula": true,
             "King": true
         },
-        "availability": "private",
+        "availability": "both",
+        "numPlayers": "18"
+    },
+    {
+        "filename": "yolkido",
+        "hash": "127ppvq4k6n",
+        "name": "Yolkido Garrison",
+        "modes": {
+            "FFA": true,
+            "Teams": true,
+            "Spatula": true,
+            "King": true
+        },
+        "availability": "both",
         "numPlayers": "18"
     }
 ];

package/src/dispatches/SaveLoadoutDispatch.js

@@ -102,7 +102,7 @@ export class SaveLoadoutDispatch {
                 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 === 'primaryId') bot.me.character.primaryGun = findCosmetics ? findItemById(changeValue[bot.me.selectedGun]) : changeValue;
                 else if (changeKey === 'secondaryId') bot.me.character.secondaryGun = findCosmetics ? findItemById(changeValue[bot.me.selectedGun]) : changeValue;
             })
         })

package/src/matchmaker.js

@@ -10,11 +10,11 @@ export class Matchmaker {
     proxy = null;
     sessionId = '';
 
-    forceClose = false;
-
     onListeners = new Map();
     onceListeners = new Map();
 
+    #forceClose = false;
+
     // sessionId: string, a custom session id
     // proxy: a socks5 proxy string
     // instance: a custom game instance
@@ -34,6 +34,11 @@ export class Matchmaker {
         const attempt = async () => {
             try {
                 this.ws = new yolkws(`wss://${instance}/matchmaker/`, this.proxy);
+                this.ws.onerror = async (e) => {
+                    console.error(e);
+                    await new Promise((resolve) => setTimeout(resolve, 100));
+                    return await attempt();
+                }
             } catch {
                 await new Promise((resolve) => setTimeout(resolve, 100));
                 await attempt();
@@ -44,6 +49,8 @@ export class Matchmaker {
 
         this.ws.onopen = () => {
             this.connected = true;
+            this.ws.onerror = null;
+
             if (this.sessionId) {
                 this.onceConnected.forEach(func => func());
             }
@@ -55,7 +62,7 @@ export class Matchmaker {
         }
 
         this.ws.onclose = () => {
-            if (this.forceClose) return;
+            if (this.#forceClose) return;
 
             this.connected = false;
             this.#createSocket(instance);
@@ -159,7 +166,7 @@ export class Matchmaker {
     }
 
     close() {
-        this.forceClose = true;
+        this.#forceClose = true;
         this.ws.close();
     }
 

package/src/packet.js

@@ -1,5 +1,5 @@
 import CommOut from './comm/CommOut.js';
-import { CommCode } from './comm/Codes.js';
+import { CommCode } from './constants/codes.js';
 
 class Packet {
     constructor(code, _args) {

package/src/pathing/mapnode.js

@@ -18,7 +18,6 @@
 
 class NodeList {
     constructor(raw) {
-        const now = Date.now();
         this.list = [];
         const addedPositions = {};
 
@@ -69,8 +68,6 @@ class NodeList {
                 }
             }
         }
-
-        console.log(`NodeList created in ${Date.now() - now}ms`);
     }
 
     add(node) {

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

@@ -188,7 +188,9 @@ type intents = {
     PATHFINDING: 3,
     BUFFERS: 4,
     PING: 5,
-    COSMETIC_DATA: 6
+    COSMETIC_DATA: 6,
+    PLAYER_HEALTH: 7,
+    PACKET_HOOK: 8
 }
 
 export class Bot {
@@ -196,7 +198,6 @@ export class Bot {
     Intents: intents;
 
     proxy: string;
-    name?: string;
     autoUpdate: boolean;
     disablePathing: boolean;
     updateInterval: number;
@@ -230,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;
 
@@ -279,6 +280,8 @@ export class Bot {
     claimURLReward(reward: string): Promise<{ result: string; eggsGiven: number; itemIds: number[]; }>;
     claimSocialReward(rewardTag: string): Promise<{ result: string; eggsGiven: number; itemIds: number[]; }>;
     buyItem(itemId: number): Promise<{ result: string; currentBalance: number; itemId: number; }>;
+
+    quit(noCleanup?: boolean): void;
 }
 
 export default Bot;

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;