diff --git a/project/src/controllers/HideoutController.ts b/project/src/controllers/HideoutController.ts index 0b364413..5354e8ef 100644 --- a/project/src/controllers/HideoutController.ts +++ b/project/src/controllers/HideoutController.ts @@ -1193,7 +1193,7 @@ export class HideoutController { improveCompleteTimestamp: timestamp + improvement.improvementTime, }; output.profileChanges[sessionId].improvements[improvement.id] = improvementDetails; - pmcData.Hideout.Improvement[improvement.id] = improvementDetails; + pmcData.Hideout.Improvements[improvement.id] = improvementDetails; } return output; diff --git a/project/src/helpers/HideoutHelper.ts b/project/src/helpers/HideoutHelper.ts index 4c8edb67..b241c071 100644 --- a/project/src/helpers/HideoutHelper.ts +++ b/project/src/helpers/HideoutHelper.ts @@ -1145,8 +1145,8 @@ export class HideoutHelper { * @param pmcProfile Profile to adjust */ public setHideoutImprovementsToCompleted(pmcProfile: IPmcData): void { - for (const improvementId in pmcProfile.Hideout.Improvement) { - const improvementDetails = pmcProfile.Hideout.Improvement[improvementId]; + for (const improvementId in pmcProfile.Hideout.Improvements) { + const improvementDetails = pmcProfile.Hideout.Improvements[improvementId]; if ( improvementDetails.completed === false && improvementDetails.improveCompleteTimestamp < this.timeUtil.getTimestamp() diff --git a/project/src/models/eft/common/tables/IBotBase.ts b/project/src/models/eft/common/tables/IBotBase.ts index 9354d7d0..e0cd8138 100644 --- a/project/src/models/eft/common/tables/IBotBase.ts +++ b/project/src/models/eft/common/tables/IBotBase.ts @@ -69,6 +69,7 @@ export interface Info { Side: string; SquadInviteRestriction: boolean; HasCoopExtension: boolean; + HasPveGame: boolean; Voice: string; Level: number; Experience: number; @@ -337,7 +338,7 @@ export interface IInsuredItem { export interface Hideout { Production: Record; Areas: HideoutArea[]; - Improvement: Record; + Improvements: Record; Seed: number; sptUpdateLastRunTimestamp: number; } diff --git a/project/src/models/enums/HideoutAreas.ts b/project/src/models/enums/HideoutAreas.ts index 9573797a..fbc53c4e 100644 --- a/project/src/models/enums/HideoutAreas.ts +++ b/project/src/models/enums/HideoutAreas.ts @@ -26,4 +26,6 @@ export enum HideoutAreas { GYM = 23, WEAPON_STAND = 24, WEAPON_STAND_SECONDARY = 25, + EQUIPMENT_PRESETS_STAND = 26, + CIRCLE_OF_CULTISTS = 27, } diff --git a/project/src/routers/EventOutputHolder.ts b/project/src/routers/EventOutputHolder.ts index 8d6954da..c29f813f 100644 --- a/project/src/routers/EventOutputHolder.ts +++ b/project/src/routers/EventOutputHolder.ts @@ -111,8 +111,8 @@ export class EventOutputHolder { * @returns dictionary of hideout improvements */ protected getImprovementsFromProfileAndFlagComplete(pmcData: IPmcData): Record { - for (const improvementKey in pmcData.Hideout.Improvement) { - const improvement = pmcData.Hideout.Improvement[improvementKey]; + for (const improvementKey in pmcData.Hideout.Improvements) { + const improvement = pmcData.Hideout.Improvements[improvementKey]; // Skip completed if (improvement.completed) { @@ -124,7 +124,7 @@ export class EventOutputHolder { } } - return pmcData.Hideout.Improvement; + return pmcData.Hideout.Improvements; } /**