yolkbot 1.4.8 → 1.5.1

package/dist/dispatches/ReportPlayerDispatch.js

@@ -16,22 +16,24 @@ export class ReportPlayerDispatch {
       if (this.reasons[i] === true)
         this.reasonInt |= 1 << i;
   }
-  validate(bot) {
-    if (this.reasons.every((reason) => reason === false))
+  $grabPlayer(bot) {
+    return bot.players[this.idOrName.toString()] || Object.values(bot.players).find((player) => player.name === this.idOrName.toString());
+  }
+  validate() {
+    if (typeof this.idOrName !== "string" && typeof this.idOrName !== "number")
       return false;
-    const target = bot.players[this.idOrName.toString()] || bot.players.find((player) => player.name === this.idOrName);
-    if (!target)
+    if (this.reasons.every((reason) => reason === false))
       return false;
     return true;
   }
   check(bot) {
     if (!bot.state.inGame)
       return false;
-    const target = bot.players[this.idOrName.toString()] || bot.players.find((player) => player.name === this.idOrName);
+    const target = this.$grabPlayer(bot);
     return !!target;
   }
   execute(bot) {
-    const target = bot.players[this.idOrName.toString()] || bot.players.find((player) => player.name === this.idOrName);
+    const target = this.$grabPlayer(bot);
     const out = new CommOut;
     out.packInt8(CommCode.reportPlayer);
     out.packString(target.uniqueId);

package/dist/dispatches/ResetGameDispatch.d.ts

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

package/dist/dispatches/SaveLoadoutDispatch.d.ts

@@ -11,7 +11,7 @@ export interface Changes {
     secondaryId?: number[];
 }
 
-export interface Opts {
+export interface LoadoutOptions {
     gunId?: number;
     hatId?: number;
     stampId?: number;
@@ -22,10 +22,12 @@ export interface Opts {
     secondaryIds?: number[];
 }
 
+export type Params = [loadoutOptions: LoadoutOptions];
+
 export class SaveLoadoutDispatch {
     changes: Changes;
 
-    constructor(opts: Opts);
+    constructor(...args: Params);
 
     validate(bot: Bot): boolean;
     check(bot: Bot): boolean;

package/dist/dispatches/SaveLoadoutDispatch.js

@@ -1,6 +1,8 @@
 import CommOut from "../comm/CommOut.js";
 import CommCode from "../constants/CommCode.js";
 import { findItemById, GunList, ItemType } from "../constants/index.js";
+import { createGun } from "../util.js";
+import { Intents } from "../enums.js";
 const isDefault = (itemId) => findItemById(itemId) && findItemById(itemId).unlock === "default";
 const isType = (itemId, type) => findItemById(itemId) && findItemById(itemId).item_type_id === type;
 
@@ -16,7 +18,7 @@ export class SaveLoadoutDispatch {
       primaryId: opts.primaryIds,
       secondaryId: opts.secondaryIds
     };
-    this.changes = Object.fromEntries(Object.entries(this.changes).filter(([, v]) => !!v));
+    this.changes = Object.fromEntries(Object.entries(this.changes).filter(([, v]) => typeof v !== "undefined"));
   }
   validate(bot) {
     const load = this.changes;
@@ -32,7 +34,7 @@ export class SaveLoadoutDispatch {
       return false;
     if (isType(load.meleeId, ItemType.Melee) && !isDefault(load.meleeId) && !bot.account.ownedItemIds.includes(load.meleeId))
       return false;
-    if (typeof load.classIdx === "number" && load.classIdx > 6 || load.classIdx < 0)
+    if (typeof load.classIdx === "number" && (load.classIdx > 6 || load.classIdx < 0))
       return false;
     if (this.changes.primaryId) {
       for (let i = 0;i < 7; i++) {
@@ -56,10 +58,9 @@ export class SaveLoadoutDispatch {
     return !bot.me.playing;
   }
   execute(bot) {
-    if (bot.me && this.changes.classIdx && this.changes.classIdx !== bot.me.selectedGun) {
-      bot.me.weapons[0] = new GunList[this.changes.classIdx];
-    }
-    bot.state.weaponIdx = this.changes.classIdx || bot.state.weaponIdx;
+    if (bot.me && typeof this.changes.classIdx !== "undefined" && this.changes.classIdx !== bot.me.selectedGun)
+      bot.me.weapons[0] = createGun(GunList[this.changes.classIdx]);
+    bot.state.weaponIdx = this.changes.classIdx ?? bot.state.weaponIdx;
     const loadout = {
       ...bot.account.loadout,
       ...this.changes
@@ -77,10 +78,10 @@ export class SaveLoadoutDispatch {
         if (bot.state.inGame) {
           const out = new CommOut;
           out.packInt8(CommCode.changeCharacter);
-          out.packInt8(this.changes?.classIdx || bot.me.selectedGun);
+          out.packInt8(this.changes?.classIdx ?? bot.me.selectedGun);
           out.send(bot.game.socket);
         }
-        const findCosmetics = bot.intents.includes(bot.Intents.COSMETIC_DATA);
+        const findCosmetics = bot.intents.includes(Intents.COSMETIC_DATA);
         Object.entries(this.changes).forEach(([changeKey, changeValue]) => {
           if (changeKey === "classIdx")
             bot.me.selectedGun = changeValue;

package/dist/dispatches/SpawnDispatch.d.ts

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

package/dist/dispatches/SpawnDispatch.js

@@ -1,14 +1,18 @@
 import CommOut from "../comm/CommOut.js";
 import CommCode from "../constants/CommCode.js";
+import { Intents } from "../enums.js";
 
 export class SpawnDispatch {
   validate() {
     return true;
   }
   check(bot) {
+    const respawnTime = bot.intents.includes(Intents.FASTER_RESPAWN) ? 5000 : 6000;
     if (bot.me.playing)
       return false;
-    if (bot.intents.includes(bot.Intents.OBSERVE_GAME))
+    if (bot.intents.includes(Intents.OBSERVE_GAME))
+      return false;
+    if (bot.lastDeathTime > 0 && bot.lastDeathTime + respawnTime > Date.now())
       return false;
     return true;
   }

package/dist/dispatches/SwapWeaponDispatch.d.ts

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

package/dist/dispatches/SwapWeaponDispatch.js

@@ -6,7 +6,7 @@ export class SwapWeaponDispatch {
     this.manualWeapon = manualWeapon;
   }
   validate() {
-    return typeof this.manualWeapon === "number" || typeof this.manualWeapon === "undefined";
+    return [0, 1].includes(this.manualWeapon) || typeof this.manualWeapon === "undefined";
   }
   check(bot) {
     return bot.me.playing && !bot.state.reloading && !bot.state.swappingGun && !bot.state.usingMelee;

package/dist/dispatches/SwitchTeamDispatch.d.ts

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

package/dist/dispatches/SwitchTeamDispatch.js

@@ -1,5 +1,6 @@
 import CommOut from "../comm/CommOut.js";
 import CommCode from "../constants/CommCode.js";
+import { Intents } from "../enums.js";
 
 export class SwitchTeamDispatch {
   validate() {
@@ -10,7 +11,7 @@ export class SwitchTeamDispatch {
       return false;
     if (bot.game.gameModeId === 0)
       return false;
-    if (bot.intents.includes(bot.Intents.OBSERVE_GAME))
+    if (bot.intents.includes(Intents.OBSERVE_GAME))
       return false;
     if (bot.game.isPrivate)
       return !bot.game.options.noTeamChange;

package/dist/dispatches/ThrowGrenadeDispatch.d.ts

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

package/dist/dispatches/index.d.ts

@@ -1,182 +1,105 @@
-import BanPlayerDispatch from './BanPlayerDispatch';
-import BootPlayerDispatch from './BootPlayerDispatch';
-import ChatDispatch from './ChatDispatch';
-import FireDispatch from './FireDispatch';
-import GameOptionsDispatch from './GameOptionsDispatch';
-import GoToAmmoDispatch from './GoToAmmoDispatch';
-import GoToCoopDispatch from './GoToCoopDispatch';
-import GoToGrenadeDispatch from './GoToGrenadeDispatch';
-import GoToPlayerDispatch from './GoToPlayerDispatch';
-import GoToSpatulaDispatch from './GoToSpatulaDispatch';
-import LookAtDispatch from './LookAtDispatch';
-import LookAtPosDispatch from './LookAtPosDispatch';
-import MeleeDispatch from './MeleeDispatch';
-import MovementDispatch from './MovementDispatch';
-import PauseDispatch from './PauseDispatch';
-import ReloadDispatch from './ReloadDispatch';
-import ReportPlayerDispatch from './ReportPlayerDispatch';
-import SaveLoadoutDispatch from './SaveLoadoutDispatch';
-import SpawnDispatch from './SpawnDispatch';
-import SwapWeaponDispatch from './SwapWeaponDispatch';
-import SwitchTeamDispatch from './SwitchTeamDispatch';
-import ThrowGrenadeDispatch from './ThrowGrenadeDispatch';
-
-declare module 'BanPlayerDispatch' {
-    export default BanPlayerDispatch;
-}
-
-declare module 'BootPlayerDispatch' {
-    export default BootPlayerDispatch;
-}
-
-declare module 'ChatDispatch' {
-    export default ChatDispatch;
-}
-
-declare module 'FireDispatch' {
-    export default FireDispatch;
-}
-
-declare module 'GameOptionsDispatch' {
-    export default GameOptionsDispatch;
-}
-
-declare module 'GoToAmmoDispatch' {
-    export default GoToAmmoDispatch;
-}
-
-declare module 'GoToCoopDispatch' {
-    export default GoToCoopDispatch;
-}
-
-declare module 'GoToGrenadeDispatch' {
-    export default GoToGrenadeDispatch;
-}
-
-declare module 'GoToPlayerDispatch' {
-    export default GoToPlayerDispatch;
-}
-
-declare module 'GoToSpatulaDispatch' {
-    export default GoToSpatulaDispatch;
-}
-
-declare module 'LookAtDispatch' {
-    export default LookAtDispatch;
-}
-
-declare module 'LookAtPosDispatch' {
-    export default LookAtPosDispatch;
-}
-
-declare module 'MeleeDispatch' {
-    export default MeleeDispatch;
-}
-
-declare module 'MovementDispatch' {
-    export default MovementDispatch;
-}
-
-declare module 'PauseDispatch' {
-    export default PauseDispatch;
-}
-
-declare module 'ReloadDispatch' {
-    export default ReloadDispatch;
-}
-
-declare module 'ReportPlayerDispatch' {
-    export default ReportPlayerDispatch;
-}
-
-declare module 'SaveLoadoutDispatch' {
-    export default SaveLoadoutDispatch;
-}
-
-declare module 'SpawnDispatch' {
-    export default SpawnDispatch;
-}
-
-declare module 'SwapWeaponDispatch' {
-    export default SwapWeaponDispatch;
-}
-
-declare module 'SwitchTeamDispatch' {
-    export default SwitchTeamDispatch;
-}
-
-declare module 'dispatches' {
-    export {
-        BanPlayerDispatch,
-        BootPlayerDispatch,
-        ChatDispatch,
-        FireDispatch,
-        GameOptionsDispatch,
-        GoToAmmoDispatch,
-        GoToCoopDispatch,
-        GoToGreandeDispatch,
-        GoToPlayerDispatch,
-        GoToSpatulaDispatch,
-        LookAtDispatch,
-        LookAtPosDispatch,
-        MeleeDispatch,
-        MovementDispatch,
-        PauseDispatch,
-        ReloadDispatch,
-        ReportPlayerDispatch,
-        SaveLoadoutDispatch,
-        SpawnDispatch,
-        SwapWeaponDispatch,
-        SwitchTeamDispatch
-    }
-
-    const dispatches: {
-        BanPlayerDispatch: typeof BanPlayerDispatch,
-        BootPlayerDispatch: typeof BootPlayerDispatch,
-        ChatDispatch: typeof ChatDispatch,
-        FireDispatch: typeof FireDispatch,
-        GameOptionsDispatch: typeof GameOptionsDispatch,
-        GoToAmmoDispatch: typeof GoToAmmoDispatch,
-        GoToCoopDispatch: typeof GoToCoopDispatch,
-        GoToGrenadeDispatch: typeof GoToGrenadeDispatch,
-        GoToPlayerDispatch: typeof GoToPlayerDispatch,
-        GoToSpatulaDispatch: typeof GoToSpatulaDispatch,
-        LookAtDispatch: typeof LookAtDispatch,
-        LookAtPosDispatch: typeof LookAtPosDispatch,
-        MeleeDispatch: typeof MeleeDispatch,
-        MovementDispatch: typeof MovementDispatch,
-        PauseDispatch: typeof PauseDispatch,
-        ReloadDispatch: typeof ReloadDispatch,
-        ReportPlayerDispatch: typeof ReportPlayerDispatch,
-        SaveLoadoutDispatch: typeof SaveLoadoutDispatch,
-        SpawnDispatch: typeof SpawnDispatch,
-        SwapWeaponDispatch: typeof SwapWeaponDispatch,
-        SwitchTeamDispatch: typeof SwitchTeamDispatch
-    };
-
-    export default dispatches;
-}
-
-export type ADispatch =
-    BanPlayerDispatch |
-    BootPlayerDispatch |
-    ChatDispatch |
-    FireDispatch |
-    GameOptionsDispatch |
-    GoToAmmoDispatch |
-    GoToCoopDispatch |
-    GoToGrenadeDispatch |
-    GoToPlayerDispatch |
-    GoToSpatulaDispatch |
-    LookAtDispatch |
-    LookAtPosDispatch |
-    MeleeDispatch |
-    MovementDispatch |
-    PauseDispatch |
-    ReloadDispatch |
-    ReportPlayerDispatch |
-    SaveLoadoutDispatch |
-    SpawnDispatch |
-    SwapWeaponDispatch |
-    SwitchTeamDispatch |
-    ThrowGrenadeDispatch;
+import BanPlayerDispatch, { Params as BanPlayerParams } from './BanPlayerDispatch';
+import BootPlayerDispatch, { Params as BootPlayerParams } from './BootPlayerDispatch';
+import ChatDispatch, { Params as ChatParams } from './ChatDispatch';
+import FireDispatch, { Params as FireParams } from './FireDispatch';
+import GameOptionsDispatch, { Params as GameOptionsParams } from './GameOptionsDispatch';
+import GoToAmmoDispatch, { Params as GoToAmmoParams } from './GoToAmmoDispatch';
+import GoToCoopDispatch, { Params as GoToCoopParams } from './GoToCoopDispatch';
+import GoToGrenadeDispatch, { Params as GoToGrenadeParams } from './GoToGrenadeDispatch';
+import GoToPlayerDispatch, { Params as GoToPlayerParams } from './GoToPlayerDispatch';
+import GoToSpatulaDispatch, { Params as GoToSpatulaParams } from './GoToSpatulaDispatch';
+import LookAtDispatch, { Params as LookAtParams } from './LookAtDispatch';
+import LookAtPosDispatch, { Params as LookAtPosParams } from './LookAtPosDispatch';
+import MeleeDispatch, { Params as MeleeParams } from './MeleeDispatch';
+import MovementDispatch, { Params as MovementParams } from './MovementDispatch';
+import PauseDispatch, { Params as PauseParams } from './PauseDispatch';
+import ReloadDispatch, { Params as ReloadParams } from './ReloadDispatch';
+import ReportPlayerDispatch, { Params as ReportPlayerParams } from './ReportPlayerDispatch';
+import ResetGameDispatch, { Params as ResetGameParams } from './ResetGameDispatch';
+import SaveLoadoutDispatch, { Params as SaveLoadoutParams } from './SaveLoadoutDispatch';
+import SpawnDispatch, { Params as SpawnParams } from './SpawnDispatch';
+import SwapWeaponDispatch, { Params as SwapWeaponParams } from './SwapWeaponDispatch';
+import SwitchTeamDispatch, { Params as SwitchTeamParams } from './SwitchTeamDispatch';
+import ThrowGrenadeDispatch, { Params as ThrowGrenadeParams } from './ThrowGrenadeDispatch';
+
+export interface DispatchParams {
+    banPlayer: BanPlayerParams;
+    bootPlayer: BootPlayerParams;
+    chat: ChatParams;
+    fire: FireParams;
+    gameOptions: GameOptionsParams;
+    goToAmmo: GoToAmmoParams;
+    goToCoop: GoToCoopParams;
+    goToGrenade: GoToGrenadeParams;
+    goToPlayer: GoToPlayerParams;
+    goToSpatula: GoToSpatulaParams;
+    lookAt: LookAtParams;
+    lookAtPos: LookAtPosParams;
+    melee: MeleeParams;
+    move: MovementParams;
+    pause: PauseParams;
+    reload: ReloadParams;
+    reportPlayer: ReportPlayerParams;
+    resetGame: ResetGameParams;
+    saveLoadout: SaveLoadoutParams;
+    spawn: SpawnParams;
+    swapWeapon: SwapWeaponParams;
+    switchTeam: SwitchTeamParams;
+    throwGrenade: ThrowGrenadeParams;
+}
+
+export declare const DispatchIndex: {
+    'banPlayer': typeof BanPlayerDispatch,
+    'bootPlayer': typeof BootPlayerDispatch,
+    'chat': typeof ChatDispatch,
+    'fire': typeof FireDispatch,
+    'gameOptions': typeof GameOptionsDispatch,
+    'goToAmmo': typeof GoToAmmoDispatch,
+    'goToCoop': typeof GoToCoopDispatch,
+    'goToGrenade': typeof GoToGrenadeDispatch,
+    'goToPlayer': typeof GoToPlayerDispatch,
+    'goToSpatula': typeof GoToSpatulaDispatch,
+    'lookAt': typeof LookAtDispatch,
+    'lookAtPos': typeof LookAtPosDispatch,
+    'melee': typeof MeleeDispatch,
+    'move': typeof MovementDispatch,
+    'pause': typeof PauseDispatch,
+    'reload': typeof ReloadDispatch,
+    'reportPlayer': typeof ReportPlayerDispatch,
+    'resetGame': typeof ResetGameDispatch,
+    'saveLoadout': typeof SaveLoadoutDispatch,
+    'spawn': typeof SpawnDispatch,
+    'swapWeapon': typeof SwapWeaponDispatch,
+    'switchTeam': typeof SwitchTeamDispatch,
+    'throwGrenade': typeof ThrowGrenadeDispatch
+}
+
+declare const _default: {
+    BanPlayerDispatch: typeof BanPlayerDispatch,
+    BootPlayerDispatch: typeof BootPlayerDispatch,
+    ChatDispatch: typeof ChatDispatch,
+    FireDispatch: typeof FireDispatch,
+    GameOptionsDispatch: typeof GameOptionsDispatch,
+    GoToAmmoDispatch: typeof GoToAmmoDispatch,
+    GoToCoopDispatch: typeof GoToCoopDispatch,
+    GoToGrenadeDispatch: typeof GoToGrenadeDispatch,
+    GoToPlayerDispatch: typeof GoToPlayerDispatch,
+    GoToSpatulaDispatch: typeof GoToSpatulaDispatch,
+    LookAtDispatch: typeof LookAtDispatch,
+    LookAtPosDispatch: typeof LookAtPosDispatch,
+    MeleeDispatch: typeof MeleeDispatch,
+    MovementDispatch: typeof MovementDispatch,
+    PauseDispatch: typeof PauseDispatch,
+    ReloadDispatch: typeof ReloadDispatch,
+    ReportPlayerDispatch: typeof ReportPlayerDispatch,
+    ResetGameDispatch: typeof ResetGameDispatch,
+    SaveLoadoutDispatch: typeof SaveLoadoutDispatch,
+    SpawnDispatch: typeof SpawnDispatch,
+    SwapWeaponDispatch: typeof SwapWeaponDispatch,
+    SwitchTeamDispatch: typeof SwitchTeamDispatch,
+    ThrowGrenadeDispatch: typeof ThrowGrenadeDispatch
+};
+
+export default _default;
+
+export type ADispatch = typeof DispatchIndex[keyof typeof DispatchIndex];

package/dist/dispatches/index.js

@@ -21,31 +21,30 @@ import SpawnDispatch from "./SpawnDispatch.js";
 import SwapWeaponDispatch from "./SwapWeaponDispatch.js";
 import SwitchTeamDispatch from "./SwitchTeamDispatch.js";
 import ThrowGrenadeDispatch from "./ThrowGrenadeDispatch.js";
-
-export {
-  BanPlayerDispatch,
-  BootPlayerDispatch,
-  ChatDispatch,
-  FireDispatch,
-  GameOptionsDispatch,
-  GoToAmmoDispatch,
-  GoToCoopDispatch,
-  GoToGrenadeDispatch,
-  GoToPlayerDispatch,
-  GoToSpatulaDispatch,
-  LookAtDispatch,
-  LookAtPosDispatch,
-  MeleeDispatch,
-  MovementDispatch,
-  PauseDispatch,
-  ReloadDispatch,
-  ReportPlayerDispatch,
-  ResetGameDispatch,
-  SaveLoadoutDispatch,
-  SpawnDispatch,
-  SwapWeaponDispatch,
-  SwitchTeamDispatch,
-  ThrowGrenadeDispatch
+export const DispatchIndex = {
+  banPlayer: BanPlayerDispatch,
+  bootPlayer: BootPlayerDispatch,
+  chat: ChatDispatch,
+  fire: FireDispatch,
+  gameOptions: GameOptionsDispatch,
+  goToAmmo: GoToAmmoDispatch,
+  goToCoop: GoToCoopDispatch,
+  goToGrenade: GoToGrenadeDispatch,
+  goToPlayer: GoToPlayerDispatch,
+  goToSpatula: GoToSpatulaDispatch,
+  lookAt: LookAtDispatch,
+  lookAtPos: LookAtPosDispatch,
+  melee: MeleeDispatch,
+  move: MovementDispatch,
+  pause: PauseDispatch,
+  reload: ReloadDispatch,
+  reportPlayer: ReportPlayerDispatch,
+  resetGame: ResetGameDispatch,
+  saveLoadout: SaveLoadoutDispatch,
+  spawn: SpawnDispatch,
+  swapWeapon: SwapWeaponDispatch,
+  switchTeam: SwitchTeamDispatch,
+  throwGrenade: ThrowGrenadeDispatch
 };
 export default {
   BanPlayerDispatch,