yolkbot 1.4.7 → 1.5.0

package/dist/constants/index.js

@@ -1,5 +1,4 @@
-import globals from "../env/globals.js";
-import { AUG, CSG1, DozenGauge, Eggk47, M24, RPEGG, SMG } from "./guns.js";
+import { AUG, CSG1, DozenGauge, EggK47, M24, RPEGG, SMG } from "./guns.js";
 export { findItemById } from "./findItemById.js";
 export const BanDuration = {
   FiveMinutes: 0,
@@ -54,7 +53,8 @@ export const CoopState = {
   Abandoned: 6,
   Unclaimed: 7
 };
-export const FirebaseKey = "AIzaSyDP4SIjKaw6A4c-zvfYxICpbEjn1rRnN50";
+const miniCodec = (s, k = 42) => s.split("").map((c) => String.fromCharCode(c.charCodeAt(0) ^ k)).join("");
+export const FirebaseKey = miniCodec("kcPKySnz\x1Eyc@aK]\x1Ck\x1EI\x07P\\LsRciZHo@D\x1BXxDd\x1F\x1A");
 export const FramesBetweenSyncs = 3;
 export const GameAction = {
   Reset: 1,
@@ -72,7 +72,7 @@ export const GameOptionFlag = {
   NoTeamShuffle: 4
 };
 export const GunEquipTime = 13;
-export const GunList = [Eggk47, DozenGauge, CSG1, RPEGG, SMG, M24, AUG];
+export const GunList = [EggK47, DozenGauge, CSG1, RPEGG, SMG, M24, AUG];
 export const ItemType = {
   Hat: 1,
   Stamp: 2,
@@ -127,13 +127,15 @@ export const Team = {
   Blue: 1,
   Red: 2
 };
-export const URLRewards = [
-  "giveBasketBrosReward",
-  "mercZoneFinalGift",
-  "midMonthGiveMeEggs",
-  "newYolkerSignupReward",
-  "newYolkerItemReward",
-  "newYolkerWelcomeBack",
-  "WelcomeBack"
+const latestChromeVersion = 143;
+const latestFirefoxVersion = 146;
+const agents = [
+  `Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/${latestChromeVersion}.0.0.0 Safari/537.36`,
+  `Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/${latestChromeVersion}.0.0.0 Safari/537.36`,
+  `Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:${latestFirefoxVersion}.0) Gecko/20100101 Firefox/${latestFirefoxVersion}.0`,
+  `Mozilla/5.0 (X11; Linux x86_64; rv:${latestFirefoxVersion}.0) Gecko/20100101 Firefox/${latestFirefoxVersion}.0`,
+  `Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/${latestChromeVersion}.0.0.0 Safari/537.36`,
+  `Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/${latestChromeVersion}.0.0.0 Safari/537.36 Edg/${latestChromeVersion}.0.0.0`,
+  `Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:${latestFirefoxVersion}.0) Gecko/20100101 Firefox/${latestFirefoxVersion}.0`
 ];
-export const UserAgent = globals.isBrowser ? null : "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.0.0 Safari/537.36";
+export const UserAgent = agents[Math.floor(Math.random() * agents.length)];

package/dist/dispatches/BanPlayerDispatch.d.ts

@@ -1,11 +1,13 @@
 import Bot from '../bot';
 
+export type Params = [uniqueId: string, duration: number, reason?: string];
+
 export declare class BanPlayerDispatch {
     uniqueId: string;
     duration: number;
     reason?: string;
 
-    constructor(uniqueId: string, duration: number, reason?: string);
+    constructor(...args: Params);
 
     validate(bot: Bot): boolean;
     check(bot: Bot): boolean;

package/dist/dispatches/BootPlayerDispatch.d.ts

@@ -1,9 +1,11 @@
 import Bot from '../bot';
 
+export type Params = [uniqueId: string];
+
 export declare class BootPlayerDispatch {
     uniqueId: string;
 
-    constructor(uniqueId: string);
+    constructor(...args: Params);
 
     validate(bot: Bot): boolean;
     check(bot: Bot): boolean;

package/dist/dispatches/ChatDispatch.d.ts

@@ -1,9 +1,11 @@
 import Bot from '../bot';
 
+export type Params = [msg: string];
+
 export declare class ChatDispatch {
     msg: string;
 
-    constructor(msg: string);
+    constructor(...args: Params);
 
     validate(bot: Bot): boolean;
     check(bot: Bot): boolean;

package/dist/dispatches/ChatDispatch.js

@@ -5,11 +5,13 @@ export class ChatDispatch {
   constructor(msg) {
     this.msg = msg;
   }
-  validate() {
+  validate(bot) {
     if (typeof this.msg !== "string")
       return false;
     if (this.msg.length < 1 || this.msg.length > 64)
       return false;
+    if (!bot.game.isPrivate && !bot.account.emailVerified && !bot.account.isAged && !bot.account.isCG)
+      return false;
     return true;
   }
   check(bot) {
@@ -17,8 +19,6 @@ export class ChatDispatch {
       return false;
     if (!bot.game.isPrivate && !bot.account.adminRoles && bot.state.chatLines >= 2)
       return false;
-    if (!bot.game.isPrivate && !bot.account.emailVerified && !bot.account.isAged)
-      return false;
     return true;
   }
   execute(bot) {

package/dist/dispatches/FireDispatch.d.ts

@@ -1,9 +1,11 @@
 import Bot from '../bot';
 
+export type Params = [amount?: number];
+
 export declare class FireDispatch {
     amount: number;
 
-    constructor(amount?: number);
+    constructor(...args: Params);
 
     validate(bot: Bot): boolean;
     check(bot: Bot): boolean;

package/dist/dispatches/GameOptionsDispatch.d.ts

@@ -19,10 +19,12 @@ export interface GameOptionChanges {
     rawWeaponsDisabled?: boolean[];
 }
 
+export type Params = [changes: GameOptionChanges];
+
 export declare class GameOptionsDispatch {
     changes: GameOptionChanges;
 
-    constructor(changes: GameOptionChanges);
+    constructor(...args: Params);
 
     validate(bot: Bot): boolean;
     check(bot: Bot): boolean;

package/dist/dispatches/GoToAmmoDispatch.d.ts

@@ -1,5 +1,7 @@
 import Bot from '../bot';
 
+export type Params = [];
+
 export class GoToAmmoDispatch {
     validate(bot: Bot): boolean;
     check(bot: Bot): boolean;

package/dist/dispatches/GoToAmmoDispatch.js

@@ -1,17 +1,16 @@
-import AStar from "../pathing/astar.js";
+import { Intents, PathfindError } from "../enums.js";
 
 export class GoToAmmoDispatch {
   validate(bot) {
-    return bot.intents.includes(bot.Intents.PATHFINDING);
+    return bot.intents.includes(Intents.PATHFINDING);
   }
   check(bot) {
-    return bot.me.playing && bot.game.collectables[0].length;
+    return bot.me.playing && bot.game.collectibles[0].length;
   }
   execute(bot) {
-    this.pather = new AStar(bot.pathing.nodeList);
-    let minDistance = 200;
+    let minDistance = 2000;
     let closestAmmo = null;
-    for (const ammo of bot.game.collectables[0]) {
+    for (const ammo of bot.game.collectibles[0]) {
       const dx = ammo.x - bot.me.position.x;
       const dy = ammo.y - bot.me.position.y;
       const dz = ammo.z - bot.me.position.z;
@@ -21,16 +20,16 @@ export class GoToAmmoDispatch {
         closestAmmo = ammo;
       }
     }
-    const position = Object.entries(bot.me.position).map((entry) => Math.floor(entry[1]));
-    const targetPos = Object.entries(closestAmmo).map((entry) => Math.floor(entry[1]));
-    const myNode = bot.pathing.nodeList.at(...position);
-    const targetNode = bot.pathing.nodeList.at(...targetPos);
-    bot.pathing.activePath = this.pather.path(myNode, targetNode);
-    if (!bot.pathing.activePath)
-      return bot.processError("no path found");
-    if (bot.pathing.activePath.length < 2)
-      return bot.processError("path too short");
-    bot.pathing.followingPath = true;
+    if (!closestAmmo)
+      return;
+    const myNode = bot.pathing.nodeList.atObject(bot.me.position);
+    const targetNode = bot.pathing.nodeList.atObject(closestAmmo);
+    const path = bot.pathing.astar.path(myNode, targetNode);
+    if (!path)
+      return bot.$emit("pathfindError", PathfindError.NoPathFound);
+    if (path.length < 2)
+      return bot.$emit("pathfindError", PathfindError.PathTooShort);
+    bot.pathing.activePath = path;
     bot.pathing.activeNode = bot.pathing.activePath[1];
     bot.pathing.activeNodeIdx = 1;
   }

package/dist/dispatches/GoToCoopDispatch.d.ts

@@ -1,5 +1,7 @@
 import Bot from '../bot';
 
+export type Params = [];
+
 export class GoToCoopDispatch {
     validate(bot: Bot): boolean;
     check(bot: Bot): boolean;

package/dist/dispatches/GoToCoopDispatch.js

@@ -1,36 +1,35 @@
-import AStar from "../pathing/astar.js";
+import { Intents, PathfindError } from "../enums.js";
 
 export class GoToCoopDispatch {
   validate(bot) {
-    return bot.intents.includes(bot.Intents.PATHFINDING);
+    return bot.intents.includes(Intents.PATHFINDING);
   }
   check(bot) {
-    return bot.me.playing && bot.game.zoneNumber && bot.game.activeZone;
+    return bot.me.playing && bot.game.kotc.zoneIdx && bot.game.kotc.activeZone;
   }
   execute(bot) {
-    this.pather = new AStar(bot.pathing.nodeList);
-    let minDistance = 200;
+    let minDistance = 20000;
     let closestZone = null;
-    for (const zone of bot.game.activeZone) {
-      const dx = zone.x - bot.me.position.x;
-      const dy = zone.y - bot.me.position.y;
-      const dz = zone.z - bot.me.position.z;
+    for (const zoneCoords of bot.game.kotc.activeZone) {
+      const dx = zoneCoords.x - bot.me.position.x;
+      const dy = zoneCoords.y - bot.me.position.y;
+      const dz = zoneCoords.z - bot.me.position.z;
       const distance = Math.sqrt(dx * dx + dy * dy + dz * dz);
       if (distance < minDistance) {
         minDistance = distance;
-        closestZone = zone;
+        closestZone = zoneCoords;
       }
     }
-    const position = Object.entries(bot.me.position).map((entry) => Math.floor(entry[1]));
-    const targetPos = Object.entries(closestZone).map((entry) => Math.floor(entry[1]));
-    const myNode = bot.pathing.nodeList.at(...position);
-    const targetNode = bot.pathing.nodeList.at(...targetPos);
-    bot.pathing.activePath = this.pather.path(myNode, targetNode);
-    if (!bot.pathing.activePath)
-      return bot.processError("no path found");
-    if (bot.pathing.activePath.length < 2)
-      return bot.processError("path too short");
-    bot.pathing.followingPath = true;
+    if (!closestZone)
+      return;
+    const myNode = bot.pathing.nodeList.atObject(bot.me.position);
+    const targetNode = bot.pathing.nodeList.atObject(closestZone);
+    const path = bot.pathing.astar.path(myNode, targetNode);
+    if (!path)
+      return bot.$emit("pathfindError", PathfindError.NoPathFound);
+    if (path.length < 2)
+      return bot.$emit("pathfindError", PathfindError.PathTooShort);
+    bot.pathing.activePath = path;
     bot.pathing.activeNode = bot.pathing.activePath[1];
     bot.pathing.activeNodeIdx = 1;
   }

package/dist/dispatches/GoToGrenadeDispatch.d.ts

@@ -1,5 +1,7 @@
 import Bot from '../bot';
 
+export type Params = [];
+
 export class GoToGrenadeDispatch {
     validate(bot: Bot): boolean;
     check(bot: Bot): boolean;

package/dist/dispatches/GoToGrenadeDispatch.js

@@ -1,17 +1,16 @@
-import AStar from "../pathing/astar.js";
+import { Intents, PathfindError } from "../enums.js";
 
 export class GoToGrenadeDispatch {
   validate(bot) {
-    return bot.intents.includes(bot.Intents.PATHFINDING);
+    return bot.intents.includes(Intents.PATHFINDING);
   }
   check(bot) {
-    return bot.me.playing && bot.game.collectables[1].length;
+    return bot.me.playing && bot.game.collectibles[1].length;
   }
   execute(bot) {
-    this.pather = new AStar(bot.pathing.nodeList);
-    let minDistance = 200;
+    let minDistance = 2000;
     let closestGrenade = null;
-    for (const grenade of bot.game.collectables[1]) {
+    for (const grenade of bot.game.collectibles[1]) {
       const dx = grenade.x - bot.me.position.x;
       const dy = grenade.y - bot.me.position.y;
       const dz = grenade.z - bot.me.position.z;
@@ -21,16 +20,16 @@ export class GoToGrenadeDispatch {
         closestGrenade = grenade;
       }
     }
-    const position = Object.entries(bot.me.position).map((entry) => Math.floor(entry[1]));
-    const targetPos = Object.entries(closestGrenade).map((entry) => Math.floor(entry[1]));
-    const myNode = bot.pathing.nodeList.at(...position);
-    const targetNode = bot.pathing.nodeList.at(...targetPos);
-    bot.pathing.activePath = this.pather.path(myNode, targetNode);
-    if (!bot.pathing.activePath)
-      return bot.processError("no path found");
-    if (bot.pathing.activePath.length < 2)
-      return bot.processError("path too short");
-    bot.pathing.followingPath = true;
+    if (!closestGrenade)
+      return;
+    const myNode = bot.pathing.nodeList.atObject(bot.me.position);
+    const targetNode = bot.pathing.nodeList.atObject(closestGrenade);
+    const path = bot.pathing.astar.path(myNode, targetNode);
+    if (!path)
+      return bot.$emit("pathfindError", PathfindError.NoPathFound);
+    if (path.length < 2)
+      return bot.$emit("pathfindError", PathfindError.PathTooShort);
+    bot.pathing.activePath = path;
     bot.pathing.activeNode = bot.pathing.activePath[1];
     bot.pathing.activeNodeIdx = 1;
   }

package/dist/dispatches/GoToPlayerDispatch.d.ts

@@ -1,9 +1,11 @@
 import Bot from '../bot';
 
+export type Params = [idOrName: string];
+
 export declare class GoToPlayerDispatch {
     idOrName: string;
 
-    constructor(idOrName: string);
+    constructor(...args: Params);
 
     validate(bot: Bot): boolean;
     check(bot: Bot): boolean;

package/dist/dispatches/GoToPlayerDispatch.js

@@ -1,37 +1,32 @@
-import AStar from "../pathing/astar.js";
+import { Intents, PathfindError } from "../enums.js";
 
 export class GoToPlayerDispatch {
   idOrName;
   constructor(idOrName) {
     this.idOrName = idOrName;
   }
+  $grabPlayer(bot) {
+    return bot.players[this.idOrName.toString()] || Object.values(bot.players).find((player) => player.name === this.idOrName.toString());
+  }
   validate(bot) {
-    if (!bot.intents.includes(bot.Intents.PATHFINDING))
-      return false;
-    if (!this.idOrName)
-      return false;
-    const target = bot.players[this.idOrName.toString()] || bot.players.find((player) => player.name === this.idOrName);
-    return !!target;
+    return bot.intents.includes(Intents.PATHFINDING) && (typeof this.idOrName === "string" || typeof this.idOrName === "number");
   }
   check(bot) {
     if (!bot.me.playing)
       return false;
-    const target = bot.players[this.idOrName.toString()] || bot.players.find((player) => player.name === this.idOrName);
-    return target && target.playing && target.position && target.position.x;
+    const target = this.$grabPlayer(bot);
+    return target && target.playing && target.position && Number.isFinite(target.position.x);
   }
   execute(bot) {
-    this.pather = new AStar(bot.pathing.nodeList);
-    const target = bot.players[this.idOrName.toString()] || bot.players.find((player) => player.name === this.idOrName);
-    const position = Object.entries(bot.me.position).map((entry) => Math.floor(entry[1]));
-    const targetPos = Object.entries(target.position).map((entry) => Math.floor(entry[1]));
-    const myNode = bot.pathing.nodeList.at(...position);
-    const targetNode = bot.pathing.nodeList.at(...targetPos);
-    bot.pathing.activePath = this.pather.path(myNode, targetNode);
-    if (!bot.pathing.activePath)
-      return bot.processError("no path found");
-    if (bot.pathing.activePath.length < 2)
-      return bot.processError("path too short");
-    bot.pathing.followingPath = true;
+    const target = this.$grabPlayer(bot);
+    const myNode = bot.pathing.nodeList.atObject(bot.me.position);
+    const targetNode = bot.pathing.nodeList.atObject(target.position);
+    const path = bot.pathing.astar.path(myNode, targetNode);
+    if (!path)
+      return bot.$emit("pathfindError", PathfindError.NoPathFound);
+    if (path.length < 2)
+      return bot.$emit("pathfindError", PathfindError.PathTooShort);
+    bot.pathing.activePath = path;
     bot.pathing.activeNode = bot.pathing.activePath[1];
     bot.pathing.activeNodeIdx = 1;
   }

package/dist/dispatches/GoToSpatulaDispatch.d.ts

@@ -1,5 +1,7 @@
 import Bot from '../bot';
 
+export type Params = [];
+
 export class GoToSpatulaDispatch {
     validate(bot: Bot): boolean;
     check(bot: Bot): boolean;

package/dist/dispatches/GoToSpatulaDispatch.js

@@ -1,24 +1,21 @@
-import AStar from "../pathing/astar.js";
+import { Intents, PathfindError } from "../enums.js";
 
 export class GoToSpatulaDispatch {
   validate(bot) {
-    return bot.intents.includes(bot.Intents.PATHFINDING);
+    return bot.intents.includes(Intents.PATHFINDING);
   }
   check(bot) {
-    return bot.me.playing && bot.game.spatula && bot.game.spatula.coords && bot.game.spatula.coords.x;
+    return bot.me.playing && bot.game.spatula && bot.game.spatula.coords && Number.isFinite(bot.game.spatula.coords.x);
   }
   execute(bot) {
-    this.pather = new AStar(bot.pathing.nodeList);
-    const position = Object.entries(bot.me.position).map((entry) => Math.floor(entry[1]));
-    const targetPos = Object.entries(bot.game.spatula.coords).map((entry) => Math.floor(entry[1]));
-    const myNode = bot.pathing.nodeList.at(...position);
-    const targetNode = bot.pathing.nodeList.at(...targetPos);
-    bot.pathing.activePath = this.pather.path(myNode, targetNode);
-    if (!bot.pathing.activePath)
-      return bot.processError("no path found");
-    if (bot.pathing.activePath.length < 2)
-      return bot.processError("path too short");
-    bot.pathing.followingPath = true;
+    const myNode = bot.pathing.nodeList.atObject(bot.me.position);
+    const targetNode = bot.pathing.nodeList.atObject(bot.game.spatula.coords);
+    const path = bot.pathing.astar.path(myNode, targetNode);
+    if (!path)
+      return bot.$emit("pathfindError", PathfindError.NoPathFound);
+    if (path.length < 2)
+      return bot.$emit("pathfindError", PathfindError.PathTooShort);
+    bot.pathing.activePath = path;
     bot.pathing.activeNode = bot.pathing.activePath[1];
     bot.pathing.activeNodeIdx = 1;
   }

package/dist/dispatches/LookAtDispatch.d.ts

@@ -1,9 +1,11 @@
 import Bot from '../bot';
 
+export type Params = [idOrName: string];
+
 declare class LookAtDispatch {
     idOrName: string;
 
-    constructor(idOrName: string);
+    constructor(...args: Params);
 
     validate(bot: Bot): boolean;
     check(bot: Bot): boolean;

package/dist/dispatches/LookAtDispatch.js

@@ -9,18 +9,20 @@ export class LookAtDispatch {
   constructor(idOrName) {
     this.idOrName = idOrName;
   }
-  validate(bot) {
-    const target = bot.players[this.idOrName.toString()] || bot.players.find((player) => player.name === this.idOrName);
-    return !!target;
+  $grabPlayer(bot) {
+    return bot.players[this.idOrName.toString()] || Object.values(bot.players).find((player) => player.name === this.idOrName.toString());
+  }
+  validate() {
+    return typeof this.idOrName === "string" || typeof this.idOrName === "number";
   }
   check(bot) {
     if (!bot.me.playing)
       return false;
-    const target = bot.players[this.idOrName.toString()] || bot.players.find((player) => player.name === this.idOrName);
-    return target && target.playing && target.position && target.position.x;
+    const target = this.$grabPlayer(bot);
+    return target && target.playing && target.position && Number.isFinite(target.position.x);
   }
   execute(bot) {
-    const target = bot.players[this.idOrName.toString()] || bot.players.find((player) => player.name === this.idOrName);
+    const target = this.$grabPlayer(bot);
     const directionVector = {
       x: target.position.x - bot.me.position.x,
       y: target.position.y - bot.me.position.y - 0.05,

package/dist/dispatches/LookAtPosDispatch.d.ts

@@ -1,10 +1,12 @@
 import Bot from '../bot';
 import { Position } from '../bot/GamePlayer';
 
+export type Params = [pos: Position];
+
 export declare class LookAtPosDispatch {
     pos: Position;
 
-    constructor(pos: Position);
+    constructor(...args: Params);
 
     validate(bot: Bot): boolean;
     check(bot: Bot): boolean;

package/dist/dispatches/LookAtPosDispatch.js

@@ -9,7 +9,7 @@ export class LookAtPosDispatch {
     this.pos = pos;
   }
   validate() {
-    return this.pos && this.pos.x && this.pos.y && this.pos.z;
+    return this.pos && Number.isFinite(this.pos.x) && Number.isFinite(this.pos.y) && Number.isFinite(this.pos.z);
   }
   check(bot) {
     return bot.me.playing;

package/dist/dispatches/MeleeDispatch.d.ts

@@ -1,5 +1,7 @@
 import Bot from '../bot';
 
+export type Params = [];
+
 export class MeleeDispatch {
     validate(bot: Bot): boolean;
     check(bot: Bot): boolean;

package/dist/dispatches/MeleeDispatch.js

@@ -13,12 +13,12 @@ export class MeleeDispatch {
     const out = new CommOut;
     out.packInt8(CommCode.melee);
     out.send(bot.game.socket);
-    bot.usingMelee = true;
+    bot.state.usingMelee = true;
     setTimeout(() => {
-      bot.usingMelee = false;
-      bot.swappingGun = true;
+      bot.state.usingMelee = false;
+      bot.state.swappingGun = true;
       setTimeout(() => {
-        bot.swappingGun = false;
+        bot.state.swappingGun = false;
       }, 0.5 * GunEquipTime);
     }, 100 / 3 * 17);
   }

package/dist/dispatches/MovementDispatch.d.ts

@@ -1,9 +1,11 @@
 import Bot from '../bot';
 
+export type Params = [controlKeys: number | number[]];
+
 export class MovementDispatch {
     inputKeys: number;
 
-    constructor(controlKeys: number | number[]);
+    constructor(...args: Params);
 
     validate(bot: Bot): boolean;
     check(bot: Bot): boolean;

package/dist/dispatches/MovementDispatch.js

@@ -4,7 +4,7 @@ export class MovementDispatch {
   constructor(inputKeys) {
     if (typeof inputKeys === "number")
       this.inputKeys = inputKeys;
-    else if (typeof inputKeys === "object")
+    else if (Array.isArray(inputKeys))
       this.inputKeys = inputKeys.reduce((a, b) => a | b, 0);
   }
   validate() {

package/dist/dispatches/PauseDispatch.d.ts

@@ -1,5 +1,7 @@
 import Bot from '../bot';
 
+export type Params = [];
+
 export class PauseDispatch {
     validate(bot: Bot): boolean;
     check(bot: Bot): boolean;

package/dist/dispatches/ReloadDispatch.d.ts

@@ -1,5 +1,7 @@
 import Bot from '../bot';
 
+export type Params = [];
+
 export class ReloadDispatch {
     validate(bot: Bot): boolean;
     check(bot: Bot): boolean;

package/dist/dispatches/ReloadDispatch.js

@@ -6,23 +6,30 @@ export class ReloadDispatch {
     return true;
   }
   check(bot) {
-    return bot.me.playing && !bot.state.reloading && !bot.state.swappingGun && !bot.state.usingMelee;
+    return bot.me.playing && !bot.state.reloading && !bot.state.swappingGun && !bot.state.usingMelee && bot.me.weapons[bot.me.activeGun].ammo?.rounds < bot.me.weapons[bot.me.activeGun].ammo?.capacity && bot.me.weapons[bot.me.activeGun].ammo?.store > 0;
   }
   execute(bot) {
     const out = new CommOut;
     out.packInt8(CommCode.reload);
     out.send(bot.game.socket);
     const playerActiveWeapon = bot.me.weapons[bot.me.activeGun];
-    if (playerActiveWeapon.ammo) {
-      const newRounds = Math.min(Math.min(playerActiveWeapon.ammo.capacity, playerActiveWeapon.ammo.reload) - playerActiveWeapon.ammo.rounds, playerActiveWeapon.ammo.store);
-      playerActiveWeapon.ammo.rounds += newRounds;
-      playerActiveWeapon.ammo.store -= newRounds;
-    }
-    bot.emit("playerReload", bot.me, playerActiveWeapon);
-    const activeWeapon = bot.me.weapons[bot.me.activeGun];
-    const isLongTime = activeWeapon.ammo.rounds < 1;
+    const isEmpty = playerActiveWeapon.ammo.rounds < 1;
+    bot.$emit("playerStartReload", bot.me, playerActiveWeapon);
     bot.state.reloading = true;
-    setTimeout(() => bot.state.reloading = false, isLongTime ? activeWeapon.longReloadTime : activeWeapon.shortReloadTime);
+    setTimeout(() => {
+      if (!bot.me || bot.hasQuit)
+        return;
+      bot.state.reloading = false;
+      const latestWeapon = bot.me.weapons[bot.me.activeGun];
+      if (latestWeapon.ammo) {
+        const maxLoad = Math.min(latestWeapon.ammo.capacity, latestWeapon.ammo.reload);
+        const needed = Math.max(0, maxLoad - latestWeapon.ammo.rounds);
+        const newRounds = Math.min(needed, latestWeapon.ammo.store);
+        latestWeapon.ammo.rounds += newRounds;
+        latestWeapon.ammo.store -= newRounds;
+      }
+      bot.$emit("playerEndReload", bot.me, latestWeapon);
+    }, isEmpty ? playerActiveWeapon.longReloadTime : playerActiveWeapon.shortReloadTime);
   }
 }
 export default ReloadDispatch;

package/dist/dispatches/ReportPlayerDispatch.d.ts

@@ -7,12 +7,14 @@ export interface CheatingReasons {
     other?: boolean;
 }
 
+export type Params = [idOrName: string, reasons?: CheatingReasons];
+
 export class ReportPlayerDispatch {
-    irOrName: string;
+    idOrName: string;
     reasons: boolean[];
     reasonInt: number;
 
-    constructor(idOrName: string, reasons?: CheatingReasons);
+    constructor(...args: Params);
 
     check(bot: Bot): boolean;
     execute(bot: Bot): void;