yolkbot 0.1.1-alpha.2 → 0.1.1-alpha.21

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.2",
+    "version": "0.1.1-alpha.21",
     "keywords": [
         "shell shockers",
         "shellshock.io",
@@ -35,10 +35,6 @@
             "import": "./src/api.js",
             "types": "./src/types/api.d.ts"
         },
-        "./bot": {
-            "import": "./src/bot.js",
-            "types": "./src/types/bot.d.ts"
-        },
         "./browser": "./build/browser.js",
         "./comm": "./src/comm/index.js",
         "./matchmaker": {
@@ -48,6 +44,18 @@
         "./packets": "./src/packet.js",
         "./pathing/*": "./src/pathing/*.js",
         "./pathing/*.js": "./src/pathing/*.js",
+        "./bot": {
+            "import": "./src/bot.js",
+            "types": "./src/types/bot.d.ts"
+        },
+        "./bot/*": {
+            "import": "./src/bot/*.js",
+            "types": "./src/types/bot/*.d.ts"
+        },
+        "./bot/*.js": {
+            "import": "./src/bot/*.js",
+            "types": "./src/types/bot/*.d.ts"
+        },
         "./constants": {
             "import": "./src/constants/index.js",
             "types": "./src/types/constants/index.d.ts"

package/src/api.js

@@ -2,10 +2,10 @@ import axios from 'axios';
 
 import yolkws from './socket.js';
 
-import { FirebaseKey, IsBrowser, UserAgent } from '#constants';
+import { FirebaseKey, ProxiesEnabled, UserAgent } from '#constants';
 
 let SocksProxyAgent;
-if (!IsBrowser) SocksProxyAgent = (await import('smallsocks')).SocksProxyAgent;
+if (ProxiesEnabled) SocksProxyAgent = (await import('smallsocks')).SocksProxyAgent;
 
 const queryServices = async (request, proxy = '', instance = 'shellshock.io') => {
     let ws;
@@ -91,7 +91,7 @@ async function loginWithCredentials(email, password, prox = '', instance = 'shel
                     'user-agent': UserAgent,
                     'x-client-version': 'Chrome/JsCore/9.17.2/FirebaseCore-web'
                 },
-                httpsAgent: (!IsBrowser && prox) ? new SocksProxyAgent(prox) : false
+                httpsAgent: (ProxiesEnabled && prox) ? new SocksProxyAgent(prox) : false
             })
             body = request.data
             token = body.idToken;
@@ -143,7 +143,7 @@ async function loginWithRefreshToken(refreshToken, prox = '', instance = 'shells
                     'user-agent': UserAgent,
                     'x-client-version': 'Chrome/JsCore/9.17.2/FirebaseCore-web'
                 },
-                httpsAgent: (!IsBrowser && prox) ? new SocksProxyAgent(prox) : false
+                httpsAgent: (ProxiesEnabled && prox) ? new SocksProxyAgent(prox) : false
             })
             body = request.data
             token = body.id_token;
@@ -185,7 +185,7 @@ async function loginAnonymously(prox = '', instance = 'shellshock.io') {
             'user-agent': UserAgent,
             'x-client-version': 'Chrome/JsCore/9.17.2/FirebaseCore-web'
         },
-        httpsAgent: (!IsBrowser && prox) ? new SocksProxyAgent(prox) : false
+        httpsAgent: (ProxiesEnabled && prox) ? new SocksProxyAgent(prox) : false
     });
 
     const token = body.idToken;

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

@@ -21,6 +21,7 @@ import {
     ItemTypes,
     Movements,
     PlayTypes,
+    ProxiesEnabled,
     ShellStreaks
 } from '#constants';
 
