update bushwaker and desharpner

2022-07-27 22:26:54 +01:00 · 2022-07-27 22:26:54 +01:00 · 0ab064d968
commit 0ab064d968
parent 3b02e4b9ba
2178 changed files with 27068 additions and 8133 deletions
--- a/1.1.0/types/controllers/BotController.d.ts
+++ b/1.1.0/types/controllers/BotController.d.ts
@ -1,20 +0,0 @@
-import { BotGenerator } from "../generators/BotGenerator";
-import { BotHelper } from "../helpers/BotHelper";
-import { IGenerateBotsRequestData } from "../models/eft/bot/IGenerateBotsRequestData";
-import { IBotBase } from "../models/eft/common/tables/IBotBase";
-import { IBotCore } from "../models/eft/common/tables/IBotCore";
-import { Difficulty } from "../models/eft/common/tables/IBotType";
-import { ConfigServer } from "../servers/ConfigServer";
-import { DatabaseServer } from "../servers/DatabaseServer";
-export declare class BotController {
-    private databaseServer;
-    private botGenerator;
-    private botHelper;
-    private configServer;
-    private botConfig;
-    constructor(databaseServer: DatabaseServer, botGenerator: BotGenerator, botHelper: BotHelper, configServer: ConfigServer);
-    getBotLimit(type: string): number;
-    getBotDifficulty(type: string, difficulty: string): IBotCore | Difficulty;
-    generate(info: IGenerateBotsRequestData, playerScav?: boolean): IBotBase[];
-    getBotCap(): number;
-}
--- a/1.1.0/types/controllers/GameController.d.ts
+++ b/1.1.0/types/controllers/GameController.d.ts
@ -1,28 +0,0 @@
-import { HttpServerHelper } from "../helpers/HttpServerHelper";
-import { ProfileHelper } from "../helpers/ProfileHelper";
-import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData";
-import { IGameConfigResponse } from "../models/eft/game/IGameConfigResponse";
-import { ILogger } from "../models/spt/utils/ILogger";
-import { ConfigServer } from "../servers/ConfigServer";
-import { Watermark } from "../utils/Watermark";
-export declare class GameController {
-    private logger;
-    private watermark;
-    private httpServerHelper;
-    private profileHelper;
-    private configServer;
-    private httpConfig;
-    constructor(logger: ILogger, watermark: Watermark, httpServerHelper: HttpServerHelper, profileHelper: ProfileHelper, configServer: ConfigServer);
-    gameStart(_url: string, _info: IEmptyRequestData, sessionID: string): void;
-    private addMissingBonusesProperty;
-    private addMissingRepeatableQuestsProperty;
-    private addMissingWeaponRepairSkill;
-    private addMissingAkiVersionTagToProfile;
-    private addMissingArmorRepairSkill;
-    private fixNullTraderSalesSums;
-    private removeDanglingConditionCounters;
-    private removeDanglingBackendCounters;
-    getGameConfig(sessionID: string): IGameConfigResponse;
-    getServer(): any[];
-    private getActiveRepeatableQuests;
-}
--- a/1.1.0/types/controllers/MatchController.d.ts
+++ b/1.1.0/types/controllers/MatchController.d.ts
@ -1,28 +0,0 @@
-import { ProfileHelper } from "../helpers/ProfileHelper";
-import { TraderHelper } from "../helpers/TraderHelper";
-import { IPmcData } from "../models/eft/common/IPmcData";
-import { IEndOfflineRaidRequestData } from "../models/eft/match/IEndOfflineRaidRequestData";
-import { IGetProfileRequestData } from "../models/eft/match/IGetProfileRequestData";
-import { IStartOfflineRaidRequestData } from "../models/eft/match/IStartOffineRaidRequestData";
-import { ConfigServer } from "../servers/ConfigServer";
-import { SaveServer } from "../servers/SaveServer";
-import { MatchLocationService } from "../services/MatchLocationService";
-export declare class MatchController {
-    private saveServer;
-    private profileHelper;
-    private matchLocationService;
-    private traderHelper;
-    private configServer;
-    private matchConfig;
-    private inraidConfig;
-    constructor(saveServer: SaveServer, profileHelper: ProfileHelper, matchLocationService: MatchLocationService, traderHelper: TraderHelper, configServer: ConfigServer);
-    getEnabled(): boolean;
-    getProfile(info: IGetProfileRequestData): IPmcData[];
-    private getMatch;
-    createGroup(sessionID: string, info: any): any;
-    deleteGroup(info: any): void;
-    joinMatch(info: any, sessionID: string): any[];
-    getGroupStatus(info: any): any;
-    startOfflineRaid(info: IStartOfflineRaidRequestData, sessionID: string): void;
-    endOfflineRaid(info: IEndOfflineRaidRequestData, sessionID: string): void;
-}
--- a/1.1.0/types/controllers/QuestController.d.ts
+++ b/1.1.0/types/controllers/QuestController.d.ts
@ -1,37 +0,0 @@
-import { DialogueHelper } from "../helpers/DialogueHelper";
-import { ItemHelper } from "../helpers/ItemHelper";
-import { ProfileHelper } from "../helpers/ProfileHelper";
-import { QuestConditionHelper } from "../helpers/QuestConditionHelper";
-import { QuestHelper } from "../helpers/QuestHelper";
-import { IPmcData } from "../models/eft/common/IPmcData";
-import { IQuest } from "../models/eft/common/tables/IQuest";
-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 { ILogger } from "../models/spt/utils/ILogger";
-import { ItemEventRouter } from "../routers/ItemEventRouter";
-import { ConfigServer } from "../servers/ConfigServer";
-import { DatabaseServer } from "../servers/DatabaseServer";
-import { PlayerService } from "../services/PlayerService";
-import { TimeUtil } from "../utils/TimeUtil";
-export declare class QuestController {
-    private logger;
-    private timeUtil;
-    private itemEventRouter;
-    private databaseServer;
-    private itemHelper;
-    private dialogueHelper;
-    private profileHelper;
-    private questHelper;
-    private questConditionHelper;
-    private playerService;
-    private configServer;
-    private questConfig;
-    constructor(logger: ILogger, timeUtil: TimeUtil, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, itemHelper: ItemHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, questConditionHelper: QuestConditionHelper, playerService: PlayerService, configServer: ConfigServer);
-    getClientQuests(sessionID: string): IQuest[];
-    acceptQuest(pmcData: IPmcData, acceptedQuest: IAcceptQuestRequestData, sessionID: string): IItemEventRouterResponse;
-    acceptRepeatableQuest(pmcData: IPmcData, acceptedQuest: IAcceptQuestRequestData, sessionID: string): IItemEventRouterResponse;
-    completeQuest(pmcData: IPmcData, body: ICompleteQuestRequestData, sessionID: string): IItemEventRouterResponse;
-    handoverQuest(pmcData: IPmcData, body: IHandoverQuestRequestData, sessionID: string): IItemEventRouterResponse;
-}
--- a/1.1.0/types/generators/BotGenerator.d.ts
+++ b/1.1.0/types/generators/BotGenerator.d.ts
@ -1,36 +0,0 @@
-import { BotHelper } from "../helpers/BotHelper";
-import { GameEventHelper } from "../helpers/GameEventHelper";
-import { IGenerateBotsRequestData } from "../models/eft/bot/IGenerateBotsRequestData";
-import { IBotBase } from "../models/eft/common/tables/IBotBase";
-import { ILogger } from "../models/spt/utils/ILogger";
-import { ConfigServer } from "../servers/ConfigServer";
-import { DatabaseServer } from "../servers/DatabaseServer";
-import { HashUtil } from "../utils/HashUtil";
-import { JsonUtil } from "../utils/JsonUtil";
-import { RandomUtil } from "../utils/RandomUtil";
-import { BotInventoryGenerator } from "./BotInventoryGenerator";
-export declare class BotGenerator {
-    private logger;
-    private hashUtil;
-    private randomUtil;
-    private jsonUtil;
-    private databaseServer;
-    private botInventoryGenerator;
-    private botHelper;
-    private gameEventHelper;
-    private configServer;
-    private botConfig;
-    constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, botInventoryGenerator: BotInventoryGenerator, botHelper: BotHelper, gameEventHelper: GameEventHelper, configServer: ConfigServer);
-    generate(info: IGenerateBotsRequestData, playerScav?: boolean): IBotBase[];
-    private generateBot;
-    private generateRandomLevel;
-    /** Converts health object to the required format */
-    private generateHealth;
-    private generateSkills;
-    private getPmcRole;
-    private removeChristmasItemsFromBotInventory;
-    private generateId;
-    private generateInventoryID;
-    private getPMCDifficulty;
-    private generateDogtag;
-}
--- a/1.1.0/types/generators/BotLootGenerator.d.ts
+++ b/1.1.0/types/generators/BotLootGenerator.d.ts
@ -1,27 +0,0 @@
-import { PMCLootGenerator } from "../generators/PMCLootGenerator";
-import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper";
-import { HandbookHelper } from "../helpers/HandbookHelper";
-import { Inventory as PmcInventory } from "../models/eft/common/IPmcData";
-import { ItemMinMax, Items } from "../models/eft/common/tables/IBotType";
-import { ConfigServer } from "../servers/ConfigServer";
-import { DatabaseServer } from "../servers/DatabaseServer";
-import { HashUtil } from "../utils/HashUtil";
-import { JsonUtil } from "../utils/JsonUtil";
-import { RandomUtil } from "../utils/RandomUtil";
-export declare class BotLootGenerator {
-    private jsonUtil;
-    private hashUtil;
-    private randomUtil;
-    private databaseServer;
-    private handbookHelper;
-    private botGeneratorHelper;
-    private pmcLootGenerator;
-    private configServer;
-    private botConfig;
-    constructor(jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, botGeneratorHelper: BotGeneratorHelper, pmcLootGenerator: PMCLootGenerator, configServer: ConfigServer);
-    generateLoot(lootPool: Items, itemCounts: ItemMinMax, isPmc: boolean, inventory: PmcInventory): void;
-    private getRandomisedCount;
-    private addLootFromPool;
-    /** Compares two item templates by their price to spawn chance ratio */
-    private compareByValue;
-}
--- a/1.1.0/types/generators/BotWeaponGenerator.d.ts
+++ b/1.1.0/types/generators/BotWeaponGenerator.d.ts
@ -1,44 +0,0 @@
-import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper";
-import { ItemHelper } from "../helpers/ItemHelper";
-import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper";
-import { Inventory as PmcInventory } from "../models/eft/common/IPmcData";
-import { MinMax, Mods, ModsChances } from "../models/eft/common/tables/IBotType";
-import { ILogger } from "../models/spt/utils/ILogger";
-import { DatabaseServer } from "../servers/DatabaseServer";
-import { HashUtil } from "../utils/HashUtil";
-import { RandomUtil } from "../utils/RandomUtil";
-export declare class BotWeaponGenerator {
-    private logger;
-    private hashUtil;
-    private databaseServer;
-    private itemHelper;
-    private weightedRandomHelper;
-    private botGeneratorHelper;
-    private randomUtil;
-    constructor(logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, weightedRandomHelper: WeightedRandomHelper, botGeneratorHelper: BotGeneratorHelper, randomUtil: RandomUtil);
-    generateWeapon(equipmentSlot: string, weaponPool: Record<string, number>, modPool: Mods, modChances: ModsChances, magCounts: MinMax, botRole: string, isPmc: boolean, inventory: PmcInventory): void;
-    /** Checks if all required slots are occupied on a weapon and all it's mods */
-    private isWeaponValid;
-    /**
-    * Generates extra magazines or bullets (if magazine is internal) and adds them to TacticalVest and Pockets.
-    * Additionally, adds extra bullets to SecuredContainer
-    *
-    * @param {*} weaponMods
-    * @param {*} weaponTemplate
-    * @param {*} magCounts
-    * @param {*} ammoTpl
-    * @returns
-    */
-    private generateExtraMagazines;
-    private addBullets;
-    /**
-     * Finds and returns tpl of ammo that should be used, while making sure it's compatible
-     *
-     * @param {*} weaponMods
-     * @param {*} weaponTemplate
-     * @returns
-     */
-    private getCompatibleAmmo;
-    /** Fill existing magazines to full, while replacing their contents with specified ammo */
-    private fillExistingMagazines;
-}
--- a/1.1.0/types/generators/WeatherGenerator.d.ts
+++ b/1.1.0/types/generators/WeatherGenerator.d.ts
@ -1,19 +0,0 @@
-import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper";
-import { ConfigServer } from "../servers/ConfigServer";
-import { IWeatherData } from "../models/eft/weather/IWeatherData";
-import { RandomUtil } from "../utils/RandomUtil";
-import { TimeUtil } from "../utils/TimeUtil";
-export declare class WeatherGenerator {
-    private weightedRandomHelper;
-    private randomUtil;
-    private timeUtil;
-    private configServer;
-    private weatherConfig;
-    constructor(weightedRandomHelper: WeightedRandomHelper, randomUtil: RandomUtil, timeUtil: TimeUtil, configServer: ConfigServer);
-    calculateTime(data: IWeatherData): IWeatherData;
-    generateWeather(data: IWeatherData): IWeatherData;
-    private getWeightedFog;
-    private getWeightedRain;
-    private getRandomFloat;
-    private getRandomInt;
-}
--- a/1.1.0/types/helpers/AssortHelper.d.ts
+++ b/1.1.0/types/helpers/AssortHelper.d.ts
@ -1,16 +0,0 @@
-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 { ItemHelper } from "./ItemHelper";
-import { QuestHelper } from "./QuestHelper";
-export declare class AssortHelper {
-    private logger;
-    private itemHelper;
-    private databaseServer;
-    private questHelper;
-    constructor(logger: ILogger, itemHelper: ItemHelper, databaseServer: DatabaseServer, questHelper: QuestHelper);
-    removeItemFromAssort(assort: ITraderAssort, itemID: string): ITraderAssort;
-    stripQuestAssort(pmcProfile: IPmcData, sessionId: string, traderId: string, assort: ITraderAssort): ITraderAssort;
-    stripLoyaltyAssort(pmcProfile: IPmcData, sessionId: string, traderId: string, assort: ITraderAssort): ITraderAssort;
-}
--- a/1.1.0/types/helpers/BotGeneratorHelper.d.ts
+++ b/1.1.0/types/helpers/BotGeneratorHelper.d.ts
@ -1,60 +0,0 @@
-import { DurabilityLimitsHelper } from "../helpers/DurabilityLimitsHelper";
-import { Inventory as PmcInventory } from "../models/eft/common/IPmcData";
-import { Mods, ModsChances } from "../models/eft/common/tables/IBotType";
-import { Item, Upd } from "../models/eft/common/tables/IItem";
-import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem";
-import { ILogger } from "../models/spt/utils/ILogger";
-import { ConfigServer } from "../servers/ConfigServer";
-import { DatabaseServer } from "../servers/DatabaseServer";
-import { HashUtil } from "../utils/HashUtil";
-import { JsonUtil } from "../utils/JsonUtil";
-import { RandomUtil } from "../utils/RandomUtil";
-import { ContainerHelper } from "./ContainerHelper";
-import { InventoryHelper } from "./InventoryHelper";
-import { ItemHelper } from "./ItemHelper";
-export declare class BotGeneratorHelper {
-    private logger;
-    private jsonUtil;
-    private hashUtil;
-    private randomUtil;
-    private databaseServer;
-    private durabilityLimitsHelper;
-    private itemHelper;
-    private inventoryHelper;
-    private containerHelper;
-    private configServer;
-    private botConfig;
-    constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, durabilityLimitsHelper: DurabilityLimitsHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, containerHelper: ContainerHelper, configServer: ConfigServer);
-    generateModsForItem(items: Item[], modPool: Mods, parentId: string, parentTemplate: ITemplateItem, modSpawnChances: ModsChances, isPmc?: boolean): Item[];
-    /**
-     * 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 {object}      items               The items where the CylinderMagazine's camora are appended to
-     * @param {object}      modPool             modPool which should include available cartrigdes
-     * @param {string}      parentId            The CylinderMagazine's UID
-     * @param {object}      parentTemplate      The CylinderMagazine's template
-     */
-    private fillCamora;
-    generateExtraPropertiesForItem(itemTemplate: ITemplateItem, botRole?: any): {
-        "upd"?: Upd;
-    };
-    private getModTplFromItemDb;
-    isItemIncompatibleWithCurrentItems(items: Item[], tplToCheck: string, equipmentSlot: string): boolean;
-    /** Adds an item with all its childern into specified equipmentSlots, wherever it fits.
-     * Returns a `boolean` indicating success. */
-    addItemWithChildrenToEquipmentSlot(equipmentSlots: string[], parentId: string, parentTpl: string, itemWithChildren: Item[], inventory: PmcInventory): boolean;
-    private itemAllowedInContainer;
-}
-export declare class ExhaustableArray<T> {
-    private itemPool;
-    private randomUtil;
-    private jsonUtil;
-    private pool;
-    constructor(itemPool: T[], randomUtil: RandomUtil, jsonUtil: JsonUtil);
-    getRandomValue(): T;
-    getFirstValue(): T;
-    hasValues(): boolean;
-}
--- a/Live/CWX_BushWhacker/CWX-BushWhacker
+++ b/Live/CWX_BushWhacker/CWX-BushWhacker
@ -1,22 +0,0 @@
-import { Difficulty } from "../models/eft/common/tables/IBotType";
-import { ILogger } from "../models/spt/utils/ILogger";
-import { ConfigServer } from "../servers/ConfigServer";
-import { DatabaseServer } from "../servers/DatabaseServer";
-import { JsonUtil } from "../utils/JsonUtil";
-import { RandomUtil } from "../utils/RandomUtil";
-export declare class BotHelper {
-    private logger;
-    private jsonUtil;
-    private databaseServer;
-    private randomUtil;
-    private configServer;
-    private botConfig;
-    constructor(logger: ILogger, jsonUtil: JsonUtil, databaseServer: DatabaseServer, randomUtil: RandomUtil, configServer: ConfigServer);
-    getBotDifficultySettings(type: string, difficulty: string): Difficulty;
-    getPmcDifficultySettings(type: string, difficulty: string): Difficulty;
-    randomisePmcHostility(difficultySettings: Difficulty): void;
-    isBotPmc(botRole: string): boolean;
-    isBotBoss(botRole: string): boolean;
-    isBotFollower(botRole: string): boolean;
-    addBotToFriendlyList(difficultySettings: Difficulty, typeToAdd: string): void;
-}
--- a/1.1.0/types/helpers/DurabilityLimitsHelper.d.ts
+++ b/1.1.0/types/helpers/DurabilityLimitsHelper.d.ts
@ -1,25 +0,0 @@
-import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem";
-import { ConfigServer } from "../servers/ConfigServer";
-import { RandomUtil } from "../utils/RandomUtil";
-import { BotHelper } from "./BotHelper";
-export declare class DurabilityLimitsHelper {
-    private randomUtil;
-    private botHelper;
-    private configServer;
-    private botConfig;
-    constructor(randomUtil: RandomUtil, botHelper: BotHelper, configServer: ConfigServer);
-    getRandomisedMaxWeaponDurability(itemTemplate: ITemplateItem, botRole: string): number;
-    getRandomisedMaxArmorDurability(itemTemplate: ITemplateItem, botRole: string): number;
-    getRandomisedWeaponDurability(itemTemplate: ITemplateItem, botRole: string, maxDurability: number): number;
-    getRandomisedArmorDurability(itemTemplate: ITemplateItem, botRole: string, maxDurability: number): number;
-    private generateMaxWeaponDurability;
-    private generateMaxPmcArmorDurability;
-    private getLowestMaxWeaponFromConfig;
-    private getHighestMaxWeaponDurabilityFromConfig;
-    private generateWeaponDurability;
-    private generateArmorDurability;
-    private getMinWeaponDeltaFromConfig;
-    private getMaxWeaponDeltaFromConfig;
-    private getMinArmorDeltaFromConfig;
-    private getMaxArmorDeltaFromConfig;
-}
--- a/1.1.0/types/helpers/ExtendedProfileHelper.d.ts
+++ b/1.1.0/types/helpers/ExtendedProfileHelper.d.ts
@ -1,22 +0,0 @@
-import { BotGenerator } from "../generators/BotGenerator";
-import { IPmcData } from "../models/eft/common/IPmcData";
-import { DatabaseServer } from "../servers/DatabaseServer";
-import { SaveServer } from "../servers/SaveServer";
-import { FenceService } from "../services/FenceService";
-import { JsonUtil } from "../utils/JsonUtil";
-import { TimeUtil } from "../utils/TimeUtil";
-import { Watermark } from "../utils/Watermark";
-import { ItemHelper } from "./ItemHelper";
-import { ProfileHelper } from "./ProfileHelper";
-export declare class ExtendedProfileHelper extends ProfileHelper {
-    private botGenerator;
-    constructor(jsonUtil: JsonUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, fenceService: FenceService, botGenerator: BotGenerator);
-    generatePlayerScav(sessionID: string): IPmcData;
-    private getScavSkills;
-    private removeSecureContainer;
-    private getDefaultScavSkills;
-    private getScavStats;
-    private getScavLevel;
-    private getScavExperience;
-    private setScavCooldownTimer;
-}
--- a/1.1.0/types/helpers/HealthHelper.d.ts
+++ b/1.1.0/types/helpers/HealthHelper.d.ts
@ -1,23 +0,0 @@
-import { IPmcData } from "../models/eft/common/IPmcData";
-import { ISyncHealthRequestData } from "../models/eft/health/ISyncHealthRequestData";
-import { IAkiProfile } from "../models/eft/profile/IAkiProfile";
-import { ILogger } from "../models/spt/utils/ILogger";
-import { ConfigServer } from "../servers/ConfigServer";
-import { SaveServer } from "../servers/SaveServer";
-import { JsonUtil } from "../utils/JsonUtil";
-import { TimeUtil } from "../utils/TimeUtil";
-export declare class HealthHelper {
-    private jsonUtil;
-    private logger;
-    private timeUtil;
-    private saveServer;
-    private configServer;
-    private healthConfig;
-    constructor(jsonUtil: JsonUtil, logger: ILogger, timeUtil: TimeUtil, saveServer: SaveServer, configServer: ConfigServer);
-    resetVitality(sessionID: string): IAkiProfile;
-    saveVitality(pmcData: IPmcData, info: ISyncHealthRequestData, sessionID: string): void;
-    private saveHealth;
-    private saveEffects;
-    private addEffect;
-    private isEmpty;
-}
--- a/1.1.0/types/helpers/HttpServerHelper.d.ts
+++ b/1.1.0/types/helpers/HttpServerHelper.d.ts
@ -1,12 +0,0 @@
-import { ConfigServer } from "../servers/ConfigServer";
-export declare class HttpServerHelper {
-    private configServer;
-    private httpConfig;
-    private mime;
-    constructor(configServer: ConfigServer);
-    getMimeText(key: string): string;
-    buildUrl(): string;
-    getBackendUrl(): string;
-    getWebsocketUrl(): string;
-    sendTextJson(resp: any, output: any): void;
-}
--- a/1.1.0/types/helpers/RagfairSortHelper.d.ts
+++ b/1.1.0/types/helpers/RagfairSortHelper.d.ts
@ -1,12 +0,0 @@
-import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer";
-import { DatabaseServer } from "../servers/DatabaseServer";
-export declare class RagfairSortHelper {
-    private databaseServer;
-    constructor(databaseServer: DatabaseServer);
-    sortOffers(offers: IRagfairOffer[], type: number, direction?: number): IRagfairOffer[];
-    private sortOffersByID;
-    private sortOffersByRating;
-    private sortOffersByName;
-    private sortOffersByPrice;
-    private sortOffersByExpiry;
-}
--- a/1.1.0/types/helpers/RepairHelper.d.ts
+++ b/1.1.0/types/helpers/RepairHelper.d.ts
@ -1,20 +0,0 @@
-import { IPmcData } from "../models/eft/common/IPmcData";
-import { Item } from "../models/eft/common/tables/IItem";
-import { ILogger } from "../models/spt/utils/ILogger";
-import { ConfigServer } from "../servers/ConfigServer";
-import { DatabaseServer } from "../servers/DatabaseServer";
-import { JsonUtil } from "../utils/JsonUtil";
-import { RandomUtil } from "../utils/RandomUtil";
-export declare class RepairHelper {
-    private logger;
-    private jsonUtil;
-    private randomUtil;
-    private databaseServer;
-    private configServer;
-    private repairConfig;
-    constructor(logger: ILogger, jsonUtil: JsonUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer);
-    updateItemDurability(itemToRepairId: string, amountToRepair: number, pmcData: IPmcData, useRepairKit?: boolean): Item;
-    private getRandomisedArmorRepairDegredationValue;
-    private getRandomisedWeaponRepairDegredationValue;
-    isWeaponTemplate(tpl: string): boolean;
-}
--- a/1.1.0/types/helpers/TraderAssortHelper.d.ts
+++ b/1.1.0/types/helpers/TraderAssortHelper.d.ts
@ -1,23 +0,0 @@
-import { ITraderAssort } from "../models/eft/common/tables/ITrader";
-import { ILogger } from "../models/spt/utils/ILogger";
-import { RagfairAssortGenerator } from "../generators/RagfairAssortGenerator";
-import { RagfairOfferGenerator } from "../generators/RagfairOfferGenerator";
-import { DatabaseServer } from "../servers/DatabaseServer";
-import { FenceService } from "../services/FenceService";
-import { TraderAssortService } from "../services/TraderAssortService";
-import { JsonUtil } from "../utils/JsonUtil";
-import { AssortHelper } from "./AssortHelper";
-import { ProfileHelper } from "./ProfileHelper";
-export declare class TraderAssortHelper {
-    private logger;
-    private jsonUtil;
-    private databaseServer;
-    private profileHelper;
-    private assortHelper;
-    private ragfairAssortGenerator;
-    private ragfairOfferGenerator;
-    private traderAssortService;
-    private fenceService;
-    constructor(logger: ILogger, jsonUtil: JsonUtil, databaseServer: DatabaseServer, profileHelper: ProfileHelper, assortHelper: AssortHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, fenceService: FenceService);
-    getAssort(sessionId: string, traderId: string): ITraderAssort;
-}
--- a/1.1.0/types/helpers/TraderHelper.d.ts
+++ b/1.1.0/types/helpers/TraderHelper.d.ts
@ -1,35 +0,0 @@
-import { IPmcData } from "../models/eft/common/IPmcData";
-import { IBarterScheme, ITraderAssort, ITraderBase, LoyaltyLevel } from "../models/eft/common/tables/ITrader";
-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 { PlayerService } from "../services/PlayerService";
-import { HandbookHelper } from "./HandbookHelper";
-import { ItemHelper } from "./ItemHelper";
-import { PaymentHelper } from "./PaymentHelper";
-import { ProfileHelper } from "./ProfileHelper";
-export declare class TraderHelper {
-    private logger;
-    private databaseServer;
-    private saveServer;
-    private profileHelper;
-    private paymentHelper;
-    private itemHelper;
-    private handbookHelper;
-    private playerService;
-    private fenceService;
-    private configServer;
-    private traderConfig;
-    constructor(logger: ILogger, databaseServer: DatabaseServer, saveServer: SaveServer, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, itemHelper: ItemHelper, handbookHelper: HandbookHelper, playerService: PlayerService, fenceService: FenceService, configServer: ConfigServer);
-    getTrader(traderID: string, sessionID: string): ITraderBase;
-    getTraderAssortsById(traderId: string): ITraderAssort;
-    resetTrader(sessionID: string, traderID: string): void;
-    changeTraderDisplay(traderID: string, status: boolean, sessionID: string): void;
-    getPurchasesData(traderID: string, sessionID: string): Record<string, IBarterScheme[][]>;
-    lvlUp(traderID: string, sessionID: string): void;
-    getTraderUpdateSeconds(traderId: string): number;
-    traderFilter(traderFilters: string[], tplToCheck: string): boolean;
-    getLoyaltyLevel(traderID: string, pmcData: IPmcData): LoyaltyLevel;
-}
--- a/1.1.0/types/loaders/InitialModLoader.d.ts
+++ b/1.1.0/types/loaders/InitialModLoader.d.ts
@ -1,58 +0,0 @@
-import { DependencyContainer } from "tsyringe";
-import { IModLoader } from "../models/spt/mod/IModLoader";
-import { ILogger } from "../models/spt/utils/ILogger";
-import { ConfigServer } from "../servers/ConfigServer";
-import { ModCompilerService } from "../services/ModCompilerService";
-import { JsonUtil } from "../utils/JsonUtil";
-import { VFS } from "../utils/VFS";
-import { BundleLoader } from "./BundleLoader";
-export declare class InitialModLoader implements IModLoader {
-    private logger;
-    private vfs;
-    private jsonUtil;
-    private modCompilerService;
-    private bundleLoader;
-    private configServer;
-    private static container;
-    private readonly basepath;
-    private imported;
-    private onLoad;
-    private akiConfig;
-    constructor(logger: ILogger, vfs: VFS, jsonUtil: JsonUtil, modCompilerService: ModCompilerService, bundleLoader: BundleLoader, configServer: ConfigServer);
-    load(container: DependencyContainer): Promise<void>;
-    getBundles(local: boolean): string;
-    getBundle(key: string, local: boolean): void;
-    getImportedModsNames(): string[];
-    getModPath(mod: string): string;
-    private importClass;
-    private importMods;
-    /**
-     *
-     * @param mods Get an array of broken/invalid mods by name
-     * @returns Mod names array
-     */
-    private getBrokenMods;
-    /**
-     * Get packageJson data for mods
-     * @param mods mods to get packageJson for
-     * @returns dictionary <modName - package.json>
-     */
-    private getModsPackageData;
-    /**
-     * Does mod have "delayedLoad(" string in its entry class
-     * @param modFolderName folder name
-     * @param modToValidate package.json details
-     * @returns boolean
-     */
-    private isModSpt300Compatible;
-    private isModCombatibleWithAki;
-    private executeMods;
-    private sortModsLoadOrder;
-    private addMod;
-    private areModDependenciesFulfilled;
-    private isModCompatible;
-    private validMod;
-    private getLoadOrderRecursive;
-    private getLoadOrder;
-    getContainer(): DependencyContainer;
-}
--- a/1.1.0/types/models/eft/common/tables/ITemplateItem.d.ts
+++ b/1.1.0/types/models/eft/common/tables/ITemplateItem.d.ts
@ -1,401 +0,0 @@
-export interface ITemplateItem {
-    _id: string;
-    _name: string;
-    _parent: string;
-    _type: string;
-    _props: Props;
-    _proto: string;
-}
-export interface Props {
-    Name: string;
-    ShortName: string;
-    Description: string;
-    Weight: number;
-    BackgroundColor: string;
-    Width: number;
-    Height: number;
-    StackMaxSize: number;
-    Rarity?: string;
-    SpawnChance?: number;
-    CreditsPrice?: number;
-    ItemSound: string;
-    Prefab: Prefab;
-    UsePrefab: Prefab;
-    StackObjectsCount: number;
-    NotShownInSlot: boolean;
-    ExaminedByDefault: boolean;
-    ExamineTime: number;
-    IsUndiscardable: boolean;
-    IsUnsaleable: boolean;
-    IsUnbuyable: boolean;
-    IsUngivable: boolean;
-    IsLockedafterEquip: boolean;
-    QuestItem: boolean;
-    LootExperience: number;
-    ExamineExperience: number;
-    HideEntrails: boolean;
-    RepairCost: number;
-    RepairSpeed: number;
-    ExtraSizeLeft: number;
-    ExtraSizeRight: number;
-    ExtraSizeUp: number;
-    ExtraSizeDown: number;
-    ExtraSizeForceAdd: boolean;
-    MergesWithChildren: boolean;
-    CanSellOnRagfair: boolean;
-    CanRequireOnRagfair: boolean;
-    ConflictingItems: string[];
-    DiscardLimit: number;
-    Unlootable: boolean;
-    UnlootableFromSlot: string;
-    UnlootableFromSide: string[];
-    AnimationVariantsNumber: number;
-    DiscardingBlock: boolean;
-    RagFairCommissionModifier: number;
-    IsAlwaysAvailableForInsurance: boolean;
-    Grids: Grid[];
-    Slots: Slot[];
-    CanPutIntoDuringTheRaid: boolean;
-    CantRemoveFromSlotsDuringRaid: string[];
-    weapClass: string;
-    weapUseType: string;
-    ammoCaliber: string;
-    Durability: number;
-    MaxDurability: number;
-    OperatingResource: number;
-    RepairComplexity: number;
-    durabSpawnMin: number;
-    durabSpawnMax: number;
-    isFastReload: boolean;
-    RecoilForceUp: number;
-    RecoilForceBack: number;
-    Convergence: number;
-    RecoilAngle: number;
-    weapFireType: string[];
-    RecolDispersion: number;
-    SingleFireRate: number;
-    CanQueueSecondShot: boolean;
-    bFirerate: number;
-    Ergonomics: number;
-    Velocity: number;
-    bEffDist: number;
-    bHearDist: number;
-    isChamberLoad: boolean;
-    chamberAmmoCount: number;
-    isBoltCatch: boolean;
-    defMagType: string;
-    defAmmo: string;
-    AdjustCollimatorsToTrajectory: boolean;
-    shotgunDispersion: number;
-    Chambers: Chamber[];
-    CameraRecoil: number;
-    CameraSnap: number;
-    ReloadMode: string;
-    CenterOfImpact: number;
-    AimPlane: number;
-    DeviationCurve: number;
-    DeviationMax: number;
-    Foldable: boolean;
-    Retractable: boolean;
-    TacticalReloadStiffnes: Xyz;
-    TacticalReloadFixation: number;
-    RecoilCenter: Xyz;
-    RotationCenter: Xyz;
-    RotationCenterNoStock: Xyz;
-    SizeReduceRight: number;
-    FoldedSlot: string;
-    CompactHandling: boolean;
-    SightingRange: number;
-    MinRepairDegradation: number;
-    MaxRepairDegradation: number;
-    MinRepairKitDegradation: number;
-    MaxRepairKitDegradation: number;
-    IronSightRange: number;
-    MustBoltBeOpennedForExternalReload: boolean;
-    MustBoltBeOpennedForInternalReload: boolean;
-    BoltAction: boolean;
-    HipAccuracyRestorationDelay: number;
-    HipAccuracyRestorationSpeed: number;
-    HipInnaccuracyGain: number;
-    ManualBoltCatch: boolean;
-    BurstShotsCount: number;
-    BaseMalfunctionChance: number;
-    AllowJam: boolean;
-    AllowFeed: boolean;
-    AllowMisfire: boolean;
-    AllowSlide: boolean;
-    DurabilityBurnRatio: number;
-    HeatFactorGun: number;
-    CoolFactorGun: number;
-    CoolFactorGunMods: number;
-    HeatFactorByShot: number;
-    AllowOverheat: boolean;
-    DoubleActionAccuracyPenalty: number;
-    RecoilPosZMult: number;
-    ShotgunDispersion: number;
-    StackMinRandom: number;
-    StackMaxRandom: number;
-    StackSlots: StackSlot[];
-    SearchSound: string;
-    BlocksArmorVest: boolean;
-    RigLayoutName: string;
-    armorZone: string[];
-    armorClass: number;
-    speedPenaltyPercent: number;
-    mousePenalty: number;
-    weaponErgonomicPenalty: number;
-    BluntThroughput: number;
-    ArmorMaterial: string;
-    medUseTime: number;
-    medEffectType: string;
-    MaxHpResource: number;
-    hpResourceRate: number;
-    StimulatorBuffs: string;
-    effects_health: EffectsHealth;
-    effects_damage: EffectsDamage;
-    knifeHitDelay: number;
-    knifeHitSlashRate: number;
-    knifeHitStabRate: number;
-    knifeHitRadius: number;
-    knifeHitSlashDam: number;
-    knifeHitStabDam: number;
-    knifeDurab: number;
-    PrimaryDistance: number;
-    SecondryDistance: number;
-    SlashPenetration: number;
-    StabPenetration: number;
-    PrimaryConsumption: number;
-    SecondryConsumption: number;
-    DeflectionConsumption: number;
-    MaxResource: number;
-    AppliedTrunkRotation: Xyz;
-    AppliedHeadRotation: Xyz;
-    DisplayOnModel: boolean;
-    AdditionalAnimationLayer: number;
-    StaminaBurnRate: number;
-    ColliderScaleMultiplier: Xyz;
-    ammoType: string;
-    InitialSpeed: number;
-    BallisticCoeficient: number;
-    BulletMassGram: number;
-    BulletDiameterMilimeters: number;
-    Damage: number;
-    ammoAccr: number;
-    ammoRec: number;
-    ammoDist: number;
-    buckshotBullets: number;
-    PenetrationPower: number;
-    PenetrationPowerDiviation: number;
-    ammoHear: number;
-    ammoSfx: string;
-    MisfireChance: number;
-    MinFragmentsCount: number;
-    MaxFragmentsCount: number;
-    ammoShiftChance: number;
-    casingName: string;
-    casingEjectPower: number;
-    casingMass: number;
-    casingSounds: string;
-    ProjectileCount: number;
-    PenetrationChance: number;
-    RicochetChance: number;
-    FragmentationChance: number;
-    Deterioration: number;
-    SpeedRetardation: number;
-    Tracer: boolean;
-    TracerColor: string;
-    TracerDistance: number;
-    ArmorDamage: number;
-    Caliber: string;
-    StaminaBurnPerDamage: number;
-    HeavyBleedingDelta: number;
-    LightBleedingDelta: number;
-    ShowBullet: boolean;
-    HasGrenaderComponent: boolean;
-    FuzeArmTimeSec: number;
-    ExplosionStrength: number;
-    MinExplosionDistance: number;
-    MaxExplosionDistance: number;
-    FragmentsCount: number;
-    FragmentType: string;
-    ShowHitEffectOnExplode: boolean;
-    ExplosionType: string;
-    AmmoLifeTimeSec: number;
-    Contusion: Contusion;
-    ArmorDistanceDistanceDamage: Xyz;
-    Blindness: Xyz;
-    IsLightAndSoundShot: boolean;
-    LightAndSoundShotAngle: number;
-    LightAndSoundShotSelfContusionTime: number;
-    LightAndSoundShotSelfContusionStrength: number;
-    MalfMisfireChance: number;
-    DurabilityBurnModificator: number;
-    HeatFactor: number;
-    MalfFeedChance: number;
-    Accuracy: number;
-    Recoil: number;
-    Loudness: number;
-    EffectiveDistance: number;
-    RaidModdable: boolean;
-    ToolModdable: boolean;
-    BlocksFolding: boolean;
-    BlocksCollapsible: boolean;
-    IsAnimated: boolean;
-    HasShoulderContact: boolean;
-    DoubleActionAccuracyPenaltyMult: number;
-    magAnimationIndex: number;
-    Cartridges: Cartridge[];
-    CanFast: boolean;
-    CanHit: boolean;
-    CanAdmin: boolean;
-    LoadUnloadModifier: number;
-    CheckTimeModifier: number;
-    CheckOverride: number;
-    ReloadMagType: string;
-    VisibleAmmoRangesString: string;
-    MalfunctionChance: number;
-    TagColor: number;
-    TagName: string;
-    MaximumNumberOfUsage: number;
-    CustomAimPlane: string;
-    sightModType: string;
-    aimingSensitivity: number;
-    SightModesCount: number;
-    OpticCalibrationDistances: number[];
-    ScopesCount: number;
-    AimSensitivity: number[][];
-    ModesCount: number[];
-    Zooms: number[][];
-    CalibrationDistances: number[][];
-    Intensity: number;
-    Mask: string;
-    MaskSize: number;
-    NoiseIntensity: number;
-    NoiseScale: number;
-    Color: Color;
-    DiffuseIntensity: number;
-    HasHinge: boolean;
-    Resource?: number;
-    CoolFactor?: number;
-    foodUseTime?: number;
-    foodEffectType?: string;
-    MaxRepairResource: number;
-    RepairQuality: number;
-    RepairType: string;
-    TargetItemFilter: string[];
-    apResource: number;
-    krResource: number;
-}
-export interface Prefab {
-    path: string;
-    rcid: string;
-}
-export interface Grid {
-    _name: string;
-    _id: string;
-    _parent: string;
-    _props: GridProps;
-    _proto: string;
-}
-export interface GridProps {
-    filters: GridFilter[];
-    cellsH: number;
-    cellsV: number;
-    minCount: number;
-    maxCount: number;
-    maxWeight: number;
-    isSortingTable: boolean;
-}
-export interface GridFilter {
-    Filter: string[];
-    ExcludedFilter: string[];
-}
-export interface Slot {
-    _name: string;
-    _id: string;
-    _parent: string;
-    _props: SlotProps;
-    _required: boolean;
-    _mergeSlotWithChildren: boolean;
-    _proto: string;
-}
-export interface SlotProps {
-    filters: Filter[];
-}
-export interface Chamber {
-    _name: string;
-    _id: string;
-    _parent: string;
-    _props: ChamberProps;
-    _required: boolean;
-    _mergeSlotWithChildren: boolean;
-    _proto: string;
-}
-export interface ChamberProps {
-    filters: FilterProps[];
-}
-export interface FilterProps {
-    Filter: string[];
-}
-export interface Xyz {
-    x: number;
-    y: number;
-    z: number;
-}
-export interface StackSlot {
-    _name?: string;
-    _id: string;
-    _sptTpl: string;
-    parent: string;
-    location: any;
-    slotId: string;
-    _max_count: number;
-    _props?: StackSlotProps;
-    _proto?: string;
-    upd: any;
-}
-export interface StackSlotProps {
-    filters: Filter[];
-}
-export interface EffectsHealth {
-    Hydration: Hydration;
-}
-export interface Hydration {
-    value: number;
-}
-export interface EffectsDamage {
-    Pain: Pain;
-    Contusion: Contusion;
-}
-export interface Pain {
-    delay: number;
-    duration: number;
-    fadeOut: number;
-}
-export interface Contusion {
-    delay: number;
-    duration: number;
-    fadeOut: number;
-}
-export interface Cartridge {
-    _name: string;
-    _id: string;
-    _parent: string;
-    _max_count: number;
-    _props: CartridgeProps;
-    _proto: string;
-}
-export interface CartridgeProps {
-    filters: Filter[];
-}
-export interface Filter {
-    Shift?: number;
-    Filter: string[];
-    AnimationIndex?: number;
-}
-export interface Color {
-    r: number;
-    g: number;
-    b: number;
-    a: number;
-}
--- a/Live/CWX_BushWhacker/CWX-BushWhacker
+++ b/Live/CWX_BushWhacker/CWX-BushWhacker
@ -1,11 +0,0 @@
-/// <reference types="node" />
-import { IncomingMessage } from "http";
-import { DynamicRouter, StaticRouter } from "../di/Router";
-export declare class HttpRouter {
-    private staticRouters;
-    private dynamicRoutes;
-    constructor(staticRouters: StaticRouter[], dynamicRoutes: DynamicRouter[]);
-    private groupBy;
-    getResponse(req: IncomingMessage, info: any, sessionID: string): string;
-    private handleRoute;
-}
--- a/1.1.0/types/services/MatchLocationService.d.ts
+++ b/1.1.0/types/services/MatchLocationService.d.ts
@ -1,8 +0,0 @@
-import { TimeUtil } from "../utils/TimeUtil";
-export declare class MatchLocationService {
-    private timeUtil;
-    private locations;
-    constructor(timeUtil: TimeUtil);
-    createGroup(sessionID: string, info: any): any;
-    deleteGroup(info: any): void;
-}
--- a/1.1.0/types/services/ModCompilerService.d.ts
+++ b/1.1.0/types/services/ModCompilerService.d.ts
@ -1,15 +0,0 @@
-import { ILogger } from "../models/spt/utils/ILogger";
-import { VFS } from "../utils/VFS";
-import { HashCacheService } from "./HashCacheService";
-export declare class ModCompilerService {
-    private logger;
-    private hashCacheService;
-    private vfs;
-    constructor(logger: ILogger, hashCacheService: HashCacheService, vfs: VFS);
-    compileMod(modName: string, modPath: string, modTypeScriptFiles: string[]): Promise<void>;
-    private compile;
-    private buildDepth;
-    private calculateDepth;
-    private areFilesReady;
-    private delay;
-}
--- a/1.1.0/types/services/RagfairCategoriesService.d.ts
+++ b/1.1.0/types/services/RagfairCategoriesService.d.ts
@ -1,10 +0,0 @@
-import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer";
-export declare class RagfairCategoriesService {
-    updateCategories(offers: IRagfairOffer[]): void;
-    private categories;
-    getCategories(): Record<string, number>;
-    getCategoryByItemId(itemId: string): number;
-    resetCategories(): void;
-    setCategoryValue(itemId: string, newValue: number): void;
-    incrementCategory(itemId: string): void;
-}
--- a/1.1.0/types/services/RagfairLinkedItemService.d.ts
+++ b/1.1.0/types/services/RagfairLinkedItemService.d.ts
@ -1,9 +0,0 @@
-import { DatabaseServer } from "../servers/DatabaseServer";
-export declare class RagfairLinkedItemService {
-    private databaseServer;
-    private linkedItemsCache;
-    constructor(databaseServer: DatabaseServer);
-    getLinkedItems(linkedSearchId: string): Iterable<string>;
-    private buildLinkedItemTable;
-    private getFilters;
-}
--- a/1.1.0/types/services/RagfairPriceService.d.ts
+++ b/1.1.0/types/services/RagfairPriceService.d.ts
@ -1,30 +0,0 @@
-import { HandbookHelper } from "../helpers/HandbookHelper";
-import { ItemHelper } from "../helpers/ItemHelper";
-import { PresetHelper } from "../helpers/PresetHelper";
-import { Item } from "../models/eft/common/tables/IItem";
-import { IBarterScheme } from "../models/eft/common/tables/ITrader";
-import { ILogger } from "../models/spt/utils/ILogger";
-import { ConfigServer } from "../servers/ConfigServer";
-import { DatabaseServer } from "../servers/DatabaseServer";
-import { RandomUtil } from "../utils/RandomUtil";
-export declare class RagfairPriceService {
-    private handbookHelper;
-    private databaseServer;
-    private logger;
-    private itemHelper;
-    private presetHelper;
-    private randomUtil;
-    private configServer;
-    private ragfairConfig;
-    private prices;
-    constructor(handbookHelper: HandbookHelper, databaseServer: DatabaseServer, logger: ILogger, itemHelper: ItemHelper, presetHelper: PresetHelper, randomUtil: RandomUtil, configServer: ConfigServer);
-    generateStaticPrices(): void;
-    generateDynamicPrices(): void;
-    hasDynamicPrices(): boolean;
-    getDynamicPrice(itemTpl: string): number;
-    getAllFleaPrices(): Record<string, number>;
-    getFleaPriceForItem(tplId: string): number;
-    getBarterPrice(barterScheme: IBarterScheme[]): number;
-    getDynamicOfferPrice(items: Item[], desiredCurrency: string): number;
-    getWeaponPresetPrice(item: Item, items: Item[], existingPrice: number): number;
-}
--- a/Live/CWX_BushWhacker/CWX-BushWhacker
+++ b/Live/CWX_BushWhacker/CWX-BushWhacker
@ -1,25 +0,0 @@
-/// <reference types="node" />
-import { Daum } from "../models/eft/itemEvent/IItemEventRouterRequest";
-import { ILogger } from "../models/spt/utils/ILogger";
-import { IAsyncQueue } from "../models/spt/utils/IAsyncQueue";
-import { IUUidGenerator } from "../models/spt/utils/IUuidGenerator";
-import fs from "fs";
-export declare class WinstonLogger implements ILogger {
-    private asyncQueue;
-    private uuidGenerator;
-    private showDebugInConsole;
-    private folderPath;
-    private file;
-    private filePath;
-    private logLevels;
-    private logger;
-    writeFilePromisify: (path: fs.PathLike, data: string, options?: any) => Promise<void>;
-    constructor(asyncQueue: IAsyncQueue, uuidGenerator: IUUidGenerator);
-    writeToLogFile(data: string | Daum): Promise<void>;
-    log(data: string | Error | Record<string, unknown>, color: string): Promise<void>;
-    error(data: string | Record<string, unknown>): Promise<void>;
-    warning(data: string | Record<string, unknown>): Promise<void>;
-    success(data: string | Record<string, unknown>): Promise<void>;
-    info(data: string | Record<string, unknown>): Promise<void>;
-    debug(data: string | Record<string, unknown>, onlyShowInConsole?: boolean): Promise<void>;
-}
--- a/Live/CWX_BushWhacker/CWX-BushWhacker
+++ b/Live/CWX_BushWhacker/CWX-BushWhacker
@ -1,29 +0,0 @@
-import { ILogger } from "../models/spt/utils/ILogger";
-import { ConfigServer } from "../servers/ConfigServer";
-export declare class WatermarkLocale {
-    private locales;
-    getLocale(): string;
-    getDescription(): string[];
-    getWarning(): string[];
-    getModding(): string[];
-}
-export declare class Watermark {
-    private logger;
-    private configServer;
-    private watermarkLocale?;
-    private akiConfig;
-    constructor(logger: ILogger, configServer: ConfigServer, watermarkLocale?: WatermarkLocale);
-    private text;
-    private versionLabel;
-    initialize(): void;
-    getVersionTag(): string;
-    getVersionLabel(): string;
-    /** Set window title */
-    setTitle(): void;
-    /** Reset console cursor to top */
-    resetCursor(): void;
-    /** Draw the watermark */
-    draw(): void;
-    /** Caculate text length */
-    private textLength;
-}
--- a/1.2.0/bepInEx/plugins/CWX-BushWhacker.dll
+++ b/1.2.0/bepInEx/plugins/CWX-BushWhacker.dll
--- a/Live/CWX_BushWhacker/CWX-BushWhacker
+++ b/Live/CWX_BushWhacker/CWX-BushWhacker
--- a/Live/CWX_BushWhacker/CWX-BushWhacker
+++ b/Live/CWX_BushWhacker/CWX-BushWhacker
@ -1,10 +1,10 @@
 {
    "name": "BushWhacker",
    "author": "CWX",
-    "version": "1.1.0",
+    "version": "1.2.0",
    "license": "NCSA",
    "main": "src/mod.js",
-    "akiVersion": "3.0.0",
+    "akiVersion": "3.1.1",
    "scripts": {
        "setup:environment": "npm i",
        "build:unzipped": "copyfiles -e \"./node_modules/**/*.*\" -e \"./dist/**/*.*\" -e \"./package-lock.json\" -e \"./tsconfig.json\" -e \"./README.txt\" -e \"./mod.code-workspace\" ./**/*.* ./dist",
--- a/Live/CWX_BushWhacker/CWX-BushWhacker
+++ b/Live/CWX_BushWhacker/CWX-BushWhacker
@ -1,21 +1,18 @@
 import { DependencyContainer } from "tsyringe";
-import { IMod } from "@spt-aki/models/external/mod";
+import { IPreAkiLoadMod } from "@spt-aki/models/external/IPreAkiLoadMod";
 import { ILogger } from "@spt-aki/models/spt/utils/ILogger";

-class CWX_MasterKey implements IMod
+class CWX_MasterKey implements IPreAkiLoadMod
 {
    private pkg;

-    public load(container: DependencyContainer): void
+    public preAkiLoad(container: DependencyContainer): void
    { 
        // get the logger from the server container
        const logger = container.resolve<ILogger>("WinstonLogger");
 		this.pkg = require("../package.json")
        logger.info(`Loading: ${this.pkg.author}: ${this.pkg.name} - ${this.pkg.version}`);
    }
-
-    public delayedLoad(container: DependencyContainer): void
-    { return }
 }

 module.exports = { mod: new CWX_MasterKey() }
--- a/Live/CWX_BushWhacker/CWX-BushWhacker
+++ b/Live/CWX_BushWhacker/CWX-BushWhacker
--- a/Live/CWX_BushWhacker/CWX-BushWhacker
+++ b/Live/CWX_BushWhacker/CWX-BushWhacker
--- a/Live/CWX_BushWhacker/CWX-BushWhacker
+++ b/Live/CWX_BushWhacker/CWX-BushWhacker
--- a/1.2.0/types/callbacks/BotCallbacks.d.ts
+++ b/1.2.0/types/callbacks/BotCallbacks.d.ts
@ -5,8 +5,8 @@ import { IBotBase } from "../models/eft/common/tables/IBotBase";
 import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
 import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 export declare class BotCallbacks {
-    private botController;
-    private httpResponse;
+    protected botController: BotController;
+    protected httpResponse: HttpResponseUtil;
    constructor(botController: BotController, httpResponse: HttpResponseUtil);
    getBotLimit(url: string, info: IEmptyRequestData, sessionID: string): string;
    getBotDifficulty(url: string, info: IEmptyRequestData, sessionID: string): string;
--- a/1.2.0/types/callbacks/BundleCallbacks.d.ts
+++ b/1.2.0/types/callbacks/BundleCallbacks.d.ts
@ -1,15 +1,16 @@
 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 { HttpResponseUtil } from "../utils/HttpResponseUtil";
 export declare class BundleCallbacks {
-    private logger;
-    private httpResponse;
-    private httpServer;
-    private bundleLoader;
-    private configServer;
-    private httpConfig;
+    protected logger: ILogger;
+    protected httpResponse: HttpResponseUtil;
+    protected httpServer: IHttpServer;
+    protected bundleLoader: BundleLoader;
+    protected configServer: ConfigServer;
+    protected httpConfig: IHttpConfig;
    constructor(logger: ILogger, httpResponse: HttpResponseUtil, httpServer: IHttpServer, bundleLoader: BundleLoader, configServer: ConfigServer);
    sendBundle(sessionID: string, req: any, resp: any, body: any): any;
    getBundles(url: string, info: any, sessionID: string): string;
--- a/1.2.0/types/callbacks/CustomizationCallbacks.d.ts
+++ b/1.2.0/types/callbacks/CustomizationCallbacks.d.ts
@ -9,9 +9,9 @@ import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRout
 import { SaveServer } from "../servers/SaveServer";
 import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 export declare class CustomizationCallbacks {
-    private customizationController;
-    private saveServer;
-    private httpResponse;
+    protected customizationController: CustomizationController;
+    protected saveServer: SaveServer;
+    protected httpResponse: HttpResponseUtil;
    constructor(customizationController: CustomizationController, saveServer: SaveServer, httpResponse: HttpResponseUtil);
    getSuits(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<{
        _id: string;
--- a/1.2.0/types/callbacks/DataCallbacks.d.ts
+++ b/1.2.0/types/callbacks/DataCallbacks.d.ts
@ -12,8 +12,8 @@ import { ISettingsBase } from "../models/spt/server/ISettingsBase";
 import { DatabaseServer } from "../servers/DatabaseServer";
 import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 export declare class DataCallbacks {
-    private httpResponse;
-    private databaseServer;
+    protected httpResponse: HttpResponseUtil;
+    protected databaseServer: DatabaseServer;
    constructor(httpResponse: HttpResponseUtil, databaseServer: DatabaseServer);
    getSettings(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<ISettingsBase>;
    getGlobals(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IGlobals>;
--- a/1.2.0/types/callbacks/DialogueCallbacks.d.ts
+++ b/1.2.0/types/callbacks/DialogueCallbacks.d.ts
@ -21,10 +21,10 @@ import { HashUtil } from "../utils/HashUtil";
 import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 import { TimeUtil } from "../utils/TimeUtil";
 export declare class DialogueCallbacks extends OnUpdate {
-    private hashUtil;
-    private timeUtil;
-    private httpResponse;
-    private dialogueController;
+    protected hashUtil: HashUtil;
+    protected timeUtil: TimeUtil;
+    protected httpResponse: HttpResponseUtil;
+    protected dialogueController: DialogueController;
    constructor(hashUtil: HashUtil, timeUtil: TimeUtil, httpResponse: HttpResponseUtil, dialogueController: DialogueController);
    getFriendList(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IGetFriendListDataResponse>;
    getChatServerList(url: string, info: IGetChatServerListRequestData, sessionID: string): IGetBodyResponseData<any[]>;
--- a/1.2.0/types/callbacks/GameCallbacks.d.ts
+++ b/1.2.0/types/callbacks/GameCallbacks.d.ts
@ -2,15 +2,16 @@ import { GameController } from "../controllers/GameController";
 import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData";
 import { IGameConfigResponse } from "../models/eft/game/IGameConfigResponse";
 import { IGameEmptyCrcRequestData } from "../models/eft/game/IGameEmptyCrcRequestData";
+import { IReportNicknameRequestData } from "../models/eft/game/IReportNicknameRequestData";
 import { IVersionValidateRequestData } from "../models/eft/game/IVersionValidateRequestData";
 import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
 import { INullResponseData } from "../models/eft/httpResponse/INullResponseData";
 import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 import { Watermark } from "../utils/Watermark";
 declare class GameCallbacks {
-    private httpResponse;
-    private watermark;
-    private gameController;
+    protected httpResponse: HttpResponseUtil;
+    protected watermark: Watermark;
+    protected gameController: GameController;
    constructor(httpResponse: HttpResponseUtil, watermark: Watermark, gameController: GameController);
    versionValidate(url: string, info: IVersionValidateRequestData, sessionID: string): INullResponseData;
    gameStart(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<any>;
@ -20,5 +21,6 @@ declare class GameCallbacks {
    validateGameVersion(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<any>;
    gameKeepalive(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<any>;
    getVersion(url: string, info: IEmptyRequestData, sessionID: string): string;
+    reportNickname(url: string, info: IReportNicknameRequestData, sessionID: string): INullResponseData;
 }
 export { GameCallbacks };
--- a/1.2.0/types/callbacks/HandbookCallbacks.d.ts
+++ b/1.2.0/types/callbacks/HandbookCallbacks.d.ts
@ -1,7 +1,7 @@
 import { HandbookController } from "../controllers/HandbookController";
 import { OnLoad } from "../di/OnLoad";
 export declare class HandbookCallbacks extends OnLoad {
-    private handbookController;
+    protected handbookController: HandbookController;
    constructor(handbookController: HandbookController);
    onLoad(): void;
    getRoute(): string;
--- a/1.2.0/types/callbacks/HealthCallbacks.d.ts
+++ b/1.2.0/types/callbacks/HealthCallbacks.d.ts
@ -9,10 +9,17 @@ import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyRespons
 import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
 import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 export declare class HealthCallbacks {
-    private httpResponse;
-    private profileHelper;
-    private healthController;
+    protected httpResponse: HttpResponseUtil;
+    protected profileHelper: ProfileHelper;
+    protected healthController: HealthController;
    constructor(httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, healthController: HealthController);
+    /**
+     * Custom aki server request found in modules/HealthSynchronizer.cs
+     * @param url
+     * @param info HealthListener.Instance.CurrentHealth class
+     * @param sessionID session id
+     * @returns empty response, no data sent back to client
+     */
    syncHealth(url: string, info: ISyncHealthRequestData, sessionID: string): IGetBodyResponseData<string>;
    offraidEat(pmcData: IPmcData, body: IOffraidEatRequestData, sessionID: string): IItemEventRouterResponse;
    offraidHeal(pmcData: IPmcData, body: IOffraidHealRequestData, sessionID: string): IItemEventRouterResponse;
--- a/1.2.0/types/callbacks/HideoutCallbacks.d.ts
+++ b/1.2.0/types/callbacks/HideoutCallbacks.d.ts
@ -11,11 +11,12 @@ import { IHideoutToggleAreaRequestData } from "../models/eft/hideout/IHideoutTog
 import { IHideoutUpgradeCompleteRequestData } from "../models/eft/hideout/IHideoutUpgradeCompleteRequestData";
 import { IHideoutUpgradeRequestData } from "../models/eft/hideout/IHideoutUpgradeRequestData";
 import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
+import { IHideoutConfig } from "../models/spt/config/IHideoutConfig";
 import { ConfigServer } from "../servers/ConfigServer";
 export declare class HideoutCallbacks extends OnUpdate {
-    private hideoutController;
-    private configServer;
-    private hideoutConfig;
+    protected hideoutController: HideoutController;
+    protected configServer: ConfigServer;
+    protected hideoutConfig: IHideoutConfig;
    constructor(hideoutController: HideoutController, // TODO: delay needed
    configServer: ConfigServer);
    upgrade(pmcData: IPmcData, body: IHideoutUpgradeRequestData, sessionID: string): IItemEventRouterResponse;
--- a/1.2.0/types/callbacks/HttpCallbacks.d.ts
+++ b/1.2.0/types/callbacks/HttpCallbacks.d.ts
@ -1,7 +1,7 @@
 import { OnLoad } from "../di/OnLoad";
 import { IHttpServer } from "../models/spt/server/IHttpServer";
 export declare class HttpCallbacks extends OnLoad {
-    private httpServer;
+    protected httpServer: IHttpServer;
    constructor(httpServer: IHttpServer);
    onLoad(): void;
    getRoute(): string;
--- a/1.2.0/types/callbacks/InraidCallbacks.d.ts
+++ b/1.2.0/types/callbacks/InraidCallbacks.d.ts
@ -3,14 +3,16 @@ 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";
 export declare class InraidCallbacks {
-    private inraidController;
-    private httpResponse;
-    private configServer;
-    private airdropConfig;
-    private inraidConfig;
+    protected inraidController: InraidController;
+    protected httpResponse: HttpResponseUtil;
+    protected configServer: ConfigServer;
+    protected airdropConfig: IAirdropConfig;
+    protected inraidConfig: IInRaidConfig;
    constructor(inraidController: InraidController, httpResponse: HttpResponseUtil, configServer: ConfigServer);
    registerPlayer(url: string, info: IRegisterPlayerRequestData, sessionID: string): INullResponseData;
    saveProgress(url: string, info: ISaveProgressRequestData, sessionID: string): INullResponseData;
--- a/1.2.0/types/callbacks/InsuranceCallbacks.d.ts
+++ b/1.2.0/types/callbacks/InsuranceCallbacks.d.ts
@ -3,20 +3,22 @@ import { OnLoadOnUpdate } from "../di/OnLoadOnUpdate";
 import { IPmcData } from "../models/eft/common/IPmcData";
 import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
 import { IGetInsuranceCostRequestData } from "../models/eft/insurance/IGetInsuranceCostRequestData";
+import { IGetInsuranceCostResponseData } from "../models/eft/insurance/IGetInsuranceCostResponseData";
 import { IInsureRequestData } from "../models/eft/insurance/IInsureRequestData";
 import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
+import { IInsuranceConfig } from "../models/spt/config/IInsuranceConfig";
 import { ConfigServer } from "../servers/ConfigServer";
 import { InsuranceService } from "../services/InsuranceService";
 import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 export declare class InsuranceCallbacks extends OnLoadOnUpdate {
-    private insuranceController;
-    private insuranceService;
-    private httpResponse;
-    private configServer;
-    private insuranceConfig;
+    protected insuranceController: InsuranceController;
+    protected insuranceService: InsuranceService;
+    protected httpResponse: HttpResponseUtil;
+    protected configServer: ConfigServer;
+    protected insuranceConfig: IInsuranceConfig;
    constructor(insuranceController: InsuranceController, insuranceService: InsuranceService, httpResponse: HttpResponseUtil, configServer: ConfigServer);
    onLoad(): void;
-    getInsuranceCost(url: string, info: IGetInsuranceCostRequestData, sessionID: string): IGetBodyResponseData<any>;
+    getInsuranceCost(url: string, info: IGetInsuranceCostRequestData, sessionID: string): IGetBodyResponseData<IGetInsuranceCostResponseData>;
    insure(pmcData: IPmcData, body: IInsureRequestData, sessionID: string): IItemEventRouterResponse;
    onUpdate(secondsSinceLastRun: number): boolean;
    getRoute(): string;
--- a/1.2.0/types/callbacks/InventoryCallbacks.d.ts
+++ b/1.2.0/types/callbacks/InventoryCallbacks.d.ts
@ -18,7 +18,7 @@ import { IInventoryToggleRequestData } from "../models/eft/inventory/IInventoryT
 import { IInventoryTransferRequestData } from "../models/eft/inventory/IInventoryTransferRequestData";
 import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
 export declare class InventoryCallbacks {
-    private inventoryController;
+    protected inventoryController: InventoryController;
    constructor(inventoryController: InventoryController);
    moveItem(pmcData: IPmcData, body: IInventoryMoveRequestData, sessionID: string): IItemEventRouterResponse;
    removeItem(pmcData: IPmcData, body: IInventoryRemoveRequestData, sessionID: string): IItemEventRouterResponse;
--- a/1.2.0/types/callbacks/ItemEventCallbacks.d.ts
+++ b/1.2.0/types/callbacks/ItemEventCallbacks.d.ts
@ -4,8 +4,8 @@ import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRout
 import { ItemEventRouter } from "../routers/ItemEventRouter";
 import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 export declare class ItemEventCallbacks {
-    private httpResponse;
-    private itemEventRouter;
+    protected httpResponse: HttpResponseUtil;
+    protected itemEventRouter: ItemEventRouter;
    constructor(httpResponse: HttpResponseUtil, itemEventRouter: ItemEventRouter);
    handleEvents(url: string, info: IItemEventRouterRequest, sessionID: string): IGetBodyResponseData<IItemEventRouterResponse>;
 }
--- a/1.2.0/types/callbacks/LauncherCallbacks.d.ts
+++ b/1.2.0/types/callbacks/LauncherCallbacks.d.ts
@ -8,10 +8,10 @@ import { SaveServer } from "../servers/SaveServer";
 import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 import { Watermark } from "../utils/Watermark";
 declare class LauncherCallbacks {
-    private httpResponse;
-    private launcherController;
-    private saveServer;
-    private watermark;
+    protected httpResponse: HttpResponseUtil;
+    protected launcherController: LauncherController;
+    protected saveServer: SaveServer;
+    protected watermark: Watermark;
    constructor(httpResponse: HttpResponseUtil, launcherController: LauncherController, saveServer: SaveServer, watermark: Watermark);
    connect(): string;
    login(url: string, info: ILoginRequestData, sessionID: string): string;
--- a/1.2.0/types/callbacks/LocationCallbacks.d.ts
+++ b/1.2.0/types/callbacks/LocationCallbacks.d.ts
@ -6,8 +6,8 @@ import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyRespons
 import { IGetLocationRequestData } from "../models/eft/location/IGetLocationRequestData";
 import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 export declare class LocationCallbacks {
-    private httpResponse;
-    private locationController;
+    protected httpResponse: HttpResponseUtil;
+    protected locationController: LocationController;
    constructor(httpResponse: HttpResponseUtil, locationController: LocationController);
    getLocationData(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<ILocationsGenerateAllResponse>;
    getLocation(url: string, info: IGetLocationRequestData, sessionID: string): IGetBodyResponseData<ILocationBase>;
--- a/1.2.0/types/callbacks/MatchCallbacks.d.ts
+++ b/1.2.0/types/callbacks/MatchCallbacks.d.ts
@ -0,0 +1,42 @@
+import { MatchController } from "../controllers/MatchController";
+import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData";
+import { IPmcData } from "../models/eft/common/IPmcData";
+import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
+import { INullResponseData } from "../models/eft/httpResponse/INullResponseData";
+import { ICreateGroupRequestData } from "../models/eft/match/ICreateGroupRequestData";
+import { IEndOfflineRaidRequestData } from "../models/eft/match/IEndOfflineRaidRequestData";
+import { IGetGroupStatusRequestData } from "../models/eft/match/IGetGroupStatusRequestData";
+import { IGetProfileRequestData } from "../models/eft/match/IGetProfileRequestData";
+import { IJoinMatchRequestData } from "../models/eft/match/IJoinMatchRequestData";
+import { IJoinMatchResult } from "../models/eft/match/IJoinMatchResult";
+import { IPutMetricsRequestData } from "../models/eft/match/IPutMetricsRequestData";
+import { IStartOfflineRaidRequestData } from "../models/eft/match/IStartOffineRaidRequestData";
+import { IUpdatePingRequestData } from "../models/eft/match/IUpdatePingRequestData";
+import { DatabaseServer } from "../servers/DatabaseServer";
+import { HttpResponseUtil } from "../utils/HttpResponseUtil";
+import { JsonUtil } from "../utils/JsonUtil";
+export declare class MatchCallbacks {
+    protected httpResponse: HttpResponseUtil;
+    protected jsonUtil: JsonUtil;
+    protected matchController: MatchController;
+    protected databaseServer: DatabaseServer;
+    constructor(httpResponse: HttpResponseUtil, jsonUtil: JsonUtil, matchController: MatchController, databaseServer: DatabaseServer);
+    updatePing(url: string, info: IUpdatePingRequestData, sessionID: string): INullResponseData;
+    exitMatch(url: string, info: IEmptyRequestData, sessionID: string): INullResponseData;
+    exitToMenu(url: string, info: IEmptyRequestData, sessionID: string): INullResponseData;
+    startGroupSearch(url: string, info: IEmptyRequestData, sessionID: string): INullResponseData;
+    stopGroupSearch(url: string, info: IEmptyRequestData, sessionID: string): INullResponseData;
+    sendGroupInvite(url: string, info: any, sessionID: string): INullResponseData;
+    acceptGroupInvite(url: string, info: any, sessionID: string): INullResponseData;
+    cancelGroupInvite(url: string, info: any, sessionID: string): INullResponseData;
+    putMetrics(url: string, info: IPutMetricsRequestData, sessionID: string): INullResponseData;
+    getProfile(url: string, info: IGetProfileRequestData, sessionID: string): IGetBodyResponseData<IPmcData[]>;
+    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>;
+    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;
+    startOfflineRaid(url: string, info: IStartOfflineRaidRequestData, sessionID: string): INullResponseData;
+    endOfflineRaid(url: string, info: IEndOfflineRaidRequestData, sessionID: string): INullResponseData;
+}
--- a/1.2.0/types/callbacks/ModCallbacks.d.ts
+++ b/1.2.0/types/callbacks/ModCallbacks.d.ts
@ -1,17 +1,18 @@
 import { OnLoad } from "../di/OnLoad";
-import { DelayedModLoader } from "../loaders/DelayedModLoader";
+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 { HttpResponseUtil } from "../utils/HttpResponseUtil";
 declare class ModCallbacks extends OnLoad {
-    private logger;
-    private httpResponse;
-    private httpServer;
-    private modLoader;
-    private configServer;
-    private httpConfig;
-    constructor(logger: ILogger, httpResponse: HttpResponseUtil, httpServer: IHttpServer, modLoader: DelayedModLoader, configServer: ConfigServer);
+    protected logger: ILogger;
+    protected httpResponse: HttpResponseUtil;
+    protected httpServer: IHttpServer;
+    protected postAkiModLoader: PostAkiModLoader;
+    protected configServer: ConfigServer;
+    protected httpConfig: IHttpConfig;
+    constructor(logger: ILogger, httpResponse: HttpResponseUtil, httpServer: IHttpServer, postAkiModLoader: PostAkiModLoader, configServer: ConfigServer);
    onLoad(): void;
    getRoute(): string;
    sendBundle(sessionID: string, req: any, resp: any, body: any): void;
--- a/1.2.0/types/callbacks/NoteCallbacks.d.ts
+++ b/1.2.0/types/callbacks/NoteCallbacks.d.ts
@ -3,7 +3,7 @@ import { IPmcData } from "../models/eft/common/IPmcData";
 import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
 import { INoteActionData } from "../models/eft/notes/INoteActionData";
 export declare class NoteCallbacks {
-    private noteController;
+    protected noteController: NoteController;
    constructor(noteController: NoteController);
    addNote(pmcData: IPmcData, body: INoteActionData, sessionID: string): IItemEventRouterResponse;
    editNote(pmcData: IPmcData, body: INoteActionData, sessionID: string): IItemEventRouterResponse;
--- a/1.2.0/types/callbacks/NotifierCallbacks.d.ts
+++ b/1.2.0/types/callbacks/NotifierCallbacks.d.ts
@ -6,9 +6,9 @@ import { INotifierChannel } from "../models/eft/notifier/INotifier";
 import { ISelectProfileRequestData } from "../models/eft/notifier/ISelectProfileRequestData";
 import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 export declare class NotifierCallbacks {
-    private httpServerHelper;
-    private httpResponse;
-    private notifierController;
+    protected httpServerHelper: HttpServerHelper;
+    protected httpResponse: HttpResponseUtil;
+    protected notifierController: NotifierController;
    constructor(httpServerHelper: HttpServerHelper, httpResponse: HttpResponseUtil, notifierController: NotifierController);
    /**
     * If we don't have anything to send, it's ok to not send anything back
@ -16,7 +16,7 @@ export declare class NotifierCallbacks {
     * until we actually have something to send because otherwise we'd spam the client
     * and the client would abort the connection due to spam.
     */
-    sendNotification(sessionID: string, req: any, resp: any, data: any): void;
+    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>;
--- a/1.2.0/types/callbacks/PresetBuildCallbacks.d.ts
+++ b/1.2.0/types/callbacks/PresetBuildCallbacks.d.ts
@ -1,4 +1,5 @@
 import { PresetBuildController } from "../controllers/PresetBuildController";
+import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData";
 import { IPmcData } from "../models/eft/common/IPmcData";
 import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
 import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
@ -6,10 +7,10 @@ import { IPresetBuildActionRequestData } from "../models/eft/presetBuild/IPreset
 import { WeaponBuild } from "../models/eft/profile/IAkiProfile";
 import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 export declare class PresetBuildCallbacks {
-    private httpResponse;
-    private presetBuildController;
+    protected httpResponse: HttpResponseUtil;
+    protected presetBuildController: PresetBuildController;
    constructor(httpResponse: HttpResponseUtil, presetBuildController: PresetBuildController);
-    getHandbookUserlist(url: string, info: any, sessionID: string): IGetBodyResponseData<WeaponBuild[]>;
+    getHandbookUserlist(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<WeaponBuild[]>;
    saveBuild(pmcData: IPmcData, body: IPresetBuildActionRequestData, sessionID: string): IItemEventRouterResponse;
    removeBuild(pmcData: IPmcData, body: IPresetBuildActionRequestData, sessionID: string): IItemEventRouterResponse;
 }
--- a/1.2.0/types/callbacks/PresetCallbacks.d.ts
+++ b/1.2.0/types/callbacks/PresetCallbacks.d.ts
@ -1,7 +1,7 @@
 import { PresetController } from "../controllers/PresetController";
 import { OnLoad } from "../di/OnLoad";
 export declare class PresetCallbacks extends OnLoad {
-    private presetController;
+    protected presetController: PresetController;
    constructor(presetController: PresetController);
    onLoad(): void;
    getRoute(): string;
--- a/1.2.0/types/callbacks/ProfileCallbacks.d.ts
+++ b/1.2.0/types/callbacks/ProfileCallbacks.d.ts
@ -3,6 +3,7 @@ import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData";
 import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
 import { INullResponseData } from "../models/eft/httpResponse/INullResponseData";
 import { IGetMiniProfileRequestData } from "../models/eft/launcher/IGetMiniProfileRequestData";
+import { GetProfileStatusResponseData } from "../models/eft/profile/GetProfileStatusResponseData";
 import { IProfileChangeNicknameRequestData } from "../models/eft/profile/IProfileChangeNicknameRequestData";
 import { IProfileChangeVoiceRequestData } from "../models/eft/profile/IProfileChangeVoiceRequestData";
 import { IProfileCreateRequestData } from "../models/eft/profile/IProfileCreateRequestData";
@ -12,9 +13,9 @@ import { IValidateNicknameRequestData } from "../models/eft/profile/IValidateNic
 import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 import { TimeUtil } from "../utils/TimeUtil";
 export declare class ProfileCallbacks {
-    private httpResponse;
-    private timeUtil;
-    private profileController;
+    protected httpResponse: HttpResponseUtil;
+    protected timeUtil: TimeUtil;
+    protected profileController: ProfileController;
    constructor(httpResponse: HttpResponseUtil, timeUtil: TimeUtil, profileController: ProfileController);
    createProfile(url: string, info: IProfileCreateRequestData, sessionID: string): IGetBodyResponseData<any>;
    getProfileData(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<any>;
@ -23,7 +24,14 @@ export declare class ProfileCallbacks {
    changeNickname(url: string, info: IProfileChangeNicknameRequestData, sessionID: string): IGetBodyResponseData<any>;
    validateNickname(url: string, info: IValidateNicknameRequestData, sessionID: string): IGetBodyResponseData<any>;
    getReservedNickname(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<string>;
-    getProfileStatus(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<any>;
+    /**
+     * Called when creating a character, when you choose a character face/voice
+     * @param url
+     * @param info response (empty)
+     * @param sessionID
+     * @returns
+     */
+    getProfileStatus(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<GetProfileStatusResponseData>;
    searchFriend(url: string, info: ISearchFriendRequestData, sessionID: string): IGetBodyResponseData<ISearchFriendResponse[]>;
    getMiniProfile(url: string, info: IGetMiniProfileRequestData, sessionID: string): string;
    getAllMiniProfiles(url: string, info: any, sessionID: string): string;
--- a/1.2.0/types/callbacks/QuestCallbacks.d.ts
+++ b/1.2.0/types/callbacks/QuestCallbacks.d.ts
@ -13,9 +13,9 @@ import { IListQuestsRequestData } from "../models/eft/quests/IListQuestsRequestD
 import { IRepeatableQuestChangeRequest } from "../models/eft/quests/IRepeatableQuestChangeRequest";
 import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 export declare class QuestCallbacks {
-    private httpResponse;
-    private questController;
-    private repeatableQuestController;
+    protected httpResponse: HttpResponseUtil;
+    protected questController: QuestController;
+    protected repeatableQuestController: RepeatableQuestController;
    constructor(httpResponse: HttpResponseUtil, questController: QuestController, repeatableQuestController: RepeatableQuestController);
    changeRepeatableQuest(pmcData: IPmcData, body: IRepeatableQuestChangeRequest, sessionID: string): IItemEventRouterResponse;
    acceptQuest(pmcData: IPmcData, body: IAcceptQuestRequestData, sessionID: string): IItemEventRouterResponse;
--- a/1.2.0/types/callbacks/RagfairCallbacks.d.ts
+++ b/1.2.0/types/callbacks/RagfairCallbacks.d.ts
@ -3,34 +3,39 @@ import { OnLoadOnUpdate } from "../di/OnLoadOnUpdate";
 import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData";
 import { IPmcData } from "../models/eft/common/IPmcData";
 import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
+import { INullResponseData } from "../models/eft/httpResponse/INullResponseData";
 import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
 import { IAddOfferRequestData } from "../models/eft/ragfair/IAddOfferRequestData";
 import { IExtendOfferRequestData } from "../models/eft/ragfair/IExtendOfferRequestData";
 import { IGetItemPriceResult } from "../models/eft/ragfair/IGetItemPriceResult";
 import { IGetMarketPriceRequestData } from "../models/eft/ragfair/IGetMarketPriceRequestData";
+import { IGetOffersResult } from "../models/eft/ragfair/IGetOffersResult";
 import { IRemoveOfferRequestData } from "../models/eft/ragfair/IRemoveOfferRequestData";
 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";
 import { JsonUtil } from "../utils/JsonUtil";
 export declare class RagfairCallbacks extends OnLoadOnUpdate {
-    private httpResponse;
-    private logger;
-    private jsonUtil;
-    private ragfairServer;
-    private ragfairController;
-    private configServer;
-    private ragfairConfig;
+    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);
    onLoad(): void;
    getRoute(): string;
-    search(url: string, info: ISearchRequestData, sessionID: string): IGetBodyResponseData<any>;
+    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>;
    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;
+    sendReport(url: string, info: ISendRagfairReportRequestData, sessionID: string): INullResponseData;
 }
--- a/1.2.0/types/callbacks/RepairCallbacks.d.ts
+++ b/1.2.0/types/callbacks/RepairCallbacks.d.ts
@ -4,7 +4,7 @@ import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRout
 import { IRepairActionDataRequest } from "../models/eft/repair/IRepairActionDataRequest";
 import { ITraderRepairActionDataRequest } from "../models/eft/repair/ITraderRepairActionDataRequest";
 export declare class RepairCallbacks {
-    private repairController;
+    protected repairController: RepairController;
    constructor(repairController: RepairController);
    traderRepair(pmcData: IPmcData, body: ITraderRepairActionDataRequest, sessionID: string): IItemEventRouterResponse;
    repair(pmcData: IPmcData, body: IRepairActionDataRequest, sessionID: string): IItemEventRouterResponse;
--- a/1.2.0/types/callbacks/SaveCallbacks.d.ts
+++ b/1.2.0/types/callbacks/SaveCallbacks.d.ts
@ -1,7 +1,7 @@
 import { OnLoadOnUpdate } from "../di/OnLoadOnUpdate";
 import { SaveServer } from "../servers/SaveServer";
 export declare class SaveCallbacks extends OnLoadOnUpdate {
-    private saveServer;
+    protected saveServer: SaveServer;
    constructor(saveServer: SaveServer);
    onLoad(): void;
    getRoute(): string;
--- a/1.2.0/types/callbacks/TradeCallbacks.d.ts
+++ b/1.2.0/types/callbacks/TradeCallbacks.d.ts
@ -4,7 +4,7 @@ import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRout
 import { IProcessBaseTradeRequestData } from "../models/eft/trade/IProcessBaseTradeRequestData";
 import { IProcessRagfairTradeRequestData } from "../models/eft/trade/IProcessRagfairTradeRequestData";
 export declare class TradeCallbacks {
-    private tradeController;
+    protected tradeController: TradeController;
    constructor(tradeController: TradeController);
    processTrade(pmcData: IPmcData, body: IProcessBaseTradeRequestData, sessionID: string): IItemEventRouterResponse;
    processRagfairTrade(pmcData: IPmcData, body: IProcessRagfairTradeRequestData, sessionID: string): IItemEventRouterResponse;
--- a/1.2.0/types/callbacks/TraderCallbacks.d.ts
+++ b/1.2.0/types/callbacks/TraderCallbacks.d.ts
@ -5,8 +5,8 @@ import { IBarterScheme, ITraderAssort, ITraderBase } from "../models/eft/common/
 import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
 import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 export declare class TraderCallbacks extends OnLoadOnUpdate {
-    private httpResponse;
-    private traderController;
+    protected httpResponse: HttpResponseUtil;
+    protected traderController: TraderController;
    constructor(httpResponse: HttpResponseUtil, traderController: TraderController);
    onLoad(): void;
    getRoute(): string;
--- a/1.2.0/types/callbacks/WeatherCallbacks.d.ts
+++ b/1.2.0/types/callbacks/WeatherCallbacks.d.ts
@ -3,8 +3,8 @@ import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData";
 import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
 import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 export declare class WeatherCallbacks {
-    private httpResponse;
-    private weatherController;
+    protected httpResponse: HttpResponseUtil;
+    protected weatherController: WeatherController;
    constructor(httpResponse: HttpResponseUtil, weatherController: WeatherController);
    getWeather(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<any>;
 }
--- a/1.2.0/types/callbacks/WishlistCallbacks.d.ts
+++ b/1.2.0/types/callbacks/WishlistCallbacks.d.ts
@ -3,7 +3,7 @@ import { IPmcData } from "../models/eft/common/IPmcData";
 import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
 import { IWishlistActionData } from "../models/eft/wishlist/IWishlistActionData";
 export declare class WishlistCallbacks {
-    private wishlistController;
+    protected wishlistController: WishlistController;
    constructor(wishlistController: WishlistController);
    addToWishlist(pmcData: IPmcData, body: IWishlistActionData, sessionID: string): IItemEventRouterResponse;
    removeFromWishlist(pmcData: IPmcData, body: IWishlistActionData, sessionID: string): IItemEventRouterResponse;
--- a/1.2.0/types/controllers/BotController.d.ts
+++ b/1.2.0/types/controllers/BotController.d.ts
@ -0,0 +1,35 @@
+import { BotGenerator } from "../generators/BotGenerator";
+import { BotHelper } from "../helpers/BotHelper";
+import { IGenerateBotsRequestData } from "../models/eft/bot/IGenerateBotsRequestData";
+import { IBotBase } from "../models/eft/common/tables/IBotBase";
+import { IBotCore } from "../models/eft/common/tables/IBotCore";
+import { Difficulty } from "../models/eft/common/tables/IBotType";
+import { IBotConfig } from "../models/spt/config/IBotConfig";
+import { ConfigServer } from "../servers/ConfigServer";
+import { DatabaseServer } from "../servers/DatabaseServer";
+export declare class BotController {
+    protected databaseServer: DatabaseServer;
+    protected botGenerator: BotGenerator;
+    protected botHelper: BotHelper;
+    protected configServer: ConfigServer;
+    protected botConfig: IBotConfig;
+    constructor(databaseServer: DatabaseServer, botGenerator: BotGenerator, botHelper: BotHelper, configServer: ConfigServer);
+    /**
+     * Return the number of bot loadout varieties to be generated
+     * @param type bot Type we want the loadout gen count for
+     * @returns
+     */
+    getBotPresetGenerationLimit(type: string): number;
+    getBotCoreDifficulty(): IBotCore;
+    /**
+     * Get bot difficulty settings
+     * adjust PMC settings to ensure they engage the correct bot types
+     * @param type what bot the server is requesting settings for
+     * @param difficulty difficulty level server requested settings for
+     * @returns Difficulty object
+     */
+    getBotDifficulty(type: string, difficulty: string): Difficulty;
+    protected getPmcDifficultySettings(pmcType: "bear" | "usec", difficulty: string): Difficulty;
+    generate(info: IGenerateBotsRequestData, playerScav?: boolean): IBotBase[];
+    getBotCap(): number;
+}
--- a/1.2.0/types/controllers/CustomizationController.d.ts
+++ b/1.2.0/types/controllers/CustomizationController.d.ts
@ -9,14 +9,14 @@ import { ItemEventRouter } from "../routers/ItemEventRouter";
 import { DatabaseServer } from "../servers/DatabaseServer";
 import { SaveServer } from "../servers/SaveServer";
 export declare class CustomizationController {
-    private logger;
-    private itemEventRouter;
-    private databaseServer;
-    private saveServer;
-    private profileHelper;
+    protected logger: ILogger;
+    protected itemEventRouter: ItemEventRouter;
+    protected databaseServer: DatabaseServer;
+    protected saveServer: SaveServer;
+    protected profileHelper: ProfileHelper;
    constructor(logger: ILogger, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, saveServer: SaveServer, profileHelper: ProfileHelper);
    getTraderSuits(traderID: string, sessionID: string): ISuit[];
    wearClothing(pmcData: IPmcData, body: IWearClothingRequestData, sessionID: string): IItemEventRouterResponse;
    buyClothing(pmcData: IPmcData, body: IBuyClothingRequestData, sessionID: string): IItemEventRouterResponse;
-    private getAllTraderSuits;
+    protected getAllTraderSuits(sessionID: string): ISuit[];
 }
--- a/1.2.0/types/controllers/DialogueController.d.ts
+++ b/1.2.0/types/controllers/DialogueController.d.ts
@ -3,13 +3,13 @@ import { IGetAllAttachmentsResponse } from "../models/eft/dialog/IGetAllAttachme
 import { IGetFriendListDataResponse } from "../models/eft/dialog/IGetFriendListDataResponse";
 import { IGetMailDialogViewResponseData } from "../models/eft/dialog/IGetMailDialogViewResponseData";
 import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
-import { DialogueInfo } from "../models/eft/profile/IAkiProfile";
+import { DialogueInfo, Message } from "../models/eft/profile/IAkiProfile";
 import { SaveServer } from "../servers/SaveServer";
 import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 export declare class DialogueController {
-    private httpResponse;
-    private saveServer;
-    private dialogueHelper;
+    protected httpResponse: HttpResponseUtil;
+    protected saveServer: SaveServer;
+    protected dialogueHelper: DialogueHelper;
    constructor(httpResponse: HttpResponseUtil, saveServer: SaveServer, dialogueHelper: DialogueHelper);
    getFriendList(sessionID: string): IGetFriendListDataResponse;
    generateDialogueList(sessionID: string): IGetBodyResponseData<DialogueInfo[]>;
@ -19,7 +19,7 @@ export declare class DialogueController {
    setDialoguePin(dialogueID: string, shouldPin: boolean, sessionID: string): void;
    setRead(dialogueIDs: string[], sessionID: string): void;
    getAllAttachments(dialogueID: string, sessionID: string): IGetAllAttachmentsResponse;
-    private messagesHaveUncollectedRewards;
-    private removeExpiredItems;
+    protected messagesHaveUncollectedRewards(messages: Message[]): boolean;
+    protected removeExpiredItems(sessionID: string): void;
    update(): void;
 }
--- a/1.2.0/types/controllers/GameController.d.ts
+++ b/1.2.0/types/controllers/GameController.d.ts
@ -0,0 +1,28 @@
+import { HttpServerHelper } from "../helpers/HttpServerHelper";
+import { ProfileHelper } from "../helpers/ProfileHelper";
+import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData";
+import { IGameConfigResponse } from "../models/eft/game/IGameConfigResponse";
+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 { ProfileFixerService } from "../services/ProfileFixerService";
+import { Watermark } from "../utils/Watermark";
+export declare class GameController {
+    protected logger: ILogger;
+    protected watermark: Watermark;
+    protected httpServerHelper: HttpServerHelper;
+    protected localeService: LocaleService;
+    protected profileHelper: ProfileHelper;
+    protected profileFixerService: ProfileFixerService;
+    protected configServer: ConfigServer;
+    protected httpConfig: IHttpConfig;
+    protected coreConfig: ICoreConfig;
+    constructor(logger: ILogger, watermark: Watermark, httpServerHelper: HttpServerHelper, localeService: LocaleService, profileHelper: ProfileHelper, profileFixerService: ProfileFixerService, configServer: ConfigServer);
+    gameStart(_url: string, _info: IEmptyRequestData, sessionID: string): void;
+    protected logProfileDetails(fullProfile: IAkiProfile): void;
+    getGameConfig(sessionID: string): IGameConfigResponse;
+    getServer(): any[];
+}
--- a/1.2.0/types/controllers/HandbookController.d.ts
+++ b/1.2.0/types/controllers/HandbookController.d.ts
@ -1,8 +1,8 @@
 import { HandbookHelper } from "../helpers/HandbookHelper";
 import { DatabaseServer } from "../servers/DatabaseServer";
 export declare class HandbookController {
-    private databaseServer;
-    private handbookHelper;
+    protected databaseServer: DatabaseServer;
+    protected handbookHelper: HandbookHelper;
    constructor(databaseServer: DatabaseServer, handbookHelper: HandbookHelper);
    load(): void;
 }
--- a/1.2.0/types/controllers/HealthController.d.ts
+++ b/1.2.0/types/controllers/HealthController.d.ts
@ -11,15 +11,36 @@ import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRout
 import { ItemEventRouter } from "../routers/ItemEventRouter";
 import { ILogger } from "../models/spt/utils/ILogger";
 export declare class HealthController {
-    private logger;
-    private itemEventRouter;
-    private itemHelper;
-    private paymentService;
-    private inventoryHelper;
-    private healthHelper;
+    protected logger: ILogger;
+    protected itemEventRouter: ItemEventRouter;
+    protected itemHelper: ItemHelper;
+    protected paymentService: PaymentService;
+    protected inventoryHelper: InventoryHelper;
+    protected healthHelper: HealthHelper;
    constructor(logger: ILogger, itemEventRouter: ItemEventRouter, itemHelper: ItemHelper, paymentService: PaymentService, inventoryHelper: InventoryHelper, healthHelper: HealthHelper);
-    saveVitality(pmcData: IPmcData, info: ISyncHealthRequestData, sessionID: string): void;
+    /**
+     * stores in-raid player health
+     * @param pmcData Player profile
+     * @param info Request data
+     * @param sessionID
+     * @param addEffects Should effects found be added or removed from profile
+     */
+    saveVitality(pmcData: IPmcData, info: ISyncHealthRequestData, sessionID: string, addEffects?: boolean): void;
+    /**
+     * When healing in menu
+     * @param pmcData
+     * @param body
+     * @param sessionID
+     * @returns
+     */
    offraidHeal(pmcData: IPmcData, body: IOffraidHealRequestData, sessionID: string): IItemEventRouterResponse;
    offraidEat(pmcData: IPmcData, body: IOffraidEatRequestData, sessionID: string): IItemEventRouterResponse;
+    /**
+     * Occurs on post-raid healing page
+     * @param pmcData player profile
+     * @param info Request data from client
+     * @param sessionID Session id
+     * @returns
+     */
    healthTreatment(pmcData: IPmcData, info: IHealthTreatmentRequestData, sessionID: string): IItemEventRouterResponse;
 }
--- a/1.2.0/types/controllers/HideoutController.d.ts
+++ b/1.2.0/types/controllers/HideoutController.d.ts
@ -3,10 +3,12 @@ import { InventoryHelper } from "../helpers/InventoryHelper";
 import { PaymentHelper } from "../helpers/PaymentHelper";
 import { PresetHelper } from "../helpers/PresetHelper";
 import { ProfileHelper } from "../helpers/ProfileHelper";
-import { IPmcData } from "../models/eft/common/IPmcData";
+import { HideoutArea, IPmcData, Product } from "../models/eft/common/IPmcData";
 import { HideoutUpgradeCompleteRequestData } from "../models/eft/hideout/HideoutUpgradeCompleteRequestData";
 import { IHideoutContinousProductionStartRequestData } from "../models/eft/hideout/IHideoutContinousProductionStartRequestData";
+import { IHideoutProduction } from "../models/eft/hideout/IHideoutProduction";
 import { IHideoutPutItemInRequestData } from "../models/eft/hideout/IHideoutPutItemInRequestData";
+import { IHideoutScavCase } from "../models/eft/hideout/IHideoutScavCase";
 import { IHideoutScavCaseStartRequestData } from "../models/eft/hideout/IHideoutScavCaseStartRequestData";
 import { IHideoutSingleProductionStartRequestData } from "../models/eft/hideout/IHideoutSingleProductionStartRequestData";
 import { IHideoutTakeItemOutRequestData } from "../models/eft/hideout/IHideoutTakeItemOutRequestData";
@ -14,6 +16,7 @@ import { IHideoutTakeProductionRequestData } from "../models/eft/hideout/IHideou
 import { IHideoutToggleAreaRequestData } from "../models/eft/hideout/IHideoutToggleAreaRequestData";
 import { IHideoutUpgradeRequestData } from "../models/eft/hideout/IHideoutUpgradeRequestData";
 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 { ConfigServer } from "../servers/ConfigServer";
@ -25,32 +28,41 @@ import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 import { RandomUtil } from "../utils/RandomUtil";
 import { TimeUtil } from "../utils/TimeUtil";
 export declare class HideoutController {
-    private logger;
-    private hashUtil;
-    private timeUtil;
-    private databaseServer;
-    private randomUtil;
-    private inventoryHelper;
-    private saveServer;
-    private playerService;
-    private presetHelper;
-    private paymentHelper;
-    private itemEventRouter;
-    private httpResponse;
-    private profileHelper;
-    private hideoutHelper;
-    private configServer;
-    private hideoutConfig;
+    protected logger: ILogger;
+    protected hashUtil: HashUtil;
+    protected timeUtil: TimeUtil;
+    protected databaseServer: DatabaseServer;
+    protected randomUtil: RandomUtil;
+    protected inventoryHelper: InventoryHelper;
+    protected saveServer: SaveServer;
+    protected playerService: PlayerService;
+    protected presetHelper: PresetHelper;
+    protected paymentHelper: PaymentHelper;
+    protected itemEventRouter: ItemEventRouter;
+    protected httpResponse: HttpResponseUtil;
+    protected profileHelper: ProfileHelper;
+    protected hideoutHelper: HideoutHelper;
+    protected configServer: ConfigServer;
+    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, configServer: ConfigServer);
    upgrade(pmcData: IPmcData, body: IHideoutUpgradeRequestData, sessionID: string): IItemEventRouterResponse;
    upgradeComplete(pmcData: IPmcData, body: HideoutUpgradeCompleteRequestData, sessionID: string): IItemEventRouterResponse;
    putItemsInAreaSlots(pmcData: IPmcData, body: IHideoutPutItemInRequestData, sessionID: string): IItemEventRouterResponse;
    takeItemsFromAreaSlots(pmcData: IPmcData, body: IHideoutTakeItemOutRequestData, sessionID: string): IItemEventRouterResponse;
+    protected removeItemFromGenerator(sessionID: string, pmcData: IPmcData, body: IHideoutTakeItemOutRequestData, output: IItemEventRouterResponse, hideoutArea: HideoutArea): IItemEventRouterResponse;
    toggleArea(pmcData: IPmcData, body: IHideoutToggleAreaRequestData, sessionID: string): IItemEventRouterResponse;
    singleProductionStart(pmcData: IPmcData, body: IHideoutSingleProductionStartRequestData, sessionID: string): IItemEventRouterResponse;
    scavCaseProductionStart(pmcData: IPmcData, body: IHideoutScavCaseStartRequestData, sessionID: string): IItemEventRouterResponse;
+    protected getRandomisedItemRarityCounter(recipe: IHideoutScavCase): {
+        [x: string]: number;
+    };
+    protected getRandomisedScavRewards(rarityItemCounter: {
+        [x: string]: number;
+    }): Product[];
    continuousProductionStart(pmcData: IPmcData, body: IHideoutContinousProductionStartRequestData, sessionID: string): IItemEventRouterResponse;
    takeProduction(pmcData: IPmcData, body: IHideoutTakeProductionRequestData, sessionID: string): IItemEventRouterResponse;
+    protected handleRecipie(sessionID: string, recipe: IHideoutProduction, pmcData: IPmcData, body: IHideoutTakeProductionRequestData, output: IItemEventRouterResponse): IItemEventRouterResponse;
+    protected handleScavCase(sessionID: string, pmcData: IPmcData, body: IHideoutTakeProductionRequestData, output: IItemEventRouterResponse): IItemEventRouterResponse;
    registerProduction(pmcData: IPmcData, body: IHideoutSingleProductionStartRequestData | IHideoutContinousProductionStartRequestData, sessionID: string): IItemEventRouterResponse;
    update(): void;
 }
--- a/1.2.0/types/controllers/InraidController.d.ts
+++ b/1.2.0/types/controllers/InraidController.d.ts
@ -6,24 +6,25 @@ import { QuestHelper } from "../helpers/QuestHelper";
 import { TraderHelper } from "../helpers/TraderHelper";
 import { IRegisterPlayerRequestData } from "../models/eft/inRaid/IRegisterPlayerRequestData";
 import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData";
+import { IInRaidConfig } from "../models/spt/config/IInRaidConfig";
 import { ConfigServer } from "../servers/ConfigServer";
 import { DatabaseServer } from "../servers/DatabaseServer";
 import { SaveServer } from "../servers/SaveServer";
 import { InsuranceService } from "../services/InsuranceService";
 import { JsonUtil } from "../utils/JsonUtil";
 export declare class InraidController {
-    private saveServer;
-    private jsonUtil;
-    private databaseServer;
-    private questHelper;
-    private itemHelper;
-    private extendedProfileHelper;
-    private healthHelper;
-    private traderHelper;
-    private insuranceService;
-    private inRaidHelper;
-    private configServer;
-    private inraidConfig;
+    protected saveServer: SaveServer;
+    protected jsonUtil: JsonUtil;
+    protected databaseServer: DatabaseServer;
+    protected questHelper: QuestHelper;
+    protected itemHelper: ItemHelper;
+    protected extendedProfileHelper: ExtendedProfileHelper;
+    protected healthHelper: HealthHelper;
+    protected traderHelper: TraderHelper;
+    protected insuranceService: InsuranceService;
+    protected inRaidHelper: InRaidHelper;
+    protected configServer: ConfigServer;
+    protected inraidConfig: IInRaidConfig;
    constructor(saveServer: SaveServer, jsonUtil: JsonUtil, databaseServer: DatabaseServer, questHelper: QuestHelper, itemHelper: ItemHelper, extendedProfileHelper: ExtendedProfileHelper, healthHelper: HealthHelper, traderHelper: TraderHelper, insuranceService: InsuranceService, inRaidHelper: InRaidHelper, configServer: ConfigServer);
    addPlayer(sessionID: string, info: IRegisterPlayerRequestData): void;
    saveProgress(offraidData: ISaveProgressRequestData, sessionID: string): void;
--- a/1.2.0/types/controllers/InsuranceController.d.ts
+++ b/1.2.0/types/controllers/InsuranceController.d.ts
@ -3,8 +3,10 @@ import { ItemHelper } from "../helpers/ItemHelper";
 import { ProfileHelper } from "../helpers/ProfileHelper";
 import { IPmcData } from "../models/eft/common/IPmcData";
 import { IGetInsuranceCostRequestData } from "../models/eft/insurance/IGetInsuranceCostRequestData";
+import { IGetInsuranceCostResponseData } from "../models/eft/insurance/IGetInsuranceCostResponseData";
 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 { ConfigServer } from "../servers/ConfigServer";
@ -15,23 +17,29 @@ import { PaymentService } from "../services/PaymentService";
 import { RandomUtil } from "../utils/RandomUtil";
 import { TimeUtil } from "../utils/TimeUtil";
 export declare class InsuranceController {
-    private logger;
-    private randomUtil;
-    private itemEventRouter;
-    private timeUtil;
-    private saveServer;
-    private databaseServer;
-    private itemHelper;
-    private profileHelper;
-    private dialogueHelper;
-    private paymentService;
-    private insuranceService;
-    private configServer;
-    private insuranceConfig;
+    protected logger: ILogger;
+    protected randomUtil: RandomUtil;
+    protected itemEventRouter: ItemEventRouter;
+    protected timeUtil: TimeUtil;
+    protected saveServer: SaveServer;
+    protected databaseServer: DatabaseServer;
+    protected itemHelper: ItemHelper;
+    protected profileHelper: ProfileHelper;
+    protected dialogueHelper: DialogueHelper;
+    protected paymentService: PaymentService;
+    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
    insuranceService: InsuranceService, configServer: ConfigServer);
    processReturn(): void;
    insure(pmcData: IPmcData, body: IInsureRequestData, sessionID: string): IItemEventRouterResponse;
-    cost(info: IGetInsuranceCostRequestData, sessionID: string): any;
+    /**
+     * Calculate insurance cost
+     * @param info request object
+     * @param sessionID session id
+     * @returns response object to send to client
+     */
+    cost(info: IGetInsuranceCostRequestData, sessionID: string): IGetInsuranceCostResponseData;
    doAbsolutelyNothing(): void;
 }
--- a/1.2.0/types/controllers/InventoryController.d.ts
+++ b/1.2.0/types/controllers/InventoryController.d.ts
@ -24,19 +24,23 @@ import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRout
 import { ILogger } from "../models/spt/utils/ILogger";
 import { ItemEventRouter } from "../routers/ItemEventRouter";
 import { DatabaseServer } from "../servers/DatabaseServer";
+import { FenceService } from "../services/FenceService";
+import { RagfairOfferService } from "../services/RagfairOfferService";
 import { HashUtil } from "../utils/HashUtil";
 import { JsonUtil } from "../utils/JsonUtil";
 export declare class InventoryController {
-    private logger;
-    private hashUtil;
-    private jsonUtil;
-    private databaseServer;
-    private presetHelper;
-    private inventoryHelper;
-    private profileHelper;
-    private paymentHelper;
-    private itemEventRouter;
-    constructor(logger: ILogger, hashUtil: HashUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, presetHelper: PresetHelper, inventoryHelper: InventoryHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, itemEventRouter: ItemEventRouter);
+    protected logger: ILogger;
+    protected hashUtil: HashUtil;
+    protected jsonUtil: JsonUtil;
+    protected databaseServer: DatabaseServer;
+    protected fenceService: FenceService;
+    protected presetHelper: PresetHelper;
+    protected inventoryHelper: InventoryHelper;
+    protected ragfairOfferService: RagfairOfferService;
+    protected profileHelper: ProfileHelper;
+    protected paymentHelper: PaymentHelper;
+    protected itemEventRouter: ItemEventRouter;
+    constructor(logger: ILogger, hashUtil: HashUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, fenceService: FenceService, presetHelper: PresetHelper, inventoryHelper: InventoryHelper, ragfairOfferService: RagfairOfferService, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, itemEventRouter: ItemEventRouter);
    /**
    * Move Item
    * change location of item with parentId and slotId
@ -93,9 +97,19 @@ export declare class InventoryController {
    tagItem(pmcData: IPmcData, body: IInventoryTagRequestData, sessionID: string): IItemEventRouterResponse;
    bindItem(pmcData: IPmcData, body: IInventoryBindRequestData, sessionID: string): IItemEventRouterResponse;
    /**
-     * Handles examining of the item     *
+     * Handles examining an item
+     * @param pmcData player profile
+     * @param body request object
+     * @param sessionID session id
+     * @returns response
     */
    examineItem(pmcData: IPmcData, body: IInventoryExamineRequestData, sessionID: string): IItemEventRouterResponse;
+    /**
+     * Get the tplid of an item from the examine request object
+     * @param body response request
+     * @returns tplid
+     */
+    protected getExaminedItemTpl(body: IInventoryExamineRequestData): string;
    readEncyclopedia(pmcData: IPmcData, body: IInventoryReadEncyclopediaRequestData, sessionID: string): IItemEventRouterResponse;
    /**
     * Handles sorting of Inventory.
--- a/1.2.0/types/controllers/LauncherController.d.ts
+++ b/1.2.0/types/controllers/LauncherController.d.ts
@ -3,23 +3,24 @@ import { IChangeRequestData } from "../models/eft/launcher/IChangeRequestData";
 import { ILoginRequestData } from "../models/eft/launcher/ILoginRequestData";
 import { IRegisterData } from "../models/eft/launcher/IRegisterData";
 import { Info } from "../models/eft/profile/IAkiProfile";
+import { ICoreConfig } from "../models/spt/config/ICoreConfig";
 import { ConfigServer } from "../servers/ConfigServer";
 import { DatabaseServer } from "../servers/DatabaseServer";
 import { SaveServer } from "../servers/SaveServer";
 import { HashUtil } from "../utils/HashUtil";
 export declare class LauncherController {
-    private hashUtil;
-    private saveServer;
-    private httpServerHelper;
-    private databaseServer;
-    private configServer;
-    private coreConfig;
+    protected hashUtil: HashUtil;
+    protected saveServer: SaveServer;
+    protected httpServerHelper: HttpServerHelper;
+    protected databaseServer: DatabaseServer;
+    protected configServer: ConfigServer;
+    protected coreConfig: ICoreConfig;
    constructor(hashUtil: HashUtil, saveServer: SaveServer, httpServerHelper: HttpServerHelper, databaseServer: DatabaseServer, configServer: ConfigServer);
    connect(): any;
    find(sessionIdKey: string): Info;
    login(info: ILoginRequestData): string;
    register(info: IRegisterData): string;
-    private createAccount;
+    protected createAccount(info: IRegisterData): string;
    changeUsername(info: IChangeRequestData): string;
    changePassword(info: IChangeRequestData): string;
    wipe(info: IRegisterData): string;
--- a/1.2.0/types/controllers/LocationController.d.ts
+++ b/1.2.0/types/controllers/LocationController.d.ts
@ -6,11 +6,11 @@ import { DatabaseServer } from "../servers/DatabaseServer";
 import { JsonUtil } from "../utils/JsonUtil";
 import { TimeUtil } from "../utils/TimeUtil";
 export declare class LocationController {
-    private jsonUtil;
-    private logger;
-    private locationGenerator;
-    private databaseServer;
-    private timeUtil;
+    protected jsonUtil: JsonUtil;
+    protected logger: ILogger;
+    protected locationGenerator: LocationGenerator;
+    protected databaseServer: DatabaseServer;
+    protected timeUtil: TimeUtil;
    constructor(jsonUtil: JsonUtil, logger: ILogger, locationGenerator: LocationGenerator, databaseServer: DatabaseServer, timeUtil: TimeUtil);
    get(location: string): ILocationBase;
    generate(name: string): ILocationBase;
--- a/1.2.0/types/controllers/MatchController.d.ts
+++ b/1.2.0/types/controllers/MatchController.d.ts
@ -0,0 +1,36 @@
+import { ProfileHelper } from "../helpers/ProfileHelper";
+import { TraderHelper } from "../helpers/TraderHelper";
+import { IPmcData } from "../models/eft/common/IPmcData";
+import { ICreateGroupRequestData } from "../models/eft/match/ICreateGroupRequestData";
+import { IEndOfflineRaidRequestData } from "../models/eft/match/IEndOfflineRaidRequestData";
+import { IGetGroupStatusRequestData } from "../models/eft/match/IGetGroupStatusRequestData";
+import { IGetProfileRequestData } from "../models/eft/match/IGetProfileRequestData";
+import { IJoinMatchRequestData } from "../models/eft/match/IJoinMatchRequestData";
+import { IJoinMatchResult } from "../models/eft/match/IJoinMatchResult";
+import { IStartOfflineRaidRequestData } from "../models/eft/match/IStartOffineRaidRequestData";
+import { IInRaidConfig } from "../models/spt/config/IInRaidConfig";
+import { IMatchConfig } from "../models/spt/config/IMatchConfig";
+import { ConfigServer } from "../servers/ConfigServer";
+import { SaveServer } from "../servers/SaveServer";
+import { BotLootCacheService } from "../services/BotLootCacheService";
+import { MatchLocationService } from "../services/MatchLocationService";
+export declare class MatchController {
+    protected saveServer: SaveServer;
+    protected profileHelper: ProfileHelper;
+    protected matchLocationService: MatchLocationService;
+    protected traderHelper: TraderHelper;
+    protected botLootCacheService: BotLootCacheService;
+    protected configServer: ConfigServer;
+    protected matchConfig: IMatchConfig;
+    protected inraidConfig: IInRaidConfig;
+    constructor(saveServer: SaveServer, profileHelper: ProfileHelper, matchLocationService: MatchLocationService, traderHelper: TraderHelper, botLootCacheService: BotLootCacheService, configServer: ConfigServer);
+    getEnabled(): boolean;
+    getProfile(info: IGetProfileRequestData): IPmcData[];
+    createGroup(sessionID: string, info: ICreateGroupRequestData): any;
+    deleteGroup(info: any): void;
+    joinMatch(info: IJoinMatchRequestData, sessionID: string): IJoinMatchResult[];
+    protected getMatch(location: string): any;
+    getGroupStatus(info: IGetGroupStatusRequestData): any;
+    startOfflineRaid(info: IStartOfflineRaidRequestData, sessionID: string): void;
+    endOfflineRaid(info: IEndOfflineRaidRequestData, sessionID: string): void;
+}
--- a/1.2.0/types/controllers/NoteController.d.ts
+++ b/1.2.0/types/controllers/NoteController.d.ts
@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRout
 import { INoteActionData } from "../models/eft/notes/INoteActionData";
 import { ItemEventRouter } from "../routers/ItemEventRouter";
 declare class NoteController {
-    private itemEventRouter;
+    protected itemEventRouter: ItemEventRouter;
    constructor(itemEventRouter: ItemEventRouter);
    addNote(pmcData: IPmcData, body: INoteActionData, sessionID: string): IItemEventRouterResponse;
    editNote(pmcData: IPmcData, body: INoteActionData, sessionID: string): IItemEventRouterResponse;
--- a/1.2.0/types/controllers/NotifierController.d.ts
+++ b/1.2.0/types/controllers/NotifierController.d.ts
@ -3,11 +3,11 @@ import { NotificationService } from "../services/NotificationService";
 import { INotifierChannel } from "../models/eft/notifier/INotifier";
 import { HttpServerHelper } from "../helpers/HttpServerHelper";
 export declare class NotifierController {
-    private notifierHelper;
-    private httpServerHelper;
-    private notificationService;
-    private pollInterval;
-    private timeout;
+    protected notifierHelper: NotifierHelper;
+    protected httpServerHelper: HttpServerHelper;
+    protected notificationService: NotificationService;
+    protected pollInterval: number;
+    protected timeout: number;
    constructor(notifierHelper: NotifierHelper, httpServerHelper: HttpServerHelper, notificationService: NotificationService);
    /**
     * Resolve an array of session notifications.
--- a/1.2.0/types/controllers/PresetBuildController.d.ts
+++ b/1.2.0/types/controllers/PresetBuildController.d.ts
@ -7,10 +7,10 @@ import { ItemEventRouter } from "../routers/ItemEventRouter";
 import { SaveServer } from "../servers/SaveServer";
 import { HashUtil } from "../utils/HashUtil";
 export declare class PresetBuildController {
-    private hashUtil;
-    private itemEventRouter;
-    private itemHelper;
-    private saveServer;
+    protected hashUtil: HashUtil;
+    protected itemEventRouter: ItemEventRouter;
+    protected itemHelper: ItemHelper;
+    protected saveServer: SaveServer;
    constructor(hashUtil: HashUtil, itemEventRouter: ItemEventRouter, itemHelper: ItemHelper, saveServer: SaveServer);
    getUserBuilds(sessionID: string): WeaponBuild[];
    saveBuild(pmcData: IPmcData, body: IPresetBuildActionRequestData, sessionID: string): IItemEventRouterResponse;
--- a/1.2.0/types/controllers/PresetController.d.ts
+++ b/1.2.0/types/controllers/PresetController.d.ts
@ -1,8 +1,8 @@
 import { PresetHelper } from "../helpers/PresetHelper";
 import { DatabaseServer } from "../servers/DatabaseServer";
 export declare class PresetController {
-    private presetHelper;
-    private databaseServer;
+    protected presetHelper: PresetHelper;
+    protected databaseServer: DatabaseServer;
    constructor(presetHelper: PresetHelper, databaseServer: DatabaseServer);
    initialize(): void;
 }
--- a/1.2.0/types/controllers/ProfileController.d.ts
+++ b/1.2.0/types/controllers/ProfileController.d.ts
@ -11,21 +11,29 @@ import { ISearchFriendResponse } from "../models/eft/profile/ISearchFriendRespon
 import { IValidateNicknameRequestData } from "../models/eft/profile/IValidateNicknameRequestData";
 import { DatabaseServer } from "../servers/DatabaseServer";
 import { SaveServer } from "../servers/SaveServer";
+import { ProfileFixerService } from "../services/ProfileFixerService";
 import { HashUtil } from "../utils/HashUtil";
 import { TimeUtil } from "../utils/TimeUtil";
 export declare class ProfileController {
-    private hashUtil;
-    private timeUtil;
-    private saveServer;
-    private databaseServer;
-    private itemHelper;
-    private traderHelper;
-    private extendedProfileHelper;
-    constructor(hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, traderHelper: TraderHelper, extendedProfileHelper: ExtendedProfileHelper);
+    protected hashUtil: HashUtil;
+    protected timeUtil: TimeUtil;
+    protected saveServer: SaveServer;
+    protected databaseServer: DatabaseServer;
+    protected itemHelper: ItemHelper;
+    protected profileFixerService: ProfileFixerService;
+    protected traderHelper: TraderHelper;
+    protected extendedProfileHelper: ExtendedProfileHelper;
+    constructor(hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileFixerService: ProfileFixerService, traderHelper: TraderHelper, extendedProfileHelper: ExtendedProfileHelper);
    getMiniProfiles(): IMiniProfile[];
    getMiniProfile(sessionID: string): any;
    getCompleteProfile(sessionID: string): IPmcData[];
    createProfile(info: IProfileCreateRequestData, sessionID: string): void;
+    /**
+     * Generate a player scav object
+     * pmc profile MUST exist first before pscav can be generated
+     * @param sessionID
+     * @returns IPmcData object
+     */
    generatePlayerScav(sessionID: string): IPmcData;
    validateNickname(info: IValidateNicknameRequestData, sessionID: string): string;
    changeNickname(info: IProfileChangeNicknameRequestData, sessionID: string): string;
--- a/1.2.0/types/controllers/QuestController.d.ts
+++ b/1.2.0/types/controllers/QuestController.d.ts
@ -0,0 +1,76 @@
+import { DialogueHelper } from "../helpers/DialogueHelper";
+import { ItemHelper } from "../helpers/ItemHelper";
+import { ProfileHelper } from "../helpers/ProfileHelper";
+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 { 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 { ConfigServer } from "../servers/ConfigServer";
+import { DatabaseServer } from "../servers/DatabaseServer";
+import { LocaleService } from "../services/LocaleService";
+import { PlayerService } from "../services/PlayerService";
+import { TimeUtil } from "../utils/TimeUtil";
+export declare class QuestController {
+    protected logger: ILogger;
+    protected timeUtil: TimeUtil;
+    protected itemEventRouter: ItemEventRouter;
+    protected databaseServer: DatabaseServer;
+    protected itemHelper: ItemHelper;
+    protected dialogueHelper: DialogueHelper;
+    protected profileHelper: ProfileHelper;
+    protected questHelper: QuestHelper;
+    protected questConditionHelper: QuestConditionHelper;
+    protected playerService: PlayerService;
+    protected localeService: LocaleService;
+    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);
+    /**
+     * Get all quests visible to player
+     * Exclude quests with incomplete preconditions (level/loyalty)
+     * @param sessionID session id
+     * @returns array of IQuest
+     */
+    getClientQuests(sessionID: string): IQuest[];
+    acceptQuest(pmcData: IPmcData, acceptedQuest: IAcceptQuestRequestData, sessionID: string): IItemEventRouterResponse;
+    acceptRepeatableQuest(pmcData: IPmcData, acceptedQuest: IAcceptQuestRequestData, sessionID: string): IItemEventRouterResponse;
+    /**
+     * Remove completed quest from profile
+     * Add newly unlocked quests to profile
+     * Also recalculate thier level due to exp rewards
+     * @param pmcData Player profile
+     * @param body completed quest request
+     * @param sessionID session id
+     * @returns ItemEvent response
+     */
+    completeQuest(pmcData: IPmcData, body: ICompleteQuestRequestData, sessionID: string): IItemEventRouterResponse;
+    /**
+     * Send a popup to player on completion of a quest
+     * @param sessionID session id
+     * @param pmcData player profile
+     * @param completedQuestId completed quest id
+     * @param questRewards rewards given to player
+     */
+    protected sendDialogMessageOnQuestComplete(sessionID: string, pmcData: IPmcData, completedQuestId: string, questRewards: Reward[]): void;
+    /**
+     * Returns a list of quests that should be failed when a quest is completed
+     * @param completedQuestId quest completed id
+     * @returns array of quests
+     */
+    protected getQuestsFailedByCompletingQuest(completedQuestId: string): IQuest[];
+    /**
+     * Fail the quests provided
+     * @param sessionID session id
+     * @param pmcData player profile
+     * @param questsToFail quests to fail
+     */
+    protected failQuests(sessionID: string, pmcData: IPmcData, questsToFail: IQuest[]): void;
+    handoverQuest(pmcData: IPmcData, body: IHandoverQuestRequestData, sessionID: string): IItemEventRouterResponse;
+}
--- a/1.2.0/types/controllers/RagfairController.d.ts
+++ b/1.2.0/types/controllers/RagfairController.d.ts
@ -20,6 +20,7 @@ import { IGetMarketPriceRequestData } from "../models/eft/ragfair/IGetMarketPric
 import { IGetOffersResult } from "../models/eft/ragfair/IGetOffersResult";
 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 { ConfigServer } from "../servers/ConfigServer";
@ -33,32 +34,34 @@ import { RagfairRequiredItemsService } from "../services/RagfairRequiredItemsSer
 import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 import { TimeUtil } from "../utils/TimeUtil";
 export declare class RagfairController {
-    private logger;
-    private timeUtil;
-    private httpResponse;
-    private itemEventRouter;
-    private ragfairServer;
-    private ragfairPriceService;
-    private databaseServer;
-    private itemHelper;
-    private saveServer;
-    private ragfairSellHelper;
-    private ragfairTaxHelper;
-    private ragfairSortHelper;
-    private ragfairOfferHelper;
-    private profileHelper;
-    private paymentService;
-    private handbookHelper;
-    private paymentHelper;
-    private inventoryHelper;
-    private ragfairHelper;
-    private ragfairOfferService;
-    private ragfairRequiredItemsService;
-    private ragfairOfferGenerator;
-    private configServer;
-    private ragfairConfig;
+    protected logger: ILogger;
+    protected timeUtil: TimeUtil;
+    protected httpResponse: HttpResponseUtil;
+    protected itemEventRouter: ItemEventRouter;
+    protected ragfairServer: RagfairServer;
+    protected ragfairPriceService: RagfairPriceService;
+    protected databaseServer: DatabaseServer;
+    protected itemHelper: ItemHelper;
+    protected saveServer: SaveServer;
+    protected ragfairSellHelper: RagfairSellHelper;
+    protected ragfairTaxHelper: RagfairTaxHelper;
+    protected ragfairSortHelper: RagfairSortHelper;
+    protected ragfairOfferHelper: RagfairOfferHelper;
+    protected profileHelper: ProfileHelper;
+    protected paymentService: PaymentService;
+    protected handbookHelper: HandbookHelper;
+    protected paymentHelper: PaymentHelper;
+    protected inventoryHelper: InventoryHelper;
+    protected ragfairHelper: RagfairHelper;
+    protected ragfairOfferService: RagfairOfferService;
+    protected ragfairRequiredItemsService: RagfairRequiredItemsService;
+    protected ragfairOfferGenerator: RagfairOfferGenerator;
+    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, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, ragfairOfferGenerator: RagfairOfferGenerator, configServer: ConfigServer);
    getOffers(sessionID: string, info: ISearchRequestData): IGetOffersResult;
+    protected isLinkedSearch(info: ISearchRequestData): boolean;
+    protected isRequiredSearch(info: ISearchRequestData): boolean;
    update(): void;
    getItemPrice(info: IGetMarketPriceRequestData): IGetItemPriceResult;
    addPlayerOffer(pmcData: IPmcData, info: IAddOfferRequestData, sessionID: string): IItemEventRouterResponse;
--- a/1.2.0/types/controllers/RepairController.d.ts
+++ b/1.2.0/types/controllers/RepairController.d.ts
@ -5,21 +5,23 @@ import { IPmcData } from "../models/eft/common/IPmcData";
 import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
 import { IRepairActionDataRequest } from "../models/eft/repair/IRepairActionDataRequest";
 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 { ConfigServer } from "../servers/ConfigServer";
 import { DatabaseServer } from "../servers/DatabaseServer";
 import { PaymentService } from "../services/PaymentService";
 export declare class RepairController {
-    private logger;
-    private itemEventRouter;
-    private databaseServer;
-    private questHelper;
-    private traderHelper;
-    private paymentService;
-    private repairHelper;
-    private configServer;
-    private repairConfig;
+    protected logger: ILogger;
+    protected itemEventRouter: ItemEventRouter;
+    protected databaseServer: DatabaseServer;
+    protected questHelper: QuestHelper;
+    protected traderHelper: TraderHelper;
+    protected paymentService: PaymentService;
+    protected repairHelper: RepairHelper;
+    protected configServer: ConfigServer;
+    protected repairConfig: IRepairConfig;
+    protected readonly WEAPON_SKILL_REPAIR_GAIN: number;
    constructor(logger: ILogger, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, questHelper: QuestHelper, traderHelper: TraderHelper, paymentService: PaymentService, repairHelper: RepairHelper, configServer: ConfigServer);
    /**
     * Repair with trader
@ -36,5 +38,5 @@ export declare class RepairController {
     * @param sessionID session id
     * @returns item event router action
     */
-    repair(pmcData: IPmcData, body: IRepairActionDataRequest, sessionID: string): IItemEventRouterResponse;
+    repairWithKit(pmcData: IPmcData, body: IRepairActionDataRequest, sessionID: string): IItemEventRouterResponse;
 }
--- a/1.2.0/types/controllers/RepeatableQuestController.d.ts
+++ b/1.2.0/types/controllers/RepeatableQuestController.d.ts
@ -9,12 +9,13 @@ import { ICompletion, ICompletionAvailableFor, IElimination, IEliminationConditi
 import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
 import { IRepeatableQuestChangeRequest } from "../models/eft/quests/IRepeatableQuestChangeRequest";
 import { ELocationName } from "../models/enums/ELocationName";
-import { IRepeatableQuestConfig } from "../models/spt/config/IQuestConfig";
+import { IQuestConfig, IRepeatableQuestConfig } from "../models/spt/config/IQuestConfig";
 import { ILogger } from "../models/spt/utils/ILogger";
 import { ItemEventRouter } from "../routers/ItemEventRouter";
 import { ConfigServer } from "../servers/ConfigServer";
 import { DatabaseServer } from "../servers/DatabaseServer";
 import { PaymentService } from "../services/PaymentService";
+import { ProfileFixerService } from "../services/ProfileFixerService";
 import { JsonUtil } from "../utils/JsonUtil";
 import { MathUtil } from "../utils/MathUtil";
 import { ObjectId } from "../utils/ObjectId";
@ -48,22 +49,23 @@ export interface ITargetLocation {
    locations: string[];
 }
 export declare class RepeatableQuestController {
-    private timeUtil;
-    private logger;
-    private randomUtil;
-    private mathUtil;
-    private jsonUtil;
-    private databaseServer;
-    private itemHelper;
-    private presetHelper;
-    private profileHelper;
-    private ragfairServerHelper;
-    private itemEventRouter;
-    private paymentService;
-    private objectId;
-    private configServer;
-    private questConfig;
-    constructor(timeUtil: TimeUtil, logger: ILogger, randomUtil: RandomUtil, mathUtil: MathUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, ragfairServerHelper: RagfairServerHelper, itemEventRouter: ItemEventRouter, paymentService: PaymentService, objectId: ObjectId, configServer: ConfigServer);
+    protected timeUtil: TimeUtil;
+    protected logger: ILogger;
+    protected randomUtil: RandomUtil;
+    protected mathUtil: MathUtil;
+    protected jsonUtil: JsonUtil;
+    protected databaseServer: DatabaseServer;
+    protected itemHelper: ItemHelper;
+    protected presetHelper: PresetHelper;
+    protected profileHelper: ProfileHelper;
+    protected profileFixerService: ProfileFixerService;
+    protected ragfairServerHelper: RagfairServerHelper;
+    protected itemEventRouter: ItemEventRouter;
+    protected paymentService: PaymentService;
+    protected objectId: ObjectId;
+    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, 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.
--- a/1.2.0/types/controllers/TradeController.d.ts
+++ b/1.2.0/types/controllers/TradeController.d.ts
@ -9,11 +9,11 @@ import { IProcessBaseTradeRequestData } from "../models/eft/trade/IProcessBaseTr
 import { ItemEventRouter } from "../routers/ItemEventRouter";
 import { ILogger } from "../models/spt/utils/ILogger";
 declare class TradeController {
-    private logger;
-    private itemEventRouter;
-    private tradeHelper;
-    private profileHelper;
-    private ragfairServer;
+    protected logger: ILogger;
+    protected itemEventRouter: ItemEventRouter;
+    protected tradeHelper: TradeHelper;
+    protected profileHelper: ProfileHelper;
+    protected ragfairServer: RagfairServer;
    constructor(logger: ILogger, itemEventRouter: ItemEventRouter, tradeHelper: TradeHelper, profileHelper: ProfileHelper, ragfairServer: RagfairServer);
    confirmTrading(pmcData: IPmcData, body: IProcessBaseTradeRequestData, sessionID: string, foundInRaid?: boolean, upd?: Upd): IItemEventRouterResponse;
    confirmRagfairTrading(pmcData: IPmcData, body: IProcessRagfairTradeRequestData, sessionID: string): IItemEventRouterResponse;
--- a/1.2.0/types/controllers/TraderController.d.ts
+++ b/1.2.0/types/controllers/TraderController.d.ts
@ -8,14 +8,14 @@ import { TraderAssortService } from "../services/TraderAssortService";
 import { JsonUtil } from "../utils/JsonUtil";
 import { TimeUtil } from "../utils/TimeUtil";
 export declare class TraderController {
-    private logger;
-    private databaseServer;
-    private traderAssortHelper;
-    private profileHelper;
-    private traderHelper;
-    private timeUtil;
-    private traderAssortService;
-    private jsonUtil;
+    protected logger: ILogger;
+    protected databaseServer: DatabaseServer;
+    protected traderAssortHelper: TraderAssortHelper;
+    protected profileHelper: ProfileHelper;
+    protected traderHelper: TraderHelper;
+    protected timeUtil: TimeUtil;
+    protected traderAssortService: TraderAssortService;
+    protected jsonUtil: JsonUtil;
    constructor(logger: ILogger, databaseServer: DatabaseServer, traderAssortHelper: TraderAssortHelper, profileHelper: ProfileHelper, traderHelper: TraderHelper, timeUtil: TimeUtil, traderAssortService: TraderAssortService, jsonUtil: JsonUtil);
    load(): void;
    getTrader(traderID: string, sessionID: string): ITraderBase;
--- a/1.2.0/types/controllers/WeatherController.d.ts
+++ b/1.2.0/types/controllers/WeatherController.d.ts
@ -1,10 +1,11 @@
 import { WeatherGenerator } from "../generators/WeatherGenerator";
 import { IWeatherData } from "../models/eft/weather/IWeatherData";
+import { IWeatherConfig } from "../models/spt/config/IWeatherConfig";
 import { ConfigServer } from "../servers/ConfigServer";
 export declare class WeatherController {
-    private weatherGenerator;
-    private configServer;
-    private weatherConfig;
+    protected weatherGenerator: WeatherGenerator;
+    protected configServer: ConfigServer;
+    protected weatherConfig: IWeatherConfig;
    constructor(weatherGenerator: WeatherGenerator, configServer: ConfigServer);
    generate(): IWeatherData;
 }
--- a/1.2.0/types/controllers/WishlistController.d.ts
+++ b/1.2.0/types/controllers/WishlistController.d.ts
@ -3,7 +3,7 @@ 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 {
-    private itemEvenRouter;
+    protected itemEvenRouter: ItemEventRouter;
    constructor(itemEvenRouter: ItemEventRouter);
    addToWishList(pmcData: IPmcData, body: IWishlistActionData, sessionID: string): IItemEventRouterResponse;
    removeFromWishList(pmcData: IPmcData, body: IWishlistActionData, sessionID: string): IItemEventRouterResponse;
--- a/Live/CWX_BushWhacker/CWX-BushWhacker
+++ b/Live/CWX_BushWhacker/CWX-BushWhacker
--- a/Live/CWX_BushWhacker/CWX-BushWhacker
+++ b/Live/CWX_BushWhacker/CWX-BushWhacker
--- a/Live/CWX_BushWhacker/CWX-BushWhacker
+++ b/Live/CWX_BushWhacker/CWX-BushWhacker
--- a/Live/CWX_BushWhacker/CWX-BushWhacker
+++ b/Live/CWX_BushWhacker/CWX-BushWhacker
--- a/Live/CWX_BushWhacker/CWX-BushWhacker
+++ b/Live/CWX_BushWhacker/CWX-BushWhacker
--- a/Live/CWX_BushWhacker/CWX-BushWhacker
+++ b/Live/CWX_BushWhacker/CWX-BushWhacker
--- a/1.2.0/types/generators/BotGenerator.d.ts
+++ b/1.2.0/types/generators/BotGenerator.d.ts
@ -0,0 +1,84 @@
+import { BotHelper } from "../helpers/BotHelper";
+import { GameEventHelper } from "../helpers/GameEventHelper";
+import { IGenerateBotsRequestData } from "../models/eft/bot/IGenerateBotsRequestData";
+import { Health as PmcHealth } from "../models/eft/common/IPmcData";
+import { IBotBase } from "../models/eft/common/tables/IBotBase";
+import { Health, Inventory, Skills } 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 { HashUtil } from "../utils/HashUtil";
+import { JsonUtil } from "../utils/JsonUtil";
+import { RandomUtil } from "../utils/RandomUtil";
+import { BotInventoryGenerator } from "./BotInventoryGenerator";
+declare namespace BotGenerator {
+    interface IRandomisedBotLevelResult {
+        level: number;
+        exp: number;
+    }
+}
+export declare class BotGenerator {
+    protected logger: ILogger;
+    protected hashUtil: HashUtil;
+    protected randomUtil: RandomUtil;
+    protected jsonUtil: JsonUtil;
+    protected databaseServer: DatabaseServer;
+    protected botInventoryGenerator: BotInventoryGenerator;
+    protected botHelper: BotHelper;
+    protected gameEventHelper: GameEventHelper;
+    protected configServer: ConfigServer;
+    protected botConfig: IBotConfig;
+    constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, botInventoryGenerator: BotInventoryGenerator, botHelper: BotHelper, gameEventHelper: GameEventHelper, configServer: ConfigServer);
+    generate(info: IGenerateBotsRequestData, playerScav?: boolean): IBotBase[];
+    /**
+     * Choose if a bot should become a Pmc by checking if bot type is allowed to become a Pmc in bot config
+     * @param isPlayerScav is a player scav being generated, forces choice returned to never be a pmc
+     */
+    protected shouldBotBePmc(isPlayerScav: boolean, role: string): boolean;
+    /**
+     * 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
+     */
+    protected getCloneOfBotBase(): IBotBase;
+    protected generateBot(bot: IBotBase, role: string, isPmc: boolean): IBotBase;
+    /**
+     * Log the number of PMCs generated to the debug console
+     */
+    protected logPmcGeneratedCount(output: IBotBase[]): void;
+    protected generateRandomLevel(min: number, max: number): BotGenerator.IRandomisedBotLevelResult;
+    /**
+     * Converts health object to the required format
+     * @param healthObj health object from bot json
+     * @param playerScav Is a pscav bot being generated
+     * @returns PmcHealth object
+     */
+    protected generateHealth(healthObj: Health, playerScav?: boolean): PmcHealth;
+    protected generateSkills(skillsObj: Skills): Skills;
+    /**
+     * Convert from pmc side (usec/bear) to the side as defined in the bot config (usecType/bearType)
+     * @param pmcSide eft side (usec/bear)
+     * @returns pmc side as defined in config
+     */
+    protected getPmcRole(pmcSide: string): string;
+    /**
+     * 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;
+    protected generateId(bot: IBotBase): IBotBase;
+    protected generateInventoryID(profile: IBotBase): IBotBase;
+    protected getPMCDifficulty(requestedDifficulty: string): string;
+    /**
+     * Add a side-specific (usec/bear) dogtag item to a bots inventory
+     * @param bot bot to add dogtag to
+     * @returns Bot with dogtag added
+     */
+    protected generateDogtag(bot: IBotBase): IBotBase;
+}
+export {};
--- a/Show More
+++ b/Show More