diff --git a/project/assets/configs/inraid.json b/project/assets/configs/inraid.json index 8ee39cdf..a7768ad6 100644 --- a/project/assets/configs/inraid.json +++ b/project/assets/configs/inraid.json @@ -27,6 +27,6 @@ "scavExtractStandingGain": 0.01, "pmcKillProbabilityForScavGain": 0.2, "keepFiRSecureContainerOnDeath": false, - "alwaysKeepFoundInRaidonRaidEnd": false, + "alwaysKeepFoundInRaidOnRaidEnd": false, "playerScavHostileChancePercent": 15 } diff --git a/project/src/generators/LocationLootGenerator.ts b/project/src/generators/LocationLootGenerator.ts index 0fd59bd3..09d43a1f 100644 --- a/project/src/generators/LocationLootGenerator.ts +++ b/project/src/generators/LocationLootGenerator.ts @@ -225,7 +225,7 @@ export class LocationLootGenerator { ); if (!containerObject) { this.logger.debug( - `Container: ${chosenContainerIds[chosenContainerId]} not found in staticRandomisableContainersOnMap, this is bad`, + `Container: ${chosenContainerId} not found in staticRandomisableContainersOnMap, this is bad`, ); continue; } @@ -320,7 +320,7 @@ export class LocationLootGenerator { * @returns dictionary keyed by groupId */ protected getGroupIdToContainerMappings( - staticContainerGroupData: IStaticContainer | Record, + staticContainerGroupData: IStaticContainer, staticContainersOnMap: IStaticContainerData[], ): Record { // Create dictionary of all group ids and choose a count of containers the map will spawn of that group @@ -488,7 +488,7 @@ export class LocationLootGenerator { const height = containerTemplate._props.Grids[0]._props.cellsV; const width = containerTemplate._props.Grids[0]._props.cellsH; - // Calcualte 2d array and return + // Calculate 2d array and return return Array(height) .fill(0) .map(() => Array(width).fill(0)); diff --git a/project/src/helpers/InRaidHelper.ts b/project/src/helpers/InRaidHelper.ts index 63a87059..ea1cf157 100644 --- a/project/src/helpers/InRaidHelper.ts +++ b/project/src/helpers/InRaidHelper.ts @@ -84,7 +84,7 @@ export class InRaidHelper { // Handle Removing of FIR status if player did not survive + not transferring // Do after above filtering code to reduce work done - if (!isSurvived && !isTransfer && !this.inRaidConfig.alwaysKeepFoundInRaidonRaidEnd) { + if (!isSurvived && !isTransfer && !this.inRaidConfig.alwaysKeepFoundInRaidOnRaidEnd) { this.removeFiRStatusFromCertainItems(postRaidProfile.Inventory.items); } diff --git a/project/src/models/spt/config/IInRaidConfig.ts b/project/src/models/spt/config/IInRaidConfig.ts index aaec8f12..c1a99be7 100644 --- a/project/src/models/spt/config/IInRaidConfig.ts +++ b/project/src/models/spt/config/IInRaidConfig.ts @@ -21,7 +21,7 @@ export interface IInRaidConfig extends IBaseConfig { /** On death should items in your secure keep their Find in raid status regardless of how you finished the raid */ keepFiRSecureContainerOnDeath: boolean; /** If enabled always keep found in raid status on items */ - alwaysKeepFoundInRaidonRaidEnd: boolean; + alwaysKeepFoundInRaidOnRaidEnd: boolean; /** Percentage chance a player scav hot is hostile to the player when scavving */ playerScavHostileChancePercent: number; }