yolkbot 1.4.7 → 1.5.0

package/dist/comm/CommIn.js

@@ -6,39 +6,37 @@ export class CommIn {
     this.idx = 0;
   }
   static isMoreDataAvailable() {
-    return Math.max(0, this.buffer.length - this.idx);
+    return this.buffer.length - this.idx;
   }
   static unPackInt8U() {
-    const i2 = this.idx;
-    this.idx++;
-    return this.buffer[i2];
+    return this.buffer[this.idx++];
   }
   static unPackInt8() {
     const v = this.unPackInt8U();
-    return (v + 128) % 256 - 128;
+    return v << 24 >> 24;
   }
   static unPackInt16U() {
     const i2 = this.idx;
     this.idx += 2;
-    return this.buffer[i2] + this.buffer[i2 + 1] * 256;
+    return this.buffer[i2] | this.buffer[i2 + 1] << 8;
   }
   static unPackInt24U() {
     const i2 = this.idx;
     this.idx += 3;
-    return this.buffer[i2] + this.buffer[i2 + 1] * 256 + this.buffer[i2 + 2] * 65536;
+    return this.buffer[i2] | this.buffer[i2 + 1] << 8 | this.buffer[i2 + 2] << 16;
   }
   static unPackInt32U() {
     const i2 = this.idx;
     this.idx += 4;
-    return this.buffer[i2] + this.buffer[i2 + 1] * 256 + this.buffer[i2 + 2] * 65536 + this.buffer[i2 + 3] * 16777216;
+    return (this.buffer[i2] | this.buffer[i2 + 1] << 8 | this.buffer[i2 + 2] << 16 | this.buffer[i2 + 3] << 24) >>> 0;
   }
   static unPackInt16() {
     const v = this.unPackInt16U();
-    return (v + 32768) % 65536 - 32768;
+    return v << 16 >> 16;
   }
   static unPackInt32() {
     const v = this.unPackInt32U();
-    return (v + 2147483648) % 4294967296 - 2147483648;
+    return v << 0;
   }
   static unPackRadU() {
     return this.unPackInt24U() / 2097152;
@@ -64,16 +62,15 @@ export class CommIn {
     return this.unPackStringHelper(len);
   }
   static unPackStringHelper(len) {
-    const remainder = this.isMoreDataAvailable();
-    if (remainder < len)
-      return 0;
-    let str = "";
-    for (let i2 = 0;i2 < len; i2++) {
+    if (this.isMoreDataAvailable() < len * 2)
+      return "";
+    const chars = [];
+    for (let i = 0;i < len; i++) {
       const c = this.unPackInt16U();
       if (c > 0)
-        str += String.fromCodePoint(c);
+        chars.push(String.fromCodePoint(c));
     }
-    return str;
+    return chars.join("");
   }
 }
 export default CommIn;

package/dist/comm/CommOut.js

@@ -2,32 +2,28 @@ export class CommOut {
   constructor(size = 16384) {
     this.idx = 0;
     this.arrayBuffer = new ArrayBuffer(size);
-    this.buffer = new Uint8Array(this.arrayBuffer, 0, size);
+    this.view = new DataView(this.arrayBuffer);
+    this.buffer = new Uint8Array(this.arrayBuffer);
   }
   send(ws2) {
     const b2 = new Uint8Array(this.arrayBuffer, 0, this.idx);
     ws2.send(b2);
   }
   packInt8(val) {
-    this.buffer[this.idx] = val & 255;
+    this.view.setInt8(this.idx, val);
     this.idx++;
   }
   packInt16(val) {
-    this.buffer[this.idx] = val & 255;
-    this.buffer[this.idx + 1] = val >> 8 & 255;
+    this.view.setInt16(this.idx, val, true);
     this.idx += 2;
   }
   packInt24(val) {
-    this.buffer[this.idx] = val & 255;
-    this.buffer[this.idx + 1] = val >> 8 & 255;
-    this.buffer[this.idx + 2] = val >> 16 & 255;
+    this.view.setInt16(this.idx, val & 65535, true);
+    this.view.setInt8(this.idx + 2, val >> 16 & 255);
     this.idx += 3;
   }
   packInt32(val) {
-    this.buffer[this.idx] = val & 255;
-    this.buffer[this.idx + 1] = val >> 8 & 255;
-    this.buffer[this.idx + 2] = val >> 16 & 255;
-    this.buffer[this.idx + 3] = val >> 24 & 255;
+    this.view.setInt32(this.idx, val, true);
     this.idx += 4;
   }
   packRadU(val) {
@@ -45,16 +41,20 @@ export class CommOut {
   packString(str) {
     if (typeof str !== "string")
       str = "";
+    if (str.length > 255) {
+      console.trace("truncated packString to fit int8 (shell protocol); this should not happen (report it on GitHub)");
+      str = str.slice(0, 255);
+    }
     this.packInt8(str.length);
-    for (let i2 = 0;i2 < str.length; i2++)
-      this.packInt16(str.charCodeAt(i2));
+    for (let i = 0;i < str.length; i++)
+      this.packInt16(str.charCodeAt(i));
   }
   packLongString(str) {
     if (typeof str !== "string")
       str = "";
     this.packInt16(str.length);
-    for (let i2 = 0;i2 < str.length; i2++)
-      this.packInt16(str.charCodeAt(i2));
+    for (let i = 0;i < str.length; i++)
+      this.packInt16(str.charCodeAt(i));
   }
 }
 export default CommOut;

package/dist/constants/CommCode.js

@@ -1,4 +1,4 @@
-const CommCode = {
+export const CommCode = {
   swapWeapon: 0,
   joinGame: 1,
   refreshGameState: 2,

package/dist/constants/findItemById.js

@@ -1,2 +1,3 @@
 import { Items } from "./items.js";
-export const findItemById = (id) => Items.find((item) => item.id === id);
+const itemsMap = new Map(Items.map((item) => [item.id, item]));
+export const findItemById = (id) => itemsMap.get(id);

package/dist/constants/guns.d.ts

@@ -1,14 +1,11 @@
 export interface GunAmmo {
-    rounds: number;
     capacity: number;
     reload: number;
     store: number;
-    storeMax: number;
     pickup: number;
 }
 
-declare class Gun {
-    // base props
+export type Gun = {
     ammo: GunAmmo;
 
     longReloadTime: number;
@@ -18,47 +15,25 @@ declare class Gun {
     internalName: string;
     standardMeshName: string;
 
-    automatic: boolean;
     damage: number;
     range: number;
-    recoil: number;
     rof: number;
     totalDamage: number;
     velocity: number;
-
-    accuracyMin: number;
-    accuracyMax: number;
-    accuracyLoss: number;
-    accuracyRecover: number;
-
-    // optional props
-    adsMod: number;
-    burst: number;
-    burstRof: number;
-    movementAccuracyMod: number;
-    radius: number;
-    reloadBloom: boolean;
-    reloadTimeMod: number;
-    tracer: number;
 }
 
-declare class Eggk47 extends Gun { }
-declare class DozenGauge extends Gun { }
-declare class CSG1 extends Gun { }
-declare class Cluck9mm extends Gun { }
-declare class RPEGG extends Gun { }
-declare class M24 extends Gun { }
-declare class AUG extends Gun { }
-
-export type AnyGun = Eggk47 | DozenGauge | CSG1 | Cluck9mm | RPEGG | SMG | M24 | AUG;
-
-export {
-    Eggk47,
-    DozenGauge,
-    CSG1,
-    Cluck9mm,
-    RPEGG,
-    SMG,
-    M24,
-    AUG
-}
+export declare const EggK47: Gun;
+export declare const DozenGauge: Gun;
+export declare const CSG1: Gun;
+export declare const Cluck9mm: Gun;
+export declare const RPEGG: Gun;
+export declare const SMG: Gun;
+export declare const M24: Gun;
+export declare const AUG: Gun;
+
+export type CreatedGun = Gun & {
+    ammo: GunAmmo & {
+        rounds: number;
+        storeMax: number;
+    }
+};

package/dist/constants/guns.js

@@ -1,272 +1,150 @@
-const BaseGun = class {
-  constructor() {
-    this.adsMod = 0.5;
-    this.burst = 0;
-    this.burstRof = 0;
-    this.movementAccuracyMod = 1;
-    this.radius = 0;
-    this.reloadBloom = true;
-    this.reloadTimeMod = 1;
-    this.tracer = 0;
-  }
+const EggK47 = {
+  ammo: {
+    capacity: 30,
+    reload: 30,
+    store: 240,
+    pickup: 30
+  },
+  longReloadTime: 205,
+  shortReloadTime: 160,
+  weaponName: "EggK-47",
+  internalName: "Eggk47",
+  standardMeshName: "eggk47",
+  damage: 30,
+  range: 20,
+  rof: 3,
+  totalDamage: 30,
+  velocity: 1.5
 };
-const Eggk47 = class _Eggk47 extends BaseGun {
-  constructor() {
-    super();
-    this.ammo = {
-      rounds: 30,
-      capacity: 30,
-      reload: 30,
-      store: 240,
-      storeMax: 240,
-      pickup: 30
-    };
-    this.longReloadTime = 205;
-    this.shortReloadTime = 160;
-    this.weaponName = "EggK-47";
-    this.internalName = "Eggk47";
-    this.standardMeshName = "eggk47";
-    this.automatic = true;
-    this.damage = 30;
-    this.range = 20;
-    this.recoil = 7;
-    this.rof = 3;
-    this.totalDamage = 30;
-    this.velocity = 1.5;
-    this.accuracyMin = 0.15;
-    this.accuracyMax = 0.03;
-    this.accuracyLoss = 0.05;
-    this.accuracyRecover = 0.025;
-    this.tracer = 1;
-  }
+const DozenGauge = {
+  ammo: {
+    capacity: 2,
+    reload: 2,
+    store: 24,
+    pickup: 8
+  },
+  longReloadTime: 155,
+  shortReloadTime: 155,
+  weaponName: "Scrambler",
+  internalName: "Dozen Gauge",
+  standardMeshName: "dozenGauge",
+  damage: 8.5,
+  range: 8,
+  rof: 8,
+  totalDamage: 170,
+  velocity: 1
 };
-const DozenGauge = class _DozenGauge extends BaseGun {
-  constructor() {
-    super();
-    this.ammo = {
-      rounds: 2,
-      capacity: 2,
-      reload: 2,
-      store: 24,
-      storeMax: 24,
-      pickup: 8
-    };
-    this.longReloadTime = 155;
-    this.shortReloadTime = 155;
-    this.weaponName = "Scrambler";
-    this.internalName = "Dozen Gauge";
-    this.standardMeshName = "dozenGauge";
-    this.automatic = false;
-    this.damage = 8.5;
-    this.range = 8;
-    this.recoil = 10;
-    this.rof = 8;
-    this.totalDamage = 170;
-    this.velocity = 1;
-    this.accuracyMin = 0.16;
-    this.accuracyMax = 0.13;
-    this.accuracyLoss = 0.17;
-    this.accuracyRecover = 0.02;
-    this.adsMod = 0.6;
-    this.movementAccuracyMod = 0.2;
-    this.tracer = 0;
-  }
+const CSG1 = {
+  ammo: {
+    capacity: 15,
+    reload: 15,
+    store: 60,
+    pickup: 15
+  },
+  longReloadTime: 225,
+  shortReloadTime: 165,
+  weaponName: "Free Ranger",
+  internalName: "CSG-1",
+  standardMeshName: "csg1",
+  damage: 105,
+  range: 50,
+  rof: 13,
+  totalDamage: 105,
+  velocity: 1.75
 };
-const CSG1 = class _CSG1 extends BaseGun {
-  constructor() {
-    super();
-    this.ammo = {
-      rounds: 15,
-      capacity: 15,
-      reload: 15,
-      store: 60,
-      storeMax: 60,
-      pickup: 15
-    };
-    this.longReloadTime = 225;
-    this.shortReloadTime = 165;
-    this.weaponName = "Free Ranger";
-    this.internalName = "CSG-1";
-    this.standardMeshName = "csg1";
-    this.automatic = false;
-    this.damage = 105;
-    this.range = 50;
-    this.recoil = 13;
-    this.rof = 13;
-    this.totalDamage = 105;
-    this.velocity = 1.75;
-    this.accuracyMin = 0.3;
-    this.accuracyMax = 0.004;
-    this.accuracyLoss = 0.3;
-    this.accuracyRecover = 0.025;
-    this.tracer = 0;
-  }
+const Cluck9mm = {
+  ammo: {
+    capacity: 15,
+    reload: 15,
+    store: 60,
+    pickup: 15
+  },
+  longReloadTime: 195,
+  shortReloadTime: 160,
+  weaponName: "Cluck 9mm",
+  internalName: "Cluck 9mm",
+  standardMeshName: "cluck9mm",
+  damage: 26,
+  range: 15,
+  rof: 4,
+  totalDamage: 26,
+  velocity: 1
 };
-const Cluck9mm = class _Cluck9mm extends BaseGun {
-  constructor() {
-    super();
-    this.ammo = {
-      rounds: 15,
-      capacity: 15,
-      reload: 15,
-      store: 60,
-      storeMax: 60,
-      pickup: 15
-    };
-    this.longReloadTime = 195;
-    this.shortReloadTime = 160;
-    this.weaponName = "Cluck 9mm";
-    this.internalName = "Cluck 9mm";
-    this.standardMeshName = "cluck9mm";
-    this.automatic = false;
-    this.damage = 26;
-    this.range = 15;
-    this.recoil = 6;
-    this.rof = 4;
-    this.totalDamage = 26;
-    this.velocity = 1;
-    this.accuracyMin = 0.15;
-    this.accuracyMax = 0.035;
-    this.accuracyLoss = 0.09;
-    this.accuracyRecover = 0.08;
-    this.adsMod = 0.8;
-    this.movementAccuracyMod = 0.6;
-    this.tracer = 0;
-  }
+const RPEGG = {
+  ammo: {
+    capacity: 1,
+    reload: 1,
+    store: 3,
+    pickup: 1
+  },
+  longReloadTime: 170,
+  shortReloadTime: 170,
+  weaponName: "RPEGG",
+  internalName: "Eggsploder",
+  standardMeshName: "rpegg",
+  damage: 140,
+  range: 45,
+  rof: 40,
+  totalDamage: 192.5,
+  velocity: 0.4
 };
-const RPEGG = class _RPEGG extends BaseGun {
-  constructor() {
-    super();
-    this.ammo = {
-      rounds: 1,
-      capacity: 1,
-      reload: 1,
-      store: 3,
-      storeMax: 3,
-      pickup: 1
-    };
-    this.longReloadTime = 170;
-    this.shortReloadTime = 170;
-    this.weaponName = "RPEGG";
-    this.internalName = "Eggsploder";
-    this.standardMeshName = "rpegg";
-    this.automatic = false;
-    this.damage = 140;
-    this.range = 45;
-    this.recoil = 60;
-    this.rof = 40;
-    this.totalDamage = 192.5;
-    this.velocity = 0.4;
-    this.accuracyMin = 0.3;
-    this.accuracyMax = 0.015;
-    this.accuracyLoss = 0.3;
-    this.accuracyRecover = 0.02;
-    this.radius = 2.75;
-  }
+const SMG = {
+  ammo: {
+    capacity: 40,
+    reload: 40,
+    store: 200,
+    pickup: 40
+  },
+  longReloadTime: 225,
+  shortReloadTime: 190,
+  weaponName: "Whipper",
+  internalName: "SMEGG",
+  standardMeshName: "smg",
+  damage: 23,
+  range: 20,
+  rof: 2,
+  totalDamage: 23,
+  velocity: 1.25
 };
-const SMG = class _SMG extends BaseGun {
-  constructor() {
-    super();
-    this.ammo = {
-      rounds: 40,
-      capacity: 40,
-      reload: 40,
-      store: 200,
-      storeMax: 200,
-      pickup: 40
-    };
-    this.longReloadTime = 225;
-    this.shortReloadTime = 190;
-    this.weaponName = "Whipper";
-    this.internalName = "SMEGG";
-    this.standardMeshName = "smg";
-    this.automatic = true;
-    this.damage = 23;
-    this.range = 20;
-    this.recoil = 7;
-    this.rof = 2;
-    this.totalDamage = 23;
-    this.velocity = 1.25;
-    this.accuracyMin = 0.19;
-    this.accuracyMax = 0.06;
-    this.accuracyLoss = 0.045;
-    this.accuracyRecover = 0.05;
-    this.adsMod = 0.6;
-    this.movementAccuracyMod = 0.7;
-    this.tracer = 2;
-  }
+const M24 = {
+  ammo: {
+    capacity: 1,
+    reload: 1,
+    store: 12,
+    pickup: 4
+  },
+  longReloadTime: 144,
+  shortReloadTime: 144,
+  weaponName: "Crackshot",
+  internalName: "M2DZ",
+  standardMeshName: "m24",
+  damage: 170,
+  range: 60,
+  rof: 15,
+  totalDamage: 170,
+  velocity: 2
 };
-const M24 = class _M24 extends BaseGun {
-  constructor() {
-    super();
-    this.ammo = {
-      rounds: 1,
-      capacity: 1,
-      reload: 1,
-      store: 12,
-      storeMax: 12,
-      pickup: 4
-    };
-    this.longReloadTime = 144;
-    this.shortReloadTime = 144;
-    this.weaponName = "Crackshot";
-    this.internalName = "M2DZ";
-    this.standardMeshName = "m24";
-    this.automatic = true;
-    this.damage = 170;
-    this.range = 60;
-    this.recoil = 20;
-    this.rof = 15;
-    this.totalDamage = 170;
-    this.velocity = 2;
-    this.accuracyMin = 0.35;
-    this.accuracyMax = 0;
-    this.accuracyLoss = 0.1;
-    this.accuracyRecover = 0.023;
-    this.movementAccuracyMod = 1.3;
-    this.reloadBloom = false;
-    this.reloadTimeMod = 0.8;
-    this.tracer = 0;
-  }
-};
-const AUG = class _AUG extends BaseGun {
-  constructor() {
-    super();
-    this.ammo = {
-      rounds: 24,
-      capacity: 24,
-      reload: 24,
-      store: 150,
-      storeMax: 150,
-      pickup: 24
-    };
-    this.longReloadTime = 205;
-    this.shortReloadTime = 160;
-    this.weaponName = "Tri-Hard";
-    this.internalName = "AUG";
-    this.standardMeshName = "aug";
-    this.automatic = false;
-    this.damage = 32;
-    this.range = 20;
-    this.recoil = 18;
-    this.rof = 15;
-    this.totalDamage = 34;
-    this.velocity = 1.5;
-    this.accuracyMin = 0.15;
-    this.accuracyMax = 0.03;
-    this.accuracyLoss = 0.037;
-    this.accuracyRecover = 0.03;
-    this.adsMod = 0.6;
-    this.burst = 3;
-    this.burstRof = 3;
-    this.movementAccuracyMod = 0.8;
-    this.movementInstability = 2;
-    this.tracer = 0;
-  }
+const AUG = {
+  ammo: {
+    capacity: 24,
+    reload: 24,
+    store: 150,
+    pickup: 24
+  },
+  longReloadTime: 205,
+  shortReloadTime: 160,
+  weaponName: "Tri-Hard",
+  internalName: "AUG",
+  standardMeshName: "aug",
+  damage: 32,
+  range: 20,
+  rof: 15,
+  totalDamage: 34,
+  velocity: 1.5
 };
 
 export {
-  Eggk47,
+  EggK47,
   DozenGauge,
   CSG1,
   Cluck9mm,

package/dist/constants/index.d.ts

@@ -1,4 +1,4 @@
-import { AUG, CSG1, DozenGauge, Eggk47, M24, RPEGG, SMG } from './guns';
+import { Gun } from './guns';
 
 export { findItemById } from './findItemById';
 
@@ -78,7 +78,7 @@ export declare const GameMode: {
     KOTC: number;
 };
 
-export declare const GameOptionFlags: {
+export declare const GameOptionFlag: {
     Locked: number;
     NoTeamChange: number;
     NoTeamShuffle: number;
@@ -86,7 +86,7 @@ export declare const GameOptionFlags: {
 
 export declare const GunEquipTime: number;
 
-export declare const GunList: Array<typeof Eggk47 | typeof DozenGauge | typeof CSG1 | typeof RPEGG | typeof SMG | typeof M24 | typeof AUG>;
+export declare const GunList: Array<Gun>;
 
 export declare const ItemType: {
     Hat: number;
@@ -108,10 +108,10 @@ export declare const Movement: {
     Scope: number;
 };
 
-export declare const PlayTypes: {
-    joinPublic: number;
-    createPrivate: number;
-    joinPrivate: number;
+export declare const PlayType: {
+    JoinPublic: number;
+    CreatePrivate: number;
+    JoinPrivate: number;
 };
 
 export declare const ShellStreak: {
@@ -150,6 +150,4 @@ export declare const Team: {
     Red: number;
 };
 
-export declare const URLRewards: string[];
-
 export declare const UserAgent: string;