From b64c46c95d7ab5c6b4d37a9f06a8b005b5322c59 Mon Sep 17 00:00:00 2001 From: Chomp Date: Mon, 6 Jan 2025 15:21:35 +0000 Subject: [PATCH] Remove redundant function that requires ragfair trader that was removed awhile ago --- project/src/controllers/GameController.ts | 4 +-- project/src/services/PostDbLoadService.ts | 37 ----------------------- 2 files changed, 2 insertions(+), 39 deletions(-) diff --git a/project/src/controllers/GameController.ts b/project/src/controllers/GameController.ts index de24018a..c8617bad 100644 --- a/project/src/controllers/GameController.ts +++ b/project/src/controllers/GameController.ts @@ -29,7 +29,7 @@ import { ICoreConfig } from "@spt/models/spt/config/ICoreConfig"; import { IHideoutConfig } from "@spt/models/spt/config/IHideoutConfig"; import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig"; import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; -import { ILogger } from "@spt/models/spt/utils/ILogger"; +import type { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; import { CustomLocationWaveService } from "@spt/services/CustomLocationWaveService"; import { DatabaseService } from "@spt/services/DatabaseService"; @@ -45,7 +45,7 @@ import { SeasonalEventService } from "@spt/services/SeasonalEventService"; import { HashUtil } from "@spt/utils/HashUtil"; import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; -import { ICloner } from "@spt/utils/cloners/ICloner"; +import type { ICloner } from "@spt/utils/cloners/ICloner"; import { inject, injectable } from "tsyringe"; @injectable() diff --git a/project/src/services/PostDbLoadService.ts b/project/src/services/PostDbLoadService.ts index 08bbd041..e43eb84a 100644 --- a/project/src/services/PostDbLoadService.ts +++ b/project/src/services/PostDbLoadService.ts @@ -90,8 +90,6 @@ export class PostDbLoadService { this.adjustLooseLootSpawnProbabilities(); - this.checkTraderRepairValuesExist(); - this.adjustLocationBotValues(); if (this.locationConfig.rogueLighthouseSpawnTimeSettings.enabled) { @@ -268,41 +266,6 @@ export class PostDbLoadService { } } - /** - * Out of date/incorrectly made trader mods forget this data - */ - protected checkTraderRepairValuesExist(): void { - const traders = this.databaseService.getTraders(); - for (const trader of Object.values(traders)) { - if (!trader?.base?.repair) { - this.logger.warning( - this.localisationService.getText("trader-missing_repair_property_using_default", { - traderId: trader.base._id, - nickname: trader.base.nickname, - }), - ); - - // use ragfair trader as a default - trader.base.repair = this.cloner.clone(traders.ragfair.base.repair); - - return; - } - - if (trader.base.repair?.quality === undefined) { - this.logger.warning( - this.localisationService.getText("trader-missing_repair_quality_property_using_default", { - traderId: trader.base._id, - nickname: trader.base.nickname, - }), - ); - - // use ragfair trader as a default - trader.base.repair.quality = this.cloner.clone(traders.ragfair.base.repair.quality); - trader.base.repair.quality = traders.ragfair.base.repair.quality; - } - } - } - protected adjustLocationBotValues(): void { const mapsDb = this.databaseService.getLocations();