Updated types

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

@@ -5,6 +5,7 @@ import { BotHelper } from "@spt/helpers/BotHelper";
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
 import { WeightedRandomHelper } from "@spt/helpers/WeightedRandomHelper";
 import { MinMax } from "@spt/models/common/MinMax";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
 import { IBaseJsonSkills, IBaseSkill, IBotBase, IInfo, IHealth as PmcHealth, ISkills as botSkills } from "@spt/models/eft/common/tables/IBotBase";
 import { IAppearance, IBodyPart, IBotType, IHealth, IInventory } from "@spt/models/eft/common/tables/IBotType";
 import { IBotGenerationDetails } from "@spt/models/spt/bots/BotGenerationDetails";
@@ -47,9 +48,10 @@ export declare class BotGenerator {
      * @param role e.g. assault / pmcbot
      * @param difficulty easy/normal/hard/impossible
      * @param botTemplate base bot template to use  (e.g. assault/pmcbot)
-     * @returns
+     * profile PMC profile of player generating pscav
+     * @returns IBotBase
      */
-    generatePlayerScav(sessionId: string, role: string, difficulty: string, botTemplate: IBotType): IBotBase;
+    generatePlayerScav(sessionId: string, role: string, difficulty: string, botTemplate: IBotType, profile: IPmcData): IBotBase;
     /**
      * Create 1 bot of the type/side/difficulty defined in botGenerationDetails
      * @param sessionId Session id
@@ -79,6 +81,12 @@ export declare class BotGenerator {
      * @returns IBotBase object
      */
     protected generateBot(sessionId: string, bot: IBotBase, botJsonTemplate: IBotType, botGenerationDetails: IBotGenerationDetails): IBotBase;
+    /**
+     * Should this bot have a name like "name (Pmc Name)" and be alterd by client patch to be hostile to player
+     * @param botRole Role bot has
+     * @returns True if name should be simulated pscav
+     */
+    protected shouldSimulatePlayerScav(botRole: string): boolean;
     /**
      * Get exp for kill by bot difficulty
      * @param experience Dict of difficulties and experience

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

@@ -91,6 +91,12 @@ export declare class RagfairOfferHelper {
      * @returns IRagfairOffer array
      */
     getOffersForBuild(searchRequest: ISearchRequestData, itemsToAdd: string[], traderAssorts: Record<string, ITraderAssort>, pmcData: IPmcData): IRagfairOffer[];
+    /**
+     * Get offers that have not exceeded buy limits
+     * @param possibleOffers offers to process
+     * @returns Offers
+     */
+    protected getOffersInsideBuyRestrictionLimits(possibleOffers: IRagfairOffer[]): IRagfairOffer[];
     /**
      * Check if offer is from trader standing the player does not have
      * @param offer Offer to check
@@ -209,4 +215,10 @@ export declare class RagfairOfferHelper {
      * @returns True if in range
      */
     protected itemQualityInRange(item: IItem, min: number, max: number): boolean;
+    /**
+     * Does this offer come from a trader
+     * @param offer Offer to check
+     * @returns True = from trader
+     */
+    offerIsFromTrader(offer: IRagfairOffer): boolean;
 }

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

