Update types

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

@@ -54,9 +54,10 @@ export declare class BotController {
      * Adjust PMC settings to ensure they engage the correct bot types
      * @param type what bot the server is requesting settings for
      * @param diffLevel difficulty level server requested settings for
+     * @param ignoreRaidSettings should raid settings chosen pre-raid be ignored
      * @returns Difficulty object
      */
-    getBotDifficulty(type: string, diffLevel: string): Difficulty;
+    getBotDifficulty(type: string, diffLevel: string, ignoreRaidSettings?: boolean): Difficulty;
     getAllBotDifficulties(): Record<string, any>;
     /**
      * Generate bot profiles and store in cache

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

@@ -75,10 +75,11 @@ export declare class MatchController {
     protected sendCoopTakenFenceMessage(sessionId: string): void;
     /**
      * Handle when a player extracts using a coop extract - add rep to fence
+     * @param sessionId Session/player id
      * @param pmcData Profile
      * @param extractName Name of extract taken
      */
-    protected handleCoopExtract(pmcData: IPmcData, extractName: string): void;
+    protected handleCoopExtract(sessionId: string, pmcData: IPmcData, extractName: string): void;
     /**
      * Was extract by car
      * @param extractName name of extract

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

@@ -187,12 +187,12 @@ export declare class BotEquipmentModGenerator {
      */
     protected getRandomModTplFromItemDb(modTpl: string, parentSlot: Slot, modSlot: string, items: Item[]): string;
     /**
-     * Log errors if mod is not compatible with slot
+     * Check if mod exists in db + is for a required slot
-     * @param modToAdd template of mod to check
+     * @param modToAdd Db template of mod to check
-     * @param slotAddedToTemplate slot the item will be placed in
+     * @param slotAddedToTemplate Slot object the item will be placed as child into
-     * @param modSlot slot the mod will fill
+     * @param modSlot Slot the mod will fill
-     * @param parentTemplate template of the mods being added
+     * @param parentTemplate Db template of the mods being added
-     * @param botRole
+     * @param botRole Bots wildspawntype (assault/pmcBot etc)
      * @returns true if valid
      */
     protected isModValidForSlot(modToAdd: [boolean, ITemplateItem], slotAddedToTemplate: Slot, modSlot: string, parentTemplate: ITemplateItem, botRole: string): boolean;

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

@@ -363,10 +363,11 @@ export declare class ItemHelper {
      * Chose a randomly weighted cartridge that fits
      * @param caliber Desired caliber
      * @param staticAmmoDist Cartridges and thier weights
+     * @param fallbackCartridgeTpl If a cartridge cannot be found in the above staticAmmoDist param, use this instead
      * @param cartridgeWhitelist OPTIONAL whitelist for cartridges
      * @returns Tpl of cartridge
      */
-    protected drawAmmoTpl(caliber: string, staticAmmoDist: Record<string, IStaticAmmoDetails[]>, cartridgeWhitelist?: string[]): string;
+    protected drawAmmoTpl(caliber: string, staticAmmoDist: Record<string, IStaticAmmoDetails[]>, fallbackCartridgeTpl: string, cartridgeWhitelist?: string[]): string;
     /**
      * Create a basic cartrige object
      * @param parentId container cartridges will be placed in
@@ -401,7 +402,7 @@ export declare class ItemHelper {
     addChildSlotItems(itemToAdd: Item[], itemToAddTemplate: ITemplateItem, modSpawnChanceDict?: Record<string, number>, requiredOnly?: boolean): Item[];
     /**
      * Get a compatible tpl from the array provided where it is not found in the provided incompatible mod tpls parameter
-     * @param possibleTpls Tpls to randomply choose from
+     * @param possibleTpls Tpls to randomly choose from
      * @param incompatibleModTpls Incompatible tpls to not allow
      * @returns Chosen tpl or null
      */

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

@@ -46,6 +46,21 @@ export declare class FenceService {
      * @param assort New assorts to replace old with
      */
     setFenceAssort(assort: ITraderAssort): void;
+    /**
+     * Replace discount fence assort with new assort
+     * @param assort New assorts to replace old with
+     */
+    setDiscountFenceAssort(assort: ITraderAssort): void;
+    /**
+     * Get main fence assort
+     * @return ITraderAssort
+     */
+    getMainFenceAssort(): ITraderAssort;
+    /**
+     * Get discount fence assort
+     * @return ITraderAssort
+     */
+    getDiscountFenceAssort(): ITraderAssort;
     /**
      * Replace high rep level fence assort with new assort
      * @param discountAssort New assorts to replace old with
@@ -119,8 +134,8 @@ export declare class FenceService {
     protected deleteRandomAssorts(itemCountToReplace: number, assort: ITraderAssort): void;
     /**
      * Choose an item at random and remove it + mods from assorts
-     * @param assort Items to remove from
+     * @param assort Trader assort to remove item from
-     * @param rootItems Assort root items to pick from to remove
+     * @param rootItems Pool of root items to pick from to remove
      */
     protected removeRandomItemFromAssorts(assort: ITraderAssort, rootItems: Item[]): void;
     /**

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

@@ -183,4 +183,9 @@ export declare class ProfileFixerService {
      * @param pmcProfile Profile to remove dead quests from
      */
     protected removeOrphanedQuests(pmcProfile: IPmcData): void;
+    /**
+     * If someone has run a mod from pre-3.8.0, it results in an invalid `nextResupply` value
+     * Resolve this by setting the nextResupply to 0 if it's null
+     */
+    protected fixNullTraderNextResupply(pmcProfile: IPmcData): void;
 }

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

@@ -54,9 +54,10 @@ export declare class BotController {
      * Adjust PMC settings to ensure they engage the correct bot types
      * @param type what bot the server is requesting settings for
      * @param diffLevel difficulty level server requested settings for
+     * @param ignoreRaidSettings should raid settings chosen pre-raid be ignored
      * @returns Difficulty object
      */
-    getBotDifficulty(type: string, diffLevel: string): Difficulty;
+    getBotDifficulty(type: string, diffLevel: string, ignoreRaidSettings?: boolean): Difficulty;
     getAllBotDifficulties(): Record<string, any>;
     /**
      * Generate bot profiles and store in cache

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

@@ -75,10 +75,11 @@ export declare class MatchController {
     protected sendCoopTakenFenceMessage(sessionId: string): void;
     /**
      * Handle when a player extracts using a coop extract - add rep to fence
+     * @param sessionId Session/player id
      * @param pmcData Profile
      * @param extractName Name of extract taken
      */
-    protected handleCoopExtract(pmcData: IPmcData, extractName: string): void;
+    protected handleCoopExtract(sessionId: string, pmcData: IPmcData, extractName: string): void;
     /**
      * Was extract by car
      * @param extractName name of extract

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

@@ -187,12 +187,12 @@ export declare class BotEquipmentModGenerator {
      */
     protected getRandomModTplFromItemDb(modTpl: string, parentSlot: Slot, modSlot: string, items: Item[]): string;
     /**
-     * Log errors if mod is not compatible with slot
+     * Check if mod exists in db + is for a required slot
-     * @param modToAdd template of mod to check
+     * @param modToAdd Db template of mod to check
-     * @param slotAddedToTemplate slot the item will be placed in
+     * @param slotAddedToTemplate Slot object the item will be placed as child into
-     * @param modSlot slot the mod will fill
+     * @param modSlot Slot the mod will fill
-     * @param parentTemplate template of the mods being added
+     * @param parentTemplate Db template of the mods being added
-     * @param botRole
+     * @param botRole Bots wildspawntype (assault/pmcBot etc)
      * @returns true if valid
      */
     protected isModValidForSlot(modToAdd: [boolean, ITemplateItem], slotAddedToTemplate: Slot, modSlot: string, parentTemplate: ITemplateItem, botRole: string): boolean;

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

@@ -363,10 +363,11 @@ export declare class ItemHelper {
      * Chose a randomly weighted cartridge that fits
      * @param caliber Desired caliber
      * @param staticAmmoDist Cartridges and thier weights
+     * @param fallbackCartridgeTpl If a cartridge cannot be found in the above staticAmmoDist param, use this instead
      * @param cartridgeWhitelist OPTIONAL whitelist for cartridges
      * @returns Tpl of cartridge
      */
-    protected drawAmmoTpl(caliber: string, staticAmmoDist: Record<string, IStaticAmmoDetails[]>, cartridgeWhitelist?: string[]): string;
+    protected drawAmmoTpl(caliber: string, staticAmmoDist: Record<string, IStaticAmmoDetails[]>, fallbackCartridgeTpl: string, cartridgeWhitelist?: string[]): string;
     /**
      * Create a basic cartrige object
      * @param parentId container cartridges will be placed in
@@ -401,7 +402,7 @@ export declare class ItemHelper {
     addChildSlotItems(itemToAdd: Item[], itemToAddTemplate: ITemplateItem, modSpawnChanceDict?: Record<string, number>, requiredOnly?: boolean): Item[];
     /**
      * Get a compatible tpl from the array provided where it is not found in the provided incompatible mod tpls parameter
-     * @param possibleTpls Tpls to randomply choose from
+     * @param possibleTpls Tpls to randomly choose from
      * @param incompatibleModTpls Incompatible tpls to not allow
      * @returns Chosen tpl or null
      */

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

@@ -46,6 +46,21 @@ export declare class FenceService {
      * @param assort New assorts to replace old with
      */
     setFenceAssort(assort: ITraderAssort): void;
+    /**
+     * Replace discount fence assort with new assort
+     * @param assort New assorts to replace old with
+     */
+    setDiscountFenceAssort(assort: ITraderAssort): void;
+    /**
+     * Get main fence assort
+     * @return ITraderAssort
+     */
+    getMainFenceAssort(): ITraderAssort;
+    /**
+     * Get discount fence assort
+     * @return ITraderAssort
+     */
+    getDiscountFenceAssort(): ITraderAssort;
     /**
      * Replace high rep level fence assort with new assort
      * @param discountAssort New assorts to replace old with
@@ -119,8 +134,8 @@ export declare class FenceService {
     protected deleteRandomAssorts(itemCountToReplace: number, assort: ITraderAssort): void;
     /**
      * Choose an item at random and remove it + mods from assorts
-     * @param assort Items to remove from
+     * @param assort Trader assort to remove item from
-     * @param rootItems Assort root items to pick from to remove
+     * @param rootItems Pool of root items to pick from to remove
      */
     protected removeRandomItemFromAssorts(assort: ITraderAssort, rootItems: Item[]): void;
     /**

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

@@ -183,4 +183,9 @@ export declare class ProfileFixerService {
      * @param pmcProfile Profile to remove dead quests from
      */
     protected removeOrphanedQuests(pmcProfile: IPmcData): void;
+    /**
+     * If someone has run a mod from pre-3.8.0, it results in an invalid `nextResupply` value
+     * Resolve this by setting the nextResupply to 0 if it's null
+     */
+    protected fixNullTraderNextResupply(pmcProfile: IPmcData): void;
 }

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

@@ -54,9 +54,10 @@ export declare class BotController {
      * Adjust PMC settings to ensure they engage the correct bot types
      * @param type what bot the server is requesting settings for
      * @param diffLevel difficulty level server requested settings for
+     * @param ignoreRaidSettings should raid settings chosen pre-raid be ignored
      * @returns Difficulty object
      */
-    getBotDifficulty(type: string, diffLevel: string): Difficulty;
+    getBotDifficulty(type: string, diffLevel: string, ignoreRaidSettings?: boolean): Difficulty;
     getAllBotDifficulties(): Record<string, any>;
     /**
      * Generate bot profiles and store in cache

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

@@ -75,10 +75,11 @@ export declare class MatchController {
     protected sendCoopTakenFenceMessage(sessionId: string): void;
     /**
      * Handle when a player extracts using a coop extract - add rep to fence
+     * @param sessionId Session/player id
      * @param pmcData Profile
      * @param extractName Name of extract taken
      */
-    protected handleCoopExtract(pmcData: IPmcData, extractName: string): void;
+    protected handleCoopExtract(sessionId: string, pmcData: IPmcData, extractName: string): void;
     /**
      * Was extract by car
      * @param extractName name of extract

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

@@ -187,12 +187,12 @@ export declare class BotEquipmentModGenerator {
      */
     protected getRandomModTplFromItemDb(modTpl: string, parentSlot: Slot, modSlot: string, items: Item[]): string;
     /**
-     * Log errors if mod is not compatible with slot
+     * Check if mod exists in db + is for a required slot
-     * @param modToAdd template of mod to check
+     * @param modToAdd Db template of mod to check
-     * @param slotAddedToTemplate slot the item will be placed in
+     * @param slotAddedToTemplate Slot object the item will be placed as child into
-     * @param modSlot slot the mod will fill
+     * @param modSlot Slot the mod will fill
-     * @param parentTemplate template of the mods being added
+     * @param parentTemplate Db template of the mods being added
-     * @param botRole
+     * @param botRole Bots wildspawntype (assault/pmcBot etc)
      * @returns true if valid
      */
     protected isModValidForSlot(modToAdd: [boolean, ITemplateItem], slotAddedToTemplate: Slot, modSlot: string, parentTemplate: ITemplateItem, botRole: string): boolean;

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

@@ -363,10 +363,11 @@ export declare class ItemHelper {
      * Chose a randomly weighted cartridge that fits
      * @param caliber Desired caliber
      * @param staticAmmoDist Cartridges and thier weights
+     * @param fallbackCartridgeTpl If a cartridge cannot be found in the above staticAmmoDist param, use this instead
      * @param cartridgeWhitelist OPTIONAL whitelist for cartridges
      * @returns Tpl of cartridge
      */
-    protected drawAmmoTpl(caliber: string, staticAmmoDist: Record<string, IStaticAmmoDetails[]>, cartridgeWhitelist?: string[]): string;
+    protected drawAmmoTpl(caliber: string, staticAmmoDist: Record<string, IStaticAmmoDetails[]>, fallbackCartridgeTpl: string, cartridgeWhitelist?: string[]): string;
     /**
      * Create a basic cartrige object
      * @param parentId container cartridges will be placed in
@@ -401,7 +402,7 @@ export declare class ItemHelper {
     addChildSlotItems(itemToAdd: Item[], itemToAddTemplate: ITemplateItem, modSpawnChanceDict?: Record<string, number>, requiredOnly?: boolean): Item[];
     /**
      * Get a compatible tpl from the array provided where it is not found in the provided incompatible mod tpls parameter
-     * @param possibleTpls Tpls to randomply choose from
+     * @param possibleTpls Tpls to randomly choose from
      * @param incompatibleModTpls Incompatible tpls to not allow
      * @returns Chosen tpl or null
      */

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

@@ -46,6 +46,21 @@ export declare class FenceService {
      * @param assort New assorts to replace old with
      */
     setFenceAssort(assort: ITraderAssort): void;
+    /**
+     * Replace discount fence assort with new assort
+     * @param assort New assorts to replace old with
+     */
+    setDiscountFenceAssort(assort: ITraderAssort): void;
+    /**
+     * Get main fence assort
+     * @return ITraderAssort
+     */
+    getMainFenceAssort(): ITraderAssort;
+    /**
+     * Get discount fence assort
+     * @return ITraderAssort
+     */
+    getDiscountFenceAssort(): ITraderAssort;
     /**
      * Replace high rep level fence assort with new assort
      * @param discountAssort New assorts to replace old with
@@ -119,8 +134,8 @@ export declare class FenceService {
     protected deleteRandomAssorts(itemCountToReplace: number, assort: ITraderAssort): void;
     /**
      * Choose an item at random and remove it + mods from assorts
-     * @param assort Items to remove from
+     * @param assort Trader assort to remove item from
-     * @param rootItems Assort root items to pick from to remove
+     * @param rootItems Pool of root items to pick from to remove
      */
     protected removeRandomItemFromAssorts(assort: ITraderAssort, rootItems: Item[]): void;
     /**

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

@@ -183,4 +183,9 @@ export declare class ProfileFixerService {
      * @param pmcProfile Profile to remove dead quests from
      */
     protected removeOrphanedQuests(pmcProfile: IPmcData): void;
+    /**
+     * If someone has run a mod from pre-3.8.0, it results in an invalid `nextResupply` value
+     * Resolve this by setting the nextResupply to 0 if it's null
+     */
+    protected fixNullTraderNextResupply(pmcProfile: IPmcData): void;
 }

TypeScript/13AddTrader/types/controllers/BotController.d.ts

@@ -54,9 +54,10 @@ export declare class BotController {
      * Adjust PMC settings to ensure they engage the correct bot types
      * @param type what bot the server is requesting settings for
      * @param diffLevel difficulty level server requested settings for
+     * @param ignoreRaidSettings should raid settings chosen pre-raid be ignored
      * @returns Difficulty object
      */
-    getBotDifficulty(type: string, diffLevel: string): Difficulty;
+    getBotDifficulty(type: string, diffLevel: string, ignoreRaidSettings?: boolean): Difficulty;
     getAllBotDifficulties(): Record<string, any>;
     /**
      * Generate bot profiles and store in cache

TypeScript/13AddTrader/types/controllers/MatchController.d.ts

@@ -75,10 +75,11 @@ export declare class MatchController {
     protected sendCoopTakenFenceMessage(sessionId: string): void;
     /**
      * Handle when a player extracts using a coop extract - add rep to fence
+     * @param sessionId Session/player id
      * @param pmcData Profile
      * @param extractName Name of extract taken
      */
-    protected handleCoopExtract(pmcData: IPmcData, extractName: string): void;
+    protected handleCoopExtract(sessionId: string, pmcData: IPmcData, extractName: string): void;
     /**
      * Was extract by car
      * @param extractName name of extract

TypeScript/13AddTrader/types/generators/BotEquipmentModGenerator.d.ts

@@ -187,12 +187,12 @@ export declare class BotEquipmentModGenerator {
      */
     protected getRandomModTplFromItemDb(modTpl: string, parentSlot: Slot, modSlot: string, items: Item[]): string;
     /**
-     * Log errors if mod is not compatible with slot
+     * Check if mod exists in db + is for a required slot
-     * @param modToAdd template of mod to check
+     * @param modToAdd Db template of mod to check
-     * @param slotAddedToTemplate slot the item will be placed in
+     * @param slotAddedToTemplate Slot object the item will be placed as child into
-     * @param modSlot slot the mod will fill
+     * @param modSlot Slot the mod will fill
-     * @param parentTemplate template of the mods being added
+     * @param parentTemplate Db template of the mods being added
-     * @param botRole
+     * @param botRole Bots wildspawntype (assault/pmcBot etc)
      * @returns true if valid
      */
     protected isModValidForSlot(modToAdd: [boolean, ITemplateItem], slotAddedToTemplate: Slot, modSlot: string, parentTemplate: ITemplateItem, botRole: string): boolean;

TypeScript/13AddTrader/types/helpers/ItemHelper.d.ts

@@ -363,10 +363,11 @@ export declare class ItemHelper {
      * Chose a randomly weighted cartridge that fits
      * @param caliber Desired caliber
      * @param staticAmmoDist Cartridges and thier weights
+     * @param fallbackCartridgeTpl If a cartridge cannot be found in the above staticAmmoDist param, use this instead
      * @param cartridgeWhitelist OPTIONAL whitelist for cartridges
      * @returns Tpl of cartridge
      */
-    protected drawAmmoTpl(caliber: string, staticAmmoDist: Record<string, IStaticAmmoDetails[]>, cartridgeWhitelist?: string[]): string;
+    protected drawAmmoTpl(caliber: string, staticAmmoDist: Record<string, IStaticAmmoDetails[]>, fallbackCartridgeTpl: string, cartridgeWhitelist?: string[]): string;
     /**
      * Create a basic cartrige object
      * @param parentId container cartridges will be placed in
@@ -401,7 +402,7 @@ export declare class ItemHelper {
     addChildSlotItems(itemToAdd: Item[], itemToAddTemplate: ITemplateItem, modSpawnChanceDict?: Record<string, number>, requiredOnly?: boolean): Item[];
     /**
      * Get a compatible tpl from the array provided where it is not found in the provided incompatible mod tpls parameter
-     * @param possibleTpls Tpls to randomply choose from
+     * @param possibleTpls Tpls to randomly choose from
      * @param incompatibleModTpls Incompatible tpls to not allow
      * @returns Chosen tpl or null
      */

TypeScript/13AddTrader/types/services/FenceService.d.ts

@@ -46,6 +46,21 @@ export declare class FenceService {
      * @param assort New assorts to replace old with
      */
     setFenceAssort(assort: ITraderAssort): void;
+    /**
+     * Replace discount fence assort with new assort
+     * @param assort New assorts to replace old with
+     */
+    setDiscountFenceAssort(assort: ITraderAssort): void;
+    /**
+     * Get main fence assort
+     * @return ITraderAssort
+     */
+    getMainFenceAssort(): ITraderAssort;
+    /**
+     * Get discount fence assort
+     * @return ITraderAssort
+     */
+    getDiscountFenceAssort(): ITraderAssort;
     /**
      * Replace high rep level fence assort with new assort
      * @param discountAssort New assorts to replace old with
@@ -119,8 +134,8 @@ export declare class FenceService {
     protected deleteRandomAssorts(itemCountToReplace: number, assort: ITraderAssort): void;
     /**
      * Choose an item at random and remove it + mods from assorts
-     * @param assort Items to remove from
+     * @param assort Trader assort to remove item from
-     * @param rootItems Assort root items to pick from to remove
+     * @param rootItems Pool of root items to pick from to remove
      */
     protected removeRandomItemFromAssorts(assort: ITraderAssort, rootItems: Item[]): void;
     /**

TypeScript/13AddTrader/types/services/ProfileFixerService.d.ts

@@ -183,4 +183,9 @@ export declare class ProfileFixerService {
      * @param pmcProfile Profile to remove dead quests from
      */
     protected removeOrphanedQuests(pmcProfile: IPmcData): void;
+    /**
+     * If someone has run a mod from pre-3.8.0, it results in an invalid `nextResupply` value
+     * Resolve this by setting the nextResupply to 0 if it's null
+     */
+    protected fixNullTraderNextResupply(pmcProfile: IPmcData): void;
 }

TypeScript/14AfterDBLoadHook/types/controllers/BotController.d.ts

@@ -54,9 +54,10 @@ export declare class BotController {
      * Adjust PMC settings to ensure they engage the correct bot types
      * @param type what bot the server is requesting settings for
      * @param diffLevel difficulty level server requested settings for
+     * @param ignoreRaidSettings should raid settings chosen pre-raid be ignored
      * @returns Difficulty object
      */
-    getBotDifficulty(type: string, diffLevel: string): Difficulty;
+    getBotDifficulty(type: string, diffLevel: string, ignoreRaidSettings?: boolean): Difficulty;
     getAllBotDifficulties(): Record<string, any>;
     /**
      * Generate bot profiles and store in cache

TypeScript/14AfterDBLoadHook/types/controllers/MatchController.d.ts

@@ -75,10 +75,11 @@ export declare class MatchController {
     protected sendCoopTakenFenceMessage(sessionId: string): void;
     /**
      * Handle when a player extracts using a coop extract - add rep to fence
+     * @param sessionId Session/player id
      * @param pmcData Profile
      * @param extractName Name of extract taken
      */
-    protected handleCoopExtract(pmcData: IPmcData, extractName: string): void;
+    protected handleCoopExtract(sessionId: string, pmcData: IPmcData, extractName: string): void;
     /**
      * Was extract by car
      * @param extractName name of extract

TypeScript/14AfterDBLoadHook/types/generators/BotEquipmentModGenerator.d.ts

@@ -187,12 +187,12 @@ export declare class BotEquipmentModGenerator {
      */
     protected getRandomModTplFromItemDb(modTpl: string, parentSlot: Slot, modSlot: string, items: Item[]): string;
     /**
-     * Log errors if mod is not compatible with slot
+     * Check if mod exists in db + is for a required slot
-     * @param modToAdd template of mod to check
+     * @param modToAdd Db template of mod to check
-     * @param slotAddedToTemplate slot the item will be placed in
+     * @param slotAddedToTemplate Slot object the item will be placed as child into
-     * @param modSlot slot the mod will fill
+     * @param modSlot Slot the mod will fill
-     * @param parentTemplate template of the mods being added
+     * @param parentTemplate Db template of the mods being added
-     * @param botRole
+     * @param botRole Bots wildspawntype (assault/pmcBot etc)
      * @returns true if valid
      */
     protected isModValidForSlot(modToAdd: [boolean, ITemplateItem], slotAddedToTemplate: Slot, modSlot: string, parentTemplate: ITemplateItem, botRole: string): boolean;

TypeScript/14AfterDBLoadHook/types/helpers/ItemHelper.d.ts

@@ -363,10 +363,11 @@ export declare class ItemHelper {
      * Chose a randomly weighted cartridge that fits
      * @param caliber Desired caliber
      * @param staticAmmoDist Cartridges and thier weights
+     * @param fallbackCartridgeTpl If a cartridge cannot be found in the above staticAmmoDist param, use this instead
      * @param cartridgeWhitelist OPTIONAL whitelist for cartridges
      * @returns Tpl of cartridge
      */
-    protected drawAmmoTpl(caliber: string, staticAmmoDist: Record<string, IStaticAmmoDetails[]>, cartridgeWhitelist?: string[]): string;
+    protected drawAmmoTpl(caliber: string, staticAmmoDist: Record<string, IStaticAmmoDetails[]>, fallbackCartridgeTpl: string, cartridgeWhitelist?: string[]): string;
     /**
      * Create a basic cartrige object
      * @param parentId container cartridges will be placed in
@@ -401,7 +402,7 @@ export declare class ItemHelper {
     addChildSlotItems(itemToAdd: Item[], itemToAddTemplate: ITemplateItem, modSpawnChanceDict?: Record<string, number>, requiredOnly?: boolean): Item[];
     /**
      * Get a compatible tpl from the array provided where it is not found in the provided incompatible mod tpls parameter
-     * @param possibleTpls Tpls to randomply choose from
+     * @param possibleTpls Tpls to randomly choose from
      * @param incompatibleModTpls Incompatible tpls to not allow
      * @returns Chosen tpl or null
      */

TypeScript/14AfterDBLoadHook/types/services/FenceService.d.ts

@@ -46,6 +46,21 @@ export declare class FenceService {
      * @param assort New assorts to replace old with
      */
     setFenceAssort(assort: ITraderAssort): void;
+    /**
+     * Replace discount fence assort with new assort
+     * @param assort New assorts to replace old with
+     */
+    setDiscountFenceAssort(assort: ITraderAssort): void;
+    /**
+     * Get main fence assort
+     * @return ITraderAssort
+     */
+    getMainFenceAssort(): ITraderAssort;
+    /**
+     * Get discount fence assort
+     * @return ITraderAssort
+     */
+    getDiscountFenceAssort(): ITraderAssort;
     /**
      * Replace high rep level fence assort with new assort
      * @param discountAssort New assorts to replace old with
@@ -119,8 +134,8 @@ export declare class FenceService {
     protected deleteRandomAssorts(itemCountToReplace: number, assort: ITraderAssort): void;
     /**
      * Choose an item at random and remove it + mods from assorts
-     * @param assort Items to remove from
+     * @param assort Trader assort to remove item from
-     * @param rootItems Assort root items to pick from to remove
+     * @param rootItems Pool of root items to pick from to remove
      */
     protected removeRandomItemFromAssorts(assort: ITraderAssort, rootItems: Item[]): void;
     /**

TypeScript/14AfterDBLoadHook/types/services/ProfileFixerService.d.ts

@@ -183,4 +183,9 @@ export declare class ProfileFixerService {
      * @param pmcProfile Profile to remove dead quests from
      */
     protected removeOrphanedQuests(pmcProfile: IPmcData): void;
+    /**
+     * If someone has run a mod from pre-3.8.0, it results in an invalid `nextResupply` value
+     * Resolve this by setting the nextResupply to 0 if it's null
+     */
+    protected fixNullTraderNextResupply(pmcProfile: IPmcData): void;
 }

TypeScript/15HttpListenerExample/types/controllers/BotController.d.ts

@@ -54,9 +54,10 @@ export declare class BotController {
      * Adjust PMC settings to ensure they engage the correct bot types
      * @param type what bot the server is requesting settings for
      * @param diffLevel difficulty level server requested settings for
+     * @param ignoreRaidSettings should raid settings chosen pre-raid be ignored
      * @returns Difficulty object
      */
-    getBotDifficulty(type: string, diffLevel: string): Difficulty;
+    getBotDifficulty(type: string, diffLevel: string, ignoreRaidSettings?: boolean): Difficulty;
     getAllBotDifficulties(): Record<string, any>;
     /**
      * Generate bot profiles and store in cache

TypeScript/15HttpListenerExample/types/controllers/MatchController.d.ts

@@ -75,10 +75,11 @@ export declare class MatchController {
     protected sendCoopTakenFenceMessage(sessionId: string): void;
     /**
      * Handle when a player extracts using a coop extract - add rep to fence
+     * @param sessionId Session/player id
      * @param pmcData Profile
      * @param extractName Name of extract taken
      */
-    protected handleCoopExtract(pmcData: IPmcData, extractName: string): void;
+    protected handleCoopExtract(sessionId: string, pmcData: IPmcData, extractName: string): void;
     /**
      * Was extract by car
      * @param extractName name of extract

TypeScript/15HttpListenerExample/types/generators/BotEquipmentModGenerator.d.ts

@@ -187,12 +187,12 @@ export declare class BotEquipmentModGenerator {
      */
     protected getRandomModTplFromItemDb(modTpl: string, parentSlot: Slot, modSlot: string, items: Item[]): string;
     /**
-     * Log errors if mod is not compatible with slot
+     * Check if mod exists in db + is for a required slot
-     * @param modToAdd template of mod to check
+     * @param modToAdd Db template of mod to check
-     * @param slotAddedToTemplate slot the item will be placed in
+     * @param slotAddedToTemplate Slot object the item will be placed as child into
-     * @param modSlot slot the mod will fill
+     * @param modSlot Slot the mod will fill
-     * @param parentTemplate template of the mods being added
+     * @param parentTemplate Db template of the mods being added
-     * @param botRole
+     * @param botRole Bots wildspawntype (assault/pmcBot etc)
      * @returns true if valid
      */
     protected isModValidForSlot(modToAdd: [boolean, ITemplateItem], slotAddedToTemplate: Slot, modSlot: string, parentTemplate: ITemplateItem, botRole: string): boolean;

TypeScript/15HttpListenerExample/types/helpers/ItemHelper.d.ts

@@ -363,10 +363,11 @@ export declare class ItemHelper {
      * Chose a randomly weighted cartridge that fits
      * @param caliber Desired caliber
      * @param staticAmmoDist Cartridges and thier weights
+     * @param fallbackCartridgeTpl If a cartridge cannot be found in the above staticAmmoDist param, use this instead
      * @param cartridgeWhitelist OPTIONAL whitelist for cartridges
      * @returns Tpl of cartridge
      */
-    protected drawAmmoTpl(caliber: string, staticAmmoDist: Record<string, IStaticAmmoDetails[]>, cartridgeWhitelist?: string[]): string;
+    protected drawAmmoTpl(caliber: string, staticAmmoDist: Record<string, IStaticAmmoDetails[]>, fallbackCartridgeTpl: string, cartridgeWhitelist?: string[]): string;
     /**
      * Create a basic cartrige object
      * @param parentId container cartridges will be placed in
@@ -401,7 +402,7 @@ export declare class ItemHelper {
     addChildSlotItems(itemToAdd: Item[], itemToAddTemplate: ITemplateItem, modSpawnChanceDict?: Record<string, number>, requiredOnly?: boolean): Item[];
     /**
      * Get a compatible tpl from the array provided where it is not found in the provided incompatible mod tpls parameter
-     * @param possibleTpls Tpls to randomply choose from
+     * @param possibleTpls Tpls to randomly choose from
      * @param incompatibleModTpls Incompatible tpls to not allow
      * @returns Chosen tpl or null
      */

TypeScript/15HttpListenerExample/types/services/FenceService.d.ts

@@ -46,6 +46,21 @@ export declare class FenceService {
      * @param assort New assorts to replace old with
      */
     setFenceAssort(assort: ITraderAssort): void;
+    /**
+     * Replace discount fence assort with new assort
+     * @param assort New assorts to replace old with
+     */
+    setDiscountFenceAssort(assort: ITraderAssort): void;
+    /**
+     * Get main fence assort
+     * @return ITraderAssort
+     */
+    getMainFenceAssort(): ITraderAssort;
+    /**
+     * Get discount fence assort
+     * @return ITraderAssort
+     */
+    getDiscountFenceAssort(): ITraderAssort;
     /**
      * Replace high rep level fence assort with new assort
      * @param discountAssort New assorts to replace old with
@@ -119,8 +134,8 @@ export declare class FenceService {
     protected deleteRandomAssorts(itemCountToReplace: number, assort: ITraderAssort): void;
     /**
      * Choose an item at random and remove it + mods from assorts
-     * @param assort Items to remove from
+     * @param assort Trader assort to remove item from
-     * @param rootItems Assort root items to pick from to remove
+     * @param rootItems Pool of root items to pick from to remove
      */
     protected removeRandomItemFromAssorts(assort: ITraderAssort, rootItems: Item[]): void;
     /**

TypeScript/15HttpListenerExample/types/services/ProfileFixerService.d.ts

@@ -183,4 +183,9 @@ export declare class ProfileFixerService {
      * @param pmcProfile Profile to remove dead quests from
      */
     protected removeOrphanedQuests(pmcProfile: IPmcData): void;
+    /**
+     * If someone has run a mod from pre-3.8.0, it results in an invalid `nextResupply` value
+     * Resolve this by setting the nextResupply to 0 if it's null
+     */
+    protected fixNullTraderNextResupply(pmcProfile: IPmcData): void;
 }

TypeScript/16ImporterUtil/types/controllers/BotController.d.ts

@@ -54,9 +54,10 @@ export declare class BotController {
      * Adjust PMC settings to ensure they engage the correct bot types
      * @param type what bot the server is requesting settings for
      * @param diffLevel difficulty level server requested settings for
+     * @param ignoreRaidSettings should raid settings chosen pre-raid be ignored
      * @returns Difficulty object
      */
-    getBotDifficulty(type: string, diffLevel: string): Difficulty;
+    getBotDifficulty(type: string, diffLevel: string, ignoreRaidSettings?: boolean): Difficulty;
     getAllBotDifficulties(): Record<string, any>;
     /**
      * Generate bot profiles and store in cache

TypeScript/16ImporterUtil/types/controllers/MatchController.d.ts

@@ -75,10 +75,11 @@ export declare class MatchController {
     protected sendCoopTakenFenceMessage(sessionId: string): void;
     /**
      * Handle when a player extracts using a coop extract - add rep to fence
+     * @param sessionId Session/player id
      * @param pmcData Profile
      * @param extractName Name of extract taken
      */
-    protected handleCoopExtract(pmcData: IPmcData, extractName: string): void;
+    protected handleCoopExtract(sessionId: string, pmcData: IPmcData, extractName: string): void;
     /**
      * Was extract by car
      * @param extractName name of extract

TypeScript/16ImporterUtil/types/generators/BotEquipmentModGenerator.d.ts

@@ -187,12 +187,12 @@ export declare class BotEquipmentModGenerator {
      */
     protected getRandomModTplFromItemDb(modTpl: string, parentSlot: Slot, modSlot: string, items: Item[]): string;
     /**
-     * Log errors if mod is not compatible with slot
+     * Check if mod exists in db + is for a required slot
-     * @param modToAdd template of mod to check
+     * @param modToAdd Db template of mod to check
-     * @param slotAddedToTemplate slot the item will be placed in
+     * @param slotAddedToTemplate Slot object the item will be placed as child into
-     * @param modSlot slot the mod will fill
+     * @param modSlot Slot the mod will fill
-     * @param parentTemplate template of the mods being added
+     * @param parentTemplate Db template of the mods being added
-     * @param botRole
+     * @param botRole Bots wildspawntype (assault/pmcBot etc)
      * @returns true if valid
      */
     protected isModValidForSlot(modToAdd: [boolean, ITemplateItem], slotAddedToTemplate: Slot, modSlot: string, parentTemplate: ITemplateItem, botRole: string): boolean;

TypeScript/16ImporterUtil/types/helpers/ItemHelper.d.ts

@@ -363,10 +363,11 @@ export declare class ItemHelper {
      * Chose a randomly weighted cartridge that fits
      * @param caliber Desired caliber
      * @param staticAmmoDist Cartridges and thier weights
+     * @param fallbackCartridgeTpl If a cartridge cannot be found in the above staticAmmoDist param, use this instead
      * @param cartridgeWhitelist OPTIONAL whitelist for cartridges
      * @returns Tpl of cartridge
      */
-    protected drawAmmoTpl(caliber: string, staticAmmoDist: Record<string, IStaticAmmoDetails[]>, cartridgeWhitelist?: string[]): string;
+    protected drawAmmoTpl(caliber: string, staticAmmoDist: Record<string, IStaticAmmoDetails[]>, fallbackCartridgeTpl: string, cartridgeWhitelist?: string[]): string;
     /**
      * Create a basic cartrige object
      * @param parentId container cartridges will be placed in
@@ -401,7 +402,7 @@ export declare class ItemHelper {
     addChildSlotItems(itemToAdd: Item[], itemToAddTemplate: ITemplateItem, modSpawnChanceDict?: Record<string, number>, requiredOnly?: boolean): Item[];
     /**
      * Get a compatible tpl from the array provided where it is not found in the provided incompatible mod tpls parameter
-     * @param possibleTpls Tpls to randomply choose from
+     * @param possibleTpls Tpls to randomly choose from
      * @param incompatibleModTpls Incompatible tpls to not allow
      * @returns Chosen tpl or null
      */

TypeScript/16ImporterUtil/types/services/FenceService.d.ts

@@ -46,6 +46,21 @@ export declare class FenceService {
      * @param assort New assorts to replace old with
      */
     setFenceAssort(assort: ITraderAssort): void;
+    /**
+     * Replace discount fence assort with new assort
+     * @param assort New assorts to replace old with
+     */
+    setDiscountFenceAssort(assort: ITraderAssort): void;
+    /**
+     * Get main fence assort
+     * @return ITraderAssort
+     */
+    getMainFenceAssort(): ITraderAssort;
+    /**
+     * Get discount fence assort
+     * @return ITraderAssort
+     */
+    getDiscountFenceAssort(): ITraderAssort;
     /**
      * Replace high rep level fence assort with new assort
      * @param discountAssort New assorts to replace old with
@@ -119,8 +134,8 @@ export declare class FenceService {
     protected deleteRandomAssorts(itemCountToReplace: number, assort: ITraderAssort): void;
     /**
      * Choose an item at random and remove it + mods from assorts
-     * @param assort Items to remove from
+     * @param assort Trader assort to remove item from
-     * @param rootItems Assort root items to pick from to remove
+     * @param rootItems Pool of root items to pick from to remove
      */
     protected removeRandomItemFromAssorts(assort: ITraderAssort, rootItems: Item[]): void;
     /**

TypeScript/16ImporterUtil/types/services/ProfileFixerService.d.ts

@@ -183,4 +183,9 @@ export declare class ProfileFixerService {
      * @param pmcProfile Profile to remove dead quests from
      */
     protected removeOrphanedQuests(pmcProfile: IPmcData): void;
+    /**
+     * If someone has run a mod from pre-3.8.0, it results in an invalid `nextResupply` value
+     * Resolve this by setting the nextResupply to 0 if it's null
+     */
+    protected fixNullTraderNextResupply(pmcProfile: IPmcData): void;
 }

TypeScript/17AsyncImporterWithDependency1/types/controllers/BotController.d.ts

@@ -54,9 +54,10 @@ export declare class BotController {
      * Adjust PMC settings to ensure they engage the correct bot types
      * @param type what bot the server is requesting settings for
      * @param diffLevel difficulty level server requested settings for
+     * @param ignoreRaidSettings should raid settings chosen pre-raid be ignored
      * @returns Difficulty object
      */
-    getBotDifficulty(type: string, diffLevel: string): Difficulty;
+    getBotDifficulty(type: string, diffLevel: string, ignoreRaidSettings?: boolean): Difficulty;
     getAllBotDifficulties(): Record<string, any>;
     /**
      * Generate bot profiles and store in cache

TypeScript/17AsyncImporterWithDependency1/types/controllers/MatchController.d.ts

@@ -75,10 +75,11 @@ export declare class MatchController {
     protected sendCoopTakenFenceMessage(sessionId: string): void;
     /**
      * Handle when a player extracts using a coop extract - add rep to fence
+     * @param sessionId Session/player id
      * @param pmcData Profile
      * @param extractName Name of extract taken
      */
-    protected handleCoopExtract(pmcData: IPmcData, extractName: string): void;
+    protected handleCoopExtract(sessionId: string, pmcData: IPmcData, extractName: string): void;
     /**
      * Was extract by car
      * @param extractName name of extract

TypeScript/17AsyncImporterWithDependency1/types/generators/BotEquipmentModGenerator.d.ts

@@ -187,12 +187,12 @@ export declare class BotEquipmentModGenerator {
      */
     protected getRandomModTplFromItemDb(modTpl: string, parentSlot: Slot, modSlot: string, items: Item[]): string;
     /**
-     * Log errors if mod is not compatible with slot
+     * Check if mod exists in db + is for a required slot
-     * @param modToAdd template of mod to check
+     * @param modToAdd Db template of mod to check
-     * @param slotAddedToTemplate slot the item will be placed in
+     * @param slotAddedToTemplate Slot object the item will be placed as child into
-     * @param modSlot slot the mod will fill
+     * @param modSlot Slot the mod will fill
-     * @param parentTemplate template of the mods being added
+     * @param parentTemplate Db template of the mods being added
-     * @param botRole
+     * @param botRole Bots wildspawntype (assault/pmcBot etc)
      * @returns true if valid
      */
     protected isModValidForSlot(modToAdd: [boolean, ITemplateItem], slotAddedToTemplate: Slot, modSlot: string, parentTemplate: ITemplateItem, botRole: string): boolean;

TypeScript/17AsyncImporterWithDependency1/types/helpers/ItemHelper.d.ts

@@ -363,10 +363,11 @@ export declare class ItemHelper {
      * Chose a randomly weighted cartridge that fits
      * @param caliber Desired caliber
      * @param staticAmmoDist Cartridges and thier weights
+     * @param fallbackCartridgeTpl If a cartridge cannot be found in the above staticAmmoDist param, use this instead
      * @param cartridgeWhitelist OPTIONAL whitelist for cartridges
      * @returns Tpl of cartridge
      */
-    protected drawAmmoTpl(caliber: string, staticAmmoDist: Record<string, IStaticAmmoDetails[]>, cartridgeWhitelist?: string[]): string;
+    protected drawAmmoTpl(caliber: string, staticAmmoDist: Record<string, IStaticAmmoDetails[]>, fallbackCartridgeTpl: string, cartridgeWhitelist?: string[]): string;
     /**
      * Create a basic cartrige object
      * @param parentId container cartridges will be placed in
@@ -401,7 +402,7 @@ export declare class ItemHelper {
     addChildSlotItems(itemToAdd: Item[], itemToAddTemplate: ITemplateItem, modSpawnChanceDict?: Record<string, number>, requiredOnly?: boolean): Item[];
     /**
      * Get a compatible tpl from the array provided where it is not found in the provided incompatible mod tpls parameter
-     * @param possibleTpls Tpls to randomply choose from
+     * @param possibleTpls Tpls to randomly choose from
      * @param incompatibleModTpls Incompatible tpls to not allow
      * @returns Chosen tpl or null
      */

TypeScript/17AsyncImporterWithDependency1/types/services/FenceService.d.ts

@@ -46,6 +46,21 @@ export declare class FenceService {
      * @param assort New assorts to replace old with
      */
     setFenceAssort(assort: ITraderAssort): void;
+    /**
+     * Replace discount fence assort with new assort
+     * @param assort New assorts to replace old with
+     */
+    setDiscountFenceAssort(assort: ITraderAssort): void;
+    /**
+     * Get main fence assort
+     * @return ITraderAssort
+     */
+    getMainFenceAssort(): ITraderAssort;
+    /**
+     * Get discount fence assort
+     * @return ITraderAssort
+     */
+    getDiscountFenceAssort(): ITraderAssort;
     /**
      * Replace high rep level fence assort with new assort
      * @param discountAssort New assorts to replace old with
@@ -119,8 +134,8 @@ export declare class FenceService {
     protected deleteRandomAssorts(itemCountToReplace: number, assort: ITraderAssort): void;
     /**
      * Choose an item at random and remove it + mods from assorts
-     * @param assort Items to remove from
+     * @param assort Trader assort to remove item from
-     * @param rootItems Assort root items to pick from to remove
+     * @param rootItems Pool of root items to pick from to remove
      */
     protected removeRandomItemFromAssorts(assort: ITraderAssort, rootItems: Item[]): void;
     /**

TypeScript/17AsyncImporterWithDependency1/types/services/ProfileFixerService.d.ts

@@ -183,4 +183,9 @@ export declare class ProfileFixerService {
      * @param pmcProfile Profile to remove dead quests from
      */
     protected removeOrphanedQuests(pmcProfile: IPmcData): void;
+    /**
+     * If someone has run a mod from pre-3.8.0, it results in an invalid `nextResupply` value
+     * Resolve this by setting the nextResupply to 0 if it's null
+     */
+    protected fixNullTraderNextResupply(pmcProfile: IPmcData): void;
 }

TypeScript/17AsyncImporterWithDependency2/types/controllers/BotController.d.ts

@@ -54,9 +54,10 @@ export declare class BotController {
      * Adjust PMC settings to ensure they engage the correct bot types
      * @param type what bot the server is requesting settings for
      * @param diffLevel difficulty level server requested settings for
+     * @param ignoreRaidSettings should raid settings chosen pre-raid be ignored
      * @returns Difficulty object
      */
-    getBotDifficulty(type: string, diffLevel: string): Difficulty;
+    getBotDifficulty(type: string, diffLevel: string, ignoreRaidSettings?: boolean): Difficulty;
     getAllBotDifficulties(): Record<string, any>;
     /**
      * Generate bot profiles and store in cache

TypeScript/17AsyncImporterWithDependency2/types/controllers/MatchController.d.ts

@@ -75,10 +75,11 @@ export declare class MatchController {
     protected sendCoopTakenFenceMessage(sessionId: string): void;
     /**
      * Handle when a player extracts using a coop extract - add rep to fence
+     * @param sessionId Session/player id
      * @param pmcData Profile
      * @param extractName Name of extract taken
      */
-    protected handleCoopExtract(pmcData: IPmcData, extractName: string): void;
+    protected handleCoopExtract(sessionId: string, pmcData: IPmcData, extractName: string): void;
     /**
      * Was extract by car
      * @param extractName name of extract

TypeScript/17AsyncImporterWithDependency2/types/generators/BotEquipmentModGenerator.d.ts

@@ -187,12 +187,12 @@ export declare class BotEquipmentModGenerator {
      */
     protected getRandomModTplFromItemDb(modTpl: string, parentSlot: Slot, modSlot: string, items: Item[]): string;
     /**
-     * Log errors if mod is not compatible with slot
+     * Check if mod exists in db + is for a required slot
-     * @param modToAdd template of mod to check
+     * @param modToAdd Db template of mod to check
-     * @param slotAddedToTemplate slot the item will be placed in
+     * @param slotAddedToTemplate Slot object the item will be placed as child into
-     * @param modSlot slot the mod will fill
+     * @param modSlot Slot the mod will fill
-     * @param parentTemplate template of the mods being added
+     * @param parentTemplate Db template of the mods being added
-     * @param botRole
+     * @param botRole Bots wildspawntype (assault/pmcBot etc)
      * @returns true if valid
      */
     protected isModValidForSlot(modToAdd: [boolean, ITemplateItem], slotAddedToTemplate: Slot, modSlot: string, parentTemplate: ITemplateItem, botRole: string): boolean;

TypeScript/17AsyncImporterWithDependency2/types/helpers/ItemHelper.d.ts

@@ -363,10 +363,11 @@ export declare class ItemHelper {
      * Chose a randomly weighted cartridge that fits
      * @param caliber Desired caliber
      * @param staticAmmoDist Cartridges and thier weights
+     * @param fallbackCartridgeTpl If a cartridge cannot be found in the above staticAmmoDist param, use this instead
      * @param cartridgeWhitelist OPTIONAL whitelist for cartridges
      * @returns Tpl of cartridge
      */
-    protected drawAmmoTpl(caliber: string, staticAmmoDist: Record<string, IStaticAmmoDetails[]>, cartridgeWhitelist?: string[]): string;
+    protected drawAmmoTpl(caliber: string, staticAmmoDist: Record<string, IStaticAmmoDetails[]>, fallbackCartridgeTpl: string, cartridgeWhitelist?: string[]): string;
     /**
      * Create a basic cartrige object
      * @param parentId container cartridges will be placed in
@@ -401,7 +402,7 @@ export declare class ItemHelper {
     addChildSlotItems(itemToAdd: Item[], itemToAddTemplate: ITemplateItem, modSpawnChanceDict?: Record<string, number>, requiredOnly?: boolean): Item[];
     /**
      * Get a compatible tpl from the array provided where it is not found in the provided incompatible mod tpls parameter
-     * @param possibleTpls Tpls to randomply choose from
+     * @param possibleTpls Tpls to randomly choose from
      * @param incompatibleModTpls Incompatible tpls to not allow
      * @returns Chosen tpl or null
      */

TypeScript/17AsyncImporterWithDependency2/types/services/FenceService.d.ts

@@ -46,6 +46,21 @@ export declare class FenceService {
      * @param assort New assorts to replace old with
      */
     setFenceAssort(assort: ITraderAssort): void;
+    /**
+     * Replace discount fence assort with new assort
+     * @param assort New assorts to replace old with
+     */
+    setDiscountFenceAssort(assort: ITraderAssort): void;
+    /**
+     * Get main fence assort
+     * @return ITraderAssort
+     */
+    getMainFenceAssort(): ITraderAssort;
+    /**
+     * Get discount fence assort
+     * @return ITraderAssort
+     */
+    getDiscountFenceAssort(): ITraderAssort;
     /**
      * Replace high rep level fence assort with new assort
      * @param discountAssort New assorts to replace old with
@@ -119,8 +134,8 @@ export declare class FenceService {
     protected deleteRandomAssorts(itemCountToReplace: number, assort: ITraderAssort): void;
     /**
      * Choose an item at random and remove it + mods from assorts
-     * @param assort Items to remove from
+     * @param assort Trader assort to remove item from
-     * @param rootItems Assort root items to pick from to remove
+     * @param rootItems Pool of root items to pick from to remove
      */
     protected removeRandomItemFromAssorts(assort: ITraderAssort, rootItems: Item[]): void;
     /**

TypeScript/17AsyncImporterWithDependency2/types/services/ProfileFixerService.d.ts

@@ -183,4 +183,9 @@ export declare class ProfileFixerService {
      * @param pmcProfile Profile to remove dead quests from
      */
     protected removeOrphanedQuests(pmcProfile: IPmcData): void;
+    /**
+     * If someone has run a mod from pre-3.8.0, it results in an invalid `nextResupply` value
+     * Resolve this by setting the nextResupply to 0 if it's null
+     */
+    protected fixNullTraderNextResupply(pmcProfile: IPmcData): void;
 }

TypeScript/18CustomItemService/types/controllers/BotController.d.ts

@@ -54,9 +54,10 @@ export declare class BotController {
      * Adjust PMC settings to ensure they engage the correct bot types
      * @param type what bot the server is requesting settings for
      * @param diffLevel difficulty level server requested settings for
+     * @param ignoreRaidSettings should raid settings chosen pre-raid be ignored
      * @returns Difficulty object
      */
-    getBotDifficulty(type: string, diffLevel: string): Difficulty;
+    getBotDifficulty(type: string, diffLevel: string, ignoreRaidSettings?: boolean): Difficulty;
     getAllBotDifficulties(): Record<string, any>;
     /**
      * Generate bot profiles and store in cache

TypeScript/18CustomItemService/types/controllers/MatchController.d.ts

@@ -75,10 +75,11 @@ export declare class MatchController {
     protected sendCoopTakenFenceMessage(sessionId: string): void;
     /**
      * Handle when a player extracts using a coop extract - add rep to fence
+     * @param sessionId Session/player id
      * @param pmcData Profile
      * @param extractName Name of extract taken
      */
-    protected handleCoopExtract(pmcData: IPmcData, extractName: string): void;
+    protected handleCoopExtract(sessionId: string, pmcData: IPmcData, extractName: string): void;
     /**
      * Was extract by car
      * @param extractName name of extract

TypeScript/18CustomItemService/types/generators/BotEquipmentModGenerator.d.ts

@@ -187,12 +187,12 @@ export declare class BotEquipmentModGenerator {
      */
     protected getRandomModTplFromItemDb(modTpl: string, parentSlot: Slot, modSlot: string, items: Item[]): string;
     /**
-     * Log errors if mod is not compatible with slot
+     * Check if mod exists in db + is for a required slot
-     * @param modToAdd template of mod to check
+     * @param modToAdd Db template of mod to check
-     * @param slotAddedToTemplate slot the item will be placed in
+     * @param slotAddedToTemplate Slot object the item will be placed as child into
-     * @param modSlot slot the mod will fill
+     * @param modSlot Slot the mod will fill
-     * @param parentTemplate template of the mods being added
+     * @param parentTemplate Db template of the mods being added
-     * @param botRole
+     * @param botRole Bots wildspawntype (assault/pmcBot etc)
      * @returns true if valid
      */
     protected isModValidForSlot(modToAdd: [boolean, ITemplateItem], slotAddedToTemplate: Slot, modSlot: string, parentTemplate: ITemplateItem, botRole: string): boolean;

TypeScript/18CustomItemService/types/helpers/ItemHelper.d.ts

@@ -363,10 +363,11 @@ export declare class ItemHelper {
      * Chose a randomly weighted cartridge that fits
      * @param caliber Desired caliber
      * @param staticAmmoDist Cartridges and thier weights
+     * @param fallbackCartridgeTpl If a cartridge cannot be found in the above staticAmmoDist param, use this instead
      * @param cartridgeWhitelist OPTIONAL whitelist for cartridges
      * @returns Tpl of cartridge
      */
-    protected drawAmmoTpl(caliber: string, staticAmmoDist: Record<string, IStaticAmmoDetails[]>, cartridgeWhitelist?: string[]): string;
+    protected drawAmmoTpl(caliber: string, staticAmmoDist: Record<string, IStaticAmmoDetails[]>, fallbackCartridgeTpl: string, cartridgeWhitelist?: string[]): string;
     /**
      * Create a basic cartrige object
      * @param parentId container cartridges will be placed in
@@ -401,7 +402,7 @@ export declare class ItemHelper {
     addChildSlotItems(itemToAdd: Item[], itemToAddTemplate: ITemplateItem, modSpawnChanceDict?: Record<string, number>, requiredOnly?: boolean): Item[];
     /**
      * Get a compatible tpl from the array provided where it is not found in the provided incompatible mod tpls parameter
-     * @param possibleTpls Tpls to randomply choose from
+     * @param possibleTpls Tpls to randomly choose from
      * @param incompatibleModTpls Incompatible tpls to not allow
      * @returns Chosen tpl or null
      */

TypeScript/18CustomItemService/types/services/FenceService.d.ts

@@ -46,6 +46,21 @@ export declare class FenceService {
      * @param assort New assorts to replace old with
      */
     setFenceAssort(assort: ITraderAssort): void;
+    /**
+     * Replace discount fence assort with new assort
+     * @param assort New assorts to replace old with
+     */
+    setDiscountFenceAssort(assort: ITraderAssort): void;
+    /**
+     * Get main fence assort
+     * @return ITraderAssort
+     */
+    getMainFenceAssort(): ITraderAssort;
+    /**
+     * Get discount fence assort
+     * @return ITraderAssort
+     */
+    getDiscountFenceAssort(): ITraderAssort;
     /**
      * Replace high rep level fence assort with new assort
      * @param discountAssort New assorts to replace old with
@@ -119,8 +134,8 @@ export declare class FenceService {
     protected deleteRandomAssorts(itemCountToReplace: number, assort: ITraderAssort): void;
     /**
      * Choose an item at random and remove it + mods from assorts
-     * @param assort Items to remove from
+     * @param assort Trader assort to remove item from
-     * @param rootItems Assort root items to pick from to remove
+     * @param rootItems Pool of root items to pick from to remove
      */
     protected removeRandomItemFromAssorts(assort: ITraderAssort, rootItems: Item[]): void;
     /**

TypeScript/18CustomItemService/types/services/ProfileFixerService.d.ts

@@ -183,4 +183,9 @@ export declare class ProfileFixerService {
      * @param pmcProfile Profile to remove dead quests from
      */
     protected removeOrphanedQuests(pmcProfile: IPmcData): void;
+    /**
+     * If someone has run a mod from pre-3.8.0, it results in an invalid `nextResupply` value
+     * Resolve this by setting the nextResupply to 0 if it's null
+     */
+    protected fixNullTraderNextResupply(pmcProfile: IPmcData): void;
 }

TypeScript/19UseExternalLibraries/types/controllers/BotController.d.ts

@@ -54,9 +54,10 @@ export declare class BotController {
      * Adjust PMC settings to ensure they engage the correct bot types
      * @param type what bot the server is requesting settings for
      * @param diffLevel difficulty level server requested settings for
+     * @param ignoreRaidSettings should raid settings chosen pre-raid be ignored
      * @returns Difficulty object
      */
-    getBotDifficulty(type: string, diffLevel: string): Difficulty;
+    getBotDifficulty(type: string, diffLevel: string, ignoreRaidSettings?: boolean): Difficulty;
     getAllBotDifficulties(): Record<string, any>;
     /**
      * Generate bot profiles and store in cache

TypeScript/19UseExternalLibraries/types/controllers/MatchController.d.ts

@@ -75,10 +75,11 @@ export declare class MatchController {
     protected sendCoopTakenFenceMessage(sessionId: string): void;
     /**
      * Handle when a player extracts using a coop extract - add rep to fence
+     * @param sessionId Session/player id
      * @param pmcData Profile
      * @param extractName Name of extract taken
      */
-    protected handleCoopExtract(pmcData: IPmcData, extractName: string): void;
+    protected handleCoopExtract(sessionId: string, pmcData: IPmcData, extractName: string): void;
     /**
      * Was extract by car
      * @param extractName name of extract

TypeScript/19UseExternalLibraries/types/generators/BotEquipmentModGenerator.d.ts

@@ -187,12 +187,12 @@ export declare class BotEquipmentModGenerator {
      */
     protected getRandomModTplFromItemDb(modTpl: string, parentSlot: Slot, modSlot: string, items: Item[]): string;
     /**
-     * Log errors if mod is not compatible with slot
+     * Check if mod exists in db + is for a required slot
-     * @param modToAdd template of mod to check
+     * @param modToAdd Db template of mod to check
-     * @param slotAddedToTemplate slot the item will be placed in
+     * @param slotAddedToTemplate Slot object the item will be placed as child into
-     * @param modSlot slot the mod will fill
+     * @param modSlot Slot the mod will fill
-     * @param parentTemplate template of the mods being added
+     * @param parentTemplate Db template of the mods being added
-     * @param botRole
+     * @param botRole Bots wildspawntype (assault/pmcBot etc)
      * @returns true if valid
      */
     protected isModValidForSlot(modToAdd: [boolean, ITemplateItem], slotAddedToTemplate: Slot, modSlot: string, parentTemplate: ITemplateItem, botRole: string): boolean;

TypeScript/19UseExternalLibraries/types/helpers/ItemHelper.d.ts

@@ -363,10 +363,11 @@ export declare class ItemHelper {
      * Chose a randomly weighted cartridge that fits
      * @param caliber Desired caliber
      * @param staticAmmoDist Cartridges and thier weights
+     * @param fallbackCartridgeTpl If a cartridge cannot be found in the above staticAmmoDist param, use this instead
      * @param cartridgeWhitelist OPTIONAL whitelist for cartridges
      * @returns Tpl of cartridge
      */
-    protected drawAmmoTpl(caliber: string, staticAmmoDist: Record<string, IStaticAmmoDetails[]>, cartridgeWhitelist?: string[]): string;
+    protected drawAmmoTpl(caliber: string, staticAmmoDist: Record<string, IStaticAmmoDetails[]>, fallbackCartridgeTpl: string, cartridgeWhitelist?: string[]): string;
     /**
      * Create a basic cartrige object
      * @param parentId container cartridges will be placed in
@@ -401,7 +402,7 @@ export declare class ItemHelper {
     addChildSlotItems(itemToAdd: Item[], itemToAddTemplate: ITemplateItem, modSpawnChanceDict?: Record<string, number>, requiredOnly?: boolean): Item[];
     /**
      * Get a compatible tpl from the array provided where it is not found in the provided incompatible mod tpls parameter
-     * @param possibleTpls Tpls to randomply choose from
+     * @param possibleTpls Tpls to randomly choose from
      * @param incompatibleModTpls Incompatible tpls to not allow
      * @returns Chosen tpl or null
      */

TypeScript/19UseExternalLibraries/types/services/FenceService.d.ts

@@ -46,6 +46,21 @@ export declare class FenceService {
      * @param assort New assorts to replace old with
      */
     setFenceAssort(assort: ITraderAssort): void;
+    /**
+     * Replace discount fence assort with new assort
+     * @param assort New assorts to replace old with
+     */
+    setDiscountFenceAssort(assort: ITraderAssort): void;
+    /**
+     * Get main fence assort
+     * @return ITraderAssort
+     */
+    getMainFenceAssort(): ITraderAssort;
+    /**
+     * Get discount fence assort
+     * @return ITraderAssort
+     */
+    getDiscountFenceAssort(): ITraderAssort;
     /**
      * Replace high rep level fence assort with new assort
      * @param discountAssort New assorts to replace old with
@@ -119,8 +134,8 @@ export declare class FenceService {
     protected deleteRandomAssorts(itemCountToReplace: number, assort: ITraderAssort): void;
     /**
      * Choose an item at random and remove it + mods from assorts
-     * @param assort Items to remove from
+     * @param assort Trader assort to remove item from
-     * @param rootItems Assort root items to pick from to remove
+     * @param rootItems Pool of root items to pick from to remove
      */
     protected removeRandomItemFromAssorts(assort: ITraderAssort, rootItems: Item[]): void;
     /**

TypeScript/19UseExternalLibraries/types/services/ProfileFixerService.d.ts

@@ -183,4 +183,9 @@ export declare class ProfileFixerService {
      * @param pmcProfile Profile to remove dead quests from
      */
     protected removeOrphanedQuests(pmcProfile: IPmcData): void;
+    /**
+     * If someone has run a mod from pre-3.8.0, it results in an invalid `nextResupply` value
+     * Resolve this by setting the nextResupply to 0 if it's null
+     */
+    protected fixNullTraderNextResupply(pmcProfile: IPmcData): void;
 }

TypeScript/1LogToConsole/types/controllers/BotController.d.ts

@@ -54,9 +54,10 @@ export declare class BotController {
      * Adjust PMC settings to ensure they engage the correct bot types
      * @param type what bot the server is requesting settings for
      * @param diffLevel difficulty level server requested settings for
+     * @param ignoreRaidSettings should raid settings chosen pre-raid be ignored
      * @returns Difficulty object
      */
-    getBotDifficulty(type: string, diffLevel: string): Difficulty;
+    getBotDifficulty(type: string, diffLevel: string, ignoreRaidSettings?: boolean): Difficulty;
     getAllBotDifficulties(): Record<string, any>;
     /**
      * Generate bot profiles and store in cache

TypeScript/1LogToConsole/types/controllers/MatchController.d.ts

@@ -75,10 +75,11 @@ export declare class MatchController {
     protected sendCoopTakenFenceMessage(sessionId: string): void;
     /**
      * Handle when a player extracts using a coop extract - add rep to fence
+     * @param sessionId Session/player id
      * @param pmcData Profile
      * @param extractName Name of extract taken
      */
-    protected handleCoopExtract(pmcData: IPmcData, extractName: string): void;
+    protected handleCoopExtract(sessionId: string, pmcData: IPmcData, extractName: string): void;
     /**
      * Was extract by car
      * @param extractName name of extract

TypeScript/1LogToConsole/types/generators/BotEquipmentModGenerator.d.ts

@@ -187,12 +187,12 @@ export declare class BotEquipmentModGenerator {
      */
     protected getRandomModTplFromItemDb(modTpl: string, parentSlot: Slot, modSlot: string, items: Item[]): string;
     /**
-     * Log errors if mod is not compatible with slot
+     * Check if mod exists in db + is for a required slot
-     * @param modToAdd template of mod to check
+     * @param modToAdd Db template of mod to check
-     * @param slotAddedToTemplate slot the item will be placed in
+     * @param slotAddedToTemplate Slot object the item will be placed as child into
-     * @param modSlot slot the mod will fill
+     * @param modSlot Slot the mod will fill
-     * @param parentTemplate template of the mods being added
+     * @param parentTemplate Db template of the mods being added
-     * @param botRole
+     * @param botRole Bots wildspawntype (assault/pmcBot etc)
      * @returns true if valid
      */
     protected isModValidForSlot(modToAdd: [boolean, ITemplateItem], slotAddedToTemplate: Slot, modSlot: string, parentTemplate: ITemplateItem, botRole: string): boolean;

TypeScript/1LogToConsole/types/helpers/ItemHelper.d.ts

@@ -363,10 +363,11 @@ export declare class ItemHelper {
      * Chose a randomly weighted cartridge that fits
      * @param caliber Desired caliber
      * @param staticAmmoDist Cartridges and thier weights
+     * @param fallbackCartridgeTpl If a cartridge cannot be found in the above staticAmmoDist param, use this instead
      * @param cartridgeWhitelist OPTIONAL whitelist for cartridges
      * @returns Tpl of cartridge
      */
-    protected drawAmmoTpl(caliber: string, staticAmmoDist: Record<string, IStaticAmmoDetails[]>, cartridgeWhitelist?: string[]): string;
+    protected drawAmmoTpl(caliber: string, staticAmmoDist: Record<string, IStaticAmmoDetails[]>, fallbackCartridgeTpl: string, cartridgeWhitelist?: string[]): string;
     /**
      * Create a basic cartrige object
      * @param parentId container cartridges will be placed in
@@ -401,7 +402,7 @@ export declare class ItemHelper {
     addChildSlotItems(itemToAdd: Item[], itemToAddTemplate: ITemplateItem, modSpawnChanceDict?: Record<string, number>, requiredOnly?: boolean): Item[];
     /**
      * Get a compatible tpl from the array provided where it is not found in the provided incompatible mod tpls parameter
-     * @param possibleTpls Tpls to randomply choose from
+     * @param possibleTpls Tpls to randomly choose from
      * @param incompatibleModTpls Incompatible tpls to not allow
      * @returns Chosen tpl or null
      */

TypeScript/1LogToConsole/types/services/FenceService.d.ts

@@ -46,6 +46,21 @@ export declare class FenceService {
      * @param assort New assorts to replace old with
      */
     setFenceAssort(assort: ITraderAssort): void;
+    /**
+     * Replace discount fence assort with new assort
+     * @param assort New assorts to replace old with
+     */
+    setDiscountFenceAssort(assort: ITraderAssort): void;
+    /**
+     * Get main fence assort
+     * @return ITraderAssort
+     */
+    getMainFenceAssort(): ITraderAssort;
+    /**
+     * Get discount fence assort
+     * @return ITraderAssort
+     */
+    getDiscountFenceAssort(): ITraderAssort;
     /**
      * Replace high rep level fence assort with new assort
      * @param discountAssort New assorts to replace old with
@@ -119,8 +134,8 @@ export declare class FenceService {
     protected deleteRandomAssorts(itemCountToReplace: number, assort: ITraderAssort): void;
     /**
      * Choose an item at random and remove it + mods from assorts
-     * @param assort Items to remove from
+     * @param assort Trader assort to remove item from
-     * @param rootItems Assort root items to pick from to remove
+     * @param rootItems Pool of root items to pick from to remove
      */
     protected removeRandomItemFromAssorts(assort: ITraderAssort, rootItems: Item[]): void;
     /**

TypeScript/1LogToConsole/types/services/ProfileFixerService.d.ts

@@ -183,4 +183,9 @@ export declare class ProfileFixerService {
      * @param pmcProfile Profile to remove dead quests from
      */
     protected removeOrphanedQuests(pmcProfile: IPmcData): void;
+    /**
+     * If someone has run a mod from pre-3.8.0, it results in an invalid `nextResupply` value
+     * Resolve this by setting the nextResupply to 0 if it's null
+     */
+    protected fixNullTraderNextResupply(pmcProfile: IPmcData): void;
 }

TypeScript/20CustomChatBot/types/controllers/BotController.d.ts

@@ -54,9 +54,10 @@ export declare class BotController {
      * Adjust PMC settings to ensure they engage the correct bot types
      * @param type what bot the server is requesting settings for
      * @param diffLevel difficulty level server requested settings for
+     * @param ignoreRaidSettings should raid settings chosen pre-raid be ignored
      * @returns Difficulty object
      */
-    getBotDifficulty(type: string, diffLevel: string): Difficulty;
+    getBotDifficulty(type: string, diffLevel: string, ignoreRaidSettings?: boolean): Difficulty;
     getAllBotDifficulties(): Record<string, any>;
     /**
      * Generate bot profiles and store in cache

TypeScript/20CustomChatBot/types/controllers/MatchController.d.ts

@@ -75,10 +75,11 @@ export declare class MatchController {
     protected sendCoopTakenFenceMessage(sessionId: string): void;
     /**
      * Handle when a player extracts using a coop extract - add rep to fence
+     * @param sessionId Session/player id
      * @param pmcData Profile
      * @param extractName Name of extract taken
      */
-    protected handleCoopExtract(pmcData: IPmcData, extractName: string): void;
+    protected handleCoopExtract(sessionId: string, pmcData: IPmcData, extractName: string): void;
     /**
      * Was extract by car
      * @param extractName name of extract

TypeScript/20CustomChatBot/types/generators/BotEquipmentModGenerator.d.ts

@@ -187,12 +187,12 @@ export declare class BotEquipmentModGenerator {
      */
     protected getRandomModTplFromItemDb(modTpl: string, parentSlot: Slot, modSlot: string, items: Item[]): string;
     /**
-     * Log errors if mod is not compatible with slot
+     * Check if mod exists in db + is for a required slot
-     * @param modToAdd template of mod to check
+     * @param modToAdd Db template of mod to check
-     * @param slotAddedToTemplate slot the item will be placed in
+     * @param slotAddedToTemplate Slot object the item will be placed as child into
-     * @param modSlot slot the mod will fill
+     * @param modSlot Slot the mod will fill
-     * @param parentTemplate template of the mods being added
+     * @param parentTemplate Db template of the mods being added
-     * @param botRole
+     * @param botRole Bots wildspawntype (assault/pmcBot etc)
      * @returns true if valid
      */
     protected isModValidForSlot(modToAdd: [boolean, ITemplateItem], slotAddedToTemplate: Slot, modSlot: string, parentTemplate: ITemplateItem, botRole: string): boolean;

TypeScript/20CustomChatBot/types/helpers/ItemHelper.d.ts

@@ -363,10 +363,11 @@ export declare class ItemHelper {
      * Chose a randomly weighted cartridge that fits
      * @param caliber Desired caliber
      * @param staticAmmoDist Cartridges and thier weights
+     * @param fallbackCartridgeTpl If a cartridge cannot be found in the above staticAmmoDist param, use this instead
      * @param cartridgeWhitelist OPTIONAL whitelist for cartridges
      * @returns Tpl of cartridge
      */
-    protected drawAmmoTpl(caliber: string, staticAmmoDist: Record<string, IStaticAmmoDetails[]>, cartridgeWhitelist?: string[]): string;
+    protected drawAmmoTpl(caliber: string, staticAmmoDist: Record<string, IStaticAmmoDetails[]>, fallbackCartridgeTpl: string, cartridgeWhitelist?: string[]): string;
     /**
      * Create a basic cartrige object
      * @param parentId container cartridges will be placed in
@@ -401,7 +402,7 @@ export declare class ItemHelper {
     addChildSlotItems(itemToAdd: Item[], itemToAddTemplate: ITemplateItem, modSpawnChanceDict?: Record<string, number>, requiredOnly?: boolean): Item[];
     /**
      * Get a compatible tpl from the array provided where it is not found in the provided incompatible mod tpls parameter
-     * @param possibleTpls Tpls to randomply choose from
+     * @param possibleTpls Tpls to randomly choose from
      * @param incompatibleModTpls Incompatible tpls to not allow
      * @returns Chosen tpl or null
      */

TypeScript/20CustomChatBot/types/services/FenceService.d.ts

@@ -46,6 +46,21 @@ export declare class FenceService {
      * @param assort New assorts to replace old with
      */
     setFenceAssort(assort: ITraderAssort): void;
+    /**
+     * Replace discount fence assort with new assort
+     * @param assort New assorts to replace old with
+     */
+    setDiscountFenceAssort(assort: ITraderAssort): void;
+    /**
+     * Get main fence assort
+     * @return ITraderAssort
+     */
+    getMainFenceAssort(): ITraderAssort;
+    /**
+     * Get discount fence assort
+     * @return ITraderAssort
+     */
+    getDiscountFenceAssort(): ITraderAssort;
     /**
      * Replace high rep level fence assort with new assort
      * @param discountAssort New assorts to replace old with
@@ -119,8 +134,8 @@ export declare class FenceService {
     protected deleteRandomAssorts(itemCountToReplace: number, assort: ITraderAssort): void;
     /**
      * Choose an item at random and remove it + mods from assorts
-     * @param assort Items to remove from
+     * @param assort Trader assort to remove item from
-     * @param rootItems Assort root items to pick from to remove
+     * @param rootItems Pool of root items to pick from to remove
      */
     protected removeRandomItemFromAssorts(assort: ITraderAssort, rootItems: Item[]): void;
     /**

TypeScript/20CustomChatBot/types/services/ProfileFixerService.d.ts

@@ -183,4 +183,9 @@ export declare class ProfileFixerService {
      * @param pmcProfile Profile to remove dead quests from
      */
     protected removeOrphanedQuests(pmcProfile: IPmcData): void;
+    /**
+     * If someone has run a mod from pre-3.8.0, it results in an invalid `nextResupply` value
+     * Resolve this by setting the nextResupply to 0 if it's null
+     */
+    protected fixNullTraderNextResupply(pmcProfile: IPmcData): void;
 }

TypeScript/21CustomCommandoCommand/types/controllers/BotController.d.ts

@@ -54,9 +54,10 @@ export declare class BotController {
      * Adjust PMC settings to ensure they engage the correct bot types
      * @param type what bot the server is requesting settings for
      * @param diffLevel difficulty level server requested settings for
+     * @param ignoreRaidSettings should raid settings chosen pre-raid be ignored
      * @returns Difficulty object
      */
-    getBotDifficulty(type: string, diffLevel: string): Difficulty;
+    getBotDifficulty(type: string, diffLevel: string, ignoreRaidSettings?: boolean): Difficulty;
     getAllBotDifficulties(): Record<string, any>;
     /**
      * Generate bot profiles and store in cache

TypeScript/21CustomCommandoCommand/types/controllers/MatchController.d.ts

@@ -75,10 +75,11 @@ export declare class MatchController {
     protected sendCoopTakenFenceMessage(sessionId: string): void;
     /**
      * Handle when a player extracts using a coop extract - add rep to fence
+     * @param sessionId Session/player id
      * @param pmcData Profile
      * @param extractName Name of extract taken
      */
-    protected handleCoopExtract(pmcData: IPmcData, extractName: string): void;
+    protected handleCoopExtract(sessionId: string, pmcData: IPmcData, extractName: string): void;
     /**
      * Was extract by car
      * @param extractName name of extract

TypeScript/21CustomCommandoCommand/types/generators/BotEquipmentModGenerator.d.ts

@@ -187,12 +187,12 @@ export declare class BotEquipmentModGenerator {
      */
     protected getRandomModTplFromItemDb(modTpl: string, parentSlot: Slot, modSlot: string, items: Item[]): string;
     /**
-     * Log errors if mod is not compatible with slot
+     * Check if mod exists in db + is for a required slot
-     * @param modToAdd template of mod to check
+     * @param modToAdd Db template of mod to check
-     * @param slotAddedToTemplate slot the item will be placed in
+     * @param slotAddedToTemplate Slot object the item will be placed as child into
-     * @param modSlot slot the mod will fill
+     * @param modSlot Slot the mod will fill
-     * @param parentTemplate template of the mods being added
+     * @param parentTemplate Db template of the mods being added
-     * @param botRole
+     * @param botRole Bots wildspawntype (assault/pmcBot etc)
      * @returns true if valid
      */
     protected isModValidForSlot(modToAdd: [boolean, ITemplateItem], slotAddedToTemplate: Slot, modSlot: string, parentTemplate: ITemplateItem, botRole: string): boolean;

TypeScript/21CustomCommandoCommand/types/helpers/ItemHelper.d.ts

@@ -363,10 +363,11 @@ export declare class ItemHelper {
      * Chose a randomly weighted cartridge that fits
      * @param caliber Desired caliber
      * @param staticAmmoDist Cartridges and thier weights
+     * @param fallbackCartridgeTpl If a cartridge cannot be found in the above staticAmmoDist param, use this instead
      * @param cartridgeWhitelist OPTIONAL whitelist for cartridges
      * @returns Tpl of cartridge
      */
-    protected drawAmmoTpl(caliber: string, staticAmmoDist: Record<string, IStaticAmmoDetails[]>, cartridgeWhitelist?: string[]): string;
+    protected drawAmmoTpl(caliber: string, staticAmmoDist: Record<string, IStaticAmmoDetails[]>, fallbackCartridgeTpl: string, cartridgeWhitelist?: string[]): string;
     /**
      * Create a basic cartrige object
      * @param parentId container cartridges will be placed in
@@ -401,7 +402,7 @@ export declare class ItemHelper {
     addChildSlotItems(itemToAdd: Item[], itemToAddTemplate: ITemplateItem, modSpawnChanceDict?: Record<string, number>, requiredOnly?: boolean): Item[];
     /**
      * Get a compatible tpl from the array provided where it is not found in the provided incompatible mod tpls parameter
-     * @param possibleTpls Tpls to randomply choose from
+     * @param possibleTpls Tpls to randomly choose from
      * @param incompatibleModTpls Incompatible tpls to not allow
      * @returns Chosen tpl or null
      */

TypeScript/21CustomCommandoCommand/types/services/FenceService.d.ts

@@ -46,6 +46,21 @@ export declare class FenceService {
      * @param assort New assorts to replace old with
      */
     setFenceAssort(assort: ITraderAssort): void;
+    /**
+     * Replace discount fence assort with new assort
+     * @param assort New assorts to replace old with
+     */
+    setDiscountFenceAssort(assort: ITraderAssort): void;
+    /**
+     * Get main fence assort
+     * @return ITraderAssort
+     */
+    getMainFenceAssort(): ITraderAssort;
+    /**
+     * Get discount fence assort
+     * @return ITraderAssort
+     */
+    getDiscountFenceAssort(): ITraderAssort;
     /**
      * Replace high rep level fence assort with new assort
      * @param discountAssort New assorts to replace old with
@@ -119,8 +134,8 @@ export declare class FenceService {
     protected deleteRandomAssorts(itemCountToReplace: number, assort: ITraderAssort): void;
     /**
      * Choose an item at random and remove it + mods from assorts
-     * @param assort Items to remove from
+     * @param assort Trader assort to remove item from
-     * @param rootItems Assort root items to pick from to remove
+     * @param rootItems Pool of root items to pick from to remove
      */
     protected removeRandomItemFromAssorts(assort: ITraderAssort, rootItems: Item[]): void;
     /**

TypeScript/21CustomCommandoCommand/types/services/ProfileFixerService.d.ts

@@ -183,4 +183,9 @@ export declare class ProfileFixerService {
      * @param pmcProfile Profile to remove dead quests from
      */
     protected removeOrphanedQuests(pmcProfile: IPmcData): void;
+    /**
+     * If someone has run a mod from pre-3.8.0, it results in an invalid `nextResupply` value
+     * Resolve this by setting the nextResupply to 0 if it's null
+     */
+    protected fixNullTraderNextResupply(pmcProfile: IPmcData): void;
 }

TypeScript/22CustomAkiCommand/types/controllers/BotController.d.ts

@@ -54,9 +54,10 @@ export declare class BotController {
      * Adjust PMC settings to ensure they engage the correct bot types
      * @param type what bot the server is requesting settings for
      * @param diffLevel difficulty level server requested settings for
+     * @param ignoreRaidSettings should raid settings chosen pre-raid be ignored
      * @returns Difficulty object
      */
-    getBotDifficulty(type: string, diffLevel: string): Difficulty;
+    getBotDifficulty(type: string, diffLevel: string, ignoreRaidSettings?: boolean): Difficulty;
     getAllBotDifficulties(): Record<string, any>;
     /**
      * Generate bot profiles and store in cache

TypeScript/22CustomAkiCommand/types/controllers/MatchController.d.ts

@@ -75,10 +75,11 @@ export declare class MatchController {
     protected sendCoopTakenFenceMessage(sessionId: string): void;
     /**
      * Handle when a player extracts using a coop extract - add rep to fence
+     * @param sessionId Session/player id
      * @param pmcData Profile
      * @param extractName Name of extract taken
      */
-    protected handleCoopExtract(pmcData: IPmcData, extractName: string): void;
+    protected handleCoopExtract(sessionId: string, pmcData: IPmcData, extractName: string): void;
     /**
      * Was extract by car
      * @param extractName name of extract

TypeScript/22CustomAkiCommand/types/generators/BotEquipmentModGenerator.d.ts

@@ -187,12 +187,12 @@ export declare class BotEquipmentModGenerator {
      */
     protected getRandomModTplFromItemDb(modTpl: string, parentSlot: Slot, modSlot: string, items: Item[]): string;
     /**
-     * Log errors if mod is not compatible with slot
+     * Check if mod exists in db + is for a required slot
-     * @param modToAdd template of mod to check
+     * @param modToAdd Db template of mod to check
-     * @param slotAddedToTemplate slot the item will be placed in
+     * @param slotAddedToTemplate Slot object the item will be placed as child into
-     * @param modSlot slot the mod will fill
+     * @param modSlot Slot the mod will fill
-     * @param parentTemplate template of the mods being added
+     * @param parentTemplate Db template of the mods being added
-     * @param botRole
+     * @param botRole Bots wildspawntype (assault/pmcBot etc)
      * @returns true if valid
      */
     protected isModValidForSlot(modToAdd: [boolean, ITemplateItem], slotAddedToTemplate: Slot, modSlot: string, parentTemplate: ITemplateItem, botRole: string): boolean;

TypeScript/22CustomAkiCommand/types/helpers/ItemHelper.d.ts

@@ -363,10 +363,11 @@ export declare class ItemHelper {
      * Chose a randomly weighted cartridge that fits
      * @param caliber Desired caliber
      * @param staticAmmoDist Cartridges and thier weights
+     * @param fallbackCartridgeTpl If a cartridge cannot be found in the above staticAmmoDist param, use this instead
      * @param cartridgeWhitelist OPTIONAL whitelist for cartridges
      * @returns Tpl of cartridge
      */
-    protected drawAmmoTpl(caliber: string, staticAmmoDist: Record<string, IStaticAmmoDetails[]>, cartridgeWhitelist?: string[]): string;
+    protected drawAmmoTpl(caliber: string, staticAmmoDist: Record<string, IStaticAmmoDetails[]>, fallbackCartridgeTpl: string, cartridgeWhitelist?: string[]): string;
     /**
      * Create a basic cartrige object
      * @param parentId container cartridges will be placed in
@@ -401,7 +402,7 @@ export declare class ItemHelper {
     addChildSlotItems(itemToAdd: Item[], itemToAddTemplate: ITemplateItem, modSpawnChanceDict?: Record<string, number>, requiredOnly?: boolean): Item[];
     /**
      * Get a compatible tpl from the array provided where it is not found in the provided incompatible mod tpls parameter
-     * @param possibleTpls Tpls to randomply choose from
+     * @param possibleTpls Tpls to randomly choose from
      * @param incompatibleModTpls Incompatible tpls to not allow
      * @returns Chosen tpl or null
      */

TypeScript/22CustomAkiCommand/types/services/FenceService.d.ts

@@ -46,6 +46,21 @@ export declare class FenceService {
      * @param assort New assorts to replace old with
      */
     setFenceAssort(assort: ITraderAssort): void;
+    /**
+     * Replace discount fence assort with new assort
+     * @param assort New assorts to replace old with
+     */
+    setDiscountFenceAssort(assort: ITraderAssort): void;
+    /**
+     * Get main fence assort
+     * @return ITraderAssort
+     */
+    getMainFenceAssort(): ITraderAssort;
+    /**
+     * Get discount fence assort
+     * @return ITraderAssort
+     */
+    getDiscountFenceAssort(): ITraderAssort;
     /**
      * Replace high rep level fence assort with new assort
      * @param discountAssort New assorts to replace old with
@@ -119,8 +134,8 @@ export declare class FenceService {
     protected deleteRandomAssorts(itemCountToReplace: number, assort: ITraderAssort): void;
     /**
      * Choose an item at random and remove it + mods from assorts
-     * @param assort Items to remove from
+     * @param assort Trader assort to remove item from
-     * @param rootItems Assort root items to pick from to remove
+     * @param rootItems Pool of root items to pick from to remove
      */
     protected removeRandomItemFromAssorts(assort: ITraderAssort, rootItems: Item[]): void;
     /**

TypeScript/22CustomAkiCommand/types/services/ProfileFixerService.d.ts

@@ -183,4 +183,9 @@ export declare class ProfileFixerService {
      * @param pmcProfile Profile to remove dead quests from
      */
     protected removeOrphanedQuests(pmcProfile: IPmcData): void;
+    /**
+     * If someone has run a mod from pre-3.8.0, it results in an invalid `nextResupply` value
+     * Resolve this by setting the nextResupply to 0 if it's null
+     */
+    protected fixNullTraderNextResupply(pmcProfile: IPmcData): void;
 }

TypeScript/2EditDatabase/types/controllers/BotController.d.ts

@@ -54,9 +54,10 @@ export declare class BotController {
      * Adjust PMC settings to ensure they engage the correct bot types
      * @param type what bot the server is requesting settings for
      * @param diffLevel difficulty level server requested settings for
+     * @param ignoreRaidSettings should raid settings chosen pre-raid be ignored
      * @returns Difficulty object
      */
-    getBotDifficulty(type: string, diffLevel: string): Difficulty;
+    getBotDifficulty(type: string, diffLevel: string, ignoreRaidSettings?: boolean): Difficulty;
     getAllBotDifficulties(): Record<string, any>;
     /**
      * Generate bot profiles and store in cache

TypeScript/2EditDatabase/types/controllers/MatchController.d.ts

@@ -75,10 +75,11 @@ export declare class MatchController {
     protected sendCoopTakenFenceMessage(sessionId: string): void;
     /**
      * Handle when a player extracts using a coop extract - add rep to fence
+     * @param sessionId Session/player id
      * @param pmcData Profile
      * @param extractName Name of extract taken
      */
-    protected handleCoopExtract(pmcData: IPmcData, extractName: string): void;
+    protected handleCoopExtract(sessionId: string, pmcData: IPmcData, extractName: string): void;
     /**
      * Was extract by car
      * @param extractName name of extract

TypeScript/2EditDatabase/types/generators/BotEquipmentModGenerator.d.ts

@@ -187,12 +187,12 @@ export declare class BotEquipmentModGenerator {
      */
     protected getRandomModTplFromItemDb(modTpl: string, parentSlot: Slot, modSlot: string, items: Item[]): string;
     /**
-     * Log errors if mod is not compatible with slot
+     * Check if mod exists in db + is for a required slot
-     * @param modToAdd template of mod to check
+     * @param modToAdd Db template of mod to check
-     * @param slotAddedToTemplate slot the item will be placed in
+     * @param slotAddedToTemplate Slot object the item will be placed as child into
-     * @param modSlot slot the mod will fill
+     * @param modSlot Slot the mod will fill
-     * @param parentTemplate template of the mods being added
+     * @param parentTemplate Db template of the mods being added
-     * @param botRole
+     * @param botRole Bots wildspawntype (assault/pmcBot etc)
      * @returns true if valid
      */
     protected isModValidForSlot(modToAdd: [boolean, ITemplateItem], slotAddedToTemplate: Slot, modSlot: string, parentTemplate: ITemplateItem, botRole: string): boolean;

TypeScript/2EditDatabase/types/helpers/ItemHelper.d.ts

@@ -363,10 +363,11 @@ export declare class ItemHelper {
      * Chose a randomly weighted cartridge that fits
      * @param caliber Desired caliber
      * @param staticAmmoDist Cartridges and thier weights
+     * @param fallbackCartridgeTpl If a cartridge cannot be found in the above staticAmmoDist param, use this instead
      * @param cartridgeWhitelist OPTIONAL whitelist for cartridges
      * @returns Tpl of cartridge
      */
-    protected drawAmmoTpl(caliber: string, staticAmmoDist: Record<string, IStaticAmmoDetails[]>, cartridgeWhitelist?: string[]): string;
+    protected drawAmmoTpl(caliber: string, staticAmmoDist: Record<string, IStaticAmmoDetails[]>, fallbackCartridgeTpl: string, cartridgeWhitelist?: string[]): string;
     /**
      * Create a basic cartrige object
      * @param parentId container cartridges will be placed in
@@ -401,7 +402,7 @@ export declare class ItemHelper {
     addChildSlotItems(itemToAdd: Item[], itemToAddTemplate: ITemplateItem, modSpawnChanceDict?: Record<string, number>, requiredOnly?: boolean): Item[];
     /**
      * Get a compatible tpl from the array provided where it is not found in the provided incompatible mod tpls parameter
-     * @param possibleTpls Tpls to randomply choose from
+     * @param possibleTpls Tpls to randomly choose from
      * @param incompatibleModTpls Incompatible tpls to not allow
      * @returns Chosen tpl or null
      */

TypeScript/2EditDatabase/types/services/FenceService.d.ts

@@ -46,6 +46,21 @@ export declare class FenceService {
      * @param assort New assorts to replace old with
      */
     setFenceAssort(assort: ITraderAssort): void;
+    /**
+     * Replace discount fence assort with new assort
+     * @param assort New assorts to replace old with
+     */
+    setDiscountFenceAssort(assort: ITraderAssort): void;
+    /**
+     * Get main fence assort
+     * @return ITraderAssort
+     */
+    getMainFenceAssort(): ITraderAssort;
+    /**
+     * Get discount fence assort
+     * @return ITraderAssort
+     */
+    getDiscountFenceAssort(): ITraderAssort;
     /**
      * Replace high rep level fence assort with new assort
      * @param discountAssort New assorts to replace old with
@@ -119,8 +134,8 @@ export declare class FenceService {
     protected deleteRandomAssorts(itemCountToReplace: number, assort: ITraderAssort): void;
     /**
      * Choose an item at random and remove it + mods from assorts
-     * @param assort Items to remove from
+     * @param assort Trader assort to remove item from
-     * @param rootItems Assort root items to pick from to remove
+     * @param rootItems Pool of root items to pick from to remove
      */
     protected removeRandomItemFromAssorts(assort: ITraderAssort, rootItems: Item[]): void;
     /**

TypeScript/2EditDatabase/types/services/ProfileFixerService.d.ts

@@ -183,4 +183,9 @@ export declare class ProfileFixerService {
      * @param pmcProfile Profile to remove dead quests from
      */
     protected removeOrphanedQuests(pmcProfile: IPmcData): void;
+    /**
+     * If someone has run a mod from pre-3.8.0, it results in an invalid `nextResupply` value
+     * Resolve this by setting the nextResupply to 0 if it's null
+     */
+    protected fixNullTraderNextResupply(pmcProfile: IPmcData): void;
 }

TypeScript/3GetSptConfigFile/types/controllers/BotController.d.ts

@@ -54,9 +54,10 @@ export declare class BotController {
      * Adjust PMC settings to ensure they engage the correct bot types
      * @param type what bot the server is requesting settings for
      * @param diffLevel difficulty level server requested settings for
+     * @param ignoreRaidSettings should raid settings chosen pre-raid be ignored
      * @returns Difficulty object
      */
-    getBotDifficulty(type: string, diffLevel: string): Difficulty;
+    getBotDifficulty(type: string, diffLevel: string, ignoreRaidSettings?: boolean): Difficulty;
     getAllBotDifficulties(): Record<string, any>;
     /**
      * Generate bot profiles and store in cache

TypeScript/3GetSptConfigFile/types/controllers/MatchController.d.ts

@@ -75,10 +75,11 @@ export declare class MatchController {
     protected sendCoopTakenFenceMessage(sessionId: string): void;
     /**
      * Handle when a player extracts using a coop extract - add rep to fence
+     * @param sessionId Session/player id
      * @param pmcData Profile
      * @param extractName Name of extract taken
      */
-    protected handleCoopExtract(pmcData: IPmcData, extractName: string): void;
+    protected handleCoopExtract(sessionId: string, pmcData: IPmcData, extractName: string): void;
     /**
      * Was extract by car
      * @param extractName name of extract

TypeScript/3GetSptConfigFile/types/generators/BotEquipmentModGenerator.d.ts

@@ -187,12 +187,12 @@ export declare class BotEquipmentModGenerator {
      */
     protected getRandomModTplFromItemDb(modTpl: string, parentSlot: Slot, modSlot: string, items: Item[]): string;
     /**
-     * Log errors if mod is not compatible with slot
+     * Check if mod exists in db + is for a required slot
-     * @param modToAdd template of mod to check
+     * @param modToAdd Db template of mod to check
-     * @param slotAddedToTemplate slot the item will be placed in
+     * @param slotAddedToTemplate Slot object the item will be placed as child into
-     * @param modSlot slot the mod will fill
+     * @param modSlot Slot the mod will fill
-     * @param parentTemplate template of the mods being added
+     * @param parentTemplate Db template of the mods being added
-     * @param botRole
+     * @param botRole Bots wildspawntype (assault/pmcBot etc)
      * @returns true if valid
      */
     protected isModValidForSlot(modToAdd: [boolean, ITemplateItem], slotAddedToTemplate: Slot, modSlot: string, parentTemplate: ITemplateItem, botRole: string): boolean;

TypeScript/3GetSptConfigFile/types/helpers/ItemHelper.d.ts

@@ -363,10 +363,11 @@ export declare class ItemHelper {
      * Chose a randomly weighted cartridge that fits
      * @param caliber Desired caliber
      * @param staticAmmoDist Cartridges and thier weights
+     * @param fallbackCartridgeTpl If a cartridge cannot be found in the above staticAmmoDist param, use this instead
      * @param cartridgeWhitelist OPTIONAL whitelist for cartridges
      * @returns Tpl of cartridge
      */
-    protected drawAmmoTpl(caliber: string, staticAmmoDist: Record<string, IStaticAmmoDetails[]>, cartridgeWhitelist?: string[]): string;
+    protected drawAmmoTpl(caliber: string, staticAmmoDist: Record<string, IStaticAmmoDetails[]>, fallbackCartridgeTpl: string, cartridgeWhitelist?: string[]): string;
     /**
      * Create a basic cartrige object
      * @param parentId container cartridges will be placed in
@@ -401,7 +402,7 @@ export declare class ItemHelper {
     addChildSlotItems(itemToAdd: Item[], itemToAddTemplate: ITemplateItem, modSpawnChanceDict?: Record<string, number>, requiredOnly?: boolean): Item[];
     /**
      * Get a compatible tpl from the array provided where it is not found in the provided incompatible mod tpls parameter
-     * @param possibleTpls Tpls to randomply choose from
+     * @param possibleTpls Tpls to randomly choose from
      * @param incompatibleModTpls Incompatible tpls to not allow
      * @returns Chosen tpl or null
      */