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

@@ -13,6 +13,7 @@ import { LootRequest } from "@spt-aki/models/spt/services/LootRequest";
 import { ILogger } from "@spt-aki/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt-aki/servers/ConfigServer";
 import { DatabaseServer } from "@spt-aki/servers/DatabaseServer";
+import { ItemFilterService } from "@spt-aki/services/ItemFilterService";
 import { LocalisationService } from "@spt-aki/services/LocalisationService";
 import { RaidTimeAdjustmentService } from "@spt-aki/services/RaidTimeAdjustmentService";
 import { HashUtil } from "@spt-aki/utils/HashUtil";
@@ -28,6 +29,7 @@ export declare class LocationController {
     protected locationGenerator: LocationGenerator;
     protected localisationService: LocalisationService;
     protected raidTimeAdjustmentService: RaidTimeAdjustmentService;
+    protected itemFilterService: ItemFilterService;
     protected lootGenerator: LootGenerator;
     protected databaseServer: DatabaseServer;
     protected timeUtil: TimeUtil;
@@ -35,7 +37,7 @@ export declare class LocationController {
     protected applicationContext: ApplicationContext;
     protected airdropConfig: IAirdropConfig;
     protected locationConfig: ILocationConfig;
-    constructor(jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, logger: ILogger, locationGenerator: LocationGenerator, localisationService: LocalisationService, raidTimeAdjustmentService: RaidTimeAdjustmentService, lootGenerator: LootGenerator, databaseServer: DatabaseServer, timeUtil: TimeUtil, configServer: ConfigServer, applicationContext: ApplicationContext);
+    constructor(jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, logger: ILogger, locationGenerator: LocationGenerator, localisationService: LocalisationService, raidTimeAdjustmentService: RaidTimeAdjustmentService, itemFilterService: ItemFilterService, lootGenerator: LootGenerator, databaseServer: DatabaseServer, timeUtil: TimeUtil, configServer: ConfigServer, applicationContext: ApplicationContext);
     /**
      * Handle client/location/getLocalloot
      * Get a location (map) with generated loot data

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

@@ -105,7 +105,7 @@ export declare class RepeatableQuestGenerator {
     /**
      * Filter a maps exits to just those for the desired side
      * @param locationKey Map id (e.g. factory4_day)
-     * @param playerSide Scav/Bear
+     * @param playerSide Scav/Pmc
      * @returns Array of Exit objects
      */
     protected getLocationExitsForSide(locationKey: string, playerSide: string): Exit[];

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

@@ -3,7 +3,7 @@ import { ItemHelper } from "@spt-aki/helpers/ItemHelper";
 import { PaymentHelper } from "@spt-aki/helpers/PaymentHelper";
 import { QuestHelper } from "@spt-aki/helpers/QuestHelper";
 import { IPmcData, IPostRaidPmcData } from "@spt-aki/models/eft/common/IPmcData";
-import { IQuestStatus, TraderInfo, Victim } from "@spt-aki/models/eft/common/tables/IBotBase";
+import { IQuestStatus, TraderInfo } from "@spt-aki/models/eft/common/tables/IBotBase";
 import { Item } from "@spt-aki/models/eft/common/tables/IItem";
 import { ISaveProgressRequestData } from "@spt-aki/models/eft/inRaid/ISaveProgressRequestData";
 import { IInRaidConfig } from "@spt-aki/models/spt/config/IInRaidConfig";
@@ -47,20 +47,6 @@ export declare class InRaidHelper {
      * @param items Items array to check
      */
     addUpdToMoneyFromRaid(items: Item[]): void;
-    /**
-     * Add karma changes up and return the new value
-     * @param existingFenceStanding Current fence standing level
-     * @param victims Array of kills player performed
-     * @returns adjusted karma level after kills are taken into account
-     */
-    calculateFenceStandingChangeFromKillsAsScav(existingFenceStanding: number, victims: Victim[]): number;
-    protected getAdditionalLossForKill(fenceStanding: number, repChangeForKill: number): number;
-    /**
-     * Get the standing gain/loss for killing an npc
-     * @param victim Who was killed by player
-     * @returns a numerical standing gain or loss
-     */
-    protected getFenceStandingChangeForKillAsScav(victim: Victim): number;
     /**
      * Reset a profile to a baseline, used post-raid
      * Reset points earned during session property

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

@@ -59,6 +59,12 @@ export declare class ItemHelper {
      * @returns Does item have the possibility ot need soft inserts
      */
     armorItemCanHoldMods(itemTpl: string): boolean;
+    /**
+     * Does the provided item tpl need soft/removable inserts to function
+     * @param itemTpl Armor item
+     * @returns True if item needs some kind of insert
+     */
+    armorItemHasRemovableOrSoftInsertSlots(itemTpl: string): boolean;
     /**
      * Does the pased in tpl have ability to hold removable plate items
      * @param itemTpl item tpl to check for plate support

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

@@ -1,9 +1,10 @@
-import { ILocationBase } from "@spt-aki/models/eft/common/ILocationBase";
+import { Exit, ILocationBase } from "@spt-aki/models/eft/common/ILocationBase";
 import { ILooseLoot } from "@spt-aki/models/eft/common/ILooseLoot";
 export interface ILocation {
     base: ILocationBase;
     looseLoot: ILooseLoot;
     statics: IStaticContainer;
+    allExtracts: Exit[];
 }
 export interface IStaticContainer {
     containersGroups: Record<string, IContainerMinMax>;

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

@@ -205,6 +205,7 @@ export interface Exit {
     PassageRequirement: string;
     PlayersCount: number;
     RequirementTip: string;
+    Side?: string;
 }
 export interface MaxItemCountInLocation {
     TemplateId: string;

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

@@ -182,6 +182,7 @@ export interface IEftStats {
     LastPlayerState?: LastPlayerState;
     TotalInGameTime: number;
     SurvivorClass?: string;
+    sptLastRaidFenceRepChange?: number;
 }
 export interface IDroppedItem {
     QuestId: string;

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

@@ -3,6 +3,8 @@ export interface IItemConfig extends IBaseConfig {
     kind: "aki-item";
     /** Items that should be globally blacklisted */
     blacklist: string[];
+    /** items that should not be given as rewards */
+    rewardItemBlacklist: string[];
     /** Items that can only be found on bosses */
     bossItems: string[];
     handbookPriceOverride: Record<string, number>;

TypeScript/10ScopesAndTypes/types/models/spt/logging/LogTextColor.d.ts

@@ -7,5 +7,5 @@ export declare enum LogTextColor {
     MAGENTA = "magenta",
     CYAN = "cyan",
     WHITE = "white",
-    GRAY = ""
+    GRAY = "gray"
 }

TypeScript/10ScopesAndTypes/types/models/spt/server/ILocations.d.ts

@@ -1,28 +1,23 @@
-import { ILocationBase } from "@spt-aki/models/eft/common/ILocationBase";
+import { ILocation } from "@spt-aki/models/eft/common/ILocation";
-import { ILooseLoot } from "@spt-aki/models/eft/common/ILooseLoot";
 import { ILocationsBase } from "@spt-aki/models/eft/common/tables/ILocationsBase";
 export interface ILocations {
-    bigmap?: ILocationData;
+    bigmap?: ILocation;
-    develop?: ILocationData;
+    develop?: ILocation;
-    factory4_day?: ILocationData;
+    factory4_day?: ILocation;
-    factory4_night?: ILocationData;
+    factory4_night?: ILocation;
-    hideout?: ILocationData;
+    hideout?: ILocation;
-    interchange?: ILocationData;
+    interchange?: ILocation;
-    laboratory?: ILocationData;
+    laboratory?: ILocation;
-    lighthouse?: ILocationData;
+    lighthouse?: ILocation;
-    privatearea?: ILocationData;
+    privatearea?: ILocation;
-    rezervbase?: ILocationData;
+    rezervbase?: ILocation;
-    shoreline?: ILocationData;
+    shoreline?: ILocation;
-    suburbs?: ILocationData;
+    suburbs?: ILocation;
-    tarkovstreets?: ILocationData;
+    tarkovstreets?: ILocation;
-    terminal?: ILocationData;
+    terminal?: ILocation;
-    town?: ILocationData;
+    town?: ILocation;
-    woods?: ILocationData;
+    woods?: ILocation;
-    sandbox?: ILocationData;
+    sandbox?: ILocation;
     /** Holds a mapping of the linkages between locations on the UI */
     base?: ILocationsBase;
 }
-export interface ILocationData {
-    base: ILocationBase;
-    looseLoot?: ILooseLoot;
-}

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

@@ -15,6 +15,17 @@ export declare class ItemFilterService {
      * @returns true if blacklisted
      */
     isItemBlacklisted(tpl: string): boolean;
+    /**
+     * Check if item is blacklisted from being a reward for player
+     * @param tpl item tpl to check is on blacklist
+     * @returns True when blacklisted
+     */
+    isItemRewardBlacklisted(tpl: string): boolean;
+    /**
+     * Get an array of items that should never be given as a reward to player
+     * @returns string array of item tpls
+     */
+    getItemRewardBlacklist(): string[];
     /**
      * Return every template id blacklisted in config/item.json
      * @returns string array of blacklisted tempalte ids

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

@@ -40,6 +40,4 @@ export declare class Watermark {
     protected resetCursor(): void;
     /** Draw the watermark */
     protected draw(): void;
-    /** Caculate text length */
-    protected textLength(s: string): number;
 }

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

@@ -13,6 +13,7 @@ import { LootRequest } from "@spt-aki/models/spt/services/LootRequest";
 import { ILogger } from "@spt-aki/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt-aki/servers/ConfigServer";
 import { DatabaseServer } from "@spt-aki/servers/DatabaseServer";
+import { ItemFilterService } from "@spt-aki/services/ItemFilterService";
 import { LocalisationService } from "@spt-aki/services/LocalisationService";
 import { RaidTimeAdjustmentService } from "@spt-aki/services/RaidTimeAdjustmentService";
 import { HashUtil } from "@spt-aki/utils/HashUtil";
@@ -28,6 +29,7 @@ export declare class LocationController {
     protected locationGenerator: LocationGenerator;
     protected localisationService: LocalisationService;
     protected raidTimeAdjustmentService: RaidTimeAdjustmentService;
+    protected itemFilterService: ItemFilterService;
     protected lootGenerator: LootGenerator;
     protected databaseServer: DatabaseServer;
     protected timeUtil: TimeUtil;
@@ -35,7 +37,7 @@ export declare class LocationController {
     protected applicationContext: ApplicationContext;
     protected airdropConfig: IAirdropConfig;
     protected locationConfig: ILocationConfig;
-    constructor(jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, logger: ILogger, locationGenerator: LocationGenerator, localisationService: LocalisationService, raidTimeAdjustmentService: RaidTimeAdjustmentService, lootGenerator: LootGenerator, databaseServer: DatabaseServer, timeUtil: TimeUtil, configServer: ConfigServer, applicationContext: ApplicationContext);
+    constructor(jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, logger: ILogger, locationGenerator: LocationGenerator, localisationService: LocalisationService, raidTimeAdjustmentService: RaidTimeAdjustmentService, itemFilterService: ItemFilterService, lootGenerator: LootGenerator, databaseServer: DatabaseServer, timeUtil: TimeUtil, configServer: ConfigServer, applicationContext: ApplicationContext);
     /**
      * Handle client/location/getLocalloot
      * Get a location (map) with generated loot data

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

@@ -105,7 +105,7 @@ export declare class RepeatableQuestGenerator {
     /**
      * Filter a maps exits to just those for the desired side
      * @param locationKey Map id (e.g. factory4_day)
-     * @param playerSide Scav/Bear
+     * @param playerSide Scav/Pmc
      * @returns Array of Exit objects
      */
     protected getLocationExitsForSide(locationKey: string, playerSide: string): Exit[];

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

@@ -3,7 +3,7 @@ import { ItemHelper } from "@spt-aki/helpers/ItemHelper";
 import { PaymentHelper } from "@spt-aki/helpers/PaymentHelper";
 import { QuestHelper } from "@spt-aki/helpers/QuestHelper";
 import { IPmcData, IPostRaidPmcData } from "@spt-aki/models/eft/common/IPmcData";
-import { IQuestStatus, TraderInfo, Victim } from "@spt-aki/models/eft/common/tables/IBotBase";
+import { IQuestStatus, TraderInfo } from "@spt-aki/models/eft/common/tables/IBotBase";
 import { Item } from "@spt-aki/models/eft/common/tables/IItem";
 import { ISaveProgressRequestData } from "@spt-aki/models/eft/inRaid/ISaveProgressRequestData";
 import { IInRaidConfig } from "@spt-aki/models/spt/config/IInRaidConfig";
@@ -47,20 +47,6 @@ export declare class InRaidHelper {
      * @param items Items array to check
      */
     addUpdToMoneyFromRaid(items: Item[]): void;
-    /**
-     * Add karma changes up and return the new value
-     * @param existingFenceStanding Current fence standing level
-     * @param victims Array of kills player performed
-     * @returns adjusted karma level after kills are taken into account
-     */
-    calculateFenceStandingChangeFromKillsAsScav(existingFenceStanding: number, victims: Victim[]): number;
-    protected getAdditionalLossForKill(fenceStanding: number, repChangeForKill: number): number;
-    /**
-     * Get the standing gain/loss for killing an npc
-     * @param victim Who was killed by player
-     * @returns a numerical standing gain or loss
-     */
-    protected getFenceStandingChangeForKillAsScav(victim: Victim): number;
     /**
      * Reset a profile to a baseline, used post-raid
      * Reset points earned during session property

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

@@ -59,6 +59,12 @@ export declare class ItemHelper {
      * @returns Does item have the possibility ot need soft inserts
      */
     armorItemCanHoldMods(itemTpl: string): boolean;
+    /**
+     * Does the provided item tpl need soft/removable inserts to function
+     * @param itemTpl Armor item
+     * @returns True if item needs some kind of insert
+     */
+    armorItemHasRemovableOrSoftInsertSlots(itemTpl: string): boolean;
     /**
      * Does the pased in tpl have ability to hold removable plate items
      * @param itemTpl item tpl to check for plate support

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

@@ -1,9 +1,10 @@
-import { ILocationBase } from "@spt-aki/models/eft/common/ILocationBase";
+import { Exit, ILocationBase } from "@spt-aki/models/eft/common/ILocationBase";
 import { ILooseLoot } from "@spt-aki/models/eft/common/ILooseLoot";
 export interface ILocation {
     base: ILocationBase;
     looseLoot: ILooseLoot;
     statics: IStaticContainer;
+    allExtracts: Exit[];
 }
 export interface IStaticContainer {
     containersGroups: Record<string, IContainerMinMax>;

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

@@ -205,6 +205,7 @@ export interface Exit {
     PassageRequirement: string;
     PlayersCount: number;
     RequirementTip: string;
+    Side?: string;
 }
 export interface MaxItemCountInLocation {
     TemplateId: string;

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

@@ -182,6 +182,7 @@ export interface IEftStats {
     LastPlayerState?: LastPlayerState;
     TotalInGameTime: number;
     SurvivorClass?: string;
+    sptLastRaidFenceRepChange?: number;
 }
 export interface IDroppedItem {
     QuestId: string;

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

@@ -3,6 +3,8 @@ export interface IItemConfig extends IBaseConfig {
     kind: "aki-item";
     /** Items that should be globally blacklisted */
     blacklist: string[];
+    /** items that should not be given as rewards */
+    rewardItemBlacklist: string[];
     /** Items that can only be found on bosses */
     bossItems: string[];
     handbookPriceOverride: Record<string, number>;

TypeScript/11BundleLoadingSample/types/models/spt/logging/LogTextColor.d.ts

@@ -7,5 +7,5 @@ export declare enum LogTextColor {
     MAGENTA = "magenta",
     CYAN = "cyan",
     WHITE = "white",
-    GRAY = ""
+    GRAY = "gray"
 }

TypeScript/11BundleLoadingSample/types/models/spt/server/ILocations.d.ts

@@ -1,28 +1,23 @@
-import { ILocationBase } from "@spt-aki/models/eft/common/ILocationBase";
+import { ILocation } from "@spt-aki/models/eft/common/ILocation";
-import { ILooseLoot } from "@spt-aki/models/eft/common/ILooseLoot";
 import { ILocationsBase } from "@spt-aki/models/eft/common/tables/ILocationsBase";
 export interface ILocations {
-    bigmap?: ILocationData;
+    bigmap?: ILocation;
-    develop?: ILocationData;
+    develop?: ILocation;
-    factory4_day?: ILocationData;
+    factory4_day?: ILocation;
-    factory4_night?: ILocationData;
+    factory4_night?: ILocation;
-    hideout?: ILocationData;
+    hideout?: ILocation;
-    interchange?: ILocationData;
+    interchange?: ILocation;
-    laboratory?: ILocationData;
+    laboratory?: ILocation;
-    lighthouse?: ILocationData;
+    lighthouse?: ILocation;
-    privatearea?: ILocationData;
+    privatearea?: ILocation;
-    rezervbase?: ILocationData;
+    rezervbase?: ILocation;
-    shoreline?: ILocationData;
+    shoreline?: ILocation;
-    suburbs?: ILocationData;
+    suburbs?: ILocation;
-    tarkovstreets?: ILocationData;
+    tarkovstreets?: ILocation;
-    terminal?: ILocationData;
+    terminal?: ILocation;
-    town?: ILocationData;
+    town?: ILocation;
-    woods?: ILocationData;
+    woods?: ILocation;
-    sandbox?: ILocationData;
+    sandbox?: ILocation;
     /** Holds a mapping of the linkages between locations on the UI */
     base?: ILocationsBase;
 }
-export interface ILocationData {
-    base: ILocationBase;
-    looseLoot?: ILooseLoot;
-}

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

@@ -15,6 +15,17 @@ export declare class ItemFilterService {
      * @returns true if blacklisted
      */
     isItemBlacklisted(tpl: string): boolean;
+    /**
+     * Check if item is blacklisted from being a reward for player
+     * @param tpl item tpl to check is on blacklist
+     * @returns True when blacklisted
+     */
+    isItemRewardBlacklisted(tpl: string): boolean;
+    /**
+     * Get an array of items that should never be given as a reward to player
+     * @returns string array of item tpls
+     */
+    getItemRewardBlacklist(): string[];
     /**
      * Return every template id blacklisted in config/item.json
      * @returns string array of blacklisted tempalte ids

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

@@ -40,6 +40,4 @@ export declare class Watermark {
     protected resetCursor(): void;
     /** Draw the watermark */
     protected draw(): void;
-    /** Caculate text length */
-    protected textLength(s: string): number;
 }

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

@@ -13,6 +13,7 @@ import { LootRequest } from "@spt-aki/models/spt/services/LootRequest";
 import { ILogger } from "@spt-aki/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt-aki/servers/ConfigServer";
 import { DatabaseServer } from "@spt-aki/servers/DatabaseServer";
+import { ItemFilterService } from "@spt-aki/services/ItemFilterService";
 import { LocalisationService } from "@spt-aki/services/LocalisationService";
 import { RaidTimeAdjustmentService } from "@spt-aki/services/RaidTimeAdjustmentService";
 import { HashUtil } from "@spt-aki/utils/HashUtil";
@@ -28,6 +29,7 @@ export declare class LocationController {
     protected locationGenerator: LocationGenerator;
     protected localisationService: LocalisationService;
     protected raidTimeAdjustmentService: RaidTimeAdjustmentService;
+    protected itemFilterService: ItemFilterService;
     protected lootGenerator: LootGenerator;
     protected databaseServer: DatabaseServer;
     protected timeUtil: TimeUtil;
@@ -35,7 +37,7 @@ export declare class LocationController {
     protected applicationContext: ApplicationContext;
     protected airdropConfig: IAirdropConfig;
     protected locationConfig: ILocationConfig;
-    constructor(jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, logger: ILogger, locationGenerator: LocationGenerator, localisationService: LocalisationService, raidTimeAdjustmentService: RaidTimeAdjustmentService, lootGenerator: LootGenerator, databaseServer: DatabaseServer, timeUtil: TimeUtil, configServer: ConfigServer, applicationContext: ApplicationContext);
+    constructor(jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, logger: ILogger, locationGenerator: LocationGenerator, localisationService: LocalisationService, raidTimeAdjustmentService: RaidTimeAdjustmentService, itemFilterService: ItemFilterService, lootGenerator: LootGenerator, databaseServer: DatabaseServer, timeUtil: TimeUtil, configServer: ConfigServer, applicationContext: ApplicationContext);
     /**
      * Handle client/location/getLocalloot
      * Get a location (map) with generated loot data

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

@@ -105,7 +105,7 @@ export declare class RepeatableQuestGenerator {
     /**
      * Filter a maps exits to just those for the desired side
      * @param locationKey Map id (e.g. factory4_day)
-     * @param playerSide Scav/Bear
+     * @param playerSide Scav/Pmc
      * @returns Array of Exit objects
      */
     protected getLocationExitsForSide(locationKey: string, playerSide: string): Exit[];

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

@@ -3,7 +3,7 @@ import { ItemHelper } from "@spt-aki/helpers/ItemHelper";
 import { PaymentHelper } from "@spt-aki/helpers/PaymentHelper";
 import { QuestHelper } from "@spt-aki/helpers/QuestHelper";
 import { IPmcData, IPostRaidPmcData } from "@spt-aki/models/eft/common/IPmcData";
-import { IQuestStatus, TraderInfo, Victim } from "@spt-aki/models/eft/common/tables/IBotBase";
+import { IQuestStatus, TraderInfo } from "@spt-aki/models/eft/common/tables/IBotBase";
 import { Item } from "@spt-aki/models/eft/common/tables/IItem";
 import { ISaveProgressRequestData } from "@spt-aki/models/eft/inRaid/ISaveProgressRequestData";
 import { IInRaidConfig } from "@spt-aki/models/spt/config/IInRaidConfig";
@@ -47,20 +47,6 @@ export declare class InRaidHelper {
      * @param items Items array to check
      */
     addUpdToMoneyFromRaid(items: Item[]): void;
-    /**
-     * Add karma changes up and return the new value
-     * @param existingFenceStanding Current fence standing level
-     * @param victims Array of kills player performed
-     * @returns adjusted karma level after kills are taken into account
-     */
-    calculateFenceStandingChangeFromKillsAsScav(existingFenceStanding: number, victims: Victim[]): number;
-    protected getAdditionalLossForKill(fenceStanding: number, repChangeForKill: number): number;
-    /**
-     * Get the standing gain/loss for killing an npc
-     * @param victim Who was killed by player
-     * @returns a numerical standing gain or loss
-     */
-    protected getFenceStandingChangeForKillAsScav(victim: Victim): number;
     /**
      * Reset a profile to a baseline, used post-raid
      * Reset points earned during session property

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

@@ -59,6 +59,12 @@ export declare class ItemHelper {
      * @returns Does item have the possibility ot need soft inserts
      */
     armorItemCanHoldMods(itemTpl: string): boolean;
+    /**
+     * Does the provided item tpl need soft/removable inserts to function
+     * @param itemTpl Armor item
+     * @returns True if item needs some kind of insert
+     */
+    armorItemHasRemovableOrSoftInsertSlots(itemTpl: string): boolean;
     /**
      * Does the pased in tpl have ability to hold removable plate items
      * @param itemTpl item tpl to check for plate support

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

@@ -1,9 +1,10 @@
-import { ILocationBase } from "@spt-aki/models/eft/common/ILocationBase";
+import { Exit, ILocationBase } from "@spt-aki/models/eft/common/ILocationBase";
 import { ILooseLoot } from "@spt-aki/models/eft/common/ILooseLoot";
 export interface ILocation {
     base: ILocationBase;
     looseLoot: ILooseLoot;
     statics: IStaticContainer;
+    allExtracts: Exit[];
 }
 export interface IStaticContainer {
     containersGroups: Record<string, IContainerMinMax>;

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

@@ -205,6 +205,7 @@ export interface Exit {
     PassageRequirement: string;
     PlayersCount: number;
     RequirementTip: string;
+    Side?: string;
 }
 export interface MaxItemCountInLocation {
     TemplateId: string;

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

@@ -182,6 +182,7 @@ export interface IEftStats {
     LastPlayerState?: LastPlayerState;
     TotalInGameTime: number;
     SurvivorClass?: string;
+    sptLastRaidFenceRepChange?: number;
 }
 export interface IDroppedItem {
     QuestId: string;

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

@@ -3,6 +3,8 @@ export interface IItemConfig extends IBaseConfig {
     kind: "aki-item";
     /** Items that should be globally blacklisted */
     blacklist: string[];
+    /** items that should not be given as rewards */
+    rewardItemBlacklist: string[];
     /** Items that can only be found on bosses */
     bossItems: string[];
     handbookPriceOverride: Record<string, number>;

TypeScript/12ClassExtensionOverride/types/models/spt/logging/LogTextColor.d.ts

@@ -7,5 +7,5 @@ export declare enum LogTextColor {
     MAGENTA = "magenta",
     CYAN = "cyan",
     WHITE = "white",
-    GRAY = ""
+    GRAY = "gray"
 }

TypeScript/12ClassExtensionOverride/types/models/spt/server/ILocations.d.ts

@@ -1,28 +1,23 @@
-import { ILocationBase } from "@spt-aki/models/eft/common/ILocationBase";
+import { ILocation } from "@spt-aki/models/eft/common/ILocation";
-import { ILooseLoot } from "@spt-aki/models/eft/common/ILooseLoot";
 import { ILocationsBase } from "@spt-aki/models/eft/common/tables/ILocationsBase";
 export interface ILocations {
-    bigmap?: ILocationData;
+    bigmap?: ILocation;
-    develop?: ILocationData;
+    develop?: ILocation;
-    factory4_day?: ILocationData;
+    factory4_day?: ILocation;
-    factory4_night?: ILocationData;
+    factory4_night?: ILocation;
-    hideout?: ILocationData;
+    hideout?: ILocation;
-    interchange?: ILocationData;
+    interchange?: ILocation;
-    laboratory?: ILocationData;
+    laboratory?: ILocation;
-    lighthouse?: ILocationData;
+    lighthouse?: ILocation;
-    privatearea?: ILocationData;
+    privatearea?: ILocation;
-    rezervbase?: ILocationData;
+    rezervbase?: ILocation;
-    shoreline?: ILocationData;
+    shoreline?: ILocation;
-    suburbs?: ILocationData;
+    suburbs?: ILocation;
-    tarkovstreets?: ILocationData;
+    tarkovstreets?: ILocation;
-    terminal?: ILocationData;
+    terminal?: ILocation;
-    town?: ILocationData;
+    town?: ILocation;
-    woods?: ILocationData;
+    woods?: ILocation;
-    sandbox?: ILocationData;
+    sandbox?: ILocation;
     /** Holds a mapping of the linkages between locations on the UI */
     base?: ILocationsBase;
 }
-export interface ILocationData {
-    base: ILocationBase;
-    looseLoot?: ILooseLoot;
-}

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

@@ -15,6 +15,17 @@ export declare class ItemFilterService {
      * @returns true if blacklisted
      */
     isItemBlacklisted(tpl: string): boolean;
+    /**
+     * Check if item is blacklisted from being a reward for player
+     * @param tpl item tpl to check is on blacklist
+     * @returns True when blacklisted
+     */
+    isItemRewardBlacklisted(tpl: string): boolean;
+    /**
+     * Get an array of items that should never be given as a reward to player
+     * @returns string array of item tpls
+     */
+    getItemRewardBlacklist(): string[];
     /**
      * Return every template id blacklisted in config/item.json
      * @returns string array of blacklisted tempalte ids

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

@@ -40,6 +40,4 @@ export declare class Watermark {
     protected resetCursor(): void;
     /** Draw the watermark */
     protected draw(): void;
-    /** Caculate text length */
-    protected textLength(s: string): number;
 }

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

@@ -13,6 +13,7 @@ import { LootRequest } from "@spt-aki/models/spt/services/LootRequest";
 import { ILogger } from "@spt-aki/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt-aki/servers/ConfigServer";
 import { DatabaseServer } from "@spt-aki/servers/DatabaseServer";
+import { ItemFilterService } from "@spt-aki/services/ItemFilterService";
 import { LocalisationService } from "@spt-aki/services/LocalisationService";
 import { RaidTimeAdjustmentService } from "@spt-aki/services/RaidTimeAdjustmentService";
 import { HashUtil } from "@spt-aki/utils/HashUtil";
@@ -28,6 +29,7 @@ export declare class LocationController {
     protected locationGenerator: LocationGenerator;
     protected localisationService: LocalisationService;
     protected raidTimeAdjustmentService: RaidTimeAdjustmentService;
+    protected itemFilterService: ItemFilterService;
     protected lootGenerator: LootGenerator;
     protected databaseServer: DatabaseServer;
     protected timeUtil: TimeUtil;
@@ -35,7 +37,7 @@ export declare class LocationController {
     protected applicationContext: ApplicationContext;
     protected airdropConfig: IAirdropConfig;
     protected locationConfig: ILocationConfig;
-    constructor(jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, logger: ILogger, locationGenerator: LocationGenerator, localisationService: LocalisationService, raidTimeAdjustmentService: RaidTimeAdjustmentService, lootGenerator: LootGenerator, databaseServer: DatabaseServer, timeUtil: TimeUtil, configServer: ConfigServer, applicationContext: ApplicationContext);
+    constructor(jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, logger: ILogger, locationGenerator: LocationGenerator, localisationService: LocalisationService, raidTimeAdjustmentService: RaidTimeAdjustmentService, itemFilterService: ItemFilterService, lootGenerator: LootGenerator, databaseServer: DatabaseServer, timeUtil: TimeUtil, configServer: ConfigServer, applicationContext: ApplicationContext);
     /**
      * Handle client/location/getLocalloot
      * Get a location (map) with generated loot data

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

@@ -105,7 +105,7 @@ export declare class RepeatableQuestGenerator {
     /**
      * Filter a maps exits to just those for the desired side
      * @param locationKey Map id (e.g. factory4_day)
-     * @param playerSide Scav/Bear
+     * @param playerSide Scav/Pmc
      * @returns Array of Exit objects
      */
     protected getLocationExitsForSide(locationKey: string, playerSide: string): Exit[];

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

@@ -3,7 +3,7 @@ import { ItemHelper } from "@spt-aki/helpers/ItemHelper";
 import { PaymentHelper } from "@spt-aki/helpers/PaymentHelper";
 import { QuestHelper } from "@spt-aki/helpers/QuestHelper";
 import { IPmcData, IPostRaidPmcData } from "@spt-aki/models/eft/common/IPmcData";
-import { IQuestStatus, TraderInfo, Victim } from "@spt-aki/models/eft/common/tables/IBotBase";
+import { IQuestStatus, TraderInfo } from "@spt-aki/models/eft/common/tables/IBotBase";
 import { Item } from "@spt-aki/models/eft/common/tables/IItem";
 import { ISaveProgressRequestData } from "@spt-aki/models/eft/inRaid/ISaveProgressRequestData";
 import { IInRaidConfig } from "@spt-aki/models/spt/config/IInRaidConfig";
@@ -47,20 +47,6 @@ export declare class InRaidHelper {
      * @param items Items array to check
      */
     addUpdToMoneyFromRaid(items: Item[]): void;
-    /**
-     * Add karma changes up and return the new value
-     * @param existingFenceStanding Current fence standing level
-     * @param victims Array of kills player performed
-     * @returns adjusted karma level after kills are taken into account
-     */
-    calculateFenceStandingChangeFromKillsAsScav(existingFenceStanding: number, victims: Victim[]): number;
-    protected getAdditionalLossForKill(fenceStanding: number, repChangeForKill: number): number;
-    /**
-     * Get the standing gain/loss for killing an npc
-     * @param victim Who was killed by player
-     * @returns a numerical standing gain or loss
-     */
-    protected getFenceStandingChangeForKillAsScav(victim: Victim): number;
     /**
      * Reset a profile to a baseline, used post-raid
      * Reset points earned during session property

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

@@ -59,6 +59,12 @@ export declare class ItemHelper {
      * @returns Does item have the possibility ot need soft inserts
      */
     armorItemCanHoldMods(itemTpl: string): boolean;
+    /**
+     * Does the provided item tpl need soft/removable inserts to function
+     * @param itemTpl Armor item
+     * @returns True if item needs some kind of insert
+     */
+    armorItemHasRemovableOrSoftInsertSlots(itemTpl: string): boolean;
     /**
      * Does the pased in tpl have ability to hold removable plate items
      * @param itemTpl item tpl to check for plate support

TypeScript/13AddTrader/types/models/eft/common/ILocation.d.ts

@@ -1,9 +1,10 @@
-import { ILocationBase } from "@spt-aki/models/eft/common/ILocationBase";
+import { Exit, ILocationBase } from "@spt-aki/models/eft/common/ILocationBase";
 import { ILooseLoot } from "@spt-aki/models/eft/common/ILooseLoot";
 export interface ILocation {
     base: ILocationBase;
     looseLoot: ILooseLoot;
     statics: IStaticContainer;
+    allExtracts: Exit[];
 }
 export interface IStaticContainer {
     containersGroups: Record<string, IContainerMinMax>;

TypeScript/13AddTrader/types/models/eft/common/ILocationBase.d.ts

@@ -205,6 +205,7 @@ export interface Exit {
     PassageRequirement: string;
     PlayersCount: number;
     RequirementTip: string;
+    Side?: string;
 }
 export interface MaxItemCountInLocation {
     TemplateId: string;

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

@@ -182,6 +182,7 @@ export interface IEftStats {
     LastPlayerState?: LastPlayerState;
     TotalInGameTime: number;
     SurvivorClass?: string;
+    sptLastRaidFenceRepChange?: number;
 }
 export interface IDroppedItem {
     QuestId: string;

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

@@ -3,6 +3,8 @@ export interface IItemConfig extends IBaseConfig {
     kind: "aki-item";
     /** Items that should be globally blacklisted */
     blacklist: string[];
+    /** items that should not be given as rewards */
+    rewardItemBlacklist: string[];
     /** Items that can only be found on bosses */
     bossItems: string[];
     handbookPriceOverride: Record<string, number>;

TypeScript/13AddTrader/types/models/spt/logging/LogTextColor.d.ts

@@ -7,5 +7,5 @@ export declare enum LogTextColor {
     MAGENTA = "magenta",
     CYAN = "cyan",
     WHITE = "white",
-    GRAY = ""
+    GRAY = "gray"
 }

TypeScript/13AddTrader/types/models/spt/server/ILocations.d.ts

@@ -1,28 +1,23 @@
-import { ILocationBase } from "@spt-aki/models/eft/common/ILocationBase";
+import { ILocation } from "@spt-aki/models/eft/common/ILocation";
-import { ILooseLoot } from "@spt-aki/models/eft/common/ILooseLoot";
 import { ILocationsBase } from "@spt-aki/models/eft/common/tables/ILocationsBase";
 export interface ILocations {
-    bigmap?: ILocationData;
+    bigmap?: ILocation;
-    develop?: ILocationData;
+    develop?: ILocation;
-    factory4_day?: ILocationData;
+    factory4_day?: ILocation;
-    factory4_night?: ILocationData;
+    factory4_night?: ILocation;
-    hideout?: ILocationData;
+    hideout?: ILocation;
-    interchange?: ILocationData;
+    interchange?: ILocation;
-    laboratory?: ILocationData;
+    laboratory?: ILocation;
-    lighthouse?: ILocationData;
+    lighthouse?: ILocation;
-    privatearea?: ILocationData;
+    privatearea?: ILocation;
-    rezervbase?: ILocationData;
+    rezervbase?: ILocation;
-    shoreline?: ILocationData;
+    shoreline?: ILocation;
-    suburbs?: ILocationData;
+    suburbs?: ILocation;
-    tarkovstreets?: ILocationData;
+    tarkovstreets?: ILocation;
-    terminal?: ILocationData;
+    terminal?: ILocation;
-    town?: ILocationData;
+    town?: ILocation;
-    woods?: ILocationData;
+    woods?: ILocation;
-    sandbox?: ILocationData;
+    sandbox?: ILocation;
     /** Holds a mapping of the linkages between locations on the UI */
     base?: ILocationsBase;
 }
-export interface ILocationData {
-    base: ILocationBase;
-    looseLoot?: ILooseLoot;
-}

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

@@ -15,6 +15,17 @@ export declare class ItemFilterService {
      * @returns true if blacklisted
      */
     isItemBlacklisted(tpl: string): boolean;
+    /**
+     * Check if item is blacklisted from being a reward for player
+     * @param tpl item tpl to check is on blacklist
+     * @returns True when blacklisted
+     */
+    isItemRewardBlacklisted(tpl: string): boolean;
+    /**
+     * Get an array of items that should never be given as a reward to player
+     * @returns string array of item tpls
+     */
+    getItemRewardBlacklist(): string[];
     /**
      * Return every template id blacklisted in config/item.json
      * @returns string array of blacklisted tempalte ids

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

@@ -40,6 +40,4 @@ export declare class Watermark {
     protected resetCursor(): void;
     /** Draw the watermark */
     protected draw(): void;
-    /** Caculate text length */
-    protected textLength(s: string): number;
 }

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

@@ -13,6 +13,7 @@ import { LootRequest } from "@spt-aki/models/spt/services/LootRequest";
 import { ILogger } from "@spt-aki/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt-aki/servers/ConfigServer";
 import { DatabaseServer } from "@spt-aki/servers/DatabaseServer";
+import { ItemFilterService } from "@spt-aki/services/ItemFilterService";
 import { LocalisationService } from "@spt-aki/services/LocalisationService";
 import { RaidTimeAdjustmentService } from "@spt-aki/services/RaidTimeAdjustmentService";
 import { HashUtil } from "@spt-aki/utils/HashUtil";
@@ -28,6 +29,7 @@ export declare class LocationController {
     protected locationGenerator: LocationGenerator;
     protected localisationService: LocalisationService;
     protected raidTimeAdjustmentService: RaidTimeAdjustmentService;
+    protected itemFilterService: ItemFilterService;
     protected lootGenerator: LootGenerator;
     protected databaseServer: DatabaseServer;
     protected timeUtil: TimeUtil;
@@ -35,7 +37,7 @@ export declare class LocationController {
     protected applicationContext: ApplicationContext;
     protected airdropConfig: IAirdropConfig;
     protected locationConfig: ILocationConfig;
-    constructor(jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, logger: ILogger, locationGenerator: LocationGenerator, localisationService: LocalisationService, raidTimeAdjustmentService: RaidTimeAdjustmentService, lootGenerator: LootGenerator, databaseServer: DatabaseServer, timeUtil: TimeUtil, configServer: ConfigServer, applicationContext: ApplicationContext);
+    constructor(jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, logger: ILogger, locationGenerator: LocationGenerator, localisationService: LocalisationService, raidTimeAdjustmentService: RaidTimeAdjustmentService, itemFilterService: ItemFilterService, lootGenerator: LootGenerator, databaseServer: DatabaseServer, timeUtil: TimeUtil, configServer: ConfigServer, applicationContext: ApplicationContext);
     /**
      * Handle client/location/getLocalloot
      * Get a location (map) with generated loot data

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

@@ -105,7 +105,7 @@ export declare class RepeatableQuestGenerator {
     /**
      * Filter a maps exits to just those for the desired side
      * @param locationKey Map id (e.g. factory4_day)
-     * @param playerSide Scav/Bear
+     * @param playerSide Scav/Pmc
      * @returns Array of Exit objects
      */
     protected getLocationExitsForSide(locationKey: string, playerSide: string): Exit[];

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

@@ -3,7 +3,7 @@ import { ItemHelper } from "@spt-aki/helpers/ItemHelper";
 import { PaymentHelper } from "@spt-aki/helpers/PaymentHelper";
 import { QuestHelper } from "@spt-aki/helpers/QuestHelper";
 import { IPmcData, IPostRaidPmcData } from "@spt-aki/models/eft/common/IPmcData";
-import { IQuestStatus, TraderInfo, Victim } from "@spt-aki/models/eft/common/tables/IBotBase";
+import { IQuestStatus, TraderInfo } from "@spt-aki/models/eft/common/tables/IBotBase";
 import { Item } from "@spt-aki/models/eft/common/tables/IItem";
 import { ISaveProgressRequestData } from "@spt-aki/models/eft/inRaid/ISaveProgressRequestData";
 import { IInRaidConfig } from "@spt-aki/models/spt/config/IInRaidConfig";
@@ -47,20 +47,6 @@ export declare class InRaidHelper {
      * @param items Items array to check
      */
     addUpdToMoneyFromRaid(items: Item[]): void;
-    /**
-     * Add karma changes up and return the new value
-     * @param existingFenceStanding Current fence standing level
-     * @param victims Array of kills player performed
-     * @returns adjusted karma level after kills are taken into account
-     */
-    calculateFenceStandingChangeFromKillsAsScav(existingFenceStanding: number, victims: Victim[]): number;
-    protected getAdditionalLossForKill(fenceStanding: number, repChangeForKill: number): number;
-    /**
-     * Get the standing gain/loss for killing an npc
-     * @param victim Who was killed by player
-     * @returns a numerical standing gain or loss
-     */
-    protected getFenceStandingChangeForKillAsScav(victim: Victim): number;
     /**
      * Reset a profile to a baseline, used post-raid
      * Reset points earned during session property

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

@@ -59,6 +59,12 @@ export declare class ItemHelper {
      * @returns Does item have the possibility ot need soft inserts
      */
     armorItemCanHoldMods(itemTpl: string): boolean;
+    /**
+     * Does the provided item tpl need soft/removable inserts to function
+     * @param itemTpl Armor item
+     * @returns True if item needs some kind of insert
+     */
+    armorItemHasRemovableOrSoftInsertSlots(itemTpl: string): boolean;
     /**
      * Does the pased in tpl have ability to hold removable plate items
      * @param itemTpl item tpl to check for plate support

TypeScript/14AfterDBLoadHook/types/models/eft/common/ILocation.d.ts

@@ -1,9 +1,10 @@
-import { ILocationBase } from "@spt-aki/models/eft/common/ILocationBase";
+import { Exit, ILocationBase } from "@spt-aki/models/eft/common/ILocationBase";
 import { ILooseLoot } from "@spt-aki/models/eft/common/ILooseLoot";
 export interface ILocation {
     base: ILocationBase;
     looseLoot: ILooseLoot;
     statics: IStaticContainer;
+    allExtracts: Exit[];
 }
 export interface IStaticContainer {
     containersGroups: Record<string, IContainerMinMax>;

TypeScript/14AfterDBLoadHook/types/models/eft/common/ILocationBase.d.ts

@@ -205,6 +205,7 @@ export interface Exit {
     PassageRequirement: string;
     PlayersCount: number;
     RequirementTip: string;
+    Side?: string;
 }
 export interface MaxItemCountInLocation {
     TemplateId: string;

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

@@ -182,6 +182,7 @@ export interface IEftStats {
     LastPlayerState?: LastPlayerState;
     TotalInGameTime: number;
     SurvivorClass?: string;
+    sptLastRaidFenceRepChange?: number;
 }
 export interface IDroppedItem {
     QuestId: string;

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

@@ -3,6 +3,8 @@ export interface IItemConfig extends IBaseConfig {
     kind: "aki-item";
     /** Items that should be globally blacklisted */
     blacklist: string[];
+    /** items that should not be given as rewards */
+    rewardItemBlacklist: string[];
     /** Items that can only be found on bosses */
     bossItems: string[];
     handbookPriceOverride: Record<string, number>;

TypeScript/14AfterDBLoadHook/types/models/spt/logging/LogTextColor.d.ts

@@ -7,5 +7,5 @@ export declare enum LogTextColor {
     MAGENTA = "magenta",
     CYAN = "cyan",
     WHITE = "white",
-    GRAY = ""
+    GRAY = "gray"
 }

TypeScript/14AfterDBLoadHook/types/models/spt/server/ILocations.d.ts

@@ -1,28 +1,23 @@
-import { ILocationBase } from "@spt-aki/models/eft/common/ILocationBase";
+import { ILocation } from "@spt-aki/models/eft/common/ILocation";
-import { ILooseLoot } from "@spt-aki/models/eft/common/ILooseLoot";
 import { ILocationsBase } from "@spt-aki/models/eft/common/tables/ILocationsBase";
 export interface ILocations {
-    bigmap?: ILocationData;
+    bigmap?: ILocation;
-    develop?: ILocationData;
+    develop?: ILocation;
-    factory4_day?: ILocationData;
+    factory4_day?: ILocation;
-    factory4_night?: ILocationData;
+    factory4_night?: ILocation;
-    hideout?: ILocationData;
+    hideout?: ILocation;
-    interchange?: ILocationData;
+    interchange?: ILocation;
-    laboratory?: ILocationData;
+    laboratory?: ILocation;
-    lighthouse?: ILocationData;
+    lighthouse?: ILocation;
-    privatearea?: ILocationData;
+    privatearea?: ILocation;
-    rezervbase?: ILocationData;
+    rezervbase?: ILocation;
-    shoreline?: ILocationData;
+    shoreline?: ILocation;
-    suburbs?: ILocationData;
+    suburbs?: ILocation;
-    tarkovstreets?: ILocationData;
+    tarkovstreets?: ILocation;
-    terminal?: ILocationData;
+    terminal?: ILocation;
-    town?: ILocationData;
+    town?: ILocation;
-    woods?: ILocationData;
+    woods?: ILocation;
-    sandbox?: ILocationData;
+    sandbox?: ILocation;
     /** Holds a mapping of the linkages between locations on the UI */
     base?: ILocationsBase;
 }
-export interface ILocationData {
-    base: ILocationBase;
-    looseLoot?: ILooseLoot;
-}

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

@@ -15,6 +15,17 @@ export declare class ItemFilterService {
      * @returns true if blacklisted
      */
     isItemBlacklisted(tpl: string): boolean;
+    /**
+     * Check if item is blacklisted from being a reward for player
+     * @param tpl item tpl to check is on blacklist
+     * @returns True when blacklisted
+     */
+    isItemRewardBlacklisted(tpl: string): boolean;
+    /**
+     * Get an array of items that should never be given as a reward to player
+     * @returns string array of item tpls
+     */
+    getItemRewardBlacklist(): string[];
     /**
      * Return every template id blacklisted in config/item.json
      * @returns string array of blacklisted tempalte ids

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

@@ -40,6 +40,4 @@ export declare class Watermark {
     protected resetCursor(): void;
     /** Draw the watermark */
     protected draw(): void;
-    /** Caculate text length */
-    protected textLength(s: string): number;
 }

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

@@ -13,6 +13,7 @@ import { LootRequest } from "@spt-aki/models/spt/services/LootRequest";
 import { ILogger } from "@spt-aki/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt-aki/servers/ConfigServer";
 import { DatabaseServer } from "@spt-aki/servers/DatabaseServer";
+import { ItemFilterService } from "@spt-aki/services/ItemFilterService";
 import { LocalisationService } from "@spt-aki/services/LocalisationService";
 import { RaidTimeAdjustmentService } from "@spt-aki/services/RaidTimeAdjustmentService";
 import { HashUtil } from "@spt-aki/utils/HashUtil";
@@ -28,6 +29,7 @@ export declare class LocationController {
     protected locationGenerator: LocationGenerator;
     protected localisationService: LocalisationService;
     protected raidTimeAdjustmentService: RaidTimeAdjustmentService;
+    protected itemFilterService: ItemFilterService;
     protected lootGenerator: LootGenerator;
     protected databaseServer: DatabaseServer;
     protected timeUtil: TimeUtil;
@@ -35,7 +37,7 @@ export declare class LocationController {
     protected applicationContext: ApplicationContext;
     protected airdropConfig: IAirdropConfig;
     protected locationConfig: ILocationConfig;
-    constructor(jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, logger: ILogger, locationGenerator: LocationGenerator, localisationService: LocalisationService, raidTimeAdjustmentService: RaidTimeAdjustmentService, lootGenerator: LootGenerator, databaseServer: DatabaseServer, timeUtil: TimeUtil, configServer: ConfigServer, applicationContext: ApplicationContext);
+    constructor(jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, logger: ILogger, locationGenerator: LocationGenerator, localisationService: LocalisationService, raidTimeAdjustmentService: RaidTimeAdjustmentService, itemFilterService: ItemFilterService, lootGenerator: LootGenerator, databaseServer: DatabaseServer, timeUtil: TimeUtil, configServer: ConfigServer, applicationContext: ApplicationContext);
     /**
      * Handle client/location/getLocalloot
      * Get a location (map) with generated loot data

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

@@ -105,7 +105,7 @@ export declare class RepeatableQuestGenerator {
     /**
      * Filter a maps exits to just those for the desired side
      * @param locationKey Map id (e.g. factory4_day)
-     * @param playerSide Scav/Bear
+     * @param playerSide Scav/Pmc
      * @returns Array of Exit objects
      */
     protected getLocationExitsForSide(locationKey: string, playerSide: string): Exit[];

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

@@ -3,7 +3,7 @@ import { ItemHelper } from "@spt-aki/helpers/ItemHelper";
 import { PaymentHelper } from "@spt-aki/helpers/PaymentHelper";
 import { QuestHelper } from "@spt-aki/helpers/QuestHelper";
 import { IPmcData, IPostRaidPmcData } from "@spt-aki/models/eft/common/IPmcData";
-import { IQuestStatus, TraderInfo, Victim } from "@spt-aki/models/eft/common/tables/IBotBase";
+import { IQuestStatus, TraderInfo } from "@spt-aki/models/eft/common/tables/IBotBase";
 import { Item } from "@spt-aki/models/eft/common/tables/IItem";
 import { ISaveProgressRequestData } from "@spt-aki/models/eft/inRaid/ISaveProgressRequestData";
 import { IInRaidConfig } from "@spt-aki/models/spt/config/IInRaidConfig";
@@ -47,20 +47,6 @@ export declare class InRaidHelper {
      * @param items Items array to check
      */
     addUpdToMoneyFromRaid(items: Item[]): void;
-    /**
-     * Add karma changes up and return the new value
-     * @param existingFenceStanding Current fence standing level
-     * @param victims Array of kills player performed
-     * @returns adjusted karma level after kills are taken into account
-     */
-    calculateFenceStandingChangeFromKillsAsScav(existingFenceStanding: number, victims: Victim[]): number;
-    protected getAdditionalLossForKill(fenceStanding: number, repChangeForKill: number): number;
-    /**
-     * Get the standing gain/loss for killing an npc
-     * @param victim Who was killed by player
-     * @returns a numerical standing gain or loss
-     */
-    protected getFenceStandingChangeForKillAsScav(victim: Victim): number;
     /**
      * Reset a profile to a baseline, used post-raid
      * Reset points earned during session property

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

@@ -59,6 +59,12 @@ export declare class ItemHelper {
      * @returns Does item have the possibility ot need soft inserts
      */
     armorItemCanHoldMods(itemTpl: string): boolean;
+    /**
+     * Does the provided item tpl need soft/removable inserts to function
+     * @param itemTpl Armor item
+     * @returns True if item needs some kind of insert
+     */
+    armorItemHasRemovableOrSoftInsertSlots(itemTpl: string): boolean;
     /**
      * Does the pased in tpl have ability to hold removable plate items
      * @param itemTpl item tpl to check for plate support

TypeScript/15HttpListenerExample/types/models/eft/common/ILocation.d.ts

@@ -1,9 +1,10 @@
-import { ILocationBase } from "@spt-aki/models/eft/common/ILocationBase";
+import { Exit, ILocationBase } from "@spt-aki/models/eft/common/ILocationBase";
 import { ILooseLoot } from "@spt-aki/models/eft/common/ILooseLoot";
 export interface ILocation {
     base: ILocationBase;
     looseLoot: ILooseLoot;
     statics: IStaticContainer;
+    allExtracts: Exit[];
 }
 export interface IStaticContainer {
     containersGroups: Record<string, IContainerMinMax>;

TypeScript/15HttpListenerExample/types/models/eft/common/ILocationBase.d.ts

@@ -205,6 +205,7 @@ export interface Exit {
     PassageRequirement: string;
     PlayersCount: number;
     RequirementTip: string;
+    Side?: string;
 }
 export interface MaxItemCountInLocation {
     TemplateId: string;

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

@@ -182,6 +182,7 @@ export interface IEftStats {
     LastPlayerState?: LastPlayerState;
     TotalInGameTime: number;
     SurvivorClass?: string;
+    sptLastRaidFenceRepChange?: number;
 }
 export interface IDroppedItem {
     QuestId: string;

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

@@ -3,6 +3,8 @@ export interface IItemConfig extends IBaseConfig {
     kind: "aki-item";
     /** Items that should be globally blacklisted */
     blacklist: string[];
+    /** items that should not be given as rewards */
+    rewardItemBlacklist: string[];
     /** Items that can only be found on bosses */
     bossItems: string[];
     handbookPriceOverride: Record<string, number>;

TypeScript/15HttpListenerExample/types/models/spt/logging/LogTextColor.d.ts

@@ -7,5 +7,5 @@ export declare enum LogTextColor {
     MAGENTA = "magenta",
     CYAN = "cyan",
     WHITE = "white",
-    GRAY = ""
+    GRAY = "gray"
 }

TypeScript/15HttpListenerExample/types/models/spt/server/ILocations.d.ts

@@ -1,28 +1,23 @@
-import { ILocationBase } from "@spt-aki/models/eft/common/ILocationBase";
+import { ILocation } from "@spt-aki/models/eft/common/ILocation";
-import { ILooseLoot } from "@spt-aki/models/eft/common/ILooseLoot";
 import { ILocationsBase } from "@spt-aki/models/eft/common/tables/ILocationsBase";
 export interface ILocations {
-    bigmap?: ILocationData;
+    bigmap?: ILocation;
-    develop?: ILocationData;
+    develop?: ILocation;
-    factory4_day?: ILocationData;
+    factory4_day?: ILocation;
-    factory4_night?: ILocationData;
+    factory4_night?: ILocation;
-    hideout?: ILocationData;
+    hideout?: ILocation;
-    interchange?: ILocationData;
+    interchange?: ILocation;
-    laboratory?: ILocationData;
+    laboratory?: ILocation;
-    lighthouse?: ILocationData;
+    lighthouse?: ILocation;
-    privatearea?: ILocationData;
+    privatearea?: ILocation;
-    rezervbase?: ILocationData;
+    rezervbase?: ILocation;
-    shoreline?: ILocationData;
+    shoreline?: ILocation;
-    suburbs?: ILocationData;
+    suburbs?: ILocation;
-    tarkovstreets?: ILocationData;
+    tarkovstreets?: ILocation;
-    terminal?: ILocationData;
+    terminal?: ILocation;
-    town?: ILocationData;
+    town?: ILocation;
-    woods?: ILocationData;
+    woods?: ILocation;
-    sandbox?: ILocationData;
+    sandbox?: ILocation;
     /** Holds a mapping of the linkages between locations on the UI */
     base?: ILocationsBase;
 }
-export interface ILocationData {
-    base: ILocationBase;
-    looseLoot?: ILooseLoot;
-}

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

@@ -15,6 +15,17 @@ export declare class ItemFilterService {
      * @returns true if blacklisted
      */
     isItemBlacklisted(tpl: string): boolean;
+    /**
+     * Check if item is blacklisted from being a reward for player
+     * @param tpl item tpl to check is on blacklist
+     * @returns True when blacklisted
+     */
+    isItemRewardBlacklisted(tpl: string): boolean;
+    /**
+     * Get an array of items that should never be given as a reward to player
+     * @returns string array of item tpls
+     */
+    getItemRewardBlacklist(): string[];
     /**
      * Return every template id blacklisted in config/item.json
      * @returns string array of blacklisted tempalte ids

TypeScript/15HttpListenerExample/types/utils/Watermark.d.ts

@@ -40,6 +40,4 @@ export declare class Watermark {
     protected resetCursor(): void;
     /** Draw the watermark */
     protected draw(): void;
-    /** Caculate text length */
-    protected textLength(s: string): number;
 }

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

@@ -13,6 +13,7 @@ import { LootRequest } from "@spt-aki/models/spt/services/LootRequest";
 import { ILogger } from "@spt-aki/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt-aki/servers/ConfigServer";
 import { DatabaseServer } from "@spt-aki/servers/DatabaseServer";
+import { ItemFilterService } from "@spt-aki/services/ItemFilterService";
 import { LocalisationService } from "@spt-aki/services/LocalisationService";
 import { RaidTimeAdjustmentService } from "@spt-aki/services/RaidTimeAdjustmentService";
 import { HashUtil } from "@spt-aki/utils/HashUtil";
@@ -28,6 +29,7 @@ export declare class LocationController {
     protected locationGenerator: LocationGenerator;
     protected localisationService: LocalisationService;
     protected raidTimeAdjustmentService: RaidTimeAdjustmentService;
+    protected itemFilterService: ItemFilterService;
     protected lootGenerator: LootGenerator;
     protected databaseServer: DatabaseServer;
     protected timeUtil: TimeUtil;
@@ -35,7 +37,7 @@ export declare class LocationController {
     protected applicationContext: ApplicationContext;
     protected airdropConfig: IAirdropConfig;
     protected locationConfig: ILocationConfig;
-    constructor(jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, logger: ILogger, locationGenerator: LocationGenerator, localisationService: LocalisationService, raidTimeAdjustmentService: RaidTimeAdjustmentService, lootGenerator: LootGenerator, databaseServer: DatabaseServer, timeUtil: TimeUtil, configServer: ConfigServer, applicationContext: ApplicationContext);
+    constructor(jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, logger: ILogger, locationGenerator: LocationGenerator, localisationService: LocalisationService, raidTimeAdjustmentService: RaidTimeAdjustmentService, itemFilterService: ItemFilterService, lootGenerator: LootGenerator, databaseServer: DatabaseServer, timeUtil: TimeUtil, configServer: ConfigServer, applicationContext: ApplicationContext);
     /**
      * Handle client/location/getLocalloot
      * Get a location (map) with generated loot data

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

@@ -105,7 +105,7 @@ export declare class RepeatableQuestGenerator {
     /**
      * Filter a maps exits to just those for the desired side
      * @param locationKey Map id (e.g. factory4_day)
-     * @param playerSide Scav/Bear
+     * @param playerSide Scav/Pmc
      * @returns Array of Exit objects
      */
     protected getLocationExitsForSide(locationKey: string, playerSide: string): Exit[];

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

@@ -3,7 +3,7 @@ import { ItemHelper } from "@spt-aki/helpers/ItemHelper";
 import { PaymentHelper } from "@spt-aki/helpers/PaymentHelper";
 import { QuestHelper } from "@spt-aki/helpers/QuestHelper";
 import { IPmcData, IPostRaidPmcData } from "@spt-aki/models/eft/common/IPmcData";
-import { IQuestStatus, TraderInfo, Victim } from "@spt-aki/models/eft/common/tables/IBotBase";
+import { IQuestStatus, TraderInfo } from "@spt-aki/models/eft/common/tables/IBotBase";
 import { Item } from "@spt-aki/models/eft/common/tables/IItem";
 import { ISaveProgressRequestData } from "@spt-aki/models/eft/inRaid/ISaveProgressRequestData";
 import { IInRaidConfig } from "@spt-aki/models/spt/config/IInRaidConfig";
@@ -47,20 +47,6 @@ export declare class InRaidHelper {
      * @param items Items array to check
      */
     addUpdToMoneyFromRaid(items: Item[]): void;
-    /**
-     * Add karma changes up and return the new value
-     * @param existingFenceStanding Current fence standing level
-     * @param victims Array of kills player performed
-     * @returns adjusted karma level after kills are taken into account
-     */
-    calculateFenceStandingChangeFromKillsAsScav(existingFenceStanding: number, victims: Victim[]): number;
-    protected getAdditionalLossForKill(fenceStanding: number, repChangeForKill: number): number;
-    /**
-     * Get the standing gain/loss for killing an npc
-     * @param victim Who was killed by player
-     * @returns a numerical standing gain or loss
-     */
-    protected getFenceStandingChangeForKillAsScav(victim: Victim): number;
     /**
      * Reset a profile to a baseline, used post-raid
      * Reset points earned during session property

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

@@ -59,6 +59,12 @@ export declare class ItemHelper {
      * @returns Does item have the possibility ot need soft inserts
      */
     armorItemCanHoldMods(itemTpl: string): boolean;
+    /**
+     * Does the provided item tpl need soft/removable inserts to function
+     * @param itemTpl Armor item
+     * @returns True if item needs some kind of insert
+     */
+    armorItemHasRemovableOrSoftInsertSlots(itemTpl: string): boolean;
     /**
      * Does the pased in tpl have ability to hold removable plate items
      * @param itemTpl item tpl to check for plate support

TypeScript/16ImporterUtil/types/models/eft/common/ILocation.d.ts

@@ -1,9 +1,10 @@
-import { ILocationBase } from "@spt-aki/models/eft/common/ILocationBase";
+import { Exit, ILocationBase } from "@spt-aki/models/eft/common/ILocationBase";
 import { ILooseLoot } from "@spt-aki/models/eft/common/ILooseLoot";
 export interface ILocation {
     base: ILocationBase;
     looseLoot: ILooseLoot;
     statics: IStaticContainer;
+    allExtracts: Exit[];
 }
 export interface IStaticContainer {
     containersGroups: Record<string, IContainerMinMax>;

TypeScript/16ImporterUtil/types/models/eft/common/ILocationBase.d.ts

@@ -205,6 +205,7 @@ export interface Exit {
     PassageRequirement: string;
     PlayersCount: number;
     RequirementTip: string;
+    Side?: string;
 }
 export interface MaxItemCountInLocation {
     TemplateId: string;

TypeScript/16ImporterUtil/types/models/eft/common/tables/IBotBase.d.ts

@@ -182,6 +182,7 @@ export interface IEftStats {
     LastPlayerState?: LastPlayerState;
     TotalInGameTime: number;
     SurvivorClass?: string;
+    sptLastRaidFenceRepChange?: number;
 }
 export interface IDroppedItem {
     QuestId: string;

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

@@ -3,6 +3,8 @@ export interface IItemConfig extends IBaseConfig {
     kind: "aki-item";
     /** Items that should be globally blacklisted */
     blacklist: string[];
+    /** items that should not be given as rewards */
+    rewardItemBlacklist: string[];
     /** Items that can only be found on bosses */
     bossItems: string[];
     handbookPriceOverride: Record<string, number>;

TypeScript/16ImporterUtil/types/models/spt/logging/LogTextColor.d.ts

@@ -7,5 +7,5 @@ export declare enum LogTextColor {
     MAGENTA = "magenta",
     CYAN = "cyan",
     WHITE = "white",
-    GRAY = ""
+    GRAY = "gray"
 }

TypeScript/16ImporterUtil/types/models/spt/server/ILocations.d.ts

@@ -1,28 +1,23 @@
-import { ILocationBase } from "@spt-aki/models/eft/common/ILocationBase";
+import { ILocation } from "@spt-aki/models/eft/common/ILocation";
-import { ILooseLoot } from "@spt-aki/models/eft/common/ILooseLoot";
 import { ILocationsBase } from "@spt-aki/models/eft/common/tables/ILocationsBase";
 export interface ILocations {
-    bigmap?: ILocationData;
+    bigmap?: ILocation;
-    develop?: ILocationData;
+    develop?: ILocation;
-    factory4_day?: ILocationData;
+    factory4_day?: ILocation;
-    factory4_night?: ILocationData;
+    factory4_night?: ILocation;
-    hideout?: ILocationData;
+    hideout?: ILocation;
-    interchange?: ILocationData;
+    interchange?: ILocation;
-    laboratory?: ILocationData;
+    laboratory?: ILocation;
-    lighthouse?: ILocationData;
+    lighthouse?: ILocation;
-    privatearea?: ILocationData;
+    privatearea?: ILocation;
-    rezervbase?: ILocationData;
+    rezervbase?: ILocation;
-    shoreline?: ILocationData;
+    shoreline?: ILocation;
-    suburbs?: ILocationData;
+    suburbs?: ILocation;
-    tarkovstreets?: ILocationData;
+    tarkovstreets?: ILocation;
-    terminal?: ILocationData;
+    terminal?: ILocation;
-    town?: ILocationData;
+    town?: ILocation;
-    woods?: ILocationData;
+    woods?: ILocation;
-    sandbox?: ILocationData;
+    sandbox?: ILocation;
     /** Holds a mapping of the linkages between locations on the UI */
     base?: ILocationsBase;
 }
-export interface ILocationData {
-    base: ILocationBase;
-    looseLoot?: ILooseLoot;
-}

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

@@ -15,6 +15,17 @@ export declare class ItemFilterService {
      * @returns true if blacklisted
      */
     isItemBlacklisted(tpl: string): boolean;
+    /**
+     * Check if item is blacklisted from being a reward for player
+     * @param tpl item tpl to check is on blacklist
+     * @returns True when blacklisted
+     */
+    isItemRewardBlacklisted(tpl: string): boolean;
+    /**
+     * Get an array of items that should never be given as a reward to player
+     * @returns string array of item tpls
+     */
+    getItemRewardBlacklist(): string[];
     /**
      * Return every template id blacklisted in config/item.json
      * @returns string array of blacklisted tempalte ids

TypeScript/16ImporterUtil/types/utils/Watermark.d.ts

@@ -40,6 +40,4 @@ export declare class Watermark {
     protected resetCursor(): void;
     /** Draw the watermark */
     protected draw(): void;
-    /** Caculate text length */
-    protected textLength(s: string): number;
 }

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

@@ -13,6 +13,7 @@ import { LootRequest } from "@spt-aki/models/spt/services/LootRequest";
 import { ILogger } from "@spt-aki/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt-aki/servers/ConfigServer";
 import { DatabaseServer } from "@spt-aki/servers/DatabaseServer";
+import { ItemFilterService } from "@spt-aki/services/ItemFilterService";
 import { LocalisationService } from "@spt-aki/services/LocalisationService";
 import { RaidTimeAdjustmentService } from "@spt-aki/services/RaidTimeAdjustmentService";
 import { HashUtil } from "@spt-aki/utils/HashUtil";
@@ -28,6 +29,7 @@ export declare class LocationController {
     protected locationGenerator: LocationGenerator;
     protected localisationService: LocalisationService;
     protected raidTimeAdjustmentService: RaidTimeAdjustmentService;
+    protected itemFilterService: ItemFilterService;
     protected lootGenerator: LootGenerator;
     protected databaseServer: DatabaseServer;
     protected timeUtil: TimeUtil;
@@ -35,7 +37,7 @@ export declare class LocationController {
     protected applicationContext: ApplicationContext;
     protected airdropConfig: IAirdropConfig;
     protected locationConfig: ILocationConfig;
-    constructor(jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, logger: ILogger, locationGenerator: LocationGenerator, localisationService: LocalisationService, raidTimeAdjustmentService: RaidTimeAdjustmentService, lootGenerator: LootGenerator, databaseServer: DatabaseServer, timeUtil: TimeUtil, configServer: ConfigServer, applicationContext: ApplicationContext);
+    constructor(jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, logger: ILogger, locationGenerator: LocationGenerator, localisationService: LocalisationService, raidTimeAdjustmentService: RaidTimeAdjustmentService, itemFilterService: ItemFilterService, lootGenerator: LootGenerator, databaseServer: DatabaseServer, timeUtil: TimeUtil, configServer: ConfigServer, applicationContext: ApplicationContext);
     /**
      * Handle client/location/getLocalloot
      * Get a location (map) with generated loot data

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

@@ -105,7 +105,7 @@ export declare class RepeatableQuestGenerator {
     /**
      * Filter a maps exits to just those for the desired side
      * @param locationKey Map id (e.g. factory4_day)
-     * @param playerSide Scav/Bear
+     * @param playerSide Scav/Pmc
      * @returns Array of Exit objects
      */
     protected getLocationExitsForSide(locationKey: string, playerSide: string): Exit[];

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

@@ -3,7 +3,7 @@ import { ItemHelper } from "@spt-aki/helpers/ItemHelper";
 import { PaymentHelper } from "@spt-aki/helpers/PaymentHelper";
 import { QuestHelper } from "@spt-aki/helpers/QuestHelper";
 import { IPmcData, IPostRaidPmcData } from "@spt-aki/models/eft/common/IPmcData";
-import { IQuestStatus, TraderInfo, Victim } from "@spt-aki/models/eft/common/tables/IBotBase";
+import { IQuestStatus, TraderInfo } from "@spt-aki/models/eft/common/tables/IBotBase";
 import { Item } from "@spt-aki/models/eft/common/tables/IItem";
 import { ISaveProgressRequestData } from "@spt-aki/models/eft/inRaid/ISaveProgressRequestData";
 import { IInRaidConfig } from "@spt-aki/models/spt/config/IInRaidConfig";
@@ -47,20 +47,6 @@ export declare class InRaidHelper {
      * @param items Items array to check
      */
     addUpdToMoneyFromRaid(items: Item[]): void;
-    /**
-     * Add karma changes up and return the new value
-     * @param existingFenceStanding Current fence standing level
-     * @param victims Array of kills player performed
-     * @returns adjusted karma level after kills are taken into account
-     */
-    calculateFenceStandingChangeFromKillsAsScav(existingFenceStanding: number, victims: Victim[]): number;
-    protected getAdditionalLossForKill(fenceStanding: number, repChangeForKill: number): number;
-    /**
-     * Get the standing gain/loss for killing an npc
-     * @param victim Who was killed by player
-     * @returns a numerical standing gain or loss
-     */
-    protected getFenceStandingChangeForKillAsScav(victim: Victim): number;
     /**
      * Reset a profile to a baseline, used post-raid
      * Reset points earned during session property

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

@@ -59,6 +59,12 @@ export declare class ItemHelper {
      * @returns Does item have the possibility ot need soft inserts
      */
     armorItemCanHoldMods(itemTpl: string): boolean;
+    /**
+     * Does the provided item tpl need soft/removable inserts to function
+     * @param itemTpl Armor item
+     * @returns True if item needs some kind of insert
+     */
+    armorItemHasRemovableOrSoftInsertSlots(itemTpl: string): boolean;
     /**
      * Does the pased in tpl have ability to hold removable plate items
      * @param itemTpl item tpl to check for plate support

TypeScript/17AsyncImporterWithDependency1/types/models/eft/common/ILocation.d.ts

@@ -1,9 +1,10 @@
-import { ILocationBase } from "@spt-aki/models/eft/common/ILocationBase";
+import { Exit, ILocationBase } from "@spt-aki/models/eft/common/ILocationBase";
 import { ILooseLoot } from "@spt-aki/models/eft/common/ILooseLoot";
 export interface ILocation {
     base: ILocationBase;
     looseLoot: ILooseLoot;
     statics: IStaticContainer;
+    allExtracts: Exit[];
 }
 export interface IStaticContainer {
     containersGroups: Record<string, IContainerMinMax>;

TypeScript/17AsyncImporterWithDependency1/types/models/eft/common/ILocationBase.d.ts

@@ -205,6 +205,7 @@ export interface Exit {
     PassageRequirement: string;
     PlayersCount: number;
     RequirementTip: string;
+    Side?: string;
 }
 export interface MaxItemCountInLocation {
     TemplateId: string;

TypeScript/17AsyncImporterWithDependency1/types/models/eft/common/tables/IBotBase.d.ts

@@ -182,6 +182,7 @@ export interface IEftStats {
     LastPlayerState?: LastPlayerState;
     TotalInGameTime: number;
     SurvivorClass?: string;
+    sptLastRaidFenceRepChange?: number;
 }
 export interface IDroppedItem {
     QuestId: string;

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

@@ -3,6 +3,8 @@ export interface IItemConfig extends IBaseConfig {
     kind: "aki-item";
     /** Items that should be globally blacklisted */
     blacklist: string[];
+    /** items that should not be given as rewards */
+    rewardItemBlacklist: string[];
     /** Items that can only be found on bosses */
     bossItems: string[];
     handbookPriceOverride: Record<string, number>;

TypeScript/17AsyncImporterWithDependency1/types/models/spt/logging/LogTextColor.d.ts

@@ -7,5 +7,5 @@ export declare enum LogTextColor {
     MAGENTA = "magenta",
     CYAN = "cyan",
     WHITE = "white",
-    GRAY = ""
+    GRAY = "gray"
 }

TypeScript/17AsyncImporterWithDependency1/types/models/spt/server/ILocations.d.ts

@@ -1,28 +1,23 @@
-import { ILocationBase } from "@spt-aki/models/eft/common/ILocationBase";
+import { ILocation } from "@spt-aki/models/eft/common/ILocation";
-import { ILooseLoot } from "@spt-aki/models/eft/common/ILooseLoot";
 import { ILocationsBase } from "@spt-aki/models/eft/common/tables/ILocationsBase";
 export interface ILocations {
-    bigmap?: ILocationData;
+    bigmap?: ILocation;
-    develop?: ILocationData;
+    develop?: ILocation;
-    factory4_day?: ILocationData;
+    factory4_day?: ILocation;
-    factory4_night?: ILocationData;
+    factory4_night?: ILocation;
-    hideout?: ILocationData;
+    hideout?: ILocation;
-    interchange?: ILocationData;
+    interchange?: ILocation;
-    laboratory?: ILocationData;
+    laboratory?: ILocation;
-    lighthouse?: ILocationData;
+    lighthouse?: ILocation;
-    privatearea?: ILocationData;
+    privatearea?: ILocation;
-    rezervbase?: ILocationData;
+    rezervbase?: ILocation;
-    shoreline?: ILocationData;
+    shoreline?: ILocation;
-    suburbs?: ILocationData;
+    suburbs?: ILocation;
-    tarkovstreets?: ILocationData;
+    tarkovstreets?: ILocation;
-    terminal?: ILocationData;
+    terminal?: ILocation;
-    town?: ILocationData;
+    town?: ILocation;
-    woods?: ILocationData;
+    woods?: ILocation;
-    sandbox?: ILocationData;
+    sandbox?: ILocation;
     /** Holds a mapping of the linkages between locations on the UI */
     base?: ILocationsBase;
 }
-export interface ILocationData {
-    base: ILocationBase;
-    looseLoot?: ILooseLoot;
-}

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

@@ -15,6 +15,17 @@ export declare class ItemFilterService {
      * @returns true if blacklisted
      */
     isItemBlacklisted(tpl: string): boolean;
+    /**
+     * Check if item is blacklisted from being a reward for player
+     * @param tpl item tpl to check is on blacklist
+     * @returns True when blacklisted
+     */
+    isItemRewardBlacklisted(tpl: string): boolean;
+    /**
+     * Get an array of items that should never be given as a reward to player
+     * @returns string array of item tpls
+     */
+    getItemRewardBlacklist(): string[];
     /**
      * Return every template id blacklisted in config/item.json
      * @returns string array of blacklisted tempalte ids

TypeScript/17AsyncImporterWithDependency1/types/utils/Watermark.d.ts

@@ -40,6 +40,4 @@ export declare class Watermark {
     protected resetCursor(): void;
     /** Draw the watermark */
     protected draw(): void;
-    /** Caculate text length */
-    protected textLength(s: string): number;
 }

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

@@ -13,6 +13,7 @@ import { LootRequest } from "@spt-aki/models/spt/services/LootRequest";
 import { ILogger } from "@spt-aki/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt-aki/servers/ConfigServer";
 import { DatabaseServer } from "@spt-aki/servers/DatabaseServer";
+import { ItemFilterService } from "@spt-aki/services/ItemFilterService";
 import { LocalisationService } from "@spt-aki/services/LocalisationService";
 import { RaidTimeAdjustmentService } from "@spt-aki/services/RaidTimeAdjustmentService";
 import { HashUtil } from "@spt-aki/utils/HashUtil";
@@ -28,6 +29,7 @@ export declare class LocationController {
     protected locationGenerator: LocationGenerator;
     protected localisationService: LocalisationService;
     protected raidTimeAdjustmentService: RaidTimeAdjustmentService;
+    protected itemFilterService: ItemFilterService;
     protected lootGenerator: LootGenerator;
     protected databaseServer: DatabaseServer;
     protected timeUtil: TimeUtil;
@@ -35,7 +37,7 @@ export declare class LocationController {
     protected applicationContext: ApplicationContext;
     protected airdropConfig: IAirdropConfig;
     protected locationConfig: ILocationConfig;
-    constructor(jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, logger: ILogger, locationGenerator: LocationGenerator, localisationService: LocalisationService, raidTimeAdjustmentService: RaidTimeAdjustmentService, lootGenerator: LootGenerator, databaseServer: DatabaseServer, timeUtil: TimeUtil, configServer: ConfigServer, applicationContext: ApplicationContext);
+    constructor(jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, logger: ILogger, locationGenerator: LocationGenerator, localisationService: LocalisationService, raidTimeAdjustmentService: RaidTimeAdjustmentService, itemFilterService: ItemFilterService, lootGenerator: LootGenerator, databaseServer: DatabaseServer, timeUtil: TimeUtil, configServer: ConfigServer, applicationContext: ApplicationContext);
     /**
      * Handle client/location/getLocalloot
      * Get a location (map) with generated loot data

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

@@ -105,7 +105,7 @@ export declare class RepeatableQuestGenerator {
     /**
      * Filter a maps exits to just those for the desired side
      * @param locationKey Map id (e.g. factory4_day)
-     * @param playerSide Scav/Bear
+     * @param playerSide Scav/Pmc
      * @returns Array of Exit objects
      */
     protected getLocationExitsForSide(locationKey: string, playerSide: string): Exit[];

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

@@ -3,7 +3,7 @@ import { ItemHelper } from "@spt-aki/helpers/ItemHelper";
 import { PaymentHelper } from "@spt-aki/helpers/PaymentHelper";
 import { QuestHelper } from "@spt-aki/helpers/QuestHelper";
 import { IPmcData, IPostRaidPmcData } from "@spt-aki/models/eft/common/IPmcData";
-import { IQuestStatus, TraderInfo, Victim } from "@spt-aki/models/eft/common/tables/IBotBase";
+import { IQuestStatus, TraderInfo } from "@spt-aki/models/eft/common/tables/IBotBase";
 import { Item } from "@spt-aki/models/eft/common/tables/IItem";
 import { ISaveProgressRequestData } from "@spt-aki/models/eft/inRaid/ISaveProgressRequestData";
 import { IInRaidConfig } from "@spt-aki/models/spt/config/IInRaidConfig";
@@ -47,20 +47,6 @@ export declare class InRaidHelper {
      * @param items Items array to check
      */
     addUpdToMoneyFromRaid(items: Item[]): void;
-    /**
-     * Add karma changes up and return the new value
-     * @param existingFenceStanding Current fence standing level
-     * @param victims Array of kills player performed
-     * @returns adjusted karma level after kills are taken into account
-     */
-    calculateFenceStandingChangeFromKillsAsScav(existingFenceStanding: number, victims: Victim[]): number;
-    protected getAdditionalLossForKill(fenceStanding: number, repChangeForKill: number): number;
-    /**
-     * Get the standing gain/loss for killing an npc
-     * @param victim Who was killed by player
-     * @returns a numerical standing gain or loss
-     */
-    protected getFenceStandingChangeForKillAsScav(victim: Victim): number;
     /**
      * Reset a profile to a baseline, used post-raid
      * Reset points earned during session property

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

@@ -59,6 +59,12 @@ export declare class ItemHelper {
      * @returns Does item have the possibility ot need soft inserts
      */
     armorItemCanHoldMods(itemTpl: string): boolean;
+    /**
+     * Does the provided item tpl need soft/removable inserts to function
+     * @param itemTpl Armor item
+     * @returns True if item needs some kind of insert
+     */
+    armorItemHasRemovableOrSoftInsertSlots(itemTpl: string): boolean;
     /**
      * Does the pased in tpl have ability to hold removable plate items
      * @param itemTpl item tpl to check for plate support