@@ -60,6 +60,7 @@ export interface IUnlockedInfo {
 export interface IInfo {
     EntryPoint: string;
     Nickname: string;
+    MainProfileNickname?: string;
     LowerNickname: string;
     Side: string;
     SquadInviteRestriction: boolean;

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

@@ -10,6 +10,8 @@ export interface IInventoryConfig extends IBaseConfig {
     customMoneyTpls: string[];
     /** Multipliers for skill gain when inside menus, NOT in-game */
     skillGainMultiplers: Record<string, number>;
+    /** Container Tpls that shoud be deprioritised when choosing where to take money from for payments */
+    deprioritisedMoneyContainers: string[];
 }
 export interface IRewardDetails {
     rewardCount: number;

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

@@ -66,7 +66,9 @@ export interface IPmcTypes {
     bear: string;
 }
 export interface ISlotLootSettings {
+    /** Item Type whitelist */
     whitelist: string[];
+    /** item tpl blacklist */
     blacklist: string[];
 }
 export interface IMinMaxLootValue extends MinMax {

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

@@ -75,6 +75,8 @@ export interface IDynamic {
     blacklist: IRagfairBlacklist;
     /** Dict of price limits keyed by item type */
     unreasonableModPrices: Record<string, IUnreasonableModPrices>;
+    /** Custom rouble prices for items to override values from prices.json */
+    itemPriceOverrideRouble: Record<string, number>;
 }
 export interface IPriceRanges {
     default: MinMax;

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

@@ -6,6 +6,8 @@ export interface ISeasonalEventConfig extends IBaseConfig {
     enableSeasonalEventDetection: boolean;
     /** event / botType / equipSlot / itemid */
     eventGear: Record<string, Record<string, Record<string, Record<string, number>>>>;
+    /** event / bot type / equipSlot / itemid */
+    eventLoot: Record<string, Record<string, Record<string, Record<string, number>>>>;
     events: ISeasonalEvent[];
     eventBotMapping: Record<string, string>;
     eventBossSpawns: Record<string, Record<string, IBossLocationSpawn[]>>;

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

@@ -1,5 +1,6 @@
 import { BotHelper } from "@spt/helpers/BotHelper";
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
+import { IBotBase } from "@spt/models/eft/common/tables/IBotBase";
 import { IBotType } from "@spt/models/eft/common/tables/IBotType";
 import { IBotGenerationDetails } from "@spt/models/spt/bots/BotGenerationDetails";
 import { IBotConfig } from "@spt/models/spt/config/IBotConfig";
@@ -38,10 +39,13 @@ export declare class BotNameService {
      */
     generateUniqueBotNickname(botJsonTemplate: IBotType, botGenerationDetails: IBotGenerationDetails, botRole: string, uniqueRoles?: string[]): string;
     /**
-     * Should this bot have a name like "name (Pmc Name)"
+     * Add random PMC name to bots MainProfileNickname property
-     * @param botRole Role bot has
+     * @param bot Bot to update
-     * @returns True if name should be simulated pscav
      */
-    protected shouldSimulatePlayerScavName(botRole: string): boolean;
+    addRandomPmcNameToBotMainProfileNicknameProperty(bot: IBotBase): void;
-    protected addPlayerScavNameSimulationSuffix(nickname: string): string;
+    /**
+     * Choose a random PMC name from bear or usec bot jsons
+     * @returns PMC name as string
+     */
+    protected getRandomPMCName(): string;
 }

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

@@ -85,7 +85,7 @@ export declare class DatabaseService {
      */
     getCustomization(): Record<string, ICustomizationItem>;
     /**
-     * @returns assets/database/templates/items.json
+     * @returns assets/database/templates/handbook.json
      */
     getHandbook(): IHandbookBase;
     /**
@@ -101,7 +101,7 @@ export declare class DatabaseService {
      */
     getProfiles(): IProfileTemplates;
     /**
-     * @returns assets/database/templates/items.json
+     * @returns assets/database/templates/quests.json
      */
     getQuests(): Record<string, IQuest>;
     /**

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

@@ -62,14 +62,6 @@ export declare class InsuranceService {
      * @returns Timestamp to return items to player in seconds
      */
     protected getInsuranceReturnTimestamp(pmcData: IPmcData, trader: ITraderBase): number;
-    /**
-     * Take the insurance item packages within a profile session and ensure that each of the items in that package are
-     * not orphaned from their parent ID.
-     *
-     * @param sessionID The session ID to update insurance equipment packages in.
-     * @returns void
-     */
-    protected adoptOrphanedInsEquipment(sessionID: string): void;
     protected getMaxInsuranceStorageTime(traderBase: ITraderBase): number;
     /**
      * Store lost gear post-raid inside profile, ready for later code to pick it up and mail it
@@ -127,10 +119,4 @@ export declare class InsuranceService {
      * @returns price in roubles
      */
     getRoublePriceToInsureItemWithTrader(pmcData: IPmcData, inventoryItem: IItem, traderId: string): number;
-    /**
-     * Returns the ID that should be used for a root-level Item's parentId property value within in the context of insurance.
-     * @param sessionID Players id
-     * @returns The root item Id.
-     */
-    getRootItemParentID(sessionID: string): string;
 }

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

@@ -8,7 +8,9 @@ import { IItem } from "@spt/models/eft/common/tables/IItem";
 import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
 import { IProcessBuyTradeRequestData } from "@spt/models/eft/trade/IProcessBuyTradeRequestData";
 import { IProcessSellTradeRequestData } from "@spt/models/eft/trade/IProcessSellTradeRequestData";
+import { IInventoryConfig } from "@spt/models/spt/config/IInventoryConfig";
 import { ILogger } from "@spt/models/spt/utils/ILogger";
+import { ConfigServer } from "@spt/servers/ConfigServer";
 import { DatabaseService } from "@spt/services/DatabaseService";
 import { LocalisationService } from "@spt/services/LocalisationService";
 import { HashUtil } from "@spt/utils/HashUtil";
@@ -24,7 +26,9 @@ export declare class PaymentService {
     protected inventoryHelper: InventoryHelper;
     protected localisationService: LocalisationService;
     protected paymentHelper: PaymentHelper;
-    constructor(logger: ILogger, hashUtil: HashUtil, httpResponse: HttpResponseUtil, databaseService: DatabaseService, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, localisationService: LocalisationService, paymentHelper: PaymentHelper);
+    protected configServer: ConfigServer;
+    protected inventoryConfig: IInventoryConfig;
+    constructor(logger: ILogger, hashUtil: HashUtil, httpResponse: HttpResponseUtil, databaseService: DatabaseService, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, localisationService: LocalisationService, paymentHelper: PaymentHelper, configServer: ConfigServer);
     /**
      * Take money and insert items into return to server request
      * @param pmcData Pmc profile

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

@@ -74,4 +74,6 @@ export declare class PostDbLoadService {
      */
     protected validateQuestAssortUnlocksExist(): void;
     protected setAllDbItemsAsSellableOnFlea(): void;
+    protected addMissingTraderBuyRestrictionMaxValue(): void;
+    protected applyFleaPriceOverrides(): void;
 }

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

@@ -47,6 +47,12 @@ export declare class ProfileFixerService {
      * @param pmcProfile profile to check and fix
      */
     checkForAndFixPmcProfileIssues(pmcProfile: IPmcData): void;
+    /**
+     * Resolve any dialogue attachments that were accidentally created using the player's equipment ID as
+     * the stash root object ID
+     * @param fullProfile
+     */
+    checkForAndFixDialogueAttachments(fullProfile: ISptProfile): void;
     /**
      * Find issues in the scav profile data that may cause issues
      * @param scavProfile profile to check and fix

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

@@ -88,6 +88,12 @@ export declare class SeasonalEventService {
      * @returns bots with equipment changes
      */
     protected getEventBotGear(eventType: SeasonalEventType): Record<string, Record<string, Record<string, number>>>;
+    /**
+     * Get a dictionary of loot changes to apply to bots for a specific event e.g. Christmas/Halloween
+     * @param eventName Name of event to get gear changes for
+     * @returns bots with loot changes
+     */
+    protected getEventBotLoot(eventType: SeasonalEventType): Record<string, Record<string, Record<string, number>>>;
     /**
      * Get the dates each seasonal event starts and ends at
      * @returns Record with event name + start/end date
@@ -108,7 +114,7 @@ export declare class SeasonalEventService {
     /**
      * Store active events inside class array property `currentlyActiveEvents` + set class properties: christmasEventActive/halloweenEventActive
      */
-    protected cacheActiveEvents(): void;
+    cacheActiveEvents(): void;
     /**
      * Get the currently active weather season e.g. SUMMER/AUTUMN/WINTER
      * @returns Season enum value
@@ -171,6 +177,11 @@ export declare class SeasonalEventService {
      * @param eventName Name of the event to read equipment in from config
      */
     protected addEventGearToBots(eventType: SeasonalEventType): void;
+    /**
+     * Read in data from seasonalEvents.json and add found loot items to bots
+     * @param eventName Name of the event to read loot in from config
+     */
+    protected addEventLootToBots(eventType: SeasonalEventType): void;
     /**
      * Add pumpkin loot boxes to scavs
      */

TypeScript/10ScopesAndTypes/types/utils/App.d.ts

@@ -4,10 +4,10 @@ import { ICoreConfig } from "@spt/models/spt/config/ICoreConfig";
 import { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { HttpServer } from "@spt/servers/HttpServer";
-import { DatabaseService } from "@spt/services/DatabaseService";
 import { LocalisationService } from "@spt/services/LocalisationService";
 import { EncodingUtil } from "@spt/utils/EncodingUtil";
 import { TimeUtil } from "@spt/utils/TimeUtil";
+import { DatabaseService } from "@spt/services/DatabaseService";
 export declare class App {
     protected logger: ILogger;
     protected timeUtil: TimeUtil;

TypeScript/10ScopesAndTypes/types/utils/ProgressWriter.d.ts

@@ -0,0 +1,13 @@
+export declare class ProgressWriter {
+    private count;
+    private total?;
+    private done;
+    private barFillChar;
+    private barEmptyChar;
+    private maxBarLength;
+    constructor(total: number, maxBarLength?: number, barFillChar?: string, barEmptyChar?: string);
+    /**
+     * Increment the progress counter and update the progress bar display.
+     */
+    increment(): void;
+}

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

@@ -5,6 +5,7 @@ import { BotHelper } from "@spt/helpers/BotHelper";
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
 import { WeightedRandomHelper } from "@spt/helpers/WeightedRandomHelper";
 import { MinMax } from "@spt/models/common/MinMax";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
 import { IBaseJsonSkills, IBaseSkill, IBotBase, IInfo, IHealth as PmcHealth, ISkills as botSkills } from "@spt/models/eft/common/tables/IBotBase";
 import { IAppearance, IBodyPart, IBotType, IHealth, IInventory } from "@spt/models/eft/common/tables/IBotType";
 import { IBotGenerationDetails } from "@spt/models/spt/bots/BotGenerationDetails";
@@ -47,9 +48,10 @@ export declare class BotGenerator {
      * @param role e.g. assault / pmcbot
      * @param difficulty easy/normal/hard/impossible
      * @param botTemplate base bot template to use  (e.g. assault/pmcbot)
-     * @returns
+     * profile PMC profile of player generating pscav
+     * @returns IBotBase
      */
-    generatePlayerScav(sessionId: string, role: string, difficulty: string, botTemplate: IBotType): IBotBase;
+    generatePlayerScav(sessionId: string, role: string, difficulty: string, botTemplate: IBotType, profile: IPmcData): IBotBase;
     /**
      * Create 1 bot of the type/side/difficulty defined in botGenerationDetails
      * @param sessionId Session id
@@ -79,6 +81,12 @@ export declare class BotGenerator {
      * @returns IBotBase object
      */
     protected generateBot(sessionId: string, bot: IBotBase, botJsonTemplate: IBotType, botGenerationDetails: IBotGenerationDetails): IBotBase;
+    /**
+     * Should this bot have a name like "name (Pmc Name)" and be alterd by client patch to be hostile to player
+     * @param botRole Role bot has
+     * @returns True if name should be simulated pscav
+     */
+    protected shouldSimulatePlayerScav(botRole: string): boolean;
     /**
      * Get exp for kill by bot difficulty
      * @param experience Dict of difficulties and experience

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

@@ -91,6 +91,12 @@ export declare class RagfairOfferHelper {
      * @returns IRagfairOffer array
      */
     getOffersForBuild(searchRequest: ISearchRequestData, itemsToAdd: string[], traderAssorts: Record<string, ITraderAssort>, pmcData: IPmcData): IRagfairOffer[];
+    /**
+     * Get offers that have not exceeded buy limits
+     * @param possibleOffers offers to process
+     * @returns Offers
+     */
+    protected getOffersInsideBuyRestrictionLimits(possibleOffers: IRagfairOffer[]): IRagfairOffer[];
     /**
      * Check if offer is from trader standing the player does not have
      * @param offer Offer to check
@@ -209,4 +215,10 @@ export declare class RagfairOfferHelper {
      * @returns True if in range
      */
     protected itemQualityInRange(item: IItem, min: number, max: number): boolean;
+    /**
+     * Does this offer come from a trader
+     * @param offer Offer to check
+     * @returns True = from trader
+     */
+    offerIsFromTrader(offer: IRagfairOffer): boolean;
 }

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

@@ -60,6 +60,7 @@ export interface IUnlockedInfo {
 export interface IInfo {
     EntryPoint: string;
     Nickname: string;
+    MainProfileNickname?: string;
     LowerNickname: string;
     Side: string;
     SquadInviteRestriction: boolean;

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

@@ -10,6 +10,8 @@ export interface IInventoryConfig extends IBaseConfig {
     customMoneyTpls: string[];
     /** Multipliers for skill gain when inside menus, NOT in-game */
     skillGainMultiplers: Record<string, number>;
+    /** Container Tpls that shoud be deprioritised when choosing where to take money from for payments */
+    deprioritisedMoneyContainers: string[];
 }
 export interface IRewardDetails {
     rewardCount: number;

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

@@ -66,7 +66,9 @@ export interface IPmcTypes {
     bear: string;
 }
 export interface ISlotLootSettings {
+    /** Item Type whitelist */
     whitelist: string[];
+    /** item tpl blacklist */
     blacklist: string[];
 }
 export interface IMinMaxLootValue extends MinMax {

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

@@ -75,6 +75,8 @@ export interface IDynamic {
     blacklist: IRagfairBlacklist;
     /** Dict of price limits keyed by item type */
     unreasonableModPrices: Record<string, IUnreasonableModPrices>;
+    /** Custom rouble prices for items to override values from prices.json */
+    itemPriceOverrideRouble: Record<string, number>;
 }
 export interface IPriceRanges {
     default: MinMax;

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

@@ -6,6 +6,8 @@ export interface ISeasonalEventConfig extends IBaseConfig {
     enableSeasonalEventDetection: boolean;
     /** event / botType / equipSlot / itemid */
     eventGear: Record<string, Record<string, Record<string, Record<string, number>>>>;
+    /** event / bot type / equipSlot / itemid */
+    eventLoot: Record<string, Record<string, Record<string, Record<string, number>>>>;
     events: ISeasonalEvent[];
     eventBotMapping: Record<string, string>;
     eventBossSpawns: Record<string, Record<string, IBossLocationSpawn[]>>;

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

@@ -1,5 +1,6 @@
 import { BotHelper } from "@spt/helpers/BotHelper";
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
+import { IBotBase } from "@spt/models/eft/common/tables/IBotBase";
 import { IBotType } from "@spt/models/eft/common/tables/IBotType";
 import { IBotGenerationDetails } from "@spt/models/spt/bots/BotGenerationDetails";
 import { IBotConfig } from "@spt/models/spt/config/IBotConfig";
@@ -38,10 +39,13 @@ export declare class BotNameService {
      */
     generateUniqueBotNickname(botJsonTemplate: IBotType, botGenerationDetails: IBotGenerationDetails, botRole: string, uniqueRoles?: string[]): string;
     /**
-     * Should this bot have a name like "name (Pmc Name)"
+     * Add random PMC name to bots MainProfileNickname property
-     * @param botRole Role bot has
+     * @param bot Bot to update
-     * @returns True if name should be simulated pscav
      */
-    protected shouldSimulatePlayerScavName(botRole: string): boolean;
+    addRandomPmcNameToBotMainProfileNicknameProperty(bot: IBotBase): void;
-    protected addPlayerScavNameSimulationSuffix(nickname: string): string;
+    /**
+     * Choose a random PMC name from bear or usec bot jsons
+     * @returns PMC name as string
+     */
+    protected getRandomPMCName(): string;
 }

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

@@ -85,7 +85,7 @@ export declare class DatabaseService {
      */
     getCustomization(): Record<string, ICustomizationItem>;
     /**
-     * @returns assets/database/templates/items.json
+     * @returns assets/database/templates/handbook.json
      */
     getHandbook(): IHandbookBase;
     /**
@@ -101,7 +101,7 @@ export declare class DatabaseService {
      */
     getProfiles(): IProfileTemplates;
     /**
-     * @returns assets/database/templates/items.json
+     * @returns assets/database/templates/quests.json
      */
     getQuests(): Record<string, IQuest>;
     /**

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

@@ -62,14 +62,6 @@ export declare class InsuranceService {
      * @returns Timestamp to return items to player in seconds
      */
     protected getInsuranceReturnTimestamp(pmcData: IPmcData, trader: ITraderBase): number;
-    /**
-     * Take the insurance item packages within a profile session and ensure that each of the items in that package are
-     * not orphaned from their parent ID.
-     *
-     * @param sessionID The session ID to update insurance equipment packages in.
-     * @returns void
-     */
-    protected adoptOrphanedInsEquipment(sessionID: string): void;
     protected getMaxInsuranceStorageTime(traderBase: ITraderBase): number;
     /**
      * Store lost gear post-raid inside profile, ready for later code to pick it up and mail it
@@ -127,10 +119,4 @@ export declare class InsuranceService {
      * @returns price in roubles
      */
     getRoublePriceToInsureItemWithTrader(pmcData: IPmcData, inventoryItem: IItem, traderId: string): number;
-    /**
-     * Returns the ID that should be used for a root-level Item's parentId property value within in the context of insurance.
-     * @param sessionID Players id
-     * @returns The root item Id.
-     */
-    getRootItemParentID(sessionID: string): string;
 }

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

@@ -8,7 +8,9 @@ import { IItem } from "@spt/models/eft/common/tables/IItem";
 import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
 import { IProcessBuyTradeRequestData } from "@spt/models/eft/trade/IProcessBuyTradeRequestData";
 import { IProcessSellTradeRequestData } from "@spt/models/eft/trade/IProcessSellTradeRequestData";
+import { IInventoryConfig } from "@spt/models/spt/config/IInventoryConfig";
 import { ILogger } from "@spt/models/spt/utils/ILogger";
+import { ConfigServer } from "@spt/servers/ConfigServer";
 import { DatabaseService } from "@spt/services/DatabaseService";
 import { LocalisationService } from "@spt/services/LocalisationService";
 import { HashUtil } from "@spt/utils/HashUtil";
@@ -24,7 +26,9 @@ export declare class PaymentService {
     protected inventoryHelper: InventoryHelper;
     protected localisationService: LocalisationService;
     protected paymentHelper: PaymentHelper;
-    constructor(logger: ILogger, hashUtil: HashUtil, httpResponse: HttpResponseUtil, databaseService: DatabaseService, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, localisationService: LocalisationService, paymentHelper: PaymentHelper);
+    protected configServer: ConfigServer;
+    protected inventoryConfig: IInventoryConfig;
+    constructor(logger: ILogger, hashUtil: HashUtil, httpResponse: HttpResponseUtil, databaseService: DatabaseService, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, localisationService: LocalisationService, paymentHelper: PaymentHelper, configServer: ConfigServer);
     /**
      * Take money and insert items into return to server request
      * @param pmcData Pmc profile

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

@@ -74,4 +74,6 @@ export declare class PostDbLoadService {
      */
     protected validateQuestAssortUnlocksExist(): void;
     protected setAllDbItemsAsSellableOnFlea(): void;
+    protected addMissingTraderBuyRestrictionMaxValue(): void;
+    protected applyFleaPriceOverrides(): void;
 }

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

@@ -47,6 +47,12 @@ export declare class ProfileFixerService {
      * @param pmcProfile profile to check and fix
      */
     checkForAndFixPmcProfileIssues(pmcProfile: IPmcData): void;
+    /**
+     * Resolve any dialogue attachments that were accidentally created using the player's equipment ID as
+     * the stash root object ID
+     * @param fullProfile
+     */
+    checkForAndFixDialogueAttachments(fullProfile: ISptProfile): void;
     /**
      * Find issues in the scav profile data that may cause issues
      * @param scavProfile profile to check and fix

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

@@ -88,6 +88,12 @@ export declare class SeasonalEventService {
      * @returns bots with equipment changes
      */
     protected getEventBotGear(eventType: SeasonalEventType): Record<string, Record<string, Record<string, number>>>;
+    /**
+     * Get a dictionary of loot changes to apply to bots for a specific event e.g. Christmas/Halloween
+     * @param eventName Name of event to get gear changes for
+     * @returns bots with loot changes
+     */
+    protected getEventBotLoot(eventType: SeasonalEventType): Record<string, Record<string, Record<string, number>>>;
     /**
      * Get the dates each seasonal event starts and ends at
      * @returns Record with event name + start/end date
@@ -108,7 +114,7 @@ export declare class SeasonalEventService {
     /**
      * Store active events inside class array property `currentlyActiveEvents` + set class properties: christmasEventActive/halloweenEventActive
      */
-    protected cacheActiveEvents(): void;
+    cacheActiveEvents(): void;
     /**
      * Get the currently active weather season e.g. SUMMER/AUTUMN/WINTER
      * @returns Season enum value
@@ -171,6 +177,11 @@ export declare class SeasonalEventService {
      * @param eventName Name of the event to read equipment in from config
      */
     protected addEventGearToBots(eventType: SeasonalEventType): void;
+    /**
+     * Read in data from seasonalEvents.json and add found loot items to bots
+     * @param eventName Name of the event to read loot in from config
+     */
+    protected addEventLootToBots(eventType: SeasonalEventType): void;
     /**
      * Add pumpkin loot boxes to scavs
      */

TypeScript/11BundleLoadingSample/types/utils/App.d.ts

@@ -4,10 +4,10 @@ import { ICoreConfig } from "@spt/models/spt/config/ICoreConfig";
 import { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { HttpServer } from "@spt/servers/HttpServer";
-import { DatabaseService } from "@spt/services/DatabaseService";
 import { LocalisationService } from "@spt/services/LocalisationService";
 import { EncodingUtil } from "@spt/utils/EncodingUtil";
 import { TimeUtil } from "@spt/utils/TimeUtil";
+import { DatabaseService } from "@spt/services/DatabaseService";
 export declare class App {
     protected logger: ILogger;
     protected timeUtil: TimeUtil;

TypeScript/11BundleLoadingSample/types/utils/ProgressWriter.d.ts

@@ -0,0 +1,13 @@
+export declare class ProgressWriter {
+    private count;
+    private total?;
+    private done;
+    private barFillChar;
+    private barEmptyChar;
+    private maxBarLength;
+    constructor(total: number, maxBarLength?: number, barFillChar?: string, barEmptyChar?: string);
+    /**
+     * Increment the progress counter and update the progress bar display.
+     */
+    increment(): void;
+}

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

@@ -5,6 +5,7 @@ import { BotHelper } from "@spt/helpers/BotHelper";
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
 import { WeightedRandomHelper } from "@spt/helpers/WeightedRandomHelper";
 import { MinMax } from "@spt/models/common/MinMax";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
 import { IBaseJsonSkills, IBaseSkill, IBotBase, IInfo, IHealth as PmcHealth, ISkills as botSkills } from "@spt/models/eft/common/tables/IBotBase";
 import { IAppearance, IBodyPart, IBotType, IHealth, IInventory } from "@spt/models/eft/common/tables/IBotType";
 import { IBotGenerationDetails } from "@spt/models/spt/bots/BotGenerationDetails";
@@ -47,9 +48,10 @@ export declare class BotGenerator {
      * @param role e.g. assault / pmcbot
      * @param difficulty easy/normal/hard/impossible
      * @param botTemplate base bot template to use  (e.g. assault/pmcbot)
-     * @returns
+     * profile PMC profile of player generating pscav
+     * @returns IBotBase
      */
-    generatePlayerScav(sessionId: string, role: string, difficulty: string, botTemplate: IBotType): IBotBase;
+    generatePlayerScav(sessionId: string, role: string, difficulty: string, botTemplate: IBotType, profile: IPmcData): IBotBase;
     /**
      * Create 1 bot of the type/side/difficulty defined in botGenerationDetails
      * @param sessionId Session id
@@ -79,6 +81,12 @@ export declare class BotGenerator {
      * @returns IBotBase object
      */
     protected generateBot(sessionId: string, bot: IBotBase, botJsonTemplate: IBotType, botGenerationDetails: IBotGenerationDetails): IBotBase;
+    /**
+     * Should this bot have a name like "name (Pmc Name)" and be alterd by client patch to be hostile to player
+     * @param botRole Role bot has
+     * @returns True if name should be simulated pscav
+     */
+    protected shouldSimulatePlayerScav(botRole: string): boolean;
     /**
      * Get exp for kill by bot difficulty
      * @param experience Dict of difficulties and experience

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

@@ -91,6 +91,12 @@ export declare class RagfairOfferHelper {
      * @returns IRagfairOffer array
      */
     getOffersForBuild(searchRequest: ISearchRequestData, itemsToAdd: string[], traderAssorts: Record<string, ITraderAssort>, pmcData: IPmcData): IRagfairOffer[];
+    /**
+     * Get offers that have not exceeded buy limits
+     * @param possibleOffers offers to process
+     * @returns Offers
+     */
+    protected getOffersInsideBuyRestrictionLimits(possibleOffers: IRagfairOffer[]): IRagfairOffer[];
     /**
      * Check if offer is from trader standing the player does not have
      * @param offer Offer to check
@@ -209,4 +215,10 @@ export declare class RagfairOfferHelper {
      * @returns True if in range
      */
     protected itemQualityInRange(item: IItem, min: number, max: number): boolean;
+    /**
+     * Does this offer come from a trader
+     * @param offer Offer to check
+     * @returns True = from trader
+     */
+    offerIsFromTrader(offer: IRagfairOffer): boolean;
 }

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

@@ -60,6 +60,7 @@ export interface IUnlockedInfo {
 export interface IInfo {
     EntryPoint: string;
     Nickname: string;
+    MainProfileNickname?: string;
     LowerNickname: string;
     Side: string;
     SquadInviteRestriction: boolean;

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

@@ -10,6 +10,8 @@ export interface IInventoryConfig extends IBaseConfig {
     customMoneyTpls: string[];
     /** Multipliers for skill gain when inside menus, NOT in-game */
     skillGainMultiplers: Record<string, number>;
+    /** Container Tpls that shoud be deprioritised when choosing where to take money from for payments */
+    deprioritisedMoneyContainers: string[];
 }
 export interface IRewardDetails {
     rewardCount: number;

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

@@ -66,7 +66,9 @@ export interface IPmcTypes {
     bear: string;
 }
 export interface ISlotLootSettings {
+    /** Item Type whitelist */
     whitelist: string[];
+    /** item tpl blacklist */
     blacklist: string[];
 }
 export interface IMinMaxLootValue extends MinMax {

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

@@ -75,6 +75,8 @@ export interface IDynamic {
     blacklist: IRagfairBlacklist;
     /** Dict of price limits keyed by item type */
     unreasonableModPrices: Record<string, IUnreasonableModPrices>;
+    /** Custom rouble prices for items to override values from prices.json */
+    itemPriceOverrideRouble: Record<string, number>;
 }
 export interface IPriceRanges {
     default: MinMax;

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

@@ -6,6 +6,8 @@ export interface ISeasonalEventConfig extends IBaseConfig {
     enableSeasonalEventDetection: boolean;
     /** event / botType / equipSlot / itemid */
     eventGear: Record<string, Record<string, Record<string, Record<string, number>>>>;
+    /** event / bot type / equipSlot / itemid */
+    eventLoot: Record<string, Record<string, Record<string, Record<string, number>>>>;
     events: ISeasonalEvent[];
     eventBotMapping: Record<string, string>;
     eventBossSpawns: Record<string, Record<string, IBossLocationSpawn[]>>;

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

@@ -1,5 +1,6 @@
 import { BotHelper } from "@spt/helpers/BotHelper";
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
+import { IBotBase } from "@spt/models/eft/common/tables/IBotBase";
 import { IBotType } from "@spt/models/eft/common/tables/IBotType";
 import { IBotGenerationDetails } from "@spt/models/spt/bots/BotGenerationDetails";
 import { IBotConfig } from "@spt/models/spt/config/IBotConfig";
@@ -38,10 +39,13 @@ export declare class BotNameService {
      */
     generateUniqueBotNickname(botJsonTemplate: IBotType, botGenerationDetails: IBotGenerationDetails, botRole: string, uniqueRoles?: string[]): string;
     /**
-     * Should this bot have a name like "name (Pmc Name)"
+     * Add random PMC name to bots MainProfileNickname property
-     * @param botRole Role bot has
+     * @param bot Bot to update
-     * @returns True if name should be simulated pscav
      */
-    protected shouldSimulatePlayerScavName(botRole: string): boolean;
+    addRandomPmcNameToBotMainProfileNicknameProperty(bot: IBotBase): void;
-    protected addPlayerScavNameSimulationSuffix(nickname: string): string;
+    /**
+     * Choose a random PMC name from bear or usec bot jsons
+     * @returns PMC name as string
+     */
+    protected getRandomPMCName(): string;
 }

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

@@ -85,7 +85,7 @@ export declare class DatabaseService {
      */
     getCustomization(): Record<string, ICustomizationItem>;
     /**
-     * @returns assets/database/templates/items.json
+     * @returns assets/database/templates/handbook.json
      */
     getHandbook(): IHandbookBase;
     /**
@@ -101,7 +101,7 @@ export declare class DatabaseService {
      */
     getProfiles(): IProfileTemplates;
     /**
-     * @returns assets/database/templates/items.json
+     * @returns assets/database/templates/quests.json
      */
     getQuests(): Record<string, IQuest>;
     /**

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

@@ -62,14 +62,6 @@ export declare class InsuranceService {
      * @returns Timestamp to return items to player in seconds
      */
     protected getInsuranceReturnTimestamp(pmcData: IPmcData, trader: ITraderBase): number;
-    /**
-     * Take the insurance item packages within a profile session and ensure that each of the items in that package are
-     * not orphaned from their parent ID.
-     *
-     * @param sessionID The session ID to update insurance equipment packages in.
-     * @returns void
-     */
-    protected adoptOrphanedInsEquipment(sessionID: string): void;
     protected getMaxInsuranceStorageTime(traderBase: ITraderBase): number;
     /**
      * Store lost gear post-raid inside profile, ready for later code to pick it up and mail it
@@ -127,10 +119,4 @@ export declare class InsuranceService {
      * @returns price in roubles
      */
     getRoublePriceToInsureItemWithTrader(pmcData: IPmcData, inventoryItem: IItem, traderId: string): number;
-    /**
-     * Returns the ID that should be used for a root-level Item's parentId property value within in the context of insurance.
-     * @param sessionID Players id
-     * @returns The root item Id.
-     */
-    getRootItemParentID(sessionID: string): string;
 }

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

@@ -8,7 +8,9 @@ import { IItem } from "@spt/models/eft/common/tables/IItem";
 import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
 import { IProcessBuyTradeRequestData } from "@spt/models/eft/trade/IProcessBuyTradeRequestData";
 import { IProcessSellTradeRequestData } from "@spt/models/eft/trade/IProcessSellTradeRequestData";
+import { IInventoryConfig } from "@spt/models/spt/config/IInventoryConfig";
 import { ILogger } from "@spt/models/spt/utils/ILogger";
+import { ConfigServer } from "@spt/servers/ConfigServer";
 import { DatabaseService } from "@spt/services/DatabaseService";
 import { LocalisationService } from "@spt/services/LocalisationService";
 import { HashUtil } from "@spt/utils/HashUtil";
@@ -24,7 +26,9 @@ export declare class PaymentService {
     protected inventoryHelper: InventoryHelper;
     protected localisationService: LocalisationService;
     protected paymentHelper: PaymentHelper;
-    constructor(logger: ILogger, hashUtil: HashUtil, httpResponse: HttpResponseUtil, databaseService: DatabaseService, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, localisationService: LocalisationService, paymentHelper: PaymentHelper);
+    protected configServer: ConfigServer;
+    protected inventoryConfig: IInventoryConfig;
+    constructor(logger: ILogger, hashUtil: HashUtil, httpResponse: HttpResponseUtil, databaseService: DatabaseService, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, localisationService: LocalisationService, paymentHelper: PaymentHelper, configServer: ConfigServer);
     /**
      * Take money and insert items into return to server request
      * @param pmcData Pmc profile

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

@@ -74,4 +74,6 @@ export declare class PostDbLoadService {
      */
     protected validateQuestAssortUnlocksExist(): void;
     protected setAllDbItemsAsSellableOnFlea(): void;
+    protected addMissingTraderBuyRestrictionMaxValue(): void;
+    protected applyFleaPriceOverrides(): void;
 }

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

@@ -47,6 +47,12 @@ export declare class ProfileFixerService {
      * @param pmcProfile profile to check and fix
      */
     checkForAndFixPmcProfileIssues(pmcProfile: IPmcData): void;
+    /**
+     * Resolve any dialogue attachments that were accidentally created using the player's equipment ID as
+     * the stash root object ID
+     * @param fullProfile
+     */
+    checkForAndFixDialogueAttachments(fullProfile: ISptProfile): void;
     /**
      * Find issues in the scav profile data that may cause issues
      * @param scavProfile profile to check and fix

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

@@ -88,6 +88,12 @@ export declare class SeasonalEventService {
      * @returns bots with equipment changes
      */
     protected getEventBotGear(eventType: SeasonalEventType): Record<string, Record<string, Record<string, number>>>;
+    /**
+     * Get a dictionary of loot changes to apply to bots for a specific event e.g. Christmas/Halloween
+     * @param eventName Name of event to get gear changes for
+     * @returns bots with loot changes
+     */
+    protected getEventBotLoot(eventType: SeasonalEventType): Record<string, Record<string, Record<string, number>>>;
     /**
      * Get the dates each seasonal event starts and ends at
      * @returns Record with event name + start/end date
@@ -108,7 +114,7 @@ export declare class SeasonalEventService {
     /**
      * Store active events inside class array property `currentlyActiveEvents` + set class properties: christmasEventActive/halloweenEventActive
      */
-    protected cacheActiveEvents(): void;
+    cacheActiveEvents(): void;
     /**
      * Get the currently active weather season e.g. SUMMER/AUTUMN/WINTER
      * @returns Season enum value
@@ -171,6 +177,11 @@ export declare class SeasonalEventService {
      * @param eventName Name of the event to read equipment in from config
      */
     protected addEventGearToBots(eventType: SeasonalEventType): void;
+    /**
+     * Read in data from seasonalEvents.json and add found loot items to bots
+     * @param eventName Name of the event to read loot in from config
+     */
+    protected addEventLootToBots(eventType: SeasonalEventType): void;
     /**
      * Add pumpkin loot boxes to scavs
      */

TypeScript/12ClassExtensionOverride/types/utils/App.d.ts

@@ -4,10 +4,10 @@ import { ICoreConfig } from "@spt/models/spt/config/ICoreConfig";
 import { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { HttpServer } from "@spt/servers/HttpServer";
-import { DatabaseService } from "@spt/services/DatabaseService";
 import { LocalisationService } from "@spt/services/LocalisationService";
 import { EncodingUtil } from "@spt/utils/EncodingUtil";
 import { TimeUtil } from "@spt/utils/TimeUtil";
+import { DatabaseService } from "@spt/services/DatabaseService";
 export declare class App {
     protected logger: ILogger;
     protected timeUtil: TimeUtil;

TypeScript/12ClassExtensionOverride/types/utils/ProgressWriter.d.ts

@@ -0,0 +1,13 @@
+export declare class ProgressWriter {
+    private count;
+    private total?;
+    private done;
+    private barFillChar;
+    private barEmptyChar;
+    private maxBarLength;
+    constructor(total: number, maxBarLength?: number, barFillChar?: string, barEmptyChar?: string);
+    /**
+     * Increment the progress counter and update the progress bar display.
+     */
+    increment(): void;
+}

TypeScript/13.1AddTraderWithAssortJSON/types/generators/BotGenerator.d.ts

@@ -5,6 +5,7 @@ import { BotHelper } from "@spt/helpers/BotHelper";
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
 import { WeightedRandomHelper } from "@spt/helpers/WeightedRandomHelper";
 import { MinMax } from "@spt/models/common/MinMax";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
 import { IBaseJsonSkills, IBaseSkill, IBotBase, IInfo, IHealth as PmcHealth, ISkills as botSkills } from "@spt/models/eft/common/tables/IBotBase";
 import { IAppearance, IBodyPart, IBotType, IHealth, IInventory } from "@spt/models/eft/common/tables/IBotType";
 import { IBotGenerationDetails } from "@spt/models/spt/bots/BotGenerationDetails";
@@ -47,9 +48,10 @@ export declare class BotGenerator {
      * @param role e.g. assault / pmcbot
      * @param difficulty easy/normal/hard/impossible
      * @param botTemplate base bot template to use  (e.g. assault/pmcbot)
-     * @returns
+     * profile PMC profile of player generating pscav
+     * @returns IBotBase
      */
-    generatePlayerScav(sessionId: string, role: string, difficulty: string, botTemplate: IBotType): IBotBase;
+    generatePlayerScav(sessionId: string, role: string, difficulty: string, botTemplate: IBotType, profile: IPmcData): IBotBase;
     /**
      * Create 1 bot of the type/side/difficulty defined in botGenerationDetails
      * @param sessionId Session id
@@ -79,6 +81,12 @@ export declare class BotGenerator {
      * @returns IBotBase object
      */
     protected generateBot(sessionId: string, bot: IBotBase, botJsonTemplate: IBotType, botGenerationDetails: IBotGenerationDetails): IBotBase;
+    /**
+     * Should this bot have a name like "name (Pmc Name)" and be alterd by client patch to be hostile to player
+     * @param botRole Role bot has
+     * @returns True if name should be simulated pscav
+     */
+    protected shouldSimulatePlayerScav(botRole: string): boolean;
     /**
      * Get exp for kill by bot difficulty
      * @param experience Dict of difficulties and experience

TypeScript/13.1AddTraderWithAssortJSON/types/helpers/RagfairOfferHelper.d.ts

@@ -91,6 +91,12 @@ export declare class RagfairOfferHelper {
      * @returns IRagfairOffer array
      */
     getOffersForBuild(searchRequest: ISearchRequestData, itemsToAdd: string[], traderAssorts: Record<string, ITraderAssort>, pmcData: IPmcData): IRagfairOffer[];
+    /**
+     * Get offers that have not exceeded buy limits
+     * @param possibleOffers offers to process
+     * @returns Offers
+     */
+    protected getOffersInsideBuyRestrictionLimits(possibleOffers: IRagfairOffer[]): IRagfairOffer[];
     /**
      * Check if offer is from trader standing the player does not have
      * @param offer Offer to check
@@ -209,4 +215,10 @@ export declare class RagfairOfferHelper {
      * @returns True if in range
      */
     protected itemQualityInRange(item: IItem, min: number, max: number): boolean;
+    /**
+     * Does this offer come from a trader
+     * @param offer Offer to check
+     * @returns True = from trader
+     */
+    offerIsFromTrader(offer: IRagfairOffer): boolean;
 }

TypeScript/13.1AddTraderWithAssortJSON/types/models/eft/common/tables/IBotBase.d.ts

@@ -60,6 +60,7 @@ export interface IUnlockedInfo {
 export interface IInfo {
     EntryPoint: string;
     Nickname: string;
+    MainProfileNickname?: string;
     LowerNickname: string;
     Side: string;
     SquadInviteRestriction: boolean;

TypeScript/13.1AddTraderWithAssortJSON/types/models/spt/config/IInventoryConfig.d.ts

@@ -10,6 +10,8 @@ export interface IInventoryConfig extends IBaseConfig {
     customMoneyTpls: string[];
     /** Multipliers for skill gain when inside menus, NOT in-game */
     skillGainMultiplers: Record<string, number>;
+    /** Container Tpls that shoud be deprioritised when choosing where to take money from for payments */
+    deprioritisedMoneyContainers: string[];
 }
 export interface IRewardDetails {
     rewardCount: number;

TypeScript/13.1AddTraderWithAssortJSON/types/models/spt/config/IPmcConfig.d.ts

@@ -66,7 +66,9 @@ export interface IPmcTypes {
     bear: string;
 }
 export interface ISlotLootSettings {
+    /** Item Type whitelist */
     whitelist: string[];
+    /** item tpl blacklist */
     blacklist: string[];
 }
 export interface IMinMaxLootValue extends MinMax {

TypeScript/13.1AddTraderWithAssortJSON/types/models/spt/config/IRagfairConfig.d.ts

@@ -75,6 +75,8 @@ export interface IDynamic {
     blacklist: IRagfairBlacklist;
     /** Dict of price limits keyed by item type */
     unreasonableModPrices: Record<string, IUnreasonableModPrices>;
+    /** Custom rouble prices for items to override values from prices.json */
+    itemPriceOverrideRouble: Record<string, number>;
 }
 export interface IPriceRanges {
     default: MinMax;

TypeScript/13.1AddTraderWithAssortJSON/types/models/spt/config/ISeasonalEventConfig.d.ts

@@ -6,6 +6,8 @@ export interface ISeasonalEventConfig extends IBaseConfig {
     enableSeasonalEventDetection: boolean;
     /** event / botType / equipSlot / itemid */
     eventGear: Record<string, Record<string, Record<string, Record<string, number>>>>;
+    /** event / bot type / equipSlot / itemid */
+    eventLoot: Record<string, Record<string, Record<string, Record<string, number>>>>;
     events: ISeasonalEvent[];
     eventBotMapping: Record<string, string>;
     eventBossSpawns: Record<string, Record<string, IBossLocationSpawn[]>>;

TypeScript/13.1AddTraderWithAssortJSON/types/services/BotNameService.d.ts

@@ -1,5 +1,6 @@
 import { BotHelper } from "@spt/helpers/BotHelper";
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
+import { IBotBase } from "@spt/models/eft/common/tables/IBotBase";
 import { IBotType } from "@spt/models/eft/common/tables/IBotType";
 import { IBotGenerationDetails } from "@spt/models/spt/bots/BotGenerationDetails";
 import { IBotConfig } from "@spt/models/spt/config/IBotConfig";
@@ -38,10 +39,13 @@ export declare class BotNameService {
      */
     generateUniqueBotNickname(botJsonTemplate: IBotType, botGenerationDetails: IBotGenerationDetails, botRole: string, uniqueRoles?: string[]): string;
     /**
-     * Should this bot have a name like "name (Pmc Name)"
+     * Add random PMC name to bots MainProfileNickname property
-     * @param botRole Role bot has
+     * @param bot Bot to update
-     * @returns True if name should be simulated pscav
      */
-    protected shouldSimulatePlayerScavName(botRole: string): boolean;
+    addRandomPmcNameToBotMainProfileNicknameProperty(bot: IBotBase): void;
-    protected addPlayerScavNameSimulationSuffix(nickname: string): string;
+    /**
+     * Choose a random PMC name from bear or usec bot jsons
+     * @returns PMC name as string
+     */
+    protected getRandomPMCName(): string;
 }

TypeScript/13.1AddTraderWithAssortJSON/types/services/DatabaseService.d.ts

@@ -85,7 +85,7 @@ export declare class DatabaseService {
      */
     getCustomization(): Record<string, ICustomizationItem>;
     /**
-     * @returns assets/database/templates/items.json
+     * @returns assets/database/templates/handbook.json
      */
     getHandbook(): IHandbookBase;
     /**
@@ -101,7 +101,7 @@ export declare class DatabaseService {
      */
     getProfiles(): IProfileTemplates;
     /**
-     * @returns assets/database/templates/items.json
+     * @returns assets/database/templates/quests.json
      */
     getQuests(): Record<string, IQuest>;
     /**

TypeScript/13.1AddTraderWithAssortJSON/types/services/InsuranceService.d.ts

@@ -62,14 +62,6 @@ export declare class InsuranceService {
      * @returns Timestamp to return items to player in seconds
      */
     protected getInsuranceReturnTimestamp(pmcData: IPmcData, trader: ITraderBase): number;
-    /**
-     * Take the insurance item packages within a profile session and ensure that each of the items in that package are
-     * not orphaned from their parent ID.
-     *
-     * @param sessionID The session ID to update insurance equipment packages in.
-     * @returns void
-     */
-    protected adoptOrphanedInsEquipment(sessionID: string): void;
     protected getMaxInsuranceStorageTime(traderBase: ITraderBase): number;
     /**
      * Store lost gear post-raid inside profile, ready for later code to pick it up and mail it
@@ -127,10 +119,4 @@ export declare class InsuranceService {
      * @returns price in roubles
      */
     getRoublePriceToInsureItemWithTrader(pmcData: IPmcData, inventoryItem: IItem, traderId: string): number;
-    /**
-     * Returns the ID that should be used for a root-level Item's parentId property value within in the context of insurance.
-     * @param sessionID Players id
-     * @returns The root item Id.
-     */
-    getRootItemParentID(sessionID: string): string;
 }

TypeScript/13.1AddTraderWithAssortJSON/types/services/PaymentService.d.ts

@@ -8,7 +8,9 @@ import { IItem } from "@spt/models/eft/common/tables/IItem";
 import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
 import { IProcessBuyTradeRequestData } from "@spt/models/eft/trade/IProcessBuyTradeRequestData";
 import { IProcessSellTradeRequestData } from "@spt/models/eft/trade/IProcessSellTradeRequestData";
+import { IInventoryConfig } from "@spt/models/spt/config/IInventoryConfig";
 import { ILogger } from "@spt/models/spt/utils/ILogger";
+import { ConfigServer } from "@spt/servers/ConfigServer";
 import { DatabaseService } from "@spt/services/DatabaseService";
 import { LocalisationService } from "@spt/services/LocalisationService";
 import { HashUtil } from "@spt/utils/HashUtil";
@@ -24,7 +26,9 @@ export declare class PaymentService {
     protected inventoryHelper: InventoryHelper;
     protected localisationService: LocalisationService;
     protected paymentHelper: PaymentHelper;
-    constructor(logger: ILogger, hashUtil: HashUtil, httpResponse: HttpResponseUtil, databaseService: DatabaseService, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, localisationService: LocalisationService, paymentHelper: PaymentHelper);
+    protected configServer: ConfigServer;
+    protected inventoryConfig: IInventoryConfig;
+    constructor(logger: ILogger, hashUtil: HashUtil, httpResponse: HttpResponseUtil, databaseService: DatabaseService, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, localisationService: LocalisationService, paymentHelper: PaymentHelper, configServer: ConfigServer);
     /**
      * Take money and insert items into return to server request
      * @param pmcData Pmc profile

TypeScript/13.1AddTraderWithAssortJSON/types/services/PostDbLoadService.d.ts

@@ -74,4 +74,6 @@ export declare class PostDbLoadService {
      */
     protected validateQuestAssortUnlocksExist(): void;
     protected setAllDbItemsAsSellableOnFlea(): void;
+    protected addMissingTraderBuyRestrictionMaxValue(): void;
+    protected applyFleaPriceOverrides(): void;
 }

TypeScript/13.1AddTraderWithAssortJSON/types/services/ProfileFixerService.d.ts

@@ -47,6 +47,12 @@ export declare class ProfileFixerService {
      * @param pmcProfile profile to check and fix
      */
     checkForAndFixPmcProfileIssues(pmcProfile: IPmcData): void;
+    /**
+     * Resolve any dialogue attachments that were accidentally created using the player's equipment ID as
+     * the stash root object ID
+     * @param fullProfile
+     */
+    checkForAndFixDialogueAttachments(fullProfile: ISptProfile): void;
     /**
      * Find issues in the scav profile data that may cause issues
      * @param scavProfile profile to check and fix

TypeScript/13.1AddTraderWithAssortJSON/types/services/SeasonalEventService.d.ts

@@ -88,6 +88,12 @@ export declare class SeasonalEventService {
      * @returns bots with equipment changes
      */
     protected getEventBotGear(eventType: SeasonalEventType): Record<string, Record<string, Record<string, number>>>;
+    /**
+     * Get a dictionary of loot changes to apply to bots for a specific event e.g. Christmas/Halloween
+     * @param eventName Name of event to get gear changes for
+     * @returns bots with loot changes
+     */
+    protected getEventBotLoot(eventType: SeasonalEventType): Record<string, Record<string, Record<string, number>>>;
     /**
      * Get the dates each seasonal event starts and ends at
      * @returns Record with event name + start/end date
@@ -108,7 +114,7 @@ export declare class SeasonalEventService {
     /**
      * Store active events inside class array property `currentlyActiveEvents` + set class properties: christmasEventActive/halloweenEventActive
      */
-    protected cacheActiveEvents(): void;
+    cacheActiveEvents(): void;
     /**
      * Get the currently active weather season e.g. SUMMER/AUTUMN/WINTER
      * @returns Season enum value
@@ -171,6 +177,11 @@ export declare class SeasonalEventService {
      * @param eventName Name of the event to read equipment in from config
      */
     protected addEventGearToBots(eventType: SeasonalEventType): void;
+    /**
+     * Read in data from seasonalEvents.json and add found loot items to bots
+     * @param eventName Name of the event to read loot in from config
+     */
+    protected addEventLootToBots(eventType: SeasonalEventType): void;
     /**
      * Add pumpkin loot boxes to scavs
      */

TypeScript/13.1AddTraderWithAssortJSON/types/utils/App.d.ts

@@ -4,10 +4,10 @@ import { ICoreConfig } from "@spt/models/spt/config/ICoreConfig";
 import { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { HttpServer } from "@spt/servers/HttpServer";
-import { DatabaseService } from "@spt/services/DatabaseService";
 import { LocalisationService } from "@spt/services/LocalisationService";
 import { EncodingUtil } from "@spt/utils/EncodingUtil";
 import { TimeUtil } from "@spt/utils/TimeUtil";
+import { DatabaseService } from "@spt/services/DatabaseService";
 export declare class App {
     protected logger: ILogger;
     protected timeUtil: TimeUtil;

TypeScript/13.1AddTraderWithAssortJSON/types/utils/ProgressWriter.d.ts

@@ -0,0 +1,13 @@
+export declare class ProgressWriter {
+    private count;
+    private total?;
+    private done;
+    private barFillChar;
+    private barEmptyChar;
+    private maxBarLength;
+    constructor(total: number, maxBarLength?: number, barFillChar?: string, barEmptyChar?: string);
+    /**
+     * Increment the progress counter and update the progress bar display.
+     */
+    increment(): void;
+}

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

@@ -5,6 +5,7 @@ import { BotHelper } from "@spt/helpers/BotHelper";
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
 import { WeightedRandomHelper } from "@spt/helpers/WeightedRandomHelper";
 import { MinMax } from "@spt/models/common/MinMax";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
 import { IBaseJsonSkills, IBaseSkill, IBotBase, IInfo, IHealth as PmcHealth, ISkills as botSkills } from "@spt/models/eft/common/tables/IBotBase";
 import { IAppearance, IBodyPart, IBotType, IHealth, IInventory } from "@spt/models/eft/common/tables/IBotType";
 import { IBotGenerationDetails } from "@spt/models/spt/bots/BotGenerationDetails";
@@ -47,9 +48,10 @@ export declare class BotGenerator {
      * @param role e.g. assault / pmcbot
      * @param difficulty easy/normal/hard/impossible
      * @param botTemplate base bot template to use  (e.g. assault/pmcbot)
-     * @returns
+     * profile PMC profile of player generating pscav
+     * @returns IBotBase
      */
-    generatePlayerScav(sessionId: string, role: string, difficulty: string, botTemplate: IBotType): IBotBase;
+    generatePlayerScav(sessionId: string, role: string, difficulty: string, botTemplate: IBotType, profile: IPmcData): IBotBase;
     /**
      * Create 1 bot of the type/side/difficulty defined in botGenerationDetails
      * @param sessionId Session id
@@ -79,6 +81,12 @@ export declare class BotGenerator {
      * @returns IBotBase object
      */
     protected generateBot(sessionId: string, bot: IBotBase, botJsonTemplate: IBotType, botGenerationDetails: IBotGenerationDetails): IBotBase;
+    /**
+     * Should this bot have a name like "name (Pmc Name)" and be alterd by client patch to be hostile to player
+     * @param botRole Role bot has
+     * @returns True if name should be simulated pscav
+     */
+    protected shouldSimulatePlayerScav(botRole: string): boolean;
     /**
      * Get exp for kill by bot difficulty
      * @param experience Dict of difficulties and experience

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

@@ -91,6 +91,12 @@ export declare class RagfairOfferHelper {
      * @returns IRagfairOffer array
      */
     getOffersForBuild(searchRequest: ISearchRequestData, itemsToAdd: string[], traderAssorts: Record<string, ITraderAssort>, pmcData: IPmcData): IRagfairOffer[];
+    /**
+     * Get offers that have not exceeded buy limits
+     * @param possibleOffers offers to process
+     * @returns Offers
+     */
+    protected getOffersInsideBuyRestrictionLimits(possibleOffers: IRagfairOffer[]): IRagfairOffer[];
     /**
      * Check if offer is from trader standing the player does not have
      * @param offer Offer to check
@@ -209,4 +215,10 @@ export declare class RagfairOfferHelper {
      * @returns True if in range
      */
     protected itemQualityInRange(item: IItem, min: number, max: number): boolean;
+    /**
+     * Does this offer come from a trader
+     * @param offer Offer to check
+     * @returns True = from trader
+     */
+    offerIsFromTrader(offer: IRagfairOffer): boolean;
 }

TypeScript/13AddTrader/types/models/eft/common/tables/IBotBase.d.ts

@@ -60,6 +60,7 @@ export interface IUnlockedInfo {
 export interface IInfo {
     EntryPoint: string;
     Nickname: string;
+    MainProfileNickname?: string;
     LowerNickname: string;
     Side: string;
     SquadInviteRestriction: boolean;

TypeScript/13AddTrader/types/models/spt/config/IInventoryConfig.d.ts

@@ -10,6 +10,8 @@ export interface IInventoryConfig extends IBaseConfig {
     customMoneyTpls: string[];
     /** Multipliers for skill gain when inside menus, NOT in-game */
     skillGainMultiplers: Record<string, number>;
+    /** Container Tpls that shoud be deprioritised when choosing where to take money from for payments */
+    deprioritisedMoneyContainers: string[];
 }
 export interface IRewardDetails {
     rewardCount: number;

TypeScript/13AddTrader/types/models/spt/config/IPmcConfig.d.ts

@@ -66,7 +66,9 @@ export interface IPmcTypes {
     bear: string;
 }
 export interface ISlotLootSettings {
+    /** Item Type whitelist */
     whitelist: string[];
+    /** item tpl blacklist */
     blacklist: string[];
 }
 export interface IMinMaxLootValue extends MinMax {

TypeScript/13AddTrader/types/models/spt/config/IRagfairConfig.d.ts

@@ -75,6 +75,8 @@ export interface IDynamic {
     blacklist: IRagfairBlacklist;
     /** Dict of price limits keyed by item type */
     unreasonableModPrices: Record<string, IUnreasonableModPrices>;
+    /** Custom rouble prices for items to override values from prices.json */
+    itemPriceOverrideRouble: Record<string, number>;
 }
 export interface IPriceRanges {
     default: MinMax;

TypeScript/13AddTrader/types/models/spt/config/ISeasonalEventConfig.d.ts

@@ -6,6 +6,8 @@ export interface ISeasonalEventConfig extends IBaseConfig {
     enableSeasonalEventDetection: boolean;
     /** event / botType / equipSlot / itemid */
     eventGear: Record<string, Record<string, Record<string, Record<string, number>>>>;
+    /** event / bot type / equipSlot / itemid */
+    eventLoot: Record<string, Record<string, Record<string, Record<string, number>>>>;
     events: ISeasonalEvent[];
     eventBotMapping: Record<string, string>;
     eventBossSpawns: Record<string, Record<string, IBossLocationSpawn[]>>;

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

@@ -1,5 +1,6 @@
 import { BotHelper } from "@spt/helpers/BotHelper";
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
+import { IBotBase } from "@spt/models/eft/common/tables/IBotBase";
 import { IBotType } from "@spt/models/eft/common/tables/IBotType";
 import { IBotGenerationDetails } from "@spt/models/spt/bots/BotGenerationDetails";
 import { IBotConfig } from "@spt/models/spt/config/IBotConfig";
@@ -38,10 +39,13 @@ export declare class BotNameService {
      */
     generateUniqueBotNickname(botJsonTemplate: IBotType, botGenerationDetails: IBotGenerationDetails, botRole: string, uniqueRoles?: string[]): string;
     /**
-     * Should this bot have a name like "name (Pmc Name)"
+     * Add random PMC name to bots MainProfileNickname property
-     * @param botRole Role bot has
+     * @param bot Bot to update
-     * @returns True if name should be simulated pscav
      */
-    protected shouldSimulatePlayerScavName(botRole: string): boolean;
+    addRandomPmcNameToBotMainProfileNicknameProperty(bot: IBotBase): void;
-    protected addPlayerScavNameSimulationSuffix(nickname: string): string;
+    /**
+     * Choose a random PMC name from bear or usec bot jsons
+     * @returns PMC name as string
+     */
+    protected getRandomPMCName(): string;
 }

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

@@ -85,7 +85,7 @@ export declare class DatabaseService {
      */
     getCustomization(): Record<string, ICustomizationItem>;
     /**
-     * @returns assets/database/templates/items.json
+     * @returns assets/database/templates/handbook.json
      */
     getHandbook(): IHandbookBase;
     /**
@@ -101,7 +101,7 @@ export declare class DatabaseService {
      */
     getProfiles(): IProfileTemplates;
     /**
-     * @returns assets/database/templates/items.json
+     * @returns assets/database/templates/quests.json
      */
     getQuests(): Record<string, IQuest>;
     /**

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

@@ -62,14 +62,6 @@ export declare class InsuranceService {
      * @returns Timestamp to return items to player in seconds
      */
     protected getInsuranceReturnTimestamp(pmcData: IPmcData, trader: ITraderBase): number;
-    /**
-     * Take the insurance item packages within a profile session and ensure that each of the items in that package are
-     * not orphaned from their parent ID.
-     *
-     * @param sessionID The session ID to update insurance equipment packages in.
-     * @returns void
-     */
-    protected adoptOrphanedInsEquipment(sessionID: string): void;
     protected getMaxInsuranceStorageTime(traderBase: ITraderBase): number;
     /**
      * Store lost gear post-raid inside profile, ready for later code to pick it up and mail it
@@ -127,10 +119,4 @@ export declare class InsuranceService {
      * @returns price in roubles
      */
     getRoublePriceToInsureItemWithTrader(pmcData: IPmcData, inventoryItem: IItem, traderId: string): number;
-    /**
-     * Returns the ID that should be used for a root-level Item's parentId property value within in the context of insurance.
-     * @param sessionID Players id
-     * @returns The root item Id.
-     */
-    getRootItemParentID(sessionID: string): string;
 }

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

@@ -8,7 +8,9 @@ import { IItem } from "@spt/models/eft/common/tables/IItem";
 import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
 import { IProcessBuyTradeRequestData } from "@spt/models/eft/trade/IProcessBuyTradeRequestData";
 import { IProcessSellTradeRequestData } from "@spt/models/eft/trade/IProcessSellTradeRequestData";
+import { IInventoryConfig } from "@spt/models/spt/config/IInventoryConfig";
 import { ILogger } from "@spt/models/spt/utils/ILogger";
+import { ConfigServer } from "@spt/servers/ConfigServer";
 import { DatabaseService } from "@spt/services/DatabaseService";
 import { LocalisationService } from "@spt/services/LocalisationService";
 import { HashUtil } from "@spt/utils/HashUtil";
@@ -24,7 +26,9 @@ export declare class PaymentService {
     protected inventoryHelper: InventoryHelper;
     protected localisationService: LocalisationService;
     protected paymentHelper: PaymentHelper;
-    constructor(logger: ILogger, hashUtil: HashUtil, httpResponse: HttpResponseUtil, databaseService: DatabaseService, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, localisationService: LocalisationService, paymentHelper: PaymentHelper);
+    protected configServer: ConfigServer;
+    protected inventoryConfig: IInventoryConfig;
+    constructor(logger: ILogger, hashUtil: HashUtil, httpResponse: HttpResponseUtil, databaseService: DatabaseService, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, localisationService: LocalisationService, paymentHelper: PaymentHelper, configServer: ConfigServer);
     /**
      * Take money and insert items into return to server request
      * @param pmcData Pmc profile

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

@@ -74,4 +74,6 @@ export declare class PostDbLoadService {
      */
     protected validateQuestAssortUnlocksExist(): void;
     protected setAllDbItemsAsSellableOnFlea(): void;
+    protected addMissingTraderBuyRestrictionMaxValue(): void;
+    protected applyFleaPriceOverrides(): void;
 }

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

@@ -47,6 +47,12 @@ export declare class ProfileFixerService {
      * @param pmcProfile profile to check and fix
      */
     checkForAndFixPmcProfileIssues(pmcProfile: IPmcData): void;
+    /**
+     * Resolve any dialogue attachments that were accidentally created using the player's equipment ID as
+     * the stash root object ID
+     * @param fullProfile
+     */
+    checkForAndFixDialogueAttachments(fullProfile: ISptProfile): void;
     /**
      * Find issues in the scav profile data that may cause issues
      * @param scavProfile profile to check and fix

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

@@ -88,6 +88,12 @@ export declare class SeasonalEventService {
      * @returns bots with equipment changes
      */
     protected getEventBotGear(eventType: SeasonalEventType): Record<string, Record<string, Record<string, number>>>;
+    /**
+     * Get a dictionary of loot changes to apply to bots for a specific event e.g. Christmas/Halloween
+     * @param eventName Name of event to get gear changes for
+     * @returns bots with loot changes
+     */
+    protected getEventBotLoot(eventType: SeasonalEventType): Record<string, Record<string, Record<string, number>>>;
     /**
      * Get the dates each seasonal event starts and ends at
      * @returns Record with event name + start/end date
@@ -108,7 +114,7 @@ export declare class SeasonalEventService {
     /**
      * Store active events inside class array property `currentlyActiveEvents` + set class properties: christmasEventActive/halloweenEventActive
      */
-    protected cacheActiveEvents(): void;
+    cacheActiveEvents(): void;
     /**
      * Get the currently active weather season e.g. SUMMER/AUTUMN/WINTER
      * @returns Season enum value
@@ -171,6 +177,11 @@ export declare class SeasonalEventService {
      * @param eventName Name of the event to read equipment in from config
      */
     protected addEventGearToBots(eventType: SeasonalEventType): void;
+    /**
+     * Read in data from seasonalEvents.json and add found loot items to bots
+     * @param eventName Name of the event to read loot in from config
+     */
+    protected addEventLootToBots(eventType: SeasonalEventType): void;
     /**
      * Add pumpkin loot boxes to scavs
      */

TypeScript/13AddTrader/types/utils/App.d.ts

@@ -4,10 +4,10 @@ import { ICoreConfig } from "@spt/models/spt/config/ICoreConfig";
 import { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { HttpServer } from "@spt/servers/HttpServer";
-import { DatabaseService } from "@spt/services/DatabaseService";
 import { LocalisationService } from "@spt/services/LocalisationService";
 import { EncodingUtil } from "@spt/utils/EncodingUtil";
 import { TimeUtil } from "@spt/utils/TimeUtil";
+import { DatabaseService } from "@spt/services/DatabaseService";
 export declare class App {
     protected logger: ILogger;
     protected timeUtil: TimeUtil;

TypeScript/13AddTrader/types/utils/ProgressWriter.d.ts

@@ -0,0 +1,13 @@
+export declare class ProgressWriter {
+    private count;
+    private total?;
+    private done;
+    private barFillChar;
+    private barEmptyChar;
+    private maxBarLength;
+    constructor(total: number, maxBarLength?: number, barFillChar?: string, barEmptyChar?: string);
+    /**
+     * Increment the progress counter and update the progress bar display.
+     */
+    increment(): void;
+}

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

@@ -5,6 +5,7 @@ import { BotHelper } from "@spt/helpers/BotHelper";
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
 import { WeightedRandomHelper } from "@spt/helpers/WeightedRandomHelper";
 import { MinMax } from "@spt/models/common/MinMax";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
 import { IBaseJsonSkills, IBaseSkill, IBotBase, IInfo, IHealth as PmcHealth, ISkills as botSkills } from "@spt/models/eft/common/tables/IBotBase";
 import { IAppearance, IBodyPart, IBotType, IHealth, IInventory } from "@spt/models/eft/common/tables/IBotType";
 import { IBotGenerationDetails } from "@spt/models/spt/bots/BotGenerationDetails";
@@ -47,9 +48,10 @@ export declare class BotGenerator {
      * @param role e.g. assault / pmcbot
      * @param difficulty easy/normal/hard/impossible
      * @param botTemplate base bot template to use  (e.g. assault/pmcbot)
-     * @returns
+     * profile PMC profile of player generating pscav
+     * @returns IBotBase
      */
-    generatePlayerScav(sessionId: string, role: string, difficulty: string, botTemplate: IBotType): IBotBase;
+    generatePlayerScav(sessionId: string, role: string, difficulty: string, botTemplate: IBotType, profile: IPmcData): IBotBase;
     /**
      * Create 1 bot of the type/side/difficulty defined in botGenerationDetails
      * @param sessionId Session id
@@ -79,6 +81,12 @@ export declare class BotGenerator {
      * @returns IBotBase object
      */
     protected generateBot(sessionId: string, bot: IBotBase, botJsonTemplate: IBotType, botGenerationDetails: IBotGenerationDetails): IBotBase;
+    /**
+     * Should this bot have a name like "name (Pmc Name)" and be alterd by client patch to be hostile to player
+     * @param botRole Role bot has
+     * @returns True if name should be simulated pscav
+     */
+    protected shouldSimulatePlayerScav(botRole: string): boolean;
     /**
      * Get exp for kill by bot difficulty
      * @param experience Dict of difficulties and experience

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

@@ -91,6 +91,12 @@ export declare class RagfairOfferHelper {
      * @returns IRagfairOffer array
      */
     getOffersForBuild(searchRequest: ISearchRequestData, itemsToAdd: string[], traderAssorts: Record<string, ITraderAssort>, pmcData: IPmcData): IRagfairOffer[];
+    /**
+     * Get offers that have not exceeded buy limits
+     * @param possibleOffers offers to process
+     * @returns Offers
+     */
+    protected getOffersInsideBuyRestrictionLimits(possibleOffers: IRagfairOffer[]): IRagfairOffer[];
     /**
      * Check if offer is from trader standing the player does not have
      * @param offer Offer to check
@@ -209,4 +215,10 @@ export declare class RagfairOfferHelper {
      * @returns True if in range
      */
     protected itemQualityInRange(item: IItem, min: number, max: number): boolean;
+    /**
+     * Does this offer come from a trader
+     * @param offer Offer to check
+     * @returns True = from trader
+     */
+    offerIsFromTrader(offer: IRagfairOffer): boolean;
 }

TypeScript/14AfterDBLoadHook/types/models/eft/common/tables/IBotBase.d.ts

@@ -60,6 +60,7 @@ export interface IUnlockedInfo {
 export interface IInfo {
     EntryPoint: string;
     Nickname: string;
+    MainProfileNickname?: string;
     LowerNickname: string;
     Side: string;
     SquadInviteRestriction: boolean;

TypeScript/14AfterDBLoadHook/types/models/spt/config/IInventoryConfig.d.ts

@@ -10,6 +10,8 @@ export interface IInventoryConfig extends IBaseConfig {
     customMoneyTpls: string[];
     /** Multipliers for skill gain when inside menus, NOT in-game */
     skillGainMultiplers: Record<string, number>;
+    /** Container Tpls that shoud be deprioritised when choosing where to take money from for payments */
+    deprioritisedMoneyContainers: string[];
 }
 export interface IRewardDetails {
     rewardCount: number;

TypeScript/14AfterDBLoadHook/types/models/spt/config/IPmcConfig.d.ts

@@ -66,7 +66,9 @@ export interface IPmcTypes {
     bear: string;
 }
 export interface ISlotLootSettings {
+    /** Item Type whitelist */
     whitelist: string[];
+    /** item tpl blacklist */
     blacklist: string[];
 }
 export interface IMinMaxLootValue extends MinMax {

TypeScript/14AfterDBLoadHook/types/models/spt/config/IRagfairConfig.d.ts

@@ -75,6 +75,8 @@ export interface IDynamic {
     blacklist: IRagfairBlacklist;
     /** Dict of price limits keyed by item type */
     unreasonableModPrices: Record<string, IUnreasonableModPrices>;
+    /** Custom rouble prices for items to override values from prices.json */
+    itemPriceOverrideRouble: Record<string, number>;
 }
 export interface IPriceRanges {
     default: MinMax;

TypeScript/14AfterDBLoadHook/types/models/spt/config/ISeasonalEventConfig.d.ts

@@ -6,6 +6,8 @@ export interface ISeasonalEventConfig extends IBaseConfig {
     enableSeasonalEventDetection: boolean;
     /** event / botType / equipSlot / itemid */
     eventGear: Record<string, Record<string, Record<string, Record<string, number>>>>;
+    /** event / bot type / equipSlot / itemid */
+    eventLoot: Record<string, Record<string, Record<string, Record<string, number>>>>;
     events: ISeasonalEvent[];
     eventBotMapping: Record<string, string>;
     eventBossSpawns: Record<string, Record<string, IBossLocationSpawn[]>>;

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

@@ -1,5 +1,6 @@
 import { BotHelper } from "@spt/helpers/BotHelper";
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
+import { IBotBase } from "@spt/models/eft/common/tables/IBotBase";
 import { IBotType } from "@spt/models/eft/common/tables/IBotType";
 import { IBotGenerationDetails } from "@spt/models/spt/bots/BotGenerationDetails";
 import { IBotConfig } from "@spt/models/spt/config/IBotConfig";
@@ -38,10 +39,13 @@ export declare class BotNameService {
      */
     generateUniqueBotNickname(botJsonTemplate: IBotType, botGenerationDetails: IBotGenerationDetails, botRole: string, uniqueRoles?: string[]): string;
     /**
-     * Should this bot have a name like "name (Pmc Name)"
+     * Add random PMC name to bots MainProfileNickname property
-     * @param botRole Role bot has
+     * @param bot Bot to update
-     * @returns True if name should be simulated pscav
      */
-    protected shouldSimulatePlayerScavName(botRole: string): boolean;
+    addRandomPmcNameToBotMainProfileNicknameProperty(bot: IBotBase): void;
-    protected addPlayerScavNameSimulationSuffix(nickname: string): string;
+    /**
+     * Choose a random PMC name from bear or usec bot jsons
+     * @returns PMC name as string
+     */
+    protected getRandomPMCName(): string;
 }

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

@@ -85,7 +85,7 @@ export declare class DatabaseService {
      */
     getCustomization(): Record<string, ICustomizationItem>;
     /**
-     * @returns assets/database/templates/items.json
+     * @returns assets/database/templates/handbook.json
      */
     getHandbook(): IHandbookBase;
     /**
@@ -101,7 +101,7 @@ export declare class DatabaseService {
      */
     getProfiles(): IProfileTemplates;
     /**
-     * @returns assets/database/templates/items.json
+     * @returns assets/database/templates/quests.json
      */
     getQuests(): Record<string, IQuest>;
     /**

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

@@ -62,14 +62,6 @@ export declare class InsuranceService {
      * @returns Timestamp to return items to player in seconds
      */
     protected getInsuranceReturnTimestamp(pmcData: IPmcData, trader: ITraderBase): number;
-    /**
-     * Take the insurance item packages within a profile session and ensure that each of the items in that package are
-     * not orphaned from their parent ID.
-     *
-     * @param sessionID The session ID to update insurance equipment packages in.
-     * @returns void
-     */
-    protected adoptOrphanedInsEquipment(sessionID: string): void;
     protected getMaxInsuranceStorageTime(traderBase: ITraderBase): number;
     /**
      * Store lost gear post-raid inside profile, ready for later code to pick it up and mail it
@@ -127,10 +119,4 @@ export declare class InsuranceService {
      * @returns price in roubles
      */
     getRoublePriceToInsureItemWithTrader(pmcData: IPmcData, inventoryItem: IItem, traderId: string): number;
-    /**
-     * Returns the ID that should be used for a root-level Item's parentId property value within in the context of insurance.
-     * @param sessionID Players id
-     * @returns The root item Id.
-     */
-    getRootItemParentID(sessionID: string): string;
 }

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

@@ -8,7 +8,9 @@ import { IItem } from "@spt/models/eft/common/tables/IItem";
 import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
 import { IProcessBuyTradeRequestData } from "@spt/models/eft/trade/IProcessBuyTradeRequestData";
 import { IProcessSellTradeRequestData } from "@spt/models/eft/trade/IProcessSellTradeRequestData";
+import { IInventoryConfig } from "@spt/models/spt/config/IInventoryConfig";
 import { ILogger } from "@spt/models/spt/utils/ILogger";
+import { ConfigServer } from "@spt/servers/ConfigServer";
 import { DatabaseService } from "@spt/services/DatabaseService";
 import { LocalisationService } from "@spt/services/LocalisationService";
 import { HashUtil } from "@spt/utils/HashUtil";
@@ -24,7 +26,9 @@ export declare class PaymentService {
     protected inventoryHelper: InventoryHelper;
     protected localisationService: LocalisationService;
     protected paymentHelper: PaymentHelper;
-    constructor(logger: ILogger, hashUtil: HashUtil, httpResponse: HttpResponseUtil, databaseService: DatabaseService, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, localisationService: LocalisationService, paymentHelper: PaymentHelper);
+    protected configServer: ConfigServer;
+    protected inventoryConfig: IInventoryConfig;
+    constructor(logger: ILogger, hashUtil: HashUtil, httpResponse: HttpResponseUtil, databaseService: DatabaseService, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, localisationService: LocalisationService, paymentHelper: PaymentHelper, configServer: ConfigServer);
     /**
      * Take money and insert items into return to server request
      * @param pmcData Pmc profile

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

@@ -74,4 +74,6 @@ export declare class PostDbLoadService {
      */
     protected validateQuestAssortUnlocksExist(): void;
     protected setAllDbItemsAsSellableOnFlea(): void;
+    protected addMissingTraderBuyRestrictionMaxValue(): void;
+    protected applyFleaPriceOverrides(): void;
 }

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

@@ -47,6 +47,12 @@ export declare class ProfileFixerService {
      * @param pmcProfile profile to check and fix
      */
     checkForAndFixPmcProfileIssues(pmcProfile: IPmcData): void;
+    /**
+     * Resolve any dialogue attachments that were accidentally created using the player's equipment ID as
+     * the stash root object ID
+     * @param fullProfile
+     */
+    checkForAndFixDialogueAttachments(fullProfile: ISptProfile): void;
     /**
      * Find issues in the scav profile data that may cause issues
      * @param scavProfile profile to check and fix

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

@@ -88,6 +88,12 @@ export declare class SeasonalEventService {
      * @returns bots with equipment changes
      */
     protected getEventBotGear(eventType: SeasonalEventType): Record<string, Record<string, Record<string, number>>>;
+    /**
+     * Get a dictionary of loot changes to apply to bots for a specific event e.g. Christmas/Halloween
+     * @param eventName Name of event to get gear changes for
+     * @returns bots with loot changes
+     */
+    protected getEventBotLoot(eventType: SeasonalEventType): Record<string, Record<string, Record<string, number>>>;
     /**
      * Get the dates each seasonal event starts and ends at
      * @returns Record with event name + start/end date
@@ -108,7 +114,7 @@ export declare class SeasonalEventService {
     /**
      * Store active events inside class array property `currentlyActiveEvents` + set class properties: christmasEventActive/halloweenEventActive
      */
-    protected cacheActiveEvents(): void;
+    cacheActiveEvents(): void;
     /**
      * Get the currently active weather season e.g. SUMMER/AUTUMN/WINTER
      * @returns Season enum value
@@ -171,6 +177,11 @@ export declare class SeasonalEventService {
      * @param eventName Name of the event to read equipment in from config
      */
     protected addEventGearToBots(eventType: SeasonalEventType): void;
+    /**
+     * Read in data from seasonalEvents.json and add found loot items to bots
+     * @param eventName Name of the event to read loot in from config
+     */
+    protected addEventLootToBots(eventType: SeasonalEventType): void;
     /**
      * Add pumpkin loot boxes to scavs
      */

TypeScript/14AfterDBLoadHook/types/utils/App.d.ts

@@ -4,10 +4,10 @@ import { ICoreConfig } from "@spt/models/spt/config/ICoreConfig";
 import { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { HttpServer } from "@spt/servers/HttpServer";
-import { DatabaseService } from "@spt/services/DatabaseService";
 import { LocalisationService } from "@spt/services/LocalisationService";
 import { EncodingUtil } from "@spt/utils/EncodingUtil";
 import { TimeUtil } from "@spt/utils/TimeUtil";
+import { DatabaseService } from "@spt/services/DatabaseService";
 export declare class App {
     protected logger: ILogger;
     protected timeUtil: TimeUtil;

TypeScript/14AfterDBLoadHook/types/utils/ProgressWriter.d.ts

@@ -0,0 +1,13 @@
+export declare class ProgressWriter {
+    private count;
+    private total?;
+    private done;
+    private barFillChar;
+    private barEmptyChar;
+    private maxBarLength;
+    constructor(total: number, maxBarLength?: number, barFillChar?: string, barEmptyChar?: string);
+    /**
+     * Increment the progress counter and update the progress bar display.
+     */
+    increment(): void;
+}

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

@@ -5,6 +5,7 @@ import { BotHelper } from "@spt/helpers/BotHelper";
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
 import { WeightedRandomHelper } from "@spt/helpers/WeightedRandomHelper";
 import { MinMax } from "@spt/models/common/MinMax";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
 import { IBaseJsonSkills, IBaseSkill, IBotBase, IInfo, IHealth as PmcHealth, ISkills as botSkills } from "@spt/models/eft/common/tables/IBotBase";
 import { IAppearance, IBodyPart, IBotType, IHealth, IInventory } from "@spt/models/eft/common/tables/IBotType";
 import { IBotGenerationDetails } from "@spt/models/spt/bots/BotGenerationDetails";
@@ -47,9 +48,10 @@ export declare class BotGenerator {
      * @param role e.g. assault / pmcbot
      * @param difficulty easy/normal/hard/impossible
      * @param botTemplate base bot template to use  (e.g. assault/pmcbot)
-     * @returns
+     * profile PMC profile of player generating pscav
+     * @returns IBotBase
      */
-    generatePlayerScav(sessionId: string, role: string, difficulty: string, botTemplate: IBotType): IBotBase;
+    generatePlayerScav(sessionId: string, role: string, difficulty: string, botTemplate: IBotType, profile: IPmcData): IBotBase;
     /**
      * Create 1 bot of the type/side/difficulty defined in botGenerationDetails
      * @param sessionId Session id
@@ -79,6 +81,12 @@ export declare class BotGenerator {
      * @returns IBotBase object
      */
     protected generateBot(sessionId: string, bot: IBotBase, botJsonTemplate: IBotType, botGenerationDetails: IBotGenerationDetails): IBotBase;
+    /**
+     * Should this bot have a name like "name (Pmc Name)" and be alterd by client patch to be hostile to player
+     * @param botRole Role bot has
+     * @returns True if name should be simulated pscav
+     */
+    protected shouldSimulatePlayerScav(botRole: string): boolean;
     /**
      * Get exp for kill by bot difficulty
      * @param experience Dict of difficulties and experience

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

@@ -91,6 +91,12 @@ export declare class RagfairOfferHelper {
      * @returns IRagfairOffer array
      */
     getOffersForBuild(searchRequest: ISearchRequestData, itemsToAdd: string[], traderAssorts: Record<string, ITraderAssort>, pmcData: IPmcData): IRagfairOffer[];
+    /**
+     * Get offers that have not exceeded buy limits
+     * @param possibleOffers offers to process
+     * @returns Offers
+     */
+    protected getOffersInsideBuyRestrictionLimits(possibleOffers: IRagfairOffer[]): IRagfairOffer[];
     /**
      * Check if offer is from trader standing the player does not have
      * @param offer Offer to check
@@ -209,4 +215,10 @@ export declare class RagfairOfferHelper {
      * @returns True if in range
      */
     protected itemQualityInRange(item: IItem, min: number, max: number): boolean;
+    /**
+     * Does this offer come from a trader
+     * @param offer Offer to check
+     * @returns True = from trader
+     */
+    offerIsFromTrader(offer: IRagfairOffer): boolean;
 }

TypeScript/15HttpListenerExample/types/models/eft/common/tables/IBotBase.d.ts

@@ -60,6 +60,7 @@ export interface IUnlockedInfo {
 export interface IInfo {
     EntryPoint: string;
     Nickname: string;
+    MainProfileNickname?: string;
     LowerNickname: string;
     Side: string;
     SquadInviteRestriction: boolean;

TypeScript/15HttpListenerExample/types/models/spt/config/IInventoryConfig.d.ts

@@ -10,6 +10,8 @@ export interface IInventoryConfig extends IBaseConfig {
     customMoneyTpls: string[];
     /** Multipliers for skill gain when inside menus, NOT in-game */
     skillGainMultiplers: Record<string, number>;
+    /** Container Tpls that shoud be deprioritised when choosing where to take money from for payments */
+    deprioritisedMoneyContainers: string[];
 }
 export interface IRewardDetails {
     rewardCount: number;