@@ -50,7 +51,7 @@ export class Bot {
     Intents = intents;
 
     constructor(params = {}) {
-        if (params.proxy && IsBrowser)
+        if (params.proxy && !ProxiesEnabled)
             throw new Error('proxies do not work and hence are not supported in the browser');
 
         this.intents = params.intents || [];
@@ -434,7 +435,7 @@ export class Bot {
                 this.game.socket.onmessage = (msg) => this._packetQueue.push(msg.data);
 
                 if (this.autoUpdate)
-                    setInterval(() => this.update(), this.updateInterval);
+                    this.updateIntervalId = setInterval(() => this.update(), this.updateInterval);
 
                 if (this.intents.includes(this.Intents.PING)) {
                     const out = CommOut.getBuffer();
@@ -723,7 +724,7 @@ export class Bot {
 
             return data;
         } else {
-            const data = await (await fetch(`https://${this.instance}/maps/${name}.json?${hash}`)).json();
+            const data = await (await fetch(`https://esm.sh/gh/yolkorg/maps/maps/${name}.json`)).json();
             return data;
         }
     }
@@ -798,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(),
@@ -828,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(),
@@ -835,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(),
@@ -899,7 +898,15 @@ export class Bot {
         const climbing = CommIn.unPackInt8U();
 
         const player = this.players[id];
-        if (!player) return;
+        if (!player || player.id == this.me.id) {
+            for (let i2 = 0; i2 < 3 /* FramesBetweenSyncs */; i2++) {
+                CommIn.unPackInt8U();
+                CommIn.unPackRadU();
+                CommIn.unPackRad();
+                CommIn.unPackInt8U();
+            }
+            return;
+        }
 
         if (player.position.x !== x) player.position.x = x;
         if (player.position.z !== z) player.position.z = z;
@@ -912,24 +919,13 @@ export class Bot {
         if (this.intents.includes(this.Intents.BUFFERS)) {
             if (!player.buffer) return;
 
-            if (player.id == this.me.id) {
-                for (let i2 = 0; i2 < 3 /* FramesBetweenSyncs */; i2++) {
-                    CommIn.unPackInt8U();
-                    CommIn.unPackRadU();
-                    CommIn.unPackRad();
-                    CommIn.unPackInt8U();
-                }
-                return;
-            }
-
-            let yaw, pitch;
             for (let i2 = 0; i2 < 3; i2++) {
                 player.buffer[i2].controlKeys = CommIn.unPackInt8U();
 
-                yaw = CommIn.unPackRadU();
+                const yaw = CommIn.unPackRadU();
                 if (!isNaN(yaw)) player.buffer[i2].yaw_ = yaw
 
-                pitch = CommIn.unPackRad();
+                const pitch = CommIn.unPackRad();
                 if (!isNaN(pitch)) player.buffer[i2].pitch_ = pitch
 
                 CommIn.unPackInt8U();
@@ -1378,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;
@@ -1758,7 +1753,7 @@ export class Bot {
         return this.pathing.nodeList.hasLineOfSight(this.me.position, target.position);
     }
 
-    getBestTarget() {
+    getBestTarget(customFilter) {
         const options = Object.values(this.players)
             .filter((player) => player)
             .filter((player) => player !== this.me)
@@ -1766,7 +1761,8 @@ export class Bot {
             .filter((player) => player.hp > 0)
             .filter((player) => player.name !== this.me.name)
             .filter((player) => this.me.team === 0 || player.team !== this.me.team)
-            .filter((player) => this.canSee(player));
+            .filter((player) => this.canSee(player))
+            .filter((player) => !!customFilter(player));
 
         let minDistance = 200;
         let targetPlayer = null;
@@ -1873,7 +1869,7 @@ export class Bot {
         if (this.intents.includes(this.Intents.PLAYER_HEALTH))
             clearInterval(this.healthIntervalId);
 
-        clearInterval(this.updateInterval);
+        clearInterval(this.updateIntervalId);
 
         this.game.socket.close();
         this.matchmaker.close();

package/src/browser.js

@@ -1,15 +1,43 @@
-export { Bot } from './bot.js';
-export { GamePlayer } from './bot/GamePlayer.js';
+import { Bot } from './bot.js';
+import { GamePlayer } from './bot/GamePlayer.js';
 
-export { Matchmaker } from './matchmaker.js';
+import { Matchmaker } from './matchmaker.js';
 
-export { default as Dispatches } from './dispatches/index.js';
+import { default as Dispatches } from './dispatches/index.js';
 
-export * as API from './api.js';
-export * as Comm from './comm/index.js';
-export * as Packet from './packet.js';
+import * as API from './api.js';
+import * as Comm from './comm/index.js';
+import * as Packet from './packet.js';
 
-export * as Constants from './constants/index.js';
-export * as Guns from './constants/guns.js';
-export { Items } from './constants/items.js';
-export { Maps } from './constants/maps.js';
+import * as Constants from './constants/index.js';
+import * as Guns from './constants/guns.js';
+import { Items } from './constants/items.js';
+import { Maps } from './constants/maps.js';
+
+const yolkbot = {
+    Bot,
+    GamePlayer,
+    Matchmaker,
+    Dispatches,
+    API,
+    Comm,
+    Packet,
+    Constants,
+    Guns,
+    Items,
+    Maps
+};
+
+window.yolkbot = yolkbot;
+
+export { Bot };
+export { GamePlayer };
+export { Matchmaker };
+export { Dispatches };
+export { API };
+export { Comm };
+export { Packet };
+export { Constants };
+export { Guns };
+export { Items };
+export { Maps };

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

@@ -71,6 +71,8 @@ export const PlayTypes = {
     joinPrivate: 2
 }
 
+export const ProxiesEnabled = !IsBrowser && typeof Bun == 'undefined';
+
 export const ShellStreaks = {
     HardBoiled: 1,
     EggBreaker: 2,
@@ -80,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/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,13 +21,10 @@ 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);

package/src/pathing/mapnode.js

@@ -20,11 +20,14 @@ class NodeList {
     constructor(raw) {
         const now = Date.now();
         this.list = [];
-        const addedPositions = new Set();
+        const addedPositions = {};
 
         for (const meshName of Object.keys(raw.data)) {
             for (const nodeData of raw.data[meshName]) {
-                addedPositions.add(`${nodeData.x},${nodeData.y},${nodeData.z}`);
+                addedPositions[(
+                    (nodeData.x << 16) |
+                    (nodeData.y << 8) |
+                    (nodeData.z))] = true;
                 this.add(new MapNode(meshName, nodeData));
             }
         }
@@ -32,8 +35,11 @@ class NodeList {
         for (let x = 0; x < raw.width; x++) {
             for (let y = 0; y < raw.height; y++) {
                 for (let z = 0; z < raw.depth; z++) {
-                    const posKey = `${x},${y},${z}`;
-                    if (!addedPositions.has(posKey)) {
+                    if (!addedPositions[(
+                        (x << 16) |
+                        (y << 8) |
+                        (z)
+                    )]) {
                         this.add(new MapNode('SPECIAL.__yolkbot_air__.none', { x: x, y: y, z: z }));
                     }
                 }

package/src/socket.js

@@ -1,12 +1,11 @@
 import NodeWebSocket from 'ws';
 
-import { IsBrowser, UserAgent } from '#constants';
+import { IsBrowser, ProxiesEnabled, UserAgent } from '#constants';
 
-// eslint-disable-next-line no-undef
 const WS = IsBrowser ? window.WebSocket : NodeWebSocket;
 
 let SocksProxyAgent;
-if (!IsBrowser) SocksProxyAgent = (await import('smallsocks')).SocksProxyAgent;
+if (ProxiesEnabled) SocksProxyAgent = (await import('smallsocks')).SocksProxyAgent;
 
 class yolkws extends WS {
     constructor(url, proxy) {

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[];