yolkbot 0.1.1-alpha.11 → 0.1.1-alpha.13

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "yolkbot",
     "description": "create a shell shockers (self) bot in under 10 lines.",
-    "version": "0.1.1-alpha.11",
+    "version": "0.1.1-alpha.13",
     "keywords": [
         "shell shockers",
         "shellshock.io",

package/src/bot/GamePlayer.js

@@ -1,4 +1,4 @@
-import { GunList } from '#constants';
+import { GunList, ShellStreaks, SocialMedias } from '#constants';
 import { Cluck9mm } from '../constants/guns.js';
 
 export class GamePlayer {
@@ -6,28 +6,31 @@ export class GamePlayer {
         this.id = id;
         this.team = team;
 
-        this.data = playerData;
+        this.raw = playerData;
 
         this.name = playerData.name_;
         this.uniqueId = playerData.uniqueId_;
 
         this.playing = playerData.playing_;
 
-        this.social = playerData.social_ && JSON.parse(playerData.social_);
+        this.socials = playerData.social_ && JSON.parse(playerData.social_);
+        if (this.socials) this.socials.forEach((social) => social.type = SocialMedias[social.id]);
+
+        this.isVip = playerData.upgradeProductId_ > 0;
         this.showBadge = !playerData.hideBadge_ || false;
 
         this.position = {
-            x: this.data.x_,
-            y: this.data.y_,
-            z: this.data.z_
+            x: playerData.x_,
+            y: playerData.y_,
+            z: playerData.z_
         };
 
         this.jumping = false;
         this.climbing = false;
 
         this.view = {
-            yaw: this.data.yaw_,
-            pitch: this.data.pitch_
+            yaw: playerData.yaw_,
+            pitch: playerData.pitch_
         };
 
         this.character = {
@@ -40,15 +43,14 @@ export class GamePlayer {
             melee: playerData.meleeItem_
         }
 
-        this.activeGun = this.data.weaponIdx_;
+        this.activeGun = playerData.weaponIdx_;
         this.selectedGun = 0;
         this.weapons = [{}, {}];
 
         if (this.character.primaryGun) {
-            const weaponClass = GunList[this.character.primaryGun.exclusive_for_class];
-            this.selectedGun = this.character.primaryGun.exclusive_for_class;
+            this.selectedGun = playerData.charClass_;
 
-            this.weapons[0] = new weaponClass();
+            this.weapons[0] = new GunList[this.selectedGun]();
             this.weapons[1] = new Cluck9mm();
         }
 
@@ -60,11 +62,11 @@ export class GamePlayer {
             2: {}
         };
 
-        this.kills = 0;
-        this.hp = 100;
+        this.streak = playerData.score_;
+        this.hp = playerData.hp_;
 
-        this.hpShield = 0;
-        this.streakRewards = [];
+        this.hpShield = playerData.shield_;
+        this.streakRewards = Object.values(ShellStreaks).filter(streak => playerData.activeShellStreaks_ & streak);
 
         this.randomSeed = 0;
         this.serverStateIdx = 0;

package/src/bot.js

@@ -799,25 +799,21 @@ export class Bot {
 
     #processAddPlayerPacket() {
         const id_ = CommIn.unPackInt8U();
-        const uniqueId = CommIn.unPackString();
-        const name = CommIn.unPackString();
-        const safename = CommIn.unPackString(); // ??? (a)
-        const charClass = CommIn.unPackInt8U();
         const findCosmetics = this.intents.includes(this.Intents.COSMETIC_DATA);
         const playerData = {
             id_: id_,
-            uniqueId_: uniqueId,
-            name_: name,
-            safename_: safename,
-            charClass_: charClass,
+            uniqueId_: CommIn.unPackString(),
+            name_: CommIn.unPackString(),
+            safename_: CommIn.unPackString(),
+            charClass_: CommIn.unPackInt8U(),
             team_: CommIn.unPackInt8U(),
-            primaryWeaponItem_: findItemById(CommIn.unPackInt16U()),
+            primaryWeaponItem_: findCosmetics ? findItemById(CommIn.unPackInt16U()) : CommIn.unPackInt16U(),
             secondaryWeaponItem_: findCosmetics ? findItemById(CommIn.unPackInt16U()) : CommIn.unPackInt16U(),
             shellColor_: CommIn.unPackInt8U(),
             hatItem_: findCosmetics ? findItemById(CommIn.unPackInt16U()) : CommIn.unPackInt16U(),
             stampItem_: findCosmetics ? findItemById(CommIn.unPackInt16U()) : CommIn.unPackInt16U(),
-            unknownInt8: CommIn.unPackInt8(), // c
-            otherUnknownInt8: CommIn.unPackInt8(),
+            _unused: CommIn.unPackInt8(),
+            _unused2: CommIn.unPackInt8(),
             grenadeItem_: findCosmetics ? findItemById(CommIn.unPackInt16U()) : CommIn.unPackInt16U(),
             meleeItem_: findCosmetics ? findItemById(CommIn.unPackInt16U()) : CommIn.unPackInt16U(),
             x_: CommIn.unPackFloat(),
@@ -829,6 +825,7 @@ export class Bot {
             yaw_: CommIn.unPackRadU(),
             pitch_: CommIn.unPackRad(),
             score_: CommIn.unPackInt32U(),
+            // the following are all stats
             kills_: CommIn.unPackInt16U(),
             deaths_: CommIn.unPackInt16U(),
             streak_: CommIn.unPackInt16U(),
@@ -836,6 +833,7 @@ export class Bot {
             totalDeaths_: CommIn.unPackInt32U(),
             bestGameStreak_: CommIn.unPackInt16U(),
             bestOverallStreak_: CommIn.unPackInt16U(),
+            // end stats
             shield_: CommIn.unPackInt8U(),
             hp_: CommIn.unPackInt8U(),
             playing_: CommIn.unPackInt8U(),
@@ -1376,8 +1374,7 @@ export class Bot {
 
         const findCosmetics = this.intents.includes(this.Intents.COSMETIC_DATA);
 
-        const primaryWeaponItem = findItemById(primaryWeaponIdx);
-
+        const primaryWeaponItem = findCosmetics ? findItemById(primaryWeaponIdx) : primaryWeaponIdx;
         const secondaryWeaponItem = findCosmetics ? findItemById(secondaryWeaponIdx) : secondaryWeaponIdx;
         const hatItem = findCosmetics ? findItemById(hatIdx) : hatIdx;
         const stampItem = findCosmetics ? findItemById(stampIdx) : stampIdx;

package/src/constants/guns.js

@@ -38,7 +38,9 @@ const Eggk47 = class _Eggk47 extends Gun {
         this.shortReloadTime = 160;
 
         this.weaponName = 'EggK-47';
+        this.internalName = 'Eggk47';
         this.standardMeshName = 'eggk47';
+
         this.rof = 3;
         this.recoil = 7;
         this.automatic = true;
@@ -67,8 +69,10 @@ const DozenGauge = class _DozenGauge extends Gun {
         this.longReloadTime = 155;
         this.shortReloadTime = 155;
 
-        this.weaponName = 'Dozen Gauge';
+        this.weaponName = 'Scrambler';
+        this.internalName = 'Dozen Gauge';
         this.standardMeshName = 'dozenGauge';
+
         this.rof = 8;
         this.recoil = 10;
         this.automatic = false;
@@ -121,8 +125,10 @@ const CSG1 = class _CSG1 extends Gun {
         this.shortReloadTime = 165;
         this.highPrecision = true;
 
-        this.weaponName = 'CSG-1';
+        this.weaponName = 'Free Ranger';
+        this.internalName = 'CSG-1';
         this.standardMeshName = 'csg1';
+
         this.rof = 13;
         this.recoil = 13;
         this.automatic = false;
@@ -159,7 +165,9 @@ const Cluck9mm = class _Cluck9mm extends Gun {
         this.shortReloadTime = 160;
 
         this.weaponName = 'Cluck 9mm';
+        this.internalName = 'Cluck 9mm';
         this.standardMeshName = 'cluck9mm';
+
         this.rof = 4;
         this.recoil = 6;
         this.automatic = false;
@@ -199,7 +207,9 @@ const RPEGG = class _RPEGG extends Gun {
         this.shortReloadTime = 170;
 
         this.weaponName = 'RPEGG';
+        this.internalName = 'Eggsploder';
         this.standardMeshName = 'rpegg';
+
         this.rof = 40;
         this.recoil = 60;
         this.automatic = false;
@@ -236,7 +246,9 @@ const SMG = class _SMG extends Gun {
         this.shortReloadTime = 190;
 
         this.weaponName = 'Whipper';
+        this.internalName = 'SMEGG';
         this.standardMeshName = 'smg';
+
         this.rof = 10;
         this.recoil = 7;
         this.automatic = true;
@@ -276,7 +288,9 @@ const M24 = class _M24 extends Gun {
         this.shortReloadTime = 144;
 
         this.weaponName = 'Crackshot';
+        this.internalName = 'M2DZ';
         this.standardMeshName = 'm24';
+
         this.rof = 60;
         this.recoil = 40;
         this.automatic = false;
@@ -316,7 +330,9 @@ const AUG = class _AUG extends Gun {
         this.shortReloadTime = 160;
 
         this.weaponName = 'Tri-Hard';
+        this.internalName = 'AUG';
         this.standardMeshName = 'aug';
+
         this.rof = 15;
         this.recoil = 18;
         this.automatic = false;

package/src/constants/index.js

@@ -82,6 +82,16 @@ export const ShellStreaks = {
     MiniEgg: 32
 }
 
+export const SocialMedias = {
+    0: 'Facebook',
+    1: 'Instagram',
+    2: 'Tiktok',
+    3: 'Discord',
+    4: 'Youtube',
+    5: 'Twitter',
+    6: 'Twitch'
+}
+
 export const SocialRewards = {
     Discord: 'rew_1200',
     Tiktok: 'rew_1208',

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/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/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;