From b0159e642725dc2e1ddf1055938dde1bcb966921 Mon Sep 17 00:00:00 2001 From: Dev Date: Sat, 19 Oct 2024 11:31:19 +0100 Subject: [PATCH] Removed unused interfaces Renamed Interfaces to follow correct naming system --- project/src/controllers/HideoutController.ts | 4 ++-- project/src/generators/BotWeaponGenerator.ts | 10 +++++----- .../eft/hideout/HideoutUpgradeCompleteRequestData.ts | 5 ----- project/src/models/eft/location/IAirdropLootResult.ts | 4 ++-- ...enerateWeaponResult.ts => IGenerateWeaponResult.ts} | 2 +- project/src/models/spt/services/CustomPreset.ts | 6 ------ .../src/models/spt/services/CustomTraderAssortData.ts | 7 ------- project/src/models/spt/services/LootItem.ts | 2 +- 8 files changed, 11 insertions(+), 29 deletions(-) delete mode 100644 project/src/models/eft/hideout/HideoutUpgradeCompleteRequestData.ts rename project/src/models/spt/bots/{GenerateWeaponResult.ts => IGenerateWeaponResult.ts} (89%) delete mode 100644 project/src/models/spt/services/CustomPreset.ts delete mode 100644 project/src/models/spt/services/CustomTraderAssortData.ts diff --git a/project/src/controllers/HideoutController.ts b/project/src/controllers/HideoutController.ts index 3b72dabf..3792237b 100644 --- a/project/src/controllers/HideoutController.ts +++ b/project/src/controllers/HideoutController.ts @@ -8,7 +8,6 @@ import { ProfileHelper } from "@spt/helpers/ProfileHelper"; import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { IBotHideoutArea, IProduct, IScavCase, ITaskConditionCounter } from "@spt/models/eft/common/tables/IBotBase"; import { IItem } from "@spt/models/eft/common/tables/IItem"; -import { HideoutUpgradeCompleteRequestData } from "@spt/models/eft/hideout/HideoutUpgradeCompleteRequestData"; import { IHandleQTEEventRequestData } from "@spt/models/eft/hideout/IHandleQTEEventRequestData"; import { IHideoutArea, Stage } from "@spt/models/eft/hideout/IHideoutArea"; import { IHideoutCancelProductionRequestData } from "@spt/models/eft/hideout/IHideoutCancelProductionRequestData"; @@ -23,6 +22,7 @@ import { IHideoutSingleProductionStartRequestData } from "@spt/models/eft/hideou import { IHideoutTakeItemOutRequestData } from "@spt/models/eft/hideout/IHideoutTakeItemOutRequestData"; import { IHideoutTakeProductionRequestData } from "@spt/models/eft/hideout/IHideoutTakeProductionRequestData"; import { IHideoutToggleAreaRequestData } from "@spt/models/eft/hideout/IHideoutToggleAreaRequestData"; +import { IHideoutUpgradeCompleteRequestData } from "@spt/models/eft/hideout/IHideoutUpgradeCompleteRequestData"; import { IHideoutUpgradeRequestData } from "@spt/models/eft/hideout/IHideoutUpgradeRequestData"; import { IQteData, IQteResult } from "@spt/models/eft/hideout/IQteData"; import { IRecordShootingRangePoints } from "@spt/models/eft/hideout/IRecordShootingRangePoints"; @@ -171,7 +171,7 @@ export class HideoutController { */ public upgradeComplete( pmcData: IPmcData, - request: HideoutUpgradeCompleteRequestData, + request: IHideoutUpgradeCompleteRequestData, sessionID: string, output: IItemEventRouterResponse, ): void { diff --git a/project/src/generators/BotWeaponGenerator.ts b/project/src/generators/BotWeaponGenerator.ts index f1ecf7bc..b3a11d38 100644 --- a/project/src/generators/BotWeaponGenerator.ts +++ b/project/src/generators/BotWeaponGenerator.ts @@ -12,8 +12,8 @@ import { IItem } from "@spt/models/eft/common/tables/IItem"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; import { EquipmentSlots } from "@spt/models/enums/EquipmentSlots"; -import { GenerateWeaponResult } from "@spt/models/spt/bots/GenerateWeaponResult"; import { IGenerateWeaponRequest } from "@spt/models/spt/bots/IGenerateWeaponRequest"; +import { IGenerateWeaponResult } from "@spt/models/spt/bots/IGenerateWeaponResult"; import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; import { IPmcConfig } from "@spt/models/spt/config/IPmcConfig"; import { IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; @@ -77,7 +77,7 @@ export class BotWeaponGenerator { botRole: string, isPmc: boolean, botLevel: number, - ): GenerateWeaponResult { + ): IGenerateWeaponResult { const weaponTpl = this.pickWeightedWeaponTplFromPool(equipmentSlot, botTemplateInventory); return this.generateWeaponByTpl( sessionId, @@ -124,7 +124,7 @@ export class BotWeaponGenerator { botRole: string, isPmc: boolean, botLevel: number, - ): GenerateWeaponResult { + ): IGenerateWeaponResult { const modPool = botTemplateInventory.mods; const weaponItemTemplate = this.itemHelper.getItem(weaponTpl)[1]; @@ -380,7 +380,7 @@ export class BotWeaponGenerator { * @param botRole The bot type we're getting generating extra mags for */ public addExtraMagazinesToInventory( - generatedWeaponResult: GenerateWeaponResult, + generatedWeaponResult: IGenerateWeaponResult, magWeights: IGenerationData, inventory: PmcInventory, botRole: string, @@ -438,7 +438,7 @@ export class BotWeaponGenerator { */ protected addUbglGrenadesToBotInventory( weaponMods: IItem[], - generatedWeaponResult: GenerateWeaponResult, + generatedWeaponResult: IGenerateWeaponResult, inventory: PmcInventory, ): void { // Find ubgl mod item + get details of it from db diff --git a/project/src/models/eft/hideout/HideoutUpgradeCompleteRequestData.ts b/project/src/models/eft/hideout/HideoutUpgradeCompleteRequestData.ts deleted file mode 100644 index 8583e8d9..00000000 --- a/project/src/models/eft/hideout/HideoutUpgradeCompleteRequestData.ts +++ /dev/null @@ -1,5 +0,0 @@ -export interface HideoutUpgradeCompleteRequestData { - Action: string; - areaType: number; - timestamp: number; -} diff --git a/project/src/models/eft/location/IAirdropLootResult.ts b/project/src/models/eft/location/IAirdropLootResult.ts index 7c626cde..6aa32eb8 100644 --- a/project/src/models/eft/location/IAirdropLootResult.ts +++ b/project/src/models/eft/location/IAirdropLootResult.ts @@ -1,6 +1,6 @@ -import { LootItem } from "@spt/models/spt/services/LootItem"; +import { ILootItem } from "@spt/models/spt/services/LootItem"; export interface IAirdropLootResult { dropType: string; - loot: LootItem[]; + loot: ILootItem[]; } diff --git a/project/src/models/spt/bots/GenerateWeaponResult.ts b/project/src/models/spt/bots/IGenerateWeaponResult.ts similarity index 89% rename from project/src/models/spt/bots/GenerateWeaponResult.ts rename to project/src/models/spt/bots/IGenerateWeaponResult.ts index b5a084b6..04b5ebd5 100644 --- a/project/src/models/spt/bots/GenerateWeaponResult.ts +++ b/project/src/models/spt/bots/IGenerateWeaponResult.ts @@ -2,7 +2,7 @@ import { IMods } from "@spt/models/eft/common/tables/IBotType"; import { IItem } from "@spt/models/eft/common/tables/IItem"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; -export class GenerateWeaponResult { +export interface IGenerateWeaponResult { weapon: IItem[]; chosenAmmoTpl: string; chosenUbglAmmoTpl: string; diff --git a/project/src/models/spt/services/CustomPreset.ts b/project/src/models/spt/services/CustomPreset.ts deleted file mode 100644 index 550e51be..00000000 --- a/project/src/models/spt/services/CustomPreset.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { IPreset } from "@spt/models/eft/common/IGlobals"; - -export interface CustomPreset { - key: string; - preset: IPreset; -} diff --git a/project/src/models/spt/services/CustomTraderAssortData.ts b/project/src/models/spt/services/CustomTraderAssortData.ts deleted file mode 100644 index e865442a..00000000 --- a/project/src/models/spt/services/CustomTraderAssortData.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { ITraderAssort } from "@spt/models/eft/common/tables/ITrader"; -import { Traders } from "@spt/models/enums/Traders"; - -export interface CustomTraderAssortData { - traderId: Traders; - assorts: ITraderAssort; -} diff --git a/project/src/models/spt/services/LootItem.ts b/project/src/models/spt/services/LootItem.ts index 91851ca7..4f49b373 100644 --- a/project/src/models/spt/services/LootItem.ts +++ b/project/src/models/spt/services/LootItem.ts @@ -1,4 +1,4 @@ -export class LootItem { +export class ILootItem { id?: string; tpl: string; isPreset: boolean;