Update types

TypeScript/10ScopesAndTypes/types/callbacks/GameCallbacks.d.ts

@@ -39,6 +39,7 @@ declare class GameCallbacks {
      */
     getGameConfig(url: string, info: IGameEmptyCrcRequestData, sessionID: string): IGetBodyResponseData<IGameConfigResponse>;
     getServer(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IServerDetails[]>;
+    getCurrentGroup(url: string, info: IEmptyRequestData, sessionID: string): any;
     validateGameVersion(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<ICheckVersionResponse>;
     /**
      * Handle client/game/keepalive

TypeScript/10ScopesAndTypes/types/callbacks/ProfileCallbacks.d.ts

@@ -5,6 +5,7 @@ import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyRespons
 import { INullResponseData } from "../models/eft/httpResponse/INullResponseData";
 import { IGetMiniProfileRequestData } from "../models/eft/launcher/IGetMiniProfileRequestData";
 import { GetProfileStatusResponseData } from "../models/eft/profile/GetProfileStatusResponseData";
+import { IGetProfileSettingsRequest } from "../models/eft/profile/IGetProfileSettingsRequest";
 import { IProfileChangeNicknameRequestData } from "../models/eft/profile/IProfileChangeNicknameRequestData";
 import { IProfileChangeVoiceRequestData } from "../models/eft/profile/IProfileChangeVoiceRequestData";
 import { IProfileCreateRequestData } from "../models/eft/profile/IProfileCreateRequestData";
@@ -64,6 +65,7 @@ export declare class ProfileCallbacks {
      * @returns
      */
     getProfileStatus(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<GetProfileStatusResponseData>;
+    getProfileSettings(url: string, info: IGetProfileSettingsRequest, sessionId: string): IGetBodyResponseData<string>;
     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;

TypeScript/10ScopesAndTypes/types/context/ApplicationContext.d.ts

@@ -8,6 +8,8 @@ export declare class ApplicationContext {
      *
      * const registerPlayerInfo = this.applicationContext.getLatestValue(ContextVariableType.REGISTER_PLAYER_REQUEST).getValue<IRegisterPlayerRequestData>();
      *
+     * const activePlayerSessionId = this.applicationContext.getLatestValue(ContextVariableType.SESSION_ID).getValue<string>();
+     *
      * const matchInfo = this.applicationContext.getLatestValue(ContextVariableType.MATCH_INFO).getValue<IStartOfflineRaidRequestData>();
      * @param type
      * @returns

TypeScript/10ScopesAndTypes/types/controllers/GameController.d.ts

@@ -20,10 +20,12 @@ import { LocalisationService } from "../services/LocalisationService";
 import { OpenZoneService } from "../services/OpenZoneService";
 import { ProfileFixerService } from "../services/ProfileFixerService";
 import { SeasonalEventService } from "../services/SeasonalEventService";
+import { JsonUtil } from "../utils/JsonUtil";
 import { TimeUtil } from "../utils/TimeUtil";
 export declare class GameController {
     protected logger: ILogger;
     protected databaseServer: DatabaseServer;
+    protected jsonUtil: JsonUtil;
     protected timeUtil: TimeUtil;
     protected preAkiModLoader: PreAkiModLoader;
     protected httpServerHelper: HttpServerHelper;
@@ -39,7 +41,7 @@ export declare class GameController {
     protected httpConfig: IHttpConfig;
     protected coreConfig: ICoreConfig;
     protected locationConfig: ILocationConfig;
-    constructor(logger: ILogger, databaseServer: DatabaseServer, timeUtil: TimeUtil, preAkiModLoader: PreAkiModLoader, httpServerHelper: HttpServerHelper, hideoutHelper: HideoutHelper, profileHelper: ProfileHelper, profileFixerService: ProfileFixerService, localisationService: LocalisationService, customLocationWaveService: CustomLocationWaveService, openZoneService: OpenZoneService, seasonalEventService: SeasonalEventService, applicationContext: ApplicationContext, configServer: ConfigServer);
+    constructor(logger: ILogger, databaseServer: DatabaseServer, jsonUtil: JsonUtil, timeUtil: TimeUtil, preAkiModLoader: PreAkiModLoader, httpServerHelper: HttpServerHelper, hideoutHelper: HideoutHelper, profileHelper: ProfileHelper, profileFixerService: ProfileFixerService, localisationService: LocalisationService, customLocationWaveService: CustomLocationWaveService, openZoneService: OpenZoneService, seasonalEventService: SeasonalEventService, applicationContext: ApplicationContext, configServer: ConfigServer);
     gameStart(_url: string, _info: IEmptyRequestData, sessionID: string, startTimeStampMS: number): void;
     /**
      * When player logs in, iterate over all active effects and reduce timer
@@ -55,6 +57,10 @@ export declare class GameController {
      * Make Rogues spawn later to allow for scavs to spawn first instead of rogues filling up all spawn positions
      */
     protected fixRoguesSpawningInstantlyOnLighthouse(): void;
+    /**
+     * Find and split waves with large numbers of bots into smaller waves - BSG appears to reduce the size of these waves to one bot when they're waiting to spawn for too long
+     */
+    protected splitBotWavesIntoSingleWaves(): void;
     /**
      * Get a list of installed mods and save their details to the profile being used
      * @param fullProfile Profile to add mod details to
@@ -76,5 +82,6 @@ export declare class GameController {
     protected logProfileDetails(fullProfile: IAkiProfile): void;
     getGameConfig(sessionID: string): IGameConfigResponse;
     getServer(): IServerDetails[];
+    getCurrentGroup(sessionId: any): any;
     getValidGameVersion(): ICheckVersionResponse;
 }

TypeScript/10ScopesAndTypes/types/controllers/InraidController.d.ts

@@ -61,18 +61,18 @@ export declare class InraidController {
      */
     protected savePmcProgress(sessionID: string, offraidData: ISaveProgressRequestData): void;
     /**
-     * Make changes to pmc profile after they left raid dead,
+     * Make changes to pmc profile after they've died in raid,
-     * alter bodypart hp, handle insurance, delete inventory items, remove carried quest items
+     * Alter bodypart hp, handle insurance, delete inventory items, remove carried quest items
-     * @param postRaidSaveRequest post-raid save request
+     * @param postRaidSaveRequest Post-raid save request
-     * @param pmcData pmc profile
+     * @param pmcData Pmc profile
-     * @param insuranceEnabled is insurance enabled
+     * @param insuranceEnabled Is insurance enabled
-     * @param preRaidGear gear player had before raid
+     * @param preRaidGear Gear player had before raid
      * @param sessionID Session id
      * @returns Updated profile object
      */
     protected performPostRaidActionsWhenDead(postRaidSaveRequest: ISaveProgressRequestData, pmcData: IPmcData, insuranceEnabled: boolean, preRaidGear: Item[], sessionID: string): IPmcData;
     /**
-     * Adjust player characters bodypart hp if they left raid early
+     * Adjust player characters bodypart hp post-raid
      * @param postRaidSaveRequest post raid data
      * @param pmcData player profile
      */

TypeScript/10ScopesAndTypes/types/controllers/InventoryController.d.ts

@@ -112,7 +112,14 @@ export declare class InventoryController {
      * @returns client response object
      */
     tagItem(pmcData: IPmcData, body: IInventoryTagRequestData, sessionID: string): IItemEventRouterResponse;
-    bindItem(pmcData: IPmcData, body: IInventoryBindRequestData, sessionID: string): IItemEventRouterResponse;
+    /**
+     * Bind an inventory item to the quick access menu at bottom of player screen
+     * @param pmcData Player profile
+     * @param bindRequest Reqeust object
+     * @param sessionID Session id
+     * @returns IItemEventRouterResponse
+     */
+    bindItem(pmcData: IPmcData, bindRequest: IInventoryBindRequestData, sessionID: string): IItemEventRouterResponse;
     /**
      * Handles examining an item
      * @param pmcData player profile
@@ -137,9 +144,36 @@ export declare class InventoryController {
      * @returns IItemEventRouterResponse
      */
     sortInventory(pmcData: IPmcData, request: IInventorySortRequestData, sessionID: string): IItemEventRouterResponse;
-    createMapMarker(pmcData: IPmcData, body: IInventoryCreateMarkerRequestData, sessionID: string): IItemEventRouterResponse;
+    /**
-    deleteMapMarker(pmcData: IPmcData, body: IInventoryDeleteMarkerRequestData, sessionID: string): IItemEventRouterResponse;
+     * Add note to a map
-    editMapMarker(pmcData: IPmcData, body: IInventoryEditMarkerRequestData, sessionID: string): IItemEventRouterResponse;
+     * @param pmcData Player profile
+     * @param request Add marker request
+     * @param sessionID Session id
+     * @returns IItemEventRouterResponse
+     */
+    createMapMarker(pmcData: IPmcData, request: IInventoryCreateMarkerRequestData, sessionID: string): IItemEventRouterResponse;
+    /**
+     * Delete a map marker
+     * @param pmcData Player profile
+     * @param request Delete marker request
+     * @param sessionID Session id
+     * @returns IItemEventRouterResponse
+     */
+    deleteMapMarker(pmcData: IPmcData, request: IInventoryDeleteMarkerRequestData, sessionID: string): IItemEventRouterResponse;
+    /**
+     * Edit an existing map marker
+     * @param pmcData Player profile
+     * @param request Edit marker request
+     * @param sessionID Session id
+     * @returns IItemEventRouterResponse
+     */
+    editMapMarker(pmcData: IPmcData, request: IInventoryEditMarkerRequestData, sessionID: string): IItemEventRouterResponse;
+    /**
+     * Strip out characters from note string that are not: letter/numbers/unicode/spaces
+     * @param mapNoteText Marker text to sanitise
+     * @returns Sanitised map marker text
+     */
+    protected sanitiseMapMarkerText(mapNoteText: string): string;
     /**
      * Handle event fired when a container is unpacked (currently only the halloween pumpkin)
      * @param pmcData Profile data

TypeScript/10ScopesAndTypes/types/controllers/TradeController.d.ts

@@ -7,6 +7,7 @@ import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRout
 import { IProcessBaseTradeRequestData } from "../models/eft/trade/IProcessBaseTradeRequestData";
 import { IProcessRagfairTradeRequestData } from "../models/eft/trade/IProcessRagfairTradeRequestData";
 import { IRagfairConfig } from "../models/spt/config/IRagfairConfig";
+import { ITraderConfig } from "../models/spt/config/ITraderConfig";
 import { ILogger } from "../models/spt/utils/ILogger";
 import { EventOutputHolder } from "../routers/EventOutputHolder";
 import { ConfigServer } from "../servers/ConfigServer";
@@ -24,8 +25,10 @@ declare class TradeController {
     protected localisationService: LocalisationService;
     protected configServer: ConfigServer;
     protected ragfairConfig: IRagfairConfig;
+    protected traderConfig: ITraderConfig;
     constructor(logger: ILogger, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, itemHelper: ItemHelper, profileHelper: ProfileHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil, localisationService: LocalisationService, configServer: ConfigServer);
-    confirmTrading(pmcData: IPmcData, body: IProcessBaseTradeRequestData, sessionID: string, foundInRaid?: boolean, upd?: Upd): IItemEventRouterResponse;
+    confirmTrading(pmcData: IPmcData, request: IProcessBaseTradeRequestData, sessionID: string): IItemEventRouterResponse;
     confirmRagfairTrading(pmcData: IPmcData, body: IProcessRagfairTradeRequestData, sessionID: string): IItemEventRouterResponse;
+    protected confirmTradingInternal(pmcData: IPmcData, body: IProcessBaseTradeRequestData, sessionID: string, foundInRaid?: boolean, upd?: Upd): IItemEventRouterResponse;
 }
 export { TradeController };

TypeScript/10ScopesAndTypes/types/generators/BotLootGenerator.d.ts

@@ -5,7 +5,7 @@ import { ItemHelper } from "../helpers/ItemHelper";
 import { Inventory as PmcInventory } from "../models/eft/common/tables/IBotBase";
 import { Chances, Inventory, ItemMinMax, ModsChances } from "../models/eft/common/tables/IBotType";
 import { Item } from "../models/eft/common/tables/IItem";
-import { ITemplateItem, Props } from "../models/eft/common/tables/ITemplateItem";
+import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem";
 import { IBotConfig } from "../models/spt/config/IBotConfig";
 import { ILogger } from "../models/spt/utils/ILogger";
 import { ConfigServer } from "../servers/ConfigServer";
@@ -96,19 +96,6 @@ export declare class BotLootGenerator {
      * @returns true if item has reached spawn limit
      */
     protected itemHasReachedSpawnLimit(itemTemplate: ITemplateItem, botRole: string, isPmc: boolean, limitCount: Record<string, number>, itemSpawnLimits: Record<string, number>): boolean;
-    /**
-     * Is the item an ammo box
-     * @param props props of the item to check
-     * @returns true if item is an ammo box
-     */
-    protected isAmmoBox(props: Props): boolean;
-    /**
-     * Create an object that contains the ammo stack for an ammo box
-     * @param parentId ammo box id
-     * @param props ammo box props
-     * @returns Item object
-     */
-    protected createAmmoForAmmoBox(parentId: string, props: Props): Item;
     /**
      * Randomise the stack size of a money object, uses different values for pmc or scavs
      * @param isPmc is this a PMC

TypeScript/10ScopesAndTypes/types/generators/BotWeaponGenerator.d.ts

@@ -140,26 +140,27 @@ export declare class BotWeaponGenerator {
     protected getWeaponCaliber(weaponTemplate: ITemplateItem): string;
     /**
      * Fill existing magazines to full, while replacing their contents with specified ammo
-     * @param weaponMods
+     * @param weaponMods Weapon with children
-     * @param magazine
+     * @param magazine Magazine item
-     * @param ammoTpl
+     * @param cartridgeTpl Cartridge to insert into magazine
      */
-    protected fillExistingMagazines(weaponMods: Item[], magazine: Item, ammoTpl: string): void;
+    protected fillExistingMagazines(weaponMods: Item[], magazine: Item, cartridgeTpl: string): void;
     /**
      * Add desired ammo tpl as item to weaponmods array, placed as child to UBGL
-     * @param weaponMods
+     * @param weaponMods Weapon with children
-     * @param ubglMod
+     * @param ubglMod UBGL item
-     * @param ubglAmmoTpl
+     * @param ubglAmmoTpl Grenade ammo tpl
      */
     protected fillUbgl(weaponMods: Item[], ubglMod: Item, ubglAmmoTpl: string): void;
     /**
      * Add cartridge item to weapon Item array, if it already exists, update
-     * @param weaponMods Weapon items array to amend
+     * @param weaponWithMods Weapon items array to amend
      * @param magazine magazine item details we're adding cartridges to
-     * @param chosenAmmo cartridge to put into the magazine
+     * @param chosenAmmoTpl cartridge to put into the magazine
      * @param newStackSize how many cartridges should go into the magazine
+     * @param magazineTemplate magazines db template
      */
-    protected addOrUpdateMagazinesChildWithAmmo(weaponMods: Item[], magazine: Item, chosenAmmo: string, newStackSize: number): void;
+    protected addOrUpdateMagazinesChildWithAmmo(weaponWithMods: Item[], magazine: Item, chosenAmmoTpl: string, magazineTemplate: ITemplateItem): void;
     /**
      * Fill each Camora with a bullet
      * @param weaponMods Weapon mods to find and update camora mod(s) from

TypeScript/10ScopesAndTypes/types/generators/LocationGenerator.d.ts

@@ -2,7 +2,7 @@ import { ContainerHelper } from "../helpers/ContainerHelper";
 import { ItemHelper } from "../helpers/ItemHelper";
 import { PresetHelper } from "../helpers/PresetHelper";
 import { RagfairServerHelper } from "../helpers/RagfairServerHelper";
-import { ILooseLoot, SpawnpointsForced, SpawnpointTemplate } from "../models/eft/common/ILooseLoot";
+import { ILooseLoot, Spawnpoint, SpawnpointsForced, SpawnpointTemplate } from "../models/eft/common/ILooseLoot";
 import { Item } from "../models/eft/common/tables/IItem";
 import { IStaticAmmoDetails, IStaticContainerProps, IStaticForcedProps, IStaticLootDetails } from "../models/eft/common/tables/ILootBase";
 import { ILocationConfig } from "../models/spt/config/ILocationConfig";
@@ -34,6 +34,15 @@ export declare class LocationGenerator {
     protected configServer: ConfigServer;
     protected locationConfig: ILocationConfig;
     constructor(logger: ILogger, jsonUtil: JsonUtil, objectId: ObjectId, randomUtil: RandomUtil, ragfairServerHelper: RagfairServerHelper, itemHelper: ItemHelper, mathUtil: MathUtil, seasonalEventService: SeasonalEventService, containerHelper: ContainerHelper, presetHelper: PresetHelper, localisationService: LocalisationService, configServer: ConfigServer);
+    /**
+     * Choose loot to put into a static container
+     * @param containerIn
+     * @param staticForced
+     * @param staticLootDist
+     * @param staticAmmoDist
+     * @param locationName Name of the map to generate static loot for
+     * @returns IStaticContainerProps
+     */
     generateContainerLoot(containerIn: IStaticContainerProps, staticForced: IStaticForcedProps[], staticLootDist: Record<string, IStaticLootDetails>, staticAmmoDist: Record<string, IStaticAmmoDetails[]>, locationName: string): IStaticContainerProps;
     protected getLooseLootMultiplerForLocation(location: string): number;
     protected getStaticLootMultiplerForLocation(location: string): number;
@@ -52,5 +61,25 @@ export declare class LocationGenerator {
      * @param name of map currently generating forced loot for
      */
     protected addForcedLoot(loot: SpawnpointTemplate[], forcedSpawnPoints: SpawnpointsForced[], locationName: string): void;
-    protected createItem(tpl: string, staticAmmoDist: Record<string, IStaticAmmoDetails[]>, parentId?: string): IContainerItem;
+    /**
+     * Create array of item (with child items) and return
+     * @param chosenComposedKey Key we want to look up items for
+     * @param spawnPoint Dynamic spawn point item we want will be placed in
+     * @returns IContainerItem
+     */
+    protected createDynamicLootItem(chosenComposedKey: string, spawnPoint: Spawnpoint): IContainerItem;
+    /**
+     * Replace the _id value for base item + all children items parentid value
+     * @param itemWithChildren Item with mods to update
+     * @param newId new id to add on chidren of base item
+     */
+    protected reparentItemAndChildren(itemWithChildren: Item[], newId?: string): void;
+    /**
+     * Find an item in array by its _tpl, handle differently if chosenTpl is a weapon
+     * @param items Items array to search
+     * @param chosenTpl Tpl we want to get item with
+     * @returns Item object
+     */
+    protected getItemInArray(items: Item[], chosenTpl: string): Item;
+    protected createStaticLootItem(tpl: string, staticAmmoDist: Record<string, IStaticAmmoDetails[]>, parentId?: string): IContainerItem;
 }

TypeScript/10ScopesAndTypes/types/helpers/BotWeaponGeneratorHelper.d.ts

@@ -65,11 +65,11 @@ export declare class BotWeaponGeneratorHelper {
     /**
      * TODO - move into BotGeneratorHelper, this is not the class for it
      * Adds an item with all its children into specified equipmentSlots, wherever it fits.
-     * @param equipmentSlots
+     * @param equipmentSlots Slot to add item+children into
      * @param parentId
      * @param parentTpl
-     * @param itemWithChildren
+     * @param itemWithChildren Item to add
-     * @param inventory
+     * @param inventory Inventory to add item+children into
      * @returns a `boolean` indicating item was added
      */
     addItemWithChildrenToEquipmentSlot(equipmentSlots: string[], parentId: string, parentTpl: string, itemWithChildren: Item[], inventory: Inventory): boolean;

TypeScript/10ScopesAndTypes/types/helpers/HideoutHelper.d.ts

@@ -140,8 +140,21 @@ export declare class HideoutHelper {
      * @returns coin slot count
      */
     protected getBTCSlots(pmcData: IPmcData): number;
+    /**
+     * Get a count of bitcoins player miner can hold
+     */
     protected getManagementSkillsSlots(): number;
-    protected hasManagementSkillSlots(pmcData: IPmcData): boolean;
+    /**
+     * Does profile have elite hideout management skill
+     * @param pmcData Profile to look at
+     * @returns True if profile has skill
+     */
+    protected hasEliteHideoutManagementSkill(pmcData: IPmcData): boolean;
+    /**
+     * Get the hideout management skill from player profile
+     * @param pmcData Profile to look at
+     * @returns Hideout management skill object
+     */
     protected getHideoutManagementSkill(pmcData: IPmcData): Common;
     protected getHideoutManagementConsumptionBonus(pmcData: IPmcData): number;
     /**

TypeScript/10ScopesAndTypes/types/helpers/InRaidHelper.d.ts

@@ -2,24 +2,35 @@ import { IPmcData } from "../models/eft/common/IPmcData";
 import { Victim } from "../models/eft/common/tables/IBotBase";
 import { Item } from "../models/eft/common/tables/IItem";
 import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData";
+import { ILostOnDeathConfig } from "../models/spt/config/ILostOnDeathConfig";
 import { ILogger } from "../models/spt/utils/ILogger";
+import { ConfigServer } from "../servers/ConfigServer";
 import { DatabaseServer } from "../servers/DatabaseServer";
 import { SaveServer } from "../servers/SaveServer";
 import { LocalisationService } from "../services/LocalisationService";
 import { ProfileFixerService } from "../services/ProfileFixerService";
 import { JsonUtil } from "../utils/JsonUtil";
 import { InventoryHelper } from "./InventoryHelper";
+import { ItemHelper } from "./ItemHelper";
 import { PaymentHelper } from "./PaymentHelper";
 export declare class InRaidHelper {
     protected logger: ILogger;
     protected saveServer: SaveServer;
     protected jsonUtil: JsonUtil;
+    protected itemHelper: ItemHelper;
     protected databaseServer: DatabaseServer;
     protected inventoryHelper: InventoryHelper;
     protected paymentHelper: PaymentHelper;
     protected localisationService: LocalisationService;
     protected profileFixerService: ProfileFixerService;
-    constructor(logger: ILogger, saveServer: SaveServer, jsonUtil: JsonUtil, databaseServer: DatabaseServer, inventoryHelper: InventoryHelper, paymentHelper: PaymentHelper, localisationService: LocalisationService, profileFixerService: ProfileFixerService);
+    protected configServer: ConfigServer;
+    protected lostOnDeathConfig: ILostOnDeathConfig;
+    constructor(logger: ILogger, saveServer: SaveServer, jsonUtil: JsonUtil, itemHelper: ItemHelper, databaseServer: DatabaseServer, inventoryHelper: InventoryHelper, paymentHelper: PaymentHelper, localisationService: LocalisationService, profileFixerService: ProfileFixerService, configServer: ConfigServer);
+    /**
+     * Should quest items be removed from player inventory on death
+     * @returns True if items should be removed from inventory
+     */
+    removeQuestItemsOnDeath(): boolean;
     /**
      * Check an array of items and add an upd object to money items with a stack count of 1
      * Single stack money items have no upd object and thus no StackObjectsCount, causing issues
@@ -83,7 +94,7 @@ export declare class InRaidHelper {
      * Remove equipped items from pre-raid
      * Add new items found in raid to profile
      * Store insurance items in profile
-     * @param sessionID
+     * @param sessionID Session id
      * @param pmcData Profile to update
      * @param postRaidProfile Profile returned by client after a raid
      * @returns Updated profile
@@ -94,15 +105,21 @@ export declare class InRaidHelper {
      * Used post-raid to remove items after death
      * @param pmcData Player profile
      * @param sessionID Session id
-     * @returns Player profile with pmc inventory cleared
      */
-    deleteInventory(pmcData: IPmcData, sessionID: string): IPmcData;
+    deleteInventory(pmcData: IPmcData, sessionID: string): void;
+    /**
+     * Get items in vest/pocket/backpack inventory containers (excluding children)
+     * @param pmcData Player profile
+     * @returns Item array
+     */
+    protected getBaseItemsInRigPocketAndBackpack(pmcData: IPmcData): Item[];
     /**
      * Does the provided items slotId mean its kept on the player after death
-     * @param slotId slotid of item to check
+     * @pmcData Player profile
+     * @itemToCheck Item to check should be kept
      * @returns true if item is kept after death
      */
-    isItemKeptAfterDeath(slotId: string): boolean;
+    protected isItemKeptAfterDeath(pmcData: IPmcData, itemToCheck: Item): boolean;
     /**
      * Return the equipped items from a players inventory
      * @param items Players inventory to search through

TypeScript/10ScopesAndTypes/types/helpers/InventoryHelper.d.ts

@@ -61,12 +61,12 @@ export declare class InventoryHelper {
     /**
      * Add ammo to ammo boxes
      * @param itemToAdd Item to check is ammo box
-     * @param toDo
+     * @param parentId Ammo box parent id
      * @param output IItemEventRouterResponse object
      * @param sessionID Session id
      * @param pmcData Profile to add ammobox to
      */
-    protected hydrateAmmoBoxWithAmmo(pmcData: IPmcData, itemToAdd: IAddItemTempObject, toDo: string[][], sessionID: string, output: IItemEventRouterResponse): void;
+    protected hydrateAmmoBoxWithAmmo(pmcData: IPmcData, itemToAdd: IAddItemTempObject, parentId: string, sessionID: string, output: IItemEventRouterResponse): void;
     /**
      *
      * @param assortItems Items to add to inventory
@@ -111,7 +111,13 @@ export declare class InventoryHelper {
     /**
     * Internal helper function to move item within the same profile_f.
     */
-    moveItemInternal(inventoryItems: Item[], body: IInventoryMoveRequestData): void;
+    moveItemInternal(pmcData: IPmcData, inventoryItems: Item[], moveRequest: IInventoryMoveRequestData): void;
+    /**
+     * Update fast panel bindings when an item is moved into a container that doesnt allow quick slot access
+     * @param pmcData Player profile
+     * @param itemBeingMoved item being moved
+     */
+    protected updateFastPanelBinding(pmcData: IPmcData, itemBeingMoved: Item): void;
     /**
     * Internal helper function to handle cartridges in inventory if any of them exist.
     */

TypeScript/10ScopesAndTypes/types/helpers/ItemHelper.d.ts

@@ -193,31 +193,53 @@ declare class ItemHelper {
     replaceIDs(pmcData: IPmcData, items: Item[], insuredItems?: InsuredItem[], fastPanel?: any): any[];
     /**
      * WARNING, SLOW. Recursively loop down through an items hierarchy to see if any of the ids match the supplied list, return true if any do
-     * @param {string} tpl
+     * @param {string} tpl Items tpl to check parents of
-     * @param {Array} tplsToCheck
+     * @param {Array} tplsToCheck Tpl values to check if parents of item match
-     * @returns boolean
+     * @returns boolean Match found
      */
     doesItemOrParentsIdMatch(tpl: string, tplsToCheck: string[]): boolean;
     /**
-     * Return true if item is a quest item
+     * Check if item is quest item
-     * @param {string} tpl
+     * @param tpl Items tpl to check quest status of
-     * @returns boolean
+     * @returns true if item is flagged as quest item
      */
     isQuestItem(tpl: string): boolean;
     /**
      * Get the inventory size of an item
-     * @param items
+     * @param items Item with children
      * @param rootItemId
      * @returns ItemSize object (width and height)
      */
     getItemSize(items: Item[], rootItemId: string): ItemHelper.ItemSize;
     /**
      * Get a random cartridge from an items Filter property
-     * @param item
+     * @param item Db item template to look up Cartridge filter values from
-     * @returns
+     * @returns Caliber of cartridge
      */
     getRandomCompatibleCaliberTemplateId(item: ITemplateItem): string;
-    createRandomMagCartridges(magTemplate: ITemplateItem, parentId: string, staticAmmoDist: Record<string, IStaticAmmoDetails[]>, caliber?: string): Item;
+    /**
+     * Add cartridges to the ammo box with correct max stack sizes
+     * @param ammoBox Box to add cartridges to
+     * @param ammoBoxDetails Item template from items db
+     */
+    addCartridgesToAmmoBox(ammoBox: Item[], ammoBoxDetails: ITemplateItem): void;
+    /**
+     * Add child items (cartridges) to a magazine
+     * @param magazine Magazine to add child items to
+     * @param magTemplate Db template of magazine
+     * @param staticAmmoDist Cartridge distribution
+     * @param caliber Caliber of cartridge to add to magazine
+     * @param minSizePercent % the magazine must be filled to
+     */
+    fillMagazineWithRandomCartridge(magazine: Item[], magTemplate: ITemplateItem, staticAmmoDist: Record<string, IStaticAmmoDetails[]>, caliber?: string, minSizePercent?: number): void;
+    /**
+     * Add child items to a magazine of a specific cartridge
+     * @param magazine Magazine to add child items to
+     * @param magTemplate Db template of magazine
+     * @param cartridgeTpl Cartridge to add to magazine
+     * @param minSizePercent % the magazine must be filled to
+     */
+    fillMagazineWithCartridge(magazine: Item[], magTemplate: ITemplateItem, cartridgeTpl: string, minSizePercent?: number): void;
     protected getRandomValidCaliber(magTemplate: ITemplateItem): string;
     protected drawAmmoTpl(caliber: string, staticAmmoDist: Record<string, IStaticAmmoDetails[]>): string;
     /**

TypeScript/10ScopesAndTypes/types/helpers/ProfileHelper.d.ts

@@ -20,7 +20,12 @@ export declare class ProfileHelper {
     protected itemHelper: ItemHelper;
     protected profileSnapshotService: ProfileSnapshotService;
     constructor(logger: ILogger, jsonUtil: JsonUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileSnapshotService: ProfileSnapshotService);
-    resetProfileQuestCondition(sessionID: string, conditionId: string): void;
+    /**
+     * Remove/reset started quest condtions in player profile
+     * @param sessionID Session id
+     * @param conditionIds Condition ids that need to be reset/removed
+     */
+    resetProfileQuestCondition(sessionID: string, conditionIds: string[]): void;
     /**
      * Get all profiles from server
      * @returns Dictionary of profiles

TypeScript/10ScopesAndTypes/types/helpers/QuestHelper.d.ts

@@ -211,7 +211,7 @@ export declare class QuestHelper {
      * @param itemTpl item tpl to look for
      * @returns 'FindItem' condition id
      */
-    getFindItemIdForQuestHandIn(itemTpl: string): string;
+    getFindItemIdForQuestHandIn(itemTpl: string): string[];
     /**
      * Add all quests to a profile with the provided statuses
      * @param pmcProfile profile to update

TypeScript/10ScopesAndTypes/types/loaders/PostAkiModLoader.d.ts

@@ -1,15 +1,19 @@
 import { DependencyContainer } from "tsyringe";
 import { IModLoader } from "../models/spt/mod/IModLoader";
+import { ILogger } from "../models/spt/utils/ILogger";
+import { LocalisationService } from "../services/LocalisationService";
 import { VFS } from "../utils/VFS";
 import { BundleLoader } from "./BundleLoader";
 import { ModTypeCheck } from "./ModTypeCheck";
 import { PreAkiModLoader } from "./PreAkiModLoader";
 export declare class PostAkiModLoader implements IModLoader {
+    protected logger: ILogger;
     protected bundleLoader: BundleLoader;
     protected vfs: VFS;
     protected preAkiModLoader: PreAkiModLoader;
+    protected localisationService: LocalisationService;
     protected modTypeCheck: ModTypeCheck;
-    constructor(bundleLoader: BundleLoader, vfs: VFS, preAkiModLoader: PreAkiModLoader, modTypeCheck: ModTypeCheck);
+    constructor(logger: ILogger, bundleLoader: BundleLoader, vfs: VFS, preAkiModLoader: PreAkiModLoader, localisationService: LocalisationService, modTypeCheck: ModTypeCheck);
     getModPath(mod: string): string;
     load(): Promise<void>;
     protected executeMods(container: DependencyContainer): Promise<void>;

TypeScript/10ScopesAndTypes/types/loaders/PostDBModLoader.d.ts

@@ -1,11 +1,15 @@
 import { DependencyContainer } from "tsyringe";
 import { OnLoad } from "../di/OnLoad";
+import { ILogger } from "../models/spt/utils/ILogger";
+import { LocalisationService } from "../services/LocalisationService";
 import { ModTypeCheck } from "./ModTypeCheck";
 import { PreAkiModLoader } from "./PreAkiModLoader";
 export declare class PostDBModLoader implements OnLoad {
+    protected logger: ILogger;
     protected preAkiModLoader: PreAkiModLoader;
+    protected localisationService: LocalisationService;
     protected modTypeCheck: ModTypeCheck;
-    constructor(preAkiModLoader: PreAkiModLoader, modTypeCheck: ModTypeCheck);
+    constructor(logger: ILogger, preAkiModLoader: PreAkiModLoader, localisationService: LocalisationService, modTypeCheck: ModTypeCheck);
     onLoad(): Promise<void>;
     getRoute(): string;
     getModPath(mod: string): string;

TypeScript/10ScopesAndTypes/types/models/eft/common/IGlobals.d.ts

@@ -70,6 +70,7 @@ export interface Config {
     EventType: string[];
     WalkSpeed: xyz;
     SprintSpeed: xyz;
+    SquadSettings: ISquadSettings;
     SkillEnduranceWeightThreshold: number;
     TeamSearchingTimeout: number;
     Insurance: Insurance;
@@ -803,6 +804,11 @@ export interface RestrictionsInRaid {
     TemplateId: string;
     Value: number;
 }
+export interface ISquadSettings {
+    CountOfRequestsToOnePlayer: number;
+    SecondsForExpiredRequest: number;
+    SendRequestDelaySeconds: number;
+}
 export interface Insurance {
     MaxStorageTimeInHour: number;
 }

TypeScript/10ScopesAndTypes/types/models/eft/common/ILooseLoot.d.ts

@@ -37,6 +37,9 @@ export interface Xyz {
     z: number;
 }
 export interface ItemDistribution {
-    tpl: string;
+    composedKey: ComposedKey;
     relativeProbability: number;
 }
+export interface ComposedKey {
+    key: string;
+}

TypeScript/10ScopesAndTypes/types/models/eft/common/tables/IBotBase.d.ts

@@ -120,9 +120,7 @@ export interface Inventory {
     sortingTable: string;
     questRaidItems: string;
     questStashItems: string;
-    fastPanel: FastPanel;
+    fastPanel: Record<string, string>;
-}
-export interface FastPanel {
 }
 export interface Skills {
     Common: Common[];

TypeScript/10ScopesAndTypes/types/models/eft/match/IEndOfflineRaidRequestData.d.ts

@@ -1,6 +1,6 @@
 export interface IEndOfflineRaidRequestData {
     crc: number;
     exitStatus: string;
-    exitName: any;
+    exitName: string;
     raidSeconds: number;
 }

TypeScript/10ScopesAndTypes/types/models/eft/match/IGetRaidConfigurationRequestData.d.ts

@@ -1,4 +1,7 @@
 export interface IGetRaidConfigurationRequestData {
+    keyId: string;
+    side: string;
+    location: string;
     timeVariant: string;
     raidMode: string;
     metabolismDisabled: boolean;
@@ -6,7 +9,6 @@ export interface IGetRaidConfigurationRequestData {
     timeAndWeatherSettings: TimeAndWeatherSettings;
     botSettings: BotSettings;
     wavesSettings: WavesSettings;
-    location: string;
 }
 export interface TimeAndWeatherSettings {
     isRandomTime: boolean;

TypeScript/10ScopesAndTypes/types/models/eft/presetBuild/IPresetBuildActionRequestData.d.ts

@@ -1,3 +1,4 @@
+import { Upd } from "../common/tables/IItem";
 export interface IPresetBuildActionRequestData {
     Action: string;
     id: string;
@@ -12,14 +13,3 @@ export interface Item {
     parentId?: string;
     slotId?: string;
 }
-export interface Upd {
-    Repairable: Repairable;
-    FireMode: FireMode;
-}
-export interface Repairable {
-    MaxDurability: number;
-    Durability: number;
-}
-export interface FireMode {
-    FireMode: string;
-}

TypeScript/10ScopesAndTypes/types/models/eft/profile/IGetProfileSettingsRequest.d.ts

@@ -0,0 +1,3 @@
+export interface IGetProfileSettingsRequest {
+    squadInviteRestriction: boolean;
+}

TypeScript/10ScopesAndTypes/types/models/enums/ConfigTypes.d.ts

@@ -19,5 +19,6 @@ export declare enum ConfigTypes {
     SCAVCASE = "aki-scavcase",
     TRADER = "aki-trader",
     WEATHER = "aki-weather",
-    SEASONAL_EVENT = "aki-seasonalevents"
+    SEASONAL_EVENT = "aki-seasonalevents",
+    LOST_ON_DEATH = "aki-lostondeath"
 }

TypeScript/10ScopesAndTypes/types/models/spt/config/IHttpConfig.d.ts

@@ -4,4 +4,5 @@ export interface IHttpConfig extends IBaseConfig {
     kind: "aki-http";
     ip: string;
     port: number;
+    logRequests: boolean;
 }

TypeScript/10ScopesAndTypes/types/models/spt/config/ILocationConfig.d.ts

@@ -2,9 +2,9 @@ import { BossLocationSpawn, Wave } from "../../../models/eft/common/ILocationBas
 import { IBaseConfig } from "./IBaseConfig";
 export interface ILocationConfig extends IBaseConfig {
     kind: "aki-location";
-    fixEmptyBotWaves: boolean;
+    fixEmptyBotWavesSettings: IFixEmptyBotWavesSettings;
-    fixRoguesTakingAllSpawnsOnLighthouse: boolean;
+    rogueLighthouseSpawnTimeSettings: IRogueLighthouseSpawnTimeSettings;
-    lighthouseRogueSpawnTimeSeconds: number;
+    splitWaveIntoSingleSpawnsSettings: ISplitWaveSettings;
     looseLootMultiplier: LootMultiplier;
     staticLootMultiplier: LootMultiplier;
     customWaves: CustomWaves;
@@ -12,6 +12,21 @@ export interface ILocationConfig extends IBaseConfig {
     openZones: Record<string, string[]>;
     /** Key = map id, value = item tpls that should only have one forced loot spawn position */
     forcedLootSingleSpawnById: Record<string, string[]>;
+    /** How many attempts should be taken to fit an item into a container before giving up */
+    fitLootIntoContainerAttempts: number;
+}
+export interface IFixEmptyBotWavesSettings {
+    enabled: boolean;
+    ignoreMaps: string[];
+}
+export interface IRogueLighthouseSpawnTimeSettings {
+    enabled: boolean;
+    waitTimeSeconds: number;
+}
+export interface ISplitWaveSettings {
+    enabled: boolean;
+    ignoreMaps: string[];
+    waveSizeThreshold: number;
 }
 export interface CustomWaves {
     boss: Record<string, BossLocationSpawn[]>;

TypeScript/10ScopesAndTypes/types/models/spt/config/ILostOnDeathConfig.d.ts

@@ -0,0 +1,21 @@
+import { IBaseConfig } from "./IBaseConfig";
+export interface ILostOnDeathConfig extends IBaseConfig {
+    kind: "aki-lostondeath";
+    equipment: Equipment;
+    specialSlotItems: boolean;
+    questItems: boolean;
+}
+export interface Equipment {
+    ArmBand: boolean;
+    Headwear: boolean;
+    Earpiece: boolean;
+    FaceCover: boolean;
+    ArmorVest: boolean;
+    Eyewear: boolean;
+    TacticalVest: boolean;
+    Backpack: boolean;
+    Holster: boolean;
+    FirstPrimaryWeapon: boolean;
+    SecondPrimaryWeapon: boolean;
+    Scabbard: boolean;
+}

TypeScript/10ScopesAndTypes/types/models/spt/config/ITraderConfig.d.ts

@@ -3,6 +3,7 @@ import { IBaseConfig } from "./IBaseConfig";
 export interface ITraderConfig extends IBaseConfig {
     kind: "aki-trader";
     updateTime: UpdateTime[];
+    purchasesAreFoundInRaid: boolean;
     updateTimeDefault: number;
     traderPriceMultipler: number;
     persistPurchaseDataInProfile: boolean;

TypeScript/10ScopesAndTypes/types/models/spt/mod/NewItemDetails.d.ts

@@ -4,6 +4,8 @@ export declare abstract class NewItemDetailsBase {
     fleaPriceRoubles: number;
     /** Price of the item in the handbook */
     handbookPriceRoubles: number;
+    /** Handbook ParentId for the new item */
+    handbookParentId: string;
     /**
      * A dictionary for locale settings, key = langauge (e.g. en,cn,es-mx,jp,fr)
      * If a language is not included, the first item in the array will be used in its place

TypeScript/10ScopesAndTypes/types/services/InsuranceService.d.ts

@@ -63,8 +63,16 @@ export declare class InsuranceService {
      * @param offraidData post-raid request object
      * @param preRaidGear gear player wore prior to raid
      * @param sessionID Session id
+     * @param playerDied did the player die in raid
+     */
+    storeLostGear(pmcData: IPmcData, offraidData: ISaveProgressRequestData, preRaidGear: Item[], sessionID: string, playerDied: boolean): void;
+    /**
+     * Store insured items on pmc death inside insurance array in player profile
+     * @param pmcData Player profile
+     * @param offraidData Player gear post-raid
+     * @param preRaidGear Player gear before raid
+     * @param sessionID Session id
      */
-    storeLostGear(pmcData: IPmcData, offraidData: ISaveProgressRequestData, preRaidGear: Item[], sessionID: string): void;
     storeInsuredItemsForReturn(pmcData: IPmcData, offraidData: ISaveProgressRequestData, preRaidGear: Item[], sessionID: string): void;
     /**
      * Add gear item to InsuredItems array in player profile

TypeScript/11BundleLoadingSample/types/callbacks/GameCallbacks.d.ts

@@ -39,6 +39,7 @@ declare class GameCallbacks {
      */
     getGameConfig(url: string, info: IGameEmptyCrcRequestData, sessionID: string): IGetBodyResponseData<IGameConfigResponse>;
     getServer(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IServerDetails[]>;
+    getCurrentGroup(url: string, info: IEmptyRequestData, sessionID: string): any;
     validateGameVersion(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<ICheckVersionResponse>;
     /**
      * Handle client/game/keepalive

TypeScript/11BundleLoadingSample/types/callbacks/ProfileCallbacks.d.ts

@@ -5,6 +5,7 @@ import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyRespons
 import { INullResponseData } from "../models/eft/httpResponse/INullResponseData";
 import { IGetMiniProfileRequestData } from "../models/eft/launcher/IGetMiniProfileRequestData";
 import { GetProfileStatusResponseData } from "../models/eft/profile/GetProfileStatusResponseData";
+import { IGetProfileSettingsRequest } from "../models/eft/profile/IGetProfileSettingsRequest";
 import { IProfileChangeNicknameRequestData } from "../models/eft/profile/IProfileChangeNicknameRequestData";
 import { IProfileChangeVoiceRequestData } from "../models/eft/profile/IProfileChangeVoiceRequestData";
 import { IProfileCreateRequestData } from "../models/eft/profile/IProfileCreateRequestData";
@@ -64,6 +65,7 @@ export declare class ProfileCallbacks {
      * @returns
      */
     getProfileStatus(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<GetProfileStatusResponseData>;
+    getProfileSettings(url: string, info: IGetProfileSettingsRequest, sessionId: string): IGetBodyResponseData<string>;
     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;

TypeScript/11BundleLoadingSample/types/context/ApplicationContext.d.ts

@@ -8,6 +8,8 @@ export declare class ApplicationContext {
      *
      * const registerPlayerInfo = this.applicationContext.getLatestValue(ContextVariableType.REGISTER_PLAYER_REQUEST).getValue<IRegisterPlayerRequestData>();
      *
+     * const activePlayerSessionId = this.applicationContext.getLatestValue(ContextVariableType.SESSION_ID).getValue<string>();
+     *
      * const matchInfo = this.applicationContext.getLatestValue(ContextVariableType.MATCH_INFO).getValue<IStartOfflineRaidRequestData>();
      * @param type
      * @returns

TypeScript/11BundleLoadingSample/types/controllers/GameController.d.ts

@@ -20,10 +20,12 @@ import { LocalisationService } from "../services/LocalisationService";
 import { OpenZoneService } from "../services/OpenZoneService";
 import { ProfileFixerService } from "../services/ProfileFixerService";
 import { SeasonalEventService } from "../services/SeasonalEventService";
+import { JsonUtil } from "../utils/JsonUtil";
 import { TimeUtil } from "../utils/TimeUtil";
 export declare class GameController {
     protected logger: ILogger;
     protected databaseServer: DatabaseServer;
+    protected jsonUtil: JsonUtil;
     protected timeUtil: TimeUtil;
     protected preAkiModLoader: PreAkiModLoader;
     protected httpServerHelper: HttpServerHelper;
@@ -39,7 +41,7 @@ export declare class GameController {
     protected httpConfig: IHttpConfig;
     protected coreConfig: ICoreConfig;
     protected locationConfig: ILocationConfig;
-    constructor(logger: ILogger, databaseServer: DatabaseServer, timeUtil: TimeUtil, preAkiModLoader: PreAkiModLoader, httpServerHelper: HttpServerHelper, hideoutHelper: HideoutHelper, profileHelper: ProfileHelper, profileFixerService: ProfileFixerService, localisationService: LocalisationService, customLocationWaveService: CustomLocationWaveService, openZoneService: OpenZoneService, seasonalEventService: SeasonalEventService, applicationContext: ApplicationContext, configServer: ConfigServer);
+    constructor(logger: ILogger, databaseServer: DatabaseServer, jsonUtil: JsonUtil, timeUtil: TimeUtil, preAkiModLoader: PreAkiModLoader, httpServerHelper: HttpServerHelper, hideoutHelper: HideoutHelper, profileHelper: ProfileHelper, profileFixerService: ProfileFixerService, localisationService: LocalisationService, customLocationWaveService: CustomLocationWaveService, openZoneService: OpenZoneService, seasonalEventService: SeasonalEventService, applicationContext: ApplicationContext, configServer: ConfigServer);
     gameStart(_url: string, _info: IEmptyRequestData, sessionID: string, startTimeStampMS: number): void;
     /**
      * When player logs in, iterate over all active effects and reduce timer
@@ -55,6 +57,10 @@ export declare class GameController {
      * Make Rogues spawn later to allow for scavs to spawn first instead of rogues filling up all spawn positions
      */
     protected fixRoguesSpawningInstantlyOnLighthouse(): void;
+    /**
+     * Find and split waves with large numbers of bots into smaller waves - BSG appears to reduce the size of these waves to one bot when they're waiting to spawn for too long
+     */
+    protected splitBotWavesIntoSingleWaves(): void;
     /**
      * Get a list of installed mods and save their details to the profile being used
      * @param fullProfile Profile to add mod details to
@@ -76,5 +82,6 @@ export declare class GameController {
     protected logProfileDetails(fullProfile: IAkiProfile): void;
     getGameConfig(sessionID: string): IGameConfigResponse;
     getServer(): IServerDetails[];
+    getCurrentGroup(sessionId: any): any;
     getValidGameVersion(): ICheckVersionResponse;
 }

TypeScript/11BundleLoadingSample/types/controllers/InraidController.d.ts

@@ -61,18 +61,18 @@ export declare class InraidController {
      */
     protected savePmcProgress(sessionID: string, offraidData: ISaveProgressRequestData): void;
     /**
-     * Make changes to pmc profile after they left raid dead,
+     * Make changes to pmc profile after they've died in raid,
-     * alter bodypart hp, handle insurance, delete inventory items, remove carried quest items
+     * Alter bodypart hp, handle insurance, delete inventory items, remove carried quest items
-     * @param postRaidSaveRequest post-raid save request
+     * @param postRaidSaveRequest Post-raid save request
-     * @param pmcData pmc profile
+     * @param pmcData Pmc profile
-     * @param insuranceEnabled is insurance enabled
+     * @param insuranceEnabled Is insurance enabled
-     * @param preRaidGear gear player had before raid
+     * @param preRaidGear Gear player had before raid
      * @param sessionID Session id
      * @returns Updated profile object
      */
     protected performPostRaidActionsWhenDead(postRaidSaveRequest: ISaveProgressRequestData, pmcData: IPmcData, insuranceEnabled: boolean, preRaidGear: Item[], sessionID: string): IPmcData;
     /**
-     * Adjust player characters bodypart hp if they left raid early
+     * Adjust player characters bodypart hp post-raid
      * @param postRaidSaveRequest post raid data
      * @param pmcData player profile
      */

TypeScript/11BundleLoadingSample/types/controllers/InventoryController.d.ts

@@ -112,7 +112,14 @@ export declare class InventoryController {
      * @returns client response object
      */
     tagItem(pmcData: IPmcData, body: IInventoryTagRequestData, sessionID: string): IItemEventRouterResponse;
-    bindItem(pmcData: IPmcData, body: IInventoryBindRequestData, sessionID: string): IItemEventRouterResponse;
+    /**
+     * Bind an inventory item to the quick access menu at bottom of player screen
+     * @param pmcData Player profile
+     * @param bindRequest Reqeust object
+     * @param sessionID Session id
+     * @returns IItemEventRouterResponse
+     */
+    bindItem(pmcData: IPmcData, bindRequest: IInventoryBindRequestData, sessionID: string): IItemEventRouterResponse;
     /**
      * Handles examining an item
      * @param pmcData player profile
@@ -137,9 +144,36 @@ export declare class InventoryController {
      * @returns IItemEventRouterResponse
      */
     sortInventory(pmcData: IPmcData, request: IInventorySortRequestData, sessionID: string): IItemEventRouterResponse;
-    createMapMarker(pmcData: IPmcData, body: IInventoryCreateMarkerRequestData, sessionID: string): IItemEventRouterResponse;
+    /**
-    deleteMapMarker(pmcData: IPmcData, body: IInventoryDeleteMarkerRequestData, sessionID: string): IItemEventRouterResponse;
+     * Add note to a map
-    editMapMarker(pmcData: IPmcData, body: IInventoryEditMarkerRequestData, sessionID: string): IItemEventRouterResponse;
+     * @param pmcData Player profile
+     * @param request Add marker request
+     * @param sessionID Session id
+     * @returns IItemEventRouterResponse
+     */
+    createMapMarker(pmcData: IPmcData, request: IInventoryCreateMarkerRequestData, sessionID: string): IItemEventRouterResponse;
+    /**
+     * Delete a map marker
+     * @param pmcData Player profile
+     * @param request Delete marker request
+     * @param sessionID Session id
+     * @returns IItemEventRouterResponse
+     */
+    deleteMapMarker(pmcData: IPmcData, request: IInventoryDeleteMarkerRequestData, sessionID: string): IItemEventRouterResponse;
+    /**
+     * Edit an existing map marker
+     * @param pmcData Player profile
+     * @param request Edit marker request
+     * @param sessionID Session id
+     * @returns IItemEventRouterResponse
+     */
+    editMapMarker(pmcData: IPmcData, request: IInventoryEditMarkerRequestData, sessionID: string): IItemEventRouterResponse;
+    /**
+     * Strip out characters from note string that are not: letter/numbers/unicode/spaces
+     * @param mapNoteText Marker text to sanitise
+     * @returns Sanitised map marker text
+     */
+    protected sanitiseMapMarkerText(mapNoteText: string): string;
     /**
      * Handle event fired when a container is unpacked (currently only the halloween pumpkin)
      * @param pmcData Profile data

TypeScript/11BundleLoadingSample/types/controllers/TradeController.d.ts

@@ -7,6 +7,7 @@ import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRout
 import { IProcessBaseTradeRequestData } from "../models/eft/trade/IProcessBaseTradeRequestData";
 import { IProcessRagfairTradeRequestData } from "../models/eft/trade/IProcessRagfairTradeRequestData";
 import { IRagfairConfig } from "../models/spt/config/IRagfairConfig";
+import { ITraderConfig } from "../models/spt/config/ITraderConfig";
 import { ILogger } from "../models/spt/utils/ILogger";
 import { EventOutputHolder } from "../routers/EventOutputHolder";
 import { ConfigServer } from "../servers/ConfigServer";
@@ -24,8 +25,10 @@ declare class TradeController {
     protected localisationService: LocalisationService;
     protected configServer: ConfigServer;
     protected ragfairConfig: IRagfairConfig;
+    protected traderConfig: ITraderConfig;
     constructor(logger: ILogger, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, itemHelper: ItemHelper, profileHelper: ProfileHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil, localisationService: LocalisationService, configServer: ConfigServer);
-    confirmTrading(pmcData: IPmcData, body: IProcessBaseTradeRequestData, sessionID: string, foundInRaid?: boolean, upd?: Upd): IItemEventRouterResponse;
+    confirmTrading(pmcData: IPmcData, request: IProcessBaseTradeRequestData, sessionID: string): IItemEventRouterResponse;
     confirmRagfairTrading(pmcData: IPmcData, body: IProcessRagfairTradeRequestData, sessionID: string): IItemEventRouterResponse;
+    protected confirmTradingInternal(pmcData: IPmcData, body: IProcessBaseTradeRequestData, sessionID: string, foundInRaid?: boolean, upd?: Upd): IItemEventRouterResponse;
 }
 export { TradeController };

TypeScript/11BundleLoadingSample/types/generators/BotLootGenerator.d.ts

@@ -5,7 +5,7 @@ import { ItemHelper } from "../helpers/ItemHelper";
 import { Inventory as PmcInventory } from "../models/eft/common/tables/IBotBase";
 import { Chances, Inventory, ItemMinMax, ModsChances } from "../models/eft/common/tables/IBotType";
 import { Item } from "../models/eft/common/tables/IItem";
-import { ITemplateItem, Props } from "../models/eft/common/tables/ITemplateItem";
+import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem";
 import { IBotConfig } from "../models/spt/config/IBotConfig";
 import { ILogger } from "../models/spt/utils/ILogger";
 import { ConfigServer } from "../servers/ConfigServer";
@@ -96,19 +96,6 @@ export declare class BotLootGenerator {
      * @returns true if item has reached spawn limit
      */
     protected itemHasReachedSpawnLimit(itemTemplate: ITemplateItem, botRole: string, isPmc: boolean, limitCount: Record<string, number>, itemSpawnLimits: Record<string, number>): boolean;
-    /**
-     * Is the item an ammo box
-     * @param props props of the item to check
-     * @returns true if item is an ammo box
-     */
-    protected isAmmoBox(props: Props): boolean;
-    /**
-     * Create an object that contains the ammo stack for an ammo box
-     * @param parentId ammo box id
-     * @param props ammo box props
-     * @returns Item object
-     */
-    protected createAmmoForAmmoBox(parentId: string, props: Props): Item;
     /**
      * Randomise the stack size of a money object, uses different values for pmc or scavs
      * @param isPmc is this a PMC

TypeScript/11BundleLoadingSample/types/generators/BotWeaponGenerator.d.ts

@@ -140,26 +140,27 @@ export declare class BotWeaponGenerator {
     protected getWeaponCaliber(weaponTemplate: ITemplateItem): string;
     /**
      * Fill existing magazines to full, while replacing their contents with specified ammo
-     * @param weaponMods
+     * @param weaponMods Weapon with children
-     * @param magazine
+     * @param magazine Magazine item
-     * @param ammoTpl
+     * @param cartridgeTpl Cartridge to insert into magazine
      */
-    protected fillExistingMagazines(weaponMods: Item[], magazine: Item, ammoTpl: string): void;
+    protected fillExistingMagazines(weaponMods: Item[], magazine: Item, cartridgeTpl: string): void;
     /**
      * Add desired ammo tpl as item to weaponmods array, placed as child to UBGL
-     * @param weaponMods
+     * @param weaponMods Weapon with children
-     * @param ubglMod
+     * @param ubglMod UBGL item
-     * @param ubglAmmoTpl
+     * @param ubglAmmoTpl Grenade ammo tpl
      */
     protected fillUbgl(weaponMods: Item[], ubglMod: Item, ubglAmmoTpl: string): void;
     /**
      * Add cartridge item to weapon Item array, if it already exists, update
-     * @param weaponMods Weapon items array to amend
+     * @param weaponWithMods Weapon items array to amend
      * @param magazine magazine item details we're adding cartridges to
-     * @param chosenAmmo cartridge to put into the magazine
+     * @param chosenAmmoTpl cartridge to put into the magazine
      * @param newStackSize how many cartridges should go into the magazine
+     * @param magazineTemplate magazines db template
      */
-    protected addOrUpdateMagazinesChildWithAmmo(weaponMods: Item[], magazine: Item, chosenAmmo: string, newStackSize: number): void;
+    protected addOrUpdateMagazinesChildWithAmmo(weaponWithMods: Item[], magazine: Item, chosenAmmoTpl: string, magazineTemplate: ITemplateItem): void;
     /**
      * Fill each Camora with a bullet
      * @param weaponMods Weapon mods to find and update camora mod(s) from

TypeScript/11BundleLoadingSample/types/generators/LocationGenerator.d.ts

@@ -2,7 +2,7 @@ import { ContainerHelper } from "../helpers/ContainerHelper";
 import { ItemHelper } from "../helpers/ItemHelper";
 import { PresetHelper } from "../helpers/PresetHelper";
 import { RagfairServerHelper } from "../helpers/RagfairServerHelper";
-import { ILooseLoot, SpawnpointsForced, SpawnpointTemplate } from "../models/eft/common/ILooseLoot";
+import { ILooseLoot, Spawnpoint, SpawnpointsForced, SpawnpointTemplate } from "../models/eft/common/ILooseLoot";
 import { Item } from "../models/eft/common/tables/IItem";
 import { IStaticAmmoDetails, IStaticContainerProps, IStaticForcedProps, IStaticLootDetails } from "../models/eft/common/tables/ILootBase";
 import { ILocationConfig } from "../models/spt/config/ILocationConfig";
@@ -34,6 +34,15 @@ export declare class LocationGenerator {
     protected configServer: ConfigServer;
     protected locationConfig: ILocationConfig;
     constructor(logger: ILogger, jsonUtil: JsonUtil, objectId: ObjectId, randomUtil: RandomUtil, ragfairServerHelper: RagfairServerHelper, itemHelper: ItemHelper, mathUtil: MathUtil, seasonalEventService: SeasonalEventService, containerHelper: ContainerHelper, presetHelper: PresetHelper, localisationService: LocalisationService, configServer: ConfigServer);
+    /**
+     * Choose loot to put into a static container
+     * @param containerIn
+     * @param staticForced
+     * @param staticLootDist
+     * @param staticAmmoDist
+     * @param locationName Name of the map to generate static loot for
+     * @returns IStaticContainerProps
+     */
     generateContainerLoot(containerIn: IStaticContainerProps, staticForced: IStaticForcedProps[], staticLootDist: Record<string, IStaticLootDetails>, staticAmmoDist: Record<string, IStaticAmmoDetails[]>, locationName: string): IStaticContainerProps;
     protected getLooseLootMultiplerForLocation(location: string): number;
     protected getStaticLootMultiplerForLocation(location: string): number;
@@ -52,5 +61,25 @@ export declare class LocationGenerator {
      * @param name of map currently generating forced loot for
      */
     protected addForcedLoot(loot: SpawnpointTemplate[], forcedSpawnPoints: SpawnpointsForced[], locationName: string): void;
-    protected createItem(tpl: string, staticAmmoDist: Record<string, IStaticAmmoDetails[]>, parentId?: string): IContainerItem;
+    /**
+     * Create array of item (with child items) and return
+     * @param chosenComposedKey Key we want to look up items for
+     * @param spawnPoint Dynamic spawn point item we want will be placed in
+     * @returns IContainerItem
+     */
+    protected createDynamicLootItem(chosenComposedKey: string, spawnPoint: Spawnpoint): IContainerItem;
+    /**
+     * Replace the _id value for base item + all children items parentid value
+     * @param itemWithChildren Item with mods to update
+     * @param newId new id to add on chidren of base item
+     */
+    protected reparentItemAndChildren(itemWithChildren: Item[], newId?: string): void;
+    /**
+     * Find an item in array by its _tpl, handle differently if chosenTpl is a weapon
+     * @param items Items array to search
+     * @param chosenTpl Tpl we want to get item with
+     * @returns Item object
+     */
+    protected getItemInArray(items: Item[], chosenTpl: string): Item;
+    protected createStaticLootItem(tpl: string, staticAmmoDist: Record<string, IStaticAmmoDetails[]>, parentId?: string): IContainerItem;
 }

TypeScript/11BundleLoadingSample/types/helpers/BotWeaponGeneratorHelper.d.ts

@@ -65,11 +65,11 @@ export declare class BotWeaponGeneratorHelper {
     /**
      * TODO - move into BotGeneratorHelper, this is not the class for it
      * Adds an item with all its children into specified equipmentSlots, wherever it fits.
-     * @param equipmentSlots
+     * @param equipmentSlots Slot to add item+children into
      * @param parentId
      * @param parentTpl
-     * @param itemWithChildren
+     * @param itemWithChildren Item to add
-     * @param inventory
+     * @param inventory Inventory to add item+children into
      * @returns a `boolean` indicating item was added
      */
     addItemWithChildrenToEquipmentSlot(equipmentSlots: string[], parentId: string, parentTpl: string, itemWithChildren: Item[], inventory: Inventory): boolean;

TypeScript/11BundleLoadingSample/types/helpers/HideoutHelper.d.ts

@@ -140,8 +140,21 @@ export declare class HideoutHelper {
      * @returns coin slot count
      */
     protected getBTCSlots(pmcData: IPmcData): number;
+    /**
+     * Get a count of bitcoins player miner can hold
+     */
     protected getManagementSkillsSlots(): number;
-    protected hasManagementSkillSlots(pmcData: IPmcData): boolean;
+    /**
+     * Does profile have elite hideout management skill
+     * @param pmcData Profile to look at
+     * @returns True if profile has skill
+     */
+    protected hasEliteHideoutManagementSkill(pmcData: IPmcData): boolean;
+    /**
+     * Get the hideout management skill from player profile
+     * @param pmcData Profile to look at
+     * @returns Hideout management skill object
+     */
     protected getHideoutManagementSkill(pmcData: IPmcData): Common;
     protected getHideoutManagementConsumptionBonus(pmcData: IPmcData): number;
     /**

TypeScript/11BundleLoadingSample/types/helpers/InRaidHelper.d.ts

@@ -2,24 +2,35 @@ import { IPmcData } from "../models/eft/common/IPmcData";
 import { Victim } from "../models/eft/common/tables/IBotBase";
 import { Item } from "../models/eft/common/tables/IItem";
 import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData";
+import { ILostOnDeathConfig } from "../models/spt/config/ILostOnDeathConfig";
 import { ILogger } from "../models/spt/utils/ILogger";
+import { ConfigServer } from "../servers/ConfigServer";
 import { DatabaseServer } from "../servers/DatabaseServer";
 import { SaveServer } from "../servers/SaveServer";
 import { LocalisationService } from "../services/LocalisationService";
 import { ProfileFixerService } from "../services/ProfileFixerService";
 import { JsonUtil } from "../utils/JsonUtil";
 import { InventoryHelper } from "./InventoryHelper";
+import { ItemHelper } from "./ItemHelper";
 import { PaymentHelper } from "./PaymentHelper";
 export declare class InRaidHelper {
     protected logger: ILogger;
     protected saveServer: SaveServer;
     protected jsonUtil: JsonUtil;
+    protected itemHelper: ItemHelper;
     protected databaseServer: DatabaseServer;
     protected inventoryHelper: InventoryHelper;
     protected paymentHelper: PaymentHelper;
     protected localisationService: LocalisationService;
     protected profileFixerService: ProfileFixerService;
-    constructor(logger: ILogger, saveServer: SaveServer, jsonUtil: JsonUtil, databaseServer: DatabaseServer, inventoryHelper: InventoryHelper, paymentHelper: PaymentHelper, localisationService: LocalisationService, profileFixerService: ProfileFixerService);
+    protected configServer: ConfigServer;
+    protected lostOnDeathConfig: ILostOnDeathConfig;
+    constructor(logger: ILogger, saveServer: SaveServer, jsonUtil: JsonUtil, itemHelper: ItemHelper, databaseServer: DatabaseServer, inventoryHelper: InventoryHelper, paymentHelper: PaymentHelper, localisationService: LocalisationService, profileFixerService: ProfileFixerService, configServer: ConfigServer);
+    /**
+     * Should quest items be removed from player inventory on death
+     * @returns True if items should be removed from inventory
+     */
+    removeQuestItemsOnDeath(): boolean;
     /**
      * Check an array of items and add an upd object to money items with a stack count of 1
      * Single stack money items have no upd object and thus no StackObjectsCount, causing issues
@@ -83,7 +94,7 @@ export declare class InRaidHelper {
      * Remove equipped items from pre-raid
      * Add new items found in raid to profile
      * Store insurance items in profile
-     * @param sessionID
+     * @param sessionID Session id
      * @param pmcData Profile to update
      * @param postRaidProfile Profile returned by client after a raid
      * @returns Updated profile
@@ -94,15 +105,21 @@ export declare class InRaidHelper {
      * Used post-raid to remove items after death
      * @param pmcData Player profile
      * @param sessionID Session id
-     * @returns Player profile with pmc inventory cleared
      */
-    deleteInventory(pmcData: IPmcData, sessionID: string): IPmcData;
+    deleteInventory(pmcData: IPmcData, sessionID: string): void;
+    /**
+     * Get items in vest/pocket/backpack inventory containers (excluding children)
+     * @param pmcData Player profile
+     * @returns Item array
+     */
+    protected getBaseItemsInRigPocketAndBackpack(pmcData: IPmcData): Item[];
     /**
      * Does the provided items slotId mean its kept on the player after death
-     * @param slotId slotid of item to check
+     * @pmcData Player profile
+     * @itemToCheck Item to check should be kept
      * @returns true if item is kept after death
      */
-    isItemKeptAfterDeath(slotId: string): boolean;
+    protected isItemKeptAfterDeath(pmcData: IPmcData, itemToCheck: Item): boolean;
     /**
      * Return the equipped items from a players inventory
      * @param items Players inventory to search through

TypeScript/11BundleLoadingSample/types/helpers/InventoryHelper.d.ts

@@ -61,12 +61,12 @@ export declare class InventoryHelper {
     /**
      * Add ammo to ammo boxes
      * @param itemToAdd Item to check is ammo box
-     * @param toDo
+     * @param parentId Ammo box parent id
      * @param output IItemEventRouterResponse object
      * @param sessionID Session id
      * @param pmcData Profile to add ammobox to
      */
-    protected hydrateAmmoBoxWithAmmo(pmcData: IPmcData, itemToAdd: IAddItemTempObject, toDo: string[][], sessionID: string, output: IItemEventRouterResponse): void;
+    protected hydrateAmmoBoxWithAmmo(pmcData: IPmcData, itemToAdd: IAddItemTempObject, parentId: string, sessionID: string, output: IItemEventRouterResponse): void;
     /**
      *
      * @param assortItems Items to add to inventory
@@ -111,7 +111,13 @@ export declare class InventoryHelper {
     /**
     * Internal helper function to move item within the same profile_f.
     */
-    moveItemInternal(inventoryItems: Item[], body: IInventoryMoveRequestData): void;
+    moveItemInternal(pmcData: IPmcData, inventoryItems: Item[], moveRequest: IInventoryMoveRequestData): void;
+    /**
+     * Update fast panel bindings when an item is moved into a container that doesnt allow quick slot access
+     * @param pmcData Player profile
+     * @param itemBeingMoved item being moved
+     */
+    protected updateFastPanelBinding(pmcData: IPmcData, itemBeingMoved: Item): void;
     /**
     * Internal helper function to handle cartridges in inventory if any of them exist.
     */

TypeScript/11BundleLoadingSample/types/helpers/ItemHelper.d.ts

@@ -193,31 +193,53 @@ declare class ItemHelper {
     replaceIDs(pmcData: IPmcData, items: Item[], insuredItems?: InsuredItem[], fastPanel?: any): any[];
     /**
      * WARNING, SLOW. Recursively loop down through an items hierarchy to see if any of the ids match the supplied list, return true if any do
-     * @param {string} tpl
+     * @param {string} tpl Items tpl to check parents of
-     * @param {Array} tplsToCheck
+     * @param {Array} tplsToCheck Tpl values to check if parents of item match
-     * @returns boolean
+     * @returns boolean Match found
      */
     doesItemOrParentsIdMatch(tpl: string, tplsToCheck: string[]): boolean;
     /**
-     * Return true if item is a quest item
+     * Check if item is quest item
-     * @param {string} tpl
+     * @param tpl Items tpl to check quest status of
-     * @returns boolean
+     * @returns true if item is flagged as quest item
      */
     isQuestItem(tpl: string): boolean;
     /**
      * Get the inventory size of an item
-     * @param items
+     * @param items Item with children
      * @param rootItemId
      * @returns ItemSize object (width and height)
      */
     getItemSize(items: Item[], rootItemId: string): ItemHelper.ItemSize;
     /**
      * Get a random cartridge from an items Filter property
-     * @param item
+     * @param item Db item template to look up Cartridge filter values from
-     * @returns
+     * @returns Caliber of cartridge
      */
     getRandomCompatibleCaliberTemplateId(item: ITemplateItem): string;
-    createRandomMagCartridges(magTemplate: ITemplateItem, parentId: string, staticAmmoDist: Record<string, IStaticAmmoDetails[]>, caliber?: string): Item;
+    /**
+     * Add cartridges to the ammo box with correct max stack sizes
+     * @param ammoBox Box to add cartridges to
+     * @param ammoBoxDetails Item template from items db
+     */
+    addCartridgesToAmmoBox(ammoBox: Item[], ammoBoxDetails: ITemplateItem): void;
+    /**
+     * Add child items (cartridges) to a magazine
+     * @param magazine Magazine to add child items to
+     * @param magTemplate Db template of magazine
+     * @param staticAmmoDist Cartridge distribution
+     * @param caliber Caliber of cartridge to add to magazine
+     * @param minSizePercent % the magazine must be filled to
+     */
+    fillMagazineWithRandomCartridge(magazine: Item[], magTemplate: ITemplateItem, staticAmmoDist: Record<string, IStaticAmmoDetails[]>, caliber?: string, minSizePercent?: number): void;
+    /**
+     * Add child items to a magazine of a specific cartridge
+     * @param magazine Magazine to add child items to
+     * @param magTemplate Db template of magazine
+     * @param cartridgeTpl Cartridge to add to magazine
+     * @param minSizePercent % the magazine must be filled to
+     */
+    fillMagazineWithCartridge(magazine: Item[], magTemplate: ITemplateItem, cartridgeTpl: string, minSizePercent?: number): void;
     protected getRandomValidCaliber(magTemplate: ITemplateItem): string;
     protected drawAmmoTpl(caliber: string, staticAmmoDist: Record<string, IStaticAmmoDetails[]>): string;
     /**

TypeScript/11BundleLoadingSample/types/helpers/ProfileHelper.d.ts

@@ -20,7 +20,12 @@ export declare class ProfileHelper {
     protected itemHelper: ItemHelper;
     protected profileSnapshotService: ProfileSnapshotService;
     constructor(logger: ILogger, jsonUtil: JsonUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileSnapshotService: ProfileSnapshotService);
-    resetProfileQuestCondition(sessionID: string, conditionId: string): void;
+    /**
+     * Remove/reset started quest condtions in player profile
+     * @param sessionID Session id
+     * @param conditionIds Condition ids that need to be reset/removed
+     */
+    resetProfileQuestCondition(sessionID: string, conditionIds: string[]): void;
     /**
      * Get all profiles from server
      * @returns Dictionary of profiles

TypeScript/11BundleLoadingSample/types/helpers/QuestHelper.d.ts

@@ -211,7 +211,7 @@ export declare class QuestHelper {
      * @param itemTpl item tpl to look for
      * @returns 'FindItem' condition id
      */
-    getFindItemIdForQuestHandIn(itemTpl: string): string;
+    getFindItemIdForQuestHandIn(itemTpl: string): string[];
     /**
      * Add all quests to a profile with the provided statuses
      * @param pmcProfile profile to update

TypeScript/11BundleLoadingSample/types/loaders/PostAkiModLoader.d.ts

@@ -1,15 +1,19 @@
 import { DependencyContainer } from "tsyringe";
 import { IModLoader } from "../models/spt/mod/IModLoader";
+import { ILogger } from "../models/spt/utils/ILogger";
+import { LocalisationService } from "../services/LocalisationService";
 import { VFS } from "../utils/VFS";
 import { BundleLoader } from "./BundleLoader";
 import { ModTypeCheck } from "./ModTypeCheck";
 import { PreAkiModLoader } from "./PreAkiModLoader";
 export declare class PostAkiModLoader implements IModLoader {
+    protected logger: ILogger;
     protected bundleLoader: BundleLoader;
     protected vfs: VFS;
     protected preAkiModLoader: PreAkiModLoader;
+    protected localisationService: LocalisationService;
     protected modTypeCheck: ModTypeCheck;
-    constructor(bundleLoader: BundleLoader, vfs: VFS, preAkiModLoader: PreAkiModLoader, modTypeCheck: ModTypeCheck);
+    constructor(logger: ILogger, bundleLoader: BundleLoader, vfs: VFS, preAkiModLoader: PreAkiModLoader, localisationService: LocalisationService, modTypeCheck: ModTypeCheck);
     getModPath(mod: string): string;
     load(): Promise<void>;
     protected executeMods(container: DependencyContainer): Promise<void>;

TypeScript/11BundleLoadingSample/types/loaders/PostDBModLoader.d.ts

@@ -1,11 +1,15 @@
 import { DependencyContainer } from "tsyringe";
 import { OnLoad } from "../di/OnLoad";
+import { ILogger } from "../models/spt/utils/ILogger";
+import { LocalisationService } from "../services/LocalisationService";
 import { ModTypeCheck } from "./ModTypeCheck";
 import { PreAkiModLoader } from "./PreAkiModLoader";
 export declare class PostDBModLoader implements OnLoad {
+    protected logger: ILogger;
     protected preAkiModLoader: PreAkiModLoader;
+    protected localisationService: LocalisationService;
     protected modTypeCheck: ModTypeCheck;
-    constructor(preAkiModLoader: PreAkiModLoader, modTypeCheck: ModTypeCheck);
+    constructor(logger: ILogger, preAkiModLoader: PreAkiModLoader, localisationService: LocalisationService, modTypeCheck: ModTypeCheck);
     onLoad(): Promise<void>;
     getRoute(): string;
     getModPath(mod: string): string;

TypeScript/11BundleLoadingSample/types/models/eft/common/IGlobals.d.ts

@@ -70,6 +70,7 @@ export interface Config {
     EventType: string[];
     WalkSpeed: xyz;
     SprintSpeed: xyz;
+    SquadSettings: ISquadSettings;
     SkillEnduranceWeightThreshold: number;
     TeamSearchingTimeout: number;
     Insurance: Insurance;
@@ -803,6 +804,11 @@ export interface RestrictionsInRaid {
     TemplateId: string;
     Value: number;
 }
+export interface ISquadSettings {
+    CountOfRequestsToOnePlayer: number;
+    SecondsForExpiredRequest: number;
+    SendRequestDelaySeconds: number;
+}
 export interface Insurance {
     MaxStorageTimeInHour: number;
 }

TypeScript/11BundleLoadingSample/types/models/eft/common/ILooseLoot.d.ts

@@ -37,6 +37,9 @@ export interface Xyz {
     z: number;
 }
 export interface ItemDistribution {
-    tpl: string;
+    composedKey: ComposedKey;
     relativeProbability: number;
 }
+export interface ComposedKey {
+    key: string;
+}

TypeScript/11BundleLoadingSample/types/models/eft/common/tables/IBotBase.d.ts

@@ -120,9 +120,7 @@ export interface Inventory {
     sortingTable: string;
     questRaidItems: string;
     questStashItems: string;
-    fastPanel: FastPanel;
+    fastPanel: Record<string, string>;
-}
-export interface FastPanel {
 }
 export interface Skills {
     Common: Common[];

TypeScript/11BundleLoadingSample/types/models/eft/match/IEndOfflineRaidRequestData.d.ts

@@ -1,6 +1,6 @@
 export interface IEndOfflineRaidRequestData {
     crc: number;
     exitStatus: string;
-    exitName: any;
+    exitName: string;
     raidSeconds: number;
 }

TypeScript/11BundleLoadingSample/types/models/eft/match/IGetRaidConfigurationRequestData.d.ts

@@ -1,4 +1,7 @@
 export interface IGetRaidConfigurationRequestData {
+    keyId: string;
+    side: string;
+    location: string;
     timeVariant: string;
     raidMode: string;
     metabolismDisabled: boolean;
@@ -6,7 +9,6 @@ export interface IGetRaidConfigurationRequestData {
     timeAndWeatherSettings: TimeAndWeatherSettings;
     botSettings: BotSettings;
     wavesSettings: WavesSettings;
-    location: string;
 }
 export interface TimeAndWeatherSettings {
     isRandomTime: boolean;

TypeScript/11BundleLoadingSample/types/models/eft/presetBuild/IPresetBuildActionRequestData.d.ts

@@ -1,3 +1,4 @@
+import { Upd } from "../common/tables/IItem";
 export interface IPresetBuildActionRequestData {
     Action: string;
     id: string;
@@ -12,14 +13,3 @@ export interface Item {
     parentId?: string;
     slotId?: string;
 }
-export interface Upd {
-    Repairable: Repairable;
-    FireMode: FireMode;
-}
-export interface Repairable {
-    MaxDurability: number;
-    Durability: number;
-}
-export interface FireMode {
-    FireMode: string;
-}

TypeScript/11BundleLoadingSample/types/models/eft/profile/IGetProfileSettingsRequest.d.ts

@@ -0,0 +1,3 @@
+export interface IGetProfileSettingsRequest {
+    squadInviteRestriction: boolean;
+}

TypeScript/11BundleLoadingSample/types/models/enums/ConfigTypes.d.ts

@@ -19,5 +19,6 @@ export declare enum ConfigTypes {
     SCAVCASE = "aki-scavcase",
     TRADER = "aki-trader",
     WEATHER = "aki-weather",
-    SEASONAL_EVENT = "aki-seasonalevents"
+    SEASONAL_EVENT = "aki-seasonalevents",
+    LOST_ON_DEATH = "aki-lostondeath"
 }

TypeScript/11BundleLoadingSample/types/models/spt/config/IHttpConfig.d.ts

@@ -4,4 +4,5 @@ export interface IHttpConfig extends IBaseConfig {
     kind: "aki-http";
     ip: string;
     port: number;
+    logRequests: boolean;
 }

TypeScript/11BundleLoadingSample/types/models/spt/config/ILocationConfig.d.ts

@@ -2,9 +2,9 @@ import { BossLocationSpawn, Wave } from "../../../models/eft/common/ILocationBas
 import { IBaseConfig } from "./IBaseConfig";
 export interface ILocationConfig extends IBaseConfig {
     kind: "aki-location";
-    fixEmptyBotWaves: boolean;
+    fixEmptyBotWavesSettings: IFixEmptyBotWavesSettings;
-    fixRoguesTakingAllSpawnsOnLighthouse: boolean;
+    rogueLighthouseSpawnTimeSettings: IRogueLighthouseSpawnTimeSettings;
-    lighthouseRogueSpawnTimeSeconds: number;
+    splitWaveIntoSingleSpawnsSettings: ISplitWaveSettings;
     looseLootMultiplier: LootMultiplier;
     staticLootMultiplier: LootMultiplier;
     customWaves: CustomWaves;
@@ -12,6 +12,21 @@ export interface ILocationConfig extends IBaseConfig {
     openZones: Record<string, string[]>;
     /** Key = map id, value = item tpls that should only have one forced loot spawn position */
     forcedLootSingleSpawnById: Record<string, string[]>;
+    /** How many attempts should be taken to fit an item into a container before giving up */
+    fitLootIntoContainerAttempts: number;
+}
+export interface IFixEmptyBotWavesSettings {
+    enabled: boolean;
+    ignoreMaps: string[];
+}
+export interface IRogueLighthouseSpawnTimeSettings {
+    enabled: boolean;
+    waitTimeSeconds: number;
+}
+export interface ISplitWaveSettings {
+    enabled: boolean;
+    ignoreMaps: string[];
+    waveSizeThreshold: number;
 }
 export interface CustomWaves {
     boss: Record<string, BossLocationSpawn[]>;

TypeScript/11BundleLoadingSample/types/models/spt/config/ILostOnDeathConfig.d.ts

@@ -0,0 +1,21 @@
+import { IBaseConfig } from "./IBaseConfig";
+export interface ILostOnDeathConfig extends IBaseConfig {
+    kind: "aki-lostondeath";
+    equipment: Equipment;
+    specialSlotItems: boolean;
+    questItems: boolean;
+}
+export interface Equipment {
+    ArmBand: boolean;
+    Headwear: boolean;
+    Earpiece: boolean;
+    FaceCover: boolean;
+    ArmorVest: boolean;
+    Eyewear: boolean;
+    TacticalVest: boolean;
+    Backpack: boolean;
+    Holster: boolean;
+    FirstPrimaryWeapon: boolean;
+    SecondPrimaryWeapon: boolean;
+    Scabbard: boolean;
+}

TypeScript/11BundleLoadingSample/types/models/spt/config/ITraderConfig.d.ts

@@ -3,6 +3,7 @@ import { IBaseConfig } from "./IBaseConfig";
 export interface ITraderConfig extends IBaseConfig {
     kind: "aki-trader";
     updateTime: UpdateTime[];
+    purchasesAreFoundInRaid: boolean;
     updateTimeDefault: number;
     traderPriceMultipler: number;
     persistPurchaseDataInProfile: boolean;

TypeScript/11BundleLoadingSample/types/models/spt/mod/NewItemDetails.d.ts

@@ -4,6 +4,8 @@ export declare abstract class NewItemDetailsBase {
     fleaPriceRoubles: number;
     /** Price of the item in the handbook */
     handbookPriceRoubles: number;
+    /** Handbook ParentId for the new item */
+    handbookParentId: string;
     /**
      * A dictionary for locale settings, key = langauge (e.g. en,cn,es-mx,jp,fr)
      * If a language is not included, the first item in the array will be used in its place

TypeScript/11BundleLoadingSample/types/services/InsuranceService.d.ts

@@ -63,8 +63,16 @@ export declare class InsuranceService {
      * @param offraidData post-raid request object
      * @param preRaidGear gear player wore prior to raid
      * @param sessionID Session id
+     * @param playerDied did the player die in raid
+     */
+    storeLostGear(pmcData: IPmcData, offraidData: ISaveProgressRequestData, preRaidGear: Item[], sessionID: string, playerDied: boolean): void;
+    /**
+     * Store insured items on pmc death inside insurance array in player profile
+     * @param pmcData Player profile
+     * @param offraidData Player gear post-raid
+     * @param preRaidGear Player gear before raid
+     * @param sessionID Session id
      */
-    storeLostGear(pmcData: IPmcData, offraidData: ISaveProgressRequestData, preRaidGear: Item[], sessionID: string): void;
     storeInsuredItemsForReturn(pmcData: IPmcData, offraidData: ISaveProgressRequestData, preRaidGear: Item[], sessionID: string): void;
     /**
      * Add gear item to InsuredItems array in player profile

TypeScript/12ClassExtensionOverride/types/callbacks/GameCallbacks.d.ts

@@ -39,6 +39,7 @@ declare class GameCallbacks {
      */
     getGameConfig(url: string, info: IGameEmptyCrcRequestData, sessionID: string): IGetBodyResponseData<IGameConfigResponse>;
     getServer(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IServerDetails[]>;
+    getCurrentGroup(url: string, info: IEmptyRequestData, sessionID: string): any;
     validateGameVersion(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<ICheckVersionResponse>;
     /**
      * Handle client/game/keepalive

TypeScript/12ClassExtensionOverride/types/callbacks/ProfileCallbacks.d.ts

@@ -5,6 +5,7 @@ import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyRespons
 import { INullResponseData } from "../models/eft/httpResponse/INullResponseData";
 import { IGetMiniProfileRequestData } from "../models/eft/launcher/IGetMiniProfileRequestData";
 import { GetProfileStatusResponseData } from "../models/eft/profile/GetProfileStatusResponseData";
+import { IGetProfileSettingsRequest } from "../models/eft/profile/IGetProfileSettingsRequest";
 import { IProfileChangeNicknameRequestData } from "../models/eft/profile/IProfileChangeNicknameRequestData";
 import { IProfileChangeVoiceRequestData } from "../models/eft/profile/IProfileChangeVoiceRequestData";
 import { IProfileCreateRequestData } from "../models/eft/profile/IProfileCreateRequestData";
@@ -64,6 +65,7 @@ export declare class ProfileCallbacks {
      * @returns
      */
     getProfileStatus(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<GetProfileStatusResponseData>;
+    getProfileSettings(url: string, info: IGetProfileSettingsRequest, sessionId: string): IGetBodyResponseData<string>;
     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;

TypeScript/12ClassExtensionOverride/types/context/ApplicationContext.d.ts

@@ -8,6 +8,8 @@ export declare class ApplicationContext {
      *
      * const registerPlayerInfo = this.applicationContext.getLatestValue(ContextVariableType.REGISTER_PLAYER_REQUEST).getValue<IRegisterPlayerRequestData>();
      *
+     * const activePlayerSessionId = this.applicationContext.getLatestValue(ContextVariableType.SESSION_ID).getValue<string>();
+     *
      * const matchInfo = this.applicationContext.getLatestValue(ContextVariableType.MATCH_INFO).getValue<IStartOfflineRaidRequestData>();
      * @param type
      * @returns

TypeScript/12ClassExtensionOverride/types/controllers/GameController.d.ts

@@ -20,10 +20,12 @@ import { LocalisationService } from "../services/LocalisationService";
 import { OpenZoneService } from "../services/OpenZoneService";
 import { ProfileFixerService } from "../services/ProfileFixerService";
 import { SeasonalEventService } from "../services/SeasonalEventService";
+import { JsonUtil } from "../utils/JsonUtil";
 import { TimeUtil } from "../utils/TimeUtil";
 export declare class GameController {
     protected logger: ILogger;
     protected databaseServer: DatabaseServer;
+    protected jsonUtil: JsonUtil;
     protected timeUtil: TimeUtil;
     protected preAkiModLoader: PreAkiModLoader;
     protected httpServerHelper: HttpServerHelper;
@@ -39,7 +41,7 @@ export declare class GameController {
     protected httpConfig: IHttpConfig;
     protected coreConfig: ICoreConfig;
     protected locationConfig: ILocationConfig;
-    constructor(logger: ILogger, databaseServer: DatabaseServer, timeUtil: TimeUtil, preAkiModLoader: PreAkiModLoader, httpServerHelper: HttpServerHelper, hideoutHelper: HideoutHelper, profileHelper: ProfileHelper, profileFixerService: ProfileFixerService, localisationService: LocalisationService, customLocationWaveService: CustomLocationWaveService, openZoneService: OpenZoneService, seasonalEventService: SeasonalEventService, applicationContext: ApplicationContext, configServer: ConfigServer);
+    constructor(logger: ILogger, databaseServer: DatabaseServer, jsonUtil: JsonUtil, timeUtil: TimeUtil, preAkiModLoader: PreAkiModLoader, httpServerHelper: HttpServerHelper, hideoutHelper: HideoutHelper, profileHelper: ProfileHelper, profileFixerService: ProfileFixerService, localisationService: LocalisationService, customLocationWaveService: CustomLocationWaveService, openZoneService: OpenZoneService, seasonalEventService: SeasonalEventService, applicationContext: ApplicationContext, configServer: ConfigServer);
     gameStart(_url: string, _info: IEmptyRequestData, sessionID: string, startTimeStampMS: number): void;
     /**
      * When player logs in, iterate over all active effects and reduce timer
@@ -55,6 +57,10 @@ export declare class GameController {
      * Make Rogues spawn later to allow for scavs to spawn first instead of rogues filling up all spawn positions
      */
     protected fixRoguesSpawningInstantlyOnLighthouse(): void;
+    /**
+     * Find and split waves with large numbers of bots into smaller waves - BSG appears to reduce the size of these waves to one bot when they're waiting to spawn for too long
+     */
+    protected splitBotWavesIntoSingleWaves(): void;
     /**
      * Get a list of installed mods and save their details to the profile being used
      * @param fullProfile Profile to add mod details to
@@ -76,5 +82,6 @@ export declare class GameController {
     protected logProfileDetails(fullProfile: IAkiProfile): void;
     getGameConfig(sessionID: string): IGameConfigResponse;
     getServer(): IServerDetails[];
+    getCurrentGroup(sessionId: any): any;
     getValidGameVersion(): ICheckVersionResponse;
 }

TypeScript/12ClassExtensionOverride/types/controllers/InraidController.d.ts

@@ -61,18 +61,18 @@ export declare class InraidController {
      */
     protected savePmcProgress(sessionID: string, offraidData: ISaveProgressRequestData): void;
     /**
-     * Make changes to pmc profile after they left raid dead,
+     * Make changes to pmc profile after they've died in raid,
-     * alter bodypart hp, handle insurance, delete inventory items, remove carried quest items
+     * Alter bodypart hp, handle insurance, delete inventory items, remove carried quest items
-     * @param postRaidSaveRequest post-raid save request
+     * @param postRaidSaveRequest Post-raid save request
-     * @param pmcData pmc profile
+     * @param pmcData Pmc profile
-     * @param insuranceEnabled is insurance enabled
+     * @param insuranceEnabled Is insurance enabled
-     * @param preRaidGear gear player had before raid
+     * @param preRaidGear Gear player had before raid
      * @param sessionID Session id
      * @returns Updated profile object
      */
     protected performPostRaidActionsWhenDead(postRaidSaveRequest: ISaveProgressRequestData, pmcData: IPmcData, insuranceEnabled: boolean, preRaidGear: Item[], sessionID: string): IPmcData;
     /**
-     * Adjust player characters bodypart hp if they left raid early
+     * Adjust player characters bodypart hp post-raid
      * @param postRaidSaveRequest post raid data
      * @param pmcData player profile
      */

TypeScript/12ClassExtensionOverride/types/controllers/InventoryController.d.ts

@@ -112,7 +112,14 @@ export declare class InventoryController {
      * @returns client response object
      */
     tagItem(pmcData: IPmcData, body: IInventoryTagRequestData, sessionID: string): IItemEventRouterResponse;
-    bindItem(pmcData: IPmcData, body: IInventoryBindRequestData, sessionID: string): IItemEventRouterResponse;
+    /**
+     * Bind an inventory item to the quick access menu at bottom of player screen
+     * @param pmcData Player profile
+     * @param bindRequest Reqeust object
+     * @param sessionID Session id
+     * @returns IItemEventRouterResponse
+     */
+    bindItem(pmcData: IPmcData, bindRequest: IInventoryBindRequestData, sessionID: string): IItemEventRouterResponse;
     /**
      * Handles examining an item
      * @param pmcData player profile
@@ -137,9 +144,36 @@ export declare class InventoryController {
      * @returns IItemEventRouterResponse
      */
     sortInventory(pmcData: IPmcData, request: IInventorySortRequestData, sessionID: string): IItemEventRouterResponse;
-    createMapMarker(pmcData: IPmcData, body: IInventoryCreateMarkerRequestData, sessionID: string): IItemEventRouterResponse;
+    /**
-    deleteMapMarker(pmcData: IPmcData, body: IInventoryDeleteMarkerRequestData, sessionID: string): IItemEventRouterResponse;
+     * Add note to a map
-    editMapMarker(pmcData: IPmcData, body: IInventoryEditMarkerRequestData, sessionID: string): IItemEventRouterResponse;
+     * @param pmcData Player profile
+     * @param request Add marker request
+     * @param sessionID Session id
+     * @returns IItemEventRouterResponse
+     */
+    createMapMarker(pmcData: IPmcData, request: IInventoryCreateMarkerRequestData, sessionID: string): IItemEventRouterResponse;
+    /**
+     * Delete a map marker
+     * @param pmcData Player profile
+     * @param request Delete marker request
+     * @param sessionID Session id
+     * @returns IItemEventRouterResponse
+     */
+    deleteMapMarker(pmcData: IPmcData, request: IInventoryDeleteMarkerRequestData, sessionID: string): IItemEventRouterResponse;
+    /**
+     * Edit an existing map marker
+     * @param pmcData Player profile
+     * @param request Edit marker request
+     * @param sessionID Session id
+     * @returns IItemEventRouterResponse
+     */
+    editMapMarker(pmcData: IPmcData, request: IInventoryEditMarkerRequestData, sessionID: string): IItemEventRouterResponse;
+    /**
+     * Strip out characters from note string that are not: letter/numbers/unicode/spaces
+     * @param mapNoteText Marker text to sanitise
+     * @returns Sanitised map marker text
+     */
+    protected sanitiseMapMarkerText(mapNoteText: string): string;
     /**
      * Handle event fired when a container is unpacked (currently only the halloween pumpkin)
      * @param pmcData Profile data

TypeScript/12ClassExtensionOverride/types/controllers/TradeController.d.ts

@@ -7,6 +7,7 @@ import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRout
 import { IProcessBaseTradeRequestData } from "../models/eft/trade/IProcessBaseTradeRequestData";
 import { IProcessRagfairTradeRequestData } from "../models/eft/trade/IProcessRagfairTradeRequestData";
 import { IRagfairConfig } from "../models/spt/config/IRagfairConfig";
+import { ITraderConfig } from "../models/spt/config/ITraderConfig";
 import { ILogger } from "../models/spt/utils/ILogger";
 import { EventOutputHolder } from "../routers/EventOutputHolder";
 import { ConfigServer } from "../servers/ConfigServer";
@@ -24,8 +25,10 @@ declare class TradeController {
     protected localisationService: LocalisationService;
     protected configServer: ConfigServer;
     protected ragfairConfig: IRagfairConfig;
+    protected traderConfig: ITraderConfig;
     constructor(logger: ILogger, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, itemHelper: ItemHelper, profileHelper: ProfileHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil, localisationService: LocalisationService, configServer: ConfigServer);
-    confirmTrading(pmcData: IPmcData, body: IProcessBaseTradeRequestData, sessionID: string, foundInRaid?: boolean, upd?: Upd): IItemEventRouterResponse;
+    confirmTrading(pmcData: IPmcData, request: IProcessBaseTradeRequestData, sessionID: string): IItemEventRouterResponse;
     confirmRagfairTrading(pmcData: IPmcData, body: IProcessRagfairTradeRequestData, sessionID: string): IItemEventRouterResponse;
+    protected confirmTradingInternal(pmcData: IPmcData, body: IProcessBaseTradeRequestData, sessionID: string, foundInRaid?: boolean, upd?: Upd): IItemEventRouterResponse;
 }
 export { TradeController };

TypeScript/12ClassExtensionOverride/types/generators/BotLootGenerator.d.ts

@@ -5,7 +5,7 @@ import { ItemHelper } from "../helpers/ItemHelper";
 import { Inventory as PmcInventory } from "../models/eft/common/tables/IBotBase";
 import { Chances, Inventory, ItemMinMax, ModsChances } from "../models/eft/common/tables/IBotType";
 import { Item } from "../models/eft/common/tables/IItem";
-import { ITemplateItem, Props } from "../models/eft/common/tables/ITemplateItem";
+import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem";
 import { IBotConfig } from "../models/spt/config/IBotConfig";
 import { ILogger } from "../models/spt/utils/ILogger";
 import { ConfigServer } from "../servers/ConfigServer";
@@ -96,19 +96,6 @@ export declare class BotLootGenerator {
      * @returns true if item has reached spawn limit
      */
     protected itemHasReachedSpawnLimit(itemTemplate: ITemplateItem, botRole: string, isPmc: boolean, limitCount: Record<string, number>, itemSpawnLimits: Record<string, number>): boolean;
-    /**
-     * Is the item an ammo box
-     * @param props props of the item to check
-     * @returns true if item is an ammo box
-     */
-    protected isAmmoBox(props: Props): boolean;
-    /**
-     * Create an object that contains the ammo stack for an ammo box
-     * @param parentId ammo box id
-     * @param props ammo box props
-     * @returns Item object
-     */
-    protected createAmmoForAmmoBox(parentId: string, props: Props): Item;
     /**
      * Randomise the stack size of a money object, uses different values for pmc or scavs
      * @param isPmc is this a PMC

TypeScript/12ClassExtensionOverride/types/generators/BotWeaponGenerator.d.ts

@@ -140,26 +140,27 @@ export declare class BotWeaponGenerator {
     protected getWeaponCaliber(weaponTemplate: ITemplateItem): string;
     /**
      * Fill existing magazines to full, while replacing their contents with specified ammo
-     * @param weaponMods
+     * @param weaponMods Weapon with children
-     * @param magazine
+     * @param magazine Magazine item
-     * @param ammoTpl
+     * @param cartridgeTpl Cartridge to insert into magazine
      */
-    protected fillExistingMagazines(weaponMods: Item[], magazine: Item, ammoTpl: string): void;
+    protected fillExistingMagazines(weaponMods: Item[], magazine: Item, cartridgeTpl: string): void;
     /**
      * Add desired ammo tpl as item to weaponmods array, placed as child to UBGL
-     * @param weaponMods
+     * @param weaponMods Weapon with children
-     * @param ubglMod
+     * @param ubglMod UBGL item
-     * @param ubglAmmoTpl
+     * @param ubglAmmoTpl Grenade ammo tpl
      */
     protected fillUbgl(weaponMods: Item[], ubglMod: Item, ubglAmmoTpl: string): void;
     /**
      * Add cartridge item to weapon Item array, if it already exists, update
-     * @param weaponMods Weapon items array to amend
+     * @param weaponWithMods Weapon items array to amend
      * @param magazine magazine item details we're adding cartridges to
-     * @param chosenAmmo cartridge to put into the magazine
+     * @param chosenAmmoTpl cartridge to put into the magazine
      * @param newStackSize how many cartridges should go into the magazine
+     * @param magazineTemplate magazines db template
      */
-    protected addOrUpdateMagazinesChildWithAmmo(weaponMods: Item[], magazine: Item, chosenAmmo: string, newStackSize: number): void;
+    protected addOrUpdateMagazinesChildWithAmmo(weaponWithMods: Item[], magazine: Item, chosenAmmoTpl: string, magazineTemplate: ITemplateItem): void;
     /**
      * Fill each Camora with a bullet
      * @param weaponMods Weapon mods to find and update camora mod(s) from

TypeScript/12ClassExtensionOverride/types/generators/LocationGenerator.d.ts

@@ -2,7 +2,7 @@ import { ContainerHelper } from "../helpers/ContainerHelper";
 import { ItemHelper } from "../helpers/ItemHelper";
 import { PresetHelper } from "../helpers/PresetHelper";
 import { RagfairServerHelper } from "../helpers/RagfairServerHelper";
-import { ILooseLoot, SpawnpointsForced, SpawnpointTemplate } from "../models/eft/common/ILooseLoot";
+import { ILooseLoot, Spawnpoint, SpawnpointsForced, SpawnpointTemplate } from "../models/eft/common/ILooseLoot";
 import { Item } from "../models/eft/common/tables/IItem";
 import { IStaticAmmoDetails, IStaticContainerProps, IStaticForcedProps, IStaticLootDetails } from "../models/eft/common/tables/ILootBase";
 import { ILocationConfig } from "../models/spt/config/ILocationConfig";
@@ -34,6 +34,15 @@ export declare class LocationGenerator {
     protected configServer: ConfigServer;
     protected locationConfig: ILocationConfig;
     constructor(logger: ILogger, jsonUtil: JsonUtil, objectId: ObjectId, randomUtil: RandomUtil, ragfairServerHelper: RagfairServerHelper, itemHelper: ItemHelper, mathUtil: MathUtil, seasonalEventService: SeasonalEventService, containerHelper: ContainerHelper, presetHelper: PresetHelper, localisationService: LocalisationService, configServer: ConfigServer);
+    /**
+     * Choose loot to put into a static container
+     * @param containerIn
+     * @param staticForced
+     * @param staticLootDist
+     * @param staticAmmoDist
+     * @param locationName Name of the map to generate static loot for
+     * @returns IStaticContainerProps
+     */
     generateContainerLoot(containerIn: IStaticContainerProps, staticForced: IStaticForcedProps[], staticLootDist: Record<string, IStaticLootDetails>, staticAmmoDist: Record<string, IStaticAmmoDetails[]>, locationName: string): IStaticContainerProps;
     protected getLooseLootMultiplerForLocation(location: string): number;
     protected getStaticLootMultiplerForLocation(location: string): number;
@@ -52,5 +61,25 @@ export declare class LocationGenerator {
      * @param name of map currently generating forced loot for
      */
     protected addForcedLoot(loot: SpawnpointTemplate[], forcedSpawnPoints: SpawnpointsForced[], locationName: string): void;
-    protected createItem(tpl: string, staticAmmoDist: Record<string, IStaticAmmoDetails[]>, parentId?: string): IContainerItem;
+    /**
+     * Create array of item (with child items) and return
+     * @param chosenComposedKey Key we want to look up items for
+     * @param spawnPoint Dynamic spawn point item we want will be placed in
+     * @returns IContainerItem
+     */
+    protected createDynamicLootItem(chosenComposedKey: string, spawnPoint: Spawnpoint): IContainerItem;
+    /**
+     * Replace the _id value for base item + all children items parentid value
+     * @param itemWithChildren Item with mods to update
+     * @param newId new id to add on chidren of base item
+     */
+    protected reparentItemAndChildren(itemWithChildren: Item[], newId?: string): void;
+    /**
+     * Find an item in array by its _tpl, handle differently if chosenTpl is a weapon
+     * @param items Items array to search
+     * @param chosenTpl Tpl we want to get item with
+     * @returns Item object
+     */
+    protected getItemInArray(items: Item[], chosenTpl: string): Item;
+    protected createStaticLootItem(tpl: string, staticAmmoDist: Record<string, IStaticAmmoDetails[]>, parentId?: string): IContainerItem;
 }

TypeScript/12ClassExtensionOverride/types/helpers/BotWeaponGeneratorHelper.d.ts

@@ -65,11 +65,11 @@ export declare class BotWeaponGeneratorHelper {
     /**
      * TODO - move into BotGeneratorHelper, this is not the class for it
      * Adds an item with all its children into specified equipmentSlots, wherever it fits.
-     * @param equipmentSlots
+     * @param equipmentSlots Slot to add item+children into
      * @param parentId
      * @param parentTpl
-     * @param itemWithChildren
+     * @param itemWithChildren Item to add
-     * @param inventory
+     * @param inventory Inventory to add item+children into
      * @returns a `boolean` indicating item was added
      */
     addItemWithChildrenToEquipmentSlot(equipmentSlots: string[], parentId: string, parentTpl: string, itemWithChildren: Item[], inventory: Inventory): boolean;

TypeScript/12ClassExtensionOverride/types/helpers/HideoutHelper.d.ts

@@ -140,8 +140,21 @@ export declare class HideoutHelper {
      * @returns coin slot count
      */
     protected getBTCSlots(pmcData: IPmcData): number;
+    /**
+     * Get a count of bitcoins player miner can hold
+     */
     protected getManagementSkillsSlots(): number;
-    protected hasManagementSkillSlots(pmcData: IPmcData): boolean;
+    /**
+     * Does profile have elite hideout management skill
+     * @param pmcData Profile to look at
+     * @returns True if profile has skill
+     */
+    protected hasEliteHideoutManagementSkill(pmcData: IPmcData): boolean;
+    /**
+     * Get the hideout management skill from player profile
+     * @param pmcData Profile to look at
+     * @returns Hideout management skill object
+     */
     protected getHideoutManagementSkill(pmcData: IPmcData): Common;
     protected getHideoutManagementConsumptionBonus(pmcData: IPmcData): number;
     /**

TypeScript/12ClassExtensionOverride/types/helpers/InRaidHelper.d.ts

@@ -2,24 +2,35 @@ import { IPmcData } from "../models/eft/common/IPmcData";
 import { Victim } from "../models/eft/common/tables/IBotBase";
 import { Item } from "../models/eft/common/tables/IItem";
 import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData";
+import { ILostOnDeathConfig } from "../models/spt/config/ILostOnDeathConfig";
 import { ILogger } from "../models/spt/utils/ILogger";
+import { ConfigServer } from "../servers/ConfigServer";
 import { DatabaseServer } from "../servers/DatabaseServer";
 import { SaveServer } from "../servers/SaveServer";
 import { LocalisationService } from "../services/LocalisationService";
 import { ProfileFixerService } from "../services/ProfileFixerService";
 import { JsonUtil } from "../utils/JsonUtil";
 import { InventoryHelper } from "./InventoryHelper";
+import { ItemHelper } from "./ItemHelper";
 import { PaymentHelper } from "./PaymentHelper";
 export declare class InRaidHelper {
     protected logger: ILogger;
     protected saveServer: SaveServer;
     protected jsonUtil: JsonUtil;
+    protected itemHelper: ItemHelper;
     protected databaseServer: DatabaseServer;
     protected inventoryHelper: InventoryHelper;
     protected paymentHelper: PaymentHelper;
     protected localisationService: LocalisationService;
     protected profileFixerService: ProfileFixerService;
-    constructor(logger: ILogger, saveServer: SaveServer, jsonUtil: JsonUtil, databaseServer: DatabaseServer, inventoryHelper: InventoryHelper, paymentHelper: PaymentHelper, localisationService: LocalisationService, profileFixerService: ProfileFixerService);
+    protected configServer: ConfigServer;
+    protected lostOnDeathConfig: ILostOnDeathConfig;
+    constructor(logger: ILogger, saveServer: SaveServer, jsonUtil: JsonUtil, itemHelper: ItemHelper, databaseServer: DatabaseServer, inventoryHelper: InventoryHelper, paymentHelper: PaymentHelper, localisationService: LocalisationService, profileFixerService: ProfileFixerService, configServer: ConfigServer);
+    /**
+     * Should quest items be removed from player inventory on death
+     * @returns True if items should be removed from inventory
+     */
+    removeQuestItemsOnDeath(): boolean;
     /**
      * Check an array of items and add an upd object to money items with a stack count of 1
      * Single stack money items have no upd object and thus no StackObjectsCount, causing issues
@@ -83,7 +94,7 @@ export declare class InRaidHelper {
      * Remove equipped items from pre-raid
      * Add new items found in raid to profile
      * Store insurance items in profile
-     * @param sessionID
+     * @param sessionID Session id
      * @param pmcData Profile to update
      * @param postRaidProfile Profile returned by client after a raid
      * @returns Updated profile
@@ -94,15 +105,21 @@ export declare class InRaidHelper {
      * Used post-raid to remove items after death
      * @param pmcData Player profile
      * @param sessionID Session id
-     * @returns Player profile with pmc inventory cleared
      */
-    deleteInventory(pmcData: IPmcData, sessionID: string): IPmcData;
+    deleteInventory(pmcData: IPmcData, sessionID: string): void;
+    /**
+     * Get items in vest/pocket/backpack inventory containers (excluding children)
+     * @param pmcData Player profile
+     * @returns Item array
+     */
+    protected getBaseItemsInRigPocketAndBackpack(pmcData: IPmcData): Item[];
     /**
      * Does the provided items slotId mean its kept on the player after death
-     * @param slotId slotid of item to check
+     * @pmcData Player profile
+     * @itemToCheck Item to check should be kept
      * @returns true if item is kept after death
      */
-    isItemKeptAfterDeath(slotId: string): boolean;
+    protected isItemKeptAfterDeath(pmcData: IPmcData, itemToCheck: Item): boolean;
     /**
      * Return the equipped items from a players inventory
      * @param items Players inventory to search through

TypeScript/12ClassExtensionOverride/types/helpers/InventoryHelper.d.ts

@@ -61,12 +61,12 @@ export declare class InventoryHelper {
     /**
      * Add ammo to ammo boxes
      * @param itemToAdd Item to check is ammo box
-     * @param toDo
+     * @param parentId Ammo box parent id
      * @param output IItemEventRouterResponse object
      * @param sessionID Session id
      * @param pmcData Profile to add ammobox to
      */
-    protected hydrateAmmoBoxWithAmmo(pmcData: IPmcData, itemToAdd: IAddItemTempObject, toDo: string[][], sessionID: string, output: IItemEventRouterResponse): void;
+    protected hydrateAmmoBoxWithAmmo(pmcData: IPmcData, itemToAdd: IAddItemTempObject, parentId: string, sessionID: string, output: IItemEventRouterResponse): void;
     /**
      *
      * @param assortItems Items to add to inventory
@@ -111,7 +111,13 @@ export declare class InventoryHelper {
     /**
     * Internal helper function to move item within the same profile_f.
     */
-    moveItemInternal(inventoryItems: Item[], body: IInventoryMoveRequestData): void;
+    moveItemInternal(pmcData: IPmcData, inventoryItems: Item[], moveRequest: IInventoryMoveRequestData): void;
+    /**
+     * Update fast panel bindings when an item is moved into a container that doesnt allow quick slot access
+     * @param pmcData Player profile
+     * @param itemBeingMoved item being moved
+     */
+    protected updateFastPanelBinding(pmcData: IPmcData, itemBeingMoved: Item): void;
     /**
     * Internal helper function to handle cartridges in inventory if any of them exist.
     */

TypeScript/12ClassExtensionOverride/types/helpers/ItemHelper.d.ts

@@ -193,31 +193,53 @@ declare class ItemHelper {
     replaceIDs(pmcData: IPmcData, items: Item[], insuredItems?: InsuredItem[], fastPanel?: any): any[];
     /**
      * WARNING, SLOW. Recursively loop down through an items hierarchy to see if any of the ids match the supplied list, return true if any do
-     * @param {string} tpl
+     * @param {string} tpl Items tpl to check parents of
-     * @param {Array} tplsToCheck
+     * @param {Array} tplsToCheck Tpl values to check if parents of item match
-     * @returns boolean
+     * @returns boolean Match found
      */
     doesItemOrParentsIdMatch(tpl: string, tplsToCheck: string[]): boolean;
     /**
-     * Return true if item is a quest item
+     * Check if item is quest item
-     * @param {string} tpl
+     * @param tpl Items tpl to check quest status of
-     * @returns boolean
+     * @returns true if item is flagged as quest item
      */
     isQuestItem(tpl: string): boolean;
     /**
      * Get the inventory size of an item
-     * @param items
+     * @param items Item with children
      * @param rootItemId
      * @returns ItemSize object (width and height)
      */
     getItemSize(items: Item[], rootItemId: string): ItemHelper.ItemSize;
     /**
      * Get a random cartridge from an items Filter property
-     * @param item
+     * @param item Db item template to look up Cartridge filter values from
-     * @returns
+     * @returns Caliber of cartridge
      */
     getRandomCompatibleCaliberTemplateId(item: ITemplateItem): string;
-    createRandomMagCartridges(magTemplate: ITemplateItem, parentId: string, staticAmmoDist: Record<string, IStaticAmmoDetails[]>, caliber?: string): Item;
+    /**
+     * Add cartridges to the ammo box with correct max stack sizes
+     * @param ammoBox Box to add cartridges to
+     * @param ammoBoxDetails Item template from items db
+     */
+    addCartridgesToAmmoBox(ammoBox: Item[], ammoBoxDetails: ITemplateItem): void;
+    /**
+     * Add child items (cartridges) to a magazine
+     * @param magazine Magazine to add child items to
+     * @param magTemplate Db template of magazine
+     * @param staticAmmoDist Cartridge distribution
+     * @param caliber Caliber of cartridge to add to magazine
+     * @param minSizePercent % the magazine must be filled to
+     */
+    fillMagazineWithRandomCartridge(magazine: Item[], magTemplate: ITemplateItem, staticAmmoDist: Record<string, IStaticAmmoDetails[]>, caliber?: string, minSizePercent?: number): void;
+    /**
+     * Add child items to a magazine of a specific cartridge
+     * @param magazine Magazine to add child items to
+     * @param magTemplate Db template of magazine
+     * @param cartridgeTpl Cartridge to add to magazine
+     * @param minSizePercent % the magazine must be filled to
+     */
+    fillMagazineWithCartridge(magazine: Item[], magTemplate: ITemplateItem, cartridgeTpl: string, minSizePercent?: number): void;
     protected getRandomValidCaliber(magTemplate: ITemplateItem): string;
     protected drawAmmoTpl(caliber: string, staticAmmoDist: Record<string, IStaticAmmoDetails[]>): string;
     /**

TypeScript/12ClassExtensionOverride/types/helpers/ProfileHelper.d.ts

@@ -20,7 +20,12 @@ export declare class ProfileHelper {
     protected itemHelper: ItemHelper;
     protected profileSnapshotService: ProfileSnapshotService;
     constructor(logger: ILogger, jsonUtil: JsonUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileSnapshotService: ProfileSnapshotService);
-    resetProfileQuestCondition(sessionID: string, conditionId: string): void;
+    /**
+     * Remove/reset started quest condtions in player profile
+     * @param sessionID Session id
+     * @param conditionIds Condition ids that need to be reset/removed
+     */
+    resetProfileQuestCondition(sessionID: string, conditionIds: string[]): void;
     /**
      * Get all profiles from server
      * @returns Dictionary of profiles

TypeScript/12ClassExtensionOverride/types/helpers/QuestHelper.d.ts

@@ -211,7 +211,7 @@ export declare class QuestHelper {
      * @param itemTpl item tpl to look for
      * @returns 'FindItem' condition id
      */
-    getFindItemIdForQuestHandIn(itemTpl: string): string;
+    getFindItemIdForQuestHandIn(itemTpl: string): string[];
     /**
      * Add all quests to a profile with the provided statuses
      * @param pmcProfile profile to update

TypeScript/12ClassExtensionOverride/types/loaders/PostAkiModLoader.d.ts

@@ -1,15 +1,19 @@
 import { DependencyContainer } from "tsyringe";
 import { IModLoader } from "../models/spt/mod/IModLoader";
+import { ILogger } from "../models/spt/utils/ILogger";
+import { LocalisationService } from "../services/LocalisationService";
 import { VFS } from "../utils/VFS";
 import { BundleLoader } from "./BundleLoader";
 import { ModTypeCheck } from "./ModTypeCheck";
 import { PreAkiModLoader } from "./PreAkiModLoader";
 export declare class PostAkiModLoader implements IModLoader {
+    protected logger: ILogger;
     protected bundleLoader: BundleLoader;
     protected vfs: VFS;
     protected preAkiModLoader: PreAkiModLoader;
+    protected localisationService: LocalisationService;
     protected modTypeCheck: ModTypeCheck;
-    constructor(bundleLoader: BundleLoader, vfs: VFS, preAkiModLoader: PreAkiModLoader, modTypeCheck: ModTypeCheck);
+    constructor(logger: ILogger, bundleLoader: BundleLoader, vfs: VFS, preAkiModLoader: PreAkiModLoader, localisationService: LocalisationService, modTypeCheck: ModTypeCheck);
     getModPath(mod: string): string;
     load(): Promise<void>;
     protected executeMods(container: DependencyContainer): Promise<void>;

TypeScript/12ClassExtensionOverride/types/loaders/PostDBModLoader.d.ts

@@ -1,11 +1,15 @@
 import { DependencyContainer } from "tsyringe";
 import { OnLoad } from "../di/OnLoad";
+import { ILogger } from "../models/spt/utils/ILogger";
+import { LocalisationService } from "../services/LocalisationService";
 import { ModTypeCheck } from "./ModTypeCheck";
 import { PreAkiModLoader } from "./PreAkiModLoader";
 export declare class PostDBModLoader implements OnLoad {
+    protected logger: ILogger;
     protected preAkiModLoader: PreAkiModLoader;
+    protected localisationService: LocalisationService;
     protected modTypeCheck: ModTypeCheck;
-    constructor(preAkiModLoader: PreAkiModLoader, modTypeCheck: ModTypeCheck);
+    constructor(logger: ILogger, preAkiModLoader: PreAkiModLoader, localisationService: LocalisationService, modTypeCheck: ModTypeCheck);
     onLoad(): Promise<void>;
     getRoute(): string;
     getModPath(mod: string): string;

TypeScript/12ClassExtensionOverride/types/models/eft/common/IGlobals.d.ts

@@ -70,6 +70,7 @@ export interface Config {
     EventType: string[];
     WalkSpeed: xyz;
     SprintSpeed: xyz;
+    SquadSettings: ISquadSettings;
     SkillEnduranceWeightThreshold: number;
     TeamSearchingTimeout: number;
     Insurance: Insurance;
@@ -803,6 +804,11 @@ export interface RestrictionsInRaid {
     TemplateId: string;
     Value: number;
 }
+export interface ISquadSettings {
+    CountOfRequestsToOnePlayer: number;
+    SecondsForExpiredRequest: number;
+    SendRequestDelaySeconds: number;
+}
 export interface Insurance {
     MaxStorageTimeInHour: number;
 }

TypeScript/12ClassExtensionOverride/types/models/eft/common/ILooseLoot.d.ts

@@ -37,6 +37,9 @@ export interface Xyz {
     z: number;
 }
 export interface ItemDistribution {
-    tpl: string;
+    composedKey: ComposedKey;
     relativeProbability: number;
 }
+export interface ComposedKey {
+    key: string;
+}

TypeScript/12ClassExtensionOverride/types/models/eft/common/tables/IBotBase.d.ts

@@ -120,9 +120,7 @@ export interface Inventory {
     sortingTable: string;
     questRaidItems: string;
     questStashItems: string;
-    fastPanel: FastPanel;
+    fastPanel: Record<string, string>;
-}
-export interface FastPanel {
 }
 export interface Skills {
     Common: Common[];

TypeScript/12ClassExtensionOverride/types/models/eft/match/IEndOfflineRaidRequestData.d.ts

@@ -1,6 +1,6 @@
 export interface IEndOfflineRaidRequestData {
     crc: number;
     exitStatus: string;
-    exitName: any;
+    exitName: string;
     raidSeconds: number;
 }

TypeScript/12ClassExtensionOverride/types/models/eft/match/IGetRaidConfigurationRequestData.d.ts

@@ -1,4 +1,7 @@
 export interface IGetRaidConfigurationRequestData {
+    keyId: string;
+    side: string;
+    location: string;
     timeVariant: string;
     raidMode: string;
     metabolismDisabled: boolean;
@@ -6,7 +9,6 @@ export interface IGetRaidConfigurationRequestData {
     timeAndWeatherSettings: TimeAndWeatherSettings;
     botSettings: BotSettings;
     wavesSettings: WavesSettings;
-    location: string;
 }
 export interface TimeAndWeatherSettings {
     isRandomTime: boolean;

TypeScript/12ClassExtensionOverride/types/models/eft/presetBuild/IPresetBuildActionRequestData.d.ts

@@ -1,3 +1,4 @@
+import { Upd } from "../common/tables/IItem";
 export interface IPresetBuildActionRequestData {
     Action: string;
     id: string;
@@ -12,14 +13,3 @@ export interface Item {
     parentId?: string;
     slotId?: string;
 }
-export interface Upd {
-    Repairable: Repairable;
-    FireMode: FireMode;
-}
-export interface Repairable {
-    MaxDurability: number;
-    Durability: number;
-}
-export interface FireMode {
-    FireMode: string;
-}

TypeScript/12ClassExtensionOverride/types/models/eft/profile/IGetProfileSettingsRequest.d.ts

@@ -0,0 +1,3 @@
+export interface IGetProfileSettingsRequest {
+    squadInviteRestriction: boolean;
+}

TypeScript/12ClassExtensionOverride/types/models/enums/ConfigTypes.d.ts

@@ -19,5 +19,6 @@ export declare enum ConfigTypes {
     SCAVCASE = "aki-scavcase",
     TRADER = "aki-trader",
     WEATHER = "aki-weather",
-    SEASONAL_EVENT = "aki-seasonalevents"
+    SEASONAL_EVENT = "aki-seasonalevents",
+    LOST_ON_DEATH = "aki-lostondeath"
 }

TypeScript/12ClassExtensionOverride/types/models/spt/config/IHttpConfig.d.ts

@@ -4,4 +4,5 @@ export interface IHttpConfig extends IBaseConfig {
     kind: "aki-http";
     ip: string;
     port: number;
+    logRequests: boolean;
 }

TypeScript/12ClassExtensionOverride/types/models/spt/config/ILocationConfig.d.ts

@@ -2,9 +2,9 @@ import { BossLocationSpawn, Wave } from "../../../models/eft/common/ILocationBas
 import { IBaseConfig } from "./IBaseConfig";
 export interface ILocationConfig extends IBaseConfig {
     kind: "aki-location";
-    fixEmptyBotWaves: boolean;
+    fixEmptyBotWavesSettings: IFixEmptyBotWavesSettings;
-    fixRoguesTakingAllSpawnsOnLighthouse: boolean;
+    rogueLighthouseSpawnTimeSettings: IRogueLighthouseSpawnTimeSettings;
-    lighthouseRogueSpawnTimeSeconds: number;
+    splitWaveIntoSingleSpawnsSettings: ISplitWaveSettings;
     looseLootMultiplier: LootMultiplier;
     staticLootMultiplier: LootMultiplier;
     customWaves: CustomWaves;
@@ -12,6 +12,21 @@ export interface ILocationConfig extends IBaseConfig {
     openZones: Record<string, string[]>;
     /** Key = map id, value = item tpls that should only have one forced loot spawn position */
     forcedLootSingleSpawnById: Record<string, string[]>;
+    /** How many attempts should be taken to fit an item into a container before giving up */
+    fitLootIntoContainerAttempts: number;
+}
+export interface IFixEmptyBotWavesSettings {
+    enabled: boolean;
+    ignoreMaps: string[];
+}
+export interface IRogueLighthouseSpawnTimeSettings {
+    enabled: boolean;
+    waitTimeSeconds: number;
+}
+export interface ISplitWaveSettings {
+    enabled: boolean;
+    ignoreMaps: string[];
+    waveSizeThreshold: number;
 }
 export interface CustomWaves {
     boss: Record<string, BossLocationSpawn[]>;

TypeScript/12ClassExtensionOverride/types/models/spt/config/ILostOnDeathConfig.d.ts

@@ -0,0 +1,21 @@
+import { IBaseConfig } from "./IBaseConfig";
+export interface ILostOnDeathConfig extends IBaseConfig {
+    kind: "aki-lostondeath";
+    equipment: Equipment;
+    specialSlotItems: boolean;
+    questItems: boolean;
+}
+export interface Equipment {
+    ArmBand: boolean;
+    Headwear: boolean;
+    Earpiece: boolean;
+    FaceCover: boolean;
+    ArmorVest: boolean;
+    Eyewear: boolean;
+    TacticalVest: boolean;
+    Backpack: boolean;
+    Holster: boolean;
+    FirstPrimaryWeapon: boolean;
+    SecondPrimaryWeapon: boolean;
+    Scabbard: boolean;
+}

TypeScript/12ClassExtensionOverride/types/models/spt/config/ITraderConfig.d.ts

@@ -3,6 +3,7 @@ import { IBaseConfig } from "./IBaseConfig";
 export interface ITraderConfig extends IBaseConfig {
     kind: "aki-trader";
     updateTime: UpdateTime[];
+    purchasesAreFoundInRaid: boolean;
     updateTimeDefault: number;
     traderPriceMultipler: number;
     persistPurchaseDataInProfile: boolean;

TypeScript/12ClassExtensionOverride/types/models/spt/mod/NewItemDetails.d.ts

@@ -4,6 +4,8 @@ export declare abstract class NewItemDetailsBase {
     fleaPriceRoubles: number;
     /** Price of the item in the handbook */
     handbookPriceRoubles: number;
+    /** Handbook ParentId for the new item */
+    handbookParentId: string;
     /**
      * A dictionary for locale settings, key = langauge (e.g. en,cn,es-mx,jp,fr)
      * If a language is not included, the first item in the array will be used in its place

TypeScript/12ClassExtensionOverride/types/services/InsuranceService.d.ts

@@ -63,8 +63,16 @@ export declare class InsuranceService {
      * @param offraidData post-raid request object
      * @param preRaidGear gear player wore prior to raid
      * @param sessionID Session id
+     * @param playerDied did the player die in raid
+     */
+    storeLostGear(pmcData: IPmcData, offraidData: ISaveProgressRequestData, preRaidGear: Item[], sessionID: string, playerDied: boolean): void;
+    /**
+     * Store insured items on pmc death inside insurance array in player profile
+     * @param pmcData Player profile
+     * @param offraidData Player gear post-raid
+     * @param preRaidGear Player gear before raid
+     * @param sessionID Session id
      */
-    storeLostGear(pmcData: IPmcData, offraidData: ISaveProgressRequestData, preRaidGear: Item[], sessionID: string): void;
     storeInsuredItemsForReturn(pmcData: IPmcData, offraidData: ISaveProgressRequestData, preRaidGear: Item[], sessionID: string): void;
     /**
      * Add gear item to InsuredItems array in player profile

TypeScript/13AddTrader/types/callbacks/GameCallbacks.d.ts

@@ -39,6 +39,7 @@ declare class GameCallbacks {
      */
     getGameConfig(url: string, info: IGameEmptyCrcRequestData, sessionID: string): IGetBodyResponseData<IGameConfigResponse>;
     getServer(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IServerDetails[]>;
+    getCurrentGroup(url: string, info: IEmptyRequestData, sessionID: string): any;
     validateGameVersion(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<ICheckVersionResponse>;
     /**
      * Handle client/game/keepalive