diff --git a/project/src/controllers/LocationController.ts b/project/src/controllers/LocationController.ts index a4ee114a..fd77a79d 100644 --- a/project/src/controllers/LocationController.ts +++ b/project/src/controllers/LocationController.ts @@ -4,7 +4,6 @@ import { ContextVariableType } from "@spt/context/ContextVariableType"; import { LocationGenerator } from "@spt/generators/LocationGenerator"; import { LootGenerator } from "@spt/generators/LootGenerator"; import { WeightedRandomHelper } from "@spt/helpers/WeightedRandomHelper"; -import { ILocation } from "@spt/models/eft/common/ILocation"; import { ILocationBase } from "@spt/models/eft/common/ILocationBase"; import { ILocationsGenerateAllResponse } from "@spt/models/eft/common/ILocationsSourceDestinationBase"; import { ILooseLoot, SpawnpointTemplate } from "@spt/models/eft/common/ILooseLoot"; @@ -76,10 +75,10 @@ export class LocationController * @param name Map name * @returns ILocationBase */ - protected generate(name: string): ILocationBase + public generate(name: string): ILocationBase { - const location: ILocation = this.databaseService.getLocation(name); - const locationBaseClone: ILocationBase = this.cloner.clone(location.base); + const location = this.databaseService.getLocation(name); + const locationBaseClone = this.cloner.clone(location.base); // Update datetime property to now locationBaseClone.UnixDateTime = this.timeUtil.getTimestamp(); diff --git a/project/src/helpers/ItemHelper.ts b/project/src/helpers/ItemHelper.ts index 918180f1..88d804a7 100644 --- a/project/src/helpers/ItemHelper.ts +++ b/project/src/helpers/ItemHelper.ts @@ -2,7 +2,7 @@ import { inject, injectable } from "tsyringe"; import { HandbookHelper } from "@spt/helpers/HandbookHelper"; import { IStaticAmmoDetails } from "@spt/models/eft/common/ILocation"; import { IPmcData } from "@spt/models/eft/common/IPmcData"; -import { InsuredItem } from "@spt/models/eft/common/tables/IBotBase"; +import { IInsuredItem } from "@spt/models/eft/common/tables/IBotBase"; import { Item, Location, Repairable, Upd } from "@spt/models/eft/common/tables/IItem"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { BaseClasses } from "@spt/models/enums/BaseClasses"; @@ -905,7 +905,7 @@ export class ItemHelper public replaceIDs( originalItems: Item[], pmcData?: IPmcData, - insuredItems?: InsuredItem[], + insuredItems?: IInsuredItem[], fastPanel?: any, ): Item[] { diff --git a/project/src/models/eft/common/tables/IBotBase.ts b/project/src/models/eft/common/tables/IBotBase.ts index b1d6c7c0..27550cc0 100644 --- a/project/src/models/eft/common/tables/IBotBase.ts +++ b/project/src/models/eft/common/tables/IBotBase.ts @@ -22,7 +22,7 @@ export interface IBotBase Stats: Stats Encyclopedia: Record TaskConditionCounters: Record - InsuredItems: InsuredItem[] + InsuredItems: IInsuredItem[] Hideout: Hideout Quests: IQuestStatus[] TradersInfo: Record @@ -365,7 +365,7 @@ export interface BackendCounter value: number } -export interface InsuredItem +export interface IInsuredItem { /** Trader Id item was insured by */ tid: string