Upate types for 3.4.0

types/ErrorHandler.d.ts

@@ -0,0 +1,6 @@
+export declare class ErrorHandler {
+    private logger;
+    private readLine;
+    constructor();
+    handleCriticalError(err: any): void;
+}

types/Program.d.ts

@@ -1,4 +1,5 @@
 export declare class Program {
+    private errorHandler;
     constructor();
     start(): void;
 }

types/callbacks/BotCallbacks.d.ts

@@ -8,8 +8,29 @@ export declare class BotCallbacks {
     protected botController: BotController;
     protected httpResponse: HttpResponseUtil;
     constructor(botController: BotController, httpResponse: HttpResponseUtil);
+    /**
+     * Handle singleplayer/settings/bot/limit
+     * @returns string
+     */
     getBotLimit(url: string, info: IEmptyRequestData, sessionID: string): string;
+    /**
+     * Handle singleplayer/settings/bot/difficulty
+     * @returns string
+     */
     getBotDifficulty(url: string, info: IEmptyRequestData, sessionID: string): string;
+    /**
+     * Handle client/game/bot/generate
+     * @returns IGetBodyResponseData
+     */
     generateBots(url: string, info: IGenerateBotsRequestData, sessionID: string): IGetBodyResponseData<IBotBase[]>;
+    /**
+     * Handle singleplayer/settings/bot/maxCap
+     * @returns string
+     */
     getBotCap(): string;
+    /**
+     * Handle singleplayer/settings/bot/getBotBehaviours
+     * @returns string
+     */
+    getBotBehaviours(): string;
 }

types/callbacks/BundleCallbacks.d.ts

@@ -1,17 +1,17 @@
 import { BundleLoader } from "../loaders/BundleLoader";
 import { IHttpConfig } from "../models/spt/config/IHttpConfig";
-import { IHttpServer } from "../models/spt/server/IHttpServer";
 import { ILogger } from "../models/spt/utils/ILogger";
 import { ConfigServer } from "../servers/ConfigServer";
