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

@@ -85,7 +85,6 @@ export declare class HideoutController {
      */
     protected checkAndUpgradeWall(pmcData: IPmcData): void;
     /**
-     *
      * @param pmcData Profile to edit
      * @param output Object to send back to client
      * @param sessionID Session/player id
@@ -102,7 +101,6 @@ export declare class HideoutController {
      */
     protected addUpdateInventoryItemToProfile(pmcData: IPmcData, dbHideoutData: IHideoutArea, hideoutStage: Stage): void;
     /**
-     *
      * @param output Objet to send to client
      * @param sessionID Session/player id
      * @param areaType Hideout area that had stash added

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

@@ -36,6 +36,7 @@ export declare class InsuranceController {
     protected mailSendService: MailSendService;
     protected configServer: ConfigServer;
     protected insuranceConfig: IInsuranceConfig;
+    protected roubleTpl: string;
     constructor(logger: ILogger, randomUtil: RandomUtil, eventOutputHolder: EventOutputHolder, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileHelper: ProfileHelper, dialogueHelper: DialogueHelper, traderHelper: TraderHelper, paymentService: PaymentService, insuranceService: InsuranceService, mailSendService: MailSendService, configServer: ConfigServer);
     /**
      * Process insurance items of all profiles prior to being given back to the player through the mail service.

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

@@ -8,12 +8,14 @@ import { Info, ModDetails } from "@spt-aki/models/eft/profile/IAkiProfile";
 import { IConnectResponse } from "@spt-aki/models/eft/profile/IConnectResponse";
 import { ICoreConfig } from "@spt-aki/models/spt/config/ICoreConfig";
 import { IPackageJsonData } from "@spt-aki/models/spt/mod/IPackageJsonData";
+import { ILogger } from "@spt-aki/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt-aki/servers/ConfigServer";
 import { DatabaseServer } from "@spt-aki/servers/DatabaseServer";
 import { SaveServer } from "@spt-aki/servers/SaveServer";
 import { LocalisationService } from "@spt-aki/services/LocalisationService";
 import { HashUtil } from "@spt-aki/utils/HashUtil";
 export declare class LauncherController {
+    protected logger: ILogger;
     protected hashUtil: HashUtil;
     protected saveServer: SaveServer;
     protected httpServerHelper: HttpServerHelper;
@@ -23,11 +25,11 @@ export declare class LauncherController {
     protected preAkiModLoader: PreAkiModLoader;
     protected configServer: ConfigServer;
     protected coreConfig: ICoreConfig;
-    constructor(hashUtil: HashUtil, saveServer: SaveServer, httpServerHelper: HttpServerHelper, profileHelper: ProfileHelper, databaseServer: DatabaseServer, localisationService: LocalisationService, preAkiModLoader: PreAkiModLoader, configServer: ConfigServer);
+    constructor(logger: ILogger, hashUtil: HashUtil, saveServer: SaveServer, httpServerHelper: HttpServerHelper, profileHelper: ProfileHelper, databaseServer: DatabaseServer, localisationService: LocalisationService, preAkiModLoader: PreAkiModLoader, configServer: ConfigServer);
     connect(): IConnectResponse;
     /**
-     * Get descriptive text for each of the profile edtions a player can choose
+     * Get descriptive text for each of the profile edtions a player can choose, keyed by profile.json profile type e.g. "Edge Of Darkness"
-     * @returns
+     * @returns Dictionary of profile types with related descriptive text
      */
     protected getProfileDescriptions(): Record<string, string>;
     find(sessionIdKey: string): Info;

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

@@ -78,6 +78,12 @@ export declare class MatchController {
      */
     protected extractWasViaCoop(extractName: string): boolean;
     protected sendCoopTakenFenceMessage(sessionId: string): void;
+    /**
+     * Handle when a player extracts using a coop extract - add rep to fence
+     * @param pmcData Profile
+     * @param extractName Name of extract taken
+     */
+    protected handleCoopExtract(pmcData: IPmcData, extractName: string): void;
     /**
      * Was extract by car
      * @param extractName name of extract
@@ -92,10 +98,11 @@ export declare class MatchController {
      */
     protected handleCarExtract(extractName: string, pmcData: IPmcData, sessionId: string): void;
     /**
-     * Update players fence trader standing value in profile
+     * Get the fence rep gain from using a car or coop extract
-     * @param pmcData Player profile
+     * @param pmcData Profile
-     * @param fenceId Id of fence trader
+     * @param baseGain amount gained for the first extract
-     * @param extractName Name of extract used
+     * @param extractCount Number of times extract was taken
+     * @returns Fence standing after taking extract
      */
-    protected updateFenceStandingInProfile(pmcData: IPmcData, fenceId: string, extractName: string): void;
+    protected getFenceStandingAfterExtract(pmcData: IPmcData, baseGain: number, extractCount: number): number;
 }

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

@@ -61,7 +61,6 @@ export declare class RepeatableQuestController {
      * (if the are on "Succeed" but not "Completed" we keep them, to allow the player to complete them and get the rewards)
      * The new quests generated are again persisted in profile.RepeatableQuests
      *
-     *
      * @param   {string}    sessionId       Player's session id
      * @returns  {array}                    array of "repeatableQuestObjects" as descibed above
      */

TypeScript/10ScopesAndTypes/types/di/Router.d.ts

@@ -21,11 +21,9 @@ export declare class DynamicRouter extends Router {
     getHandledRoutes(): HandledRoute[];
 }
 export declare class ItemEventRouterDefinition extends Router {
-    constructor();
     handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse;
 }
 export declare class SaveLoadRouter extends Router {
-    constructor();
     handleLoad(profile: IAkiProfile): IAkiProfile;
 }
 export declare class HandledRoute {

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

@@ -104,7 +104,6 @@ export declare class BotEquipmentModGenerator {
      */
     protected shouldModBeSpawned(itemSlot: Slot, modSlot: string, modSpawnChances: ModsChances): boolean;
     /**
-     *
      * @param modSlot Slot mod will fit into
      * @param isRandomisableSlot Will generate a randomised mod pool if true
      * @param modsParent Parent slot the item will be a part of
@@ -116,6 +115,13 @@ export declare class BotEquipmentModGenerator {
      * @returns ITemplateItem
      */
     protected chooseModToPutIntoSlot(modSlot: string, isRandomisableSlot: boolean, botWeaponSightWhitelist: Record<string, string[]>, botEquipBlacklist: EquipmentFilterDetails, itemModPool: Record<string, string[]>, weapon: Item[], ammoTpl: string, parentTemplate: ITemplateItem): [boolean, ITemplateItem];
+    /**
+     * Temp fix to prevent certain combinations of weapons with mods that are known to be incompatible
+     * @param weapon Weapon
+     * @param modTpl Mod to check compatibility with weapon
+     * @returns True if incompatible
+     */
+    protected weaponModComboIsIncompatible(weapon: Item[], modTpl: string): boolean;
     /**
      * Create a mod item with parameters as properties
      * @param modId _id

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

@@ -4,7 +4,7 @@ import { BotDifficultyHelper } from "@spt-aki/helpers/BotDifficultyHelper";
 import { BotHelper } from "@spt-aki/helpers/BotHelper";
 import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper";
 import { WeightedRandomHelper } from "@spt-aki/helpers/WeightedRandomHelper";
-import { IBaseJsonSkills, IBaseSkill, IBotBase, Info, Health as PmcHealth, Skills as botSkills } from "@spt-aki/models/eft/common/tables/IBotBase";
+import { Health as PmcHealth, IBaseJsonSkills, IBaseSkill, IBotBase, Info, Skills as botSkills } from "@spt-aki/models/eft/common/tables/IBotBase";
 import { Appearance, Health, IBotType } from "@spt-aki/models/eft/common/tables/IBotType";
 import { BotGenerationDetails } from "@spt-aki/models/spt/bots/BotGenerationDetails";
 import { IBotConfig } from "@spt-aki/models/spt/config/IBotConfig";

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

@@ -121,7 +121,6 @@ export declare class RagfairOfferGenerator {
      */
     generateDynamicOffers(expiredOffers?: Item[]): Promise<void>;
     /**
-     *
      * @param assortItemIndex Index of assort item
      * @param assortItemsToProcess Item array containing index
      * @param expiredOffers Currently expired offers on flea

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

@@ -6,6 +6,7 @@ import { RagfairServerHelper } from "@spt-aki/helpers/RagfairServerHelper";
 import { RepeatableQuestHelper } from "@spt-aki/helpers/RepeatableQuestHelper";
 import { Exit } from "@spt-aki/models/eft/common/ILocationBase";
 import { TraderInfo } from "@spt-aki/models/eft/common/tables/IBotBase";
+import { Item } from "@spt-aki/models/eft/common/tables/IItem";
 import { ICompletion, ICompletionAvailableFor, IElimination, IEliminationCondition, IExploration, IExplorationCondition, IPickup, IRepeatableQuest, IReward, IRewards } from "@spt-aki/models/eft/common/tables/IRepeatableQuests";
 import { ITemplateItem } from "@spt-aki/models/eft/common/tables/ITemplateItem";
 import { IBaseQuestConfig, IBossInfo, IEliminationConfig, IQuestConfig, IRepeatableQuestConfig } from "@spt-aki/models/spt/config/IQuestConfig";
@@ -105,11 +106,11 @@ export declare class RepeatableQuestGenerator {
      * A repeatable quest, besides some more or less static components, exists of reward and condition (see assets/database/templates/repeatableQuests.json)
      * This is a helper method for GenerateCompletionQuest to create a completion condition (of which a completion quest theoretically can have many)
      *
-     * @param   {string}    targetItemId    id of the item to request
+     * @param   {string}    itemTpl    id of the item to request
      * @param   {integer}   value           amount of items of this specific type to request
      * @returns {object}                    object of "Completion"-condition
      */
-    protected generateCompletionAvailableForFinish(targetItemId: string, value: number): ICompletionAvailableFor;
+    protected generateCompletionAvailableForFinish(itemTpl: string, value: number): ICompletionAvailableFor;
     /**
      * Generates a valid Exploration quest
      *
@@ -156,13 +157,26 @@ export declare class RepeatableQuestGenerator {
      * @returns {object}                        object of "Reward"-type that can be given for a repeatable mission
      */
     protected generateReward(pmcLevel: number, difficulty: number, traderId: string, repeatableConfig: IRepeatableQuestConfig, questConfig: IBaseQuestConfig): IRewards;
+    /**
+     * Should reward item have stack size increased (25% chance)
+     * @param item Item to possibly increase stack size of
+     * @param maxRoublePriceToStack Maximum rouble price an item can be to still be chosen for stacking
+     * @returns True if it should
+     */
+    protected canIncreaseRewardItemStackSize(item: ITemplateItem, maxRoublePriceToStack: number): boolean;
+    /**
+     * Get a randomised number a reward items stack size should be based on its handbook price
+     * @param item Reward item to get stack size for
+     * @returns Stack size value
+     */
+    protected getRandomisedRewardItemStackSizeByPrice(item: ITemplateItem): number;
     /**
      * Select a number of items that have a colelctive value of the passed in parameter
      * @param repeatableConfig Config
      * @param roublesBudget Total value of items to return
      * @returns Array of reward items that fit budget
      */
-    protected chooseRewardItemsWithinBudget(repeatableConfig: IRepeatableQuestConfig, roublesBudget: number): ITemplateItem[];
+    protected chooseRewardItemsWithinBudget(repeatableConfig: IRepeatableQuestConfig, roublesBudget: number, traderId: string): ITemplateItem[];
     /**
      * Helper to create a reward item structured as required by the client
      *
@@ -171,20 +185,20 @@ export declare class RepeatableQuestGenerator {
      * @param   {integer}   index           All rewards will be appended to a list, for unknown reasons the client wants the index
      * @returns {object}                    Object of "Reward"-item-type
      */
-    protected generateRewardItem(tpl: string, value: number, index: number, preset?: any): IReward;
+    protected generateRewardItem(tpl: string, value: number, index: number, preset?: Item[]): IReward;
     /**
      * Picks rewardable items from items.json. This means they need to fit into the inventory and they shouldn't be keys (debatable)
      * @param repeatableQuestConfig Config file
      * @returns List of rewardable items [[_tpl, itemTemplate],...]
      */
-    protected getRewardableItems(repeatableQuestConfig: IRepeatableQuestConfig): [string, ITemplateItem][];
+    protected getRewardableItems(repeatableQuestConfig: IRepeatableQuestConfig, traderId: string): [string, ITemplateItem][];
     /**
      * Checks if an id is a valid item. Valid meaning that it's an item that may be a reward
      * or content of bot loot. Items that are tested as valid may be in a player backpack or stash.
      * @param {string} tpl template id of item to check
      * @returns True if item is valid reward
      */
-    protected isValidRewardItem(tpl: string, repeatableQuestConfig: IRepeatableQuestConfig): boolean;
+    protected isValidRewardItem(tpl: string, repeatableQuestConfig: IRepeatableQuestConfig, itemBaseWhitelist: string[]): boolean;
     /**
      * Generates the base object of quest type format given as templates in assets/database/templates/repeatableQuests.json
      * The templates include Elimination, Completion and Extraction quest types

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

@@ -84,7 +84,6 @@ export declare class ScavCaseRewardGenerator {
         upd: Upd;
     }, rarity: string): void;
     /**
-     *
      * @param dbItems all items from the items.json
      * @param itemFilters controls how the dbItems will be filtered and returned (handbook price)
      * @returns filtered dbItems array

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

@@ -30,7 +30,7 @@ export declare class BotGeneratorHelper {
      * @param botRole Used by weapons to randomize the durability values. Null for non-equipped items
      * @returns Item Upd object with extra properties
      */
-    generateExtraPropertiesForItem(itemTemplate: ITemplateItem, botRole?: string): {
+    generateExtraPropertiesForItem(itemTemplate: ITemplateItem, botRole?: any): {
         upd?: Upd;
     };
     /**

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

@@ -86,13 +86,6 @@ export declare class InRaidHelper {
      * @param tradersClientProfile Client
      */
     protected applyTraderStandingAdjustments(tradersServerProfile: Record<string, TraderInfo>, tradersClientProfile: Record<string, TraderInfo>): void;
-    /**
-     * Some maps have one-time-use keys (e.g. Labs
-     * Remove the relevant key from an inventory based on the post-raid request data passed in
-     * @param offraidData post-raid data
-     * @param sessionID Session id
-     */
-    protected removeMapAccessKey(offraidData: ISaveProgressRequestData, sessionID: string): void;
     /**
      * Set the SPT inraid location Profile property to 'none'
      * @param sessionID Session id

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

@@ -86,7 +86,6 @@ export declare class InventoryHelper {
      */
     protected hydrateAmmoBoxWithAmmo(pmcData: IPmcData, itemToAdd: IAddItemTempObject, parentId: string, sessionID: string, output: IItemEventRouterResponse, foundInRaid: boolean): void;
     /**
-     *
      * @param assortItems Items to add to inventory
      * @param requestItem Details of purchased item to add to inventory
      * @param result Array split stacks are added to

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

@@ -28,7 +28,8 @@ export interface IBotBase {
     RepeatableQuests: IPmcDataRepeatableQuest[];
     Bonuses: Bonus[];
     Notes: Notes;
-    CarExtractCounts: CarExtractCounts;
+    CarExtractCounts: Record<string, number>;
+    CoopExtractCounts: Record<string, number>;
     SurvivorClass: SurvivorClass;
     WishList: string[];
     /** SPT specific property used during bot generation in raid */
@@ -306,6 +307,8 @@ export interface Productive {
     /** Used when sending data to client */
     NeedFuelForAllProductionTime?: boolean;
     sptIsScavCase?: boolean;
+    /** Some crafts are always inProgress, but need to be reset, e.g. water collector */
+    sptIsComplete?: boolean;
 }
 export interface Production extends Productive {
     RecipeId: string;
@@ -346,8 +349,6 @@ export interface LastCompleted {
 export interface Notes {
     Notes: Note[];
 }
-export interface CarExtractCounts {
-}
 export declare enum SurvivorClass {
     UNKNOWN = 0,
     NEUTRALIZER = 1,

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

@@ -5,8 +5,12 @@ export interface IProfileTemplates {
     "Left Behind": IProfileSides;
     "Prepare To Escape": IProfileSides;
     "Edge Of Darkness": IProfileSides;
+    "SPT Developer": IProfileSides;
+    "SPT Easy start": IProfileSides;
+    "SPT Zero to hero": IProfileSides;
 }
 export interface IProfileSides {
+    descriptionLocaleKey: string;
     usec: TemplateSide;
     bear: TemplateSide;
 }

TypeScript/10ScopesAndTypes/types/models/eft/inventory/IInventoryUnbindRequestData.d.ts

@@ -1,6 +0,0 @@
-import { IInventoryBaseActionRequestData } from "@spt-aki/models/eft/inventory/IInventoryBaseActionRequestData";
-export interface IInventoryUnbindRequestData extends IInventoryBaseActionRequestData {
-    Action: "Unbind";
-    item: string;
-    index: number;
-}

TypeScript/10ScopesAndTypes/types/models/eft/trade/IProcessBuyTradeRequestData.d.ts

@@ -1,6 +1,6 @@
 import { IProcessBaseTradeRequestData } from "@spt-aki/models/eft/trade/IProcessBaseTradeRequestData";
 export interface IProcessBuyTradeRequestData extends IProcessBaseTradeRequestData {
-    Action: "buy_from_trader" | "TradingConfirm" | "RestoreHealth" | "";
+    Action: "buy_from_trader" | "TradingConfirm" | "RestoreHealth" | "" | "SptInsure" | "SptRepair";
     type: string;
     tid: string;
     item_id: string;
@@ -9,6 +9,7 @@ export interface IProcessBuyTradeRequestData extends IProcessBaseTradeRequestDat
     scheme_items: SchemeItem[];
 }
 export interface SchemeItem {
+    /** Id of stack to take money from, is money tpl when Action is `SptInsure` */
     id: string;
     count: number;
 }

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

@@ -10,8 +10,10 @@ export interface IInRaidConfig extends IBaseConfig {
     carExtracts: string[];
     /** Names of coop extracts */
     coopExtracts: string[];
-    /** Fene rep gain from a single car extract */
+    /** Fence rep gain from a single car extract */
     carExtractBaseStandingGain: number;
+    /** Fence rep gain from a single coop extract */
+    coopExtractBaseStandingGain: number;
     /** Fence rep gain when successfully extracting as pscav */
     scavExtractGain: number;
     /** On death should items in your secure keep their Find in raid status regardless of how you finished the raid */

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

@@ -61,6 +61,9 @@ export interface IRewardScaling {
 export interface ITraderWhitelist {
     traderId: string;
     questTypes: string[];
+    rewardBaseWhitelist: string[];
+    rewardCanBeWeapon: boolean;
+    weaponRewardChancePercent: number;
 }
 export interface IRepeatableQuestTypesConfig {
     Exploration: IExploration;
@@ -70,6 +73,7 @@ export interface IRepeatableQuestTypesConfig {
 }
 export interface IExploration extends IBaseQuestConfig {
     maxExtracts: number;
+    maxExtractsWithSpecificExit: number;
     specificExits: ISpecificExits;
 }
 export interface ISpecificExits {
@@ -79,6 +83,7 @@ export interface ISpecificExits {
 export interface ICompletion extends IBaseQuestConfig {
     minRequestedAmount: number;
     maxRequestedAmount: number;
+    uniqueItemCount: number;
     minRequestedBulletAmount: number;
     maxRequestedBulletAmount: number;
     useWhitelist: boolean;

TypeScript/10ScopesAndTypes/types/routers/EventOutputHolder.d.ts

@@ -44,4 +44,9 @@ export declare class EventOutputHolder {
      * @returns dictionary of hideout productions
      */
     protected getProductionsFromProfileAndFlagComplete(productions: Record<string, Productive>): Record<string, Productive>;
+    /**
+     * Required as continuous productions don't reset and stay at 100% completion but client thinks it hasn't started
+     * @param productions Productions in a profile
+     */
+    protected resetSptIsCompleteFlaggedCrafts(productions: Record<string, Productive>): void;
 }

TypeScript/10ScopesAndTypes/types/routers/ItemEventRouter.d.ts

@@ -13,7 +13,6 @@ export declare class ItemEventRouter {
     protected eventOutputHolder: EventOutputHolder;
     constructor(logger: ILogger, profileHelper: ProfileHelper, itemEventRouters: ItemEventRouterDefinition[], localisationService: LocalisationService, eventOutputHolder: EventOutputHolder);
     /**
-     *
      * @param info Event request
      * @param sessionID Session id
      * @returns Item response

TypeScript/10ScopesAndTypes/types/routers/save_load/HealthSaveLoadRouter.d.ts

@@ -1,7 +1,6 @@
 import { HandledRoute, SaveLoadRouter } from "@spt-aki/di/Router";
 import { IAkiProfile } from "@spt-aki/models/eft/profile/IAkiProfile";
 export declare class HealthSaveLoadRouter extends SaveLoadRouter {
-    constructor();
     getHandledRoutes(): HandledRoute[];
     handleLoad(profile: IAkiProfile): IAkiProfile;
 }

TypeScript/10ScopesAndTypes/types/routers/save_load/InraidSaveLoadRouter.d.ts

@@ -1,7 +1,6 @@
 import { HandledRoute, SaveLoadRouter } from "@spt-aki/di/Router";
 import { IAkiProfile } from "@spt-aki/models/eft/profile/IAkiProfile";
 export declare class InraidSaveLoadRouter extends SaveLoadRouter {
-    constructor();
     getHandledRoutes(): HandledRoute[];
     handleLoad(profile: IAkiProfile): IAkiProfile;
 }

TypeScript/10ScopesAndTypes/types/routers/save_load/InsuranceSaveLoadRouter.d.ts

@@ -1,7 +1,6 @@
 import { HandledRoute, SaveLoadRouter } from "@spt-aki/di/Router";
 import { IAkiProfile } from "@spt-aki/models/eft/profile/IAkiProfile";
 export declare class InsuranceSaveLoadRouter extends SaveLoadRouter {
-    constructor();
     getHandledRoutes(): HandledRoute[];
     handleLoad(profile: IAkiProfile): IAkiProfile;
 }

TypeScript/10ScopesAndTypes/types/routers/save_load/ProfileSaveLoadRouter.d.ts

@@ -1,7 +1,6 @@
 import { HandledRoute, SaveLoadRouter } from "@spt-aki/di/Router";
 import { IAkiProfile } from "@spt-aki/models/eft/profile/IAkiProfile";
 export declare class ProfileSaveLoadRouter extends SaveLoadRouter {
-    constructor();
     getHandledRoutes(): HandledRoute[];
     handleLoad(profile: IAkiProfile): IAkiProfile;
 }

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

@@ -55,7 +55,7 @@ export declare class PaymentService {
      */
     protected isItemInStash(pmcData: IPmcData, item: Item): boolean;
     /**
-     * Remove currency from player stash/inventory
+     * Remove currency from player stash/inventory and update client object with changes
      * @param pmcData Player profile to find and remove currency from
      * @param currencyTpl Type of currency to pay
      * @param amountToPay money value to pay

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

@@ -104,7 +104,6 @@ export declare class ProfileFixerService {
      */
     addMissingHideoutBonusesToProfile(pmcProfile: IPmcData): void;
     /**
-     *
      * @param profileBonuses bonuses from profile
      * @param bonus bonus to find
      * @returns matching bonus

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

@@ -41,7 +41,6 @@ export declare class RepairService {
      */
     repairItemByTrader(sessionID: string, pmcData: IPmcData, repairItemDetails: RepairItem, traderId: string): RepairDetails;
     /**
-     *
      * @param sessionID Session id
      * @param pmcData profile to take money from
      * @param repairedItemId Repaired item id
@@ -64,7 +63,6 @@ export declare class RepairService {
      */
     protected getWeaponRepairSkillPoints(repairDetails: RepairDetails): number;
     /**
-     *
      * @param sessionId Session id
      * @param pmcData Profile to update repaired item in
      * @param repairKits Array of Repair kits to use

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

@@ -85,7 +85,6 @@ export declare class HideoutController {
      */
     protected checkAndUpgradeWall(pmcData: IPmcData): void;
     /**
-     *
      * @param pmcData Profile to edit
      * @param output Object to send back to client
      * @param sessionID Session/player id
@@ -102,7 +101,6 @@ export declare class HideoutController {
      */
     protected addUpdateInventoryItemToProfile(pmcData: IPmcData, dbHideoutData: IHideoutArea, hideoutStage: Stage): void;
     /**
-     *
      * @param output Objet to send to client
      * @param sessionID Session/player id
      * @param areaType Hideout area that had stash added

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

@@ -36,6 +36,7 @@ export declare class InsuranceController {
     protected mailSendService: MailSendService;
     protected configServer: ConfigServer;
     protected insuranceConfig: IInsuranceConfig;
+    protected roubleTpl: string;
     constructor(logger: ILogger, randomUtil: RandomUtil, eventOutputHolder: EventOutputHolder, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileHelper: ProfileHelper, dialogueHelper: DialogueHelper, traderHelper: TraderHelper, paymentService: PaymentService, insuranceService: InsuranceService, mailSendService: MailSendService, configServer: ConfigServer);
     /**
      * Process insurance items of all profiles prior to being given back to the player through the mail service.

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

@@ -8,12 +8,14 @@ import { Info, ModDetails } from "@spt-aki/models/eft/profile/IAkiProfile";
 import { IConnectResponse } from "@spt-aki/models/eft/profile/IConnectResponse";
 import { ICoreConfig } from "@spt-aki/models/spt/config/ICoreConfig";
 import { IPackageJsonData } from "@spt-aki/models/spt/mod/IPackageJsonData";
+import { ILogger } from "@spt-aki/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt-aki/servers/ConfigServer";
 import { DatabaseServer } from "@spt-aki/servers/DatabaseServer";
 import { SaveServer } from "@spt-aki/servers/SaveServer";
 import { LocalisationService } from "@spt-aki/services/LocalisationService";
 import { HashUtil } from "@spt-aki/utils/HashUtil";
 export declare class LauncherController {
+    protected logger: ILogger;
     protected hashUtil: HashUtil;
     protected saveServer: SaveServer;
     protected httpServerHelper: HttpServerHelper;
@@ -23,11 +25,11 @@ export declare class LauncherController {
     protected preAkiModLoader: PreAkiModLoader;
     protected configServer: ConfigServer;
     protected coreConfig: ICoreConfig;
-    constructor(hashUtil: HashUtil, saveServer: SaveServer, httpServerHelper: HttpServerHelper, profileHelper: ProfileHelper, databaseServer: DatabaseServer, localisationService: LocalisationService, preAkiModLoader: PreAkiModLoader, configServer: ConfigServer);
+    constructor(logger: ILogger, hashUtil: HashUtil, saveServer: SaveServer, httpServerHelper: HttpServerHelper, profileHelper: ProfileHelper, databaseServer: DatabaseServer, localisationService: LocalisationService, preAkiModLoader: PreAkiModLoader, configServer: ConfigServer);
     connect(): IConnectResponse;
     /**
-     * Get descriptive text for each of the profile edtions a player can choose
+     * Get descriptive text for each of the profile edtions a player can choose, keyed by profile.json profile type e.g. "Edge Of Darkness"
-     * @returns
+     * @returns Dictionary of profile types with related descriptive text
      */
     protected getProfileDescriptions(): Record<string, string>;
     find(sessionIdKey: string): Info;

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

@@ -78,6 +78,12 @@ export declare class MatchController {
      */
     protected extractWasViaCoop(extractName: string): boolean;
     protected sendCoopTakenFenceMessage(sessionId: string): void;
+    /**
+     * Handle when a player extracts using a coop extract - add rep to fence
+     * @param pmcData Profile
+     * @param extractName Name of extract taken
+     */
+    protected handleCoopExtract(pmcData: IPmcData, extractName: string): void;
     /**
      * Was extract by car
      * @param extractName name of extract
@@ -92,10 +98,11 @@ export declare class MatchController {
      */
     protected handleCarExtract(extractName: string, pmcData: IPmcData, sessionId: string): void;
     /**
-     * Update players fence trader standing value in profile
+     * Get the fence rep gain from using a car or coop extract
-     * @param pmcData Player profile
+     * @param pmcData Profile
-     * @param fenceId Id of fence trader
+     * @param baseGain amount gained for the first extract
-     * @param extractName Name of extract used
+     * @param extractCount Number of times extract was taken
+     * @returns Fence standing after taking extract
      */
-    protected updateFenceStandingInProfile(pmcData: IPmcData, fenceId: string, extractName: string): void;
+    protected getFenceStandingAfterExtract(pmcData: IPmcData, baseGain: number, extractCount: number): number;
 }

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

@@ -61,7 +61,6 @@ export declare class RepeatableQuestController {
      * (if the are on "Succeed" but not "Completed" we keep them, to allow the player to complete them and get the rewards)
      * The new quests generated are again persisted in profile.RepeatableQuests
      *
-     *
      * @param   {string}    sessionId       Player's session id
      * @returns  {array}                    array of "repeatableQuestObjects" as descibed above
      */

TypeScript/11BundleLoadingSample/types/di/Router.d.ts

@@ -21,11 +21,9 @@ export declare class DynamicRouter extends Router {
     getHandledRoutes(): HandledRoute[];
 }
 export declare class ItemEventRouterDefinition extends Router {
-    constructor();
     handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse;
 }
 export declare class SaveLoadRouter extends Router {
-    constructor();
     handleLoad(profile: IAkiProfile): IAkiProfile;
 }
 export declare class HandledRoute {

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

@@ -104,7 +104,6 @@ export declare class BotEquipmentModGenerator {
      */
     protected shouldModBeSpawned(itemSlot: Slot, modSlot: string, modSpawnChances: ModsChances): boolean;
     /**
-     *
      * @param modSlot Slot mod will fit into
      * @param isRandomisableSlot Will generate a randomised mod pool if true
      * @param modsParent Parent slot the item will be a part of
@@ -116,6 +115,13 @@ export declare class BotEquipmentModGenerator {
      * @returns ITemplateItem
      */
     protected chooseModToPutIntoSlot(modSlot: string, isRandomisableSlot: boolean, botWeaponSightWhitelist: Record<string, string[]>, botEquipBlacklist: EquipmentFilterDetails, itemModPool: Record<string, string[]>, weapon: Item[], ammoTpl: string, parentTemplate: ITemplateItem): [boolean, ITemplateItem];
+    /**
+     * Temp fix to prevent certain combinations of weapons with mods that are known to be incompatible
+     * @param weapon Weapon
+     * @param modTpl Mod to check compatibility with weapon
+     * @returns True if incompatible
+     */
+    protected weaponModComboIsIncompatible(weapon: Item[], modTpl: string): boolean;
     /**
      * Create a mod item with parameters as properties
      * @param modId _id

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

@@ -4,7 +4,7 @@ import { BotDifficultyHelper } from "@spt-aki/helpers/BotDifficultyHelper";
 import { BotHelper } from "@spt-aki/helpers/BotHelper";
 import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper";
 import { WeightedRandomHelper } from "@spt-aki/helpers/WeightedRandomHelper";
-import { IBaseJsonSkills, IBaseSkill, IBotBase, Info, Health as PmcHealth, Skills as botSkills } from "@spt-aki/models/eft/common/tables/IBotBase";
+import { Health as PmcHealth, IBaseJsonSkills, IBaseSkill, IBotBase, Info, Skills as botSkills } from "@spt-aki/models/eft/common/tables/IBotBase";
 import { Appearance, Health, IBotType } from "@spt-aki/models/eft/common/tables/IBotType";
 import { BotGenerationDetails } from "@spt-aki/models/spt/bots/BotGenerationDetails";
 import { IBotConfig } from "@spt-aki/models/spt/config/IBotConfig";

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

@@ -121,7 +121,6 @@ export declare class RagfairOfferGenerator {
      */
     generateDynamicOffers(expiredOffers?: Item[]): Promise<void>;
     /**
-     *
      * @param assortItemIndex Index of assort item
      * @param assortItemsToProcess Item array containing index
      * @param expiredOffers Currently expired offers on flea

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

@@ -6,6 +6,7 @@ import { RagfairServerHelper } from "@spt-aki/helpers/RagfairServerHelper";
 import { RepeatableQuestHelper } from "@spt-aki/helpers/RepeatableQuestHelper";
 import { Exit } from "@spt-aki/models/eft/common/ILocationBase";
 import { TraderInfo } from "@spt-aki/models/eft/common/tables/IBotBase";
+import { Item } from "@spt-aki/models/eft/common/tables/IItem";
 import { ICompletion, ICompletionAvailableFor, IElimination, IEliminationCondition, IExploration, IExplorationCondition, IPickup, IRepeatableQuest, IReward, IRewards } from "@spt-aki/models/eft/common/tables/IRepeatableQuests";
 import { ITemplateItem } from "@spt-aki/models/eft/common/tables/ITemplateItem";
 import { IBaseQuestConfig, IBossInfo, IEliminationConfig, IQuestConfig, IRepeatableQuestConfig } from "@spt-aki/models/spt/config/IQuestConfig";
@@ -105,11 +106,11 @@ export declare class RepeatableQuestGenerator {
      * A repeatable quest, besides some more or less static components, exists of reward and condition (see assets/database/templates/repeatableQuests.json)
      * This is a helper method for GenerateCompletionQuest to create a completion condition (of which a completion quest theoretically can have many)
      *
-     * @param   {string}    targetItemId    id of the item to request
+     * @param   {string}    itemTpl    id of the item to request
      * @param   {integer}   value           amount of items of this specific type to request
      * @returns {object}                    object of "Completion"-condition
      */
-    protected generateCompletionAvailableForFinish(targetItemId: string, value: number): ICompletionAvailableFor;
+    protected generateCompletionAvailableForFinish(itemTpl: string, value: number): ICompletionAvailableFor;
     /**
      * Generates a valid Exploration quest
      *
@@ -156,13 +157,26 @@ export declare class RepeatableQuestGenerator {
      * @returns {object}                        object of "Reward"-type that can be given for a repeatable mission
      */
     protected generateReward(pmcLevel: number, difficulty: number, traderId: string, repeatableConfig: IRepeatableQuestConfig, questConfig: IBaseQuestConfig): IRewards;
+    /**
+     * Should reward item have stack size increased (25% chance)
+     * @param item Item to possibly increase stack size of
+     * @param maxRoublePriceToStack Maximum rouble price an item can be to still be chosen for stacking
+     * @returns True if it should
+     */
+    protected canIncreaseRewardItemStackSize(item: ITemplateItem, maxRoublePriceToStack: number): boolean;
+    /**
+     * Get a randomised number a reward items stack size should be based on its handbook price
+     * @param item Reward item to get stack size for
+     * @returns Stack size value
+     */
+    protected getRandomisedRewardItemStackSizeByPrice(item: ITemplateItem): number;
     /**
      * Select a number of items that have a colelctive value of the passed in parameter
      * @param repeatableConfig Config
      * @param roublesBudget Total value of items to return
      * @returns Array of reward items that fit budget
      */
-    protected chooseRewardItemsWithinBudget(repeatableConfig: IRepeatableQuestConfig, roublesBudget: number): ITemplateItem[];
+    protected chooseRewardItemsWithinBudget(repeatableConfig: IRepeatableQuestConfig, roublesBudget: number, traderId: string): ITemplateItem[];
     /**
      * Helper to create a reward item structured as required by the client
      *
@@ -171,20 +185,20 @@ export declare class RepeatableQuestGenerator {
      * @param   {integer}   index           All rewards will be appended to a list, for unknown reasons the client wants the index
      * @returns {object}                    Object of "Reward"-item-type
      */
-    protected generateRewardItem(tpl: string, value: number, index: number, preset?: any): IReward;
+    protected generateRewardItem(tpl: string, value: number, index: number, preset?: Item[]): IReward;
     /**
      * Picks rewardable items from items.json. This means they need to fit into the inventory and they shouldn't be keys (debatable)
      * @param repeatableQuestConfig Config file
      * @returns List of rewardable items [[_tpl, itemTemplate],...]
      */
-    protected getRewardableItems(repeatableQuestConfig: IRepeatableQuestConfig): [string, ITemplateItem][];
+    protected getRewardableItems(repeatableQuestConfig: IRepeatableQuestConfig, traderId: string): [string, ITemplateItem][];
     /**
      * Checks if an id is a valid item. Valid meaning that it's an item that may be a reward
      * or content of bot loot. Items that are tested as valid may be in a player backpack or stash.
      * @param {string} tpl template id of item to check
      * @returns True if item is valid reward
      */
-    protected isValidRewardItem(tpl: string, repeatableQuestConfig: IRepeatableQuestConfig): boolean;
+    protected isValidRewardItem(tpl: string, repeatableQuestConfig: IRepeatableQuestConfig, itemBaseWhitelist: string[]): boolean;
     /**
      * Generates the base object of quest type format given as templates in assets/database/templates/repeatableQuests.json
      * The templates include Elimination, Completion and Extraction quest types

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

@@ -84,7 +84,6 @@ export declare class ScavCaseRewardGenerator {
         upd: Upd;
     }, rarity: string): void;
     /**
-     *
      * @param dbItems all items from the items.json
      * @param itemFilters controls how the dbItems will be filtered and returned (handbook price)
      * @returns filtered dbItems array

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

@@ -30,7 +30,7 @@ export declare class BotGeneratorHelper {
      * @param botRole Used by weapons to randomize the durability values. Null for non-equipped items
      * @returns Item Upd object with extra properties
      */
-    generateExtraPropertiesForItem(itemTemplate: ITemplateItem, botRole?: string): {
+    generateExtraPropertiesForItem(itemTemplate: ITemplateItem, botRole?: any): {
         upd?: Upd;
     };
     /**

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

@@ -86,13 +86,6 @@ export declare class InRaidHelper {
      * @param tradersClientProfile Client
      */
     protected applyTraderStandingAdjustments(tradersServerProfile: Record<string, TraderInfo>, tradersClientProfile: Record<string, TraderInfo>): void;
-    /**
-     * Some maps have one-time-use keys (e.g. Labs
-     * Remove the relevant key from an inventory based on the post-raid request data passed in
-     * @param offraidData post-raid data
-     * @param sessionID Session id
-     */
-    protected removeMapAccessKey(offraidData: ISaveProgressRequestData, sessionID: string): void;
     /**
      * Set the SPT inraid location Profile property to 'none'
      * @param sessionID Session id

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

@@ -86,7 +86,6 @@ export declare class InventoryHelper {
      */
     protected hydrateAmmoBoxWithAmmo(pmcData: IPmcData, itemToAdd: IAddItemTempObject, parentId: string, sessionID: string, output: IItemEventRouterResponse, foundInRaid: boolean): void;
     /**
-     *
      * @param assortItems Items to add to inventory
      * @param requestItem Details of purchased item to add to inventory
      * @param result Array split stacks are added to

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

@@ -28,7 +28,8 @@ export interface IBotBase {
     RepeatableQuests: IPmcDataRepeatableQuest[];
     Bonuses: Bonus[];
     Notes: Notes;
-    CarExtractCounts: CarExtractCounts;
+    CarExtractCounts: Record<string, number>;
+    CoopExtractCounts: Record<string, number>;
     SurvivorClass: SurvivorClass;
     WishList: string[];
     /** SPT specific property used during bot generation in raid */
@@ -306,6 +307,8 @@ export interface Productive {
     /** Used when sending data to client */
     NeedFuelForAllProductionTime?: boolean;
     sptIsScavCase?: boolean;
+    /** Some crafts are always inProgress, but need to be reset, e.g. water collector */
+    sptIsComplete?: boolean;
 }
 export interface Production extends Productive {
     RecipeId: string;
@@ -346,8 +349,6 @@ export interface LastCompleted {
 export interface Notes {
     Notes: Note[];
 }
-export interface CarExtractCounts {
-}
 export declare enum SurvivorClass {
     UNKNOWN = 0,
     NEUTRALIZER = 1,

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

@@ -5,8 +5,12 @@ export interface IProfileTemplates {
     "Left Behind": IProfileSides;
     "Prepare To Escape": IProfileSides;
     "Edge Of Darkness": IProfileSides;
+    "SPT Developer": IProfileSides;
+    "SPT Easy start": IProfileSides;
+    "SPT Zero to hero": IProfileSides;
 }
 export interface IProfileSides {
+    descriptionLocaleKey: string;
     usec: TemplateSide;
     bear: TemplateSide;
 }

TypeScript/11BundleLoadingSample/types/models/eft/inventory/IInventoryUnbindRequestData.d.ts

@@ -1,6 +0,0 @@
-import { IInventoryBaseActionRequestData } from "@spt-aki/models/eft/inventory/IInventoryBaseActionRequestData";
-export interface IInventoryUnbindRequestData extends IInventoryBaseActionRequestData {
-    Action: "Unbind";
-    item: string;
-    index: number;
-}

TypeScript/11BundleLoadingSample/types/models/eft/trade/IProcessBuyTradeRequestData.d.ts

@@ -1,6 +1,6 @@
 import { IProcessBaseTradeRequestData } from "@spt-aki/models/eft/trade/IProcessBaseTradeRequestData";
 export interface IProcessBuyTradeRequestData extends IProcessBaseTradeRequestData {
-    Action: "buy_from_trader" | "TradingConfirm" | "RestoreHealth" | "";
+    Action: "buy_from_trader" | "TradingConfirm" | "RestoreHealth" | "" | "SptInsure" | "SptRepair";
     type: string;
     tid: string;
     item_id: string;
@@ -9,6 +9,7 @@ export interface IProcessBuyTradeRequestData extends IProcessBaseTradeRequestDat
     scheme_items: SchemeItem[];
 }
 export interface SchemeItem {
+    /** Id of stack to take money from, is money tpl when Action is `SptInsure` */
     id: string;
     count: number;
 }

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

@@ -10,8 +10,10 @@ export interface IInRaidConfig extends IBaseConfig {
     carExtracts: string[];
     /** Names of coop extracts */
     coopExtracts: string[];
-    /** Fene rep gain from a single car extract */
+    /** Fence rep gain from a single car extract */
     carExtractBaseStandingGain: number;
+    /** Fence rep gain from a single coop extract */
+    coopExtractBaseStandingGain: number;
     /** Fence rep gain when successfully extracting as pscav */
     scavExtractGain: number;
     /** On death should items in your secure keep their Find in raid status regardless of how you finished the raid */

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

@@ -61,6 +61,9 @@ export interface IRewardScaling {
 export interface ITraderWhitelist {
     traderId: string;
     questTypes: string[];
+    rewardBaseWhitelist: string[];
+    rewardCanBeWeapon: boolean;
+    weaponRewardChancePercent: number;
 }
 export interface IRepeatableQuestTypesConfig {
     Exploration: IExploration;
@@ -70,6 +73,7 @@ export interface IRepeatableQuestTypesConfig {
 }
 export interface IExploration extends IBaseQuestConfig {
     maxExtracts: number;
+    maxExtractsWithSpecificExit: number;
     specificExits: ISpecificExits;
 }
 export interface ISpecificExits {
@@ -79,6 +83,7 @@ export interface ISpecificExits {
 export interface ICompletion extends IBaseQuestConfig {
     minRequestedAmount: number;
     maxRequestedAmount: number;
+    uniqueItemCount: number;
     minRequestedBulletAmount: number;
     maxRequestedBulletAmount: number;
     useWhitelist: boolean;

TypeScript/11BundleLoadingSample/types/routers/EventOutputHolder.d.ts

@@ -44,4 +44,9 @@ export declare class EventOutputHolder {
      * @returns dictionary of hideout productions
      */
     protected getProductionsFromProfileAndFlagComplete(productions: Record<string, Productive>): Record<string, Productive>;
+    /**
+     * Required as continuous productions don't reset and stay at 100% completion but client thinks it hasn't started
+     * @param productions Productions in a profile
+     */
+    protected resetSptIsCompleteFlaggedCrafts(productions: Record<string, Productive>): void;
 }

TypeScript/11BundleLoadingSample/types/routers/ItemEventRouter.d.ts

@@ -13,7 +13,6 @@ export declare class ItemEventRouter {
     protected eventOutputHolder: EventOutputHolder;
     constructor(logger: ILogger, profileHelper: ProfileHelper, itemEventRouters: ItemEventRouterDefinition[], localisationService: LocalisationService, eventOutputHolder: EventOutputHolder);
     /**
-     *
      * @param info Event request
      * @param sessionID Session id
      * @returns Item response

TypeScript/11BundleLoadingSample/types/routers/save_load/HealthSaveLoadRouter.d.ts

@@ -1,7 +1,6 @@
 import { HandledRoute, SaveLoadRouter } from "@spt-aki/di/Router";
 import { IAkiProfile } from "@spt-aki/models/eft/profile/IAkiProfile";
 export declare class HealthSaveLoadRouter extends SaveLoadRouter {
-    constructor();
     getHandledRoutes(): HandledRoute[];
     handleLoad(profile: IAkiProfile): IAkiProfile;
 }

TypeScript/11BundleLoadingSample/types/routers/save_load/InraidSaveLoadRouter.d.ts

@@ -1,7 +1,6 @@
 import { HandledRoute, SaveLoadRouter } from "@spt-aki/di/Router";
 import { IAkiProfile } from "@spt-aki/models/eft/profile/IAkiProfile";
 export declare class InraidSaveLoadRouter extends SaveLoadRouter {
-    constructor();
     getHandledRoutes(): HandledRoute[];
     handleLoad(profile: IAkiProfile): IAkiProfile;
 }

TypeScript/11BundleLoadingSample/types/routers/save_load/InsuranceSaveLoadRouter.d.ts

@@ -1,7 +1,6 @@
 import { HandledRoute, SaveLoadRouter } from "@spt-aki/di/Router";
 import { IAkiProfile } from "@spt-aki/models/eft/profile/IAkiProfile";
 export declare class InsuranceSaveLoadRouter extends SaveLoadRouter {
-    constructor();
     getHandledRoutes(): HandledRoute[];
     handleLoad(profile: IAkiProfile): IAkiProfile;
 }

TypeScript/11BundleLoadingSample/types/routers/save_load/ProfileSaveLoadRouter.d.ts

@@ -1,7 +1,6 @@
 import { HandledRoute, SaveLoadRouter } from "@spt-aki/di/Router";
 import { IAkiProfile } from "@spt-aki/models/eft/profile/IAkiProfile";
 export declare class ProfileSaveLoadRouter extends SaveLoadRouter {
-    constructor();
     getHandledRoutes(): HandledRoute[];
     handleLoad(profile: IAkiProfile): IAkiProfile;
 }

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

@@ -55,7 +55,7 @@ export declare class PaymentService {
      */
     protected isItemInStash(pmcData: IPmcData, item: Item): boolean;
     /**
-     * Remove currency from player stash/inventory
+     * Remove currency from player stash/inventory and update client object with changes
      * @param pmcData Player profile to find and remove currency from
      * @param currencyTpl Type of currency to pay
      * @param amountToPay money value to pay

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

@@ -104,7 +104,6 @@ export declare class ProfileFixerService {
      */
     addMissingHideoutBonusesToProfile(pmcProfile: IPmcData): void;
     /**
-     *
      * @param profileBonuses bonuses from profile
      * @param bonus bonus to find
      * @returns matching bonus

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

@@ -41,7 +41,6 @@ export declare class RepairService {
      */
     repairItemByTrader(sessionID: string, pmcData: IPmcData, repairItemDetails: RepairItem, traderId: string): RepairDetails;
     /**
-     *
      * @param sessionID Session id
      * @param pmcData profile to take money from
      * @param repairedItemId Repaired item id
@@ -64,7 +63,6 @@ export declare class RepairService {
      */
     protected getWeaponRepairSkillPoints(repairDetails: RepairDetails): number;
     /**
-     *
      * @param sessionId Session id
      * @param pmcData Profile to update repaired item in
      * @param repairKits Array of Repair kits to use

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

@@ -85,7 +85,6 @@ export declare class HideoutController {
      */
     protected checkAndUpgradeWall(pmcData: IPmcData): void;
     /**
-     *
      * @param pmcData Profile to edit
      * @param output Object to send back to client
      * @param sessionID Session/player id
@@ -102,7 +101,6 @@ export declare class HideoutController {
      */
     protected addUpdateInventoryItemToProfile(pmcData: IPmcData, dbHideoutData: IHideoutArea, hideoutStage: Stage): void;
     /**
-     *
      * @param output Objet to send to client
      * @param sessionID Session/player id
      * @param areaType Hideout area that had stash added

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

@@ -36,6 +36,7 @@ export declare class InsuranceController {
     protected mailSendService: MailSendService;
     protected configServer: ConfigServer;
     protected insuranceConfig: IInsuranceConfig;
+    protected roubleTpl: string;
     constructor(logger: ILogger, randomUtil: RandomUtil, eventOutputHolder: EventOutputHolder, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileHelper: ProfileHelper, dialogueHelper: DialogueHelper, traderHelper: TraderHelper, paymentService: PaymentService, insuranceService: InsuranceService, mailSendService: MailSendService, configServer: ConfigServer);
     /**
      * Process insurance items of all profiles prior to being given back to the player through the mail service.

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

@@ -8,12 +8,14 @@ import { Info, ModDetails } from "@spt-aki/models/eft/profile/IAkiProfile";
 import { IConnectResponse } from "@spt-aki/models/eft/profile/IConnectResponse";
 import { ICoreConfig } from "@spt-aki/models/spt/config/ICoreConfig";
 import { IPackageJsonData } from "@spt-aki/models/spt/mod/IPackageJsonData";
+import { ILogger } from "@spt-aki/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt-aki/servers/ConfigServer";
 import { DatabaseServer } from "@spt-aki/servers/DatabaseServer";
 import { SaveServer } from "@spt-aki/servers/SaveServer";
 import { LocalisationService } from "@spt-aki/services/LocalisationService";
 import { HashUtil } from "@spt-aki/utils/HashUtil";
 export declare class LauncherController {
+    protected logger: ILogger;
     protected hashUtil: HashUtil;
     protected saveServer: SaveServer;
     protected httpServerHelper: HttpServerHelper;
@@ -23,11 +25,11 @@ export declare class LauncherController {
     protected preAkiModLoader: PreAkiModLoader;
     protected configServer: ConfigServer;
     protected coreConfig: ICoreConfig;
-    constructor(hashUtil: HashUtil, saveServer: SaveServer, httpServerHelper: HttpServerHelper, profileHelper: ProfileHelper, databaseServer: DatabaseServer, localisationService: LocalisationService, preAkiModLoader: PreAkiModLoader, configServer: ConfigServer);
+    constructor(logger: ILogger, hashUtil: HashUtil, saveServer: SaveServer, httpServerHelper: HttpServerHelper, profileHelper: ProfileHelper, databaseServer: DatabaseServer, localisationService: LocalisationService, preAkiModLoader: PreAkiModLoader, configServer: ConfigServer);
     connect(): IConnectResponse;
     /**
-     * Get descriptive text for each of the profile edtions a player can choose
+     * Get descriptive text for each of the profile edtions a player can choose, keyed by profile.json profile type e.g. "Edge Of Darkness"
-     * @returns
+     * @returns Dictionary of profile types with related descriptive text
      */
     protected getProfileDescriptions(): Record<string, string>;
     find(sessionIdKey: string): Info;

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

@@ -78,6 +78,12 @@ export declare class MatchController {
      */
     protected extractWasViaCoop(extractName: string): boolean;
     protected sendCoopTakenFenceMessage(sessionId: string): void;
+    /**
+     * Handle when a player extracts using a coop extract - add rep to fence
+     * @param pmcData Profile
+     * @param extractName Name of extract taken
+     */
+    protected handleCoopExtract(pmcData: IPmcData, extractName: string): void;
     /**
      * Was extract by car
      * @param extractName name of extract
@@ -92,10 +98,11 @@ export declare class MatchController {
      */
     protected handleCarExtract(extractName: string, pmcData: IPmcData, sessionId: string): void;
     /**
-     * Update players fence trader standing value in profile
+     * Get the fence rep gain from using a car or coop extract
-     * @param pmcData Player profile
+     * @param pmcData Profile
-     * @param fenceId Id of fence trader
+     * @param baseGain amount gained for the first extract
-     * @param extractName Name of extract used
+     * @param extractCount Number of times extract was taken
+     * @returns Fence standing after taking extract
      */
-    protected updateFenceStandingInProfile(pmcData: IPmcData, fenceId: string, extractName: string): void;
+    protected getFenceStandingAfterExtract(pmcData: IPmcData, baseGain: number, extractCount: number): number;
 }

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

@@ -61,7 +61,6 @@ export declare class RepeatableQuestController {
      * (if the are on "Succeed" but not "Completed" we keep them, to allow the player to complete them and get the rewards)
      * The new quests generated are again persisted in profile.RepeatableQuests
      *
-     *
      * @param   {string}    sessionId       Player's session id
      * @returns  {array}                    array of "repeatableQuestObjects" as descibed above
      */

TypeScript/12ClassExtensionOverride/types/di/Router.d.ts

@@ -21,11 +21,9 @@ export declare class DynamicRouter extends Router {
     getHandledRoutes(): HandledRoute[];
 }
 export declare class ItemEventRouterDefinition extends Router {
-    constructor();
     handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse;
 }
 export declare class SaveLoadRouter extends Router {
-    constructor();
     handleLoad(profile: IAkiProfile): IAkiProfile;
 }
 export declare class HandledRoute {

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

@@ -104,7 +104,6 @@ export declare class BotEquipmentModGenerator {
      */
     protected shouldModBeSpawned(itemSlot: Slot, modSlot: string, modSpawnChances: ModsChances): boolean;
     /**
-     *
      * @param modSlot Slot mod will fit into
      * @param isRandomisableSlot Will generate a randomised mod pool if true
      * @param modsParent Parent slot the item will be a part of
@@ -116,6 +115,13 @@ export declare class BotEquipmentModGenerator {
      * @returns ITemplateItem
      */
     protected chooseModToPutIntoSlot(modSlot: string, isRandomisableSlot: boolean, botWeaponSightWhitelist: Record<string, string[]>, botEquipBlacklist: EquipmentFilterDetails, itemModPool: Record<string, string[]>, weapon: Item[], ammoTpl: string, parentTemplate: ITemplateItem): [boolean, ITemplateItem];
+    /**
+     * Temp fix to prevent certain combinations of weapons with mods that are known to be incompatible
+     * @param weapon Weapon
+     * @param modTpl Mod to check compatibility with weapon
+     * @returns True if incompatible
+     */
+    protected weaponModComboIsIncompatible(weapon: Item[], modTpl: string): boolean;
     /**
      * Create a mod item with parameters as properties
      * @param modId _id

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

@@ -4,7 +4,7 @@ import { BotDifficultyHelper } from "@spt-aki/helpers/BotDifficultyHelper";
 import { BotHelper } from "@spt-aki/helpers/BotHelper";
 import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper";
 import { WeightedRandomHelper } from "@spt-aki/helpers/WeightedRandomHelper";
-import { IBaseJsonSkills, IBaseSkill, IBotBase, Info, Health as PmcHealth, Skills as botSkills } from "@spt-aki/models/eft/common/tables/IBotBase";
+import { Health as PmcHealth, IBaseJsonSkills, IBaseSkill, IBotBase, Info, Skills as botSkills } from "@spt-aki/models/eft/common/tables/IBotBase";
 import { Appearance, Health, IBotType } from "@spt-aki/models/eft/common/tables/IBotType";
 import { BotGenerationDetails } from "@spt-aki/models/spt/bots/BotGenerationDetails";
 import { IBotConfig } from "@spt-aki/models/spt/config/IBotConfig";

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

@@ -121,7 +121,6 @@ export declare class RagfairOfferGenerator {
      */
     generateDynamicOffers(expiredOffers?: Item[]): Promise<void>;
     /**
-     *
      * @param assortItemIndex Index of assort item
      * @param assortItemsToProcess Item array containing index
      * @param expiredOffers Currently expired offers on flea

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

@@ -6,6 +6,7 @@ import { RagfairServerHelper } from "@spt-aki/helpers/RagfairServerHelper";
 import { RepeatableQuestHelper } from "@spt-aki/helpers/RepeatableQuestHelper";
 import { Exit } from "@spt-aki/models/eft/common/ILocationBase";
 import { TraderInfo } from "@spt-aki/models/eft/common/tables/IBotBase";
+import { Item } from "@spt-aki/models/eft/common/tables/IItem";
 import { ICompletion, ICompletionAvailableFor, IElimination, IEliminationCondition, IExploration, IExplorationCondition, IPickup, IRepeatableQuest, IReward, IRewards } from "@spt-aki/models/eft/common/tables/IRepeatableQuests";
 import { ITemplateItem } from "@spt-aki/models/eft/common/tables/ITemplateItem";
 import { IBaseQuestConfig, IBossInfo, IEliminationConfig, IQuestConfig, IRepeatableQuestConfig } from "@spt-aki/models/spt/config/IQuestConfig";
@@ -105,11 +106,11 @@ export declare class RepeatableQuestGenerator {
      * A repeatable quest, besides some more or less static components, exists of reward and condition (see assets/database/templates/repeatableQuests.json)
      * This is a helper method for GenerateCompletionQuest to create a completion condition (of which a completion quest theoretically can have many)
      *
-     * @param   {string}    targetItemId    id of the item to request
+     * @param   {string}    itemTpl    id of the item to request
      * @param   {integer}   value           amount of items of this specific type to request
      * @returns {object}                    object of "Completion"-condition
      */
-    protected generateCompletionAvailableForFinish(targetItemId: string, value: number): ICompletionAvailableFor;
+    protected generateCompletionAvailableForFinish(itemTpl: string, value: number): ICompletionAvailableFor;
     /**
      * Generates a valid Exploration quest
      *
@@ -156,13 +157,26 @@ export declare class RepeatableQuestGenerator {
      * @returns {object}                        object of "Reward"-type that can be given for a repeatable mission
      */
     protected generateReward(pmcLevel: number, difficulty: number, traderId: string, repeatableConfig: IRepeatableQuestConfig, questConfig: IBaseQuestConfig): IRewards;
+    /**
+     * Should reward item have stack size increased (25% chance)
+     * @param item Item to possibly increase stack size of
+     * @param maxRoublePriceToStack Maximum rouble price an item can be to still be chosen for stacking
+     * @returns True if it should
+     */
+    protected canIncreaseRewardItemStackSize(item: ITemplateItem, maxRoublePriceToStack: number): boolean;
+    /**
+     * Get a randomised number a reward items stack size should be based on its handbook price
+     * @param item Reward item to get stack size for
+     * @returns Stack size value
+     */
+    protected getRandomisedRewardItemStackSizeByPrice(item: ITemplateItem): number;
     /**
      * Select a number of items that have a colelctive value of the passed in parameter
      * @param repeatableConfig Config
      * @param roublesBudget Total value of items to return
      * @returns Array of reward items that fit budget
      */
-    protected chooseRewardItemsWithinBudget(repeatableConfig: IRepeatableQuestConfig, roublesBudget: number): ITemplateItem[];
+    protected chooseRewardItemsWithinBudget(repeatableConfig: IRepeatableQuestConfig, roublesBudget: number, traderId: string): ITemplateItem[];
     /**
      * Helper to create a reward item structured as required by the client
      *
@@ -171,20 +185,20 @@ export declare class RepeatableQuestGenerator {
      * @param   {integer}   index           All rewards will be appended to a list, for unknown reasons the client wants the index
      * @returns {object}                    Object of "Reward"-item-type
      */
-    protected generateRewardItem(tpl: string, value: number, index: number, preset?: any): IReward;
+    protected generateRewardItem(tpl: string, value: number, index: number, preset?: Item[]): IReward;
     /**
      * Picks rewardable items from items.json. This means they need to fit into the inventory and they shouldn't be keys (debatable)
      * @param repeatableQuestConfig Config file
      * @returns List of rewardable items [[_tpl, itemTemplate],...]
      */
-    protected getRewardableItems(repeatableQuestConfig: IRepeatableQuestConfig): [string, ITemplateItem][];
+    protected getRewardableItems(repeatableQuestConfig: IRepeatableQuestConfig, traderId: string): [string, ITemplateItem][];
     /**
      * Checks if an id is a valid item. Valid meaning that it's an item that may be a reward
      * or content of bot loot. Items that are tested as valid may be in a player backpack or stash.
      * @param {string} tpl template id of item to check
      * @returns True if item is valid reward
      */
-    protected isValidRewardItem(tpl: string, repeatableQuestConfig: IRepeatableQuestConfig): boolean;
+    protected isValidRewardItem(tpl: string, repeatableQuestConfig: IRepeatableQuestConfig, itemBaseWhitelist: string[]): boolean;
     /**
      * Generates the base object of quest type format given as templates in assets/database/templates/repeatableQuests.json
      * The templates include Elimination, Completion and Extraction quest types

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

@@ -84,7 +84,6 @@ export declare class ScavCaseRewardGenerator {
         upd: Upd;
     }, rarity: string): void;
     /**
-     *
      * @param dbItems all items from the items.json
      * @param itemFilters controls how the dbItems will be filtered and returned (handbook price)
      * @returns filtered dbItems array

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

@@ -30,7 +30,7 @@ export declare class BotGeneratorHelper {
      * @param botRole Used by weapons to randomize the durability values. Null for non-equipped items
      * @returns Item Upd object with extra properties
      */
-    generateExtraPropertiesForItem(itemTemplate: ITemplateItem, botRole?: string): {
+    generateExtraPropertiesForItem(itemTemplate: ITemplateItem, botRole?: any): {
         upd?: Upd;
     };
     /**

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

@@ -86,13 +86,6 @@ export declare class InRaidHelper {
      * @param tradersClientProfile Client
      */
     protected applyTraderStandingAdjustments(tradersServerProfile: Record<string, TraderInfo>, tradersClientProfile: Record<string, TraderInfo>): void;
-    /**
-     * Some maps have one-time-use keys (e.g. Labs
-     * Remove the relevant key from an inventory based on the post-raid request data passed in
-     * @param offraidData post-raid data
-     * @param sessionID Session id
-     */
-    protected removeMapAccessKey(offraidData: ISaveProgressRequestData, sessionID: string): void;
     /**
      * Set the SPT inraid location Profile property to 'none'
      * @param sessionID Session id

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

@@ -86,7 +86,6 @@ export declare class InventoryHelper {
      */
     protected hydrateAmmoBoxWithAmmo(pmcData: IPmcData, itemToAdd: IAddItemTempObject, parentId: string, sessionID: string, output: IItemEventRouterResponse, foundInRaid: boolean): void;
     /**
-     *
      * @param assortItems Items to add to inventory
      * @param requestItem Details of purchased item to add to inventory
      * @param result Array split stacks are added to

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

@@ -28,7 +28,8 @@ export interface IBotBase {
     RepeatableQuests: IPmcDataRepeatableQuest[];
     Bonuses: Bonus[];
     Notes: Notes;
-    CarExtractCounts: CarExtractCounts;
+    CarExtractCounts: Record<string, number>;
+    CoopExtractCounts: Record<string, number>;
     SurvivorClass: SurvivorClass;
     WishList: string[];
     /** SPT specific property used during bot generation in raid */
@@ -306,6 +307,8 @@ export interface Productive {
     /** Used when sending data to client */
     NeedFuelForAllProductionTime?: boolean;
     sptIsScavCase?: boolean;
+    /** Some crafts are always inProgress, but need to be reset, e.g. water collector */
+    sptIsComplete?: boolean;
 }
 export interface Production extends Productive {
     RecipeId: string;
@@ -346,8 +349,6 @@ export interface LastCompleted {
 export interface Notes {
     Notes: Note[];
 }
-export interface CarExtractCounts {
-}
 export declare enum SurvivorClass {
     UNKNOWN = 0,
     NEUTRALIZER = 1,

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

@@ -5,8 +5,12 @@ export interface IProfileTemplates {
     "Left Behind": IProfileSides;
     "Prepare To Escape": IProfileSides;
     "Edge Of Darkness": IProfileSides;
+    "SPT Developer": IProfileSides;
+    "SPT Easy start": IProfileSides;
+    "SPT Zero to hero": IProfileSides;
 }
 export interface IProfileSides {
+    descriptionLocaleKey: string;
     usec: TemplateSide;
     bear: TemplateSide;
 }

TypeScript/12ClassExtensionOverride/types/models/eft/inventory/IInventoryUnbindRequestData.d.ts

@@ -1,6 +0,0 @@
-import { IInventoryBaseActionRequestData } from "@spt-aki/models/eft/inventory/IInventoryBaseActionRequestData";
-export interface IInventoryUnbindRequestData extends IInventoryBaseActionRequestData {
-    Action: "Unbind";
-    item: string;
-    index: number;
-}

TypeScript/12ClassExtensionOverride/types/models/eft/trade/IProcessBuyTradeRequestData.d.ts

@@ -1,6 +1,6 @@
 import { IProcessBaseTradeRequestData } from "@spt-aki/models/eft/trade/IProcessBaseTradeRequestData";
 export interface IProcessBuyTradeRequestData extends IProcessBaseTradeRequestData {
-    Action: "buy_from_trader" | "TradingConfirm" | "RestoreHealth" | "";
+    Action: "buy_from_trader" | "TradingConfirm" | "RestoreHealth" | "" | "SptInsure" | "SptRepair";
     type: string;
     tid: string;
     item_id: string;
@@ -9,6 +9,7 @@ export interface IProcessBuyTradeRequestData extends IProcessBaseTradeRequestDat
     scheme_items: SchemeItem[];
 }
 export interface SchemeItem {
+    /** Id of stack to take money from, is money tpl when Action is `SptInsure` */
     id: string;
     count: number;
 }

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

@@ -10,8 +10,10 @@ export interface IInRaidConfig extends IBaseConfig {
     carExtracts: string[];
     /** Names of coop extracts */
     coopExtracts: string[];
-    /** Fene rep gain from a single car extract */
+    /** Fence rep gain from a single car extract */
     carExtractBaseStandingGain: number;
+    /** Fence rep gain from a single coop extract */
+    coopExtractBaseStandingGain: number;
     /** Fence rep gain when successfully extracting as pscav */
     scavExtractGain: number;
     /** On death should items in your secure keep their Find in raid status regardless of how you finished the raid */

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

@@ -61,6 +61,9 @@ export interface IRewardScaling {
 export interface ITraderWhitelist {
     traderId: string;
     questTypes: string[];
+    rewardBaseWhitelist: string[];
+    rewardCanBeWeapon: boolean;
+    weaponRewardChancePercent: number;
 }
 export interface IRepeatableQuestTypesConfig {
     Exploration: IExploration;
@@ -70,6 +73,7 @@ export interface IRepeatableQuestTypesConfig {
 }
 export interface IExploration extends IBaseQuestConfig {
     maxExtracts: number;
+    maxExtractsWithSpecificExit: number;
     specificExits: ISpecificExits;
 }
 export interface ISpecificExits {
@@ -79,6 +83,7 @@ export interface ISpecificExits {
 export interface ICompletion extends IBaseQuestConfig {
     minRequestedAmount: number;
     maxRequestedAmount: number;
+    uniqueItemCount: number;
     minRequestedBulletAmount: number;
     maxRequestedBulletAmount: number;
     useWhitelist: boolean;

TypeScript/12ClassExtensionOverride/types/routers/EventOutputHolder.d.ts

@@ -44,4 +44,9 @@ export declare class EventOutputHolder {
      * @returns dictionary of hideout productions
      */
     protected getProductionsFromProfileAndFlagComplete(productions: Record<string, Productive>): Record<string, Productive>;
+    /**
+     * Required as continuous productions don't reset and stay at 100% completion but client thinks it hasn't started
+     * @param productions Productions in a profile
+     */
+    protected resetSptIsCompleteFlaggedCrafts(productions: Record<string, Productive>): void;
 }

TypeScript/12ClassExtensionOverride/types/routers/ItemEventRouter.d.ts

@@ -13,7 +13,6 @@ export declare class ItemEventRouter {
     protected eventOutputHolder: EventOutputHolder;
     constructor(logger: ILogger, profileHelper: ProfileHelper, itemEventRouters: ItemEventRouterDefinition[], localisationService: LocalisationService, eventOutputHolder: EventOutputHolder);
     /**
-     *
      * @param info Event request
      * @param sessionID Session id
      * @returns Item response

TypeScript/12ClassExtensionOverride/types/routers/save_load/HealthSaveLoadRouter.d.ts

@@ -1,7 +1,6 @@
 import { HandledRoute, SaveLoadRouter } from "@spt-aki/di/Router";
 import { IAkiProfile } from "@spt-aki/models/eft/profile/IAkiProfile";
 export declare class HealthSaveLoadRouter extends SaveLoadRouter {
-    constructor();
     getHandledRoutes(): HandledRoute[];
     handleLoad(profile: IAkiProfile): IAkiProfile;
 }

TypeScript/12ClassExtensionOverride/types/routers/save_load/InraidSaveLoadRouter.d.ts

@@ -1,7 +1,6 @@
 import { HandledRoute, SaveLoadRouter } from "@spt-aki/di/Router";
 import { IAkiProfile } from "@spt-aki/models/eft/profile/IAkiProfile";
 export declare class InraidSaveLoadRouter extends SaveLoadRouter {
-    constructor();
     getHandledRoutes(): HandledRoute[];
     handleLoad(profile: IAkiProfile): IAkiProfile;
 }

TypeScript/12ClassExtensionOverride/types/routers/save_load/InsuranceSaveLoadRouter.d.ts

@@ -1,7 +1,6 @@
 import { HandledRoute, SaveLoadRouter } from "@spt-aki/di/Router";
 import { IAkiProfile } from "@spt-aki/models/eft/profile/IAkiProfile";
 export declare class InsuranceSaveLoadRouter extends SaveLoadRouter {
-    constructor();
     getHandledRoutes(): HandledRoute[];
     handleLoad(profile: IAkiProfile): IAkiProfile;
 }

TypeScript/12ClassExtensionOverride/types/routers/save_load/ProfileSaveLoadRouter.d.ts

@@ -1,7 +1,6 @@
 import { HandledRoute, SaveLoadRouter } from "@spt-aki/di/Router";
 import { IAkiProfile } from "@spt-aki/models/eft/profile/IAkiProfile";
 export declare class ProfileSaveLoadRouter extends SaveLoadRouter {
-    constructor();
     getHandledRoutes(): HandledRoute[];
     handleLoad(profile: IAkiProfile): IAkiProfile;
 }

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

@@ -55,7 +55,7 @@ export declare class PaymentService {
      */
     protected isItemInStash(pmcData: IPmcData, item: Item): boolean;
     /**
-     * Remove currency from player stash/inventory
+     * Remove currency from player stash/inventory and update client object with changes
      * @param pmcData Player profile to find and remove currency from
      * @param currencyTpl Type of currency to pay
      * @param amountToPay money value to pay

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

@@ -104,7 +104,6 @@ export declare class ProfileFixerService {
      */
     addMissingHideoutBonusesToProfile(pmcProfile: IPmcData): void;
     /**
-     *
      * @param profileBonuses bonuses from profile
      * @param bonus bonus to find
      * @returns matching bonus

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

@@ -41,7 +41,6 @@ export declare class RepairService {
      */
     repairItemByTrader(sessionID: string, pmcData: IPmcData, repairItemDetails: RepairItem, traderId: string): RepairDetails;
     /**
-     *
      * @param sessionID Session id
      * @param pmcData profile to take money from
      * @param repairedItemId Repaired item id
@@ -64,7 +63,6 @@ export declare class RepairService {
      */
     protected getWeaponRepairSkillPoints(repairDetails: RepairDetails): number;
     /**
-     *
      * @param sessionId Session id
      * @param pmcData Profile to update repaired item in
      * @param repairKits Array of Repair kits to use

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

@@ -85,7 +85,6 @@ export declare class HideoutController {
      */
     protected checkAndUpgradeWall(pmcData: IPmcData): void;
     /**
-     *
      * @param pmcData Profile to edit
      * @param output Object to send back to client
      * @param sessionID Session/player id
@@ -102,7 +101,6 @@ export declare class HideoutController {
      */
     protected addUpdateInventoryItemToProfile(pmcData: IPmcData, dbHideoutData: IHideoutArea, hideoutStage: Stage): void;
     /**
-     *
      * @param output Objet to send to client
      * @param sessionID Session/player id
      * @param areaType Hideout area that had stash added

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

@@ -36,6 +36,7 @@ export declare class InsuranceController {
     protected mailSendService: MailSendService;
     protected configServer: ConfigServer;
     protected insuranceConfig: IInsuranceConfig;
+    protected roubleTpl: string;
     constructor(logger: ILogger, randomUtil: RandomUtil, eventOutputHolder: EventOutputHolder, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileHelper: ProfileHelper, dialogueHelper: DialogueHelper, traderHelper: TraderHelper, paymentService: PaymentService, insuranceService: InsuranceService, mailSendService: MailSendService, configServer: ConfigServer);
     /**
      * Process insurance items of all profiles prior to being given back to the player through the mail service.

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

@@ -8,12 +8,14 @@ import { Info, ModDetails } from "@spt-aki/models/eft/profile/IAkiProfile";
 import { IConnectResponse } from "@spt-aki/models/eft/profile/IConnectResponse";
 import { ICoreConfig } from "@spt-aki/models/spt/config/ICoreConfig";
 import { IPackageJsonData } from "@spt-aki/models/spt/mod/IPackageJsonData";
+import { ILogger } from "@spt-aki/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt-aki/servers/ConfigServer";
 import { DatabaseServer } from "@spt-aki/servers/DatabaseServer";
 import { SaveServer } from "@spt-aki/servers/SaveServer";
 import { LocalisationService } from "@spt-aki/services/LocalisationService";
 import { HashUtil } from "@spt-aki/utils/HashUtil";
 export declare class LauncherController {
+    protected logger: ILogger;
     protected hashUtil: HashUtil;
     protected saveServer: SaveServer;
     protected httpServerHelper: HttpServerHelper;
@@ -23,11 +25,11 @@ export declare class LauncherController {
     protected preAkiModLoader: PreAkiModLoader;
     protected configServer: ConfigServer;
     protected coreConfig: ICoreConfig;
-    constructor(hashUtil: HashUtil, saveServer: SaveServer, httpServerHelper: HttpServerHelper, profileHelper: ProfileHelper, databaseServer: DatabaseServer, localisationService: LocalisationService, preAkiModLoader: PreAkiModLoader, configServer: ConfigServer);
+    constructor(logger: ILogger, hashUtil: HashUtil, saveServer: SaveServer, httpServerHelper: HttpServerHelper, profileHelper: ProfileHelper, databaseServer: DatabaseServer, localisationService: LocalisationService, preAkiModLoader: PreAkiModLoader, configServer: ConfigServer);
     connect(): IConnectResponse;
     /**
-     * Get descriptive text for each of the profile edtions a player can choose
+     * Get descriptive text for each of the profile edtions a player can choose, keyed by profile.json profile type e.g. "Edge Of Darkness"
-     * @returns
+     * @returns Dictionary of profile types with related descriptive text
      */
     protected getProfileDescriptions(): Record<string, string>;
     find(sessionIdKey: string): Info;

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

@@ -78,6 +78,12 @@ export declare class MatchController {
      */
     protected extractWasViaCoop(extractName: string): boolean;
     protected sendCoopTakenFenceMessage(sessionId: string): void;
+    /**
+     * Handle when a player extracts using a coop extract - add rep to fence
+     * @param pmcData Profile
+     * @param extractName Name of extract taken
+     */
+    protected handleCoopExtract(pmcData: IPmcData, extractName: string): void;
     /**
      * Was extract by car
      * @param extractName name of extract
@@ -92,10 +98,11 @@ export declare class MatchController {
      */
     protected handleCarExtract(extractName: string, pmcData: IPmcData, sessionId: string): void;
     /**
-     * Update players fence trader standing value in profile
+     * Get the fence rep gain from using a car or coop extract
-     * @param pmcData Player profile
+     * @param pmcData Profile
-     * @param fenceId Id of fence trader
+     * @param baseGain amount gained for the first extract
-     * @param extractName Name of extract used
+     * @param extractCount Number of times extract was taken
+     * @returns Fence standing after taking extract
      */
-    protected updateFenceStandingInProfile(pmcData: IPmcData, fenceId: string, extractName: string): void;
+    protected getFenceStandingAfterExtract(pmcData: IPmcData, baseGain: number, extractCount: number): number;
 }

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

@@ -61,7 +61,6 @@ export declare class RepeatableQuestController {
      * (if the are on "Succeed" but not "Completed" we keep them, to allow the player to complete them and get the rewards)
      * The new quests generated are again persisted in profile.RepeatableQuests
      *
-     *
      * @param   {string}    sessionId       Player's session id
      * @returns  {array}                    array of "repeatableQuestObjects" as descibed above
      */

TypeScript/13AddTrader/types/di/Router.d.ts

@@ -21,11 +21,9 @@ export declare class DynamicRouter extends Router {
     getHandledRoutes(): HandledRoute[];
 }
 export declare class ItemEventRouterDefinition extends Router {
-    constructor();
     handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse;
 }
 export declare class SaveLoadRouter extends Router {
-    constructor();
     handleLoad(profile: IAkiProfile): IAkiProfile;
 }
 export declare class HandledRoute {

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

@@ -104,7 +104,6 @@ export declare class BotEquipmentModGenerator {
      */
     protected shouldModBeSpawned(itemSlot: Slot, modSlot: string, modSpawnChances: ModsChances): boolean;
     /**
-     *
      * @param modSlot Slot mod will fit into
      * @param isRandomisableSlot Will generate a randomised mod pool if true
      * @param modsParent Parent slot the item will be a part of
@@ -116,6 +115,13 @@ export declare class BotEquipmentModGenerator {
      * @returns ITemplateItem
      */
     protected chooseModToPutIntoSlot(modSlot: string, isRandomisableSlot: boolean, botWeaponSightWhitelist: Record<string, string[]>, botEquipBlacklist: EquipmentFilterDetails, itemModPool: Record<string, string[]>, weapon: Item[], ammoTpl: string, parentTemplate: ITemplateItem): [boolean, ITemplateItem];
+    /**
+     * Temp fix to prevent certain combinations of weapons with mods that are known to be incompatible
+     * @param weapon Weapon
+     * @param modTpl Mod to check compatibility with weapon
+     * @returns True if incompatible
+     */
+    protected weaponModComboIsIncompatible(weapon: Item[], modTpl: string): boolean;
     /**
      * Create a mod item with parameters as properties
      * @param modId _id

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

@@ -4,7 +4,7 @@ import { BotDifficultyHelper } from "@spt-aki/helpers/BotDifficultyHelper";
 import { BotHelper } from "@spt-aki/helpers/BotHelper";
 import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper";
 import { WeightedRandomHelper } from "@spt-aki/helpers/WeightedRandomHelper";
-import { IBaseJsonSkills, IBaseSkill, IBotBase, Info, Health as PmcHealth, Skills as botSkills } from "@spt-aki/models/eft/common/tables/IBotBase";
+import { Health as PmcHealth, IBaseJsonSkills, IBaseSkill, IBotBase, Info, Skills as botSkills } from "@spt-aki/models/eft/common/tables/IBotBase";
 import { Appearance, Health, IBotType } from "@spt-aki/models/eft/common/tables/IBotType";
 import { BotGenerationDetails } from "@spt-aki/models/spt/bots/BotGenerationDetails";
 import { IBotConfig } from "@spt-aki/models/spt/config/IBotConfig";

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

@@ -121,7 +121,6 @@ export declare class RagfairOfferGenerator {
      */
     generateDynamicOffers(expiredOffers?: Item[]): Promise<void>;
     /**
-     *
      * @param assortItemIndex Index of assort item
      * @param assortItemsToProcess Item array containing index
      * @param expiredOffers Currently expired offers on flea

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

@@ -6,6 +6,7 @@ import { RagfairServerHelper } from "@spt-aki/helpers/RagfairServerHelper";
 import { RepeatableQuestHelper } from "@spt-aki/helpers/RepeatableQuestHelper";
 import { Exit } from "@spt-aki/models/eft/common/ILocationBase";
 import { TraderInfo } from "@spt-aki/models/eft/common/tables/IBotBase";
+import { Item } from "@spt-aki/models/eft/common/tables/IItem";
 import { ICompletion, ICompletionAvailableFor, IElimination, IEliminationCondition, IExploration, IExplorationCondition, IPickup, IRepeatableQuest, IReward, IRewards } from "@spt-aki/models/eft/common/tables/IRepeatableQuests";
 import { ITemplateItem } from "@spt-aki/models/eft/common/tables/ITemplateItem";
 import { IBaseQuestConfig, IBossInfo, IEliminationConfig, IQuestConfig, IRepeatableQuestConfig } from "@spt-aki/models/spt/config/IQuestConfig";
@@ -105,11 +106,11 @@ export declare class RepeatableQuestGenerator {
      * A repeatable quest, besides some more or less static components, exists of reward and condition (see assets/database/templates/repeatableQuests.json)
      * This is a helper method for GenerateCompletionQuest to create a completion condition (of which a completion quest theoretically can have many)
      *
-     * @param   {string}    targetItemId    id of the item to request
+     * @param   {string}    itemTpl    id of the item to request
      * @param   {integer}   value           amount of items of this specific type to request
      * @returns {object}                    object of "Completion"-condition
      */
-    protected generateCompletionAvailableForFinish(targetItemId: string, value: number): ICompletionAvailableFor;
+    protected generateCompletionAvailableForFinish(itemTpl: string, value: number): ICompletionAvailableFor;
     /**
      * Generates a valid Exploration quest
      *
@@ -156,13 +157,26 @@ export declare class RepeatableQuestGenerator {
      * @returns {object}                        object of "Reward"-type that can be given for a repeatable mission
      */
     protected generateReward(pmcLevel: number, difficulty: number, traderId: string, repeatableConfig: IRepeatableQuestConfig, questConfig: IBaseQuestConfig): IRewards;
+    /**
+     * Should reward item have stack size increased (25% chance)
+     * @param item Item to possibly increase stack size of
+     * @param maxRoublePriceToStack Maximum rouble price an item can be to still be chosen for stacking
+     * @returns True if it should
+     */
+    protected canIncreaseRewardItemStackSize(item: ITemplateItem, maxRoublePriceToStack: number): boolean;
+    /**
+     * Get a randomised number a reward items stack size should be based on its handbook price
+     * @param item Reward item to get stack size for
+     * @returns Stack size value
+     */
+    protected getRandomisedRewardItemStackSizeByPrice(item: ITemplateItem): number;
     /**
      * Select a number of items that have a colelctive value of the passed in parameter
      * @param repeatableConfig Config
      * @param roublesBudget Total value of items to return
      * @returns Array of reward items that fit budget
      */
-    protected chooseRewardItemsWithinBudget(repeatableConfig: IRepeatableQuestConfig, roublesBudget: number): ITemplateItem[];
+    protected chooseRewardItemsWithinBudget(repeatableConfig: IRepeatableQuestConfig, roublesBudget: number, traderId: string): ITemplateItem[];
     /**
      * Helper to create a reward item structured as required by the client
      *
@@ -171,20 +185,20 @@ export declare class RepeatableQuestGenerator {
      * @param   {integer}   index           All rewards will be appended to a list, for unknown reasons the client wants the index
      * @returns {object}                    Object of "Reward"-item-type
      */
-    protected generateRewardItem(tpl: string, value: number, index: number, preset?: any): IReward;
+    protected generateRewardItem(tpl: string, value: number, index: number, preset?: Item[]): IReward;
     /**
      * Picks rewardable items from items.json. This means they need to fit into the inventory and they shouldn't be keys (debatable)
      * @param repeatableQuestConfig Config file
      * @returns List of rewardable items [[_tpl, itemTemplate],...]
      */
-    protected getRewardableItems(repeatableQuestConfig: IRepeatableQuestConfig): [string, ITemplateItem][];
+    protected getRewardableItems(repeatableQuestConfig: IRepeatableQuestConfig, traderId: string): [string, ITemplateItem][];
     /**
      * Checks if an id is a valid item. Valid meaning that it's an item that may be a reward
      * or content of bot loot. Items that are tested as valid may be in a player backpack or stash.
      * @param {string} tpl template id of item to check
      * @returns True if item is valid reward
      */
-    protected isValidRewardItem(tpl: string, repeatableQuestConfig: IRepeatableQuestConfig): boolean;
+    protected isValidRewardItem(tpl: string, repeatableQuestConfig: IRepeatableQuestConfig, itemBaseWhitelist: string[]): boolean;
     /**
      * Generates the base object of quest type format given as templates in assets/database/templates/repeatableQuests.json
      * The templates include Elimination, Completion and Extraction quest types

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

@@ -84,7 +84,6 @@ export declare class ScavCaseRewardGenerator {
         upd: Upd;
     }, rarity: string): void;
     /**
-     *
      * @param dbItems all items from the items.json
      * @param itemFilters controls how the dbItems will be filtered and returned (handbook price)
      * @returns filtered dbItems array

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

@@ -30,7 +30,7 @@ export declare class BotGeneratorHelper {
      * @param botRole Used by weapons to randomize the durability values. Null for non-equipped items
      * @returns Item Upd object with extra properties
      */
-    generateExtraPropertiesForItem(itemTemplate: ITemplateItem, botRole?: string): {
+    generateExtraPropertiesForItem(itemTemplate: ITemplateItem, botRole?: any): {
         upd?: Upd;
     };
     /**

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

@@ -86,13 +86,6 @@ export declare class InRaidHelper {
      * @param tradersClientProfile Client
      */
     protected applyTraderStandingAdjustments(tradersServerProfile: Record<string, TraderInfo>, tradersClientProfile: Record<string, TraderInfo>): void;
-    /**
-     * Some maps have one-time-use keys (e.g. Labs
-     * Remove the relevant key from an inventory based on the post-raid request data passed in
-     * @param offraidData post-raid data
-     * @param sessionID Session id
-     */
-    protected removeMapAccessKey(offraidData: ISaveProgressRequestData, sessionID: string): void;
     /**
      * Set the SPT inraid location Profile property to 'none'
      * @param sessionID Session id