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

@@ -8,7 +8,6 @@ import { IHandbookBase } from "@spt/models/eft/common/tables/IHandbookBase";
 import { IGetItemPricesResponse } from "@spt/models/eft/game/IGetItemPricesResponse";
 import { IHideoutArea } from "@spt/models/eft/hideout/IHideoutArea";
 import { IHideoutProductionData } from "@spt/models/eft/hideout/IHideoutProduction";
-import { IHideoutScavCase } from "@spt/models/eft/hideout/IHideoutScavCase";
 import { IHideoutSettingsBase } from "@spt/models/eft/hideout/IHideoutSettingsBase";
 import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
 import { ISettingsBase } from "@spt/models/spt/server/ISettingsBase";
@@ -63,7 +62,6 @@ export declare class DataCallbacks {
     getHideoutSettings(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutSettingsBase>;
     getHideoutAreas(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutArea[]>;
     getHideoutProduction(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutProductionData>;
-    getHideoutScavcase(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutScavCase[]>;
     /**
      * Handle client/languages
      */

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

@@ -18,11 +18,6 @@ export declare class WeatherController {
     constructor(weatherGenerator: WeatherGenerator, logger: ILogger, configServer: ConfigServer, seasonalEventService: SeasonalEventService, raidWeatherService: RaidWeatherService, weatherHelper: WeatherHelper);
     /** Handle client/weather */
     generate(): IWeatherData;
-    /**
-     * Get the current in-raid time (MUST HAVE PLAYER LOGGED INTO CLIENT TO WORK)
-     * @returns Date object
-     */
-    getCurrentInRaidTime(): Date;
     /** Handle client/localGame/weather */
     generateLocal(sesssionId: string): IGetLocalWeatherResponseData;
 }

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

@@ -2,7 +2,7 @@ import { ItemHelper } from "@spt/helpers/ItemHelper";
 import { PresetHelper } from "@spt/helpers/PresetHelper";
 import { IItem } from "@spt/models/eft/common/tables/IItem";
 import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
-import { IHideoutScavCase } from "@spt/models/eft/hideout/IHideoutScavCase";
+import { IScavRecipe } from "@spt/models/eft/hideout/IHideoutProduction";
 import { IScavCaseConfig } from "@spt/models/spt/config/IScavCaseConfig";
 import { IRewardCountAndPriceDetails, IScavCaseRewardCountsAndPrices } from "@spt/models/spt/hideout/ScavCaseRewardCountsAndPrices";
 import { ILogger } from "@spt/models/spt/utils/ILogger";
@@ -84,10 +84,10 @@ export declare class ScavCaseRewardGenerator {
     protected getFilteredItemsByPrice(dbItems: ITemplateItem[], itemFilters: IRewardCountAndPriceDetails): ITemplateItem[];
     /**
      * Gathers the reward min and max count params for each reward quality level from config and scavcase.json into a single object
-     * @param scavCaseDetails scavcase.json values
+     * @param scavCaseDetails production.json/scavRecipes object
      * @returns ScavCaseRewardCountsAndPrices object
      */
-    protected getScavCaseRewardCountsAndPrices(scavCaseDetails: IHideoutScavCase): IScavCaseRewardCountsAndPrices;
+    protected getScavCaseRewardCountsAndPrices(scavCaseDetails: IScavRecipe): IScavCaseRewardCountsAndPrices;
     /**
      * Randomises the size of ammo and money stacks
      * @param itemToCalculate ammo or money item

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

@@ -113,12 +113,12 @@ export declare class QuestHelper {
      */
     protected generateArmorRewardChildSlots(originalRewardRootItem: IItem, questReward: IQuestReward): void;
     /**
-     * Gets a flat list of reward items for the given quest at a specific state (e.g. Fail/Success)
+     * Gets a flat list of reward items for the given quest at a specific state for the specified game version (e.g. Fail/Success)
      * @param quest quest to get rewards for
      * @param status Quest status that holds the items (Started, Success, Fail)
      * @returns array of items with the correct maxStack
      */
-    getQuestRewardItems(quest: IQuest, status: QuestStatus): IItem[];
+    getQuestRewardItems(quest: IQuest, status: QuestStatus, gameVersion: string): IItem[];
     /**
      * Look up quest in db by accepted quest id and construct a profile-ready object ready to store in profile
      * @param pmcData Player profile
@@ -321,6 +321,15 @@ export declare class QuestHelper {
      * @returns array of IQuest
      */
     getClientQuests(sessionID: string): IQuest[];
+    /**
+     * Create a clone of the given quest array with the rewards updated to reflect the
+     * given game version
+     *
+     * @param quests The list of quests to check
+     * @param gameVersion The game version of the profile
+     * @returns array of IQuest objects with the rewards filtered correctly for the game version
+     */
+    protected updateQuestsForGameEdition(quests: IQuest[], gameVersion: string): IQuest[];
     /**
      * Return a list of quests that would fail when supplied quest is completed
      * @param completedQuestId quest completed id

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

@@ -10,7 +10,7 @@ export declare class WeatherHelper {
     protected weatherConfig: IWeatherConfig;
     constructor(logger: ILogger, timeUtil: TimeUtil, configServer: ConfigServer);
     /**
-     * Get the current in-raid time
+     * Get the current in-raid time - does not include an accurate date, only time
      * @param currentDate (new Date())
      * @returns Date object of current in-raid time
      */

TypeScript/10ScopesAndTypes/types/models/eft/hideout/IHideoutScavCase.d.ts

@@ -1,18 +0,0 @@
-import { MinMax } from "@spt/models/common/MinMax";
-export interface IHideoutScavCase {
-    _id: string;
-    ProductionTime: number;
-    Requirements: IRequirement[];
-    EndProducts: IEndProducts;
-}
-export interface IRequirement {
-    templateId: string;
-    count: number;
-    isFunctional: boolean;
-    type: string;
-}
-export interface IEndProducts {
-    Common: MinMax;
-    Rare: MinMax;
-    Superrare: MinMax;
-}

TypeScript/10ScopesAndTypes/types/models/spt/callbacks/IDataCallbacks.d.ts

@@ -1,23 +0,0 @@
-import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
-import { IGlobals } from "@spt/models/eft/common/IGlobals";
-import { IHideoutArea } from "@spt/models/eft/hideout/IHideoutArea";
-import { IHideoutProduction } from "@spt/models/eft/hideout/IHideoutProduction";
-import { IHideoutScavCase } from "@spt/models/eft/hideout/IHideoutScavCase";
-import { IHideoutSettingsBase } from "@spt/models/eft/hideout/IHideoutSettingsBase";
-import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
-import { ISettingsBase } from "@spt/models/spt/server/ISettingsBase";
-export interface IDataCallbacks {
-    getSettings(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<ISettingsBase>;
-    getGlobals(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IGlobals>;
-    getTemplateItems(url: string, info: IEmptyRequestData, sessionID: string): string;
-    getTemplateHandbook(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<any>;
-    getTemplateSuits(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<any>;
-    getTemplateCharacter(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<string[]>;
-    getHideoutSettings(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutSettingsBase>;
-    getHideoutAreas(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutArea[]>;
-    gethideoutProduction(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutProduction[]>;
-    getHideoutScavcase(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutScavCase[]>;
-    getLocalesLanguages(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<Record<string, string>>;
-    getLocalesMenu(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<any>;
-    getLocalesGlobal(url: string, info: IEmptyRequestData, sessionID: string): string;
-}

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

@@ -57,6 +57,8 @@ export interface IGameFixes {
     fixShotgunDispersion: boolean;
     /** Remove items added by mods when the mod no longer exists - can fix dead profiles stuck at game load */
     removeModItemsFromProfile: boolean;
+    /** Remove invalid traders from profile - trader data can be leftover when player removes trader mod */
+    removeInvalidTradersFromProfile: boolean;
     /** Fix issues that cause the game to not start due to inventory item issues */
     fixProfileBreakingInventoryItemIssues: boolean;
 }

TypeScript/10ScopesAndTypes/types/models/spt/hideout/IHideout.d.ts

@@ -1,12 +1,10 @@
 import { IHideoutArea } from "@spt/models/eft/hideout/IHideoutArea";
 import { IHideoutProductionData } from "@spt/models/eft/hideout/IHideoutProduction";
-import { IHideoutScavCase } from "@spt/models/eft/hideout/IHideoutScavCase";
 import { IHideoutSettingsBase } from "@spt/models/eft/hideout/IHideoutSettingsBase";
 import { IQteData } from "@spt/models/eft/hideout/IQteData";
 export interface IHideout {
     areas: IHideoutArea[];
     production: IHideoutProductionData;
-    scavcase: IHideoutScavCase[];
     settings: IHideoutSettingsBase;
     qte: IQteData[];
 }

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

@@ -120,4 +120,5 @@ export declare class ProfileFixerService {
      * @returns matching bonus
      */
     protected getBonusFromProfile(profileBonuses: IBonus[], bonus: IStageBonus): IBonus | undefined;
+    checkForAndRemoveInvalidTraders(fullProfile: ISptProfile): void;
 }

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

@@ -138,6 +138,12 @@ export declare class SeasonalEventService {
      */
     protected enableHalloweenSummonEvent(): void;
     protected configureZombies(zombieSettings: IZombieSettings): void;
+    /**
+     * BSG store the location ids differently inside `LocationInfection`, need to convert to matching location IDs
+     * @param infectedLocationKey Key to convert
+     * @returns Array of locations
+     */
+    protected getLocationFromInfectedLocation(infectedLocationKey: string): string[];
     protected addEventWavesToMaps(eventType: string): void;
     /**
      * Add event bosses to maps

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

@@ -8,7 +8,6 @@ import { IHandbookBase } from "@spt/models/eft/common/tables/IHandbookBase";
 import { IGetItemPricesResponse } from "@spt/models/eft/game/IGetItemPricesResponse";
 import { IHideoutArea } from "@spt/models/eft/hideout/IHideoutArea";
 import { IHideoutProductionData } from "@spt/models/eft/hideout/IHideoutProduction";
-import { IHideoutScavCase } from "@spt/models/eft/hideout/IHideoutScavCase";
 import { IHideoutSettingsBase } from "@spt/models/eft/hideout/IHideoutSettingsBase";
 import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
 import { ISettingsBase } from "@spt/models/spt/server/ISettingsBase";
@@ -63,7 +62,6 @@ export declare class DataCallbacks {
     getHideoutSettings(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutSettingsBase>;
     getHideoutAreas(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutArea[]>;
     getHideoutProduction(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutProductionData>;
-    getHideoutScavcase(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutScavCase[]>;
     /**
      * Handle client/languages
      */

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

@@ -18,11 +18,6 @@ export declare class WeatherController {
     constructor(weatherGenerator: WeatherGenerator, logger: ILogger, configServer: ConfigServer, seasonalEventService: SeasonalEventService, raidWeatherService: RaidWeatherService, weatherHelper: WeatherHelper);
     /** Handle client/weather */
     generate(): IWeatherData;
-    /**
-     * Get the current in-raid time (MUST HAVE PLAYER LOGGED INTO CLIENT TO WORK)
-     * @returns Date object
-     */
-    getCurrentInRaidTime(): Date;
     /** Handle client/localGame/weather */
     generateLocal(sesssionId: string): IGetLocalWeatherResponseData;
 }

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

@@ -2,7 +2,7 @@ import { ItemHelper } from "@spt/helpers/ItemHelper";
 import { PresetHelper } from "@spt/helpers/PresetHelper";
 import { IItem } from "@spt/models/eft/common/tables/IItem";
 import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
-import { IHideoutScavCase } from "@spt/models/eft/hideout/IHideoutScavCase";
+import { IScavRecipe } from "@spt/models/eft/hideout/IHideoutProduction";
 import { IScavCaseConfig } from "@spt/models/spt/config/IScavCaseConfig";
 import { IRewardCountAndPriceDetails, IScavCaseRewardCountsAndPrices } from "@spt/models/spt/hideout/ScavCaseRewardCountsAndPrices";
 import { ILogger } from "@spt/models/spt/utils/ILogger";
@@ -84,10 +84,10 @@ export declare class ScavCaseRewardGenerator {
     protected getFilteredItemsByPrice(dbItems: ITemplateItem[], itemFilters: IRewardCountAndPriceDetails): ITemplateItem[];
     /**
      * Gathers the reward min and max count params for each reward quality level from config and scavcase.json into a single object
-     * @param scavCaseDetails scavcase.json values
+     * @param scavCaseDetails production.json/scavRecipes object
      * @returns ScavCaseRewardCountsAndPrices object
      */
-    protected getScavCaseRewardCountsAndPrices(scavCaseDetails: IHideoutScavCase): IScavCaseRewardCountsAndPrices;
+    protected getScavCaseRewardCountsAndPrices(scavCaseDetails: IScavRecipe): IScavCaseRewardCountsAndPrices;
     /**
      * Randomises the size of ammo and money stacks
      * @param itemToCalculate ammo or money item

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

@@ -113,12 +113,12 @@ export declare class QuestHelper {
      */
     protected generateArmorRewardChildSlots(originalRewardRootItem: IItem, questReward: IQuestReward): void;
     /**
-     * Gets a flat list of reward items for the given quest at a specific state (e.g. Fail/Success)
+     * Gets a flat list of reward items for the given quest at a specific state for the specified game version (e.g. Fail/Success)
      * @param quest quest to get rewards for
      * @param status Quest status that holds the items (Started, Success, Fail)
      * @returns array of items with the correct maxStack
      */
-    getQuestRewardItems(quest: IQuest, status: QuestStatus): IItem[];
+    getQuestRewardItems(quest: IQuest, status: QuestStatus, gameVersion: string): IItem[];
     /**
      * Look up quest in db by accepted quest id and construct a profile-ready object ready to store in profile
      * @param pmcData Player profile
@@ -321,6 +321,15 @@ export declare class QuestHelper {
      * @returns array of IQuest
      */
     getClientQuests(sessionID: string): IQuest[];
+    /**
+     * Create a clone of the given quest array with the rewards updated to reflect the
+     * given game version
+     *
+     * @param quests The list of quests to check
+     * @param gameVersion The game version of the profile
+     * @returns array of IQuest objects with the rewards filtered correctly for the game version
+     */
+    protected updateQuestsForGameEdition(quests: IQuest[], gameVersion: string): IQuest[];
     /**
      * Return a list of quests that would fail when supplied quest is completed
      * @param completedQuestId quest completed id

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

@@ -10,7 +10,7 @@ export declare class WeatherHelper {
     protected weatherConfig: IWeatherConfig;
     constructor(logger: ILogger, timeUtil: TimeUtil, configServer: ConfigServer);
     /**
-     * Get the current in-raid time
+     * Get the current in-raid time - does not include an accurate date, only time
      * @param currentDate (new Date())
      * @returns Date object of current in-raid time
      */

TypeScript/11BundleLoadingSample/types/models/eft/hideout/IHideoutScavCase.d.ts

@@ -1,18 +0,0 @@
-import { MinMax } from "@spt/models/common/MinMax";
-export interface IHideoutScavCase {
-    _id: string;
-    ProductionTime: number;
-    Requirements: IRequirement[];
-    EndProducts: IEndProducts;
-}
-export interface IRequirement {
-    templateId: string;
-    count: number;
-    isFunctional: boolean;
-    type: string;
-}
-export interface IEndProducts {
-    Common: MinMax;
-    Rare: MinMax;
-    Superrare: MinMax;
-}

TypeScript/11BundleLoadingSample/types/models/spt/callbacks/IDataCallbacks.d.ts

@@ -1,23 +0,0 @@
-import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
-import { IGlobals } from "@spt/models/eft/common/IGlobals";
-import { IHideoutArea } from "@spt/models/eft/hideout/IHideoutArea";
-import { IHideoutProduction } from "@spt/models/eft/hideout/IHideoutProduction";
-import { IHideoutScavCase } from "@spt/models/eft/hideout/IHideoutScavCase";
-import { IHideoutSettingsBase } from "@spt/models/eft/hideout/IHideoutSettingsBase";
-import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
-import { ISettingsBase } from "@spt/models/spt/server/ISettingsBase";
-export interface IDataCallbacks {
-    getSettings(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<ISettingsBase>;
-    getGlobals(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IGlobals>;
-    getTemplateItems(url: string, info: IEmptyRequestData, sessionID: string): string;
-    getTemplateHandbook(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<any>;
-    getTemplateSuits(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<any>;
-    getTemplateCharacter(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<string[]>;
-    getHideoutSettings(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutSettingsBase>;
-    getHideoutAreas(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutArea[]>;
-    gethideoutProduction(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutProduction[]>;
-    getHideoutScavcase(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutScavCase[]>;
-    getLocalesLanguages(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<Record<string, string>>;
-    getLocalesMenu(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<any>;
-    getLocalesGlobal(url: string, info: IEmptyRequestData, sessionID: string): string;
-}

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

@@ -57,6 +57,8 @@ export interface IGameFixes {
     fixShotgunDispersion: boolean;
     /** Remove items added by mods when the mod no longer exists - can fix dead profiles stuck at game load */
     removeModItemsFromProfile: boolean;
+    /** Remove invalid traders from profile - trader data can be leftover when player removes trader mod */
+    removeInvalidTradersFromProfile: boolean;
     /** Fix issues that cause the game to not start due to inventory item issues */
     fixProfileBreakingInventoryItemIssues: boolean;
 }

TypeScript/11BundleLoadingSample/types/models/spt/hideout/IHideout.d.ts

@@ -1,12 +1,10 @@
 import { IHideoutArea } from "@spt/models/eft/hideout/IHideoutArea";
 import { IHideoutProductionData } from "@spt/models/eft/hideout/IHideoutProduction";
-import { IHideoutScavCase } from "@spt/models/eft/hideout/IHideoutScavCase";
 import { IHideoutSettingsBase } from "@spt/models/eft/hideout/IHideoutSettingsBase";
 import { IQteData } from "@spt/models/eft/hideout/IQteData";
 export interface IHideout {
     areas: IHideoutArea[];
     production: IHideoutProductionData;
-    scavcase: IHideoutScavCase[];
     settings: IHideoutSettingsBase;
     qte: IQteData[];
 }

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

@@ -120,4 +120,5 @@ export declare class ProfileFixerService {
      * @returns matching bonus
      */
     protected getBonusFromProfile(profileBonuses: IBonus[], bonus: IStageBonus): IBonus | undefined;
+    checkForAndRemoveInvalidTraders(fullProfile: ISptProfile): void;
 }

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

@@ -138,6 +138,12 @@ export declare class SeasonalEventService {
      */
     protected enableHalloweenSummonEvent(): void;
     protected configureZombies(zombieSettings: IZombieSettings): void;
+    /**
+     * BSG store the location ids differently inside `LocationInfection`, need to convert to matching location IDs
+     * @param infectedLocationKey Key to convert
+     * @returns Array of locations
+     */
+    protected getLocationFromInfectedLocation(infectedLocationKey: string): string[];
     protected addEventWavesToMaps(eventType: string): void;
     /**
      * Add event bosses to maps

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

@@ -8,7 +8,6 @@ import { IHandbookBase } from "@spt/models/eft/common/tables/IHandbookBase";
 import { IGetItemPricesResponse } from "@spt/models/eft/game/IGetItemPricesResponse";
 import { IHideoutArea } from "@spt/models/eft/hideout/IHideoutArea";
 import { IHideoutProductionData } from "@spt/models/eft/hideout/IHideoutProduction";
-import { IHideoutScavCase } from "@spt/models/eft/hideout/IHideoutScavCase";
 import { IHideoutSettingsBase } from "@spt/models/eft/hideout/IHideoutSettingsBase";
 import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
 import { ISettingsBase } from "@spt/models/spt/server/ISettingsBase";
@@ -63,7 +62,6 @@ export declare class DataCallbacks {
     getHideoutSettings(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutSettingsBase>;
     getHideoutAreas(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutArea[]>;
     getHideoutProduction(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutProductionData>;
-    getHideoutScavcase(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutScavCase[]>;
     /**
      * Handle client/languages
      */

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

@@ -18,11 +18,6 @@ export declare class WeatherController {
     constructor(weatherGenerator: WeatherGenerator, logger: ILogger, configServer: ConfigServer, seasonalEventService: SeasonalEventService, raidWeatherService: RaidWeatherService, weatherHelper: WeatherHelper);
     /** Handle client/weather */
     generate(): IWeatherData;
-    /**
-     * Get the current in-raid time (MUST HAVE PLAYER LOGGED INTO CLIENT TO WORK)
-     * @returns Date object
-     */
-    getCurrentInRaidTime(): Date;
     /** Handle client/localGame/weather */
     generateLocal(sesssionId: string): IGetLocalWeatherResponseData;
 }

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

@@ -2,7 +2,7 @@ import { ItemHelper } from "@spt/helpers/ItemHelper";
 import { PresetHelper } from "@spt/helpers/PresetHelper";
 import { IItem } from "@spt/models/eft/common/tables/IItem";
 import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
-import { IHideoutScavCase } from "@spt/models/eft/hideout/IHideoutScavCase";
+import { IScavRecipe } from "@spt/models/eft/hideout/IHideoutProduction";
 import { IScavCaseConfig } from "@spt/models/spt/config/IScavCaseConfig";
 import { IRewardCountAndPriceDetails, IScavCaseRewardCountsAndPrices } from "@spt/models/spt/hideout/ScavCaseRewardCountsAndPrices";
 import { ILogger } from "@spt/models/spt/utils/ILogger";
@@ -84,10 +84,10 @@ export declare class ScavCaseRewardGenerator {
     protected getFilteredItemsByPrice(dbItems: ITemplateItem[], itemFilters: IRewardCountAndPriceDetails): ITemplateItem[];
     /**
      * Gathers the reward min and max count params for each reward quality level from config and scavcase.json into a single object
-     * @param scavCaseDetails scavcase.json values
+     * @param scavCaseDetails production.json/scavRecipes object
      * @returns ScavCaseRewardCountsAndPrices object
      */
-    protected getScavCaseRewardCountsAndPrices(scavCaseDetails: IHideoutScavCase): IScavCaseRewardCountsAndPrices;
+    protected getScavCaseRewardCountsAndPrices(scavCaseDetails: IScavRecipe): IScavCaseRewardCountsAndPrices;
     /**
      * Randomises the size of ammo and money stacks
      * @param itemToCalculate ammo or money item

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

@@ -113,12 +113,12 @@ export declare class QuestHelper {
      */
     protected generateArmorRewardChildSlots(originalRewardRootItem: IItem, questReward: IQuestReward): void;
     /**
-     * Gets a flat list of reward items for the given quest at a specific state (e.g. Fail/Success)
+     * Gets a flat list of reward items for the given quest at a specific state for the specified game version (e.g. Fail/Success)
      * @param quest quest to get rewards for
      * @param status Quest status that holds the items (Started, Success, Fail)
      * @returns array of items with the correct maxStack
      */
-    getQuestRewardItems(quest: IQuest, status: QuestStatus): IItem[];
+    getQuestRewardItems(quest: IQuest, status: QuestStatus, gameVersion: string): IItem[];
     /**
      * Look up quest in db by accepted quest id and construct a profile-ready object ready to store in profile
      * @param pmcData Player profile
@@ -321,6 +321,15 @@ export declare class QuestHelper {
      * @returns array of IQuest
      */
     getClientQuests(sessionID: string): IQuest[];
+    /**
+     * Create a clone of the given quest array with the rewards updated to reflect the
+     * given game version
+     *
+     * @param quests The list of quests to check
+     * @param gameVersion The game version of the profile
+     * @returns array of IQuest objects with the rewards filtered correctly for the game version
+     */
+    protected updateQuestsForGameEdition(quests: IQuest[], gameVersion: string): IQuest[];
     /**
      * Return a list of quests that would fail when supplied quest is completed
      * @param completedQuestId quest completed id

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

@@ -10,7 +10,7 @@ export declare class WeatherHelper {
     protected weatherConfig: IWeatherConfig;
     constructor(logger: ILogger, timeUtil: TimeUtil, configServer: ConfigServer);
     /**
-     * Get the current in-raid time
+     * Get the current in-raid time - does not include an accurate date, only time
      * @param currentDate (new Date())
      * @returns Date object of current in-raid time
      */

TypeScript/12ClassExtensionOverride/types/models/eft/hideout/IHideoutScavCase.d.ts

@@ -1,18 +0,0 @@
-import { MinMax } from "@spt/models/common/MinMax";
-export interface IHideoutScavCase {
-    _id: string;
-    ProductionTime: number;
-    Requirements: IRequirement[];
-    EndProducts: IEndProducts;
-}
-export interface IRequirement {
-    templateId: string;
-    count: number;
-    isFunctional: boolean;
-    type: string;
-}
-export interface IEndProducts {
-    Common: MinMax;
-    Rare: MinMax;
-    Superrare: MinMax;
-}

TypeScript/12ClassExtensionOverride/types/models/spt/callbacks/IDataCallbacks.d.ts

@@ -1,23 +0,0 @@
-import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
-import { IGlobals } from "@spt/models/eft/common/IGlobals";
-import { IHideoutArea } from "@spt/models/eft/hideout/IHideoutArea";
-import { IHideoutProduction } from "@spt/models/eft/hideout/IHideoutProduction";
-import { IHideoutScavCase } from "@spt/models/eft/hideout/IHideoutScavCase";
-import { IHideoutSettingsBase } from "@spt/models/eft/hideout/IHideoutSettingsBase";
-import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
-import { ISettingsBase } from "@spt/models/spt/server/ISettingsBase";
-export interface IDataCallbacks {
-    getSettings(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<ISettingsBase>;
-    getGlobals(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IGlobals>;
-    getTemplateItems(url: string, info: IEmptyRequestData, sessionID: string): string;
-    getTemplateHandbook(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<any>;
-    getTemplateSuits(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<any>;
-    getTemplateCharacter(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<string[]>;
-    getHideoutSettings(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutSettingsBase>;
-    getHideoutAreas(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutArea[]>;
-    gethideoutProduction(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutProduction[]>;
-    getHideoutScavcase(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutScavCase[]>;
-    getLocalesLanguages(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<Record<string, string>>;
-    getLocalesMenu(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<any>;
-    getLocalesGlobal(url: string, info: IEmptyRequestData, sessionID: string): string;
-}

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

@@ -57,6 +57,8 @@ export interface IGameFixes {
     fixShotgunDispersion: boolean;
     /** Remove items added by mods when the mod no longer exists - can fix dead profiles stuck at game load */
     removeModItemsFromProfile: boolean;
+    /** Remove invalid traders from profile - trader data can be leftover when player removes trader mod */
+    removeInvalidTradersFromProfile: boolean;
     /** Fix issues that cause the game to not start due to inventory item issues */
     fixProfileBreakingInventoryItemIssues: boolean;
 }

TypeScript/12ClassExtensionOverride/types/models/spt/hideout/IHideout.d.ts

@@ -1,12 +1,10 @@
 import { IHideoutArea } from "@spt/models/eft/hideout/IHideoutArea";
 import { IHideoutProductionData } from "@spt/models/eft/hideout/IHideoutProduction";
-import { IHideoutScavCase } from "@spt/models/eft/hideout/IHideoutScavCase";
 import { IHideoutSettingsBase } from "@spt/models/eft/hideout/IHideoutSettingsBase";
 import { IQteData } from "@spt/models/eft/hideout/IQteData";
 export interface IHideout {
     areas: IHideoutArea[];
     production: IHideoutProductionData;
-    scavcase: IHideoutScavCase[];
     settings: IHideoutSettingsBase;
     qte: IQteData[];
 }

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

@@ -120,4 +120,5 @@ export declare class ProfileFixerService {
      * @returns matching bonus
      */
     protected getBonusFromProfile(profileBonuses: IBonus[], bonus: IStageBonus): IBonus | undefined;
+    checkForAndRemoveInvalidTraders(fullProfile: ISptProfile): void;
 }

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

@@ -138,6 +138,12 @@ export declare class SeasonalEventService {
      */
     protected enableHalloweenSummonEvent(): void;
     protected configureZombies(zombieSettings: IZombieSettings): void;
+    /**
+     * BSG store the location ids differently inside `LocationInfection`, need to convert to matching location IDs
+     * @param infectedLocationKey Key to convert
+     * @returns Array of locations
+     */
+    protected getLocationFromInfectedLocation(infectedLocationKey: string): string[];
     protected addEventWavesToMaps(eventType: string): void;
     /**
      * Add event bosses to maps

TypeScript/13.1AddTraderWithAssortJSON/types/callbacks/DataCallbacks.d.ts

@@ -8,7 +8,6 @@ import { IHandbookBase } from "@spt/models/eft/common/tables/IHandbookBase";
 import { IGetItemPricesResponse } from "@spt/models/eft/game/IGetItemPricesResponse";
 import { IHideoutArea } from "@spt/models/eft/hideout/IHideoutArea";
 import { IHideoutProductionData } from "@spt/models/eft/hideout/IHideoutProduction";
-import { IHideoutScavCase } from "@spt/models/eft/hideout/IHideoutScavCase";
 import { IHideoutSettingsBase } from "@spt/models/eft/hideout/IHideoutSettingsBase";
 import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
 import { ISettingsBase } from "@spt/models/spt/server/ISettingsBase";
@@ -63,7 +62,6 @@ export declare class DataCallbacks {
     getHideoutSettings(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutSettingsBase>;
     getHideoutAreas(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutArea[]>;
     getHideoutProduction(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutProductionData>;
-    getHideoutScavcase(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutScavCase[]>;
     /**
      * Handle client/languages
      */

TypeScript/13.1AddTraderWithAssortJSON/types/controllers/WeatherController.d.ts

@@ -18,11 +18,6 @@ export declare class WeatherController {
     constructor(weatherGenerator: WeatherGenerator, logger: ILogger, configServer: ConfigServer, seasonalEventService: SeasonalEventService, raidWeatherService: RaidWeatherService, weatherHelper: WeatherHelper);
     /** Handle client/weather */
     generate(): IWeatherData;
-    /**
-     * Get the current in-raid time (MUST HAVE PLAYER LOGGED INTO CLIENT TO WORK)
-     * @returns Date object
-     */
-    getCurrentInRaidTime(): Date;
     /** Handle client/localGame/weather */
     generateLocal(sesssionId: string): IGetLocalWeatherResponseData;
 }

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

@@ -2,7 +2,7 @@ import { ItemHelper } from "@spt/helpers/ItemHelper";
 import { PresetHelper } from "@spt/helpers/PresetHelper";
 import { IItem } from "@spt/models/eft/common/tables/IItem";
 import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
-import { IHideoutScavCase } from "@spt/models/eft/hideout/IHideoutScavCase";
+import { IScavRecipe } from "@spt/models/eft/hideout/IHideoutProduction";
 import { IScavCaseConfig } from "@spt/models/spt/config/IScavCaseConfig";
 import { IRewardCountAndPriceDetails, IScavCaseRewardCountsAndPrices } from "@spt/models/spt/hideout/ScavCaseRewardCountsAndPrices";
 import { ILogger } from "@spt/models/spt/utils/ILogger";
@@ -84,10 +84,10 @@ export declare class ScavCaseRewardGenerator {
     protected getFilteredItemsByPrice(dbItems: ITemplateItem[], itemFilters: IRewardCountAndPriceDetails): ITemplateItem[];
     /**
      * Gathers the reward min and max count params for each reward quality level from config and scavcase.json into a single object
-     * @param scavCaseDetails scavcase.json values
+     * @param scavCaseDetails production.json/scavRecipes object
      * @returns ScavCaseRewardCountsAndPrices object
      */
-    protected getScavCaseRewardCountsAndPrices(scavCaseDetails: IHideoutScavCase): IScavCaseRewardCountsAndPrices;
+    protected getScavCaseRewardCountsAndPrices(scavCaseDetails: IScavRecipe): IScavCaseRewardCountsAndPrices;
     /**
      * Randomises the size of ammo and money stacks
      * @param itemToCalculate ammo or money item

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

@@ -113,12 +113,12 @@ export declare class QuestHelper {
      */
     protected generateArmorRewardChildSlots(originalRewardRootItem: IItem, questReward: IQuestReward): void;
     /**
-     * Gets a flat list of reward items for the given quest at a specific state (e.g. Fail/Success)
+     * Gets a flat list of reward items for the given quest at a specific state for the specified game version (e.g. Fail/Success)
      * @param quest quest to get rewards for
      * @param status Quest status that holds the items (Started, Success, Fail)
      * @returns array of items with the correct maxStack
      */
-    getQuestRewardItems(quest: IQuest, status: QuestStatus): IItem[];
+    getQuestRewardItems(quest: IQuest, status: QuestStatus, gameVersion: string): IItem[];
     /**
      * Look up quest in db by accepted quest id and construct a profile-ready object ready to store in profile
      * @param pmcData Player profile
@@ -321,6 +321,15 @@ export declare class QuestHelper {
      * @returns array of IQuest
      */
     getClientQuests(sessionID: string): IQuest[];
+    /**
+     * Create a clone of the given quest array with the rewards updated to reflect the
+     * given game version
+     *
+     * @param quests The list of quests to check
+     * @param gameVersion The game version of the profile
+     * @returns array of IQuest objects with the rewards filtered correctly for the game version
+     */
+    protected updateQuestsForGameEdition(quests: IQuest[], gameVersion: string): IQuest[];
     /**
      * Return a list of quests that would fail when supplied quest is completed
      * @param completedQuestId quest completed id

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

@@ -10,7 +10,7 @@ export declare class WeatherHelper {
     protected weatherConfig: IWeatherConfig;
     constructor(logger: ILogger, timeUtil: TimeUtil, configServer: ConfigServer);
     /**
-     * Get the current in-raid time
+     * Get the current in-raid time - does not include an accurate date, only time
      * @param currentDate (new Date())
      * @returns Date object of current in-raid time
      */

TypeScript/13.1AddTraderWithAssortJSON/types/models/eft/hideout/IHideoutScavCase.d.ts

@@ -1,18 +0,0 @@
-import { MinMax } from "@spt/models/common/MinMax";
-export interface IHideoutScavCase {
-    _id: string;
-    ProductionTime: number;
-    Requirements: IRequirement[];
-    EndProducts: IEndProducts;
-}
-export interface IRequirement {
-    templateId: string;
-    count: number;
-    isFunctional: boolean;
-    type: string;
-}
-export interface IEndProducts {
-    Common: MinMax;
-    Rare: MinMax;
-    Superrare: MinMax;
-}

TypeScript/13.1AddTraderWithAssortJSON/types/models/spt/callbacks/IDataCallbacks.d.ts

@@ -1,23 +0,0 @@
-import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
-import { IGlobals } from "@spt/models/eft/common/IGlobals";
-import { IHideoutArea } from "@spt/models/eft/hideout/IHideoutArea";
-import { IHideoutProduction } from "@spt/models/eft/hideout/IHideoutProduction";
-import { IHideoutScavCase } from "@spt/models/eft/hideout/IHideoutScavCase";
-import { IHideoutSettingsBase } from "@spt/models/eft/hideout/IHideoutSettingsBase";
-import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
-import { ISettingsBase } from "@spt/models/spt/server/ISettingsBase";
-export interface IDataCallbacks {
-    getSettings(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<ISettingsBase>;
-    getGlobals(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IGlobals>;
-    getTemplateItems(url: string, info: IEmptyRequestData, sessionID: string): string;
-    getTemplateHandbook(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<any>;
-    getTemplateSuits(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<any>;
-    getTemplateCharacter(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<string[]>;
-    getHideoutSettings(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutSettingsBase>;
-    getHideoutAreas(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutArea[]>;
-    gethideoutProduction(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutProduction[]>;
-    getHideoutScavcase(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutScavCase[]>;
-    getLocalesLanguages(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<Record<string, string>>;
-    getLocalesMenu(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<any>;
-    getLocalesGlobal(url: string, info: IEmptyRequestData, sessionID: string): string;
-}

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

@@ -57,6 +57,8 @@ export interface IGameFixes {
     fixShotgunDispersion: boolean;
     /** Remove items added by mods when the mod no longer exists - can fix dead profiles stuck at game load */
     removeModItemsFromProfile: boolean;
+    /** Remove invalid traders from profile - trader data can be leftover when player removes trader mod */
+    removeInvalidTradersFromProfile: boolean;
     /** Fix issues that cause the game to not start due to inventory item issues */
     fixProfileBreakingInventoryItemIssues: boolean;
 }

TypeScript/13.1AddTraderWithAssortJSON/types/models/spt/hideout/IHideout.d.ts

@@ -1,12 +1,10 @@
 import { IHideoutArea } from "@spt/models/eft/hideout/IHideoutArea";
 import { IHideoutProductionData } from "@spt/models/eft/hideout/IHideoutProduction";
-import { IHideoutScavCase } from "@spt/models/eft/hideout/IHideoutScavCase";
 import { IHideoutSettingsBase } from "@spt/models/eft/hideout/IHideoutSettingsBase";
 import { IQteData } from "@spt/models/eft/hideout/IQteData";
 export interface IHideout {
     areas: IHideoutArea[];
     production: IHideoutProductionData;
-    scavcase: IHideoutScavCase[];
     settings: IHideoutSettingsBase;
     qte: IQteData[];
 }

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

@@ -120,4 +120,5 @@ export declare class ProfileFixerService {
      * @returns matching bonus
      */
     protected getBonusFromProfile(profileBonuses: IBonus[], bonus: IStageBonus): IBonus | undefined;
+    checkForAndRemoveInvalidTraders(fullProfile: ISptProfile): void;
 }

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

@@ -138,6 +138,12 @@ export declare class SeasonalEventService {
      */
     protected enableHalloweenSummonEvent(): void;
     protected configureZombies(zombieSettings: IZombieSettings): void;
+    /**
+     * BSG store the location ids differently inside `LocationInfection`, need to convert to matching location IDs
+     * @param infectedLocationKey Key to convert
+     * @returns Array of locations
+     */
+    protected getLocationFromInfectedLocation(infectedLocationKey: string): string[];
     protected addEventWavesToMaps(eventType: string): void;
     /**
      * Add event bosses to maps

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

@@ -8,7 +8,6 @@ import { IHandbookBase } from "@spt/models/eft/common/tables/IHandbookBase";
 import { IGetItemPricesResponse } from "@spt/models/eft/game/IGetItemPricesResponse";
 import { IHideoutArea } from "@spt/models/eft/hideout/IHideoutArea";
 import { IHideoutProductionData } from "@spt/models/eft/hideout/IHideoutProduction";
-import { IHideoutScavCase } from "@spt/models/eft/hideout/IHideoutScavCase";
 import { IHideoutSettingsBase } from "@spt/models/eft/hideout/IHideoutSettingsBase";
 import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
 import { ISettingsBase } from "@spt/models/spt/server/ISettingsBase";
@@ -63,7 +62,6 @@ export declare class DataCallbacks {
     getHideoutSettings(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutSettingsBase>;
     getHideoutAreas(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutArea[]>;
     getHideoutProduction(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutProductionData>;
-    getHideoutScavcase(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutScavCase[]>;
     /**
      * Handle client/languages
      */

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

@@ -18,11 +18,6 @@ export declare class WeatherController {
     constructor(weatherGenerator: WeatherGenerator, logger: ILogger, configServer: ConfigServer, seasonalEventService: SeasonalEventService, raidWeatherService: RaidWeatherService, weatherHelper: WeatherHelper);
     /** Handle client/weather */
     generate(): IWeatherData;
-    /**
-     * Get the current in-raid time (MUST HAVE PLAYER LOGGED INTO CLIENT TO WORK)
-     * @returns Date object
-     */
-    getCurrentInRaidTime(): Date;
     /** Handle client/localGame/weather */
     generateLocal(sesssionId: string): IGetLocalWeatherResponseData;
 }

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

@@ -2,7 +2,7 @@ import { ItemHelper } from "@spt/helpers/ItemHelper";
 import { PresetHelper } from "@spt/helpers/PresetHelper";
 import { IItem } from "@spt/models/eft/common/tables/IItem";
 import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
-import { IHideoutScavCase } from "@spt/models/eft/hideout/IHideoutScavCase";
+import { IScavRecipe } from "@spt/models/eft/hideout/IHideoutProduction";
 import { IScavCaseConfig } from "@spt/models/spt/config/IScavCaseConfig";
 import { IRewardCountAndPriceDetails, IScavCaseRewardCountsAndPrices } from "@spt/models/spt/hideout/ScavCaseRewardCountsAndPrices";
 import { ILogger } from "@spt/models/spt/utils/ILogger";
@@ -84,10 +84,10 @@ export declare class ScavCaseRewardGenerator {
     protected getFilteredItemsByPrice(dbItems: ITemplateItem[], itemFilters: IRewardCountAndPriceDetails): ITemplateItem[];
     /**
      * Gathers the reward min and max count params for each reward quality level from config and scavcase.json into a single object
-     * @param scavCaseDetails scavcase.json values
+     * @param scavCaseDetails production.json/scavRecipes object
      * @returns ScavCaseRewardCountsAndPrices object
      */
-    protected getScavCaseRewardCountsAndPrices(scavCaseDetails: IHideoutScavCase): IScavCaseRewardCountsAndPrices;
+    protected getScavCaseRewardCountsAndPrices(scavCaseDetails: IScavRecipe): IScavCaseRewardCountsAndPrices;
     /**
      * Randomises the size of ammo and money stacks
      * @param itemToCalculate ammo or money item

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

@@ -113,12 +113,12 @@ export declare class QuestHelper {
      */
     protected generateArmorRewardChildSlots(originalRewardRootItem: IItem, questReward: IQuestReward): void;
     /**
-     * Gets a flat list of reward items for the given quest at a specific state (e.g. Fail/Success)
+     * Gets a flat list of reward items for the given quest at a specific state for the specified game version (e.g. Fail/Success)
      * @param quest quest to get rewards for
      * @param status Quest status that holds the items (Started, Success, Fail)
      * @returns array of items with the correct maxStack
      */
-    getQuestRewardItems(quest: IQuest, status: QuestStatus): IItem[];
+    getQuestRewardItems(quest: IQuest, status: QuestStatus, gameVersion: string): IItem[];
     /**
      * Look up quest in db by accepted quest id and construct a profile-ready object ready to store in profile
      * @param pmcData Player profile
@@ -321,6 +321,15 @@ export declare class QuestHelper {
      * @returns array of IQuest
      */
     getClientQuests(sessionID: string): IQuest[];
+    /**
+     * Create a clone of the given quest array with the rewards updated to reflect the
+     * given game version
+     *
+     * @param quests The list of quests to check
+     * @param gameVersion The game version of the profile
+     * @returns array of IQuest objects with the rewards filtered correctly for the game version
+     */
+    protected updateQuestsForGameEdition(quests: IQuest[], gameVersion: string): IQuest[];
     /**
      * Return a list of quests that would fail when supplied quest is completed
      * @param completedQuestId quest completed id

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

@@ -10,7 +10,7 @@ export declare class WeatherHelper {
     protected weatherConfig: IWeatherConfig;
     constructor(logger: ILogger, timeUtil: TimeUtil, configServer: ConfigServer);
     /**
-     * Get the current in-raid time
+     * Get the current in-raid time - does not include an accurate date, only time
      * @param currentDate (new Date())
      * @returns Date object of current in-raid time
      */

TypeScript/13AddTrader/types/models/eft/hideout/IHideoutScavCase.d.ts

@@ -1,18 +0,0 @@
-import { MinMax } from "@spt/models/common/MinMax";
-export interface IHideoutScavCase {
-    _id: string;
-    ProductionTime: number;
-    Requirements: IRequirement[];
-    EndProducts: IEndProducts;
-}
-export interface IRequirement {
-    templateId: string;
-    count: number;
-    isFunctional: boolean;
-    type: string;
-}
-export interface IEndProducts {
-    Common: MinMax;
-    Rare: MinMax;
-    Superrare: MinMax;
-}

TypeScript/13AddTrader/types/models/spt/callbacks/IDataCallbacks.d.ts

@@ -1,23 +0,0 @@
-import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
-import { IGlobals } from "@spt/models/eft/common/IGlobals";
-import { IHideoutArea } from "@spt/models/eft/hideout/IHideoutArea";
-import { IHideoutProduction } from "@spt/models/eft/hideout/IHideoutProduction";
-import { IHideoutScavCase } from "@spt/models/eft/hideout/IHideoutScavCase";
-import { IHideoutSettingsBase } from "@spt/models/eft/hideout/IHideoutSettingsBase";
-import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
-import { ISettingsBase } from "@spt/models/spt/server/ISettingsBase";
-export interface IDataCallbacks {
-    getSettings(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<ISettingsBase>;
-    getGlobals(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IGlobals>;
-    getTemplateItems(url: string, info: IEmptyRequestData, sessionID: string): string;
-    getTemplateHandbook(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<any>;
-    getTemplateSuits(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<any>;
-    getTemplateCharacter(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<string[]>;
-    getHideoutSettings(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutSettingsBase>;
-    getHideoutAreas(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutArea[]>;
-    gethideoutProduction(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutProduction[]>;
-    getHideoutScavcase(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutScavCase[]>;
-    getLocalesLanguages(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<Record<string, string>>;
-    getLocalesMenu(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<any>;
-    getLocalesGlobal(url: string, info: IEmptyRequestData, sessionID: string): string;
-}

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

@@ -57,6 +57,8 @@ export interface IGameFixes {
     fixShotgunDispersion: boolean;
     /** Remove items added by mods when the mod no longer exists - can fix dead profiles stuck at game load */
     removeModItemsFromProfile: boolean;
+    /** Remove invalid traders from profile - trader data can be leftover when player removes trader mod */
+    removeInvalidTradersFromProfile: boolean;
     /** Fix issues that cause the game to not start due to inventory item issues */
     fixProfileBreakingInventoryItemIssues: boolean;
 }

TypeScript/13AddTrader/types/models/spt/hideout/IHideout.d.ts

@@ -1,12 +1,10 @@
 import { IHideoutArea } from "@spt/models/eft/hideout/IHideoutArea";
 import { IHideoutProductionData } from "@spt/models/eft/hideout/IHideoutProduction";
-import { IHideoutScavCase } from "@spt/models/eft/hideout/IHideoutScavCase";
 import { IHideoutSettingsBase } from "@spt/models/eft/hideout/IHideoutSettingsBase";
 import { IQteData } from "@spt/models/eft/hideout/IQteData";
 export interface IHideout {
     areas: IHideoutArea[];
     production: IHideoutProductionData;
-    scavcase: IHideoutScavCase[];
     settings: IHideoutSettingsBase;
     qte: IQteData[];
 }

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

@@ -120,4 +120,5 @@ export declare class ProfileFixerService {
      * @returns matching bonus
      */
     protected getBonusFromProfile(profileBonuses: IBonus[], bonus: IStageBonus): IBonus | undefined;
+    checkForAndRemoveInvalidTraders(fullProfile: ISptProfile): void;
 }

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

@@ -138,6 +138,12 @@ export declare class SeasonalEventService {
      */
     protected enableHalloweenSummonEvent(): void;
     protected configureZombies(zombieSettings: IZombieSettings): void;
+    /**
+     * BSG store the location ids differently inside `LocationInfection`, need to convert to matching location IDs
+     * @param infectedLocationKey Key to convert
+     * @returns Array of locations
+     */
+    protected getLocationFromInfectedLocation(infectedLocationKey: string): string[];
     protected addEventWavesToMaps(eventType: string): void;
     /**
      * Add event bosses to maps

TypeScript/14AfterDBLoadHook/types/callbacks/DataCallbacks.d.ts

@@ -8,7 +8,6 @@ import { IHandbookBase } from "@spt/models/eft/common/tables/IHandbookBase";
 import { IGetItemPricesResponse } from "@spt/models/eft/game/IGetItemPricesResponse";
 import { IHideoutArea } from "@spt/models/eft/hideout/IHideoutArea";
 import { IHideoutProductionData } from "@spt/models/eft/hideout/IHideoutProduction";
-import { IHideoutScavCase } from "@spt/models/eft/hideout/IHideoutScavCase";
 import { IHideoutSettingsBase } from "@spt/models/eft/hideout/IHideoutSettingsBase";
 import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
 import { ISettingsBase } from "@spt/models/spt/server/ISettingsBase";
@@ -63,7 +62,6 @@ export declare class DataCallbacks {
     getHideoutSettings(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutSettingsBase>;
     getHideoutAreas(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutArea[]>;
     getHideoutProduction(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutProductionData>;
-    getHideoutScavcase(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutScavCase[]>;
     /**
      * Handle client/languages
      */

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

@@ -18,11 +18,6 @@ export declare class WeatherController {
     constructor(weatherGenerator: WeatherGenerator, logger: ILogger, configServer: ConfigServer, seasonalEventService: SeasonalEventService, raidWeatherService: RaidWeatherService, weatherHelper: WeatherHelper);
     /** Handle client/weather */
     generate(): IWeatherData;
-    /**
-     * Get the current in-raid time (MUST HAVE PLAYER LOGGED INTO CLIENT TO WORK)
-     * @returns Date object
-     */
-    getCurrentInRaidTime(): Date;
     /** Handle client/localGame/weather */
     generateLocal(sesssionId: string): IGetLocalWeatherResponseData;
 }

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

@@ -2,7 +2,7 @@ import { ItemHelper } from "@spt/helpers/ItemHelper";
 import { PresetHelper } from "@spt/helpers/PresetHelper";
 import { IItem } from "@spt/models/eft/common/tables/IItem";
 import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
-import { IHideoutScavCase } from "@spt/models/eft/hideout/IHideoutScavCase";
+import { IScavRecipe } from "@spt/models/eft/hideout/IHideoutProduction";
 import { IScavCaseConfig } from "@spt/models/spt/config/IScavCaseConfig";
 import { IRewardCountAndPriceDetails, IScavCaseRewardCountsAndPrices } from "@spt/models/spt/hideout/ScavCaseRewardCountsAndPrices";
 import { ILogger } from "@spt/models/spt/utils/ILogger";
@@ -84,10 +84,10 @@ export declare class ScavCaseRewardGenerator {
     protected getFilteredItemsByPrice(dbItems: ITemplateItem[], itemFilters: IRewardCountAndPriceDetails): ITemplateItem[];
     /**
      * Gathers the reward min and max count params for each reward quality level from config and scavcase.json into a single object
-     * @param scavCaseDetails scavcase.json values
+     * @param scavCaseDetails production.json/scavRecipes object
      * @returns ScavCaseRewardCountsAndPrices object
      */
-    protected getScavCaseRewardCountsAndPrices(scavCaseDetails: IHideoutScavCase): IScavCaseRewardCountsAndPrices;
+    protected getScavCaseRewardCountsAndPrices(scavCaseDetails: IScavRecipe): IScavCaseRewardCountsAndPrices;
     /**
      * Randomises the size of ammo and money stacks
      * @param itemToCalculate ammo or money item

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

@@ -113,12 +113,12 @@ export declare class QuestHelper {
      */
     protected generateArmorRewardChildSlots(originalRewardRootItem: IItem, questReward: IQuestReward): void;
     /**
-     * Gets a flat list of reward items for the given quest at a specific state (e.g. Fail/Success)
+     * Gets a flat list of reward items for the given quest at a specific state for the specified game version (e.g. Fail/Success)
      * @param quest quest to get rewards for
      * @param status Quest status that holds the items (Started, Success, Fail)
      * @returns array of items with the correct maxStack
      */
-    getQuestRewardItems(quest: IQuest, status: QuestStatus): IItem[];
+    getQuestRewardItems(quest: IQuest, status: QuestStatus, gameVersion: string): IItem[];
     /**
      * Look up quest in db by accepted quest id and construct a profile-ready object ready to store in profile
      * @param pmcData Player profile
@@ -321,6 +321,15 @@ export declare class QuestHelper {
      * @returns array of IQuest
      */
     getClientQuests(sessionID: string): IQuest[];
+    /**
+     * Create a clone of the given quest array with the rewards updated to reflect the
+     * given game version
+     *
+     * @param quests The list of quests to check
+     * @param gameVersion The game version of the profile
+     * @returns array of IQuest objects with the rewards filtered correctly for the game version
+     */
+    protected updateQuestsForGameEdition(quests: IQuest[], gameVersion: string): IQuest[];
     /**
      * Return a list of quests that would fail when supplied quest is completed
      * @param completedQuestId quest completed id

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

@@ -10,7 +10,7 @@ export declare class WeatherHelper {
     protected weatherConfig: IWeatherConfig;
     constructor(logger: ILogger, timeUtil: TimeUtil, configServer: ConfigServer);
     /**
-     * Get the current in-raid time
+     * Get the current in-raid time - does not include an accurate date, only time
      * @param currentDate (new Date())
      * @returns Date object of current in-raid time
      */

TypeScript/14AfterDBLoadHook/types/models/eft/hideout/IHideoutScavCase.d.ts

@@ -1,18 +0,0 @@
-import { MinMax } from "@spt/models/common/MinMax";
-export interface IHideoutScavCase {
-    _id: string;
-    ProductionTime: number;
-    Requirements: IRequirement[];
-    EndProducts: IEndProducts;
-}
-export interface IRequirement {
-    templateId: string;
-    count: number;
-    isFunctional: boolean;
-    type: string;
-}
-export interface IEndProducts {
-    Common: MinMax;
-    Rare: MinMax;
-    Superrare: MinMax;
-}

TypeScript/14AfterDBLoadHook/types/models/spt/callbacks/IDataCallbacks.d.ts

@@ -1,23 +0,0 @@
-import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
-import { IGlobals } from "@spt/models/eft/common/IGlobals";
-import { IHideoutArea } from "@spt/models/eft/hideout/IHideoutArea";
-import { IHideoutProduction } from "@spt/models/eft/hideout/IHideoutProduction";
-import { IHideoutScavCase } from "@spt/models/eft/hideout/IHideoutScavCase";
-import { IHideoutSettingsBase } from "@spt/models/eft/hideout/IHideoutSettingsBase";
-import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
-import { ISettingsBase } from "@spt/models/spt/server/ISettingsBase";
-export interface IDataCallbacks {
-    getSettings(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<ISettingsBase>;
-    getGlobals(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IGlobals>;
-    getTemplateItems(url: string, info: IEmptyRequestData, sessionID: string): string;
-    getTemplateHandbook(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<any>;
-    getTemplateSuits(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<any>;
-    getTemplateCharacter(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<string[]>;
-    getHideoutSettings(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutSettingsBase>;
-    getHideoutAreas(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutArea[]>;
-    gethideoutProduction(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutProduction[]>;
-    getHideoutScavcase(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutScavCase[]>;
-    getLocalesLanguages(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<Record<string, string>>;
-    getLocalesMenu(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<any>;
-    getLocalesGlobal(url: string, info: IEmptyRequestData, sessionID: string): string;
-}

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

@@ -57,6 +57,8 @@ export interface IGameFixes {
     fixShotgunDispersion: boolean;
     /** Remove items added by mods when the mod no longer exists - can fix dead profiles stuck at game load */
     removeModItemsFromProfile: boolean;
+    /** Remove invalid traders from profile - trader data can be leftover when player removes trader mod */
+    removeInvalidTradersFromProfile: boolean;
     /** Fix issues that cause the game to not start due to inventory item issues */
     fixProfileBreakingInventoryItemIssues: boolean;
 }

TypeScript/14AfterDBLoadHook/types/models/spt/hideout/IHideout.d.ts

@@ -1,12 +1,10 @@
 import { IHideoutArea } from "@spt/models/eft/hideout/IHideoutArea";
 import { IHideoutProductionData } from "@spt/models/eft/hideout/IHideoutProduction";
-import { IHideoutScavCase } from "@spt/models/eft/hideout/IHideoutScavCase";
 import { IHideoutSettingsBase } from "@spt/models/eft/hideout/IHideoutSettingsBase";
 import { IQteData } from "@spt/models/eft/hideout/IQteData";
 export interface IHideout {
     areas: IHideoutArea[];
     production: IHideoutProductionData;
-    scavcase: IHideoutScavCase[];
     settings: IHideoutSettingsBase;
     qte: IQteData[];
 }

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

@@ -120,4 +120,5 @@ export declare class ProfileFixerService {
      * @returns matching bonus
      */
     protected getBonusFromProfile(profileBonuses: IBonus[], bonus: IStageBonus): IBonus | undefined;
+    checkForAndRemoveInvalidTraders(fullProfile: ISptProfile): void;
 }

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

@@ -138,6 +138,12 @@ export declare class SeasonalEventService {
      */
     protected enableHalloweenSummonEvent(): void;
     protected configureZombies(zombieSettings: IZombieSettings): void;
+    /**
+     * BSG store the location ids differently inside `LocationInfection`, need to convert to matching location IDs
+     * @param infectedLocationKey Key to convert
+     * @returns Array of locations
+     */
+    protected getLocationFromInfectedLocation(infectedLocationKey: string): string[];
     protected addEventWavesToMaps(eventType: string): void;
     /**
      * Add event bosses to maps

TypeScript/15HttpListenerExample/types/callbacks/DataCallbacks.d.ts

@@ -8,7 +8,6 @@ import { IHandbookBase } from "@spt/models/eft/common/tables/IHandbookBase";
 import { IGetItemPricesResponse } from "@spt/models/eft/game/IGetItemPricesResponse";
 import { IHideoutArea } from "@spt/models/eft/hideout/IHideoutArea";
 import { IHideoutProductionData } from "@spt/models/eft/hideout/IHideoutProduction";
-import { IHideoutScavCase } from "@spt/models/eft/hideout/IHideoutScavCase";
 import { IHideoutSettingsBase } from "@spt/models/eft/hideout/IHideoutSettingsBase";
 import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
 import { ISettingsBase } from "@spt/models/spt/server/ISettingsBase";
@@ -63,7 +62,6 @@ export declare class DataCallbacks {
     getHideoutSettings(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutSettingsBase>;
     getHideoutAreas(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutArea[]>;
     getHideoutProduction(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutProductionData>;
-    getHideoutScavcase(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutScavCase[]>;
     /**
      * Handle client/languages
      */

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

@@ -18,11 +18,6 @@ export declare class WeatherController {
     constructor(weatherGenerator: WeatherGenerator, logger: ILogger, configServer: ConfigServer, seasonalEventService: SeasonalEventService, raidWeatherService: RaidWeatherService, weatherHelper: WeatherHelper);
     /** Handle client/weather */
     generate(): IWeatherData;
-    /**
-     * Get the current in-raid time (MUST HAVE PLAYER LOGGED INTO CLIENT TO WORK)
-     * @returns Date object
-     */
-    getCurrentInRaidTime(): Date;
     /** Handle client/localGame/weather */
     generateLocal(sesssionId: string): IGetLocalWeatherResponseData;
 }

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

@@ -2,7 +2,7 @@ import { ItemHelper } from "@spt/helpers/ItemHelper";
 import { PresetHelper } from "@spt/helpers/PresetHelper";
 import { IItem } from "@spt/models/eft/common/tables/IItem";
 import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
-import { IHideoutScavCase } from "@spt/models/eft/hideout/IHideoutScavCase";
+import { IScavRecipe } from "@spt/models/eft/hideout/IHideoutProduction";
 import { IScavCaseConfig } from "@spt/models/spt/config/IScavCaseConfig";
 import { IRewardCountAndPriceDetails, IScavCaseRewardCountsAndPrices } from "@spt/models/spt/hideout/ScavCaseRewardCountsAndPrices";
 import { ILogger } from "@spt/models/spt/utils/ILogger";
@@ -84,10 +84,10 @@ export declare class ScavCaseRewardGenerator {
     protected getFilteredItemsByPrice(dbItems: ITemplateItem[], itemFilters: IRewardCountAndPriceDetails): ITemplateItem[];
     /**
      * Gathers the reward min and max count params for each reward quality level from config and scavcase.json into a single object
-     * @param scavCaseDetails scavcase.json values
+     * @param scavCaseDetails production.json/scavRecipes object
      * @returns ScavCaseRewardCountsAndPrices object
      */
-    protected getScavCaseRewardCountsAndPrices(scavCaseDetails: IHideoutScavCase): IScavCaseRewardCountsAndPrices;
+    protected getScavCaseRewardCountsAndPrices(scavCaseDetails: IScavRecipe): IScavCaseRewardCountsAndPrices;
     /**
      * Randomises the size of ammo and money stacks
      * @param itemToCalculate ammo or money item

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

@@ -113,12 +113,12 @@ export declare class QuestHelper {
      */
     protected generateArmorRewardChildSlots(originalRewardRootItem: IItem, questReward: IQuestReward): void;
     /**
-     * Gets a flat list of reward items for the given quest at a specific state (e.g. Fail/Success)
+     * Gets a flat list of reward items for the given quest at a specific state for the specified game version (e.g. Fail/Success)
      * @param quest quest to get rewards for
      * @param status Quest status that holds the items (Started, Success, Fail)
      * @returns array of items with the correct maxStack
      */
-    getQuestRewardItems(quest: IQuest, status: QuestStatus): IItem[];
+    getQuestRewardItems(quest: IQuest, status: QuestStatus, gameVersion: string): IItem[];
     /**
      * Look up quest in db by accepted quest id and construct a profile-ready object ready to store in profile
      * @param pmcData Player profile
@@ -321,6 +321,15 @@ export declare class QuestHelper {
      * @returns array of IQuest
      */
     getClientQuests(sessionID: string): IQuest[];
+    /**
+     * Create a clone of the given quest array with the rewards updated to reflect the
+     * given game version
+     *
+     * @param quests The list of quests to check
+     * @param gameVersion The game version of the profile
+     * @returns array of IQuest objects with the rewards filtered correctly for the game version
+     */
+    protected updateQuestsForGameEdition(quests: IQuest[], gameVersion: string): IQuest[];
     /**
      * Return a list of quests that would fail when supplied quest is completed
      * @param completedQuestId quest completed id

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

@@ -10,7 +10,7 @@ export declare class WeatherHelper {
     protected weatherConfig: IWeatherConfig;
     constructor(logger: ILogger, timeUtil: TimeUtil, configServer: ConfigServer);
     /**
-     * Get the current in-raid time
+     * Get the current in-raid time - does not include an accurate date, only time
      * @param currentDate (new Date())
      * @returns Date object of current in-raid time
      */

TypeScript/15HttpListenerExample/types/models/eft/hideout/IHideoutScavCase.d.ts

@@ -1,18 +0,0 @@
-import { MinMax } from "@spt/models/common/MinMax";
-export interface IHideoutScavCase {
-    _id: string;
-    ProductionTime: number;
-    Requirements: IRequirement[];
-    EndProducts: IEndProducts;
-}
-export interface IRequirement {
-    templateId: string;
-    count: number;
-    isFunctional: boolean;
-    type: string;
-}
-export interface IEndProducts {
-    Common: MinMax;
-    Rare: MinMax;
-    Superrare: MinMax;
-}

TypeScript/15HttpListenerExample/types/models/spt/callbacks/IDataCallbacks.d.ts

@@ -1,23 +0,0 @@
-import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
-import { IGlobals } from "@spt/models/eft/common/IGlobals";
-import { IHideoutArea } from "@spt/models/eft/hideout/IHideoutArea";
-import { IHideoutProduction } from "@spt/models/eft/hideout/IHideoutProduction";
-import { IHideoutScavCase } from "@spt/models/eft/hideout/IHideoutScavCase";
-import { IHideoutSettingsBase } from "@spt/models/eft/hideout/IHideoutSettingsBase";
-import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
-import { ISettingsBase } from "@spt/models/spt/server/ISettingsBase";
-export interface IDataCallbacks {
-    getSettings(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<ISettingsBase>;
-    getGlobals(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IGlobals>;
-    getTemplateItems(url: string, info: IEmptyRequestData, sessionID: string): string;
-    getTemplateHandbook(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<any>;
-    getTemplateSuits(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<any>;
-    getTemplateCharacter(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<string[]>;
-    getHideoutSettings(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutSettingsBase>;
-    getHideoutAreas(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutArea[]>;
-    gethideoutProduction(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutProduction[]>;
-    getHideoutScavcase(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutScavCase[]>;
-    getLocalesLanguages(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<Record<string, string>>;
-    getLocalesMenu(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<any>;
-    getLocalesGlobal(url: string, info: IEmptyRequestData, sessionID: string): string;
-}

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

@@ -57,6 +57,8 @@ export interface IGameFixes {
     fixShotgunDispersion: boolean;
     /** Remove items added by mods when the mod no longer exists - can fix dead profiles stuck at game load */
     removeModItemsFromProfile: boolean;
+    /** Remove invalid traders from profile - trader data can be leftover when player removes trader mod */
+    removeInvalidTradersFromProfile: boolean;
     /** Fix issues that cause the game to not start due to inventory item issues */
     fixProfileBreakingInventoryItemIssues: boolean;
 }

TypeScript/15HttpListenerExample/types/models/spt/hideout/IHideout.d.ts

@@ -1,12 +1,10 @@
 import { IHideoutArea } from "@spt/models/eft/hideout/IHideoutArea";
 import { IHideoutProductionData } from "@spt/models/eft/hideout/IHideoutProduction";
-import { IHideoutScavCase } from "@spt/models/eft/hideout/IHideoutScavCase";
 import { IHideoutSettingsBase } from "@spt/models/eft/hideout/IHideoutSettingsBase";
 import { IQteData } from "@spt/models/eft/hideout/IQteData";
 export interface IHideout {
     areas: IHideoutArea[];
     production: IHideoutProductionData;
-    scavcase: IHideoutScavCase[];
     settings: IHideoutSettingsBase;
     qte: IQteData[];
 }

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

@@ -120,4 +120,5 @@ export declare class ProfileFixerService {
      * @returns matching bonus
      */
     protected getBonusFromProfile(profileBonuses: IBonus[], bonus: IStageBonus): IBonus | undefined;
+    checkForAndRemoveInvalidTraders(fullProfile: ISptProfile): void;
 }

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

@@ -138,6 +138,12 @@ export declare class SeasonalEventService {
      */
     protected enableHalloweenSummonEvent(): void;
     protected configureZombies(zombieSettings: IZombieSettings): void;
+    /**
+     * BSG store the location ids differently inside `LocationInfection`, need to convert to matching location IDs
+     * @param infectedLocationKey Key to convert
+     * @returns Array of locations
+     */
+    protected getLocationFromInfectedLocation(infectedLocationKey: string): string[];
     protected addEventWavesToMaps(eventType: string): void;
     /**
      * Add event bosses to maps

TypeScript/16ImporterUtil/types/callbacks/DataCallbacks.d.ts

@@ -8,7 +8,6 @@ import { IHandbookBase } from "@spt/models/eft/common/tables/IHandbookBase";
 import { IGetItemPricesResponse } from "@spt/models/eft/game/IGetItemPricesResponse";
 import { IHideoutArea } from "@spt/models/eft/hideout/IHideoutArea";
 import { IHideoutProductionData } from "@spt/models/eft/hideout/IHideoutProduction";
-import { IHideoutScavCase } from "@spt/models/eft/hideout/IHideoutScavCase";
 import { IHideoutSettingsBase } from "@spt/models/eft/hideout/IHideoutSettingsBase";
 import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
 import { ISettingsBase } from "@spt/models/spt/server/ISettingsBase";
@@ -63,7 +62,6 @@ export declare class DataCallbacks {
     getHideoutSettings(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutSettingsBase>;
     getHideoutAreas(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutArea[]>;
     getHideoutProduction(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutProductionData>;
-    getHideoutScavcase(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutScavCase[]>;
     /**
      * Handle client/languages
      */

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

@@ -18,11 +18,6 @@ export declare class WeatherController {
     constructor(weatherGenerator: WeatherGenerator, logger: ILogger, configServer: ConfigServer, seasonalEventService: SeasonalEventService, raidWeatherService: RaidWeatherService, weatherHelper: WeatherHelper);
     /** Handle client/weather */
     generate(): IWeatherData;
-    /**
-     * Get the current in-raid time (MUST HAVE PLAYER LOGGED INTO CLIENT TO WORK)
-     * @returns Date object
-     */
-    getCurrentInRaidTime(): Date;
     /** Handle client/localGame/weather */
     generateLocal(sesssionId: string): IGetLocalWeatherResponseData;
 }

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

@@ -2,7 +2,7 @@ import { ItemHelper } from "@spt/helpers/ItemHelper";
 import { PresetHelper } from "@spt/helpers/PresetHelper";
 import { IItem } from "@spt/models/eft/common/tables/IItem";
 import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
-import { IHideoutScavCase } from "@spt/models/eft/hideout/IHideoutScavCase";
+import { IScavRecipe } from "@spt/models/eft/hideout/IHideoutProduction";
 import { IScavCaseConfig } from "@spt/models/spt/config/IScavCaseConfig";
 import { IRewardCountAndPriceDetails, IScavCaseRewardCountsAndPrices } from "@spt/models/spt/hideout/ScavCaseRewardCountsAndPrices";
 import { ILogger } from "@spt/models/spt/utils/ILogger";
@@ -84,10 +84,10 @@ export declare class ScavCaseRewardGenerator {
     protected getFilteredItemsByPrice(dbItems: ITemplateItem[], itemFilters: IRewardCountAndPriceDetails): ITemplateItem[];
     /**
      * Gathers the reward min and max count params for each reward quality level from config and scavcase.json into a single object
-     * @param scavCaseDetails scavcase.json values
+     * @param scavCaseDetails production.json/scavRecipes object
      * @returns ScavCaseRewardCountsAndPrices object
      */
-    protected getScavCaseRewardCountsAndPrices(scavCaseDetails: IHideoutScavCase): IScavCaseRewardCountsAndPrices;
+    protected getScavCaseRewardCountsAndPrices(scavCaseDetails: IScavRecipe): IScavCaseRewardCountsAndPrices;
     /**
      * Randomises the size of ammo and money stacks
      * @param itemToCalculate ammo or money item

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

@@ -113,12 +113,12 @@ export declare class QuestHelper {
      */
     protected generateArmorRewardChildSlots(originalRewardRootItem: IItem, questReward: IQuestReward): void;
     /**
-     * Gets a flat list of reward items for the given quest at a specific state (e.g. Fail/Success)
+     * Gets a flat list of reward items for the given quest at a specific state for the specified game version (e.g. Fail/Success)
      * @param quest quest to get rewards for
      * @param status Quest status that holds the items (Started, Success, Fail)
      * @returns array of items with the correct maxStack
      */
-    getQuestRewardItems(quest: IQuest, status: QuestStatus): IItem[];
+    getQuestRewardItems(quest: IQuest, status: QuestStatus, gameVersion: string): IItem[];
     /**
      * Look up quest in db by accepted quest id and construct a profile-ready object ready to store in profile
      * @param pmcData Player profile
@@ -321,6 +321,15 @@ export declare class QuestHelper {
      * @returns array of IQuest
      */
     getClientQuests(sessionID: string): IQuest[];
+    /**
+     * Create a clone of the given quest array with the rewards updated to reflect the
+     * given game version
+     *
+     * @param quests The list of quests to check
+     * @param gameVersion The game version of the profile
+     * @returns array of IQuest objects with the rewards filtered correctly for the game version
+     */
+    protected updateQuestsForGameEdition(quests: IQuest[], gameVersion: string): IQuest[];
     /**
      * Return a list of quests that would fail when supplied quest is completed
      * @param completedQuestId quest completed id

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

@@ -10,7 +10,7 @@ export declare class WeatherHelper {
     protected weatherConfig: IWeatherConfig;
     constructor(logger: ILogger, timeUtil: TimeUtil, configServer: ConfigServer);
     /**
-     * Get the current in-raid time
+     * Get the current in-raid time - does not include an accurate date, only time
      * @param currentDate (new Date())
      * @returns Date object of current in-raid time
      */

TypeScript/16ImporterUtil/types/models/eft/hideout/IHideoutScavCase.d.ts

@@ -1,18 +0,0 @@
-import { MinMax } from "@spt/models/common/MinMax";
-export interface IHideoutScavCase {
-    _id: string;
-    ProductionTime: number;
-    Requirements: IRequirement[];
-    EndProducts: IEndProducts;
-}
-export interface IRequirement {
-    templateId: string;
-    count: number;
-    isFunctional: boolean;
-    type: string;
-}
-export interface IEndProducts {
-    Common: MinMax;
-    Rare: MinMax;
-    Superrare: MinMax;
-}

TypeScript/16ImporterUtil/types/models/spt/callbacks/IDataCallbacks.d.ts

@@ -1,23 +0,0 @@
-import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
-import { IGlobals } from "@spt/models/eft/common/IGlobals";
-import { IHideoutArea } from "@spt/models/eft/hideout/IHideoutArea";
-import { IHideoutProduction } from "@spt/models/eft/hideout/IHideoutProduction";
-import { IHideoutScavCase } from "@spt/models/eft/hideout/IHideoutScavCase";
-import { IHideoutSettingsBase } from "@spt/models/eft/hideout/IHideoutSettingsBase";
-import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
-import { ISettingsBase } from "@spt/models/spt/server/ISettingsBase";
-export interface IDataCallbacks {
-    getSettings(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<ISettingsBase>;
-    getGlobals(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IGlobals>;
-    getTemplateItems(url: string, info: IEmptyRequestData, sessionID: string): string;
-    getTemplateHandbook(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<any>;
-    getTemplateSuits(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<any>;
-    getTemplateCharacter(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<string[]>;
-    getHideoutSettings(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutSettingsBase>;
-    getHideoutAreas(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutArea[]>;
-    gethideoutProduction(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutProduction[]>;
-    getHideoutScavcase(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutScavCase[]>;
-    getLocalesLanguages(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<Record<string, string>>;
-    getLocalesMenu(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<any>;
-    getLocalesGlobal(url: string, info: IEmptyRequestData, sessionID: string): string;
-}

TypeScript/16ImporterUtil/types/models/spt/config/ICoreConfig.d.ts

@@ -57,6 +57,8 @@ export interface IGameFixes {
     fixShotgunDispersion: boolean;
     /** Remove items added by mods when the mod no longer exists - can fix dead profiles stuck at game load */
     removeModItemsFromProfile: boolean;
+    /** Remove invalid traders from profile - trader data can be leftover when player removes trader mod */
+    removeInvalidTradersFromProfile: boolean;
     /** Fix issues that cause the game to not start due to inventory item issues */
     fixProfileBreakingInventoryItemIssues: boolean;
 }

TypeScript/16ImporterUtil/types/models/spt/hideout/IHideout.d.ts

@@ -1,12 +1,10 @@
 import { IHideoutArea } from "@spt/models/eft/hideout/IHideoutArea";
 import { IHideoutProductionData } from "@spt/models/eft/hideout/IHideoutProduction";
-import { IHideoutScavCase } from "@spt/models/eft/hideout/IHideoutScavCase";
 import { IHideoutSettingsBase } from "@spt/models/eft/hideout/IHideoutSettingsBase";
 import { IQteData } from "@spt/models/eft/hideout/IQteData";
 export interface IHideout {
     areas: IHideoutArea[];
     production: IHideoutProductionData;
-    scavcase: IHideoutScavCase[];
     settings: IHideoutSettingsBase;
     qte: IQteData[];
 }

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

@@ -120,4 +120,5 @@ export declare class ProfileFixerService {
      * @returns matching bonus
      */
     protected getBonusFromProfile(profileBonuses: IBonus[], bonus: IStageBonus): IBonus | undefined;
+    checkForAndRemoveInvalidTraders(fullProfile: ISptProfile): void;
 }

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

@@ -138,6 +138,12 @@ export declare class SeasonalEventService {
      */
     protected enableHalloweenSummonEvent(): void;
     protected configureZombies(zombieSettings: IZombieSettings): void;
+    /**
+     * BSG store the location ids differently inside `LocationInfection`, need to convert to matching location IDs
+     * @param infectedLocationKey Key to convert
+     * @returns Array of locations
+     */
+    protected getLocationFromInfectedLocation(infectedLocationKey: string): string[];
     protected addEventWavesToMaps(eventType: string): void;
     /**
      * Add event bosses to maps

TypeScript/17AsyncImporterWithDependency1/types/callbacks/DataCallbacks.d.ts

@@ -8,7 +8,6 @@ import { IHandbookBase } from "@spt/models/eft/common/tables/IHandbookBase";
 import { IGetItemPricesResponse } from "@spt/models/eft/game/IGetItemPricesResponse";
 import { IHideoutArea } from "@spt/models/eft/hideout/IHideoutArea";
 import { IHideoutProductionData } from "@spt/models/eft/hideout/IHideoutProduction";
-import { IHideoutScavCase } from "@spt/models/eft/hideout/IHideoutScavCase";
 import { IHideoutSettingsBase } from "@spt/models/eft/hideout/IHideoutSettingsBase";
 import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
 import { ISettingsBase } from "@spt/models/spt/server/ISettingsBase";
@@ -63,7 +62,6 @@ export declare class DataCallbacks {
     getHideoutSettings(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutSettingsBase>;
     getHideoutAreas(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutArea[]>;
     getHideoutProduction(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutProductionData>;
-    getHideoutScavcase(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutScavCase[]>;
     /**
      * Handle client/languages
      */

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

@@ -18,11 +18,6 @@ export declare class WeatherController {
     constructor(weatherGenerator: WeatherGenerator, logger: ILogger, configServer: ConfigServer, seasonalEventService: SeasonalEventService, raidWeatherService: RaidWeatherService, weatherHelper: WeatherHelper);
     /** Handle client/weather */
     generate(): IWeatherData;
-    /**
-     * Get the current in-raid time (MUST HAVE PLAYER LOGGED INTO CLIENT TO WORK)
-     * @returns Date object
-     */
-    getCurrentInRaidTime(): Date;
     /** Handle client/localGame/weather */
     generateLocal(sesssionId: string): IGetLocalWeatherResponseData;
 }

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

@@ -2,7 +2,7 @@ import { ItemHelper } from "@spt/helpers/ItemHelper";
 import { PresetHelper } from "@spt/helpers/PresetHelper";
 import { IItem } from "@spt/models/eft/common/tables/IItem";
 import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
-import { IHideoutScavCase } from "@spt/models/eft/hideout/IHideoutScavCase";
+import { IScavRecipe } from "@spt/models/eft/hideout/IHideoutProduction";
 import { IScavCaseConfig } from "@spt/models/spt/config/IScavCaseConfig";
 import { IRewardCountAndPriceDetails, IScavCaseRewardCountsAndPrices } from "@spt/models/spt/hideout/ScavCaseRewardCountsAndPrices";
 import { ILogger } from "@spt/models/spt/utils/ILogger";
@@ -84,10 +84,10 @@ export declare class ScavCaseRewardGenerator {
     protected getFilteredItemsByPrice(dbItems: ITemplateItem[], itemFilters: IRewardCountAndPriceDetails): ITemplateItem[];
     /**
      * Gathers the reward min and max count params for each reward quality level from config and scavcase.json into a single object
-     * @param scavCaseDetails scavcase.json values
+     * @param scavCaseDetails production.json/scavRecipes object
      * @returns ScavCaseRewardCountsAndPrices object
      */
-    protected getScavCaseRewardCountsAndPrices(scavCaseDetails: IHideoutScavCase): IScavCaseRewardCountsAndPrices;
+    protected getScavCaseRewardCountsAndPrices(scavCaseDetails: IScavRecipe): IScavCaseRewardCountsAndPrices;
     /**
      * Randomises the size of ammo and money stacks
      * @param itemToCalculate ammo or money item

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

@@ -113,12 +113,12 @@ export declare class QuestHelper {
      */
     protected generateArmorRewardChildSlots(originalRewardRootItem: IItem, questReward: IQuestReward): void;
     /**
-     * Gets a flat list of reward items for the given quest at a specific state (e.g. Fail/Success)
+     * Gets a flat list of reward items for the given quest at a specific state for the specified game version (e.g. Fail/Success)
      * @param quest quest to get rewards for
      * @param status Quest status that holds the items (Started, Success, Fail)
      * @returns array of items with the correct maxStack
      */
-    getQuestRewardItems(quest: IQuest, status: QuestStatus): IItem[];
+    getQuestRewardItems(quest: IQuest, status: QuestStatus, gameVersion: string): IItem[];
     /**
      * Look up quest in db by accepted quest id and construct a profile-ready object ready to store in profile
      * @param pmcData Player profile
@@ -321,6 +321,15 @@ export declare class QuestHelper {
      * @returns array of IQuest
      */
     getClientQuests(sessionID: string): IQuest[];
+    /**
+     * Create a clone of the given quest array with the rewards updated to reflect the
+     * given game version
+     *
+     * @param quests The list of quests to check
+     * @param gameVersion The game version of the profile
+     * @returns array of IQuest objects with the rewards filtered correctly for the game version
+     */
+    protected updateQuestsForGameEdition(quests: IQuest[], gameVersion: string): IQuest[];
     /**
      * Return a list of quests that would fail when supplied quest is completed
      * @param completedQuestId quest completed id

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

@@ -10,7 +10,7 @@ export declare class WeatherHelper {
     protected weatherConfig: IWeatherConfig;
     constructor(logger: ILogger, timeUtil: TimeUtil, configServer: ConfigServer);
     /**
-     * Get the current in-raid time
+     * Get the current in-raid time - does not include an accurate date, only time
      * @param currentDate (new Date())
      * @returns Date object of current in-raid time
      */

TypeScript/17AsyncImporterWithDependency1/types/models/eft/hideout/IHideoutScavCase.d.ts

@@ -1,18 +0,0 @@
-import { MinMax } from "@spt/models/common/MinMax";
-export interface IHideoutScavCase {
-    _id: string;
-    ProductionTime: number;
-    Requirements: IRequirement[];
-    EndProducts: IEndProducts;
-}
-export interface IRequirement {
-    templateId: string;
-    count: number;
-    isFunctional: boolean;
-    type: string;
-}
-export interface IEndProducts {
-    Common: MinMax;
-    Rare: MinMax;
-    Superrare: MinMax;
-}

TypeScript/17AsyncImporterWithDependency1/types/models/spt/callbacks/IDataCallbacks.d.ts

@@ -1,23 +0,0 @@
-import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
-import { IGlobals } from "@spt/models/eft/common/IGlobals";
-import { IHideoutArea } from "@spt/models/eft/hideout/IHideoutArea";
-import { IHideoutProduction } from "@spt/models/eft/hideout/IHideoutProduction";
-import { IHideoutScavCase } from "@spt/models/eft/hideout/IHideoutScavCase";
-import { IHideoutSettingsBase } from "@spt/models/eft/hideout/IHideoutSettingsBase";
-import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
-import { ISettingsBase } from "@spt/models/spt/server/ISettingsBase";
-export interface IDataCallbacks {
-    getSettings(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<ISettingsBase>;
-    getGlobals(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IGlobals>;
-    getTemplateItems(url: string, info: IEmptyRequestData, sessionID: string): string;
-    getTemplateHandbook(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<any>;
-    getTemplateSuits(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<any>;
-    getTemplateCharacter(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<string[]>;
-    getHideoutSettings(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutSettingsBase>;
-    getHideoutAreas(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutArea[]>;
-    gethideoutProduction(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutProduction[]>;
-    getHideoutScavcase(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutScavCase[]>;
-    getLocalesLanguages(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<Record<string, string>>;
-    getLocalesMenu(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<any>;
-    getLocalesGlobal(url: string, info: IEmptyRequestData, sessionID: string): string;
-}

TypeScript/17AsyncImporterWithDependency1/types/models/spt/config/ICoreConfig.d.ts

@@ -57,6 +57,8 @@ export interface IGameFixes {
     fixShotgunDispersion: boolean;
     /** Remove items added by mods when the mod no longer exists - can fix dead profiles stuck at game load */
     removeModItemsFromProfile: boolean;
+    /** Remove invalid traders from profile - trader data can be leftover when player removes trader mod */
+    removeInvalidTradersFromProfile: boolean;
     /** Fix issues that cause the game to not start due to inventory item issues */
     fixProfileBreakingInventoryItemIssues: boolean;
 }

TypeScript/17AsyncImporterWithDependency1/types/models/spt/hideout/IHideout.d.ts

@@ -1,12 +1,10 @@
 import { IHideoutArea } from "@spt/models/eft/hideout/IHideoutArea";
 import { IHideoutProductionData } from "@spt/models/eft/hideout/IHideoutProduction";
-import { IHideoutScavCase } from "@spt/models/eft/hideout/IHideoutScavCase";
 import { IHideoutSettingsBase } from "@spt/models/eft/hideout/IHideoutSettingsBase";
 import { IQteData } from "@spt/models/eft/hideout/IQteData";
 export interface IHideout {
     areas: IHideoutArea[];
     production: IHideoutProductionData;
-    scavcase: IHideoutScavCase[];
     settings: IHideoutSettingsBase;
     qte: IQteData[];
 }

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

@@ -120,4 +120,5 @@ export declare class ProfileFixerService {
      * @returns matching bonus
      */
     protected getBonusFromProfile(profileBonuses: IBonus[], bonus: IStageBonus): IBonus | undefined;
+    checkForAndRemoveInvalidTraders(fullProfile: ISptProfile): void;
 }

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

@@ -138,6 +138,12 @@ export declare class SeasonalEventService {
      */
     protected enableHalloweenSummonEvent(): void;
     protected configureZombies(zombieSettings: IZombieSettings): void;
+    /**
+     * BSG store the location ids differently inside `LocationInfection`, need to convert to matching location IDs
+     * @param infectedLocationKey Key to convert
+     * @returns Array of locations
+     */
+    protected getLocationFromInfectedLocation(infectedLocationKey: string): string[];
     protected addEventWavesToMaps(eventType: string): void;
     /**
      * Add event bosses to maps

TypeScript/17AsyncImporterWithDependency2/types/callbacks/DataCallbacks.d.ts

@@ -8,7 +8,6 @@ import { IHandbookBase } from "@spt/models/eft/common/tables/IHandbookBase";
 import { IGetItemPricesResponse } from "@spt/models/eft/game/IGetItemPricesResponse";
 import { IHideoutArea } from "@spt/models/eft/hideout/IHideoutArea";
 import { IHideoutProductionData } from "@spt/models/eft/hideout/IHideoutProduction";
-import { IHideoutScavCase } from "@spt/models/eft/hideout/IHideoutScavCase";
 import { IHideoutSettingsBase } from "@spt/models/eft/hideout/IHideoutSettingsBase";
 import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
 import { ISettingsBase } from "@spt/models/spt/server/ISettingsBase";
@@ -63,7 +62,6 @@ export declare class DataCallbacks {
     getHideoutSettings(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutSettingsBase>;
     getHideoutAreas(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutArea[]>;
     getHideoutProduction(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutProductionData>;
-    getHideoutScavcase(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutScavCase[]>;
     /**
      * Handle client/languages
      */