+import { HttpFileUtil } from "../utils/HttpFileUtil";
 import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 export declare class BundleCallbacks {
     protected logger: ILogger;
     protected httpResponse: HttpResponseUtil;
-    protected httpServer: IHttpServer;
+    protected httpFileUtil: HttpFileUtil;
     protected bundleLoader: BundleLoader;
     protected configServer: ConfigServer;
     protected httpConfig: IHttpConfig;
-    constructor(logger: ILogger, httpResponse: HttpResponseUtil, httpServer: IHttpServer, bundleLoader: BundleLoader, configServer: ConfigServer);
+    constructor(logger: ILogger, httpResponse: HttpResponseUtil, httpFileUtil: HttpFileUtil, bundleLoader: BundleLoader, configServer: ConfigServer);
     sendBundle(sessionID: string, req: any, resp: any, body: any): any;
     getBundles(url: string, info: any, sessionID: string): string;
     getBundle(url: string, info: any, sessionID: string): string;

types/callbacks/CustomizationCallbacks.d.ts

@@ -3,6 +3,7 @@ import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData";
 import { IPmcData } from "../models/eft/common/IPmcData";
 import { ISuit } from "../models/eft/common/tables/ITrader";
 import { IBuyClothingRequestData } from "../models/eft/customization/IBuyClothingRequestData";
+import { IGetSuitsResponse } from "../models/eft/customization/IGetSuitsResponse";
 import { IWearClothingRequestData } from "../models/eft/customization/IWearClothingRequestData";
 import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
 import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
@@ -13,10 +14,15 @@ export declare class CustomizationCallbacks {
     protected saveServer: SaveServer;
     protected httpResponse: HttpResponseUtil;
     constructor(customizationController: CustomizationController, saveServer: SaveServer, httpResponse: HttpResponseUtil);
-    getSuits(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<{
+    /**
-        _id: string;
+     * Handles client/trading/customization/storage
-        suites: string[];
+     * @returns
-    }>;
+     */
+    getSuits(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IGetSuitsResponse>;
+    /**
+     * Handles client/trading/customization
+     * @returns ISuit[]
+     */
     getTraderSuits(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<ISuit[]>;
     wearClothing(pmcData: IPmcData, body: IWearClothingRequestData, sessionID: string): IItemEventRouterResponse;
     buyClothing(pmcData: IPmcData, body: IBuyClothingRequestData, sessionID: string): IItemEventRouterResponse;

types/callbacks/DataCallbacks.d.ts

@@ -1,32 +1,59 @@
 import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData";
 import { IGlobals } from "../models/eft/common/IGlobals";
 import { ICustomizationItem } from "../models/eft/common/tables/ICustomizationItem";
+import { IHandbookBase } from "../models/eft/common/tables/IHandbookBase";
 import { IQuest } from "../models/eft/common/tables/IQuest";
 import { IHideoutArea } from "../models/eft/hideout/IHideoutArea";
 import { IHideoutProduction } from "../models/eft/hideout/IHideoutProduction";
 import { IHideoutScavCase } from "../models/eft/hideout/IHideoutScavCase";
 import { IHideoutSettingsBase } from "../models/eft/hideout/IHideoutSettingsBase";
 import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
-import { ILanguageBase } from "../models/spt/server/ILocaleBase";
 import { ISettingsBase } from "../models/spt/server/ISettingsBase";
 import { DatabaseServer } from "../servers/DatabaseServer";
 import { HttpResponseUtil } from "../utils/HttpResponseUtil";
+/**
+ * Handle client requests
+ */
 export declare class DataCallbacks {
     protected httpResponse: HttpResponseUtil;
     protected databaseServer: DatabaseServer;
     constructor(httpResponse: HttpResponseUtil, databaseServer: DatabaseServer);
+    /**
+     * Handles client/settings
+     * @returns ISettingsBase
+     */
     getSettings(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<ISettingsBase>;
+    /**
+     * Handles client/globals
+     * @returns IGlobals
+     */
     getGlobals(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IGlobals>;
+    /**
+     * Handles client/items
+     * @returns string
+     */
     getTemplateItems(url: string, info: IEmptyRequestData, sessionID: string): string;
-    getTemplateHandbook(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<any>;
+    /**
+     * Handles client/handbook/templates
+     * @returns IHandbookBase
+     */
+    getTemplateHandbook(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHandbookBase>;
+    /**
+     * Handles client/customization
+     * @returns Record<string, ICustomizationItem
+     */
     getTemplateSuits(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<Record<string, ICustomizationItem>>;
+    /**
+     * Handles client/account/customization
+     * @returns string[]
+     */
     getTemplateCharacter(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<string[]>;
     getTemplateQuests(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IQuest[]>;
     getHideoutSettings(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutSettingsBase>;
     getHideoutAreas(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutArea[]>;
     gethideoutProduction(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutProduction[]>;
     getHideoutScavcase(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutScavCase[]>;
-    getLocalesLanguages(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<ILanguageBase[]>;
+    getLocalesLanguages(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<Record<string, string>>;
-    getLocalesMenu(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<any>;
+    getLocalesMenu(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<string>;
     getLocalesGlobal(url: string, info: IEmptyRequestData, sessionID: string): string;
 }

types/callbacks/DialogueCallbacks.d.ts

@@ -1,6 +1,7 @@
 import { DialogueController } from "../controllers/DialogueController";
 import { OnUpdate } from "../di/OnUpdate";
 import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData";
+import { IChatServer } from "../models/eft/dialog/IChatServer";
 import { IFriendRequestData } from "../models/eft/dialog/IFriendRequestData";
 import { IGetAllAttachmentsRequestData } from "../models/eft/dialog/IGetAllAttachmentsRequestData";
 import { IGetAllAttachmentsResponse } from "../models/eft/dialog/IGetAllAttachmentsResponse";
@@ -26,20 +27,32 @@ export declare class DialogueCallbacks extends OnUpdate {
     protected httpResponse: HttpResponseUtil;
     protected dialogueController: DialogueController;
     constructor(hashUtil: HashUtil, timeUtil: TimeUtil, httpResponse: HttpResponseUtil, dialogueController: DialogueController);
+    /**
+     * Handles client/friend/list
+     * @returns IGetFriendListDataResponse
+     */
     getFriendList(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IGetFriendListDataResponse>;
-    getChatServerList(url: string, info: IGetChatServerListRequestData, sessionID: string): IGetBodyResponseData<any[]>;
+    /**
+     * Handles client/chatServer/list
+     * @returns
+     */
+    getChatServerList(url: string, info: IGetChatServerListRequestData, sessionID: string): IGetBodyResponseData<IChatServer[]>;
     getMailDialogList(url: string, info: IGetMailDialogListRequestData, sessionID: string): IGetBodyResponseData<DialogueInfo[]>;
     getMailDialogView(url: string, info: IGetMailDialogViewRequestData, sessionID: string): IGetBodyResponseData<IGetMailDialogViewResponseData>;
-    getMailDialogInfo(url: string, info: IGetMailDialogInfoRequestData, sessionID: string): IGetBodyResponseData<any>;
+    getMailDialogInfo(url: string, info: IGetMailDialogInfoRequestData, sessionID: string): IGetBodyResponseData<DialogueInfo>;
     removeDialog(url: string, info: IRemoveDialogRequestData, sessionID: string): IGetBodyResponseData<any[]>;
     pinDialog(url: string, info: IPinDialogRequestData, sessionID: string): IGetBodyResponseData<any[]>;
     unpinDialog(url: string, info: IPinDialogRequestData, sessionID: string): IGetBodyResponseData<any[]>;
     setRead(url: string, info: ISetDialogReadRequestData, sessionID: string): IGetBodyResponseData<any[]>;
+    /**
+     * Handles client/mail/dialog/getAllAttachments
+     * @returns IGetAllAttachmentsResponse
+     */
     getAllAttachments(url: string, info: IGetAllAttachmentsRequestData, sessionID: string): IGetBodyResponseData<IGetAllAttachmentsResponse>;
     listOutbox(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<any[]>;
     listInbox(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<any[]>;
     friendRequest(url: string, request: IFriendRequestData, sessionID: string): INullResponseData;
     sendMessage(url: string, request: ISendMessageRequest, sessionID: string): IGetBodyResponseData<number>;
-    onUpdate(timeSinceLastRun: number): boolean;
+    onUpdate(timeSinceLastRun: number): Promise<boolean>;
     getRoute(): string;
 }

types/callbacks/GameCallbacks.d.ts

@@ -1,8 +1,13 @@
 import { GameController } from "../controllers/GameController";
 import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData";
+import { ICheckVersionResponse } from "../models/eft/game/ICheckVersionResponse";
 import { IGameConfigResponse } from "../models/eft/game/IGameConfigResponse";
 import { IGameEmptyCrcRequestData } from "../models/eft/game/IGameEmptyCrcRequestData";
+import { IGameKeepAliveResponse } from "../models/eft/game/IGameKeepAliveResponse";
+import { IGameLogoutResponseData } from "../models/eft/game/IGameLogoutResponseData";
+import { IGameStartResponse } from "../models/eft/game/IGameStartResponse";
 import { IReportNicknameRequestData } from "../models/eft/game/IReportNicknameRequestData";
+import { IServerDetails } from "../models/eft/game/IServerDetails";
 import { IVersionValidateRequestData } from "../models/eft/game/IVersionValidateRequestData";
 import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
 import { INullResponseData } from "../models/eft/httpResponse/INullResponseData";
@@ -13,13 +18,37 @@ declare class GameCallbacks {
     protected watermark: Watermark;
     protected gameController: GameController;
     constructor(httpResponse: HttpResponseUtil, watermark: Watermark, gameController: GameController);
+    /**
+     * Handle client/game/version/validate
+     * @returns INullResponseData
+     */
     versionValidate(url: string, info: IVersionValidateRequestData, sessionID: string): INullResponseData;
-    gameStart(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<any>;
+    /**
-    gameLogout(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<any>;
+     * Handle client/game/start
+     * @returns IGameStartResponse
+     */
+    gameStart(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IGameStartResponse>;
+    /**
+     * Handle client/game/logout
+     * @returns IGameLogoutResponseData
+     */
+    gameLogout(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IGameLogoutResponseData>;
+    /**
+     * Handle client/game/config
+     * @returns IGameConfigResponse
+     */
     getGameConfig(url: string, info: IGameEmptyCrcRequestData, sessionID: string): IGetBodyResponseData<IGameConfigResponse>;
-    getServer(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<any>;
+    getServer(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IServerDetails[]>;
-    validateGameVersion(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<any>;
+    validateGameVersion(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<ICheckVersionResponse>;
-    gameKeepalive(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<any>;
+    /**
+     * Handle client/game/keepalive
+     * @returns IGameKeepAliveResponse
+     */
+    gameKeepalive(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IGameKeepAliveResponse>;
+    /**
+     * Handle singleplayer/settings/version
+     * @returns string
+     */
     getVersion(url: string, info: IEmptyRequestData, sessionID: string): string;
     reportNickname(url: string, info: IReportNicknameRequestData, sessionID: string): INullResponseData;
 }

types/callbacks/HandbookCallbacks.d.ts

@@ -3,6 +3,6 @@ import { OnLoad } from "../di/OnLoad";
 export declare class HandbookCallbacks extends OnLoad {
     protected handbookController: HandbookController;
     constructor(handbookController: HandbookController);
-    onLoad(): void;
+    onLoad(): Promise<void>;
     getRoute(): string;
 }

types/callbacks/HealthCallbacks.d.ts

@@ -21,7 +21,19 @@ export declare class HealthCallbacks {
      * @returns empty response, no data sent back to client
      */
     syncHealth(url: string, info: ISyncHealthRequestData, sessionID: string): IGetBodyResponseData<string>;
+    /**
+     * Handle Eat
+     * @returns IItemEventRouterResponse
+     */
     offraidEat(pmcData: IPmcData, body: IOffraidEatRequestData, sessionID: string): IItemEventRouterResponse;
+    /**
+     * Handle Heal
+     * @returns IItemEventRouterResponse
+     */
     offraidHeal(pmcData: IPmcData, body: IOffraidHealRequestData, sessionID: string): IItemEventRouterResponse;
+    /**
+     * Handle RestoreHealth
+     * @returns IItemEventRouterResponse
+     */
     healthTreatment(pmcData: IPmcData, info: IHealthTreatmentRequestData, sessionID: string): IItemEventRouterResponse;
 }

types/callbacks/HideoutCallbacks.d.ts

@@ -19,15 +19,78 @@ export declare class HideoutCallbacks extends OnUpdate {
     protected hideoutConfig: IHideoutConfig;
     constructor(hideoutController: HideoutController, // TODO: delay needed
     configServer: ConfigServer);
+    /**
+     * Handle HideoutUpgrade
+     * @param pmcData
+     * @param body
+     * @param sessionID
+     * @returns
+     */
     upgrade(pmcData: IPmcData, body: IHideoutUpgradeRequestData, sessionID: string): IItemEventRouterResponse;
+    /**
+     * Handle HideoutUpgradeComplete
+     * @param pmcData
+     * @param body
+     * @param sessionID
+     * @returns
+     */
     upgradeComplete(pmcData: IPmcData, body: IHideoutUpgradeCompleteRequestData, sessionID: string): IItemEventRouterResponse;
+    /**
+     * Handle HideoutPutItemsInAreaSlots
+     * @param pmcData
+     * @param body
+     * @param sessionID
+     * @returns
+     */
     putItemsInAreaSlots(pmcData: IPmcData, body: IHideoutPutItemInRequestData, sessionID: string): IItemEventRouterResponse;
+    /**
+     * Handle HideoutTakeItemsFromAreaSlots
+     * @param pmcData
+     * @param body
+     * @param sessionID
+     * @returns
+     */
     takeItemsFromAreaSlots(pmcData: IPmcData, body: IHideoutTakeItemOutRequestData, sessionID: string): IItemEventRouterResponse;
+    /**
+     * Handle HideoutToggleArea
+     * @param pmcData
+     * @param body
+     * @param sessionID
+     * @returns
+     */
     toggleArea(pmcData: IPmcData, body: IHideoutToggleAreaRequestData, sessionID: string): IItemEventRouterResponse;
+    /**
+     * Handle HideoutSingleProductionStart
+     * @param pmcData
+     * @param body
+     * @param sessionID
+     * @returns
+     */
     singleProductionStart(pmcData: IPmcData, body: IHideoutSingleProductionStartRequestData, sessionID: string): IItemEventRouterResponse;
+    /**
+     * Handle HideoutScavCaseProductionStart
+     * @param pmcData
+     * @param body
+     * @param sessionID
+     * @returns
+     */
     scavCaseProductionStart(pmcData: IPmcData, body: IHideoutScavCaseStartRequestData, sessionID: string): IItemEventRouterResponse;
+    /**
+     * Handle HideoutContinuousProductionStart
+     * @param pmcData
+     * @param body
+     * @param sessionID
+     * @returns
+     */
     continuousProductionStart(pmcData: IPmcData, body: IHideoutContinousProductionStartRequestData, sessionID: string): IItemEventRouterResponse;
+    /**
+     * Handle HideoutTakeProduction
+     * @param pmcData
+     * @param body
+     * @param sessionID
+     * @returns
+     */
     takeProduction(pmcData: IPmcData, body: IHideoutTakeProductionRequestData, sessionID: string): IItemEventRouterResponse;
-    onUpdate(timeSinceLastRun: number): boolean;
+    onUpdate(timeSinceLastRun: number): Promise<boolean>;
     getRoute(): string;
 }

types/callbacks/HttpCallbacks.d.ts

@@ -1,9 +1,9 @@
 import { OnLoad } from "../di/OnLoad";
-import { IHttpServer } from "../models/spt/server/IHttpServer";
+import { HttpServer } from "../servers/HttpServer";
 export declare class HttpCallbacks extends OnLoad {
-    protected httpServer: IHttpServer;
+    protected httpServer: HttpServer;
-    constructor(httpServer: IHttpServer);
+    constructor(httpServer: HttpServer);
-    onLoad(): void;
+    onLoad(): Promise<void>;
     getRoute(): string;
     getImage(): string;
 }

types/callbacks/InraidCallbacks.d.ts

@@ -1,23 +1,49 @@
 import { InraidController } from "../controllers/InraidController";
-import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData";
 import { INullResponseData } from "../models/eft/httpResponse/INullResponseData";
 import { IRegisterPlayerRequestData } from "../models/eft/inRaid/IRegisterPlayerRequestData";
 import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData";
-import { IAirdropConfig } from "../models/spt/config/IAirdropConfig";
-import { IInRaidConfig } from "../models/spt/config/IInRaidConfig";
-import { ConfigServer } from "../servers/ConfigServer";
 import { HttpResponseUtil } from "../utils/HttpResponseUtil";
+/**
+ * Handle client requests
+ */
 export declare class InraidCallbacks {
     protected inraidController: InraidController;
     protected httpResponse: HttpResponseUtil;
-    protected configServer: ConfigServer;
+    constructor(inraidController: InraidController, httpResponse: HttpResponseUtil);
-    protected airdropConfig: IAirdropConfig;
+    /**
-    protected inraidConfig: IInRaidConfig;
+     * Handle client/location/getLocalloot
-    constructor(inraidController: InraidController, httpResponse: HttpResponseUtil, configServer: ConfigServer);
+     * @param url
+     * @param info register player request
+     * @param sessionID Session id
+     * @returns Null http response
+     */
     registerPlayer(url: string, info: IRegisterPlayerRequestData, sessionID: string): INullResponseData;
+    /**
+     * Handle raid/profile/save
+     * @param url
+     * @param info Save progress request
+     * @param sessionID Session id
+     * @returns Null http response
+     */
     saveProgress(url: string, info: ISaveProgressRequestData, sessionID: string): INullResponseData;
+    /**
+     * Handle singleplayer/settings/raid/endstate
+     * @returns
+     */
     getRaidEndState(): string;
-    getRaidMenuSettings(url: string, info: IEmptyRequestData, sessionID: string): string;
+    /**
-    getWeaponDurability(url: string, info: any, sessionID: string): string;
+     * Handle singleplayer/settings/raid/menu
-    getAirdropConfig(url: string, info: any, sessionID: string): string;
+     * @returns JSON as string
+     */
+    getRaidMenuSettings(): string;
+    /**
+     * Handle singleplayer/settings/weapon/durability
+     * @returns
+     */
+    getWeaponDurability(): string;
+    /**
+     * Handle singleplayer/airdrop/config
+     * @returns JSON as string
+     */
+    getAirdropConfig(): string;
 }

types/callbacks/InsuranceCallbacks.d.ts

@@ -17,8 +17,16 @@ export declare class InsuranceCallbacks extends OnUpdate {
     protected configServer: ConfigServer;
     protected insuranceConfig: IInsuranceConfig;
     constructor(insuranceController: InsuranceController, insuranceService: InsuranceService, httpResponse: HttpResponseUtil, configServer: ConfigServer);
+    /**
+     * Handle client/insurance/items/list/cost
+     * @returns IGetInsuranceCostResponseData
+     */
     getInsuranceCost(url: string, info: IGetInsuranceCostRequestData, sessionID: string): IGetBodyResponseData<IGetInsuranceCostResponseData>;
+    /**
+     * Handle Insure
+     * @returns IItemEventRouterResponse
+     */
     insure(pmcData: IPmcData, body: IInsureRequestData, sessionID: string): IItemEventRouterResponse;
-    onUpdate(secondsSinceLastRun: number): boolean;
+    onUpdate(secondsSinceLastRun: number): Promise<boolean>;
     getRoute(): string;
 }

types/callbacks/InventoryCallbacks.d.ts

@@ -16,6 +16,7 @@ import { IInventorySwapRequestData } from "../models/eft/inventory/IInventorySwa
 import { IInventoryTagRequestData } from "../models/eft/inventory/IInventoryTagRequestData";
 import { IInventoryToggleRequestData } from "../models/eft/inventory/IInventoryToggleRequestData";
 import { IInventoryTransferRequestData } from "../models/eft/inventory/IInventoryTransferRequestData";
+import { IOpenRandomLootContainerRequestData } from "../models/eft/inventory/IOpenRandomLootContainerRequestData";
 import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
 export declare class InventoryCallbacks {
     protected inventoryController: InventoryController;
@@ -36,4 +37,5 @@ export declare class InventoryCallbacks {
     createMapMarker(pmcData: IPmcData, body: IInventoryCreateMarkerRequestData, sessionID: string): IItemEventRouterResponse;
     deleteMapMarker(pmcData: IPmcData, body: IInventoryDeleteMarkerRequestData, sessionID: string): IItemEventRouterResponse;
     editMapMarker(pmcData: IPmcData, body: IInventoryEditMarkerRequestData, sessionID: string): IItemEventRouterResponse;
+    openRandomLootContainer(pmcData: IPmcData, body: IOpenRandomLootContainerRequestData, sessionID: string): IItemEventRouterResponse;
 }

types/callbacks/ItemEventCallbacks.d.ts

@@ -1,4 +1,5 @@
 import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
+import { Warning } from "../models/eft/itemEvent/IItemEventRouterBase";
 import { IItemEventRouterRequest } from "../models/eft/itemEvent/IItemEventRouterRequest";
 import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
 import { ItemEventRouter } from "../routers/ItemEventRouter";
@@ -8,4 +9,5 @@ export declare class ItemEventCallbacks {
     protected itemEventRouter: ItemEventRouter;
     constructor(httpResponse: HttpResponseUtil, itemEventRouter: ItemEventRouter);
     handleEvents(url: string, info: IItemEventRouterRequest, sessionID: string): IGetBodyResponseData<IItemEventRouterResponse>;
+    protected getErrorCode(warnings: Warning[]): number;
 }

types/callbacks/MatchCallbacks.d.ts

@@ -34,6 +34,10 @@ export declare class MatchCallbacks {
     serverAvailable(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<any> | IGetBodyResponseData<true>;
     joinMatch(url: string, info: IJoinMatchRequestData, sessionID: string): IGetBodyResponseData<IJoinMatchResult[]>;
     getMetrics(url: string, info: any, sessionID: string): IGetBodyResponseData<string>;
+    /**
+     * Handle client/match/group/status
+     * @returns
+     */
     getGroupStatus(url: string, info: IGetGroupStatusRequestData, sessionID: string): IGetBodyResponseData<any>;
     createGroup(url: string, info: ICreateGroupRequestData, sessionID: string): IGetBodyResponseData<any>;
     deleteGroup(url: string, info: any, sessionID: string): INullResponseData;

types/callbacks/ModCallbacks.d.ts

@@ -1,19 +1,21 @@
 import { OnLoad } from "../di/OnLoad";
 import { PostAkiModLoader } from "../loaders/PostAkiModLoader";
 import { IHttpConfig } from "../models/spt/config/IHttpConfig";
-import { IHttpServer } from "../models/spt/server/IHttpServer";
 import { ILogger } from "../models/spt/utils/ILogger";
 import { ConfigServer } from "../servers/ConfigServer";
+import { LocalisationService } from "../services/LocalisationService";
+import { HttpFileUtil } from "../utils/HttpFileUtil";
 import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 declare class ModCallbacks extends OnLoad {
     protected logger: ILogger;
     protected httpResponse: HttpResponseUtil;
-    protected httpServer: IHttpServer;
+    protected httpFileUtil: HttpFileUtil;
     protected postAkiModLoader: PostAkiModLoader;
+    protected localisationService: LocalisationService;
     protected configServer: ConfigServer;
     protected httpConfig: IHttpConfig;
-    constructor(logger: ILogger, httpResponse: HttpResponseUtil, httpServer: IHttpServer, postAkiModLoader: PostAkiModLoader, configServer: ConfigServer);
+    constructor(logger: ILogger, httpResponse: HttpResponseUtil, httpFileUtil: HttpFileUtil, postAkiModLoader: PostAkiModLoader, localisationService: LocalisationService, configServer: ConfigServer);
-    onLoad(): void;
+    onLoad(): Promise<void>;
     getRoute(): string;
     sendBundle(sessionID: string, req: any, resp: any, body: any): void;
     getBundles(url: string, info: any, sessionID: string): string;

types/callbacks/NotifierCallbacks.d.ts

@@ -4,6 +4,7 @@ import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData";
 import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
 import { INotifierChannel } from "../models/eft/notifier/INotifier";
 import { ISelectProfileRequestData } from "../models/eft/notifier/ISelectProfileRequestData";
+import { ISelectProfileResponse } from "../models/eft/notifier/ISelectProfileResponse";
 import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 export declare class NotifierCallbacks {
     protected httpServerHelper: HttpServerHelper;
@@ -19,6 +20,10 @@ export declare class NotifierCallbacks {
     sendNotification(sessionID: string, req: any, resp: any, data: any): void;
     getNotifier(url: string, info: any, sessionID: string): IGetBodyResponseData<any[]>;
     createNotifierChannel(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<INotifierChannel>;
-    selectProfile(url: string, info: ISelectProfileRequestData, sessionID: string): IGetBodyResponseData<any>;
+    /**
+     * Handle client/game/profile/select
+     * @returns ISelectProfileResponse
+     */
+    selectProfile(url: string, info: ISelectProfileRequestData, sessionID: string): IGetBodyResponseData<ISelectProfileResponse>;
     notify(url: string, info: any, sessionID: string): string;
 }

types/callbacks/PresetCallbacks.d.ts

@@ -3,6 +3,6 @@ import { OnLoad } from "../di/OnLoad";
 export declare class PresetCallbacks extends OnLoad {
     protected presetController: PresetController;
     constructor(presetController: PresetController);
-    onLoad(): void;
+    onLoad(): Promise<void>;
     getRoute(): string;
 }

types/callbacks/QuestCallbacks.d.ts

@@ -21,6 +21,13 @@ export declare class QuestCallbacks {
     acceptQuest(pmcData: IPmcData, body: IAcceptQuestRequestData, sessionID: string): IItemEventRouterResponse;
     completeQuest(pmcData: IPmcData, body: ICompleteQuestRequestData, sessionID: string): IItemEventRouterResponse;
     handoverQuest(pmcData: IPmcData, body: IHandoverQuestRequestData, sessionID: string): IItemEventRouterResponse;
+    /**
+     * Handle client/quest/list
+     * @param url
+     * @param info
+     * @param sessionID
+     * @returns
+     */
     listQuests(url: string, info: IListQuestsRequestData, sessionID: string): IGetBodyResponseData<IQuest[]>;
     activityPeriods(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IPmcDataRepeatableQuest[]>;
 }

types/callbacks/RagfairCallbacks.d.ts

@@ -14,7 +14,6 @@ import { IRemoveOfferRequestData } from "../models/eft/ragfair/IRemoveOfferReque
 import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData";
 import { ISendRagfairReportRequestData } from "../models/eft/ragfair/ISendRagfairReportRequestData";
 import { IRagfairConfig } from "../models/spt/config/IRagfairConfig";
-import { ILogger } from "../models/spt/utils/ILogger";
 import { ConfigServer } from "../servers/ConfigServer";
 import { RagfairServer } from "../servers/RagfairServer";
 import { HttpResponseUtil } from "../utils/HttpResponseUtil";
@@ -24,21 +23,20 @@ import { JsonUtil } from "../utils/JsonUtil";
  */
 export declare class RagfairCallbacks extends OnLoadOnUpdate {
     protected httpResponse: HttpResponseUtil;
-    protected logger: ILogger;
     protected jsonUtil: JsonUtil;
     protected ragfairServer: RagfairServer;
     protected ragfairController: RagfairController;
     protected configServer: ConfigServer;
     protected ragfairConfig: IRagfairConfig;
-    constructor(httpResponse: HttpResponseUtil, logger: ILogger, jsonUtil: JsonUtil, ragfairServer: RagfairServer, ragfairController: RagfairController, configServer: ConfigServer);
+    constructor(httpResponse: HttpResponseUtil, jsonUtil: JsonUtil, ragfairServer: RagfairServer, ragfairController: RagfairController, configServer: ConfigServer);
-    onLoad(): void;
+    onLoad(): Promise<void>;
     getRoute(): string;
     search(url: string, info: ISearchRequestData, sessionID: string): IGetBodyResponseData<IGetOffersResult>;
     getMarketPrice(url: string, info: IGetMarketPriceRequestData, sessionID: string): IGetBodyResponseData<IGetItemPriceResult>;
-    getItemPrices(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<any>;
+    getItemPrices(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<Record<string, number>>;
     addOffer(pmcData: IPmcData, info: IAddOfferRequestData, sessionID: string): IItemEventRouterResponse;
     removeOffer(pmcData: IPmcData, info: IRemoveOfferRequestData, sessionID: string): IItemEventRouterResponse;
     extendOffer(pmcData: IPmcData, info: IExtendOfferRequestData, sessionID: string): IItemEventRouterResponse;
-    onUpdate(timeSinceLastRun: number): boolean;
+    onUpdate(timeSinceLastRun: number): Promise<boolean>;
     sendReport(url: string, info: ISendRagfairReportRequestData, sessionID: string): INullResponseData;
 }

types/callbacks/RepairCallbacks.d.ts

@@ -6,6 +6,20 @@ import { ITraderRepairActionDataRequest } from "../models/eft/repair/ITraderRepa
 export declare class RepairCallbacks {
     protected repairController: RepairController;
     constructor(repairController: RepairController);
+    /**
+     * use trader to repair item
+     * @param pmcData
+     * @param body
+     * @param sessionID
+     * @returns
+     */
     traderRepair(pmcData: IPmcData, body: ITraderRepairActionDataRequest, sessionID: string): IItemEventRouterResponse;
+    /**
+     * Use repair kit to repair item
+     * @param pmcData
+     * @param body
+     * @param sessionID
+     * @returns
+     */
     repair(pmcData: IPmcData, body: IRepairActionDataRequest, sessionID: string): IItemEventRouterResponse;
 }

types/callbacks/SaveCallbacks.d.ts

@@ -3,7 +3,7 @@ import { SaveServer } from "../servers/SaveServer";
 export declare class SaveCallbacks extends OnLoadOnUpdate {
     protected saveServer: SaveServer;
     constructor(saveServer: SaveServer);
-    onLoad(): void;
+    onLoad(): Promise<void>;
     getRoute(): string;
-    onUpdate(secondsSinceLastRun: number): boolean;
+    onUpdate(secondsSinceLastRun: number): Promise<boolean>;
 }

types/callbacks/TraderCallbacks.d.ts

@@ -8,10 +8,14 @@ export declare class TraderCallbacks extends OnLoadOnUpdate {
     protected httpResponse: HttpResponseUtil;
     protected traderController: TraderController;
     constructor(httpResponse: HttpResponseUtil, traderController: TraderController);
-    onLoad(): void;
+    onLoad(): Promise<void>;
-    onUpdate(): boolean;
+    onUpdate(): Promise<boolean>;
     getRoute(): string;
     getTraderSettings(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<ITraderBase[]>;
+    /**
+     * Handle client/trading/api/getUserAssortPrice/trader
+     * @returns
+     */
     getProfilePurchases(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<Record<string, IBarterScheme[][]>>;
     getTrader(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<ITraderBase>;
     getAssort(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<ITraderAssort>;

types/callbacks/WeatherCallbacks.d.ts

@@ -1,10 +1,15 @@
 import { WeatherController } from "../controllers/WeatherController";
 import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData";
 import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
+import { IWeatherData } from "../models/eft/weather/IWeatherData";
 import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 export declare class WeatherCallbacks {
     protected httpResponse: HttpResponseUtil;
     protected weatherController: WeatherController;
     constructor(httpResponse: HttpResponseUtil, weatherController: WeatherController);
-    getWeather(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<any>;
+    /**
+     * Handle client/weather
+     * @returns IWeatherData
+     */
+    getWeather(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IWeatherData>;
 }

types/context/ApplicationContext.d.ts

@@ -3,6 +3,15 @@ import { ContextVariableType } from "./ContextVariableType";
 export declare class ApplicationContext {
     private variables;
     private static holderMaxSize;
+    /**
+     * Called like:
+     *
+     * const registerPlayerInfo = this.applicationContext.getLatestValue(ContextVariableType.REGISTER_PLAYER_REQUEST).getValue<IRegisterPlayerRequestData>();
+     *
+     * const matchInfo = this.applicationContext.getLatestValue(ContextVariableType.MATCH_INFO).getValue<IStartOfflineRaidRequestData>();
+     * @param type
+     * @returns
+     */
     getLatestValue(type: ContextVariableType): ContextVariable;
     getValues(type: ContextVariableType): ContextVariable[];
     addValue(type: ContextVariableType, value: any): void;

types/context/ContextVariableType.d.ts

@@ -1,4 +1,10 @@
 export declare enum ContextVariableType {
+    /** Logged in users session id */
     SESSION_ID = 0,
-    MATCH_INFO = 1
+    /** Currently acive raid information */
+    MATCH_INFO = 1,
+    /** Timestamp when client first connected */
+    CLIENT_START_TIMESTAMP = 2,
+    /** When player is loading into map and loot is requested */
+    REGISTER_PLAYER_REQUEST = 3
 }

types/controllers/BotController.d.ts

@@ -1,5 +1,9 @@
+import { ApplicationContext } from "../context/ApplicationContext";
 import { BotGenerator } from "../generators/BotGenerator";
+import { BotDifficultyHelper } from "../helpers/BotDifficultyHelper";
 import { BotHelper } from "../helpers/BotHelper";
+import { ProfileHelper } from "../helpers/ProfileHelper";
+import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper";
 import { IGenerateBotsRequestData } from "../models/eft/bot/IGenerateBotsRequestData";
 import { IBotBase } from "../models/eft/common/tables/IBotBase";
 import { IBotCore } from "../models/eft/common/tables/IBotCore";
@@ -9,23 +13,34 @@ import { ILogger } from "../models/spt/utils/ILogger";
 import { ConfigServer } from "../servers/ConfigServer";
 import { DatabaseServer } from "../servers/DatabaseServer";
 import { BotGenerationCacheService } from "../services/BotGenerationCacheService";
-import { PmcAiService } from "../services/PmcAiService";
+import { LocalisationService } from "../services/LocalisationService";
+import { JsonUtil } from "../utils/JsonUtil";
 export declare class BotController {
     protected logger: ILogger;
     protected databaseServer: DatabaseServer;
     protected botGenerator: BotGenerator;
     protected botHelper: BotHelper;
-    protected pmcAiService: PmcAiService;
+    protected botDifficultyHelper: BotDifficultyHelper;
     protected botGenerationCacheService: BotGenerationCacheService;
+    protected localisationService: LocalisationService;
+    protected weightedRandomHelper: WeightedRandomHelper;
+    protected profileHelper: ProfileHelper;
     protected configServer: ConfigServer;
+    protected applicationContext: ApplicationContext;
+    protected jsonUtil: JsonUtil;
     protected botConfig: IBotConfig;
-    constructor(logger: ILogger, databaseServer: DatabaseServer, botGenerator: BotGenerator, botHelper: BotHelper, pmcAiService: PmcAiService, botGenerationCacheService: BotGenerationCacheService, configServer: ConfigServer);
+    static readonly pmcTypeLabel = "PMC";
+    constructor(logger: ILogger, databaseServer: DatabaseServer, botGenerator: BotGenerator, botHelper: BotHelper, botDifficultyHelper: BotDifficultyHelper, botGenerationCacheService: BotGenerationCacheService, localisationService: LocalisationService, weightedRandomHelper: WeightedRandomHelper, profileHelper: ProfileHelper, configServer: ConfigServer, applicationContext: ApplicationContext, jsonUtil: JsonUtil);
     /**
      * Return the number of bot loadout varieties to be generated
      * @param type bot Type we want the loadout gen count for
-     * @returns
+     * @returns number of bots to generate
      */
     getBotPresetGenerationLimit(type: string): number;
+    /**
+     * Get the core.json difficulty settings from database\bots
+     * @returns IBotCore
+     */
     getBotCoreDifficulty(): IBotCore;
     /**
      * Get bot difficulty settings
@@ -35,7 +50,24 @@ export declare class BotController {
      * @returns Difficulty object
      */
     getBotDifficulty(type: string, difficulty: string): Difficulty;
-    protected getPmcDifficultySettings(pmcType: "bear" | "usec", difficulty: string, usecType: string, bearType: string): Difficulty;
+    /**
+     * Generate bot profiles and store in cache
+     * @param sessionId Session id
+     * @param info bot generation request info
+     * @returns IBotBase array
+     */
     generate(sessionId: string, info: IGenerateBotsRequestData): IBotBase[];
+    /**
+     * Get the difficulty passed in, if its not "asoline", get selected difficulty from config
+     * @param requestedDifficulty
+     * @returns
+     */
+    getPMCDifficulty(requestedDifficulty: string): string;
+    /**
+     * Get the max number of bots allowed on a map
+     * Looks up location player is entering when getting cap value
+     * @returns cap number
+     */
     getBotCap(): number;
+    getPmcBotTypes(): Record<string, Record<string, Record<string, number>>>;
 }

types/controllers/CustomizationController.d.ts

@@ -5,16 +5,18 @@ import { IBuyClothingRequestData } from "../models/eft/customization/IBuyClothin
 import { IWearClothingRequestData } from "../models/eft/customization/IWearClothingRequestData";
 import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
 import { ILogger } from "../models/spt/utils/ILogger";
-import { ItemEventRouter } from "../routers/ItemEventRouter";
+import { EventOutputHolder } from "../routers/EventOutputHolder";
 import { DatabaseServer } from "../servers/DatabaseServer";
 import { SaveServer } from "../servers/SaveServer";
+import { LocalisationService } from "../services/LocalisationService";
 export declare class CustomizationController {
     protected logger: ILogger;
-    protected itemEventRouter: ItemEventRouter;
+    protected eventOutputHolder: EventOutputHolder;
     protected databaseServer: DatabaseServer;
     protected saveServer: SaveServer;
+    protected localisationService: LocalisationService;
     protected profileHelper: ProfileHelper;
-    constructor(logger: ILogger, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, saveServer: SaveServer, profileHelper: ProfileHelper);
+    constructor(logger: ILogger, eventOutputHolder: EventOutputHolder, databaseServer: DatabaseServer, saveServer: SaveServer, localisationService: LocalisationService, profileHelper: ProfileHelper);
     getTraderSuits(traderID: string, sessionID: string): ISuit[];
     wearClothing(pmcData: IPmcData, body: IWearClothingRequestData, sessionID: string): IItemEventRouterResponse;
     buyClothing(pmcData: IPmcData, body: IBuyClothingRequestData, sessionID: string): IItemEventRouterResponse;

types/controllers/DialogueController.d.ts

@@ -2,24 +2,78 @@ import { DialogueHelper } from "../helpers/DialogueHelper";
 import { IGetAllAttachmentsResponse } from "../models/eft/dialog/IGetAllAttachmentsResponse";
 import { IGetFriendListDataResponse } from "../models/eft/dialog/IGetFriendListDataResponse";
 import { IGetMailDialogViewResponseData } from "../models/eft/dialog/IGetMailDialogViewResponseData";
-import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
 import { DialogueInfo, Message } from "../models/eft/profile/IAkiProfile";
 import { SaveServer } from "../servers/SaveServer";
-import { HttpResponseUtil } from "../utils/HttpResponseUtil";
+import { TimeUtil } from "../utils/TimeUtil";
 export declare class DialogueController {
-    protected httpResponse: HttpResponseUtil;
     protected saveServer: SaveServer;
+    protected timeUtil: TimeUtil;
     protected dialogueHelper: DialogueHelper;
-    constructor(httpResponse: HttpResponseUtil, saveServer: SaveServer, dialogueHelper: DialogueHelper);
+    constructor(saveServer: SaveServer, timeUtil: TimeUtil, dialogueHelper: DialogueHelper);
+    update(): void;
     getFriendList(sessionID: string): IGetFriendListDataResponse;
-    generateDialogueList(sessionID: string): IGetBodyResponseData<DialogueInfo[]>;
+    /**
+     * Create array holding trader dialogs and mail interactions with player
+     * Set the content of the dialogue on the list tab.
+     * @param sessionID Session Id
+     * @returns array of dialogs
+     */
+    generateDialogueList(sessionID: string): DialogueInfo[];
+    /**
+     * Get the content of a dialogue
+     * @param dialogueID Dialog id
+     * @param sessionID Session Id
+     * @returns DialogueInfo
+     */
     getDialogueInfo(dialogueID: string, sessionID: string): DialogueInfo;
+    /**
+     * Handle player clicking 'messenger' and seeing all the messages they've recieved
+     * Set the content of the dialogue on the details panel, showing all the messages
+     * for the specified dialogue.
+     * @param dialogueID Dialog id
+     * @param sessionID Session id
+     * @returns IGetMailDialogViewResponseData object
+     */
     generateDialogueView(dialogueID: string, sessionID: string): IGetMailDialogViewResponseData;
+    /**
+     * Get a count of messages with attachments from a particular dialog
+     * @param sessionID Session id
+     * @param dialogueID Dialog id
+     * @returns Count of messages with attachments
+     */
+    protected getUnreadMessagesWithAttachmentsCount(sessionID: string, dialogueID: string): number;
+    /**
+     * Does array have messages with uncollected rewards (includes expired rewards)
+     * @param messages Messages to check
+     * @returns true if uncollected rewards found
+     */
+    protected messagesHaveUncollectedRewards(messages: Message[]): boolean;
     removeDialogue(dialogueID: string, sessionID: string): void;
     setDialoguePin(dialogueID: string, shouldPin: boolean, sessionID: string): void;
     setRead(dialogueIDs: string[], sessionID: string): void;
+    /**
+     * Get all uncollected items attached to mail in a particular dialog
+     * @param dialogueID Dialog to get mail attachments from
+     * @param sessionID Session id
+     * @returns
+     */
     getAllAttachments(dialogueID: string, sessionID: string): IGetAllAttachmentsResponse;
-    protected messagesHaveUncollectedRewards(messages: Message[]): boolean;
+    /**
+     * Get messages from a specific dialog that have items not expired
+     * @param sessionId Session id
+     * @param dialogueId Dialog to get mail attachments from
+     * @returns Message array
+     */
+    protected getActiveMessagesFromDialog(sessionId: string, dialogueId: string): Message[];
+    /**
+     * Return array of messages with uncollected items (includes expired)
+     * @param messages Messages to parse
+     * @returns messages with items to collect
+     */
+    protected getMessagesWithAttachments(messages: Message[]): Message[];
+    /**
+     * Delete expired items. triggers when updating traders.
+     * @param sessionID Session id
+     */
     protected removeExpiredItems(sessionID: string): void;
-    update(): void;
 }

types/controllers/GameController.d.ts

@@ -1,29 +1,56 @@
+import { ApplicationContext } from "../context/ApplicationContext";
 import { HttpServerHelper } from "../helpers/HttpServerHelper";
 import { ProfileHelper } from "../helpers/ProfileHelper";
+import { PreAkiModLoader } from "../loaders/PreAkiModLoader";
 import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData";
+import { IPmcData } from "../models/eft/common/IPmcData";
+import { ICheckVersionResponse } from "../models/eft/game/ICheckVersionResponse";
 import { IGameConfigResponse } from "../models/eft/game/IGameConfigResponse";
+import { IServerDetails } from "../models/eft/game/IServerDetails";
 import { IAkiProfile } from "../models/eft/profile/IAkiProfile";
 import { ICoreConfig } from "../models/spt/config/ICoreConfig";
 import { IHttpConfig } from "../models/spt/config/IHttpConfig";
 import { ILogger } from "../models/spt/utils/ILogger";
 import { ConfigServer } from "../servers/ConfigServer";
-import { LocaleService } from "../services/LocaleService";
+import { DatabaseServer } from "../servers/DatabaseServer";
+import { LocalisationService } from "../services/LocalisationService";
 import { ProfileFixerService } from "../services/ProfileFixerService";
-import { Watermark } from "../utils/Watermark";
+import { SeasonalEventService } from "../services/SeasonalEventService";
 export declare class GameController {
     protected logger: ILogger;
-    protected watermark: Watermark;
+    protected databaseServer: DatabaseServer;
+    protected preAkiModLoader: PreAkiModLoader;
     protected httpServerHelper: HttpServerHelper;
-    protected localeService: LocaleService;
     protected profileHelper: ProfileHelper;
     protected profileFixerService: ProfileFixerService;
+    protected localisationService: LocalisationService;
+    protected seasonalEventService: SeasonalEventService;
+    protected applicationContext: ApplicationContext;
     protected configServer: ConfigServer;
     protected httpConfig: IHttpConfig;
     protected coreConfig: ICoreConfig;
-    constructor(logger: ILogger, watermark: Watermark, httpServerHelper: HttpServerHelper, localeService: LocaleService, profileHelper: ProfileHelper, profileFixerService: ProfileFixerService, configServer: ConfigServer);
+    constructor(logger: ILogger, databaseServer: DatabaseServer, preAkiModLoader: PreAkiModLoader, httpServerHelper: HttpServerHelper, profileHelper: ProfileHelper, profileFixerService: ProfileFixerService, localisationService: LocalisationService, seasonalEventService: SeasonalEventService, applicationContext: ApplicationContext, configServer: ConfigServer);
-    gameStart(_url: string, _info: IEmptyRequestData, sessionID: string): void;
+    gameStart(_url: string, _info: IEmptyRequestData, sessionID: string, startTimeStampMS: number): void;
+    /**
+     * Get a list of installed mods and save their details to the profile being used
+     * @param fullProfile Profile to add mod details to
+     */
+    protected saveActiveModsToProfile(fullProfile: IAkiProfile): void;
+    /**
+     * Add the logged in players name to PMC name pool
+     * @param pmcProfile
+     */
+    protected addPlayerToPMCNames(pmcProfile: IPmcData): void;
+    /**
+     * Blank out the "test" mail message from prapor
+     */
+    protected removePraporTestMessage(): void;
+    /**
+     * Make non-trigger-spawned raiders spawn earlier + always
+     */
+    protected adjustLabsRaiderSpawnRate(): void;
     protected logProfileDetails(fullProfile: IAkiProfile): void;
     getGameConfig(sessionID: string): IGameConfigResponse;
-    getServer(): any[];
+    getServer(): IServerDetails[];
-    getValidGameVersion(): any;
+    getValidGameVersion(): ICheckVersionResponse;
 }

types/controllers/HealthController.d.ts

@@ -1,23 +1,25 @@
-import { ItemHelper } from "../helpers/ItemHelper";
-import { PaymentService } from "../services/PaymentService";
-import { InventoryHelper } from "../helpers/InventoryHelper";
 import { HealthHelper } from "../helpers/HealthHelper";
+import { InventoryHelper } from "../helpers/InventoryHelper";
+import { ItemHelper } from "../helpers/ItemHelper";
 import { IPmcData } from "../models/eft/common/IPmcData";
 import { IHealthTreatmentRequestData } from "../models/eft/health/IHealthTreatmentRequestData";
 import { IOffraidEatRequestData } from "../models/eft/health/IOffraidEatRequestData";
 import { IOffraidHealRequestData } from "../models/eft/health/IOffraidHealRequestData";
 import { ISyncHealthRequestData } from "../models/eft/health/ISyncHealthRequestData";
 import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
-import { ItemEventRouter } from "../routers/ItemEventRouter";
 import { ILogger } from "../models/spt/utils/ILogger";
+import { EventOutputHolder } from "../routers/EventOutputHolder";
+import { LocalisationService } from "../services/LocalisationService";
+import { PaymentService } from "../services/PaymentService";
 export declare class HealthController {
     protected logger: ILogger;
-    protected itemEventRouter: ItemEventRouter;
+    protected eventOutputHolder: EventOutputHolder;
     protected itemHelper: ItemHelper;
     protected paymentService: PaymentService;
     protected inventoryHelper: InventoryHelper;
+    protected localisationService: LocalisationService;
     protected healthHelper: HealthHelper;
-    constructor(logger: ILogger, itemEventRouter: ItemEventRouter, itemHelper: ItemHelper, paymentService: PaymentService, inventoryHelper: InventoryHelper, healthHelper: HealthHelper);
+    constructor(logger: ILogger, eventOutputHolder: EventOutputHolder, itemHelper: ItemHelper, paymentService: PaymentService, inventoryHelper: InventoryHelper, localisationService: LocalisationService, healthHelper: HealthHelper);
     /**
      * stores in-raid player health
      * @param pmcData Player profile
@@ -25,7 +27,7 @@ export declare class HealthController {
      * @param sessionID
      * @param addEffects Should effects found be added or removed from profile
      */
-    saveVitality(pmcData: IPmcData, info: ISyncHealthRequestData, sessionID: string, addEffects?: boolean): void;
+    saveVitality(pmcData: IPmcData, info: ISyncHealthRequestData, sessionID: string, addEffects?: boolean, deleteExistingEffects?: boolean): void;
     /**
      * When healing in menu
      * @param pmcData
@@ -38,9 +40,16 @@ export declare class HealthController {
     /**
      * Occurs on post-raid healing page
      * @param pmcData player profile
-     * @param info Request data from client
+     * @param healthTreatmentRequest Request data from client
      * @param sessionID Session id
      * @returns
      */
-    healthTreatment(pmcData: IPmcData, info: IHealthTreatmentRequestData, sessionID: string): IItemEventRouterResponse;
+    healthTreatment(pmcData: IPmcData, healthTreatmentRequest: IHealthTreatmentRequestData, sessionID: string): IItemEventRouterResponse;
+    /**
+     * iterate over treatment request diff and find effects to remove from player limbs
+     * @param sessionId
+     * @param profile Profile to update
+     * @param treatmentRequest client request
+     */
+    protected removeEffectsAfterPostRaidHeal(sessionId: string, profile: IPmcData, treatmentRequest: IHealthTreatmentRequestData): void;
 }

types/controllers/HideoutController.d.ts

@@ -19,16 +19,17 @@ import { IHideoutUpgradeRequestData } from "../models/eft/hideout/IHideoutUpgrad
 import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
 import { IHideoutConfig } from "../models/spt/config/IHideoutConfig";
 import { ILogger } from "../models/spt/utils/ILogger";
-import { ItemEventRouter } from "../routers/ItemEventRouter";
+import { EventOutputHolder } from "../routers/EventOutputHolder";
 import { ConfigServer } from "../servers/ConfigServer";
 import { DatabaseServer } from "../servers/DatabaseServer";
 import { SaveServer } from "../servers/SaveServer";
+import { LocalisationService } from "../services/LocalisationService";
 import { PlayerService } from "../services/PlayerService";
 import { HashUtil } from "../utils/HashUtil";
 import { HttpResponseUtil } from "../utils/HttpResponseUtil";
+import { JsonUtil } from "../utils/JsonUtil";
 import { RandomUtil } from "../utils/RandomUtil";
 import { TimeUtil } from "../utils/TimeUtil";
-import { JsonUtil } from "../utils/JsonUtil";
 export declare class HideoutController {
     protected logger: ILogger;
     protected hashUtil: HashUtil;
@@ -40,16 +41,17 @@ export declare class HideoutController {
     protected playerService: PlayerService;
     protected presetHelper: PresetHelper;
     protected paymentHelper: PaymentHelper;
-    protected itemEventRouter: ItemEventRouter;
+    protected eventOutputHolder: EventOutputHolder;
     protected httpResponse: HttpResponseUtil;
     protected profileHelper: ProfileHelper;
     protected hideoutHelper: HideoutHelper;
     protected scavCaseRewardGenerator: ScavCaseRewardGenerator;
+    protected localisationService: LocalisationService;
     protected configServer: ConfigServer;
     protected jsonUtil: JsonUtil;
     protected static nameBackendCountersCrafting: string;
     protected hideoutConfig: IHideoutConfig;
-    constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, randomUtil: RandomUtil, inventoryHelper: InventoryHelper, saveServer: SaveServer, playerService: PlayerService, presetHelper: PresetHelper, paymentHelper: PaymentHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, hideoutHelper: HideoutHelper, scavCaseRewardGenerator: ScavCaseRewardGenerator, configServer: ConfigServer, jsonUtil: JsonUtil);
+    constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, randomUtil: RandomUtil, inventoryHelper: InventoryHelper, saveServer: SaveServer, playerService: PlayerService, presetHelper: PresetHelper, paymentHelper: PaymentHelper, eventOutputHolder: EventOutputHolder, httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, hideoutHelper: HideoutHelper, scavCaseRewardGenerator: ScavCaseRewardGenerator, localisationService: LocalisationService, configServer: ConfigServer, jsonUtil: JsonUtil);
     upgrade(pmcData: IPmcData, body: IHideoutUpgradeRequestData, sessionID: string): IItemEventRouterResponse;
     upgradeComplete(pmcData: IPmcData, body: HideoutUpgradeCompleteRequestData, sessionID: string): IItemEventRouterResponse;
     /**

types/controllers/InraidController.d.ts

@@ -1,3 +1,4 @@
+import { ApplicationContext } from "../context/ApplicationContext";
 import { PlayerScavGenerator } from "../generators/PlayerScavGenerator";
 import { HealthHelper } from "../helpers/HealthHelper";
 import { InRaidHelper } from "../helpers/InRaidHelper";
@@ -6,8 +7,10 @@ import { ProfileHelper } from "../helpers/ProfileHelper";
 import { QuestHelper } from "../helpers/QuestHelper";
 import { TraderHelper } from "../helpers/TraderHelper";
 import { IPmcData } from "../models/eft/common/IPmcData";
+import { Item } from "../models/eft/common/tables/IItem";
 import { IRegisterPlayerRequestData } from "../models/eft/inRaid/IRegisterPlayerRequestData";
 import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData";
+import { IAirdropConfig } from "../models/spt/config/IAirdropConfig";
 import { IInRaidConfig } from "../models/spt/config/IInRaidConfig";
 import { ILogger } from "../models/spt/utils/ILogger";
 import { ConfigServer } from "../servers/ConfigServer";
@@ -16,6 +19,9 @@ import { SaveServer } from "../servers/SaveServer";
 import { InsuranceService } from "../services/InsuranceService";
 import { JsonUtil } from "../utils/JsonUtil";
 import { TimeUtil } from "../utils/TimeUtil";
+/**
+ * Logic for handling In Raid callbacks
+ */
 export declare class InraidController {
     protected logger: ILogger;
     protected saveServer: SaveServer;
@@ -30,17 +36,47 @@ export declare class InraidController {
     protected traderHelper: TraderHelper;
     protected insuranceService: InsuranceService;
     protected inRaidHelper: InRaidHelper;
+    protected applicationContext: ApplicationContext;
     protected configServer: ConfigServer;
+    protected airdropConfig: IAirdropConfig;
     protected inraidConfig: IInRaidConfig;
-    constructor(logger: ILogger, saveServer: SaveServer, jsonUtil: JsonUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, questHelper: QuestHelper, itemHelper: ItemHelper, profileHelper: ProfileHelper, playerScavGenerator: PlayerScavGenerator, healthHelper: HealthHelper, traderHelper: TraderHelper, insuranceService: InsuranceService, inRaidHelper: InRaidHelper, configServer: ConfigServer);
+    constructor(logger: ILogger, saveServer: SaveServer, jsonUtil: JsonUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, questHelper: QuestHelper, itemHelper: ItemHelper, profileHelper: ProfileHelper, playerScavGenerator: PlayerScavGenerator, healthHelper: HealthHelper, traderHelper: TraderHelper, insuranceService: InsuranceService, inRaidHelper: InRaidHelper, applicationContext: ApplicationContext, configServer: ConfigServer);
-    addPlayer(sessionID: string, info: IRegisterPlayerRequestData): void;
-    saveProgress(offraidData: ISaveProgressRequestData, sessionID: string): void;
     /**
-     * Handle updating the profile post-pmc raid
+     * Save locationId to active profiles inraid object AND app context
+     * @param sessionID Session id
+     * @param info Register player request
+     */
+    addPlayer(sessionID: string, info: IRegisterPlayerRequestData): void;
+    /**
+     * Save profile state to disk
+     * Handles pmc/pscav
+     * @param offraidData post-raid request data
+     * @param sessionID Session id
+     */
+    savePostRaidProgress(offraidData: ISaveProgressRequestData, sessionID: string): void;
+    /**
+     * Handle updating player profile post-pmc raid
      * @param sessionID session id
-     * @param offraidData post-raid data of raid
+     * @param offraidData post-raid data
      */
     protected savePmcProgress(sessionID: string, offraidData: ISaveProgressRequestData): void;
+    /**
+     * Make changes to pmc profile after they left raid dead,
+     * alter bodypart hp, handle insurance, delete inventory items, remove carried quest items
+     * @param postRaidSaveRequest post-raid save request
+     * @param pmcData pmc profile
+     * @param insuranceEnabled is insurance enabled
+     * @param preRaidGear gear player had before raid
+     * @param sessionID Session id
+     * @returns Updated profile object
+     */
+    protected performPostRaidActionsWhenDead(postRaidSaveRequest: ISaveProgressRequestData, pmcData: IPmcData, insuranceEnabled: boolean, preRaidGear: Item[], sessionID: string): IPmcData;
+    /**
+     * Adjust player characters bodypart hp if they left raid early
+     * @param postRaidSaveRequest post raid data
+     * @param pmcData player profile
+     */
+    protected updatePmcHealthPostRaid(postRaidSaveRequest: ISaveProgressRequestData, pmcData: IPmcData): void;
     /**
      * Reduce body part hp to % of max
      * @param pmcData profile to edit
@@ -66,6 +102,31 @@ export declare class InraidController {
      * @param isPlayerScav Was the player a pScav
      */
     protected markOrRemoveFoundInRaidItems(offraidData: ISaveProgressRequestData, pmcData: IPmcData, isPlayerScav: boolean): void;
+    /**
+     * Update profile after player completes scav raid
+     * @param scavData Scav profile
+     * @param sessionID Session id
+     * @param offraidData Post-raid save request
+     * @param pmcData Pmc profile
+     * @param isDead Is player dead
+     */
     protected handlePostRaidPlayerScavProcess(scavData: IPmcData, sessionID: string, offraidData: ISaveProgressRequestData, pmcData: IPmcData, isDead: boolean): void;
+    /**
+     * Update profile with scav karma values based on in-raid actions
+     * @param pmcData Pmc profile
+     * @param offraidData Post-raid save request
+     * @param scavData Scav profile
+     * @param sessionID Session id
+     */
     protected handlePostRaidPlayerScavKarmaChanges(pmcData: IPmcData, offraidData: ISaveProgressRequestData, scavData: IPmcData, sessionID: string): void;
+    /**
+     * Get the inraid config from configs/inraid.json
+     * @returns InRaid Config
+     */
+    getInraidConfig(): IInRaidConfig;
+    /**
+     * Get airdrop config from configs/airdrop.json
+     * @returns Airdrop config
+     */
+    getAirdropConfig(): IAirdropConfig;
 }

types/controllers/InsuranceController.d.ts

@@ -8,7 +8,7 @@ import { IInsureRequestData } from "../models/eft/insurance/IInsureRequestData";
 import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
 import { IInsuranceConfig } from "../models/spt/config/IInsuranceConfig";
 import { ILogger } from "../models/spt/utils/ILogger";
-import { ItemEventRouter } from "../routers/ItemEventRouter";
+import { EventOutputHolder } from "../routers/EventOutputHolder";
 import { ConfigServer } from "../servers/ConfigServer";
 import { DatabaseServer } from "../servers/DatabaseServer";
 import { SaveServer } from "../servers/SaveServer";
@@ -19,7 +19,7 @@ import { TimeUtil } from "../utils/TimeUtil";
 export declare class InsuranceController {
     protected logger: ILogger;
     protected randomUtil: RandomUtil;
-    protected itemEventRouter: ItemEventRouter;
+    protected eventOutputHolder: EventOutputHolder;
     protected timeUtil: TimeUtil;
     protected saveServer: SaveServer;
     protected databaseServer: DatabaseServer;
@@ -30,8 +30,7 @@ export declare class InsuranceController {
     protected insuranceService: InsuranceService;
     protected configServer: ConfigServer;
     protected insuranceConfig: IInsuranceConfig;
-    constructor(logger: ILogger, randomUtil: RandomUtil, itemEventRouter: ItemEventRouter, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileHelper: ProfileHelper, dialogueHelper: DialogueHelper, paymentService: PaymentService, // TODO: delay required
+    constructor(logger: ILogger, randomUtil: RandomUtil, eventOutputHolder: EventOutputHolder, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileHelper: ProfileHelper, dialogueHelper: DialogueHelper, paymentService: PaymentService, insuranceService: InsuranceService, configServer: ConfigServer);
-    insuranceService: InsuranceService, configServer: ConfigServer);
     processReturn(): void;
     insure(pmcData: IPmcData, body: IInsureRequestData, sessionID: string): IItemEventRouterResponse;
     /**

types/controllers/InventoryController.d.ts

@@ -2,6 +2,7 @@ import { InventoryHelper } from "../helpers/InventoryHelper";
 import { PaymentHelper } from "../helpers/PaymentHelper";
 import { PresetHelper } from "../helpers/PresetHelper";
 import { ProfileHelper } from "../helpers/ProfileHelper";
+import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper";
 import { IPmcData } from "../models/eft/common/IPmcData";
 import { IAddItemRequestData } from "../models/eft/inventory/IAddItemRequestData";
 import { IInventoryBindRequestData } from "../models/eft/inventory/IInventoryBindRequestData";
@@ -20,34 +21,46 @@ import { IInventorySwapRequestData } from "../models/eft/inventory/IInventorySwa
 import { IInventoryTagRequestData } from "../models/eft/inventory/IInventoryTagRequestData";
 import { IInventoryToggleRequestData } from "../models/eft/inventory/IInventoryToggleRequestData";
 import { IInventoryTransferRequestData } from "../models/eft/inventory/IInventoryTransferRequestData";
+import { IOpenRandomLootContainerRequestData } from "../models/eft/inventory/IOpenRandomLootContainerRequestData";
 import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
 import { ILogger } from "../models/spt/utils/ILogger";
-import { ItemEventRouter } from "../routers/ItemEventRouter";
+import { EventOutputHolder } from "../routers/EventOutputHolder";
 import { DatabaseServer } from "../servers/DatabaseServer";
 import { FenceService } from "../services/FenceService";
+import { LocalisationService } from "../services/LocalisationService";
 import { RagfairOfferService } from "../services/RagfairOfferService";
 import { HashUtil } from "../utils/HashUtil";
+import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 import { JsonUtil } from "../utils/JsonUtil";
+import { RandomUtil } from "../utils/RandomUtil";
 export declare class InventoryController {
     protected logger: ILogger;
     protected hashUtil: HashUtil;
     protected jsonUtil: JsonUtil;
+    protected randomUtil: RandomUtil;
     protected databaseServer: DatabaseServer;
     protected fenceService: FenceService;
     protected presetHelper: PresetHelper;
     protected inventoryHelper: InventoryHelper;
     protected ragfairOfferService: RagfairOfferService;
     protected profileHelper: ProfileHelper;
+    protected weightedRandomHelper: WeightedRandomHelper;
     protected paymentHelper: PaymentHelper;
-    protected itemEventRouter: ItemEventRouter;
+    protected localisationService: LocalisationService;
-    constructor(logger: ILogger, hashUtil: HashUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, fenceService: FenceService, presetHelper: PresetHelper, inventoryHelper: InventoryHelper, ragfairOfferService: RagfairOfferService, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, itemEventRouter: ItemEventRouter);
+    protected eventOutputHolder: EventOutputHolder;
+    protected httpResponseUtil: HttpResponseUtil;
+    constructor(logger: ILogger, hashUtil: HashUtil, jsonUtil: JsonUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, fenceService: FenceService, presetHelper: PresetHelper, inventoryHelper: InventoryHelper, ragfairOfferService: RagfairOfferService, profileHelper: ProfileHelper, weightedRandomHelper: WeightedRandomHelper, paymentHelper: PaymentHelper, localisationService: LocalisationService, eventOutputHolder: EventOutputHolder, httpResponseUtil: HttpResponseUtil);
     /**
     * Move Item
     * change location of item with parentId and slotId
     * transfers items from one profile to another if fromOwner/toOwner is set in the body.
     * otherwise, move is contained within the same profile_f.
+     * @param pmcData Profile
+     * @param moveRequest Move request data
+     * @param sessionID Session id
+     * @returns IItemEventRouterResponse
      */
-    moveItem(pmcData: IPmcData, body: IInventoryMoveRequestData, sessionID: string): IItemEventRouterResponse;
+    moveItem(pmcData: IPmcData, moveRequest: IInventoryMoveRequestData, sessionID: string): IItemEventRouterResponse;
     /**
     * Remove Item from Profile
     * Deep tree item deletion, also removes items from insurance list
@@ -122,4 +135,12 @@ export declare class InventoryController {
     createMapMarker(pmcData: IPmcData, body: IInventoryCreateMarkerRequestData, sessionID: string): IItemEventRouterResponse;
     deleteMapMarker(pmcData: IPmcData, body: IInventoryDeleteMarkerRequestData, sessionID: string): IItemEventRouterResponse;
     editMapMarker(pmcData: IPmcData, body: IInventoryEditMarkerRequestData, sessionID: string): IItemEventRouterResponse;
+    /**
+     * Handle event fired when a container is unpacked (currently only the halloween pumpkin)
+     * @param pmcData Profile data
+     * @param body open loot container request data
+     * @param sessionID Session id
+     * @returns IItemEventRouterResponse
+     */
+    openRandomLootContainer(pmcData: IPmcData, body: IOpenRandomLootContainerRequestData, sessionID: string): IItemEventRouterResponse;
 }

types/controllers/LocationController.d.ts

@@ -7,6 +7,7 @@ import { LootItem } from "../models/spt/services/LootItem";
 import { ILogger } from "../models/spt/utils/ILogger";
 import { ConfigServer } from "../servers/ConfigServer";
 import { DatabaseServer } from "../servers/DatabaseServer";
+import { LocalisationService } from "../services/LocalisationService";
 import { HashUtil } from "../utils/HashUtil";
 import { JsonUtil } from "../utils/JsonUtil";
 import { TimeUtil } from "../utils/TimeUtil";
@@ -15,12 +16,13 @@ export declare class LocationController {
     protected hashUtil: HashUtil;
     protected logger: ILogger;
     protected locationGenerator: LocationGenerator;
+    protected localisationService: LocalisationService;
     protected lootGenerator: LootGenerator;
     protected databaseServer: DatabaseServer;
     protected timeUtil: TimeUtil;
     protected configServer: ConfigServer;
     protected airdropConfig: IAirdropConfig;
-    constructor(jsonUtil: JsonUtil, hashUtil: HashUtil, logger: ILogger, locationGenerator: LocationGenerator, lootGenerator: LootGenerator, databaseServer: DatabaseServer, timeUtil: TimeUtil, configServer: ConfigServer);
+    constructor(jsonUtil: JsonUtil, hashUtil: HashUtil, logger: ILogger, locationGenerator: LocationGenerator, localisationService: LocalisationService, lootGenerator: LootGenerator, databaseServer: DatabaseServer, timeUtil: TimeUtil, configServer: ConfigServer);
     get(location: string): ILocationBase;
     generate(name: string): ILocationBase;
     generateAll(): ILocationsGenerateAllResponse;

types/controllers/MatchController.d.ts

@@ -9,6 +9,7 @@ import { IGetProfileRequestData } from "../models/eft/match/IGetProfileRequestDa
 import { IJoinMatchRequestData } from "../models/eft/match/IJoinMatchRequestData";
 import { IJoinMatchResult } from "../models/eft/match/IJoinMatchResult";
 import { IStartOfflineRaidRequestData } from "../models/eft/match/IStartOffineRaidRequestData";
+import { BotDifficulty } from "../models/enums/BotDifficulty";
 import { IBotConfig } from "../models/spt/config/IBotConfig";
 import { IInRaidConfig } from "../models/spt/config/IInRaidConfig";
 import { IMatchConfig } from "../models/spt/config/IMatchConfig";
@@ -17,8 +18,9 @@ import { ConfigServer } from "../servers/ConfigServer";
 import { SaveServer } from "../servers/SaveServer";
 import { BotGenerationCacheService } from "../services/BotGenerationCacheService";
 import { BotLootCacheService } from "../services/BotLootCacheService";
+import { CustomLocationWaveService } from "../services/CustomLocationWaveService";
 import { MatchLocationService } from "../services/MatchLocationService";
-import { PmcAiService } from "../services/PmcAiService";
+import { OpenZoneService } from "../services/OpenZoneService";
 import { ProfileSnapshotService } from "../services/ProfileSnapshotService";
 export declare class MatchController {
     protected logger: ILogger;
@@ -29,13 +31,14 @@ export declare class MatchController {
     protected botLootCacheService: BotLootCacheService;
     protected configServer: ConfigServer;
     protected profileSnapshotService: ProfileSnapshotService;
-    protected pmcAiService: PmcAiService;
+    protected customLocationWaveService: CustomLocationWaveService;
+    protected openZoneService: OpenZoneService;
     protected botGenerationCacheService: BotGenerationCacheService;
     protected applicationContext: ApplicationContext;
     protected matchConfig: IMatchConfig;
     protected inraidConfig: IInRaidConfig;
     protected botConfig: IBotConfig;
-    constructor(logger: ILogger, saveServer: SaveServer, profileHelper: ProfileHelper, matchLocationService: MatchLocationService, traderHelper: TraderHelper, botLootCacheService: BotLootCacheService, configServer: ConfigServer, profileSnapshotService: ProfileSnapshotService, pmcAiService: PmcAiService, botGenerationCacheService: BotGenerationCacheService, applicationContext: ApplicationContext);
+    constructor(logger: ILogger, saveServer: SaveServer, profileHelper: ProfileHelper, matchLocationService: MatchLocationService, traderHelper: TraderHelper, botLootCacheService: BotLootCacheService, configServer: ConfigServer, profileSnapshotService: ProfileSnapshotService, customLocationWaveService: CustomLocationWaveService, openZoneService: OpenZoneService, botGenerationCacheService: BotGenerationCacheService, applicationContext: ApplicationContext);
     getEnabled(): boolean;
     getProfile(info: IGetProfileRequestData): IPmcData[];
     createGroup(sessionID: string, info: ICreateGroupRequestData): any;
@@ -44,5 +47,11 @@ export declare class MatchController {
     protected getMatch(location: string): any;
     getGroupStatus(info: IGetGroupStatusRequestData): any;
     startOfflineRaid(info: IStartOfflineRaidRequestData, sessionID: string): void;
+    /**
+     * Convert a difficulty value from pre-raid screen to a bot difficulty
+     * @param botDifficulty dropdown difficulty
+     * @returns bot difficulty
+     */
+    protected convertDifficultyDropdownIntoBotDifficulty(botDifficulty: BotDifficulty): string;
     endOfflineRaid(info: IEndOfflineRaidRequestData, sessionID: string): void;
 }

types/controllers/NoteController.d.ts

@@ -1,10 +1,10 @@
 import { IPmcData } from "../models/eft/common/IPmcData";
 import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
 import { INoteActionData } from "../models/eft/notes/INoteActionData";
-import { ItemEventRouter } from "../routers/ItemEventRouter";
+import { EventOutputHolder } from "../routers/EventOutputHolder";
 export declare class NoteController {
-    protected itemEventRouter: ItemEventRouter;
+    protected eventOutputHolder: EventOutputHolder;
-    constructor(itemEventRouter: ItemEventRouter);
+    constructor(eventOutputHolder: EventOutputHolder);
     addNote(pmcData: IPmcData, body: INoteActionData, sessionID: string): IItemEventRouterResponse;
     editNote(pmcData: IPmcData, body: INoteActionData, sessionID: string): IItemEventRouterResponse;
     deleteNote(pmcData: IPmcData, body: INoteActionData, sessionID: string): IItemEventRouterResponse;

types/controllers/PresetBuildController.d.ts

@@ -3,15 +3,15 @@ import { IPmcData } from "../models/eft/common/IPmcData";
 import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
 import { IPresetBuildActionRequestData } from "../models/eft/presetBuild/IPresetBuildActionRequestData";
 import { WeaponBuild } from "../models/eft/profile/IAkiProfile";
-import { ItemEventRouter } from "../routers/ItemEventRouter";
+import { EventOutputHolder } from "../routers/EventOutputHolder";
 import { SaveServer } from "../servers/SaveServer";
 import { HashUtil } from "../utils/HashUtil";
 export declare class PresetBuildController {
     protected hashUtil: HashUtil;
-    protected itemEventRouter: ItemEventRouter;
+    protected eventOutputHolder: EventOutputHolder;
     protected itemHelper: ItemHelper;
     protected saveServer: SaveServer;
-    constructor(hashUtil: HashUtil, itemEventRouter: ItemEventRouter, itemHelper: ItemHelper, saveServer: SaveServer);
+    constructor(hashUtil: HashUtil, eventOutputHolder: EventOutputHolder, itemHelper: ItemHelper, saveServer: SaveServer);
     getUserBuilds(sessionID: string): WeaponBuild[];
     saveBuild(pmcData: IPmcData, body: IPresetBuildActionRequestData, sessionID: string): IItemEventRouterResponse;
     removeBuild(pmcData: IPmcData, body: IPresetBuildActionRequestData, sessionID: string): IItemEventRouterResponse;

types/controllers/QuestController.d.ts

@@ -5,22 +5,26 @@ import { QuestConditionHelper } from "../helpers/QuestConditionHelper";
 import { QuestHelper } from "../helpers/QuestHelper";
 import { IPmcData } from "../models/eft/common/IPmcData";
 import { IQuest, Reward } from "../models/eft/common/tables/IQuest";
+import { IRepeatableQuest } from "../models/eft/common/tables/IRepeatableQuests";
 import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
 import { IAcceptQuestRequestData } from "../models/eft/quests/IAcceptQuestRequestData";
 import { ICompleteQuestRequestData } from "../models/eft/quests/ICompleteQuestRequestData";
 import { IHandoverQuestRequestData } from "../models/eft/quests/IHandoverQuestRequestData";
 import { IQuestConfig } from "../models/spt/config/IQuestConfig";
 import { ILogger } from "../models/spt/utils/ILogger";
-import { ItemEventRouter } from "../routers/ItemEventRouter";
+import { EventOutputHolder } from "../routers/EventOutputHolder";
 import { ConfigServer } from "../servers/ConfigServer";
 import { DatabaseServer } from "../servers/DatabaseServer";
 import { LocaleService } from "../services/LocaleService";
+import { LocalisationService } from "../services/LocalisationService";
 import { PlayerService } from "../services/PlayerService";
+import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 import { TimeUtil } from "../utils/TimeUtil";
 export declare class QuestController {
     protected logger: ILogger;
     protected timeUtil: TimeUtil;
-    protected itemEventRouter: ItemEventRouter;
+    protected httpResponseUtil: HttpResponseUtil;
+    protected eventOutputHolder: EventOutputHolder;
     protected databaseServer: DatabaseServer;
     protected itemHelper: ItemHelper;
     protected dialogueHelper: DialogueHelper;
@@ -29,9 +33,10 @@ export declare class QuestController {
     protected questConditionHelper: QuestConditionHelper;
     protected playerService: PlayerService;
     protected localeService: LocaleService;
+    protected localisationService: LocalisationService;
     protected configServer: ConfigServer;
     protected questConfig: IQuestConfig;
-    constructor(logger: ILogger, timeUtil: TimeUtil, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, itemHelper: ItemHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, questConditionHelper: QuestConditionHelper, playerService: PlayerService, localeService: LocaleService, configServer: ConfigServer);
+    constructor(logger: ILogger, timeUtil: TimeUtil, httpResponseUtil: HttpResponseUtil, eventOutputHolder: EventOutputHolder, databaseServer: DatabaseServer, itemHelper: ItemHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, questConditionHelper: QuestConditionHelper, playerService: PlayerService, localeService: LocaleService, localisationService: LocalisationService, configServer: ConfigServer);
     /**
      * Get all quests visible to player
      * Exclude quests with incomplete preconditions (level/loyalty)
@@ -55,7 +60,30 @@ export declare class QuestController {
      * @returns client response
      */
     acceptQuest(pmcData: IPmcData, acceptedQuest: IAcceptQuestRequestData, sessionID: string): IItemEventRouterResponse;
+    /**
+     * Get a quests startedMessageText key from db, if no startedMessageText key found, use description key instead
+     * @param startedMessageTextId startedMessageText property from IQuest
+     * @param questDescriptionId description property from IQuest
+     * @returns message id
+     */
+    protected getMessageIdForQuestStart(startedMessageTextId: string, questDescriptionId: string): string;
+    /**
+     * Handle the client accepting a repeatable quest and starting it
+     * Send starting rewards if any to player and
+     * Send start notification if any to player
+     * @param pmcData Profile to update with new quest
+     * @param acceptedQuest Quest being accepted
+     * @param sessionID Session id
+     * @returns IItemEventRouterResponse
+     */
     acceptRepeatableQuest(pmcData: IPmcData, acceptedQuest: IAcceptQuestRequestData, sessionID: string): IItemEventRouterResponse;
+    /**
+     * Look for an accepted quest inside player profile, return matching
+     * @param pmcData Profile to search through
+     * @param acceptedQuest Quest to search for
+     * @returns IRepeatableQuest
+     */
+    protected getRepeatableQuestFromProfile(pmcData: IPmcData, acceptedQuest: IAcceptQuestRequestData): IRepeatableQuest;
     /**
      * Update completed quest in profile
      * Add newly unlocked quests to profile

types/controllers/RagfairController.d.ts

@@ -12,6 +12,7 @@ import { RagfairTaxHelper } from "../helpers/RagfairTaxHelper";
 import { TraderHelper } from "../helpers/TraderHelper";
 import { IPmcData } from "../models/eft/common/IPmcData";
 import { Item } from "../models/eft/common/tables/IItem";
+import { ITraderAssort } from "../models/eft/common/tables/ITrader";
 import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
 import { IAkiProfile } from "../models/eft/profile/IAkiProfile";
 import { IAddOfferRequestData, Requirement } from "../models/eft/ragfair/IAddOfferRequestData";
@@ -23,11 +24,12 @@ import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer";
 import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData";
 import { IRagfairConfig } from "../models/spt/config/IRagfairConfig";
 import { ILogger } from "../models/spt/utils/ILogger";
-import { ItemEventRouter } from "../routers/ItemEventRouter";
+import { EventOutputHolder } from "../routers/EventOutputHolder";
 import { ConfigServer } from "../servers/ConfigServer";
 import { DatabaseServer } from "../servers/DatabaseServer";
 import { RagfairServer } from "../servers/RagfairServer";
 import { SaveServer } from "../servers/SaveServer";
+import { LocalisationService } from "../services/LocalisationService";
 import { PaymentService } from "../services/PaymentService";
 import { RagfairOfferService } from "../services/RagfairOfferService";
 import { RagfairPriceService } from "../services/RagfairPriceService";
@@ -41,7 +43,7 @@ export declare class RagfairController {
     protected logger: ILogger;
     protected timeUtil: TimeUtil;
     protected httpResponse: HttpResponseUtil;
-    protected itemEventRouter: ItemEventRouter;
+    protected eventOutputHolder: EventOutputHolder;
     protected ragfairServer: RagfairServer;
     protected ragfairPriceService: RagfairPriceService;
     protected databaseServer: DatabaseServer;
@@ -61,19 +63,55 @@ export declare class RagfairController {
     protected ragfairOfferService: RagfairOfferService;
     protected ragfairRequiredItemsService: RagfairRequiredItemsService;
     protected ragfairOfferGenerator: RagfairOfferGenerator;
+    protected localisationService: LocalisationService;
     protected configServer: ConfigServer;
     protected ragfairConfig: IRagfairConfig;
-    constructor(logger: ILogger, timeUtil: TimeUtil, httpResponse: HttpResponseUtil, itemEventRouter: ItemEventRouter, ragfairServer: RagfairServer, ragfairPriceService: RagfairPriceService, databaseServer: DatabaseServer, itemHelper: ItemHelper, saveServer: SaveServer, ragfairSellHelper: RagfairSellHelper, ragfairTaxHelper: RagfairTaxHelper, ragfairSortHelper: RagfairSortHelper, ragfairOfferHelper: RagfairOfferHelper, profileHelper: ProfileHelper, paymentService: PaymentService, handbookHelper: HandbookHelper, paymentHelper: PaymentHelper, inventoryHelper: InventoryHelper, traderHelper: TraderHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, ragfairOfferGenerator: RagfairOfferGenerator, configServer: ConfigServer);
+    constructor(logger: ILogger, timeUtil: TimeUtil, httpResponse: HttpResponseUtil, eventOutputHolder: EventOutputHolder, ragfairServer: RagfairServer, ragfairPriceService: RagfairPriceService, databaseServer: DatabaseServer, itemHelper: ItemHelper, saveServer: SaveServer, ragfairSellHelper: RagfairSellHelper, ragfairTaxHelper: RagfairTaxHelper, ragfairSortHelper: RagfairSortHelper, ragfairOfferHelper: RagfairOfferHelper, profileHelper: ProfileHelper, paymentService: PaymentService, handbookHelper: HandbookHelper, paymentHelper: PaymentHelper, inventoryHelper: InventoryHelper, traderHelper: TraderHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, ragfairOfferGenerator: RagfairOfferGenerator, localisationService: LocalisationService, configServer: ConfigServer);
-    getOffers(sessionID: string, info: ISearchRequestData): IGetOffersResult;
+    getOffers(sessionID: string, searchRequest: ISearchRequestData): IGetOffersResult;
+    /**
+     * Get offers for the client based on type of search being performed
+     * @param searchRequest Client search request data
+     * @param itemsToAdd
+     * @param traderAssorts Trader assorts
+     * @param pmcProfile Player profile
+     * @returns array of offers
+     */
+    protected getOffersForSearchType(searchRequest: ISearchRequestData, itemsToAdd: string[], traderAssorts: Record<string, ITraderAssort>, pmcProfile: IPmcData): IRagfairOffer[];
+    /**
+     * Get categories for the type of search being performed, linked/required/all
+     * @param searchRequest Client search request data
+     * @param offers ragfair offers to get categories for
+     * @returns record with tpls + counts
+     */
+    protected getSpecificCategories(searchRequest: ISearchRequestData, offers: IRagfairOffer[]): Record<string, number>;
+    /**
+     * Add Required offers to offers result
+     * @param searchRequest Client search request data
+     * @param assorts
+     * @param pmcProfile Player profile
+     * @param result Result object being sent back to client
+     */
+    protected addRequiredOffersToResult(searchRequest: ISearchRequestData, assorts: Record<string, ITraderAssort>, pmcProfile: IPmcData, result: IGetOffersResult): void;
+    /**
+     * Add index to all offers passed in (0-indexed)
+     * @param offers Offers to add index value to
+     */
+    protected addIndexValueToOffers(offers: IRagfairOffer[]): void;
     /**
      * Update a trader flea offer with buy restrictions stored in the traders assort
      * @param offer flea offer to update
+     * @param profile full profile of player
      */
-    protected setTraderOfferPurchaseLimits(offer: IRagfairOffer): void;
+    protected setTraderOfferPurchaseLimits(offer: IRagfairOffer, profile: IAkiProfile): void;
     protected isLinkedSearch(info: ISearchRequestData): boolean;
     protected isRequiredSearch(info: ISearchRequestData): boolean;
     update(): void;
-    getItemPrice(info: IGetMarketPriceRequestData): IGetItemPriceResult;
+    /**
+     * Called when creating an offer on flea, fills values in top right corner
+     * @param getPriceRequest
+     * @returns min/avg/max values for an item based on flea offers available
+     */
+    getItemMinAvgMaxFleaPriceValues(getPriceRequest: IGetMarketPriceRequestData): IGetItemPriceResult;
     addPlayerOffer(pmcData: IPmcData, info: IAddOfferRequestData, sessionID: string): IItemEventRouterResponse;
     createPlayerOffer(profile: IAkiProfile, requirements: Requirement[], items: Item[], sellInOnePiece: boolean, amountToSend: number): IRagfairOffer;
     getAllFleaPrices(): Record<string, number>;

types/controllers/RepairController.d.ts

@@ -7,35 +7,35 @@ import { IRepairActionDataRequest } from "../models/eft/repair/IRepairActionData
 import { ITraderRepairActionDataRequest } from "../models/eft/repair/ITraderRepairActionDataRequest";
 import { IRepairConfig } from "../models/spt/config/IRepairConfig";
 import { ILogger } from "../models/spt/utils/ILogger";
-import { ItemEventRouter } from "../routers/ItemEventRouter";
+import { EventOutputHolder } from "../routers/EventOutputHolder";
-import { ConfigServer } from "../servers/ConfigServer";
 import { DatabaseServer } from "../servers/DatabaseServer";
 import { PaymentService } from "../services/PaymentService";
+import { RepairService } from "../services/RepairService";
 export declare class RepairController {
     protected logger: ILogger;
-    protected itemEventRouter: ItemEventRouter;
+    protected eventOutputHolder: EventOutputHolder;
     protected databaseServer: DatabaseServer;
     protected questHelper: QuestHelper;
     protected traderHelper: TraderHelper;
     protected paymentService: PaymentService;
     protected repairHelper: RepairHelper;
-    protected configServer: ConfigServer;
+    protected repairService: RepairService;
     protected repairConfig: IRepairConfig;
-    constructor(logger: ILogger, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, questHelper: QuestHelper, traderHelper: TraderHelper, paymentService: PaymentService, repairHelper: RepairHelper, configServer: ConfigServer);
+    constructor(logger: ILogger, eventOutputHolder: EventOutputHolder, databaseServer: DatabaseServer, questHelper: QuestHelper, traderHelper: TraderHelper, paymentService: PaymentService, repairHelper: RepairHelper, repairService: RepairService);
     /**
      * Repair with trader
-     * @param pmcData player profile
-     * @param body endpoint request data
      * @param sessionID session id
+     * @param body endpoint request data
+     * @param pmcData player profile
      * @returns item event router action
      */
-    traderRepair(pmcData: IPmcData, body: ITraderRepairActionDataRequest, sessionID: string): IItemEventRouterResponse;
+    traderRepair(sessionID: string, body: ITraderRepairActionDataRequest, pmcData: IPmcData): IItemEventRouterResponse;
     /**
      * Repair with repair kit
-     * @param pmcData player profile
-     * @param body endpoint request data
      * @param sessionID session id
+     * @param body endpoint request data
+     * @param pmcData player profile
      * @returns item event router action
      */
-    repairWithKit(pmcData: IPmcData, body: IRepairActionDataRequest, sessionID: string): IItemEventRouterResponse;
+    repairWithKit(sessionID: string, body: IRepairActionDataRequest, pmcData: IPmcData): IItemEventRouterResponse;
 }

types/controllers/RepeatableQuestController.d.ts

@@ -13,12 +13,14 @@ import { IRepeatableQuestChangeRequest } from "../models/eft/quests/IRepeatableQ
 import { ELocationName } from "../models/enums/ELocationName";
 import { IQuestConfig, IRepeatableQuestConfig } from "../models/spt/config/IQuestConfig";
 import { ILogger } from "../models/spt/utils/ILogger";
-import { ItemEventRouter } from "../routers/ItemEventRouter";
+import { EventOutputHolder } from "../routers/EventOutputHolder";
 import { ConfigServer } from "../servers/ConfigServer";
 import { DatabaseServer } from "../servers/DatabaseServer";
 import { ItemFilterService } from "../services/ItemFilterService";
+import { LocalisationService } from "../services/LocalisationService";
 import { PaymentService } from "../services/PaymentService";
 import { ProfileFixerService } from "../services/ProfileFixerService";
+import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 import { JsonUtil } from "../utils/JsonUtil";
 import { MathUtil } from "../utils/MathUtil";
 import { ObjectId } from "../utils/ObjectId";
@@ -55,6 +57,7 @@ export declare class RepeatableQuestController {
     protected timeUtil: TimeUtil;
     protected logger: ILogger;
     protected randomUtil: RandomUtil;
+    protected httpResponse: HttpResponseUtil;
     protected mathUtil: MathUtil;
     protected jsonUtil: JsonUtil;
     protected databaseServer: DatabaseServer;
@@ -63,13 +66,14 @@ export declare class RepeatableQuestController {
     protected profileHelper: ProfileHelper;
     protected profileFixerService: ProfileFixerService;
     protected ragfairServerHelper: RagfairServerHelper;
-    protected itemEventRouter: ItemEventRouter;
+    protected eventOutputHolder: EventOutputHolder;
+    protected localisationService: LocalisationService;
     protected paymentService: PaymentService;
     protected objectId: ObjectId;
     protected itemFilterService: ItemFilterService;
     protected configServer: ConfigServer;
     protected questConfig: IQuestConfig;
-    constructor(timeUtil: TimeUtil, logger: ILogger, randomUtil: RandomUtil, mathUtil: MathUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, profileFixerService: ProfileFixerService, ragfairServerHelper: RagfairServerHelper, itemEventRouter: ItemEventRouter, paymentService: PaymentService, objectId: ObjectId, itemFilterService: ItemFilterService, configServer: ConfigServer);
+    constructor(timeUtil: TimeUtil, logger: ILogger, randomUtil: RandomUtil, httpResponse: HttpResponseUtil, mathUtil: MathUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, profileFixerService: ProfileFixerService, ragfairServerHelper: RagfairServerHelper, eventOutputHolder: EventOutputHolder, localisationService: LocalisationService, paymentService: PaymentService, objectId: ObjectId, itemFilterService: ItemFilterService, configServer: ConfigServer);
     /**
      * This is the method reached by the /client/repeatalbeQuests/activityPeriods endpoint
      * Returns an array of objects in the format of repeatable quests to the client.
@@ -96,6 +100,13 @@ export declare class RepeatableQuestController {
      * @returns  {array}                    array of "repeatableQuestObjects" as descibed above
      */
     getClientRepeatableQuests(_info: IEmptyRequestData, sessionID: string): IPmcDataRepeatableQuest[];
+    /**
+     * Get repeatable quest data from profile from name (daily/weekly), creates base repeatable quest object if none exists
+     * @param repeatableConfig daily/weekly config
+     * @param pmcData Profile to search
+     * @returns IPmcDataRepeatableQuest
+     */
+    protected getRepeatableQuestSubTypeFromProfile(repeatableConfig: IRepeatableQuestConfig, pmcData: IPmcData): IPmcDataRepeatableQuest;
     /**
      * This method is called by GetClientRepeatableQuests and creates one element of quest type format (see assets/database/templates/repeatableQuests.json).
      * It randomly draws a quest type (currently Elimination, Completion or Exploration) as well as a trader who is providing the quest
@@ -144,6 +155,12 @@ export declare class RepeatableQuestController {
      * @returns {object}                        object of quest type format for "Elimination" (see assets/database/templates/repeatableQuests.json)
      */
     generateEliminationQuest(pmcLevel: number, traderId: string, questTypePool: IQuestTypePool, repeatableConfig: IRepeatableQuestConfig): IElimination;
+    /**
+     * Cpnvert a location into an quest code can read (e.g. factory4_day into 55f2d3fd4bdc2d5f408b4567)
+     * @param locationKey e.g factory4_day
+     * @returns guid
+     */
+    protected getQuestLocationByMapId(locationKey: string): string;
     /**
      * Exploration repeatable quests can specify a required extraction point.
      * This method creates the according object which will be appended to the conditions array

types/controllers/TradeController.d.ts

@@ -6,15 +6,17 @@ import { IProcessRagfairTradeRequestData } from "../models/eft/trade/IProcessRag
 import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
 import { Upd } from "../models/eft/common/tables/IItem";
 import { IProcessBaseTradeRequestData } from "../models/eft/trade/IProcessBaseTradeRequestData";
-import { ItemEventRouter } from "../routers/ItemEventRouter";
+import { EventOutputHolder } from "../routers/EventOutputHolder";
 import { ILogger } from "../models/spt/utils/ILogger";
+import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 declare class TradeController {
     protected logger: ILogger;
-    protected itemEventRouter: ItemEventRouter;
+    protected eventOutputHolder: EventOutputHolder;
     protected tradeHelper: TradeHelper;
     protected profileHelper: ProfileHelper;
     protected ragfairServer: RagfairServer;
-    constructor(logger: ILogger, itemEventRouter: ItemEventRouter, tradeHelper: TradeHelper, profileHelper: ProfileHelper, ragfairServer: RagfairServer);
+    protected httpResponse: HttpResponseUtil;
+    constructor(logger: ILogger, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, profileHelper: ProfileHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil);
     confirmTrading(pmcData: IPmcData, body: IProcessBaseTradeRequestData, sessionID: string, foundInRaid?: boolean, upd?: Upd): IItemEventRouterResponse;
     confirmRagfairTrading(pmcData: IPmcData, body: IProcessRagfairTradeRequestData, sessionID: string): IItemEventRouterResponse;
 }

types/controllers/TraderController.d.ts

@@ -1,3 +1,4 @@
+import { FenceBaseAssortGenerator } from "../generators/FenceBaseAssortGenerator";
 import { ProfileHelper } from "../helpers/ProfileHelper";
 import { TraderAssortHelper } from "../helpers/TraderAssortHelper";
 import { TraderHelper } from "../helpers/TraderHelper";
@@ -6,6 +7,7 @@ import { ILogger } from "../models/spt/utils/ILogger";
 import { DatabaseServer } from "../servers/DatabaseServer";
 import { FenceService } from "../services/FenceService";
 import { TraderAssortService } from "../services/TraderAssortService";
+import { TraderPurchasePersisterService } from "../services/TraderPurchasePersisterService";
 import { JsonUtil } from "../utils/JsonUtil";
 import { TimeUtil } from "../utils/TimeUtil";
 export declare class TraderController {
@@ -16,9 +18,11 @@ export declare class TraderController {
     protected traderHelper: TraderHelper;
     protected timeUtil: TimeUtil;
     protected traderAssortService: TraderAssortService;
+    protected traderPurchasePersisterService: TraderPurchasePersisterService;
     protected fenceService: FenceService;
+    protected fenceBaseAssortGenerator: FenceBaseAssortGenerator;
     protected jsonUtil: JsonUtil;
-    constructor(logger: ILogger, databaseServer: DatabaseServer, traderAssortHelper: TraderAssortHelper, profileHelper: ProfileHelper, traderHelper: TraderHelper, timeUtil: TimeUtil, traderAssortService: TraderAssortService, fenceService: FenceService, jsonUtil: JsonUtil);
+    constructor(logger: ILogger, databaseServer: DatabaseServer, traderAssortHelper: TraderAssortHelper, profileHelper: ProfileHelper, traderHelper: TraderHelper, timeUtil: TimeUtil, traderAssortService: TraderAssortService, traderPurchasePersisterService: TraderPurchasePersisterService, fenceService: FenceService, fenceBaseAssortGenerator: FenceBaseAssortGenerator, jsonUtil: JsonUtil);
     /**
      * Runs when onLoad event is fired
      * Iterate over traders, ensure an unmolested copy of their assorts is stored in traderAssortService

types/controllers/WeatherController.d.ts

@@ -1,11 +1,18 @@
 import { WeatherGenerator } from "../generators/WeatherGenerator";
 import { IWeatherData } from "../models/eft/weather/IWeatherData";
 import { IWeatherConfig } from "../models/spt/config/IWeatherConfig";
+import { ILogger } from "../models/spt/utils/ILogger";
 import { ConfigServer } from "../servers/ConfigServer";
 export declare class WeatherController {
     protected weatherGenerator: WeatherGenerator;
+    protected logger: ILogger;
     protected configServer: ConfigServer;
     protected weatherConfig: IWeatherConfig;
-    constructor(weatherGenerator: WeatherGenerator, configServer: ConfigServer);
+    constructor(weatherGenerator: WeatherGenerator, logger: ILogger, configServer: ConfigServer);
     generate(): IWeatherData;
+    /**
+     * Get the current in-raid time (MUST HAVE PLAYER LOGGED INTO CLIENT TO WORK)
+     * @returns Date object
+     */
+    getCurrentInRaidTime(): Date;
 }

types/controllers/WishlistController.d.ts

@@ -1,10 +1,10 @@
-import { ItemEventRouter } from "../routers/ItemEventRouter";
+import { EventOutputHolder } from "../routers/EventOutputHolder";
 import { IPmcData } from "../models/eft/common/IPmcData";
 import { IWishlistActionData } from "../models/eft/wishlist/IWishlistActionData";
 import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
 export declare class WishlistController {
-    protected itemEvenRouter: ItemEventRouter;
+    protected eventOutputHolder: EventOutputHolder;
-    constructor(itemEvenRouter: ItemEventRouter);
+    constructor(eventOutputHolder: EventOutputHolder);
     addToWishList(pmcData: IPmcData, body: IWishlistActionData, sessionID: string): IItemEventRouterResponse;
     removeFromWishList(pmcData: IPmcData, body: IWishlistActionData, sessionID: string): IItemEventRouterResponse;
 }

types/di/Container.d.ts

@@ -3,6 +3,7 @@ import { DependencyContainer } from "tsyringe";
  * Handle the registration of classes to be used by the Dependency Injection code
  */
 export declare class Container {
+    static registerPostLoadTypes(container: DependencyContainer, childContainer: DependencyContainer): void;
     static registerTypes(depContainer: DependencyContainer): void;
     static registerListTypes(depContainer: DependencyContainer): void;
     private static registerUtils;

types/di/OnLoad.d.ts

@@ -1,4 +1,4 @@
 export declare class OnLoad {
-    onLoad(): void;
+    onLoad(): Promise<void>;
     getRoute(): string;
 }

types/di/OnLoadOnUpdate.d.ts

@@ -1,7 +1,7 @@
 import { OnLoad } from "./OnLoad";
 import { OnUpdate } from "./OnUpdate";
 export declare class OnLoadOnUpdate implements OnLoad, OnUpdate {
-    onUpdate(timeSinceLastRun: number): boolean;
+    onUpdate(timeSinceLastRun: number): Promise<boolean>;
-    onLoad(): void;
+    onLoad(): Promise<void>;
     getRoute(): string;
 }

types/di/OnUpdate.d.ts

@@ -1,4 +1,4 @@
 export declare class OnUpdate {
-    onUpdate(timeSinceLastRun: number): boolean;
+    onUpdate(timeSinceLastRun: number): Promise<boolean>;
     getRoute(): string;
 }

types/di/Serializer.d.ts

@@ -1,5 +1,6 @@
-import { IHttpServer } from "../models/spt/server/IHttpServer";
+/// <reference types="node" />
+import { IncomingMessage, ServerResponse } from "http";
 export declare class Serializer {
-    serialize(sessionID: string, req: any, resp: any, body: any, httpServer: IHttpServer): void;
+    serialize(sessionID: string, req: IncomingMessage, resp: ServerResponse, body: any): void;
     canHandle(something: string): boolean;
 }

types/generators/BotEquipmentModGenerator.d.ts

@@ -0,0 +1,200 @@
+import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper";
+import { BotHelper } from "../helpers/BotHelper";
+import { BotWeaponGeneratorHelper } from "../helpers/BotWeaponGeneratorHelper";
+import { ItemHelper } from "../helpers/ItemHelper";
+import { ProbabilityHelper } from "../helpers/ProbabilityHelper";
+import { ProfileHelper } from "../helpers/ProfileHelper";
+import { Mods, ModsChances } from "../models/eft/common/tables/IBotType";
+import { Item } from "../models/eft/common/tables/IItem";
+import { ITemplateItem, Slot } from "../models/eft/common/tables/ITemplateItem";
+import { EquipmentFilterDetails, IBotConfig } from "../models/spt/config/IBotConfig";
+import { ILogger } from "../models/spt/utils/ILogger";
+import { ConfigServer } from "../servers/ConfigServer";
+import { DatabaseServer } from "../servers/DatabaseServer";
+import { BotEquipmentFilterService } from "../services/BotEquipmentFilterService";
+import { BotEquipmentModPoolService } from "../services/BotEquipmentModPoolService";
+import { BotModLimits, BotWeaponModLimitService } from "../services/BotWeaponModLimitService";
+import { ItemFilterService } from "../services/ItemFilterService";
+import { LocalisationService } from "../services/LocalisationService";
+import { HashUtil } from "../utils/HashUtil";
+import { JsonUtil } from "../utils/JsonUtil";
+import { RandomUtil } from "../utils/RandomUtil";
+export declare class BotEquipmentModGenerator {
+    protected logger: ILogger;
+    protected jsonUtil: JsonUtil;
+    protected hashUtil: HashUtil;
+    protected randomUtil: RandomUtil;
+    protected probabilityHelper: ProbabilityHelper;
+    protected databaseServer: DatabaseServer;
+    protected itemHelper: ItemHelper;
+    protected botEquipmentFilterService: BotEquipmentFilterService;
+    protected itemFilterService: ItemFilterService;
+    protected profileHelper: ProfileHelper;
+    protected botWeaponModLimitService: BotWeaponModLimitService;
+    protected botHelper: BotHelper;
+    protected botGeneratorHelper: BotGeneratorHelper;
+    protected botWeaponGeneratorHelper: BotWeaponGeneratorHelper;
+    protected localisationService: LocalisationService;
+    protected botEquipmentModPoolService: BotEquipmentModPoolService;
+    protected configServer: ConfigServer;
+    protected botConfig: IBotConfig;
+    constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, probabilityHelper: ProbabilityHelper, databaseServer: DatabaseServer, itemHelper: ItemHelper, botEquipmentFilterService: BotEquipmentFilterService, itemFilterService: ItemFilterService, profileHelper: ProfileHelper, botWeaponModLimitService: BotWeaponModLimitService, botHelper: BotHelper, botGeneratorHelper: BotGeneratorHelper, botWeaponGeneratorHelper: BotWeaponGeneratorHelper, localisationService: LocalisationService, botEquipmentModPoolService: BotEquipmentModPoolService, configServer: ConfigServer);
+    /**
+     * Check mods are compatible and add to array
+     * @param equipment Equipment item to add mods to
+     * @param modPool Mod list to choose frm
+     * @param parentId parentid of item to add mod to
+     * @param parentTemplate template objet of item to add mods to
+     * @param modSpawnChances dictionary of mod items and their chance to spawn for this bot type
+     * @param botRole the bot role being generated for
+     * @param forceSpawn should this mod be forced to spawn
+     * @returns Item + compatible mods as an array
+     */
+    generateModsForEquipment(equipment: Item[], modPool: Mods, parentId: string, parentTemplate: ITemplateItem, modSpawnChances: ModsChances, botRole: string, forceSpawn?: boolean): Item[];
+    /**
+     * Add mods to a weapon using the provided mod pool
+     * @param sessionId session id
+     * @param weapon Weapon to add mods to
+     * @param modPool Pool of compatible mods to attach to weapon
+     * @param weaponParentId parentId of weapon
+     * @param parentTemplate Weapon which mods will be generated on
+     * @param modSpawnChances Mod spawn chances
+     * @param ammoTpl Ammo tpl to use when generating magazines/cartridges
+     * @param botRole Role of bot weapon is generated for
+     * @param botLevel lvel of the bot weapon is being generated for
+     * @param modLimits limits placed on certian mod types per gun
+     * @param botEquipmentRole role of bot when accessing bot.json equipment config settings
+     * @returns Weapon + mods array
+     */
+    generateModsForWeapon(sessionId: string, weapon: Item[], modPool: Mods, weaponParentId: string, parentTemplate: ITemplateItem, modSpawnChances: ModsChances, ammoTpl: string, botRole: string, botLevel: number, modLimits: BotModLimits, botEquipmentRole: string): Item[];
+    /**
+     * Is this modslot a front or rear sight
+     * @param modSlot Slot to check
+     * @returns true if it's a front/rear sight
+     */
+    protected modIsFrontOrRearSight(modSlot: string): boolean;
+    /**
+     * Does the provided mod details show the mod can hold a scope
+     * @param modSlot e.g. mod_scope, mod_mount
+     * @param modsParentId Parent id of mod item
+     * @returns true if it can hold a scope
+     */
+    protected modSlotCanHoldScope(modSlot: string, modsParentId: string): boolean;
+    /**
+     * Set all scope mod chances to 100%
+     * @param modSpawnChances Chances objet to update
+     */
+    protected setScopeSpawnChancesToFull(modSpawnChances: ModsChances): void;
+    protected sortModKeys(unsortedKeys: string[]): string[];
+    /**
+     * Get a Slot property for an item (chamber/cartridge/slot)
+     * @param modSlot e.g patron_in_weapon
+     * @param parentTemplate item template
+     * @returns Slot item
+     */
+    protected getModItemSlot(modSlot: string, parentTemplate: ITemplateItem): Slot;
+    /**
+     * randomly choose if a mod should be spawned, 100% for required mods OR mod is ammo slot
+     * never return true for an item that has 0% spawn chance
+     * @param itemSlot slot the item sits in
+     * @param modSlot slot the mod sits in
+     * @param modSpawnChances Chances for various mod spawns
+     * @returns boolean true if it should spawn
+     */
+    protected shouldModBeSpawned(itemSlot: Slot, modSlot: string, modSpawnChances: ModsChances): boolean;
+    /**
+     *
+     * @param modSlot Slot mod will fit into
+     * @param isRandomisableSlot Will generate a randomised mod pool if true
+     * @param modsParent Parent slot the item will be a part of
+     * @param botEquipBlacklist Blacklist to prevent mods from being picked
+     * @param itemModPool Pool of items to pick from
+     * @param weapon array with only weapon tpl in it, ready for mods to be added
+     * @param ammoTpl ammo tpl to use if slot requires a cartridge to be added (e.g. mod_magazine)
+     * @param parentTemplate Parent item the mod will go into
+     * @returns ITemplateItem
+     */
+    protected chooseModToPutIntoSlot(modSlot: string, isRandomisableSlot: boolean, botWeaponSightWhitelist: Record<string, string[]>, botEquipBlacklist: EquipmentFilterDetails, itemModPool: Record<string, string[]>, weapon: Item[], ammoTpl: string, parentTemplate: ITemplateItem): [boolean, ITemplateItem];
+    /**
+     * Create a mod item with parameters as properties
+     * @param modId _id
+     * @param modTpl _tpl
+     * @param parentId parentId
+     * @param modSlot slotId
+     * @param modTemplate Used to add additional properites in the upd object
+     * @returns Item object
+     */
+    protected createModItem(modId: string, modTpl: string, parentId: string, modSlot: string, modTemplate: ITemplateItem, botRole: string): Item;
+    /**
+     * Get a list of containers that hold ammo
+     * e.g. mod_magazine / patron_in_weapon_000
+     * @returns string array
+     */
+    protected getAmmoContainers(): string[];
+    /**
+     * Get a random mod from an items compatible mods Filter array
+     * @param modTpl ???? default value to return if nothing found
+     * @param parentSlot item mod will go into, used to get combatible items
+     * @param modSlot Slot to get mod to fill
+     * @param items items to ensure picked mod is compatible with
+     * @returns item tpl
+     */
+    protected getModTplFromItemDb(modTpl: string, parentSlot: Slot, modSlot: string, items: Item[]): string;
+    /**
+     * Log errors if mod is not compatible with slot
+     * @param modToAdd template of mod to check
+     * @param itemSlot slot the item will be placed in
+     * @param modSlot slot the mod will fill
+     * @param parentTemplate tempalte of the mods parent item
+     * @returns true if valid
+     */
+    protected isModValidForSlot(modToAdd: [boolean, ITemplateItem], itemSlot: Slot, modSlot: string, parentTemplate: ITemplateItem): boolean;
+    /**
+     * Find mod tpls of a provided type and add to modPool
+     * @param desiredSlotName slot to look up and add we are adding tpls for (e.g mod_scope)
+     * @param modTemplate db object for modItem we get compatible mods from
+     * @param modPool Pool of mods we are adding to
+     */
+    protected addCompatibleModsForProvidedMod(desiredSlotName: string, modTemplate: ITemplateItem, modPool: Mods, botEquipBlacklist: EquipmentFilterDetails): void;
+    /**
+     * Get the possible items that fit a slot
+     * @param parentItemId item tpl to get compatible items for
+     * @param modSlot Slot item should fit in
+     * @param botEquipBlacklist equipment that should not be picked
+     * @returns array of compatible items for that slot
+     */
+    protected getDynamicModPool(parentItemId: string, modSlot: string, botEquipBlacklist: EquipmentFilterDetails): string[];
+    /**
+     * Take a list of tpls and filter out blacklisted values using itemFilterService + botEquipmentBlacklist
+     * @param allowedMods base mods to filter
+     * @param botEquipBlacklist equipment blacklist
+     * @param modSlot slot mods belong to
+     * @returns Filtered array of mod tpls
+     */
+    protected filterWeaponModsByBlacklist(allowedMods: string[], botEquipBlacklist: EquipmentFilterDetails, modSlot: string): string[];
+    /**
+     * With the shotgun revolver (60db29ce99594040e04c4a27) 12.12 introduced CylinderMagazines.
+     * Those magazines (e.g. 60dc519adf4c47305f6d410d) have a "Cartridges" entry with a _max_count=0.
+     * Ammo is not put into the magazine directly but assigned to the magazine's slots: The "camora_xxx" slots.
+     * This function is a helper called by generateModsForItem for mods with parent type "CylinderMagazine"
+     * @param items The items where the CylinderMagazine's camora are appended to
+     * @param modPool modPool which should include available cartrigdes
+     * @param parentId The CylinderMagazine's UID
+     * @param parentTemplate The CylinderMagazine's template
+     */
+    protected fillCamora(items: Item[], modPool: Mods, parentId: string, parentTemplate: ITemplateItem): void;
+    /**
+     * Take a record of camoras and merge the compatable shells into one array
+     * @param camorasWithShells camoras we want to merge into one array
+     * @returns string array of shells fro luitple camora sources
+     */
+    protected mergeCamoraPoolsTogether(camorasWithShells: Record<string, string[]>): string[];
+    /**
+     * Filter out non-whitelisted weapon scopes
+     * @param weapon Weapon scopes will be added to
+     * @param scopes Full scope pool
+     * @param botWeaponSightWhitelist whitelist of scope types by weapon base type
+     * @returns array of scope tpls that have been filtered
+     */
+    protected filterSightsByWeaponType(weapon: Item, scopes: string[], botWeaponSightWhitelist: Record<string, string[]>): string[];
+}

types/generators/BotGenerator.d.ts

@@ -1,25 +1,21 @@
+import { BotDifficultyHelper } from "../helpers/BotDifficultyHelper";
 import { BotHelper } from "../helpers/BotHelper";
-import { GameEventHelper } from "../helpers/GameEventHelper";
 import { ProfileHelper } from "../helpers/ProfileHelper";
-import { IGenerateBotsRequestData } from "../models/eft/bot/IGenerateBotsRequestData";
+import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper";
 import { Health as PmcHealth, IBotBase, Skills } from "../models/eft/common/tables/IBotBase";
-import { Health, IBotType, Inventory } from "../models/eft/common/tables/IBotType";
+import { Health, IBotType } from "../models/eft/common/tables/IBotType";
+import { BotGenerationDetails } from "../models/spt/bots/BotGenerationDetails";
 import { IBotConfig } from "../models/spt/config/IBotConfig";
 import { ILogger } from "../models/spt/utils/ILogger";
 import { ConfigServer } from "../servers/ConfigServer";
 import { DatabaseServer } from "../servers/DatabaseServer";
 import { BotEquipmentFilterService } from "../services/BotEquipmentFilterService";
-import { PmcAiService } from "../services/PmcAiService";
+import { SeasonalEventService } from "../services/SeasonalEventService";
 import { HashUtil } from "../utils/HashUtil";
 import { JsonUtil } from "../utils/JsonUtil";
 import { RandomUtil } from "../utils/RandomUtil";
 import { BotInventoryGenerator } from "./BotInventoryGenerator";
-declare namespace BotGenerator {
+import { BotLevelGenerator } from "./BotLevelGenerator";
-    interface IRandomisedBotLevelResult {
-        level: number;
-        exp: number;
-    }
-}
 export declare class BotGenerator {
     protected logger: ILogger;
     protected hashUtil: HashUtil;
@@ -28,13 +24,15 @@ export declare class BotGenerator {
     protected profileHelper: ProfileHelper;
     protected databaseServer: DatabaseServer;
     protected botInventoryGenerator: BotInventoryGenerator;
+    protected botLevelGenerator: BotLevelGenerator;
     protected botEquipmentFilterService: BotEquipmentFilterService;
+    protected weightedRandomHelper: WeightedRandomHelper;
     protected botHelper: BotHelper;
-    protected gameEventHelper: GameEventHelper;
+    protected botDifficultyHelper: BotDifficultyHelper;
-    protected pmcAiService: PmcAiService;
+    protected seasonalEventService: SeasonalEventService;
     protected configServer: ConfigServer;
     protected botConfig: IBotConfig;
-    constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, jsonUtil: JsonUtil, profileHelper: ProfileHelper, databaseServer: DatabaseServer, botInventoryGenerator: BotInventoryGenerator, botEquipmentFilterService: BotEquipmentFilterService, botHelper: BotHelper, gameEventHelper: GameEventHelper, pmcAiService: PmcAiService, configServer: ConfigServer);
+    constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, jsonUtil: JsonUtil, profileHelper: ProfileHelper, databaseServer: DatabaseServer, botInventoryGenerator: BotInventoryGenerator, botLevelGenerator: BotLevelGenerator, botEquipmentFilterService: BotEquipmentFilterService, weightedRandomHelper: WeightedRandomHelper, botHelper: BotHelper, botDifficultyHelper: BotDifficultyHelper, seasonalEventService: SeasonalEventService, configServer: ConfigServer);
     /**
      * Generate a player scav bot object
      * @param role e.g. assault / pmcbot
@@ -44,17 +42,12 @@ export declare class BotGenerator {
      */
     generatePlayerScav(sessionId: string, role: string, difficulty: string, botTemplate: IBotType): IBotBase;
     /**
-     * Generate an array of bot objects for populate a raid with
+     * Create x number of bots of the type/side/difficulty defined in botGenerationDetails
-     * @param sessionId session id
+     * @param sessionId Session id
-     * @param info request object
+     * @param botGenerationDetails details on how to generate bots
-     * @returns bot array
+     * @returns array of bots
      */
-    generate(sessionId: string, info: IGenerateBotsRequestData): IBotBase[];
+    prepareAndGenerateBots(sessionId: string, botGenerationDetails: BotGenerationDetails): IBotBase[];
-    /**
-     * Get a randomised PMC side based on bot config value 'isUsec'
-     * @returns pmc side as string
-     */
-    protected getRandomisedPmcSide(): string;
     /**
      * Get a clone of the database\bots\base.json file
      * @returns IBotBase object
@@ -64,26 +57,24 @@ export declare class BotGenerator {
      * Create a IBotBase object with equipment/loot/exp etc
      * @param sessionId Session id
      * @param bot bots base file
-     * @param role botRole bot will use
+     * @param botJsonTemplate Bot template from db/bots/x.json
-     * @param node Bot template from db/bots/x.json
+     * @param botGenerationDetails details on how to generate the bot
-     * @param isPmc Is bot to be a PMC
-     * @param isPlayerScav is bot to be a p scav bot
      * @returns IBotBase object
      */
-    protected generateBot(sessionId: string, bot: IBotBase, role: string, node: IBotType, isPmc: boolean, isPlayerScav?: boolean): IBotBase;
+    protected generateBot(sessionId: string, bot: IBotBase, botJsonTemplate: IBotType, botGenerationDetails: BotGenerationDetails): IBotBase;
+    /**
+     * Create a bot nickname
+     * @param botJsonTemplate x.json from database
+     * @param isPlayerScav Will bot be player scav
+     * @param botRole role of bot e.g. assault
+     * @returns Nickname for bot
+     */
+    protected generateBotNickname(botJsonTemplate: IBotType, isPlayerScav: boolean, botRole: string): string;
     /**
      * Log the number of PMCs generated to the debug console
      * @param output Generated bot array, ready to send to client
      */
     protected logPmcGeneratedCount(output: IBotBase[]): void;
-    /**
-     * Return a randomised bot level and exp value
-     * @param role botRole being generated for
-     * @param min Min exp value
-     * @param max Max exp value
-     * @returns IRandomisedBotLevelResult object
-     */
-    protected generateRandomLevel(role: string, min: number, max: number): BotGenerator.IRandomisedBotLevelResult;
     /**
      * Converts health object to the required format
      * @param healthObj health object from bot json
@@ -92,11 +83,6 @@ export declare class BotGenerator {
      */
     protected generateHealth(healthObj: Health, playerScav?: boolean): PmcHealth;
     protected generateSkills(skillsObj: Skills): Skills;
-    /**
-     * Iterate through bots inventory and loot to find and remove christmas items (as defined in GameEventHelper)
-     * @param nodeInventory Bots inventory to iterate over
-     */
-    protected removeChristmasItemsFromBotInventory(nodeInventory: Inventory): void;
     /**
      * Generate a random Id for a bot and apply to bots _id and aid value
      * @param bot bot to update
@@ -104,12 +90,6 @@ export declare class BotGenerator {
      */
     protected generateId(bot: IBotBase): IBotBase;
     protected generateInventoryID(profile: IBotBase): IBotBase;
-    /**
-     * Get the difficulty passed in, if its not "asoline", get selected difficulty from config
-     * @param requestedDifficulty
-     * @returns
-     */
-    protected getPMCDifficulty(requestedDifficulty: string): string;
     /**
      * Add a side-specific (usec/bear) dogtag item to a bots inventory
      * @param bot bot to add dogtag to
@@ -117,4 +97,3 @@ export declare class BotGenerator {
      */
     protected generateDogtag(bot: IBotBase): IBotBase;
 }
-export {};

types/generators/BotInventoryGenerator.d.ts

@@ -1,14 +1,18 @@
 import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper";
+import { BotHelper } from "../helpers/BotHelper";
 import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper";
 import { Inventory as PmcInventory } from "../models/eft/common/tables/IBotBase";
-import { Chances, Generation, Inventory, Mods } from "../models/eft/common/tables/IBotType";
+import { Chances, Generation, IBotType, Inventory, Mods } from "../models/eft/common/tables/IBotType";
 import { EquipmentSlots } from "../models/enums/EquipmentSlots";
-import { IBotConfig } from "../models/spt/config/IBotConfig";
+import { EquipmentFilterDetails, IBotConfig, RandomisationDetails } from "../models/spt/config/IBotConfig";
 import { ILogger } from "../models/spt/utils/ILogger";
 import { ConfigServer } from "../servers/ConfigServer";
 import { DatabaseServer } from "../servers/DatabaseServer";
+import { BotEquipmentModPoolService } from "../services/BotEquipmentModPoolService";
+import { LocalisationService } from "../services/LocalisationService";
 import { HashUtil } from "../utils/HashUtil";
 import { RandomUtil } from "../utils/RandomUtil";
+import { BotEquipmentModGenerator } from "./BotEquipmentModGenerator";
 import { BotLootGenerator } from "./BotLootGenerator";
 import { BotWeaponGenerator } from "./BotWeaponGenerator";
 export declare class BotInventoryGenerator {
@@ -19,15 +23,90 @@ export declare class BotInventoryGenerator {
     protected botWeaponGenerator: BotWeaponGenerator;
     protected botLootGenerator: BotLootGenerator;
     protected botGeneratorHelper: BotGeneratorHelper;
+    protected botHelper: BotHelper;
     protected weightedRandomHelper: WeightedRandomHelper;
+    protected localisationService: LocalisationService;
+    protected botEquipmentModPoolService: BotEquipmentModPoolService;
+    protected botEquipmentModGenerator: BotEquipmentModGenerator;
     protected configServer: ConfigServer;
     protected botConfig: IBotConfig;
-    constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, botWeaponGenerator: BotWeaponGenerator, botLootGenerator: BotLootGenerator, botGeneratorHelper: BotGeneratorHelper, weightedRandomHelper: WeightedRandomHelper, configServer: ConfigServer);
+    constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, botWeaponGenerator: BotWeaponGenerator, botLootGenerator: BotLootGenerator, botGeneratorHelper: BotGeneratorHelper, botHelper: BotHelper, weightedRandomHelper: WeightedRandomHelper, localisationService: LocalisationService, botEquipmentModPoolService: BotEquipmentModPoolService, botEquipmentModGenerator: BotEquipmentModGenerator, configServer: ConfigServer);
-    generateInventory(sessionId: string, templateInventory: Inventory, equipmentChances: Chances, itemGenerationLimitsMinMax: Generation, botRole: string, isPmc: boolean): PmcInventory;
+    /**
+     * Add equipment/weapons/loot to bot
+     * @param sessionId Session id
+     * @param botJsonTemplate bot/x.json data from db
+     * @param botRole Role bot has (assault/pmcBot)
+     * @param isPmc Is bot being converted into a pmc
+     * @param botLevel Level of bot being generated
+     * @returns PmcInventory object with equipment/weapons/loot
+     */
+    generateInventory(sessionId: string, botJsonTemplate: IBotType, botRole: string, isPmc: boolean, botLevel: number): PmcInventory;
+    /**
+     * Create a pmcInventory object with all the base/generic items needed
+     * @returns PmcInventory object
+     */
+    protected generateInventoryBase(): PmcInventory;
+    /**
+     * Add equipment to a bot
+     * @param templateInventory bot/x.json data from db
+     * @param equipmentChances Chances items will be added to bot
+     * @param botRole Role bot has (assault/pmcBot)
+     * @param botInventory Inventory to add equipment to
+     * @param botLevel Level of bot
+     */
+    protected generateAndAddEquipmentToBot(templateInventory: Inventory, equipmentChances: Chances, botRole: string, botInventory: PmcInventory, botLevel: number): void;
+    /**
+     * Add a piece of equipment with mods to inventory from the provided pools
+     * @param equipmentSlot Slot to select an item for
+     * @param equipmentPool Possible items to choose from
+     * @param modPool Possible mods to apply to item chosen
+     * @param spawnChances Chances items will be chosen to be added
+     * @param botRole Role of bot e.g. assault
+     * @param inventory Inventory to add item into
+     * @param randomisationDetails settings from bot.json to adjust how item is generated
+     */
+    protected generateEquipment(equipmentSlot: string, equipmentPool: Record<string, number>, modPool: Mods, spawnChances: Chances, botRole: string, inventory: PmcInventory, randomisationDetails: RandomisationDetails): void;
+    /**
+     * Get all possible mods for item and filter down based on equipment blacklist from bot.json config
+     * @param itemTpl Item mod pool is being retreived and filtered
+     * @param equipmentBlacklist blacklist to filter mod pool with
+     * @returns Filtered pool of mods
+     */
+    protected getFilteredDynamicModsForItem(itemTpl: string, equipmentBlacklist: EquipmentFilterDetails[]): Record<string, string[]>;
+    /**
+     * Work out what weapons bot should have equipped and add them to bot inventory
+     * @param templateInventory bot/x.json data from db
+     * @param equipmentChances Chances bot can have equipment equipped
+     * @param sessionId Session id
+     * @param botInventory Inventory to add weapons to
+     * @param botRole assault/pmcBot/bossTagilla etc
+     * @param isPmc Is the bot being generated as a pmc
+     * @param botLevel level of bot having weapon generated
+     * @param itemGenerationLimitsMinMax Limits for items the bot can have
+     */
+    protected generateAndAddWeaponsToBot(templateInventory: Inventory, equipmentChances: Chances, sessionId: string, botInventory: PmcInventory, botRole: string, isPmc: boolean, itemGenerationLimitsMinMax: Generation, botLevel: number): void;
+    /**
+     * Calculate if the bot should have weapons in Primary/Secondary/Holster slots
+     * @param equipmentChances Chances bot has certain equipment
+     * @returns What slots bot should have weapons generated for
+     */
+    protected getDesiredWeaponsForBot(equipmentChances: Chances): {
+        slot: EquipmentSlots;
+        shouldSpawn: boolean;
+    }[];
+    /**
+     * Add weapon + spare mags/ammo to bots inventory
+     * @param sessionId Session id
+     * @param weaponSlot Weapon slot being generated
+     * @param templateInventory bot/x.json data from db
+     * @param botInventory Inventory to add weapon+mags/ammo to
+     * @param equipmentChances Chances bot can have equipment equipped
+     * @param botRole assault/pmcBot/bossTagilla etc
+     * @param isPmc Is the bot being generated as a pmc
+     * @param itemGenerationLimitsMinMax
+     */
     protected addWeaponAndMagazinesToInventory(sessionId: string, weaponSlot: {
         slot: EquipmentSlots;
         shouldSpawn: boolean;
-    }, templateInventory: Inventory, botInventory: PmcInventory, equipmentChances: Chances, botRole: string, isPmc: boolean, itemGenerationLimitsMinMax: Generation): void;
+    }, templateInventory: Inventory, botInventory: PmcInventory, equipmentChances: Chances, botRole: string, isPmc: boolean, itemGenerationLimitsMinMax: Generation, botLevel: number): void;
-    protected generateEquipment(equipmentSlot: string, equipmentPool: Record<string, number>, modPool: Mods, spawnChances: Chances, botRole: string, inventory: PmcInventory): void;
-    protected generateInventoryBase(): PmcInventory;
 }

types/generators/BotLevelGenerator.d.ts

@@ -0,0 +1,29 @@
+import { MinMax } from "../models/common/MinMax";
+import { IRandomisedBotLevelResult } from "../models/eft/bot/IRandomisedBotLevelResult";
+import { ExpTable } from "../models/eft/common/IGlobals";
+import { IBotBase } from "../models/eft/common/tables/IBotBase";
+import { BotGenerationDetails } from "../models/spt/bots/BotGenerationDetails";
+import { ILogger } from "../models/spt/utils/ILogger";
+import { DatabaseServer } from "../servers/DatabaseServer";
+import { RandomUtil } from "../utils/RandomUtil";
+export declare class BotLevelGenerator {
+    protected logger: ILogger;
+    protected randomUtil: RandomUtil;
+    protected databaseServer: DatabaseServer;
+    constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer);
+    /**
+     * Return a randomised bot level and exp value
+     * @param levelDetails min and max of level for bot
+     * @param botGenerationDetails Deatils to help generate a bot
+     * @param bot being level is being generated for
+     * @returns IRandomisedBotLevelResult object
+     */
+    generateBotLevel(levelDetails: MinMax, botGenerationDetails: BotGenerationDetails, bot: IBotBase): IRandomisedBotLevelResult;
+    /**
+     * Get the highest level a bot can be relative to the players level, but no futher than the max size from globals.exp_table
+     * @param playerLevel Players current level
+     * @param relativeDeltaMax max delta above player level to go
+     * @returns highest level possible for bot
+     */
+    protected getHighestRelativeBotLevel(playerLevel: number, relativeDeltaMax: number, levelDetails: MinMax, expTable: ExpTable[]): number;
+}

types/generators/BotLootGenerator.d.ts

@@ -10,6 +10,7 @@ import { ILogger } from "../models/spt/utils/ILogger";
 import { ConfigServer } from "../servers/ConfigServer";
 import { DatabaseServer } from "../servers/DatabaseServer";
 import { BotLootCacheService } from "../services/BotLootCacheService";
+import { LocalisationService } from "../services/LocalisationService";
 import { HashUtil } from "../utils/HashUtil";
 import { RandomUtil } from "../utils/RandomUtil";
 import { BotWeaponGenerator } from "./BotWeaponGenerator";
@@ -23,10 +24,22 @@ export declare class BotLootGenerator {
     protected botWeaponGenerator: BotWeaponGenerator;
     protected botWeaponGeneratorHelper: BotWeaponGeneratorHelper;
     protected botLootCacheService: BotLootCacheService;
+    protected localisationService: LocalisationService;
     protected configServer: ConfigServer;
     protected botConfig: IBotConfig;
-    constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, botGeneratorHelper: BotGeneratorHelper, botWeaponGenerator: BotWeaponGenerator, botWeaponGeneratorHelper: BotWeaponGeneratorHelper, botLootCacheService: BotLootCacheService, configServer: ConfigServer);
+    constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, botGeneratorHelper: BotGeneratorHelper, botWeaponGenerator: BotWeaponGenerator, botWeaponGeneratorHelper: BotWeaponGeneratorHelper, botLootCacheService: BotLootCacheService, localisationService: LocalisationService, configServer: ConfigServer);
-    generateLoot(sessionId: string, templateInventory: Inventory, itemCounts: ItemMinMax, isPmc: boolean, botRole: string, botInventory: PmcInventory, equipmentChances: Chances): void;
+    /**
+     * Add loot to bots containers
+     * @param sessionId Session id
+     * @param templateInventory x.json from database/bots
+     * @param itemCounts Liits on item types to be added as loot
+     * @param isPmc Will bot be a pmc
+     * @param botRole Role of bot, e.g. asssult
+     * @param botInventory Inventory to add loot to
+     * @param equipmentChances
+     * @param botLevel Level of bot
+     */
+    generateLoot(sessionId: string, templateInventory: Inventory, itemCounts: ItemMinMax, isPmc: boolean, botRole: string, botInventory: PmcInventory, equipmentChances: Chances, botLevel: number): void;
     protected getRandomisedCount(min: number, max: number, nValue: number): number;
     /**
      * Take random items from a pool and add to an inventory until totalItemCount or totalValueLimit is reached
@@ -49,7 +62,7 @@ export declare class BotLootGenerator {
      * @param botRole bots role, .e.g. pmcBot
      * @param isPmc are we generating for a pmc
      */
-    protected addLooseWeaponsToInventorySlot(sessionId: string, botInventory: PmcInventory, equipmentSlot: string, templateInventory: Inventory, modChances: ModsChances, botRole: string, isPmc: boolean): void;
+    protected addLooseWeaponsToInventorySlot(sessionId: string, botInventory: PmcInventory, equipmentSlot: string, templateInventory: Inventory, modChances: ModsChances, botRole: string, isPmc: boolean, botLevel: number): void;
     /**
      * Get a random item from the pool parameter using the biasedRandomNumber system
      * @param pool pool of items to pick an item from
@@ -113,7 +126,7 @@ export declare class BotLootGenerator {
      * If no limit found for a non pmc bot, fall back to defaults
      * @param isPmc is the bot we want limits for a pmc
      * @param botRole what role does the bot have
-     * @returns dictionary of tplIds and limit
+     * @returns Dictionary of tplIds and limit
      */
     protected getItemSpawnLimitsForBotType(isPmc: boolean, botRole: string): Record<string, number>;
     /**

types/generators/BotWeaponGenerator.d.ts

@@ -12,9 +12,12 @@ import { IBotConfig } from "../models/spt/config/IBotConfig";
 import { ILogger } from "../models/spt/utils/ILogger";
 import { ConfigServer } from "../servers/ConfigServer";
 import { DatabaseServer } from "../servers/DatabaseServer";
+import { BotWeaponModLimitService } from "../services/BotWeaponModLimitService";
+import { LocalisationService } from "../services/LocalisationService";
 import { HashUtil } from "../utils/HashUtil";
 import { JsonUtil } from "../utils/JsonUtil";
 import { RandomUtil } from "../utils/RandomUtil";
+import { BotEquipmentModGenerator } from "./BotEquipmentModGenerator";
 import { IInventoryMagGen } from "./weapongen/IInventoryMagGen";
 export declare class BotWeaponGenerator {
     protected jsonUtil: JsonUtil;
@@ -27,10 +30,13 @@ export declare class BotWeaponGenerator {
     protected randomUtil: RandomUtil;
     protected configServer: ConfigServer;
     protected botWeaponGeneratorHelper: BotWeaponGeneratorHelper;
+    protected botWeaponModLimitService: BotWeaponModLimitService;
+    protected botEquipmentModGenerator: BotEquipmentModGenerator;
+    protected localisationService: LocalisationService;
     protected inventoryMagGenComponents: IInventoryMagGen[];
     protected readonly modMagazineSlotId = "mod_magazine";
     protected botConfig: IBotConfig;
-    constructor(jsonUtil: JsonUtil, logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, weightedRandomHelper: WeightedRandomHelper, botGeneratorHelper: BotGeneratorHelper, randomUtil: RandomUtil, configServer: ConfigServer, botWeaponGeneratorHelper: BotWeaponGeneratorHelper, inventoryMagGenComponents: IInventoryMagGen[]);
+    constructor(jsonUtil: JsonUtil, logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, weightedRandomHelper: WeightedRandomHelper, botGeneratorHelper: BotGeneratorHelper, randomUtil: RandomUtil, configServer: ConfigServer, botWeaponGeneratorHelper: BotWeaponGeneratorHelper, botWeaponModLimitService: BotWeaponModLimitService, botEquipmentModGenerator: BotEquipmentModGenerator, localisationService: LocalisationService, inventoryMagGenComponents: IInventoryMagGen[]);
     /**
      * Pick a random weapon based on weightings and generate a functional weapon
      * @param equipmentSlot Primary/secondary/holster
@@ -41,7 +47,7 @@ export declare class BotWeaponGenerator {
      * @param isPmc Is weapon generated for a pmc
      * @returns GenerateWeaponResult object
      */
-    generateRandomWeapon(sessionId: string, equipmentSlot: string, botTemplateInventory: Inventory, weaponParentId: string, modChances: ModsChances, botRole: string, isPmc: boolean): GenerateWeaponResult;
+    generateRandomWeapon(sessionId: string, equipmentSlot: string, botTemplateInventory: Inventory, weaponParentId: string, modChances: ModsChances, botRole: string, isPmc: boolean, botLevel: number): GenerateWeaponResult;
     /**
      * Get a random weighted weapon from a bots pool of weapons
      * @param equipmentSlot Primary/secondary/holster
@@ -60,7 +66,7 @@ export declare class BotWeaponGenerator {
      * @param isPmc
      * @returns GenerateWeaponResult object
      */
-    generateWeaponByTpl(sessionId: string, weaponTpl: string, equipmentSlot: string, botTemplateInventory: Inventory, weaponParentId: string, modChances: ModsChances, botRole: string, isPmc: boolean): GenerateWeaponResult;
+    generateWeaponByTpl(sessionId: string, weaponTpl: string, equipmentSlot: string, botTemplateInventory: Inventory, weaponParentId: string, modChances: ModsChances, botRole: string, isPmc: boolean, botLevel: number): GenerateWeaponResult;
     /**
      * Create array with weapon base as only element and
      * add additional properties based on weapon type

types/generators/FenceBaseAssortGenerator.d.ts

@@ -0,0 +1,28 @@
+import { HandbookHelper } from "../helpers/HandbookHelper";
+import { ItemHelper } from "../helpers/ItemHelper";
+import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem";
+import { ITraderConfig } from "../models/spt/config/ITraderConfig";
+import { ILogger } from "../models/spt/utils/ILogger";
+import { ConfigServer } from "../servers/ConfigServer";
+import { DatabaseServer } from "../servers/DatabaseServer";
+import { ItemFilterService } from "../services/ItemFilterService";
+export declare class FenceBaseAssortGenerator {
+    protected logger: ILogger;
+    protected databaseServer: DatabaseServer;
+    protected handbookHelper: HandbookHelper;
+    protected itemHelper: ItemHelper;
+    protected itemFilterService: ItemFilterService;
+    protected configServer: ConfigServer;
+    protected traderConfig: ITraderConfig;
+    constructor(logger: ILogger, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, itemHelper: ItemHelper, itemFilterService: ItemFilterService, configServer: ConfigServer);
+    /**
+     * Create base fence assorts dynamically and store in db
+     */
+    generateFenceBaseAssorts(): void;
+    /**
+     * Check if item is valid for being added to fence assorts
+     * @param item Item to check
+     * @returns true if valid fence item
+     */
+    protected isValidFenceItem(item: ITemplateItem): boolean;
+}

types/generators/LocationGenerator.d.ts

@@ -1,5 +1,4 @@
 import { ContainerHelper } from "../helpers/ContainerHelper";
-import { GameEventHelper } from "../helpers/GameEventHelper";
 import { ItemHelper } from "../helpers/ItemHelper";
 import { PresetHelper } from "../helpers/PresetHelper";
 import { RagfairServerHelper } from "../helpers/RagfairServerHelper";
@@ -9,6 +8,8 @@ import { IStaticAmmoDetails, IStaticContainerProps, IStaticForcedProps, IStaticL
 import { ILocationConfig } from "../models/spt/config/ILocationConfig";
 import { ILogger } from "../models/spt/utils/ILogger";
 import { ConfigServer } from "../servers/ConfigServer";
+import { LocalisationService } from "../services/LocalisationService";
+import { SeasonalEventService } from "../services/SeasonalEventService";
 import { JsonUtil } from "../utils/JsonUtil";
 import { MathUtil } from "../utils/MathUtil";
 import { ObjectId } from "../utils/ObjectId";
@@ -26,12 +27,13 @@ export declare class LocationGenerator {
     protected ragfairServerHelper: RagfairServerHelper;
     protected itemHelper: ItemHelper;
     protected mathUtil: MathUtil;
-    protected gameEventHelper: GameEventHelper;
+    protected seasonalEventService: SeasonalEventService;
     protected containerHelper: ContainerHelper;
     protected presetHelper: PresetHelper;
+    protected localisationService: LocalisationService;
     protected configServer: ConfigServer;
     protected locationConfig: ILocationConfig;
-    constructor(logger: ILogger, jsonUtil: JsonUtil, objectId: ObjectId, randomUtil: RandomUtil, ragfairServerHelper: RagfairServerHelper, itemHelper: ItemHelper, mathUtil: MathUtil, gameEventHelper: GameEventHelper, containerHelper: ContainerHelper, presetHelper: PresetHelper, configServer: ConfigServer);
+    constructor(logger: ILogger, jsonUtil: JsonUtil, objectId: ObjectId, randomUtil: RandomUtil, ragfairServerHelper: RagfairServerHelper, itemHelper: ItemHelper, mathUtil: MathUtil, seasonalEventService: SeasonalEventService, containerHelper: ContainerHelper, presetHelper: PresetHelper, localisationService: LocalisationService, configServer: ConfigServer);
     generateContainerLoot(containerIn: IStaticContainerProps, staticForced: IStaticForcedProps[], staticLootDist: Record<string, IStaticLootDetails>, staticAmmoDist: Record<string, IStaticAmmoDetails[]>, locationName: string): IStaticContainerProps;
     protected getLooseLootMultiplerForLocation(location: string): number;
     protected getStaticLootMultiplerForLocation(location: string): number;

types/generators/LootGenerator.d.ts

@@ -6,6 +6,7 @@ import { LootRequest } from "../models/spt/services/LootRequest";
 import { ILogger } from "../models/spt/utils/ILogger";
 import { DatabaseServer } from "../servers/DatabaseServer";
 import { ItemFilterService } from "../services/ItemFilterService";
+import { LocalisationService } from "../services/LocalisationService";
 import { HashUtil } from "../utils/HashUtil";
 import { RandomUtil } from "../utils/RandomUtil";
 export declare class LootGenerator {
@@ -14,11 +15,12 @@ export declare class LootGenerator {
     protected databaseServer: DatabaseServer;
     protected randomUtil: RandomUtil;
     protected itemHelper: ItemHelper;
+    protected localisationService: LocalisationService;
     protected itemFilterService: ItemFilterService;
-    constructor(logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseServer, randomUtil: RandomUtil, itemHelper: ItemHelper, itemFilterService: ItemFilterService);
+    constructor(logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseServer, randomUtil: RandomUtil, itemHelper: ItemHelper, localisationService: LocalisationService, itemFilterService: ItemFilterService);
     /**
-     * Generate a list of items based on options passed in
+     * Generate a list of items based on configuration options parameter
-     * @param options parameters to adjust what loot is generated
+     * @param options parameters to adjust how loot is generated
      * @returns An array of loot items
      */
     createRandomloot(options: LootRequest): LootItem[];
@@ -35,23 +37,31 @@ export declare class LootGenerator {
      * Find a random item in items.json and add to result array
      * @param items items to choose from
      * @param itemTypeCounts item limit counts
+     * @param options item filters
      * @param result array to add found item to
      * @returns true if item was valid and added to pool
      */
     protected findAndAddRandomItemToLoot(items: [string, ITemplateItem][], itemTypeCounts: Record<string, {
         current: number;
         max: number;
-    }>, whitelistedArmorLevels: number[], result: LootItem[]): boolean;
+    }>, options: LootRequest, result: LootItem[]): boolean;
+    /**
+     * Get a randomised stack count for an item between its StackMinRandom and StackMaxSize values
+     * @param item item to get stack count of
+     * @param options loot options
+     * @returns stack count
+     */
+    protected getRandomisedStackCount(item: ITemplateItem, options: LootRequest): number;
     /**
-     *
      * Find a random item in items.json and add to result array
      * @param globalDefaultPresets presets to choose from
      * @param itemTypeCounts item limit counts
+     * @param itemBlacklist items to skip
      * @param result array to add found preset to
      * @returns true if preset was valid and added to pool
      */
     protected findAndAddRandomPresetToLoot(globalDefaultPresets: [string, Preset][], itemTypeCounts: Record<string, {
         current: number;
         max: number;
-    }>, result: LootItem[]): boolean;
+    }>, itemBlacklist: string[], result: LootItem[]): boolean;
 }

types/generators/PlayerScavGenerator.d.ts

@@ -10,6 +10,7 @@ import { DatabaseServer } from "../servers/DatabaseServer";
 import { SaveServer } from "../servers/SaveServer";
 import { BotLootCacheService } from "../services/BotLootCacheService";
 import { FenceService } from "../services/FenceService";
+import { LocalisationService } from "../services/LocalisationService";
 import { JsonUtil } from "../utils/JsonUtil";
 import { BotGenerator } from "./BotGenerator";
 export declare class PlayerScavGenerator {
@@ -21,10 +22,11 @@ export declare class PlayerScavGenerator {
     protected jsonUtil: JsonUtil;
     protected fenceService: FenceService;
     protected botLootCacheService: BotLootCacheService;
+    protected localisationService: LocalisationService;
     protected botGenerator: BotGenerator;
     protected configServer: ConfigServer;
     protected playerScavConfig: IPlayerScavConfig;
-    constructor(logger: ILogger, databaseServer: DatabaseServer, saveServer: SaveServer, profileHelper: ProfileHelper, botHelper: BotHelper, jsonUtil: JsonUtil, fenceService: FenceService, botLootCacheService: BotLootCacheService, botGenerator: BotGenerator, configServer: ConfigServer);
+    constructor(logger: ILogger, databaseServer: DatabaseServer, saveServer: SaveServer, profileHelper: ProfileHelper, botHelper: BotHelper, jsonUtil: JsonUtil, fenceService: FenceService, botLootCacheService: BotLootCacheService, localisationService: LocalisationService, botGenerator: BotGenerator, configServer: ConfigServer);
     /**
      * Update a player profile to include a new player scav profile
      * @param sessionID session id to specify what profile is updated

types/generators/RagfairOfferGenerator.d.ts

@@ -1,16 +1,19 @@
+import { HandbookHelper } from "../helpers/HandbookHelper";
 import { ItemHelper } from "../helpers/ItemHelper";
+import { PaymentHelper } from "../helpers/PaymentHelper";
 import { PresetHelper } from "../helpers/PresetHelper";
 import { RagfairServerHelper } from "../helpers/RagfairServerHelper";
 import { Item } from "../models/eft/common/tables/IItem";
 import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem";
 import { IBarterScheme } from "../models/eft/common/tables/ITrader";
-import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer";
+import { IRagfairOffer, OfferRequirement } from "../models/eft/ragfair/IRagfairOffer";
-import { IRagfairConfig } from "../models/spt/config/IRagfairConfig";
+import { Dynamic, IRagfairConfig } from "../models/spt/config/IRagfairConfig";
 import { ILogger } from "../models/spt/utils/ILogger";
 import { ConfigServer } from "../servers/ConfigServer";
 import { DatabaseServer } from "../servers/DatabaseServer";
 import { SaveServer } from "../servers/SaveServer";
 import { FenceService } from "../services/FenceService";
+import { LocalisationService } from "../services/LocalisationService";
 import { RagfairCategoriesService } from "../services/RagfairCategoriesService";
 import { RagfairOfferService } from "../services/RagfairOfferService";
 import { RagfairPriceService } from "../services/RagfairPriceService";
@@ -27,18 +30,45 @@ export declare class RagfairOfferGenerator {
     protected timeUtil: TimeUtil;
     protected databaseServer: DatabaseServer;
     protected ragfairServerHelper: RagfairServerHelper;
+    protected handbookHelper: HandbookHelper;
     protected saveServer: SaveServer;
     protected presetHelper: PresetHelper;
     protected ragfairAssortGenerator: RagfairAssortGenerator;
     protected ragfairOfferService: RagfairOfferService;
     protected ragfairPriceService: RagfairPriceService;
+    protected localisationService: LocalisationService;
+    protected paymentHelper: PaymentHelper;
     protected ragfairCategoriesService: RagfairCategoriesService;
     protected fenceService: FenceService;
     protected itemHelper: ItemHelper;
     protected configServer: ConfigServer;
     protected ragfairConfig: IRagfairConfig;
-    constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, ragfairServerHelper: RagfairServerHelper, saveServer: SaveServer, presetHelper: PresetHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferService: RagfairOfferService, ragfairPriceService: RagfairPriceService, ragfairCategoriesService: RagfairCategoriesService, fenceService: FenceService, itemHelper: ItemHelper, configServer: ConfigServer);
+    protected allowedFleaPriceItemsForBarter: {
+        tpl: string;
+        price: number;
+    }[];
+    constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, ragfairServerHelper: RagfairServerHelper, handbookHelper: HandbookHelper, saveServer: SaveServer, presetHelper: PresetHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferService: RagfairOfferService, ragfairPriceService: RagfairPriceService, localisationService: LocalisationService, paymentHelper: PaymentHelper, ragfairCategoriesService: RagfairCategoriesService, fenceService: FenceService, itemHelper: ItemHelper, configServer: ConfigServer);
     createOffer(userID: string, time: number, items: Item[], barterScheme: IBarterScheme[], loyalLevel: number, price: number, sellInOnePiece?: boolean): IRagfairOffer;
+    /**
+     * Calculate the offer price that's listed on the flea listing
+     * @param offerRequirements barter requirements for offer
+     * @returns rouble cost of offer
+     */
+    protected calculateOfferListingPrice(offerRequirements: OfferRequirement[]): number;
+    /**
+     * Get avatar url from trader table in db
+     * @param isTrader Is user we're getting avatar for a trader
+     * @param userId persons id to get avatar of
+     * @returns url of avatar
+     */
+    protected getAvatarUrl(isTrader: boolean, userId: string): string;
+    /**
+     * Convert a count of currency into roubles
+     * @param currencyCount amount of currency to convert into roubles
+     * @param currencyType Type of currency (euro/dollar/rouble)
+     * @returns count of roubles
+     */
+    protected calculateRoublePrice(currencyCount: number, currencyType: string): number;
     protected getTraderId(userID: string): string;
     protected getRating(userID: string): number;
     /**
@@ -58,7 +88,16 @@ export declare class RagfairOfferGenerator {
      * Create multiple offers for items by using a unique list of items we've generated previously
      * @param expiredOffers optional, expired offers to regenerate
      */
-    generateDynamicOffers(expiredOffers?: Item[]): void;
+    generateDynamicOffers(expiredOffers?: Item[]): Promise<void>;
+    protected createOffersForItems(assortItemIndex: string, assortItemsToProcess: Item[], expiredOffers: Item[], config: Dynamic): Promise<void>;
+    /**
+     * Create one flea offer for a specific item
+     * @param items Item to create offer for
+     * @param isPreset Is item a weapon preset
+     * @param itemDetails raw db item details
+     * @returns
+     */
+    protected createSingleOfferForItem(items: Item[], isPreset: boolean, itemDetails: [boolean, ITemplateItem]): Promise<Item[]>;
     /**
      * Generate trader offers on flea using the traders assort data
      * @param traderID Trader to generate offers for
@@ -73,20 +112,36 @@ export declare class RagfairOfferGenerator {
      * @returns Item with conditions added
      */
     protected addMissingCondition(item: Item): Item;
-    protected getOfferRequirements(items: Item[]): {
+    /**
-        count: number;
+     * Create a barter-based barter scheme, if not possible, fall back to making barter scheme currency based
-        _tpl: string;
+     * @param offerItems Items for sale in offer
+     * @returns barter scheme
+     */
+    protected createBarterRequirement(offerItems: Item[]): IBarterScheme[];
+    /**
+     * Get an array of flea prices + item tpl, cached in generator class inside `allowedFleaPriceItemsForBarter`
+     * @returns array with tpl/price values
+     */
+    protected getFleaPricesAsArray(): {
+        tpl: string;
+        price: number;
     }[];
+    /**
+     * Create a random currency-based barter scheme for an array of items
+     * @param offerItems Items on offer
+     * @returns Barter scheme for offer
+     */
+    protected createCurrencyRequirement(offerItems: Item[]): IBarterScheme[];
     /**
      * Create a flea offer and store it in the Ragfair server offers array
      * @param userID owner of the offer
      * @param time time offer is put up
      * @param items items in the offer
-     * @param barterScheme
+     * @param barterScheme cost of item (currency or barter)
-     * @param loyalLevel
+     * @param loyalLevel Loyalty level needed to buy item
      * @param price price of offer
      * @param sellInOnePiece
-     * @returns
+     * @returns Ragfair offer
      */
     createFleaOffer(userID: string, time: number, items: Item[], barterScheme: IBarterScheme[], loyalLevel: number, price: number, sellInOnePiece?: boolean): IRagfairOffer;
 }

types/generators/ScavCaseRewardGenerator.d.ts

@@ -37,12 +37,6 @@ export declare class ScavCaseRewardGenerator {
      * @returns filtered array of db items
      */
     protected getDbItems(): ITemplateItem[];
-    /**
-     * Check if a template id has a blacklisted parent id
-     * @param tplid template id to check
-     * @returns true if item is blacklisted
-     */
-    protected itemHasBlacklistedParent(tplid: string): boolean;
     /**
      * Pick a number of items to be rewards, the count is defined by the values in
      * @param items item pool to pick rewards from

types/generators/WeatherGenerator.d.ts

@@ -1,38 +1,54 @@
+import { ApplicationContext } from "../context/ApplicationContext";
 import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper";
-import { IWeatherData } from "../models/eft/weather/IWeatherData";
+import { IWeather, IWeatherData } from "../models/eft/weather/IWeatherData";
+import { WindDirection } from "../models/enums/WindDirection";
 import { IWeatherConfig } from "../models/spt/config/IWeatherConfig";
+import { ILogger } from "../models/spt/utils/ILogger";
 import { ConfigServer } from "../servers/ConfigServer";
 import { RandomUtil } from "../utils/RandomUtil";
 import { TimeUtil } from "../utils/TimeUtil";
 export declare class WeatherGenerator {
     protected weightedRandomHelper: WeightedRandomHelper;
+    protected logger: ILogger;
     protected randomUtil: RandomUtil;
     protected timeUtil: TimeUtil;
+    protected applicationContext: ApplicationContext;
     protected configServer: ConfigServer;
     protected weatherConfig: IWeatherConfig;
-    constructor(weightedRandomHelper: WeightedRandomHelper, randomUtil: RandomUtil, timeUtil: TimeUtil, configServer: ConfigServer);
+    constructor(weightedRandomHelper: WeightedRandomHelper, logger: ILogger, randomUtil: RandomUtil, timeUtil: TimeUtil, applicationContext: ApplicationContext, configServer: ConfigServer);
-    calculateTime(data: IWeatherData): IWeatherData;
+    calculateGameTime(data: IWeatherData): IWeatherData;
     /**
      * Get server uptime seconds multiplied by a multiplier and add to current time as seconds
      * Format to BSGs requirements
-     * @param computedDate current date
+     * @param currentDate current date
      * @returns formatted time
      */
-    protected getAcceleratedTime(computedDate: Date): string;
+    protected getBsgFormattedInRaidTime(currentDate: Date): string;
+    /**
+     * Get the current in-raid time
+     * @param currentDate (new Date())
+     * @returns Date object of current in-raid time
+     */
+    getInRaidTime(currentDate: Date): Date;
     /**
      * Get current time formatted to fit BSGs requirement
-     * @param computedDate date to format into bsg style
+     * @param date date to format into bsg style
      * @returns
      */
-    protected getNormalTime(computedDate: Date): string;
+    protected getBSGFormattedTime(date: Date): string;
     /**
-     * Return randomised Weather data
+     * Return randomised Weather data with help of config/weather.json
-     * @param weatherData weather input data
      * @returns Randomised weather data
      */
-    generateWeather(weatherData: IWeatherData): IWeatherData;
+    generateWeather(): IWeather;
-    protected getWeightedFog(): string;
+    /**
+     * Set IWeather date/time/timestamp values to now
+     * @param weather Object to update
+     */
+    protected setCurrentDateTime(weather: IWeather): void;
+    protected getWeightedWindDirection(): WindDirection;
+    protected getWeightedWindSpeed(): number;
+    protected getWeightedFog(): number;
     protected getWeightedRain(): number;
     protected getRandomFloat(node: string): number;
-    protected getRandomInt(node: string): number;
 }

types/generators/weapongen/implementations/ExternalInventoryMagGen.d.ts

@@ -1,13 +1,15 @@
 import { BotWeaponGeneratorHelper } from "../../../helpers/BotWeaponGeneratorHelper";
 import { ItemHelper } from "../../../helpers/ItemHelper";
 import { ILogger } from "../../../models/spt/utils/ILogger";
+import { LocalisationService } from "../../../services/LocalisationService";
 import { IInventoryMagGen } from "../IInventoryMagGen";
 import { InventoryMagGen } from "../InventoryMagGen";
 export declare class ExternalInventoryMagGen implements IInventoryMagGen {
     protected logger: ILogger;
     protected itemHelper: ItemHelper;
+    protected localisationService: LocalisationService;
     protected botWeaponGeneratorHelper: BotWeaponGeneratorHelper;
-    constructor(logger: ILogger, itemHelper: ItemHelper, botWeaponGeneratorHelper: BotWeaponGeneratorHelper);
+    constructor(logger: ILogger, itemHelper: ItemHelper, localisationService: LocalisationService, botWeaponGeneratorHelper: BotWeaponGeneratorHelper);
     getPriority(): number;
     canHandleInventoryMagGen(inventoryMagGen: InventoryMagGen): boolean;
     process(inventoryMagGen: InventoryMagGen): void;

types/helpers/AssortHelper.d.ts

@@ -2,14 +2,16 @@ import { IPmcData } from "../models/eft/common/IPmcData";
 import { ITraderAssort } from "../models/eft/common/tables/ITrader";
 import { ILogger } from "../models/spt/utils/ILogger";
 import { DatabaseServer } from "../servers/DatabaseServer";
+import { LocalisationService } from "../services/LocalisationService";
 import { ItemHelper } from "./ItemHelper";
 import { QuestHelper } from "./QuestHelper";
 export declare class AssortHelper {
     protected logger: ILogger;
     protected itemHelper: ItemHelper;
     protected databaseServer: DatabaseServer;
+    protected localisationService: LocalisationService;
     protected questHelper: QuestHelper;
-    constructor(logger: ILogger, itemHelper: ItemHelper, databaseServer: DatabaseServer, questHelper: QuestHelper);
+    constructor(logger: ILogger, itemHelper: ItemHelper, databaseServer: DatabaseServer, localisationService: LocalisationService, questHelper: QuestHelper);
     /**
      * Remove assorts from a trader that have not been unlocked yet
      * @param pmcProfile player profile

types/helpers/BotDifficultyHelper.d.ts

@@ -0,0 +1,46 @@
+import { Difficulty } from "../models/eft/common/tables/IBotType";
+import { IBotConfig } from "../models/spt/config/IBotConfig";
+import { ILogger } from "../models/spt/utils/ILogger";
+import { ConfigServer } from "../servers/ConfigServer";
+import { DatabaseServer } from "../servers/DatabaseServer";
+import { LocalisationService } from "../services/LocalisationService";
+import { JsonUtil } from "../utils/JsonUtil";
+import { RandomUtil } from "../utils/RandomUtil";
+import { BotHelper } from "./BotHelper";
+export declare class BotDifficultyHelper {
+    protected logger: ILogger;
+    protected jsonUtil: JsonUtil;
+    protected databaseServer: DatabaseServer;
+    protected randomUtil: RandomUtil;
+    protected localisationService: LocalisationService;
+    protected botHelper: BotHelper;
+    protected configServer: ConfigServer;
+    protected botConfig: IBotConfig;
+    constructor(logger: ILogger, jsonUtil: JsonUtil, databaseServer: DatabaseServer, randomUtil: RandomUtil, localisationService: LocalisationService, botHelper: BotHelper, configServer: ConfigServer);
+    getPmcDifficultySettings(pmcType: "bear" | "usec", difficulty: string, usecType: string, bearType: string): Difficulty;
+    /**
+     * Get difficulty settings for desired bot type, if not found use assault bot types
+     * @param type bot type to retreive difficulty of
+     * @param difficulty difficulty to get settings for (easy/normal etc)
+     * @returns Difficulty object
+     */
+    getBotDifficultySettings(type: string, difficulty: string): Difficulty;
+    /**
+     * Get difficulty settings for a PMC
+     * @param type "usec" / "bear"
+     * @param difficulty what difficulty to retrieve
+     * @returns Difficulty object
+     */
+    protected getDifficultySettings(type: string, difficulty: string): Difficulty;
+    /**
+     * Translate chosen value from pre-raid difficulty dropdown into bot difficulty value
+     * @param dropDownDifficulty Dropdown difficulty value to convert
+     * @returns bot difficulty
+     */
+    convertBotDifficultyDropdownToBotDifficulty(dropDownDifficulty: string): string;
+    /**
+     * Choose a random difficulty from - easy/normal/hard/impossible
+     * @returns random difficulty
+     */
+    chooseRandomDifficulty(): string;
+}

types/helpers/BotGeneratorHelper.d.ts

@@ -1,209 +1,42 @@
 import { DurabilityLimitsHelper } from "../helpers/DurabilityLimitsHelper";
-import { Mods, ModsChances } from "../models/eft/common/tables/IBotType";
 import { Item, Repairable, Upd } from "../models/eft/common/tables/IItem";
-import { ITemplateItem, Slot } from "../models/eft/common/tables/ITemplateItem";
+import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem";
-import { EquipmentFilterDetails, IBotConfig } from "../models/spt/config/IBotConfig";
+import { EquipmentFilters, IBotConfig } from "../models/spt/config/IBotConfig";
 import { ILogger } from "../models/spt/utils/ILogger";
 import { ConfigServer } from "../servers/ConfigServer";
 import { DatabaseServer } from "../servers/DatabaseServer";
-import { BotEquipmentFilterService } from "../services/BotEquipmentFilterService";
+import { LocalisationService } from "../services/LocalisationService";
-import { ItemFilterService } from "../services/ItemFilterService";
-import { HashUtil } from "../utils/HashUtil";
 import { JsonUtil } from "../utils/JsonUtil";
 import { RandomUtil } from "../utils/RandomUtil";
-import { BotWeaponGeneratorHelper } from "./BotWeaponGeneratorHelper";
-import { ContainerHelper } from "./ContainerHelper";
-import { InventoryHelper } from "./InventoryHelper";
 import { ItemHelper } from "./ItemHelper";
-import { ProbabilityHelper } from "./ProbabilityHelper";
-import { ProfileHelper } from "./ProfileHelper";
-export declare class BotModLimits {
-    scope: ItemCount;
-    scopeMax: number;
-    scopeBaseTypes: string[];
-    flashlightLaser: ItemCount;
-    flashlightLaserMax: number;
-    flashlgihtLaserBaseTypes: string[];
-}
-export declare class ItemCount {
-    count: number;
-}
 export declare class BotGeneratorHelper {
     protected logger: ILogger;
-    protected jsonUtil: JsonUtil;
-    protected hashUtil: HashUtil;
     protected randomUtil: RandomUtil;
-    protected probabilityHelper: ProbabilityHelper;
     protected databaseServer: DatabaseServer;
     protected durabilityLimitsHelper: DurabilityLimitsHelper;
     protected itemHelper: ItemHelper;
-    protected inventoryHelper: InventoryHelper;
+    protected localisationService: LocalisationService;
-    protected containerHelper: ContainerHelper;
-    protected botEquipmentFilterService: BotEquipmentFilterService;
-    protected itemFilterService: ItemFilterService;
-    protected profileHelper: ProfileHelper;
-    protected botWeaponGeneratorHelper: BotWeaponGeneratorHelper;
     protected configServer: ConfigServer;
     protected botConfig: IBotConfig;
-    constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, probabilityHelper: ProbabilityHelper, databaseServer: DatabaseServer, durabilityLimitsHelper: DurabilityLimitsHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, containerHelper: ContainerHelper, botEquipmentFilterService: BotEquipmentFilterService, itemFilterService: ItemFilterService, profileHelper: ProfileHelper, botWeaponGeneratorHelper: BotWeaponGeneratorHelper, configServer: ConfigServer);
+    constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, durabilityLimitsHelper: DurabilityLimitsHelper, itemHelper: ItemHelper, localisationService: LocalisationService, configServer: ConfigServer);
-    /**
-     * Check mods are compatible and add to array
-     * @param equipment Equipment item to add mods to
-     * @param modPool Mod list to choose frm
-     * @param parentId parentid of item to add mod to
-     * @param parentTemplate template objet of item to add mods to
-     * @param modSpawnChances dictionary of mod items and their chance to spawn for this bot type
-     * @returns Item + compatible mods as an array
-     */
-    generateModsForEquipment(equipment: Item[], modPool: Mods, parentId: string, parentTemplate: ITemplateItem, modSpawnChances: ModsChances): Item[];
-    /**
-     * @param sessionId session id
-     * @param weapon Weapon to add mods to
-     * @param modPool Pool of compatible mods to attach to weapon
-     * @param weaponParentId parentId of weapon
-     * @param parentWeaponTemplate Weapon which mods will be generated on
-     * @param modSpawnChances Mod spawn chances
-     * @param ammoTpl Ammo tpl to use when generating magazines/cartridges
-     * @param botRole Role of bot weapon is generated for
-     * @returns Weapon + mods array
-     */
-    generateModsForWeapon(sessionId: string, weapon: Item[], modPool: Mods, weaponParentId: string, parentWeaponTemplate: ITemplateItem, modSpawnChances: ModsChances, ammoTpl: string, botRole: string): Item[];
-    /**
-     *
-     * @param modSlot
-     * @param isRandomisableSlot
-     * @param modsParent
-     * @param botEquipBlacklist
-     * @param itemModPool
-     * @param weapon array with only weapon tpl in it, ready for mods to be added
-     * @param ammoTpl ammo tpl to use if slot requires a cartridge to be added (e.g. mod_magazine)
-     * @param parentTemplate
-     * @returns
-     */
-    protected chooseModToPutIntoSlot(modSlot: string, isRandomisableSlot: boolean, modsParent: Slot, botEquipBlacklist: EquipmentFilterDetails, itemModPool: Record<string, string[]>, weapon: Item[], ammoTpl: string, parentTemplate: ITemplateItem): [boolean, ITemplateItem];
-    /**
-     * Find mod tpls of a provided type and add to modPool
-     * @param desiredSlotName slot to look up and add we are adding tpls for (e.g mod_scope)
-     * @param modTemplate db object for modItem we get compatible mods from
-     * @param modPool Pool of mods we are adding to
-     */
-    protected addCompatibleModsForProvidedMod(desiredSlotName: string, modTemplate: ITemplateItem, modPool: Mods, botEquipBlacklist: EquipmentFilterDetails): void;
-    /**
-     * Check if mod item is on limited list + has surpassed the limit set for it
-     * @param botRole role the bot has e.g. assault
-     * @param modTemplate mods template data
-     * @param modLimits limits set for weapon being generated for this bot
-     * @returns true if over item limit
-     */
-    protected modHasReachedItemLimit(botRole: string, modTemplate: ITemplateItem, modLimits: BotModLimits): boolean;
-    /**
-     * Initalise mod limits to be used when generating a weapon
-     * @param botRole "assault", "bossTagilla" or "pmc"
-     * @returns BotModLimits object
-     */
-    protected initModLimits(botRole: string): BotModLimits;
-    /**
-     * Generate a pool of mods for this bots mod type if bot has values inside `randomisedWeaponModSlots` array found in bot.json/equipment[botrole]
-     * @param allowedMods Mods to be added to mod pool
-     * @param botEquipBlacklist blacklist of items not allowed to be added to mod pool
-     * @param modSlot Slot to generate mods for
-     * @param itemModPool base mod pool to replace values of
-     */
-    protected generateDynamicWeaponModPool(allowedMods: string[], botEquipBlacklist: EquipmentFilterDetails, modSlot: string, itemModPool: Record<string, string[]>): void;
-    /**
-     * Find all compatible mods for equipment item and add to modPool
-     * @param itemDetails item to find mods for
-     * @param modPool ModPool to add mods to
-     */
-    generateDynamicModPool(itemDetails: ITemplateItem, modPool: Mods): void;
-    /**
-     * Take a list of tpls and filter out blacklisted values using itemFilterService + botEquipmentBlacklist
-     * @param allowedMods base mods to filter
-     * @param botEquipBlacklist equipment blacklist
-     * @param modSlot slot mods belong to
-     * @returns Filtered array of mod tpls
-     */
-    protected filterWeaponModsByBlacklist(allowedMods: string[], botEquipBlacklist: EquipmentFilterDetails, modSlot: string): string[];
-    /**
-     * Check if the specific item type on the weapon has reached the set limit
-     * @param modTpl log mod tpl if over type limit
-     * @param currentCount current number of this item on gun
-     * @param maxLimit mod limit allowed
-     * @param botRole role of bot we're checking weapon of
-     * @returns true if limit reached
-     */
-    protected weaponModLimitReached(modTpl: string, currentCount: {
-        count: number;
-    }, maxLimit: number, botRole: string): boolean;
-    /**
-     * Log errors if mod is not compatible with slot
-     * @param modToAdd template of mod to check
-     * @param itemSlot slot the item will be placed in
-     * @param modSlot slot the mod will fill
-     * @param parentTemplate tempalte of the mods parent item
-     * @returns true if valid
-     */
-    protected isModValidForSlot(modToAdd: [boolean, ITemplateItem], itemSlot: Slot, modSlot: string, parentTemplate: ITemplateItem): boolean;
-    /**
-     * Create a mod item with parameters as properties
-     * @param modId _id
-     * @param modTpl _tpl
-     * @param parentId parentId
-     * @param modSlot slotId
-     * @param modTemplate Used to add additional properites in the upd object
-     * @returns Item object
-     */
-    protected createModItem(modId: string, modTpl: string, parentId: string, modSlot: string, modTemplate: ITemplateItem): Item;
-    /**
-     * randomly choose if a mod should be spawned, 100% for required mods OR mod is ammo slot
-     * never return true for an item that has 0% spawn chance
-     * @param itemSlot slot the item sits in
-     * @param modSlot slot the mod sits in
-     * @param modSpawnChances Chances for various mod spawns
-     * @returns boolean true if it should spawn
-     */
-    protected shouldModBeSpawned(itemSlot: Slot, modSlot: string, modSpawnChances: ModsChances): boolean;
-    /**
-     * Get a list of containers that hold ammo
-     * e.g. mod_magazine / patron_in_weapon_000
-     * @returns string array
-     */
-    protected getAmmoContainers(): string[];
-    /**
-     * Get the slot details for an item (chamber/cartridge/slot)
-     * @param modSlot e.g patron_in_weapon
-     * @param parentTemplate item template
-     * @returns
-     */
-    protected getModItemSlot(modSlot: string, parentTemplate: ITemplateItem): Slot;
-    /**
-     * With the shotgun revolver (60db29ce99594040e04c4a27) 12.12 introduced CylinderMagazines.
-     * Those magazines (e.g. 60dc519adf4c47305f6d410d) have a "Cartridges" entry with a _max_count=0.
-     * Ammo is not put into the magazine directly but assigned to the magazine's slots: The "camora_xxx" slots.
-     * This function is a helper called by generateModsForItem for mods with parent type "CylinderMagazine"
-     * @param items The items where the CylinderMagazine's camora are appended to
-     * @param modPool modPool which should include available cartrigdes
-     * @param parentId The CylinderMagazine's UID
-     * @param parentTemplate The CylinderMagazine's template
-     * @returns
-     */
-    protected fillCamora(items: Item[], modPool: Mods, parentId: string, parentTemplate: ITemplateItem): void;
-    /**
-     * Take a record of camoras and merge the compatable shells into one array
-     * @param camorasWithShells camoras we want to merge into one array
-     * @returns string array of shells fro luitple camora sources
-     */
-    protected mergeCamoraPoolsTogether(camorasWithShells: Record<string, string[]>): string[];
     /**
      * Adds properties to an item
      * e.g. Repairable / HasHinge / Foldable / MaxDurability
-     * @param itemTemplate
+     * @param itemTemplate Item extra properties are being generated for
-     * @param botRole Used by weapons to randomise the durability values
+     * @param botRole Used by weapons to randomise the durability values. Null for non-equipped items
      * @returns Item Upd object with extra properties
      */
-    generateExtraPropertiesForItem(itemTemplate: ITemplateItem, botRole?: any): {
+    generateExtraPropertiesForItem(itemTemplate: ITemplateItem, botRole?: string): {
         upd?: Upd;
     };
+    /**
+     * Get the chance for the weapon attachment or helmet equipment to be set as activated
+     * @param botRole role of bot with weapon/helmet
+     * @param setting the setting of the weapon attachment/helmet equipment to be activated
+     * @param defaultValue default value for the chance of activation if the botrole or bot equipment role is null
+     * @returns Percent chance to be active
+     */
+    protected getBotEquipmentSettingFromConfig(botRole: string, setting: keyof EquipmentFilters, defaultValue: number): number;
     /**
      * Create a repairable object for a weapon that containers durability + max durability properties
      * @param itemTemplate weapon object being generated for
@@ -219,22 +52,22 @@ export declare class BotGeneratorHelper {
      */
     protected generateArmorRepairableProperties(itemTemplate: ITemplateItem, botRole: string): Repairable;
     /**
-     * Get a random mod from an items compatible mods Filter array
+     * Can item be added to another item without conflict
-     * @param modTpl
+     * @param items Items to check compatiblilities with
-     * @param parentSlot
+     * @param tplToCheck Tpl of the item to check for incompatibilities
-     * @param modSlot
+     * @param equipmentSlot Slot the item will be placed into
-     * @param items
+     * @returns false if no incompatibilties, also has incompatibility reason
-     * @returns item tpl
      */
-    protected getModTplFromItemDb(modTpl: string, parentSlot: Slot, modSlot: string, items: Item[]): string;
+    isItemIncompatibleWithCurrentItems(items: Item[], tplToCheck: string, equipmentSlot: string): {
+        incompatible: boolean;
+        reason: string;
+    };
     /**
-     * Can an item be added to an item without issue
+     * Convert a bots role to the equipment role used in config/bot.json
-     * @param items
+     * @param botRole Role to convert
-     * @param tplToCheck
+     * @returns Equipment role (e.g. pmc / assault / bossTagilla)
-     * @param equipmentSlot
-     * @returns true if possible
      */
-    isItemIncompatibleWithCurrentItems(items: Item[], tplToCheck: string, equipmentSlot: string): boolean;
+    getBotEquipmentRole(botRole: string): string;
 }
 /** TODO - move into own class */
 export declare class ExhaustableArray<T> {

types/helpers/BotHelper.d.ts

@@ -1,8 +1,10 @@
+import { MinMax } from "../models/common/MinMax";
 import { Difficulty, IBotType } from "../models/eft/common/tables/IBotType";
-import { IBotConfig } from "../models/spt/config/IBotConfig";
+import { EquipmentFilters, IBotConfig, RandomisationDetails } from "../models/spt/config/IBotConfig";
 import { ILogger } from "../models/spt/utils/ILogger";
 import { ConfigServer } from "../servers/ConfigServer";
 import { DatabaseServer } from "../servers/DatabaseServer";
+import { LocalisationService } from "../services/LocalisationService";
 import { JsonUtil } from "../utils/JsonUtil";
 import { RandomUtil } from "../utils/RandomUtil";
 export declare class BotHelper {
@@ -10,40 +12,27 @@ export declare class BotHelper {
     protected jsonUtil: JsonUtil;
     protected databaseServer: DatabaseServer;
     protected randomUtil: RandomUtil;
+    protected localisationService: LocalisationService;
     protected configServer: ConfigServer;
     protected botConfig: IBotConfig;
-    constructor(logger: ILogger, jsonUtil: JsonUtil, databaseServer: DatabaseServer, randomUtil: RandomUtil, configServer: ConfigServer);
+    constructor(logger: ILogger, jsonUtil: JsonUtil, databaseServer: DatabaseServer, randomUtil: RandomUtil, localisationService: LocalisationService, configServer: ConfigServer);
-    /**
-     * Get difficulty settings for desired bot type, if not found use assault bot types
-     * @param type bot type to retreive difficulty of
-     * @param difficulty difficulty to get settings for (easy/normal etc)
-     * @returns Difficulty object
-     */
-    getBotDifficultySettings(type: string, difficulty: string): Difficulty;
     /**
      * Get a template object for the specified botRole from bots.types db
      * @param role botRole to get template for
      * @returns IBotType object
      */
     getBotTemplate(role: string): IBotType;
-    /**
-     * Get difficulty settings for a PMC
-     * @param type "usec" / "bear"
-     * @param difficulty what difficulty to retrieve
-     * @returns Difficulty object
-     */
-    getPmcDifficultySettings(type: string, difficulty: string): Difficulty;
-    /**
-     * Choose a random difficulty from - easy/normal/hard/impossible
-     * @returns random difficulty
-     */
-    chooseRandomDifficulty(): string;
     /**
      * Randomise the chance the PMC will attack their own side
      * Look up value in bot.json/chanceSameSideIsHostilePercent
      * @param difficultySettings pmc difficulty settings
      */
     randomisePmcHostility(difficultySettings: Difficulty): void;
+    /**
+     * Is the passed in bot role a PMC (usec/bear/pmc)
+     * @param botRole bot role to check
+     * @returns true if is pmc
+     */
     isBotPmc(botRole: string): boolean;
     isBotBoss(botRole: string): boolean;
     isBotFollower(botRole: string): boolean;
@@ -71,4 +60,29 @@ export declare class BotHelper {
      * @returns true if should be a pmc
      */
     shouldBotBePmc(botRole: string): boolean;
+    rollChanceToBePmc(role: string, botConvertMinMax: MinMax): boolean;
+    botRoleIsPmc(botRole: string): boolean;
+    /**
+     * Get randomisation settings for bot from config/bot.json
+     * @param botLevel level of bot
+     * @param botEquipConfig bot equipment json
+     * @returns RandomisationDetails
+     */
+    getBotRandomisationDetails(botLevel: number, botEquipConfig: EquipmentFilters): RandomisationDetails;
+    /**
+     * Choose between sptBear and sptUsec at random based on the % defined in botConfig.pmc.isUsec
+     * @returns pmc role
+     */
+    getRandomisedPmcRole(): string;
+    /**
+     * Get the corrisponding side when sptBear or sptUsec is passed in
+     * @param botRole role to get side for
+     * @returns side (usec/bear)
+     */
+    getPmcSideByRole(botRole: string): string;
+    /**
+     * Get a randomised PMC side based on bot config value 'isUsec'
+     * @returns pmc side as string
+     */
+    protected getRandomisedPmcSide(): string;
 }

types/helpers/BotWeaponGeneratorHelper.d.ts

@@ -4,6 +4,7 @@ import { Item } from "../models/eft/common/tables/IItem";
 import { Grid, ITemplateItem } from "../models/eft/common/tables/ITemplateItem";
 import { ILogger } from "../models/spt/utils/ILogger";
 import { DatabaseServer } from "../servers/DatabaseServer";
+import { LocalisationService } from "../services/LocalisationService";
 import { HashUtil } from "../utils/HashUtil";
 import { RandomUtil } from "../utils/RandomUtil";
 import { ContainerHelper } from "./ContainerHelper";
@@ -16,8 +17,9 @@ export declare class BotWeaponGeneratorHelper {
     protected randomUtil: RandomUtil;
     protected hashUtil: HashUtil;
     protected inventoryHelper: InventoryHelper;
+    protected localisationService: LocalisationService;
     protected containerHelper: ContainerHelper;
-    constructor(logger: ILogger, databaseServer: DatabaseServer, itemHelper: ItemHelper, randomUtil: RandomUtil, hashUtil: HashUtil, inventoryHelper: InventoryHelper, containerHelper: ContainerHelper);
+    constructor(logger: ILogger, databaseServer: DatabaseServer, itemHelper: ItemHelper, randomUtil: RandomUtil, hashUtil: HashUtil, inventoryHelper: InventoryHelper, localisationService: LocalisationService, containerHelper: ContainerHelper);
     /**
      * Get a randomised number of bullets for a specific magazine
      * @param magCounts min and max count of magazines

types/helpers/DialogueHelper.d.ts

@@ -1,20 +1,24 @@
 import { Item } from "../models/eft/common/tables/IItem";
 import { Dialogue, MessageContent, MessagePreview } from "../models/eft/profile/IAkiProfile";
 import { MessageType } from "../models/enums/MessageType";
+import { ILogger } from "../models/spt/utils/ILogger";
 import { DatabaseServer } from "../servers/DatabaseServer";
 import { SaveServer } from "../servers/SaveServer";
+import { LocalisationService } from "../services/LocalisationService";
 import { HashUtil } from "../utils/HashUtil";
 import { ItemHelper } from "./ItemHelper";
 import { NotificationSendHelper } from "./NotificationSendHelper";
 import { NotifierHelper } from "./NotifierHelper";
 export declare class DialogueHelper {
+    protected logger: ILogger;
     protected hashUtil: HashUtil;
     protected saveServer: SaveServer;
     protected databaseServer: DatabaseServer;
     protected notifierHelper: NotifierHelper;
     protected notificationSendHelper: NotificationSendHelper;
+    protected localisationService: LocalisationService;
     protected itemHelper: ItemHelper;
-    constructor(hashUtil: HashUtil, saveServer: SaveServer, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, notificationSendHelper: NotificationSendHelper, itemHelper: ItemHelper);
+    constructor(logger: ILogger, hashUtil: HashUtil, saveServer: SaveServer, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, notificationSendHelper: NotificationSendHelper, localisationService: LocalisationService, itemHelper: ItemHelper);
     createMessageContext(templateId: string, messageType: MessageType, maxStoreTime: number): MessageContent;
     /**
      * Add a templated message to the dialogue.
@@ -23,7 +27,7 @@ export declare class DialogueHelper {
      * @param sessionID
      * @param rewards
      */
-    addDialogueMessage(dialogueID: string, messageContent: MessageContent, sessionID: string, rewards?: any[]): void;
+    addDialogueMessage(dialogueID: string, messageContent: MessageContent, sessionID: string, rewards?: Item[]): void;
     /**
      * Get the preview contents of the last message in a dialogue.
      * @param dialogue
@@ -34,7 +38,8 @@ export declare class DialogueHelper {
      * Get the item contents for a particular message.
      * @param messageID
      * @param sessionID
+     * @param itemId Item being moved to inventory
      * @returns
      */
-    getMessageItemContents(messageID: string, sessionID: string): Item[];
+    getMessageItemContents(messageID: string, sessionID: string, itemId: string): Item[];
 }

types/helpers/GameEventHelper.d.ts

@@ -1,9 +1,9 @@
+import { ISeasonalEventConfig } from "../models/spt/config/ISeasonalEventConfig";
+import { ConfigServer } from "../servers/ConfigServer";
 import { DatabaseServer } from "../servers/DatabaseServer";
 export declare class GameEventHelper {
     protected databaseServer: DatabaseServer;
-    constructor(databaseServer: DatabaseServer);
+    protected configServer: ConfigServer;
-    get events(): Record<string, string>;
+    protected seasonalEventConfig: ISeasonalEventConfig;
-    get christmasEventItems(): string[];
+    constructor(databaseServer: DatabaseServer, configServer: ConfigServer);
-    itemIsChristmasRelated(itemId: string): boolean;
-    christmasEventEnabled(): boolean;
 }

types/helpers/HandbookHelper.d.ts

@@ -1,3 +1,4 @@
+import { DatabaseServer } from "../servers/DatabaseServer";
 declare class LookupItem {
     byId: Record<number, string>;
     byParent: Record<string, string[]>;
@@ -9,25 +10,44 @@ export declare class LookupCollection {
     constructor();
 }
 export declare class HandbookHelper {
-    protected lookup: LookupCollection;
+    protected databaseServer: DatabaseServer;
-    hydrateLookup(lookup: LookupCollection): void;
+    protected lookupCacheGenerated: boolean;
-    getTemplatePrice(x: string): number;
+    protected handbookPriceCache: LookupCollection;
+    constructor(databaseServer: DatabaseServer);
+    hydrateLookup(): void;
+    /**
+     * Get price from internal cache, if cache empty look up price directly in handbook (expensive)
+     * If no values found, return 1
+     * @param tpl item tpl to look up price for
+     * @returns price in roubles
+     */
+    getTemplatePrice(tpl: string): number;
+    /**
+     * all items in template with the given parent category
+     * @param x
+     * @returns string array
+     */
     templatesWithParent(x: string): string[];
-    isCategory(x: string): boolean;
+    /**
+     * Does category exist in handbook cache
+     * @param category
+     * @returns true if exists in cache
+     */
+    isCategory(category: string): boolean;
     childrenCategories(x: string): string[];
     /**
-    * Gets Currency to Ruble conversion Value
+     * Convert non-roubles into roubles
-    * @param {number} value
+     * @param nonRoubleCurrencyCount Currency count to convert
-    * @param {string} currencyFrom
+     * @param currencyTypeFrom What current currency is
-    * @returns number
+     * @returns Count in roubles
      */
-    inRUB(value: number, currencyFrom: string): number;
+    inRUB(nonRoubleCurrencyCount: number, currencyTypeFrom: string): number;
     /**
-     * Gets Ruble to Currency conversion Value
+     * Convert roubles into another currency
-     * @param {number} value
+     * @param roubleCurrencyCount roubles to convert
-     * @param {string} currencyTo
+     * @param currencyTypeTo Currency to convert roubles into
-     * @returns number
+     * @returns currency count in desired type
      */
-    fromRUB(value: number, currencyTo: string): number;
+    fromRUB(roubleCurrencyCount: number, currencyTypeTo: string): number;
 }
 export {};

types/helpers/HealthHelper.d.ts

@@ -1,4 +1,5 @@
 import { IPmcData } from "../models/eft/common/IPmcData";
+import { Effect } from "../models/eft/health/Effect";
 import { ISyncHealthRequestData } from "../models/eft/health/ISyncHealthRequestData";
 import { IAkiProfile } from "../models/eft/profile/IAkiProfile";
 import { IHealthConfig } from "../models/spt/config/IHealthConfig";
@@ -28,7 +29,7 @@ export declare class HealthHelper {
      * @param sessionID Session id
      * @param addEffects Should effects be added or removed (default - add)
      */
-    saveVitality(pmcData: IPmcData, info: ISyncHealthRequestData, sessionID: string, addEffects?: boolean): void;
+    saveVitality(pmcData: IPmcData, info: ISyncHealthRequestData, sessionID: string, addEffects?: boolean, deleteExistingEffects?: boolean): void;
     protected saveHealth(pmcData: IPmcData, sessionID: string): void;
     /**
      * Save effects to profile
@@ -39,13 +40,13 @@ export declare class HealthHelper {
      * @param addEffects Should effects be added back to profile
      * @returns
      */
-    protected saveEffects(pmcData: IPmcData, sessionID: string, addEffects: boolean): void;
+    protected saveEffects(pmcData: IPmcData, sessionID: string, addEffects: boolean, deleteExistingEffects?: boolean): void;
     /**
      * Add effect to body part in profile
      * @param pmcData Player profile
      * @param effectBodyPart body part to edit
      * @param effectType Effect to add to body part
      */
-    protected addEffect(pmcData: IPmcData, effectBodyPart: string, effectType: string): void;
+    protected addEffect(pmcData: IPmcData, effectBodyPart: string, effectType: Effect): void;
     protected isEmpty(map: any): boolean;
 }

types/helpers/HideoutHelper.d.ts

@@ -8,9 +8,10 @@ import { IHideoutTakeProductionRequestData } from "../models/eft/hideout/IHideou
 import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
 import { IHideoutConfig } from "../models/spt/config/IHideoutConfig";
 import { ILogger } from "../models/spt/utils/ILogger";
-import { ItemEventRouter } from "../routers/ItemEventRouter";
+import { EventOutputHolder } from "../routers/EventOutputHolder";
 import { ConfigServer } from "../servers/ConfigServer";
 import { DatabaseServer } from "../servers/DatabaseServer";
+import { LocalisationService } from "../services/LocalisationService";
 import { PlayerService } from "../services/PlayerService";
 import { HashUtil } from "../utils/HashUtil";
 import { HttpResponseUtil } from "../utils/HttpResponseUtil";
@@ -24,18 +25,19 @@ export declare class HideoutHelper {
     protected timeUtil: TimeUtil;
     protected randomUtil: RandomUtil;
     protected databaseServer: DatabaseServer;
-    protected itemEventRouter: ItemEventRouter;
+    protected eventOutputHolder: EventOutputHolder;
     protected httpResponse: HttpResponseUtil;
     protected profileHelper: ProfileHelper;
     protected inventoryHelper: InventoryHelper;
     protected playerService: PlayerService;
+    protected localisationService: LocalisationService;
     protected configServer: ConfigServer;
     static bitcoinFarm: string;
     static waterCollector: string;
     static bitcoin: string;
     static expeditionaryFuelTank: string;
     protected hideoutConfig: IHideoutConfig;
-    constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, inventoryHelper: InventoryHelper, playerService: PlayerService, configServer: ConfigServer);
+    constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, eventOutputHolder: EventOutputHolder, httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, inventoryHelper: InventoryHelper, playerService: PlayerService, localisationService: LocalisationService, configServer: ConfigServer);
     registerProduction(pmcData: IPmcData, body: IHideoutSingleProductionStartRequestData | IHideoutContinousProductionStartRequestData, sessionID: string): IItemEventRouterResponse;
     /**
      * This convinience function intialies new Production Object

types/helpers/InRaidHelper.d.ts

@@ -5,6 +5,7 @@ import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequ
 import { ILogger } from "../models/spt/utils/ILogger";
 import { DatabaseServer } from "../servers/DatabaseServer";
 import { SaveServer } from "../servers/SaveServer";
+import { LocalisationService } from "../services/LocalisationService";
 import { ProfileFixerService } from "../services/ProfileFixerService";
 import { JsonUtil } from "../utils/JsonUtil";
 import { InventoryHelper } from "./InventoryHelper";
@@ -16,8 +17,9 @@ export declare class InRaidHelper {
     protected databaseServer: DatabaseServer;
     protected inventoryHelper: InventoryHelper;
     protected paymentHelper: PaymentHelper;
+    protected localisationService: LocalisationService;
     protected profileFixerService: ProfileFixerService;
-    constructor(logger: ILogger, saveServer: SaveServer, jsonUtil: JsonUtil, databaseServer: DatabaseServer, inventoryHelper: InventoryHelper, paymentHelper: PaymentHelper, profileFixerService: ProfileFixerService);
+    constructor(logger: ILogger, saveServer: SaveServer, jsonUtil: JsonUtil, databaseServer: DatabaseServer, inventoryHelper: InventoryHelper, paymentHelper: PaymentHelper, localisationService: LocalisationService, profileFixerService: ProfileFixerService);
     /**
      * Check an array of items and add an upd object to money items with a stack count of 1
      * Single stack money items have no upd object and thus no StackObjectsCount, causing issues
@@ -42,6 +44,7 @@ export declare class InRaidHelper {
      * @returns Reset profile object
      */
     updateProfileBaseStats(profileData: IPmcData, saveProgressRequest: ISaveProgressRequestData, sessionID: string): IPmcData;
+    protected transferPostRaidLimbEffectsToProfile(saveProgressRequest: ISaveProgressRequestData, profileData: IPmcData): void;
     /**
      * Some maps have one-time-use keys (e.g. Labs
      * Remove the relevant key from an inventory based on the post-raid request data passed in

types/helpers/InventoryHelper.d.ts

@@ -5,11 +5,12 @@ import { IInventoryMergeRequestData } from "../models/eft/inventory/IInventoryMe
 import { IInventoryMoveRequestData } from "../models/eft/inventory/IInventoryMoveRequestData";
 import { IInventorySplitRequestData } from "../models/eft/inventory/IInventorySplitRequestData";
 import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
-import { IInventoryConfig } from "../models/spt/config/IInventoryConfig";
+import { IInventoryConfig, RewardDetails } from "../models/spt/config/IInventoryConfig";
 import { ILogger } from "../models/spt/utils/ILogger";
 import { ConfigServer } from "../servers/ConfigServer";
 import { DatabaseServer } from "../servers/DatabaseServer";
 import { FenceService } from "../services/FenceService";
+import { LocalisationService } from "../services/LocalisationService";
 import { HashUtil } from "../utils/HashUtil";
 import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 import { JsonUtil } from "../utils/JsonUtil";
@@ -38,9 +39,21 @@ export declare class InventoryHelper {
     protected itemHelper: ItemHelper;
     protected containerHelper: ContainerHelper;
     protected profileHelper: ProfileHelper;
+    protected localisationService: LocalisationService;
     protected configServer: ConfigServer;
     protected inventoryConfig: IInventoryConfig;
-    constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, httpResponse: HttpResponseUtil, fenceService: FenceService, databaseServer: DatabaseServer, paymentHelper: PaymentHelper, traderAssortHelper: TraderAssortHelper, dialogueHelper: DialogueHelper, itemHelper: ItemHelper, containerHelper: ContainerHelper, profileHelper: ProfileHelper, configServer: ConfigServer);
+    constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, httpResponse: HttpResponseUtil, fenceService: FenceService, databaseServer: DatabaseServer, paymentHelper: PaymentHelper, traderAssortHelper: TraderAssortHelper, dialogueHelper: DialogueHelper, itemHelper: ItemHelper, containerHelper: ContainerHelper, profileHelper: ProfileHelper, localisationService: LocalisationService, configServer: ConfigServer);
+    /**
+     * BUG: Passing the same item multiple times with a count of 1 will cause multiples of that item to be added (e.g. x3 separate objects of tar cola with count of 1 = 9 tarcolas being added to inventory)
+     * @param pmcData Profile to add items to
+     * @param body request data to add items
+     * @param output response to send back to client
+     * @param sessionID Session id
+     * @param callback
+     * @param foundInRaid Will results added to inventory be set as found in raid
+     * @param addUpd Additional upd propertys for items being added to inventory
+     * @returns IItemEventRouterResponse
+     */
     addItem(pmcData: IPmcData, body: IAddItemRequestData, output: IItemEventRouterResponse, sessionID: string, callback: any, foundInRaid?: boolean, addUpd?: any): IItemEventRouterResponse;
     removeItem(pmcData: IPmcData, itemId: string, sessionID: string, output?: IItemEventRouterResponse): IItemEventRouterResponse;
     removeItemByCount(pmcData: IPmcData, itemId: string, count: number, sessionID: string, output?: IItemEventRouterResponse): IItemEventRouterResponse;
@@ -76,6 +89,12 @@ export declare class InventoryHelper {
     * Internal helper function to handle cartridges in inventory if any of them exist.
     */
     protected handleCartridges(items: Item[], body: IInventoryMoveRequestData): void;
+    /**
+     * Get details for how a random loot container should be handled, max rewards, possible reward tpls
+     * @param itemTpl Container being opened
+     * @returns Reward details
+     */
+    getRandomLootContainerRewardDetails(itemTpl: string): RewardDetails;
 }
 declare namespace InventoryHelper {
     interface InventoryItemHash {

types/helpers/ItemHelper.d.ts

@@ -5,11 +5,15 @@ import { IStaticAmmoDetails } from "../models/eft/common/tables/ILootBase";
 import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem";
 import { ILogger } from "../models/spt/utils/ILogger";
 import { DatabaseServer } from "../servers/DatabaseServer";
+import { ItemBaseClassService } from "../services/ItemBaseClassService";
+import { LocaleService } from "../services/LocaleService";
+import { LocalisationService } from "../services/LocalisationService";
 import { HashUtil } from "../utils/HashUtil";
 import { JsonUtil } from "../utils/JsonUtil";
 import { MathUtil } from "../utils/MathUtil";
 import { ObjectId } from "../utils/ObjectId";
 import { RandomUtil } from "../utils/RandomUtil";
+import { HandbookHelper } from "./HandbookHelper";
 declare class ItemHelper {
     protected logger: ILogger;
     protected hashUtil: HashUtil;
@@ -18,7 +22,11 @@ declare class ItemHelper {
     protected objectId: ObjectId;
     protected mathUtil: MathUtil;
     protected databaseServer: DatabaseServer;
-    constructor(logger: ILogger, hashUtil: HashUtil, jsonUtil: JsonUtil, randomUtil: RandomUtil, objectId: ObjectId, mathUtil: MathUtil, databaseServer: DatabaseServer);
+    protected handbookHelper: HandbookHelper;
+    protected itemBaseClassService: ItemBaseClassService;
+    protected localisationService: LocalisationService;
+    protected localeService: LocaleService;
+    constructor(logger: ILogger, hashUtil: HashUtil, jsonUtil: JsonUtil, randomUtil: RandomUtil, objectId: ObjectId, mathUtil: MathUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, itemBaseClassService: ItemBaseClassService, localisationService: LocalisationService, localeService: LocaleService);
     /**
      * Checks if an id is a valid item. Valid meaning that it's an item that be stored in stash
      * @param       {string}    tpl       the template id / tpl
@@ -29,10 +37,17 @@ declare class ItemHelper {
      * Check if the tpl / template Id provided is a descendent of the baseclass
      *
      * @param   {string}    tpl             the item template id to check
-     * @param   {string}    baseclassTpl    the baseclass to check for
+     * @param   {string}    baseClassTpl    the baseclass to check for
      * @return  {boolean}                   is the tpl a descendent?
      */
-    isOfBaseclass(tpl: string, baseclassTpl: string): boolean;
+    isOfBaseclass(tpl: string, baseClassTpl: string): boolean;
+    /**
+     * Check if item has any of the supplied base clases
+     * @param tpl Item to check base classes of
+     * @param baseClassTpls base classes to check for
+     * @returns true if any supplied base classes match
+     */
+    isOfBaseclasses(tpl: string, baseClassTpls: string[]): boolean;
     /**
      * Returns the item price based on the handbook or as a fallback from the prices.json if the item is not
      * found in the handbook. If the price can't be found at all return 0
@@ -177,7 +192,7 @@ declare class ItemHelper {
      */
     replaceIDs(pmcData: IPmcData, items: Item[], insuredItems?: InsuredItem[], fastPanel?: any): any[];
     /**
-     * Recursivly loop down through an items hierarchy to see if any of the ids match the supplied list, return true if any do
+     * WARNING, SLOW. Recursivly loop down through an items hierarchy to see if any of the ids match the supplied list, return true if any do
      * @param {string} tpl
      * @param {Array} tplsToCheck
      * @returns boolean
@@ -212,6 +227,12 @@ declare class ItemHelper {
      * @returns size of stack
      */
     getItemStackSize(item: Item): number;
+    /**
+     * Get the name of an item from the locale file using the item tpl
+     * @param itemTpl Tpl of item to get name of
+     * @returns Name of item
+     */
+    getItemName(itemTpl: string): string;
 }
 declare namespace ItemHelper {
     interface ItemSize {

types/helpers/NotificationSendHelper.d.ts

@@ -1,10 +1,10 @@
 import { INotification } from "../models/eft/notifier/INotifier";
-import { IHttpServer } from "../models/spt/server/IHttpServer";
+import { WebSocketServer } from "../servers/WebSocketServer";
 import { NotificationService } from "../services/NotificationService";
 export declare class NotificationSendHelper {
-    protected httpServer: IHttpServer;
+    protected webSocketServer: WebSocketServer;
     protected notificationService: NotificationService;
-    constructor(httpServer: IHttpServer, notificationService: NotificationService);
+    constructor(webSocketServer: WebSocketServer, notificationService: NotificationService);
     /**
      * Send notification message to the appropiate channel
      */

types/helpers/PresetHelper.d.ts

@@ -5,8 +5,10 @@ export declare class PresetHelper {
     protected jsonUtil: JsonUtil;
     protected databaseServer: DatabaseServer;
     protected lookup: Record<string, string[]>;
+    protected defaultPresets: Record<string, Preset>;
     constructor(jsonUtil: JsonUtil, databaseServer: DatabaseServer);
     hydratePresetStore(input: Record<string, string[]>): void;
+    getDefaultPresets(): Record<string, Preset>;
     isPreset(id: string): boolean;
     hasPreset(templateId: string): boolean;
     getPreset(id: string): Preset;

types/helpers/ProfileHelper.d.ts

@@ -5,7 +5,6 @@ import { IValidateNicknameRequestData } from "../models/eft/profile/IValidateNic
 import { ILogger } from "../models/spt/utils/ILogger";
 import { DatabaseServer } from "../servers/DatabaseServer";
 import { SaveServer } from "../servers/SaveServer";
-import { FenceService } from "../services/FenceService";
 import { ProfileSnapshotService } from "../services/ProfileSnapshotService";
 import { JsonUtil } from "../utils/JsonUtil";
 import { TimeUtil } from "../utils/TimeUtil";
@@ -20,9 +19,13 @@ export declare class ProfileHelper {
     protected databaseServer: DatabaseServer;
     protected itemHelper: ItemHelper;
     protected profileSnapshotService: ProfileSnapshotService;
-    protected fenceService: FenceService;
+    constructor(logger: ILogger, jsonUtil: JsonUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileSnapshotService: ProfileSnapshotService);
-    constructor(logger: ILogger, jsonUtil: JsonUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileSnapshotService: ProfileSnapshotService, fenceService: FenceService);
     resetProfileQuestCondition(sessionID: string, conditionId: string): void;
+    /**
+     * Get all profiles from server
+     * @returns Dictionary of profiles
+     */
+    getProfiles(): Record<string, IAkiProfile>;
     getCompleteProfile(sessionID: string): IPmcData[];
     /**
      * Fix xp doubling on post-raid xp reward screen by sending a 'dummy' profile to the post-raid screen

types/helpers/QuestHelper.d.ts

@@ -6,10 +6,11 @@ import { ICompleteQuestRequestData } from "../models/eft/quests/ICompleteQuestRe
 import { QuestStatus } from "../models/enums/QuestStatus";
 import { IQuestConfig } from "../models/spt/config/IQuestConfig";
 import { ILogger } from "../models/spt/utils/ILogger";
-import { ItemEventRouter } from "../routers/ItemEventRouter";
+import { EventOutputHolder } from "../routers/EventOutputHolder";
 import { ConfigServer } from "../servers/ConfigServer";
 import { DatabaseServer } from "../servers/DatabaseServer";
 import { LocaleService } from "../services/LocaleService";
+import { LocalisationService } from "../services/LocalisationService";
 import { HashUtil } from "../utils/HashUtil";
 import { JsonUtil } from "../utils/JsonUtil";
 import { TimeUtil } from "../utils/TimeUtil";
@@ -25,17 +26,18 @@ export declare class QuestHelper {
     protected timeUtil: TimeUtil;
     protected hashUtil: HashUtil;
     protected itemHelper: ItemHelper;
-    protected itemEventRouter: ItemEventRouter;
+    protected eventOutputHolder: EventOutputHolder;
     protected databaseServer: DatabaseServer;
     protected localeService: LocaleService;
     protected ragfairServerHelper: RagfairServerHelper;
     protected dialogueHelper: DialogueHelper;
     protected profileHelper: ProfileHelper;
     protected paymentHelper: PaymentHelper;
+    protected localisationService: LocalisationService;
     protected traderHelper: TraderHelper;
     protected configServer: ConfigServer;
     protected questConfig: IQuestConfig;
-    constructor(logger: ILogger, jsonUtil: JsonUtil, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, localeService: LocaleService, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, traderHelper: TraderHelper, configServer: ConfigServer);
+    constructor(logger: ILogger, jsonUtil: JsonUtil, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, eventOutputHolder: EventOutputHolder, databaseServer: DatabaseServer, localeService: LocaleService, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, localisationService: LocalisationService, traderHelper: TraderHelper, configServer: ConfigServer);
     /**
     * Get status of a quest by quest id
     * @param pmcData Profile to search
@@ -50,6 +52,12 @@ export declare class QuestHelper {
      * @returns true if player level is greater than or equal to quest
      */
     doesPlayerLevelFulfilCondition(playerLevel: number, condition: AvailableForConditions): boolean;
+    /**
+     * Get the quests found in both arrays (inner join)
+     * @param before Array of qeusts #1
+     * @param after Array of quests #2
+     * @returns Reduction of cartesian product between two quest arrays
+     */
     getDeltaQuests(before: IQuest[], after: IQuest[]): IQuest[];
     /**
      * Increase skill points of a skill on player profile
@@ -60,44 +68,91 @@ export declare class QuestHelper {
      * @param progressAmount Amount of skill points to add to skill
      */
     rewardSkillPoints(sessionID: string, pmcData: IPmcData, output: IItemEventRouterResponse, skillName: string, progressAmount: number): void;
-    getQuestLocale(questId: string): any;
     /**
-     * Debug Routine for showing some information on the
+     * Get quest name by quest id
-     * quest list in question.
+     * @param questId id to get
+     * @returns
+     */
+    getQuestNameFromLocale(questId: string): string;
+    /**
+     * Check if trader has sufficient loyalty to fullfill quest requirement
+     * @param questProperties Quest props
+     * @param profile Player profile
+     * @returns true if loyalty is high enough to fulfil quest requirement
+     */
+    traderStandingRequirementCheck(questProperties: AvailableForProps, profile: IPmcData): boolean;
+    protected processReward(reward: Reward): Reward[];
+    /**
+     * Gets a flat list of reward items for the given quest at a specific state (e.g. Fail/Success)
+     * @param quest quest to get rewards for
+     * @param state Quest status that holds the items (Started, Success, Fail)
+     * @returns array of items with the correct maxStack
      */
-    dumpQuests(quests: any): void;
-    loyaltyRequirementCheck(loyaltyRequirementProperties: AvailableForProps, profile: IPmcData): boolean;
-    protected processReward(reward: Reward): any[];
     getQuestRewardItems(quest: IQuest, state: QuestStatus): Reward[];
     /**
-     * Add quest with new state value to pmc profile
+     * Update player profile with quest status (e.g. Fail/Success)
      * @param pmcData profile to add quest to
      * @param newState state the new quest should be in when added
      * @param acceptedQuest Details of quest being added
      */
     addQuestToPMCData(pmcData: IPmcData, newState: QuestStatus, acceptedQuest: IAcceptQuestRequestData): void;
-    acceptedUnlocked(acceptedQuestId: string, sessionID: string): IQuest[];
-    failedUnlocked(failedQuestId: string, sessionID: string): IQuest[];
-    applyMoneyBoost(quest: IQuest, moneyBoost: number): IQuest;
-    changeItemStack(pmcData: IPmcData, id: string, value: number, sessionID: string, output: any): void;
     /**
-     * Get List of All Quests as an array
+     * TODO: what is going on here
+     * @param acceptedQuestId Quest to add to profile
+     * @param sessionID Session id
+     * @returns Array of quests in profile + quest passed in as param
+     */
+    acceptedUnlocked(acceptedQuestId: string, sessionID: string): IQuest[];
+    /**
+     * TODO: what is going on here
+     * @param failedQuestId
+     * @param sessionID Session id
+     * @returns
+     */
+    failedUnlocked(failedQuestId: string, sessionID: string): IQuest[];
+    /**
+     * Adjust quest money rewards by passed in multipler
+     * @param quest Quest to multiple money rewards
+     * @param multipler Value to adjust money rewards by
+     * @returns Updated quest
+     */
+    applyMoneyBoost(quest: IQuest, multipler: number): IQuest;
+    /**
+     * Sets the item stack to new value, or delete the item if value <= 0
+     * // TODO maybe merge this function and the one from customization
+     * @param pmcData Profile
+     * @param itemId id of item to adjust stack size of
+     * @param newStackSize Stack size to adjust to
+     * @param sessionID Session id
+     * @param output ItemEvent router response
+     */
+    changeItemStack(pmcData: IPmcData, itemId: string, newStackSize: number, sessionID: string, output: IItemEventRouterResponse): void;
+    /**
+     * Get List of All Quests from db
+     * NOT CLONED
      * @returns Array of IQuest objects
      */
-    questValues(): IQuest[];
+    getQuestsFromDb(): IQuest[];
     /**
-     * Reest AvailableForStart conditions for quests
+     * Get quests, strip all requirement conditions except level
-     * @param quests queststo clean
+     * @param quests quests to process
      * @returns quest array without conditions
      */
-    protected cleanQuestList(quests: IQuest[]): IQuest[];
+    protected getQuestsWithOnlyLevelRequirementStartCondition(quests: IQuest[]): IQuest[];
     /**
-     * Reset AvailableForStart conditions on a quest
+     * Remove all quest conditions except for level requirement
      * @param quest quest to clean
      * @returns reset IQuest object
      */
-    cleanQuestConditions(quest: IQuest): IQuest;
+    getQuestWithOnlyLevelRequirementStartCondition(quest: IQuest): IQuest;
-    failQuest(pmcData: IPmcData, body: any, sessionID: string): any;
+    /**
+     * Fail a quest in a player profile
+     * @param pmcData Profile
+     * @param failRequest fail quest request data
+     * @param sessionID Session id
+     * @returns Item event router response
+     */
+    failQuest(pmcData: IPmcData, failRequest: any, sessionID: string): IItemEventRouterResponse;
     /**
      * Get quest by id from database
      * @param questId questid to look for
@@ -105,7 +160,12 @@ export declare class QuestHelper {
      * @returns IQuest object
      */
     getQuestFromDb(questId: string, pmcData: IPmcData): IQuest;
-    getQuestLocaleIdFromDb(messageId: string): string;
+    /**
+     * Get the locale Id from locale db for a quest message
+     * @param questMessageId Quest mesage id to look up
+     * @returns Locale Id from locale db
+     */
+    getQuestLocaleIdFromDb(questMessageId: string): string;
     /**
      * Alter a quests state + Add a record to tis status timers object
      * @param pmcData Profile to update
@@ -128,5 +188,10 @@ export declare class QuestHelper {
      * @returns bonus in percent
      */
     protected getIntelCenterRewardBonus(pmcData: IPmcData): number;
-    getFindItemIdForQuestItem(itemTpl: string): string;
+    /**
+     * Find quest with 'findItem' requirement that needs the item tpl be handed in
+     * @param itemTpl item tpl to look for
+     * @returns 'FindItem' condition id
+     */
+    getFindItemIdForQuestHandIn(itemTpl: string): string;
 }

types/helpers/RagfairOfferHelper.d.ts

@@ -6,7 +6,7 @@ import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData";
 import { IQuestConfig } from "../models/spt/config/IQuestConfig";
 import { IRagfairConfig } from "../models/spt/config/IRagfairConfig";
 import { ILogger } from "../models/spt/utils/ILogger";
-import { ItemEventRouter } from "../routers/ItemEventRouter";
+import { EventOutputHolder } from "../routers/EventOutputHolder";
 import { ConfigServer } from "../servers/ConfigServer";
 import { DatabaseServer } from "../servers/DatabaseServer";
 import { SaveServer } from "../servers/SaveServer";
@@ -27,7 +27,7 @@ export declare class RagfairOfferHelper {
     protected logger: ILogger;
     protected timeUtil: TimeUtil;
     protected hashUtil: HashUtil;
-    protected itemEventRouter: ItemEventRouter;
+    protected eventOutputHolder: EventOutputHolder;
     protected databaseServer: DatabaseServer;
     protected traderHelper: TraderHelper;
     protected saveServer: SaveServer;
@@ -45,12 +45,24 @@ export declare class RagfairOfferHelper {
     protected static goodSoldTemplate: string;
     protected ragfairConfig: IRagfairConfig;
     protected questConfig: IQuestConfig;
-    constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, traderHelper: TraderHelper, saveServer: SaveServer, dialogueHelper: DialogueHelper, itemHelper: ItemHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, localeService: LocaleService, configServer: ConfigServer);
+    constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, eventOutputHolder: EventOutputHolder, databaseServer: DatabaseServer, traderHelper: TraderHelper, saveServer: SaveServer, dialogueHelper: DialogueHelper, itemHelper: ItemHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, localeService: LocaleService, configServer: ConfigServer);
-    getValidOffers(info: ISearchRequestData, itemsToAdd: string[], assorts: Record<string, ITraderAssort>, pmcProfile: IPmcData): IRagfairOffer[];
+    getValidOffers(searchRequest: ISearchRequestData, itemsToAdd: string[], traderAssorts: Record<string, ITraderAssort>, pmcProfile: IPmcData): IRagfairOffer[];
     getOffersForBuild(info: ISearchRequestData, itemsToAdd: string[], assorts: Record<string, ITraderAssort>, pmcProfile: IPmcData): IRagfairOffer[];
+    /**
+     * Check if trader offers' BuyRestrictionMax value has been reached
+     * @param offer offer to check restriction properties of
+     * @returns true if restriction reached, false if no restrictions/not reached
+     */
+    protected traderBuyRestrictionReached(offer: IRagfairOffer): boolean;
+    /**
+     * Get an array of flea offers that are inaccessible to player due to their inadequate loyalty level
+     * @param offers Offers to check
+     * @param pmcProfile Players profile with trader loyalty levels
+     */
+    protected getLoyaltyLockedOffers(offers: IRagfairOffer[], pmcProfile: IPmcData): string[];
     processOffersOnProfile(sessionID: string): boolean;
     protected getProfileOffers(sessionID: string): IRagfairOffer[];
     protected deleteOfferByOfferId(sessionID: string, offerId: string): void;
     protected completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse;
-    isDisplayableOffer(info: ISearchRequestData, itemsToAdd: string[], assorts: Record<string, ITraderAssort>, offer: IRagfairOffer, pmcProfile: IPmcData): boolean;
+    isDisplayableOffer(info: ISearchRequestData, itemsToAdd: string[], traderAssorts: Record<string, ITraderAssort>, offer: IRagfairOffer, pmcProfile: IPmcData): boolean;
 }

types/helpers/RagfairSellHelper.d.ts

@@ -11,7 +11,21 @@ export declare class RagfairSellHelper {
     protected configServer: ConfigServer;
     protected ragfairConfig: IRagfairConfig;
     constructor(logger: ILogger, randomUtil: RandomUtil, timeUtil: TimeUtil, configServer: ConfigServer);
-    calculateSellChance(baseChancePercent: number, offerPriceRub: number, playerListedPriceRub: number): number;
+    /**
+     * Get the percent chance to sell an item based on its average listed price vs player chosen listing price
+     * @param baseChancePercent Base chance to sell item
+     * @param averageOfferPriceRub Price of average offer in roubles
+     * @param playerListedPriceRub Price player listed item for in roubles
+     * @returns percent value
+     */
+    calculateSellChance(baseChancePercent: number, averageOfferPriceRub: number, playerListedPriceRub: number): number;
+    /**
+     * Get percent chance to sell an item when price is below items average listing price
+     * @param playerListedPriceRub Price player listed item for in roubles
+     * @param averageOfferPriceRub Price of average offer in roubles
+     * @returns percent value
+     */
+    protected getSellMultiplierWhenPlayerPriceIsBelowAverageListingPrice(averageOfferPriceRub: number, playerListedPriceRub: number): number;
     /**
      * Determine if the offer being listed will be sold
      * @param sellChancePercent chance item will sell

types/helpers/RagfairServerHelper.d.ts

@@ -42,12 +42,22 @@ export declare class RagfairServerHelper {
     protected isItemBlacklisted(itemTemplateId: string): boolean;
     isTrader(userID: string): boolean;
     isPlayer(userID: string): boolean;
-    returnItems(sessionID: string, items: any[]): void;
+    returnItems(sessionID: string, items: Item[]): void;
     calculateDynamicStackCount(tplId: string, isWeaponPreset: boolean): number;
+    /**
+     * Choose a currency at random with bias
+     * @returns currency tpl
+     */
     getDynamicOfferCurrency(): string;
     getMemberType(userID: string): MemberCategory;
     getNickname(userID: string): string;
     getPresetItems(item: any): Item[];
     getPresetItemsByTpl(item: Item): Item[];
+    /**
+     * Generate new unique ids for the children while preserving hierarchy
+     * @param item base item
+     * @param preset
+     * @returns Item array with new IDs
+     */
     reparentPresets(item: Item, preset: Item[]): Item[];
 }

types/helpers/RagfairSortHelper.d.ts

@@ -1,14 +1,28 @@
 import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer";
+import { RagfairSort } from "../models/enums/RagfairSort";
 import { DatabaseServer } from "../servers/DatabaseServer";
 import { LocaleService } from "../services/LocaleService";
 export declare class RagfairSortHelper {
     protected databaseServer: DatabaseServer;
     protected localeService: LocaleService;
     constructor(databaseServer: DatabaseServer, localeService: LocaleService);
-    sortOffers(offers: IRagfairOffer[], type: number, direction?: number): IRagfairOffer[];
+    /**
+     * Sort a list of ragfair offers by something (id/rating/offer name/price/expirty time)
+     * @param offers Offers to sort
+     * @param type How to sort it
+     * @param direction Ascending/descending
+     * @returns Sorted offers
+     */
+    sortOffers(offers: IRagfairOffer[], type: RagfairSort, direction?: number): IRagfairOffer[];
     protected sortOffersByID(a: IRagfairOffer, b: IRagfairOffer): number;
     protected sortOffersByRating(a: IRagfairOffer, b: IRagfairOffer): number;
     protected sortOffersByName(a: IRagfairOffer, b: IRagfairOffer): number;
+    /**
+     * Order two offers by rouble price value
+     * @param a Offer a
+     * @param b Offer b
+     * @returns
+     */
     protected sortOffersByPrice(a: IRagfairOffer, b: IRagfairOffer): number;
     protected sortOffersByExpiry(a: IRagfairOffer, b: IRagfairOffer): number;
 }

types/helpers/RepairHelper.d.ts

@@ -14,8 +14,17 @@ export declare class RepairHelper {
     protected configServer: ConfigServer;
     protected repairConfig: IRepairConfig;
     constructor(logger: ILogger, jsonUtil: JsonUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer);
-    updateItemDurability(itemToRepair: Item, itemToRepairDetails: ITemplateItem, isArmor: boolean, amountToRepair: number, useRepairKit?: boolean, applyRandomDegradation?: boolean): Item;
+    /**
-    protected getRandomisedArmorRepairDegredationValue(armorMaterial: string, isRepairKit: boolean, armorMax: number): number;
+     * Alter an items durability after a repair by trader/repair kit
-    protected getRandomisedWeaponRepairDegredationValue(itemProps: Props, isRepairKit: boolean, armorMax: number): number;
+     * @param itemToRepair item to update durability details
+     * @param itemToRepairDetails db details of item to repair
+     * @param isArmor Is item being repaired a piece of armor
+     * @param amountToRepair how many unit of durability to repair
+     * @param useRepairKit Is item being repaired with a repair kit
+     * @param applyMaxDurabilityDegradation should item have max durability reduced
+     */
+    updateItemDurability(itemToRepair: Item, itemToRepairDetails: ITemplateItem, isArmor: boolean, amountToRepair: number, useRepairKit: boolean, traderQualityMultipler: number, applyMaxDurabilityDegradation?: boolean): void;
+    protected getRandomisedArmorRepairDegredationValue(armorMaterial: string, isRepairKit: boolean, armorMax: number, traderQualityMultipler: number): number;
+    protected getRandomisedWeaponRepairDegredationValue(itemProps: Props, isRepairKit: boolean, weaponMax: number, traderQualityMultipler: number): number;
     isWeaponTemplate(tpl: string): boolean;
 }

types/helpers/TradeHelper.d.ts

@@ -6,21 +6,25 @@ import { Item, Upd } from "../models/eft/common/tables/IItem";
 import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
 import { IProcessBuyTradeRequestData } from "../models/eft/trade/IProcessBuyTradeRequestData";
 import { IProcessSellTradeRequestData } from "../models/eft/trade/IProcessSellTradeRequestData";
+import { ITraderConfig } from "../models/spt/config/ITraderConfig";
 import { ILogger } from "../models/spt/utils/ILogger";
-import { ItemEventRouter } from "../routers/ItemEventRouter";
+import { EventOutputHolder } from "../routers/EventOutputHolder";
+import { ConfigServer } from "../servers/ConfigServer";
 import { RagfairServer } from "../servers/RagfairServer";
 import { FenceService } from "../services/FenceService";
 import { PaymentService } from "../services/PaymentService";
 export declare class TradeHelper {
     protected logger: ILogger;
-    protected itemEventRouter: ItemEventRouter;
+    protected eventOutputHolder: EventOutputHolder;
     protected traderHelper: TraderHelper;
     protected itemHelper: ItemHelper;
     protected paymentService: PaymentService;
     protected fenceService: FenceService;
     protected inventoryHelper: InventoryHelper;
     protected ragfairServer: RagfairServer;
-    constructor(logger: ILogger, itemEventRouter: ItemEventRouter, traderHelper: TraderHelper, itemHelper: ItemHelper, paymentService: PaymentService, fenceService: FenceService, inventoryHelper: InventoryHelper, ragfairServer: RagfairServer);
+    protected configServer: ConfigServer;
+    protected traderConfig: ITraderConfig;
+    constructor(logger: ILogger, eventOutputHolder: EventOutputHolder, traderHelper: TraderHelper, itemHelper: ItemHelper, paymentService: PaymentService, fenceService: FenceService, inventoryHelper: InventoryHelper, ragfairServer: RagfairServer, configServer: ConfigServer);
     /**
      * Buy item from flea or trader
      * @param pmcData
@@ -33,7 +37,7 @@ export declare class TradeHelper {
     buyItem(pmcData: IPmcData, buyRequestData: IProcessBuyTradeRequestData, sessionID: string, foundInRaid: boolean, upd: Upd): IItemEventRouterResponse;
     /**
      * Sell item to trader
-     * @param pmcData
+     * @param pmcData Profile to update
      * @param body
      * @param sessionID
      * @returns

types/helpers/TraderAssortHelper.d.ts

@@ -7,7 +7,9 @@ import { ILogger } from "../models/spt/utils/ILogger";
 import { ConfigServer } from "../servers/ConfigServer";
 import { DatabaseServer } from "../servers/DatabaseServer";
 import { FenceService } from "../services/FenceService";
+import { LocalisationService } from "../services/LocalisationService";
 import { TraderAssortService } from "../services/TraderAssortService";
+import { TraderPurchasePersisterService } from "../services/TraderPurchasePersisterService";
 import { JsonUtil } from "../utils/JsonUtil";
 import { MathUtil } from "../utils/MathUtil";
 import { TimeUtil } from "../utils/TimeUtil";
@@ -27,11 +29,13 @@ export declare class TraderAssortHelper {
     protected ragfairAssortGenerator: RagfairAssortGenerator;
     protected ragfairOfferGenerator: RagfairOfferGenerator;
     protected traderAssortService: TraderAssortService;
+    protected localisationService: LocalisationService;
+    protected traderPurchasePersisterService: TraderPurchasePersisterService;
     protected traderHelper: TraderHelper;
     protected fenceService: FenceService;
     protected configServer: ConfigServer;
     protected traderConfig: ITraderConfig;
-    constructor(logger: ILogger, jsonUtil: JsonUtil, mathUtil: MathUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, profileHelper: ProfileHelper, assortHelper: AssortHelper, paymentHelper: PaymentHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, traderHelper: TraderHelper, fenceService: FenceService, configServer: ConfigServer);
+    constructor(logger: ILogger, jsonUtil: JsonUtil, mathUtil: MathUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, profileHelper: ProfileHelper, assortHelper: AssortHelper, paymentHelper: PaymentHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, localisationService: LocalisationService, traderPurchasePersisterService: TraderPurchasePersisterService, traderHelper: TraderHelper, fenceService: FenceService, configServer: ConfigServer);
     /**
      * Get a traders assorts
      * Can be used for returning ragfair / fence assorts

types/helpers/TraderHelper.d.ts

@@ -8,6 +8,7 @@ import { ConfigServer } from "../servers/ConfigServer";
 import { DatabaseServer } from "../servers/DatabaseServer";
 import { SaveServer } from "../servers/SaveServer";
 import { FenceService } from "../services/FenceService";
+import { LocalisationService } from "../services/LocalisationService";
 import { PlayerService } from "../services/PlayerService";
 import { TimeUtil } from "../utils/TimeUtil";
 import { HandbookHelper } from "./HandbookHelper";
@@ -23,11 +24,12 @@ export declare class TraderHelper {
     protected itemHelper: ItemHelper;
     protected handbookHelper: HandbookHelper;
     protected playerService: PlayerService;
+    protected localisationService: LocalisationService;
     protected fenceService: FenceService;
     protected timeUtil: TimeUtil;
     protected configServer: ConfigServer;
     protected traderConfig: ITraderConfig;
-    constructor(logger: ILogger, databaseServer: DatabaseServer, saveServer: SaveServer, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, itemHelper: ItemHelper, handbookHelper: HandbookHelper, playerService: PlayerService, fenceService: FenceService, timeUtil: TimeUtil, configServer: ConfigServer);
+    constructor(logger: ILogger, databaseServer: DatabaseServer, saveServer: SaveServer, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, itemHelper: ItemHelper, handbookHelper: HandbookHelper, playerService: PlayerService, localisationService: LocalisationService, fenceService: FenceService, timeUtil: TimeUtil, configServer: ConfigServer);
     getTrader(traderID: string, sessionID: string): ITraderBase;
     getTraderAssortsById(traderId: string): ITraderAssort;
     /**
@@ -53,19 +55,26 @@ export declare class TraderHelper {
     getPurchasesData(traderID: string, sessionID: string): Record<string, IBarterScheme[][]>;
     /**
      * Should item be skipped when selling to trader according to its sell categories and other checks
-     * @param pmcData
+     * @param pmcData Profile
-     * @param item
+     * @param item Item to be checked is sellable to trader
-     * @param sellCategory
+     * @param sellCategory categories trader will buy
+     * @param traderId Trader item is being checked can be sold to
      * @returns true if should NOT be sold to trader
      */
-    protected isItemUnSellableToTrader(pmcData: IPmcData, item: Item, sellCategory: string[]): boolean;
+    protected isItemUnSellableToTrader(pmcData: IPmcData, item: Item, sellCategory: string[], traderId: string): boolean;
     /**
-     * Can this weapon be sold to a trader with its current durabiltiy level
+     * Check if item has durability so low it precludes it from being sold to the trader (inclusive)
-     * @param traderID
+     * @param item Item to check durability of
-     * @param item
+     * @param traderId Trader item is sold to
-     * @returns boolean
+     * @returns
      */
-    protected isWeaponBelowTraderBuyDurability(traderID: string, item: Item): boolean;
+    protected itemIsBelowSellableDurabilityThreshhold(item: Item, traderId: string): boolean;
+    /**
+     * Get the percentage threshold value a trader will buy armor/weapons above
+     * @param traderId Trader to look up
+     * @returns percentage
+     */
+    protected getTraderDurabiltyPurchaseThreshold(traderId: string): number;
     /**
      * Get the price of an item and all of its attached children
      * Take into account bonuses/adjsutments e.g. discounts
@@ -113,10 +122,22 @@ export declare class TraderHelper {
     getTraderUpdateSeconds(traderId: string): number;
     /**
     * check if an item is allowed to be sold to a trader
-    * @param traderFilters array of allowed categories
+    * @param categoriesTraderBuys array of allowed categories
     * @param tplToCheck itemTpl of inventory
-    * @returns boolean
+    * @returns boolean if item can be sold to trader
     */
-    traderFilter(traderFilters: string[], tplToCheck: string): boolean;
+    doesTraderBuyItem(categoriesTraderBuys: string[], tplToCheck: string): boolean;
     getLoyaltyLevel(traderID: string, pmcData: IPmcData): LoyaltyLevel;
+    /**
+     * Store the purchase of an assort from a trader in the player profile
+     * @param sessionID Session id
+     * @param newPurchaseDetails New item assort id + count
+     */
+    addTraderPurchasesToPlayerProfile(sessionID: string, newPurchaseDetails: {
+        items: {
+            item_id: string;
+            count: number;
+        }[];
+        tid: string;
+    }): void;
 }

types/ide/Compiler.d.ts

@@ -1 +0,0 @@
-import "reflect-metadata";

types/loaders/PostDBModLoader.d.ts

@@ -4,7 +4,7 @@ import { PreAkiModLoader } from "./PreAkiModLoader";
 export declare class PostDBModLoader implements OnLoad {
     protected preAkiModLoader: PreAkiModLoader;
     constructor(preAkiModLoader: PreAkiModLoader);
-    onLoad(): void;
+    onLoad(): Promise<void>;
     getRoute(): string;
     getModPath(mod: string): string;
     protected executeMods(container: DependencyContainer): void;

types/loaders/PreAkiModLoader.d.ts

@@ -1,10 +1,14 @@
 import { DependencyContainer } from "tsyringe";
+import { IPostAkiLoadMod } from "../models/external/IPostAkiLoadMod";
+import { IPostDBLoadMod } from "../models/external/IPostDBLoadMod";
+import { IPreAkiLoadMod } from "../models/external/IPreAkiLoadMod";
 import { ICoreConfig } from "../models/spt/config/ICoreConfig";
 import { ModLoader } from "../models/spt/mod/IMod";
 import { IModLoader } from "../models/spt/mod/IModLoader";
 import { IPackageJsonData } from "../models/spt/mod/IPackageJsonData";
 import { ILogger } from "../models/spt/utils/ILogger";
 import { ConfigServer } from "../servers/ConfigServer";
+import { LocalisationService } from "../services/LocalisationService";
 import { ModCompilerService } from "../services/ModCompilerService";
 import { JsonUtil } from "../utils/JsonUtil";
 import { VFS } from "../utils/VFS";
@@ -15,12 +19,13 @@ export declare class PreAkiModLoader implements IModLoader {
     protected jsonUtil: JsonUtil;
     protected modCompilerService: ModCompilerService;
     protected bundleLoader: BundleLoader;
+    protected localisationService: LocalisationService;
     protected configServer: ConfigServer;
     protected static container: DependencyContainer;
     protected readonly basepath = "user/mods/";
     protected imported: Record<string, ModLoader.IMod>;
     protected akiConfig: ICoreConfig;
-    constructor(logger: ILogger, vfs: VFS, jsonUtil: JsonUtil, modCompilerService: ModCompilerService, bundleLoader: BundleLoader, configServer: ConfigServer);
+    constructor(logger: ILogger, vfs: VFS, jsonUtil: JsonUtil, modCompilerService: ModCompilerService, bundleLoader: BundleLoader, localisationService: LocalisationService, configServer: ConfigServer);
     load(container: DependencyContainer): Promise<void>;
     getBundles(local: boolean): string;
     getBundle(key: string, local: boolean): void;
@@ -29,6 +34,7 @@ export declare class PreAkiModLoader implements IModLoader {
      * @returns Array of mod names in load order
      */
     getImportedModsNames(): string[];
+    getImportedModDetails(): Record<string, ModLoader.IMod>;
     getModPath(mod: string): string;
     protected importClass(name: string, filepath: string, container: DependencyContainer): void;
     protected importMods(): Promise<void>;
@@ -44,9 +50,9 @@ export declare class PreAkiModLoader implements IModLoader {
      */
     protected getDuplicates(stringArray: string[]): string[];
     /**
-     *
+     * Get an array of mods with errors that prevent them from working with SPT
-     * @param mods Get an array of broken/invalid mods by name
+     * @param mods mods to validate
-     * @returns Mod names array
+     * @returns Mod names as array
      */
     protected getBrokenMods(mods: string[]): string[];
     /**
@@ -56,19 +62,38 @@ export declare class PreAkiModLoader implements IModLoader {
      */
     protected getModsPackageData(mods: string[]): Record<string, IPackageJsonData>;
     /**
-     * Does mod have "delayedLoad(" string in its entry class
+     * Use defined safe guard to check if the mod is a IPreAkiLoadMod
-     * @param modFolderName folder name
-     * @param modToValidate package.json details
      * @returns boolean
      */
-    protected isModSpt3XXCompatible(modFolderName: string, modToValidate: IPackageJsonData): boolean;
+    protected isPreAkiLoad(mod: any): mod is IPreAkiLoadMod;
+    /**
+     * Use defined safe guard to check if the mod is a IPostAkiLoadMod
+     * @returns boolean
+     */
+    protected isPostAkiLoad(mod: any): mod is IPostAkiLoadMod;
+    /**
+     * Use defined safe guard to check if the mod is a IPostDBLoadMod
+     * @returns boolean
+     */
+    protected isPostDBAkiLoad(mod: any): mod is IPostDBLoadMod;
+    /**
+     * Check that the mod is compatible with SPT 3.X.X
+     * @param mod the mod to check
+     * @returns boolean
+     */
+    protected isModSpt3XXCompatible(mod: any): boolean;
     protected isModCombatibleWithAki(mod: IPackageJsonData): boolean;
     protected executeMods(container: DependencyContainer): void;
     sortModsLoadOrder(): string[];
     protected addMod(mod: string): Promise<void>;
     protected areModDependenciesFulfilled(pkg: IPackageJsonData, loadedMods: Record<string, IPackageJsonData>): boolean;
     protected isModCompatible(mod: IPackageJsonData, loadedMods: Record<string, IPackageJsonData>): boolean;
-    protected validMod(mod: string): boolean;
+    /**
+     * Validate a mod passes a number of checks
+     * @param modName name of mod in /mods/ to validate
+     * @returns true if valid
+     */
+    protected validMod(modName: string): boolean;
     protected getLoadOrderRecursive(mod: string, result: Record<string, string>, visited: Record<string, string>): void;
     protected getLoadOrder(mods: Record<string, ModLoader.IMod>): Record<string, string>;
     getContainer(): DependencyContainer;

types/models/eft/bot/IGenerateBotsRequestData.d.ts

@@ -2,6 +2,7 @@ export interface IGenerateBotsRequestData {
     conditions: Condition[];
 }
 export interface Condition {
+    /** e.g. assault/pmcBot/bossKilla */
     Role: string;
     Limit: number;
     Difficulty: string;

types/models/eft/bot/IRandomisedBotLevelResult.d.ts

@@ -0,0 +1,4 @@
+export interface IRandomisedBotLevelResult {
+    level: number;
+    exp: number;
+}

types/models/eft/common/IGlobals.d.ts

@@ -591,6 +591,7 @@ export interface HealPrice {
 export interface ProfileHealthSettings {
     BodyPartsSettings: BodyPartsSettings;
     HealthFactorsSettings: HealthFactorsSettings;
+    DefaultStimulatorBuff: string;
 }
 export interface BodyPartsSettings {
     Head: BodyPartsSetting;
@@ -1175,5 +1176,6 @@ export interface Preset {
     _name: string;
     _parent: string;
     _items: Item[];
+    /** Default presets have this property */
     _encyclopedia?: string;
 }

types/models/eft/common/tables/IBotBase.d.ts

@@ -341,6 +341,7 @@ export interface RagfairInfo {
     offers: IRagfairOffer[];
 }
 export interface Bonus {
+    id?: string;
     type: string;
     templateId?: string;
     passive?: boolean;
@@ -348,6 +349,8 @@ export interface Bonus {
     visible?: boolean;
     value?: number;
     icon?: string;
+    filter?: string[];
+    skillType?: string;
 }
 export interface Note {
     Time: number;