From 67f4aea3f285c012a517e290432840ab43e719ca Mon Sep 17 00:00:00 2001 From: Dev Date: Fri, 31 May 2024 10:31:47 +0100 Subject: [PATCH] Updated types --- .../Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts | 6 +++--- .../10ScopesAndTypes/types/helpers/PresetHelper.d.ts | 6 +++--- .../10ScopesAndTypes/types/helpers/ProfileHelper.d.ts | 6 +++--- .../10ScopesAndTypes/types/helpers/QuestHelper.d.ts | 6 +++--- .../types/helpers/RagfairOfferHelper.d.ts | 6 +++--- .../10ScopesAndTypes/types/helpers/RepairHelper.d.ts | 6 +++--- .../types/helpers/TraderAssortHelper.d.ts | 6 +++--- .../10ScopesAndTypes/types/helpers/TraderHelper.d.ts | 6 +++--- .../types/models/eft/common/IGlobals.d.ts | 1 - .../types/models/eft/common/ILocationBase.d.ts | 6 ++++++ .../types/models/eft/common/tables/IRepeatableQuests.d.ts | 3 +++ .../types/models/eft/common/tables/ITemplateItem.d.ts | 8 +++++++- .../types/models/spt/config/IQuestConfig.d.ts | 2 ++ .../types/services/BotEquipmentModPoolService.d.ts | 6 +++--- .../types/services/CustomLocationWaveService.d.ts | 6 +++--- .../10ScopesAndTypes/types/services/InsuranceService.d.ts | 6 +++--- .../10ScopesAndTypes/types/services/MailSendService.d.ts | 6 +++--- .../10ScopesAndTypes/types/services/OpenZoneService.d.ts | 6 +++--- .../10ScopesAndTypes/types/services/PaymentService.d.ts | 6 +++--- .../10ScopesAndTypes/types/services/PlayerService.d.ts | 6 +++--- .../types/services/RagfairLinkedItemService.d.ts | 6 +++--- .../types/services/RagfairOfferService.d.ts | 6 +++--- .../types/services/RagfairPriceService.d.ts | 6 +++--- .../types/services/RagfairTaxService.d.ts | 6 +++--- .../types/services/RaidTimeAdjustmentService.d.ts | 6 +++--- .../10ScopesAndTypes/types/services/RepairService.d.ts | 6 +++--- .../types/services/TraderServicesService.d.ts | 6 +++--- .../types/services/mod/CustomItemService.d.ts | 4 ++-- .../Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts | 6 +++--- .../11BundleLoadingSample/types/helpers/PresetHelper.d.ts | 6 +++--- .../types/helpers/ProfileHelper.d.ts | 6 +++--- .../11BundleLoadingSample/types/helpers/QuestHelper.d.ts | 6 +++--- .../types/helpers/RagfairOfferHelper.d.ts | 6 +++--- .../11BundleLoadingSample/types/helpers/RepairHelper.d.ts | 6 +++--- .../types/helpers/TraderAssortHelper.d.ts | 6 +++--- .../11BundleLoadingSample/types/helpers/TraderHelper.d.ts | 6 +++--- .../types/models/eft/common/IGlobals.d.ts | 1 - .../types/models/eft/common/ILocationBase.d.ts | 6 ++++++ .../types/models/eft/common/tables/IRepeatableQuests.d.ts | 3 +++ .../types/models/eft/common/tables/ITemplateItem.d.ts | 8 +++++++- .../types/models/spt/config/IQuestConfig.d.ts | 2 ++ .../types/services/BotEquipmentModPoolService.d.ts | 6 +++--- .../types/services/CustomLocationWaveService.d.ts | 6 +++--- .../types/services/InsuranceService.d.ts | 6 +++--- .../types/services/MailSendService.d.ts | 6 +++--- .../types/services/OpenZoneService.d.ts | 6 +++--- .../types/services/PaymentService.d.ts | 6 +++--- .../types/services/PlayerService.d.ts | 6 +++--- .../types/services/RagfairLinkedItemService.d.ts | 6 +++--- .../types/services/RagfairOfferService.d.ts | 6 +++--- .../types/services/RagfairPriceService.d.ts | 6 +++--- .../types/services/RagfairTaxService.d.ts | 6 +++--- .../types/services/RaidTimeAdjustmentService.d.ts | 6 +++--- .../types/services/RepairService.d.ts | 6 +++--- .../types/services/TraderServicesService.d.ts | 6 +++--- .../types/services/mod/CustomItemService.d.ts | 4 ++-- .../Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts | 6 +++--- .../types/helpers/PresetHelper.d.ts | 6 +++--- .../types/helpers/ProfileHelper.d.ts | 6 +++--- .../types/helpers/QuestHelper.d.ts | 6 +++--- .../types/helpers/RagfairOfferHelper.d.ts | 6 +++--- .../types/helpers/RepairHelper.d.ts | 6 +++--- .../types/helpers/TraderAssortHelper.d.ts | 6 +++--- .../types/helpers/TraderHelper.d.ts | 6 +++--- .../types/models/eft/common/IGlobals.d.ts | 1 - .../types/models/eft/common/ILocationBase.d.ts | 6 ++++++ .../types/models/eft/common/tables/IRepeatableQuests.d.ts | 3 +++ .../types/models/eft/common/tables/ITemplateItem.d.ts | 8 +++++++- .../types/models/spt/config/IQuestConfig.d.ts | 2 ++ .../types/services/BotEquipmentModPoolService.d.ts | 6 +++--- .../types/services/CustomLocationWaveService.d.ts | 6 +++--- .../types/services/InsuranceService.d.ts | 6 +++--- .../types/services/MailSendService.d.ts | 6 +++--- .../types/services/OpenZoneService.d.ts | 6 +++--- .../types/services/PaymentService.d.ts | 6 +++--- .../types/services/PlayerService.d.ts | 6 +++--- .../types/services/RagfairLinkedItemService.d.ts | 6 +++--- .../types/services/RagfairOfferService.d.ts | 6 +++--- .../types/services/RagfairPriceService.d.ts | 6 +++--- .../types/services/RagfairTaxService.d.ts | 6 +++--- .../types/services/RaidTimeAdjustmentService.d.ts | 6 +++--- .../types/services/RepairService.d.ts | 6 +++--- .../types/services/TraderServicesService.d.ts | 6 +++--- .../types/services/mod/CustomItemService.d.ts | 4 ++-- .../Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts | 6 +++--- TypeScript/13AddTrader/types/helpers/PresetHelper.d.ts | 6 +++--- TypeScript/13AddTrader/types/helpers/ProfileHelper.d.ts | 6 +++--- TypeScript/13AddTrader/types/helpers/QuestHelper.d.ts | 6 +++--- .../13AddTrader/types/helpers/RagfairOfferHelper.d.ts | 6 +++--- TypeScript/13AddTrader/types/helpers/RepairHelper.d.ts | 6 +++--- .../13AddTrader/types/helpers/TraderAssortHelper.d.ts | 6 +++--- TypeScript/13AddTrader/types/helpers/TraderHelper.d.ts | 6 +++--- .../13AddTrader/types/models/eft/common/IGlobals.d.ts | 1 - .../types/models/eft/common/ILocationBase.d.ts | 6 ++++++ .../types/models/eft/common/tables/IRepeatableQuests.d.ts | 3 +++ .../types/models/eft/common/tables/ITemplateItem.d.ts | 8 +++++++- .../13AddTrader/types/models/spt/config/IQuestConfig.d.ts | 2 ++ .../types/services/BotEquipmentModPoolService.d.ts | 6 +++--- .../types/services/CustomLocationWaveService.d.ts | 6 +++--- .../13AddTrader/types/services/InsuranceService.d.ts | 6 +++--- .../13AddTrader/types/services/MailSendService.d.ts | 6 +++--- .../13AddTrader/types/services/OpenZoneService.d.ts | 6 +++--- TypeScript/13AddTrader/types/services/PaymentService.d.ts | 6 +++--- TypeScript/13AddTrader/types/services/PlayerService.d.ts | 6 +++--- .../types/services/RagfairLinkedItemService.d.ts | 6 +++--- .../13AddTrader/types/services/RagfairOfferService.d.ts | 6 +++--- .../13AddTrader/types/services/RagfairPriceService.d.ts | 6 +++--- .../13AddTrader/types/services/RagfairTaxService.d.ts | 6 +++--- .../types/services/RaidTimeAdjustmentService.d.ts | 6 +++--- TypeScript/13AddTrader/types/services/RepairService.d.ts | 6 +++--- .../13AddTrader/types/services/TraderServicesService.d.ts | 6 +++--- .../13AddTrader/types/services/mod/CustomItemService.d.ts | 4 ++-- .../Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts | 6 +++--- .../14AfterDBLoadHook/types/helpers/PresetHelper.d.ts | 6 +++--- .../14AfterDBLoadHook/types/helpers/ProfileHelper.d.ts | 6 +++--- .../14AfterDBLoadHook/types/helpers/QuestHelper.d.ts | 6 +++--- .../types/helpers/RagfairOfferHelper.d.ts | 6 +++--- .../14AfterDBLoadHook/types/helpers/RepairHelper.d.ts | 6 +++--- .../types/helpers/TraderAssortHelper.d.ts | 6 +++--- .../14AfterDBLoadHook/types/helpers/TraderHelper.d.ts | 6 +++--- .../types/models/eft/common/IGlobals.d.ts | 1 - .../types/models/eft/common/ILocationBase.d.ts | 6 ++++++ .../types/models/eft/common/tables/IRepeatableQuests.d.ts | 3 +++ .../types/models/eft/common/tables/ITemplateItem.d.ts | 8 +++++++- .../types/models/spt/config/IQuestConfig.d.ts | 2 ++ .../types/services/BotEquipmentModPoolService.d.ts | 6 +++--- .../types/services/CustomLocationWaveService.d.ts | 6 +++--- .../types/services/InsuranceService.d.ts | 6 +++--- .../14AfterDBLoadHook/types/services/MailSendService.d.ts | 6 +++--- .../14AfterDBLoadHook/types/services/OpenZoneService.d.ts | 6 +++--- .../14AfterDBLoadHook/types/services/PaymentService.d.ts | 6 +++--- .../14AfterDBLoadHook/types/services/PlayerService.d.ts | 6 +++--- .../types/services/RagfairLinkedItemService.d.ts | 6 +++--- .../types/services/RagfairOfferService.d.ts | 6 +++--- .../types/services/RagfairPriceService.d.ts | 6 +++--- .../types/services/RagfairTaxService.d.ts | 6 +++--- .../types/services/RaidTimeAdjustmentService.d.ts | 6 +++--- .../14AfterDBLoadHook/types/services/RepairService.d.ts | 6 +++--- .../types/services/TraderServicesService.d.ts | 6 +++--- .../types/services/mod/CustomItemService.d.ts | 4 ++-- .../Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts | 6 +++--- .../15HttpListenerExample/types/helpers/PresetHelper.d.ts | 6 +++--- .../types/helpers/ProfileHelper.d.ts | 6 +++--- .../15HttpListenerExample/types/helpers/QuestHelper.d.ts | 6 +++--- .../types/helpers/RagfairOfferHelper.d.ts | 6 +++--- .../15HttpListenerExample/types/helpers/RepairHelper.d.ts | 6 +++--- .../types/helpers/TraderAssortHelper.d.ts | 6 +++--- .../15HttpListenerExample/types/helpers/TraderHelper.d.ts | 6 +++--- .../types/models/eft/common/IGlobals.d.ts | 1 - .../types/models/eft/common/ILocationBase.d.ts | 6 ++++++ .../types/models/eft/common/tables/IRepeatableQuests.d.ts | 3 +++ .../types/models/eft/common/tables/ITemplateItem.d.ts | 8 +++++++- .../types/models/spt/config/IQuestConfig.d.ts | 2 ++ .../types/services/BotEquipmentModPoolService.d.ts | 6 +++--- .../types/services/CustomLocationWaveService.d.ts | 6 +++--- .../types/services/InsuranceService.d.ts | 6 +++--- .../types/services/MailSendService.d.ts | 6 +++--- .../types/services/OpenZoneService.d.ts | 6 +++--- .../types/services/PaymentService.d.ts | 6 +++--- .../types/services/PlayerService.d.ts | 6 +++--- .../types/services/RagfairLinkedItemService.d.ts | 6 +++--- .../types/services/RagfairOfferService.d.ts | 6 +++--- .../types/services/RagfairPriceService.d.ts | 6 +++--- .../types/services/RagfairTaxService.d.ts | 6 +++--- .../types/services/RaidTimeAdjustmentService.d.ts | 6 +++--- .../types/services/RepairService.d.ts | 6 +++--- .../types/services/TraderServicesService.d.ts | 6 +++--- .../types/services/mod/CustomItemService.d.ts | 4 ++-- .../Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts | 6 +++--- TypeScript/16ImporterUtil/types/helpers/PresetHelper.d.ts | 6 +++--- .../16ImporterUtil/types/helpers/ProfileHelper.d.ts | 6 +++--- TypeScript/16ImporterUtil/types/helpers/QuestHelper.d.ts | 6 +++--- .../16ImporterUtil/types/helpers/RagfairOfferHelper.d.ts | 6 +++--- TypeScript/16ImporterUtil/types/helpers/RepairHelper.d.ts | 6 +++--- .../16ImporterUtil/types/helpers/TraderAssortHelper.d.ts | 6 +++--- TypeScript/16ImporterUtil/types/helpers/TraderHelper.d.ts | 6 +++--- .../16ImporterUtil/types/models/eft/common/IGlobals.d.ts | 1 - .../types/models/eft/common/ILocationBase.d.ts | 6 ++++++ .../types/models/eft/common/tables/IRepeatableQuests.d.ts | 3 +++ .../types/models/eft/common/tables/ITemplateItem.d.ts | 8 +++++++- .../types/models/spt/config/IQuestConfig.d.ts | 2 ++ .../types/services/BotEquipmentModPoolService.d.ts | 6 +++--- .../types/services/CustomLocationWaveService.d.ts | 6 +++--- .../16ImporterUtil/types/services/InsuranceService.d.ts | 6 +++--- .../16ImporterUtil/types/services/MailSendService.d.ts | 6 +++--- .../16ImporterUtil/types/services/OpenZoneService.d.ts | 6 +++--- .../16ImporterUtil/types/services/PaymentService.d.ts | 6 +++--- .../16ImporterUtil/types/services/PlayerService.d.ts | 6 +++--- .../types/services/RagfairLinkedItemService.d.ts | 6 +++--- .../types/services/RagfairOfferService.d.ts | 6 +++--- .../types/services/RagfairPriceService.d.ts | 6 +++--- .../16ImporterUtil/types/services/RagfairTaxService.d.ts | 6 +++--- .../types/services/RaidTimeAdjustmentService.d.ts | 6 +++--- .../16ImporterUtil/types/services/RepairService.d.ts | 6 +++--- .../types/services/TraderServicesService.d.ts | 6 +++--- .../types/services/mod/CustomItemService.d.ts | 4 ++-- .../Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts | 6 +++--- .../types/helpers/PresetHelper.d.ts | 6 +++--- .../types/helpers/ProfileHelper.d.ts | 6 +++--- .../types/helpers/QuestHelper.d.ts | 6 +++--- .../types/helpers/RagfairOfferHelper.d.ts | 6 +++--- .../types/helpers/RepairHelper.d.ts | 6 +++--- .../types/helpers/TraderAssortHelper.d.ts | 6 +++--- .../types/helpers/TraderHelper.d.ts | 6 +++--- .../types/models/eft/common/IGlobals.d.ts | 1 - .../types/models/eft/common/ILocationBase.d.ts | 6 ++++++ .../types/models/eft/common/tables/IRepeatableQuests.d.ts | 3 +++ .../types/models/eft/common/tables/ITemplateItem.d.ts | 8 +++++++- .../types/models/spt/config/IQuestConfig.d.ts | 2 ++ .../types/services/BotEquipmentModPoolService.d.ts | 6 +++--- .../types/services/CustomLocationWaveService.d.ts | 6 +++--- .../types/services/InsuranceService.d.ts | 6 +++--- .../types/services/MailSendService.d.ts | 6 +++--- .../types/services/OpenZoneService.d.ts | 6 +++--- .../types/services/PaymentService.d.ts | 6 +++--- .../types/services/PlayerService.d.ts | 6 +++--- .../types/services/RagfairLinkedItemService.d.ts | 6 +++--- .../types/services/RagfairOfferService.d.ts | 6 +++--- .../types/services/RagfairPriceService.d.ts | 6 +++--- .../types/services/RagfairTaxService.d.ts | 6 +++--- .../types/services/RaidTimeAdjustmentService.d.ts | 6 +++--- .../types/services/RepairService.d.ts | 6 +++--- .../types/services/TraderServicesService.d.ts | 6 +++--- .../types/services/mod/CustomItemService.d.ts | 4 ++-- .../Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts | 6 +++--- .../types/helpers/PresetHelper.d.ts | 6 +++--- .../types/helpers/ProfileHelper.d.ts | 6 +++--- .../types/helpers/QuestHelper.d.ts | 6 +++--- .../types/helpers/RagfairOfferHelper.d.ts | 6 +++--- .../types/helpers/RepairHelper.d.ts | 6 +++--- .../types/helpers/TraderAssortHelper.d.ts | 6 +++--- .../types/helpers/TraderHelper.d.ts | 6 +++--- .../types/models/eft/common/IGlobals.d.ts | 1 - .../types/models/eft/common/ILocationBase.d.ts | 6 ++++++ .../types/models/eft/common/tables/IRepeatableQuests.d.ts | 3 +++ .../types/models/eft/common/tables/ITemplateItem.d.ts | 8 +++++++- .../types/models/spt/config/IQuestConfig.d.ts | 2 ++ .../types/services/BotEquipmentModPoolService.d.ts | 6 +++--- .../types/services/CustomLocationWaveService.d.ts | 6 +++--- .../types/services/InsuranceService.d.ts | 6 +++--- .../types/services/MailSendService.d.ts | 6 +++--- .../types/services/OpenZoneService.d.ts | 6 +++--- .../types/services/PaymentService.d.ts | 6 +++--- .../types/services/PlayerService.d.ts | 6 +++--- .../types/services/RagfairLinkedItemService.d.ts | 6 +++--- .../types/services/RagfairOfferService.d.ts | 6 +++--- .../types/services/RagfairPriceService.d.ts | 6 +++--- .../types/services/RagfairTaxService.d.ts | 6 +++--- .../types/services/RaidTimeAdjustmentService.d.ts | 6 +++--- .../types/services/RepairService.d.ts | 6 +++--- .../types/services/TraderServicesService.d.ts | 6 +++--- .../types/services/mod/CustomItemService.d.ts | 4 ++-- .../Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts | 6 +++--- .../18CustomItemService/types/helpers/PresetHelper.d.ts | 6 +++--- .../18CustomItemService/types/helpers/ProfileHelper.d.ts | 6 +++--- .../18CustomItemService/types/helpers/QuestHelper.d.ts | 6 +++--- .../types/helpers/RagfairOfferHelper.d.ts | 6 +++--- .../18CustomItemService/types/helpers/RepairHelper.d.ts | 6 +++--- .../types/helpers/TraderAssortHelper.d.ts | 6 +++--- .../18CustomItemService/types/helpers/TraderHelper.d.ts | 6 +++--- .../types/models/eft/common/IGlobals.d.ts | 1 - .../types/models/eft/common/ILocationBase.d.ts | 6 ++++++ .../types/models/eft/common/tables/IRepeatableQuests.d.ts | 3 +++ .../types/models/eft/common/tables/ITemplateItem.d.ts | 8 +++++++- .../types/models/spt/config/IQuestConfig.d.ts | 2 ++ .../types/services/BotEquipmentModPoolService.d.ts | 6 +++--- .../types/services/CustomLocationWaveService.d.ts | 6 +++--- .../types/services/InsuranceService.d.ts | 6 +++--- .../types/services/MailSendService.d.ts | 6 +++--- .../types/services/OpenZoneService.d.ts | 6 +++--- .../types/services/PaymentService.d.ts | 6 +++--- .../18CustomItemService/types/services/PlayerService.d.ts | 6 +++--- .../types/services/RagfairLinkedItemService.d.ts | 6 +++--- .../types/services/RagfairOfferService.d.ts | 6 +++--- .../types/services/RagfairPriceService.d.ts | 6 +++--- .../types/services/RagfairTaxService.d.ts | 6 +++--- .../types/services/RaidTimeAdjustmentService.d.ts | 6 +++--- .../18CustomItemService/types/services/RepairService.d.ts | 6 +++--- .../types/services/TraderServicesService.d.ts | 6 +++--- .../types/services/mod/CustomItemService.d.ts | 4 ++-- .../Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts | 6 +++--- .../types/helpers/PresetHelper.d.ts | 6 +++--- .../types/helpers/ProfileHelper.d.ts | 6 +++--- .../19UseExternalLibraries/types/helpers/QuestHelper.d.ts | 6 +++--- .../types/helpers/RagfairOfferHelper.d.ts | 6 +++--- .../types/helpers/RepairHelper.d.ts | 6 +++--- .../types/helpers/TraderAssortHelper.d.ts | 6 +++--- .../types/helpers/TraderHelper.d.ts | 6 +++--- .../types/models/eft/common/IGlobals.d.ts | 1 - .../types/models/eft/common/ILocationBase.d.ts | 6 ++++++ .../types/models/eft/common/tables/IRepeatableQuests.d.ts | 3 +++ .../types/models/eft/common/tables/ITemplateItem.d.ts | 8 +++++++- .../types/models/spt/config/IQuestConfig.d.ts | 2 ++ .../types/services/BotEquipmentModPoolService.d.ts | 6 +++--- .../types/services/CustomLocationWaveService.d.ts | 6 +++--- .../types/services/InsuranceService.d.ts | 6 +++--- .../types/services/MailSendService.d.ts | 6 +++--- .../types/services/OpenZoneService.d.ts | 6 +++--- .../types/services/PaymentService.d.ts | 6 +++--- .../types/services/PlayerService.d.ts | 6 +++--- .../types/services/RagfairLinkedItemService.d.ts | 6 +++--- .../types/services/RagfairOfferService.d.ts | 6 +++--- .../types/services/RagfairPriceService.d.ts | 6 +++--- .../types/services/RagfairTaxService.d.ts | 6 +++--- .../types/services/RaidTimeAdjustmentService.d.ts | 6 +++--- .../types/services/RepairService.d.ts | 6 +++--- .../types/services/TraderServicesService.d.ts | 6 +++--- .../types/services/mod/CustomItemService.d.ts | 4 ++-- .../Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts | 6 +++--- TypeScript/1LogToConsole/types/helpers/PresetHelper.d.ts | 6 +++--- TypeScript/1LogToConsole/types/helpers/ProfileHelper.d.ts | 6 +++--- TypeScript/1LogToConsole/types/helpers/QuestHelper.d.ts | 6 +++--- .../1LogToConsole/types/helpers/RagfairOfferHelper.d.ts | 6 +++--- TypeScript/1LogToConsole/types/helpers/RepairHelper.d.ts | 6 +++--- .../1LogToConsole/types/helpers/TraderAssortHelper.d.ts | 6 +++--- TypeScript/1LogToConsole/types/helpers/TraderHelper.d.ts | 6 +++--- .../1LogToConsole/types/models/eft/common/IGlobals.d.ts | 1 - .../types/models/eft/common/ILocationBase.d.ts | 6 ++++++ .../types/models/eft/common/tables/IRepeatableQuests.d.ts | 3 +++ .../types/models/eft/common/tables/ITemplateItem.d.ts | 8 +++++++- .../types/models/spt/config/IQuestConfig.d.ts | 2 ++ .../types/services/BotEquipmentModPoolService.d.ts | 6 +++--- .../types/services/CustomLocationWaveService.d.ts | 6 +++--- .../1LogToConsole/types/services/InsuranceService.d.ts | 6 +++--- .../1LogToConsole/types/services/MailSendService.d.ts | 6 +++--- .../1LogToConsole/types/services/OpenZoneService.d.ts | 6 +++--- .../1LogToConsole/types/services/PaymentService.d.ts | 6 +++--- .../1LogToConsole/types/services/PlayerService.d.ts | 6 +++--- .../types/services/RagfairLinkedItemService.d.ts | 6 +++--- .../1LogToConsole/types/services/RagfairOfferService.d.ts | 6 +++--- .../1LogToConsole/types/services/RagfairPriceService.d.ts | 6 +++--- .../1LogToConsole/types/services/RagfairTaxService.d.ts | 6 +++--- .../types/services/RaidTimeAdjustmentService.d.ts | 6 +++--- .../1LogToConsole/types/services/RepairService.d.ts | 6 +++--- .../types/services/TraderServicesService.d.ts | 6 +++--- .../types/services/mod/CustomItemService.d.ts | 4 ++-- .../Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts | 6 +++--- .../20CustomChatBot/types/helpers/PresetHelper.d.ts | 6 +++--- .../20CustomChatBot/types/helpers/ProfileHelper.d.ts | 6 +++--- TypeScript/20CustomChatBot/types/helpers/QuestHelper.d.ts | 6 +++--- .../20CustomChatBot/types/helpers/RagfairOfferHelper.d.ts | 6 +++--- .../20CustomChatBot/types/helpers/RepairHelper.d.ts | 6 +++--- .../20CustomChatBot/types/helpers/TraderAssortHelper.d.ts | 6 +++--- .../20CustomChatBot/types/helpers/TraderHelper.d.ts | 6 +++--- .../20CustomChatBot/types/models/eft/common/IGlobals.d.ts | 1 - .../types/models/eft/common/ILocationBase.d.ts | 6 ++++++ .../types/models/eft/common/tables/IRepeatableQuests.d.ts | 3 +++ .../types/models/eft/common/tables/ITemplateItem.d.ts | 8 +++++++- .../types/models/spt/config/IQuestConfig.d.ts | 2 ++ .../types/services/BotEquipmentModPoolService.d.ts | 6 +++--- .../types/services/CustomLocationWaveService.d.ts | 6 +++--- .../20CustomChatBot/types/services/InsuranceService.d.ts | 6 +++--- .../20CustomChatBot/types/services/MailSendService.d.ts | 6 +++--- .../20CustomChatBot/types/services/OpenZoneService.d.ts | 6 +++--- .../20CustomChatBot/types/services/PaymentService.d.ts | 6 +++--- .../20CustomChatBot/types/services/PlayerService.d.ts | 6 +++--- .../types/services/RagfairLinkedItemService.d.ts | 6 +++--- .../types/services/RagfairOfferService.d.ts | 6 +++--- .../types/services/RagfairPriceService.d.ts | 6 +++--- .../20CustomChatBot/types/services/RagfairTaxService.d.ts | 6 +++--- .../types/services/RaidTimeAdjustmentService.d.ts | 6 +++--- .../20CustomChatBot/types/services/RepairService.d.ts | 6 +++--- .../types/services/TraderServicesService.d.ts | 6 +++--- .../types/services/mod/CustomItemService.d.ts | 4 ++-- .../Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts | 6 +++--- .../types/helpers/PresetHelper.d.ts | 6 +++--- .../types/helpers/ProfileHelper.d.ts | 6 +++--- .../types/helpers/QuestHelper.d.ts | 6 +++--- .../types/helpers/RagfairOfferHelper.d.ts | 6 +++--- .../types/helpers/RepairHelper.d.ts | 6 +++--- .../types/helpers/TraderAssortHelper.d.ts | 6 +++--- .../types/helpers/TraderHelper.d.ts | 6 +++--- .../types/models/eft/common/IGlobals.d.ts | 1 - .../types/models/eft/common/ILocationBase.d.ts | 6 ++++++ .../types/models/eft/common/tables/IRepeatableQuests.d.ts | 3 +++ .../types/models/eft/common/tables/ITemplateItem.d.ts | 8 +++++++- .../types/models/spt/config/IQuestConfig.d.ts | 2 ++ .../types/services/BotEquipmentModPoolService.d.ts | 6 +++--- .../types/services/CustomLocationWaveService.d.ts | 6 +++--- .../types/services/InsuranceService.d.ts | 6 +++--- .../types/services/MailSendService.d.ts | 6 +++--- .../types/services/OpenZoneService.d.ts | 6 +++--- .../types/services/PaymentService.d.ts | 6 +++--- .../types/services/PlayerService.d.ts | 6 +++--- .../types/services/RagfairLinkedItemService.d.ts | 6 +++--- .../types/services/RagfairOfferService.d.ts | 6 +++--- .../types/services/RagfairPriceService.d.ts | 6 +++--- .../types/services/RagfairTaxService.d.ts | 6 +++--- .../types/services/RaidTimeAdjustmentService.d.ts | 6 +++--- .../types/services/RepairService.d.ts | 6 +++--- .../types/services/TraderServicesService.d.ts | 6 +++--- .../types/services/mod/CustomItemService.d.ts | 4 ++-- .../Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts | 6 +++--- .../22CustomAkiCommand/types/helpers/PresetHelper.d.ts | 6 +++--- .../22CustomAkiCommand/types/helpers/ProfileHelper.d.ts | 6 +++--- .../22CustomAkiCommand/types/helpers/QuestHelper.d.ts | 6 +++--- .../types/helpers/RagfairOfferHelper.d.ts | 6 +++--- .../22CustomAkiCommand/types/helpers/RepairHelper.d.ts | 6 +++--- .../types/helpers/TraderAssortHelper.d.ts | 6 +++--- .../22CustomAkiCommand/types/helpers/TraderHelper.d.ts | 6 +++--- .../types/models/eft/common/IGlobals.d.ts | 1 - .../types/models/eft/common/ILocationBase.d.ts | 6 ++++++ .../types/models/eft/common/tables/IRepeatableQuests.d.ts | 3 +++ .../types/models/eft/common/tables/ITemplateItem.d.ts | 8 +++++++- .../types/models/spt/config/IQuestConfig.d.ts | 2 ++ .../types/services/BotEquipmentModPoolService.d.ts | 6 +++--- .../types/services/CustomLocationWaveService.d.ts | 6 +++--- .../types/services/InsuranceService.d.ts | 6 +++--- .../types/services/MailSendService.d.ts | 6 +++--- .../types/services/OpenZoneService.d.ts | 6 +++--- .../22CustomAkiCommand/types/services/PaymentService.d.ts | 6 +++--- .../22CustomAkiCommand/types/services/PlayerService.d.ts | 6 +++--- .../types/services/RagfairLinkedItemService.d.ts | 6 +++--- .../types/services/RagfairOfferService.d.ts | 6 +++--- .../types/services/RagfairPriceService.d.ts | 6 +++--- .../types/services/RagfairTaxService.d.ts | 6 +++--- .../types/services/RaidTimeAdjustmentService.d.ts | 6 +++--- .../22CustomAkiCommand/types/services/RepairService.d.ts | 6 +++--- .../types/services/TraderServicesService.d.ts | 6 +++--- .../types/services/mod/CustomItemService.d.ts | 4 ++-- .../Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts | 6 +++--- TypeScript/2EditDatabase/types/helpers/PresetHelper.d.ts | 6 +++--- TypeScript/2EditDatabase/types/helpers/ProfileHelper.d.ts | 6 +++--- TypeScript/2EditDatabase/types/helpers/QuestHelper.d.ts | 6 +++--- .../2EditDatabase/types/helpers/RagfairOfferHelper.d.ts | 6 +++--- TypeScript/2EditDatabase/types/helpers/RepairHelper.d.ts | 6 +++--- .../2EditDatabase/types/helpers/TraderAssortHelper.d.ts | 6 +++--- TypeScript/2EditDatabase/types/helpers/TraderHelper.d.ts | 6 +++--- .../2EditDatabase/types/models/eft/common/IGlobals.d.ts | 1 - .../types/models/eft/common/ILocationBase.d.ts | 6 ++++++ .../types/models/eft/common/tables/IRepeatableQuests.d.ts | 3 +++ .../types/models/eft/common/tables/ITemplateItem.d.ts | 8 +++++++- .../types/models/spt/config/IQuestConfig.d.ts | 2 ++ .../types/services/BotEquipmentModPoolService.d.ts | 6 +++--- .../types/services/CustomLocationWaveService.d.ts | 6 +++--- .../2EditDatabase/types/services/InsuranceService.d.ts | 6 +++--- .../2EditDatabase/types/services/MailSendService.d.ts | 6 +++--- .../2EditDatabase/types/services/OpenZoneService.d.ts | 6 +++--- .../2EditDatabase/types/services/PaymentService.d.ts | 6 +++--- .../2EditDatabase/types/services/PlayerService.d.ts | 6 +++--- .../types/services/RagfairLinkedItemService.d.ts | 6 +++--- .../2EditDatabase/types/services/RagfairOfferService.d.ts | 6 +++--- .../2EditDatabase/types/services/RagfairPriceService.d.ts | 6 +++--- .../2EditDatabase/types/services/RagfairTaxService.d.ts | 6 +++--- .../types/services/RaidTimeAdjustmentService.d.ts | 6 +++--- .../2EditDatabase/types/services/RepairService.d.ts | 6 +++--- .../types/services/TraderServicesService.d.ts | 6 +++--- .../types/services/mod/CustomItemService.d.ts | 4 ++-- .../Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts | 6 +++--- .../3GetSptConfigFile/types/helpers/PresetHelper.d.ts | 6 +++--- .../3GetSptConfigFile/types/helpers/ProfileHelper.d.ts | 6 +++--- .../3GetSptConfigFile/types/helpers/QuestHelper.d.ts | 6 +++--- .../types/helpers/RagfairOfferHelper.d.ts | 6 +++--- .../3GetSptConfigFile/types/helpers/RepairHelper.d.ts | 6 +++--- .../types/helpers/TraderAssortHelper.d.ts | 6 +++--- .../3GetSptConfigFile/types/helpers/TraderHelper.d.ts | 6 +++--- .../types/models/eft/common/IGlobals.d.ts | 1 - .../types/models/eft/common/ILocationBase.d.ts | 6 ++++++ .../types/models/eft/common/tables/IRepeatableQuests.d.ts | 3 +++ .../types/models/eft/common/tables/ITemplateItem.d.ts | 8 +++++++- .../types/models/spt/config/IQuestConfig.d.ts | 2 ++ .../types/services/BotEquipmentModPoolService.d.ts | 6 +++--- .../types/services/CustomLocationWaveService.d.ts | 6 +++--- .../types/services/InsuranceService.d.ts | 6 +++--- .../3GetSptConfigFile/types/services/MailSendService.d.ts | 6 +++--- .../3GetSptConfigFile/types/services/OpenZoneService.d.ts | 6 +++--- .../3GetSptConfigFile/types/services/PaymentService.d.ts | 6 +++--- .../3GetSptConfigFile/types/services/PlayerService.d.ts | 6 +++--- .../types/services/RagfairLinkedItemService.d.ts | 6 +++--- .../types/services/RagfairOfferService.d.ts | 6 +++--- .../types/services/RagfairPriceService.d.ts | 6 +++--- .../types/services/RagfairTaxService.d.ts | 6 +++--- .../types/services/RaidTimeAdjustmentService.d.ts | 6 +++--- .../3GetSptConfigFile/types/services/RepairService.d.ts | 6 +++--- .../types/services/TraderServicesService.d.ts | 6 +++--- .../types/services/mod/CustomItemService.d.ts | 4 ++-- .../Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts | 6 +++--- .../types/helpers/PresetHelper.d.ts | 6 +++--- .../types/helpers/ProfileHelper.d.ts | 6 +++--- .../types/helpers/QuestHelper.d.ts | 6 +++--- .../types/helpers/RagfairOfferHelper.d.ts | 6 +++--- .../types/helpers/RepairHelper.d.ts | 6 +++--- .../types/helpers/TraderAssortHelper.d.ts | 6 +++--- .../types/helpers/TraderHelper.d.ts | 6 +++--- .../types/models/eft/common/IGlobals.d.ts | 1 - .../types/models/eft/common/ILocationBase.d.ts | 6 ++++++ .../types/models/eft/common/tables/IRepeatableQuests.d.ts | 3 +++ .../types/models/eft/common/tables/ITemplateItem.d.ts | 8 +++++++- .../types/models/spt/config/IQuestConfig.d.ts | 2 ++ .../types/services/BotEquipmentModPoolService.d.ts | 6 +++--- .../types/services/CustomLocationWaveService.d.ts | 6 +++--- .../types/services/InsuranceService.d.ts | 6 +++--- .../types/services/MailSendService.d.ts | 6 +++--- .../types/services/OpenZoneService.d.ts | 6 +++--- .../types/services/PaymentService.d.ts | 6 +++--- .../types/services/PlayerService.d.ts | 6 +++--- .../types/services/RagfairLinkedItemService.d.ts | 6 +++--- .../types/services/RagfairOfferService.d.ts | 6 +++--- .../types/services/RagfairPriceService.d.ts | 6 +++--- .../types/services/RagfairTaxService.d.ts | 6 +++--- .../types/services/RaidTimeAdjustmentService.d.ts | 6 +++--- .../types/services/RepairService.d.ts | 6 +++--- .../types/services/TraderServicesService.d.ts | 6 +++--- .../types/services/mod/CustomItemService.d.ts | 4 ++-- .../Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts | 6 +++--- .../4UseACustomConfigFile/types/helpers/PresetHelper.d.ts | 6 +++--- .../types/helpers/ProfileHelper.d.ts | 6 +++--- .../4UseACustomConfigFile/types/helpers/QuestHelper.d.ts | 6 +++--- .../types/helpers/RagfairOfferHelper.d.ts | 6 +++--- .../4UseACustomConfigFile/types/helpers/RepairHelper.d.ts | 6 +++--- .../types/helpers/TraderAssortHelper.d.ts | 6 +++--- .../4UseACustomConfigFile/types/helpers/TraderHelper.d.ts | 6 +++--- .../types/models/eft/common/IGlobals.d.ts | 1 - .../types/models/eft/common/ILocationBase.d.ts | 6 ++++++ .../types/models/eft/common/tables/IRepeatableQuests.d.ts | 3 +++ .../types/models/eft/common/tables/ITemplateItem.d.ts | 8 +++++++- .../types/models/spt/config/IQuestConfig.d.ts | 2 ++ .../types/services/BotEquipmentModPoolService.d.ts | 6 +++--- .../types/services/CustomLocationWaveService.d.ts | 6 +++--- .../types/services/InsuranceService.d.ts | 6 +++--- .../types/services/MailSendService.d.ts | 6 +++--- .../types/services/OpenZoneService.d.ts | 6 +++--- .../types/services/PaymentService.d.ts | 6 +++--- .../types/services/PlayerService.d.ts | 6 +++--- .../types/services/RagfairLinkedItemService.d.ts | 6 +++--- .../types/services/RagfairOfferService.d.ts | 6 +++--- .../types/services/RagfairPriceService.d.ts | 6 +++--- .../types/services/RagfairTaxService.d.ts | 6 +++--- .../types/services/RaidTimeAdjustmentService.d.ts | 6 +++--- .../types/services/RepairService.d.ts | 6 +++--- .../types/services/TraderServicesService.d.ts | 6 +++--- .../types/services/mod/CustomItemService.d.ts | 4 ++-- .../Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts | 6 +++--- TypeScript/5ReplaceMethod/types/helpers/PresetHelper.d.ts | 6 +++--- .../5ReplaceMethod/types/helpers/ProfileHelper.d.ts | 6 +++--- TypeScript/5ReplaceMethod/types/helpers/QuestHelper.d.ts | 6 +++--- .../5ReplaceMethod/types/helpers/RagfairOfferHelper.d.ts | 6 +++--- TypeScript/5ReplaceMethod/types/helpers/RepairHelper.d.ts | 6 +++--- .../5ReplaceMethod/types/helpers/TraderAssortHelper.d.ts | 6 +++--- TypeScript/5ReplaceMethod/types/helpers/TraderHelper.d.ts | 6 +++--- .../5ReplaceMethod/types/models/eft/common/IGlobals.d.ts | 1 - .../types/models/eft/common/ILocationBase.d.ts | 6 ++++++ .../types/models/eft/common/tables/IRepeatableQuests.d.ts | 3 +++ .../types/models/eft/common/tables/ITemplateItem.d.ts | 8 +++++++- .../types/models/spt/config/IQuestConfig.d.ts | 2 ++ .../types/services/BotEquipmentModPoolService.d.ts | 6 +++--- .../types/services/CustomLocationWaveService.d.ts | 6 +++--- .../5ReplaceMethod/types/services/InsuranceService.d.ts | 6 +++--- .../5ReplaceMethod/types/services/MailSendService.d.ts | 6 +++--- .../5ReplaceMethod/types/services/OpenZoneService.d.ts | 6 +++--- .../5ReplaceMethod/types/services/PaymentService.d.ts | 6 +++--- .../5ReplaceMethod/types/services/PlayerService.d.ts | 6 +++--- .../types/services/RagfairLinkedItemService.d.ts | 6 +++--- .../types/services/RagfairOfferService.d.ts | 6 +++--- .../types/services/RagfairPriceService.d.ts | 6 +++--- .../5ReplaceMethod/types/services/RagfairTaxService.d.ts | 6 +++--- .../types/services/RaidTimeAdjustmentService.d.ts | 6 +++--- .../5ReplaceMethod/types/services/RepairService.d.ts | 6 +++--- .../types/services/TraderServicesService.d.ts | 6 +++--- .../types/services/mod/CustomItemService.d.ts | 4 ++-- .../Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts | 6 +++--- .../types/helpers/PresetHelper.d.ts | 6 +++--- .../types/helpers/ProfileHelper.d.ts | 6 +++--- .../6ReferenceAnotherClass/types/helpers/QuestHelper.d.ts | 6 +++--- .../types/helpers/RagfairOfferHelper.d.ts | 6 +++--- .../types/helpers/RepairHelper.d.ts | 6 +++--- .../types/helpers/TraderAssortHelper.d.ts | 6 +++--- .../types/helpers/TraderHelper.d.ts | 6 +++--- .../types/models/eft/common/IGlobals.d.ts | 1 - .../types/models/eft/common/ILocationBase.d.ts | 6 ++++++ .../types/models/eft/common/tables/IRepeatableQuests.d.ts | 3 +++ .../types/models/eft/common/tables/ITemplateItem.d.ts | 8 +++++++- .../types/models/spt/config/IQuestConfig.d.ts | 2 ++ .../types/services/BotEquipmentModPoolService.d.ts | 6 +++--- .../types/services/CustomLocationWaveService.d.ts | 6 +++--- .../types/services/InsuranceService.d.ts | 6 +++--- .../types/services/MailSendService.d.ts | 6 +++--- .../types/services/OpenZoneService.d.ts | 6 +++--- .../types/services/PaymentService.d.ts | 6 +++--- .../types/services/PlayerService.d.ts | 6 +++--- .../types/services/RagfairLinkedItemService.d.ts | 6 +++--- .../types/services/RagfairOfferService.d.ts | 6 +++--- .../types/services/RagfairPriceService.d.ts | 6 +++--- .../types/services/RagfairTaxService.d.ts | 6 +++--- .../types/services/RaidTimeAdjustmentService.d.ts | 6 +++--- .../types/services/RepairService.d.ts | 6 +++--- .../types/services/TraderServicesService.d.ts | 6 +++--- .../types/services/mod/CustomItemService.d.ts | 4 ++-- .../Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts | 6 +++--- TypeScript/7OnLoadHook/types/helpers/PresetHelper.d.ts | 6 +++--- TypeScript/7OnLoadHook/types/helpers/ProfileHelper.d.ts | 6 +++--- TypeScript/7OnLoadHook/types/helpers/QuestHelper.d.ts | 6 +++--- .../7OnLoadHook/types/helpers/RagfairOfferHelper.d.ts | 6 +++--- TypeScript/7OnLoadHook/types/helpers/RepairHelper.d.ts | 6 +++--- .../7OnLoadHook/types/helpers/TraderAssortHelper.d.ts | 6 +++--- TypeScript/7OnLoadHook/types/helpers/TraderHelper.d.ts | 6 +++--- .../7OnLoadHook/types/models/eft/common/IGlobals.d.ts | 1 - .../types/models/eft/common/ILocationBase.d.ts | 6 ++++++ .../types/models/eft/common/tables/IRepeatableQuests.d.ts | 3 +++ .../types/models/eft/common/tables/ITemplateItem.d.ts | 8 +++++++- .../7OnLoadHook/types/models/spt/config/IQuestConfig.d.ts | 2 ++ .../types/services/BotEquipmentModPoolService.d.ts | 6 +++--- .../types/services/CustomLocationWaveService.d.ts | 6 +++--- .../7OnLoadHook/types/services/InsuranceService.d.ts | 6 +++--- .../7OnLoadHook/types/services/MailSendService.d.ts | 6 +++--- .../7OnLoadHook/types/services/OpenZoneService.d.ts | 6 +++--- TypeScript/7OnLoadHook/types/services/PaymentService.d.ts | 6 +++--- TypeScript/7OnLoadHook/types/services/PlayerService.d.ts | 6 +++--- .../types/services/RagfairLinkedItemService.d.ts | 6 +++--- .../7OnLoadHook/types/services/RagfairOfferService.d.ts | 6 +++--- .../7OnLoadHook/types/services/RagfairPriceService.d.ts | 6 +++--- .../7OnLoadHook/types/services/RagfairTaxService.d.ts | 6 +++--- .../types/services/RaidTimeAdjustmentService.d.ts | 6 +++--- TypeScript/7OnLoadHook/types/services/RepairService.d.ts | 6 +++--- .../7OnLoadHook/types/services/TraderServicesService.d.ts | 6 +++--- .../7OnLoadHook/types/services/mod/CustomItemService.d.ts | 4 ++-- .../Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts | 6 +++--- TypeScript/8OnUpdateHook/types/helpers/PresetHelper.d.ts | 6 +++--- TypeScript/8OnUpdateHook/types/helpers/ProfileHelper.d.ts | 6 +++--- TypeScript/8OnUpdateHook/types/helpers/QuestHelper.d.ts | 6 +++--- .../8OnUpdateHook/types/helpers/RagfairOfferHelper.d.ts | 6 +++--- TypeScript/8OnUpdateHook/types/helpers/RepairHelper.d.ts | 6 +++--- .../8OnUpdateHook/types/helpers/TraderAssortHelper.d.ts | 6 +++--- TypeScript/8OnUpdateHook/types/helpers/TraderHelper.d.ts | 6 +++--- .../8OnUpdateHook/types/models/eft/common/IGlobals.d.ts | 1 - .../types/models/eft/common/ILocationBase.d.ts | 6 ++++++ .../types/models/eft/common/tables/IRepeatableQuests.d.ts | 3 +++ .../types/models/eft/common/tables/ITemplateItem.d.ts | 8 +++++++- .../types/models/spt/config/IQuestConfig.d.ts | 2 ++ .../types/services/BotEquipmentModPoolService.d.ts | 6 +++--- .../types/services/CustomLocationWaveService.d.ts | 6 +++--- .../8OnUpdateHook/types/services/InsuranceService.d.ts | 6 +++--- .../8OnUpdateHook/types/services/MailSendService.d.ts | 6 +++--- .../8OnUpdateHook/types/services/OpenZoneService.d.ts | 6 +++--- .../8OnUpdateHook/types/services/PaymentService.d.ts | 6 +++--- .../8OnUpdateHook/types/services/PlayerService.d.ts | 6 +++--- .../types/services/RagfairLinkedItemService.d.ts | 6 +++--- .../8OnUpdateHook/types/services/RagfairOfferService.d.ts | 6 +++--- .../8OnUpdateHook/types/services/RagfairPriceService.d.ts | 6 +++--- .../8OnUpdateHook/types/services/RagfairTaxService.d.ts | 6 +++--- .../types/services/RaidTimeAdjustmentService.d.ts | 6 +++--- .../8OnUpdateHook/types/services/RepairService.d.ts | 6 +++--- .../types/services/TraderServicesService.d.ts | 6 +++--- .../types/services/mod/CustomItemService.d.ts | 4 ++-- .../Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts | 6 +++--- TypeScript/9RouterHooks/types/helpers/PresetHelper.d.ts | 6 +++--- TypeScript/9RouterHooks/types/helpers/ProfileHelper.d.ts | 6 +++--- TypeScript/9RouterHooks/types/helpers/QuestHelper.d.ts | 6 +++--- .../9RouterHooks/types/helpers/RagfairOfferHelper.d.ts | 6 +++--- TypeScript/9RouterHooks/types/helpers/RepairHelper.d.ts | 6 +++--- .../9RouterHooks/types/helpers/TraderAssortHelper.d.ts | 6 +++--- TypeScript/9RouterHooks/types/helpers/TraderHelper.d.ts | 6 +++--- .../9RouterHooks/types/models/eft/common/IGlobals.d.ts | 1 - .../types/models/eft/common/ILocationBase.d.ts | 6 ++++++ .../types/models/eft/common/tables/IRepeatableQuests.d.ts | 3 +++ .../types/models/eft/common/tables/ITemplateItem.d.ts | 8 +++++++- .../types/models/spt/config/IQuestConfig.d.ts | 2 ++ .../types/services/BotEquipmentModPoolService.d.ts | 6 +++--- .../types/services/CustomLocationWaveService.d.ts | 6 +++--- .../9RouterHooks/types/services/InsuranceService.d.ts | 6 +++--- .../9RouterHooks/types/services/MailSendService.d.ts | 6 +++--- .../9RouterHooks/types/services/OpenZoneService.d.ts | 6 +++--- .../9RouterHooks/types/services/PaymentService.d.ts | 6 +++--- TypeScript/9RouterHooks/types/services/PlayerService.d.ts | 6 +++--- .../types/services/RagfairLinkedItemService.d.ts | 6 +++--- .../9RouterHooks/types/services/RagfairOfferService.d.ts | 6 +++--- .../9RouterHooks/types/services/RagfairPriceService.d.ts | 6 +++--- .../9RouterHooks/types/services/RagfairTaxService.d.ts | 6 +++--- .../types/services/RaidTimeAdjustmentService.d.ts | 6 +++--- TypeScript/9RouterHooks/types/services/RepairService.d.ts | 6 +++--- .../types/services/TraderServicesService.d.ts | 6 +++--- .../types/services/mod/CustomItemService.d.ts | 4 ++-- 672 files changed, 2064 insertions(+), 1680 deletions(-) diff --git a/TypeScript/10ScopesAndTypes/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts b/TypeScript/10ScopesAndTypes/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts index a7491b5..c51bf7e 100644 --- a/TypeScript/10ScopesAndTypes/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts +++ b/TypeScript/10ScopesAndTypes/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts @@ -6,7 +6,7 @@ import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { ISendMessageRequest } from "@spt/models/eft/dialog/ISendMessageRequest"; import { IUserDialogInfo } from "@spt/models/eft/profile/ISptProfile"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -19,7 +19,7 @@ export declare class GiveSptCommand implements ISptCommand { protected presetHelper: PresetHelper; protected mailSendService: MailSendService; protected localeService: LocaleService; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemFilterService: ItemFilterService; protected cloner: ICloner; /** @@ -34,7 +34,7 @@ export declare class GiveSptCommand implements ISptCommand { private static acceptableConfidence; private static excludedPresetItems; protected savedCommand: Map; - constructor(logger: ILogger, itemHelper: ItemHelper, hashUtil: HashUtil, presetHelper: PresetHelper, mailSendService: MailSendService, localeService: LocaleService, databaseServer: DatabaseServer, itemFilterService: ItemFilterService, cloner: ICloner); + constructor(logger: ILogger, itemHelper: ItemHelper, hashUtil: HashUtil, presetHelper: PresetHelper, mailSendService: MailSendService, localeService: LocaleService, databaseService: DatabaseService, itemFilterService: ItemFilterService, cloner: ICloner); getCommand(): string; getCommandHelp(): string; performAction(commandHandler: IUserDialogInfo, sessionId: string, request: ISendMessageRequest): string; diff --git a/TypeScript/10ScopesAndTypes/types/helpers/PresetHelper.d.ts b/TypeScript/10ScopesAndTypes/types/helpers/PresetHelper.d.ts index 5fc8a7c..e71e5b7 100644 --- a/TypeScript/10ScopesAndTypes/types/helpers/PresetHelper.d.ts +++ b/TypeScript/10ScopesAndTypes/types/helpers/PresetHelper.d.ts @@ -1,16 +1,16 @@ import { IPreset } from "@spt/models/eft/common/IGlobals"; import { BaseClasses } from "@spt/models/enums/BaseClasses"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; import { ItemHelper } from "./ItemHelper"; export declare class PresetHelper { - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected cloner: ICloner; protected lookup: Record; protected defaultEquipmentPresets: Record; protected defaultWeaponPresets: Record; - constructor(databaseServer: DatabaseServer, itemHelper: ItemHelper, cloner: ICloner); + constructor(databaseService: DatabaseService, itemHelper: ItemHelper, cloner: ICloner); hydratePresetStore(input: Record): void; /** * Get default weapon and equipment presets diff --git a/TypeScript/10ScopesAndTypes/types/helpers/ProfileHelper.d.ts b/TypeScript/10ScopesAndTypes/types/helpers/ProfileHelper.d.ts index 37937ff..e943bd3 100644 --- a/TypeScript/10ScopesAndTypes/types/helpers/ProfileHelper.d.ts +++ b/TypeScript/10ScopesAndTypes/types/helpers/ProfileHelper.d.ts @@ -7,8 +7,8 @@ import { SkillTypes } from "@spt/models/enums/SkillTypes"; import { IInventoryConfig } from "@spt/models/spt/config/IInventoryConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileSnapshotService } from "@spt/services/ProfileSnapshotService"; import { ICloner } from "@spt/utils/cloners/ICloner"; @@ -21,14 +21,14 @@ export declare class ProfileHelper { protected watermark: Watermark; protected timeUtil: TimeUtil; protected saveServer: SaveServer; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected profileSnapshotService: ProfileSnapshotService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected cloner: ICloner; protected inventoryConfig: IInventoryConfig; - constructor(logger: ILogger, hashUtil: HashUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileSnapshotService: ProfileSnapshotService, localisationService: LocalisationService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, hashUtil: HashUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseService: DatabaseService, itemHelper: ItemHelper, profileSnapshotService: ProfileSnapshotService, localisationService: LocalisationService, configServer: ConfigServer, cloner: ICloner); /** * Remove/reset a completed quest condtion from players profile quest data * @param sessionID Session id diff --git a/TypeScript/10ScopesAndTypes/types/helpers/QuestHelper.d.ts b/TypeScript/10ScopesAndTypes/types/helpers/QuestHelper.d.ts index 39ba2a9..93368fa 100644 --- a/TypeScript/10ScopesAndTypes/types/helpers/QuestHelper.d.ts +++ b/TypeScript/10ScopesAndTypes/types/helpers/QuestHelper.d.ts @@ -18,7 +18,7 @@ import { IQuestConfig } from "@spt/models/spt/config/IQuestConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -30,9 +30,9 @@ export declare class QuestHelper { protected timeUtil: TimeUtil; protected hashUtil: HashUtil; protected itemHelper: ItemHelper; + protected databaseService: DatabaseService; protected questConditionHelper: QuestConditionHelper; protected eventOutputHolder: EventOutputHolder; - protected databaseServer: DatabaseServer; protected localeService: LocaleService; protected ragfairServerHelper: RagfairServerHelper; protected dialogueHelper: DialogueHelper; @@ -45,7 +45,7 @@ export declare class QuestHelper { protected configServer: ConfigServer; protected cloner: ICloner; protected questConfig: IQuestConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, questConditionHelper: QuestConditionHelper, eventOutputHolder: EventOutputHolder, databaseServer: DatabaseServer, localeService: LocaleService, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, localisationService: LocalisationService, traderHelper: TraderHelper, presetHelper: PresetHelper, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, databaseService: DatabaseService, questConditionHelper: QuestConditionHelper, eventOutputHolder: EventOutputHolder, localeService: LocaleService, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, localisationService: LocalisationService, traderHelper: TraderHelper, presetHelper: PresetHelper, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); /** * Get status of a quest in player profile by its id * @param pmcData Profile to search diff --git a/TypeScript/10ScopesAndTypes/types/helpers/RagfairOfferHelper.d.ts b/TypeScript/10ScopesAndTypes/types/helpers/RagfairOfferHelper.d.ts index 27bb081..a08e60a 100644 --- a/TypeScript/10ScopesAndTypes/types/helpers/RagfairOfferHelper.d.ts +++ b/TypeScript/10ScopesAndTypes/types/helpers/RagfairOfferHelper.d.ts @@ -19,8 +19,8 @@ import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -34,7 +34,7 @@ export declare class RagfairOfferHelper { protected timeUtil: TimeUtil; protected hashUtil: HashUtil; protected eventOutputHolder: EventOutputHolder; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected traderHelper: TraderHelper; protected saveServer: SaveServer; protected itemHelper: ItemHelper; @@ -55,7 +55,7 @@ export declare class RagfairOfferHelper { protected static goodSoldTemplate: string; protected ragfairConfig: IRagfairConfig; protected questConfig: IQuestConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, eventOutputHolder: EventOutputHolder, databaseServer: DatabaseServer, traderHelper: TraderHelper, saveServer: SaveServer, itemHelper: ItemHelper, botHelper: BotHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, localeService: LocaleService, localisationService: LocalisationService, mailSendService: MailSendService, configServer: ConfigServer); + constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, eventOutputHolder: EventOutputHolder, databaseService: DatabaseService, traderHelper: TraderHelper, saveServer: SaveServer, itemHelper: ItemHelper, botHelper: BotHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, localeService: LocaleService, localisationService: LocalisationService, mailSendService: MailSendService, configServer: ConfigServer); /** * Passthrough to ragfairOfferService.getOffers(), get flea offers a player should see * @param searchRequest Data from client diff --git a/TypeScript/10ScopesAndTypes/types/helpers/RepairHelper.d.ts b/TypeScript/10ScopesAndTypes/types/helpers/RepairHelper.d.ts index 4bd0577..99a21da 100644 --- a/TypeScript/10ScopesAndTypes/types/helpers/RepairHelper.d.ts +++ b/TypeScript/10ScopesAndTypes/types/helpers/RepairHelper.d.ts @@ -3,17 +3,17 @@ import { ITemplateItem, Props } from "@spt/models/eft/common/tables/ITemplateIte import { IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RepairHelper { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected configServer: ConfigServer; protected cloner: ICloner; protected repairConfig: IRepairConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, configServer: ConfigServer, cloner: ICloner); /** * Alter an items durability after a repair by trader/repair kit * @param itemToRepair item to update durability details diff --git a/TypeScript/10ScopesAndTypes/types/helpers/TraderAssortHelper.d.ts b/TypeScript/10ScopesAndTypes/types/helpers/TraderAssortHelper.d.ts index faf2a9d..8f8f802 100644 --- a/TypeScript/10ScopesAndTypes/types/helpers/TraderAssortHelper.d.ts +++ b/TypeScript/10ScopesAndTypes/types/helpers/TraderAssortHelper.d.ts @@ -9,7 +9,7 @@ import { ITrader, ITraderAssort } from "@spt/models/eft/common/tables/ITrader"; import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; @@ -21,7 +21,7 @@ export declare class TraderAssortHelper { protected logger: ILogger; protected mathUtil: MathUtil; protected timeUtil: TimeUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected assortHelper: AssortHelper; protected paymentHelper: PaymentHelper; @@ -37,7 +37,7 @@ export declare class TraderAssortHelper { protected traderConfig: ITraderConfig; protected mergedQuestAssorts: Record>; protected createdMergedQuestAssorts: boolean; - constructor(logger: ILogger, mathUtil: MathUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, profileHelper: ProfileHelper, assortHelper: AssortHelper, paymentHelper: PaymentHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, localisationService: LocalisationService, traderPurchasePersisterService: TraderPurchasePersisterService, traderHelper: TraderHelper, fenceService: FenceService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, mathUtil: MathUtil, timeUtil: TimeUtil, databaseService: DatabaseService, profileHelper: ProfileHelper, assortHelper: AssortHelper, paymentHelper: PaymentHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, localisationService: LocalisationService, traderPurchasePersisterService: TraderPurchasePersisterService, traderHelper: TraderHelper, fenceService: FenceService, configServer: ConfigServer, cloner: ICloner); /** * Get a traders assorts * Can be used for returning ragfair / fence assorts diff --git a/TypeScript/10ScopesAndTypes/types/helpers/TraderHelper.d.ts b/TypeScript/10ScopesAndTypes/types/helpers/TraderHelper.d.ts index 5f515da..eec1cc7 100644 --- a/TypeScript/10ScopesAndTypes/types/helpers/TraderHelper.d.ts +++ b/TypeScript/10ScopesAndTypes/types/helpers/TraderHelper.d.ts @@ -10,7 +10,7 @@ import { Traders } from "@spt/models/enums/Traders"; import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; @@ -18,7 +18,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class TraderHelper { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected handbookHelper: HandbookHelper; protected itemHelper: ItemHelper; @@ -33,7 +33,7 @@ export declare class TraderHelper { protected highestTraderPriceItems?: Record; /** Dictionary of item tpl and the highest trader buy back rouble price */ protected highestTraderBuyPriceItems?: Record; - constructor(logger: ILogger, databaseServer: DatabaseServer, profileHelper: ProfileHelper, handbookHelper: HandbookHelper, itemHelper: ItemHelper, playerService: PlayerService, localisationService: LocalisationService, fenceService: FenceService, timeUtil: TimeUtil, randomUtil: RandomUtil, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, profileHelper: ProfileHelper, handbookHelper: HandbookHelper, itemHelper: ItemHelper, playerService: PlayerService, localisationService: LocalisationService, fenceService: FenceService, timeUtil: TimeUtil, randomUtil: RandomUtil, configServer: ConfigServer); /** * Get a trader base object, update profile to reflect players current standing in profile * when trader not found in profile diff --git a/TypeScript/10ScopesAndTypes/types/models/eft/common/IGlobals.d.ts b/TypeScript/10ScopesAndTypes/types/models/eft/common/IGlobals.d.ts index 2209415..a0bb051 100644 --- a/TypeScript/10ScopesAndTypes/types/models/eft/common/IGlobals.d.ts +++ b/TypeScript/10ScopesAndTypes/types/models/eft/common/IGlobals.d.ts @@ -802,7 +802,6 @@ export interface IMaxActiveOfferCount { from: number; to: number; count: number; - countForSpecialEditions: number; } export interface IMaxSumForRarity { Common: IRarityMaxSum; diff --git a/TypeScript/10ScopesAndTypes/types/models/eft/common/ILocationBase.d.ts b/TypeScript/10ScopesAndTypes/types/models/eft/common/ILocationBase.d.ts index 65931f8..10f1a57 100644 --- a/TypeScript/10ScopesAndTypes/types/models/eft/common/ILocationBase.d.ts +++ b/TypeScript/10ScopesAndTypes/types/models/eft/common/ILocationBase.d.ts @@ -196,18 +196,24 @@ export interface Props { export interface Exit { /** % Chance out of 100 exit will appear in raid */ Chance: number; + ChancePVE: number; Count: number; + CountPVE: number; EntryPoints: string; EventAvailable: boolean; ExfiltrationTime: number; + ExfiltrationTimePVE: number; ExfiltrationType: string; RequiredSlot?: string; Id: string; MaxTime: number; + MaxTimePVE: number; MinTime: number; + MinTimePVE: number; Name: string; PassageRequirement: string; PlayersCount: number; + PlayersCountPVE: number; RequirementTip: string; Side?: string; } diff --git a/TypeScript/10ScopesAndTypes/types/models/eft/common/tables/IRepeatableQuests.d.ts b/TypeScript/10ScopesAndTypes/types/models/eft/common/tables/IRepeatableQuests.d.ts index 854c8ef..27ff49d 100644 --- a/TypeScript/10ScopesAndTypes/types/models/eft/common/tables/IRepeatableQuests.d.ts +++ b/TypeScript/10ScopesAndTypes/types/models/eft/common/tables/IRepeatableQuests.d.ts @@ -18,10 +18,13 @@ export interface IRepeatableTemplates { export interface IPmcDataRepeatableQuest { id?: string; name: string; + unavailableTime?: string; activeQuests: IRepeatableQuest[]; inactiveQuests: IRepeatableQuest[]; endTime: number; changeRequirement: Record; + freeChanges: number; + freeChangesAvailable: number; } export interface IChangeRequirement { changeCost: IChangeCost[]; diff --git a/TypeScript/10ScopesAndTypes/types/models/eft/common/tables/ITemplateItem.d.ts b/TypeScript/10ScopesAndTypes/types/models/eft/common/tables/ITemplateItem.d.ts index a8ccfbb..e5c6632 100644 --- a/TypeScript/10ScopesAndTypes/types/models/eft/common/tables/ITemplateItem.d.ts +++ b/TypeScript/10ScopesAndTypes/types/models/eft/common/tables/ITemplateItem.d.ts @@ -63,7 +63,7 @@ export interface Props { DiscardingBlock?: boolean; DropSoundType?: string; RagFairCommissionModifier?: number; - RarityPvE: string; + RarityPvE?: string; IsAlwaysAvailableForInsurance?: boolean; DiscardLimit?: number; MaxResource?: number; @@ -414,6 +414,12 @@ export interface Props { LayoutName?: string; Lower75Prefab?: Prefab; MaxUsages?: number; + ScavKillExpPenalty?: number; + ScavKillExpPenaltyPVE?: number; + ScavKillStandingPenalty?: number; + ScavKillStandingPenaltyPVE?: number; + TradersDiscount?: number; + TradersDiscountPVE?: number; } export interface IHealthEffect { type: string; diff --git a/TypeScript/10ScopesAndTypes/types/models/spt/config/IQuestConfig.d.ts b/TypeScript/10ScopesAndTypes/types/models/spt/config/IQuestConfig.d.ts index 362602c..2cdf4fa 100644 --- a/TypeScript/10ScopesAndTypes/types/models/spt/config/IQuestConfig.d.ts +++ b/TypeScript/10ScopesAndTypes/types/models/spt/config/IQuestConfig.d.ts @@ -47,6 +47,8 @@ export interface IRepeatableQuestConfig { /** Item tplIds to ignore when generating rewards */ rewardBlacklist: string[]; rewardAmmoStackMinSize: number; + freeChangesAvailable: number; + freeChanges: number; } export interface IRewardScaling { levels: number[]; diff --git a/TypeScript/10ScopesAndTypes/types/services/BotEquipmentModPoolService.d.ts b/TypeScript/10ScopesAndTypes/types/services/BotEquipmentModPoolService.d.ts index c53f31b..7b2b442 100644 --- a/TypeScript/10ScopesAndTypes/types/services/BotEquipmentModPoolService.d.ts +++ b/TypeScript/10ScopesAndTypes/types/services/BotEquipmentModPoolService.d.ts @@ -4,7 +4,7 @@ import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { VFS } from "@spt/utils/VFS"; /** Store a mapping between weapons, their slots and the items that fit those slots */ @@ -12,7 +12,7 @@ export declare class BotEquipmentModPoolService { protected logger: ILogger; protected vfs: VFS; protected itemHelper: ItemHelper; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected botConfig: IBotConfig; @@ -20,7 +20,7 @@ export declare class BotEquipmentModPoolService { protected gearModPool: Mods; protected weaponPoolGenerated: boolean; protected armorPoolGenerated: boolean; - constructor(logger: ILogger, vfs: VFS, itemHelper: ItemHelper, databaseServer: DatabaseServer, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, vfs: VFS, itemHelper: ItemHelper, databaseService: DatabaseService, localisationService: LocalisationService, configServer: ConfigServer); /** * Store dictionary of mods for each item passed in * @param items items to find related mods and store in modPool diff --git a/TypeScript/10ScopesAndTypes/types/services/CustomLocationWaveService.d.ts b/TypeScript/10ScopesAndTypes/types/services/CustomLocationWaveService.d.ts index 728a1e8..c72d5bb 100644 --- a/TypeScript/10ScopesAndTypes/types/services/CustomLocationWaveService.d.ts +++ b/TypeScript/10ScopesAndTypes/types/services/CustomLocationWaveService.d.ts @@ -2,15 +2,15 @@ import { BossLocationSpawn, Wave } from "@spt/models/eft/common/ILocationBase"; import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class CustomLocationWaveService { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, configServer: ConfigServer); /** * Add a boss wave to a map * @param locationId e.g. factory4_day, bigmap diff --git a/TypeScript/10ScopesAndTypes/types/services/InsuranceService.d.ts b/TypeScript/10ScopesAndTypes/types/services/InsuranceService.d.ts index c54f9f9..0000e66 100644 --- a/TypeScript/10ScopesAndTypes/types/services/InsuranceService.d.ts +++ b/TypeScript/10ScopesAndTypes/types/services/InsuranceService.d.ts @@ -13,8 +13,8 @@ import { ILostOnDeathConfig } from "@spt/models/spt/config/ILostOnDeathConfig"; import { IInsuranceEquipmentPkg } from "@spt/models/spt/services/IInsuranceEquipmentPkg"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -24,7 +24,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class InsuranceService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected secureContainerHelper: SecureContainerHelper; protected randomUtil: RandomUtil; protected itemHelper: ItemHelper; @@ -42,7 +42,7 @@ export declare class InsuranceService { protected insured: Record>; protected insuranceConfig: IInsuranceConfig; protected lostOnDeathConfig: ILostOnDeathConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, handbookHelper: HandbookHelper, localisationService: LocalisationService, localeService: LocaleService, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, databaseService: DatabaseService, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, handbookHelper: HandbookHelper, localisationService: LocalisationService, localeService: LocaleService, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); /** * Does player have insurance array * @param sessionId Player id diff --git a/TypeScript/10ScopesAndTypes/types/services/MailSendService.d.ts b/TypeScript/10ScopesAndTypes/types/services/MailSendService.d.ts index d445841..8f1f974 100644 --- a/TypeScript/10ScopesAndTypes/types/services/MailSendService.d.ts +++ b/TypeScript/10ScopesAndTypes/types/services/MailSendService.d.ts @@ -9,8 +9,8 @@ import { MessageType } from "@spt/models/enums/MessageType"; import { Traders } from "@spt/models/enums/Traders"; import { IProfileChangeEvent, ISendMessageDetails } from "@spt/models/spt/dialog/ISendMessageDetails"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; @@ -19,7 +19,7 @@ export declare class MailSendService { protected hashUtil: HashUtil; protected timeUtil: TimeUtil; protected saveServer: SaveServer; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected notifierHelper: NotifierHelper; protected dialogueHelper: DialogueHelper; protected notificationSendHelper: NotificationSendHelper; @@ -27,7 +27,7 @@ export declare class MailSendService { protected itemHelper: ItemHelper; protected traderHelper: TraderHelper; protected readonly systemSenderId = "59e7125688a45068a6249071"; - constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, dialogueHelper: DialogueHelper, notificationSendHelper: NotificationSendHelper, localisationService: LocalisationService, itemHelper: ItemHelper, traderHelper: TraderHelper); + constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseService: DatabaseService, notifierHelper: NotifierHelper, dialogueHelper: DialogueHelper, notificationSendHelper: NotificationSendHelper, localisationService: LocalisationService, itemHelper: ItemHelper, traderHelper: TraderHelper); /** * Send a message from an NPC (e.g. prapor) to the player with or without items using direct message text, do not look up any locale * @param sessionId The session ID to send the message to diff --git a/TypeScript/10ScopesAndTypes/types/services/OpenZoneService.d.ts b/TypeScript/10ScopesAndTypes/types/services/OpenZoneService.d.ts index 1bc5f00..c7dd0bd 100644 --- a/TypeScript/10ScopesAndTypes/types/services/OpenZoneService.d.ts +++ b/TypeScript/10ScopesAndTypes/types/services/OpenZoneService.d.ts @@ -1,18 +1,18 @@ import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RandomUtil } from "@spt/utils/RandomUtil"; /** Service for adding new zones to a maps OpenZones property */ export declare class OpenZoneService { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, localisationService: LocalisationService, configServer: ConfigServer); /** * Add open zone to specified map * @param locationId map location (e.g. factory4_day) diff --git a/TypeScript/10ScopesAndTypes/types/services/PaymentService.d.ts b/TypeScript/10ScopesAndTypes/types/services/PaymentService.d.ts index 64ff2c1..61d5731 100644 --- a/TypeScript/10ScopesAndTypes/types/services/PaymentService.d.ts +++ b/TypeScript/10ScopesAndTypes/types/services/PaymentService.d.ts @@ -9,7 +9,7 @@ import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRo import { IProcessBuyTradeRequestData } from "@spt/models/eft/trade/IProcessBuyTradeRequestData"; import { IProcessSellTradeRequestData } from "@spt/models/eft/trade/IProcessSellTradeRequestData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; @@ -17,14 +17,14 @@ export declare class PaymentService { protected logger: ILogger; protected hashUtil: HashUtil; protected httpResponse: HttpResponseUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected handbookHelper: HandbookHelper; protected traderHelper: TraderHelper; protected itemHelper: ItemHelper; protected inventoryHelper: InventoryHelper; protected localisationService: LocalisationService; protected paymentHelper: PaymentHelper; - constructor(logger: ILogger, hashUtil: HashUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, localisationService: LocalisationService, paymentHelper: PaymentHelper); + constructor(logger: ILogger, hashUtil: HashUtil, httpResponse: HttpResponseUtil, databaseService: DatabaseService, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, localisationService: LocalisationService, paymentHelper: PaymentHelper); /** * Take money and insert items into return to server request * @param pmcData Pmc profile diff --git a/TypeScript/10ScopesAndTypes/types/services/PlayerService.d.ts b/TypeScript/10ScopesAndTypes/types/services/PlayerService.d.ts index ae57410..84c4c6f 100644 --- a/TypeScript/10ScopesAndTypes/types/services/PlayerService.d.ts +++ b/TypeScript/10ScopesAndTypes/types/services/PlayerService.d.ts @@ -1,14 +1,14 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class PlayerService { protected logger: ILogger; protected timeUtil: TimeUtil; protected localisationService: LocalisationService; - protected databaseServer: DatabaseServer; - constructor(logger: ILogger, timeUtil: TimeUtil, localisationService: LocalisationService, databaseServer: DatabaseServer); + protected databaseService: DatabaseService; + constructor(logger: ILogger, timeUtil: TimeUtil, localisationService: LocalisationService, databaseService: DatabaseService); /** * Get level of player * @param pmcData Player profile diff --git a/TypeScript/10ScopesAndTypes/types/services/RagfairLinkedItemService.d.ts b/TypeScript/10ScopesAndTypes/types/services/RagfairLinkedItemService.d.ts index 6011c1a..0d03459 100644 --- a/TypeScript/10ScopesAndTypes/types/services/RagfairLinkedItemService.d.ts +++ b/TypeScript/10ScopesAndTypes/types/services/RagfairLinkedItemService.d.ts @@ -1,11 +1,11 @@ import { ItemHelper } from "@spt/helpers/ItemHelper"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; export declare class RagfairLinkedItemService { - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected linkedItemsCache: Record>; - constructor(databaseServer: DatabaseServer, itemHelper: ItemHelper); + constructor(databaseService: DatabaseService, itemHelper: ItemHelper); getLinkedItems(linkedSearchId: string): Set; /** * Use ragfair linked item service to get an array of items that can fit on or in designated itemtpl diff --git a/TypeScript/10ScopesAndTypes/types/services/RagfairOfferService.d.ts b/TypeScript/10ScopesAndTypes/types/services/RagfairOfferService.d.ts index c044f6d..4bc07c3 100644 --- a/TypeScript/10ScopesAndTypes/types/services/RagfairOfferService.d.ts +++ b/TypeScript/10ScopesAndTypes/types/services/RagfairOfferService.d.ts @@ -6,8 +6,8 @@ import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RagfairOfferHolder } from "@spt/utils/RagfairOfferHolder"; @@ -15,7 +15,7 @@ import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class RagfairOfferService { protected logger: ILogger; protected timeUtil: TimeUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected saveServer: SaveServer; protected ragfairServerHelper: RagfairServerHelper; protected profileHelper: ProfileHelper; @@ -28,7 +28,7 @@ export declare class RagfairOfferService { protected expiredOffers: Record; protected ragfairConfig: IRagfairConfig; protected ragfairOfferHandler: RagfairOfferHolder; - constructor(logger: ILogger, timeUtil: TimeUtil, databaseServer: DatabaseServer, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, eventOutputHolder: EventOutputHolder, httpResponse: HttpResponseUtil, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, timeUtil: TimeUtil, databaseService: DatabaseService, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, eventOutputHolder: EventOutputHolder, httpResponse: HttpResponseUtil, localisationService: LocalisationService, configServer: ConfigServer); /** * Get all offers * @returns IRagfairOffer array diff --git a/TypeScript/10ScopesAndTypes/types/services/RagfairPriceService.d.ts b/TypeScript/10ScopesAndTypes/types/services/RagfairPriceService.d.ts index 5b8fa56..0a2f26e 100644 --- a/TypeScript/10ScopesAndTypes/types/services/RagfairPriceService.d.ts +++ b/TypeScript/10ScopesAndTypes/types/services/RagfairPriceService.d.ts @@ -12,7 +12,7 @@ import { IRagfairConfig, IUnreasonableModPrices } from "@spt/models/spt/config/I import { IRagfairServerPrices } from "@spt/models/spt/ragfair/IRagfairServerPrices"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RandomUtil } from "@spt/utils/RandomUtil"; /** @@ -20,7 +20,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; */ export declare class RagfairPriceService implements OnLoad { protected handbookHelper: HandbookHelper; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected logger: ILogger; protected itemHelper: ItemHelper; protected presetHelper: PresetHelper; @@ -30,7 +30,7 @@ export declare class RagfairPriceService implements OnLoad { protected configServer: ConfigServer; protected ragfairConfig: IRagfairConfig; protected prices: IRagfairServerPrices; - constructor(handbookHelper: HandbookHelper, databaseServer: DatabaseServer, logger: ILogger, itemHelper: ItemHelper, presetHelper: PresetHelper, traderHelper: TraderHelper, randomUtil: RandomUtil, localisationService: LocalisationService, configServer: ConfigServer); + constructor(handbookHelper: HandbookHelper, databaseService: DatabaseService, logger: ILogger, itemHelper: ItemHelper, presetHelper: PresetHelper, traderHelper: TraderHelper, randomUtil: RandomUtil, localisationService: LocalisationService, configServer: ConfigServer); /** * Generate static (handbook) and dynamic (prices.json) flea prices, store inside class as dictionaries */ diff --git a/TypeScript/10ScopesAndTypes/types/services/RagfairTaxService.d.ts b/TypeScript/10ScopesAndTypes/types/services/RagfairTaxService.d.ts index 4e4e648..effb9f0 100644 --- a/TypeScript/10ScopesAndTypes/types/services/RagfairTaxService.d.ts +++ b/TypeScript/10ScopesAndTypes/types/services/RagfairTaxService.d.ts @@ -4,15 +4,15 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { IStorePlayerOfferTaxAmountRequestData } from "@spt/models/eft/ragfair/IStorePlayerOfferTaxAmountRequestData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; export declare class RagfairTaxService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected ragfairPriceService: RagfairPriceService; protected itemHelper: ItemHelper; protected playerOfferTaxCache: Record; - constructor(logger: ILogger, databaseServer: DatabaseServer, ragfairPriceService: RagfairPriceService, itemHelper: ItemHelper); + constructor(logger: ILogger, databaseService: DatabaseService, ragfairPriceService: RagfairPriceService, itemHelper: ItemHelper); storeClientOfferTaxValue(sessionId: string, offer: IStorePlayerOfferTaxAmountRequestData): void; clearStoredOfferTaxById(offerIdToRemove: string): void; getStoredClientOfferTaxValueById(offerIdToGet: string): IStorePlayerOfferTaxAmountRequestData; diff --git a/TypeScript/10ScopesAndTypes/types/services/RaidTimeAdjustmentService.d.ts b/TypeScript/10ScopesAndTypes/types/services/RaidTimeAdjustmentService.d.ts index f770b64..bfc099a 100644 --- a/TypeScript/10ScopesAndTypes/types/services/RaidTimeAdjustmentService.d.ts +++ b/TypeScript/10ScopesAndTypes/types/services/RaidTimeAdjustmentService.d.ts @@ -7,17 +7,17 @@ import { ILocationConfig, IScavRaidTimeLocationSettings, LootMultiplier } from " import { IRaidChanges } from "@spt/models/spt/location/IRaidChanges"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RaidTimeAdjustmentService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected randomUtil: RandomUtil; protected weightedRandomHelper: WeightedRandomHelper; protected applicationContext: ApplicationContext; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, applicationContext: ApplicationContext, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, applicationContext: ApplicationContext, configServer: ConfigServer); /** * Make alterations to the base map data passed in * Loot multipliers/waves/wave start times diff --git a/TypeScript/10ScopesAndTypes/types/services/RepairService.d.ts b/TypeScript/10ScopesAndTypes/types/services/RepairService.d.ts index 9203417..48f306e 100644 --- a/TypeScript/10ScopesAndTypes/types/services/RepairService.d.ts +++ b/TypeScript/10ScopesAndTypes/types/services/RepairService.d.ts @@ -14,13 +14,13 @@ import { SkillTypes } from "@spt/models/enums/SkillTypes"; import { BonusSettings, IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RepairService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected randomUtil: RandomUtil; protected itemHelper: ItemHelper; @@ -31,7 +31,7 @@ export declare class RepairService { protected localisationService: LocalisationService; protected configServer: ConfigServer; protected repairConfig: IRepairConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, profileHelper: ProfileHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, traderHelper: TraderHelper, weightedRandomHelper: WeightedRandomHelper, paymentService: PaymentService, repairHelper: RepairHelper, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, profileHelper: ProfileHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, traderHelper: TraderHelper, weightedRandomHelper: WeightedRandomHelper, paymentService: PaymentService, repairHelper: RepairHelper, localisationService: LocalisationService, configServer: ConfigServer); /** * Use trader to repair an items durability * @param sessionID Session id diff --git a/TypeScript/10ScopesAndTypes/types/services/TraderServicesService.d.ts b/TypeScript/10ScopesAndTypes/types/services/TraderServicesService.d.ts index 111c71a..e441eb6 100644 --- a/TypeScript/10ScopesAndTypes/types/services/TraderServicesService.d.ts +++ b/TypeScript/10ScopesAndTypes/types/services/TraderServicesService.d.ts @@ -1,13 +1,13 @@ import { ProfileHelper } from "@spt/helpers/ProfileHelper"; import { ITraderServiceModel } from "@spt/models/spt/services/ITraderServiceModel"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderServicesService { protected profileHelper: ProfileHelper; protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected cloner: ICloner; - constructor(profileHelper: ProfileHelper, logger: ILogger, databaseServer: DatabaseServer, cloner: ICloner); + constructor(profileHelper: ProfileHelper, logger: ILogger, databaseService: DatabaseService, cloner: ICloner); getTraderServices(sessionId: string, traderId: string): ITraderServiceModel[]; } diff --git a/TypeScript/10ScopesAndTypes/types/services/mod/CustomItemService.d.ts b/TypeScript/10ScopesAndTypes/types/services/mod/CustomItemService.d.ts index 6dc4730..1926bed 100644 --- a/TypeScript/10ScopesAndTypes/types/services/mod/CustomItemService.d.ts +++ b/TypeScript/10ScopesAndTypes/types/services/mod/CustomItemService.d.ts @@ -9,11 +9,11 @@ import { HashUtil } from "@spt/utils/HashUtil"; export declare class CustomItemService { protected logger: ILogger; protected hashUtil: HashUtil; - protected databaseServer: DatabaseService; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected itemBaseClassService: ItemBaseClassService; protected cloner: ICloner; - constructor(logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseService, itemHelper: ItemHelper, itemBaseClassService: ItemBaseClassService, cloner: ICloner); + constructor(logger: ILogger, hashUtil: HashUtil, databaseService: DatabaseService, itemHelper: ItemHelper, itemBaseClassService: ItemBaseClassService, cloner: ICloner); /** * Create a new item from a cloned item base * WARNING - If no item id is supplied, an id will be generated, this id will be random every time you add an item and will not be the same on each subsequent server start diff --git a/TypeScript/11BundleLoadingSample/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts b/TypeScript/11BundleLoadingSample/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts index a7491b5..c51bf7e 100644 --- a/TypeScript/11BundleLoadingSample/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts +++ b/TypeScript/11BundleLoadingSample/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts @@ -6,7 +6,7 @@ import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { ISendMessageRequest } from "@spt/models/eft/dialog/ISendMessageRequest"; import { IUserDialogInfo } from "@spt/models/eft/profile/ISptProfile"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -19,7 +19,7 @@ export declare class GiveSptCommand implements ISptCommand { protected presetHelper: PresetHelper; protected mailSendService: MailSendService; protected localeService: LocaleService; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemFilterService: ItemFilterService; protected cloner: ICloner; /** @@ -34,7 +34,7 @@ export declare class GiveSptCommand implements ISptCommand { private static acceptableConfidence; private static excludedPresetItems; protected savedCommand: Map; - constructor(logger: ILogger, itemHelper: ItemHelper, hashUtil: HashUtil, presetHelper: PresetHelper, mailSendService: MailSendService, localeService: LocaleService, databaseServer: DatabaseServer, itemFilterService: ItemFilterService, cloner: ICloner); + constructor(logger: ILogger, itemHelper: ItemHelper, hashUtil: HashUtil, presetHelper: PresetHelper, mailSendService: MailSendService, localeService: LocaleService, databaseService: DatabaseService, itemFilterService: ItemFilterService, cloner: ICloner); getCommand(): string; getCommandHelp(): string; performAction(commandHandler: IUserDialogInfo, sessionId: string, request: ISendMessageRequest): string; diff --git a/TypeScript/11BundleLoadingSample/types/helpers/PresetHelper.d.ts b/TypeScript/11BundleLoadingSample/types/helpers/PresetHelper.d.ts index 5fc8a7c..e71e5b7 100644 --- a/TypeScript/11BundleLoadingSample/types/helpers/PresetHelper.d.ts +++ b/TypeScript/11BundleLoadingSample/types/helpers/PresetHelper.d.ts @@ -1,16 +1,16 @@ import { IPreset } from "@spt/models/eft/common/IGlobals"; import { BaseClasses } from "@spt/models/enums/BaseClasses"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; import { ItemHelper } from "./ItemHelper"; export declare class PresetHelper { - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected cloner: ICloner; protected lookup: Record; protected defaultEquipmentPresets: Record; protected defaultWeaponPresets: Record; - constructor(databaseServer: DatabaseServer, itemHelper: ItemHelper, cloner: ICloner); + constructor(databaseService: DatabaseService, itemHelper: ItemHelper, cloner: ICloner); hydratePresetStore(input: Record): void; /** * Get default weapon and equipment presets diff --git a/TypeScript/11BundleLoadingSample/types/helpers/ProfileHelper.d.ts b/TypeScript/11BundleLoadingSample/types/helpers/ProfileHelper.d.ts index 37937ff..e943bd3 100644 --- a/TypeScript/11BundleLoadingSample/types/helpers/ProfileHelper.d.ts +++ b/TypeScript/11BundleLoadingSample/types/helpers/ProfileHelper.d.ts @@ -7,8 +7,8 @@ import { SkillTypes } from "@spt/models/enums/SkillTypes"; import { IInventoryConfig } from "@spt/models/spt/config/IInventoryConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileSnapshotService } from "@spt/services/ProfileSnapshotService"; import { ICloner } from "@spt/utils/cloners/ICloner"; @@ -21,14 +21,14 @@ export declare class ProfileHelper { protected watermark: Watermark; protected timeUtil: TimeUtil; protected saveServer: SaveServer; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected profileSnapshotService: ProfileSnapshotService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected cloner: ICloner; protected inventoryConfig: IInventoryConfig; - constructor(logger: ILogger, hashUtil: HashUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileSnapshotService: ProfileSnapshotService, localisationService: LocalisationService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, hashUtil: HashUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseService: DatabaseService, itemHelper: ItemHelper, profileSnapshotService: ProfileSnapshotService, localisationService: LocalisationService, configServer: ConfigServer, cloner: ICloner); /** * Remove/reset a completed quest condtion from players profile quest data * @param sessionID Session id diff --git a/TypeScript/11BundleLoadingSample/types/helpers/QuestHelper.d.ts b/TypeScript/11BundleLoadingSample/types/helpers/QuestHelper.d.ts index 39ba2a9..93368fa 100644 --- a/TypeScript/11BundleLoadingSample/types/helpers/QuestHelper.d.ts +++ b/TypeScript/11BundleLoadingSample/types/helpers/QuestHelper.d.ts @@ -18,7 +18,7 @@ import { IQuestConfig } from "@spt/models/spt/config/IQuestConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -30,9 +30,9 @@ export declare class QuestHelper { protected timeUtil: TimeUtil; protected hashUtil: HashUtil; protected itemHelper: ItemHelper; + protected databaseService: DatabaseService; protected questConditionHelper: QuestConditionHelper; protected eventOutputHolder: EventOutputHolder; - protected databaseServer: DatabaseServer; protected localeService: LocaleService; protected ragfairServerHelper: RagfairServerHelper; protected dialogueHelper: DialogueHelper; @@ -45,7 +45,7 @@ export declare class QuestHelper { protected configServer: ConfigServer; protected cloner: ICloner; protected questConfig: IQuestConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, questConditionHelper: QuestConditionHelper, eventOutputHolder: EventOutputHolder, databaseServer: DatabaseServer, localeService: LocaleService, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, localisationService: LocalisationService, traderHelper: TraderHelper, presetHelper: PresetHelper, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, databaseService: DatabaseService, questConditionHelper: QuestConditionHelper, eventOutputHolder: EventOutputHolder, localeService: LocaleService, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, localisationService: LocalisationService, traderHelper: TraderHelper, presetHelper: PresetHelper, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); /** * Get status of a quest in player profile by its id * @param pmcData Profile to search diff --git a/TypeScript/11BundleLoadingSample/types/helpers/RagfairOfferHelper.d.ts b/TypeScript/11BundleLoadingSample/types/helpers/RagfairOfferHelper.d.ts index 27bb081..a08e60a 100644 --- a/TypeScript/11BundleLoadingSample/types/helpers/RagfairOfferHelper.d.ts +++ b/TypeScript/11BundleLoadingSample/types/helpers/RagfairOfferHelper.d.ts @@ -19,8 +19,8 @@ import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -34,7 +34,7 @@ export declare class RagfairOfferHelper { protected timeUtil: TimeUtil; protected hashUtil: HashUtil; protected eventOutputHolder: EventOutputHolder; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected traderHelper: TraderHelper; protected saveServer: SaveServer; protected itemHelper: ItemHelper; @@ -55,7 +55,7 @@ export declare class RagfairOfferHelper { protected static goodSoldTemplate: string; protected ragfairConfig: IRagfairConfig; protected questConfig: IQuestConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, eventOutputHolder: EventOutputHolder, databaseServer: DatabaseServer, traderHelper: TraderHelper, saveServer: SaveServer, itemHelper: ItemHelper, botHelper: BotHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, localeService: LocaleService, localisationService: LocalisationService, mailSendService: MailSendService, configServer: ConfigServer); + constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, eventOutputHolder: EventOutputHolder, databaseService: DatabaseService, traderHelper: TraderHelper, saveServer: SaveServer, itemHelper: ItemHelper, botHelper: BotHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, localeService: LocaleService, localisationService: LocalisationService, mailSendService: MailSendService, configServer: ConfigServer); /** * Passthrough to ragfairOfferService.getOffers(), get flea offers a player should see * @param searchRequest Data from client diff --git a/TypeScript/11BundleLoadingSample/types/helpers/RepairHelper.d.ts b/TypeScript/11BundleLoadingSample/types/helpers/RepairHelper.d.ts index 4bd0577..99a21da 100644 --- a/TypeScript/11BundleLoadingSample/types/helpers/RepairHelper.d.ts +++ b/TypeScript/11BundleLoadingSample/types/helpers/RepairHelper.d.ts @@ -3,17 +3,17 @@ import { ITemplateItem, Props } from "@spt/models/eft/common/tables/ITemplateIte import { IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RepairHelper { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected configServer: ConfigServer; protected cloner: ICloner; protected repairConfig: IRepairConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, configServer: ConfigServer, cloner: ICloner); /** * Alter an items durability after a repair by trader/repair kit * @param itemToRepair item to update durability details diff --git a/TypeScript/11BundleLoadingSample/types/helpers/TraderAssortHelper.d.ts b/TypeScript/11BundleLoadingSample/types/helpers/TraderAssortHelper.d.ts index faf2a9d..8f8f802 100644 --- a/TypeScript/11BundleLoadingSample/types/helpers/TraderAssortHelper.d.ts +++ b/TypeScript/11BundleLoadingSample/types/helpers/TraderAssortHelper.d.ts @@ -9,7 +9,7 @@ import { ITrader, ITraderAssort } from "@spt/models/eft/common/tables/ITrader"; import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; @@ -21,7 +21,7 @@ export declare class TraderAssortHelper { protected logger: ILogger; protected mathUtil: MathUtil; protected timeUtil: TimeUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected assortHelper: AssortHelper; protected paymentHelper: PaymentHelper; @@ -37,7 +37,7 @@ export declare class TraderAssortHelper { protected traderConfig: ITraderConfig; protected mergedQuestAssorts: Record>; protected createdMergedQuestAssorts: boolean; - constructor(logger: ILogger, mathUtil: MathUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, profileHelper: ProfileHelper, assortHelper: AssortHelper, paymentHelper: PaymentHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, localisationService: LocalisationService, traderPurchasePersisterService: TraderPurchasePersisterService, traderHelper: TraderHelper, fenceService: FenceService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, mathUtil: MathUtil, timeUtil: TimeUtil, databaseService: DatabaseService, profileHelper: ProfileHelper, assortHelper: AssortHelper, paymentHelper: PaymentHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, localisationService: LocalisationService, traderPurchasePersisterService: TraderPurchasePersisterService, traderHelper: TraderHelper, fenceService: FenceService, configServer: ConfigServer, cloner: ICloner); /** * Get a traders assorts * Can be used for returning ragfair / fence assorts diff --git a/TypeScript/11BundleLoadingSample/types/helpers/TraderHelper.d.ts b/TypeScript/11BundleLoadingSample/types/helpers/TraderHelper.d.ts index 5f515da..eec1cc7 100644 --- a/TypeScript/11BundleLoadingSample/types/helpers/TraderHelper.d.ts +++ b/TypeScript/11BundleLoadingSample/types/helpers/TraderHelper.d.ts @@ -10,7 +10,7 @@ import { Traders } from "@spt/models/enums/Traders"; import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; @@ -18,7 +18,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class TraderHelper { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected handbookHelper: HandbookHelper; protected itemHelper: ItemHelper; @@ -33,7 +33,7 @@ export declare class TraderHelper { protected highestTraderPriceItems?: Record; /** Dictionary of item tpl and the highest trader buy back rouble price */ protected highestTraderBuyPriceItems?: Record; - constructor(logger: ILogger, databaseServer: DatabaseServer, profileHelper: ProfileHelper, handbookHelper: HandbookHelper, itemHelper: ItemHelper, playerService: PlayerService, localisationService: LocalisationService, fenceService: FenceService, timeUtil: TimeUtil, randomUtil: RandomUtil, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, profileHelper: ProfileHelper, handbookHelper: HandbookHelper, itemHelper: ItemHelper, playerService: PlayerService, localisationService: LocalisationService, fenceService: FenceService, timeUtil: TimeUtil, randomUtil: RandomUtil, configServer: ConfigServer); /** * Get a trader base object, update profile to reflect players current standing in profile * when trader not found in profile diff --git a/TypeScript/11BundleLoadingSample/types/models/eft/common/IGlobals.d.ts b/TypeScript/11BundleLoadingSample/types/models/eft/common/IGlobals.d.ts index 2209415..a0bb051 100644 --- a/TypeScript/11BundleLoadingSample/types/models/eft/common/IGlobals.d.ts +++ b/TypeScript/11BundleLoadingSample/types/models/eft/common/IGlobals.d.ts @@ -802,7 +802,6 @@ export interface IMaxActiveOfferCount { from: number; to: number; count: number; - countForSpecialEditions: number; } export interface IMaxSumForRarity { Common: IRarityMaxSum; diff --git a/TypeScript/11BundleLoadingSample/types/models/eft/common/ILocationBase.d.ts b/TypeScript/11BundleLoadingSample/types/models/eft/common/ILocationBase.d.ts index 65931f8..10f1a57 100644 --- a/TypeScript/11BundleLoadingSample/types/models/eft/common/ILocationBase.d.ts +++ b/TypeScript/11BundleLoadingSample/types/models/eft/common/ILocationBase.d.ts @@ -196,18 +196,24 @@ export interface Props { export interface Exit { /** % Chance out of 100 exit will appear in raid */ Chance: number; + ChancePVE: number; Count: number; + CountPVE: number; EntryPoints: string; EventAvailable: boolean; ExfiltrationTime: number; + ExfiltrationTimePVE: number; ExfiltrationType: string; RequiredSlot?: string; Id: string; MaxTime: number; + MaxTimePVE: number; MinTime: number; + MinTimePVE: number; Name: string; PassageRequirement: string; PlayersCount: number; + PlayersCountPVE: number; RequirementTip: string; Side?: string; } diff --git a/TypeScript/11BundleLoadingSample/types/models/eft/common/tables/IRepeatableQuests.d.ts b/TypeScript/11BundleLoadingSample/types/models/eft/common/tables/IRepeatableQuests.d.ts index 854c8ef..27ff49d 100644 --- a/TypeScript/11BundleLoadingSample/types/models/eft/common/tables/IRepeatableQuests.d.ts +++ b/TypeScript/11BundleLoadingSample/types/models/eft/common/tables/IRepeatableQuests.d.ts @@ -18,10 +18,13 @@ export interface IRepeatableTemplates { export interface IPmcDataRepeatableQuest { id?: string; name: string; + unavailableTime?: string; activeQuests: IRepeatableQuest[]; inactiveQuests: IRepeatableQuest[]; endTime: number; changeRequirement: Record; + freeChanges: number; + freeChangesAvailable: number; } export interface IChangeRequirement { changeCost: IChangeCost[]; diff --git a/TypeScript/11BundleLoadingSample/types/models/eft/common/tables/ITemplateItem.d.ts b/TypeScript/11BundleLoadingSample/types/models/eft/common/tables/ITemplateItem.d.ts index a8ccfbb..e5c6632 100644 --- a/TypeScript/11BundleLoadingSample/types/models/eft/common/tables/ITemplateItem.d.ts +++ b/TypeScript/11BundleLoadingSample/types/models/eft/common/tables/ITemplateItem.d.ts @@ -63,7 +63,7 @@ export interface Props { DiscardingBlock?: boolean; DropSoundType?: string; RagFairCommissionModifier?: number; - RarityPvE: string; + RarityPvE?: string; IsAlwaysAvailableForInsurance?: boolean; DiscardLimit?: number; MaxResource?: number; @@ -414,6 +414,12 @@ export interface Props { LayoutName?: string; Lower75Prefab?: Prefab; MaxUsages?: number; + ScavKillExpPenalty?: number; + ScavKillExpPenaltyPVE?: number; + ScavKillStandingPenalty?: number; + ScavKillStandingPenaltyPVE?: number; + TradersDiscount?: number; + TradersDiscountPVE?: number; } export interface IHealthEffect { type: string; diff --git a/TypeScript/11BundleLoadingSample/types/models/spt/config/IQuestConfig.d.ts b/TypeScript/11BundleLoadingSample/types/models/spt/config/IQuestConfig.d.ts index 362602c..2cdf4fa 100644 --- a/TypeScript/11BundleLoadingSample/types/models/spt/config/IQuestConfig.d.ts +++ b/TypeScript/11BundleLoadingSample/types/models/spt/config/IQuestConfig.d.ts @@ -47,6 +47,8 @@ export interface IRepeatableQuestConfig { /** Item tplIds to ignore when generating rewards */ rewardBlacklist: string[]; rewardAmmoStackMinSize: number; + freeChangesAvailable: number; + freeChanges: number; } export interface IRewardScaling { levels: number[]; diff --git a/TypeScript/11BundleLoadingSample/types/services/BotEquipmentModPoolService.d.ts b/TypeScript/11BundleLoadingSample/types/services/BotEquipmentModPoolService.d.ts index c53f31b..7b2b442 100644 --- a/TypeScript/11BundleLoadingSample/types/services/BotEquipmentModPoolService.d.ts +++ b/TypeScript/11BundleLoadingSample/types/services/BotEquipmentModPoolService.d.ts @@ -4,7 +4,7 @@ import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { VFS } from "@spt/utils/VFS"; /** Store a mapping between weapons, their slots and the items that fit those slots */ @@ -12,7 +12,7 @@ export declare class BotEquipmentModPoolService { protected logger: ILogger; protected vfs: VFS; protected itemHelper: ItemHelper; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected botConfig: IBotConfig; @@ -20,7 +20,7 @@ export declare class BotEquipmentModPoolService { protected gearModPool: Mods; protected weaponPoolGenerated: boolean; protected armorPoolGenerated: boolean; - constructor(logger: ILogger, vfs: VFS, itemHelper: ItemHelper, databaseServer: DatabaseServer, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, vfs: VFS, itemHelper: ItemHelper, databaseService: DatabaseService, localisationService: LocalisationService, configServer: ConfigServer); /** * Store dictionary of mods for each item passed in * @param items items to find related mods and store in modPool diff --git a/TypeScript/11BundleLoadingSample/types/services/CustomLocationWaveService.d.ts b/TypeScript/11BundleLoadingSample/types/services/CustomLocationWaveService.d.ts index 728a1e8..c72d5bb 100644 --- a/TypeScript/11BundleLoadingSample/types/services/CustomLocationWaveService.d.ts +++ b/TypeScript/11BundleLoadingSample/types/services/CustomLocationWaveService.d.ts @@ -2,15 +2,15 @@ import { BossLocationSpawn, Wave } from "@spt/models/eft/common/ILocationBase"; import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class CustomLocationWaveService { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, configServer: ConfigServer); /** * Add a boss wave to a map * @param locationId e.g. factory4_day, bigmap diff --git a/TypeScript/11BundleLoadingSample/types/services/InsuranceService.d.ts b/TypeScript/11BundleLoadingSample/types/services/InsuranceService.d.ts index c54f9f9..0000e66 100644 --- a/TypeScript/11BundleLoadingSample/types/services/InsuranceService.d.ts +++ b/TypeScript/11BundleLoadingSample/types/services/InsuranceService.d.ts @@ -13,8 +13,8 @@ import { ILostOnDeathConfig } from "@spt/models/spt/config/ILostOnDeathConfig"; import { IInsuranceEquipmentPkg } from "@spt/models/spt/services/IInsuranceEquipmentPkg"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -24,7 +24,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class InsuranceService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected secureContainerHelper: SecureContainerHelper; protected randomUtil: RandomUtil; protected itemHelper: ItemHelper; @@ -42,7 +42,7 @@ export declare class InsuranceService { protected insured: Record>; protected insuranceConfig: IInsuranceConfig; protected lostOnDeathConfig: ILostOnDeathConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, handbookHelper: HandbookHelper, localisationService: LocalisationService, localeService: LocaleService, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, databaseService: DatabaseService, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, handbookHelper: HandbookHelper, localisationService: LocalisationService, localeService: LocaleService, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); /** * Does player have insurance array * @param sessionId Player id diff --git a/TypeScript/11BundleLoadingSample/types/services/MailSendService.d.ts b/TypeScript/11BundleLoadingSample/types/services/MailSendService.d.ts index d445841..8f1f974 100644 --- a/TypeScript/11BundleLoadingSample/types/services/MailSendService.d.ts +++ b/TypeScript/11BundleLoadingSample/types/services/MailSendService.d.ts @@ -9,8 +9,8 @@ import { MessageType } from "@spt/models/enums/MessageType"; import { Traders } from "@spt/models/enums/Traders"; import { IProfileChangeEvent, ISendMessageDetails } from "@spt/models/spt/dialog/ISendMessageDetails"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; @@ -19,7 +19,7 @@ export declare class MailSendService { protected hashUtil: HashUtil; protected timeUtil: TimeUtil; protected saveServer: SaveServer; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected notifierHelper: NotifierHelper; protected dialogueHelper: DialogueHelper; protected notificationSendHelper: NotificationSendHelper; @@ -27,7 +27,7 @@ export declare class MailSendService { protected itemHelper: ItemHelper; protected traderHelper: TraderHelper; protected readonly systemSenderId = "59e7125688a45068a6249071"; - constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, dialogueHelper: DialogueHelper, notificationSendHelper: NotificationSendHelper, localisationService: LocalisationService, itemHelper: ItemHelper, traderHelper: TraderHelper); + constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseService: DatabaseService, notifierHelper: NotifierHelper, dialogueHelper: DialogueHelper, notificationSendHelper: NotificationSendHelper, localisationService: LocalisationService, itemHelper: ItemHelper, traderHelper: TraderHelper); /** * Send a message from an NPC (e.g. prapor) to the player with or without items using direct message text, do not look up any locale * @param sessionId The session ID to send the message to diff --git a/TypeScript/11BundleLoadingSample/types/services/OpenZoneService.d.ts b/TypeScript/11BundleLoadingSample/types/services/OpenZoneService.d.ts index 1bc5f00..c7dd0bd 100644 --- a/TypeScript/11BundleLoadingSample/types/services/OpenZoneService.d.ts +++ b/TypeScript/11BundleLoadingSample/types/services/OpenZoneService.d.ts @@ -1,18 +1,18 @@ import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RandomUtil } from "@spt/utils/RandomUtil"; /** Service for adding new zones to a maps OpenZones property */ export declare class OpenZoneService { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, localisationService: LocalisationService, configServer: ConfigServer); /** * Add open zone to specified map * @param locationId map location (e.g. factory4_day) diff --git a/TypeScript/11BundleLoadingSample/types/services/PaymentService.d.ts b/TypeScript/11BundleLoadingSample/types/services/PaymentService.d.ts index 64ff2c1..61d5731 100644 --- a/TypeScript/11BundleLoadingSample/types/services/PaymentService.d.ts +++ b/TypeScript/11BundleLoadingSample/types/services/PaymentService.d.ts @@ -9,7 +9,7 @@ import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRo import { IProcessBuyTradeRequestData } from "@spt/models/eft/trade/IProcessBuyTradeRequestData"; import { IProcessSellTradeRequestData } from "@spt/models/eft/trade/IProcessSellTradeRequestData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; @@ -17,14 +17,14 @@ export declare class PaymentService { protected logger: ILogger; protected hashUtil: HashUtil; protected httpResponse: HttpResponseUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected handbookHelper: HandbookHelper; protected traderHelper: TraderHelper; protected itemHelper: ItemHelper; protected inventoryHelper: InventoryHelper; protected localisationService: LocalisationService; protected paymentHelper: PaymentHelper; - constructor(logger: ILogger, hashUtil: HashUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, localisationService: LocalisationService, paymentHelper: PaymentHelper); + constructor(logger: ILogger, hashUtil: HashUtil, httpResponse: HttpResponseUtil, databaseService: DatabaseService, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, localisationService: LocalisationService, paymentHelper: PaymentHelper); /** * Take money and insert items into return to server request * @param pmcData Pmc profile diff --git a/TypeScript/11BundleLoadingSample/types/services/PlayerService.d.ts b/TypeScript/11BundleLoadingSample/types/services/PlayerService.d.ts index ae57410..84c4c6f 100644 --- a/TypeScript/11BundleLoadingSample/types/services/PlayerService.d.ts +++ b/TypeScript/11BundleLoadingSample/types/services/PlayerService.d.ts @@ -1,14 +1,14 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class PlayerService { protected logger: ILogger; protected timeUtil: TimeUtil; protected localisationService: LocalisationService; - protected databaseServer: DatabaseServer; - constructor(logger: ILogger, timeUtil: TimeUtil, localisationService: LocalisationService, databaseServer: DatabaseServer); + protected databaseService: DatabaseService; + constructor(logger: ILogger, timeUtil: TimeUtil, localisationService: LocalisationService, databaseService: DatabaseService); /** * Get level of player * @param pmcData Player profile diff --git a/TypeScript/11BundleLoadingSample/types/services/RagfairLinkedItemService.d.ts b/TypeScript/11BundleLoadingSample/types/services/RagfairLinkedItemService.d.ts index 6011c1a..0d03459 100644 --- a/TypeScript/11BundleLoadingSample/types/services/RagfairLinkedItemService.d.ts +++ b/TypeScript/11BundleLoadingSample/types/services/RagfairLinkedItemService.d.ts @@ -1,11 +1,11 @@ import { ItemHelper } from "@spt/helpers/ItemHelper"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; export declare class RagfairLinkedItemService { - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected linkedItemsCache: Record>; - constructor(databaseServer: DatabaseServer, itemHelper: ItemHelper); + constructor(databaseService: DatabaseService, itemHelper: ItemHelper); getLinkedItems(linkedSearchId: string): Set; /** * Use ragfair linked item service to get an array of items that can fit on or in designated itemtpl diff --git a/TypeScript/11BundleLoadingSample/types/services/RagfairOfferService.d.ts b/TypeScript/11BundleLoadingSample/types/services/RagfairOfferService.d.ts index c044f6d..4bc07c3 100644 --- a/TypeScript/11BundleLoadingSample/types/services/RagfairOfferService.d.ts +++ b/TypeScript/11BundleLoadingSample/types/services/RagfairOfferService.d.ts @@ -6,8 +6,8 @@ import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RagfairOfferHolder } from "@spt/utils/RagfairOfferHolder"; @@ -15,7 +15,7 @@ import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class RagfairOfferService { protected logger: ILogger; protected timeUtil: TimeUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected saveServer: SaveServer; protected ragfairServerHelper: RagfairServerHelper; protected profileHelper: ProfileHelper; @@ -28,7 +28,7 @@ export declare class RagfairOfferService { protected expiredOffers: Record; protected ragfairConfig: IRagfairConfig; protected ragfairOfferHandler: RagfairOfferHolder; - constructor(logger: ILogger, timeUtil: TimeUtil, databaseServer: DatabaseServer, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, eventOutputHolder: EventOutputHolder, httpResponse: HttpResponseUtil, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, timeUtil: TimeUtil, databaseService: DatabaseService, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, eventOutputHolder: EventOutputHolder, httpResponse: HttpResponseUtil, localisationService: LocalisationService, configServer: ConfigServer); /** * Get all offers * @returns IRagfairOffer array diff --git a/TypeScript/11BundleLoadingSample/types/services/RagfairPriceService.d.ts b/TypeScript/11BundleLoadingSample/types/services/RagfairPriceService.d.ts index 5b8fa56..0a2f26e 100644 --- a/TypeScript/11BundleLoadingSample/types/services/RagfairPriceService.d.ts +++ b/TypeScript/11BundleLoadingSample/types/services/RagfairPriceService.d.ts @@ -12,7 +12,7 @@ import { IRagfairConfig, IUnreasonableModPrices } from "@spt/models/spt/config/I import { IRagfairServerPrices } from "@spt/models/spt/ragfair/IRagfairServerPrices"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RandomUtil } from "@spt/utils/RandomUtil"; /** @@ -20,7 +20,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; */ export declare class RagfairPriceService implements OnLoad { protected handbookHelper: HandbookHelper; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected logger: ILogger; protected itemHelper: ItemHelper; protected presetHelper: PresetHelper; @@ -30,7 +30,7 @@ export declare class RagfairPriceService implements OnLoad { protected configServer: ConfigServer; protected ragfairConfig: IRagfairConfig; protected prices: IRagfairServerPrices; - constructor(handbookHelper: HandbookHelper, databaseServer: DatabaseServer, logger: ILogger, itemHelper: ItemHelper, presetHelper: PresetHelper, traderHelper: TraderHelper, randomUtil: RandomUtil, localisationService: LocalisationService, configServer: ConfigServer); + constructor(handbookHelper: HandbookHelper, databaseService: DatabaseService, logger: ILogger, itemHelper: ItemHelper, presetHelper: PresetHelper, traderHelper: TraderHelper, randomUtil: RandomUtil, localisationService: LocalisationService, configServer: ConfigServer); /** * Generate static (handbook) and dynamic (prices.json) flea prices, store inside class as dictionaries */ diff --git a/TypeScript/11BundleLoadingSample/types/services/RagfairTaxService.d.ts b/TypeScript/11BundleLoadingSample/types/services/RagfairTaxService.d.ts index 4e4e648..effb9f0 100644 --- a/TypeScript/11BundleLoadingSample/types/services/RagfairTaxService.d.ts +++ b/TypeScript/11BundleLoadingSample/types/services/RagfairTaxService.d.ts @@ -4,15 +4,15 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { IStorePlayerOfferTaxAmountRequestData } from "@spt/models/eft/ragfair/IStorePlayerOfferTaxAmountRequestData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; export declare class RagfairTaxService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected ragfairPriceService: RagfairPriceService; protected itemHelper: ItemHelper; protected playerOfferTaxCache: Record; - constructor(logger: ILogger, databaseServer: DatabaseServer, ragfairPriceService: RagfairPriceService, itemHelper: ItemHelper); + constructor(logger: ILogger, databaseService: DatabaseService, ragfairPriceService: RagfairPriceService, itemHelper: ItemHelper); storeClientOfferTaxValue(sessionId: string, offer: IStorePlayerOfferTaxAmountRequestData): void; clearStoredOfferTaxById(offerIdToRemove: string): void; getStoredClientOfferTaxValueById(offerIdToGet: string): IStorePlayerOfferTaxAmountRequestData; diff --git a/TypeScript/11BundleLoadingSample/types/services/RaidTimeAdjustmentService.d.ts b/TypeScript/11BundleLoadingSample/types/services/RaidTimeAdjustmentService.d.ts index f770b64..bfc099a 100644 --- a/TypeScript/11BundleLoadingSample/types/services/RaidTimeAdjustmentService.d.ts +++ b/TypeScript/11BundleLoadingSample/types/services/RaidTimeAdjustmentService.d.ts @@ -7,17 +7,17 @@ import { ILocationConfig, IScavRaidTimeLocationSettings, LootMultiplier } from " import { IRaidChanges } from "@spt/models/spt/location/IRaidChanges"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RaidTimeAdjustmentService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected randomUtil: RandomUtil; protected weightedRandomHelper: WeightedRandomHelper; protected applicationContext: ApplicationContext; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, applicationContext: ApplicationContext, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, applicationContext: ApplicationContext, configServer: ConfigServer); /** * Make alterations to the base map data passed in * Loot multipliers/waves/wave start times diff --git a/TypeScript/11BundleLoadingSample/types/services/RepairService.d.ts b/TypeScript/11BundleLoadingSample/types/services/RepairService.d.ts index 9203417..48f306e 100644 --- a/TypeScript/11BundleLoadingSample/types/services/RepairService.d.ts +++ b/TypeScript/11BundleLoadingSample/types/services/RepairService.d.ts @@ -14,13 +14,13 @@ import { SkillTypes } from "@spt/models/enums/SkillTypes"; import { BonusSettings, IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RepairService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected randomUtil: RandomUtil; protected itemHelper: ItemHelper; @@ -31,7 +31,7 @@ export declare class RepairService { protected localisationService: LocalisationService; protected configServer: ConfigServer; protected repairConfig: IRepairConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, profileHelper: ProfileHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, traderHelper: TraderHelper, weightedRandomHelper: WeightedRandomHelper, paymentService: PaymentService, repairHelper: RepairHelper, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, profileHelper: ProfileHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, traderHelper: TraderHelper, weightedRandomHelper: WeightedRandomHelper, paymentService: PaymentService, repairHelper: RepairHelper, localisationService: LocalisationService, configServer: ConfigServer); /** * Use trader to repair an items durability * @param sessionID Session id diff --git a/TypeScript/11BundleLoadingSample/types/services/TraderServicesService.d.ts b/TypeScript/11BundleLoadingSample/types/services/TraderServicesService.d.ts index 111c71a..e441eb6 100644 --- a/TypeScript/11BundleLoadingSample/types/services/TraderServicesService.d.ts +++ b/TypeScript/11BundleLoadingSample/types/services/TraderServicesService.d.ts @@ -1,13 +1,13 @@ import { ProfileHelper } from "@spt/helpers/ProfileHelper"; import { ITraderServiceModel } from "@spt/models/spt/services/ITraderServiceModel"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderServicesService { protected profileHelper: ProfileHelper; protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected cloner: ICloner; - constructor(profileHelper: ProfileHelper, logger: ILogger, databaseServer: DatabaseServer, cloner: ICloner); + constructor(profileHelper: ProfileHelper, logger: ILogger, databaseService: DatabaseService, cloner: ICloner); getTraderServices(sessionId: string, traderId: string): ITraderServiceModel[]; } diff --git a/TypeScript/11BundleLoadingSample/types/services/mod/CustomItemService.d.ts b/TypeScript/11BundleLoadingSample/types/services/mod/CustomItemService.d.ts index 6dc4730..1926bed 100644 --- a/TypeScript/11BundleLoadingSample/types/services/mod/CustomItemService.d.ts +++ b/TypeScript/11BundleLoadingSample/types/services/mod/CustomItemService.d.ts @@ -9,11 +9,11 @@ import { HashUtil } from "@spt/utils/HashUtil"; export declare class CustomItemService { protected logger: ILogger; protected hashUtil: HashUtil; - protected databaseServer: DatabaseService; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected itemBaseClassService: ItemBaseClassService; protected cloner: ICloner; - constructor(logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseService, itemHelper: ItemHelper, itemBaseClassService: ItemBaseClassService, cloner: ICloner); + constructor(logger: ILogger, hashUtil: HashUtil, databaseService: DatabaseService, itemHelper: ItemHelper, itemBaseClassService: ItemBaseClassService, cloner: ICloner); /** * Create a new item from a cloned item base * WARNING - If no item id is supplied, an id will be generated, this id will be random every time you add an item and will not be the same on each subsequent server start diff --git a/TypeScript/12ClassExtensionOverride/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts b/TypeScript/12ClassExtensionOverride/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts index a7491b5..c51bf7e 100644 --- a/TypeScript/12ClassExtensionOverride/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts @@ -6,7 +6,7 @@ import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { ISendMessageRequest } from "@spt/models/eft/dialog/ISendMessageRequest"; import { IUserDialogInfo } from "@spt/models/eft/profile/ISptProfile"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -19,7 +19,7 @@ export declare class GiveSptCommand implements ISptCommand { protected presetHelper: PresetHelper; protected mailSendService: MailSendService; protected localeService: LocaleService; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemFilterService: ItemFilterService; protected cloner: ICloner; /** @@ -34,7 +34,7 @@ export declare class GiveSptCommand implements ISptCommand { private static acceptableConfidence; private static excludedPresetItems; protected savedCommand: Map; - constructor(logger: ILogger, itemHelper: ItemHelper, hashUtil: HashUtil, presetHelper: PresetHelper, mailSendService: MailSendService, localeService: LocaleService, databaseServer: DatabaseServer, itemFilterService: ItemFilterService, cloner: ICloner); + constructor(logger: ILogger, itemHelper: ItemHelper, hashUtil: HashUtil, presetHelper: PresetHelper, mailSendService: MailSendService, localeService: LocaleService, databaseService: DatabaseService, itemFilterService: ItemFilterService, cloner: ICloner); getCommand(): string; getCommandHelp(): string; performAction(commandHandler: IUserDialogInfo, sessionId: string, request: ISendMessageRequest): string; diff --git a/TypeScript/12ClassExtensionOverride/types/helpers/PresetHelper.d.ts b/TypeScript/12ClassExtensionOverride/types/helpers/PresetHelper.d.ts index 5fc8a7c..e71e5b7 100644 --- a/TypeScript/12ClassExtensionOverride/types/helpers/PresetHelper.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/helpers/PresetHelper.d.ts @@ -1,16 +1,16 @@ import { IPreset } from "@spt/models/eft/common/IGlobals"; import { BaseClasses } from "@spt/models/enums/BaseClasses"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; import { ItemHelper } from "./ItemHelper"; export declare class PresetHelper { - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected cloner: ICloner; protected lookup: Record; protected defaultEquipmentPresets: Record; protected defaultWeaponPresets: Record; - constructor(databaseServer: DatabaseServer, itemHelper: ItemHelper, cloner: ICloner); + constructor(databaseService: DatabaseService, itemHelper: ItemHelper, cloner: ICloner); hydratePresetStore(input: Record): void; /** * Get default weapon and equipment presets diff --git a/TypeScript/12ClassExtensionOverride/types/helpers/ProfileHelper.d.ts b/TypeScript/12ClassExtensionOverride/types/helpers/ProfileHelper.d.ts index 37937ff..e943bd3 100644 --- a/TypeScript/12ClassExtensionOverride/types/helpers/ProfileHelper.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/helpers/ProfileHelper.d.ts @@ -7,8 +7,8 @@ import { SkillTypes } from "@spt/models/enums/SkillTypes"; import { IInventoryConfig } from "@spt/models/spt/config/IInventoryConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileSnapshotService } from "@spt/services/ProfileSnapshotService"; import { ICloner } from "@spt/utils/cloners/ICloner"; @@ -21,14 +21,14 @@ export declare class ProfileHelper { protected watermark: Watermark; protected timeUtil: TimeUtil; protected saveServer: SaveServer; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected profileSnapshotService: ProfileSnapshotService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected cloner: ICloner; protected inventoryConfig: IInventoryConfig; - constructor(logger: ILogger, hashUtil: HashUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileSnapshotService: ProfileSnapshotService, localisationService: LocalisationService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, hashUtil: HashUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseService: DatabaseService, itemHelper: ItemHelper, profileSnapshotService: ProfileSnapshotService, localisationService: LocalisationService, configServer: ConfigServer, cloner: ICloner); /** * Remove/reset a completed quest condtion from players profile quest data * @param sessionID Session id diff --git a/TypeScript/12ClassExtensionOverride/types/helpers/QuestHelper.d.ts b/TypeScript/12ClassExtensionOverride/types/helpers/QuestHelper.d.ts index 39ba2a9..93368fa 100644 --- a/TypeScript/12ClassExtensionOverride/types/helpers/QuestHelper.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/helpers/QuestHelper.d.ts @@ -18,7 +18,7 @@ import { IQuestConfig } from "@spt/models/spt/config/IQuestConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -30,9 +30,9 @@ export declare class QuestHelper { protected timeUtil: TimeUtil; protected hashUtil: HashUtil; protected itemHelper: ItemHelper; + protected databaseService: DatabaseService; protected questConditionHelper: QuestConditionHelper; protected eventOutputHolder: EventOutputHolder; - protected databaseServer: DatabaseServer; protected localeService: LocaleService; protected ragfairServerHelper: RagfairServerHelper; protected dialogueHelper: DialogueHelper; @@ -45,7 +45,7 @@ export declare class QuestHelper { protected configServer: ConfigServer; protected cloner: ICloner; protected questConfig: IQuestConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, questConditionHelper: QuestConditionHelper, eventOutputHolder: EventOutputHolder, databaseServer: DatabaseServer, localeService: LocaleService, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, localisationService: LocalisationService, traderHelper: TraderHelper, presetHelper: PresetHelper, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, databaseService: DatabaseService, questConditionHelper: QuestConditionHelper, eventOutputHolder: EventOutputHolder, localeService: LocaleService, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, localisationService: LocalisationService, traderHelper: TraderHelper, presetHelper: PresetHelper, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); /** * Get status of a quest in player profile by its id * @param pmcData Profile to search diff --git a/TypeScript/12ClassExtensionOverride/types/helpers/RagfairOfferHelper.d.ts b/TypeScript/12ClassExtensionOverride/types/helpers/RagfairOfferHelper.d.ts index 27bb081..a08e60a 100644 --- a/TypeScript/12ClassExtensionOverride/types/helpers/RagfairOfferHelper.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/helpers/RagfairOfferHelper.d.ts @@ -19,8 +19,8 @@ import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -34,7 +34,7 @@ export declare class RagfairOfferHelper { protected timeUtil: TimeUtil; protected hashUtil: HashUtil; protected eventOutputHolder: EventOutputHolder; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected traderHelper: TraderHelper; protected saveServer: SaveServer; protected itemHelper: ItemHelper; @@ -55,7 +55,7 @@ export declare class RagfairOfferHelper { protected static goodSoldTemplate: string; protected ragfairConfig: IRagfairConfig; protected questConfig: IQuestConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, eventOutputHolder: EventOutputHolder, databaseServer: DatabaseServer, traderHelper: TraderHelper, saveServer: SaveServer, itemHelper: ItemHelper, botHelper: BotHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, localeService: LocaleService, localisationService: LocalisationService, mailSendService: MailSendService, configServer: ConfigServer); + constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, eventOutputHolder: EventOutputHolder, databaseService: DatabaseService, traderHelper: TraderHelper, saveServer: SaveServer, itemHelper: ItemHelper, botHelper: BotHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, localeService: LocaleService, localisationService: LocalisationService, mailSendService: MailSendService, configServer: ConfigServer); /** * Passthrough to ragfairOfferService.getOffers(), get flea offers a player should see * @param searchRequest Data from client diff --git a/TypeScript/12ClassExtensionOverride/types/helpers/RepairHelper.d.ts b/TypeScript/12ClassExtensionOverride/types/helpers/RepairHelper.d.ts index 4bd0577..99a21da 100644 --- a/TypeScript/12ClassExtensionOverride/types/helpers/RepairHelper.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/helpers/RepairHelper.d.ts @@ -3,17 +3,17 @@ import { ITemplateItem, Props } from "@spt/models/eft/common/tables/ITemplateIte import { IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RepairHelper { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected configServer: ConfigServer; protected cloner: ICloner; protected repairConfig: IRepairConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, configServer: ConfigServer, cloner: ICloner); /** * Alter an items durability after a repair by trader/repair kit * @param itemToRepair item to update durability details diff --git a/TypeScript/12ClassExtensionOverride/types/helpers/TraderAssortHelper.d.ts b/TypeScript/12ClassExtensionOverride/types/helpers/TraderAssortHelper.d.ts index faf2a9d..8f8f802 100644 --- a/TypeScript/12ClassExtensionOverride/types/helpers/TraderAssortHelper.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/helpers/TraderAssortHelper.d.ts @@ -9,7 +9,7 @@ import { ITrader, ITraderAssort } from "@spt/models/eft/common/tables/ITrader"; import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; @@ -21,7 +21,7 @@ export declare class TraderAssortHelper { protected logger: ILogger; protected mathUtil: MathUtil; protected timeUtil: TimeUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected assortHelper: AssortHelper; protected paymentHelper: PaymentHelper; @@ -37,7 +37,7 @@ export declare class TraderAssortHelper { protected traderConfig: ITraderConfig; protected mergedQuestAssorts: Record>; protected createdMergedQuestAssorts: boolean; - constructor(logger: ILogger, mathUtil: MathUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, profileHelper: ProfileHelper, assortHelper: AssortHelper, paymentHelper: PaymentHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, localisationService: LocalisationService, traderPurchasePersisterService: TraderPurchasePersisterService, traderHelper: TraderHelper, fenceService: FenceService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, mathUtil: MathUtil, timeUtil: TimeUtil, databaseService: DatabaseService, profileHelper: ProfileHelper, assortHelper: AssortHelper, paymentHelper: PaymentHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, localisationService: LocalisationService, traderPurchasePersisterService: TraderPurchasePersisterService, traderHelper: TraderHelper, fenceService: FenceService, configServer: ConfigServer, cloner: ICloner); /** * Get a traders assorts * Can be used for returning ragfair / fence assorts diff --git a/TypeScript/12ClassExtensionOverride/types/helpers/TraderHelper.d.ts b/TypeScript/12ClassExtensionOverride/types/helpers/TraderHelper.d.ts index 5f515da..eec1cc7 100644 --- a/TypeScript/12ClassExtensionOverride/types/helpers/TraderHelper.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/helpers/TraderHelper.d.ts @@ -10,7 +10,7 @@ import { Traders } from "@spt/models/enums/Traders"; import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; @@ -18,7 +18,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class TraderHelper { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected handbookHelper: HandbookHelper; protected itemHelper: ItemHelper; @@ -33,7 +33,7 @@ export declare class TraderHelper { protected highestTraderPriceItems?: Record; /** Dictionary of item tpl and the highest trader buy back rouble price */ protected highestTraderBuyPriceItems?: Record; - constructor(logger: ILogger, databaseServer: DatabaseServer, profileHelper: ProfileHelper, handbookHelper: HandbookHelper, itemHelper: ItemHelper, playerService: PlayerService, localisationService: LocalisationService, fenceService: FenceService, timeUtil: TimeUtil, randomUtil: RandomUtil, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, profileHelper: ProfileHelper, handbookHelper: HandbookHelper, itemHelper: ItemHelper, playerService: PlayerService, localisationService: LocalisationService, fenceService: FenceService, timeUtil: TimeUtil, randomUtil: RandomUtil, configServer: ConfigServer); /** * Get a trader base object, update profile to reflect players current standing in profile * when trader not found in profile diff --git a/TypeScript/12ClassExtensionOverride/types/models/eft/common/IGlobals.d.ts b/TypeScript/12ClassExtensionOverride/types/models/eft/common/IGlobals.d.ts index 2209415..a0bb051 100644 --- a/TypeScript/12ClassExtensionOverride/types/models/eft/common/IGlobals.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/models/eft/common/IGlobals.d.ts @@ -802,7 +802,6 @@ export interface IMaxActiveOfferCount { from: number; to: number; count: number; - countForSpecialEditions: number; } export interface IMaxSumForRarity { Common: IRarityMaxSum; diff --git a/TypeScript/12ClassExtensionOverride/types/models/eft/common/ILocationBase.d.ts b/TypeScript/12ClassExtensionOverride/types/models/eft/common/ILocationBase.d.ts index 65931f8..10f1a57 100644 --- a/TypeScript/12ClassExtensionOverride/types/models/eft/common/ILocationBase.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/models/eft/common/ILocationBase.d.ts @@ -196,18 +196,24 @@ export interface Props { export interface Exit { /** % Chance out of 100 exit will appear in raid */ Chance: number; + ChancePVE: number; Count: number; + CountPVE: number; EntryPoints: string; EventAvailable: boolean; ExfiltrationTime: number; + ExfiltrationTimePVE: number; ExfiltrationType: string; RequiredSlot?: string; Id: string; MaxTime: number; + MaxTimePVE: number; MinTime: number; + MinTimePVE: number; Name: string; PassageRequirement: string; PlayersCount: number; + PlayersCountPVE: number; RequirementTip: string; Side?: string; } diff --git a/TypeScript/12ClassExtensionOverride/types/models/eft/common/tables/IRepeatableQuests.d.ts b/TypeScript/12ClassExtensionOverride/types/models/eft/common/tables/IRepeatableQuests.d.ts index 854c8ef..27ff49d 100644 --- a/TypeScript/12ClassExtensionOverride/types/models/eft/common/tables/IRepeatableQuests.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/models/eft/common/tables/IRepeatableQuests.d.ts @@ -18,10 +18,13 @@ export interface IRepeatableTemplates { export interface IPmcDataRepeatableQuest { id?: string; name: string; + unavailableTime?: string; activeQuests: IRepeatableQuest[]; inactiveQuests: IRepeatableQuest[]; endTime: number; changeRequirement: Record; + freeChanges: number; + freeChangesAvailable: number; } export interface IChangeRequirement { changeCost: IChangeCost[]; diff --git a/TypeScript/12ClassExtensionOverride/types/models/eft/common/tables/ITemplateItem.d.ts b/TypeScript/12ClassExtensionOverride/types/models/eft/common/tables/ITemplateItem.d.ts index a8ccfbb..e5c6632 100644 --- a/TypeScript/12ClassExtensionOverride/types/models/eft/common/tables/ITemplateItem.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/models/eft/common/tables/ITemplateItem.d.ts @@ -63,7 +63,7 @@ export interface Props { DiscardingBlock?: boolean; DropSoundType?: string; RagFairCommissionModifier?: number; - RarityPvE: string; + RarityPvE?: string; IsAlwaysAvailableForInsurance?: boolean; DiscardLimit?: number; MaxResource?: number; @@ -414,6 +414,12 @@ export interface Props { LayoutName?: string; Lower75Prefab?: Prefab; MaxUsages?: number; + ScavKillExpPenalty?: number; + ScavKillExpPenaltyPVE?: number; + ScavKillStandingPenalty?: number; + ScavKillStandingPenaltyPVE?: number; + TradersDiscount?: number; + TradersDiscountPVE?: number; } export interface IHealthEffect { type: string; diff --git a/TypeScript/12ClassExtensionOverride/types/models/spt/config/IQuestConfig.d.ts b/TypeScript/12ClassExtensionOverride/types/models/spt/config/IQuestConfig.d.ts index 362602c..2cdf4fa 100644 --- a/TypeScript/12ClassExtensionOverride/types/models/spt/config/IQuestConfig.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/models/spt/config/IQuestConfig.d.ts @@ -47,6 +47,8 @@ export interface IRepeatableQuestConfig { /** Item tplIds to ignore when generating rewards */ rewardBlacklist: string[]; rewardAmmoStackMinSize: number; + freeChangesAvailable: number; + freeChanges: number; } export interface IRewardScaling { levels: number[]; diff --git a/TypeScript/12ClassExtensionOverride/types/services/BotEquipmentModPoolService.d.ts b/TypeScript/12ClassExtensionOverride/types/services/BotEquipmentModPoolService.d.ts index c53f31b..7b2b442 100644 --- a/TypeScript/12ClassExtensionOverride/types/services/BotEquipmentModPoolService.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/services/BotEquipmentModPoolService.d.ts @@ -4,7 +4,7 @@ import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { VFS } from "@spt/utils/VFS"; /** Store a mapping between weapons, their slots and the items that fit those slots */ @@ -12,7 +12,7 @@ export declare class BotEquipmentModPoolService { protected logger: ILogger; protected vfs: VFS; protected itemHelper: ItemHelper; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected botConfig: IBotConfig; @@ -20,7 +20,7 @@ export declare class BotEquipmentModPoolService { protected gearModPool: Mods; protected weaponPoolGenerated: boolean; protected armorPoolGenerated: boolean; - constructor(logger: ILogger, vfs: VFS, itemHelper: ItemHelper, databaseServer: DatabaseServer, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, vfs: VFS, itemHelper: ItemHelper, databaseService: DatabaseService, localisationService: LocalisationService, configServer: ConfigServer); /** * Store dictionary of mods for each item passed in * @param items items to find related mods and store in modPool diff --git a/TypeScript/12ClassExtensionOverride/types/services/CustomLocationWaveService.d.ts b/TypeScript/12ClassExtensionOverride/types/services/CustomLocationWaveService.d.ts index 728a1e8..c72d5bb 100644 --- a/TypeScript/12ClassExtensionOverride/types/services/CustomLocationWaveService.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/services/CustomLocationWaveService.d.ts @@ -2,15 +2,15 @@ import { BossLocationSpawn, Wave } from "@spt/models/eft/common/ILocationBase"; import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class CustomLocationWaveService { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, configServer: ConfigServer); /** * Add a boss wave to a map * @param locationId e.g. factory4_day, bigmap diff --git a/TypeScript/12ClassExtensionOverride/types/services/InsuranceService.d.ts b/TypeScript/12ClassExtensionOverride/types/services/InsuranceService.d.ts index c54f9f9..0000e66 100644 --- a/TypeScript/12ClassExtensionOverride/types/services/InsuranceService.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/services/InsuranceService.d.ts @@ -13,8 +13,8 @@ import { ILostOnDeathConfig } from "@spt/models/spt/config/ILostOnDeathConfig"; import { IInsuranceEquipmentPkg } from "@spt/models/spt/services/IInsuranceEquipmentPkg"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -24,7 +24,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class InsuranceService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected secureContainerHelper: SecureContainerHelper; protected randomUtil: RandomUtil; protected itemHelper: ItemHelper; @@ -42,7 +42,7 @@ export declare class InsuranceService { protected insured: Record>; protected insuranceConfig: IInsuranceConfig; protected lostOnDeathConfig: ILostOnDeathConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, handbookHelper: HandbookHelper, localisationService: LocalisationService, localeService: LocaleService, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, databaseService: DatabaseService, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, handbookHelper: HandbookHelper, localisationService: LocalisationService, localeService: LocaleService, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); /** * Does player have insurance array * @param sessionId Player id diff --git a/TypeScript/12ClassExtensionOverride/types/services/MailSendService.d.ts b/TypeScript/12ClassExtensionOverride/types/services/MailSendService.d.ts index d445841..8f1f974 100644 --- a/TypeScript/12ClassExtensionOverride/types/services/MailSendService.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/services/MailSendService.d.ts @@ -9,8 +9,8 @@ import { MessageType } from "@spt/models/enums/MessageType"; import { Traders } from "@spt/models/enums/Traders"; import { IProfileChangeEvent, ISendMessageDetails } from "@spt/models/spt/dialog/ISendMessageDetails"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; @@ -19,7 +19,7 @@ export declare class MailSendService { protected hashUtil: HashUtil; protected timeUtil: TimeUtil; protected saveServer: SaveServer; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected notifierHelper: NotifierHelper; protected dialogueHelper: DialogueHelper; protected notificationSendHelper: NotificationSendHelper; @@ -27,7 +27,7 @@ export declare class MailSendService { protected itemHelper: ItemHelper; protected traderHelper: TraderHelper; protected readonly systemSenderId = "59e7125688a45068a6249071"; - constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, dialogueHelper: DialogueHelper, notificationSendHelper: NotificationSendHelper, localisationService: LocalisationService, itemHelper: ItemHelper, traderHelper: TraderHelper); + constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseService: DatabaseService, notifierHelper: NotifierHelper, dialogueHelper: DialogueHelper, notificationSendHelper: NotificationSendHelper, localisationService: LocalisationService, itemHelper: ItemHelper, traderHelper: TraderHelper); /** * Send a message from an NPC (e.g. prapor) to the player with or without items using direct message text, do not look up any locale * @param sessionId The session ID to send the message to diff --git a/TypeScript/12ClassExtensionOverride/types/services/OpenZoneService.d.ts b/TypeScript/12ClassExtensionOverride/types/services/OpenZoneService.d.ts index 1bc5f00..c7dd0bd 100644 --- a/TypeScript/12ClassExtensionOverride/types/services/OpenZoneService.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/services/OpenZoneService.d.ts @@ -1,18 +1,18 @@ import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RandomUtil } from "@spt/utils/RandomUtil"; /** Service for adding new zones to a maps OpenZones property */ export declare class OpenZoneService { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, localisationService: LocalisationService, configServer: ConfigServer); /** * Add open zone to specified map * @param locationId map location (e.g. factory4_day) diff --git a/TypeScript/12ClassExtensionOverride/types/services/PaymentService.d.ts b/TypeScript/12ClassExtensionOverride/types/services/PaymentService.d.ts index 64ff2c1..61d5731 100644 --- a/TypeScript/12ClassExtensionOverride/types/services/PaymentService.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/services/PaymentService.d.ts @@ -9,7 +9,7 @@ import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRo import { IProcessBuyTradeRequestData } from "@spt/models/eft/trade/IProcessBuyTradeRequestData"; import { IProcessSellTradeRequestData } from "@spt/models/eft/trade/IProcessSellTradeRequestData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; @@ -17,14 +17,14 @@ export declare class PaymentService { protected logger: ILogger; protected hashUtil: HashUtil; protected httpResponse: HttpResponseUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected handbookHelper: HandbookHelper; protected traderHelper: TraderHelper; protected itemHelper: ItemHelper; protected inventoryHelper: InventoryHelper; protected localisationService: LocalisationService; protected paymentHelper: PaymentHelper; - constructor(logger: ILogger, hashUtil: HashUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, localisationService: LocalisationService, paymentHelper: PaymentHelper); + constructor(logger: ILogger, hashUtil: HashUtil, httpResponse: HttpResponseUtil, databaseService: DatabaseService, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, localisationService: LocalisationService, paymentHelper: PaymentHelper); /** * Take money and insert items into return to server request * @param pmcData Pmc profile diff --git a/TypeScript/12ClassExtensionOverride/types/services/PlayerService.d.ts b/TypeScript/12ClassExtensionOverride/types/services/PlayerService.d.ts index ae57410..84c4c6f 100644 --- a/TypeScript/12ClassExtensionOverride/types/services/PlayerService.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/services/PlayerService.d.ts @@ -1,14 +1,14 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class PlayerService { protected logger: ILogger; protected timeUtil: TimeUtil; protected localisationService: LocalisationService; - protected databaseServer: DatabaseServer; - constructor(logger: ILogger, timeUtil: TimeUtil, localisationService: LocalisationService, databaseServer: DatabaseServer); + protected databaseService: DatabaseService; + constructor(logger: ILogger, timeUtil: TimeUtil, localisationService: LocalisationService, databaseService: DatabaseService); /** * Get level of player * @param pmcData Player profile diff --git a/TypeScript/12ClassExtensionOverride/types/services/RagfairLinkedItemService.d.ts b/TypeScript/12ClassExtensionOverride/types/services/RagfairLinkedItemService.d.ts index 6011c1a..0d03459 100644 --- a/TypeScript/12ClassExtensionOverride/types/services/RagfairLinkedItemService.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/services/RagfairLinkedItemService.d.ts @@ -1,11 +1,11 @@ import { ItemHelper } from "@spt/helpers/ItemHelper"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; export declare class RagfairLinkedItemService { - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected linkedItemsCache: Record>; - constructor(databaseServer: DatabaseServer, itemHelper: ItemHelper); + constructor(databaseService: DatabaseService, itemHelper: ItemHelper); getLinkedItems(linkedSearchId: string): Set; /** * Use ragfair linked item service to get an array of items that can fit on or in designated itemtpl diff --git a/TypeScript/12ClassExtensionOverride/types/services/RagfairOfferService.d.ts b/TypeScript/12ClassExtensionOverride/types/services/RagfairOfferService.d.ts index c044f6d..4bc07c3 100644 --- a/TypeScript/12ClassExtensionOverride/types/services/RagfairOfferService.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/services/RagfairOfferService.d.ts @@ -6,8 +6,8 @@ import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RagfairOfferHolder } from "@spt/utils/RagfairOfferHolder"; @@ -15,7 +15,7 @@ import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class RagfairOfferService { protected logger: ILogger; protected timeUtil: TimeUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected saveServer: SaveServer; protected ragfairServerHelper: RagfairServerHelper; protected profileHelper: ProfileHelper; @@ -28,7 +28,7 @@ export declare class RagfairOfferService { protected expiredOffers: Record; protected ragfairConfig: IRagfairConfig; protected ragfairOfferHandler: RagfairOfferHolder; - constructor(logger: ILogger, timeUtil: TimeUtil, databaseServer: DatabaseServer, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, eventOutputHolder: EventOutputHolder, httpResponse: HttpResponseUtil, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, timeUtil: TimeUtil, databaseService: DatabaseService, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, eventOutputHolder: EventOutputHolder, httpResponse: HttpResponseUtil, localisationService: LocalisationService, configServer: ConfigServer); /** * Get all offers * @returns IRagfairOffer array diff --git a/TypeScript/12ClassExtensionOverride/types/services/RagfairPriceService.d.ts b/TypeScript/12ClassExtensionOverride/types/services/RagfairPriceService.d.ts index 5b8fa56..0a2f26e 100644 --- a/TypeScript/12ClassExtensionOverride/types/services/RagfairPriceService.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/services/RagfairPriceService.d.ts @@ -12,7 +12,7 @@ import { IRagfairConfig, IUnreasonableModPrices } from "@spt/models/spt/config/I import { IRagfairServerPrices } from "@spt/models/spt/ragfair/IRagfairServerPrices"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RandomUtil } from "@spt/utils/RandomUtil"; /** @@ -20,7 +20,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; */ export declare class RagfairPriceService implements OnLoad { protected handbookHelper: HandbookHelper; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected logger: ILogger; protected itemHelper: ItemHelper; protected presetHelper: PresetHelper; @@ -30,7 +30,7 @@ export declare class RagfairPriceService implements OnLoad { protected configServer: ConfigServer; protected ragfairConfig: IRagfairConfig; protected prices: IRagfairServerPrices; - constructor(handbookHelper: HandbookHelper, databaseServer: DatabaseServer, logger: ILogger, itemHelper: ItemHelper, presetHelper: PresetHelper, traderHelper: TraderHelper, randomUtil: RandomUtil, localisationService: LocalisationService, configServer: ConfigServer); + constructor(handbookHelper: HandbookHelper, databaseService: DatabaseService, logger: ILogger, itemHelper: ItemHelper, presetHelper: PresetHelper, traderHelper: TraderHelper, randomUtil: RandomUtil, localisationService: LocalisationService, configServer: ConfigServer); /** * Generate static (handbook) and dynamic (prices.json) flea prices, store inside class as dictionaries */ diff --git a/TypeScript/12ClassExtensionOverride/types/services/RagfairTaxService.d.ts b/TypeScript/12ClassExtensionOverride/types/services/RagfairTaxService.d.ts index 4e4e648..effb9f0 100644 --- a/TypeScript/12ClassExtensionOverride/types/services/RagfairTaxService.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/services/RagfairTaxService.d.ts @@ -4,15 +4,15 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { IStorePlayerOfferTaxAmountRequestData } from "@spt/models/eft/ragfair/IStorePlayerOfferTaxAmountRequestData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; export declare class RagfairTaxService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected ragfairPriceService: RagfairPriceService; protected itemHelper: ItemHelper; protected playerOfferTaxCache: Record; - constructor(logger: ILogger, databaseServer: DatabaseServer, ragfairPriceService: RagfairPriceService, itemHelper: ItemHelper); + constructor(logger: ILogger, databaseService: DatabaseService, ragfairPriceService: RagfairPriceService, itemHelper: ItemHelper); storeClientOfferTaxValue(sessionId: string, offer: IStorePlayerOfferTaxAmountRequestData): void; clearStoredOfferTaxById(offerIdToRemove: string): void; getStoredClientOfferTaxValueById(offerIdToGet: string): IStorePlayerOfferTaxAmountRequestData; diff --git a/TypeScript/12ClassExtensionOverride/types/services/RaidTimeAdjustmentService.d.ts b/TypeScript/12ClassExtensionOverride/types/services/RaidTimeAdjustmentService.d.ts index f770b64..bfc099a 100644 --- a/TypeScript/12ClassExtensionOverride/types/services/RaidTimeAdjustmentService.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/services/RaidTimeAdjustmentService.d.ts @@ -7,17 +7,17 @@ import { ILocationConfig, IScavRaidTimeLocationSettings, LootMultiplier } from " import { IRaidChanges } from "@spt/models/spt/location/IRaidChanges"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RaidTimeAdjustmentService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected randomUtil: RandomUtil; protected weightedRandomHelper: WeightedRandomHelper; protected applicationContext: ApplicationContext; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, applicationContext: ApplicationContext, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, applicationContext: ApplicationContext, configServer: ConfigServer); /** * Make alterations to the base map data passed in * Loot multipliers/waves/wave start times diff --git a/TypeScript/12ClassExtensionOverride/types/services/RepairService.d.ts b/TypeScript/12ClassExtensionOverride/types/services/RepairService.d.ts index 9203417..48f306e 100644 --- a/TypeScript/12ClassExtensionOverride/types/services/RepairService.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/services/RepairService.d.ts @@ -14,13 +14,13 @@ import { SkillTypes } from "@spt/models/enums/SkillTypes"; import { BonusSettings, IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RepairService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected randomUtil: RandomUtil; protected itemHelper: ItemHelper; @@ -31,7 +31,7 @@ export declare class RepairService { protected localisationService: LocalisationService; protected configServer: ConfigServer; protected repairConfig: IRepairConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, profileHelper: ProfileHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, traderHelper: TraderHelper, weightedRandomHelper: WeightedRandomHelper, paymentService: PaymentService, repairHelper: RepairHelper, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, profileHelper: ProfileHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, traderHelper: TraderHelper, weightedRandomHelper: WeightedRandomHelper, paymentService: PaymentService, repairHelper: RepairHelper, localisationService: LocalisationService, configServer: ConfigServer); /** * Use trader to repair an items durability * @param sessionID Session id diff --git a/TypeScript/12ClassExtensionOverride/types/services/TraderServicesService.d.ts b/TypeScript/12ClassExtensionOverride/types/services/TraderServicesService.d.ts index 111c71a..e441eb6 100644 --- a/TypeScript/12ClassExtensionOverride/types/services/TraderServicesService.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/services/TraderServicesService.d.ts @@ -1,13 +1,13 @@ import { ProfileHelper } from "@spt/helpers/ProfileHelper"; import { ITraderServiceModel } from "@spt/models/spt/services/ITraderServiceModel"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderServicesService { protected profileHelper: ProfileHelper; protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected cloner: ICloner; - constructor(profileHelper: ProfileHelper, logger: ILogger, databaseServer: DatabaseServer, cloner: ICloner); + constructor(profileHelper: ProfileHelper, logger: ILogger, databaseService: DatabaseService, cloner: ICloner); getTraderServices(sessionId: string, traderId: string): ITraderServiceModel[]; } diff --git a/TypeScript/12ClassExtensionOverride/types/services/mod/CustomItemService.d.ts b/TypeScript/12ClassExtensionOverride/types/services/mod/CustomItemService.d.ts index 6dc4730..1926bed 100644 --- a/TypeScript/12ClassExtensionOverride/types/services/mod/CustomItemService.d.ts +++ b/TypeScript/12ClassExtensionOverride/types/services/mod/CustomItemService.d.ts @@ -9,11 +9,11 @@ import { HashUtil } from "@spt/utils/HashUtil"; export declare class CustomItemService { protected logger: ILogger; protected hashUtil: HashUtil; - protected databaseServer: DatabaseService; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected itemBaseClassService: ItemBaseClassService; protected cloner: ICloner; - constructor(logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseService, itemHelper: ItemHelper, itemBaseClassService: ItemBaseClassService, cloner: ICloner); + constructor(logger: ILogger, hashUtil: HashUtil, databaseService: DatabaseService, itemHelper: ItemHelper, itemBaseClassService: ItemBaseClassService, cloner: ICloner); /** * Create a new item from a cloned item base * WARNING - If no item id is supplied, an id will be generated, this id will be random every time you add an item and will not be the same on each subsequent server start diff --git a/TypeScript/13AddTrader/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts b/TypeScript/13AddTrader/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts index a7491b5..c51bf7e 100644 --- a/TypeScript/13AddTrader/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts +++ b/TypeScript/13AddTrader/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts @@ -6,7 +6,7 @@ import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { ISendMessageRequest } from "@spt/models/eft/dialog/ISendMessageRequest"; import { IUserDialogInfo } from "@spt/models/eft/profile/ISptProfile"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -19,7 +19,7 @@ export declare class GiveSptCommand implements ISptCommand { protected presetHelper: PresetHelper; protected mailSendService: MailSendService; protected localeService: LocaleService; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemFilterService: ItemFilterService; protected cloner: ICloner; /** @@ -34,7 +34,7 @@ export declare class GiveSptCommand implements ISptCommand { private static acceptableConfidence; private static excludedPresetItems; protected savedCommand: Map; - constructor(logger: ILogger, itemHelper: ItemHelper, hashUtil: HashUtil, presetHelper: PresetHelper, mailSendService: MailSendService, localeService: LocaleService, databaseServer: DatabaseServer, itemFilterService: ItemFilterService, cloner: ICloner); + constructor(logger: ILogger, itemHelper: ItemHelper, hashUtil: HashUtil, presetHelper: PresetHelper, mailSendService: MailSendService, localeService: LocaleService, databaseService: DatabaseService, itemFilterService: ItemFilterService, cloner: ICloner); getCommand(): string; getCommandHelp(): string; performAction(commandHandler: IUserDialogInfo, sessionId: string, request: ISendMessageRequest): string; diff --git a/TypeScript/13AddTrader/types/helpers/PresetHelper.d.ts b/TypeScript/13AddTrader/types/helpers/PresetHelper.d.ts index 5fc8a7c..e71e5b7 100644 --- a/TypeScript/13AddTrader/types/helpers/PresetHelper.d.ts +++ b/TypeScript/13AddTrader/types/helpers/PresetHelper.d.ts @@ -1,16 +1,16 @@ import { IPreset } from "@spt/models/eft/common/IGlobals"; import { BaseClasses } from "@spt/models/enums/BaseClasses"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; import { ItemHelper } from "./ItemHelper"; export declare class PresetHelper { - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected cloner: ICloner; protected lookup: Record; protected defaultEquipmentPresets: Record; protected defaultWeaponPresets: Record; - constructor(databaseServer: DatabaseServer, itemHelper: ItemHelper, cloner: ICloner); + constructor(databaseService: DatabaseService, itemHelper: ItemHelper, cloner: ICloner); hydratePresetStore(input: Record): void; /** * Get default weapon and equipment presets diff --git a/TypeScript/13AddTrader/types/helpers/ProfileHelper.d.ts b/TypeScript/13AddTrader/types/helpers/ProfileHelper.d.ts index 37937ff..e943bd3 100644 --- a/TypeScript/13AddTrader/types/helpers/ProfileHelper.d.ts +++ b/TypeScript/13AddTrader/types/helpers/ProfileHelper.d.ts @@ -7,8 +7,8 @@ import { SkillTypes } from "@spt/models/enums/SkillTypes"; import { IInventoryConfig } from "@spt/models/spt/config/IInventoryConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileSnapshotService } from "@spt/services/ProfileSnapshotService"; import { ICloner } from "@spt/utils/cloners/ICloner"; @@ -21,14 +21,14 @@ export declare class ProfileHelper { protected watermark: Watermark; protected timeUtil: TimeUtil; protected saveServer: SaveServer; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected profileSnapshotService: ProfileSnapshotService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected cloner: ICloner; protected inventoryConfig: IInventoryConfig; - constructor(logger: ILogger, hashUtil: HashUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileSnapshotService: ProfileSnapshotService, localisationService: LocalisationService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, hashUtil: HashUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseService: DatabaseService, itemHelper: ItemHelper, profileSnapshotService: ProfileSnapshotService, localisationService: LocalisationService, configServer: ConfigServer, cloner: ICloner); /** * Remove/reset a completed quest condtion from players profile quest data * @param sessionID Session id diff --git a/TypeScript/13AddTrader/types/helpers/QuestHelper.d.ts b/TypeScript/13AddTrader/types/helpers/QuestHelper.d.ts index 39ba2a9..93368fa 100644 --- a/TypeScript/13AddTrader/types/helpers/QuestHelper.d.ts +++ b/TypeScript/13AddTrader/types/helpers/QuestHelper.d.ts @@ -18,7 +18,7 @@ import { IQuestConfig } from "@spt/models/spt/config/IQuestConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -30,9 +30,9 @@ export declare class QuestHelper { protected timeUtil: TimeUtil; protected hashUtil: HashUtil; protected itemHelper: ItemHelper; + protected databaseService: DatabaseService; protected questConditionHelper: QuestConditionHelper; protected eventOutputHolder: EventOutputHolder; - protected databaseServer: DatabaseServer; protected localeService: LocaleService; protected ragfairServerHelper: RagfairServerHelper; protected dialogueHelper: DialogueHelper; @@ -45,7 +45,7 @@ export declare class QuestHelper { protected configServer: ConfigServer; protected cloner: ICloner; protected questConfig: IQuestConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, questConditionHelper: QuestConditionHelper, eventOutputHolder: EventOutputHolder, databaseServer: DatabaseServer, localeService: LocaleService, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, localisationService: LocalisationService, traderHelper: TraderHelper, presetHelper: PresetHelper, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, databaseService: DatabaseService, questConditionHelper: QuestConditionHelper, eventOutputHolder: EventOutputHolder, localeService: LocaleService, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, localisationService: LocalisationService, traderHelper: TraderHelper, presetHelper: PresetHelper, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); /** * Get status of a quest in player profile by its id * @param pmcData Profile to search diff --git a/TypeScript/13AddTrader/types/helpers/RagfairOfferHelper.d.ts b/TypeScript/13AddTrader/types/helpers/RagfairOfferHelper.d.ts index 27bb081..a08e60a 100644 --- a/TypeScript/13AddTrader/types/helpers/RagfairOfferHelper.d.ts +++ b/TypeScript/13AddTrader/types/helpers/RagfairOfferHelper.d.ts @@ -19,8 +19,8 @@ import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -34,7 +34,7 @@ export declare class RagfairOfferHelper { protected timeUtil: TimeUtil; protected hashUtil: HashUtil; protected eventOutputHolder: EventOutputHolder; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected traderHelper: TraderHelper; protected saveServer: SaveServer; protected itemHelper: ItemHelper; @@ -55,7 +55,7 @@ export declare class RagfairOfferHelper { protected static goodSoldTemplate: string; protected ragfairConfig: IRagfairConfig; protected questConfig: IQuestConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, eventOutputHolder: EventOutputHolder, databaseServer: DatabaseServer, traderHelper: TraderHelper, saveServer: SaveServer, itemHelper: ItemHelper, botHelper: BotHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, localeService: LocaleService, localisationService: LocalisationService, mailSendService: MailSendService, configServer: ConfigServer); + constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, eventOutputHolder: EventOutputHolder, databaseService: DatabaseService, traderHelper: TraderHelper, saveServer: SaveServer, itemHelper: ItemHelper, botHelper: BotHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, localeService: LocaleService, localisationService: LocalisationService, mailSendService: MailSendService, configServer: ConfigServer); /** * Passthrough to ragfairOfferService.getOffers(), get flea offers a player should see * @param searchRequest Data from client diff --git a/TypeScript/13AddTrader/types/helpers/RepairHelper.d.ts b/TypeScript/13AddTrader/types/helpers/RepairHelper.d.ts index 4bd0577..99a21da 100644 --- a/TypeScript/13AddTrader/types/helpers/RepairHelper.d.ts +++ b/TypeScript/13AddTrader/types/helpers/RepairHelper.d.ts @@ -3,17 +3,17 @@ import { ITemplateItem, Props } from "@spt/models/eft/common/tables/ITemplateIte import { IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RepairHelper { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected configServer: ConfigServer; protected cloner: ICloner; protected repairConfig: IRepairConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, configServer: ConfigServer, cloner: ICloner); /** * Alter an items durability after a repair by trader/repair kit * @param itemToRepair item to update durability details diff --git a/TypeScript/13AddTrader/types/helpers/TraderAssortHelper.d.ts b/TypeScript/13AddTrader/types/helpers/TraderAssortHelper.d.ts index faf2a9d..8f8f802 100644 --- a/TypeScript/13AddTrader/types/helpers/TraderAssortHelper.d.ts +++ b/TypeScript/13AddTrader/types/helpers/TraderAssortHelper.d.ts @@ -9,7 +9,7 @@ import { ITrader, ITraderAssort } from "@spt/models/eft/common/tables/ITrader"; import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; @@ -21,7 +21,7 @@ export declare class TraderAssortHelper { protected logger: ILogger; protected mathUtil: MathUtil; protected timeUtil: TimeUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected assortHelper: AssortHelper; protected paymentHelper: PaymentHelper; @@ -37,7 +37,7 @@ export declare class TraderAssortHelper { protected traderConfig: ITraderConfig; protected mergedQuestAssorts: Record>; protected createdMergedQuestAssorts: boolean; - constructor(logger: ILogger, mathUtil: MathUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, profileHelper: ProfileHelper, assortHelper: AssortHelper, paymentHelper: PaymentHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, localisationService: LocalisationService, traderPurchasePersisterService: TraderPurchasePersisterService, traderHelper: TraderHelper, fenceService: FenceService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, mathUtil: MathUtil, timeUtil: TimeUtil, databaseService: DatabaseService, profileHelper: ProfileHelper, assortHelper: AssortHelper, paymentHelper: PaymentHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, localisationService: LocalisationService, traderPurchasePersisterService: TraderPurchasePersisterService, traderHelper: TraderHelper, fenceService: FenceService, configServer: ConfigServer, cloner: ICloner); /** * Get a traders assorts * Can be used for returning ragfair / fence assorts diff --git a/TypeScript/13AddTrader/types/helpers/TraderHelper.d.ts b/TypeScript/13AddTrader/types/helpers/TraderHelper.d.ts index 5f515da..eec1cc7 100644 --- a/TypeScript/13AddTrader/types/helpers/TraderHelper.d.ts +++ b/TypeScript/13AddTrader/types/helpers/TraderHelper.d.ts @@ -10,7 +10,7 @@ import { Traders } from "@spt/models/enums/Traders"; import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; @@ -18,7 +18,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class TraderHelper { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected handbookHelper: HandbookHelper; protected itemHelper: ItemHelper; @@ -33,7 +33,7 @@ export declare class TraderHelper { protected highestTraderPriceItems?: Record; /** Dictionary of item tpl and the highest trader buy back rouble price */ protected highestTraderBuyPriceItems?: Record; - constructor(logger: ILogger, databaseServer: DatabaseServer, profileHelper: ProfileHelper, handbookHelper: HandbookHelper, itemHelper: ItemHelper, playerService: PlayerService, localisationService: LocalisationService, fenceService: FenceService, timeUtil: TimeUtil, randomUtil: RandomUtil, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, profileHelper: ProfileHelper, handbookHelper: HandbookHelper, itemHelper: ItemHelper, playerService: PlayerService, localisationService: LocalisationService, fenceService: FenceService, timeUtil: TimeUtil, randomUtil: RandomUtil, configServer: ConfigServer); /** * Get a trader base object, update profile to reflect players current standing in profile * when trader not found in profile diff --git a/TypeScript/13AddTrader/types/models/eft/common/IGlobals.d.ts b/TypeScript/13AddTrader/types/models/eft/common/IGlobals.d.ts index 2209415..a0bb051 100644 --- a/TypeScript/13AddTrader/types/models/eft/common/IGlobals.d.ts +++ b/TypeScript/13AddTrader/types/models/eft/common/IGlobals.d.ts @@ -802,7 +802,6 @@ export interface IMaxActiveOfferCount { from: number; to: number; count: number; - countForSpecialEditions: number; } export interface IMaxSumForRarity { Common: IRarityMaxSum; diff --git a/TypeScript/13AddTrader/types/models/eft/common/ILocationBase.d.ts b/TypeScript/13AddTrader/types/models/eft/common/ILocationBase.d.ts index 65931f8..10f1a57 100644 --- a/TypeScript/13AddTrader/types/models/eft/common/ILocationBase.d.ts +++ b/TypeScript/13AddTrader/types/models/eft/common/ILocationBase.d.ts @@ -196,18 +196,24 @@ export interface Props { export interface Exit { /** % Chance out of 100 exit will appear in raid */ Chance: number; + ChancePVE: number; Count: number; + CountPVE: number; EntryPoints: string; EventAvailable: boolean; ExfiltrationTime: number; + ExfiltrationTimePVE: number; ExfiltrationType: string; RequiredSlot?: string; Id: string; MaxTime: number; + MaxTimePVE: number; MinTime: number; + MinTimePVE: number; Name: string; PassageRequirement: string; PlayersCount: number; + PlayersCountPVE: number; RequirementTip: string; Side?: string; } diff --git a/TypeScript/13AddTrader/types/models/eft/common/tables/IRepeatableQuests.d.ts b/TypeScript/13AddTrader/types/models/eft/common/tables/IRepeatableQuests.d.ts index 854c8ef..27ff49d 100644 --- a/TypeScript/13AddTrader/types/models/eft/common/tables/IRepeatableQuests.d.ts +++ b/TypeScript/13AddTrader/types/models/eft/common/tables/IRepeatableQuests.d.ts @@ -18,10 +18,13 @@ export interface IRepeatableTemplates { export interface IPmcDataRepeatableQuest { id?: string; name: string; + unavailableTime?: string; activeQuests: IRepeatableQuest[]; inactiveQuests: IRepeatableQuest[]; endTime: number; changeRequirement: Record; + freeChanges: number; + freeChangesAvailable: number; } export interface IChangeRequirement { changeCost: IChangeCost[]; diff --git a/TypeScript/13AddTrader/types/models/eft/common/tables/ITemplateItem.d.ts b/TypeScript/13AddTrader/types/models/eft/common/tables/ITemplateItem.d.ts index a8ccfbb..e5c6632 100644 --- a/TypeScript/13AddTrader/types/models/eft/common/tables/ITemplateItem.d.ts +++ b/TypeScript/13AddTrader/types/models/eft/common/tables/ITemplateItem.d.ts @@ -63,7 +63,7 @@ export interface Props { DiscardingBlock?: boolean; DropSoundType?: string; RagFairCommissionModifier?: number; - RarityPvE: string; + RarityPvE?: string; IsAlwaysAvailableForInsurance?: boolean; DiscardLimit?: number; MaxResource?: number; @@ -414,6 +414,12 @@ export interface Props { LayoutName?: string; Lower75Prefab?: Prefab; MaxUsages?: number; + ScavKillExpPenalty?: number; + ScavKillExpPenaltyPVE?: number; + ScavKillStandingPenalty?: number; + ScavKillStandingPenaltyPVE?: number; + TradersDiscount?: number; + TradersDiscountPVE?: number; } export interface IHealthEffect { type: string; diff --git a/TypeScript/13AddTrader/types/models/spt/config/IQuestConfig.d.ts b/TypeScript/13AddTrader/types/models/spt/config/IQuestConfig.d.ts index 362602c..2cdf4fa 100644 --- a/TypeScript/13AddTrader/types/models/spt/config/IQuestConfig.d.ts +++ b/TypeScript/13AddTrader/types/models/spt/config/IQuestConfig.d.ts @@ -47,6 +47,8 @@ export interface IRepeatableQuestConfig { /** Item tplIds to ignore when generating rewards */ rewardBlacklist: string[]; rewardAmmoStackMinSize: number; + freeChangesAvailable: number; + freeChanges: number; } export interface IRewardScaling { levels: number[]; diff --git a/TypeScript/13AddTrader/types/services/BotEquipmentModPoolService.d.ts b/TypeScript/13AddTrader/types/services/BotEquipmentModPoolService.d.ts index c53f31b..7b2b442 100644 --- a/TypeScript/13AddTrader/types/services/BotEquipmentModPoolService.d.ts +++ b/TypeScript/13AddTrader/types/services/BotEquipmentModPoolService.d.ts @@ -4,7 +4,7 @@ import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { VFS } from "@spt/utils/VFS"; /** Store a mapping between weapons, their slots and the items that fit those slots */ @@ -12,7 +12,7 @@ export declare class BotEquipmentModPoolService { protected logger: ILogger; protected vfs: VFS; protected itemHelper: ItemHelper; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected botConfig: IBotConfig; @@ -20,7 +20,7 @@ export declare class BotEquipmentModPoolService { protected gearModPool: Mods; protected weaponPoolGenerated: boolean; protected armorPoolGenerated: boolean; - constructor(logger: ILogger, vfs: VFS, itemHelper: ItemHelper, databaseServer: DatabaseServer, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, vfs: VFS, itemHelper: ItemHelper, databaseService: DatabaseService, localisationService: LocalisationService, configServer: ConfigServer); /** * Store dictionary of mods for each item passed in * @param items items to find related mods and store in modPool diff --git a/TypeScript/13AddTrader/types/services/CustomLocationWaveService.d.ts b/TypeScript/13AddTrader/types/services/CustomLocationWaveService.d.ts index 728a1e8..c72d5bb 100644 --- a/TypeScript/13AddTrader/types/services/CustomLocationWaveService.d.ts +++ b/TypeScript/13AddTrader/types/services/CustomLocationWaveService.d.ts @@ -2,15 +2,15 @@ import { BossLocationSpawn, Wave } from "@spt/models/eft/common/ILocationBase"; import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class CustomLocationWaveService { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, configServer: ConfigServer); /** * Add a boss wave to a map * @param locationId e.g. factory4_day, bigmap diff --git a/TypeScript/13AddTrader/types/services/InsuranceService.d.ts b/TypeScript/13AddTrader/types/services/InsuranceService.d.ts index c54f9f9..0000e66 100644 --- a/TypeScript/13AddTrader/types/services/InsuranceService.d.ts +++ b/TypeScript/13AddTrader/types/services/InsuranceService.d.ts @@ -13,8 +13,8 @@ import { ILostOnDeathConfig } from "@spt/models/spt/config/ILostOnDeathConfig"; import { IInsuranceEquipmentPkg } from "@spt/models/spt/services/IInsuranceEquipmentPkg"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -24,7 +24,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class InsuranceService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected secureContainerHelper: SecureContainerHelper; protected randomUtil: RandomUtil; protected itemHelper: ItemHelper; @@ -42,7 +42,7 @@ export declare class InsuranceService { protected insured: Record>; protected insuranceConfig: IInsuranceConfig; protected lostOnDeathConfig: ILostOnDeathConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, handbookHelper: HandbookHelper, localisationService: LocalisationService, localeService: LocaleService, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, databaseService: DatabaseService, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, handbookHelper: HandbookHelper, localisationService: LocalisationService, localeService: LocaleService, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); /** * Does player have insurance array * @param sessionId Player id diff --git a/TypeScript/13AddTrader/types/services/MailSendService.d.ts b/TypeScript/13AddTrader/types/services/MailSendService.d.ts index d445841..8f1f974 100644 --- a/TypeScript/13AddTrader/types/services/MailSendService.d.ts +++ b/TypeScript/13AddTrader/types/services/MailSendService.d.ts @@ -9,8 +9,8 @@ import { MessageType } from "@spt/models/enums/MessageType"; import { Traders } from "@spt/models/enums/Traders"; import { IProfileChangeEvent, ISendMessageDetails } from "@spt/models/spt/dialog/ISendMessageDetails"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; @@ -19,7 +19,7 @@ export declare class MailSendService { protected hashUtil: HashUtil; protected timeUtil: TimeUtil; protected saveServer: SaveServer; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected notifierHelper: NotifierHelper; protected dialogueHelper: DialogueHelper; protected notificationSendHelper: NotificationSendHelper; @@ -27,7 +27,7 @@ export declare class MailSendService { protected itemHelper: ItemHelper; protected traderHelper: TraderHelper; protected readonly systemSenderId = "59e7125688a45068a6249071"; - constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, dialogueHelper: DialogueHelper, notificationSendHelper: NotificationSendHelper, localisationService: LocalisationService, itemHelper: ItemHelper, traderHelper: TraderHelper); + constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseService: DatabaseService, notifierHelper: NotifierHelper, dialogueHelper: DialogueHelper, notificationSendHelper: NotificationSendHelper, localisationService: LocalisationService, itemHelper: ItemHelper, traderHelper: TraderHelper); /** * Send a message from an NPC (e.g. prapor) to the player with or without items using direct message text, do not look up any locale * @param sessionId The session ID to send the message to diff --git a/TypeScript/13AddTrader/types/services/OpenZoneService.d.ts b/TypeScript/13AddTrader/types/services/OpenZoneService.d.ts index 1bc5f00..c7dd0bd 100644 --- a/TypeScript/13AddTrader/types/services/OpenZoneService.d.ts +++ b/TypeScript/13AddTrader/types/services/OpenZoneService.d.ts @@ -1,18 +1,18 @@ import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RandomUtil } from "@spt/utils/RandomUtil"; /** Service for adding new zones to a maps OpenZones property */ export declare class OpenZoneService { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, localisationService: LocalisationService, configServer: ConfigServer); /** * Add open zone to specified map * @param locationId map location (e.g. factory4_day) diff --git a/TypeScript/13AddTrader/types/services/PaymentService.d.ts b/TypeScript/13AddTrader/types/services/PaymentService.d.ts index 64ff2c1..61d5731 100644 --- a/TypeScript/13AddTrader/types/services/PaymentService.d.ts +++ b/TypeScript/13AddTrader/types/services/PaymentService.d.ts @@ -9,7 +9,7 @@ import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRo import { IProcessBuyTradeRequestData } from "@spt/models/eft/trade/IProcessBuyTradeRequestData"; import { IProcessSellTradeRequestData } from "@spt/models/eft/trade/IProcessSellTradeRequestData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; @@ -17,14 +17,14 @@ export declare class PaymentService { protected logger: ILogger; protected hashUtil: HashUtil; protected httpResponse: HttpResponseUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected handbookHelper: HandbookHelper; protected traderHelper: TraderHelper; protected itemHelper: ItemHelper; protected inventoryHelper: InventoryHelper; protected localisationService: LocalisationService; protected paymentHelper: PaymentHelper; - constructor(logger: ILogger, hashUtil: HashUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, localisationService: LocalisationService, paymentHelper: PaymentHelper); + constructor(logger: ILogger, hashUtil: HashUtil, httpResponse: HttpResponseUtil, databaseService: DatabaseService, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, localisationService: LocalisationService, paymentHelper: PaymentHelper); /** * Take money and insert items into return to server request * @param pmcData Pmc profile diff --git a/TypeScript/13AddTrader/types/services/PlayerService.d.ts b/TypeScript/13AddTrader/types/services/PlayerService.d.ts index ae57410..84c4c6f 100644 --- a/TypeScript/13AddTrader/types/services/PlayerService.d.ts +++ b/TypeScript/13AddTrader/types/services/PlayerService.d.ts @@ -1,14 +1,14 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class PlayerService { protected logger: ILogger; protected timeUtil: TimeUtil; protected localisationService: LocalisationService; - protected databaseServer: DatabaseServer; - constructor(logger: ILogger, timeUtil: TimeUtil, localisationService: LocalisationService, databaseServer: DatabaseServer); + protected databaseService: DatabaseService; + constructor(logger: ILogger, timeUtil: TimeUtil, localisationService: LocalisationService, databaseService: DatabaseService); /** * Get level of player * @param pmcData Player profile diff --git a/TypeScript/13AddTrader/types/services/RagfairLinkedItemService.d.ts b/TypeScript/13AddTrader/types/services/RagfairLinkedItemService.d.ts index 6011c1a..0d03459 100644 --- a/TypeScript/13AddTrader/types/services/RagfairLinkedItemService.d.ts +++ b/TypeScript/13AddTrader/types/services/RagfairLinkedItemService.d.ts @@ -1,11 +1,11 @@ import { ItemHelper } from "@spt/helpers/ItemHelper"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; export declare class RagfairLinkedItemService { - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected linkedItemsCache: Record>; - constructor(databaseServer: DatabaseServer, itemHelper: ItemHelper); + constructor(databaseService: DatabaseService, itemHelper: ItemHelper); getLinkedItems(linkedSearchId: string): Set; /** * Use ragfair linked item service to get an array of items that can fit on or in designated itemtpl diff --git a/TypeScript/13AddTrader/types/services/RagfairOfferService.d.ts b/TypeScript/13AddTrader/types/services/RagfairOfferService.d.ts index c044f6d..4bc07c3 100644 --- a/TypeScript/13AddTrader/types/services/RagfairOfferService.d.ts +++ b/TypeScript/13AddTrader/types/services/RagfairOfferService.d.ts @@ -6,8 +6,8 @@ import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RagfairOfferHolder } from "@spt/utils/RagfairOfferHolder"; @@ -15,7 +15,7 @@ import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class RagfairOfferService { protected logger: ILogger; protected timeUtil: TimeUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected saveServer: SaveServer; protected ragfairServerHelper: RagfairServerHelper; protected profileHelper: ProfileHelper; @@ -28,7 +28,7 @@ export declare class RagfairOfferService { protected expiredOffers: Record; protected ragfairConfig: IRagfairConfig; protected ragfairOfferHandler: RagfairOfferHolder; - constructor(logger: ILogger, timeUtil: TimeUtil, databaseServer: DatabaseServer, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, eventOutputHolder: EventOutputHolder, httpResponse: HttpResponseUtil, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, timeUtil: TimeUtil, databaseService: DatabaseService, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, eventOutputHolder: EventOutputHolder, httpResponse: HttpResponseUtil, localisationService: LocalisationService, configServer: ConfigServer); /** * Get all offers * @returns IRagfairOffer array diff --git a/TypeScript/13AddTrader/types/services/RagfairPriceService.d.ts b/TypeScript/13AddTrader/types/services/RagfairPriceService.d.ts index 5b8fa56..0a2f26e 100644 --- a/TypeScript/13AddTrader/types/services/RagfairPriceService.d.ts +++ b/TypeScript/13AddTrader/types/services/RagfairPriceService.d.ts @@ -12,7 +12,7 @@ import { IRagfairConfig, IUnreasonableModPrices } from "@spt/models/spt/config/I import { IRagfairServerPrices } from "@spt/models/spt/ragfair/IRagfairServerPrices"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RandomUtil } from "@spt/utils/RandomUtil"; /** @@ -20,7 +20,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; */ export declare class RagfairPriceService implements OnLoad { protected handbookHelper: HandbookHelper; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected logger: ILogger; protected itemHelper: ItemHelper; protected presetHelper: PresetHelper; @@ -30,7 +30,7 @@ export declare class RagfairPriceService implements OnLoad { protected configServer: ConfigServer; protected ragfairConfig: IRagfairConfig; protected prices: IRagfairServerPrices; - constructor(handbookHelper: HandbookHelper, databaseServer: DatabaseServer, logger: ILogger, itemHelper: ItemHelper, presetHelper: PresetHelper, traderHelper: TraderHelper, randomUtil: RandomUtil, localisationService: LocalisationService, configServer: ConfigServer); + constructor(handbookHelper: HandbookHelper, databaseService: DatabaseService, logger: ILogger, itemHelper: ItemHelper, presetHelper: PresetHelper, traderHelper: TraderHelper, randomUtil: RandomUtil, localisationService: LocalisationService, configServer: ConfigServer); /** * Generate static (handbook) and dynamic (prices.json) flea prices, store inside class as dictionaries */ diff --git a/TypeScript/13AddTrader/types/services/RagfairTaxService.d.ts b/TypeScript/13AddTrader/types/services/RagfairTaxService.d.ts index 4e4e648..effb9f0 100644 --- a/TypeScript/13AddTrader/types/services/RagfairTaxService.d.ts +++ b/TypeScript/13AddTrader/types/services/RagfairTaxService.d.ts @@ -4,15 +4,15 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { IStorePlayerOfferTaxAmountRequestData } from "@spt/models/eft/ragfair/IStorePlayerOfferTaxAmountRequestData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; export declare class RagfairTaxService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected ragfairPriceService: RagfairPriceService; protected itemHelper: ItemHelper; protected playerOfferTaxCache: Record; - constructor(logger: ILogger, databaseServer: DatabaseServer, ragfairPriceService: RagfairPriceService, itemHelper: ItemHelper); + constructor(logger: ILogger, databaseService: DatabaseService, ragfairPriceService: RagfairPriceService, itemHelper: ItemHelper); storeClientOfferTaxValue(sessionId: string, offer: IStorePlayerOfferTaxAmountRequestData): void; clearStoredOfferTaxById(offerIdToRemove: string): void; getStoredClientOfferTaxValueById(offerIdToGet: string): IStorePlayerOfferTaxAmountRequestData; diff --git a/TypeScript/13AddTrader/types/services/RaidTimeAdjustmentService.d.ts b/TypeScript/13AddTrader/types/services/RaidTimeAdjustmentService.d.ts index f770b64..bfc099a 100644 --- a/TypeScript/13AddTrader/types/services/RaidTimeAdjustmentService.d.ts +++ b/TypeScript/13AddTrader/types/services/RaidTimeAdjustmentService.d.ts @@ -7,17 +7,17 @@ import { ILocationConfig, IScavRaidTimeLocationSettings, LootMultiplier } from " import { IRaidChanges } from "@spt/models/spt/location/IRaidChanges"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RaidTimeAdjustmentService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected randomUtil: RandomUtil; protected weightedRandomHelper: WeightedRandomHelper; protected applicationContext: ApplicationContext; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, applicationContext: ApplicationContext, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, applicationContext: ApplicationContext, configServer: ConfigServer); /** * Make alterations to the base map data passed in * Loot multipliers/waves/wave start times diff --git a/TypeScript/13AddTrader/types/services/RepairService.d.ts b/TypeScript/13AddTrader/types/services/RepairService.d.ts index 9203417..48f306e 100644 --- a/TypeScript/13AddTrader/types/services/RepairService.d.ts +++ b/TypeScript/13AddTrader/types/services/RepairService.d.ts @@ -14,13 +14,13 @@ import { SkillTypes } from "@spt/models/enums/SkillTypes"; import { BonusSettings, IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RepairService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected randomUtil: RandomUtil; protected itemHelper: ItemHelper; @@ -31,7 +31,7 @@ export declare class RepairService { protected localisationService: LocalisationService; protected configServer: ConfigServer; protected repairConfig: IRepairConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, profileHelper: ProfileHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, traderHelper: TraderHelper, weightedRandomHelper: WeightedRandomHelper, paymentService: PaymentService, repairHelper: RepairHelper, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, profileHelper: ProfileHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, traderHelper: TraderHelper, weightedRandomHelper: WeightedRandomHelper, paymentService: PaymentService, repairHelper: RepairHelper, localisationService: LocalisationService, configServer: ConfigServer); /** * Use trader to repair an items durability * @param sessionID Session id diff --git a/TypeScript/13AddTrader/types/services/TraderServicesService.d.ts b/TypeScript/13AddTrader/types/services/TraderServicesService.d.ts index 111c71a..e441eb6 100644 --- a/TypeScript/13AddTrader/types/services/TraderServicesService.d.ts +++ b/TypeScript/13AddTrader/types/services/TraderServicesService.d.ts @@ -1,13 +1,13 @@ import { ProfileHelper } from "@spt/helpers/ProfileHelper"; import { ITraderServiceModel } from "@spt/models/spt/services/ITraderServiceModel"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderServicesService { protected profileHelper: ProfileHelper; protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected cloner: ICloner; - constructor(profileHelper: ProfileHelper, logger: ILogger, databaseServer: DatabaseServer, cloner: ICloner); + constructor(profileHelper: ProfileHelper, logger: ILogger, databaseService: DatabaseService, cloner: ICloner); getTraderServices(sessionId: string, traderId: string): ITraderServiceModel[]; } diff --git a/TypeScript/13AddTrader/types/services/mod/CustomItemService.d.ts b/TypeScript/13AddTrader/types/services/mod/CustomItemService.d.ts index 6dc4730..1926bed 100644 --- a/TypeScript/13AddTrader/types/services/mod/CustomItemService.d.ts +++ b/TypeScript/13AddTrader/types/services/mod/CustomItemService.d.ts @@ -9,11 +9,11 @@ import { HashUtil } from "@spt/utils/HashUtil"; export declare class CustomItemService { protected logger: ILogger; protected hashUtil: HashUtil; - protected databaseServer: DatabaseService; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected itemBaseClassService: ItemBaseClassService; protected cloner: ICloner; - constructor(logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseService, itemHelper: ItemHelper, itemBaseClassService: ItemBaseClassService, cloner: ICloner); + constructor(logger: ILogger, hashUtil: HashUtil, databaseService: DatabaseService, itemHelper: ItemHelper, itemBaseClassService: ItemBaseClassService, cloner: ICloner); /** * Create a new item from a cloned item base * WARNING - If no item id is supplied, an id will be generated, this id will be random every time you add an item and will not be the same on each subsequent server start diff --git a/TypeScript/14AfterDBLoadHook/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts b/TypeScript/14AfterDBLoadHook/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts index a7491b5..c51bf7e 100644 --- a/TypeScript/14AfterDBLoadHook/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts @@ -6,7 +6,7 @@ import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { ISendMessageRequest } from "@spt/models/eft/dialog/ISendMessageRequest"; import { IUserDialogInfo } from "@spt/models/eft/profile/ISptProfile"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -19,7 +19,7 @@ export declare class GiveSptCommand implements ISptCommand { protected presetHelper: PresetHelper; protected mailSendService: MailSendService; protected localeService: LocaleService; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemFilterService: ItemFilterService; protected cloner: ICloner; /** @@ -34,7 +34,7 @@ export declare class GiveSptCommand implements ISptCommand { private static acceptableConfidence; private static excludedPresetItems; protected savedCommand: Map; - constructor(logger: ILogger, itemHelper: ItemHelper, hashUtil: HashUtil, presetHelper: PresetHelper, mailSendService: MailSendService, localeService: LocaleService, databaseServer: DatabaseServer, itemFilterService: ItemFilterService, cloner: ICloner); + constructor(logger: ILogger, itemHelper: ItemHelper, hashUtil: HashUtil, presetHelper: PresetHelper, mailSendService: MailSendService, localeService: LocaleService, databaseService: DatabaseService, itemFilterService: ItemFilterService, cloner: ICloner); getCommand(): string; getCommandHelp(): string; performAction(commandHandler: IUserDialogInfo, sessionId: string, request: ISendMessageRequest): string; diff --git a/TypeScript/14AfterDBLoadHook/types/helpers/PresetHelper.d.ts b/TypeScript/14AfterDBLoadHook/types/helpers/PresetHelper.d.ts index 5fc8a7c..e71e5b7 100644 --- a/TypeScript/14AfterDBLoadHook/types/helpers/PresetHelper.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/helpers/PresetHelper.d.ts @@ -1,16 +1,16 @@ import { IPreset } from "@spt/models/eft/common/IGlobals"; import { BaseClasses } from "@spt/models/enums/BaseClasses"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; import { ItemHelper } from "./ItemHelper"; export declare class PresetHelper { - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected cloner: ICloner; protected lookup: Record; protected defaultEquipmentPresets: Record; protected defaultWeaponPresets: Record; - constructor(databaseServer: DatabaseServer, itemHelper: ItemHelper, cloner: ICloner); + constructor(databaseService: DatabaseService, itemHelper: ItemHelper, cloner: ICloner); hydratePresetStore(input: Record): void; /** * Get default weapon and equipment presets diff --git a/TypeScript/14AfterDBLoadHook/types/helpers/ProfileHelper.d.ts b/TypeScript/14AfterDBLoadHook/types/helpers/ProfileHelper.d.ts index 37937ff..e943bd3 100644 --- a/TypeScript/14AfterDBLoadHook/types/helpers/ProfileHelper.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/helpers/ProfileHelper.d.ts @@ -7,8 +7,8 @@ import { SkillTypes } from "@spt/models/enums/SkillTypes"; import { IInventoryConfig } from "@spt/models/spt/config/IInventoryConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileSnapshotService } from "@spt/services/ProfileSnapshotService"; import { ICloner } from "@spt/utils/cloners/ICloner"; @@ -21,14 +21,14 @@ export declare class ProfileHelper { protected watermark: Watermark; protected timeUtil: TimeUtil; protected saveServer: SaveServer; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected profileSnapshotService: ProfileSnapshotService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected cloner: ICloner; protected inventoryConfig: IInventoryConfig; - constructor(logger: ILogger, hashUtil: HashUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileSnapshotService: ProfileSnapshotService, localisationService: LocalisationService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, hashUtil: HashUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseService: DatabaseService, itemHelper: ItemHelper, profileSnapshotService: ProfileSnapshotService, localisationService: LocalisationService, configServer: ConfigServer, cloner: ICloner); /** * Remove/reset a completed quest condtion from players profile quest data * @param sessionID Session id diff --git a/TypeScript/14AfterDBLoadHook/types/helpers/QuestHelper.d.ts b/TypeScript/14AfterDBLoadHook/types/helpers/QuestHelper.d.ts index 39ba2a9..93368fa 100644 --- a/TypeScript/14AfterDBLoadHook/types/helpers/QuestHelper.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/helpers/QuestHelper.d.ts @@ -18,7 +18,7 @@ import { IQuestConfig } from "@spt/models/spt/config/IQuestConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -30,9 +30,9 @@ export declare class QuestHelper { protected timeUtil: TimeUtil; protected hashUtil: HashUtil; protected itemHelper: ItemHelper; + protected databaseService: DatabaseService; protected questConditionHelper: QuestConditionHelper; protected eventOutputHolder: EventOutputHolder; - protected databaseServer: DatabaseServer; protected localeService: LocaleService; protected ragfairServerHelper: RagfairServerHelper; protected dialogueHelper: DialogueHelper; @@ -45,7 +45,7 @@ export declare class QuestHelper { protected configServer: ConfigServer; protected cloner: ICloner; protected questConfig: IQuestConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, questConditionHelper: QuestConditionHelper, eventOutputHolder: EventOutputHolder, databaseServer: DatabaseServer, localeService: LocaleService, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, localisationService: LocalisationService, traderHelper: TraderHelper, presetHelper: PresetHelper, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, databaseService: DatabaseService, questConditionHelper: QuestConditionHelper, eventOutputHolder: EventOutputHolder, localeService: LocaleService, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, localisationService: LocalisationService, traderHelper: TraderHelper, presetHelper: PresetHelper, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); /** * Get status of a quest in player profile by its id * @param pmcData Profile to search diff --git a/TypeScript/14AfterDBLoadHook/types/helpers/RagfairOfferHelper.d.ts b/TypeScript/14AfterDBLoadHook/types/helpers/RagfairOfferHelper.d.ts index 27bb081..a08e60a 100644 --- a/TypeScript/14AfterDBLoadHook/types/helpers/RagfairOfferHelper.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/helpers/RagfairOfferHelper.d.ts @@ -19,8 +19,8 @@ import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -34,7 +34,7 @@ export declare class RagfairOfferHelper { protected timeUtil: TimeUtil; protected hashUtil: HashUtil; protected eventOutputHolder: EventOutputHolder; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected traderHelper: TraderHelper; protected saveServer: SaveServer; protected itemHelper: ItemHelper; @@ -55,7 +55,7 @@ export declare class RagfairOfferHelper { protected static goodSoldTemplate: string; protected ragfairConfig: IRagfairConfig; protected questConfig: IQuestConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, eventOutputHolder: EventOutputHolder, databaseServer: DatabaseServer, traderHelper: TraderHelper, saveServer: SaveServer, itemHelper: ItemHelper, botHelper: BotHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, localeService: LocaleService, localisationService: LocalisationService, mailSendService: MailSendService, configServer: ConfigServer); + constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, eventOutputHolder: EventOutputHolder, databaseService: DatabaseService, traderHelper: TraderHelper, saveServer: SaveServer, itemHelper: ItemHelper, botHelper: BotHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, localeService: LocaleService, localisationService: LocalisationService, mailSendService: MailSendService, configServer: ConfigServer); /** * Passthrough to ragfairOfferService.getOffers(), get flea offers a player should see * @param searchRequest Data from client diff --git a/TypeScript/14AfterDBLoadHook/types/helpers/RepairHelper.d.ts b/TypeScript/14AfterDBLoadHook/types/helpers/RepairHelper.d.ts index 4bd0577..99a21da 100644 --- a/TypeScript/14AfterDBLoadHook/types/helpers/RepairHelper.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/helpers/RepairHelper.d.ts @@ -3,17 +3,17 @@ import { ITemplateItem, Props } from "@spt/models/eft/common/tables/ITemplateIte import { IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RepairHelper { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected configServer: ConfigServer; protected cloner: ICloner; protected repairConfig: IRepairConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, configServer: ConfigServer, cloner: ICloner); /** * Alter an items durability after a repair by trader/repair kit * @param itemToRepair item to update durability details diff --git a/TypeScript/14AfterDBLoadHook/types/helpers/TraderAssortHelper.d.ts b/TypeScript/14AfterDBLoadHook/types/helpers/TraderAssortHelper.d.ts index faf2a9d..8f8f802 100644 --- a/TypeScript/14AfterDBLoadHook/types/helpers/TraderAssortHelper.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/helpers/TraderAssortHelper.d.ts @@ -9,7 +9,7 @@ import { ITrader, ITraderAssort } from "@spt/models/eft/common/tables/ITrader"; import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; @@ -21,7 +21,7 @@ export declare class TraderAssortHelper { protected logger: ILogger; protected mathUtil: MathUtil; protected timeUtil: TimeUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected assortHelper: AssortHelper; protected paymentHelper: PaymentHelper; @@ -37,7 +37,7 @@ export declare class TraderAssortHelper { protected traderConfig: ITraderConfig; protected mergedQuestAssorts: Record>; protected createdMergedQuestAssorts: boolean; - constructor(logger: ILogger, mathUtil: MathUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, profileHelper: ProfileHelper, assortHelper: AssortHelper, paymentHelper: PaymentHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, localisationService: LocalisationService, traderPurchasePersisterService: TraderPurchasePersisterService, traderHelper: TraderHelper, fenceService: FenceService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, mathUtil: MathUtil, timeUtil: TimeUtil, databaseService: DatabaseService, profileHelper: ProfileHelper, assortHelper: AssortHelper, paymentHelper: PaymentHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, localisationService: LocalisationService, traderPurchasePersisterService: TraderPurchasePersisterService, traderHelper: TraderHelper, fenceService: FenceService, configServer: ConfigServer, cloner: ICloner); /** * Get a traders assorts * Can be used for returning ragfair / fence assorts diff --git a/TypeScript/14AfterDBLoadHook/types/helpers/TraderHelper.d.ts b/TypeScript/14AfterDBLoadHook/types/helpers/TraderHelper.d.ts index 5f515da..eec1cc7 100644 --- a/TypeScript/14AfterDBLoadHook/types/helpers/TraderHelper.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/helpers/TraderHelper.d.ts @@ -10,7 +10,7 @@ import { Traders } from "@spt/models/enums/Traders"; import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; @@ -18,7 +18,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class TraderHelper { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected handbookHelper: HandbookHelper; protected itemHelper: ItemHelper; @@ -33,7 +33,7 @@ export declare class TraderHelper { protected highestTraderPriceItems?: Record; /** Dictionary of item tpl and the highest trader buy back rouble price */ protected highestTraderBuyPriceItems?: Record; - constructor(logger: ILogger, databaseServer: DatabaseServer, profileHelper: ProfileHelper, handbookHelper: HandbookHelper, itemHelper: ItemHelper, playerService: PlayerService, localisationService: LocalisationService, fenceService: FenceService, timeUtil: TimeUtil, randomUtil: RandomUtil, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, profileHelper: ProfileHelper, handbookHelper: HandbookHelper, itemHelper: ItemHelper, playerService: PlayerService, localisationService: LocalisationService, fenceService: FenceService, timeUtil: TimeUtil, randomUtil: RandomUtil, configServer: ConfigServer); /** * Get a trader base object, update profile to reflect players current standing in profile * when trader not found in profile diff --git a/TypeScript/14AfterDBLoadHook/types/models/eft/common/IGlobals.d.ts b/TypeScript/14AfterDBLoadHook/types/models/eft/common/IGlobals.d.ts index 2209415..a0bb051 100644 --- a/TypeScript/14AfterDBLoadHook/types/models/eft/common/IGlobals.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/models/eft/common/IGlobals.d.ts @@ -802,7 +802,6 @@ export interface IMaxActiveOfferCount { from: number; to: number; count: number; - countForSpecialEditions: number; } export interface IMaxSumForRarity { Common: IRarityMaxSum; diff --git a/TypeScript/14AfterDBLoadHook/types/models/eft/common/ILocationBase.d.ts b/TypeScript/14AfterDBLoadHook/types/models/eft/common/ILocationBase.d.ts index 65931f8..10f1a57 100644 --- a/TypeScript/14AfterDBLoadHook/types/models/eft/common/ILocationBase.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/models/eft/common/ILocationBase.d.ts @@ -196,18 +196,24 @@ export interface Props { export interface Exit { /** % Chance out of 100 exit will appear in raid */ Chance: number; + ChancePVE: number; Count: number; + CountPVE: number; EntryPoints: string; EventAvailable: boolean; ExfiltrationTime: number; + ExfiltrationTimePVE: number; ExfiltrationType: string; RequiredSlot?: string; Id: string; MaxTime: number; + MaxTimePVE: number; MinTime: number; + MinTimePVE: number; Name: string; PassageRequirement: string; PlayersCount: number; + PlayersCountPVE: number; RequirementTip: string; Side?: string; } diff --git a/TypeScript/14AfterDBLoadHook/types/models/eft/common/tables/IRepeatableQuests.d.ts b/TypeScript/14AfterDBLoadHook/types/models/eft/common/tables/IRepeatableQuests.d.ts index 854c8ef..27ff49d 100644 --- a/TypeScript/14AfterDBLoadHook/types/models/eft/common/tables/IRepeatableQuests.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/models/eft/common/tables/IRepeatableQuests.d.ts @@ -18,10 +18,13 @@ export interface IRepeatableTemplates { export interface IPmcDataRepeatableQuest { id?: string; name: string; + unavailableTime?: string; activeQuests: IRepeatableQuest[]; inactiveQuests: IRepeatableQuest[]; endTime: number; changeRequirement: Record; + freeChanges: number; + freeChangesAvailable: number; } export interface IChangeRequirement { changeCost: IChangeCost[]; diff --git a/TypeScript/14AfterDBLoadHook/types/models/eft/common/tables/ITemplateItem.d.ts b/TypeScript/14AfterDBLoadHook/types/models/eft/common/tables/ITemplateItem.d.ts index a8ccfbb..e5c6632 100644 --- a/TypeScript/14AfterDBLoadHook/types/models/eft/common/tables/ITemplateItem.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/models/eft/common/tables/ITemplateItem.d.ts @@ -63,7 +63,7 @@ export interface Props { DiscardingBlock?: boolean; DropSoundType?: string; RagFairCommissionModifier?: number; - RarityPvE: string; + RarityPvE?: string; IsAlwaysAvailableForInsurance?: boolean; DiscardLimit?: number; MaxResource?: number; @@ -414,6 +414,12 @@ export interface Props { LayoutName?: string; Lower75Prefab?: Prefab; MaxUsages?: number; + ScavKillExpPenalty?: number; + ScavKillExpPenaltyPVE?: number; + ScavKillStandingPenalty?: number; + ScavKillStandingPenaltyPVE?: number; + TradersDiscount?: number; + TradersDiscountPVE?: number; } export interface IHealthEffect { type: string; diff --git a/TypeScript/14AfterDBLoadHook/types/models/spt/config/IQuestConfig.d.ts b/TypeScript/14AfterDBLoadHook/types/models/spt/config/IQuestConfig.d.ts index 362602c..2cdf4fa 100644 --- a/TypeScript/14AfterDBLoadHook/types/models/spt/config/IQuestConfig.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/models/spt/config/IQuestConfig.d.ts @@ -47,6 +47,8 @@ export interface IRepeatableQuestConfig { /** Item tplIds to ignore when generating rewards */ rewardBlacklist: string[]; rewardAmmoStackMinSize: number; + freeChangesAvailable: number; + freeChanges: number; } export interface IRewardScaling { levels: number[]; diff --git a/TypeScript/14AfterDBLoadHook/types/services/BotEquipmentModPoolService.d.ts b/TypeScript/14AfterDBLoadHook/types/services/BotEquipmentModPoolService.d.ts index c53f31b..7b2b442 100644 --- a/TypeScript/14AfterDBLoadHook/types/services/BotEquipmentModPoolService.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/services/BotEquipmentModPoolService.d.ts @@ -4,7 +4,7 @@ import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { VFS } from "@spt/utils/VFS"; /** Store a mapping between weapons, their slots and the items that fit those slots */ @@ -12,7 +12,7 @@ export declare class BotEquipmentModPoolService { protected logger: ILogger; protected vfs: VFS; protected itemHelper: ItemHelper; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected botConfig: IBotConfig; @@ -20,7 +20,7 @@ export declare class BotEquipmentModPoolService { protected gearModPool: Mods; protected weaponPoolGenerated: boolean; protected armorPoolGenerated: boolean; - constructor(logger: ILogger, vfs: VFS, itemHelper: ItemHelper, databaseServer: DatabaseServer, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, vfs: VFS, itemHelper: ItemHelper, databaseService: DatabaseService, localisationService: LocalisationService, configServer: ConfigServer); /** * Store dictionary of mods for each item passed in * @param items items to find related mods and store in modPool diff --git a/TypeScript/14AfterDBLoadHook/types/services/CustomLocationWaveService.d.ts b/TypeScript/14AfterDBLoadHook/types/services/CustomLocationWaveService.d.ts index 728a1e8..c72d5bb 100644 --- a/TypeScript/14AfterDBLoadHook/types/services/CustomLocationWaveService.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/services/CustomLocationWaveService.d.ts @@ -2,15 +2,15 @@ import { BossLocationSpawn, Wave } from "@spt/models/eft/common/ILocationBase"; import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class CustomLocationWaveService { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, configServer: ConfigServer); /** * Add a boss wave to a map * @param locationId e.g. factory4_day, bigmap diff --git a/TypeScript/14AfterDBLoadHook/types/services/InsuranceService.d.ts b/TypeScript/14AfterDBLoadHook/types/services/InsuranceService.d.ts index c54f9f9..0000e66 100644 --- a/TypeScript/14AfterDBLoadHook/types/services/InsuranceService.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/services/InsuranceService.d.ts @@ -13,8 +13,8 @@ import { ILostOnDeathConfig } from "@spt/models/spt/config/ILostOnDeathConfig"; import { IInsuranceEquipmentPkg } from "@spt/models/spt/services/IInsuranceEquipmentPkg"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -24,7 +24,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class InsuranceService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected secureContainerHelper: SecureContainerHelper; protected randomUtil: RandomUtil; protected itemHelper: ItemHelper; @@ -42,7 +42,7 @@ export declare class InsuranceService { protected insured: Record>; protected insuranceConfig: IInsuranceConfig; protected lostOnDeathConfig: ILostOnDeathConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, handbookHelper: HandbookHelper, localisationService: LocalisationService, localeService: LocaleService, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, databaseService: DatabaseService, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, handbookHelper: HandbookHelper, localisationService: LocalisationService, localeService: LocaleService, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); /** * Does player have insurance array * @param sessionId Player id diff --git a/TypeScript/14AfterDBLoadHook/types/services/MailSendService.d.ts b/TypeScript/14AfterDBLoadHook/types/services/MailSendService.d.ts index d445841..8f1f974 100644 --- a/TypeScript/14AfterDBLoadHook/types/services/MailSendService.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/services/MailSendService.d.ts @@ -9,8 +9,8 @@ import { MessageType } from "@spt/models/enums/MessageType"; import { Traders } from "@spt/models/enums/Traders"; import { IProfileChangeEvent, ISendMessageDetails } from "@spt/models/spt/dialog/ISendMessageDetails"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; @@ -19,7 +19,7 @@ export declare class MailSendService { protected hashUtil: HashUtil; protected timeUtil: TimeUtil; protected saveServer: SaveServer; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected notifierHelper: NotifierHelper; protected dialogueHelper: DialogueHelper; protected notificationSendHelper: NotificationSendHelper; @@ -27,7 +27,7 @@ export declare class MailSendService { protected itemHelper: ItemHelper; protected traderHelper: TraderHelper; protected readonly systemSenderId = "59e7125688a45068a6249071"; - constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, dialogueHelper: DialogueHelper, notificationSendHelper: NotificationSendHelper, localisationService: LocalisationService, itemHelper: ItemHelper, traderHelper: TraderHelper); + constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseService: DatabaseService, notifierHelper: NotifierHelper, dialogueHelper: DialogueHelper, notificationSendHelper: NotificationSendHelper, localisationService: LocalisationService, itemHelper: ItemHelper, traderHelper: TraderHelper); /** * Send a message from an NPC (e.g. prapor) to the player with or without items using direct message text, do not look up any locale * @param sessionId The session ID to send the message to diff --git a/TypeScript/14AfterDBLoadHook/types/services/OpenZoneService.d.ts b/TypeScript/14AfterDBLoadHook/types/services/OpenZoneService.d.ts index 1bc5f00..c7dd0bd 100644 --- a/TypeScript/14AfterDBLoadHook/types/services/OpenZoneService.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/services/OpenZoneService.d.ts @@ -1,18 +1,18 @@ import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RandomUtil } from "@spt/utils/RandomUtil"; /** Service for adding new zones to a maps OpenZones property */ export declare class OpenZoneService { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, localisationService: LocalisationService, configServer: ConfigServer); /** * Add open zone to specified map * @param locationId map location (e.g. factory4_day) diff --git a/TypeScript/14AfterDBLoadHook/types/services/PaymentService.d.ts b/TypeScript/14AfterDBLoadHook/types/services/PaymentService.d.ts index 64ff2c1..61d5731 100644 --- a/TypeScript/14AfterDBLoadHook/types/services/PaymentService.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/services/PaymentService.d.ts @@ -9,7 +9,7 @@ import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRo import { IProcessBuyTradeRequestData } from "@spt/models/eft/trade/IProcessBuyTradeRequestData"; import { IProcessSellTradeRequestData } from "@spt/models/eft/trade/IProcessSellTradeRequestData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; @@ -17,14 +17,14 @@ export declare class PaymentService { protected logger: ILogger; protected hashUtil: HashUtil; protected httpResponse: HttpResponseUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected handbookHelper: HandbookHelper; protected traderHelper: TraderHelper; protected itemHelper: ItemHelper; protected inventoryHelper: InventoryHelper; protected localisationService: LocalisationService; protected paymentHelper: PaymentHelper; - constructor(logger: ILogger, hashUtil: HashUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, localisationService: LocalisationService, paymentHelper: PaymentHelper); + constructor(logger: ILogger, hashUtil: HashUtil, httpResponse: HttpResponseUtil, databaseService: DatabaseService, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, localisationService: LocalisationService, paymentHelper: PaymentHelper); /** * Take money and insert items into return to server request * @param pmcData Pmc profile diff --git a/TypeScript/14AfterDBLoadHook/types/services/PlayerService.d.ts b/TypeScript/14AfterDBLoadHook/types/services/PlayerService.d.ts index ae57410..84c4c6f 100644 --- a/TypeScript/14AfterDBLoadHook/types/services/PlayerService.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/services/PlayerService.d.ts @@ -1,14 +1,14 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class PlayerService { protected logger: ILogger; protected timeUtil: TimeUtil; protected localisationService: LocalisationService; - protected databaseServer: DatabaseServer; - constructor(logger: ILogger, timeUtil: TimeUtil, localisationService: LocalisationService, databaseServer: DatabaseServer); + protected databaseService: DatabaseService; + constructor(logger: ILogger, timeUtil: TimeUtil, localisationService: LocalisationService, databaseService: DatabaseService); /** * Get level of player * @param pmcData Player profile diff --git a/TypeScript/14AfterDBLoadHook/types/services/RagfairLinkedItemService.d.ts b/TypeScript/14AfterDBLoadHook/types/services/RagfairLinkedItemService.d.ts index 6011c1a..0d03459 100644 --- a/TypeScript/14AfterDBLoadHook/types/services/RagfairLinkedItemService.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/services/RagfairLinkedItemService.d.ts @@ -1,11 +1,11 @@ import { ItemHelper } from "@spt/helpers/ItemHelper"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; export declare class RagfairLinkedItemService { - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected linkedItemsCache: Record>; - constructor(databaseServer: DatabaseServer, itemHelper: ItemHelper); + constructor(databaseService: DatabaseService, itemHelper: ItemHelper); getLinkedItems(linkedSearchId: string): Set; /** * Use ragfair linked item service to get an array of items that can fit on or in designated itemtpl diff --git a/TypeScript/14AfterDBLoadHook/types/services/RagfairOfferService.d.ts b/TypeScript/14AfterDBLoadHook/types/services/RagfairOfferService.d.ts index c044f6d..4bc07c3 100644 --- a/TypeScript/14AfterDBLoadHook/types/services/RagfairOfferService.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/services/RagfairOfferService.d.ts @@ -6,8 +6,8 @@ import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RagfairOfferHolder } from "@spt/utils/RagfairOfferHolder"; @@ -15,7 +15,7 @@ import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class RagfairOfferService { protected logger: ILogger; protected timeUtil: TimeUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected saveServer: SaveServer; protected ragfairServerHelper: RagfairServerHelper; protected profileHelper: ProfileHelper; @@ -28,7 +28,7 @@ export declare class RagfairOfferService { protected expiredOffers: Record; protected ragfairConfig: IRagfairConfig; protected ragfairOfferHandler: RagfairOfferHolder; - constructor(logger: ILogger, timeUtil: TimeUtil, databaseServer: DatabaseServer, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, eventOutputHolder: EventOutputHolder, httpResponse: HttpResponseUtil, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, timeUtil: TimeUtil, databaseService: DatabaseService, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, eventOutputHolder: EventOutputHolder, httpResponse: HttpResponseUtil, localisationService: LocalisationService, configServer: ConfigServer); /** * Get all offers * @returns IRagfairOffer array diff --git a/TypeScript/14AfterDBLoadHook/types/services/RagfairPriceService.d.ts b/TypeScript/14AfterDBLoadHook/types/services/RagfairPriceService.d.ts index 5b8fa56..0a2f26e 100644 --- a/TypeScript/14AfterDBLoadHook/types/services/RagfairPriceService.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/services/RagfairPriceService.d.ts @@ -12,7 +12,7 @@ import { IRagfairConfig, IUnreasonableModPrices } from "@spt/models/spt/config/I import { IRagfairServerPrices } from "@spt/models/spt/ragfair/IRagfairServerPrices"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RandomUtil } from "@spt/utils/RandomUtil"; /** @@ -20,7 +20,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; */ export declare class RagfairPriceService implements OnLoad { protected handbookHelper: HandbookHelper; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected logger: ILogger; protected itemHelper: ItemHelper; protected presetHelper: PresetHelper; @@ -30,7 +30,7 @@ export declare class RagfairPriceService implements OnLoad { protected configServer: ConfigServer; protected ragfairConfig: IRagfairConfig; protected prices: IRagfairServerPrices; - constructor(handbookHelper: HandbookHelper, databaseServer: DatabaseServer, logger: ILogger, itemHelper: ItemHelper, presetHelper: PresetHelper, traderHelper: TraderHelper, randomUtil: RandomUtil, localisationService: LocalisationService, configServer: ConfigServer); + constructor(handbookHelper: HandbookHelper, databaseService: DatabaseService, logger: ILogger, itemHelper: ItemHelper, presetHelper: PresetHelper, traderHelper: TraderHelper, randomUtil: RandomUtil, localisationService: LocalisationService, configServer: ConfigServer); /** * Generate static (handbook) and dynamic (prices.json) flea prices, store inside class as dictionaries */ diff --git a/TypeScript/14AfterDBLoadHook/types/services/RagfairTaxService.d.ts b/TypeScript/14AfterDBLoadHook/types/services/RagfairTaxService.d.ts index 4e4e648..effb9f0 100644 --- a/TypeScript/14AfterDBLoadHook/types/services/RagfairTaxService.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/services/RagfairTaxService.d.ts @@ -4,15 +4,15 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { IStorePlayerOfferTaxAmountRequestData } from "@spt/models/eft/ragfair/IStorePlayerOfferTaxAmountRequestData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; export declare class RagfairTaxService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected ragfairPriceService: RagfairPriceService; protected itemHelper: ItemHelper; protected playerOfferTaxCache: Record; - constructor(logger: ILogger, databaseServer: DatabaseServer, ragfairPriceService: RagfairPriceService, itemHelper: ItemHelper); + constructor(logger: ILogger, databaseService: DatabaseService, ragfairPriceService: RagfairPriceService, itemHelper: ItemHelper); storeClientOfferTaxValue(sessionId: string, offer: IStorePlayerOfferTaxAmountRequestData): void; clearStoredOfferTaxById(offerIdToRemove: string): void; getStoredClientOfferTaxValueById(offerIdToGet: string): IStorePlayerOfferTaxAmountRequestData; diff --git a/TypeScript/14AfterDBLoadHook/types/services/RaidTimeAdjustmentService.d.ts b/TypeScript/14AfterDBLoadHook/types/services/RaidTimeAdjustmentService.d.ts index f770b64..bfc099a 100644 --- a/TypeScript/14AfterDBLoadHook/types/services/RaidTimeAdjustmentService.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/services/RaidTimeAdjustmentService.d.ts @@ -7,17 +7,17 @@ import { ILocationConfig, IScavRaidTimeLocationSettings, LootMultiplier } from " import { IRaidChanges } from "@spt/models/spt/location/IRaidChanges"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RaidTimeAdjustmentService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected randomUtil: RandomUtil; protected weightedRandomHelper: WeightedRandomHelper; protected applicationContext: ApplicationContext; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, applicationContext: ApplicationContext, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, applicationContext: ApplicationContext, configServer: ConfigServer); /** * Make alterations to the base map data passed in * Loot multipliers/waves/wave start times diff --git a/TypeScript/14AfterDBLoadHook/types/services/RepairService.d.ts b/TypeScript/14AfterDBLoadHook/types/services/RepairService.d.ts index 9203417..48f306e 100644 --- a/TypeScript/14AfterDBLoadHook/types/services/RepairService.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/services/RepairService.d.ts @@ -14,13 +14,13 @@ import { SkillTypes } from "@spt/models/enums/SkillTypes"; import { BonusSettings, IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RepairService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected randomUtil: RandomUtil; protected itemHelper: ItemHelper; @@ -31,7 +31,7 @@ export declare class RepairService { protected localisationService: LocalisationService; protected configServer: ConfigServer; protected repairConfig: IRepairConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, profileHelper: ProfileHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, traderHelper: TraderHelper, weightedRandomHelper: WeightedRandomHelper, paymentService: PaymentService, repairHelper: RepairHelper, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, profileHelper: ProfileHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, traderHelper: TraderHelper, weightedRandomHelper: WeightedRandomHelper, paymentService: PaymentService, repairHelper: RepairHelper, localisationService: LocalisationService, configServer: ConfigServer); /** * Use trader to repair an items durability * @param sessionID Session id diff --git a/TypeScript/14AfterDBLoadHook/types/services/TraderServicesService.d.ts b/TypeScript/14AfterDBLoadHook/types/services/TraderServicesService.d.ts index 111c71a..e441eb6 100644 --- a/TypeScript/14AfterDBLoadHook/types/services/TraderServicesService.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/services/TraderServicesService.d.ts @@ -1,13 +1,13 @@ import { ProfileHelper } from "@spt/helpers/ProfileHelper"; import { ITraderServiceModel } from "@spt/models/spt/services/ITraderServiceModel"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderServicesService { protected profileHelper: ProfileHelper; protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected cloner: ICloner; - constructor(profileHelper: ProfileHelper, logger: ILogger, databaseServer: DatabaseServer, cloner: ICloner); + constructor(profileHelper: ProfileHelper, logger: ILogger, databaseService: DatabaseService, cloner: ICloner); getTraderServices(sessionId: string, traderId: string): ITraderServiceModel[]; } diff --git a/TypeScript/14AfterDBLoadHook/types/services/mod/CustomItemService.d.ts b/TypeScript/14AfterDBLoadHook/types/services/mod/CustomItemService.d.ts index 6dc4730..1926bed 100644 --- a/TypeScript/14AfterDBLoadHook/types/services/mod/CustomItemService.d.ts +++ b/TypeScript/14AfterDBLoadHook/types/services/mod/CustomItemService.d.ts @@ -9,11 +9,11 @@ import { HashUtil } from "@spt/utils/HashUtil"; export declare class CustomItemService { protected logger: ILogger; protected hashUtil: HashUtil; - protected databaseServer: DatabaseService; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected itemBaseClassService: ItemBaseClassService; protected cloner: ICloner; - constructor(logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseService, itemHelper: ItemHelper, itemBaseClassService: ItemBaseClassService, cloner: ICloner); + constructor(logger: ILogger, hashUtil: HashUtil, databaseService: DatabaseService, itemHelper: ItemHelper, itemBaseClassService: ItemBaseClassService, cloner: ICloner); /** * Create a new item from a cloned item base * WARNING - If no item id is supplied, an id will be generated, this id will be random every time you add an item and will not be the same on each subsequent server start diff --git a/TypeScript/15HttpListenerExample/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts b/TypeScript/15HttpListenerExample/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts index a7491b5..c51bf7e 100644 --- a/TypeScript/15HttpListenerExample/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts +++ b/TypeScript/15HttpListenerExample/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts @@ -6,7 +6,7 @@ import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { ISendMessageRequest } from "@spt/models/eft/dialog/ISendMessageRequest"; import { IUserDialogInfo } from "@spt/models/eft/profile/ISptProfile"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -19,7 +19,7 @@ export declare class GiveSptCommand implements ISptCommand { protected presetHelper: PresetHelper; protected mailSendService: MailSendService; protected localeService: LocaleService; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemFilterService: ItemFilterService; protected cloner: ICloner; /** @@ -34,7 +34,7 @@ export declare class GiveSptCommand implements ISptCommand { private static acceptableConfidence; private static excludedPresetItems; protected savedCommand: Map; - constructor(logger: ILogger, itemHelper: ItemHelper, hashUtil: HashUtil, presetHelper: PresetHelper, mailSendService: MailSendService, localeService: LocaleService, databaseServer: DatabaseServer, itemFilterService: ItemFilterService, cloner: ICloner); + constructor(logger: ILogger, itemHelper: ItemHelper, hashUtil: HashUtil, presetHelper: PresetHelper, mailSendService: MailSendService, localeService: LocaleService, databaseService: DatabaseService, itemFilterService: ItemFilterService, cloner: ICloner); getCommand(): string; getCommandHelp(): string; performAction(commandHandler: IUserDialogInfo, sessionId: string, request: ISendMessageRequest): string; diff --git a/TypeScript/15HttpListenerExample/types/helpers/PresetHelper.d.ts b/TypeScript/15HttpListenerExample/types/helpers/PresetHelper.d.ts index 5fc8a7c..e71e5b7 100644 --- a/TypeScript/15HttpListenerExample/types/helpers/PresetHelper.d.ts +++ b/TypeScript/15HttpListenerExample/types/helpers/PresetHelper.d.ts @@ -1,16 +1,16 @@ import { IPreset } from "@spt/models/eft/common/IGlobals"; import { BaseClasses } from "@spt/models/enums/BaseClasses"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; import { ItemHelper } from "./ItemHelper"; export declare class PresetHelper { - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected cloner: ICloner; protected lookup: Record; protected defaultEquipmentPresets: Record; protected defaultWeaponPresets: Record; - constructor(databaseServer: DatabaseServer, itemHelper: ItemHelper, cloner: ICloner); + constructor(databaseService: DatabaseService, itemHelper: ItemHelper, cloner: ICloner); hydratePresetStore(input: Record): void; /** * Get default weapon and equipment presets diff --git a/TypeScript/15HttpListenerExample/types/helpers/ProfileHelper.d.ts b/TypeScript/15HttpListenerExample/types/helpers/ProfileHelper.d.ts index 37937ff..e943bd3 100644 --- a/TypeScript/15HttpListenerExample/types/helpers/ProfileHelper.d.ts +++ b/TypeScript/15HttpListenerExample/types/helpers/ProfileHelper.d.ts @@ -7,8 +7,8 @@ import { SkillTypes } from "@spt/models/enums/SkillTypes"; import { IInventoryConfig } from "@spt/models/spt/config/IInventoryConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileSnapshotService } from "@spt/services/ProfileSnapshotService"; import { ICloner } from "@spt/utils/cloners/ICloner"; @@ -21,14 +21,14 @@ export declare class ProfileHelper { protected watermark: Watermark; protected timeUtil: TimeUtil; protected saveServer: SaveServer; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected profileSnapshotService: ProfileSnapshotService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected cloner: ICloner; protected inventoryConfig: IInventoryConfig; - constructor(logger: ILogger, hashUtil: HashUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileSnapshotService: ProfileSnapshotService, localisationService: LocalisationService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, hashUtil: HashUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseService: DatabaseService, itemHelper: ItemHelper, profileSnapshotService: ProfileSnapshotService, localisationService: LocalisationService, configServer: ConfigServer, cloner: ICloner); /** * Remove/reset a completed quest condtion from players profile quest data * @param sessionID Session id diff --git a/TypeScript/15HttpListenerExample/types/helpers/QuestHelper.d.ts b/TypeScript/15HttpListenerExample/types/helpers/QuestHelper.d.ts index 39ba2a9..93368fa 100644 --- a/TypeScript/15HttpListenerExample/types/helpers/QuestHelper.d.ts +++ b/TypeScript/15HttpListenerExample/types/helpers/QuestHelper.d.ts @@ -18,7 +18,7 @@ import { IQuestConfig } from "@spt/models/spt/config/IQuestConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -30,9 +30,9 @@ export declare class QuestHelper { protected timeUtil: TimeUtil; protected hashUtil: HashUtil; protected itemHelper: ItemHelper; + protected databaseService: DatabaseService; protected questConditionHelper: QuestConditionHelper; protected eventOutputHolder: EventOutputHolder; - protected databaseServer: DatabaseServer; protected localeService: LocaleService; protected ragfairServerHelper: RagfairServerHelper; protected dialogueHelper: DialogueHelper; @@ -45,7 +45,7 @@ export declare class QuestHelper { protected configServer: ConfigServer; protected cloner: ICloner; protected questConfig: IQuestConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, questConditionHelper: QuestConditionHelper, eventOutputHolder: EventOutputHolder, databaseServer: DatabaseServer, localeService: LocaleService, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, localisationService: LocalisationService, traderHelper: TraderHelper, presetHelper: PresetHelper, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, databaseService: DatabaseService, questConditionHelper: QuestConditionHelper, eventOutputHolder: EventOutputHolder, localeService: LocaleService, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, localisationService: LocalisationService, traderHelper: TraderHelper, presetHelper: PresetHelper, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); /** * Get status of a quest in player profile by its id * @param pmcData Profile to search diff --git a/TypeScript/15HttpListenerExample/types/helpers/RagfairOfferHelper.d.ts b/TypeScript/15HttpListenerExample/types/helpers/RagfairOfferHelper.d.ts index 27bb081..a08e60a 100644 --- a/TypeScript/15HttpListenerExample/types/helpers/RagfairOfferHelper.d.ts +++ b/TypeScript/15HttpListenerExample/types/helpers/RagfairOfferHelper.d.ts @@ -19,8 +19,8 @@ import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -34,7 +34,7 @@ export declare class RagfairOfferHelper { protected timeUtil: TimeUtil; protected hashUtil: HashUtil; protected eventOutputHolder: EventOutputHolder; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected traderHelper: TraderHelper; protected saveServer: SaveServer; protected itemHelper: ItemHelper; @@ -55,7 +55,7 @@ export declare class RagfairOfferHelper { protected static goodSoldTemplate: string; protected ragfairConfig: IRagfairConfig; protected questConfig: IQuestConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, eventOutputHolder: EventOutputHolder, databaseServer: DatabaseServer, traderHelper: TraderHelper, saveServer: SaveServer, itemHelper: ItemHelper, botHelper: BotHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, localeService: LocaleService, localisationService: LocalisationService, mailSendService: MailSendService, configServer: ConfigServer); + constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, eventOutputHolder: EventOutputHolder, databaseService: DatabaseService, traderHelper: TraderHelper, saveServer: SaveServer, itemHelper: ItemHelper, botHelper: BotHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, localeService: LocaleService, localisationService: LocalisationService, mailSendService: MailSendService, configServer: ConfigServer); /** * Passthrough to ragfairOfferService.getOffers(), get flea offers a player should see * @param searchRequest Data from client diff --git a/TypeScript/15HttpListenerExample/types/helpers/RepairHelper.d.ts b/TypeScript/15HttpListenerExample/types/helpers/RepairHelper.d.ts index 4bd0577..99a21da 100644 --- a/TypeScript/15HttpListenerExample/types/helpers/RepairHelper.d.ts +++ b/TypeScript/15HttpListenerExample/types/helpers/RepairHelper.d.ts @@ -3,17 +3,17 @@ import { ITemplateItem, Props } from "@spt/models/eft/common/tables/ITemplateIte import { IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RepairHelper { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected configServer: ConfigServer; protected cloner: ICloner; protected repairConfig: IRepairConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, configServer: ConfigServer, cloner: ICloner); /** * Alter an items durability after a repair by trader/repair kit * @param itemToRepair item to update durability details diff --git a/TypeScript/15HttpListenerExample/types/helpers/TraderAssortHelper.d.ts b/TypeScript/15HttpListenerExample/types/helpers/TraderAssortHelper.d.ts index faf2a9d..8f8f802 100644 --- a/TypeScript/15HttpListenerExample/types/helpers/TraderAssortHelper.d.ts +++ b/TypeScript/15HttpListenerExample/types/helpers/TraderAssortHelper.d.ts @@ -9,7 +9,7 @@ import { ITrader, ITraderAssort } from "@spt/models/eft/common/tables/ITrader"; import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; @@ -21,7 +21,7 @@ export declare class TraderAssortHelper { protected logger: ILogger; protected mathUtil: MathUtil; protected timeUtil: TimeUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected assortHelper: AssortHelper; protected paymentHelper: PaymentHelper; @@ -37,7 +37,7 @@ export declare class TraderAssortHelper { protected traderConfig: ITraderConfig; protected mergedQuestAssorts: Record>; protected createdMergedQuestAssorts: boolean; - constructor(logger: ILogger, mathUtil: MathUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, profileHelper: ProfileHelper, assortHelper: AssortHelper, paymentHelper: PaymentHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, localisationService: LocalisationService, traderPurchasePersisterService: TraderPurchasePersisterService, traderHelper: TraderHelper, fenceService: FenceService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, mathUtil: MathUtil, timeUtil: TimeUtil, databaseService: DatabaseService, profileHelper: ProfileHelper, assortHelper: AssortHelper, paymentHelper: PaymentHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, localisationService: LocalisationService, traderPurchasePersisterService: TraderPurchasePersisterService, traderHelper: TraderHelper, fenceService: FenceService, configServer: ConfigServer, cloner: ICloner); /** * Get a traders assorts * Can be used for returning ragfair / fence assorts diff --git a/TypeScript/15HttpListenerExample/types/helpers/TraderHelper.d.ts b/TypeScript/15HttpListenerExample/types/helpers/TraderHelper.d.ts index 5f515da..eec1cc7 100644 --- a/TypeScript/15HttpListenerExample/types/helpers/TraderHelper.d.ts +++ b/TypeScript/15HttpListenerExample/types/helpers/TraderHelper.d.ts @@ -10,7 +10,7 @@ import { Traders } from "@spt/models/enums/Traders"; import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; @@ -18,7 +18,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class TraderHelper { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected handbookHelper: HandbookHelper; protected itemHelper: ItemHelper; @@ -33,7 +33,7 @@ export declare class TraderHelper { protected highestTraderPriceItems?: Record; /** Dictionary of item tpl and the highest trader buy back rouble price */ protected highestTraderBuyPriceItems?: Record; - constructor(logger: ILogger, databaseServer: DatabaseServer, profileHelper: ProfileHelper, handbookHelper: HandbookHelper, itemHelper: ItemHelper, playerService: PlayerService, localisationService: LocalisationService, fenceService: FenceService, timeUtil: TimeUtil, randomUtil: RandomUtil, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, profileHelper: ProfileHelper, handbookHelper: HandbookHelper, itemHelper: ItemHelper, playerService: PlayerService, localisationService: LocalisationService, fenceService: FenceService, timeUtil: TimeUtil, randomUtil: RandomUtil, configServer: ConfigServer); /** * Get a trader base object, update profile to reflect players current standing in profile * when trader not found in profile diff --git a/TypeScript/15HttpListenerExample/types/models/eft/common/IGlobals.d.ts b/TypeScript/15HttpListenerExample/types/models/eft/common/IGlobals.d.ts index 2209415..a0bb051 100644 --- a/TypeScript/15HttpListenerExample/types/models/eft/common/IGlobals.d.ts +++ b/TypeScript/15HttpListenerExample/types/models/eft/common/IGlobals.d.ts @@ -802,7 +802,6 @@ export interface IMaxActiveOfferCount { from: number; to: number; count: number; - countForSpecialEditions: number; } export interface IMaxSumForRarity { Common: IRarityMaxSum; diff --git a/TypeScript/15HttpListenerExample/types/models/eft/common/ILocationBase.d.ts b/TypeScript/15HttpListenerExample/types/models/eft/common/ILocationBase.d.ts index 65931f8..10f1a57 100644 --- a/TypeScript/15HttpListenerExample/types/models/eft/common/ILocationBase.d.ts +++ b/TypeScript/15HttpListenerExample/types/models/eft/common/ILocationBase.d.ts @@ -196,18 +196,24 @@ export interface Props { export interface Exit { /** % Chance out of 100 exit will appear in raid */ Chance: number; + ChancePVE: number; Count: number; + CountPVE: number; EntryPoints: string; EventAvailable: boolean; ExfiltrationTime: number; + ExfiltrationTimePVE: number; ExfiltrationType: string; RequiredSlot?: string; Id: string; MaxTime: number; + MaxTimePVE: number; MinTime: number; + MinTimePVE: number; Name: string; PassageRequirement: string; PlayersCount: number; + PlayersCountPVE: number; RequirementTip: string; Side?: string; } diff --git a/TypeScript/15HttpListenerExample/types/models/eft/common/tables/IRepeatableQuests.d.ts b/TypeScript/15HttpListenerExample/types/models/eft/common/tables/IRepeatableQuests.d.ts index 854c8ef..27ff49d 100644 --- a/TypeScript/15HttpListenerExample/types/models/eft/common/tables/IRepeatableQuests.d.ts +++ b/TypeScript/15HttpListenerExample/types/models/eft/common/tables/IRepeatableQuests.d.ts @@ -18,10 +18,13 @@ export interface IRepeatableTemplates { export interface IPmcDataRepeatableQuest { id?: string; name: string; + unavailableTime?: string; activeQuests: IRepeatableQuest[]; inactiveQuests: IRepeatableQuest[]; endTime: number; changeRequirement: Record; + freeChanges: number; + freeChangesAvailable: number; } export interface IChangeRequirement { changeCost: IChangeCost[]; diff --git a/TypeScript/15HttpListenerExample/types/models/eft/common/tables/ITemplateItem.d.ts b/TypeScript/15HttpListenerExample/types/models/eft/common/tables/ITemplateItem.d.ts index a8ccfbb..e5c6632 100644 --- a/TypeScript/15HttpListenerExample/types/models/eft/common/tables/ITemplateItem.d.ts +++ b/TypeScript/15HttpListenerExample/types/models/eft/common/tables/ITemplateItem.d.ts @@ -63,7 +63,7 @@ export interface Props { DiscardingBlock?: boolean; DropSoundType?: string; RagFairCommissionModifier?: number; - RarityPvE: string; + RarityPvE?: string; IsAlwaysAvailableForInsurance?: boolean; DiscardLimit?: number; MaxResource?: number; @@ -414,6 +414,12 @@ export interface Props { LayoutName?: string; Lower75Prefab?: Prefab; MaxUsages?: number; + ScavKillExpPenalty?: number; + ScavKillExpPenaltyPVE?: number; + ScavKillStandingPenalty?: number; + ScavKillStandingPenaltyPVE?: number; + TradersDiscount?: number; + TradersDiscountPVE?: number; } export interface IHealthEffect { type: string; diff --git a/TypeScript/15HttpListenerExample/types/models/spt/config/IQuestConfig.d.ts b/TypeScript/15HttpListenerExample/types/models/spt/config/IQuestConfig.d.ts index 362602c..2cdf4fa 100644 --- a/TypeScript/15HttpListenerExample/types/models/spt/config/IQuestConfig.d.ts +++ b/TypeScript/15HttpListenerExample/types/models/spt/config/IQuestConfig.d.ts @@ -47,6 +47,8 @@ export interface IRepeatableQuestConfig { /** Item tplIds to ignore when generating rewards */ rewardBlacklist: string[]; rewardAmmoStackMinSize: number; + freeChangesAvailable: number; + freeChanges: number; } export interface IRewardScaling { levels: number[]; diff --git a/TypeScript/15HttpListenerExample/types/services/BotEquipmentModPoolService.d.ts b/TypeScript/15HttpListenerExample/types/services/BotEquipmentModPoolService.d.ts index c53f31b..7b2b442 100644 --- a/TypeScript/15HttpListenerExample/types/services/BotEquipmentModPoolService.d.ts +++ b/TypeScript/15HttpListenerExample/types/services/BotEquipmentModPoolService.d.ts @@ -4,7 +4,7 @@ import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { VFS } from "@spt/utils/VFS"; /** Store a mapping between weapons, their slots and the items that fit those slots */ @@ -12,7 +12,7 @@ export declare class BotEquipmentModPoolService { protected logger: ILogger; protected vfs: VFS; protected itemHelper: ItemHelper; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected botConfig: IBotConfig; @@ -20,7 +20,7 @@ export declare class BotEquipmentModPoolService { protected gearModPool: Mods; protected weaponPoolGenerated: boolean; protected armorPoolGenerated: boolean; - constructor(logger: ILogger, vfs: VFS, itemHelper: ItemHelper, databaseServer: DatabaseServer, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, vfs: VFS, itemHelper: ItemHelper, databaseService: DatabaseService, localisationService: LocalisationService, configServer: ConfigServer); /** * Store dictionary of mods for each item passed in * @param items items to find related mods and store in modPool diff --git a/TypeScript/15HttpListenerExample/types/services/CustomLocationWaveService.d.ts b/TypeScript/15HttpListenerExample/types/services/CustomLocationWaveService.d.ts index 728a1e8..c72d5bb 100644 --- a/TypeScript/15HttpListenerExample/types/services/CustomLocationWaveService.d.ts +++ b/TypeScript/15HttpListenerExample/types/services/CustomLocationWaveService.d.ts @@ -2,15 +2,15 @@ import { BossLocationSpawn, Wave } from "@spt/models/eft/common/ILocationBase"; import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class CustomLocationWaveService { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, configServer: ConfigServer); /** * Add a boss wave to a map * @param locationId e.g. factory4_day, bigmap diff --git a/TypeScript/15HttpListenerExample/types/services/InsuranceService.d.ts b/TypeScript/15HttpListenerExample/types/services/InsuranceService.d.ts index c54f9f9..0000e66 100644 --- a/TypeScript/15HttpListenerExample/types/services/InsuranceService.d.ts +++ b/TypeScript/15HttpListenerExample/types/services/InsuranceService.d.ts @@ -13,8 +13,8 @@ import { ILostOnDeathConfig } from "@spt/models/spt/config/ILostOnDeathConfig"; import { IInsuranceEquipmentPkg } from "@spt/models/spt/services/IInsuranceEquipmentPkg"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -24,7 +24,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class InsuranceService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected secureContainerHelper: SecureContainerHelper; protected randomUtil: RandomUtil; protected itemHelper: ItemHelper; @@ -42,7 +42,7 @@ export declare class InsuranceService { protected insured: Record>; protected insuranceConfig: IInsuranceConfig; protected lostOnDeathConfig: ILostOnDeathConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, handbookHelper: HandbookHelper, localisationService: LocalisationService, localeService: LocaleService, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, databaseService: DatabaseService, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, handbookHelper: HandbookHelper, localisationService: LocalisationService, localeService: LocaleService, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); /** * Does player have insurance array * @param sessionId Player id diff --git a/TypeScript/15HttpListenerExample/types/services/MailSendService.d.ts b/TypeScript/15HttpListenerExample/types/services/MailSendService.d.ts index d445841..8f1f974 100644 --- a/TypeScript/15HttpListenerExample/types/services/MailSendService.d.ts +++ b/TypeScript/15HttpListenerExample/types/services/MailSendService.d.ts @@ -9,8 +9,8 @@ import { MessageType } from "@spt/models/enums/MessageType"; import { Traders } from "@spt/models/enums/Traders"; import { IProfileChangeEvent, ISendMessageDetails } from "@spt/models/spt/dialog/ISendMessageDetails"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; @@ -19,7 +19,7 @@ export declare class MailSendService { protected hashUtil: HashUtil; protected timeUtil: TimeUtil; protected saveServer: SaveServer; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected notifierHelper: NotifierHelper; protected dialogueHelper: DialogueHelper; protected notificationSendHelper: NotificationSendHelper; @@ -27,7 +27,7 @@ export declare class MailSendService { protected itemHelper: ItemHelper; protected traderHelper: TraderHelper; protected readonly systemSenderId = "59e7125688a45068a6249071"; - constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, dialogueHelper: DialogueHelper, notificationSendHelper: NotificationSendHelper, localisationService: LocalisationService, itemHelper: ItemHelper, traderHelper: TraderHelper); + constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseService: DatabaseService, notifierHelper: NotifierHelper, dialogueHelper: DialogueHelper, notificationSendHelper: NotificationSendHelper, localisationService: LocalisationService, itemHelper: ItemHelper, traderHelper: TraderHelper); /** * Send a message from an NPC (e.g. prapor) to the player with or without items using direct message text, do not look up any locale * @param sessionId The session ID to send the message to diff --git a/TypeScript/15HttpListenerExample/types/services/OpenZoneService.d.ts b/TypeScript/15HttpListenerExample/types/services/OpenZoneService.d.ts index 1bc5f00..c7dd0bd 100644 --- a/TypeScript/15HttpListenerExample/types/services/OpenZoneService.d.ts +++ b/TypeScript/15HttpListenerExample/types/services/OpenZoneService.d.ts @@ -1,18 +1,18 @@ import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RandomUtil } from "@spt/utils/RandomUtil"; /** Service for adding new zones to a maps OpenZones property */ export declare class OpenZoneService { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, localisationService: LocalisationService, configServer: ConfigServer); /** * Add open zone to specified map * @param locationId map location (e.g. factory4_day) diff --git a/TypeScript/15HttpListenerExample/types/services/PaymentService.d.ts b/TypeScript/15HttpListenerExample/types/services/PaymentService.d.ts index 64ff2c1..61d5731 100644 --- a/TypeScript/15HttpListenerExample/types/services/PaymentService.d.ts +++ b/TypeScript/15HttpListenerExample/types/services/PaymentService.d.ts @@ -9,7 +9,7 @@ import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRo import { IProcessBuyTradeRequestData } from "@spt/models/eft/trade/IProcessBuyTradeRequestData"; import { IProcessSellTradeRequestData } from "@spt/models/eft/trade/IProcessSellTradeRequestData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; @@ -17,14 +17,14 @@ export declare class PaymentService { protected logger: ILogger; protected hashUtil: HashUtil; protected httpResponse: HttpResponseUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected handbookHelper: HandbookHelper; protected traderHelper: TraderHelper; protected itemHelper: ItemHelper; protected inventoryHelper: InventoryHelper; protected localisationService: LocalisationService; protected paymentHelper: PaymentHelper; - constructor(logger: ILogger, hashUtil: HashUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, localisationService: LocalisationService, paymentHelper: PaymentHelper); + constructor(logger: ILogger, hashUtil: HashUtil, httpResponse: HttpResponseUtil, databaseService: DatabaseService, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, localisationService: LocalisationService, paymentHelper: PaymentHelper); /** * Take money and insert items into return to server request * @param pmcData Pmc profile diff --git a/TypeScript/15HttpListenerExample/types/services/PlayerService.d.ts b/TypeScript/15HttpListenerExample/types/services/PlayerService.d.ts index ae57410..84c4c6f 100644 --- a/TypeScript/15HttpListenerExample/types/services/PlayerService.d.ts +++ b/TypeScript/15HttpListenerExample/types/services/PlayerService.d.ts @@ -1,14 +1,14 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class PlayerService { protected logger: ILogger; protected timeUtil: TimeUtil; protected localisationService: LocalisationService; - protected databaseServer: DatabaseServer; - constructor(logger: ILogger, timeUtil: TimeUtil, localisationService: LocalisationService, databaseServer: DatabaseServer); + protected databaseService: DatabaseService; + constructor(logger: ILogger, timeUtil: TimeUtil, localisationService: LocalisationService, databaseService: DatabaseService); /** * Get level of player * @param pmcData Player profile diff --git a/TypeScript/15HttpListenerExample/types/services/RagfairLinkedItemService.d.ts b/TypeScript/15HttpListenerExample/types/services/RagfairLinkedItemService.d.ts index 6011c1a..0d03459 100644 --- a/TypeScript/15HttpListenerExample/types/services/RagfairLinkedItemService.d.ts +++ b/TypeScript/15HttpListenerExample/types/services/RagfairLinkedItemService.d.ts @@ -1,11 +1,11 @@ import { ItemHelper } from "@spt/helpers/ItemHelper"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; export declare class RagfairLinkedItemService { - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected linkedItemsCache: Record>; - constructor(databaseServer: DatabaseServer, itemHelper: ItemHelper); + constructor(databaseService: DatabaseService, itemHelper: ItemHelper); getLinkedItems(linkedSearchId: string): Set; /** * Use ragfair linked item service to get an array of items that can fit on or in designated itemtpl diff --git a/TypeScript/15HttpListenerExample/types/services/RagfairOfferService.d.ts b/TypeScript/15HttpListenerExample/types/services/RagfairOfferService.d.ts index c044f6d..4bc07c3 100644 --- a/TypeScript/15HttpListenerExample/types/services/RagfairOfferService.d.ts +++ b/TypeScript/15HttpListenerExample/types/services/RagfairOfferService.d.ts @@ -6,8 +6,8 @@ import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RagfairOfferHolder } from "@spt/utils/RagfairOfferHolder"; @@ -15,7 +15,7 @@ import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class RagfairOfferService { protected logger: ILogger; protected timeUtil: TimeUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected saveServer: SaveServer; protected ragfairServerHelper: RagfairServerHelper; protected profileHelper: ProfileHelper; @@ -28,7 +28,7 @@ export declare class RagfairOfferService { protected expiredOffers: Record; protected ragfairConfig: IRagfairConfig; protected ragfairOfferHandler: RagfairOfferHolder; - constructor(logger: ILogger, timeUtil: TimeUtil, databaseServer: DatabaseServer, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, eventOutputHolder: EventOutputHolder, httpResponse: HttpResponseUtil, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, timeUtil: TimeUtil, databaseService: DatabaseService, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, eventOutputHolder: EventOutputHolder, httpResponse: HttpResponseUtil, localisationService: LocalisationService, configServer: ConfigServer); /** * Get all offers * @returns IRagfairOffer array diff --git a/TypeScript/15HttpListenerExample/types/services/RagfairPriceService.d.ts b/TypeScript/15HttpListenerExample/types/services/RagfairPriceService.d.ts index 5b8fa56..0a2f26e 100644 --- a/TypeScript/15HttpListenerExample/types/services/RagfairPriceService.d.ts +++ b/TypeScript/15HttpListenerExample/types/services/RagfairPriceService.d.ts @@ -12,7 +12,7 @@ import { IRagfairConfig, IUnreasonableModPrices } from "@spt/models/spt/config/I import { IRagfairServerPrices } from "@spt/models/spt/ragfair/IRagfairServerPrices"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RandomUtil } from "@spt/utils/RandomUtil"; /** @@ -20,7 +20,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; */ export declare class RagfairPriceService implements OnLoad { protected handbookHelper: HandbookHelper; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected logger: ILogger; protected itemHelper: ItemHelper; protected presetHelper: PresetHelper; @@ -30,7 +30,7 @@ export declare class RagfairPriceService implements OnLoad { protected configServer: ConfigServer; protected ragfairConfig: IRagfairConfig; protected prices: IRagfairServerPrices; - constructor(handbookHelper: HandbookHelper, databaseServer: DatabaseServer, logger: ILogger, itemHelper: ItemHelper, presetHelper: PresetHelper, traderHelper: TraderHelper, randomUtil: RandomUtil, localisationService: LocalisationService, configServer: ConfigServer); + constructor(handbookHelper: HandbookHelper, databaseService: DatabaseService, logger: ILogger, itemHelper: ItemHelper, presetHelper: PresetHelper, traderHelper: TraderHelper, randomUtil: RandomUtil, localisationService: LocalisationService, configServer: ConfigServer); /** * Generate static (handbook) and dynamic (prices.json) flea prices, store inside class as dictionaries */ diff --git a/TypeScript/15HttpListenerExample/types/services/RagfairTaxService.d.ts b/TypeScript/15HttpListenerExample/types/services/RagfairTaxService.d.ts index 4e4e648..effb9f0 100644 --- a/TypeScript/15HttpListenerExample/types/services/RagfairTaxService.d.ts +++ b/TypeScript/15HttpListenerExample/types/services/RagfairTaxService.d.ts @@ -4,15 +4,15 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { IStorePlayerOfferTaxAmountRequestData } from "@spt/models/eft/ragfair/IStorePlayerOfferTaxAmountRequestData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; export declare class RagfairTaxService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected ragfairPriceService: RagfairPriceService; protected itemHelper: ItemHelper; protected playerOfferTaxCache: Record; - constructor(logger: ILogger, databaseServer: DatabaseServer, ragfairPriceService: RagfairPriceService, itemHelper: ItemHelper); + constructor(logger: ILogger, databaseService: DatabaseService, ragfairPriceService: RagfairPriceService, itemHelper: ItemHelper); storeClientOfferTaxValue(sessionId: string, offer: IStorePlayerOfferTaxAmountRequestData): void; clearStoredOfferTaxById(offerIdToRemove: string): void; getStoredClientOfferTaxValueById(offerIdToGet: string): IStorePlayerOfferTaxAmountRequestData; diff --git a/TypeScript/15HttpListenerExample/types/services/RaidTimeAdjustmentService.d.ts b/TypeScript/15HttpListenerExample/types/services/RaidTimeAdjustmentService.d.ts index f770b64..bfc099a 100644 --- a/TypeScript/15HttpListenerExample/types/services/RaidTimeAdjustmentService.d.ts +++ b/TypeScript/15HttpListenerExample/types/services/RaidTimeAdjustmentService.d.ts @@ -7,17 +7,17 @@ import { ILocationConfig, IScavRaidTimeLocationSettings, LootMultiplier } from " import { IRaidChanges } from "@spt/models/spt/location/IRaidChanges"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RaidTimeAdjustmentService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected randomUtil: RandomUtil; protected weightedRandomHelper: WeightedRandomHelper; protected applicationContext: ApplicationContext; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, applicationContext: ApplicationContext, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, applicationContext: ApplicationContext, configServer: ConfigServer); /** * Make alterations to the base map data passed in * Loot multipliers/waves/wave start times diff --git a/TypeScript/15HttpListenerExample/types/services/RepairService.d.ts b/TypeScript/15HttpListenerExample/types/services/RepairService.d.ts index 9203417..48f306e 100644 --- a/TypeScript/15HttpListenerExample/types/services/RepairService.d.ts +++ b/TypeScript/15HttpListenerExample/types/services/RepairService.d.ts @@ -14,13 +14,13 @@ import { SkillTypes } from "@spt/models/enums/SkillTypes"; import { BonusSettings, IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RepairService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected randomUtil: RandomUtil; protected itemHelper: ItemHelper; @@ -31,7 +31,7 @@ export declare class RepairService { protected localisationService: LocalisationService; protected configServer: ConfigServer; protected repairConfig: IRepairConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, profileHelper: ProfileHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, traderHelper: TraderHelper, weightedRandomHelper: WeightedRandomHelper, paymentService: PaymentService, repairHelper: RepairHelper, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, profileHelper: ProfileHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, traderHelper: TraderHelper, weightedRandomHelper: WeightedRandomHelper, paymentService: PaymentService, repairHelper: RepairHelper, localisationService: LocalisationService, configServer: ConfigServer); /** * Use trader to repair an items durability * @param sessionID Session id diff --git a/TypeScript/15HttpListenerExample/types/services/TraderServicesService.d.ts b/TypeScript/15HttpListenerExample/types/services/TraderServicesService.d.ts index 111c71a..e441eb6 100644 --- a/TypeScript/15HttpListenerExample/types/services/TraderServicesService.d.ts +++ b/TypeScript/15HttpListenerExample/types/services/TraderServicesService.d.ts @@ -1,13 +1,13 @@ import { ProfileHelper } from "@spt/helpers/ProfileHelper"; import { ITraderServiceModel } from "@spt/models/spt/services/ITraderServiceModel"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderServicesService { protected profileHelper: ProfileHelper; protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected cloner: ICloner; - constructor(profileHelper: ProfileHelper, logger: ILogger, databaseServer: DatabaseServer, cloner: ICloner); + constructor(profileHelper: ProfileHelper, logger: ILogger, databaseService: DatabaseService, cloner: ICloner); getTraderServices(sessionId: string, traderId: string): ITraderServiceModel[]; } diff --git a/TypeScript/15HttpListenerExample/types/services/mod/CustomItemService.d.ts b/TypeScript/15HttpListenerExample/types/services/mod/CustomItemService.d.ts index 6dc4730..1926bed 100644 --- a/TypeScript/15HttpListenerExample/types/services/mod/CustomItemService.d.ts +++ b/TypeScript/15HttpListenerExample/types/services/mod/CustomItemService.d.ts @@ -9,11 +9,11 @@ import { HashUtil } from "@spt/utils/HashUtil"; export declare class CustomItemService { protected logger: ILogger; protected hashUtil: HashUtil; - protected databaseServer: DatabaseService; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected itemBaseClassService: ItemBaseClassService; protected cloner: ICloner; - constructor(logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseService, itemHelper: ItemHelper, itemBaseClassService: ItemBaseClassService, cloner: ICloner); + constructor(logger: ILogger, hashUtil: HashUtil, databaseService: DatabaseService, itemHelper: ItemHelper, itemBaseClassService: ItemBaseClassService, cloner: ICloner); /** * Create a new item from a cloned item base * WARNING - If no item id is supplied, an id will be generated, this id will be random every time you add an item and will not be the same on each subsequent server start diff --git a/TypeScript/16ImporterUtil/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts b/TypeScript/16ImporterUtil/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts index a7491b5..c51bf7e 100644 --- a/TypeScript/16ImporterUtil/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts +++ b/TypeScript/16ImporterUtil/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts @@ -6,7 +6,7 @@ import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { ISendMessageRequest } from "@spt/models/eft/dialog/ISendMessageRequest"; import { IUserDialogInfo } from "@spt/models/eft/profile/ISptProfile"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -19,7 +19,7 @@ export declare class GiveSptCommand implements ISptCommand { protected presetHelper: PresetHelper; protected mailSendService: MailSendService; protected localeService: LocaleService; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemFilterService: ItemFilterService; protected cloner: ICloner; /** @@ -34,7 +34,7 @@ export declare class GiveSptCommand implements ISptCommand { private static acceptableConfidence; private static excludedPresetItems; protected savedCommand: Map; - constructor(logger: ILogger, itemHelper: ItemHelper, hashUtil: HashUtil, presetHelper: PresetHelper, mailSendService: MailSendService, localeService: LocaleService, databaseServer: DatabaseServer, itemFilterService: ItemFilterService, cloner: ICloner); + constructor(logger: ILogger, itemHelper: ItemHelper, hashUtil: HashUtil, presetHelper: PresetHelper, mailSendService: MailSendService, localeService: LocaleService, databaseService: DatabaseService, itemFilterService: ItemFilterService, cloner: ICloner); getCommand(): string; getCommandHelp(): string; performAction(commandHandler: IUserDialogInfo, sessionId: string, request: ISendMessageRequest): string; diff --git a/TypeScript/16ImporterUtil/types/helpers/PresetHelper.d.ts b/TypeScript/16ImporterUtil/types/helpers/PresetHelper.d.ts index 5fc8a7c..e71e5b7 100644 --- a/TypeScript/16ImporterUtil/types/helpers/PresetHelper.d.ts +++ b/TypeScript/16ImporterUtil/types/helpers/PresetHelper.d.ts @@ -1,16 +1,16 @@ import { IPreset } from "@spt/models/eft/common/IGlobals"; import { BaseClasses } from "@spt/models/enums/BaseClasses"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; import { ItemHelper } from "./ItemHelper"; export declare class PresetHelper { - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected cloner: ICloner; protected lookup: Record; protected defaultEquipmentPresets: Record; protected defaultWeaponPresets: Record; - constructor(databaseServer: DatabaseServer, itemHelper: ItemHelper, cloner: ICloner); + constructor(databaseService: DatabaseService, itemHelper: ItemHelper, cloner: ICloner); hydratePresetStore(input: Record): void; /** * Get default weapon and equipment presets diff --git a/TypeScript/16ImporterUtil/types/helpers/ProfileHelper.d.ts b/TypeScript/16ImporterUtil/types/helpers/ProfileHelper.d.ts index 37937ff..e943bd3 100644 --- a/TypeScript/16ImporterUtil/types/helpers/ProfileHelper.d.ts +++ b/TypeScript/16ImporterUtil/types/helpers/ProfileHelper.d.ts @@ -7,8 +7,8 @@ import { SkillTypes } from "@spt/models/enums/SkillTypes"; import { IInventoryConfig } from "@spt/models/spt/config/IInventoryConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileSnapshotService } from "@spt/services/ProfileSnapshotService"; import { ICloner } from "@spt/utils/cloners/ICloner"; @@ -21,14 +21,14 @@ export declare class ProfileHelper { protected watermark: Watermark; protected timeUtil: TimeUtil; protected saveServer: SaveServer; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected profileSnapshotService: ProfileSnapshotService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected cloner: ICloner; protected inventoryConfig: IInventoryConfig; - constructor(logger: ILogger, hashUtil: HashUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileSnapshotService: ProfileSnapshotService, localisationService: LocalisationService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, hashUtil: HashUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseService: DatabaseService, itemHelper: ItemHelper, profileSnapshotService: ProfileSnapshotService, localisationService: LocalisationService, configServer: ConfigServer, cloner: ICloner); /** * Remove/reset a completed quest condtion from players profile quest data * @param sessionID Session id diff --git a/TypeScript/16ImporterUtil/types/helpers/QuestHelper.d.ts b/TypeScript/16ImporterUtil/types/helpers/QuestHelper.d.ts index 39ba2a9..93368fa 100644 --- a/TypeScript/16ImporterUtil/types/helpers/QuestHelper.d.ts +++ b/TypeScript/16ImporterUtil/types/helpers/QuestHelper.d.ts @@ -18,7 +18,7 @@ import { IQuestConfig } from "@spt/models/spt/config/IQuestConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -30,9 +30,9 @@ export declare class QuestHelper { protected timeUtil: TimeUtil; protected hashUtil: HashUtil; protected itemHelper: ItemHelper; + protected databaseService: DatabaseService; protected questConditionHelper: QuestConditionHelper; protected eventOutputHolder: EventOutputHolder; - protected databaseServer: DatabaseServer; protected localeService: LocaleService; protected ragfairServerHelper: RagfairServerHelper; protected dialogueHelper: DialogueHelper; @@ -45,7 +45,7 @@ export declare class QuestHelper { protected configServer: ConfigServer; protected cloner: ICloner; protected questConfig: IQuestConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, questConditionHelper: QuestConditionHelper, eventOutputHolder: EventOutputHolder, databaseServer: DatabaseServer, localeService: LocaleService, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, localisationService: LocalisationService, traderHelper: TraderHelper, presetHelper: PresetHelper, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, databaseService: DatabaseService, questConditionHelper: QuestConditionHelper, eventOutputHolder: EventOutputHolder, localeService: LocaleService, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, localisationService: LocalisationService, traderHelper: TraderHelper, presetHelper: PresetHelper, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); /** * Get status of a quest in player profile by its id * @param pmcData Profile to search diff --git a/TypeScript/16ImporterUtil/types/helpers/RagfairOfferHelper.d.ts b/TypeScript/16ImporterUtil/types/helpers/RagfairOfferHelper.d.ts index 27bb081..a08e60a 100644 --- a/TypeScript/16ImporterUtil/types/helpers/RagfairOfferHelper.d.ts +++ b/TypeScript/16ImporterUtil/types/helpers/RagfairOfferHelper.d.ts @@ -19,8 +19,8 @@ import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -34,7 +34,7 @@ export declare class RagfairOfferHelper { protected timeUtil: TimeUtil; protected hashUtil: HashUtil; protected eventOutputHolder: EventOutputHolder; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected traderHelper: TraderHelper; protected saveServer: SaveServer; protected itemHelper: ItemHelper; @@ -55,7 +55,7 @@ export declare class RagfairOfferHelper { protected static goodSoldTemplate: string; protected ragfairConfig: IRagfairConfig; protected questConfig: IQuestConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, eventOutputHolder: EventOutputHolder, databaseServer: DatabaseServer, traderHelper: TraderHelper, saveServer: SaveServer, itemHelper: ItemHelper, botHelper: BotHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, localeService: LocaleService, localisationService: LocalisationService, mailSendService: MailSendService, configServer: ConfigServer); + constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, eventOutputHolder: EventOutputHolder, databaseService: DatabaseService, traderHelper: TraderHelper, saveServer: SaveServer, itemHelper: ItemHelper, botHelper: BotHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, localeService: LocaleService, localisationService: LocalisationService, mailSendService: MailSendService, configServer: ConfigServer); /** * Passthrough to ragfairOfferService.getOffers(), get flea offers a player should see * @param searchRequest Data from client diff --git a/TypeScript/16ImporterUtil/types/helpers/RepairHelper.d.ts b/TypeScript/16ImporterUtil/types/helpers/RepairHelper.d.ts index 4bd0577..99a21da 100644 --- a/TypeScript/16ImporterUtil/types/helpers/RepairHelper.d.ts +++ b/TypeScript/16ImporterUtil/types/helpers/RepairHelper.d.ts @@ -3,17 +3,17 @@ import { ITemplateItem, Props } from "@spt/models/eft/common/tables/ITemplateIte import { IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RepairHelper { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected configServer: ConfigServer; protected cloner: ICloner; protected repairConfig: IRepairConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, configServer: ConfigServer, cloner: ICloner); /** * Alter an items durability after a repair by trader/repair kit * @param itemToRepair item to update durability details diff --git a/TypeScript/16ImporterUtil/types/helpers/TraderAssortHelper.d.ts b/TypeScript/16ImporterUtil/types/helpers/TraderAssortHelper.d.ts index faf2a9d..8f8f802 100644 --- a/TypeScript/16ImporterUtil/types/helpers/TraderAssortHelper.d.ts +++ b/TypeScript/16ImporterUtil/types/helpers/TraderAssortHelper.d.ts @@ -9,7 +9,7 @@ import { ITrader, ITraderAssort } from "@spt/models/eft/common/tables/ITrader"; import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; @@ -21,7 +21,7 @@ export declare class TraderAssortHelper { protected logger: ILogger; protected mathUtil: MathUtil; protected timeUtil: TimeUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected assortHelper: AssortHelper; protected paymentHelper: PaymentHelper; @@ -37,7 +37,7 @@ export declare class TraderAssortHelper { protected traderConfig: ITraderConfig; protected mergedQuestAssorts: Record>; protected createdMergedQuestAssorts: boolean; - constructor(logger: ILogger, mathUtil: MathUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, profileHelper: ProfileHelper, assortHelper: AssortHelper, paymentHelper: PaymentHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, localisationService: LocalisationService, traderPurchasePersisterService: TraderPurchasePersisterService, traderHelper: TraderHelper, fenceService: FenceService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, mathUtil: MathUtil, timeUtil: TimeUtil, databaseService: DatabaseService, profileHelper: ProfileHelper, assortHelper: AssortHelper, paymentHelper: PaymentHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, localisationService: LocalisationService, traderPurchasePersisterService: TraderPurchasePersisterService, traderHelper: TraderHelper, fenceService: FenceService, configServer: ConfigServer, cloner: ICloner); /** * Get a traders assorts * Can be used for returning ragfair / fence assorts diff --git a/TypeScript/16ImporterUtil/types/helpers/TraderHelper.d.ts b/TypeScript/16ImporterUtil/types/helpers/TraderHelper.d.ts index 5f515da..eec1cc7 100644 --- a/TypeScript/16ImporterUtil/types/helpers/TraderHelper.d.ts +++ b/TypeScript/16ImporterUtil/types/helpers/TraderHelper.d.ts @@ -10,7 +10,7 @@ import { Traders } from "@spt/models/enums/Traders"; import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; @@ -18,7 +18,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class TraderHelper { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected handbookHelper: HandbookHelper; protected itemHelper: ItemHelper; @@ -33,7 +33,7 @@ export declare class TraderHelper { protected highestTraderPriceItems?: Record; /** Dictionary of item tpl and the highest trader buy back rouble price */ protected highestTraderBuyPriceItems?: Record; - constructor(logger: ILogger, databaseServer: DatabaseServer, profileHelper: ProfileHelper, handbookHelper: HandbookHelper, itemHelper: ItemHelper, playerService: PlayerService, localisationService: LocalisationService, fenceService: FenceService, timeUtil: TimeUtil, randomUtil: RandomUtil, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, profileHelper: ProfileHelper, handbookHelper: HandbookHelper, itemHelper: ItemHelper, playerService: PlayerService, localisationService: LocalisationService, fenceService: FenceService, timeUtil: TimeUtil, randomUtil: RandomUtil, configServer: ConfigServer); /** * Get a trader base object, update profile to reflect players current standing in profile * when trader not found in profile diff --git a/TypeScript/16ImporterUtil/types/models/eft/common/IGlobals.d.ts b/TypeScript/16ImporterUtil/types/models/eft/common/IGlobals.d.ts index 2209415..a0bb051 100644 --- a/TypeScript/16ImporterUtil/types/models/eft/common/IGlobals.d.ts +++ b/TypeScript/16ImporterUtil/types/models/eft/common/IGlobals.d.ts @@ -802,7 +802,6 @@ export interface IMaxActiveOfferCount { from: number; to: number; count: number; - countForSpecialEditions: number; } export interface IMaxSumForRarity { Common: IRarityMaxSum; diff --git a/TypeScript/16ImporterUtil/types/models/eft/common/ILocationBase.d.ts b/TypeScript/16ImporterUtil/types/models/eft/common/ILocationBase.d.ts index 65931f8..10f1a57 100644 --- a/TypeScript/16ImporterUtil/types/models/eft/common/ILocationBase.d.ts +++ b/TypeScript/16ImporterUtil/types/models/eft/common/ILocationBase.d.ts @@ -196,18 +196,24 @@ export interface Props { export interface Exit { /** % Chance out of 100 exit will appear in raid */ Chance: number; + ChancePVE: number; Count: number; + CountPVE: number; EntryPoints: string; EventAvailable: boolean; ExfiltrationTime: number; + ExfiltrationTimePVE: number; ExfiltrationType: string; RequiredSlot?: string; Id: string; MaxTime: number; + MaxTimePVE: number; MinTime: number; + MinTimePVE: number; Name: string; PassageRequirement: string; PlayersCount: number; + PlayersCountPVE: number; RequirementTip: string; Side?: string; } diff --git a/TypeScript/16ImporterUtil/types/models/eft/common/tables/IRepeatableQuests.d.ts b/TypeScript/16ImporterUtil/types/models/eft/common/tables/IRepeatableQuests.d.ts index 854c8ef..27ff49d 100644 --- a/TypeScript/16ImporterUtil/types/models/eft/common/tables/IRepeatableQuests.d.ts +++ b/TypeScript/16ImporterUtil/types/models/eft/common/tables/IRepeatableQuests.d.ts @@ -18,10 +18,13 @@ export interface IRepeatableTemplates { export interface IPmcDataRepeatableQuest { id?: string; name: string; + unavailableTime?: string; activeQuests: IRepeatableQuest[]; inactiveQuests: IRepeatableQuest[]; endTime: number; changeRequirement: Record; + freeChanges: number; + freeChangesAvailable: number; } export interface IChangeRequirement { changeCost: IChangeCost[]; diff --git a/TypeScript/16ImporterUtil/types/models/eft/common/tables/ITemplateItem.d.ts b/TypeScript/16ImporterUtil/types/models/eft/common/tables/ITemplateItem.d.ts index a8ccfbb..e5c6632 100644 --- a/TypeScript/16ImporterUtil/types/models/eft/common/tables/ITemplateItem.d.ts +++ b/TypeScript/16ImporterUtil/types/models/eft/common/tables/ITemplateItem.d.ts @@ -63,7 +63,7 @@ export interface Props { DiscardingBlock?: boolean; DropSoundType?: string; RagFairCommissionModifier?: number; - RarityPvE: string; + RarityPvE?: string; IsAlwaysAvailableForInsurance?: boolean; DiscardLimit?: number; MaxResource?: number; @@ -414,6 +414,12 @@ export interface Props { LayoutName?: string; Lower75Prefab?: Prefab; MaxUsages?: number; + ScavKillExpPenalty?: number; + ScavKillExpPenaltyPVE?: number; + ScavKillStandingPenalty?: number; + ScavKillStandingPenaltyPVE?: number; + TradersDiscount?: number; + TradersDiscountPVE?: number; } export interface IHealthEffect { type: string; diff --git a/TypeScript/16ImporterUtil/types/models/spt/config/IQuestConfig.d.ts b/TypeScript/16ImporterUtil/types/models/spt/config/IQuestConfig.d.ts index 362602c..2cdf4fa 100644 --- a/TypeScript/16ImporterUtil/types/models/spt/config/IQuestConfig.d.ts +++ b/TypeScript/16ImporterUtil/types/models/spt/config/IQuestConfig.d.ts @@ -47,6 +47,8 @@ export interface IRepeatableQuestConfig { /** Item tplIds to ignore when generating rewards */ rewardBlacklist: string[]; rewardAmmoStackMinSize: number; + freeChangesAvailable: number; + freeChanges: number; } export interface IRewardScaling { levels: number[]; diff --git a/TypeScript/16ImporterUtil/types/services/BotEquipmentModPoolService.d.ts b/TypeScript/16ImporterUtil/types/services/BotEquipmentModPoolService.d.ts index c53f31b..7b2b442 100644 --- a/TypeScript/16ImporterUtil/types/services/BotEquipmentModPoolService.d.ts +++ b/TypeScript/16ImporterUtil/types/services/BotEquipmentModPoolService.d.ts @@ -4,7 +4,7 @@ import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { VFS } from "@spt/utils/VFS"; /** Store a mapping between weapons, their slots and the items that fit those slots */ @@ -12,7 +12,7 @@ export declare class BotEquipmentModPoolService { protected logger: ILogger; protected vfs: VFS; protected itemHelper: ItemHelper; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected botConfig: IBotConfig; @@ -20,7 +20,7 @@ export declare class BotEquipmentModPoolService { protected gearModPool: Mods; protected weaponPoolGenerated: boolean; protected armorPoolGenerated: boolean; - constructor(logger: ILogger, vfs: VFS, itemHelper: ItemHelper, databaseServer: DatabaseServer, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, vfs: VFS, itemHelper: ItemHelper, databaseService: DatabaseService, localisationService: LocalisationService, configServer: ConfigServer); /** * Store dictionary of mods for each item passed in * @param items items to find related mods and store in modPool diff --git a/TypeScript/16ImporterUtil/types/services/CustomLocationWaveService.d.ts b/TypeScript/16ImporterUtil/types/services/CustomLocationWaveService.d.ts index 728a1e8..c72d5bb 100644 --- a/TypeScript/16ImporterUtil/types/services/CustomLocationWaveService.d.ts +++ b/TypeScript/16ImporterUtil/types/services/CustomLocationWaveService.d.ts @@ -2,15 +2,15 @@ import { BossLocationSpawn, Wave } from "@spt/models/eft/common/ILocationBase"; import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class CustomLocationWaveService { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, configServer: ConfigServer); /** * Add a boss wave to a map * @param locationId e.g. factory4_day, bigmap diff --git a/TypeScript/16ImporterUtil/types/services/InsuranceService.d.ts b/TypeScript/16ImporterUtil/types/services/InsuranceService.d.ts index c54f9f9..0000e66 100644 --- a/TypeScript/16ImporterUtil/types/services/InsuranceService.d.ts +++ b/TypeScript/16ImporterUtil/types/services/InsuranceService.d.ts @@ -13,8 +13,8 @@ import { ILostOnDeathConfig } from "@spt/models/spt/config/ILostOnDeathConfig"; import { IInsuranceEquipmentPkg } from "@spt/models/spt/services/IInsuranceEquipmentPkg"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -24,7 +24,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class InsuranceService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected secureContainerHelper: SecureContainerHelper; protected randomUtil: RandomUtil; protected itemHelper: ItemHelper; @@ -42,7 +42,7 @@ export declare class InsuranceService { protected insured: Record>; protected insuranceConfig: IInsuranceConfig; protected lostOnDeathConfig: ILostOnDeathConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, handbookHelper: HandbookHelper, localisationService: LocalisationService, localeService: LocaleService, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, databaseService: DatabaseService, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, handbookHelper: HandbookHelper, localisationService: LocalisationService, localeService: LocaleService, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); /** * Does player have insurance array * @param sessionId Player id diff --git a/TypeScript/16ImporterUtil/types/services/MailSendService.d.ts b/TypeScript/16ImporterUtil/types/services/MailSendService.d.ts index d445841..8f1f974 100644 --- a/TypeScript/16ImporterUtil/types/services/MailSendService.d.ts +++ b/TypeScript/16ImporterUtil/types/services/MailSendService.d.ts @@ -9,8 +9,8 @@ import { MessageType } from "@spt/models/enums/MessageType"; import { Traders } from "@spt/models/enums/Traders"; import { IProfileChangeEvent, ISendMessageDetails } from "@spt/models/spt/dialog/ISendMessageDetails"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; @@ -19,7 +19,7 @@ export declare class MailSendService { protected hashUtil: HashUtil; protected timeUtil: TimeUtil; protected saveServer: SaveServer; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected notifierHelper: NotifierHelper; protected dialogueHelper: DialogueHelper; protected notificationSendHelper: NotificationSendHelper; @@ -27,7 +27,7 @@ export declare class MailSendService { protected itemHelper: ItemHelper; protected traderHelper: TraderHelper; protected readonly systemSenderId = "59e7125688a45068a6249071"; - constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, dialogueHelper: DialogueHelper, notificationSendHelper: NotificationSendHelper, localisationService: LocalisationService, itemHelper: ItemHelper, traderHelper: TraderHelper); + constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseService: DatabaseService, notifierHelper: NotifierHelper, dialogueHelper: DialogueHelper, notificationSendHelper: NotificationSendHelper, localisationService: LocalisationService, itemHelper: ItemHelper, traderHelper: TraderHelper); /** * Send a message from an NPC (e.g. prapor) to the player with or without items using direct message text, do not look up any locale * @param sessionId The session ID to send the message to diff --git a/TypeScript/16ImporterUtil/types/services/OpenZoneService.d.ts b/TypeScript/16ImporterUtil/types/services/OpenZoneService.d.ts index 1bc5f00..c7dd0bd 100644 --- a/TypeScript/16ImporterUtil/types/services/OpenZoneService.d.ts +++ b/TypeScript/16ImporterUtil/types/services/OpenZoneService.d.ts @@ -1,18 +1,18 @@ import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RandomUtil } from "@spt/utils/RandomUtil"; /** Service for adding new zones to a maps OpenZones property */ export declare class OpenZoneService { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, localisationService: LocalisationService, configServer: ConfigServer); /** * Add open zone to specified map * @param locationId map location (e.g. factory4_day) diff --git a/TypeScript/16ImporterUtil/types/services/PaymentService.d.ts b/TypeScript/16ImporterUtil/types/services/PaymentService.d.ts index 64ff2c1..61d5731 100644 --- a/TypeScript/16ImporterUtil/types/services/PaymentService.d.ts +++ b/TypeScript/16ImporterUtil/types/services/PaymentService.d.ts @@ -9,7 +9,7 @@ import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRo import { IProcessBuyTradeRequestData } from "@spt/models/eft/trade/IProcessBuyTradeRequestData"; import { IProcessSellTradeRequestData } from "@spt/models/eft/trade/IProcessSellTradeRequestData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; @@ -17,14 +17,14 @@ export declare class PaymentService { protected logger: ILogger; protected hashUtil: HashUtil; protected httpResponse: HttpResponseUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected handbookHelper: HandbookHelper; protected traderHelper: TraderHelper; protected itemHelper: ItemHelper; protected inventoryHelper: InventoryHelper; protected localisationService: LocalisationService; protected paymentHelper: PaymentHelper; - constructor(logger: ILogger, hashUtil: HashUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, localisationService: LocalisationService, paymentHelper: PaymentHelper); + constructor(logger: ILogger, hashUtil: HashUtil, httpResponse: HttpResponseUtil, databaseService: DatabaseService, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, localisationService: LocalisationService, paymentHelper: PaymentHelper); /** * Take money and insert items into return to server request * @param pmcData Pmc profile diff --git a/TypeScript/16ImporterUtil/types/services/PlayerService.d.ts b/TypeScript/16ImporterUtil/types/services/PlayerService.d.ts index ae57410..84c4c6f 100644 --- a/TypeScript/16ImporterUtil/types/services/PlayerService.d.ts +++ b/TypeScript/16ImporterUtil/types/services/PlayerService.d.ts @@ -1,14 +1,14 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class PlayerService { protected logger: ILogger; protected timeUtil: TimeUtil; protected localisationService: LocalisationService; - protected databaseServer: DatabaseServer; - constructor(logger: ILogger, timeUtil: TimeUtil, localisationService: LocalisationService, databaseServer: DatabaseServer); + protected databaseService: DatabaseService; + constructor(logger: ILogger, timeUtil: TimeUtil, localisationService: LocalisationService, databaseService: DatabaseService); /** * Get level of player * @param pmcData Player profile diff --git a/TypeScript/16ImporterUtil/types/services/RagfairLinkedItemService.d.ts b/TypeScript/16ImporterUtil/types/services/RagfairLinkedItemService.d.ts index 6011c1a..0d03459 100644 --- a/TypeScript/16ImporterUtil/types/services/RagfairLinkedItemService.d.ts +++ b/TypeScript/16ImporterUtil/types/services/RagfairLinkedItemService.d.ts @@ -1,11 +1,11 @@ import { ItemHelper } from "@spt/helpers/ItemHelper"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; export declare class RagfairLinkedItemService { - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected linkedItemsCache: Record>; - constructor(databaseServer: DatabaseServer, itemHelper: ItemHelper); + constructor(databaseService: DatabaseService, itemHelper: ItemHelper); getLinkedItems(linkedSearchId: string): Set; /** * Use ragfair linked item service to get an array of items that can fit on or in designated itemtpl diff --git a/TypeScript/16ImporterUtil/types/services/RagfairOfferService.d.ts b/TypeScript/16ImporterUtil/types/services/RagfairOfferService.d.ts index c044f6d..4bc07c3 100644 --- a/TypeScript/16ImporterUtil/types/services/RagfairOfferService.d.ts +++ b/TypeScript/16ImporterUtil/types/services/RagfairOfferService.d.ts @@ -6,8 +6,8 @@ import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RagfairOfferHolder } from "@spt/utils/RagfairOfferHolder"; @@ -15,7 +15,7 @@ import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class RagfairOfferService { protected logger: ILogger; protected timeUtil: TimeUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected saveServer: SaveServer; protected ragfairServerHelper: RagfairServerHelper; protected profileHelper: ProfileHelper; @@ -28,7 +28,7 @@ export declare class RagfairOfferService { protected expiredOffers: Record; protected ragfairConfig: IRagfairConfig; protected ragfairOfferHandler: RagfairOfferHolder; - constructor(logger: ILogger, timeUtil: TimeUtil, databaseServer: DatabaseServer, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, eventOutputHolder: EventOutputHolder, httpResponse: HttpResponseUtil, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, timeUtil: TimeUtil, databaseService: DatabaseService, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, eventOutputHolder: EventOutputHolder, httpResponse: HttpResponseUtil, localisationService: LocalisationService, configServer: ConfigServer); /** * Get all offers * @returns IRagfairOffer array diff --git a/TypeScript/16ImporterUtil/types/services/RagfairPriceService.d.ts b/TypeScript/16ImporterUtil/types/services/RagfairPriceService.d.ts index 5b8fa56..0a2f26e 100644 --- a/TypeScript/16ImporterUtil/types/services/RagfairPriceService.d.ts +++ b/TypeScript/16ImporterUtil/types/services/RagfairPriceService.d.ts @@ -12,7 +12,7 @@ import { IRagfairConfig, IUnreasonableModPrices } from "@spt/models/spt/config/I import { IRagfairServerPrices } from "@spt/models/spt/ragfair/IRagfairServerPrices"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RandomUtil } from "@spt/utils/RandomUtil"; /** @@ -20,7 +20,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; */ export declare class RagfairPriceService implements OnLoad { protected handbookHelper: HandbookHelper; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected logger: ILogger; protected itemHelper: ItemHelper; protected presetHelper: PresetHelper; @@ -30,7 +30,7 @@ export declare class RagfairPriceService implements OnLoad { protected configServer: ConfigServer; protected ragfairConfig: IRagfairConfig; protected prices: IRagfairServerPrices; - constructor(handbookHelper: HandbookHelper, databaseServer: DatabaseServer, logger: ILogger, itemHelper: ItemHelper, presetHelper: PresetHelper, traderHelper: TraderHelper, randomUtil: RandomUtil, localisationService: LocalisationService, configServer: ConfigServer); + constructor(handbookHelper: HandbookHelper, databaseService: DatabaseService, logger: ILogger, itemHelper: ItemHelper, presetHelper: PresetHelper, traderHelper: TraderHelper, randomUtil: RandomUtil, localisationService: LocalisationService, configServer: ConfigServer); /** * Generate static (handbook) and dynamic (prices.json) flea prices, store inside class as dictionaries */ diff --git a/TypeScript/16ImporterUtil/types/services/RagfairTaxService.d.ts b/TypeScript/16ImporterUtil/types/services/RagfairTaxService.d.ts index 4e4e648..effb9f0 100644 --- a/TypeScript/16ImporterUtil/types/services/RagfairTaxService.d.ts +++ b/TypeScript/16ImporterUtil/types/services/RagfairTaxService.d.ts @@ -4,15 +4,15 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { IStorePlayerOfferTaxAmountRequestData } from "@spt/models/eft/ragfair/IStorePlayerOfferTaxAmountRequestData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; export declare class RagfairTaxService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected ragfairPriceService: RagfairPriceService; protected itemHelper: ItemHelper; protected playerOfferTaxCache: Record; - constructor(logger: ILogger, databaseServer: DatabaseServer, ragfairPriceService: RagfairPriceService, itemHelper: ItemHelper); + constructor(logger: ILogger, databaseService: DatabaseService, ragfairPriceService: RagfairPriceService, itemHelper: ItemHelper); storeClientOfferTaxValue(sessionId: string, offer: IStorePlayerOfferTaxAmountRequestData): void; clearStoredOfferTaxById(offerIdToRemove: string): void; getStoredClientOfferTaxValueById(offerIdToGet: string): IStorePlayerOfferTaxAmountRequestData; diff --git a/TypeScript/16ImporterUtil/types/services/RaidTimeAdjustmentService.d.ts b/TypeScript/16ImporterUtil/types/services/RaidTimeAdjustmentService.d.ts index f770b64..bfc099a 100644 --- a/TypeScript/16ImporterUtil/types/services/RaidTimeAdjustmentService.d.ts +++ b/TypeScript/16ImporterUtil/types/services/RaidTimeAdjustmentService.d.ts @@ -7,17 +7,17 @@ import { ILocationConfig, IScavRaidTimeLocationSettings, LootMultiplier } from " import { IRaidChanges } from "@spt/models/spt/location/IRaidChanges"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RaidTimeAdjustmentService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected randomUtil: RandomUtil; protected weightedRandomHelper: WeightedRandomHelper; protected applicationContext: ApplicationContext; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, applicationContext: ApplicationContext, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, applicationContext: ApplicationContext, configServer: ConfigServer); /** * Make alterations to the base map data passed in * Loot multipliers/waves/wave start times diff --git a/TypeScript/16ImporterUtil/types/services/RepairService.d.ts b/TypeScript/16ImporterUtil/types/services/RepairService.d.ts index 9203417..48f306e 100644 --- a/TypeScript/16ImporterUtil/types/services/RepairService.d.ts +++ b/TypeScript/16ImporterUtil/types/services/RepairService.d.ts @@ -14,13 +14,13 @@ import { SkillTypes } from "@spt/models/enums/SkillTypes"; import { BonusSettings, IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RepairService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected randomUtil: RandomUtil; protected itemHelper: ItemHelper; @@ -31,7 +31,7 @@ export declare class RepairService { protected localisationService: LocalisationService; protected configServer: ConfigServer; protected repairConfig: IRepairConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, profileHelper: ProfileHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, traderHelper: TraderHelper, weightedRandomHelper: WeightedRandomHelper, paymentService: PaymentService, repairHelper: RepairHelper, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, profileHelper: ProfileHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, traderHelper: TraderHelper, weightedRandomHelper: WeightedRandomHelper, paymentService: PaymentService, repairHelper: RepairHelper, localisationService: LocalisationService, configServer: ConfigServer); /** * Use trader to repair an items durability * @param sessionID Session id diff --git a/TypeScript/16ImporterUtil/types/services/TraderServicesService.d.ts b/TypeScript/16ImporterUtil/types/services/TraderServicesService.d.ts index 111c71a..e441eb6 100644 --- a/TypeScript/16ImporterUtil/types/services/TraderServicesService.d.ts +++ b/TypeScript/16ImporterUtil/types/services/TraderServicesService.d.ts @@ -1,13 +1,13 @@ import { ProfileHelper } from "@spt/helpers/ProfileHelper"; import { ITraderServiceModel } from "@spt/models/spt/services/ITraderServiceModel"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderServicesService { protected profileHelper: ProfileHelper; protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected cloner: ICloner; - constructor(profileHelper: ProfileHelper, logger: ILogger, databaseServer: DatabaseServer, cloner: ICloner); + constructor(profileHelper: ProfileHelper, logger: ILogger, databaseService: DatabaseService, cloner: ICloner); getTraderServices(sessionId: string, traderId: string): ITraderServiceModel[]; } diff --git a/TypeScript/16ImporterUtil/types/services/mod/CustomItemService.d.ts b/TypeScript/16ImporterUtil/types/services/mod/CustomItemService.d.ts index 6dc4730..1926bed 100644 --- a/TypeScript/16ImporterUtil/types/services/mod/CustomItemService.d.ts +++ b/TypeScript/16ImporterUtil/types/services/mod/CustomItemService.d.ts @@ -9,11 +9,11 @@ import { HashUtil } from "@spt/utils/HashUtil"; export declare class CustomItemService { protected logger: ILogger; protected hashUtil: HashUtil; - protected databaseServer: DatabaseService; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected itemBaseClassService: ItemBaseClassService; protected cloner: ICloner; - constructor(logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseService, itemHelper: ItemHelper, itemBaseClassService: ItemBaseClassService, cloner: ICloner); + constructor(logger: ILogger, hashUtil: HashUtil, databaseService: DatabaseService, itemHelper: ItemHelper, itemBaseClassService: ItemBaseClassService, cloner: ICloner); /** * Create a new item from a cloned item base * WARNING - If no item id is supplied, an id will be generated, this id will be random every time you add an item and will not be the same on each subsequent server start diff --git a/TypeScript/17AsyncImporterWithDependency1/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts index a7491b5..c51bf7e 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts @@ -6,7 +6,7 @@ import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { ISendMessageRequest } from "@spt/models/eft/dialog/ISendMessageRequest"; import { IUserDialogInfo } from "@spt/models/eft/profile/ISptProfile"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -19,7 +19,7 @@ export declare class GiveSptCommand implements ISptCommand { protected presetHelper: PresetHelper; protected mailSendService: MailSendService; protected localeService: LocaleService; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemFilterService: ItemFilterService; protected cloner: ICloner; /** @@ -34,7 +34,7 @@ export declare class GiveSptCommand implements ISptCommand { private static acceptableConfidence; private static excludedPresetItems; protected savedCommand: Map; - constructor(logger: ILogger, itemHelper: ItemHelper, hashUtil: HashUtil, presetHelper: PresetHelper, mailSendService: MailSendService, localeService: LocaleService, databaseServer: DatabaseServer, itemFilterService: ItemFilterService, cloner: ICloner); + constructor(logger: ILogger, itemHelper: ItemHelper, hashUtil: HashUtil, presetHelper: PresetHelper, mailSendService: MailSendService, localeService: LocaleService, databaseService: DatabaseService, itemFilterService: ItemFilterService, cloner: ICloner); getCommand(): string; getCommandHelp(): string; performAction(commandHandler: IUserDialogInfo, sessionId: string, request: ISendMessageRequest): string; diff --git a/TypeScript/17AsyncImporterWithDependency1/types/helpers/PresetHelper.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/helpers/PresetHelper.d.ts index 5fc8a7c..e71e5b7 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/helpers/PresetHelper.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/helpers/PresetHelper.d.ts @@ -1,16 +1,16 @@ import { IPreset } from "@spt/models/eft/common/IGlobals"; import { BaseClasses } from "@spt/models/enums/BaseClasses"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; import { ItemHelper } from "./ItemHelper"; export declare class PresetHelper { - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected cloner: ICloner; protected lookup: Record; protected defaultEquipmentPresets: Record; protected defaultWeaponPresets: Record; - constructor(databaseServer: DatabaseServer, itemHelper: ItemHelper, cloner: ICloner); + constructor(databaseService: DatabaseService, itemHelper: ItemHelper, cloner: ICloner); hydratePresetStore(input: Record): void; /** * Get default weapon and equipment presets diff --git a/TypeScript/17AsyncImporterWithDependency1/types/helpers/ProfileHelper.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/helpers/ProfileHelper.d.ts index 37937ff..e943bd3 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/helpers/ProfileHelper.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/helpers/ProfileHelper.d.ts @@ -7,8 +7,8 @@ import { SkillTypes } from "@spt/models/enums/SkillTypes"; import { IInventoryConfig } from "@spt/models/spt/config/IInventoryConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileSnapshotService } from "@spt/services/ProfileSnapshotService"; import { ICloner } from "@spt/utils/cloners/ICloner"; @@ -21,14 +21,14 @@ export declare class ProfileHelper { protected watermark: Watermark; protected timeUtil: TimeUtil; protected saveServer: SaveServer; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected profileSnapshotService: ProfileSnapshotService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected cloner: ICloner; protected inventoryConfig: IInventoryConfig; - constructor(logger: ILogger, hashUtil: HashUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileSnapshotService: ProfileSnapshotService, localisationService: LocalisationService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, hashUtil: HashUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseService: DatabaseService, itemHelper: ItemHelper, profileSnapshotService: ProfileSnapshotService, localisationService: LocalisationService, configServer: ConfigServer, cloner: ICloner); /** * Remove/reset a completed quest condtion from players profile quest data * @param sessionID Session id diff --git a/TypeScript/17AsyncImporterWithDependency1/types/helpers/QuestHelper.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/helpers/QuestHelper.d.ts index 39ba2a9..93368fa 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/helpers/QuestHelper.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/helpers/QuestHelper.d.ts @@ -18,7 +18,7 @@ import { IQuestConfig } from "@spt/models/spt/config/IQuestConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -30,9 +30,9 @@ export declare class QuestHelper { protected timeUtil: TimeUtil; protected hashUtil: HashUtil; protected itemHelper: ItemHelper; + protected databaseService: DatabaseService; protected questConditionHelper: QuestConditionHelper; protected eventOutputHolder: EventOutputHolder; - protected databaseServer: DatabaseServer; protected localeService: LocaleService; protected ragfairServerHelper: RagfairServerHelper; protected dialogueHelper: DialogueHelper; @@ -45,7 +45,7 @@ export declare class QuestHelper { protected configServer: ConfigServer; protected cloner: ICloner; protected questConfig: IQuestConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, questConditionHelper: QuestConditionHelper, eventOutputHolder: EventOutputHolder, databaseServer: DatabaseServer, localeService: LocaleService, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, localisationService: LocalisationService, traderHelper: TraderHelper, presetHelper: PresetHelper, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, databaseService: DatabaseService, questConditionHelper: QuestConditionHelper, eventOutputHolder: EventOutputHolder, localeService: LocaleService, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, localisationService: LocalisationService, traderHelper: TraderHelper, presetHelper: PresetHelper, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); /** * Get status of a quest in player profile by its id * @param pmcData Profile to search diff --git a/TypeScript/17AsyncImporterWithDependency1/types/helpers/RagfairOfferHelper.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/helpers/RagfairOfferHelper.d.ts index 27bb081..a08e60a 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/helpers/RagfairOfferHelper.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/helpers/RagfairOfferHelper.d.ts @@ -19,8 +19,8 @@ import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -34,7 +34,7 @@ export declare class RagfairOfferHelper { protected timeUtil: TimeUtil; protected hashUtil: HashUtil; protected eventOutputHolder: EventOutputHolder; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected traderHelper: TraderHelper; protected saveServer: SaveServer; protected itemHelper: ItemHelper; @@ -55,7 +55,7 @@ export declare class RagfairOfferHelper { protected static goodSoldTemplate: string; protected ragfairConfig: IRagfairConfig; protected questConfig: IQuestConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, eventOutputHolder: EventOutputHolder, databaseServer: DatabaseServer, traderHelper: TraderHelper, saveServer: SaveServer, itemHelper: ItemHelper, botHelper: BotHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, localeService: LocaleService, localisationService: LocalisationService, mailSendService: MailSendService, configServer: ConfigServer); + constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, eventOutputHolder: EventOutputHolder, databaseService: DatabaseService, traderHelper: TraderHelper, saveServer: SaveServer, itemHelper: ItemHelper, botHelper: BotHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, localeService: LocaleService, localisationService: LocalisationService, mailSendService: MailSendService, configServer: ConfigServer); /** * Passthrough to ragfairOfferService.getOffers(), get flea offers a player should see * @param searchRequest Data from client diff --git a/TypeScript/17AsyncImporterWithDependency1/types/helpers/RepairHelper.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/helpers/RepairHelper.d.ts index 4bd0577..99a21da 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/helpers/RepairHelper.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/helpers/RepairHelper.d.ts @@ -3,17 +3,17 @@ import { ITemplateItem, Props } from "@spt/models/eft/common/tables/ITemplateIte import { IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RepairHelper { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected configServer: ConfigServer; protected cloner: ICloner; protected repairConfig: IRepairConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, configServer: ConfigServer, cloner: ICloner); /** * Alter an items durability after a repair by trader/repair kit * @param itemToRepair item to update durability details diff --git a/TypeScript/17AsyncImporterWithDependency1/types/helpers/TraderAssortHelper.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/helpers/TraderAssortHelper.d.ts index faf2a9d..8f8f802 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/helpers/TraderAssortHelper.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/helpers/TraderAssortHelper.d.ts @@ -9,7 +9,7 @@ import { ITrader, ITraderAssort } from "@spt/models/eft/common/tables/ITrader"; import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; @@ -21,7 +21,7 @@ export declare class TraderAssortHelper { protected logger: ILogger; protected mathUtil: MathUtil; protected timeUtil: TimeUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected assortHelper: AssortHelper; protected paymentHelper: PaymentHelper; @@ -37,7 +37,7 @@ export declare class TraderAssortHelper { protected traderConfig: ITraderConfig; protected mergedQuestAssorts: Record>; protected createdMergedQuestAssorts: boolean; - constructor(logger: ILogger, mathUtil: MathUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, profileHelper: ProfileHelper, assortHelper: AssortHelper, paymentHelper: PaymentHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, localisationService: LocalisationService, traderPurchasePersisterService: TraderPurchasePersisterService, traderHelper: TraderHelper, fenceService: FenceService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, mathUtil: MathUtil, timeUtil: TimeUtil, databaseService: DatabaseService, profileHelper: ProfileHelper, assortHelper: AssortHelper, paymentHelper: PaymentHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, localisationService: LocalisationService, traderPurchasePersisterService: TraderPurchasePersisterService, traderHelper: TraderHelper, fenceService: FenceService, configServer: ConfigServer, cloner: ICloner); /** * Get a traders assorts * Can be used for returning ragfair / fence assorts diff --git a/TypeScript/17AsyncImporterWithDependency1/types/helpers/TraderHelper.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/helpers/TraderHelper.d.ts index 5f515da..eec1cc7 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/helpers/TraderHelper.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/helpers/TraderHelper.d.ts @@ -10,7 +10,7 @@ import { Traders } from "@spt/models/enums/Traders"; import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; @@ -18,7 +18,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class TraderHelper { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected handbookHelper: HandbookHelper; protected itemHelper: ItemHelper; @@ -33,7 +33,7 @@ export declare class TraderHelper { protected highestTraderPriceItems?: Record; /** Dictionary of item tpl and the highest trader buy back rouble price */ protected highestTraderBuyPriceItems?: Record; - constructor(logger: ILogger, databaseServer: DatabaseServer, profileHelper: ProfileHelper, handbookHelper: HandbookHelper, itemHelper: ItemHelper, playerService: PlayerService, localisationService: LocalisationService, fenceService: FenceService, timeUtil: TimeUtil, randomUtil: RandomUtil, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, profileHelper: ProfileHelper, handbookHelper: HandbookHelper, itemHelper: ItemHelper, playerService: PlayerService, localisationService: LocalisationService, fenceService: FenceService, timeUtil: TimeUtil, randomUtil: RandomUtil, configServer: ConfigServer); /** * Get a trader base object, update profile to reflect players current standing in profile * when trader not found in profile diff --git a/TypeScript/17AsyncImporterWithDependency1/types/models/eft/common/IGlobals.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/models/eft/common/IGlobals.d.ts index 2209415..a0bb051 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/models/eft/common/IGlobals.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/models/eft/common/IGlobals.d.ts @@ -802,7 +802,6 @@ export interface IMaxActiveOfferCount { from: number; to: number; count: number; - countForSpecialEditions: number; } export interface IMaxSumForRarity { Common: IRarityMaxSum; diff --git a/TypeScript/17AsyncImporterWithDependency1/types/models/eft/common/ILocationBase.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/models/eft/common/ILocationBase.d.ts index 65931f8..10f1a57 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/models/eft/common/ILocationBase.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/models/eft/common/ILocationBase.d.ts @@ -196,18 +196,24 @@ export interface Props { export interface Exit { /** % Chance out of 100 exit will appear in raid */ Chance: number; + ChancePVE: number; Count: number; + CountPVE: number; EntryPoints: string; EventAvailable: boolean; ExfiltrationTime: number; + ExfiltrationTimePVE: number; ExfiltrationType: string; RequiredSlot?: string; Id: string; MaxTime: number; + MaxTimePVE: number; MinTime: number; + MinTimePVE: number; Name: string; PassageRequirement: string; PlayersCount: number; + PlayersCountPVE: number; RequirementTip: string; Side?: string; } diff --git a/TypeScript/17AsyncImporterWithDependency1/types/models/eft/common/tables/IRepeatableQuests.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/models/eft/common/tables/IRepeatableQuests.d.ts index 854c8ef..27ff49d 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/models/eft/common/tables/IRepeatableQuests.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/models/eft/common/tables/IRepeatableQuests.d.ts @@ -18,10 +18,13 @@ export interface IRepeatableTemplates { export interface IPmcDataRepeatableQuest { id?: string; name: string; + unavailableTime?: string; activeQuests: IRepeatableQuest[]; inactiveQuests: IRepeatableQuest[]; endTime: number; changeRequirement: Record; + freeChanges: number; + freeChangesAvailable: number; } export interface IChangeRequirement { changeCost: IChangeCost[]; diff --git a/TypeScript/17AsyncImporterWithDependency1/types/models/eft/common/tables/ITemplateItem.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/models/eft/common/tables/ITemplateItem.d.ts index a8ccfbb..e5c6632 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/models/eft/common/tables/ITemplateItem.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/models/eft/common/tables/ITemplateItem.d.ts @@ -63,7 +63,7 @@ export interface Props { DiscardingBlock?: boolean; DropSoundType?: string; RagFairCommissionModifier?: number; - RarityPvE: string; + RarityPvE?: string; IsAlwaysAvailableForInsurance?: boolean; DiscardLimit?: number; MaxResource?: number; @@ -414,6 +414,12 @@ export interface Props { LayoutName?: string; Lower75Prefab?: Prefab; MaxUsages?: number; + ScavKillExpPenalty?: number; + ScavKillExpPenaltyPVE?: number; + ScavKillStandingPenalty?: number; + ScavKillStandingPenaltyPVE?: number; + TradersDiscount?: number; + TradersDiscountPVE?: number; } export interface IHealthEffect { type: string; diff --git a/TypeScript/17AsyncImporterWithDependency1/types/models/spt/config/IQuestConfig.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/models/spt/config/IQuestConfig.d.ts index 362602c..2cdf4fa 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/models/spt/config/IQuestConfig.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/models/spt/config/IQuestConfig.d.ts @@ -47,6 +47,8 @@ export interface IRepeatableQuestConfig { /** Item tplIds to ignore when generating rewards */ rewardBlacklist: string[]; rewardAmmoStackMinSize: number; + freeChangesAvailable: number; + freeChanges: number; } export interface IRewardScaling { levels: number[]; diff --git a/TypeScript/17AsyncImporterWithDependency1/types/services/BotEquipmentModPoolService.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/services/BotEquipmentModPoolService.d.ts index c53f31b..7b2b442 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/services/BotEquipmentModPoolService.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/services/BotEquipmentModPoolService.d.ts @@ -4,7 +4,7 @@ import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { VFS } from "@spt/utils/VFS"; /** Store a mapping between weapons, their slots and the items that fit those slots */ @@ -12,7 +12,7 @@ export declare class BotEquipmentModPoolService { protected logger: ILogger; protected vfs: VFS; protected itemHelper: ItemHelper; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected botConfig: IBotConfig; @@ -20,7 +20,7 @@ export declare class BotEquipmentModPoolService { protected gearModPool: Mods; protected weaponPoolGenerated: boolean; protected armorPoolGenerated: boolean; - constructor(logger: ILogger, vfs: VFS, itemHelper: ItemHelper, databaseServer: DatabaseServer, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, vfs: VFS, itemHelper: ItemHelper, databaseService: DatabaseService, localisationService: LocalisationService, configServer: ConfigServer); /** * Store dictionary of mods for each item passed in * @param items items to find related mods and store in modPool diff --git a/TypeScript/17AsyncImporterWithDependency1/types/services/CustomLocationWaveService.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/services/CustomLocationWaveService.d.ts index 728a1e8..c72d5bb 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/services/CustomLocationWaveService.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/services/CustomLocationWaveService.d.ts @@ -2,15 +2,15 @@ import { BossLocationSpawn, Wave } from "@spt/models/eft/common/ILocationBase"; import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class CustomLocationWaveService { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, configServer: ConfigServer); /** * Add a boss wave to a map * @param locationId e.g. factory4_day, bigmap diff --git a/TypeScript/17AsyncImporterWithDependency1/types/services/InsuranceService.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/services/InsuranceService.d.ts index c54f9f9..0000e66 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/services/InsuranceService.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/services/InsuranceService.d.ts @@ -13,8 +13,8 @@ import { ILostOnDeathConfig } from "@spt/models/spt/config/ILostOnDeathConfig"; import { IInsuranceEquipmentPkg } from "@spt/models/spt/services/IInsuranceEquipmentPkg"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -24,7 +24,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class InsuranceService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected secureContainerHelper: SecureContainerHelper; protected randomUtil: RandomUtil; protected itemHelper: ItemHelper; @@ -42,7 +42,7 @@ export declare class InsuranceService { protected insured: Record>; protected insuranceConfig: IInsuranceConfig; protected lostOnDeathConfig: ILostOnDeathConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, handbookHelper: HandbookHelper, localisationService: LocalisationService, localeService: LocaleService, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, databaseService: DatabaseService, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, handbookHelper: HandbookHelper, localisationService: LocalisationService, localeService: LocaleService, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); /** * Does player have insurance array * @param sessionId Player id diff --git a/TypeScript/17AsyncImporterWithDependency1/types/services/MailSendService.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/services/MailSendService.d.ts index d445841..8f1f974 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/services/MailSendService.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/services/MailSendService.d.ts @@ -9,8 +9,8 @@ import { MessageType } from "@spt/models/enums/MessageType"; import { Traders } from "@spt/models/enums/Traders"; import { IProfileChangeEvent, ISendMessageDetails } from "@spt/models/spt/dialog/ISendMessageDetails"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; @@ -19,7 +19,7 @@ export declare class MailSendService { protected hashUtil: HashUtil; protected timeUtil: TimeUtil; protected saveServer: SaveServer; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected notifierHelper: NotifierHelper; protected dialogueHelper: DialogueHelper; protected notificationSendHelper: NotificationSendHelper; @@ -27,7 +27,7 @@ export declare class MailSendService { protected itemHelper: ItemHelper; protected traderHelper: TraderHelper; protected readonly systemSenderId = "59e7125688a45068a6249071"; - constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, dialogueHelper: DialogueHelper, notificationSendHelper: NotificationSendHelper, localisationService: LocalisationService, itemHelper: ItemHelper, traderHelper: TraderHelper); + constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseService: DatabaseService, notifierHelper: NotifierHelper, dialogueHelper: DialogueHelper, notificationSendHelper: NotificationSendHelper, localisationService: LocalisationService, itemHelper: ItemHelper, traderHelper: TraderHelper); /** * Send a message from an NPC (e.g. prapor) to the player with or without items using direct message text, do not look up any locale * @param sessionId The session ID to send the message to diff --git a/TypeScript/17AsyncImporterWithDependency1/types/services/OpenZoneService.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/services/OpenZoneService.d.ts index 1bc5f00..c7dd0bd 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/services/OpenZoneService.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/services/OpenZoneService.d.ts @@ -1,18 +1,18 @@ import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RandomUtil } from "@spt/utils/RandomUtil"; /** Service for adding new zones to a maps OpenZones property */ export declare class OpenZoneService { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, localisationService: LocalisationService, configServer: ConfigServer); /** * Add open zone to specified map * @param locationId map location (e.g. factory4_day) diff --git a/TypeScript/17AsyncImporterWithDependency1/types/services/PaymentService.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/services/PaymentService.d.ts index 64ff2c1..61d5731 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/services/PaymentService.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/services/PaymentService.d.ts @@ -9,7 +9,7 @@ import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRo import { IProcessBuyTradeRequestData } from "@spt/models/eft/trade/IProcessBuyTradeRequestData"; import { IProcessSellTradeRequestData } from "@spt/models/eft/trade/IProcessSellTradeRequestData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; @@ -17,14 +17,14 @@ export declare class PaymentService { protected logger: ILogger; protected hashUtil: HashUtil; protected httpResponse: HttpResponseUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected handbookHelper: HandbookHelper; protected traderHelper: TraderHelper; protected itemHelper: ItemHelper; protected inventoryHelper: InventoryHelper; protected localisationService: LocalisationService; protected paymentHelper: PaymentHelper; - constructor(logger: ILogger, hashUtil: HashUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, localisationService: LocalisationService, paymentHelper: PaymentHelper); + constructor(logger: ILogger, hashUtil: HashUtil, httpResponse: HttpResponseUtil, databaseService: DatabaseService, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, localisationService: LocalisationService, paymentHelper: PaymentHelper); /** * Take money and insert items into return to server request * @param pmcData Pmc profile diff --git a/TypeScript/17AsyncImporterWithDependency1/types/services/PlayerService.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/services/PlayerService.d.ts index ae57410..84c4c6f 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/services/PlayerService.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/services/PlayerService.d.ts @@ -1,14 +1,14 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class PlayerService { protected logger: ILogger; protected timeUtil: TimeUtil; protected localisationService: LocalisationService; - protected databaseServer: DatabaseServer; - constructor(logger: ILogger, timeUtil: TimeUtil, localisationService: LocalisationService, databaseServer: DatabaseServer); + protected databaseService: DatabaseService; + constructor(logger: ILogger, timeUtil: TimeUtil, localisationService: LocalisationService, databaseService: DatabaseService); /** * Get level of player * @param pmcData Player profile diff --git a/TypeScript/17AsyncImporterWithDependency1/types/services/RagfairLinkedItemService.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/services/RagfairLinkedItemService.d.ts index 6011c1a..0d03459 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/services/RagfairLinkedItemService.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/services/RagfairLinkedItemService.d.ts @@ -1,11 +1,11 @@ import { ItemHelper } from "@spt/helpers/ItemHelper"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; export declare class RagfairLinkedItemService { - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected linkedItemsCache: Record>; - constructor(databaseServer: DatabaseServer, itemHelper: ItemHelper); + constructor(databaseService: DatabaseService, itemHelper: ItemHelper); getLinkedItems(linkedSearchId: string): Set; /** * Use ragfair linked item service to get an array of items that can fit on or in designated itemtpl diff --git a/TypeScript/17AsyncImporterWithDependency1/types/services/RagfairOfferService.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/services/RagfairOfferService.d.ts index c044f6d..4bc07c3 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/services/RagfairOfferService.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/services/RagfairOfferService.d.ts @@ -6,8 +6,8 @@ import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RagfairOfferHolder } from "@spt/utils/RagfairOfferHolder"; @@ -15,7 +15,7 @@ import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class RagfairOfferService { protected logger: ILogger; protected timeUtil: TimeUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected saveServer: SaveServer; protected ragfairServerHelper: RagfairServerHelper; protected profileHelper: ProfileHelper; @@ -28,7 +28,7 @@ export declare class RagfairOfferService { protected expiredOffers: Record; protected ragfairConfig: IRagfairConfig; protected ragfairOfferHandler: RagfairOfferHolder; - constructor(logger: ILogger, timeUtil: TimeUtil, databaseServer: DatabaseServer, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, eventOutputHolder: EventOutputHolder, httpResponse: HttpResponseUtil, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, timeUtil: TimeUtil, databaseService: DatabaseService, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, eventOutputHolder: EventOutputHolder, httpResponse: HttpResponseUtil, localisationService: LocalisationService, configServer: ConfigServer); /** * Get all offers * @returns IRagfairOffer array diff --git a/TypeScript/17AsyncImporterWithDependency1/types/services/RagfairPriceService.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/services/RagfairPriceService.d.ts index 5b8fa56..0a2f26e 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/services/RagfairPriceService.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/services/RagfairPriceService.d.ts @@ -12,7 +12,7 @@ import { IRagfairConfig, IUnreasonableModPrices } from "@spt/models/spt/config/I import { IRagfairServerPrices } from "@spt/models/spt/ragfair/IRagfairServerPrices"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RandomUtil } from "@spt/utils/RandomUtil"; /** @@ -20,7 +20,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; */ export declare class RagfairPriceService implements OnLoad { protected handbookHelper: HandbookHelper; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected logger: ILogger; protected itemHelper: ItemHelper; protected presetHelper: PresetHelper; @@ -30,7 +30,7 @@ export declare class RagfairPriceService implements OnLoad { protected configServer: ConfigServer; protected ragfairConfig: IRagfairConfig; protected prices: IRagfairServerPrices; - constructor(handbookHelper: HandbookHelper, databaseServer: DatabaseServer, logger: ILogger, itemHelper: ItemHelper, presetHelper: PresetHelper, traderHelper: TraderHelper, randomUtil: RandomUtil, localisationService: LocalisationService, configServer: ConfigServer); + constructor(handbookHelper: HandbookHelper, databaseService: DatabaseService, logger: ILogger, itemHelper: ItemHelper, presetHelper: PresetHelper, traderHelper: TraderHelper, randomUtil: RandomUtil, localisationService: LocalisationService, configServer: ConfigServer); /** * Generate static (handbook) and dynamic (prices.json) flea prices, store inside class as dictionaries */ diff --git a/TypeScript/17AsyncImporterWithDependency1/types/services/RagfairTaxService.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/services/RagfairTaxService.d.ts index 4e4e648..effb9f0 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/services/RagfairTaxService.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/services/RagfairTaxService.d.ts @@ -4,15 +4,15 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { IStorePlayerOfferTaxAmountRequestData } from "@spt/models/eft/ragfair/IStorePlayerOfferTaxAmountRequestData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; export declare class RagfairTaxService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected ragfairPriceService: RagfairPriceService; protected itemHelper: ItemHelper; protected playerOfferTaxCache: Record; - constructor(logger: ILogger, databaseServer: DatabaseServer, ragfairPriceService: RagfairPriceService, itemHelper: ItemHelper); + constructor(logger: ILogger, databaseService: DatabaseService, ragfairPriceService: RagfairPriceService, itemHelper: ItemHelper); storeClientOfferTaxValue(sessionId: string, offer: IStorePlayerOfferTaxAmountRequestData): void; clearStoredOfferTaxById(offerIdToRemove: string): void; getStoredClientOfferTaxValueById(offerIdToGet: string): IStorePlayerOfferTaxAmountRequestData; diff --git a/TypeScript/17AsyncImporterWithDependency1/types/services/RaidTimeAdjustmentService.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/services/RaidTimeAdjustmentService.d.ts index f770b64..bfc099a 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/services/RaidTimeAdjustmentService.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/services/RaidTimeAdjustmentService.d.ts @@ -7,17 +7,17 @@ import { ILocationConfig, IScavRaidTimeLocationSettings, LootMultiplier } from " import { IRaidChanges } from "@spt/models/spt/location/IRaidChanges"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RaidTimeAdjustmentService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected randomUtil: RandomUtil; protected weightedRandomHelper: WeightedRandomHelper; protected applicationContext: ApplicationContext; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, applicationContext: ApplicationContext, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, applicationContext: ApplicationContext, configServer: ConfigServer); /** * Make alterations to the base map data passed in * Loot multipliers/waves/wave start times diff --git a/TypeScript/17AsyncImporterWithDependency1/types/services/RepairService.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/services/RepairService.d.ts index 9203417..48f306e 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/services/RepairService.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/services/RepairService.d.ts @@ -14,13 +14,13 @@ import { SkillTypes } from "@spt/models/enums/SkillTypes"; import { BonusSettings, IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RepairService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected randomUtil: RandomUtil; protected itemHelper: ItemHelper; @@ -31,7 +31,7 @@ export declare class RepairService { protected localisationService: LocalisationService; protected configServer: ConfigServer; protected repairConfig: IRepairConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, profileHelper: ProfileHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, traderHelper: TraderHelper, weightedRandomHelper: WeightedRandomHelper, paymentService: PaymentService, repairHelper: RepairHelper, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, profileHelper: ProfileHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, traderHelper: TraderHelper, weightedRandomHelper: WeightedRandomHelper, paymentService: PaymentService, repairHelper: RepairHelper, localisationService: LocalisationService, configServer: ConfigServer); /** * Use trader to repair an items durability * @param sessionID Session id diff --git a/TypeScript/17AsyncImporterWithDependency1/types/services/TraderServicesService.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/services/TraderServicesService.d.ts index 111c71a..e441eb6 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/services/TraderServicesService.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/services/TraderServicesService.d.ts @@ -1,13 +1,13 @@ import { ProfileHelper } from "@spt/helpers/ProfileHelper"; import { ITraderServiceModel } from "@spt/models/spt/services/ITraderServiceModel"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderServicesService { protected profileHelper: ProfileHelper; protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected cloner: ICloner; - constructor(profileHelper: ProfileHelper, logger: ILogger, databaseServer: DatabaseServer, cloner: ICloner); + constructor(profileHelper: ProfileHelper, logger: ILogger, databaseService: DatabaseService, cloner: ICloner); getTraderServices(sessionId: string, traderId: string): ITraderServiceModel[]; } diff --git a/TypeScript/17AsyncImporterWithDependency1/types/services/mod/CustomItemService.d.ts b/TypeScript/17AsyncImporterWithDependency1/types/services/mod/CustomItemService.d.ts index 6dc4730..1926bed 100644 --- a/TypeScript/17AsyncImporterWithDependency1/types/services/mod/CustomItemService.d.ts +++ b/TypeScript/17AsyncImporterWithDependency1/types/services/mod/CustomItemService.d.ts @@ -9,11 +9,11 @@ import { HashUtil } from "@spt/utils/HashUtil"; export declare class CustomItemService { protected logger: ILogger; protected hashUtil: HashUtil; - protected databaseServer: DatabaseService; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected itemBaseClassService: ItemBaseClassService; protected cloner: ICloner; - constructor(logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseService, itemHelper: ItemHelper, itemBaseClassService: ItemBaseClassService, cloner: ICloner); + constructor(logger: ILogger, hashUtil: HashUtil, databaseService: DatabaseService, itemHelper: ItemHelper, itemBaseClassService: ItemBaseClassService, cloner: ICloner); /** * Create a new item from a cloned item base * WARNING - If no item id is supplied, an id will be generated, this id will be random every time you add an item and will not be the same on each subsequent server start diff --git a/TypeScript/17AsyncImporterWithDependency2/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts index a7491b5..c51bf7e 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts @@ -6,7 +6,7 @@ import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { ISendMessageRequest } from "@spt/models/eft/dialog/ISendMessageRequest"; import { IUserDialogInfo } from "@spt/models/eft/profile/ISptProfile"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -19,7 +19,7 @@ export declare class GiveSptCommand implements ISptCommand { protected presetHelper: PresetHelper; protected mailSendService: MailSendService; protected localeService: LocaleService; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemFilterService: ItemFilterService; protected cloner: ICloner; /** @@ -34,7 +34,7 @@ export declare class GiveSptCommand implements ISptCommand { private static acceptableConfidence; private static excludedPresetItems; protected savedCommand: Map; - constructor(logger: ILogger, itemHelper: ItemHelper, hashUtil: HashUtil, presetHelper: PresetHelper, mailSendService: MailSendService, localeService: LocaleService, databaseServer: DatabaseServer, itemFilterService: ItemFilterService, cloner: ICloner); + constructor(logger: ILogger, itemHelper: ItemHelper, hashUtil: HashUtil, presetHelper: PresetHelper, mailSendService: MailSendService, localeService: LocaleService, databaseService: DatabaseService, itemFilterService: ItemFilterService, cloner: ICloner); getCommand(): string; getCommandHelp(): string; performAction(commandHandler: IUserDialogInfo, sessionId: string, request: ISendMessageRequest): string; diff --git a/TypeScript/17AsyncImporterWithDependency2/types/helpers/PresetHelper.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/helpers/PresetHelper.d.ts index 5fc8a7c..e71e5b7 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/helpers/PresetHelper.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/helpers/PresetHelper.d.ts @@ -1,16 +1,16 @@ import { IPreset } from "@spt/models/eft/common/IGlobals"; import { BaseClasses } from "@spt/models/enums/BaseClasses"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; import { ItemHelper } from "./ItemHelper"; export declare class PresetHelper { - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected cloner: ICloner; protected lookup: Record; protected defaultEquipmentPresets: Record; protected defaultWeaponPresets: Record; - constructor(databaseServer: DatabaseServer, itemHelper: ItemHelper, cloner: ICloner); + constructor(databaseService: DatabaseService, itemHelper: ItemHelper, cloner: ICloner); hydratePresetStore(input: Record): void; /** * Get default weapon and equipment presets diff --git a/TypeScript/17AsyncImporterWithDependency2/types/helpers/ProfileHelper.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/helpers/ProfileHelper.d.ts index 37937ff..e943bd3 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/helpers/ProfileHelper.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/helpers/ProfileHelper.d.ts @@ -7,8 +7,8 @@ import { SkillTypes } from "@spt/models/enums/SkillTypes"; import { IInventoryConfig } from "@spt/models/spt/config/IInventoryConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileSnapshotService } from "@spt/services/ProfileSnapshotService"; import { ICloner } from "@spt/utils/cloners/ICloner"; @@ -21,14 +21,14 @@ export declare class ProfileHelper { protected watermark: Watermark; protected timeUtil: TimeUtil; protected saveServer: SaveServer; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected profileSnapshotService: ProfileSnapshotService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected cloner: ICloner; protected inventoryConfig: IInventoryConfig; - constructor(logger: ILogger, hashUtil: HashUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileSnapshotService: ProfileSnapshotService, localisationService: LocalisationService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, hashUtil: HashUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseService: DatabaseService, itemHelper: ItemHelper, profileSnapshotService: ProfileSnapshotService, localisationService: LocalisationService, configServer: ConfigServer, cloner: ICloner); /** * Remove/reset a completed quest condtion from players profile quest data * @param sessionID Session id diff --git a/TypeScript/17AsyncImporterWithDependency2/types/helpers/QuestHelper.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/helpers/QuestHelper.d.ts index 39ba2a9..93368fa 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/helpers/QuestHelper.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/helpers/QuestHelper.d.ts @@ -18,7 +18,7 @@ import { IQuestConfig } from "@spt/models/spt/config/IQuestConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -30,9 +30,9 @@ export declare class QuestHelper { protected timeUtil: TimeUtil; protected hashUtil: HashUtil; protected itemHelper: ItemHelper; + protected databaseService: DatabaseService; protected questConditionHelper: QuestConditionHelper; protected eventOutputHolder: EventOutputHolder; - protected databaseServer: DatabaseServer; protected localeService: LocaleService; protected ragfairServerHelper: RagfairServerHelper; protected dialogueHelper: DialogueHelper; @@ -45,7 +45,7 @@ export declare class QuestHelper { protected configServer: ConfigServer; protected cloner: ICloner; protected questConfig: IQuestConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, questConditionHelper: QuestConditionHelper, eventOutputHolder: EventOutputHolder, databaseServer: DatabaseServer, localeService: LocaleService, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, localisationService: LocalisationService, traderHelper: TraderHelper, presetHelper: PresetHelper, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, databaseService: DatabaseService, questConditionHelper: QuestConditionHelper, eventOutputHolder: EventOutputHolder, localeService: LocaleService, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, localisationService: LocalisationService, traderHelper: TraderHelper, presetHelper: PresetHelper, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); /** * Get status of a quest in player profile by its id * @param pmcData Profile to search diff --git a/TypeScript/17AsyncImporterWithDependency2/types/helpers/RagfairOfferHelper.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/helpers/RagfairOfferHelper.d.ts index 27bb081..a08e60a 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/helpers/RagfairOfferHelper.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/helpers/RagfairOfferHelper.d.ts @@ -19,8 +19,8 @@ import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -34,7 +34,7 @@ export declare class RagfairOfferHelper { protected timeUtil: TimeUtil; protected hashUtil: HashUtil; protected eventOutputHolder: EventOutputHolder; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected traderHelper: TraderHelper; protected saveServer: SaveServer; protected itemHelper: ItemHelper; @@ -55,7 +55,7 @@ export declare class RagfairOfferHelper { protected static goodSoldTemplate: string; protected ragfairConfig: IRagfairConfig; protected questConfig: IQuestConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, eventOutputHolder: EventOutputHolder, databaseServer: DatabaseServer, traderHelper: TraderHelper, saveServer: SaveServer, itemHelper: ItemHelper, botHelper: BotHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, localeService: LocaleService, localisationService: LocalisationService, mailSendService: MailSendService, configServer: ConfigServer); + constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, eventOutputHolder: EventOutputHolder, databaseService: DatabaseService, traderHelper: TraderHelper, saveServer: SaveServer, itemHelper: ItemHelper, botHelper: BotHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, localeService: LocaleService, localisationService: LocalisationService, mailSendService: MailSendService, configServer: ConfigServer); /** * Passthrough to ragfairOfferService.getOffers(), get flea offers a player should see * @param searchRequest Data from client diff --git a/TypeScript/17AsyncImporterWithDependency2/types/helpers/RepairHelper.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/helpers/RepairHelper.d.ts index 4bd0577..99a21da 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/helpers/RepairHelper.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/helpers/RepairHelper.d.ts @@ -3,17 +3,17 @@ import { ITemplateItem, Props } from "@spt/models/eft/common/tables/ITemplateIte import { IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RepairHelper { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected configServer: ConfigServer; protected cloner: ICloner; protected repairConfig: IRepairConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, configServer: ConfigServer, cloner: ICloner); /** * Alter an items durability after a repair by trader/repair kit * @param itemToRepair item to update durability details diff --git a/TypeScript/17AsyncImporterWithDependency2/types/helpers/TraderAssortHelper.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/helpers/TraderAssortHelper.d.ts index faf2a9d..8f8f802 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/helpers/TraderAssortHelper.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/helpers/TraderAssortHelper.d.ts @@ -9,7 +9,7 @@ import { ITrader, ITraderAssort } from "@spt/models/eft/common/tables/ITrader"; import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; @@ -21,7 +21,7 @@ export declare class TraderAssortHelper { protected logger: ILogger; protected mathUtil: MathUtil; protected timeUtil: TimeUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected assortHelper: AssortHelper; protected paymentHelper: PaymentHelper; @@ -37,7 +37,7 @@ export declare class TraderAssortHelper { protected traderConfig: ITraderConfig; protected mergedQuestAssorts: Record>; protected createdMergedQuestAssorts: boolean; - constructor(logger: ILogger, mathUtil: MathUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, profileHelper: ProfileHelper, assortHelper: AssortHelper, paymentHelper: PaymentHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, localisationService: LocalisationService, traderPurchasePersisterService: TraderPurchasePersisterService, traderHelper: TraderHelper, fenceService: FenceService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, mathUtil: MathUtil, timeUtil: TimeUtil, databaseService: DatabaseService, profileHelper: ProfileHelper, assortHelper: AssortHelper, paymentHelper: PaymentHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, localisationService: LocalisationService, traderPurchasePersisterService: TraderPurchasePersisterService, traderHelper: TraderHelper, fenceService: FenceService, configServer: ConfigServer, cloner: ICloner); /** * Get a traders assorts * Can be used for returning ragfair / fence assorts diff --git a/TypeScript/17AsyncImporterWithDependency2/types/helpers/TraderHelper.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/helpers/TraderHelper.d.ts index 5f515da..eec1cc7 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/helpers/TraderHelper.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/helpers/TraderHelper.d.ts @@ -10,7 +10,7 @@ import { Traders } from "@spt/models/enums/Traders"; import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; @@ -18,7 +18,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class TraderHelper { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected handbookHelper: HandbookHelper; protected itemHelper: ItemHelper; @@ -33,7 +33,7 @@ export declare class TraderHelper { protected highestTraderPriceItems?: Record; /** Dictionary of item tpl and the highest trader buy back rouble price */ protected highestTraderBuyPriceItems?: Record; - constructor(logger: ILogger, databaseServer: DatabaseServer, profileHelper: ProfileHelper, handbookHelper: HandbookHelper, itemHelper: ItemHelper, playerService: PlayerService, localisationService: LocalisationService, fenceService: FenceService, timeUtil: TimeUtil, randomUtil: RandomUtil, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, profileHelper: ProfileHelper, handbookHelper: HandbookHelper, itemHelper: ItemHelper, playerService: PlayerService, localisationService: LocalisationService, fenceService: FenceService, timeUtil: TimeUtil, randomUtil: RandomUtil, configServer: ConfigServer); /** * Get a trader base object, update profile to reflect players current standing in profile * when trader not found in profile diff --git a/TypeScript/17AsyncImporterWithDependency2/types/models/eft/common/IGlobals.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/models/eft/common/IGlobals.d.ts index 2209415..a0bb051 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/models/eft/common/IGlobals.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/models/eft/common/IGlobals.d.ts @@ -802,7 +802,6 @@ export interface IMaxActiveOfferCount { from: number; to: number; count: number; - countForSpecialEditions: number; } export interface IMaxSumForRarity { Common: IRarityMaxSum; diff --git a/TypeScript/17AsyncImporterWithDependency2/types/models/eft/common/ILocationBase.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/models/eft/common/ILocationBase.d.ts index 65931f8..10f1a57 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/models/eft/common/ILocationBase.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/models/eft/common/ILocationBase.d.ts @@ -196,18 +196,24 @@ export interface Props { export interface Exit { /** % Chance out of 100 exit will appear in raid */ Chance: number; + ChancePVE: number; Count: number; + CountPVE: number; EntryPoints: string; EventAvailable: boolean; ExfiltrationTime: number; + ExfiltrationTimePVE: number; ExfiltrationType: string; RequiredSlot?: string; Id: string; MaxTime: number; + MaxTimePVE: number; MinTime: number; + MinTimePVE: number; Name: string; PassageRequirement: string; PlayersCount: number; + PlayersCountPVE: number; RequirementTip: string; Side?: string; } diff --git a/TypeScript/17AsyncImporterWithDependency2/types/models/eft/common/tables/IRepeatableQuests.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/models/eft/common/tables/IRepeatableQuests.d.ts index 854c8ef..27ff49d 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/models/eft/common/tables/IRepeatableQuests.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/models/eft/common/tables/IRepeatableQuests.d.ts @@ -18,10 +18,13 @@ export interface IRepeatableTemplates { export interface IPmcDataRepeatableQuest { id?: string; name: string; + unavailableTime?: string; activeQuests: IRepeatableQuest[]; inactiveQuests: IRepeatableQuest[]; endTime: number; changeRequirement: Record; + freeChanges: number; + freeChangesAvailable: number; } export interface IChangeRequirement { changeCost: IChangeCost[]; diff --git a/TypeScript/17AsyncImporterWithDependency2/types/models/eft/common/tables/ITemplateItem.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/models/eft/common/tables/ITemplateItem.d.ts index a8ccfbb..e5c6632 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/models/eft/common/tables/ITemplateItem.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/models/eft/common/tables/ITemplateItem.d.ts @@ -63,7 +63,7 @@ export interface Props { DiscardingBlock?: boolean; DropSoundType?: string; RagFairCommissionModifier?: number; - RarityPvE: string; + RarityPvE?: string; IsAlwaysAvailableForInsurance?: boolean; DiscardLimit?: number; MaxResource?: number; @@ -414,6 +414,12 @@ export interface Props { LayoutName?: string; Lower75Prefab?: Prefab; MaxUsages?: number; + ScavKillExpPenalty?: number; + ScavKillExpPenaltyPVE?: number; + ScavKillStandingPenalty?: number; + ScavKillStandingPenaltyPVE?: number; + TradersDiscount?: number; + TradersDiscountPVE?: number; } export interface IHealthEffect { type: string; diff --git a/TypeScript/17AsyncImporterWithDependency2/types/models/spt/config/IQuestConfig.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/models/spt/config/IQuestConfig.d.ts index 362602c..2cdf4fa 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/models/spt/config/IQuestConfig.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/models/spt/config/IQuestConfig.d.ts @@ -47,6 +47,8 @@ export interface IRepeatableQuestConfig { /** Item tplIds to ignore when generating rewards */ rewardBlacklist: string[]; rewardAmmoStackMinSize: number; + freeChangesAvailable: number; + freeChanges: number; } export interface IRewardScaling { levels: number[]; diff --git a/TypeScript/17AsyncImporterWithDependency2/types/services/BotEquipmentModPoolService.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/services/BotEquipmentModPoolService.d.ts index c53f31b..7b2b442 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/services/BotEquipmentModPoolService.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/services/BotEquipmentModPoolService.d.ts @@ -4,7 +4,7 @@ import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { VFS } from "@spt/utils/VFS"; /** Store a mapping between weapons, their slots and the items that fit those slots */ @@ -12,7 +12,7 @@ export declare class BotEquipmentModPoolService { protected logger: ILogger; protected vfs: VFS; protected itemHelper: ItemHelper; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected botConfig: IBotConfig; @@ -20,7 +20,7 @@ export declare class BotEquipmentModPoolService { protected gearModPool: Mods; protected weaponPoolGenerated: boolean; protected armorPoolGenerated: boolean; - constructor(logger: ILogger, vfs: VFS, itemHelper: ItemHelper, databaseServer: DatabaseServer, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, vfs: VFS, itemHelper: ItemHelper, databaseService: DatabaseService, localisationService: LocalisationService, configServer: ConfigServer); /** * Store dictionary of mods for each item passed in * @param items items to find related mods and store in modPool diff --git a/TypeScript/17AsyncImporterWithDependency2/types/services/CustomLocationWaveService.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/services/CustomLocationWaveService.d.ts index 728a1e8..c72d5bb 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/services/CustomLocationWaveService.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/services/CustomLocationWaveService.d.ts @@ -2,15 +2,15 @@ import { BossLocationSpawn, Wave } from "@spt/models/eft/common/ILocationBase"; import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class CustomLocationWaveService { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, configServer: ConfigServer); /** * Add a boss wave to a map * @param locationId e.g. factory4_day, bigmap diff --git a/TypeScript/17AsyncImporterWithDependency2/types/services/InsuranceService.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/services/InsuranceService.d.ts index c54f9f9..0000e66 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/services/InsuranceService.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/services/InsuranceService.d.ts @@ -13,8 +13,8 @@ import { ILostOnDeathConfig } from "@spt/models/spt/config/ILostOnDeathConfig"; import { IInsuranceEquipmentPkg } from "@spt/models/spt/services/IInsuranceEquipmentPkg"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -24,7 +24,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class InsuranceService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected secureContainerHelper: SecureContainerHelper; protected randomUtil: RandomUtil; protected itemHelper: ItemHelper; @@ -42,7 +42,7 @@ export declare class InsuranceService { protected insured: Record>; protected insuranceConfig: IInsuranceConfig; protected lostOnDeathConfig: ILostOnDeathConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, handbookHelper: HandbookHelper, localisationService: LocalisationService, localeService: LocaleService, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, databaseService: DatabaseService, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, handbookHelper: HandbookHelper, localisationService: LocalisationService, localeService: LocaleService, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); /** * Does player have insurance array * @param sessionId Player id diff --git a/TypeScript/17AsyncImporterWithDependency2/types/services/MailSendService.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/services/MailSendService.d.ts index d445841..8f1f974 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/services/MailSendService.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/services/MailSendService.d.ts @@ -9,8 +9,8 @@ import { MessageType } from "@spt/models/enums/MessageType"; import { Traders } from "@spt/models/enums/Traders"; import { IProfileChangeEvent, ISendMessageDetails } from "@spt/models/spt/dialog/ISendMessageDetails"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; @@ -19,7 +19,7 @@ export declare class MailSendService { protected hashUtil: HashUtil; protected timeUtil: TimeUtil; protected saveServer: SaveServer; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected notifierHelper: NotifierHelper; protected dialogueHelper: DialogueHelper; protected notificationSendHelper: NotificationSendHelper; @@ -27,7 +27,7 @@ export declare class MailSendService { protected itemHelper: ItemHelper; protected traderHelper: TraderHelper; protected readonly systemSenderId = "59e7125688a45068a6249071"; - constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, dialogueHelper: DialogueHelper, notificationSendHelper: NotificationSendHelper, localisationService: LocalisationService, itemHelper: ItemHelper, traderHelper: TraderHelper); + constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseService: DatabaseService, notifierHelper: NotifierHelper, dialogueHelper: DialogueHelper, notificationSendHelper: NotificationSendHelper, localisationService: LocalisationService, itemHelper: ItemHelper, traderHelper: TraderHelper); /** * Send a message from an NPC (e.g. prapor) to the player with or without items using direct message text, do not look up any locale * @param sessionId The session ID to send the message to diff --git a/TypeScript/17AsyncImporterWithDependency2/types/services/OpenZoneService.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/services/OpenZoneService.d.ts index 1bc5f00..c7dd0bd 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/services/OpenZoneService.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/services/OpenZoneService.d.ts @@ -1,18 +1,18 @@ import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RandomUtil } from "@spt/utils/RandomUtil"; /** Service for adding new zones to a maps OpenZones property */ export declare class OpenZoneService { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, localisationService: LocalisationService, configServer: ConfigServer); /** * Add open zone to specified map * @param locationId map location (e.g. factory4_day) diff --git a/TypeScript/17AsyncImporterWithDependency2/types/services/PaymentService.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/services/PaymentService.d.ts index 64ff2c1..61d5731 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/services/PaymentService.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/services/PaymentService.d.ts @@ -9,7 +9,7 @@ import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRo import { IProcessBuyTradeRequestData } from "@spt/models/eft/trade/IProcessBuyTradeRequestData"; import { IProcessSellTradeRequestData } from "@spt/models/eft/trade/IProcessSellTradeRequestData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; @@ -17,14 +17,14 @@ export declare class PaymentService { protected logger: ILogger; protected hashUtil: HashUtil; protected httpResponse: HttpResponseUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected handbookHelper: HandbookHelper; protected traderHelper: TraderHelper; protected itemHelper: ItemHelper; protected inventoryHelper: InventoryHelper; protected localisationService: LocalisationService; protected paymentHelper: PaymentHelper; - constructor(logger: ILogger, hashUtil: HashUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, localisationService: LocalisationService, paymentHelper: PaymentHelper); + constructor(logger: ILogger, hashUtil: HashUtil, httpResponse: HttpResponseUtil, databaseService: DatabaseService, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, localisationService: LocalisationService, paymentHelper: PaymentHelper); /** * Take money and insert items into return to server request * @param pmcData Pmc profile diff --git a/TypeScript/17AsyncImporterWithDependency2/types/services/PlayerService.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/services/PlayerService.d.ts index ae57410..84c4c6f 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/services/PlayerService.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/services/PlayerService.d.ts @@ -1,14 +1,14 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class PlayerService { protected logger: ILogger; protected timeUtil: TimeUtil; protected localisationService: LocalisationService; - protected databaseServer: DatabaseServer; - constructor(logger: ILogger, timeUtil: TimeUtil, localisationService: LocalisationService, databaseServer: DatabaseServer); + protected databaseService: DatabaseService; + constructor(logger: ILogger, timeUtil: TimeUtil, localisationService: LocalisationService, databaseService: DatabaseService); /** * Get level of player * @param pmcData Player profile diff --git a/TypeScript/17AsyncImporterWithDependency2/types/services/RagfairLinkedItemService.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/services/RagfairLinkedItemService.d.ts index 6011c1a..0d03459 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/services/RagfairLinkedItemService.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/services/RagfairLinkedItemService.d.ts @@ -1,11 +1,11 @@ import { ItemHelper } from "@spt/helpers/ItemHelper"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; export declare class RagfairLinkedItemService { - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected linkedItemsCache: Record>; - constructor(databaseServer: DatabaseServer, itemHelper: ItemHelper); + constructor(databaseService: DatabaseService, itemHelper: ItemHelper); getLinkedItems(linkedSearchId: string): Set; /** * Use ragfair linked item service to get an array of items that can fit on or in designated itemtpl diff --git a/TypeScript/17AsyncImporterWithDependency2/types/services/RagfairOfferService.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/services/RagfairOfferService.d.ts index c044f6d..4bc07c3 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/services/RagfairOfferService.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/services/RagfairOfferService.d.ts @@ -6,8 +6,8 @@ import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RagfairOfferHolder } from "@spt/utils/RagfairOfferHolder"; @@ -15,7 +15,7 @@ import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class RagfairOfferService { protected logger: ILogger; protected timeUtil: TimeUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected saveServer: SaveServer; protected ragfairServerHelper: RagfairServerHelper; protected profileHelper: ProfileHelper; @@ -28,7 +28,7 @@ export declare class RagfairOfferService { protected expiredOffers: Record; protected ragfairConfig: IRagfairConfig; protected ragfairOfferHandler: RagfairOfferHolder; - constructor(logger: ILogger, timeUtil: TimeUtil, databaseServer: DatabaseServer, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, eventOutputHolder: EventOutputHolder, httpResponse: HttpResponseUtil, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, timeUtil: TimeUtil, databaseService: DatabaseService, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, eventOutputHolder: EventOutputHolder, httpResponse: HttpResponseUtil, localisationService: LocalisationService, configServer: ConfigServer); /** * Get all offers * @returns IRagfairOffer array diff --git a/TypeScript/17AsyncImporterWithDependency2/types/services/RagfairPriceService.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/services/RagfairPriceService.d.ts index 5b8fa56..0a2f26e 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/services/RagfairPriceService.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/services/RagfairPriceService.d.ts @@ -12,7 +12,7 @@ import { IRagfairConfig, IUnreasonableModPrices } from "@spt/models/spt/config/I import { IRagfairServerPrices } from "@spt/models/spt/ragfair/IRagfairServerPrices"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RandomUtil } from "@spt/utils/RandomUtil"; /** @@ -20,7 +20,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; */ export declare class RagfairPriceService implements OnLoad { protected handbookHelper: HandbookHelper; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected logger: ILogger; protected itemHelper: ItemHelper; protected presetHelper: PresetHelper; @@ -30,7 +30,7 @@ export declare class RagfairPriceService implements OnLoad { protected configServer: ConfigServer; protected ragfairConfig: IRagfairConfig; protected prices: IRagfairServerPrices; - constructor(handbookHelper: HandbookHelper, databaseServer: DatabaseServer, logger: ILogger, itemHelper: ItemHelper, presetHelper: PresetHelper, traderHelper: TraderHelper, randomUtil: RandomUtil, localisationService: LocalisationService, configServer: ConfigServer); + constructor(handbookHelper: HandbookHelper, databaseService: DatabaseService, logger: ILogger, itemHelper: ItemHelper, presetHelper: PresetHelper, traderHelper: TraderHelper, randomUtil: RandomUtil, localisationService: LocalisationService, configServer: ConfigServer); /** * Generate static (handbook) and dynamic (prices.json) flea prices, store inside class as dictionaries */ diff --git a/TypeScript/17AsyncImporterWithDependency2/types/services/RagfairTaxService.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/services/RagfairTaxService.d.ts index 4e4e648..effb9f0 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/services/RagfairTaxService.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/services/RagfairTaxService.d.ts @@ -4,15 +4,15 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { IStorePlayerOfferTaxAmountRequestData } from "@spt/models/eft/ragfair/IStorePlayerOfferTaxAmountRequestData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; export declare class RagfairTaxService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected ragfairPriceService: RagfairPriceService; protected itemHelper: ItemHelper; protected playerOfferTaxCache: Record; - constructor(logger: ILogger, databaseServer: DatabaseServer, ragfairPriceService: RagfairPriceService, itemHelper: ItemHelper); + constructor(logger: ILogger, databaseService: DatabaseService, ragfairPriceService: RagfairPriceService, itemHelper: ItemHelper); storeClientOfferTaxValue(sessionId: string, offer: IStorePlayerOfferTaxAmountRequestData): void; clearStoredOfferTaxById(offerIdToRemove: string): void; getStoredClientOfferTaxValueById(offerIdToGet: string): IStorePlayerOfferTaxAmountRequestData; diff --git a/TypeScript/17AsyncImporterWithDependency2/types/services/RaidTimeAdjustmentService.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/services/RaidTimeAdjustmentService.d.ts index f770b64..bfc099a 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/services/RaidTimeAdjustmentService.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/services/RaidTimeAdjustmentService.d.ts @@ -7,17 +7,17 @@ import { ILocationConfig, IScavRaidTimeLocationSettings, LootMultiplier } from " import { IRaidChanges } from "@spt/models/spt/location/IRaidChanges"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RaidTimeAdjustmentService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected randomUtil: RandomUtil; protected weightedRandomHelper: WeightedRandomHelper; protected applicationContext: ApplicationContext; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, applicationContext: ApplicationContext, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, applicationContext: ApplicationContext, configServer: ConfigServer); /** * Make alterations to the base map data passed in * Loot multipliers/waves/wave start times diff --git a/TypeScript/17AsyncImporterWithDependency2/types/services/RepairService.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/services/RepairService.d.ts index 9203417..48f306e 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/services/RepairService.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/services/RepairService.d.ts @@ -14,13 +14,13 @@ import { SkillTypes } from "@spt/models/enums/SkillTypes"; import { BonusSettings, IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RepairService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected randomUtil: RandomUtil; protected itemHelper: ItemHelper; @@ -31,7 +31,7 @@ export declare class RepairService { protected localisationService: LocalisationService; protected configServer: ConfigServer; protected repairConfig: IRepairConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, profileHelper: ProfileHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, traderHelper: TraderHelper, weightedRandomHelper: WeightedRandomHelper, paymentService: PaymentService, repairHelper: RepairHelper, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, profileHelper: ProfileHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, traderHelper: TraderHelper, weightedRandomHelper: WeightedRandomHelper, paymentService: PaymentService, repairHelper: RepairHelper, localisationService: LocalisationService, configServer: ConfigServer); /** * Use trader to repair an items durability * @param sessionID Session id diff --git a/TypeScript/17AsyncImporterWithDependency2/types/services/TraderServicesService.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/services/TraderServicesService.d.ts index 111c71a..e441eb6 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/services/TraderServicesService.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/services/TraderServicesService.d.ts @@ -1,13 +1,13 @@ import { ProfileHelper } from "@spt/helpers/ProfileHelper"; import { ITraderServiceModel } from "@spt/models/spt/services/ITraderServiceModel"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderServicesService { protected profileHelper: ProfileHelper; protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected cloner: ICloner; - constructor(profileHelper: ProfileHelper, logger: ILogger, databaseServer: DatabaseServer, cloner: ICloner); + constructor(profileHelper: ProfileHelper, logger: ILogger, databaseService: DatabaseService, cloner: ICloner); getTraderServices(sessionId: string, traderId: string): ITraderServiceModel[]; } diff --git a/TypeScript/17AsyncImporterWithDependency2/types/services/mod/CustomItemService.d.ts b/TypeScript/17AsyncImporterWithDependency2/types/services/mod/CustomItemService.d.ts index 6dc4730..1926bed 100644 --- a/TypeScript/17AsyncImporterWithDependency2/types/services/mod/CustomItemService.d.ts +++ b/TypeScript/17AsyncImporterWithDependency2/types/services/mod/CustomItemService.d.ts @@ -9,11 +9,11 @@ import { HashUtil } from "@spt/utils/HashUtil"; export declare class CustomItemService { protected logger: ILogger; protected hashUtil: HashUtil; - protected databaseServer: DatabaseService; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected itemBaseClassService: ItemBaseClassService; protected cloner: ICloner; - constructor(logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseService, itemHelper: ItemHelper, itemBaseClassService: ItemBaseClassService, cloner: ICloner); + constructor(logger: ILogger, hashUtil: HashUtil, databaseService: DatabaseService, itemHelper: ItemHelper, itemBaseClassService: ItemBaseClassService, cloner: ICloner); /** * Create a new item from a cloned item base * WARNING - If no item id is supplied, an id will be generated, this id will be random every time you add an item and will not be the same on each subsequent server start diff --git a/TypeScript/18CustomItemService/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts b/TypeScript/18CustomItemService/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts index a7491b5..c51bf7e 100644 --- a/TypeScript/18CustomItemService/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts +++ b/TypeScript/18CustomItemService/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts @@ -6,7 +6,7 @@ import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { ISendMessageRequest } from "@spt/models/eft/dialog/ISendMessageRequest"; import { IUserDialogInfo } from "@spt/models/eft/profile/ISptProfile"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -19,7 +19,7 @@ export declare class GiveSptCommand implements ISptCommand { protected presetHelper: PresetHelper; protected mailSendService: MailSendService; protected localeService: LocaleService; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemFilterService: ItemFilterService; protected cloner: ICloner; /** @@ -34,7 +34,7 @@ export declare class GiveSptCommand implements ISptCommand { private static acceptableConfidence; private static excludedPresetItems; protected savedCommand: Map; - constructor(logger: ILogger, itemHelper: ItemHelper, hashUtil: HashUtil, presetHelper: PresetHelper, mailSendService: MailSendService, localeService: LocaleService, databaseServer: DatabaseServer, itemFilterService: ItemFilterService, cloner: ICloner); + constructor(logger: ILogger, itemHelper: ItemHelper, hashUtil: HashUtil, presetHelper: PresetHelper, mailSendService: MailSendService, localeService: LocaleService, databaseService: DatabaseService, itemFilterService: ItemFilterService, cloner: ICloner); getCommand(): string; getCommandHelp(): string; performAction(commandHandler: IUserDialogInfo, sessionId: string, request: ISendMessageRequest): string; diff --git a/TypeScript/18CustomItemService/types/helpers/PresetHelper.d.ts b/TypeScript/18CustomItemService/types/helpers/PresetHelper.d.ts index 5fc8a7c..e71e5b7 100644 --- a/TypeScript/18CustomItemService/types/helpers/PresetHelper.d.ts +++ b/TypeScript/18CustomItemService/types/helpers/PresetHelper.d.ts @@ -1,16 +1,16 @@ import { IPreset } from "@spt/models/eft/common/IGlobals"; import { BaseClasses } from "@spt/models/enums/BaseClasses"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; import { ItemHelper } from "./ItemHelper"; export declare class PresetHelper { - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected cloner: ICloner; protected lookup: Record; protected defaultEquipmentPresets: Record; protected defaultWeaponPresets: Record; - constructor(databaseServer: DatabaseServer, itemHelper: ItemHelper, cloner: ICloner); + constructor(databaseService: DatabaseService, itemHelper: ItemHelper, cloner: ICloner); hydratePresetStore(input: Record): void; /** * Get default weapon and equipment presets diff --git a/TypeScript/18CustomItemService/types/helpers/ProfileHelper.d.ts b/TypeScript/18CustomItemService/types/helpers/ProfileHelper.d.ts index 37937ff..e943bd3 100644 --- a/TypeScript/18CustomItemService/types/helpers/ProfileHelper.d.ts +++ b/TypeScript/18CustomItemService/types/helpers/ProfileHelper.d.ts @@ -7,8 +7,8 @@ import { SkillTypes } from "@spt/models/enums/SkillTypes"; import { IInventoryConfig } from "@spt/models/spt/config/IInventoryConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileSnapshotService } from "@spt/services/ProfileSnapshotService"; import { ICloner } from "@spt/utils/cloners/ICloner"; @@ -21,14 +21,14 @@ export declare class ProfileHelper { protected watermark: Watermark; protected timeUtil: TimeUtil; protected saveServer: SaveServer; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected profileSnapshotService: ProfileSnapshotService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected cloner: ICloner; protected inventoryConfig: IInventoryConfig; - constructor(logger: ILogger, hashUtil: HashUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileSnapshotService: ProfileSnapshotService, localisationService: LocalisationService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, hashUtil: HashUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseService: DatabaseService, itemHelper: ItemHelper, profileSnapshotService: ProfileSnapshotService, localisationService: LocalisationService, configServer: ConfigServer, cloner: ICloner); /** * Remove/reset a completed quest condtion from players profile quest data * @param sessionID Session id diff --git a/TypeScript/18CustomItemService/types/helpers/QuestHelper.d.ts b/TypeScript/18CustomItemService/types/helpers/QuestHelper.d.ts index 39ba2a9..93368fa 100644 --- a/TypeScript/18CustomItemService/types/helpers/QuestHelper.d.ts +++ b/TypeScript/18CustomItemService/types/helpers/QuestHelper.d.ts @@ -18,7 +18,7 @@ import { IQuestConfig } from "@spt/models/spt/config/IQuestConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -30,9 +30,9 @@ export declare class QuestHelper { protected timeUtil: TimeUtil; protected hashUtil: HashUtil; protected itemHelper: ItemHelper; + protected databaseService: DatabaseService; protected questConditionHelper: QuestConditionHelper; protected eventOutputHolder: EventOutputHolder; - protected databaseServer: DatabaseServer; protected localeService: LocaleService; protected ragfairServerHelper: RagfairServerHelper; protected dialogueHelper: DialogueHelper; @@ -45,7 +45,7 @@ export declare class QuestHelper { protected configServer: ConfigServer; protected cloner: ICloner; protected questConfig: IQuestConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, questConditionHelper: QuestConditionHelper, eventOutputHolder: EventOutputHolder, databaseServer: DatabaseServer, localeService: LocaleService, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, localisationService: LocalisationService, traderHelper: TraderHelper, presetHelper: PresetHelper, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, databaseService: DatabaseService, questConditionHelper: QuestConditionHelper, eventOutputHolder: EventOutputHolder, localeService: LocaleService, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, localisationService: LocalisationService, traderHelper: TraderHelper, presetHelper: PresetHelper, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); /** * Get status of a quest in player profile by its id * @param pmcData Profile to search diff --git a/TypeScript/18CustomItemService/types/helpers/RagfairOfferHelper.d.ts b/TypeScript/18CustomItemService/types/helpers/RagfairOfferHelper.d.ts index 27bb081..a08e60a 100644 --- a/TypeScript/18CustomItemService/types/helpers/RagfairOfferHelper.d.ts +++ b/TypeScript/18CustomItemService/types/helpers/RagfairOfferHelper.d.ts @@ -19,8 +19,8 @@ import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -34,7 +34,7 @@ export declare class RagfairOfferHelper { protected timeUtil: TimeUtil; protected hashUtil: HashUtil; protected eventOutputHolder: EventOutputHolder; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected traderHelper: TraderHelper; protected saveServer: SaveServer; protected itemHelper: ItemHelper; @@ -55,7 +55,7 @@ export declare class RagfairOfferHelper { protected static goodSoldTemplate: string; protected ragfairConfig: IRagfairConfig; protected questConfig: IQuestConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, eventOutputHolder: EventOutputHolder, databaseServer: DatabaseServer, traderHelper: TraderHelper, saveServer: SaveServer, itemHelper: ItemHelper, botHelper: BotHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, localeService: LocaleService, localisationService: LocalisationService, mailSendService: MailSendService, configServer: ConfigServer); + constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, eventOutputHolder: EventOutputHolder, databaseService: DatabaseService, traderHelper: TraderHelper, saveServer: SaveServer, itemHelper: ItemHelper, botHelper: BotHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, localeService: LocaleService, localisationService: LocalisationService, mailSendService: MailSendService, configServer: ConfigServer); /** * Passthrough to ragfairOfferService.getOffers(), get flea offers a player should see * @param searchRequest Data from client diff --git a/TypeScript/18CustomItemService/types/helpers/RepairHelper.d.ts b/TypeScript/18CustomItemService/types/helpers/RepairHelper.d.ts index 4bd0577..99a21da 100644 --- a/TypeScript/18CustomItemService/types/helpers/RepairHelper.d.ts +++ b/TypeScript/18CustomItemService/types/helpers/RepairHelper.d.ts @@ -3,17 +3,17 @@ import { ITemplateItem, Props } from "@spt/models/eft/common/tables/ITemplateIte import { IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RepairHelper { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected configServer: ConfigServer; protected cloner: ICloner; protected repairConfig: IRepairConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, configServer: ConfigServer, cloner: ICloner); /** * Alter an items durability after a repair by trader/repair kit * @param itemToRepair item to update durability details diff --git a/TypeScript/18CustomItemService/types/helpers/TraderAssortHelper.d.ts b/TypeScript/18CustomItemService/types/helpers/TraderAssortHelper.d.ts index faf2a9d..8f8f802 100644 --- a/TypeScript/18CustomItemService/types/helpers/TraderAssortHelper.d.ts +++ b/TypeScript/18CustomItemService/types/helpers/TraderAssortHelper.d.ts @@ -9,7 +9,7 @@ import { ITrader, ITraderAssort } from "@spt/models/eft/common/tables/ITrader"; import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; @@ -21,7 +21,7 @@ export declare class TraderAssortHelper { protected logger: ILogger; protected mathUtil: MathUtil; protected timeUtil: TimeUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected assortHelper: AssortHelper; protected paymentHelper: PaymentHelper; @@ -37,7 +37,7 @@ export declare class TraderAssortHelper { protected traderConfig: ITraderConfig; protected mergedQuestAssorts: Record>; protected createdMergedQuestAssorts: boolean; - constructor(logger: ILogger, mathUtil: MathUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, profileHelper: ProfileHelper, assortHelper: AssortHelper, paymentHelper: PaymentHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, localisationService: LocalisationService, traderPurchasePersisterService: TraderPurchasePersisterService, traderHelper: TraderHelper, fenceService: FenceService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, mathUtil: MathUtil, timeUtil: TimeUtil, databaseService: DatabaseService, profileHelper: ProfileHelper, assortHelper: AssortHelper, paymentHelper: PaymentHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, localisationService: LocalisationService, traderPurchasePersisterService: TraderPurchasePersisterService, traderHelper: TraderHelper, fenceService: FenceService, configServer: ConfigServer, cloner: ICloner); /** * Get a traders assorts * Can be used for returning ragfair / fence assorts diff --git a/TypeScript/18CustomItemService/types/helpers/TraderHelper.d.ts b/TypeScript/18CustomItemService/types/helpers/TraderHelper.d.ts index 5f515da..eec1cc7 100644 --- a/TypeScript/18CustomItemService/types/helpers/TraderHelper.d.ts +++ b/TypeScript/18CustomItemService/types/helpers/TraderHelper.d.ts @@ -10,7 +10,7 @@ import { Traders } from "@spt/models/enums/Traders"; import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; @@ -18,7 +18,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class TraderHelper { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected handbookHelper: HandbookHelper; protected itemHelper: ItemHelper; @@ -33,7 +33,7 @@ export declare class TraderHelper { protected highestTraderPriceItems?: Record; /** Dictionary of item tpl and the highest trader buy back rouble price */ protected highestTraderBuyPriceItems?: Record; - constructor(logger: ILogger, databaseServer: DatabaseServer, profileHelper: ProfileHelper, handbookHelper: HandbookHelper, itemHelper: ItemHelper, playerService: PlayerService, localisationService: LocalisationService, fenceService: FenceService, timeUtil: TimeUtil, randomUtil: RandomUtil, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, profileHelper: ProfileHelper, handbookHelper: HandbookHelper, itemHelper: ItemHelper, playerService: PlayerService, localisationService: LocalisationService, fenceService: FenceService, timeUtil: TimeUtil, randomUtil: RandomUtil, configServer: ConfigServer); /** * Get a trader base object, update profile to reflect players current standing in profile * when trader not found in profile diff --git a/TypeScript/18CustomItemService/types/models/eft/common/IGlobals.d.ts b/TypeScript/18CustomItemService/types/models/eft/common/IGlobals.d.ts index 2209415..a0bb051 100644 --- a/TypeScript/18CustomItemService/types/models/eft/common/IGlobals.d.ts +++ b/TypeScript/18CustomItemService/types/models/eft/common/IGlobals.d.ts @@ -802,7 +802,6 @@ export interface IMaxActiveOfferCount { from: number; to: number; count: number; - countForSpecialEditions: number; } export interface IMaxSumForRarity { Common: IRarityMaxSum; diff --git a/TypeScript/18CustomItemService/types/models/eft/common/ILocationBase.d.ts b/TypeScript/18CustomItemService/types/models/eft/common/ILocationBase.d.ts index 65931f8..10f1a57 100644 --- a/TypeScript/18CustomItemService/types/models/eft/common/ILocationBase.d.ts +++ b/TypeScript/18CustomItemService/types/models/eft/common/ILocationBase.d.ts @@ -196,18 +196,24 @@ export interface Props { export interface Exit { /** % Chance out of 100 exit will appear in raid */ Chance: number; + ChancePVE: number; Count: number; + CountPVE: number; EntryPoints: string; EventAvailable: boolean; ExfiltrationTime: number; + ExfiltrationTimePVE: number; ExfiltrationType: string; RequiredSlot?: string; Id: string; MaxTime: number; + MaxTimePVE: number; MinTime: number; + MinTimePVE: number; Name: string; PassageRequirement: string; PlayersCount: number; + PlayersCountPVE: number; RequirementTip: string; Side?: string; } diff --git a/TypeScript/18CustomItemService/types/models/eft/common/tables/IRepeatableQuests.d.ts b/TypeScript/18CustomItemService/types/models/eft/common/tables/IRepeatableQuests.d.ts index 854c8ef..27ff49d 100644 --- a/TypeScript/18CustomItemService/types/models/eft/common/tables/IRepeatableQuests.d.ts +++ b/TypeScript/18CustomItemService/types/models/eft/common/tables/IRepeatableQuests.d.ts @@ -18,10 +18,13 @@ export interface IRepeatableTemplates { export interface IPmcDataRepeatableQuest { id?: string; name: string; + unavailableTime?: string; activeQuests: IRepeatableQuest[]; inactiveQuests: IRepeatableQuest[]; endTime: number; changeRequirement: Record; + freeChanges: number; + freeChangesAvailable: number; } export interface IChangeRequirement { changeCost: IChangeCost[]; diff --git a/TypeScript/18CustomItemService/types/models/eft/common/tables/ITemplateItem.d.ts b/TypeScript/18CustomItemService/types/models/eft/common/tables/ITemplateItem.d.ts index a8ccfbb..e5c6632 100644 --- a/TypeScript/18CustomItemService/types/models/eft/common/tables/ITemplateItem.d.ts +++ b/TypeScript/18CustomItemService/types/models/eft/common/tables/ITemplateItem.d.ts @@ -63,7 +63,7 @@ export interface Props { DiscardingBlock?: boolean; DropSoundType?: string; RagFairCommissionModifier?: number; - RarityPvE: string; + RarityPvE?: string; IsAlwaysAvailableForInsurance?: boolean; DiscardLimit?: number; MaxResource?: number; @@ -414,6 +414,12 @@ export interface Props { LayoutName?: string; Lower75Prefab?: Prefab; MaxUsages?: number; + ScavKillExpPenalty?: number; + ScavKillExpPenaltyPVE?: number; + ScavKillStandingPenalty?: number; + ScavKillStandingPenaltyPVE?: number; + TradersDiscount?: number; + TradersDiscountPVE?: number; } export interface IHealthEffect { type: string; diff --git a/TypeScript/18CustomItemService/types/models/spt/config/IQuestConfig.d.ts b/TypeScript/18CustomItemService/types/models/spt/config/IQuestConfig.d.ts index 362602c..2cdf4fa 100644 --- a/TypeScript/18CustomItemService/types/models/spt/config/IQuestConfig.d.ts +++ b/TypeScript/18CustomItemService/types/models/spt/config/IQuestConfig.d.ts @@ -47,6 +47,8 @@ export interface IRepeatableQuestConfig { /** Item tplIds to ignore when generating rewards */ rewardBlacklist: string[]; rewardAmmoStackMinSize: number; + freeChangesAvailable: number; + freeChanges: number; } export interface IRewardScaling { levels: number[]; diff --git a/TypeScript/18CustomItemService/types/services/BotEquipmentModPoolService.d.ts b/TypeScript/18CustomItemService/types/services/BotEquipmentModPoolService.d.ts index c53f31b..7b2b442 100644 --- a/TypeScript/18CustomItemService/types/services/BotEquipmentModPoolService.d.ts +++ b/TypeScript/18CustomItemService/types/services/BotEquipmentModPoolService.d.ts @@ -4,7 +4,7 @@ import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { VFS } from "@spt/utils/VFS"; /** Store a mapping between weapons, their slots and the items that fit those slots */ @@ -12,7 +12,7 @@ export declare class BotEquipmentModPoolService { protected logger: ILogger; protected vfs: VFS; protected itemHelper: ItemHelper; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected botConfig: IBotConfig; @@ -20,7 +20,7 @@ export declare class BotEquipmentModPoolService { protected gearModPool: Mods; protected weaponPoolGenerated: boolean; protected armorPoolGenerated: boolean; - constructor(logger: ILogger, vfs: VFS, itemHelper: ItemHelper, databaseServer: DatabaseServer, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, vfs: VFS, itemHelper: ItemHelper, databaseService: DatabaseService, localisationService: LocalisationService, configServer: ConfigServer); /** * Store dictionary of mods for each item passed in * @param items items to find related mods and store in modPool diff --git a/TypeScript/18CustomItemService/types/services/CustomLocationWaveService.d.ts b/TypeScript/18CustomItemService/types/services/CustomLocationWaveService.d.ts index 728a1e8..c72d5bb 100644 --- a/TypeScript/18CustomItemService/types/services/CustomLocationWaveService.d.ts +++ b/TypeScript/18CustomItemService/types/services/CustomLocationWaveService.d.ts @@ -2,15 +2,15 @@ import { BossLocationSpawn, Wave } from "@spt/models/eft/common/ILocationBase"; import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class CustomLocationWaveService { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, configServer: ConfigServer); /** * Add a boss wave to a map * @param locationId e.g. factory4_day, bigmap diff --git a/TypeScript/18CustomItemService/types/services/InsuranceService.d.ts b/TypeScript/18CustomItemService/types/services/InsuranceService.d.ts index c54f9f9..0000e66 100644 --- a/TypeScript/18CustomItemService/types/services/InsuranceService.d.ts +++ b/TypeScript/18CustomItemService/types/services/InsuranceService.d.ts @@ -13,8 +13,8 @@ import { ILostOnDeathConfig } from "@spt/models/spt/config/ILostOnDeathConfig"; import { IInsuranceEquipmentPkg } from "@spt/models/spt/services/IInsuranceEquipmentPkg"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -24,7 +24,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class InsuranceService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected secureContainerHelper: SecureContainerHelper; protected randomUtil: RandomUtil; protected itemHelper: ItemHelper; @@ -42,7 +42,7 @@ export declare class InsuranceService { protected insured: Record>; protected insuranceConfig: IInsuranceConfig; protected lostOnDeathConfig: ILostOnDeathConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, handbookHelper: HandbookHelper, localisationService: LocalisationService, localeService: LocaleService, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, databaseService: DatabaseService, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, handbookHelper: HandbookHelper, localisationService: LocalisationService, localeService: LocaleService, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); /** * Does player have insurance array * @param sessionId Player id diff --git a/TypeScript/18CustomItemService/types/services/MailSendService.d.ts b/TypeScript/18CustomItemService/types/services/MailSendService.d.ts index d445841..8f1f974 100644 --- a/TypeScript/18CustomItemService/types/services/MailSendService.d.ts +++ b/TypeScript/18CustomItemService/types/services/MailSendService.d.ts @@ -9,8 +9,8 @@ import { MessageType } from "@spt/models/enums/MessageType"; import { Traders } from "@spt/models/enums/Traders"; import { IProfileChangeEvent, ISendMessageDetails } from "@spt/models/spt/dialog/ISendMessageDetails"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; @@ -19,7 +19,7 @@ export declare class MailSendService { protected hashUtil: HashUtil; protected timeUtil: TimeUtil; protected saveServer: SaveServer; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected notifierHelper: NotifierHelper; protected dialogueHelper: DialogueHelper; protected notificationSendHelper: NotificationSendHelper; @@ -27,7 +27,7 @@ export declare class MailSendService { protected itemHelper: ItemHelper; protected traderHelper: TraderHelper; protected readonly systemSenderId = "59e7125688a45068a6249071"; - constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, dialogueHelper: DialogueHelper, notificationSendHelper: NotificationSendHelper, localisationService: LocalisationService, itemHelper: ItemHelper, traderHelper: TraderHelper); + constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseService: DatabaseService, notifierHelper: NotifierHelper, dialogueHelper: DialogueHelper, notificationSendHelper: NotificationSendHelper, localisationService: LocalisationService, itemHelper: ItemHelper, traderHelper: TraderHelper); /** * Send a message from an NPC (e.g. prapor) to the player with or without items using direct message text, do not look up any locale * @param sessionId The session ID to send the message to diff --git a/TypeScript/18CustomItemService/types/services/OpenZoneService.d.ts b/TypeScript/18CustomItemService/types/services/OpenZoneService.d.ts index 1bc5f00..c7dd0bd 100644 --- a/TypeScript/18CustomItemService/types/services/OpenZoneService.d.ts +++ b/TypeScript/18CustomItemService/types/services/OpenZoneService.d.ts @@ -1,18 +1,18 @@ import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RandomUtil } from "@spt/utils/RandomUtil"; /** Service for adding new zones to a maps OpenZones property */ export declare class OpenZoneService { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, localisationService: LocalisationService, configServer: ConfigServer); /** * Add open zone to specified map * @param locationId map location (e.g. factory4_day) diff --git a/TypeScript/18CustomItemService/types/services/PaymentService.d.ts b/TypeScript/18CustomItemService/types/services/PaymentService.d.ts index 64ff2c1..61d5731 100644 --- a/TypeScript/18CustomItemService/types/services/PaymentService.d.ts +++ b/TypeScript/18CustomItemService/types/services/PaymentService.d.ts @@ -9,7 +9,7 @@ import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRo import { IProcessBuyTradeRequestData } from "@spt/models/eft/trade/IProcessBuyTradeRequestData"; import { IProcessSellTradeRequestData } from "@spt/models/eft/trade/IProcessSellTradeRequestData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; @@ -17,14 +17,14 @@ export declare class PaymentService { protected logger: ILogger; protected hashUtil: HashUtil; protected httpResponse: HttpResponseUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected handbookHelper: HandbookHelper; protected traderHelper: TraderHelper; protected itemHelper: ItemHelper; protected inventoryHelper: InventoryHelper; protected localisationService: LocalisationService; protected paymentHelper: PaymentHelper; - constructor(logger: ILogger, hashUtil: HashUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, localisationService: LocalisationService, paymentHelper: PaymentHelper); + constructor(logger: ILogger, hashUtil: HashUtil, httpResponse: HttpResponseUtil, databaseService: DatabaseService, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, localisationService: LocalisationService, paymentHelper: PaymentHelper); /** * Take money and insert items into return to server request * @param pmcData Pmc profile diff --git a/TypeScript/18CustomItemService/types/services/PlayerService.d.ts b/TypeScript/18CustomItemService/types/services/PlayerService.d.ts index ae57410..84c4c6f 100644 --- a/TypeScript/18CustomItemService/types/services/PlayerService.d.ts +++ b/TypeScript/18CustomItemService/types/services/PlayerService.d.ts @@ -1,14 +1,14 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class PlayerService { protected logger: ILogger; protected timeUtil: TimeUtil; protected localisationService: LocalisationService; - protected databaseServer: DatabaseServer; - constructor(logger: ILogger, timeUtil: TimeUtil, localisationService: LocalisationService, databaseServer: DatabaseServer); + protected databaseService: DatabaseService; + constructor(logger: ILogger, timeUtil: TimeUtil, localisationService: LocalisationService, databaseService: DatabaseService); /** * Get level of player * @param pmcData Player profile diff --git a/TypeScript/18CustomItemService/types/services/RagfairLinkedItemService.d.ts b/TypeScript/18CustomItemService/types/services/RagfairLinkedItemService.d.ts index 6011c1a..0d03459 100644 --- a/TypeScript/18CustomItemService/types/services/RagfairLinkedItemService.d.ts +++ b/TypeScript/18CustomItemService/types/services/RagfairLinkedItemService.d.ts @@ -1,11 +1,11 @@ import { ItemHelper } from "@spt/helpers/ItemHelper"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; export declare class RagfairLinkedItemService { - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected linkedItemsCache: Record>; - constructor(databaseServer: DatabaseServer, itemHelper: ItemHelper); + constructor(databaseService: DatabaseService, itemHelper: ItemHelper); getLinkedItems(linkedSearchId: string): Set; /** * Use ragfair linked item service to get an array of items that can fit on or in designated itemtpl diff --git a/TypeScript/18CustomItemService/types/services/RagfairOfferService.d.ts b/TypeScript/18CustomItemService/types/services/RagfairOfferService.d.ts index c044f6d..4bc07c3 100644 --- a/TypeScript/18CustomItemService/types/services/RagfairOfferService.d.ts +++ b/TypeScript/18CustomItemService/types/services/RagfairOfferService.d.ts @@ -6,8 +6,8 @@ import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RagfairOfferHolder } from "@spt/utils/RagfairOfferHolder"; @@ -15,7 +15,7 @@ import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class RagfairOfferService { protected logger: ILogger; protected timeUtil: TimeUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected saveServer: SaveServer; protected ragfairServerHelper: RagfairServerHelper; protected profileHelper: ProfileHelper; @@ -28,7 +28,7 @@ export declare class RagfairOfferService { protected expiredOffers: Record; protected ragfairConfig: IRagfairConfig; protected ragfairOfferHandler: RagfairOfferHolder; - constructor(logger: ILogger, timeUtil: TimeUtil, databaseServer: DatabaseServer, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, eventOutputHolder: EventOutputHolder, httpResponse: HttpResponseUtil, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, timeUtil: TimeUtil, databaseService: DatabaseService, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, eventOutputHolder: EventOutputHolder, httpResponse: HttpResponseUtil, localisationService: LocalisationService, configServer: ConfigServer); /** * Get all offers * @returns IRagfairOffer array diff --git a/TypeScript/18CustomItemService/types/services/RagfairPriceService.d.ts b/TypeScript/18CustomItemService/types/services/RagfairPriceService.d.ts index 5b8fa56..0a2f26e 100644 --- a/TypeScript/18CustomItemService/types/services/RagfairPriceService.d.ts +++ b/TypeScript/18CustomItemService/types/services/RagfairPriceService.d.ts @@ -12,7 +12,7 @@ import { IRagfairConfig, IUnreasonableModPrices } from "@spt/models/spt/config/I import { IRagfairServerPrices } from "@spt/models/spt/ragfair/IRagfairServerPrices"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RandomUtil } from "@spt/utils/RandomUtil"; /** @@ -20,7 +20,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; */ export declare class RagfairPriceService implements OnLoad { protected handbookHelper: HandbookHelper; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected logger: ILogger; protected itemHelper: ItemHelper; protected presetHelper: PresetHelper; @@ -30,7 +30,7 @@ export declare class RagfairPriceService implements OnLoad { protected configServer: ConfigServer; protected ragfairConfig: IRagfairConfig; protected prices: IRagfairServerPrices; - constructor(handbookHelper: HandbookHelper, databaseServer: DatabaseServer, logger: ILogger, itemHelper: ItemHelper, presetHelper: PresetHelper, traderHelper: TraderHelper, randomUtil: RandomUtil, localisationService: LocalisationService, configServer: ConfigServer); + constructor(handbookHelper: HandbookHelper, databaseService: DatabaseService, logger: ILogger, itemHelper: ItemHelper, presetHelper: PresetHelper, traderHelper: TraderHelper, randomUtil: RandomUtil, localisationService: LocalisationService, configServer: ConfigServer); /** * Generate static (handbook) and dynamic (prices.json) flea prices, store inside class as dictionaries */ diff --git a/TypeScript/18CustomItemService/types/services/RagfairTaxService.d.ts b/TypeScript/18CustomItemService/types/services/RagfairTaxService.d.ts index 4e4e648..effb9f0 100644 --- a/TypeScript/18CustomItemService/types/services/RagfairTaxService.d.ts +++ b/TypeScript/18CustomItemService/types/services/RagfairTaxService.d.ts @@ -4,15 +4,15 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { IStorePlayerOfferTaxAmountRequestData } from "@spt/models/eft/ragfair/IStorePlayerOfferTaxAmountRequestData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; export declare class RagfairTaxService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected ragfairPriceService: RagfairPriceService; protected itemHelper: ItemHelper; protected playerOfferTaxCache: Record; - constructor(logger: ILogger, databaseServer: DatabaseServer, ragfairPriceService: RagfairPriceService, itemHelper: ItemHelper); + constructor(logger: ILogger, databaseService: DatabaseService, ragfairPriceService: RagfairPriceService, itemHelper: ItemHelper); storeClientOfferTaxValue(sessionId: string, offer: IStorePlayerOfferTaxAmountRequestData): void; clearStoredOfferTaxById(offerIdToRemove: string): void; getStoredClientOfferTaxValueById(offerIdToGet: string): IStorePlayerOfferTaxAmountRequestData; diff --git a/TypeScript/18CustomItemService/types/services/RaidTimeAdjustmentService.d.ts b/TypeScript/18CustomItemService/types/services/RaidTimeAdjustmentService.d.ts index f770b64..bfc099a 100644 --- a/TypeScript/18CustomItemService/types/services/RaidTimeAdjustmentService.d.ts +++ b/TypeScript/18CustomItemService/types/services/RaidTimeAdjustmentService.d.ts @@ -7,17 +7,17 @@ import { ILocationConfig, IScavRaidTimeLocationSettings, LootMultiplier } from " import { IRaidChanges } from "@spt/models/spt/location/IRaidChanges"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RaidTimeAdjustmentService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected randomUtil: RandomUtil; protected weightedRandomHelper: WeightedRandomHelper; protected applicationContext: ApplicationContext; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, applicationContext: ApplicationContext, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, applicationContext: ApplicationContext, configServer: ConfigServer); /** * Make alterations to the base map data passed in * Loot multipliers/waves/wave start times diff --git a/TypeScript/18CustomItemService/types/services/RepairService.d.ts b/TypeScript/18CustomItemService/types/services/RepairService.d.ts index 9203417..48f306e 100644 --- a/TypeScript/18CustomItemService/types/services/RepairService.d.ts +++ b/TypeScript/18CustomItemService/types/services/RepairService.d.ts @@ -14,13 +14,13 @@ import { SkillTypes } from "@spt/models/enums/SkillTypes"; import { BonusSettings, IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RepairService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected randomUtil: RandomUtil; protected itemHelper: ItemHelper; @@ -31,7 +31,7 @@ export declare class RepairService { protected localisationService: LocalisationService; protected configServer: ConfigServer; protected repairConfig: IRepairConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, profileHelper: ProfileHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, traderHelper: TraderHelper, weightedRandomHelper: WeightedRandomHelper, paymentService: PaymentService, repairHelper: RepairHelper, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, profileHelper: ProfileHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, traderHelper: TraderHelper, weightedRandomHelper: WeightedRandomHelper, paymentService: PaymentService, repairHelper: RepairHelper, localisationService: LocalisationService, configServer: ConfigServer); /** * Use trader to repair an items durability * @param sessionID Session id diff --git a/TypeScript/18CustomItemService/types/services/TraderServicesService.d.ts b/TypeScript/18CustomItemService/types/services/TraderServicesService.d.ts index 111c71a..e441eb6 100644 --- a/TypeScript/18CustomItemService/types/services/TraderServicesService.d.ts +++ b/TypeScript/18CustomItemService/types/services/TraderServicesService.d.ts @@ -1,13 +1,13 @@ import { ProfileHelper } from "@spt/helpers/ProfileHelper"; import { ITraderServiceModel } from "@spt/models/spt/services/ITraderServiceModel"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderServicesService { protected profileHelper: ProfileHelper; protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected cloner: ICloner; - constructor(profileHelper: ProfileHelper, logger: ILogger, databaseServer: DatabaseServer, cloner: ICloner); + constructor(profileHelper: ProfileHelper, logger: ILogger, databaseService: DatabaseService, cloner: ICloner); getTraderServices(sessionId: string, traderId: string): ITraderServiceModel[]; } diff --git a/TypeScript/18CustomItemService/types/services/mod/CustomItemService.d.ts b/TypeScript/18CustomItemService/types/services/mod/CustomItemService.d.ts index 6dc4730..1926bed 100644 --- a/TypeScript/18CustomItemService/types/services/mod/CustomItemService.d.ts +++ b/TypeScript/18CustomItemService/types/services/mod/CustomItemService.d.ts @@ -9,11 +9,11 @@ import { HashUtil } from "@spt/utils/HashUtil"; export declare class CustomItemService { protected logger: ILogger; protected hashUtil: HashUtil; - protected databaseServer: DatabaseService; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected itemBaseClassService: ItemBaseClassService; protected cloner: ICloner; - constructor(logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseService, itemHelper: ItemHelper, itemBaseClassService: ItemBaseClassService, cloner: ICloner); + constructor(logger: ILogger, hashUtil: HashUtil, databaseService: DatabaseService, itemHelper: ItemHelper, itemBaseClassService: ItemBaseClassService, cloner: ICloner); /** * Create a new item from a cloned item base * WARNING - If no item id is supplied, an id will be generated, this id will be random every time you add an item and will not be the same on each subsequent server start diff --git a/TypeScript/19UseExternalLibraries/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts b/TypeScript/19UseExternalLibraries/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts index a7491b5..c51bf7e 100644 --- a/TypeScript/19UseExternalLibraries/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts +++ b/TypeScript/19UseExternalLibraries/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts @@ -6,7 +6,7 @@ import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { ISendMessageRequest } from "@spt/models/eft/dialog/ISendMessageRequest"; import { IUserDialogInfo } from "@spt/models/eft/profile/ISptProfile"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -19,7 +19,7 @@ export declare class GiveSptCommand implements ISptCommand { protected presetHelper: PresetHelper; protected mailSendService: MailSendService; protected localeService: LocaleService; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemFilterService: ItemFilterService; protected cloner: ICloner; /** @@ -34,7 +34,7 @@ export declare class GiveSptCommand implements ISptCommand { private static acceptableConfidence; private static excludedPresetItems; protected savedCommand: Map; - constructor(logger: ILogger, itemHelper: ItemHelper, hashUtil: HashUtil, presetHelper: PresetHelper, mailSendService: MailSendService, localeService: LocaleService, databaseServer: DatabaseServer, itemFilterService: ItemFilterService, cloner: ICloner); + constructor(logger: ILogger, itemHelper: ItemHelper, hashUtil: HashUtil, presetHelper: PresetHelper, mailSendService: MailSendService, localeService: LocaleService, databaseService: DatabaseService, itemFilterService: ItemFilterService, cloner: ICloner); getCommand(): string; getCommandHelp(): string; performAction(commandHandler: IUserDialogInfo, sessionId: string, request: ISendMessageRequest): string; diff --git a/TypeScript/19UseExternalLibraries/types/helpers/PresetHelper.d.ts b/TypeScript/19UseExternalLibraries/types/helpers/PresetHelper.d.ts index 5fc8a7c..e71e5b7 100644 --- a/TypeScript/19UseExternalLibraries/types/helpers/PresetHelper.d.ts +++ b/TypeScript/19UseExternalLibraries/types/helpers/PresetHelper.d.ts @@ -1,16 +1,16 @@ import { IPreset } from "@spt/models/eft/common/IGlobals"; import { BaseClasses } from "@spt/models/enums/BaseClasses"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; import { ItemHelper } from "./ItemHelper"; export declare class PresetHelper { - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected cloner: ICloner; protected lookup: Record; protected defaultEquipmentPresets: Record; protected defaultWeaponPresets: Record; - constructor(databaseServer: DatabaseServer, itemHelper: ItemHelper, cloner: ICloner); + constructor(databaseService: DatabaseService, itemHelper: ItemHelper, cloner: ICloner); hydratePresetStore(input: Record): void; /** * Get default weapon and equipment presets diff --git a/TypeScript/19UseExternalLibraries/types/helpers/ProfileHelper.d.ts b/TypeScript/19UseExternalLibraries/types/helpers/ProfileHelper.d.ts index 37937ff..e943bd3 100644 --- a/TypeScript/19UseExternalLibraries/types/helpers/ProfileHelper.d.ts +++ b/TypeScript/19UseExternalLibraries/types/helpers/ProfileHelper.d.ts @@ -7,8 +7,8 @@ import { SkillTypes } from "@spt/models/enums/SkillTypes"; import { IInventoryConfig } from "@spt/models/spt/config/IInventoryConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileSnapshotService } from "@spt/services/ProfileSnapshotService"; import { ICloner } from "@spt/utils/cloners/ICloner"; @@ -21,14 +21,14 @@ export declare class ProfileHelper { protected watermark: Watermark; protected timeUtil: TimeUtil; protected saveServer: SaveServer; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected profileSnapshotService: ProfileSnapshotService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected cloner: ICloner; protected inventoryConfig: IInventoryConfig; - constructor(logger: ILogger, hashUtil: HashUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileSnapshotService: ProfileSnapshotService, localisationService: LocalisationService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, hashUtil: HashUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseService: DatabaseService, itemHelper: ItemHelper, profileSnapshotService: ProfileSnapshotService, localisationService: LocalisationService, configServer: ConfigServer, cloner: ICloner); /** * Remove/reset a completed quest condtion from players profile quest data * @param sessionID Session id diff --git a/TypeScript/19UseExternalLibraries/types/helpers/QuestHelper.d.ts b/TypeScript/19UseExternalLibraries/types/helpers/QuestHelper.d.ts index 39ba2a9..93368fa 100644 --- a/TypeScript/19UseExternalLibraries/types/helpers/QuestHelper.d.ts +++ b/TypeScript/19UseExternalLibraries/types/helpers/QuestHelper.d.ts @@ -18,7 +18,7 @@ import { IQuestConfig } from "@spt/models/spt/config/IQuestConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -30,9 +30,9 @@ export declare class QuestHelper { protected timeUtil: TimeUtil; protected hashUtil: HashUtil; protected itemHelper: ItemHelper; + protected databaseService: DatabaseService; protected questConditionHelper: QuestConditionHelper; protected eventOutputHolder: EventOutputHolder; - protected databaseServer: DatabaseServer; protected localeService: LocaleService; protected ragfairServerHelper: RagfairServerHelper; protected dialogueHelper: DialogueHelper; @@ -45,7 +45,7 @@ export declare class QuestHelper { protected configServer: ConfigServer; protected cloner: ICloner; protected questConfig: IQuestConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, questConditionHelper: QuestConditionHelper, eventOutputHolder: EventOutputHolder, databaseServer: DatabaseServer, localeService: LocaleService, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, localisationService: LocalisationService, traderHelper: TraderHelper, presetHelper: PresetHelper, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, databaseService: DatabaseService, questConditionHelper: QuestConditionHelper, eventOutputHolder: EventOutputHolder, localeService: LocaleService, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, localisationService: LocalisationService, traderHelper: TraderHelper, presetHelper: PresetHelper, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); /** * Get status of a quest in player profile by its id * @param pmcData Profile to search diff --git a/TypeScript/19UseExternalLibraries/types/helpers/RagfairOfferHelper.d.ts b/TypeScript/19UseExternalLibraries/types/helpers/RagfairOfferHelper.d.ts index 27bb081..a08e60a 100644 --- a/TypeScript/19UseExternalLibraries/types/helpers/RagfairOfferHelper.d.ts +++ b/TypeScript/19UseExternalLibraries/types/helpers/RagfairOfferHelper.d.ts @@ -19,8 +19,8 @@ import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -34,7 +34,7 @@ export declare class RagfairOfferHelper { protected timeUtil: TimeUtil; protected hashUtil: HashUtil; protected eventOutputHolder: EventOutputHolder; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected traderHelper: TraderHelper; protected saveServer: SaveServer; protected itemHelper: ItemHelper; @@ -55,7 +55,7 @@ export declare class RagfairOfferHelper { protected static goodSoldTemplate: string; protected ragfairConfig: IRagfairConfig; protected questConfig: IQuestConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, eventOutputHolder: EventOutputHolder, databaseServer: DatabaseServer, traderHelper: TraderHelper, saveServer: SaveServer, itemHelper: ItemHelper, botHelper: BotHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, localeService: LocaleService, localisationService: LocalisationService, mailSendService: MailSendService, configServer: ConfigServer); + constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, eventOutputHolder: EventOutputHolder, databaseService: DatabaseService, traderHelper: TraderHelper, saveServer: SaveServer, itemHelper: ItemHelper, botHelper: BotHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, localeService: LocaleService, localisationService: LocalisationService, mailSendService: MailSendService, configServer: ConfigServer); /** * Passthrough to ragfairOfferService.getOffers(), get flea offers a player should see * @param searchRequest Data from client diff --git a/TypeScript/19UseExternalLibraries/types/helpers/RepairHelper.d.ts b/TypeScript/19UseExternalLibraries/types/helpers/RepairHelper.d.ts index 4bd0577..99a21da 100644 --- a/TypeScript/19UseExternalLibraries/types/helpers/RepairHelper.d.ts +++ b/TypeScript/19UseExternalLibraries/types/helpers/RepairHelper.d.ts @@ -3,17 +3,17 @@ import { ITemplateItem, Props } from "@spt/models/eft/common/tables/ITemplateIte import { IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RepairHelper { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected configServer: ConfigServer; protected cloner: ICloner; protected repairConfig: IRepairConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, configServer: ConfigServer, cloner: ICloner); /** * Alter an items durability after a repair by trader/repair kit * @param itemToRepair item to update durability details diff --git a/TypeScript/19UseExternalLibraries/types/helpers/TraderAssortHelper.d.ts b/TypeScript/19UseExternalLibraries/types/helpers/TraderAssortHelper.d.ts index faf2a9d..8f8f802 100644 --- a/TypeScript/19UseExternalLibraries/types/helpers/TraderAssortHelper.d.ts +++ b/TypeScript/19UseExternalLibraries/types/helpers/TraderAssortHelper.d.ts @@ -9,7 +9,7 @@ import { ITrader, ITraderAssort } from "@spt/models/eft/common/tables/ITrader"; import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; @@ -21,7 +21,7 @@ export declare class TraderAssortHelper { protected logger: ILogger; protected mathUtil: MathUtil; protected timeUtil: TimeUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected assortHelper: AssortHelper; protected paymentHelper: PaymentHelper; @@ -37,7 +37,7 @@ export declare class TraderAssortHelper { protected traderConfig: ITraderConfig; protected mergedQuestAssorts: Record>; protected createdMergedQuestAssorts: boolean; - constructor(logger: ILogger, mathUtil: MathUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, profileHelper: ProfileHelper, assortHelper: AssortHelper, paymentHelper: PaymentHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, localisationService: LocalisationService, traderPurchasePersisterService: TraderPurchasePersisterService, traderHelper: TraderHelper, fenceService: FenceService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, mathUtil: MathUtil, timeUtil: TimeUtil, databaseService: DatabaseService, profileHelper: ProfileHelper, assortHelper: AssortHelper, paymentHelper: PaymentHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, localisationService: LocalisationService, traderPurchasePersisterService: TraderPurchasePersisterService, traderHelper: TraderHelper, fenceService: FenceService, configServer: ConfigServer, cloner: ICloner); /** * Get a traders assorts * Can be used for returning ragfair / fence assorts diff --git a/TypeScript/19UseExternalLibraries/types/helpers/TraderHelper.d.ts b/TypeScript/19UseExternalLibraries/types/helpers/TraderHelper.d.ts index 5f515da..eec1cc7 100644 --- a/TypeScript/19UseExternalLibraries/types/helpers/TraderHelper.d.ts +++ b/TypeScript/19UseExternalLibraries/types/helpers/TraderHelper.d.ts @@ -10,7 +10,7 @@ import { Traders } from "@spt/models/enums/Traders"; import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; @@ -18,7 +18,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class TraderHelper { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected handbookHelper: HandbookHelper; protected itemHelper: ItemHelper; @@ -33,7 +33,7 @@ export declare class TraderHelper { protected highestTraderPriceItems?: Record; /** Dictionary of item tpl and the highest trader buy back rouble price */ protected highestTraderBuyPriceItems?: Record; - constructor(logger: ILogger, databaseServer: DatabaseServer, profileHelper: ProfileHelper, handbookHelper: HandbookHelper, itemHelper: ItemHelper, playerService: PlayerService, localisationService: LocalisationService, fenceService: FenceService, timeUtil: TimeUtil, randomUtil: RandomUtil, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, profileHelper: ProfileHelper, handbookHelper: HandbookHelper, itemHelper: ItemHelper, playerService: PlayerService, localisationService: LocalisationService, fenceService: FenceService, timeUtil: TimeUtil, randomUtil: RandomUtil, configServer: ConfigServer); /** * Get a trader base object, update profile to reflect players current standing in profile * when trader not found in profile diff --git a/TypeScript/19UseExternalLibraries/types/models/eft/common/IGlobals.d.ts b/TypeScript/19UseExternalLibraries/types/models/eft/common/IGlobals.d.ts index 2209415..a0bb051 100644 --- a/TypeScript/19UseExternalLibraries/types/models/eft/common/IGlobals.d.ts +++ b/TypeScript/19UseExternalLibraries/types/models/eft/common/IGlobals.d.ts @@ -802,7 +802,6 @@ export interface IMaxActiveOfferCount { from: number; to: number; count: number; - countForSpecialEditions: number; } export interface IMaxSumForRarity { Common: IRarityMaxSum; diff --git a/TypeScript/19UseExternalLibraries/types/models/eft/common/ILocationBase.d.ts b/TypeScript/19UseExternalLibraries/types/models/eft/common/ILocationBase.d.ts index 65931f8..10f1a57 100644 --- a/TypeScript/19UseExternalLibraries/types/models/eft/common/ILocationBase.d.ts +++ b/TypeScript/19UseExternalLibraries/types/models/eft/common/ILocationBase.d.ts @@ -196,18 +196,24 @@ export interface Props { export interface Exit { /** % Chance out of 100 exit will appear in raid */ Chance: number; + ChancePVE: number; Count: number; + CountPVE: number; EntryPoints: string; EventAvailable: boolean; ExfiltrationTime: number; + ExfiltrationTimePVE: number; ExfiltrationType: string; RequiredSlot?: string; Id: string; MaxTime: number; + MaxTimePVE: number; MinTime: number; + MinTimePVE: number; Name: string; PassageRequirement: string; PlayersCount: number; + PlayersCountPVE: number; RequirementTip: string; Side?: string; } diff --git a/TypeScript/19UseExternalLibraries/types/models/eft/common/tables/IRepeatableQuests.d.ts b/TypeScript/19UseExternalLibraries/types/models/eft/common/tables/IRepeatableQuests.d.ts index 854c8ef..27ff49d 100644 --- a/TypeScript/19UseExternalLibraries/types/models/eft/common/tables/IRepeatableQuests.d.ts +++ b/TypeScript/19UseExternalLibraries/types/models/eft/common/tables/IRepeatableQuests.d.ts @@ -18,10 +18,13 @@ export interface IRepeatableTemplates { export interface IPmcDataRepeatableQuest { id?: string; name: string; + unavailableTime?: string; activeQuests: IRepeatableQuest[]; inactiveQuests: IRepeatableQuest[]; endTime: number; changeRequirement: Record; + freeChanges: number; + freeChangesAvailable: number; } export interface IChangeRequirement { changeCost: IChangeCost[]; diff --git a/TypeScript/19UseExternalLibraries/types/models/eft/common/tables/ITemplateItem.d.ts b/TypeScript/19UseExternalLibraries/types/models/eft/common/tables/ITemplateItem.d.ts index a8ccfbb..e5c6632 100644 --- a/TypeScript/19UseExternalLibraries/types/models/eft/common/tables/ITemplateItem.d.ts +++ b/TypeScript/19UseExternalLibraries/types/models/eft/common/tables/ITemplateItem.d.ts @@ -63,7 +63,7 @@ export interface Props { DiscardingBlock?: boolean; DropSoundType?: string; RagFairCommissionModifier?: number; - RarityPvE: string; + RarityPvE?: string; IsAlwaysAvailableForInsurance?: boolean; DiscardLimit?: number; MaxResource?: number; @@ -414,6 +414,12 @@ export interface Props { LayoutName?: string; Lower75Prefab?: Prefab; MaxUsages?: number; + ScavKillExpPenalty?: number; + ScavKillExpPenaltyPVE?: number; + ScavKillStandingPenalty?: number; + ScavKillStandingPenaltyPVE?: number; + TradersDiscount?: number; + TradersDiscountPVE?: number; } export interface IHealthEffect { type: string; diff --git a/TypeScript/19UseExternalLibraries/types/models/spt/config/IQuestConfig.d.ts b/TypeScript/19UseExternalLibraries/types/models/spt/config/IQuestConfig.d.ts index 362602c..2cdf4fa 100644 --- a/TypeScript/19UseExternalLibraries/types/models/spt/config/IQuestConfig.d.ts +++ b/TypeScript/19UseExternalLibraries/types/models/spt/config/IQuestConfig.d.ts @@ -47,6 +47,8 @@ export interface IRepeatableQuestConfig { /** Item tplIds to ignore when generating rewards */ rewardBlacklist: string[]; rewardAmmoStackMinSize: number; + freeChangesAvailable: number; + freeChanges: number; } export interface IRewardScaling { levels: number[]; diff --git a/TypeScript/19UseExternalLibraries/types/services/BotEquipmentModPoolService.d.ts b/TypeScript/19UseExternalLibraries/types/services/BotEquipmentModPoolService.d.ts index c53f31b..7b2b442 100644 --- a/TypeScript/19UseExternalLibraries/types/services/BotEquipmentModPoolService.d.ts +++ b/TypeScript/19UseExternalLibraries/types/services/BotEquipmentModPoolService.d.ts @@ -4,7 +4,7 @@ import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { VFS } from "@spt/utils/VFS"; /** Store a mapping between weapons, their slots and the items that fit those slots */ @@ -12,7 +12,7 @@ export declare class BotEquipmentModPoolService { protected logger: ILogger; protected vfs: VFS; protected itemHelper: ItemHelper; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected botConfig: IBotConfig; @@ -20,7 +20,7 @@ export declare class BotEquipmentModPoolService { protected gearModPool: Mods; protected weaponPoolGenerated: boolean; protected armorPoolGenerated: boolean; - constructor(logger: ILogger, vfs: VFS, itemHelper: ItemHelper, databaseServer: DatabaseServer, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, vfs: VFS, itemHelper: ItemHelper, databaseService: DatabaseService, localisationService: LocalisationService, configServer: ConfigServer); /** * Store dictionary of mods for each item passed in * @param items items to find related mods and store in modPool diff --git a/TypeScript/19UseExternalLibraries/types/services/CustomLocationWaveService.d.ts b/TypeScript/19UseExternalLibraries/types/services/CustomLocationWaveService.d.ts index 728a1e8..c72d5bb 100644 --- a/TypeScript/19UseExternalLibraries/types/services/CustomLocationWaveService.d.ts +++ b/TypeScript/19UseExternalLibraries/types/services/CustomLocationWaveService.d.ts @@ -2,15 +2,15 @@ import { BossLocationSpawn, Wave } from "@spt/models/eft/common/ILocationBase"; import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class CustomLocationWaveService { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, configServer: ConfigServer); /** * Add a boss wave to a map * @param locationId e.g. factory4_day, bigmap diff --git a/TypeScript/19UseExternalLibraries/types/services/InsuranceService.d.ts b/TypeScript/19UseExternalLibraries/types/services/InsuranceService.d.ts index c54f9f9..0000e66 100644 --- a/TypeScript/19UseExternalLibraries/types/services/InsuranceService.d.ts +++ b/TypeScript/19UseExternalLibraries/types/services/InsuranceService.d.ts @@ -13,8 +13,8 @@ import { ILostOnDeathConfig } from "@spt/models/spt/config/ILostOnDeathConfig"; import { IInsuranceEquipmentPkg } from "@spt/models/spt/services/IInsuranceEquipmentPkg"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -24,7 +24,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class InsuranceService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected secureContainerHelper: SecureContainerHelper; protected randomUtil: RandomUtil; protected itemHelper: ItemHelper; @@ -42,7 +42,7 @@ export declare class InsuranceService { protected insured: Record>; protected insuranceConfig: IInsuranceConfig; protected lostOnDeathConfig: ILostOnDeathConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, handbookHelper: HandbookHelper, localisationService: LocalisationService, localeService: LocaleService, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, databaseService: DatabaseService, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, handbookHelper: HandbookHelper, localisationService: LocalisationService, localeService: LocaleService, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); /** * Does player have insurance array * @param sessionId Player id diff --git a/TypeScript/19UseExternalLibraries/types/services/MailSendService.d.ts b/TypeScript/19UseExternalLibraries/types/services/MailSendService.d.ts index d445841..8f1f974 100644 --- a/TypeScript/19UseExternalLibraries/types/services/MailSendService.d.ts +++ b/TypeScript/19UseExternalLibraries/types/services/MailSendService.d.ts @@ -9,8 +9,8 @@ import { MessageType } from "@spt/models/enums/MessageType"; import { Traders } from "@spt/models/enums/Traders"; import { IProfileChangeEvent, ISendMessageDetails } from "@spt/models/spt/dialog/ISendMessageDetails"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; @@ -19,7 +19,7 @@ export declare class MailSendService { protected hashUtil: HashUtil; protected timeUtil: TimeUtil; protected saveServer: SaveServer; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected notifierHelper: NotifierHelper; protected dialogueHelper: DialogueHelper; protected notificationSendHelper: NotificationSendHelper; @@ -27,7 +27,7 @@ export declare class MailSendService { protected itemHelper: ItemHelper; protected traderHelper: TraderHelper; protected readonly systemSenderId = "59e7125688a45068a6249071"; - constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, dialogueHelper: DialogueHelper, notificationSendHelper: NotificationSendHelper, localisationService: LocalisationService, itemHelper: ItemHelper, traderHelper: TraderHelper); + constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseService: DatabaseService, notifierHelper: NotifierHelper, dialogueHelper: DialogueHelper, notificationSendHelper: NotificationSendHelper, localisationService: LocalisationService, itemHelper: ItemHelper, traderHelper: TraderHelper); /** * Send a message from an NPC (e.g. prapor) to the player with or without items using direct message text, do not look up any locale * @param sessionId The session ID to send the message to diff --git a/TypeScript/19UseExternalLibraries/types/services/OpenZoneService.d.ts b/TypeScript/19UseExternalLibraries/types/services/OpenZoneService.d.ts index 1bc5f00..c7dd0bd 100644 --- a/TypeScript/19UseExternalLibraries/types/services/OpenZoneService.d.ts +++ b/TypeScript/19UseExternalLibraries/types/services/OpenZoneService.d.ts @@ -1,18 +1,18 @@ import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RandomUtil } from "@spt/utils/RandomUtil"; /** Service for adding new zones to a maps OpenZones property */ export declare class OpenZoneService { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, localisationService: LocalisationService, configServer: ConfigServer); /** * Add open zone to specified map * @param locationId map location (e.g. factory4_day) diff --git a/TypeScript/19UseExternalLibraries/types/services/PaymentService.d.ts b/TypeScript/19UseExternalLibraries/types/services/PaymentService.d.ts index 64ff2c1..61d5731 100644 --- a/TypeScript/19UseExternalLibraries/types/services/PaymentService.d.ts +++ b/TypeScript/19UseExternalLibraries/types/services/PaymentService.d.ts @@ -9,7 +9,7 @@ import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRo import { IProcessBuyTradeRequestData } from "@spt/models/eft/trade/IProcessBuyTradeRequestData"; import { IProcessSellTradeRequestData } from "@spt/models/eft/trade/IProcessSellTradeRequestData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; @@ -17,14 +17,14 @@ export declare class PaymentService { protected logger: ILogger; protected hashUtil: HashUtil; protected httpResponse: HttpResponseUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected handbookHelper: HandbookHelper; protected traderHelper: TraderHelper; protected itemHelper: ItemHelper; protected inventoryHelper: InventoryHelper; protected localisationService: LocalisationService; protected paymentHelper: PaymentHelper; - constructor(logger: ILogger, hashUtil: HashUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, localisationService: LocalisationService, paymentHelper: PaymentHelper); + constructor(logger: ILogger, hashUtil: HashUtil, httpResponse: HttpResponseUtil, databaseService: DatabaseService, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, localisationService: LocalisationService, paymentHelper: PaymentHelper); /** * Take money and insert items into return to server request * @param pmcData Pmc profile diff --git a/TypeScript/19UseExternalLibraries/types/services/PlayerService.d.ts b/TypeScript/19UseExternalLibraries/types/services/PlayerService.d.ts index ae57410..84c4c6f 100644 --- a/TypeScript/19UseExternalLibraries/types/services/PlayerService.d.ts +++ b/TypeScript/19UseExternalLibraries/types/services/PlayerService.d.ts @@ -1,14 +1,14 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class PlayerService { protected logger: ILogger; protected timeUtil: TimeUtil; protected localisationService: LocalisationService; - protected databaseServer: DatabaseServer; - constructor(logger: ILogger, timeUtil: TimeUtil, localisationService: LocalisationService, databaseServer: DatabaseServer); + protected databaseService: DatabaseService; + constructor(logger: ILogger, timeUtil: TimeUtil, localisationService: LocalisationService, databaseService: DatabaseService); /** * Get level of player * @param pmcData Player profile diff --git a/TypeScript/19UseExternalLibraries/types/services/RagfairLinkedItemService.d.ts b/TypeScript/19UseExternalLibraries/types/services/RagfairLinkedItemService.d.ts index 6011c1a..0d03459 100644 --- a/TypeScript/19UseExternalLibraries/types/services/RagfairLinkedItemService.d.ts +++ b/TypeScript/19UseExternalLibraries/types/services/RagfairLinkedItemService.d.ts @@ -1,11 +1,11 @@ import { ItemHelper } from "@spt/helpers/ItemHelper"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; export declare class RagfairLinkedItemService { - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected linkedItemsCache: Record>; - constructor(databaseServer: DatabaseServer, itemHelper: ItemHelper); + constructor(databaseService: DatabaseService, itemHelper: ItemHelper); getLinkedItems(linkedSearchId: string): Set; /** * Use ragfair linked item service to get an array of items that can fit on or in designated itemtpl diff --git a/TypeScript/19UseExternalLibraries/types/services/RagfairOfferService.d.ts b/TypeScript/19UseExternalLibraries/types/services/RagfairOfferService.d.ts index c044f6d..4bc07c3 100644 --- a/TypeScript/19UseExternalLibraries/types/services/RagfairOfferService.d.ts +++ b/TypeScript/19UseExternalLibraries/types/services/RagfairOfferService.d.ts @@ -6,8 +6,8 @@ import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RagfairOfferHolder } from "@spt/utils/RagfairOfferHolder"; @@ -15,7 +15,7 @@ import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class RagfairOfferService { protected logger: ILogger; protected timeUtil: TimeUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected saveServer: SaveServer; protected ragfairServerHelper: RagfairServerHelper; protected profileHelper: ProfileHelper; @@ -28,7 +28,7 @@ export declare class RagfairOfferService { protected expiredOffers: Record; protected ragfairConfig: IRagfairConfig; protected ragfairOfferHandler: RagfairOfferHolder; - constructor(logger: ILogger, timeUtil: TimeUtil, databaseServer: DatabaseServer, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, eventOutputHolder: EventOutputHolder, httpResponse: HttpResponseUtil, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, timeUtil: TimeUtil, databaseService: DatabaseService, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, eventOutputHolder: EventOutputHolder, httpResponse: HttpResponseUtil, localisationService: LocalisationService, configServer: ConfigServer); /** * Get all offers * @returns IRagfairOffer array diff --git a/TypeScript/19UseExternalLibraries/types/services/RagfairPriceService.d.ts b/TypeScript/19UseExternalLibraries/types/services/RagfairPriceService.d.ts index 5b8fa56..0a2f26e 100644 --- a/TypeScript/19UseExternalLibraries/types/services/RagfairPriceService.d.ts +++ b/TypeScript/19UseExternalLibraries/types/services/RagfairPriceService.d.ts @@ -12,7 +12,7 @@ import { IRagfairConfig, IUnreasonableModPrices } from "@spt/models/spt/config/I import { IRagfairServerPrices } from "@spt/models/spt/ragfair/IRagfairServerPrices"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RandomUtil } from "@spt/utils/RandomUtil"; /** @@ -20,7 +20,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; */ export declare class RagfairPriceService implements OnLoad { protected handbookHelper: HandbookHelper; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected logger: ILogger; protected itemHelper: ItemHelper; protected presetHelper: PresetHelper; @@ -30,7 +30,7 @@ export declare class RagfairPriceService implements OnLoad { protected configServer: ConfigServer; protected ragfairConfig: IRagfairConfig; protected prices: IRagfairServerPrices; - constructor(handbookHelper: HandbookHelper, databaseServer: DatabaseServer, logger: ILogger, itemHelper: ItemHelper, presetHelper: PresetHelper, traderHelper: TraderHelper, randomUtil: RandomUtil, localisationService: LocalisationService, configServer: ConfigServer); + constructor(handbookHelper: HandbookHelper, databaseService: DatabaseService, logger: ILogger, itemHelper: ItemHelper, presetHelper: PresetHelper, traderHelper: TraderHelper, randomUtil: RandomUtil, localisationService: LocalisationService, configServer: ConfigServer); /** * Generate static (handbook) and dynamic (prices.json) flea prices, store inside class as dictionaries */ diff --git a/TypeScript/19UseExternalLibraries/types/services/RagfairTaxService.d.ts b/TypeScript/19UseExternalLibraries/types/services/RagfairTaxService.d.ts index 4e4e648..effb9f0 100644 --- a/TypeScript/19UseExternalLibraries/types/services/RagfairTaxService.d.ts +++ b/TypeScript/19UseExternalLibraries/types/services/RagfairTaxService.d.ts @@ -4,15 +4,15 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { IStorePlayerOfferTaxAmountRequestData } from "@spt/models/eft/ragfair/IStorePlayerOfferTaxAmountRequestData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; export declare class RagfairTaxService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected ragfairPriceService: RagfairPriceService; protected itemHelper: ItemHelper; protected playerOfferTaxCache: Record; - constructor(logger: ILogger, databaseServer: DatabaseServer, ragfairPriceService: RagfairPriceService, itemHelper: ItemHelper); + constructor(logger: ILogger, databaseService: DatabaseService, ragfairPriceService: RagfairPriceService, itemHelper: ItemHelper); storeClientOfferTaxValue(sessionId: string, offer: IStorePlayerOfferTaxAmountRequestData): void; clearStoredOfferTaxById(offerIdToRemove: string): void; getStoredClientOfferTaxValueById(offerIdToGet: string): IStorePlayerOfferTaxAmountRequestData; diff --git a/TypeScript/19UseExternalLibraries/types/services/RaidTimeAdjustmentService.d.ts b/TypeScript/19UseExternalLibraries/types/services/RaidTimeAdjustmentService.d.ts index f770b64..bfc099a 100644 --- a/TypeScript/19UseExternalLibraries/types/services/RaidTimeAdjustmentService.d.ts +++ b/TypeScript/19UseExternalLibraries/types/services/RaidTimeAdjustmentService.d.ts @@ -7,17 +7,17 @@ import { ILocationConfig, IScavRaidTimeLocationSettings, LootMultiplier } from " import { IRaidChanges } from "@spt/models/spt/location/IRaidChanges"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RaidTimeAdjustmentService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected randomUtil: RandomUtil; protected weightedRandomHelper: WeightedRandomHelper; protected applicationContext: ApplicationContext; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, applicationContext: ApplicationContext, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, applicationContext: ApplicationContext, configServer: ConfigServer); /** * Make alterations to the base map data passed in * Loot multipliers/waves/wave start times diff --git a/TypeScript/19UseExternalLibraries/types/services/RepairService.d.ts b/TypeScript/19UseExternalLibraries/types/services/RepairService.d.ts index 9203417..48f306e 100644 --- a/TypeScript/19UseExternalLibraries/types/services/RepairService.d.ts +++ b/TypeScript/19UseExternalLibraries/types/services/RepairService.d.ts @@ -14,13 +14,13 @@ import { SkillTypes } from "@spt/models/enums/SkillTypes"; import { BonusSettings, IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RepairService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected randomUtil: RandomUtil; protected itemHelper: ItemHelper; @@ -31,7 +31,7 @@ export declare class RepairService { protected localisationService: LocalisationService; protected configServer: ConfigServer; protected repairConfig: IRepairConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, profileHelper: ProfileHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, traderHelper: TraderHelper, weightedRandomHelper: WeightedRandomHelper, paymentService: PaymentService, repairHelper: RepairHelper, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, profileHelper: ProfileHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, traderHelper: TraderHelper, weightedRandomHelper: WeightedRandomHelper, paymentService: PaymentService, repairHelper: RepairHelper, localisationService: LocalisationService, configServer: ConfigServer); /** * Use trader to repair an items durability * @param sessionID Session id diff --git a/TypeScript/19UseExternalLibraries/types/services/TraderServicesService.d.ts b/TypeScript/19UseExternalLibraries/types/services/TraderServicesService.d.ts index 111c71a..e441eb6 100644 --- a/TypeScript/19UseExternalLibraries/types/services/TraderServicesService.d.ts +++ b/TypeScript/19UseExternalLibraries/types/services/TraderServicesService.d.ts @@ -1,13 +1,13 @@ import { ProfileHelper } from "@spt/helpers/ProfileHelper"; import { ITraderServiceModel } from "@spt/models/spt/services/ITraderServiceModel"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderServicesService { protected profileHelper: ProfileHelper; protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected cloner: ICloner; - constructor(profileHelper: ProfileHelper, logger: ILogger, databaseServer: DatabaseServer, cloner: ICloner); + constructor(profileHelper: ProfileHelper, logger: ILogger, databaseService: DatabaseService, cloner: ICloner); getTraderServices(sessionId: string, traderId: string): ITraderServiceModel[]; } diff --git a/TypeScript/19UseExternalLibraries/types/services/mod/CustomItemService.d.ts b/TypeScript/19UseExternalLibraries/types/services/mod/CustomItemService.d.ts index 6dc4730..1926bed 100644 --- a/TypeScript/19UseExternalLibraries/types/services/mod/CustomItemService.d.ts +++ b/TypeScript/19UseExternalLibraries/types/services/mod/CustomItemService.d.ts @@ -9,11 +9,11 @@ import { HashUtil } from "@spt/utils/HashUtil"; export declare class CustomItemService { protected logger: ILogger; protected hashUtil: HashUtil; - protected databaseServer: DatabaseService; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected itemBaseClassService: ItemBaseClassService; protected cloner: ICloner; - constructor(logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseService, itemHelper: ItemHelper, itemBaseClassService: ItemBaseClassService, cloner: ICloner); + constructor(logger: ILogger, hashUtil: HashUtil, databaseService: DatabaseService, itemHelper: ItemHelper, itemBaseClassService: ItemBaseClassService, cloner: ICloner); /** * Create a new item from a cloned item base * WARNING - If no item id is supplied, an id will be generated, this id will be random every time you add an item and will not be the same on each subsequent server start diff --git a/TypeScript/1LogToConsole/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts b/TypeScript/1LogToConsole/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts index a7491b5..c51bf7e 100644 --- a/TypeScript/1LogToConsole/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts +++ b/TypeScript/1LogToConsole/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts @@ -6,7 +6,7 @@ import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { ISendMessageRequest } from "@spt/models/eft/dialog/ISendMessageRequest"; import { IUserDialogInfo } from "@spt/models/eft/profile/ISptProfile"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -19,7 +19,7 @@ export declare class GiveSptCommand implements ISptCommand { protected presetHelper: PresetHelper; protected mailSendService: MailSendService; protected localeService: LocaleService; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemFilterService: ItemFilterService; protected cloner: ICloner; /** @@ -34,7 +34,7 @@ export declare class GiveSptCommand implements ISptCommand { private static acceptableConfidence; private static excludedPresetItems; protected savedCommand: Map; - constructor(logger: ILogger, itemHelper: ItemHelper, hashUtil: HashUtil, presetHelper: PresetHelper, mailSendService: MailSendService, localeService: LocaleService, databaseServer: DatabaseServer, itemFilterService: ItemFilterService, cloner: ICloner); + constructor(logger: ILogger, itemHelper: ItemHelper, hashUtil: HashUtil, presetHelper: PresetHelper, mailSendService: MailSendService, localeService: LocaleService, databaseService: DatabaseService, itemFilterService: ItemFilterService, cloner: ICloner); getCommand(): string; getCommandHelp(): string; performAction(commandHandler: IUserDialogInfo, sessionId: string, request: ISendMessageRequest): string; diff --git a/TypeScript/1LogToConsole/types/helpers/PresetHelper.d.ts b/TypeScript/1LogToConsole/types/helpers/PresetHelper.d.ts index 5fc8a7c..e71e5b7 100644 --- a/TypeScript/1LogToConsole/types/helpers/PresetHelper.d.ts +++ b/TypeScript/1LogToConsole/types/helpers/PresetHelper.d.ts @@ -1,16 +1,16 @@ import { IPreset } from "@spt/models/eft/common/IGlobals"; import { BaseClasses } from "@spt/models/enums/BaseClasses"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; import { ItemHelper } from "./ItemHelper"; export declare class PresetHelper { - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected cloner: ICloner; protected lookup: Record; protected defaultEquipmentPresets: Record; protected defaultWeaponPresets: Record; - constructor(databaseServer: DatabaseServer, itemHelper: ItemHelper, cloner: ICloner); + constructor(databaseService: DatabaseService, itemHelper: ItemHelper, cloner: ICloner); hydratePresetStore(input: Record): void; /** * Get default weapon and equipment presets diff --git a/TypeScript/1LogToConsole/types/helpers/ProfileHelper.d.ts b/TypeScript/1LogToConsole/types/helpers/ProfileHelper.d.ts index 37937ff..e943bd3 100644 --- a/TypeScript/1LogToConsole/types/helpers/ProfileHelper.d.ts +++ b/TypeScript/1LogToConsole/types/helpers/ProfileHelper.d.ts @@ -7,8 +7,8 @@ import { SkillTypes } from "@spt/models/enums/SkillTypes"; import { IInventoryConfig } from "@spt/models/spt/config/IInventoryConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileSnapshotService } from "@spt/services/ProfileSnapshotService"; import { ICloner } from "@spt/utils/cloners/ICloner"; @@ -21,14 +21,14 @@ export declare class ProfileHelper { protected watermark: Watermark; protected timeUtil: TimeUtil; protected saveServer: SaveServer; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected profileSnapshotService: ProfileSnapshotService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected cloner: ICloner; protected inventoryConfig: IInventoryConfig; - constructor(logger: ILogger, hashUtil: HashUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileSnapshotService: ProfileSnapshotService, localisationService: LocalisationService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, hashUtil: HashUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseService: DatabaseService, itemHelper: ItemHelper, profileSnapshotService: ProfileSnapshotService, localisationService: LocalisationService, configServer: ConfigServer, cloner: ICloner); /** * Remove/reset a completed quest condtion from players profile quest data * @param sessionID Session id diff --git a/TypeScript/1LogToConsole/types/helpers/QuestHelper.d.ts b/TypeScript/1LogToConsole/types/helpers/QuestHelper.d.ts index 39ba2a9..93368fa 100644 --- a/TypeScript/1LogToConsole/types/helpers/QuestHelper.d.ts +++ b/TypeScript/1LogToConsole/types/helpers/QuestHelper.d.ts @@ -18,7 +18,7 @@ import { IQuestConfig } from "@spt/models/spt/config/IQuestConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -30,9 +30,9 @@ export declare class QuestHelper { protected timeUtil: TimeUtil; protected hashUtil: HashUtil; protected itemHelper: ItemHelper; + protected databaseService: DatabaseService; protected questConditionHelper: QuestConditionHelper; protected eventOutputHolder: EventOutputHolder; - protected databaseServer: DatabaseServer; protected localeService: LocaleService; protected ragfairServerHelper: RagfairServerHelper; protected dialogueHelper: DialogueHelper; @@ -45,7 +45,7 @@ export declare class QuestHelper { protected configServer: ConfigServer; protected cloner: ICloner; protected questConfig: IQuestConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, questConditionHelper: QuestConditionHelper, eventOutputHolder: EventOutputHolder, databaseServer: DatabaseServer, localeService: LocaleService, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, localisationService: LocalisationService, traderHelper: TraderHelper, presetHelper: PresetHelper, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, databaseService: DatabaseService, questConditionHelper: QuestConditionHelper, eventOutputHolder: EventOutputHolder, localeService: LocaleService, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, localisationService: LocalisationService, traderHelper: TraderHelper, presetHelper: PresetHelper, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); /** * Get status of a quest in player profile by its id * @param pmcData Profile to search diff --git a/TypeScript/1LogToConsole/types/helpers/RagfairOfferHelper.d.ts b/TypeScript/1LogToConsole/types/helpers/RagfairOfferHelper.d.ts index 27bb081..a08e60a 100644 --- a/TypeScript/1LogToConsole/types/helpers/RagfairOfferHelper.d.ts +++ b/TypeScript/1LogToConsole/types/helpers/RagfairOfferHelper.d.ts @@ -19,8 +19,8 @@ import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -34,7 +34,7 @@ export declare class RagfairOfferHelper { protected timeUtil: TimeUtil; protected hashUtil: HashUtil; protected eventOutputHolder: EventOutputHolder; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected traderHelper: TraderHelper; protected saveServer: SaveServer; protected itemHelper: ItemHelper; @@ -55,7 +55,7 @@ export declare class RagfairOfferHelper { protected static goodSoldTemplate: string; protected ragfairConfig: IRagfairConfig; protected questConfig: IQuestConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, eventOutputHolder: EventOutputHolder, databaseServer: DatabaseServer, traderHelper: TraderHelper, saveServer: SaveServer, itemHelper: ItemHelper, botHelper: BotHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, localeService: LocaleService, localisationService: LocalisationService, mailSendService: MailSendService, configServer: ConfigServer); + constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, eventOutputHolder: EventOutputHolder, databaseService: DatabaseService, traderHelper: TraderHelper, saveServer: SaveServer, itemHelper: ItemHelper, botHelper: BotHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, localeService: LocaleService, localisationService: LocalisationService, mailSendService: MailSendService, configServer: ConfigServer); /** * Passthrough to ragfairOfferService.getOffers(), get flea offers a player should see * @param searchRequest Data from client diff --git a/TypeScript/1LogToConsole/types/helpers/RepairHelper.d.ts b/TypeScript/1LogToConsole/types/helpers/RepairHelper.d.ts index 4bd0577..99a21da 100644 --- a/TypeScript/1LogToConsole/types/helpers/RepairHelper.d.ts +++ b/TypeScript/1LogToConsole/types/helpers/RepairHelper.d.ts @@ -3,17 +3,17 @@ import { ITemplateItem, Props } from "@spt/models/eft/common/tables/ITemplateIte import { IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RepairHelper { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected configServer: ConfigServer; protected cloner: ICloner; protected repairConfig: IRepairConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, configServer: ConfigServer, cloner: ICloner); /** * Alter an items durability after a repair by trader/repair kit * @param itemToRepair item to update durability details diff --git a/TypeScript/1LogToConsole/types/helpers/TraderAssortHelper.d.ts b/TypeScript/1LogToConsole/types/helpers/TraderAssortHelper.d.ts index faf2a9d..8f8f802 100644 --- a/TypeScript/1LogToConsole/types/helpers/TraderAssortHelper.d.ts +++ b/TypeScript/1LogToConsole/types/helpers/TraderAssortHelper.d.ts @@ -9,7 +9,7 @@ import { ITrader, ITraderAssort } from "@spt/models/eft/common/tables/ITrader"; import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; @@ -21,7 +21,7 @@ export declare class TraderAssortHelper { protected logger: ILogger; protected mathUtil: MathUtil; protected timeUtil: TimeUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected assortHelper: AssortHelper; protected paymentHelper: PaymentHelper; @@ -37,7 +37,7 @@ export declare class TraderAssortHelper { protected traderConfig: ITraderConfig; protected mergedQuestAssorts: Record>; protected createdMergedQuestAssorts: boolean; - constructor(logger: ILogger, mathUtil: MathUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, profileHelper: ProfileHelper, assortHelper: AssortHelper, paymentHelper: PaymentHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, localisationService: LocalisationService, traderPurchasePersisterService: TraderPurchasePersisterService, traderHelper: TraderHelper, fenceService: FenceService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, mathUtil: MathUtil, timeUtil: TimeUtil, databaseService: DatabaseService, profileHelper: ProfileHelper, assortHelper: AssortHelper, paymentHelper: PaymentHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, localisationService: LocalisationService, traderPurchasePersisterService: TraderPurchasePersisterService, traderHelper: TraderHelper, fenceService: FenceService, configServer: ConfigServer, cloner: ICloner); /** * Get a traders assorts * Can be used for returning ragfair / fence assorts diff --git a/TypeScript/1LogToConsole/types/helpers/TraderHelper.d.ts b/TypeScript/1LogToConsole/types/helpers/TraderHelper.d.ts index 5f515da..eec1cc7 100644 --- a/TypeScript/1LogToConsole/types/helpers/TraderHelper.d.ts +++ b/TypeScript/1LogToConsole/types/helpers/TraderHelper.d.ts @@ -10,7 +10,7 @@ import { Traders } from "@spt/models/enums/Traders"; import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; @@ -18,7 +18,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class TraderHelper { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected handbookHelper: HandbookHelper; protected itemHelper: ItemHelper; @@ -33,7 +33,7 @@ export declare class TraderHelper { protected highestTraderPriceItems?: Record; /** Dictionary of item tpl and the highest trader buy back rouble price */ protected highestTraderBuyPriceItems?: Record; - constructor(logger: ILogger, databaseServer: DatabaseServer, profileHelper: ProfileHelper, handbookHelper: HandbookHelper, itemHelper: ItemHelper, playerService: PlayerService, localisationService: LocalisationService, fenceService: FenceService, timeUtil: TimeUtil, randomUtil: RandomUtil, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, profileHelper: ProfileHelper, handbookHelper: HandbookHelper, itemHelper: ItemHelper, playerService: PlayerService, localisationService: LocalisationService, fenceService: FenceService, timeUtil: TimeUtil, randomUtil: RandomUtil, configServer: ConfigServer); /** * Get a trader base object, update profile to reflect players current standing in profile * when trader not found in profile diff --git a/TypeScript/1LogToConsole/types/models/eft/common/IGlobals.d.ts b/TypeScript/1LogToConsole/types/models/eft/common/IGlobals.d.ts index 2209415..a0bb051 100644 --- a/TypeScript/1LogToConsole/types/models/eft/common/IGlobals.d.ts +++ b/TypeScript/1LogToConsole/types/models/eft/common/IGlobals.d.ts @@ -802,7 +802,6 @@ export interface IMaxActiveOfferCount { from: number; to: number; count: number; - countForSpecialEditions: number; } export interface IMaxSumForRarity { Common: IRarityMaxSum; diff --git a/TypeScript/1LogToConsole/types/models/eft/common/ILocationBase.d.ts b/TypeScript/1LogToConsole/types/models/eft/common/ILocationBase.d.ts index 65931f8..10f1a57 100644 --- a/TypeScript/1LogToConsole/types/models/eft/common/ILocationBase.d.ts +++ b/TypeScript/1LogToConsole/types/models/eft/common/ILocationBase.d.ts @@ -196,18 +196,24 @@ export interface Props { export interface Exit { /** % Chance out of 100 exit will appear in raid */ Chance: number; + ChancePVE: number; Count: number; + CountPVE: number; EntryPoints: string; EventAvailable: boolean; ExfiltrationTime: number; + ExfiltrationTimePVE: number; ExfiltrationType: string; RequiredSlot?: string; Id: string; MaxTime: number; + MaxTimePVE: number; MinTime: number; + MinTimePVE: number; Name: string; PassageRequirement: string; PlayersCount: number; + PlayersCountPVE: number; RequirementTip: string; Side?: string; } diff --git a/TypeScript/1LogToConsole/types/models/eft/common/tables/IRepeatableQuests.d.ts b/TypeScript/1LogToConsole/types/models/eft/common/tables/IRepeatableQuests.d.ts index 854c8ef..27ff49d 100644 --- a/TypeScript/1LogToConsole/types/models/eft/common/tables/IRepeatableQuests.d.ts +++ b/TypeScript/1LogToConsole/types/models/eft/common/tables/IRepeatableQuests.d.ts @@ -18,10 +18,13 @@ export interface IRepeatableTemplates { export interface IPmcDataRepeatableQuest { id?: string; name: string; + unavailableTime?: string; activeQuests: IRepeatableQuest[]; inactiveQuests: IRepeatableQuest[]; endTime: number; changeRequirement: Record; + freeChanges: number; + freeChangesAvailable: number; } export interface IChangeRequirement { changeCost: IChangeCost[]; diff --git a/TypeScript/1LogToConsole/types/models/eft/common/tables/ITemplateItem.d.ts b/TypeScript/1LogToConsole/types/models/eft/common/tables/ITemplateItem.d.ts index a8ccfbb..e5c6632 100644 --- a/TypeScript/1LogToConsole/types/models/eft/common/tables/ITemplateItem.d.ts +++ b/TypeScript/1LogToConsole/types/models/eft/common/tables/ITemplateItem.d.ts @@ -63,7 +63,7 @@ export interface Props { DiscardingBlock?: boolean; DropSoundType?: string; RagFairCommissionModifier?: number; - RarityPvE: string; + RarityPvE?: string; IsAlwaysAvailableForInsurance?: boolean; DiscardLimit?: number; MaxResource?: number; @@ -414,6 +414,12 @@ export interface Props { LayoutName?: string; Lower75Prefab?: Prefab; MaxUsages?: number; + ScavKillExpPenalty?: number; + ScavKillExpPenaltyPVE?: number; + ScavKillStandingPenalty?: number; + ScavKillStandingPenaltyPVE?: number; + TradersDiscount?: number; + TradersDiscountPVE?: number; } export interface IHealthEffect { type: string; diff --git a/TypeScript/1LogToConsole/types/models/spt/config/IQuestConfig.d.ts b/TypeScript/1LogToConsole/types/models/spt/config/IQuestConfig.d.ts index 362602c..2cdf4fa 100644 --- a/TypeScript/1LogToConsole/types/models/spt/config/IQuestConfig.d.ts +++ b/TypeScript/1LogToConsole/types/models/spt/config/IQuestConfig.d.ts @@ -47,6 +47,8 @@ export interface IRepeatableQuestConfig { /** Item tplIds to ignore when generating rewards */ rewardBlacklist: string[]; rewardAmmoStackMinSize: number; + freeChangesAvailable: number; + freeChanges: number; } export interface IRewardScaling { levels: number[]; diff --git a/TypeScript/1LogToConsole/types/services/BotEquipmentModPoolService.d.ts b/TypeScript/1LogToConsole/types/services/BotEquipmentModPoolService.d.ts index c53f31b..7b2b442 100644 --- a/TypeScript/1LogToConsole/types/services/BotEquipmentModPoolService.d.ts +++ b/TypeScript/1LogToConsole/types/services/BotEquipmentModPoolService.d.ts @@ -4,7 +4,7 @@ import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { VFS } from "@spt/utils/VFS"; /** Store a mapping between weapons, their slots and the items that fit those slots */ @@ -12,7 +12,7 @@ export declare class BotEquipmentModPoolService { protected logger: ILogger; protected vfs: VFS; protected itemHelper: ItemHelper; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected botConfig: IBotConfig; @@ -20,7 +20,7 @@ export declare class BotEquipmentModPoolService { protected gearModPool: Mods; protected weaponPoolGenerated: boolean; protected armorPoolGenerated: boolean; - constructor(logger: ILogger, vfs: VFS, itemHelper: ItemHelper, databaseServer: DatabaseServer, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, vfs: VFS, itemHelper: ItemHelper, databaseService: DatabaseService, localisationService: LocalisationService, configServer: ConfigServer); /** * Store dictionary of mods for each item passed in * @param items items to find related mods and store in modPool diff --git a/TypeScript/1LogToConsole/types/services/CustomLocationWaveService.d.ts b/TypeScript/1LogToConsole/types/services/CustomLocationWaveService.d.ts index 728a1e8..c72d5bb 100644 --- a/TypeScript/1LogToConsole/types/services/CustomLocationWaveService.d.ts +++ b/TypeScript/1LogToConsole/types/services/CustomLocationWaveService.d.ts @@ -2,15 +2,15 @@ import { BossLocationSpawn, Wave } from "@spt/models/eft/common/ILocationBase"; import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class CustomLocationWaveService { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, configServer: ConfigServer); /** * Add a boss wave to a map * @param locationId e.g. factory4_day, bigmap diff --git a/TypeScript/1LogToConsole/types/services/InsuranceService.d.ts b/TypeScript/1LogToConsole/types/services/InsuranceService.d.ts index c54f9f9..0000e66 100644 --- a/TypeScript/1LogToConsole/types/services/InsuranceService.d.ts +++ b/TypeScript/1LogToConsole/types/services/InsuranceService.d.ts @@ -13,8 +13,8 @@ import { ILostOnDeathConfig } from "@spt/models/spt/config/ILostOnDeathConfig"; import { IInsuranceEquipmentPkg } from "@spt/models/spt/services/IInsuranceEquipmentPkg"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -24,7 +24,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class InsuranceService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected secureContainerHelper: SecureContainerHelper; protected randomUtil: RandomUtil; protected itemHelper: ItemHelper; @@ -42,7 +42,7 @@ export declare class InsuranceService { protected insured: Record>; protected insuranceConfig: IInsuranceConfig; protected lostOnDeathConfig: ILostOnDeathConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, handbookHelper: HandbookHelper, localisationService: LocalisationService, localeService: LocaleService, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, databaseService: DatabaseService, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, handbookHelper: HandbookHelper, localisationService: LocalisationService, localeService: LocaleService, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); /** * Does player have insurance array * @param sessionId Player id diff --git a/TypeScript/1LogToConsole/types/services/MailSendService.d.ts b/TypeScript/1LogToConsole/types/services/MailSendService.d.ts index d445841..8f1f974 100644 --- a/TypeScript/1LogToConsole/types/services/MailSendService.d.ts +++ b/TypeScript/1LogToConsole/types/services/MailSendService.d.ts @@ -9,8 +9,8 @@ import { MessageType } from "@spt/models/enums/MessageType"; import { Traders } from "@spt/models/enums/Traders"; import { IProfileChangeEvent, ISendMessageDetails } from "@spt/models/spt/dialog/ISendMessageDetails"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; @@ -19,7 +19,7 @@ export declare class MailSendService { protected hashUtil: HashUtil; protected timeUtil: TimeUtil; protected saveServer: SaveServer; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected notifierHelper: NotifierHelper; protected dialogueHelper: DialogueHelper; protected notificationSendHelper: NotificationSendHelper; @@ -27,7 +27,7 @@ export declare class MailSendService { protected itemHelper: ItemHelper; protected traderHelper: TraderHelper; protected readonly systemSenderId = "59e7125688a45068a6249071"; - constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, dialogueHelper: DialogueHelper, notificationSendHelper: NotificationSendHelper, localisationService: LocalisationService, itemHelper: ItemHelper, traderHelper: TraderHelper); + constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseService: DatabaseService, notifierHelper: NotifierHelper, dialogueHelper: DialogueHelper, notificationSendHelper: NotificationSendHelper, localisationService: LocalisationService, itemHelper: ItemHelper, traderHelper: TraderHelper); /** * Send a message from an NPC (e.g. prapor) to the player with or without items using direct message text, do not look up any locale * @param sessionId The session ID to send the message to diff --git a/TypeScript/1LogToConsole/types/services/OpenZoneService.d.ts b/TypeScript/1LogToConsole/types/services/OpenZoneService.d.ts index 1bc5f00..c7dd0bd 100644 --- a/TypeScript/1LogToConsole/types/services/OpenZoneService.d.ts +++ b/TypeScript/1LogToConsole/types/services/OpenZoneService.d.ts @@ -1,18 +1,18 @@ import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RandomUtil } from "@spt/utils/RandomUtil"; /** Service for adding new zones to a maps OpenZones property */ export declare class OpenZoneService { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, localisationService: LocalisationService, configServer: ConfigServer); /** * Add open zone to specified map * @param locationId map location (e.g. factory4_day) diff --git a/TypeScript/1LogToConsole/types/services/PaymentService.d.ts b/TypeScript/1LogToConsole/types/services/PaymentService.d.ts index 64ff2c1..61d5731 100644 --- a/TypeScript/1LogToConsole/types/services/PaymentService.d.ts +++ b/TypeScript/1LogToConsole/types/services/PaymentService.d.ts @@ -9,7 +9,7 @@ import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRo import { IProcessBuyTradeRequestData } from "@spt/models/eft/trade/IProcessBuyTradeRequestData"; import { IProcessSellTradeRequestData } from "@spt/models/eft/trade/IProcessSellTradeRequestData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; @@ -17,14 +17,14 @@ export declare class PaymentService { protected logger: ILogger; protected hashUtil: HashUtil; protected httpResponse: HttpResponseUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected handbookHelper: HandbookHelper; protected traderHelper: TraderHelper; protected itemHelper: ItemHelper; protected inventoryHelper: InventoryHelper; protected localisationService: LocalisationService; protected paymentHelper: PaymentHelper; - constructor(logger: ILogger, hashUtil: HashUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, localisationService: LocalisationService, paymentHelper: PaymentHelper); + constructor(logger: ILogger, hashUtil: HashUtil, httpResponse: HttpResponseUtil, databaseService: DatabaseService, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, localisationService: LocalisationService, paymentHelper: PaymentHelper); /** * Take money and insert items into return to server request * @param pmcData Pmc profile diff --git a/TypeScript/1LogToConsole/types/services/PlayerService.d.ts b/TypeScript/1LogToConsole/types/services/PlayerService.d.ts index ae57410..84c4c6f 100644 --- a/TypeScript/1LogToConsole/types/services/PlayerService.d.ts +++ b/TypeScript/1LogToConsole/types/services/PlayerService.d.ts @@ -1,14 +1,14 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class PlayerService { protected logger: ILogger; protected timeUtil: TimeUtil; protected localisationService: LocalisationService; - protected databaseServer: DatabaseServer; - constructor(logger: ILogger, timeUtil: TimeUtil, localisationService: LocalisationService, databaseServer: DatabaseServer); + protected databaseService: DatabaseService; + constructor(logger: ILogger, timeUtil: TimeUtil, localisationService: LocalisationService, databaseService: DatabaseService); /** * Get level of player * @param pmcData Player profile diff --git a/TypeScript/1LogToConsole/types/services/RagfairLinkedItemService.d.ts b/TypeScript/1LogToConsole/types/services/RagfairLinkedItemService.d.ts index 6011c1a..0d03459 100644 --- a/TypeScript/1LogToConsole/types/services/RagfairLinkedItemService.d.ts +++ b/TypeScript/1LogToConsole/types/services/RagfairLinkedItemService.d.ts @@ -1,11 +1,11 @@ import { ItemHelper } from "@spt/helpers/ItemHelper"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; export declare class RagfairLinkedItemService { - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected linkedItemsCache: Record>; - constructor(databaseServer: DatabaseServer, itemHelper: ItemHelper); + constructor(databaseService: DatabaseService, itemHelper: ItemHelper); getLinkedItems(linkedSearchId: string): Set; /** * Use ragfair linked item service to get an array of items that can fit on or in designated itemtpl diff --git a/TypeScript/1LogToConsole/types/services/RagfairOfferService.d.ts b/TypeScript/1LogToConsole/types/services/RagfairOfferService.d.ts index c044f6d..4bc07c3 100644 --- a/TypeScript/1LogToConsole/types/services/RagfairOfferService.d.ts +++ b/TypeScript/1LogToConsole/types/services/RagfairOfferService.d.ts @@ -6,8 +6,8 @@ import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RagfairOfferHolder } from "@spt/utils/RagfairOfferHolder"; @@ -15,7 +15,7 @@ import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class RagfairOfferService { protected logger: ILogger; protected timeUtil: TimeUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected saveServer: SaveServer; protected ragfairServerHelper: RagfairServerHelper; protected profileHelper: ProfileHelper; @@ -28,7 +28,7 @@ export declare class RagfairOfferService { protected expiredOffers: Record; protected ragfairConfig: IRagfairConfig; protected ragfairOfferHandler: RagfairOfferHolder; - constructor(logger: ILogger, timeUtil: TimeUtil, databaseServer: DatabaseServer, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, eventOutputHolder: EventOutputHolder, httpResponse: HttpResponseUtil, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, timeUtil: TimeUtil, databaseService: DatabaseService, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, eventOutputHolder: EventOutputHolder, httpResponse: HttpResponseUtil, localisationService: LocalisationService, configServer: ConfigServer); /** * Get all offers * @returns IRagfairOffer array diff --git a/TypeScript/1LogToConsole/types/services/RagfairPriceService.d.ts b/TypeScript/1LogToConsole/types/services/RagfairPriceService.d.ts index 5b8fa56..0a2f26e 100644 --- a/TypeScript/1LogToConsole/types/services/RagfairPriceService.d.ts +++ b/TypeScript/1LogToConsole/types/services/RagfairPriceService.d.ts @@ -12,7 +12,7 @@ import { IRagfairConfig, IUnreasonableModPrices } from "@spt/models/spt/config/I import { IRagfairServerPrices } from "@spt/models/spt/ragfair/IRagfairServerPrices"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RandomUtil } from "@spt/utils/RandomUtil"; /** @@ -20,7 +20,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; */ export declare class RagfairPriceService implements OnLoad { protected handbookHelper: HandbookHelper; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected logger: ILogger; protected itemHelper: ItemHelper; protected presetHelper: PresetHelper; @@ -30,7 +30,7 @@ export declare class RagfairPriceService implements OnLoad { protected configServer: ConfigServer; protected ragfairConfig: IRagfairConfig; protected prices: IRagfairServerPrices; - constructor(handbookHelper: HandbookHelper, databaseServer: DatabaseServer, logger: ILogger, itemHelper: ItemHelper, presetHelper: PresetHelper, traderHelper: TraderHelper, randomUtil: RandomUtil, localisationService: LocalisationService, configServer: ConfigServer); + constructor(handbookHelper: HandbookHelper, databaseService: DatabaseService, logger: ILogger, itemHelper: ItemHelper, presetHelper: PresetHelper, traderHelper: TraderHelper, randomUtil: RandomUtil, localisationService: LocalisationService, configServer: ConfigServer); /** * Generate static (handbook) and dynamic (prices.json) flea prices, store inside class as dictionaries */ diff --git a/TypeScript/1LogToConsole/types/services/RagfairTaxService.d.ts b/TypeScript/1LogToConsole/types/services/RagfairTaxService.d.ts index 4e4e648..effb9f0 100644 --- a/TypeScript/1LogToConsole/types/services/RagfairTaxService.d.ts +++ b/TypeScript/1LogToConsole/types/services/RagfairTaxService.d.ts @@ -4,15 +4,15 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { IStorePlayerOfferTaxAmountRequestData } from "@spt/models/eft/ragfair/IStorePlayerOfferTaxAmountRequestData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; export declare class RagfairTaxService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected ragfairPriceService: RagfairPriceService; protected itemHelper: ItemHelper; protected playerOfferTaxCache: Record; - constructor(logger: ILogger, databaseServer: DatabaseServer, ragfairPriceService: RagfairPriceService, itemHelper: ItemHelper); + constructor(logger: ILogger, databaseService: DatabaseService, ragfairPriceService: RagfairPriceService, itemHelper: ItemHelper); storeClientOfferTaxValue(sessionId: string, offer: IStorePlayerOfferTaxAmountRequestData): void; clearStoredOfferTaxById(offerIdToRemove: string): void; getStoredClientOfferTaxValueById(offerIdToGet: string): IStorePlayerOfferTaxAmountRequestData; diff --git a/TypeScript/1LogToConsole/types/services/RaidTimeAdjustmentService.d.ts b/TypeScript/1LogToConsole/types/services/RaidTimeAdjustmentService.d.ts index f770b64..bfc099a 100644 --- a/TypeScript/1LogToConsole/types/services/RaidTimeAdjustmentService.d.ts +++ b/TypeScript/1LogToConsole/types/services/RaidTimeAdjustmentService.d.ts @@ -7,17 +7,17 @@ import { ILocationConfig, IScavRaidTimeLocationSettings, LootMultiplier } from " import { IRaidChanges } from "@spt/models/spt/location/IRaidChanges"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RaidTimeAdjustmentService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected randomUtil: RandomUtil; protected weightedRandomHelper: WeightedRandomHelper; protected applicationContext: ApplicationContext; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, applicationContext: ApplicationContext, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, applicationContext: ApplicationContext, configServer: ConfigServer); /** * Make alterations to the base map data passed in * Loot multipliers/waves/wave start times diff --git a/TypeScript/1LogToConsole/types/services/RepairService.d.ts b/TypeScript/1LogToConsole/types/services/RepairService.d.ts index 9203417..48f306e 100644 --- a/TypeScript/1LogToConsole/types/services/RepairService.d.ts +++ b/TypeScript/1LogToConsole/types/services/RepairService.d.ts @@ -14,13 +14,13 @@ import { SkillTypes } from "@spt/models/enums/SkillTypes"; import { BonusSettings, IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RepairService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected randomUtil: RandomUtil; protected itemHelper: ItemHelper; @@ -31,7 +31,7 @@ export declare class RepairService { protected localisationService: LocalisationService; protected configServer: ConfigServer; protected repairConfig: IRepairConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, profileHelper: ProfileHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, traderHelper: TraderHelper, weightedRandomHelper: WeightedRandomHelper, paymentService: PaymentService, repairHelper: RepairHelper, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, profileHelper: ProfileHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, traderHelper: TraderHelper, weightedRandomHelper: WeightedRandomHelper, paymentService: PaymentService, repairHelper: RepairHelper, localisationService: LocalisationService, configServer: ConfigServer); /** * Use trader to repair an items durability * @param sessionID Session id diff --git a/TypeScript/1LogToConsole/types/services/TraderServicesService.d.ts b/TypeScript/1LogToConsole/types/services/TraderServicesService.d.ts index 111c71a..e441eb6 100644 --- a/TypeScript/1LogToConsole/types/services/TraderServicesService.d.ts +++ b/TypeScript/1LogToConsole/types/services/TraderServicesService.d.ts @@ -1,13 +1,13 @@ import { ProfileHelper } from "@spt/helpers/ProfileHelper"; import { ITraderServiceModel } from "@spt/models/spt/services/ITraderServiceModel"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderServicesService { protected profileHelper: ProfileHelper; protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected cloner: ICloner; - constructor(profileHelper: ProfileHelper, logger: ILogger, databaseServer: DatabaseServer, cloner: ICloner); + constructor(profileHelper: ProfileHelper, logger: ILogger, databaseService: DatabaseService, cloner: ICloner); getTraderServices(sessionId: string, traderId: string): ITraderServiceModel[]; } diff --git a/TypeScript/1LogToConsole/types/services/mod/CustomItemService.d.ts b/TypeScript/1LogToConsole/types/services/mod/CustomItemService.d.ts index 6dc4730..1926bed 100644 --- a/TypeScript/1LogToConsole/types/services/mod/CustomItemService.d.ts +++ b/TypeScript/1LogToConsole/types/services/mod/CustomItemService.d.ts @@ -9,11 +9,11 @@ import { HashUtil } from "@spt/utils/HashUtil"; export declare class CustomItemService { protected logger: ILogger; protected hashUtil: HashUtil; - protected databaseServer: DatabaseService; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected itemBaseClassService: ItemBaseClassService; protected cloner: ICloner; - constructor(logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseService, itemHelper: ItemHelper, itemBaseClassService: ItemBaseClassService, cloner: ICloner); + constructor(logger: ILogger, hashUtil: HashUtil, databaseService: DatabaseService, itemHelper: ItemHelper, itemBaseClassService: ItemBaseClassService, cloner: ICloner); /** * Create a new item from a cloned item base * WARNING - If no item id is supplied, an id will be generated, this id will be random every time you add an item and will not be the same on each subsequent server start diff --git a/TypeScript/20CustomChatBot/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts b/TypeScript/20CustomChatBot/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts index a7491b5..c51bf7e 100644 --- a/TypeScript/20CustomChatBot/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts +++ b/TypeScript/20CustomChatBot/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts @@ -6,7 +6,7 @@ import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { ISendMessageRequest } from "@spt/models/eft/dialog/ISendMessageRequest"; import { IUserDialogInfo } from "@spt/models/eft/profile/ISptProfile"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -19,7 +19,7 @@ export declare class GiveSptCommand implements ISptCommand { protected presetHelper: PresetHelper; protected mailSendService: MailSendService; protected localeService: LocaleService; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemFilterService: ItemFilterService; protected cloner: ICloner; /** @@ -34,7 +34,7 @@ export declare class GiveSptCommand implements ISptCommand { private static acceptableConfidence; private static excludedPresetItems; protected savedCommand: Map; - constructor(logger: ILogger, itemHelper: ItemHelper, hashUtil: HashUtil, presetHelper: PresetHelper, mailSendService: MailSendService, localeService: LocaleService, databaseServer: DatabaseServer, itemFilterService: ItemFilterService, cloner: ICloner); + constructor(logger: ILogger, itemHelper: ItemHelper, hashUtil: HashUtil, presetHelper: PresetHelper, mailSendService: MailSendService, localeService: LocaleService, databaseService: DatabaseService, itemFilterService: ItemFilterService, cloner: ICloner); getCommand(): string; getCommandHelp(): string; performAction(commandHandler: IUserDialogInfo, sessionId: string, request: ISendMessageRequest): string; diff --git a/TypeScript/20CustomChatBot/types/helpers/PresetHelper.d.ts b/TypeScript/20CustomChatBot/types/helpers/PresetHelper.d.ts index 5fc8a7c..e71e5b7 100644 --- a/TypeScript/20CustomChatBot/types/helpers/PresetHelper.d.ts +++ b/TypeScript/20CustomChatBot/types/helpers/PresetHelper.d.ts @@ -1,16 +1,16 @@ import { IPreset } from "@spt/models/eft/common/IGlobals"; import { BaseClasses } from "@spt/models/enums/BaseClasses"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; import { ItemHelper } from "./ItemHelper"; export declare class PresetHelper { - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected cloner: ICloner; protected lookup: Record; protected defaultEquipmentPresets: Record; protected defaultWeaponPresets: Record; - constructor(databaseServer: DatabaseServer, itemHelper: ItemHelper, cloner: ICloner); + constructor(databaseService: DatabaseService, itemHelper: ItemHelper, cloner: ICloner); hydratePresetStore(input: Record): void; /** * Get default weapon and equipment presets diff --git a/TypeScript/20CustomChatBot/types/helpers/ProfileHelper.d.ts b/TypeScript/20CustomChatBot/types/helpers/ProfileHelper.d.ts index 37937ff..e943bd3 100644 --- a/TypeScript/20CustomChatBot/types/helpers/ProfileHelper.d.ts +++ b/TypeScript/20CustomChatBot/types/helpers/ProfileHelper.d.ts @@ -7,8 +7,8 @@ import { SkillTypes } from "@spt/models/enums/SkillTypes"; import { IInventoryConfig } from "@spt/models/spt/config/IInventoryConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileSnapshotService } from "@spt/services/ProfileSnapshotService"; import { ICloner } from "@spt/utils/cloners/ICloner"; @@ -21,14 +21,14 @@ export declare class ProfileHelper { protected watermark: Watermark; protected timeUtil: TimeUtil; protected saveServer: SaveServer; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected profileSnapshotService: ProfileSnapshotService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected cloner: ICloner; protected inventoryConfig: IInventoryConfig; - constructor(logger: ILogger, hashUtil: HashUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileSnapshotService: ProfileSnapshotService, localisationService: LocalisationService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, hashUtil: HashUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseService: DatabaseService, itemHelper: ItemHelper, profileSnapshotService: ProfileSnapshotService, localisationService: LocalisationService, configServer: ConfigServer, cloner: ICloner); /** * Remove/reset a completed quest condtion from players profile quest data * @param sessionID Session id diff --git a/TypeScript/20CustomChatBot/types/helpers/QuestHelper.d.ts b/TypeScript/20CustomChatBot/types/helpers/QuestHelper.d.ts index 39ba2a9..93368fa 100644 --- a/TypeScript/20CustomChatBot/types/helpers/QuestHelper.d.ts +++ b/TypeScript/20CustomChatBot/types/helpers/QuestHelper.d.ts @@ -18,7 +18,7 @@ import { IQuestConfig } from "@spt/models/spt/config/IQuestConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -30,9 +30,9 @@ export declare class QuestHelper { protected timeUtil: TimeUtil; protected hashUtil: HashUtil; protected itemHelper: ItemHelper; + protected databaseService: DatabaseService; protected questConditionHelper: QuestConditionHelper; protected eventOutputHolder: EventOutputHolder; - protected databaseServer: DatabaseServer; protected localeService: LocaleService; protected ragfairServerHelper: RagfairServerHelper; protected dialogueHelper: DialogueHelper; @@ -45,7 +45,7 @@ export declare class QuestHelper { protected configServer: ConfigServer; protected cloner: ICloner; protected questConfig: IQuestConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, questConditionHelper: QuestConditionHelper, eventOutputHolder: EventOutputHolder, databaseServer: DatabaseServer, localeService: LocaleService, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, localisationService: LocalisationService, traderHelper: TraderHelper, presetHelper: PresetHelper, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, databaseService: DatabaseService, questConditionHelper: QuestConditionHelper, eventOutputHolder: EventOutputHolder, localeService: LocaleService, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, localisationService: LocalisationService, traderHelper: TraderHelper, presetHelper: PresetHelper, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); /** * Get status of a quest in player profile by its id * @param pmcData Profile to search diff --git a/TypeScript/20CustomChatBot/types/helpers/RagfairOfferHelper.d.ts b/TypeScript/20CustomChatBot/types/helpers/RagfairOfferHelper.d.ts index 27bb081..a08e60a 100644 --- a/TypeScript/20CustomChatBot/types/helpers/RagfairOfferHelper.d.ts +++ b/TypeScript/20CustomChatBot/types/helpers/RagfairOfferHelper.d.ts @@ -19,8 +19,8 @@ import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -34,7 +34,7 @@ export declare class RagfairOfferHelper { protected timeUtil: TimeUtil; protected hashUtil: HashUtil; protected eventOutputHolder: EventOutputHolder; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected traderHelper: TraderHelper; protected saveServer: SaveServer; protected itemHelper: ItemHelper; @@ -55,7 +55,7 @@ export declare class RagfairOfferHelper { protected static goodSoldTemplate: string; protected ragfairConfig: IRagfairConfig; protected questConfig: IQuestConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, eventOutputHolder: EventOutputHolder, databaseServer: DatabaseServer, traderHelper: TraderHelper, saveServer: SaveServer, itemHelper: ItemHelper, botHelper: BotHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, localeService: LocaleService, localisationService: LocalisationService, mailSendService: MailSendService, configServer: ConfigServer); + constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, eventOutputHolder: EventOutputHolder, databaseService: DatabaseService, traderHelper: TraderHelper, saveServer: SaveServer, itemHelper: ItemHelper, botHelper: BotHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, localeService: LocaleService, localisationService: LocalisationService, mailSendService: MailSendService, configServer: ConfigServer); /** * Passthrough to ragfairOfferService.getOffers(), get flea offers a player should see * @param searchRequest Data from client diff --git a/TypeScript/20CustomChatBot/types/helpers/RepairHelper.d.ts b/TypeScript/20CustomChatBot/types/helpers/RepairHelper.d.ts index 4bd0577..99a21da 100644 --- a/TypeScript/20CustomChatBot/types/helpers/RepairHelper.d.ts +++ b/TypeScript/20CustomChatBot/types/helpers/RepairHelper.d.ts @@ -3,17 +3,17 @@ import { ITemplateItem, Props } from "@spt/models/eft/common/tables/ITemplateIte import { IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RepairHelper { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected configServer: ConfigServer; protected cloner: ICloner; protected repairConfig: IRepairConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, configServer: ConfigServer, cloner: ICloner); /** * Alter an items durability after a repair by trader/repair kit * @param itemToRepair item to update durability details diff --git a/TypeScript/20CustomChatBot/types/helpers/TraderAssortHelper.d.ts b/TypeScript/20CustomChatBot/types/helpers/TraderAssortHelper.d.ts index faf2a9d..8f8f802 100644 --- a/TypeScript/20CustomChatBot/types/helpers/TraderAssortHelper.d.ts +++ b/TypeScript/20CustomChatBot/types/helpers/TraderAssortHelper.d.ts @@ -9,7 +9,7 @@ import { ITrader, ITraderAssort } from "@spt/models/eft/common/tables/ITrader"; import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; @@ -21,7 +21,7 @@ export declare class TraderAssortHelper { protected logger: ILogger; protected mathUtil: MathUtil; protected timeUtil: TimeUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected assortHelper: AssortHelper; protected paymentHelper: PaymentHelper; @@ -37,7 +37,7 @@ export declare class TraderAssortHelper { protected traderConfig: ITraderConfig; protected mergedQuestAssorts: Record>; protected createdMergedQuestAssorts: boolean; - constructor(logger: ILogger, mathUtil: MathUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, profileHelper: ProfileHelper, assortHelper: AssortHelper, paymentHelper: PaymentHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, localisationService: LocalisationService, traderPurchasePersisterService: TraderPurchasePersisterService, traderHelper: TraderHelper, fenceService: FenceService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, mathUtil: MathUtil, timeUtil: TimeUtil, databaseService: DatabaseService, profileHelper: ProfileHelper, assortHelper: AssortHelper, paymentHelper: PaymentHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, localisationService: LocalisationService, traderPurchasePersisterService: TraderPurchasePersisterService, traderHelper: TraderHelper, fenceService: FenceService, configServer: ConfigServer, cloner: ICloner); /** * Get a traders assorts * Can be used for returning ragfair / fence assorts diff --git a/TypeScript/20CustomChatBot/types/helpers/TraderHelper.d.ts b/TypeScript/20CustomChatBot/types/helpers/TraderHelper.d.ts index 5f515da..eec1cc7 100644 --- a/TypeScript/20CustomChatBot/types/helpers/TraderHelper.d.ts +++ b/TypeScript/20CustomChatBot/types/helpers/TraderHelper.d.ts @@ -10,7 +10,7 @@ import { Traders } from "@spt/models/enums/Traders"; import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; @@ -18,7 +18,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class TraderHelper { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected handbookHelper: HandbookHelper; protected itemHelper: ItemHelper; @@ -33,7 +33,7 @@ export declare class TraderHelper { protected highestTraderPriceItems?: Record; /** Dictionary of item tpl and the highest trader buy back rouble price */ protected highestTraderBuyPriceItems?: Record; - constructor(logger: ILogger, databaseServer: DatabaseServer, profileHelper: ProfileHelper, handbookHelper: HandbookHelper, itemHelper: ItemHelper, playerService: PlayerService, localisationService: LocalisationService, fenceService: FenceService, timeUtil: TimeUtil, randomUtil: RandomUtil, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, profileHelper: ProfileHelper, handbookHelper: HandbookHelper, itemHelper: ItemHelper, playerService: PlayerService, localisationService: LocalisationService, fenceService: FenceService, timeUtil: TimeUtil, randomUtil: RandomUtil, configServer: ConfigServer); /** * Get a trader base object, update profile to reflect players current standing in profile * when trader not found in profile diff --git a/TypeScript/20CustomChatBot/types/models/eft/common/IGlobals.d.ts b/TypeScript/20CustomChatBot/types/models/eft/common/IGlobals.d.ts index 2209415..a0bb051 100644 --- a/TypeScript/20CustomChatBot/types/models/eft/common/IGlobals.d.ts +++ b/TypeScript/20CustomChatBot/types/models/eft/common/IGlobals.d.ts @@ -802,7 +802,6 @@ export interface IMaxActiveOfferCount { from: number; to: number; count: number; - countForSpecialEditions: number; } export interface IMaxSumForRarity { Common: IRarityMaxSum; diff --git a/TypeScript/20CustomChatBot/types/models/eft/common/ILocationBase.d.ts b/TypeScript/20CustomChatBot/types/models/eft/common/ILocationBase.d.ts index 65931f8..10f1a57 100644 --- a/TypeScript/20CustomChatBot/types/models/eft/common/ILocationBase.d.ts +++ b/TypeScript/20CustomChatBot/types/models/eft/common/ILocationBase.d.ts @@ -196,18 +196,24 @@ export interface Props { export interface Exit { /** % Chance out of 100 exit will appear in raid */ Chance: number; + ChancePVE: number; Count: number; + CountPVE: number; EntryPoints: string; EventAvailable: boolean; ExfiltrationTime: number; + ExfiltrationTimePVE: number; ExfiltrationType: string; RequiredSlot?: string; Id: string; MaxTime: number; + MaxTimePVE: number; MinTime: number; + MinTimePVE: number; Name: string; PassageRequirement: string; PlayersCount: number; + PlayersCountPVE: number; RequirementTip: string; Side?: string; } diff --git a/TypeScript/20CustomChatBot/types/models/eft/common/tables/IRepeatableQuests.d.ts b/TypeScript/20CustomChatBot/types/models/eft/common/tables/IRepeatableQuests.d.ts index 854c8ef..27ff49d 100644 --- a/TypeScript/20CustomChatBot/types/models/eft/common/tables/IRepeatableQuests.d.ts +++ b/TypeScript/20CustomChatBot/types/models/eft/common/tables/IRepeatableQuests.d.ts @@ -18,10 +18,13 @@ export interface IRepeatableTemplates { export interface IPmcDataRepeatableQuest { id?: string; name: string; + unavailableTime?: string; activeQuests: IRepeatableQuest[]; inactiveQuests: IRepeatableQuest[]; endTime: number; changeRequirement: Record; + freeChanges: number; + freeChangesAvailable: number; } export interface IChangeRequirement { changeCost: IChangeCost[]; diff --git a/TypeScript/20CustomChatBot/types/models/eft/common/tables/ITemplateItem.d.ts b/TypeScript/20CustomChatBot/types/models/eft/common/tables/ITemplateItem.d.ts index a8ccfbb..e5c6632 100644 --- a/TypeScript/20CustomChatBot/types/models/eft/common/tables/ITemplateItem.d.ts +++ b/TypeScript/20CustomChatBot/types/models/eft/common/tables/ITemplateItem.d.ts @@ -63,7 +63,7 @@ export interface Props { DiscardingBlock?: boolean; DropSoundType?: string; RagFairCommissionModifier?: number; - RarityPvE: string; + RarityPvE?: string; IsAlwaysAvailableForInsurance?: boolean; DiscardLimit?: number; MaxResource?: number; @@ -414,6 +414,12 @@ export interface Props { LayoutName?: string; Lower75Prefab?: Prefab; MaxUsages?: number; + ScavKillExpPenalty?: number; + ScavKillExpPenaltyPVE?: number; + ScavKillStandingPenalty?: number; + ScavKillStandingPenaltyPVE?: number; + TradersDiscount?: number; + TradersDiscountPVE?: number; } export interface IHealthEffect { type: string; diff --git a/TypeScript/20CustomChatBot/types/models/spt/config/IQuestConfig.d.ts b/TypeScript/20CustomChatBot/types/models/spt/config/IQuestConfig.d.ts index 362602c..2cdf4fa 100644 --- a/TypeScript/20CustomChatBot/types/models/spt/config/IQuestConfig.d.ts +++ b/TypeScript/20CustomChatBot/types/models/spt/config/IQuestConfig.d.ts @@ -47,6 +47,8 @@ export interface IRepeatableQuestConfig { /** Item tplIds to ignore when generating rewards */ rewardBlacklist: string[]; rewardAmmoStackMinSize: number; + freeChangesAvailable: number; + freeChanges: number; } export interface IRewardScaling { levels: number[]; diff --git a/TypeScript/20CustomChatBot/types/services/BotEquipmentModPoolService.d.ts b/TypeScript/20CustomChatBot/types/services/BotEquipmentModPoolService.d.ts index c53f31b..7b2b442 100644 --- a/TypeScript/20CustomChatBot/types/services/BotEquipmentModPoolService.d.ts +++ b/TypeScript/20CustomChatBot/types/services/BotEquipmentModPoolService.d.ts @@ -4,7 +4,7 @@ import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { VFS } from "@spt/utils/VFS"; /** Store a mapping between weapons, their slots and the items that fit those slots */ @@ -12,7 +12,7 @@ export declare class BotEquipmentModPoolService { protected logger: ILogger; protected vfs: VFS; protected itemHelper: ItemHelper; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected botConfig: IBotConfig; @@ -20,7 +20,7 @@ export declare class BotEquipmentModPoolService { protected gearModPool: Mods; protected weaponPoolGenerated: boolean; protected armorPoolGenerated: boolean; - constructor(logger: ILogger, vfs: VFS, itemHelper: ItemHelper, databaseServer: DatabaseServer, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, vfs: VFS, itemHelper: ItemHelper, databaseService: DatabaseService, localisationService: LocalisationService, configServer: ConfigServer); /** * Store dictionary of mods for each item passed in * @param items items to find related mods and store in modPool diff --git a/TypeScript/20CustomChatBot/types/services/CustomLocationWaveService.d.ts b/TypeScript/20CustomChatBot/types/services/CustomLocationWaveService.d.ts index 728a1e8..c72d5bb 100644 --- a/TypeScript/20CustomChatBot/types/services/CustomLocationWaveService.d.ts +++ b/TypeScript/20CustomChatBot/types/services/CustomLocationWaveService.d.ts @@ -2,15 +2,15 @@ import { BossLocationSpawn, Wave } from "@spt/models/eft/common/ILocationBase"; import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class CustomLocationWaveService { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, configServer: ConfigServer); /** * Add a boss wave to a map * @param locationId e.g. factory4_day, bigmap diff --git a/TypeScript/20CustomChatBot/types/services/InsuranceService.d.ts b/TypeScript/20CustomChatBot/types/services/InsuranceService.d.ts index c54f9f9..0000e66 100644 --- a/TypeScript/20CustomChatBot/types/services/InsuranceService.d.ts +++ b/TypeScript/20CustomChatBot/types/services/InsuranceService.d.ts @@ -13,8 +13,8 @@ import { ILostOnDeathConfig } from "@spt/models/spt/config/ILostOnDeathConfig"; import { IInsuranceEquipmentPkg } from "@spt/models/spt/services/IInsuranceEquipmentPkg"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -24,7 +24,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class InsuranceService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected secureContainerHelper: SecureContainerHelper; protected randomUtil: RandomUtil; protected itemHelper: ItemHelper; @@ -42,7 +42,7 @@ export declare class InsuranceService { protected insured: Record>; protected insuranceConfig: IInsuranceConfig; protected lostOnDeathConfig: ILostOnDeathConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, handbookHelper: HandbookHelper, localisationService: LocalisationService, localeService: LocaleService, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, databaseService: DatabaseService, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, handbookHelper: HandbookHelper, localisationService: LocalisationService, localeService: LocaleService, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); /** * Does player have insurance array * @param sessionId Player id diff --git a/TypeScript/20CustomChatBot/types/services/MailSendService.d.ts b/TypeScript/20CustomChatBot/types/services/MailSendService.d.ts index d445841..8f1f974 100644 --- a/TypeScript/20CustomChatBot/types/services/MailSendService.d.ts +++ b/TypeScript/20CustomChatBot/types/services/MailSendService.d.ts @@ -9,8 +9,8 @@ import { MessageType } from "@spt/models/enums/MessageType"; import { Traders } from "@spt/models/enums/Traders"; import { IProfileChangeEvent, ISendMessageDetails } from "@spt/models/spt/dialog/ISendMessageDetails"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; @@ -19,7 +19,7 @@ export declare class MailSendService { protected hashUtil: HashUtil; protected timeUtil: TimeUtil; protected saveServer: SaveServer; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected notifierHelper: NotifierHelper; protected dialogueHelper: DialogueHelper; protected notificationSendHelper: NotificationSendHelper; @@ -27,7 +27,7 @@ export declare class MailSendService { protected itemHelper: ItemHelper; protected traderHelper: TraderHelper; protected readonly systemSenderId = "59e7125688a45068a6249071"; - constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, dialogueHelper: DialogueHelper, notificationSendHelper: NotificationSendHelper, localisationService: LocalisationService, itemHelper: ItemHelper, traderHelper: TraderHelper); + constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseService: DatabaseService, notifierHelper: NotifierHelper, dialogueHelper: DialogueHelper, notificationSendHelper: NotificationSendHelper, localisationService: LocalisationService, itemHelper: ItemHelper, traderHelper: TraderHelper); /** * Send a message from an NPC (e.g. prapor) to the player with or without items using direct message text, do not look up any locale * @param sessionId The session ID to send the message to diff --git a/TypeScript/20CustomChatBot/types/services/OpenZoneService.d.ts b/TypeScript/20CustomChatBot/types/services/OpenZoneService.d.ts index 1bc5f00..c7dd0bd 100644 --- a/TypeScript/20CustomChatBot/types/services/OpenZoneService.d.ts +++ b/TypeScript/20CustomChatBot/types/services/OpenZoneService.d.ts @@ -1,18 +1,18 @@ import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RandomUtil } from "@spt/utils/RandomUtil"; /** Service for adding new zones to a maps OpenZones property */ export declare class OpenZoneService { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, localisationService: LocalisationService, configServer: ConfigServer); /** * Add open zone to specified map * @param locationId map location (e.g. factory4_day) diff --git a/TypeScript/20CustomChatBot/types/services/PaymentService.d.ts b/TypeScript/20CustomChatBot/types/services/PaymentService.d.ts index 64ff2c1..61d5731 100644 --- a/TypeScript/20CustomChatBot/types/services/PaymentService.d.ts +++ b/TypeScript/20CustomChatBot/types/services/PaymentService.d.ts @@ -9,7 +9,7 @@ import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRo import { IProcessBuyTradeRequestData } from "@spt/models/eft/trade/IProcessBuyTradeRequestData"; import { IProcessSellTradeRequestData } from "@spt/models/eft/trade/IProcessSellTradeRequestData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; @@ -17,14 +17,14 @@ export declare class PaymentService { protected logger: ILogger; protected hashUtil: HashUtil; protected httpResponse: HttpResponseUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected handbookHelper: HandbookHelper; protected traderHelper: TraderHelper; protected itemHelper: ItemHelper; protected inventoryHelper: InventoryHelper; protected localisationService: LocalisationService; protected paymentHelper: PaymentHelper; - constructor(logger: ILogger, hashUtil: HashUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, localisationService: LocalisationService, paymentHelper: PaymentHelper); + constructor(logger: ILogger, hashUtil: HashUtil, httpResponse: HttpResponseUtil, databaseService: DatabaseService, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, localisationService: LocalisationService, paymentHelper: PaymentHelper); /** * Take money and insert items into return to server request * @param pmcData Pmc profile diff --git a/TypeScript/20CustomChatBot/types/services/PlayerService.d.ts b/TypeScript/20CustomChatBot/types/services/PlayerService.d.ts index ae57410..84c4c6f 100644 --- a/TypeScript/20CustomChatBot/types/services/PlayerService.d.ts +++ b/TypeScript/20CustomChatBot/types/services/PlayerService.d.ts @@ -1,14 +1,14 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class PlayerService { protected logger: ILogger; protected timeUtil: TimeUtil; protected localisationService: LocalisationService; - protected databaseServer: DatabaseServer; - constructor(logger: ILogger, timeUtil: TimeUtil, localisationService: LocalisationService, databaseServer: DatabaseServer); + protected databaseService: DatabaseService; + constructor(logger: ILogger, timeUtil: TimeUtil, localisationService: LocalisationService, databaseService: DatabaseService); /** * Get level of player * @param pmcData Player profile diff --git a/TypeScript/20CustomChatBot/types/services/RagfairLinkedItemService.d.ts b/TypeScript/20CustomChatBot/types/services/RagfairLinkedItemService.d.ts index 6011c1a..0d03459 100644 --- a/TypeScript/20CustomChatBot/types/services/RagfairLinkedItemService.d.ts +++ b/TypeScript/20CustomChatBot/types/services/RagfairLinkedItemService.d.ts @@ -1,11 +1,11 @@ import { ItemHelper } from "@spt/helpers/ItemHelper"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; export declare class RagfairLinkedItemService { - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected linkedItemsCache: Record>; - constructor(databaseServer: DatabaseServer, itemHelper: ItemHelper); + constructor(databaseService: DatabaseService, itemHelper: ItemHelper); getLinkedItems(linkedSearchId: string): Set; /** * Use ragfair linked item service to get an array of items that can fit on or in designated itemtpl diff --git a/TypeScript/20CustomChatBot/types/services/RagfairOfferService.d.ts b/TypeScript/20CustomChatBot/types/services/RagfairOfferService.d.ts index c044f6d..4bc07c3 100644 --- a/TypeScript/20CustomChatBot/types/services/RagfairOfferService.d.ts +++ b/TypeScript/20CustomChatBot/types/services/RagfairOfferService.d.ts @@ -6,8 +6,8 @@ import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RagfairOfferHolder } from "@spt/utils/RagfairOfferHolder"; @@ -15,7 +15,7 @@ import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class RagfairOfferService { protected logger: ILogger; protected timeUtil: TimeUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected saveServer: SaveServer; protected ragfairServerHelper: RagfairServerHelper; protected profileHelper: ProfileHelper; @@ -28,7 +28,7 @@ export declare class RagfairOfferService { protected expiredOffers: Record; protected ragfairConfig: IRagfairConfig; protected ragfairOfferHandler: RagfairOfferHolder; - constructor(logger: ILogger, timeUtil: TimeUtil, databaseServer: DatabaseServer, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, eventOutputHolder: EventOutputHolder, httpResponse: HttpResponseUtil, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, timeUtil: TimeUtil, databaseService: DatabaseService, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, eventOutputHolder: EventOutputHolder, httpResponse: HttpResponseUtil, localisationService: LocalisationService, configServer: ConfigServer); /** * Get all offers * @returns IRagfairOffer array diff --git a/TypeScript/20CustomChatBot/types/services/RagfairPriceService.d.ts b/TypeScript/20CustomChatBot/types/services/RagfairPriceService.d.ts index 5b8fa56..0a2f26e 100644 --- a/TypeScript/20CustomChatBot/types/services/RagfairPriceService.d.ts +++ b/TypeScript/20CustomChatBot/types/services/RagfairPriceService.d.ts @@ -12,7 +12,7 @@ import { IRagfairConfig, IUnreasonableModPrices } from "@spt/models/spt/config/I import { IRagfairServerPrices } from "@spt/models/spt/ragfair/IRagfairServerPrices"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RandomUtil } from "@spt/utils/RandomUtil"; /** @@ -20,7 +20,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; */ export declare class RagfairPriceService implements OnLoad { protected handbookHelper: HandbookHelper; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected logger: ILogger; protected itemHelper: ItemHelper; protected presetHelper: PresetHelper; @@ -30,7 +30,7 @@ export declare class RagfairPriceService implements OnLoad { protected configServer: ConfigServer; protected ragfairConfig: IRagfairConfig; protected prices: IRagfairServerPrices; - constructor(handbookHelper: HandbookHelper, databaseServer: DatabaseServer, logger: ILogger, itemHelper: ItemHelper, presetHelper: PresetHelper, traderHelper: TraderHelper, randomUtil: RandomUtil, localisationService: LocalisationService, configServer: ConfigServer); + constructor(handbookHelper: HandbookHelper, databaseService: DatabaseService, logger: ILogger, itemHelper: ItemHelper, presetHelper: PresetHelper, traderHelper: TraderHelper, randomUtil: RandomUtil, localisationService: LocalisationService, configServer: ConfigServer); /** * Generate static (handbook) and dynamic (prices.json) flea prices, store inside class as dictionaries */ diff --git a/TypeScript/20CustomChatBot/types/services/RagfairTaxService.d.ts b/TypeScript/20CustomChatBot/types/services/RagfairTaxService.d.ts index 4e4e648..effb9f0 100644 --- a/TypeScript/20CustomChatBot/types/services/RagfairTaxService.d.ts +++ b/TypeScript/20CustomChatBot/types/services/RagfairTaxService.d.ts @@ -4,15 +4,15 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { IStorePlayerOfferTaxAmountRequestData } from "@spt/models/eft/ragfair/IStorePlayerOfferTaxAmountRequestData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; export declare class RagfairTaxService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected ragfairPriceService: RagfairPriceService; protected itemHelper: ItemHelper; protected playerOfferTaxCache: Record; - constructor(logger: ILogger, databaseServer: DatabaseServer, ragfairPriceService: RagfairPriceService, itemHelper: ItemHelper); + constructor(logger: ILogger, databaseService: DatabaseService, ragfairPriceService: RagfairPriceService, itemHelper: ItemHelper); storeClientOfferTaxValue(sessionId: string, offer: IStorePlayerOfferTaxAmountRequestData): void; clearStoredOfferTaxById(offerIdToRemove: string): void; getStoredClientOfferTaxValueById(offerIdToGet: string): IStorePlayerOfferTaxAmountRequestData; diff --git a/TypeScript/20CustomChatBot/types/services/RaidTimeAdjustmentService.d.ts b/TypeScript/20CustomChatBot/types/services/RaidTimeAdjustmentService.d.ts index f770b64..bfc099a 100644 --- a/TypeScript/20CustomChatBot/types/services/RaidTimeAdjustmentService.d.ts +++ b/TypeScript/20CustomChatBot/types/services/RaidTimeAdjustmentService.d.ts @@ -7,17 +7,17 @@ import { ILocationConfig, IScavRaidTimeLocationSettings, LootMultiplier } from " import { IRaidChanges } from "@spt/models/spt/location/IRaidChanges"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RaidTimeAdjustmentService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected randomUtil: RandomUtil; protected weightedRandomHelper: WeightedRandomHelper; protected applicationContext: ApplicationContext; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, applicationContext: ApplicationContext, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, applicationContext: ApplicationContext, configServer: ConfigServer); /** * Make alterations to the base map data passed in * Loot multipliers/waves/wave start times diff --git a/TypeScript/20CustomChatBot/types/services/RepairService.d.ts b/TypeScript/20CustomChatBot/types/services/RepairService.d.ts index 9203417..48f306e 100644 --- a/TypeScript/20CustomChatBot/types/services/RepairService.d.ts +++ b/TypeScript/20CustomChatBot/types/services/RepairService.d.ts @@ -14,13 +14,13 @@ import { SkillTypes } from "@spt/models/enums/SkillTypes"; import { BonusSettings, IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RepairService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected randomUtil: RandomUtil; protected itemHelper: ItemHelper; @@ -31,7 +31,7 @@ export declare class RepairService { protected localisationService: LocalisationService; protected configServer: ConfigServer; protected repairConfig: IRepairConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, profileHelper: ProfileHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, traderHelper: TraderHelper, weightedRandomHelper: WeightedRandomHelper, paymentService: PaymentService, repairHelper: RepairHelper, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, profileHelper: ProfileHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, traderHelper: TraderHelper, weightedRandomHelper: WeightedRandomHelper, paymentService: PaymentService, repairHelper: RepairHelper, localisationService: LocalisationService, configServer: ConfigServer); /** * Use trader to repair an items durability * @param sessionID Session id diff --git a/TypeScript/20CustomChatBot/types/services/TraderServicesService.d.ts b/TypeScript/20CustomChatBot/types/services/TraderServicesService.d.ts index 111c71a..e441eb6 100644 --- a/TypeScript/20CustomChatBot/types/services/TraderServicesService.d.ts +++ b/TypeScript/20CustomChatBot/types/services/TraderServicesService.d.ts @@ -1,13 +1,13 @@ import { ProfileHelper } from "@spt/helpers/ProfileHelper"; import { ITraderServiceModel } from "@spt/models/spt/services/ITraderServiceModel"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderServicesService { protected profileHelper: ProfileHelper; protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected cloner: ICloner; - constructor(profileHelper: ProfileHelper, logger: ILogger, databaseServer: DatabaseServer, cloner: ICloner); + constructor(profileHelper: ProfileHelper, logger: ILogger, databaseService: DatabaseService, cloner: ICloner); getTraderServices(sessionId: string, traderId: string): ITraderServiceModel[]; } diff --git a/TypeScript/20CustomChatBot/types/services/mod/CustomItemService.d.ts b/TypeScript/20CustomChatBot/types/services/mod/CustomItemService.d.ts index 6dc4730..1926bed 100644 --- a/TypeScript/20CustomChatBot/types/services/mod/CustomItemService.d.ts +++ b/TypeScript/20CustomChatBot/types/services/mod/CustomItemService.d.ts @@ -9,11 +9,11 @@ import { HashUtil } from "@spt/utils/HashUtil"; export declare class CustomItemService { protected logger: ILogger; protected hashUtil: HashUtil; - protected databaseServer: DatabaseService; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected itemBaseClassService: ItemBaseClassService; protected cloner: ICloner; - constructor(logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseService, itemHelper: ItemHelper, itemBaseClassService: ItemBaseClassService, cloner: ICloner); + constructor(logger: ILogger, hashUtil: HashUtil, databaseService: DatabaseService, itemHelper: ItemHelper, itemBaseClassService: ItemBaseClassService, cloner: ICloner); /** * Create a new item from a cloned item base * WARNING - If no item id is supplied, an id will be generated, this id will be random every time you add an item and will not be the same on each subsequent server start diff --git a/TypeScript/21CustomCommandoCommand/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts b/TypeScript/21CustomCommandoCommand/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts index a7491b5..c51bf7e 100644 --- a/TypeScript/21CustomCommandoCommand/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts @@ -6,7 +6,7 @@ import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { ISendMessageRequest } from "@spt/models/eft/dialog/ISendMessageRequest"; import { IUserDialogInfo } from "@spt/models/eft/profile/ISptProfile"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -19,7 +19,7 @@ export declare class GiveSptCommand implements ISptCommand { protected presetHelper: PresetHelper; protected mailSendService: MailSendService; protected localeService: LocaleService; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemFilterService: ItemFilterService; protected cloner: ICloner; /** @@ -34,7 +34,7 @@ export declare class GiveSptCommand implements ISptCommand { private static acceptableConfidence; private static excludedPresetItems; protected savedCommand: Map; - constructor(logger: ILogger, itemHelper: ItemHelper, hashUtil: HashUtil, presetHelper: PresetHelper, mailSendService: MailSendService, localeService: LocaleService, databaseServer: DatabaseServer, itemFilterService: ItemFilterService, cloner: ICloner); + constructor(logger: ILogger, itemHelper: ItemHelper, hashUtil: HashUtil, presetHelper: PresetHelper, mailSendService: MailSendService, localeService: LocaleService, databaseService: DatabaseService, itemFilterService: ItemFilterService, cloner: ICloner); getCommand(): string; getCommandHelp(): string; performAction(commandHandler: IUserDialogInfo, sessionId: string, request: ISendMessageRequest): string; diff --git a/TypeScript/21CustomCommandoCommand/types/helpers/PresetHelper.d.ts b/TypeScript/21CustomCommandoCommand/types/helpers/PresetHelper.d.ts index 5fc8a7c..e71e5b7 100644 --- a/TypeScript/21CustomCommandoCommand/types/helpers/PresetHelper.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/helpers/PresetHelper.d.ts @@ -1,16 +1,16 @@ import { IPreset } from "@spt/models/eft/common/IGlobals"; import { BaseClasses } from "@spt/models/enums/BaseClasses"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; import { ItemHelper } from "./ItemHelper"; export declare class PresetHelper { - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected cloner: ICloner; protected lookup: Record; protected defaultEquipmentPresets: Record; protected defaultWeaponPresets: Record; - constructor(databaseServer: DatabaseServer, itemHelper: ItemHelper, cloner: ICloner); + constructor(databaseService: DatabaseService, itemHelper: ItemHelper, cloner: ICloner); hydratePresetStore(input: Record): void; /** * Get default weapon and equipment presets diff --git a/TypeScript/21CustomCommandoCommand/types/helpers/ProfileHelper.d.ts b/TypeScript/21CustomCommandoCommand/types/helpers/ProfileHelper.d.ts index 37937ff..e943bd3 100644 --- a/TypeScript/21CustomCommandoCommand/types/helpers/ProfileHelper.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/helpers/ProfileHelper.d.ts @@ -7,8 +7,8 @@ import { SkillTypes } from "@spt/models/enums/SkillTypes"; import { IInventoryConfig } from "@spt/models/spt/config/IInventoryConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileSnapshotService } from "@spt/services/ProfileSnapshotService"; import { ICloner } from "@spt/utils/cloners/ICloner"; @@ -21,14 +21,14 @@ export declare class ProfileHelper { protected watermark: Watermark; protected timeUtil: TimeUtil; protected saveServer: SaveServer; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected profileSnapshotService: ProfileSnapshotService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected cloner: ICloner; protected inventoryConfig: IInventoryConfig; - constructor(logger: ILogger, hashUtil: HashUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileSnapshotService: ProfileSnapshotService, localisationService: LocalisationService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, hashUtil: HashUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseService: DatabaseService, itemHelper: ItemHelper, profileSnapshotService: ProfileSnapshotService, localisationService: LocalisationService, configServer: ConfigServer, cloner: ICloner); /** * Remove/reset a completed quest condtion from players profile quest data * @param sessionID Session id diff --git a/TypeScript/21CustomCommandoCommand/types/helpers/QuestHelper.d.ts b/TypeScript/21CustomCommandoCommand/types/helpers/QuestHelper.d.ts index 39ba2a9..93368fa 100644 --- a/TypeScript/21CustomCommandoCommand/types/helpers/QuestHelper.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/helpers/QuestHelper.d.ts @@ -18,7 +18,7 @@ import { IQuestConfig } from "@spt/models/spt/config/IQuestConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -30,9 +30,9 @@ export declare class QuestHelper { protected timeUtil: TimeUtil; protected hashUtil: HashUtil; protected itemHelper: ItemHelper; + protected databaseService: DatabaseService; protected questConditionHelper: QuestConditionHelper; protected eventOutputHolder: EventOutputHolder; - protected databaseServer: DatabaseServer; protected localeService: LocaleService; protected ragfairServerHelper: RagfairServerHelper; protected dialogueHelper: DialogueHelper; @@ -45,7 +45,7 @@ export declare class QuestHelper { protected configServer: ConfigServer; protected cloner: ICloner; protected questConfig: IQuestConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, questConditionHelper: QuestConditionHelper, eventOutputHolder: EventOutputHolder, databaseServer: DatabaseServer, localeService: LocaleService, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, localisationService: LocalisationService, traderHelper: TraderHelper, presetHelper: PresetHelper, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, databaseService: DatabaseService, questConditionHelper: QuestConditionHelper, eventOutputHolder: EventOutputHolder, localeService: LocaleService, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, localisationService: LocalisationService, traderHelper: TraderHelper, presetHelper: PresetHelper, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); /** * Get status of a quest in player profile by its id * @param pmcData Profile to search diff --git a/TypeScript/21CustomCommandoCommand/types/helpers/RagfairOfferHelper.d.ts b/TypeScript/21CustomCommandoCommand/types/helpers/RagfairOfferHelper.d.ts index 27bb081..a08e60a 100644 --- a/TypeScript/21CustomCommandoCommand/types/helpers/RagfairOfferHelper.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/helpers/RagfairOfferHelper.d.ts @@ -19,8 +19,8 @@ import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -34,7 +34,7 @@ export declare class RagfairOfferHelper { protected timeUtil: TimeUtil; protected hashUtil: HashUtil; protected eventOutputHolder: EventOutputHolder; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected traderHelper: TraderHelper; protected saveServer: SaveServer; protected itemHelper: ItemHelper; @@ -55,7 +55,7 @@ export declare class RagfairOfferHelper { protected static goodSoldTemplate: string; protected ragfairConfig: IRagfairConfig; protected questConfig: IQuestConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, eventOutputHolder: EventOutputHolder, databaseServer: DatabaseServer, traderHelper: TraderHelper, saveServer: SaveServer, itemHelper: ItemHelper, botHelper: BotHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, localeService: LocaleService, localisationService: LocalisationService, mailSendService: MailSendService, configServer: ConfigServer); + constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, eventOutputHolder: EventOutputHolder, databaseService: DatabaseService, traderHelper: TraderHelper, saveServer: SaveServer, itemHelper: ItemHelper, botHelper: BotHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, localeService: LocaleService, localisationService: LocalisationService, mailSendService: MailSendService, configServer: ConfigServer); /** * Passthrough to ragfairOfferService.getOffers(), get flea offers a player should see * @param searchRequest Data from client diff --git a/TypeScript/21CustomCommandoCommand/types/helpers/RepairHelper.d.ts b/TypeScript/21CustomCommandoCommand/types/helpers/RepairHelper.d.ts index 4bd0577..99a21da 100644 --- a/TypeScript/21CustomCommandoCommand/types/helpers/RepairHelper.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/helpers/RepairHelper.d.ts @@ -3,17 +3,17 @@ import { ITemplateItem, Props } from "@spt/models/eft/common/tables/ITemplateIte import { IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RepairHelper { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected configServer: ConfigServer; protected cloner: ICloner; protected repairConfig: IRepairConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, configServer: ConfigServer, cloner: ICloner); /** * Alter an items durability after a repair by trader/repair kit * @param itemToRepair item to update durability details diff --git a/TypeScript/21CustomCommandoCommand/types/helpers/TraderAssortHelper.d.ts b/TypeScript/21CustomCommandoCommand/types/helpers/TraderAssortHelper.d.ts index faf2a9d..8f8f802 100644 --- a/TypeScript/21CustomCommandoCommand/types/helpers/TraderAssortHelper.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/helpers/TraderAssortHelper.d.ts @@ -9,7 +9,7 @@ import { ITrader, ITraderAssort } from "@spt/models/eft/common/tables/ITrader"; import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; @@ -21,7 +21,7 @@ export declare class TraderAssortHelper { protected logger: ILogger; protected mathUtil: MathUtil; protected timeUtil: TimeUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected assortHelper: AssortHelper; protected paymentHelper: PaymentHelper; @@ -37,7 +37,7 @@ export declare class TraderAssortHelper { protected traderConfig: ITraderConfig; protected mergedQuestAssorts: Record>; protected createdMergedQuestAssorts: boolean; - constructor(logger: ILogger, mathUtil: MathUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, profileHelper: ProfileHelper, assortHelper: AssortHelper, paymentHelper: PaymentHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, localisationService: LocalisationService, traderPurchasePersisterService: TraderPurchasePersisterService, traderHelper: TraderHelper, fenceService: FenceService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, mathUtil: MathUtil, timeUtil: TimeUtil, databaseService: DatabaseService, profileHelper: ProfileHelper, assortHelper: AssortHelper, paymentHelper: PaymentHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, localisationService: LocalisationService, traderPurchasePersisterService: TraderPurchasePersisterService, traderHelper: TraderHelper, fenceService: FenceService, configServer: ConfigServer, cloner: ICloner); /** * Get a traders assorts * Can be used for returning ragfair / fence assorts diff --git a/TypeScript/21CustomCommandoCommand/types/helpers/TraderHelper.d.ts b/TypeScript/21CustomCommandoCommand/types/helpers/TraderHelper.d.ts index 5f515da..eec1cc7 100644 --- a/TypeScript/21CustomCommandoCommand/types/helpers/TraderHelper.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/helpers/TraderHelper.d.ts @@ -10,7 +10,7 @@ import { Traders } from "@spt/models/enums/Traders"; import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; @@ -18,7 +18,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class TraderHelper { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected handbookHelper: HandbookHelper; protected itemHelper: ItemHelper; @@ -33,7 +33,7 @@ export declare class TraderHelper { protected highestTraderPriceItems?: Record; /** Dictionary of item tpl and the highest trader buy back rouble price */ protected highestTraderBuyPriceItems?: Record; - constructor(logger: ILogger, databaseServer: DatabaseServer, profileHelper: ProfileHelper, handbookHelper: HandbookHelper, itemHelper: ItemHelper, playerService: PlayerService, localisationService: LocalisationService, fenceService: FenceService, timeUtil: TimeUtil, randomUtil: RandomUtil, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, profileHelper: ProfileHelper, handbookHelper: HandbookHelper, itemHelper: ItemHelper, playerService: PlayerService, localisationService: LocalisationService, fenceService: FenceService, timeUtil: TimeUtil, randomUtil: RandomUtil, configServer: ConfigServer); /** * Get a trader base object, update profile to reflect players current standing in profile * when trader not found in profile diff --git a/TypeScript/21CustomCommandoCommand/types/models/eft/common/IGlobals.d.ts b/TypeScript/21CustomCommandoCommand/types/models/eft/common/IGlobals.d.ts index 2209415..a0bb051 100644 --- a/TypeScript/21CustomCommandoCommand/types/models/eft/common/IGlobals.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/models/eft/common/IGlobals.d.ts @@ -802,7 +802,6 @@ export interface IMaxActiveOfferCount { from: number; to: number; count: number; - countForSpecialEditions: number; } export interface IMaxSumForRarity { Common: IRarityMaxSum; diff --git a/TypeScript/21CustomCommandoCommand/types/models/eft/common/ILocationBase.d.ts b/TypeScript/21CustomCommandoCommand/types/models/eft/common/ILocationBase.d.ts index 65931f8..10f1a57 100644 --- a/TypeScript/21CustomCommandoCommand/types/models/eft/common/ILocationBase.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/models/eft/common/ILocationBase.d.ts @@ -196,18 +196,24 @@ export interface Props { export interface Exit { /** % Chance out of 100 exit will appear in raid */ Chance: number; + ChancePVE: number; Count: number; + CountPVE: number; EntryPoints: string; EventAvailable: boolean; ExfiltrationTime: number; + ExfiltrationTimePVE: number; ExfiltrationType: string; RequiredSlot?: string; Id: string; MaxTime: number; + MaxTimePVE: number; MinTime: number; + MinTimePVE: number; Name: string; PassageRequirement: string; PlayersCount: number; + PlayersCountPVE: number; RequirementTip: string; Side?: string; } diff --git a/TypeScript/21CustomCommandoCommand/types/models/eft/common/tables/IRepeatableQuests.d.ts b/TypeScript/21CustomCommandoCommand/types/models/eft/common/tables/IRepeatableQuests.d.ts index 854c8ef..27ff49d 100644 --- a/TypeScript/21CustomCommandoCommand/types/models/eft/common/tables/IRepeatableQuests.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/models/eft/common/tables/IRepeatableQuests.d.ts @@ -18,10 +18,13 @@ export interface IRepeatableTemplates { export interface IPmcDataRepeatableQuest { id?: string; name: string; + unavailableTime?: string; activeQuests: IRepeatableQuest[]; inactiveQuests: IRepeatableQuest[]; endTime: number; changeRequirement: Record; + freeChanges: number; + freeChangesAvailable: number; } export interface IChangeRequirement { changeCost: IChangeCost[]; diff --git a/TypeScript/21CustomCommandoCommand/types/models/eft/common/tables/ITemplateItem.d.ts b/TypeScript/21CustomCommandoCommand/types/models/eft/common/tables/ITemplateItem.d.ts index a8ccfbb..e5c6632 100644 --- a/TypeScript/21CustomCommandoCommand/types/models/eft/common/tables/ITemplateItem.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/models/eft/common/tables/ITemplateItem.d.ts @@ -63,7 +63,7 @@ export interface Props { DiscardingBlock?: boolean; DropSoundType?: string; RagFairCommissionModifier?: number; - RarityPvE: string; + RarityPvE?: string; IsAlwaysAvailableForInsurance?: boolean; DiscardLimit?: number; MaxResource?: number; @@ -414,6 +414,12 @@ export interface Props { LayoutName?: string; Lower75Prefab?: Prefab; MaxUsages?: number; + ScavKillExpPenalty?: number; + ScavKillExpPenaltyPVE?: number; + ScavKillStandingPenalty?: number; + ScavKillStandingPenaltyPVE?: number; + TradersDiscount?: number; + TradersDiscountPVE?: number; } export interface IHealthEffect { type: string; diff --git a/TypeScript/21CustomCommandoCommand/types/models/spt/config/IQuestConfig.d.ts b/TypeScript/21CustomCommandoCommand/types/models/spt/config/IQuestConfig.d.ts index 362602c..2cdf4fa 100644 --- a/TypeScript/21CustomCommandoCommand/types/models/spt/config/IQuestConfig.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/models/spt/config/IQuestConfig.d.ts @@ -47,6 +47,8 @@ export interface IRepeatableQuestConfig { /** Item tplIds to ignore when generating rewards */ rewardBlacklist: string[]; rewardAmmoStackMinSize: number; + freeChangesAvailable: number; + freeChanges: number; } export interface IRewardScaling { levels: number[]; diff --git a/TypeScript/21CustomCommandoCommand/types/services/BotEquipmentModPoolService.d.ts b/TypeScript/21CustomCommandoCommand/types/services/BotEquipmentModPoolService.d.ts index c53f31b..7b2b442 100644 --- a/TypeScript/21CustomCommandoCommand/types/services/BotEquipmentModPoolService.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/services/BotEquipmentModPoolService.d.ts @@ -4,7 +4,7 @@ import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { VFS } from "@spt/utils/VFS"; /** Store a mapping between weapons, their slots and the items that fit those slots */ @@ -12,7 +12,7 @@ export declare class BotEquipmentModPoolService { protected logger: ILogger; protected vfs: VFS; protected itemHelper: ItemHelper; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected botConfig: IBotConfig; @@ -20,7 +20,7 @@ export declare class BotEquipmentModPoolService { protected gearModPool: Mods; protected weaponPoolGenerated: boolean; protected armorPoolGenerated: boolean; - constructor(logger: ILogger, vfs: VFS, itemHelper: ItemHelper, databaseServer: DatabaseServer, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, vfs: VFS, itemHelper: ItemHelper, databaseService: DatabaseService, localisationService: LocalisationService, configServer: ConfigServer); /** * Store dictionary of mods for each item passed in * @param items items to find related mods and store in modPool diff --git a/TypeScript/21CustomCommandoCommand/types/services/CustomLocationWaveService.d.ts b/TypeScript/21CustomCommandoCommand/types/services/CustomLocationWaveService.d.ts index 728a1e8..c72d5bb 100644 --- a/TypeScript/21CustomCommandoCommand/types/services/CustomLocationWaveService.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/services/CustomLocationWaveService.d.ts @@ -2,15 +2,15 @@ import { BossLocationSpawn, Wave } from "@spt/models/eft/common/ILocationBase"; import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class CustomLocationWaveService { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, configServer: ConfigServer); /** * Add a boss wave to a map * @param locationId e.g. factory4_day, bigmap diff --git a/TypeScript/21CustomCommandoCommand/types/services/InsuranceService.d.ts b/TypeScript/21CustomCommandoCommand/types/services/InsuranceService.d.ts index c54f9f9..0000e66 100644 --- a/TypeScript/21CustomCommandoCommand/types/services/InsuranceService.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/services/InsuranceService.d.ts @@ -13,8 +13,8 @@ import { ILostOnDeathConfig } from "@spt/models/spt/config/ILostOnDeathConfig"; import { IInsuranceEquipmentPkg } from "@spt/models/spt/services/IInsuranceEquipmentPkg"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -24,7 +24,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class InsuranceService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected secureContainerHelper: SecureContainerHelper; protected randomUtil: RandomUtil; protected itemHelper: ItemHelper; @@ -42,7 +42,7 @@ export declare class InsuranceService { protected insured: Record>; protected insuranceConfig: IInsuranceConfig; protected lostOnDeathConfig: ILostOnDeathConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, handbookHelper: HandbookHelper, localisationService: LocalisationService, localeService: LocaleService, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, databaseService: DatabaseService, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, handbookHelper: HandbookHelper, localisationService: LocalisationService, localeService: LocaleService, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); /** * Does player have insurance array * @param sessionId Player id diff --git a/TypeScript/21CustomCommandoCommand/types/services/MailSendService.d.ts b/TypeScript/21CustomCommandoCommand/types/services/MailSendService.d.ts index d445841..8f1f974 100644 --- a/TypeScript/21CustomCommandoCommand/types/services/MailSendService.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/services/MailSendService.d.ts @@ -9,8 +9,8 @@ import { MessageType } from "@spt/models/enums/MessageType"; import { Traders } from "@spt/models/enums/Traders"; import { IProfileChangeEvent, ISendMessageDetails } from "@spt/models/spt/dialog/ISendMessageDetails"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; @@ -19,7 +19,7 @@ export declare class MailSendService { protected hashUtil: HashUtil; protected timeUtil: TimeUtil; protected saveServer: SaveServer; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected notifierHelper: NotifierHelper; protected dialogueHelper: DialogueHelper; protected notificationSendHelper: NotificationSendHelper; @@ -27,7 +27,7 @@ export declare class MailSendService { protected itemHelper: ItemHelper; protected traderHelper: TraderHelper; protected readonly systemSenderId = "59e7125688a45068a6249071"; - constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, dialogueHelper: DialogueHelper, notificationSendHelper: NotificationSendHelper, localisationService: LocalisationService, itemHelper: ItemHelper, traderHelper: TraderHelper); + constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseService: DatabaseService, notifierHelper: NotifierHelper, dialogueHelper: DialogueHelper, notificationSendHelper: NotificationSendHelper, localisationService: LocalisationService, itemHelper: ItemHelper, traderHelper: TraderHelper); /** * Send a message from an NPC (e.g. prapor) to the player with or without items using direct message text, do not look up any locale * @param sessionId The session ID to send the message to diff --git a/TypeScript/21CustomCommandoCommand/types/services/OpenZoneService.d.ts b/TypeScript/21CustomCommandoCommand/types/services/OpenZoneService.d.ts index 1bc5f00..c7dd0bd 100644 --- a/TypeScript/21CustomCommandoCommand/types/services/OpenZoneService.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/services/OpenZoneService.d.ts @@ -1,18 +1,18 @@ import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RandomUtil } from "@spt/utils/RandomUtil"; /** Service for adding new zones to a maps OpenZones property */ export declare class OpenZoneService { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, localisationService: LocalisationService, configServer: ConfigServer); /** * Add open zone to specified map * @param locationId map location (e.g. factory4_day) diff --git a/TypeScript/21CustomCommandoCommand/types/services/PaymentService.d.ts b/TypeScript/21CustomCommandoCommand/types/services/PaymentService.d.ts index 64ff2c1..61d5731 100644 --- a/TypeScript/21CustomCommandoCommand/types/services/PaymentService.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/services/PaymentService.d.ts @@ -9,7 +9,7 @@ import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRo import { IProcessBuyTradeRequestData } from "@spt/models/eft/trade/IProcessBuyTradeRequestData"; import { IProcessSellTradeRequestData } from "@spt/models/eft/trade/IProcessSellTradeRequestData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; @@ -17,14 +17,14 @@ export declare class PaymentService { protected logger: ILogger; protected hashUtil: HashUtil; protected httpResponse: HttpResponseUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected handbookHelper: HandbookHelper; protected traderHelper: TraderHelper; protected itemHelper: ItemHelper; protected inventoryHelper: InventoryHelper; protected localisationService: LocalisationService; protected paymentHelper: PaymentHelper; - constructor(logger: ILogger, hashUtil: HashUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, localisationService: LocalisationService, paymentHelper: PaymentHelper); + constructor(logger: ILogger, hashUtil: HashUtil, httpResponse: HttpResponseUtil, databaseService: DatabaseService, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, localisationService: LocalisationService, paymentHelper: PaymentHelper); /** * Take money and insert items into return to server request * @param pmcData Pmc profile diff --git a/TypeScript/21CustomCommandoCommand/types/services/PlayerService.d.ts b/TypeScript/21CustomCommandoCommand/types/services/PlayerService.d.ts index ae57410..84c4c6f 100644 --- a/TypeScript/21CustomCommandoCommand/types/services/PlayerService.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/services/PlayerService.d.ts @@ -1,14 +1,14 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class PlayerService { protected logger: ILogger; protected timeUtil: TimeUtil; protected localisationService: LocalisationService; - protected databaseServer: DatabaseServer; - constructor(logger: ILogger, timeUtil: TimeUtil, localisationService: LocalisationService, databaseServer: DatabaseServer); + protected databaseService: DatabaseService; + constructor(logger: ILogger, timeUtil: TimeUtil, localisationService: LocalisationService, databaseService: DatabaseService); /** * Get level of player * @param pmcData Player profile diff --git a/TypeScript/21CustomCommandoCommand/types/services/RagfairLinkedItemService.d.ts b/TypeScript/21CustomCommandoCommand/types/services/RagfairLinkedItemService.d.ts index 6011c1a..0d03459 100644 --- a/TypeScript/21CustomCommandoCommand/types/services/RagfairLinkedItemService.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/services/RagfairLinkedItemService.d.ts @@ -1,11 +1,11 @@ import { ItemHelper } from "@spt/helpers/ItemHelper"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; export declare class RagfairLinkedItemService { - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected linkedItemsCache: Record>; - constructor(databaseServer: DatabaseServer, itemHelper: ItemHelper); + constructor(databaseService: DatabaseService, itemHelper: ItemHelper); getLinkedItems(linkedSearchId: string): Set; /** * Use ragfair linked item service to get an array of items that can fit on or in designated itemtpl diff --git a/TypeScript/21CustomCommandoCommand/types/services/RagfairOfferService.d.ts b/TypeScript/21CustomCommandoCommand/types/services/RagfairOfferService.d.ts index c044f6d..4bc07c3 100644 --- a/TypeScript/21CustomCommandoCommand/types/services/RagfairOfferService.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/services/RagfairOfferService.d.ts @@ -6,8 +6,8 @@ import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RagfairOfferHolder } from "@spt/utils/RagfairOfferHolder"; @@ -15,7 +15,7 @@ import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class RagfairOfferService { protected logger: ILogger; protected timeUtil: TimeUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected saveServer: SaveServer; protected ragfairServerHelper: RagfairServerHelper; protected profileHelper: ProfileHelper; @@ -28,7 +28,7 @@ export declare class RagfairOfferService { protected expiredOffers: Record; protected ragfairConfig: IRagfairConfig; protected ragfairOfferHandler: RagfairOfferHolder; - constructor(logger: ILogger, timeUtil: TimeUtil, databaseServer: DatabaseServer, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, eventOutputHolder: EventOutputHolder, httpResponse: HttpResponseUtil, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, timeUtil: TimeUtil, databaseService: DatabaseService, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, eventOutputHolder: EventOutputHolder, httpResponse: HttpResponseUtil, localisationService: LocalisationService, configServer: ConfigServer); /** * Get all offers * @returns IRagfairOffer array diff --git a/TypeScript/21CustomCommandoCommand/types/services/RagfairPriceService.d.ts b/TypeScript/21CustomCommandoCommand/types/services/RagfairPriceService.d.ts index 5b8fa56..0a2f26e 100644 --- a/TypeScript/21CustomCommandoCommand/types/services/RagfairPriceService.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/services/RagfairPriceService.d.ts @@ -12,7 +12,7 @@ import { IRagfairConfig, IUnreasonableModPrices } from "@spt/models/spt/config/I import { IRagfairServerPrices } from "@spt/models/spt/ragfair/IRagfairServerPrices"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RandomUtil } from "@spt/utils/RandomUtil"; /** @@ -20,7 +20,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; */ export declare class RagfairPriceService implements OnLoad { protected handbookHelper: HandbookHelper; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected logger: ILogger; protected itemHelper: ItemHelper; protected presetHelper: PresetHelper; @@ -30,7 +30,7 @@ export declare class RagfairPriceService implements OnLoad { protected configServer: ConfigServer; protected ragfairConfig: IRagfairConfig; protected prices: IRagfairServerPrices; - constructor(handbookHelper: HandbookHelper, databaseServer: DatabaseServer, logger: ILogger, itemHelper: ItemHelper, presetHelper: PresetHelper, traderHelper: TraderHelper, randomUtil: RandomUtil, localisationService: LocalisationService, configServer: ConfigServer); + constructor(handbookHelper: HandbookHelper, databaseService: DatabaseService, logger: ILogger, itemHelper: ItemHelper, presetHelper: PresetHelper, traderHelper: TraderHelper, randomUtil: RandomUtil, localisationService: LocalisationService, configServer: ConfigServer); /** * Generate static (handbook) and dynamic (prices.json) flea prices, store inside class as dictionaries */ diff --git a/TypeScript/21CustomCommandoCommand/types/services/RagfairTaxService.d.ts b/TypeScript/21CustomCommandoCommand/types/services/RagfairTaxService.d.ts index 4e4e648..effb9f0 100644 --- a/TypeScript/21CustomCommandoCommand/types/services/RagfairTaxService.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/services/RagfairTaxService.d.ts @@ -4,15 +4,15 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { IStorePlayerOfferTaxAmountRequestData } from "@spt/models/eft/ragfair/IStorePlayerOfferTaxAmountRequestData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; export declare class RagfairTaxService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected ragfairPriceService: RagfairPriceService; protected itemHelper: ItemHelper; protected playerOfferTaxCache: Record; - constructor(logger: ILogger, databaseServer: DatabaseServer, ragfairPriceService: RagfairPriceService, itemHelper: ItemHelper); + constructor(logger: ILogger, databaseService: DatabaseService, ragfairPriceService: RagfairPriceService, itemHelper: ItemHelper); storeClientOfferTaxValue(sessionId: string, offer: IStorePlayerOfferTaxAmountRequestData): void; clearStoredOfferTaxById(offerIdToRemove: string): void; getStoredClientOfferTaxValueById(offerIdToGet: string): IStorePlayerOfferTaxAmountRequestData; diff --git a/TypeScript/21CustomCommandoCommand/types/services/RaidTimeAdjustmentService.d.ts b/TypeScript/21CustomCommandoCommand/types/services/RaidTimeAdjustmentService.d.ts index f770b64..bfc099a 100644 --- a/TypeScript/21CustomCommandoCommand/types/services/RaidTimeAdjustmentService.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/services/RaidTimeAdjustmentService.d.ts @@ -7,17 +7,17 @@ import { ILocationConfig, IScavRaidTimeLocationSettings, LootMultiplier } from " import { IRaidChanges } from "@spt/models/spt/location/IRaidChanges"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RaidTimeAdjustmentService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected randomUtil: RandomUtil; protected weightedRandomHelper: WeightedRandomHelper; protected applicationContext: ApplicationContext; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, applicationContext: ApplicationContext, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, applicationContext: ApplicationContext, configServer: ConfigServer); /** * Make alterations to the base map data passed in * Loot multipliers/waves/wave start times diff --git a/TypeScript/21CustomCommandoCommand/types/services/RepairService.d.ts b/TypeScript/21CustomCommandoCommand/types/services/RepairService.d.ts index 9203417..48f306e 100644 --- a/TypeScript/21CustomCommandoCommand/types/services/RepairService.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/services/RepairService.d.ts @@ -14,13 +14,13 @@ import { SkillTypes } from "@spt/models/enums/SkillTypes"; import { BonusSettings, IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RepairService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected randomUtil: RandomUtil; protected itemHelper: ItemHelper; @@ -31,7 +31,7 @@ export declare class RepairService { protected localisationService: LocalisationService; protected configServer: ConfigServer; protected repairConfig: IRepairConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, profileHelper: ProfileHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, traderHelper: TraderHelper, weightedRandomHelper: WeightedRandomHelper, paymentService: PaymentService, repairHelper: RepairHelper, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, profileHelper: ProfileHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, traderHelper: TraderHelper, weightedRandomHelper: WeightedRandomHelper, paymentService: PaymentService, repairHelper: RepairHelper, localisationService: LocalisationService, configServer: ConfigServer); /** * Use trader to repair an items durability * @param sessionID Session id diff --git a/TypeScript/21CustomCommandoCommand/types/services/TraderServicesService.d.ts b/TypeScript/21CustomCommandoCommand/types/services/TraderServicesService.d.ts index 111c71a..e441eb6 100644 --- a/TypeScript/21CustomCommandoCommand/types/services/TraderServicesService.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/services/TraderServicesService.d.ts @@ -1,13 +1,13 @@ import { ProfileHelper } from "@spt/helpers/ProfileHelper"; import { ITraderServiceModel } from "@spt/models/spt/services/ITraderServiceModel"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderServicesService { protected profileHelper: ProfileHelper; protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected cloner: ICloner; - constructor(profileHelper: ProfileHelper, logger: ILogger, databaseServer: DatabaseServer, cloner: ICloner); + constructor(profileHelper: ProfileHelper, logger: ILogger, databaseService: DatabaseService, cloner: ICloner); getTraderServices(sessionId: string, traderId: string): ITraderServiceModel[]; } diff --git a/TypeScript/21CustomCommandoCommand/types/services/mod/CustomItemService.d.ts b/TypeScript/21CustomCommandoCommand/types/services/mod/CustomItemService.d.ts index 6dc4730..1926bed 100644 --- a/TypeScript/21CustomCommandoCommand/types/services/mod/CustomItemService.d.ts +++ b/TypeScript/21CustomCommandoCommand/types/services/mod/CustomItemService.d.ts @@ -9,11 +9,11 @@ import { HashUtil } from "@spt/utils/HashUtil"; export declare class CustomItemService { protected logger: ILogger; protected hashUtil: HashUtil; - protected databaseServer: DatabaseService; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected itemBaseClassService: ItemBaseClassService; protected cloner: ICloner; - constructor(logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseService, itemHelper: ItemHelper, itemBaseClassService: ItemBaseClassService, cloner: ICloner); + constructor(logger: ILogger, hashUtil: HashUtil, databaseService: DatabaseService, itemHelper: ItemHelper, itemBaseClassService: ItemBaseClassService, cloner: ICloner); /** * Create a new item from a cloned item base * WARNING - If no item id is supplied, an id will be generated, this id will be random every time you add an item and will not be the same on each subsequent server start diff --git a/TypeScript/22CustomAkiCommand/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts b/TypeScript/22CustomAkiCommand/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts index a7491b5..c51bf7e 100644 --- a/TypeScript/22CustomAkiCommand/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts +++ b/TypeScript/22CustomAkiCommand/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts @@ -6,7 +6,7 @@ import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { ISendMessageRequest } from "@spt/models/eft/dialog/ISendMessageRequest"; import { IUserDialogInfo } from "@spt/models/eft/profile/ISptProfile"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -19,7 +19,7 @@ export declare class GiveSptCommand implements ISptCommand { protected presetHelper: PresetHelper; protected mailSendService: MailSendService; protected localeService: LocaleService; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemFilterService: ItemFilterService; protected cloner: ICloner; /** @@ -34,7 +34,7 @@ export declare class GiveSptCommand implements ISptCommand { private static acceptableConfidence; private static excludedPresetItems; protected savedCommand: Map; - constructor(logger: ILogger, itemHelper: ItemHelper, hashUtil: HashUtil, presetHelper: PresetHelper, mailSendService: MailSendService, localeService: LocaleService, databaseServer: DatabaseServer, itemFilterService: ItemFilterService, cloner: ICloner); + constructor(logger: ILogger, itemHelper: ItemHelper, hashUtil: HashUtil, presetHelper: PresetHelper, mailSendService: MailSendService, localeService: LocaleService, databaseService: DatabaseService, itemFilterService: ItemFilterService, cloner: ICloner); getCommand(): string; getCommandHelp(): string; performAction(commandHandler: IUserDialogInfo, sessionId: string, request: ISendMessageRequest): string; diff --git a/TypeScript/22CustomAkiCommand/types/helpers/PresetHelper.d.ts b/TypeScript/22CustomAkiCommand/types/helpers/PresetHelper.d.ts index 5fc8a7c..e71e5b7 100644 --- a/TypeScript/22CustomAkiCommand/types/helpers/PresetHelper.d.ts +++ b/TypeScript/22CustomAkiCommand/types/helpers/PresetHelper.d.ts @@ -1,16 +1,16 @@ import { IPreset } from "@spt/models/eft/common/IGlobals"; import { BaseClasses } from "@spt/models/enums/BaseClasses"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; import { ItemHelper } from "./ItemHelper"; export declare class PresetHelper { - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected cloner: ICloner; protected lookup: Record; protected defaultEquipmentPresets: Record; protected defaultWeaponPresets: Record; - constructor(databaseServer: DatabaseServer, itemHelper: ItemHelper, cloner: ICloner); + constructor(databaseService: DatabaseService, itemHelper: ItemHelper, cloner: ICloner); hydratePresetStore(input: Record): void; /** * Get default weapon and equipment presets diff --git a/TypeScript/22CustomAkiCommand/types/helpers/ProfileHelper.d.ts b/TypeScript/22CustomAkiCommand/types/helpers/ProfileHelper.d.ts index 37937ff..e943bd3 100644 --- a/TypeScript/22CustomAkiCommand/types/helpers/ProfileHelper.d.ts +++ b/TypeScript/22CustomAkiCommand/types/helpers/ProfileHelper.d.ts @@ -7,8 +7,8 @@ import { SkillTypes } from "@spt/models/enums/SkillTypes"; import { IInventoryConfig } from "@spt/models/spt/config/IInventoryConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileSnapshotService } from "@spt/services/ProfileSnapshotService"; import { ICloner } from "@spt/utils/cloners/ICloner"; @@ -21,14 +21,14 @@ export declare class ProfileHelper { protected watermark: Watermark; protected timeUtil: TimeUtil; protected saveServer: SaveServer; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected profileSnapshotService: ProfileSnapshotService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected cloner: ICloner; protected inventoryConfig: IInventoryConfig; - constructor(logger: ILogger, hashUtil: HashUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileSnapshotService: ProfileSnapshotService, localisationService: LocalisationService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, hashUtil: HashUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseService: DatabaseService, itemHelper: ItemHelper, profileSnapshotService: ProfileSnapshotService, localisationService: LocalisationService, configServer: ConfigServer, cloner: ICloner); /** * Remove/reset a completed quest condtion from players profile quest data * @param sessionID Session id diff --git a/TypeScript/22CustomAkiCommand/types/helpers/QuestHelper.d.ts b/TypeScript/22CustomAkiCommand/types/helpers/QuestHelper.d.ts index 39ba2a9..93368fa 100644 --- a/TypeScript/22CustomAkiCommand/types/helpers/QuestHelper.d.ts +++ b/TypeScript/22CustomAkiCommand/types/helpers/QuestHelper.d.ts @@ -18,7 +18,7 @@ import { IQuestConfig } from "@spt/models/spt/config/IQuestConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -30,9 +30,9 @@ export declare class QuestHelper { protected timeUtil: TimeUtil; protected hashUtil: HashUtil; protected itemHelper: ItemHelper; + protected databaseService: DatabaseService; protected questConditionHelper: QuestConditionHelper; protected eventOutputHolder: EventOutputHolder; - protected databaseServer: DatabaseServer; protected localeService: LocaleService; protected ragfairServerHelper: RagfairServerHelper; protected dialogueHelper: DialogueHelper; @@ -45,7 +45,7 @@ export declare class QuestHelper { protected configServer: ConfigServer; protected cloner: ICloner; protected questConfig: IQuestConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, questConditionHelper: QuestConditionHelper, eventOutputHolder: EventOutputHolder, databaseServer: DatabaseServer, localeService: LocaleService, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, localisationService: LocalisationService, traderHelper: TraderHelper, presetHelper: PresetHelper, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, databaseService: DatabaseService, questConditionHelper: QuestConditionHelper, eventOutputHolder: EventOutputHolder, localeService: LocaleService, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, localisationService: LocalisationService, traderHelper: TraderHelper, presetHelper: PresetHelper, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); /** * Get status of a quest in player profile by its id * @param pmcData Profile to search diff --git a/TypeScript/22CustomAkiCommand/types/helpers/RagfairOfferHelper.d.ts b/TypeScript/22CustomAkiCommand/types/helpers/RagfairOfferHelper.d.ts index 27bb081..a08e60a 100644 --- a/TypeScript/22CustomAkiCommand/types/helpers/RagfairOfferHelper.d.ts +++ b/TypeScript/22CustomAkiCommand/types/helpers/RagfairOfferHelper.d.ts @@ -19,8 +19,8 @@ import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -34,7 +34,7 @@ export declare class RagfairOfferHelper { protected timeUtil: TimeUtil; protected hashUtil: HashUtil; protected eventOutputHolder: EventOutputHolder; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected traderHelper: TraderHelper; protected saveServer: SaveServer; protected itemHelper: ItemHelper; @@ -55,7 +55,7 @@ export declare class RagfairOfferHelper { protected static goodSoldTemplate: string; protected ragfairConfig: IRagfairConfig; protected questConfig: IQuestConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, eventOutputHolder: EventOutputHolder, databaseServer: DatabaseServer, traderHelper: TraderHelper, saveServer: SaveServer, itemHelper: ItemHelper, botHelper: BotHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, localeService: LocaleService, localisationService: LocalisationService, mailSendService: MailSendService, configServer: ConfigServer); + constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, eventOutputHolder: EventOutputHolder, databaseService: DatabaseService, traderHelper: TraderHelper, saveServer: SaveServer, itemHelper: ItemHelper, botHelper: BotHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, localeService: LocaleService, localisationService: LocalisationService, mailSendService: MailSendService, configServer: ConfigServer); /** * Passthrough to ragfairOfferService.getOffers(), get flea offers a player should see * @param searchRequest Data from client diff --git a/TypeScript/22CustomAkiCommand/types/helpers/RepairHelper.d.ts b/TypeScript/22CustomAkiCommand/types/helpers/RepairHelper.d.ts index 4bd0577..99a21da 100644 --- a/TypeScript/22CustomAkiCommand/types/helpers/RepairHelper.d.ts +++ b/TypeScript/22CustomAkiCommand/types/helpers/RepairHelper.d.ts @@ -3,17 +3,17 @@ import { ITemplateItem, Props } from "@spt/models/eft/common/tables/ITemplateIte import { IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RepairHelper { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected configServer: ConfigServer; protected cloner: ICloner; protected repairConfig: IRepairConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, configServer: ConfigServer, cloner: ICloner); /** * Alter an items durability after a repair by trader/repair kit * @param itemToRepair item to update durability details diff --git a/TypeScript/22CustomAkiCommand/types/helpers/TraderAssortHelper.d.ts b/TypeScript/22CustomAkiCommand/types/helpers/TraderAssortHelper.d.ts index faf2a9d..8f8f802 100644 --- a/TypeScript/22CustomAkiCommand/types/helpers/TraderAssortHelper.d.ts +++ b/TypeScript/22CustomAkiCommand/types/helpers/TraderAssortHelper.d.ts @@ -9,7 +9,7 @@ import { ITrader, ITraderAssort } from "@spt/models/eft/common/tables/ITrader"; import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; @@ -21,7 +21,7 @@ export declare class TraderAssortHelper { protected logger: ILogger; protected mathUtil: MathUtil; protected timeUtil: TimeUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected assortHelper: AssortHelper; protected paymentHelper: PaymentHelper; @@ -37,7 +37,7 @@ export declare class TraderAssortHelper { protected traderConfig: ITraderConfig; protected mergedQuestAssorts: Record>; protected createdMergedQuestAssorts: boolean; - constructor(logger: ILogger, mathUtil: MathUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, profileHelper: ProfileHelper, assortHelper: AssortHelper, paymentHelper: PaymentHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, localisationService: LocalisationService, traderPurchasePersisterService: TraderPurchasePersisterService, traderHelper: TraderHelper, fenceService: FenceService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, mathUtil: MathUtil, timeUtil: TimeUtil, databaseService: DatabaseService, profileHelper: ProfileHelper, assortHelper: AssortHelper, paymentHelper: PaymentHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, localisationService: LocalisationService, traderPurchasePersisterService: TraderPurchasePersisterService, traderHelper: TraderHelper, fenceService: FenceService, configServer: ConfigServer, cloner: ICloner); /** * Get a traders assorts * Can be used for returning ragfair / fence assorts diff --git a/TypeScript/22CustomAkiCommand/types/helpers/TraderHelper.d.ts b/TypeScript/22CustomAkiCommand/types/helpers/TraderHelper.d.ts index 5f515da..eec1cc7 100644 --- a/TypeScript/22CustomAkiCommand/types/helpers/TraderHelper.d.ts +++ b/TypeScript/22CustomAkiCommand/types/helpers/TraderHelper.d.ts @@ -10,7 +10,7 @@ import { Traders } from "@spt/models/enums/Traders"; import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; @@ -18,7 +18,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class TraderHelper { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected handbookHelper: HandbookHelper; protected itemHelper: ItemHelper; @@ -33,7 +33,7 @@ export declare class TraderHelper { protected highestTraderPriceItems?: Record; /** Dictionary of item tpl and the highest trader buy back rouble price */ protected highestTraderBuyPriceItems?: Record; - constructor(logger: ILogger, databaseServer: DatabaseServer, profileHelper: ProfileHelper, handbookHelper: HandbookHelper, itemHelper: ItemHelper, playerService: PlayerService, localisationService: LocalisationService, fenceService: FenceService, timeUtil: TimeUtil, randomUtil: RandomUtil, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, profileHelper: ProfileHelper, handbookHelper: HandbookHelper, itemHelper: ItemHelper, playerService: PlayerService, localisationService: LocalisationService, fenceService: FenceService, timeUtil: TimeUtil, randomUtil: RandomUtil, configServer: ConfigServer); /** * Get a trader base object, update profile to reflect players current standing in profile * when trader not found in profile diff --git a/TypeScript/22CustomAkiCommand/types/models/eft/common/IGlobals.d.ts b/TypeScript/22CustomAkiCommand/types/models/eft/common/IGlobals.d.ts index 2209415..a0bb051 100644 --- a/TypeScript/22CustomAkiCommand/types/models/eft/common/IGlobals.d.ts +++ b/TypeScript/22CustomAkiCommand/types/models/eft/common/IGlobals.d.ts @@ -802,7 +802,6 @@ export interface IMaxActiveOfferCount { from: number; to: number; count: number; - countForSpecialEditions: number; } export interface IMaxSumForRarity { Common: IRarityMaxSum; diff --git a/TypeScript/22CustomAkiCommand/types/models/eft/common/ILocationBase.d.ts b/TypeScript/22CustomAkiCommand/types/models/eft/common/ILocationBase.d.ts index 65931f8..10f1a57 100644 --- a/TypeScript/22CustomAkiCommand/types/models/eft/common/ILocationBase.d.ts +++ b/TypeScript/22CustomAkiCommand/types/models/eft/common/ILocationBase.d.ts @@ -196,18 +196,24 @@ export interface Props { export interface Exit { /** % Chance out of 100 exit will appear in raid */ Chance: number; + ChancePVE: number; Count: number; + CountPVE: number; EntryPoints: string; EventAvailable: boolean; ExfiltrationTime: number; + ExfiltrationTimePVE: number; ExfiltrationType: string; RequiredSlot?: string; Id: string; MaxTime: number; + MaxTimePVE: number; MinTime: number; + MinTimePVE: number; Name: string; PassageRequirement: string; PlayersCount: number; + PlayersCountPVE: number; RequirementTip: string; Side?: string; } diff --git a/TypeScript/22CustomAkiCommand/types/models/eft/common/tables/IRepeatableQuests.d.ts b/TypeScript/22CustomAkiCommand/types/models/eft/common/tables/IRepeatableQuests.d.ts index 854c8ef..27ff49d 100644 --- a/TypeScript/22CustomAkiCommand/types/models/eft/common/tables/IRepeatableQuests.d.ts +++ b/TypeScript/22CustomAkiCommand/types/models/eft/common/tables/IRepeatableQuests.d.ts @@ -18,10 +18,13 @@ export interface IRepeatableTemplates { export interface IPmcDataRepeatableQuest { id?: string; name: string; + unavailableTime?: string; activeQuests: IRepeatableQuest[]; inactiveQuests: IRepeatableQuest[]; endTime: number; changeRequirement: Record; + freeChanges: number; + freeChangesAvailable: number; } export interface IChangeRequirement { changeCost: IChangeCost[]; diff --git a/TypeScript/22CustomAkiCommand/types/models/eft/common/tables/ITemplateItem.d.ts b/TypeScript/22CustomAkiCommand/types/models/eft/common/tables/ITemplateItem.d.ts index a8ccfbb..e5c6632 100644 --- a/TypeScript/22CustomAkiCommand/types/models/eft/common/tables/ITemplateItem.d.ts +++ b/TypeScript/22CustomAkiCommand/types/models/eft/common/tables/ITemplateItem.d.ts @@ -63,7 +63,7 @@ export interface Props { DiscardingBlock?: boolean; DropSoundType?: string; RagFairCommissionModifier?: number; - RarityPvE: string; + RarityPvE?: string; IsAlwaysAvailableForInsurance?: boolean; DiscardLimit?: number; MaxResource?: number; @@ -414,6 +414,12 @@ export interface Props { LayoutName?: string; Lower75Prefab?: Prefab; MaxUsages?: number; + ScavKillExpPenalty?: number; + ScavKillExpPenaltyPVE?: number; + ScavKillStandingPenalty?: number; + ScavKillStandingPenaltyPVE?: number; + TradersDiscount?: number; + TradersDiscountPVE?: number; } export interface IHealthEffect { type: string; diff --git a/TypeScript/22CustomAkiCommand/types/models/spt/config/IQuestConfig.d.ts b/TypeScript/22CustomAkiCommand/types/models/spt/config/IQuestConfig.d.ts index 362602c..2cdf4fa 100644 --- a/TypeScript/22CustomAkiCommand/types/models/spt/config/IQuestConfig.d.ts +++ b/TypeScript/22CustomAkiCommand/types/models/spt/config/IQuestConfig.d.ts @@ -47,6 +47,8 @@ export interface IRepeatableQuestConfig { /** Item tplIds to ignore when generating rewards */ rewardBlacklist: string[]; rewardAmmoStackMinSize: number; + freeChangesAvailable: number; + freeChanges: number; } export interface IRewardScaling { levels: number[]; diff --git a/TypeScript/22CustomAkiCommand/types/services/BotEquipmentModPoolService.d.ts b/TypeScript/22CustomAkiCommand/types/services/BotEquipmentModPoolService.d.ts index c53f31b..7b2b442 100644 --- a/TypeScript/22CustomAkiCommand/types/services/BotEquipmentModPoolService.d.ts +++ b/TypeScript/22CustomAkiCommand/types/services/BotEquipmentModPoolService.d.ts @@ -4,7 +4,7 @@ import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { VFS } from "@spt/utils/VFS"; /** Store a mapping between weapons, their slots and the items that fit those slots */ @@ -12,7 +12,7 @@ export declare class BotEquipmentModPoolService { protected logger: ILogger; protected vfs: VFS; protected itemHelper: ItemHelper; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected botConfig: IBotConfig; @@ -20,7 +20,7 @@ export declare class BotEquipmentModPoolService { protected gearModPool: Mods; protected weaponPoolGenerated: boolean; protected armorPoolGenerated: boolean; - constructor(logger: ILogger, vfs: VFS, itemHelper: ItemHelper, databaseServer: DatabaseServer, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, vfs: VFS, itemHelper: ItemHelper, databaseService: DatabaseService, localisationService: LocalisationService, configServer: ConfigServer); /** * Store dictionary of mods for each item passed in * @param items items to find related mods and store in modPool diff --git a/TypeScript/22CustomAkiCommand/types/services/CustomLocationWaveService.d.ts b/TypeScript/22CustomAkiCommand/types/services/CustomLocationWaveService.d.ts index 728a1e8..c72d5bb 100644 --- a/TypeScript/22CustomAkiCommand/types/services/CustomLocationWaveService.d.ts +++ b/TypeScript/22CustomAkiCommand/types/services/CustomLocationWaveService.d.ts @@ -2,15 +2,15 @@ import { BossLocationSpawn, Wave } from "@spt/models/eft/common/ILocationBase"; import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class CustomLocationWaveService { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, configServer: ConfigServer); /** * Add a boss wave to a map * @param locationId e.g. factory4_day, bigmap diff --git a/TypeScript/22CustomAkiCommand/types/services/InsuranceService.d.ts b/TypeScript/22CustomAkiCommand/types/services/InsuranceService.d.ts index c54f9f9..0000e66 100644 --- a/TypeScript/22CustomAkiCommand/types/services/InsuranceService.d.ts +++ b/TypeScript/22CustomAkiCommand/types/services/InsuranceService.d.ts @@ -13,8 +13,8 @@ import { ILostOnDeathConfig } from "@spt/models/spt/config/ILostOnDeathConfig"; import { IInsuranceEquipmentPkg } from "@spt/models/spt/services/IInsuranceEquipmentPkg"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -24,7 +24,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class InsuranceService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected secureContainerHelper: SecureContainerHelper; protected randomUtil: RandomUtil; protected itemHelper: ItemHelper; @@ -42,7 +42,7 @@ export declare class InsuranceService { protected insured: Record>; protected insuranceConfig: IInsuranceConfig; protected lostOnDeathConfig: ILostOnDeathConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, handbookHelper: HandbookHelper, localisationService: LocalisationService, localeService: LocaleService, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, databaseService: DatabaseService, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, handbookHelper: HandbookHelper, localisationService: LocalisationService, localeService: LocaleService, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); /** * Does player have insurance array * @param sessionId Player id diff --git a/TypeScript/22CustomAkiCommand/types/services/MailSendService.d.ts b/TypeScript/22CustomAkiCommand/types/services/MailSendService.d.ts index d445841..8f1f974 100644 --- a/TypeScript/22CustomAkiCommand/types/services/MailSendService.d.ts +++ b/TypeScript/22CustomAkiCommand/types/services/MailSendService.d.ts @@ -9,8 +9,8 @@ import { MessageType } from "@spt/models/enums/MessageType"; import { Traders } from "@spt/models/enums/Traders"; import { IProfileChangeEvent, ISendMessageDetails } from "@spt/models/spt/dialog/ISendMessageDetails"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; @@ -19,7 +19,7 @@ export declare class MailSendService { protected hashUtil: HashUtil; protected timeUtil: TimeUtil; protected saveServer: SaveServer; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected notifierHelper: NotifierHelper; protected dialogueHelper: DialogueHelper; protected notificationSendHelper: NotificationSendHelper; @@ -27,7 +27,7 @@ export declare class MailSendService { protected itemHelper: ItemHelper; protected traderHelper: TraderHelper; protected readonly systemSenderId = "59e7125688a45068a6249071"; - constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, dialogueHelper: DialogueHelper, notificationSendHelper: NotificationSendHelper, localisationService: LocalisationService, itemHelper: ItemHelper, traderHelper: TraderHelper); + constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseService: DatabaseService, notifierHelper: NotifierHelper, dialogueHelper: DialogueHelper, notificationSendHelper: NotificationSendHelper, localisationService: LocalisationService, itemHelper: ItemHelper, traderHelper: TraderHelper); /** * Send a message from an NPC (e.g. prapor) to the player with or without items using direct message text, do not look up any locale * @param sessionId The session ID to send the message to diff --git a/TypeScript/22CustomAkiCommand/types/services/OpenZoneService.d.ts b/TypeScript/22CustomAkiCommand/types/services/OpenZoneService.d.ts index 1bc5f00..c7dd0bd 100644 --- a/TypeScript/22CustomAkiCommand/types/services/OpenZoneService.d.ts +++ b/TypeScript/22CustomAkiCommand/types/services/OpenZoneService.d.ts @@ -1,18 +1,18 @@ import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RandomUtil } from "@spt/utils/RandomUtil"; /** Service for adding new zones to a maps OpenZones property */ export declare class OpenZoneService { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, localisationService: LocalisationService, configServer: ConfigServer); /** * Add open zone to specified map * @param locationId map location (e.g. factory4_day) diff --git a/TypeScript/22CustomAkiCommand/types/services/PaymentService.d.ts b/TypeScript/22CustomAkiCommand/types/services/PaymentService.d.ts index 64ff2c1..61d5731 100644 --- a/TypeScript/22CustomAkiCommand/types/services/PaymentService.d.ts +++ b/TypeScript/22CustomAkiCommand/types/services/PaymentService.d.ts @@ -9,7 +9,7 @@ import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRo import { IProcessBuyTradeRequestData } from "@spt/models/eft/trade/IProcessBuyTradeRequestData"; import { IProcessSellTradeRequestData } from "@spt/models/eft/trade/IProcessSellTradeRequestData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; @@ -17,14 +17,14 @@ export declare class PaymentService { protected logger: ILogger; protected hashUtil: HashUtil; protected httpResponse: HttpResponseUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected handbookHelper: HandbookHelper; protected traderHelper: TraderHelper; protected itemHelper: ItemHelper; protected inventoryHelper: InventoryHelper; protected localisationService: LocalisationService; protected paymentHelper: PaymentHelper; - constructor(logger: ILogger, hashUtil: HashUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, localisationService: LocalisationService, paymentHelper: PaymentHelper); + constructor(logger: ILogger, hashUtil: HashUtil, httpResponse: HttpResponseUtil, databaseService: DatabaseService, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, localisationService: LocalisationService, paymentHelper: PaymentHelper); /** * Take money and insert items into return to server request * @param pmcData Pmc profile diff --git a/TypeScript/22CustomAkiCommand/types/services/PlayerService.d.ts b/TypeScript/22CustomAkiCommand/types/services/PlayerService.d.ts index ae57410..84c4c6f 100644 --- a/TypeScript/22CustomAkiCommand/types/services/PlayerService.d.ts +++ b/TypeScript/22CustomAkiCommand/types/services/PlayerService.d.ts @@ -1,14 +1,14 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class PlayerService { protected logger: ILogger; protected timeUtil: TimeUtil; protected localisationService: LocalisationService; - protected databaseServer: DatabaseServer; - constructor(logger: ILogger, timeUtil: TimeUtil, localisationService: LocalisationService, databaseServer: DatabaseServer); + protected databaseService: DatabaseService; + constructor(logger: ILogger, timeUtil: TimeUtil, localisationService: LocalisationService, databaseService: DatabaseService); /** * Get level of player * @param pmcData Player profile diff --git a/TypeScript/22CustomAkiCommand/types/services/RagfairLinkedItemService.d.ts b/TypeScript/22CustomAkiCommand/types/services/RagfairLinkedItemService.d.ts index 6011c1a..0d03459 100644 --- a/TypeScript/22CustomAkiCommand/types/services/RagfairLinkedItemService.d.ts +++ b/TypeScript/22CustomAkiCommand/types/services/RagfairLinkedItemService.d.ts @@ -1,11 +1,11 @@ import { ItemHelper } from "@spt/helpers/ItemHelper"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; export declare class RagfairLinkedItemService { - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected linkedItemsCache: Record>; - constructor(databaseServer: DatabaseServer, itemHelper: ItemHelper); + constructor(databaseService: DatabaseService, itemHelper: ItemHelper); getLinkedItems(linkedSearchId: string): Set; /** * Use ragfair linked item service to get an array of items that can fit on or in designated itemtpl diff --git a/TypeScript/22CustomAkiCommand/types/services/RagfairOfferService.d.ts b/TypeScript/22CustomAkiCommand/types/services/RagfairOfferService.d.ts index c044f6d..4bc07c3 100644 --- a/TypeScript/22CustomAkiCommand/types/services/RagfairOfferService.d.ts +++ b/TypeScript/22CustomAkiCommand/types/services/RagfairOfferService.d.ts @@ -6,8 +6,8 @@ import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RagfairOfferHolder } from "@spt/utils/RagfairOfferHolder"; @@ -15,7 +15,7 @@ import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class RagfairOfferService { protected logger: ILogger; protected timeUtil: TimeUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected saveServer: SaveServer; protected ragfairServerHelper: RagfairServerHelper; protected profileHelper: ProfileHelper; @@ -28,7 +28,7 @@ export declare class RagfairOfferService { protected expiredOffers: Record; protected ragfairConfig: IRagfairConfig; protected ragfairOfferHandler: RagfairOfferHolder; - constructor(logger: ILogger, timeUtil: TimeUtil, databaseServer: DatabaseServer, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, eventOutputHolder: EventOutputHolder, httpResponse: HttpResponseUtil, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, timeUtil: TimeUtil, databaseService: DatabaseService, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, eventOutputHolder: EventOutputHolder, httpResponse: HttpResponseUtil, localisationService: LocalisationService, configServer: ConfigServer); /** * Get all offers * @returns IRagfairOffer array diff --git a/TypeScript/22CustomAkiCommand/types/services/RagfairPriceService.d.ts b/TypeScript/22CustomAkiCommand/types/services/RagfairPriceService.d.ts index 5b8fa56..0a2f26e 100644 --- a/TypeScript/22CustomAkiCommand/types/services/RagfairPriceService.d.ts +++ b/TypeScript/22CustomAkiCommand/types/services/RagfairPriceService.d.ts @@ -12,7 +12,7 @@ import { IRagfairConfig, IUnreasonableModPrices } from "@spt/models/spt/config/I import { IRagfairServerPrices } from "@spt/models/spt/ragfair/IRagfairServerPrices"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RandomUtil } from "@spt/utils/RandomUtil"; /** @@ -20,7 +20,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; */ export declare class RagfairPriceService implements OnLoad { protected handbookHelper: HandbookHelper; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected logger: ILogger; protected itemHelper: ItemHelper; protected presetHelper: PresetHelper; @@ -30,7 +30,7 @@ export declare class RagfairPriceService implements OnLoad { protected configServer: ConfigServer; protected ragfairConfig: IRagfairConfig; protected prices: IRagfairServerPrices; - constructor(handbookHelper: HandbookHelper, databaseServer: DatabaseServer, logger: ILogger, itemHelper: ItemHelper, presetHelper: PresetHelper, traderHelper: TraderHelper, randomUtil: RandomUtil, localisationService: LocalisationService, configServer: ConfigServer); + constructor(handbookHelper: HandbookHelper, databaseService: DatabaseService, logger: ILogger, itemHelper: ItemHelper, presetHelper: PresetHelper, traderHelper: TraderHelper, randomUtil: RandomUtil, localisationService: LocalisationService, configServer: ConfigServer); /** * Generate static (handbook) and dynamic (prices.json) flea prices, store inside class as dictionaries */ diff --git a/TypeScript/22CustomAkiCommand/types/services/RagfairTaxService.d.ts b/TypeScript/22CustomAkiCommand/types/services/RagfairTaxService.d.ts index 4e4e648..effb9f0 100644 --- a/TypeScript/22CustomAkiCommand/types/services/RagfairTaxService.d.ts +++ b/TypeScript/22CustomAkiCommand/types/services/RagfairTaxService.d.ts @@ -4,15 +4,15 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { IStorePlayerOfferTaxAmountRequestData } from "@spt/models/eft/ragfair/IStorePlayerOfferTaxAmountRequestData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; export declare class RagfairTaxService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected ragfairPriceService: RagfairPriceService; protected itemHelper: ItemHelper; protected playerOfferTaxCache: Record; - constructor(logger: ILogger, databaseServer: DatabaseServer, ragfairPriceService: RagfairPriceService, itemHelper: ItemHelper); + constructor(logger: ILogger, databaseService: DatabaseService, ragfairPriceService: RagfairPriceService, itemHelper: ItemHelper); storeClientOfferTaxValue(sessionId: string, offer: IStorePlayerOfferTaxAmountRequestData): void; clearStoredOfferTaxById(offerIdToRemove: string): void; getStoredClientOfferTaxValueById(offerIdToGet: string): IStorePlayerOfferTaxAmountRequestData; diff --git a/TypeScript/22CustomAkiCommand/types/services/RaidTimeAdjustmentService.d.ts b/TypeScript/22CustomAkiCommand/types/services/RaidTimeAdjustmentService.d.ts index f770b64..bfc099a 100644 --- a/TypeScript/22CustomAkiCommand/types/services/RaidTimeAdjustmentService.d.ts +++ b/TypeScript/22CustomAkiCommand/types/services/RaidTimeAdjustmentService.d.ts @@ -7,17 +7,17 @@ import { ILocationConfig, IScavRaidTimeLocationSettings, LootMultiplier } from " import { IRaidChanges } from "@spt/models/spt/location/IRaidChanges"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RaidTimeAdjustmentService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected randomUtil: RandomUtil; protected weightedRandomHelper: WeightedRandomHelper; protected applicationContext: ApplicationContext; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, applicationContext: ApplicationContext, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, applicationContext: ApplicationContext, configServer: ConfigServer); /** * Make alterations to the base map data passed in * Loot multipliers/waves/wave start times diff --git a/TypeScript/22CustomAkiCommand/types/services/RepairService.d.ts b/TypeScript/22CustomAkiCommand/types/services/RepairService.d.ts index 9203417..48f306e 100644 --- a/TypeScript/22CustomAkiCommand/types/services/RepairService.d.ts +++ b/TypeScript/22CustomAkiCommand/types/services/RepairService.d.ts @@ -14,13 +14,13 @@ import { SkillTypes } from "@spt/models/enums/SkillTypes"; import { BonusSettings, IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RepairService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected randomUtil: RandomUtil; protected itemHelper: ItemHelper; @@ -31,7 +31,7 @@ export declare class RepairService { protected localisationService: LocalisationService; protected configServer: ConfigServer; protected repairConfig: IRepairConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, profileHelper: ProfileHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, traderHelper: TraderHelper, weightedRandomHelper: WeightedRandomHelper, paymentService: PaymentService, repairHelper: RepairHelper, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, profileHelper: ProfileHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, traderHelper: TraderHelper, weightedRandomHelper: WeightedRandomHelper, paymentService: PaymentService, repairHelper: RepairHelper, localisationService: LocalisationService, configServer: ConfigServer); /** * Use trader to repair an items durability * @param sessionID Session id diff --git a/TypeScript/22CustomAkiCommand/types/services/TraderServicesService.d.ts b/TypeScript/22CustomAkiCommand/types/services/TraderServicesService.d.ts index 111c71a..e441eb6 100644 --- a/TypeScript/22CustomAkiCommand/types/services/TraderServicesService.d.ts +++ b/TypeScript/22CustomAkiCommand/types/services/TraderServicesService.d.ts @@ -1,13 +1,13 @@ import { ProfileHelper } from "@spt/helpers/ProfileHelper"; import { ITraderServiceModel } from "@spt/models/spt/services/ITraderServiceModel"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderServicesService { protected profileHelper: ProfileHelper; protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected cloner: ICloner; - constructor(profileHelper: ProfileHelper, logger: ILogger, databaseServer: DatabaseServer, cloner: ICloner); + constructor(profileHelper: ProfileHelper, logger: ILogger, databaseService: DatabaseService, cloner: ICloner); getTraderServices(sessionId: string, traderId: string): ITraderServiceModel[]; } diff --git a/TypeScript/22CustomAkiCommand/types/services/mod/CustomItemService.d.ts b/TypeScript/22CustomAkiCommand/types/services/mod/CustomItemService.d.ts index 6dc4730..1926bed 100644 --- a/TypeScript/22CustomAkiCommand/types/services/mod/CustomItemService.d.ts +++ b/TypeScript/22CustomAkiCommand/types/services/mod/CustomItemService.d.ts @@ -9,11 +9,11 @@ import { HashUtil } from "@spt/utils/HashUtil"; export declare class CustomItemService { protected logger: ILogger; protected hashUtil: HashUtil; - protected databaseServer: DatabaseService; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected itemBaseClassService: ItemBaseClassService; protected cloner: ICloner; - constructor(logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseService, itemHelper: ItemHelper, itemBaseClassService: ItemBaseClassService, cloner: ICloner); + constructor(logger: ILogger, hashUtil: HashUtil, databaseService: DatabaseService, itemHelper: ItemHelper, itemBaseClassService: ItemBaseClassService, cloner: ICloner); /** * Create a new item from a cloned item base * WARNING - If no item id is supplied, an id will be generated, this id will be random every time you add an item and will not be the same on each subsequent server start diff --git a/TypeScript/2EditDatabase/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts b/TypeScript/2EditDatabase/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts index a7491b5..c51bf7e 100644 --- a/TypeScript/2EditDatabase/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts +++ b/TypeScript/2EditDatabase/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts @@ -6,7 +6,7 @@ import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { ISendMessageRequest } from "@spt/models/eft/dialog/ISendMessageRequest"; import { IUserDialogInfo } from "@spt/models/eft/profile/ISptProfile"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -19,7 +19,7 @@ export declare class GiveSptCommand implements ISptCommand { protected presetHelper: PresetHelper; protected mailSendService: MailSendService; protected localeService: LocaleService; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemFilterService: ItemFilterService; protected cloner: ICloner; /** @@ -34,7 +34,7 @@ export declare class GiveSptCommand implements ISptCommand { private static acceptableConfidence; private static excludedPresetItems; protected savedCommand: Map; - constructor(logger: ILogger, itemHelper: ItemHelper, hashUtil: HashUtil, presetHelper: PresetHelper, mailSendService: MailSendService, localeService: LocaleService, databaseServer: DatabaseServer, itemFilterService: ItemFilterService, cloner: ICloner); + constructor(logger: ILogger, itemHelper: ItemHelper, hashUtil: HashUtil, presetHelper: PresetHelper, mailSendService: MailSendService, localeService: LocaleService, databaseService: DatabaseService, itemFilterService: ItemFilterService, cloner: ICloner); getCommand(): string; getCommandHelp(): string; performAction(commandHandler: IUserDialogInfo, sessionId: string, request: ISendMessageRequest): string; diff --git a/TypeScript/2EditDatabase/types/helpers/PresetHelper.d.ts b/TypeScript/2EditDatabase/types/helpers/PresetHelper.d.ts index 5fc8a7c..e71e5b7 100644 --- a/TypeScript/2EditDatabase/types/helpers/PresetHelper.d.ts +++ b/TypeScript/2EditDatabase/types/helpers/PresetHelper.d.ts @@ -1,16 +1,16 @@ import { IPreset } from "@spt/models/eft/common/IGlobals"; import { BaseClasses } from "@spt/models/enums/BaseClasses"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; import { ItemHelper } from "./ItemHelper"; export declare class PresetHelper { - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected cloner: ICloner; protected lookup: Record; protected defaultEquipmentPresets: Record; protected defaultWeaponPresets: Record; - constructor(databaseServer: DatabaseServer, itemHelper: ItemHelper, cloner: ICloner); + constructor(databaseService: DatabaseService, itemHelper: ItemHelper, cloner: ICloner); hydratePresetStore(input: Record): void; /** * Get default weapon and equipment presets diff --git a/TypeScript/2EditDatabase/types/helpers/ProfileHelper.d.ts b/TypeScript/2EditDatabase/types/helpers/ProfileHelper.d.ts index 37937ff..e943bd3 100644 --- a/TypeScript/2EditDatabase/types/helpers/ProfileHelper.d.ts +++ b/TypeScript/2EditDatabase/types/helpers/ProfileHelper.d.ts @@ -7,8 +7,8 @@ import { SkillTypes } from "@spt/models/enums/SkillTypes"; import { IInventoryConfig } from "@spt/models/spt/config/IInventoryConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileSnapshotService } from "@spt/services/ProfileSnapshotService"; import { ICloner } from "@spt/utils/cloners/ICloner"; @@ -21,14 +21,14 @@ export declare class ProfileHelper { protected watermark: Watermark; protected timeUtil: TimeUtil; protected saveServer: SaveServer; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected profileSnapshotService: ProfileSnapshotService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected cloner: ICloner; protected inventoryConfig: IInventoryConfig; - constructor(logger: ILogger, hashUtil: HashUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileSnapshotService: ProfileSnapshotService, localisationService: LocalisationService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, hashUtil: HashUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseService: DatabaseService, itemHelper: ItemHelper, profileSnapshotService: ProfileSnapshotService, localisationService: LocalisationService, configServer: ConfigServer, cloner: ICloner); /** * Remove/reset a completed quest condtion from players profile quest data * @param sessionID Session id diff --git a/TypeScript/2EditDatabase/types/helpers/QuestHelper.d.ts b/TypeScript/2EditDatabase/types/helpers/QuestHelper.d.ts index 39ba2a9..93368fa 100644 --- a/TypeScript/2EditDatabase/types/helpers/QuestHelper.d.ts +++ b/TypeScript/2EditDatabase/types/helpers/QuestHelper.d.ts @@ -18,7 +18,7 @@ import { IQuestConfig } from "@spt/models/spt/config/IQuestConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -30,9 +30,9 @@ export declare class QuestHelper { protected timeUtil: TimeUtil; protected hashUtil: HashUtil; protected itemHelper: ItemHelper; + protected databaseService: DatabaseService; protected questConditionHelper: QuestConditionHelper; protected eventOutputHolder: EventOutputHolder; - protected databaseServer: DatabaseServer; protected localeService: LocaleService; protected ragfairServerHelper: RagfairServerHelper; protected dialogueHelper: DialogueHelper; @@ -45,7 +45,7 @@ export declare class QuestHelper { protected configServer: ConfigServer; protected cloner: ICloner; protected questConfig: IQuestConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, questConditionHelper: QuestConditionHelper, eventOutputHolder: EventOutputHolder, databaseServer: DatabaseServer, localeService: LocaleService, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, localisationService: LocalisationService, traderHelper: TraderHelper, presetHelper: PresetHelper, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, databaseService: DatabaseService, questConditionHelper: QuestConditionHelper, eventOutputHolder: EventOutputHolder, localeService: LocaleService, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, localisationService: LocalisationService, traderHelper: TraderHelper, presetHelper: PresetHelper, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); /** * Get status of a quest in player profile by its id * @param pmcData Profile to search diff --git a/TypeScript/2EditDatabase/types/helpers/RagfairOfferHelper.d.ts b/TypeScript/2EditDatabase/types/helpers/RagfairOfferHelper.d.ts index 27bb081..a08e60a 100644 --- a/TypeScript/2EditDatabase/types/helpers/RagfairOfferHelper.d.ts +++ b/TypeScript/2EditDatabase/types/helpers/RagfairOfferHelper.d.ts @@ -19,8 +19,8 @@ import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -34,7 +34,7 @@ export declare class RagfairOfferHelper { protected timeUtil: TimeUtil; protected hashUtil: HashUtil; protected eventOutputHolder: EventOutputHolder; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected traderHelper: TraderHelper; protected saveServer: SaveServer; protected itemHelper: ItemHelper; @@ -55,7 +55,7 @@ export declare class RagfairOfferHelper { protected static goodSoldTemplate: string; protected ragfairConfig: IRagfairConfig; protected questConfig: IQuestConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, eventOutputHolder: EventOutputHolder, databaseServer: DatabaseServer, traderHelper: TraderHelper, saveServer: SaveServer, itemHelper: ItemHelper, botHelper: BotHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, localeService: LocaleService, localisationService: LocalisationService, mailSendService: MailSendService, configServer: ConfigServer); + constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, eventOutputHolder: EventOutputHolder, databaseService: DatabaseService, traderHelper: TraderHelper, saveServer: SaveServer, itemHelper: ItemHelper, botHelper: BotHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, localeService: LocaleService, localisationService: LocalisationService, mailSendService: MailSendService, configServer: ConfigServer); /** * Passthrough to ragfairOfferService.getOffers(), get flea offers a player should see * @param searchRequest Data from client diff --git a/TypeScript/2EditDatabase/types/helpers/RepairHelper.d.ts b/TypeScript/2EditDatabase/types/helpers/RepairHelper.d.ts index 4bd0577..99a21da 100644 --- a/TypeScript/2EditDatabase/types/helpers/RepairHelper.d.ts +++ b/TypeScript/2EditDatabase/types/helpers/RepairHelper.d.ts @@ -3,17 +3,17 @@ import { ITemplateItem, Props } from "@spt/models/eft/common/tables/ITemplateIte import { IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RepairHelper { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected configServer: ConfigServer; protected cloner: ICloner; protected repairConfig: IRepairConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, configServer: ConfigServer, cloner: ICloner); /** * Alter an items durability after a repair by trader/repair kit * @param itemToRepair item to update durability details diff --git a/TypeScript/2EditDatabase/types/helpers/TraderAssortHelper.d.ts b/TypeScript/2EditDatabase/types/helpers/TraderAssortHelper.d.ts index faf2a9d..8f8f802 100644 --- a/TypeScript/2EditDatabase/types/helpers/TraderAssortHelper.d.ts +++ b/TypeScript/2EditDatabase/types/helpers/TraderAssortHelper.d.ts @@ -9,7 +9,7 @@ import { ITrader, ITraderAssort } from "@spt/models/eft/common/tables/ITrader"; import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; @@ -21,7 +21,7 @@ export declare class TraderAssortHelper { protected logger: ILogger; protected mathUtil: MathUtil; protected timeUtil: TimeUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected assortHelper: AssortHelper; protected paymentHelper: PaymentHelper; @@ -37,7 +37,7 @@ export declare class TraderAssortHelper { protected traderConfig: ITraderConfig; protected mergedQuestAssorts: Record>; protected createdMergedQuestAssorts: boolean; - constructor(logger: ILogger, mathUtil: MathUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, profileHelper: ProfileHelper, assortHelper: AssortHelper, paymentHelper: PaymentHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, localisationService: LocalisationService, traderPurchasePersisterService: TraderPurchasePersisterService, traderHelper: TraderHelper, fenceService: FenceService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, mathUtil: MathUtil, timeUtil: TimeUtil, databaseService: DatabaseService, profileHelper: ProfileHelper, assortHelper: AssortHelper, paymentHelper: PaymentHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, localisationService: LocalisationService, traderPurchasePersisterService: TraderPurchasePersisterService, traderHelper: TraderHelper, fenceService: FenceService, configServer: ConfigServer, cloner: ICloner); /** * Get a traders assorts * Can be used for returning ragfair / fence assorts diff --git a/TypeScript/2EditDatabase/types/helpers/TraderHelper.d.ts b/TypeScript/2EditDatabase/types/helpers/TraderHelper.d.ts index 5f515da..eec1cc7 100644 --- a/TypeScript/2EditDatabase/types/helpers/TraderHelper.d.ts +++ b/TypeScript/2EditDatabase/types/helpers/TraderHelper.d.ts @@ -10,7 +10,7 @@ import { Traders } from "@spt/models/enums/Traders"; import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; @@ -18,7 +18,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class TraderHelper { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected handbookHelper: HandbookHelper; protected itemHelper: ItemHelper; @@ -33,7 +33,7 @@ export declare class TraderHelper { protected highestTraderPriceItems?: Record; /** Dictionary of item tpl and the highest trader buy back rouble price */ protected highestTraderBuyPriceItems?: Record; - constructor(logger: ILogger, databaseServer: DatabaseServer, profileHelper: ProfileHelper, handbookHelper: HandbookHelper, itemHelper: ItemHelper, playerService: PlayerService, localisationService: LocalisationService, fenceService: FenceService, timeUtil: TimeUtil, randomUtil: RandomUtil, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, profileHelper: ProfileHelper, handbookHelper: HandbookHelper, itemHelper: ItemHelper, playerService: PlayerService, localisationService: LocalisationService, fenceService: FenceService, timeUtil: TimeUtil, randomUtil: RandomUtil, configServer: ConfigServer); /** * Get a trader base object, update profile to reflect players current standing in profile * when trader not found in profile diff --git a/TypeScript/2EditDatabase/types/models/eft/common/IGlobals.d.ts b/TypeScript/2EditDatabase/types/models/eft/common/IGlobals.d.ts index 2209415..a0bb051 100644 --- a/TypeScript/2EditDatabase/types/models/eft/common/IGlobals.d.ts +++ b/TypeScript/2EditDatabase/types/models/eft/common/IGlobals.d.ts @@ -802,7 +802,6 @@ export interface IMaxActiveOfferCount { from: number; to: number; count: number; - countForSpecialEditions: number; } export interface IMaxSumForRarity { Common: IRarityMaxSum; diff --git a/TypeScript/2EditDatabase/types/models/eft/common/ILocationBase.d.ts b/TypeScript/2EditDatabase/types/models/eft/common/ILocationBase.d.ts index 65931f8..10f1a57 100644 --- a/TypeScript/2EditDatabase/types/models/eft/common/ILocationBase.d.ts +++ b/TypeScript/2EditDatabase/types/models/eft/common/ILocationBase.d.ts @@ -196,18 +196,24 @@ export interface Props { export interface Exit { /** % Chance out of 100 exit will appear in raid */ Chance: number; + ChancePVE: number; Count: number; + CountPVE: number; EntryPoints: string; EventAvailable: boolean; ExfiltrationTime: number; + ExfiltrationTimePVE: number; ExfiltrationType: string; RequiredSlot?: string; Id: string; MaxTime: number; + MaxTimePVE: number; MinTime: number; + MinTimePVE: number; Name: string; PassageRequirement: string; PlayersCount: number; + PlayersCountPVE: number; RequirementTip: string; Side?: string; } diff --git a/TypeScript/2EditDatabase/types/models/eft/common/tables/IRepeatableQuests.d.ts b/TypeScript/2EditDatabase/types/models/eft/common/tables/IRepeatableQuests.d.ts index 854c8ef..27ff49d 100644 --- a/TypeScript/2EditDatabase/types/models/eft/common/tables/IRepeatableQuests.d.ts +++ b/TypeScript/2EditDatabase/types/models/eft/common/tables/IRepeatableQuests.d.ts @@ -18,10 +18,13 @@ export interface IRepeatableTemplates { export interface IPmcDataRepeatableQuest { id?: string; name: string; + unavailableTime?: string; activeQuests: IRepeatableQuest[]; inactiveQuests: IRepeatableQuest[]; endTime: number; changeRequirement: Record; + freeChanges: number; + freeChangesAvailable: number; } export interface IChangeRequirement { changeCost: IChangeCost[]; diff --git a/TypeScript/2EditDatabase/types/models/eft/common/tables/ITemplateItem.d.ts b/TypeScript/2EditDatabase/types/models/eft/common/tables/ITemplateItem.d.ts index a8ccfbb..e5c6632 100644 --- a/TypeScript/2EditDatabase/types/models/eft/common/tables/ITemplateItem.d.ts +++ b/TypeScript/2EditDatabase/types/models/eft/common/tables/ITemplateItem.d.ts @@ -63,7 +63,7 @@ export interface Props { DiscardingBlock?: boolean; DropSoundType?: string; RagFairCommissionModifier?: number; - RarityPvE: string; + RarityPvE?: string; IsAlwaysAvailableForInsurance?: boolean; DiscardLimit?: number; MaxResource?: number; @@ -414,6 +414,12 @@ export interface Props { LayoutName?: string; Lower75Prefab?: Prefab; MaxUsages?: number; + ScavKillExpPenalty?: number; + ScavKillExpPenaltyPVE?: number; + ScavKillStandingPenalty?: number; + ScavKillStandingPenaltyPVE?: number; + TradersDiscount?: number; + TradersDiscountPVE?: number; } export interface IHealthEffect { type: string; diff --git a/TypeScript/2EditDatabase/types/models/spt/config/IQuestConfig.d.ts b/TypeScript/2EditDatabase/types/models/spt/config/IQuestConfig.d.ts index 362602c..2cdf4fa 100644 --- a/TypeScript/2EditDatabase/types/models/spt/config/IQuestConfig.d.ts +++ b/TypeScript/2EditDatabase/types/models/spt/config/IQuestConfig.d.ts @@ -47,6 +47,8 @@ export interface IRepeatableQuestConfig { /** Item tplIds to ignore when generating rewards */ rewardBlacklist: string[]; rewardAmmoStackMinSize: number; + freeChangesAvailable: number; + freeChanges: number; } export interface IRewardScaling { levels: number[]; diff --git a/TypeScript/2EditDatabase/types/services/BotEquipmentModPoolService.d.ts b/TypeScript/2EditDatabase/types/services/BotEquipmentModPoolService.d.ts index c53f31b..7b2b442 100644 --- a/TypeScript/2EditDatabase/types/services/BotEquipmentModPoolService.d.ts +++ b/TypeScript/2EditDatabase/types/services/BotEquipmentModPoolService.d.ts @@ -4,7 +4,7 @@ import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { VFS } from "@spt/utils/VFS"; /** Store a mapping between weapons, their slots and the items that fit those slots */ @@ -12,7 +12,7 @@ export declare class BotEquipmentModPoolService { protected logger: ILogger; protected vfs: VFS; protected itemHelper: ItemHelper; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected botConfig: IBotConfig; @@ -20,7 +20,7 @@ export declare class BotEquipmentModPoolService { protected gearModPool: Mods; protected weaponPoolGenerated: boolean; protected armorPoolGenerated: boolean; - constructor(logger: ILogger, vfs: VFS, itemHelper: ItemHelper, databaseServer: DatabaseServer, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, vfs: VFS, itemHelper: ItemHelper, databaseService: DatabaseService, localisationService: LocalisationService, configServer: ConfigServer); /** * Store dictionary of mods for each item passed in * @param items items to find related mods and store in modPool diff --git a/TypeScript/2EditDatabase/types/services/CustomLocationWaveService.d.ts b/TypeScript/2EditDatabase/types/services/CustomLocationWaveService.d.ts index 728a1e8..c72d5bb 100644 --- a/TypeScript/2EditDatabase/types/services/CustomLocationWaveService.d.ts +++ b/TypeScript/2EditDatabase/types/services/CustomLocationWaveService.d.ts @@ -2,15 +2,15 @@ import { BossLocationSpawn, Wave } from "@spt/models/eft/common/ILocationBase"; import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class CustomLocationWaveService { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, configServer: ConfigServer); /** * Add a boss wave to a map * @param locationId e.g. factory4_day, bigmap diff --git a/TypeScript/2EditDatabase/types/services/InsuranceService.d.ts b/TypeScript/2EditDatabase/types/services/InsuranceService.d.ts index c54f9f9..0000e66 100644 --- a/TypeScript/2EditDatabase/types/services/InsuranceService.d.ts +++ b/TypeScript/2EditDatabase/types/services/InsuranceService.d.ts @@ -13,8 +13,8 @@ import { ILostOnDeathConfig } from "@spt/models/spt/config/ILostOnDeathConfig"; import { IInsuranceEquipmentPkg } from "@spt/models/spt/services/IInsuranceEquipmentPkg"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -24,7 +24,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class InsuranceService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected secureContainerHelper: SecureContainerHelper; protected randomUtil: RandomUtil; protected itemHelper: ItemHelper; @@ -42,7 +42,7 @@ export declare class InsuranceService { protected insured: Record>; protected insuranceConfig: IInsuranceConfig; protected lostOnDeathConfig: ILostOnDeathConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, handbookHelper: HandbookHelper, localisationService: LocalisationService, localeService: LocaleService, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, databaseService: DatabaseService, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, handbookHelper: HandbookHelper, localisationService: LocalisationService, localeService: LocaleService, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); /** * Does player have insurance array * @param sessionId Player id diff --git a/TypeScript/2EditDatabase/types/services/MailSendService.d.ts b/TypeScript/2EditDatabase/types/services/MailSendService.d.ts index d445841..8f1f974 100644 --- a/TypeScript/2EditDatabase/types/services/MailSendService.d.ts +++ b/TypeScript/2EditDatabase/types/services/MailSendService.d.ts @@ -9,8 +9,8 @@ import { MessageType } from "@spt/models/enums/MessageType"; import { Traders } from "@spt/models/enums/Traders"; import { IProfileChangeEvent, ISendMessageDetails } from "@spt/models/spt/dialog/ISendMessageDetails"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; @@ -19,7 +19,7 @@ export declare class MailSendService { protected hashUtil: HashUtil; protected timeUtil: TimeUtil; protected saveServer: SaveServer; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected notifierHelper: NotifierHelper; protected dialogueHelper: DialogueHelper; protected notificationSendHelper: NotificationSendHelper; @@ -27,7 +27,7 @@ export declare class MailSendService { protected itemHelper: ItemHelper; protected traderHelper: TraderHelper; protected readonly systemSenderId = "59e7125688a45068a6249071"; - constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, dialogueHelper: DialogueHelper, notificationSendHelper: NotificationSendHelper, localisationService: LocalisationService, itemHelper: ItemHelper, traderHelper: TraderHelper); + constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseService: DatabaseService, notifierHelper: NotifierHelper, dialogueHelper: DialogueHelper, notificationSendHelper: NotificationSendHelper, localisationService: LocalisationService, itemHelper: ItemHelper, traderHelper: TraderHelper); /** * Send a message from an NPC (e.g. prapor) to the player with or without items using direct message text, do not look up any locale * @param sessionId The session ID to send the message to diff --git a/TypeScript/2EditDatabase/types/services/OpenZoneService.d.ts b/TypeScript/2EditDatabase/types/services/OpenZoneService.d.ts index 1bc5f00..c7dd0bd 100644 --- a/TypeScript/2EditDatabase/types/services/OpenZoneService.d.ts +++ b/TypeScript/2EditDatabase/types/services/OpenZoneService.d.ts @@ -1,18 +1,18 @@ import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RandomUtil } from "@spt/utils/RandomUtil"; /** Service for adding new zones to a maps OpenZones property */ export declare class OpenZoneService { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, localisationService: LocalisationService, configServer: ConfigServer); /** * Add open zone to specified map * @param locationId map location (e.g. factory4_day) diff --git a/TypeScript/2EditDatabase/types/services/PaymentService.d.ts b/TypeScript/2EditDatabase/types/services/PaymentService.d.ts index 64ff2c1..61d5731 100644 --- a/TypeScript/2EditDatabase/types/services/PaymentService.d.ts +++ b/TypeScript/2EditDatabase/types/services/PaymentService.d.ts @@ -9,7 +9,7 @@ import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRo import { IProcessBuyTradeRequestData } from "@spt/models/eft/trade/IProcessBuyTradeRequestData"; import { IProcessSellTradeRequestData } from "@spt/models/eft/trade/IProcessSellTradeRequestData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; @@ -17,14 +17,14 @@ export declare class PaymentService { protected logger: ILogger; protected hashUtil: HashUtil; protected httpResponse: HttpResponseUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected handbookHelper: HandbookHelper; protected traderHelper: TraderHelper; protected itemHelper: ItemHelper; protected inventoryHelper: InventoryHelper; protected localisationService: LocalisationService; protected paymentHelper: PaymentHelper; - constructor(logger: ILogger, hashUtil: HashUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, localisationService: LocalisationService, paymentHelper: PaymentHelper); + constructor(logger: ILogger, hashUtil: HashUtil, httpResponse: HttpResponseUtil, databaseService: DatabaseService, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, localisationService: LocalisationService, paymentHelper: PaymentHelper); /** * Take money and insert items into return to server request * @param pmcData Pmc profile diff --git a/TypeScript/2EditDatabase/types/services/PlayerService.d.ts b/TypeScript/2EditDatabase/types/services/PlayerService.d.ts index ae57410..84c4c6f 100644 --- a/TypeScript/2EditDatabase/types/services/PlayerService.d.ts +++ b/TypeScript/2EditDatabase/types/services/PlayerService.d.ts @@ -1,14 +1,14 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class PlayerService { protected logger: ILogger; protected timeUtil: TimeUtil; protected localisationService: LocalisationService; - protected databaseServer: DatabaseServer; - constructor(logger: ILogger, timeUtil: TimeUtil, localisationService: LocalisationService, databaseServer: DatabaseServer); + protected databaseService: DatabaseService; + constructor(logger: ILogger, timeUtil: TimeUtil, localisationService: LocalisationService, databaseService: DatabaseService); /** * Get level of player * @param pmcData Player profile diff --git a/TypeScript/2EditDatabase/types/services/RagfairLinkedItemService.d.ts b/TypeScript/2EditDatabase/types/services/RagfairLinkedItemService.d.ts index 6011c1a..0d03459 100644 --- a/TypeScript/2EditDatabase/types/services/RagfairLinkedItemService.d.ts +++ b/TypeScript/2EditDatabase/types/services/RagfairLinkedItemService.d.ts @@ -1,11 +1,11 @@ import { ItemHelper } from "@spt/helpers/ItemHelper"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; export declare class RagfairLinkedItemService { - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected linkedItemsCache: Record>; - constructor(databaseServer: DatabaseServer, itemHelper: ItemHelper); + constructor(databaseService: DatabaseService, itemHelper: ItemHelper); getLinkedItems(linkedSearchId: string): Set; /** * Use ragfair linked item service to get an array of items that can fit on or in designated itemtpl diff --git a/TypeScript/2EditDatabase/types/services/RagfairOfferService.d.ts b/TypeScript/2EditDatabase/types/services/RagfairOfferService.d.ts index c044f6d..4bc07c3 100644 --- a/TypeScript/2EditDatabase/types/services/RagfairOfferService.d.ts +++ b/TypeScript/2EditDatabase/types/services/RagfairOfferService.d.ts @@ -6,8 +6,8 @@ import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RagfairOfferHolder } from "@spt/utils/RagfairOfferHolder"; @@ -15,7 +15,7 @@ import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class RagfairOfferService { protected logger: ILogger; protected timeUtil: TimeUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected saveServer: SaveServer; protected ragfairServerHelper: RagfairServerHelper; protected profileHelper: ProfileHelper; @@ -28,7 +28,7 @@ export declare class RagfairOfferService { protected expiredOffers: Record; protected ragfairConfig: IRagfairConfig; protected ragfairOfferHandler: RagfairOfferHolder; - constructor(logger: ILogger, timeUtil: TimeUtil, databaseServer: DatabaseServer, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, eventOutputHolder: EventOutputHolder, httpResponse: HttpResponseUtil, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, timeUtil: TimeUtil, databaseService: DatabaseService, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, eventOutputHolder: EventOutputHolder, httpResponse: HttpResponseUtil, localisationService: LocalisationService, configServer: ConfigServer); /** * Get all offers * @returns IRagfairOffer array diff --git a/TypeScript/2EditDatabase/types/services/RagfairPriceService.d.ts b/TypeScript/2EditDatabase/types/services/RagfairPriceService.d.ts index 5b8fa56..0a2f26e 100644 --- a/TypeScript/2EditDatabase/types/services/RagfairPriceService.d.ts +++ b/TypeScript/2EditDatabase/types/services/RagfairPriceService.d.ts @@ -12,7 +12,7 @@ import { IRagfairConfig, IUnreasonableModPrices } from "@spt/models/spt/config/I import { IRagfairServerPrices } from "@spt/models/spt/ragfair/IRagfairServerPrices"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RandomUtil } from "@spt/utils/RandomUtil"; /** @@ -20,7 +20,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; */ export declare class RagfairPriceService implements OnLoad { protected handbookHelper: HandbookHelper; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected logger: ILogger; protected itemHelper: ItemHelper; protected presetHelper: PresetHelper; @@ -30,7 +30,7 @@ export declare class RagfairPriceService implements OnLoad { protected configServer: ConfigServer; protected ragfairConfig: IRagfairConfig; protected prices: IRagfairServerPrices; - constructor(handbookHelper: HandbookHelper, databaseServer: DatabaseServer, logger: ILogger, itemHelper: ItemHelper, presetHelper: PresetHelper, traderHelper: TraderHelper, randomUtil: RandomUtil, localisationService: LocalisationService, configServer: ConfigServer); + constructor(handbookHelper: HandbookHelper, databaseService: DatabaseService, logger: ILogger, itemHelper: ItemHelper, presetHelper: PresetHelper, traderHelper: TraderHelper, randomUtil: RandomUtil, localisationService: LocalisationService, configServer: ConfigServer); /** * Generate static (handbook) and dynamic (prices.json) flea prices, store inside class as dictionaries */ diff --git a/TypeScript/2EditDatabase/types/services/RagfairTaxService.d.ts b/TypeScript/2EditDatabase/types/services/RagfairTaxService.d.ts index 4e4e648..effb9f0 100644 --- a/TypeScript/2EditDatabase/types/services/RagfairTaxService.d.ts +++ b/TypeScript/2EditDatabase/types/services/RagfairTaxService.d.ts @@ -4,15 +4,15 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { IStorePlayerOfferTaxAmountRequestData } from "@spt/models/eft/ragfair/IStorePlayerOfferTaxAmountRequestData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; export declare class RagfairTaxService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected ragfairPriceService: RagfairPriceService; protected itemHelper: ItemHelper; protected playerOfferTaxCache: Record; - constructor(logger: ILogger, databaseServer: DatabaseServer, ragfairPriceService: RagfairPriceService, itemHelper: ItemHelper); + constructor(logger: ILogger, databaseService: DatabaseService, ragfairPriceService: RagfairPriceService, itemHelper: ItemHelper); storeClientOfferTaxValue(sessionId: string, offer: IStorePlayerOfferTaxAmountRequestData): void; clearStoredOfferTaxById(offerIdToRemove: string): void; getStoredClientOfferTaxValueById(offerIdToGet: string): IStorePlayerOfferTaxAmountRequestData; diff --git a/TypeScript/2EditDatabase/types/services/RaidTimeAdjustmentService.d.ts b/TypeScript/2EditDatabase/types/services/RaidTimeAdjustmentService.d.ts index f770b64..bfc099a 100644 --- a/TypeScript/2EditDatabase/types/services/RaidTimeAdjustmentService.d.ts +++ b/TypeScript/2EditDatabase/types/services/RaidTimeAdjustmentService.d.ts @@ -7,17 +7,17 @@ import { ILocationConfig, IScavRaidTimeLocationSettings, LootMultiplier } from " import { IRaidChanges } from "@spt/models/spt/location/IRaidChanges"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RaidTimeAdjustmentService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected randomUtil: RandomUtil; protected weightedRandomHelper: WeightedRandomHelper; protected applicationContext: ApplicationContext; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, applicationContext: ApplicationContext, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, applicationContext: ApplicationContext, configServer: ConfigServer); /** * Make alterations to the base map data passed in * Loot multipliers/waves/wave start times diff --git a/TypeScript/2EditDatabase/types/services/RepairService.d.ts b/TypeScript/2EditDatabase/types/services/RepairService.d.ts index 9203417..48f306e 100644 --- a/TypeScript/2EditDatabase/types/services/RepairService.d.ts +++ b/TypeScript/2EditDatabase/types/services/RepairService.d.ts @@ -14,13 +14,13 @@ import { SkillTypes } from "@spt/models/enums/SkillTypes"; import { BonusSettings, IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RepairService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected randomUtil: RandomUtil; protected itemHelper: ItemHelper; @@ -31,7 +31,7 @@ export declare class RepairService { protected localisationService: LocalisationService; protected configServer: ConfigServer; protected repairConfig: IRepairConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, profileHelper: ProfileHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, traderHelper: TraderHelper, weightedRandomHelper: WeightedRandomHelper, paymentService: PaymentService, repairHelper: RepairHelper, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, profileHelper: ProfileHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, traderHelper: TraderHelper, weightedRandomHelper: WeightedRandomHelper, paymentService: PaymentService, repairHelper: RepairHelper, localisationService: LocalisationService, configServer: ConfigServer); /** * Use trader to repair an items durability * @param sessionID Session id diff --git a/TypeScript/2EditDatabase/types/services/TraderServicesService.d.ts b/TypeScript/2EditDatabase/types/services/TraderServicesService.d.ts index 111c71a..e441eb6 100644 --- a/TypeScript/2EditDatabase/types/services/TraderServicesService.d.ts +++ b/TypeScript/2EditDatabase/types/services/TraderServicesService.d.ts @@ -1,13 +1,13 @@ import { ProfileHelper } from "@spt/helpers/ProfileHelper"; import { ITraderServiceModel } from "@spt/models/spt/services/ITraderServiceModel"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderServicesService { protected profileHelper: ProfileHelper; protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected cloner: ICloner; - constructor(profileHelper: ProfileHelper, logger: ILogger, databaseServer: DatabaseServer, cloner: ICloner); + constructor(profileHelper: ProfileHelper, logger: ILogger, databaseService: DatabaseService, cloner: ICloner); getTraderServices(sessionId: string, traderId: string): ITraderServiceModel[]; } diff --git a/TypeScript/2EditDatabase/types/services/mod/CustomItemService.d.ts b/TypeScript/2EditDatabase/types/services/mod/CustomItemService.d.ts index 6dc4730..1926bed 100644 --- a/TypeScript/2EditDatabase/types/services/mod/CustomItemService.d.ts +++ b/TypeScript/2EditDatabase/types/services/mod/CustomItemService.d.ts @@ -9,11 +9,11 @@ import { HashUtil } from "@spt/utils/HashUtil"; export declare class CustomItemService { protected logger: ILogger; protected hashUtil: HashUtil; - protected databaseServer: DatabaseService; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected itemBaseClassService: ItemBaseClassService; protected cloner: ICloner; - constructor(logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseService, itemHelper: ItemHelper, itemBaseClassService: ItemBaseClassService, cloner: ICloner); + constructor(logger: ILogger, hashUtil: HashUtil, databaseService: DatabaseService, itemHelper: ItemHelper, itemBaseClassService: ItemBaseClassService, cloner: ICloner); /** * Create a new item from a cloned item base * WARNING - If no item id is supplied, an id will be generated, this id will be random every time you add an item and will not be the same on each subsequent server start diff --git a/TypeScript/3GetSptConfigFile/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts b/TypeScript/3GetSptConfigFile/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts index a7491b5..c51bf7e 100644 --- a/TypeScript/3GetSptConfigFile/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts +++ b/TypeScript/3GetSptConfigFile/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts @@ -6,7 +6,7 @@ import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { ISendMessageRequest } from "@spt/models/eft/dialog/ISendMessageRequest"; import { IUserDialogInfo } from "@spt/models/eft/profile/ISptProfile"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -19,7 +19,7 @@ export declare class GiveSptCommand implements ISptCommand { protected presetHelper: PresetHelper; protected mailSendService: MailSendService; protected localeService: LocaleService; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemFilterService: ItemFilterService; protected cloner: ICloner; /** @@ -34,7 +34,7 @@ export declare class GiveSptCommand implements ISptCommand { private static acceptableConfidence; private static excludedPresetItems; protected savedCommand: Map; - constructor(logger: ILogger, itemHelper: ItemHelper, hashUtil: HashUtil, presetHelper: PresetHelper, mailSendService: MailSendService, localeService: LocaleService, databaseServer: DatabaseServer, itemFilterService: ItemFilterService, cloner: ICloner); + constructor(logger: ILogger, itemHelper: ItemHelper, hashUtil: HashUtil, presetHelper: PresetHelper, mailSendService: MailSendService, localeService: LocaleService, databaseService: DatabaseService, itemFilterService: ItemFilterService, cloner: ICloner); getCommand(): string; getCommandHelp(): string; performAction(commandHandler: IUserDialogInfo, sessionId: string, request: ISendMessageRequest): string; diff --git a/TypeScript/3GetSptConfigFile/types/helpers/PresetHelper.d.ts b/TypeScript/3GetSptConfigFile/types/helpers/PresetHelper.d.ts index 5fc8a7c..e71e5b7 100644 --- a/TypeScript/3GetSptConfigFile/types/helpers/PresetHelper.d.ts +++ b/TypeScript/3GetSptConfigFile/types/helpers/PresetHelper.d.ts @@ -1,16 +1,16 @@ import { IPreset } from "@spt/models/eft/common/IGlobals"; import { BaseClasses } from "@spt/models/enums/BaseClasses"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; import { ItemHelper } from "./ItemHelper"; export declare class PresetHelper { - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected cloner: ICloner; protected lookup: Record; protected defaultEquipmentPresets: Record; protected defaultWeaponPresets: Record; - constructor(databaseServer: DatabaseServer, itemHelper: ItemHelper, cloner: ICloner); + constructor(databaseService: DatabaseService, itemHelper: ItemHelper, cloner: ICloner); hydratePresetStore(input: Record): void; /** * Get default weapon and equipment presets diff --git a/TypeScript/3GetSptConfigFile/types/helpers/ProfileHelper.d.ts b/TypeScript/3GetSptConfigFile/types/helpers/ProfileHelper.d.ts index 37937ff..e943bd3 100644 --- a/TypeScript/3GetSptConfigFile/types/helpers/ProfileHelper.d.ts +++ b/TypeScript/3GetSptConfigFile/types/helpers/ProfileHelper.d.ts @@ -7,8 +7,8 @@ import { SkillTypes } from "@spt/models/enums/SkillTypes"; import { IInventoryConfig } from "@spt/models/spt/config/IInventoryConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileSnapshotService } from "@spt/services/ProfileSnapshotService"; import { ICloner } from "@spt/utils/cloners/ICloner"; @@ -21,14 +21,14 @@ export declare class ProfileHelper { protected watermark: Watermark; protected timeUtil: TimeUtil; protected saveServer: SaveServer; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected profileSnapshotService: ProfileSnapshotService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected cloner: ICloner; protected inventoryConfig: IInventoryConfig; - constructor(logger: ILogger, hashUtil: HashUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileSnapshotService: ProfileSnapshotService, localisationService: LocalisationService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, hashUtil: HashUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseService: DatabaseService, itemHelper: ItemHelper, profileSnapshotService: ProfileSnapshotService, localisationService: LocalisationService, configServer: ConfigServer, cloner: ICloner); /** * Remove/reset a completed quest condtion from players profile quest data * @param sessionID Session id diff --git a/TypeScript/3GetSptConfigFile/types/helpers/QuestHelper.d.ts b/TypeScript/3GetSptConfigFile/types/helpers/QuestHelper.d.ts index 39ba2a9..93368fa 100644 --- a/TypeScript/3GetSptConfigFile/types/helpers/QuestHelper.d.ts +++ b/TypeScript/3GetSptConfigFile/types/helpers/QuestHelper.d.ts @@ -18,7 +18,7 @@ import { IQuestConfig } from "@spt/models/spt/config/IQuestConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -30,9 +30,9 @@ export declare class QuestHelper { protected timeUtil: TimeUtil; protected hashUtil: HashUtil; protected itemHelper: ItemHelper; + protected databaseService: DatabaseService; protected questConditionHelper: QuestConditionHelper; protected eventOutputHolder: EventOutputHolder; - protected databaseServer: DatabaseServer; protected localeService: LocaleService; protected ragfairServerHelper: RagfairServerHelper; protected dialogueHelper: DialogueHelper; @@ -45,7 +45,7 @@ export declare class QuestHelper { protected configServer: ConfigServer; protected cloner: ICloner; protected questConfig: IQuestConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, questConditionHelper: QuestConditionHelper, eventOutputHolder: EventOutputHolder, databaseServer: DatabaseServer, localeService: LocaleService, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, localisationService: LocalisationService, traderHelper: TraderHelper, presetHelper: PresetHelper, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, databaseService: DatabaseService, questConditionHelper: QuestConditionHelper, eventOutputHolder: EventOutputHolder, localeService: LocaleService, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, localisationService: LocalisationService, traderHelper: TraderHelper, presetHelper: PresetHelper, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); /** * Get status of a quest in player profile by its id * @param pmcData Profile to search diff --git a/TypeScript/3GetSptConfigFile/types/helpers/RagfairOfferHelper.d.ts b/TypeScript/3GetSptConfigFile/types/helpers/RagfairOfferHelper.d.ts index 27bb081..a08e60a 100644 --- a/TypeScript/3GetSptConfigFile/types/helpers/RagfairOfferHelper.d.ts +++ b/TypeScript/3GetSptConfigFile/types/helpers/RagfairOfferHelper.d.ts @@ -19,8 +19,8 @@ import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -34,7 +34,7 @@ export declare class RagfairOfferHelper { protected timeUtil: TimeUtil; protected hashUtil: HashUtil; protected eventOutputHolder: EventOutputHolder; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected traderHelper: TraderHelper; protected saveServer: SaveServer; protected itemHelper: ItemHelper; @@ -55,7 +55,7 @@ export declare class RagfairOfferHelper { protected static goodSoldTemplate: string; protected ragfairConfig: IRagfairConfig; protected questConfig: IQuestConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, eventOutputHolder: EventOutputHolder, databaseServer: DatabaseServer, traderHelper: TraderHelper, saveServer: SaveServer, itemHelper: ItemHelper, botHelper: BotHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, localeService: LocaleService, localisationService: LocalisationService, mailSendService: MailSendService, configServer: ConfigServer); + constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, eventOutputHolder: EventOutputHolder, databaseService: DatabaseService, traderHelper: TraderHelper, saveServer: SaveServer, itemHelper: ItemHelper, botHelper: BotHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, localeService: LocaleService, localisationService: LocalisationService, mailSendService: MailSendService, configServer: ConfigServer); /** * Passthrough to ragfairOfferService.getOffers(), get flea offers a player should see * @param searchRequest Data from client diff --git a/TypeScript/3GetSptConfigFile/types/helpers/RepairHelper.d.ts b/TypeScript/3GetSptConfigFile/types/helpers/RepairHelper.d.ts index 4bd0577..99a21da 100644 --- a/TypeScript/3GetSptConfigFile/types/helpers/RepairHelper.d.ts +++ b/TypeScript/3GetSptConfigFile/types/helpers/RepairHelper.d.ts @@ -3,17 +3,17 @@ import { ITemplateItem, Props } from "@spt/models/eft/common/tables/ITemplateIte import { IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RepairHelper { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected configServer: ConfigServer; protected cloner: ICloner; protected repairConfig: IRepairConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, configServer: ConfigServer, cloner: ICloner); /** * Alter an items durability after a repair by trader/repair kit * @param itemToRepair item to update durability details diff --git a/TypeScript/3GetSptConfigFile/types/helpers/TraderAssortHelper.d.ts b/TypeScript/3GetSptConfigFile/types/helpers/TraderAssortHelper.d.ts index faf2a9d..8f8f802 100644 --- a/TypeScript/3GetSptConfigFile/types/helpers/TraderAssortHelper.d.ts +++ b/TypeScript/3GetSptConfigFile/types/helpers/TraderAssortHelper.d.ts @@ -9,7 +9,7 @@ import { ITrader, ITraderAssort } from "@spt/models/eft/common/tables/ITrader"; import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; @@ -21,7 +21,7 @@ export declare class TraderAssortHelper { protected logger: ILogger; protected mathUtil: MathUtil; protected timeUtil: TimeUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected assortHelper: AssortHelper; protected paymentHelper: PaymentHelper; @@ -37,7 +37,7 @@ export declare class TraderAssortHelper { protected traderConfig: ITraderConfig; protected mergedQuestAssorts: Record>; protected createdMergedQuestAssorts: boolean; - constructor(logger: ILogger, mathUtil: MathUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, profileHelper: ProfileHelper, assortHelper: AssortHelper, paymentHelper: PaymentHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, localisationService: LocalisationService, traderPurchasePersisterService: TraderPurchasePersisterService, traderHelper: TraderHelper, fenceService: FenceService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, mathUtil: MathUtil, timeUtil: TimeUtil, databaseService: DatabaseService, profileHelper: ProfileHelper, assortHelper: AssortHelper, paymentHelper: PaymentHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, localisationService: LocalisationService, traderPurchasePersisterService: TraderPurchasePersisterService, traderHelper: TraderHelper, fenceService: FenceService, configServer: ConfigServer, cloner: ICloner); /** * Get a traders assorts * Can be used for returning ragfair / fence assorts diff --git a/TypeScript/3GetSptConfigFile/types/helpers/TraderHelper.d.ts b/TypeScript/3GetSptConfigFile/types/helpers/TraderHelper.d.ts index 5f515da..eec1cc7 100644 --- a/TypeScript/3GetSptConfigFile/types/helpers/TraderHelper.d.ts +++ b/TypeScript/3GetSptConfigFile/types/helpers/TraderHelper.d.ts @@ -10,7 +10,7 @@ import { Traders } from "@spt/models/enums/Traders"; import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; @@ -18,7 +18,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class TraderHelper { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected handbookHelper: HandbookHelper; protected itemHelper: ItemHelper; @@ -33,7 +33,7 @@ export declare class TraderHelper { protected highestTraderPriceItems?: Record; /** Dictionary of item tpl and the highest trader buy back rouble price */ protected highestTraderBuyPriceItems?: Record; - constructor(logger: ILogger, databaseServer: DatabaseServer, profileHelper: ProfileHelper, handbookHelper: HandbookHelper, itemHelper: ItemHelper, playerService: PlayerService, localisationService: LocalisationService, fenceService: FenceService, timeUtil: TimeUtil, randomUtil: RandomUtil, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, profileHelper: ProfileHelper, handbookHelper: HandbookHelper, itemHelper: ItemHelper, playerService: PlayerService, localisationService: LocalisationService, fenceService: FenceService, timeUtil: TimeUtil, randomUtil: RandomUtil, configServer: ConfigServer); /** * Get a trader base object, update profile to reflect players current standing in profile * when trader not found in profile diff --git a/TypeScript/3GetSptConfigFile/types/models/eft/common/IGlobals.d.ts b/TypeScript/3GetSptConfigFile/types/models/eft/common/IGlobals.d.ts index 2209415..a0bb051 100644 --- a/TypeScript/3GetSptConfigFile/types/models/eft/common/IGlobals.d.ts +++ b/TypeScript/3GetSptConfigFile/types/models/eft/common/IGlobals.d.ts @@ -802,7 +802,6 @@ export interface IMaxActiveOfferCount { from: number; to: number; count: number; - countForSpecialEditions: number; } export interface IMaxSumForRarity { Common: IRarityMaxSum; diff --git a/TypeScript/3GetSptConfigFile/types/models/eft/common/ILocationBase.d.ts b/TypeScript/3GetSptConfigFile/types/models/eft/common/ILocationBase.d.ts index 65931f8..10f1a57 100644 --- a/TypeScript/3GetSptConfigFile/types/models/eft/common/ILocationBase.d.ts +++ b/TypeScript/3GetSptConfigFile/types/models/eft/common/ILocationBase.d.ts @@ -196,18 +196,24 @@ export interface Props { export interface Exit { /** % Chance out of 100 exit will appear in raid */ Chance: number; + ChancePVE: number; Count: number; + CountPVE: number; EntryPoints: string; EventAvailable: boolean; ExfiltrationTime: number; + ExfiltrationTimePVE: number; ExfiltrationType: string; RequiredSlot?: string; Id: string; MaxTime: number; + MaxTimePVE: number; MinTime: number; + MinTimePVE: number; Name: string; PassageRequirement: string; PlayersCount: number; + PlayersCountPVE: number; RequirementTip: string; Side?: string; } diff --git a/TypeScript/3GetSptConfigFile/types/models/eft/common/tables/IRepeatableQuests.d.ts b/TypeScript/3GetSptConfigFile/types/models/eft/common/tables/IRepeatableQuests.d.ts index 854c8ef..27ff49d 100644 --- a/TypeScript/3GetSptConfigFile/types/models/eft/common/tables/IRepeatableQuests.d.ts +++ b/TypeScript/3GetSptConfigFile/types/models/eft/common/tables/IRepeatableQuests.d.ts @@ -18,10 +18,13 @@ export interface IRepeatableTemplates { export interface IPmcDataRepeatableQuest { id?: string; name: string; + unavailableTime?: string; activeQuests: IRepeatableQuest[]; inactiveQuests: IRepeatableQuest[]; endTime: number; changeRequirement: Record; + freeChanges: number; + freeChangesAvailable: number; } export interface IChangeRequirement { changeCost: IChangeCost[]; diff --git a/TypeScript/3GetSptConfigFile/types/models/eft/common/tables/ITemplateItem.d.ts b/TypeScript/3GetSptConfigFile/types/models/eft/common/tables/ITemplateItem.d.ts index a8ccfbb..e5c6632 100644 --- a/TypeScript/3GetSptConfigFile/types/models/eft/common/tables/ITemplateItem.d.ts +++ b/TypeScript/3GetSptConfigFile/types/models/eft/common/tables/ITemplateItem.d.ts @@ -63,7 +63,7 @@ export interface Props { DiscardingBlock?: boolean; DropSoundType?: string; RagFairCommissionModifier?: number; - RarityPvE: string; + RarityPvE?: string; IsAlwaysAvailableForInsurance?: boolean; DiscardLimit?: number; MaxResource?: number; @@ -414,6 +414,12 @@ export interface Props { LayoutName?: string; Lower75Prefab?: Prefab; MaxUsages?: number; + ScavKillExpPenalty?: number; + ScavKillExpPenaltyPVE?: number; + ScavKillStandingPenalty?: number; + ScavKillStandingPenaltyPVE?: number; + TradersDiscount?: number; + TradersDiscountPVE?: number; } export interface IHealthEffect { type: string; diff --git a/TypeScript/3GetSptConfigFile/types/models/spt/config/IQuestConfig.d.ts b/TypeScript/3GetSptConfigFile/types/models/spt/config/IQuestConfig.d.ts index 362602c..2cdf4fa 100644 --- a/TypeScript/3GetSptConfigFile/types/models/spt/config/IQuestConfig.d.ts +++ b/TypeScript/3GetSptConfigFile/types/models/spt/config/IQuestConfig.d.ts @@ -47,6 +47,8 @@ export interface IRepeatableQuestConfig { /** Item tplIds to ignore when generating rewards */ rewardBlacklist: string[]; rewardAmmoStackMinSize: number; + freeChangesAvailable: number; + freeChanges: number; } export interface IRewardScaling { levels: number[]; diff --git a/TypeScript/3GetSptConfigFile/types/services/BotEquipmentModPoolService.d.ts b/TypeScript/3GetSptConfigFile/types/services/BotEquipmentModPoolService.d.ts index c53f31b..7b2b442 100644 --- a/TypeScript/3GetSptConfigFile/types/services/BotEquipmentModPoolService.d.ts +++ b/TypeScript/3GetSptConfigFile/types/services/BotEquipmentModPoolService.d.ts @@ -4,7 +4,7 @@ import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { VFS } from "@spt/utils/VFS"; /** Store a mapping between weapons, their slots and the items that fit those slots */ @@ -12,7 +12,7 @@ export declare class BotEquipmentModPoolService { protected logger: ILogger; protected vfs: VFS; protected itemHelper: ItemHelper; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected botConfig: IBotConfig; @@ -20,7 +20,7 @@ export declare class BotEquipmentModPoolService { protected gearModPool: Mods; protected weaponPoolGenerated: boolean; protected armorPoolGenerated: boolean; - constructor(logger: ILogger, vfs: VFS, itemHelper: ItemHelper, databaseServer: DatabaseServer, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, vfs: VFS, itemHelper: ItemHelper, databaseService: DatabaseService, localisationService: LocalisationService, configServer: ConfigServer); /** * Store dictionary of mods for each item passed in * @param items items to find related mods and store in modPool diff --git a/TypeScript/3GetSptConfigFile/types/services/CustomLocationWaveService.d.ts b/TypeScript/3GetSptConfigFile/types/services/CustomLocationWaveService.d.ts index 728a1e8..c72d5bb 100644 --- a/TypeScript/3GetSptConfigFile/types/services/CustomLocationWaveService.d.ts +++ b/TypeScript/3GetSptConfigFile/types/services/CustomLocationWaveService.d.ts @@ -2,15 +2,15 @@ import { BossLocationSpawn, Wave } from "@spt/models/eft/common/ILocationBase"; import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class CustomLocationWaveService { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, configServer: ConfigServer); /** * Add a boss wave to a map * @param locationId e.g. factory4_day, bigmap diff --git a/TypeScript/3GetSptConfigFile/types/services/InsuranceService.d.ts b/TypeScript/3GetSptConfigFile/types/services/InsuranceService.d.ts index c54f9f9..0000e66 100644 --- a/TypeScript/3GetSptConfigFile/types/services/InsuranceService.d.ts +++ b/TypeScript/3GetSptConfigFile/types/services/InsuranceService.d.ts @@ -13,8 +13,8 @@ import { ILostOnDeathConfig } from "@spt/models/spt/config/ILostOnDeathConfig"; import { IInsuranceEquipmentPkg } from "@spt/models/spt/services/IInsuranceEquipmentPkg"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -24,7 +24,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class InsuranceService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected secureContainerHelper: SecureContainerHelper; protected randomUtil: RandomUtil; protected itemHelper: ItemHelper; @@ -42,7 +42,7 @@ export declare class InsuranceService { protected insured: Record>; protected insuranceConfig: IInsuranceConfig; protected lostOnDeathConfig: ILostOnDeathConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, handbookHelper: HandbookHelper, localisationService: LocalisationService, localeService: LocaleService, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, databaseService: DatabaseService, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, handbookHelper: HandbookHelper, localisationService: LocalisationService, localeService: LocaleService, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); /** * Does player have insurance array * @param sessionId Player id diff --git a/TypeScript/3GetSptConfigFile/types/services/MailSendService.d.ts b/TypeScript/3GetSptConfigFile/types/services/MailSendService.d.ts index d445841..8f1f974 100644 --- a/TypeScript/3GetSptConfigFile/types/services/MailSendService.d.ts +++ b/TypeScript/3GetSptConfigFile/types/services/MailSendService.d.ts @@ -9,8 +9,8 @@ import { MessageType } from "@spt/models/enums/MessageType"; import { Traders } from "@spt/models/enums/Traders"; import { IProfileChangeEvent, ISendMessageDetails } from "@spt/models/spt/dialog/ISendMessageDetails"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; @@ -19,7 +19,7 @@ export declare class MailSendService { protected hashUtil: HashUtil; protected timeUtil: TimeUtil; protected saveServer: SaveServer; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected notifierHelper: NotifierHelper; protected dialogueHelper: DialogueHelper; protected notificationSendHelper: NotificationSendHelper; @@ -27,7 +27,7 @@ export declare class MailSendService { protected itemHelper: ItemHelper; protected traderHelper: TraderHelper; protected readonly systemSenderId = "59e7125688a45068a6249071"; - constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, dialogueHelper: DialogueHelper, notificationSendHelper: NotificationSendHelper, localisationService: LocalisationService, itemHelper: ItemHelper, traderHelper: TraderHelper); + constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseService: DatabaseService, notifierHelper: NotifierHelper, dialogueHelper: DialogueHelper, notificationSendHelper: NotificationSendHelper, localisationService: LocalisationService, itemHelper: ItemHelper, traderHelper: TraderHelper); /** * Send a message from an NPC (e.g. prapor) to the player with or without items using direct message text, do not look up any locale * @param sessionId The session ID to send the message to diff --git a/TypeScript/3GetSptConfigFile/types/services/OpenZoneService.d.ts b/TypeScript/3GetSptConfigFile/types/services/OpenZoneService.d.ts index 1bc5f00..c7dd0bd 100644 --- a/TypeScript/3GetSptConfigFile/types/services/OpenZoneService.d.ts +++ b/TypeScript/3GetSptConfigFile/types/services/OpenZoneService.d.ts @@ -1,18 +1,18 @@ import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RandomUtil } from "@spt/utils/RandomUtil"; /** Service for adding new zones to a maps OpenZones property */ export declare class OpenZoneService { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, localisationService: LocalisationService, configServer: ConfigServer); /** * Add open zone to specified map * @param locationId map location (e.g. factory4_day) diff --git a/TypeScript/3GetSptConfigFile/types/services/PaymentService.d.ts b/TypeScript/3GetSptConfigFile/types/services/PaymentService.d.ts index 64ff2c1..61d5731 100644 --- a/TypeScript/3GetSptConfigFile/types/services/PaymentService.d.ts +++ b/TypeScript/3GetSptConfigFile/types/services/PaymentService.d.ts @@ -9,7 +9,7 @@ import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRo import { IProcessBuyTradeRequestData } from "@spt/models/eft/trade/IProcessBuyTradeRequestData"; import { IProcessSellTradeRequestData } from "@spt/models/eft/trade/IProcessSellTradeRequestData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; @@ -17,14 +17,14 @@ export declare class PaymentService { protected logger: ILogger; protected hashUtil: HashUtil; protected httpResponse: HttpResponseUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected handbookHelper: HandbookHelper; protected traderHelper: TraderHelper; protected itemHelper: ItemHelper; protected inventoryHelper: InventoryHelper; protected localisationService: LocalisationService; protected paymentHelper: PaymentHelper; - constructor(logger: ILogger, hashUtil: HashUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, localisationService: LocalisationService, paymentHelper: PaymentHelper); + constructor(logger: ILogger, hashUtil: HashUtil, httpResponse: HttpResponseUtil, databaseService: DatabaseService, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, localisationService: LocalisationService, paymentHelper: PaymentHelper); /** * Take money and insert items into return to server request * @param pmcData Pmc profile diff --git a/TypeScript/3GetSptConfigFile/types/services/PlayerService.d.ts b/TypeScript/3GetSptConfigFile/types/services/PlayerService.d.ts index ae57410..84c4c6f 100644 --- a/TypeScript/3GetSptConfigFile/types/services/PlayerService.d.ts +++ b/TypeScript/3GetSptConfigFile/types/services/PlayerService.d.ts @@ -1,14 +1,14 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class PlayerService { protected logger: ILogger; protected timeUtil: TimeUtil; protected localisationService: LocalisationService; - protected databaseServer: DatabaseServer; - constructor(logger: ILogger, timeUtil: TimeUtil, localisationService: LocalisationService, databaseServer: DatabaseServer); + protected databaseService: DatabaseService; + constructor(logger: ILogger, timeUtil: TimeUtil, localisationService: LocalisationService, databaseService: DatabaseService); /** * Get level of player * @param pmcData Player profile diff --git a/TypeScript/3GetSptConfigFile/types/services/RagfairLinkedItemService.d.ts b/TypeScript/3GetSptConfigFile/types/services/RagfairLinkedItemService.d.ts index 6011c1a..0d03459 100644 --- a/TypeScript/3GetSptConfigFile/types/services/RagfairLinkedItemService.d.ts +++ b/TypeScript/3GetSptConfigFile/types/services/RagfairLinkedItemService.d.ts @@ -1,11 +1,11 @@ import { ItemHelper } from "@spt/helpers/ItemHelper"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; export declare class RagfairLinkedItemService { - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected linkedItemsCache: Record>; - constructor(databaseServer: DatabaseServer, itemHelper: ItemHelper); + constructor(databaseService: DatabaseService, itemHelper: ItemHelper); getLinkedItems(linkedSearchId: string): Set; /** * Use ragfair linked item service to get an array of items that can fit on or in designated itemtpl diff --git a/TypeScript/3GetSptConfigFile/types/services/RagfairOfferService.d.ts b/TypeScript/3GetSptConfigFile/types/services/RagfairOfferService.d.ts index c044f6d..4bc07c3 100644 --- a/TypeScript/3GetSptConfigFile/types/services/RagfairOfferService.d.ts +++ b/TypeScript/3GetSptConfigFile/types/services/RagfairOfferService.d.ts @@ -6,8 +6,8 @@ import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RagfairOfferHolder } from "@spt/utils/RagfairOfferHolder"; @@ -15,7 +15,7 @@ import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class RagfairOfferService { protected logger: ILogger; protected timeUtil: TimeUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected saveServer: SaveServer; protected ragfairServerHelper: RagfairServerHelper; protected profileHelper: ProfileHelper; @@ -28,7 +28,7 @@ export declare class RagfairOfferService { protected expiredOffers: Record; protected ragfairConfig: IRagfairConfig; protected ragfairOfferHandler: RagfairOfferHolder; - constructor(logger: ILogger, timeUtil: TimeUtil, databaseServer: DatabaseServer, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, eventOutputHolder: EventOutputHolder, httpResponse: HttpResponseUtil, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, timeUtil: TimeUtil, databaseService: DatabaseService, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, eventOutputHolder: EventOutputHolder, httpResponse: HttpResponseUtil, localisationService: LocalisationService, configServer: ConfigServer); /** * Get all offers * @returns IRagfairOffer array diff --git a/TypeScript/3GetSptConfigFile/types/services/RagfairPriceService.d.ts b/TypeScript/3GetSptConfigFile/types/services/RagfairPriceService.d.ts index 5b8fa56..0a2f26e 100644 --- a/TypeScript/3GetSptConfigFile/types/services/RagfairPriceService.d.ts +++ b/TypeScript/3GetSptConfigFile/types/services/RagfairPriceService.d.ts @@ -12,7 +12,7 @@ import { IRagfairConfig, IUnreasonableModPrices } from "@spt/models/spt/config/I import { IRagfairServerPrices } from "@spt/models/spt/ragfair/IRagfairServerPrices"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RandomUtil } from "@spt/utils/RandomUtil"; /** @@ -20,7 +20,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; */ export declare class RagfairPriceService implements OnLoad { protected handbookHelper: HandbookHelper; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected logger: ILogger; protected itemHelper: ItemHelper; protected presetHelper: PresetHelper; @@ -30,7 +30,7 @@ export declare class RagfairPriceService implements OnLoad { protected configServer: ConfigServer; protected ragfairConfig: IRagfairConfig; protected prices: IRagfairServerPrices; - constructor(handbookHelper: HandbookHelper, databaseServer: DatabaseServer, logger: ILogger, itemHelper: ItemHelper, presetHelper: PresetHelper, traderHelper: TraderHelper, randomUtil: RandomUtil, localisationService: LocalisationService, configServer: ConfigServer); + constructor(handbookHelper: HandbookHelper, databaseService: DatabaseService, logger: ILogger, itemHelper: ItemHelper, presetHelper: PresetHelper, traderHelper: TraderHelper, randomUtil: RandomUtil, localisationService: LocalisationService, configServer: ConfigServer); /** * Generate static (handbook) and dynamic (prices.json) flea prices, store inside class as dictionaries */ diff --git a/TypeScript/3GetSptConfigFile/types/services/RagfairTaxService.d.ts b/TypeScript/3GetSptConfigFile/types/services/RagfairTaxService.d.ts index 4e4e648..effb9f0 100644 --- a/TypeScript/3GetSptConfigFile/types/services/RagfairTaxService.d.ts +++ b/TypeScript/3GetSptConfigFile/types/services/RagfairTaxService.d.ts @@ -4,15 +4,15 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { IStorePlayerOfferTaxAmountRequestData } from "@spt/models/eft/ragfair/IStorePlayerOfferTaxAmountRequestData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; export declare class RagfairTaxService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected ragfairPriceService: RagfairPriceService; protected itemHelper: ItemHelper; protected playerOfferTaxCache: Record; - constructor(logger: ILogger, databaseServer: DatabaseServer, ragfairPriceService: RagfairPriceService, itemHelper: ItemHelper); + constructor(logger: ILogger, databaseService: DatabaseService, ragfairPriceService: RagfairPriceService, itemHelper: ItemHelper); storeClientOfferTaxValue(sessionId: string, offer: IStorePlayerOfferTaxAmountRequestData): void; clearStoredOfferTaxById(offerIdToRemove: string): void; getStoredClientOfferTaxValueById(offerIdToGet: string): IStorePlayerOfferTaxAmountRequestData; diff --git a/TypeScript/3GetSptConfigFile/types/services/RaidTimeAdjustmentService.d.ts b/TypeScript/3GetSptConfigFile/types/services/RaidTimeAdjustmentService.d.ts index f770b64..bfc099a 100644 --- a/TypeScript/3GetSptConfigFile/types/services/RaidTimeAdjustmentService.d.ts +++ b/TypeScript/3GetSptConfigFile/types/services/RaidTimeAdjustmentService.d.ts @@ -7,17 +7,17 @@ import { ILocationConfig, IScavRaidTimeLocationSettings, LootMultiplier } from " import { IRaidChanges } from "@spt/models/spt/location/IRaidChanges"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RaidTimeAdjustmentService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected randomUtil: RandomUtil; protected weightedRandomHelper: WeightedRandomHelper; protected applicationContext: ApplicationContext; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, applicationContext: ApplicationContext, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, applicationContext: ApplicationContext, configServer: ConfigServer); /** * Make alterations to the base map data passed in * Loot multipliers/waves/wave start times diff --git a/TypeScript/3GetSptConfigFile/types/services/RepairService.d.ts b/TypeScript/3GetSptConfigFile/types/services/RepairService.d.ts index 9203417..48f306e 100644 --- a/TypeScript/3GetSptConfigFile/types/services/RepairService.d.ts +++ b/TypeScript/3GetSptConfigFile/types/services/RepairService.d.ts @@ -14,13 +14,13 @@ import { SkillTypes } from "@spt/models/enums/SkillTypes"; import { BonusSettings, IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RepairService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected randomUtil: RandomUtil; protected itemHelper: ItemHelper; @@ -31,7 +31,7 @@ export declare class RepairService { protected localisationService: LocalisationService; protected configServer: ConfigServer; protected repairConfig: IRepairConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, profileHelper: ProfileHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, traderHelper: TraderHelper, weightedRandomHelper: WeightedRandomHelper, paymentService: PaymentService, repairHelper: RepairHelper, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, profileHelper: ProfileHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, traderHelper: TraderHelper, weightedRandomHelper: WeightedRandomHelper, paymentService: PaymentService, repairHelper: RepairHelper, localisationService: LocalisationService, configServer: ConfigServer); /** * Use trader to repair an items durability * @param sessionID Session id diff --git a/TypeScript/3GetSptConfigFile/types/services/TraderServicesService.d.ts b/TypeScript/3GetSptConfigFile/types/services/TraderServicesService.d.ts index 111c71a..e441eb6 100644 --- a/TypeScript/3GetSptConfigFile/types/services/TraderServicesService.d.ts +++ b/TypeScript/3GetSptConfigFile/types/services/TraderServicesService.d.ts @@ -1,13 +1,13 @@ import { ProfileHelper } from "@spt/helpers/ProfileHelper"; import { ITraderServiceModel } from "@spt/models/spt/services/ITraderServiceModel"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderServicesService { protected profileHelper: ProfileHelper; protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected cloner: ICloner; - constructor(profileHelper: ProfileHelper, logger: ILogger, databaseServer: DatabaseServer, cloner: ICloner); + constructor(profileHelper: ProfileHelper, logger: ILogger, databaseService: DatabaseService, cloner: ICloner); getTraderServices(sessionId: string, traderId: string): ITraderServiceModel[]; } diff --git a/TypeScript/3GetSptConfigFile/types/services/mod/CustomItemService.d.ts b/TypeScript/3GetSptConfigFile/types/services/mod/CustomItemService.d.ts index 6dc4730..1926bed 100644 --- a/TypeScript/3GetSptConfigFile/types/services/mod/CustomItemService.d.ts +++ b/TypeScript/3GetSptConfigFile/types/services/mod/CustomItemService.d.ts @@ -9,11 +9,11 @@ import { HashUtil } from "@spt/utils/HashUtil"; export declare class CustomItemService { protected logger: ILogger; protected hashUtil: HashUtil; - protected databaseServer: DatabaseService; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected itemBaseClassService: ItemBaseClassService; protected cloner: ICloner; - constructor(logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseService, itemHelper: ItemHelper, itemBaseClassService: ItemBaseClassService, cloner: ICloner); + constructor(logger: ILogger, hashUtil: HashUtil, databaseService: DatabaseService, itemHelper: ItemHelper, itemBaseClassService: ItemBaseClassService, cloner: ICloner); /** * Create a new item from a cloned item base * WARNING - If no item id is supplied, an id will be generated, this id will be random every time you add an item and will not be the same on each subsequent server start diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts index a7491b5..c51bf7e 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts @@ -6,7 +6,7 @@ import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { ISendMessageRequest } from "@spt/models/eft/dialog/ISendMessageRequest"; import { IUserDialogInfo } from "@spt/models/eft/profile/ISptProfile"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -19,7 +19,7 @@ export declare class GiveSptCommand implements ISptCommand { protected presetHelper: PresetHelper; protected mailSendService: MailSendService; protected localeService: LocaleService; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemFilterService: ItemFilterService; protected cloner: ICloner; /** @@ -34,7 +34,7 @@ export declare class GiveSptCommand implements ISptCommand { private static acceptableConfidence; private static excludedPresetItems; protected savedCommand: Map; - constructor(logger: ILogger, itemHelper: ItemHelper, hashUtil: HashUtil, presetHelper: PresetHelper, mailSendService: MailSendService, localeService: LocaleService, databaseServer: DatabaseServer, itemFilterService: ItemFilterService, cloner: ICloner); + constructor(logger: ILogger, itemHelper: ItemHelper, hashUtil: HashUtil, presetHelper: PresetHelper, mailSendService: MailSendService, localeService: LocaleService, databaseService: DatabaseService, itemFilterService: ItemFilterService, cloner: ICloner); getCommand(): string; getCommandHelp(): string; performAction(commandHandler: IUserDialogInfo, sessionId: string, request: ISendMessageRequest): string; diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/PresetHelper.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/PresetHelper.d.ts index 5fc8a7c..e71e5b7 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/PresetHelper.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/PresetHelper.d.ts @@ -1,16 +1,16 @@ import { IPreset } from "@spt/models/eft/common/IGlobals"; import { BaseClasses } from "@spt/models/enums/BaseClasses"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; import { ItemHelper } from "./ItemHelper"; export declare class PresetHelper { - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected cloner: ICloner; protected lookup: Record; protected defaultEquipmentPresets: Record; protected defaultWeaponPresets: Record; - constructor(databaseServer: DatabaseServer, itemHelper: ItemHelper, cloner: ICloner); + constructor(databaseService: DatabaseService, itemHelper: ItemHelper, cloner: ICloner); hydratePresetStore(input: Record): void; /** * Get default weapon and equipment presets diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/ProfileHelper.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/ProfileHelper.d.ts index 37937ff..e943bd3 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/ProfileHelper.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/ProfileHelper.d.ts @@ -7,8 +7,8 @@ import { SkillTypes } from "@spt/models/enums/SkillTypes"; import { IInventoryConfig } from "@spt/models/spt/config/IInventoryConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileSnapshotService } from "@spt/services/ProfileSnapshotService"; import { ICloner } from "@spt/utils/cloners/ICloner"; @@ -21,14 +21,14 @@ export declare class ProfileHelper { protected watermark: Watermark; protected timeUtil: TimeUtil; protected saveServer: SaveServer; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected profileSnapshotService: ProfileSnapshotService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected cloner: ICloner; protected inventoryConfig: IInventoryConfig; - constructor(logger: ILogger, hashUtil: HashUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileSnapshotService: ProfileSnapshotService, localisationService: LocalisationService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, hashUtil: HashUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseService: DatabaseService, itemHelper: ItemHelper, profileSnapshotService: ProfileSnapshotService, localisationService: LocalisationService, configServer: ConfigServer, cloner: ICloner); /** * Remove/reset a completed quest condtion from players profile quest data * @param sessionID Session id diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/QuestHelper.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/QuestHelper.d.ts index 39ba2a9..93368fa 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/QuestHelper.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/QuestHelper.d.ts @@ -18,7 +18,7 @@ import { IQuestConfig } from "@spt/models/spt/config/IQuestConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -30,9 +30,9 @@ export declare class QuestHelper { protected timeUtil: TimeUtil; protected hashUtil: HashUtil; protected itemHelper: ItemHelper; + protected databaseService: DatabaseService; protected questConditionHelper: QuestConditionHelper; protected eventOutputHolder: EventOutputHolder; - protected databaseServer: DatabaseServer; protected localeService: LocaleService; protected ragfairServerHelper: RagfairServerHelper; protected dialogueHelper: DialogueHelper; @@ -45,7 +45,7 @@ export declare class QuestHelper { protected configServer: ConfigServer; protected cloner: ICloner; protected questConfig: IQuestConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, questConditionHelper: QuestConditionHelper, eventOutputHolder: EventOutputHolder, databaseServer: DatabaseServer, localeService: LocaleService, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, localisationService: LocalisationService, traderHelper: TraderHelper, presetHelper: PresetHelper, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, databaseService: DatabaseService, questConditionHelper: QuestConditionHelper, eventOutputHolder: EventOutputHolder, localeService: LocaleService, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, localisationService: LocalisationService, traderHelper: TraderHelper, presetHelper: PresetHelper, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); /** * Get status of a quest in player profile by its id * @param pmcData Profile to search diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/RagfairOfferHelper.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/RagfairOfferHelper.d.ts index 27bb081..a08e60a 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/RagfairOfferHelper.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/RagfairOfferHelper.d.ts @@ -19,8 +19,8 @@ import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -34,7 +34,7 @@ export declare class RagfairOfferHelper { protected timeUtil: TimeUtil; protected hashUtil: HashUtil; protected eventOutputHolder: EventOutputHolder; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected traderHelper: TraderHelper; protected saveServer: SaveServer; protected itemHelper: ItemHelper; @@ -55,7 +55,7 @@ export declare class RagfairOfferHelper { protected static goodSoldTemplate: string; protected ragfairConfig: IRagfairConfig; protected questConfig: IQuestConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, eventOutputHolder: EventOutputHolder, databaseServer: DatabaseServer, traderHelper: TraderHelper, saveServer: SaveServer, itemHelper: ItemHelper, botHelper: BotHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, localeService: LocaleService, localisationService: LocalisationService, mailSendService: MailSendService, configServer: ConfigServer); + constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, eventOutputHolder: EventOutputHolder, databaseService: DatabaseService, traderHelper: TraderHelper, saveServer: SaveServer, itemHelper: ItemHelper, botHelper: BotHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, localeService: LocaleService, localisationService: LocalisationService, mailSendService: MailSendService, configServer: ConfigServer); /** * Passthrough to ragfairOfferService.getOffers(), get flea offers a player should see * @param searchRequest Data from client diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/RepairHelper.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/RepairHelper.d.ts index 4bd0577..99a21da 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/RepairHelper.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/RepairHelper.d.ts @@ -3,17 +3,17 @@ import { ITemplateItem, Props } from "@spt/models/eft/common/tables/ITemplateIte import { IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RepairHelper { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected configServer: ConfigServer; protected cloner: ICloner; protected repairConfig: IRepairConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, configServer: ConfigServer, cloner: ICloner); /** * Alter an items durability after a repair by trader/repair kit * @param itemToRepair item to update durability details diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/TraderAssortHelper.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/TraderAssortHelper.d.ts index faf2a9d..8f8f802 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/TraderAssortHelper.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/TraderAssortHelper.d.ts @@ -9,7 +9,7 @@ import { ITrader, ITraderAssort } from "@spt/models/eft/common/tables/ITrader"; import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; @@ -21,7 +21,7 @@ export declare class TraderAssortHelper { protected logger: ILogger; protected mathUtil: MathUtil; protected timeUtil: TimeUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected assortHelper: AssortHelper; protected paymentHelper: PaymentHelper; @@ -37,7 +37,7 @@ export declare class TraderAssortHelper { protected traderConfig: ITraderConfig; protected mergedQuestAssorts: Record>; protected createdMergedQuestAssorts: boolean; - constructor(logger: ILogger, mathUtil: MathUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, profileHelper: ProfileHelper, assortHelper: AssortHelper, paymentHelper: PaymentHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, localisationService: LocalisationService, traderPurchasePersisterService: TraderPurchasePersisterService, traderHelper: TraderHelper, fenceService: FenceService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, mathUtil: MathUtil, timeUtil: TimeUtil, databaseService: DatabaseService, profileHelper: ProfileHelper, assortHelper: AssortHelper, paymentHelper: PaymentHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, localisationService: LocalisationService, traderPurchasePersisterService: TraderPurchasePersisterService, traderHelper: TraderHelper, fenceService: FenceService, configServer: ConfigServer, cloner: ICloner); /** * Get a traders assorts * Can be used for returning ragfair / fence assorts diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/TraderHelper.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/TraderHelper.d.ts index 5f515da..eec1cc7 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/TraderHelper.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/helpers/TraderHelper.d.ts @@ -10,7 +10,7 @@ import { Traders } from "@spt/models/enums/Traders"; import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; @@ -18,7 +18,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class TraderHelper { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected handbookHelper: HandbookHelper; protected itemHelper: ItemHelper; @@ -33,7 +33,7 @@ export declare class TraderHelper { protected highestTraderPriceItems?: Record; /** Dictionary of item tpl and the highest trader buy back rouble price */ protected highestTraderBuyPriceItems?: Record; - constructor(logger: ILogger, databaseServer: DatabaseServer, profileHelper: ProfileHelper, handbookHelper: HandbookHelper, itemHelper: ItemHelper, playerService: PlayerService, localisationService: LocalisationService, fenceService: FenceService, timeUtil: TimeUtil, randomUtil: RandomUtil, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, profileHelper: ProfileHelper, handbookHelper: HandbookHelper, itemHelper: ItemHelper, playerService: PlayerService, localisationService: LocalisationService, fenceService: FenceService, timeUtil: TimeUtil, randomUtil: RandomUtil, configServer: ConfigServer); /** * Get a trader base object, update profile to reflect players current standing in profile * when trader not found in profile diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/eft/common/IGlobals.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/eft/common/IGlobals.d.ts index 2209415..a0bb051 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/eft/common/IGlobals.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/eft/common/IGlobals.d.ts @@ -802,7 +802,6 @@ export interface IMaxActiveOfferCount { from: number; to: number; count: number; - countForSpecialEditions: number; } export interface IMaxSumForRarity { Common: IRarityMaxSum; diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/eft/common/ILocationBase.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/eft/common/ILocationBase.d.ts index 65931f8..10f1a57 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/eft/common/ILocationBase.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/eft/common/ILocationBase.d.ts @@ -196,18 +196,24 @@ export interface Props { export interface Exit { /** % Chance out of 100 exit will appear in raid */ Chance: number; + ChancePVE: number; Count: number; + CountPVE: number; EntryPoints: string; EventAvailable: boolean; ExfiltrationTime: number; + ExfiltrationTimePVE: number; ExfiltrationType: string; RequiredSlot?: string; Id: string; MaxTime: number; + MaxTimePVE: number; MinTime: number; + MinTimePVE: number; Name: string; PassageRequirement: string; PlayersCount: number; + PlayersCountPVE: number; RequirementTip: string; Side?: string; } diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/eft/common/tables/IRepeatableQuests.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/eft/common/tables/IRepeatableQuests.d.ts index 854c8ef..27ff49d 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/eft/common/tables/IRepeatableQuests.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/eft/common/tables/IRepeatableQuests.d.ts @@ -18,10 +18,13 @@ export interface IRepeatableTemplates { export interface IPmcDataRepeatableQuest { id?: string; name: string; + unavailableTime?: string; activeQuests: IRepeatableQuest[]; inactiveQuests: IRepeatableQuest[]; endTime: number; changeRequirement: Record; + freeChanges: number; + freeChangesAvailable: number; } export interface IChangeRequirement { changeCost: IChangeCost[]; diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/eft/common/tables/ITemplateItem.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/eft/common/tables/ITemplateItem.d.ts index a8ccfbb..e5c6632 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/eft/common/tables/ITemplateItem.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/eft/common/tables/ITemplateItem.d.ts @@ -63,7 +63,7 @@ export interface Props { DiscardingBlock?: boolean; DropSoundType?: string; RagFairCommissionModifier?: number; - RarityPvE: string; + RarityPvE?: string; IsAlwaysAvailableForInsurance?: boolean; DiscardLimit?: number; MaxResource?: number; @@ -414,6 +414,12 @@ export interface Props { LayoutName?: string; Lower75Prefab?: Prefab; MaxUsages?: number; + ScavKillExpPenalty?: number; + ScavKillExpPenaltyPVE?: number; + ScavKillStandingPenalty?: number; + ScavKillStandingPenaltyPVE?: number; + TradersDiscount?: number; + TradersDiscountPVE?: number; } export interface IHealthEffect { type: string; diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/spt/config/IQuestConfig.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/spt/config/IQuestConfig.d.ts index 362602c..2cdf4fa 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/spt/config/IQuestConfig.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/models/spt/config/IQuestConfig.d.ts @@ -47,6 +47,8 @@ export interface IRepeatableQuestConfig { /** Item tplIds to ignore when generating rewards */ rewardBlacklist: string[]; rewardAmmoStackMinSize: number; + freeChangesAvailable: number; + freeChanges: number; } export interface IRewardScaling { levels: number[]; diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/BotEquipmentModPoolService.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/BotEquipmentModPoolService.d.ts index c53f31b..7b2b442 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/BotEquipmentModPoolService.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/BotEquipmentModPoolService.d.ts @@ -4,7 +4,7 @@ import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { VFS } from "@spt/utils/VFS"; /** Store a mapping between weapons, their slots and the items that fit those slots */ @@ -12,7 +12,7 @@ export declare class BotEquipmentModPoolService { protected logger: ILogger; protected vfs: VFS; protected itemHelper: ItemHelper; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected botConfig: IBotConfig; @@ -20,7 +20,7 @@ export declare class BotEquipmentModPoolService { protected gearModPool: Mods; protected weaponPoolGenerated: boolean; protected armorPoolGenerated: boolean; - constructor(logger: ILogger, vfs: VFS, itemHelper: ItemHelper, databaseServer: DatabaseServer, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, vfs: VFS, itemHelper: ItemHelper, databaseService: DatabaseService, localisationService: LocalisationService, configServer: ConfigServer); /** * Store dictionary of mods for each item passed in * @param items items to find related mods and store in modPool diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/CustomLocationWaveService.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/CustomLocationWaveService.d.ts index 728a1e8..c72d5bb 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/CustomLocationWaveService.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/CustomLocationWaveService.d.ts @@ -2,15 +2,15 @@ import { BossLocationSpawn, Wave } from "@spt/models/eft/common/ILocationBase"; import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class CustomLocationWaveService { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, configServer: ConfigServer); /** * Add a boss wave to a map * @param locationId e.g. factory4_day, bigmap diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/InsuranceService.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/InsuranceService.d.ts index c54f9f9..0000e66 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/InsuranceService.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/InsuranceService.d.ts @@ -13,8 +13,8 @@ import { ILostOnDeathConfig } from "@spt/models/spt/config/ILostOnDeathConfig"; import { IInsuranceEquipmentPkg } from "@spt/models/spt/services/IInsuranceEquipmentPkg"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -24,7 +24,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class InsuranceService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected secureContainerHelper: SecureContainerHelper; protected randomUtil: RandomUtil; protected itemHelper: ItemHelper; @@ -42,7 +42,7 @@ export declare class InsuranceService { protected insured: Record>; protected insuranceConfig: IInsuranceConfig; protected lostOnDeathConfig: ILostOnDeathConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, handbookHelper: HandbookHelper, localisationService: LocalisationService, localeService: LocaleService, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, databaseService: DatabaseService, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, handbookHelper: HandbookHelper, localisationService: LocalisationService, localeService: LocaleService, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); /** * Does player have insurance array * @param sessionId Player id diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/MailSendService.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/MailSendService.d.ts index d445841..8f1f974 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/MailSendService.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/MailSendService.d.ts @@ -9,8 +9,8 @@ import { MessageType } from "@spt/models/enums/MessageType"; import { Traders } from "@spt/models/enums/Traders"; import { IProfileChangeEvent, ISendMessageDetails } from "@spt/models/spt/dialog/ISendMessageDetails"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; @@ -19,7 +19,7 @@ export declare class MailSendService { protected hashUtil: HashUtil; protected timeUtil: TimeUtil; protected saveServer: SaveServer; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected notifierHelper: NotifierHelper; protected dialogueHelper: DialogueHelper; protected notificationSendHelper: NotificationSendHelper; @@ -27,7 +27,7 @@ export declare class MailSendService { protected itemHelper: ItemHelper; protected traderHelper: TraderHelper; protected readonly systemSenderId = "59e7125688a45068a6249071"; - constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, dialogueHelper: DialogueHelper, notificationSendHelper: NotificationSendHelper, localisationService: LocalisationService, itemHelper: ItemHelper, traderHelper: TraderHelper); + constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseService: DatabaseService, notifierHelper: NotifierHelper, dialogueHelper: DialogueHelper, notificationSendHelper: NotificationSendHelper, localisationService: LocalisationService, itemHelper: ItemHelper, traderHelper: TraderHelper); /** * Send a message from an NPC (e.g. prapor) to the player with or without items using direct message text, do not look up any locale * @param sessionId The session ID to send the message to diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/OpenZoneService.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/OpenZoneService.d.ts index 1bc5f00..c7dd0bd 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/OpenZoneService.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/OpenZoneService.d.ts @@ -1,18 +1,18 @@ import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RandomUtil } from "@spt/utils/RandomUtil"; /** Service for adding new zones to a maps OpenZones property */ export declare class OpenZoneService { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, localisationService: LocalisationService, configServer: ConfigServer); /** * Add open zone to specified map * @param locationId map location (e.g. factory4_day) diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/PaymentService.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/PaymentService.d.ts index 64ff2c1..61d5731 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/PaymentService.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/PaymentService.d.ts @@ -9,7 +9,7 @@ import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRo import { IProcessBuyTradeRequestData } from "@spt/models/eft/trade/IProcessBuyTradeRequestData"; import { IProcessSellTradeRequestData } from "@spt/models/eft/trade/IProcessSellTradeRequestData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; @@ -17,14 +17,14 @@ export declare class PaymentService { protected logger: ILogger; protected hashUtil: HashUtil; protected httpResponse: HttpResponseUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected handbookHelper: HandbookHelper; protected traderHelper: TraderHelper; protected itemHelper: ItemHelper; protected inventoryHelper: InventoryHelper; protected localisationService: LocalisationService; protected paymentHelper: PaymentHelper; - constructor(logger: ILogger, hashUtil: HashUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, localisationService: LocalisationService, paymentHelper: PaymentHelper); + constructor(logger: ILogger, hashUtil: HashUtil, httpResponse: HttpResponseUtil, databaseService: DatabaseService, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, localisationService: LocalisationService, paymentHelper: PaymentHelper); /** * Take money and insert items into return to server request * @param pmcData Pmc profile diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/PlayerService.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/PlayerService.d.ts index ae57410..84c4c6f 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/PlayerService.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/PlayerService.d.ts @@ -1,14 +1,14 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class PlayerService { protected logger: ILogger; protected timeUtil: TimeUtil; protected localisationService: LocalisationService; - protected databaseServer: DatabaseServer; - constructor(logger: ILogger, timeUtil: TimeUtil, localisationService: LocalisationService, databaseServer: DatabaseServer); + protected databaseService: DatabaseService; + constructor(logger: ILogger, timeUtil: TimeUtil, localisationService: LocalisationService, databaseService: DatabaseService); /** * Get level of player * @param pmcData Player profile diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/RagfairLinkedItemService.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/RagfairLinkedItemService.d.ts index 6011c1a..0d03459 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/RagfairLinkedItemService.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/RagfairLinkedItemService.d.ts @@ -1,11 +1,11 @@ import { ItemHelper } from "@spt/helpers/ItemHelper"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; export declare class RagfairLinkedItemService { - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected linkedItemsCache: Record>; - constructor(databaseServer: DatabaseServer, itemHelper: ItemHelper); + constructor(databaseService: DatabaseService, itemHelper: ItemHelper); getLinkedItems(linkedSearchId: string): Set; /** * Use ragfair linked item service to get an array of items that can fit on or in designated itemtpl diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/RagfairOfferService.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/RagfairOfferService.d.ts index c044f6d..4bc07c3 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/RagfairOfferService.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/RagfairOfferService.d.ts @@ -6,8 +6,8 @@ import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RagfairOfferHolder } from "@spt/utils/RagfairOfferHolder"; @@ -15,7 +15,7 @@ import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class RagfairOfferService { protected logger: ILogger; protected timeUtil: TimeUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected saveServer: SaveServer; protected ragfairServerHelper: RagfairServerHelper; protected profileHelper: ProfileHelper; @@ -28,7 +28,7 @@ export declare class RagfairOfferService { protected expiredOffers: Record; protected ragfairConfig: IRagfairConfig; protected ragfairOfferHandler: RagfairOfferHolder; - constructor(logger: ILogger, timeUtil: TimeUtil, databaseServer: DatabaseServer, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, eventOutputHolder: EventOutputHolder, httpResponse: HttpResponseUtil, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, timeUtil: TimeUtil, databaseService: DatabaseService, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, eventOutputHolder: EventOutputHolder, httpResponse: HttpResponseUtil, localisationService: LocalisationService, configServer: ConfigServer); /** * Get all offers * @returns IRagfairOffer array diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/RagfairPriceService.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/RagfairPriceService.d.ts index 5b8fa56..0a2f26e 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/RagfairPriceService.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/RagfairPriceService.d.ts @@ -12,7 +12,7 @@ import { IRagfairConfig, IUnreasonableModPrices } from "@spt/models/spt/config/I import { IRagfairServerPrices } from "@spt/models/spt/ragfair/IRagfairServerPrices"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RandomUtil } from "@spt/utils/RandomUtil"; /** @@ -20,7 +20,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; */ export declare class RagfairPriceService implements OnLoad { protected handbookHelper: HandbookHelper; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected logger: ILogger; protected itemHelper: ItemHelper; protected presetHelper: PresetHelper; @@ -30,7 +30,7 @@ export declare class RagfairPriceService implements OnLoad { protected configServer: ConfigServer; protected ragfairConfig: IRagfairConfig; protected prices: IRagfairServerPrices; - constructor(handbookHelper: HandbookHelper, databaseServer: DatabaseServer, logger: ILogger, itemHelper: ItemHelper, presetHelper: PresetHelper, traderHelper: TraderHelper, randomUtil: RandomUtil, localisationService: LocalisationService, configServer: ConfigServer); + constructor(handbookHelper: HandbookHelper, databaseService: DatabaseService, logger: ILogger, itemHelper: ItemHelper, presetHelper: PresetHelper, traderHelper: TraderHelper, randomUtil: RandomUtil, localisationService: LocalisationService, configServer: ConfigServer); /** * Generate static (handbook) and dynamic (prices.json) flea prices, store inside class as dictionaries */ diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/RagfairTaxService.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/RagfairTaxService.d.ts index 4e4e648..effb9f0 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/RagfairTaxService.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/RagfairTaxService.d.ts @@ -4,15 +4,15 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { IStorePlayerOfferTaxAmountRequestData } from "@spt/models/eft/ragfair/IStorePlayerOfferTaxAmountRequestData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; export declare class RagfairTaxService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected ragfairPriceService: RagfairPriceService; protected itemHelper: ItemHelper; protected playerOfferTaxCache: Record; - constructor(logger: ILogger, databaseServer: DatabaseServer, ragfairPriceService: RagfairPriceService, itemHelper: ItemHelper); + constructor(logger: ILogger, databaseService: DatabaseService, ragfairPriceService: RagfairPriceService, itemHelper: ItemHelper); storeClientOfferTaxValue(sessionId: string, offer: IStorePlayerOfferTaxAmountRequestData): void; clearStoredOfferTaxById(offerIdToRemove: string): void; getStoredClientOfferTaxValueById(offerIdToGet: string): IStorePlayerOfferTaxAmountRequestData; diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/RaidTimeAdjustmentService.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/RaidTimeAdjustmentService.d.ts index f770b64..bfc099a 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/RaidTimeAdjustmentService.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/RaidTimeAdjustmentService.d.ts @@ -7,17 +7,17 @@ import { ILocationConfig, IScavRaidTimeLocationSettings, LootMultiplier } from " import { IRaidChanges } from "@spt/models/spt/location/IRaidChanges"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RaidTimeAdjustmentService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected randomUtil: RandomUtil; protected weightedRandomHelper: WeightedRandomHelper; protected applicationContext: ApplicationContext; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, applicationContext: ApplicationContext, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, applicationContext: ApplicationContext, configServer: ConfigServer); /** * Make alterations to the base map data passed in * Loot multipliers/waves/wave start times diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/RepairService.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/RepairService.d.ts index 9203417..48f306e 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/RepairService.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/RepairService.d.ts @@ -14,13 +14,13 @@ import { SkillTypes } from "@spt/models/enums/SkillTypes"; import { BonusSettings, IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RepairService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected randomUtil: RandomUtil; protected itemHelper: ItemHelper; @@ -31,7 +31,7 @@ export declare class RepairService { protected localisationService: LocalisationService; protected configServer: ConfigServer; protected repairConfig: IRepairConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, profileHelper: ProfileHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, traderHelper: TraderHelper, weightedRandomHelper: WeightedRandomHelper, paymentService: PaymentService, repairHelper: RepairHelper, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, profileHelper: ProfileHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, traderHelper: TraderHelper, weightedRandomHelper: WeightedRandomHelper, paymentService: PaymentService, repairHelper: RepairHelper, localisationService: LocalisationService, configServer: ConfigServer); /** * Use trader to repair an items durability * @param sessionID Session id diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/TraderServicesService.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/TraderServicesService.d.ts index 111c71a..e441eb6 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/TraderServicesService.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/TraderServicesService.d.ts @@ -1,13 +1,13 @@ import { ProfileHelper } from "@spt/helpers/ProfileHelper"; import { ITraderServiceModel } from "@spt/models/spt/services/ITraderServiceModel"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderServicesService { protected profileHelper: ProfileHelper; protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected cloner: ICloner; - constructor(profileHelper: ProfileHelper, logger: ILogger, databaseServer: DatabaseServer, cloner: ICloner); + constructor(profileHelper: ProfileHelper, logger: ILogger, databaseService: DatabaseService, cloner: ICloner); getTraderServices(sessionId: string, traderId: string): ITraderServiceModel[]; } diff --git a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/mod/CustomItemService.d.ts b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/mod/CustomItemService.d.ts index 6dc4730..1926bed 100644 --- a/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/mod/CustomItemService.d.ts +++ b/TypeScript/4.1UseACustomJson5OrJsonCConfigFile/types/services/mod/CustomItemService.d.ts @@ -9,11 +9,11 @@ import { HashUtil } from "@spt/utils/HashUtil"; export declare class CustomItemService { protected logger: ILogger; protected hashUtil: HashUtil; - protected databaseServer: DatabaseService; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected itemBaseClassService: ItemBaseClassService; protected cloner: ICloner; - constructor(logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseService, itemHelper: ItemHelper, itemBaseClassService: ItemBaseClassService, cloner: ICloner); + constructor(logger: ILogger, hashUtil: HashUtil, databaseService: DatabaseService, itemHelper: ItemHelper, itemBaseClassService: ItemBaseClassService, cloner: ICloner); /** * Create a new item from a cloned item base * WARNING - If no item id is supplied, an id will be generated, this id will be random every time you add an item and will not be the same on each subsequent server start diff --git a/TypeScript/4UseACustomConfigFile/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts b/TypeScript/4UseACustomConfigFile/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts index a7491b5..c51bf7e 100644 --- a/TypeScript/4UseACustomConfigFile/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts @@ -6,7 +6,7 @@ import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { ISendMessageRequest } from "@spt/models/eft/dialog/ISendMessageRequest"; import { IUserDialogInfo } from "@spt/models/eft/profile/ISptProfile"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -19,7 +19,7 @@ export declare class GiveSptCommand implements ISptCommand { protected presetHelper: PresetHelper; protected mailSendService: MailSendService; protected localeService: LocaleService; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemFilterService: ItemFilterService; protected cloner: ICloner; /** @@ -34,7 +34,7 @@ export declare class GiveSptCommand implements ISptCommand { private static acceptableConfidence; private static excludedPresetItems; protected savedCommand: Map; - constructor(logger: ILogger, itemHelper: ItemHelper, hashUtil: HashUtil, presetHelper: PresetHelper, mailSendService: MailSendService, localeService: LocaleService, databaseServer: DatabaseServer, itemFilterService: ItemFilterService, cloner: ICloner); + constructor(logger: ILogger, itemHelper: ItemHelper, hashUtil: HashUtil, presetHelper: PresetHelper, mailSendService: MailSendService, localeService: LocaleService, databaseService: DatabaseService, itemFilterService: ItemFilterService, cloner: ICloner); getCommand(): string; getCommandHelp(): string; performAction(commandHandler: IUserDialogInfo, sessionId: string, request: ISendMessageRequest): string; diff --git a/TypeScript/4UseACustomConfigFile/types/helpers/PresetHelper.d.ts b/TypeScript/4UseACustomConfigFile/types/helpers/PresetHelper.d.ts index 5fc8a7c..e71e5b7 100644 --- a/TypeScript/4UseACustomConfigFile/types/helpers/PresetHelper.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/helpers/PresetHelper.d.ts @@ -1,16 +1,16 @@ import { IPreset } from "@spt/models/eft/common/IGlobals"; import { BaseClasses } from "@spt/models/enums/BaseClasses"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; import { ItemHelper } from "./ItemHelper"; export declare class PresetHelper { - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected cloner: ICloner; protected lookup: Record; protected defaultEquipmentPresets: Record; protected defaultWeaponPresets: Record; - constructor(databaseServer: DatabaseServer, itemHelper: ItemHelper, cloner: ICloner); + constructor(databaseService: DatabaseService, itemHelper: ItemHelper, cloner: ICloner); hydratePresetStore(input: Record): void; /** * Get default weapon and equipment presets diff --git a/TypeScript/4UseACustomConfigFile/types/helpers/ProfileHelper.d.ts b/TypeScript/4UseACustomConfigFile/types/helpers/ProfileHelper.d.ts index 37937ff..e943bd3 100644 --- a/TypeScript/4UseACustomConfigFile/types/helpers/ProfileHelper.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/helpers/ProfileHelper.d.ts @@ -7,8 +7,8 @@ import { SkillTypes } from "@spt/models/enums/SkillTypes"; import { IInventoryConfig } from "@spt/models/spt/config/IInventoryConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileSnapshotService } from "@spt/services/ProfileSnapshotService"; import { ICloner } from "@spt/utils/cloners/ICloner"; @@ -21,14 +21,14 @@ export declare class ProfileHelper { protected watermark: Watermark; protected timeUtil: TimeUtil; protected saveServer: SaveServer; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected profileSnapshotService: ProfileSnapshotService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected cloner: ICloner; protected inventoryConfig: IInventoryConfig; - constructor(logger: ILogger, hashUtil: HashUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileSnapshotService: ProfileSnapshotService, localisationService: LocalisationService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, hashUtil: HashUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseService: DatabaseService, itemHelper: ItemHelper, profileSnapshotService: ProfileSnapshotService, localisationService: LocalisationService, configServer: ConfigServer, cloner: ICloner); /** * Remove/reset a completed quest condtion from players profile quest data * @param sessionID Session id diff --git a/TypeScript/4UseACustomConfigFile/types/helpers/QuestHelper.d.ts b/TypeScript/4UseACustomConfigFile/types/helpers/QuestHelper.d.ts index 39ba2a9..93368fa 100644 --- a/TypeScript/4UseACustomConfigFile/types/helpers/QuestHelper.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/helpers/QuestHelper.d.ts @@ -18,7 +18,7 @@ import { IQuestConfig } from "@spt/models/spt/config/IQuestConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -30,9 +30,9 @@ export declare class QuestHelper { protected timeUtil: TimeUtil; protected hashUtil: HashUtil; protected itemHelper: ItemHelper; + protected databaseService: DatabaseService; protected questConditionHelper: QuestConditionHelper; protected eventOutputHolder: EventOutputHolder; - protected databaseServer: DatabaseServer; protected localeService: LocaleService; protected ragfairServerHelper: RagfairServerHelper; protected dialogueHelper: DialogueHelper; @@ -45,7 +45,7 @@ export declare class QuestHelper { protected configServer: ConfigServer; protected cloner: ICloner; protected questConfig: IQuestConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, questConditionHelper: QuestConditionHelper, eventOutputHolder: EventOutputHolder, databaseServer: DatabaseServer, localeService: LocaleService, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, localisationService: LocalisationService, traderHelper: TraderHelper, presetHelper: PresetHelper, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, databaseService: DatabaseService, questConditionHelper: QuestConditionHelper, eventOutputHolder: EventOutputHolder, localeService: LocaleService, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, localisationService: LocalisationService, traderHelper: TraderHelper, presetHelper: PresetHelper, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); /** * Get status of a quest in player profile by its id * @param pmcData Profile to search diff --git a/TypeScript/4UseACustomConfigFile/types/helpers/RagfairOfferHelper.d.ts b/TypeScript/4UseACustomConfigFile/types/helpers/RagfairOfferHelper.d.ts index 27bb081..a08e60a 100644 --- a/TypeScript/4UseACustomConfigFile/types/helpers/RagfairOfferHelper.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/helpers/RagfairOfferHelper.d.ts @@ -19,8 +19,8 @@ import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -34,7 +34,7 @@ export declare class RagfairOfferHelper { protected timeUtil: TimeUtil; protected hashUtil: HashUtil; protected eventOutputHolder: EventOutputHolder; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected traderHelper: TraderHelper; protected saveServer: SaveServer; protected itemHelper: ItemHelper; @@ -55,7 +55,7 @@ export declare class RagfairOfferHelper { protected static goodSoldTemplate: string; protected ragfairConfig: IRagfairConfig; protected questConfig: IQuestConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, eventOutputHolder: EventOutputHolder, databaseServer: DatabaseServer, traderHelper: TraderHelper, saveServer: SaveServer, itemHelper: ItemHelper, botHelper: BotHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, localeService: LocaleService, localisationService: LocalisationService, mailSendService: MailSendService, configServer: ConfigServer); + constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, eventOutputHolder: EventOutputHolder, databaseService: DatabaseService, traderHelper: TraderHelper, saveServer: SaveServer, itemHelper: ItemHelper, botHelper: BotHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, localeService: LocaleService, localisationService: LocalisationService, mailSendService: MailSendService, configServer: ConfigServer); /** * Passthrough to ragfairOfferService.getOffers(), get flea offers a player should see * @param searchRequest Data from client diff --git a/TypeScript/4UseACustomConfigFile/types/helpers/RepairHelper.d.ts b/TypeScript/4UseACustomConfigFile/types/helpers/RepairHelper.d.ts index 4bd0577..99a21da 100644 --- a/TypeScript/4UseACustomConfigFile/types/helpers/RepairHelper.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/helpers/RepairHelper.d.ts @@ -3,17 +3,17 @@ import { ITemplateItem, Props } from "@spt/models/eft/common/tables/ITemplateIte import { IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RepairHelper { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected configServer: ConfigServer; protected cloner: ICloner; protected repairConfig: IRepairConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, configServer: ConfigServer, cloner: ICloner); /** * Alter an items durability after a repair by trader/repair kit * @param itemToRepair item to update durability details diff --git a/TypeScript/4UseACustomConfigFile/types/helpers/TraderAssortHelper.d.ts b/TypeScript/4UseACustomConfigFile/types/helpers/TraderAssortHelper.d.ts index faf2a9d..8f8f802 100644 --- a/TypeScript/4UseACustomConfigFile/types/helpers/TraderAssortHelper.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/helpers/TraderAssortHelper.d.ts @@ -9,7 +9,7 @@ import { ITrader, ITraderAssort } from "@spt/models/eft/common/tables/ITrader"; import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; @@ -21,7 +21,7 @@ export declare class TraderAssortHelper { protected logger: ILogger; protected mathUtil: MathUtil; protected timeUtil: TimeUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected assortHelper: AssortHelper; protected paymentHelper: PaymentHelper; @@ -37,7 +37,7 @@ export declare class TraderAssortHelper { protected traderConfig: ITraderConfig; protected mergedQuestAssorts: Record>; protected createdMergedQuestAssorts: boolean; - constructor(logger: ILogger, mathUtil: MathUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, profileHelper: ProfileHelper, assortHelper: AssortHelper, paymentHelper: PaymentHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, localisationService: LocalisationService, traderPurchasePersisterService: TraderPurchasePersisterService, traderHelper: TraderHelper, fenceService: FenceService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, mathUtil: MathUtil, timeUtil: TimeUtil, databaseService: DatabaseService, profileHelper: ProfileHelper, assortHelper: AssortHelper, paymentHelper: PaymentHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, localisationService: LocalisationService, traderPurchasePersisterService: TraderPurchasePersisterService, traderHelper: TraderHelper, fenceService: FenceService, configServer: ConfigServer, cloner: ICloner); /** * Get a traders assorts * Can be used for returning ragfair / fence assorts diff --git a/TypeScript/4UseACustomConfigFile/types/helpers/TraderHelper.d.ts b/TypeScript/4UseACustomConfigFile/types/helpers/TraderHelper.d.ts index 5f515da..eec1cc7 100644 --- a/TypeScript/4UseACustomConfigFile/types/helpers/TraderHelper.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/helpers/TraderHelper.d.ts @@ -10,7 +10,7 @@ import { Traders } from "@spt/models/enums/Traders"; import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; @@ -18,7 +18,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class TraderHelper { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected handbookHelper: HandbookHelper; protected itemHelper: ItemHelper; @@ -33,7 +33,7 @@ export declare class TraderHelper { protected highestTraderPriceItems?: Record; /** Dictionary of item tpl and the highest trader buy back rouble price */ protected highestTraderBuyPriceItems?: Record; - constructor(logger: ILogger, databaseServer: DatabaseServer, profileHelper: ProfileHelper, handbookHelper: HandbookHelper, itemHelper: ItemHelper, playerService: PlayerService, localisationService: LocalisationService, fenceService: FenceService, timeUtil: TimeUtil, randomUtil: RandomUtil, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, profileHelper: ProfileHelper, handbookHelper: HandbookHelper, itemHelper: ItemHelper, playerService: PlayerService, localisationService: LocalisationService, fenceService: FenceService, timeUtil: TimeUtil, randomUtil: RandomUtil, configServer: ConfigServer); /** * Get a trader base object, update profile to reflect players current standing in profile * when trader not found in profile diff --git a/TypeScript/4UseACustomConfigFile/types/models/eft/common/IGlobals.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/common/IGlobals.d.ts index 2209415..a0bb051 100644 --- a/TypeScript/4UseACustomConfigFile/types/models/eft/common/IGlobals.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/models/eft/common/IGlobals.d.ts @@ -802,7 +802,6 @@ export interface IMaxActiveOfferCount { from: number; to: number; count: number; - countForSpecialEditions: number; } export interface IMaxSumForRarity { Common: IRarityMaxSum; diff --git a/TypeScript/4UseACustomConfigFile/types/models/eft/common/ILocationBase.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/common/ILocationBase.d.ts index 65931f8..10f1a57 100644 --- a/TypeScript/4UseACustomConfigFile/types/models/eft/common/ILocationBase.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/models/eft/common/ILocationBase.d.ts @@ -196,18 +196,24 @@ export interface Props { export interface Exit { /** % Chance out of 100 exit will appear in raid */ Chance: number; + ChancePVE: number; Count: number; + CountPVE: number; EntryPoints: string; EventAvailable: boolean; ExfiltrationTime: number; + ExfiltrationTimePVE: number; ExfiltrationType: string; RequiredSlot?: string; Id: string; MaxTime: number; + MaxTimePVE: number; MinTime: number; + MinTimePVE: number; Name: string; PassageRequirement: string; PlayersCount: number; + PlayersCountPVE: number; RequirementTip: string; Side?: string; } diff --git a/TypeScript/4UseACustomConfigFile/types/models/eft/common/tables/IRepeatableQuests.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/common/tables/IRepeatableQuests.d.ts index 854c8ef..27ff49d 100644 --- a/TypeScript/4UseACustomConfigFile/types/models/eft/common/tables/IRepeatableQuests.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/models/eft/common/tables/IRepeatableQuests.d.ts @@ -18,10 +18,13 @@ export interface IRepeatableTemplates { export interface IPmcDataRepeatableQuest { id?: string; name: string; + unavailableTime?: string; activeQuests: IRepeatableQuest[]; inactiveQuests: IRepeatableQuest[]; endTime: number; changeRequirement: Record; + freeChanges: number; + freeChangesAvailable: number; } export interface IChangeRequirement { changeCost: IChangeCost[]; diff --git a/TypeScript/4UseACustomConfigFile/types/models/eft/common/tables/ITemplateItem.d.ts b/TypeScript/4UseACustomConfigFile/types/models/eft/common/tables/ITemplateItem.d.ts index a8ccfbb..e5c6632 100644 --- a/TypeScript/4UseACustomConfigFile/types/models/eft/common/tables/ITemplateItem.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/models/eft/common/tables/ITemplateItem.d.ts @@ -63,7 +63,7 @@ export interface Props { DiscardingBlock?: boolean; DropSoundType?: string; RagFairCommissionModifier?: number; - RarityPvE: string; + RarityPvE?: string; IsAlwaysAvailableForInsurance?: boolean; DiscardLimit?: number; MaxResource?: number; @@ -414,6 +414,12 @@ export interface Props { LayoutName?: string; Lower75Prefab?: Prefab; MaxUsages?: number; + ScavKillExpPenalty?: number; + ScavKillExpPenaltyPVE?: number; + ScavKillStandingPenalty?: number; + ScavKillStandingPenaltyPVE?: number; + TradersDiscount?: number; + TradersDiscountPVE?: number; } export interface IHealthEffect { type: string; diff --git a/TypeScript/4UseACustomConfigFile/types/models/spt/config/IQuestConfig.d.ts b/TypeScript/4UseACustomConfigFile/types/models/spt/config/IQuestConfig.d.ts index 362602c..2cdf4fa 100644 --- a/TypeScript/4UseACustomConfigFile/types/models/spt/config/IQuestConfig.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/models/spt/config/IQuestConfig.d.ts @@ -47,6 +47,8 @@ export interface IRepeatableQuestConfig { /** Item tplIds to ignore when generating rewards */ rewardBlacklist: string[]; rewardAmmoStackMinSize: number; + freeChangesAvailable: number; + freeChanges: number; } export interface IRewardScaling { levels: number[]; diff --git a/TypeScript/4UseACustomConfigFile/types/services/BotEquipmentModPoolService.d.ts b/TypeScript/4UseACustomConfigFile/types/services/BotEquipmentModPoolService.d.ts index c53f31b..7b2b442 100644 --- a/TypeScript/4UseACustomConfigFile/types/services/BotEquipmentModPoolService.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/services/BotEquipmentModPoolService.d.ts @@ -4,7 +4,7 @@ import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { VFS } from "@spt/utils/VFS"; /** Store a mapping between weapons, their slots and the items that fit those slots */ @@ -12,7 +12,7 @@ export declare class BotEquipmentModPoolService { protected logger: ILogger; protected vfs: VFS; protected itemHelper: ItemHelper; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected botConfig: IBotConfig; @@ -20,7 +20,7 @@ export declare class BotEquipmentModPoolService { protected gearModPool: Mods; protected weaponPoolGenerated: boolean; protected armorPoolGenerated: boolean; - constructor(logger: ILogger, vfs: VFS, itemHelper: ItemHelper, databaseServer: DatabaseServer, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, vfs: VFS, itemHelper: ItemHelper, databaseService: DatabaseService, localisationService: LocalisationService, configServer: ConfigServer); /** * Store dictionary of mods for each item passed in * @param items items to find related mods and store in modPool diff --git a/TypeScript/4UseACustomConfigFile/types/services/CustomLocationWaveService.d.ts b/TypeScript/4UseACustomConfigFile/types/services/CustomLocationWaveService.d.ts index 728a1e8..c72d5bb 100644 --- a/TypeScript/4UseACustomConfigFile/types/services/CustomLocationWaveService.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/services/CustomLocationWaveService.d.ts @@ -2,15 +2,15 @@ import { BossLocationSpawn, Wave } from "@spt/models/eft/common/ILocationBase"; import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class CustomLocationWaveService { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, configServer: ConfigServer); /** * Add a boss wave to a map * @param locationId e.g. factory4_day, bigmap diff --git a/TypeScript/4UseACustomConfigFile/types/services/InsuranceService.d.ts b/TypeScript/4UseACustomConfigFile/types/services/InsuranceService.d.ts index c54f9f9..0000e66 100644 --- a/TypeScript/4UseACustomConfigFile/types/services/InsuranceService.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/services/InsuranceService.d.ts @@ -13,8 +13,8 @@ import { ILostOnDeathConfig } from "@spt/models/spt/config/ILostOnDeathConfig"; import { IInsuranceEquipmentPkg } from "@spt/models/spt/services/IInsuranceEquipmentPkg"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -24,7 +24,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class InsuranceService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected secureContainerHelper: SecureContainerHelper; protected randomUtil: RandomUtil; protected itemHelper: ItemHelper; @@ -42,7 +42,7 @@ export declare class InsuranceService { protected insured: Record>; protected insuranceConfig: IInsuranceConfig; protected lostOnDeathConfig: ILostOnDeathConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, handbookHelper: HandbookHelper, localisationService: LocalisationService, localeService: LocaleService, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, databaseService: DatabaseService, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, handbookHelper: HandbookHelper, localisationService: LocalisationService, localeService: LocaleService, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); /** * Does player have insurance array * @param sessionId Player id diff --git a/TypeScript/4UseACustomConfigFile/types/services/MailSendService.d.ts b/TypeScript/4UseACustomConfigFile/types/services/MailSendService.d.ts index d445841..8f1f974 100644 --- a/TypeScript/4UseACustomConfigFile/types/services/MailSendService.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/services/MailSendService.d.ts @@ -9,8 +9,8 @@ import { MessageType } from "@spt/models/enums/MessageType"; import { Traders } from "@spt/models/enums/Traders"; import { IProfileChangeEvent, ISendMessageDetails } from "@spt/models/spt/dialog/ISendMessageDetails"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; @@ -19,7 +19,7 @@ export declare class MailSendService { protected hashUtil: HashUtil; protected timeUtil: TimeUtil; protected saveServer: SaveServer; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected notifierHelper: NotifierHelper; protected dialogueHelper: DialogueHelper; protected notificationSendHelper: NotificationSendHelper; @@ -27,7 +27,7 @@ export declare class MailSendService { protected itemHelper: ItemHelper; protected traderHelper: TraderHelper; protected readonly systemSenderId = "59e7125688a45068a6249071"; - constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, dialogueHelper: DialogueHelper, notificationSendHelper: NotificationSendHelper, localisationService: LocalisationService, itemHelper: ItemHelper, traderHelper: TraderHelper); + constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseService: DatabaseService, notifierHelper: NotifierHelper, dialogueHelper: DialogueHelper, notificationSendHelper: NotificationSendHelper, localisationService: LocalisationService, itemHelper: ItemHelper, traderHelper: TraderHelper); /** * Send a message from an NPC (e.g. prapor) to the player with or without items using direct message text, do not look up any locale * @param sessionId The session ID to send the message to diff --git a/TypeScript/4UseACustomConfigFile/types/services/OpenZoneService.d.ts b/TypeScript/4UseACustomConfigFile/types/services/OpenZoneService.d.ts index 1bc5f00..c7dd0bd 100644 --- a/TypeScript/4UseACustomConfigFile/types/services/OpenZoneService.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/services/OpenZoneService.d.ts @@ -1,18 +1,18 @@ import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RandomUtil } from "@spt/utils/RandomUtil"; /** Service for adding new zones to a maps OpenZones property */ export declare class OpenZoneService { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, localisationService: LocalisationService, configServer: ConfigServer); /** * Add open zone to specified map * @param locationId map location (e.g. factory4_day) diff --git a/TypeScript/4UseACustomConfigFile/types/services/PaymentService.d.ts b/TypeScript/4UseACustomConfigFile/types/services/PaymentService.d.ts index 64ff2c1..61d5731 100644 --- a/TypeScript/4UseACustomConfigFile/types/services/PaymentService.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/services/PaymentService.d.ts @@ -9,7 +9,7 @@ import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRo import { IProcessBuyTradeRequestData } from "@spt/models/eft/trade/IProcessBuyTradeRequestData"; import { IProcessSellTradeRequestData } from "@spt/models/eft/trade/IProcessSellTradeRequestData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; @@ -17,14 +17,14 @@ export declare class PaymentService { protected logger: ILogger; protected hashUtil: HashUtil; protected httpResponse: HttpResponseUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected handbookHelper: HandbookHelper; protected traderHelper: TraderHelper; protected itemHelper: ItemHelper; protected inventoryHelper: InventoryHelper; protected localisationService: LocalisationService; protected paymentHelper: PaymentHelper; - constructor(logger: ILogger, hashUtil: HashUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, localisationService: LocalisationService, paymentHelper: PaymentHelper); + constructor(logger: ILogger, hashUtil: HashUtil, httpResponse: HttpResponseUtil, databaseService: DatabaseService, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, localisationService: LocalisationService, paymentHelper: PaymentHelper); /** * Take money and insert items into return to server request * @param pmcData Pmc profile diff --git a/TypeScript/4UseACustomConfigFile/types/services/PlayerService.d.ts b/TypeScript/4UseACustomConfigFile/types/services/PlayerService.d.ts index ae57410..84c4c6f 100644 --- a/TypeScript/4UseACustomConfigFile/types/services/PlayerService.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/services/PlayerService.d.ts @@ -1,14 +1,14 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class PlayerService { protected logger: ILogger; protected timeUtil: TimeUtil; protected localisationService: LocalisationService; - protected databaseServer: DatabaseServer; - constructor(logger: ILogger, timeUtil: TimeUtil, localisationService: LocalisationService, databaseServer: DatabaseServer); + protected databaseService: DatabaseService; + constructor(logger: ILogger, timeUtil: TimeUtil, localisationService: LocalisationService, databaseService: DatabaseService); /** * Get level of player * @param pmcData Player profile diff --git a/TypeScript/4UseACustomConfigFile/types/services/RagfairLinkedItemService.d.ts b/TypeScript/4UseACustomConfigFile/types/services/RagfairLinkedItemService.d.ts index 6011c1a..0d03459 100644 --- a/TypeScript/4UseACustomConfigFile/types/services/RagfairLinkedItemService.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/services/RagfairLinkedItemService.d.ts @@ -1,11 +1,11 @@ import { ItemHelper } from "@spt/helpers/ItemHelper"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; export declare class RagfairLinkedItemService { - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected linkedItemsCache: Record>; - constructor(databaseServer: DatabaseServer, itemHelper: ItemHelper); + constructor(databaseService: DatabaseService, itemHelper: ItemHelper); getLinkedItems(linkedSearchId: string): Set; /** * Use ragfair linked item service to get an array of items that can fit on or in designated itemtpl diff --git a/TypeScript/4UseACustomConfigFile/types/services/RagfairOfferService.d.ts b/TypeScript/4UseACustomConfigFile/types/services/RagfairOfferService.d.ts index c044f6d..4bc07c3 100644 --- a/TypeScript/4UseACustomConfigFile/types/services/RagfairOfferService.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/services/RagfairOfferService.d.ts @@ -6,8 +6,8 @@ import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RagfairOfferHolder } from "@spt/utils/RagfairOfferHolder"; @@ -15,7 +15,7 @@ import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class RagfairOfferService { protected logger: ILogger; protected timeUtil: TimeUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected saveServer: SaveServer; protected ragfairServerHelper: RagfairServerHelper; protected profileHelper: ProfileHelper; @@ -28,7 +28,7 @@ export declare class RagfairOfferService { protected expiredOffers: Record; protected ragfairConfig: IRagfairConfig; protected ragfairOfferHandler: RagfairOfferHolder; - constructor(logger: ILogger, timeUtil: TimeUtil, databaseServer: DatabaseServer, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, eventOutputHolder: EventOutputHolder, httpResponse: HttpResponseUtil, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, timeUtil: TimeUtil, databaseService: DatabaseService, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, eventOutputHolder: EventOutputHolder, httpResponse: HttpResponseUtil, localisationService: LocalisationService, configServer: ConfigServer); /** * Get all offers * @returns IRagfairOffer array diff --git a/TypeScript/4UseACustomConfigFile/types/services/RagfairPriceService.d.ts b/TypeScript/4UseACustomConfigFile/types/services/RagfairPriceService.d.ts index 5b8fa56..0a2f26e 100644 --- a/TypeScript/4UseACustomConfigFile/types/services/RagfairPriceService.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/services/RagfairPriceService.d.ts @@ -12,7 +12,7 @@ import { IRagfairConfig, IUnreasonableModPrices } from "@spt/models/spt/config/I import { IRagfairServerPrices } from "@spt/models/spt/ragfair/IRagfairServerPrices"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RandomUtil } from "@spt/utils/RandomUtil"; /** @@ -20,7 +20,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; */ export declare class RagfairPriceService implements OnLoad { protected handbookHelper: HandbookHelper; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected logger: ILogger; protected itemHelper: ItemHelper; protected presetHelper: PresetHelper; @@ -30,7 +30,7 @@ export declare class RagfairPriceService implements OnLoad { protected configServer: ConfigServer; protected ragfairConfig: IRagfairConfig; protected prices: IRagfairServerPrices; - constructor(handbookHelper: HandbookHelper, databaseServer: DatabaseServer, logger: ILogger, itemHelper: ItemHelper, presetHelper: PresetHelper, traderHelper: TraderHelper, randomUtil: RandomUtil, localisationService: LocalisationService, configServer: ConfigServer); + constructor(handbookHelper: HandbookHelper, databaseService: DatabaseService, logger: ILogger, itemHelper: ItemHelper, presetHelper: PresetHelper, traderHelper: TraderHelper, randomUtil: RandomUtil, localisationService: LocalisationService, configServer: ConfigServer); /** * Generate static (handbook) and dynamic (prices.json) flea prices, store inside class as dictionaries */ diff --git a/TypeScript/4UseACustomConfigFile/types/services/RagfairTaxService.d.ts b/TypeScript/4UseACustomConfigFile/types/services/RagfairTaxService.d.ts index 4e4e648..effb9f0 100644 --- a/TypeScript/4UseACustomConfigFile/types/services/RagfairTaxService.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/services/RagfairTaxService.d.ts @@ -4,15 +4,15 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { IStorePlayerOfferTaxAmountRequestData } from "@spt/models/eft/ragfair/IStorePlayerOfferTaxAmountRequestData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; export declare class RagfairTaxService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected ragfairPriceService: RagfairPriceService; protected itemHelper: ItemHelper; protected playerOfferTaxCache: Record; - constructor(logger: ILogger, databaseServer: DatabaseServer, ragfairPriceService: RagfairPriceService, itemHelper: ItemHelper); + constructor(logger: ILogger, databaseService: DatabaseService, ragfairPriceService: RagfairPriceService, itemHelper: ItemHelper); storeClientOfferTaxValue(sessionId: string, offer: IStorePlayerOfferTaxAmountRequestData): void; clearStoredOfferTaxById(offerIdToRemove: string): void; getStoredClientOfferTaxValueById(offerIdToGet: string): IStorePlayerOfferTaxAmountRequestData; diff --git a/TypeScript/4UseACustomConfigFile/types/services/RaidTimeAdjustmentService.d.ts b/TypeScript/4UseACustomConfigFile/types/services/RaidTimeAdjustmentService.d.ts index f770b64..bfc099a 100644 --- a/TypeScript/4UseACustomConfigFile/types/services/RaidTimeAdjustmentService.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/services/RaidTimeAdjustmentService.d.ts @@ -7,17 +7,17 @@ import { ILocationConfig, IScavRaidTimeLocationSettings, LootMultiplier } from " import { IRaidChanges } from "@spt/models/spt/location/IRaidChanges"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RaidTimeAdjustmentService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected randomUtil: RandomUtil; protected weightedRandomHelper: WeightedRandomHelper; protected applicationContext: ApplicationContext; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, applicationContext: ApplicationContext, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, applicationContext: ApplicationContext, configServer: ConfigServer); /** * Make alterations to the base map data passed in * Loot multipliers/waves/wave start times diff --git a/TypeScript/4UseACustomConfigFile/types/services/RepairService.d.ts b/TypeScript/4UseACustomConfigFile/types/services/RepairService.d.ts index 9203417..48f306e 100644 --- a/TypeScript/4UseACustomConfigFile/types/services/RepairService.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/services/RepairService.d.ts @@ -14,13 +14,13 @@ import { SkillTypes } from "@spt/models/enums/SkillTypes"; import { BonusSettings, IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RepairService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected randomUtil: RandomUtil; protected itemHelper: ItemHelper; @@ -31,7 +31,7 @@ export declare class RepairService { protected localisationService: LocalisationService; protected configServer: ConfigServer; protected repairConfig: IRepairConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, profileHelper: ProfileHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, traderHelper: TraderHelper, weightedRandomHelper: WeightedRandomHelper, paymentService: PaymentService, repairHelper: RepairHelper, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, profileHelper: ProfileHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, traderHelper: TraderHelper, weightedRandomHelper: WeightedRandomHelper, paymentService: PaymentService, repairHelper: RepairHelper, localisationService: LocalisationService, configServer: ConfigServer); /** * Use trader to repair an items durability * @param sessionID Session id diff --git a/TypeScript/4UseACustomConfigFile/types/services/TraderServicesService.d.ts b/TypeScript/4UseACustomConfigFile/types/services/TraderServicesService.d.ts index 111c71a..e441eb6 100644 --- a/TypeScript/4UseACustomConfigFile/types/services/TraderServicesService.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/services/TraderServicesService.d.ts @@ -1,13 +1,13 @@ import { ProfileHelper } from "@spt/helpers/ProfileHelper"; import { ITraderServiceModel } from "@spt/models/spt/services/ITraderServiceModel"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderServicesService { protected profileHelper: ProfileHelper; protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected cloner: ICloner; - constructor(profileHelper: ProfileHelper, logger: ILogger, databaseServer: DatabaseServer, cloner: ICloner); + constructor(profileHelper: ProfileHelper, logger: ILogger, databaseService: DatabaseService, cloner: ICloner); getTraderServices(sessionId: string, traderId: string): ITraderServiceModel[]; } diff --git a/TypeScript/4UseACustomConfigFile/types/services/mod/CustomItemService.d.ts b/TypeScript/4UseACustomConfigFile/types/services/mod/CustomItemService.d.ts index 6dc4730..1926bed 100644 --- a/TypeScript/4UseACustomConfigFile/types/services/mod/CustomItemService.d.ts +++ b/TypeScript/4UseACustomConfigFile/types/services/mod/CustomItemService.d.ts @@ -9,11 +9,11 @@ import { HashUtil } from "@spt/utils/HashUtil"; export declare class CustomItemService { protected logger: ILogger; protected hashUtil: HashUtil; - protected databaseServer: DatabaseService; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected itemBaseClassService: ItemBaseClassService; protected cloner: ICloner; - constructor(logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseService, itemHelper: ItemHelper, itemBaseClassService: ItemBaseClassService, cloner: ICloner); + constructor(logger: ILogger, hashUtil: HashUtil, databaseService: DatabaseService, itemHelper: ItemHelper, itemBaseClassService: ItemBaseClassService, cloner: ICloner); /** * Create a new item from a cloned item base * WARNING - If no item id is supplied, an id will be generated, this id will be random every time you add an item and will not be the same on each subsequent server start diff --git a/TypeScript/5ReplaceMethod/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts b/TypeScript/5ReplaceMethod/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts index a7491b5..c51bf7e 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts @@ -6,7 +6,7 @@ import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { ISendMessageRequest } from "@spt/models/eft/dialog/ISendMessageRequest"; import { IUserDialogInfo } from "@spt/models/eft/profile/ISptProfile"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -19,7 +19,7 @@ export declare class GiveSptCommand implements ISptCommand { protected presetHelper: PresetHelper; protected mailSendService: MailSendService; protected localeService: LocaleService; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemFilterService: ItemFilterService; protected cloner: ICloner; /** @@ -34,7 +34,7 @@ export declare class GiveSptCommand implements ISptCommand { private static acceptableConfidence; private static excludedPresetItems; protected savedCommand: Map; - constructor(logger: ILogger, itemHelper: ItemHelper, hashUtil: HashUtil, presetHelper: PresetHelper, mailSendService: MailSendService, localeService: LocaleService, databaseServer: DatabaseServer, itemFilterService: ItemFilterService, cloner: ICloner); + constructor(logger: ILogger, itemHelper: ItemHelper, hashUtil: HashUtil, presetHelper: PresetHelper, mailSendService: MailSendService, localeService: LocaleService, databaseService: DatabaseService, itemFilterService: ItemFilterService, cloner: ICloner); getCommand(): string; getCommandHelp(): string; performAction(commandHandler: IUserDialogInfo, sessionId: string, request: ISendMessageRequest): string; diff --git a/TypeScript/5ReplaceMethod/types/helpers/PresetHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/PresetHelper.d.ts index 5fc8a7c..e71e5b7 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/PresetHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/PresetHelper.d.ts @@ -1,16 +1,16 @@ import { IPreset } from "@spt/models/eft/common/IGlobals"; import { BaseClasses } from "@spt/models/enums/BaseClasses"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; import { ItemHelper } from "./ItemHelper"; export declare class PresetHelper { - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected cloner: ICloner; protected lookup: Record; protected defaultEquipmentPresets: Record; protected defaultWeaponPresets: Record; - constructor(databaseServer: DatabaseServer, itemHelper: ItemHelper, cloner: ICloner); + constructor(databaseService: DatabaseService, itemHelper: ItemHelper, cloner: ICloner); hydratePresetStore(input: Record): void; /** * Get default weapon and equipment presets diff --git a/TypeScript/5ReplaceMethod/types/helpers/ProfileHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/ProfileHelper.d.ts index 37937ff..e943bd3 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/ProfileHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/ProfileHelper.d.ts @@ -7,8 +7,8 @@ import { SkillTypes } from "@spt/models/enums/SkillTypes"; import { IInventoryConfig } from "@spt/models/spt/config/IInventoryConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileSnapshotService } from "@spt/services/ProfileSnapshotService"; import { ICloner } from "@spt/utils/cloners/ICloner"; @@ -21,14 +21,14 @@ export declare class ProfileHelper { protected watermark: Watermark; protected timeUtil: TimeUtil; protected saveServer: SaveServer; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected profileSnapshotService: ProfileSnapshotService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected cloner: ICloner; protected inventoryConfig: IInventoryConfig; - constructor(logger: ILogger, hashUtil: HashUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileSnapshotService: ProfileSnapshotService, localisationService: LocalisationService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, hashUtil: HashUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseService: DatabaseService, itemHelper: ItemHelper, profileSnapshotService: ProfileSnapshotService, localisationService: LocalisationService, configServer: ConfigServer, cloner: ICloner); /** * Remove/reset a completed quest condtion from players profile quest data * @param sessionID Session id diff --git a/TypeScript/5ReplaceMethod/types/helpers/QuestHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/QuestHelper.d.ts index 39ba2a9..93368fa 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/QuestHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/QuestHelper.d.ts @@ -18,7 +18,7 @@ import { IQuestConfig } from "@spt/models/spt/config/IQuestConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -30,9 +30,9 @@ export declare class QuestHelper { protected timeUtil: TimeUtil; protected hashUtil: HashUtil; protected itemHelper: ItemHelper; + protected databaseService: DatabaseService; protected questConditionHelper: QuestConditionHelper; protected eventOutputHolder: EventOutputHolder; - protected databaseServer: DatabaseServer; protected localeService: LocaleService; protected ragfairServerHelper: RagfairServerHelper; protected dialogueHelper: DialogueHelper; @@ -45,7 +45,7 @@ export declare class QuestHelper { protected configServer: ConfigServer; protected cloner: ICloner; protected questConfig: IQuestConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, questConditionHelper: QuestConditionHelper, eventOutputHolder: EventOutputHolder, databaseServer: DatabaseServer, localeService: LocaleService, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, localisationService: LocalisationService, traderHelper: TraderHelper, presetHelper: PresetHelper, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, databaseService: DatabaseService, questConditionHelper: QuestConditionHelper, eventOutputHolder: EventOutputHolder, localeService: LocaleService, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, localisationService: LocalisationService, traderHelper: TraderHelper, presetHelper: PresetHelper, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); /** * Get status of a quest in player profile by its id * @param pmcData Profile to search diff --git a/TypeScript/5ReplaceMethod/types/helpers/RagfairOfferHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/RagfairOfferHelper.d.ts index 27bb081..a08e60a 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/RagfairOfferHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/RagfairOfferHelper.d.ts @@ -19,8 +19,8 @@ import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -34,7 +34,7 @@ export declare class RagfairOfferHelper { protected timeUtil: TimeUtil; protected hashUtil: HashUtil; protected eventOutputHolder: EventOutputHolder; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected traderHelper: TraderHelper; protected saveServer: SaveServer; protected itemHelper: ItemHelper; @@ -55,7 +55,7 @@ export declare class RagfairOfferHelper { protected static goodSoldTemplate: string; protected ragfairConfig: IRagfairConfig; protected questConfig: IQuestConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, eventOutputHolder: EventOutputHolder, databaseServer: DatabaseServer, traderHelper: TraderHelper, saveServer: SaveServer, itemHelper: ItemHelper, botHelper: BotHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, localeService: LocaleService, localisationService: LocalisationService, mailSendService: MailSendService, configServer: ConfigServer); + constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, eventOutputHolder: EventOutputHolder, databaseService: DatabaseService, traderHelper: TraderHelper, saveServer: SaveServer, itemHelper: ItemHelper, botHelper: BotHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, localeService: LocaleService, localisationService: LocalisationService, mailSendService: MailSendService, configServer: ConfigServer); /** * Passthrough to ragfairOfferService.getOffers(), get flea offers a player should see * @param searchRequest Data from client diff --git a/TypeScript/5ReplaceMethod/types/helpers/RepairHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/RepairHelper.d.ts index 4bd0577..99a21da 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/RepairHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/RepairHelper.d.ts @@ -3,17 +3,17 @@ import { ITemplateItem, Props } from "@spt/models/eft/common/tables/ITemplateIte import { IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RepairHelper { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected configServer: ConfigServer; protected cloner: ICloner; protected repairConfig: IRepairConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, configServer: ConfigServer, cloner: ICloner); /** * Alter an items durability after a repair by trader/repair kit * @param itemToRepair item to update durability details diff --git a/TypeScript/5ReplaceMethod/types/helpers/TraderAssortHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/TraderAssortHelper.d.ts index faf2a9d..8f8f802 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/TraderAssortHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/TraderAssortHelper.d.ts @@ -9,7 +9,7 @@ import { ITrader, ITraderAssort } from "@spt/models/eft/common/tables/ITrader"; import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; @@ -21,7 +21,7 @@ export declare class TraderAssortHelper { protected logger: ILogger; protected mathUtil: MathUtil; protected timeUtil: TimeUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected assortHelper: AssortHelper; protected paymentHelper: PaymentHelper; @@ -37,7 +37,7 @@ export declare class TraderAssortHelper { protected traderConfig: ITraderConfig; protected mergedQuestAssorts: Record>; protected createdMergedQuestAssorts: boolean; - constructor(logger: ILogger, mathUtil: MathUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, profileHelper: ProfileHelper, assortHelper: AssortHelper, paymentHelper: PaymentHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, localisationService: LocalisationService, traderPurchasePersisterService: TraderPurchasePersisterService, traderHelper: TraderHelper, fenceService: FenceService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, mathUtil: MathUtil, timeUtil: TimeUtil, databaseService: DatabaseService, profileHelper: ProfileHelper, assortHelper: AssortHelper, paymentHelper: PaymentHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, localisationService: LocalisationService, traderPurchasePersisterService: TraderPurchasePersisterService, traderHelper: TraderHelper, fenceService: FenceService, configServer: ConfigServer, cloner: ICloner); /** * Get a traders assorts * Can be used for returning ragfair / fence assorts diff --git a/TypeScript/5ReplaceMethod/types/helpers/TraderHelper.d.ts b/TypeScript/5ReplaceMethod/types/helpers/TraderHelper.d.ts index 5f515da..eec1cc7 100644 --- a/TypeScript/5ReplaceMethod/types/helpers/TraderHelper.d.ts +++ b/TypeScript/5ReplaceMethod/types/helpers/TraderHelper.d.ts @@ -10,7 +10,7 @@ import { Traders } from "@spt/models/enums/Traders"; import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; @@ -18,7 +18,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class TraderHelper { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected handbookHelper: HandbookHelper; protected itemHelper: ItemHelper; @@ -33,7 +33,7 @@ export declare class TraderHelper { protected highestTraderPriceItems?: Record; /** Dictionary of item tpl and the highest trader buy back rouble price */ protected highestTraderBuyPriceItems?: Record; - constructor(logger: ILogger, databaseServer: DatabaseServer, profileHelper: ProfileHelper, handbookHelper: HandbookHelper, itemHelper: ItemHelper, playerService: PlayerService, localisationService: LocalisationService, fenceService: FenceService, timeUtil: TimeUtil, randomUtil: RandomUtil, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, profileHelper: ProfileHelper, handbookHelper: HandbookHelper, itemHelper: ItemHelper, playerService: PlayerService, localisationService: LocalisationService, fenceService: FenceService, timeUtil: TimeUtil, randomUtil: RandomUtil, configServer: ConfigServer); /** * Get a trader base object, update profile to reflect players current standing in profile * when trader not found in profile diff --git a/TypeScript/5ReplaceMethod/types/models/eft/common/IGlobals.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/common/IGlobals.d.ts index 2209415..a0bb051 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/common/IGlobals.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/common/IGlobals.d.ts @@ -802,7 +802,6 @@ export interface IMaxActiveOfferCount { from: number; to: number; count: number; - countForSpecialEditions: number; } export interface IMaxSumForRarity { Common: IRarityMaxSum; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/common/ILocationBase.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/common/ILocationBase.d.ts index 65931f8..10f1a57 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/common/ILocationBase.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/common/ILocationBase.d.ts @@ -196,18 +196,24 @@ export interface Props { export interface Exit { /** % Chance out of 100 exit will appear in raid */ Chance: number; + ChancePVE: number; Count: number; + CountPVE: number; EntryPoints: string; EventAvailable: boolean; ExfiltrationTime: number; + ExfiltrationTimePVE: number; ExfiltrationType: string; RequiredSlot?: string; Id: string; MaxTime: number; + MaxTimePVE: number; MinTime: number; + MinTimePVE: number; Name: string; PassageRequirement: string; PlayersCount: number; + PlayersCountPVE: number; RequirementTip: string; Side?: string; } diff --git a/TypeScript/5ReplaceMethod/types/models/eft/common/tables/IRepeatableQuests.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/common/tables/IRepeatableQuests.d.ts index 854c8ef..27ff49d 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/common/tables/IRepeatableQuests.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/common/tables/IRepeatableQuests.d.ts @@ -18,10 +18,13 @@ export interface IRepeatableTemplates { export interface IPmcDataRepeatableQuest { id?: string; name: string; + unavailableTime?: string; activeQuests: IRepeatableQuest[]; inactiveQuests: IRepeatableQuest[]; endTime: number; changeRequirement: Record; + freeChanges: number; + freeChangesAvailable: number; } export interface IChangeRequirement { changeCost: IChangeCost[]; diff --git a/TypeScript/5ReplaceMethod/types/models/eft/common/tables/ITemplateItem.d.ts b/TypeScript/5ReplaceMethod/types/models/eft/common/tables/ITemplateItem.d.ts index a8ccfbb..e5c6632 100644 --- a/TypeScript/5ReplaceMethod/types/models/eft/common/tables/ITemplateItem.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/eft/common/tables/ITemplateItem.d.ts @@ -63,7 +63,7 @@ export interface Props { DiscardingBlock?: boolean; DropSoundType?: string; RagFairCommissionModifier?: number; - RarityPvE: string; + RarityPvE?: string; IsAlwaysAvailableForInsurance?: boolean; DiscardLimit?: number; MaxResource?: number; @@ -414,6 +414,12 @@ export interface Props { LayoutName?: string; Lower75Prefab?: Prefab; MaxUsages?: number; + ScavKillExpPenalty?: number; + ScavKillExpPenaltyPVE?: number; + ScavKillStandingPenalty?: number; + ScavKillStandingPenaltyPVE?: number; + TradersDiscount?: number; + TradersDiscountPVE?: number; } export interface IHealthEffect { type: string; diff --git a/TypeScript/5ReplaceMethod/types/models/spt/config/IQuestConfig.d.ts b/TypeScript/5ReplaceMethod/types/models/spt/config/IQuestConfig.d.ts index 362602c..2cdf4fa 100644 --- a/TypeScript/5ReplaceMethod/types/models/spt/config/IQuestConfig.d.ts +++ b/TypeScript/5ReplaceMethod/types/models/spt/config/IQuestConfig.d.ts @@ -47,6 +47,8 @@ export interface IRepeatableQuestConfig { /** Item tplIds to ignore when generating rewards */ rewardBlacklist: string[]; rewardAmmoStackMinSize: number; + freeChangesAvailable: number; + freeChanges: number; } export interface IRewardScaling { levels: number[]; diff --git a/TypeScript/5ReplaceMethod/types/services/BotEquipmentModPoolService.d.ts b/TypeScript/5ReplaceMethod/types/services/BotEquipmentModPoolService.d.ts index c53f31b..7b2b442 100644 --- a/TypeScript/5ReplaceMethod/types/services/BotEquipmentModPoolService.d.ts +++ b/TypeScript/5ReplaceMethod/types/services/BotEquipmentModPoolService.d.ts @@ -4,7 +4,7 @@ import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { VFS } from "@spt/utils/VFS"; /** Store a mapping between weapons, their slots and the items that fit those slots */ @@ -12,7 +12,7 @@ export declare class BotEquipmentModPoolService { protected logger: ILogger; protected vfs: VFS; protected itemHelper: ItemHelper; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected botConfig: IBotConfig; @@ -20,7 +20,7 @@ export declare class BotEquipmentModPoolService { protected gearModPool: Mods; protected weaponPoolGenerated: boolean; protected armorPoolGenerated: boolean; - constructor(logger: ILogger, vfs: VFS, itemHelper: ItemHelper, databaseServer: DatabaseServer, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, vfs: VFS, itemHelper: ItemHelper, databaseService: DatabaseService, localisationService: LocalisationService, configServer: ConfigServer); /** * Store dictionary of mods for each item passed in * @param items items to find related mods and store in modPool diff --git a/TypeScript/5ReplaceMethod/types/services/CustomLocationWaveService.d.ts b/TypeScript/5ReplaceMethod/types/services/CustomLocationWaveService.d.ts index 728a1e8..c72d5bb 100644 --- a/TypeScript/5ReplaceMethod/types/services/CustomLocationWaveService.d.ts +++ b/TypeScript/5ReplaceMethod/types/services/CustomLocationWaveService.d.ts @@ -2,15 +2,15 @@ import { BossLocationSpawn, Wave } from "@spt/models/eft/common/ILocationBase"; import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class CustomLocationWaveService { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, configServer: ConfigServer); /** * Add a boss wave to a map * @param locationId e.g. factory4_day, bigmap diff --git a/TypeScript/5ReplaceMethod/types/services/InsuranceService.d.ts b/TypeScript/5ReplaceMethod/types/services/InsuranceService.d.ts index c54f9f9..0000e66 100644 --- a/TypeScript/5ReplaceMethod/types/services/InsuranceService.d.ts +++ b/TypeScript/5ReplaceMethod/types/services/InsuranceService.d.ts @@ -13,8 +13,8 @@ import { ILostOnDeathConfig } from "@spt/models/spt/config/ILostOnDeathConfig"; import { IInsuranceEquipmentPkg } from "@spt/models/spt/services/IInsuranceEquipmentPkg"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -24,7 +24,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class InsuranceService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected secureContainerHelper: SecureContainerHelper; protected randomUtil: RandomUtil; protected itemHelper: ItemHelper; @@ -42,7 +42,7 @@ export declare class InsuranceService { protected insured: Record>; protected insuranceConfig: IInsuranceConfig; protected lostOnDeathConfig: ILostOnDeathConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, handbookHelper: HandbookHelper, localisationService: LocalisationService, localeService: LocaleService, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, databaseService: DatabaseService, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, handbookHelper: HandbookHelper, localisationService: LocalisationService, localeService: LocaleService, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); /** * Does player have insurance array * @param sessionId Player id diff --git a/TypeScript/5ReplaceMethod/types/services/MailSendService.d.ts b/TypeScript/5ReplaceMethod/types/services/MailSendService.d.ts index d445841..8f1f974 100644 --- a/TypeScript/5ReplaceMethod/types/services/MailSendService.d.ts +++ b/TypeScript/5ReplaceMethod/types/services/MailSendService.d.ts @@ -9,8 +9,8 @@ import { MessageType } from "@spt/models/enums/MessageType"; import { Traders } from "@spt/models/enums/Traders"; import { IProfileChangeEvent, ISendMessageDetails } from "@spt/models/spt/dialog/ISendMessageDetails"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; @@ -19,7 +19,7 @@ export declare class MailSendService { protected hashUtil: HashUtil; protected timeUtil: TimeUtil; protected saveServer: SaveServer; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected notifierHelper: NotifierHelper; protected dialogueHelper: DialogueHelper; protected notificationSendHelper: NotificationSendHelper; @@ -27,7 +27,7 @@ export declare class MailSendService { protected itemHelper: ItemHelper; protected traderHelper: TraderHelper; protected readonly systemSenderId = "59e7125688a45068a6249071"; - constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, dialogueHelper: DialogueHelper, notificationSendHelper: NotificationSendHelper, localisationService: LocalisationService, itemHelper: ItemHelper, traderHelper: TraderHelper); + constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseService: DatabaseService, notifierHelper: NotifierHelper, dialogueHelper: DialogueHelper, notificationSendHelper: NotificationSendHelper, localisationService: LocalisationService, itemHelper: ItemHelper, traderHelper: TraderHelper); /** * Send a message from an NPC (e.g. prapor) to the player with or without items using direct message text, do not look up any locale * @param sessionId The session ID to send the message to diff --git a/TypeScript/5ReplaceMethod/types/services/OpenZoneService.d.ts b/TypeScript/5ReplaceMethod/types/services/OpenZoneService.d.ts index 1bc5f00..c7dd0bd 100644 --- a/TypeScript/5ReplaceMethod/types/services/OpenZoneService.d.ts +++ b/TypeScript/5ReplaceMethod/types/services/OpenZoneService.d.ts @@ -1,18 +1,18 @@ import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RandomUtil } from "@spt/utils/RandomUtil"; /** Service for adding new zones to a maps OpenZones property */ export declare class OpenZoneService { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, localisationService: LocalisationService, configServer: ConfigServer); /** * Add open zone to specified map * @param locationId map location (e.g. factory4_day) diff --git a/TypeScript/5ReplaceMethod/types/services/PaymentService.d.ts b/TypeScript/5ReplaceMethod/types/services/PaymentService.d.ts index 64ff2c1..61d5731 100644 --- a/TypeScript/5ReplaceMethod/types/services/PaymentService.d.ts +++ b/TypeScript/5ReplaceMethod/types/services/PaymentService.d.ts @@ -9,7 +9,7 @@ import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRo import { IProcessBuyTradeRequestData } from "@spt/models/eft/trade/IProcessBuyTradeRequestData"; import { IProcessSellTradeRequestData } from "@spt/models/eft/trade/IProcessSellTradeRequestData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; @@ -17,14 +17,14 @@ export declare class PaymentService { protected logger: ILogger; protected hashUtil: HashUtil; protected httpResponse: HttpResponseUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected handbookHelper: HandbookHelper; protected traderHelper: TraderHelper; protected itemHelper: ItemHelper; protected inventoryHelper: InventoryHelper; protected localisationService: LocalisationService; protected paymentHelper: PaymentHelper; - constructor(logger: ILogger, hashUtil: HashUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, localisationService: LocalisationService, paymentHelper: PaymentHelper); + constructor(logger: ILogger, hashUtil: HashUtil, httpResponse: HttpResponseUtil, databaseService: DatabaseService, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, localisationService: LocalisationService, paymentHelper: PaymentHelper); /** * Take money and insert items into return to server request * @param pmcData Pmc profile diff --git a/TypeScript/5ReplaceMethod/types/services/PlayerService.d.ts b/TypeScript/5ReplaceMethod/types/services/PlayerService.d.ts index ae57410..84c4c6f 100644 --- a/TypeScript/5ReplaceMethod/types/services/PlayerService.d.ts +++ b/TypeScript/5ReplaceMethod/types/services/PlayerService.d.ts @@ -1,14 +1,14 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class PlayerService { protected logger: ILogger; protected timeUtil: TimeUtil; protected localisationService: LocalisationService; - protected databaseServer: DatabaseServer; - constructor(logger: ILogger, timeUtil: TimeUtil, localisationService: LocalisationService, databaseServer: DatabaseServer); + protected databaseService: DatabaseService; + constructor(logger: ILogger, timeUtil: TimeUtil, localisationService: LocalisationService, databaseService: DatabaseService); /** * Get level of player * @param pmcData Player profile diff --git a/TypeScript/5ReplaceMethod/types/services/RagfairLinkedItemService.d.ts b/TypeScript/5ReplaceMethod/types/services/RagfairLinkedItemService.d.ts index 6011c1a..0d03459 100644 --- a/TypeScript/5ReplaceMethod/types/services/RagfairLinkedItemService.d.ts +++ b/TypeScript/5ReplaceMethod/types/services/RagfairLinkedItemService.d.ts @@ -1,11 +1,11 @@ import { ItemHelper } from "@spt/helpers/ItemHelper"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; export declare class RagfairLinkedItemService { - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected linkedItemsCache: Record>; - constructor(databaseServer: DatabaseServer, itemHelper: ItemHelper); + constructor(databaseService: DatabaseService, itemHelper: ItemHelper); getLinkedItems(linkedSearchId: string): Set; /** * Use ragfair linked item service to get an array of items that can fit on or in designated itemtpl diff --git a/TypeScript/5ReplaceMethod/types/services/RagfairOfferService.d.ts b/TypeScript/5ReplaceMethod/types/services/RagfairOfferService.d.ts index c044f6d..4bc07c3 100644 --- a/TypeScript/5ReplaceMethod/types/services/RagfairOfferService.d.ts +++ b/TypeScript/5ReplaceMethod/types/services/RagfairOfferService.d.ts @@ -6,8 +6,8 @@ import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RagfairOfferHolder } from "@spt/utils/RagfairOfferHolder"; @@ -15,7 +15,7 @@ import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class RagfairOfferService { protected logger: ILogger; protected timeUtil: TimeUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected saveServer: SaveServer; protected ragfairServerHelper: RagfairServerHelper; protected profileHelper: ProfileHelper; @@ -28,7 +28,7 @@ export declare class RagfairOfferService { protected expiredOffers: Record; protected ragfairConfig: IRagfairConfig; protected ragfairOfferHandler: RagfairOfferHolder; - constructor(logger: ILogger, timeUtil: TimeUtil, databaseServer: DatabaseServer, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, eventOutputHolder: EventOutputHolder, httpResponse: HttpResponseUtil, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, timeUtil: TimeUtil, databaseService: DatabaseService, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, eventOutputHolder: EventOutputHolder, httpResponse: HttpResponseUtil, localisationService: LocalisationService, configServer: ConfigServer); /** * Get all offers * @returns IRagfairOffer array diff --git a/TypeScript/5ReplaceMethod/types/services/RagfairPriceService.d.ts b/TypeScript/5ReplaceMethod/types/services/RagfairPriceService.d.ts index 5b8fa56..0a2f26e 100644 --- a/TypeScript/5ReplaceMethod/types/services/RagfairPriceService.d.ts +++ b/TypeScript/5ReplaceMethod/types/services/RagfairPriceService.d.ts @@ -12,7 +12,7 @@ import { IRagfairConfig, IUnreasonableModPrices } from "@spt/models/spt/config/I import { IRagfairServerPrices } from "@spt/models/spt/ragfair/IRagfairServerPrices"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RandomUtil } from "@spt/utils/RandomUtil"; /** @@ -20,7 +20,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; */ export declare class RagfairPriceService implements OnLoad { protected handbookHelper: HandbookHelper; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected logger: ILogger; protected itemHelper: ItemHelper; protected presetHelper: PresetHelper; @@ -30,7 +30,7 @@ export declare class RagfairPriceService implements OnLoad { protected configServer: ConfigServer; protected ragfairConfig: IRagfairConfig; protected prices: IRagfairServerPrices; - constructor(handbookHelper: HandbookHelper, databaseServer: DatabaseServer, logger: ILogger, itemHelper: ItemHelper, presetHelper: PresetHelper, traderHelper: TraderHelper, randomUtil: RandomUtil, localisationService: LocalisationService, configServer: ConfigServer); + constructor(handbookHelper: HandbookHelper, databaseService: DatabaseService, logger: ILogger, itemHelper: ItemHelper, presetHelper: PresetHelper, traderHelper: TraderHelper, randomUtil: RandomUtil, localisationService: LocalisationService, configServer: ConfigServer); /** * Generate static (handbook) and dynamic (prices.json) flea prices, store inside class as dictionaries */ diff --git a/TypeScript/5ReplaceMethod/types/services/RagfairTaxService.d.ts b/TypeScript/5ReplaceMethod/types/services/RagfairTaxService.d.ts index 4e4e648..effb9f0 100644 --- a/TypeScript/5ReplaceMethod/types/services/RagfairTaxService.d.ts +++ b/TypeScript/5ReplaceMethod/types/services/RagfairTaxService.d.ts @@ -4,15 +4,15 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { IStorePlayerOfferTaxAmountRequestData } from "@spt/models/eft/ragfair/IStorePlayerOfferTaxAmountRequestData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; export declare class RagfairTaxService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected ragfairPriceService: RagfairPriceService; protected itemHelper: ItemHelper; protected playerOfferTaxCache: Record; - constructor(logger: ILogger, databaseServer: DatabaseServer, ragfairPriceService: RagfairPriceService, itemHelper: ItemHelper); + constructor(logger: ILogger, databaseService: DatabaseService, ragfairPriceService: RagfairPriceService, itemHelper: ItemHelper); storeClientOfferTaxValue(sessionId: string, offer: IStorePlayerOfferTaxAmountRequestData): void; clearStoredOfferTaxById(offerIdToRemove: string): void; getStoredClientOfferTaxValueById(offerIdToGet: string): IStorePlayerOfferTaxAmountRequestData; diff --git a/TypeScript/5ReplaceMethod/types/services/RaidTimeAdjustmentService.d.ts b/TypeScript/5ReplaceMethod/types/services/RaidTimeAdjustmentService.d.ts index f770b64..bfc099a 100644 --- a/TypeScript/5ReplaceMethod/types/services/RaidTimeAdjustmentService.d.ts +++ b/TypeScript/5ReplaceMethod/types/services/RaidTimeAdjustmentService.d.ts @@ -7,17 +7,17 @@ import { ILocationConfig, IScavRaidTimeLocationSettings, LootMultiplier } from " import { IRaidChanges } from "@spt/models/spt/location/IRaidChanges"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RaidTimeAdjustmentService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected randomUtil: RandomUtil; protected weightedRandomHelper: WeightedRandomHelper; protected applicationContext: ApplicationContext; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, applicationContext: ApplicationContext, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, applicationContext: ApplicationContext, configServer: ConfigServer); /** * Make alterations to the base map data passed in * Loot multipliers/waves/wave start times diff --git a/TypeScript/5ReplaceMethod/types/services/RepairService.d.ts b/TypeScript/5ReplaceMethod/types/services/RepairService.d.ts index 9203417..48f306e 100644 --- a/TypeScript/5ReplaceMethod/types/services/RepairService.d.ts +++ b/TypeScript/5ReplaceMethod/types/services/RepairService.d.ts @@ -14,13 +14,13 @@ import { SkillTypes } from "@spt/models/enums/SkillTypes"; import { BonusSettings, IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RepairService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected randomUtil: RandomUtil; protected itemHelper: ItemHelper; @@ -31,7 +31,7 @@ export declare class RepairService { protected localisationService: LocalisationService; protected configServer: ConfigServer; protected repairConfig: IRepairConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, profileHelper: ProfileHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, traderHelper: TraderHelper, weightedRandomHelper: WeightedRandomHelper, paymentService: PaymentService, repairHelper: RepairHelper, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, profileHelper: ProfileHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, traderHelper: TraderHelper, weightedRandomHelper: WeightedRandomHelper, paymentService: PaymentService, repairHelper: RepairHelper, localisationService: LocalisationService, configServer: ConfigServer); /** * Use trader to repair an items durability * @param sessionID Session id diff --git a/TypeScript/5ReplaceMethod/types/services/TraderServicesService.d.ts b/TypeScript/5ReplaceMethod/types/services/TraderServicesService.d.ts index 111c71a..e441eb6 100644 --- a/TypeScript/5ReplaceMethod/types/services/TraderServicesService.d.ts +++ b/TypeScript/5ReplaceMethod/types/services/TraderServicesService.d.ts @@ -1,13 +1,13 @@ import { ProfileHelper } from "@spt/helpers/ProfileHelper"; import { ITraderServiceModel } from "@spt/models/spt/services/ITraderServiceModel"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderServicesService { protected profileHelper: ProfileHelper; protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected cloner: ICloner; - constructor(profileHelper: ProfileHelper, logger: ILogger, databaseServer: DatabaseServer, cloner: ICloner); + constructor(profileHelper: ProfileHelper, logger: ILogger, databaseService: DatabaseService, cloner: ICloner); getTraderServices(sessionId: string, traderId: string): ITraderServiceModel[]; } diff --git a/TypeScript/5ReplaceMethod/types/services/mod/CustomItemService.d.ts b/TypeScript/5ReplaceMethod/types/services/mod/CustomItemService.d.ts index 6dc4730..1926bed 100644 --- a/TypeScript/5ReplaceMethod/types/services/mod/CustomItemService.d.ts +++ b/TypeScript/5ReplaceMethod/types/services/mod/CustomItemService.d.ts @@ -9,11 +9,11 @@ import { HashUtil } from "@spt/utils/HashUtil"; export declare class CustomItemService { protected logger: ILogger; protected hashUtil: HashUtil; - protected databaseServer: DatabaseService; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected itemBaseClassService: ItemBaseClassService; protected cloner: ICloner; - constructor(logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseService, itemHelper: ItemHelper, itemBaseClassService: ItemBaseClassService, cloner: ICloner); + constructor(logger: ILogger, hashUtil: HashUtil, databaseService: DatabaseService, itemHelper: ItemHelper, itemBaseClassService: ItemBaseClassService, cloner: ICloner); /** * Create a new item from a cloned item base * WARNING - If no item id is supplied, an id will be generated, this id will be random every time you add an item and will not be the same on each subsequent server start diff --git a/TypeScript/6ReferenceAnotherClass/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts b/TypeScript/6ReferenceAnotherClass/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts index a7491b5..c51bf7e 100644 --- a/TypeScript/6ReferenceAnotherClass/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts @@ -6,7 +6,7 @@ import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { ISendMessageRequest } from "@spt/models/eft/dialog/ISendMessageRequest"; import { IUserDialogInfo } from "@spt/models/eft/profile/ISptProfile"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -19,7 +19,7 @@ export declare class GiveSptCommand implements ISptCommand { protected presetHelper: PresetHelper; protected mailSendService: MailSendService; protected localeService: LocaleService; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemFilterService: ItemFilterService; protected cloner: ICloner; /** @@ -34,7 +34,7 @@ export declare class GiveSptCommand implements ISptCommand { private static acceptableConfidence; private static excludedPresetItems; protected savedCommand: Map; - constructor(logger: ILogger, itemHelper: ItemHelper, hashUtil: HashUtil, presetHelper: PresetHelper, mailSendService: MailSendService, localeService: LocaleService, databaseServer: DatabaseServer, itemFilterService: ItemFilterService, cloner: ICloner); + constructor(logger: ILogger, itemHelper: ItemHelper, hashUtil: HashUtil, presetHelper: PresetHelper, mailSendService: MailSendService, localeService: LocaleService, databaseService: DatabaseService, itemFilterService: ItemFilterService, cloner: ICloner); getCommand(): string; getCommandHelp(): string; performAction(commandHandler: IUserDialogInfo, sessionId: string, request: ISendMessageRequest): string; diff --git a/TypeScript/6ReferenceAnotherClass/types/helpers/PresetHelper.d.ts b/TypeScript/6ReferenceAnotherClass/types/helpers/PresetHelper.d.ts index 5fc8a7c..e71e5b7 100644 --- a/TypeScript/6ReferenceAnotherClass/types/helpers/PresetHelper.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/helpers/PresetHelper.d.ts @@ -1,16 +1,16 @@ import { IPreset } from "@spt/models/eft/common/IGlobals"; import { BaseClasses } from "@spt/models/enums/BaseClasses"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; import { ItemHelper } from "./ItemHelper"; export declare class PresetHelper { - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected cloner: ICloner; protected lookup: Record; protected defaultEquipmentPresets: Record; protected defaultWeaponPresets: Record; - constructor(databaseServer: DatabaseServer, itemHelper: ItemHelper, cloner: ICloner); + constructor(databaseService: DatabaseService, itemHelper: ItemHelper, cloner: ICloner); hydratePresetStore(input: Record): void; /** * Get default weapon and equipment presets diff --git a/TypeScript/6ReferenceAnotherClass/types/helpers/ProfileHelper.d.ts b/TypeScript/6ReferenceAnotherClass/types/helpers/ProfileHelper.d.ts index 37937ff..e943bd3 100644 --- a/TypeScript/6ReferenceAnotherClass/types/helpers/ProfileHelper.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/helpers/ProfileHelper.d.ts @@ -7,8 +7,8 @@ import { SkillTypes } from "@spt/models/enums/SkillTypes"; import { IInventoryConfig } from "@spt/models/spt/config/IInventoryConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileSnapshotService } from "@spt/services/ProfileSnapshotService"; import { ICloner } from "@spt/utils/cloners/ICloner"; @@ -21,14 +21,14 @@ export declare class ProfileHelper { protected watermark: Watermark; protected timeUtil: TimeUtil; protected saveServer: SaveServer; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected profileSnapshotService: ProfileSnapshotService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected cloner: ICloner; protected inventoryConfig: IInventoryConfig; - constructor(logger: ILogger, hashUtil: HashUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileSnapshotService: ProfileSnapshotService, localisationService: LocalisationService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, hashUtil: HashUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseService: DatabaseService, itemHelper: ItemHelper, profileSnapshotService: ProfileSnapshotService, localisationService: LocalisationService, configServer: ConfigServer, cloner: ICloner); /** * Remove/reset a completed quest condtion from players profile quest data * @param sessionID Session id diff --git a/TypeScript/6ReferenceAnotherClass/types/helpers/QuestHelper.d.ts b/TypeScript/6ReferenceAnotherClass/types/helpers/QuestHelper.d.ts index 39ba2a9..93368fa 100644 --- a/TypeScript/6ReferenceAnotherClass/types/helpers/QuestHelper.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/helpers/QuestHelper.d.ts @@ -18,7 +18,7 @@ import { IQuestConfig } from "@spt/models/spt/config/IQuestConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -30,9 +30,9 @@ export declare class QuestHelper { protected timeUtil: TimeUtil; protected hashUtil: HashUtil; protected itemHelper: ItemHelper; + protected databaseService: DatabaseService; protected questConditionHelper: QuestConditionHelper; protected eventOutputHolder: EventOutputHolder; - protected databaseServer: DatabaseServer; protected localeService: LocaleService; protected ragfairServerHelper: RagfairServerHelper; protected dialogueHelper: DialogueHelper; @@ -45,7 +45,7 @@ export declare class QuestHelper { protected configServer: ConfigServer; protected cloner: ICloner; protected questConfig: IQuestConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, questConditionHelper: QuestConditionHelper, eventOutputHolder: EventOutputHolder, databaseServer: DatabaseServer, localeService: LocaleService, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, localisationService: LocalisationService, traderHelper: TraderHelper, presetHelper: PresetHelper, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, databaseService: DatabaseService, questConditionHelper: QuestConditionHelper, eventOutputHolder: EventOutputHolder, localeService: LocaleService, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, localisationService: LocalisationService, traderHelper: TraderHelper, presetHelper: PresetHelper, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); /** * Get status of a quest in player profile by its id * @param pmcData Profile to search diff --git a/TypeScript/6ReferenceAnotherClass/types/helpers/RagfairOfferHelper.d.ts b/TypeScript/6ReferenceAnotherClass/types/helpers/RagfairOfferHelper.d.ts index 27bb081..a08e60a 100644 --- a/TypeScript/6ReferenceAnotherClass/types/helpers/RagfairOfferHelper.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/helpers/RagfairOfferHelper.d.ts @@ -19,8 +19,8 @@ import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -34,7 +34,7 @@ export declare class RagfairOfferHelper { protected timeUtil: TimeUtil; protected hashUtil: HashUtil; protected eventOutputHolder: EventOutputHolder; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected traderHelper: TraderHelper; protected saveServer: SaveServer; protected itemHelper: ItemHelper; @@ -55,7 +55,7 @@ export declare class RagfairOfferHelper { protected static goodSoldTemplate: string; protected ragfairConfig: IRagfairConfig; protected questConfig: IQuestConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, eventOutputHolder: EventOutputHolder, databaseServer: DatabaseServer, traderHelper: TraderHelper, saveServer: SaveServer, itemHelper: ItemHelper, botHelper: BotHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, localeService: LocaleService, localisationService: LocalisationService, mailSendService: MailSendService, configServer: ConfigServer); + constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, eventOutputHolder: EventOutputHolder, databaseService: DatabaseService, traderHelper: TraderHelper, saveServer: SaveServer, itemHelper: ItemHelper, botHelper: BotHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, localeService: LocaleService, localisationService: LocalisationService, mailSendService: MailSendService, configServer: ConfigServer); /** * Passthrough to ragfairOfferService.getOffers(), get flea offers a player should see * @param searchRequest Data from client diff --git a/TypeScript/6ReferenceAnotherClass/types/helpers/RepairHelper.d.ts b/TypeScript/6ReferenceAnotherClass/types/helpers/RepairHelper.d.ts index 4bd0577..99a21da 100644 --- a/TypeScript/6ReferenceAnotherClass/types/helpers/RepairHelper.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/helpers/RepairHelper.d.ts @@ -3,17 +3,17 @@ import { ITemplateItem, Props } from "@spt/models/eft/common/tables/ITemplateIte import { IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RepairHelper { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected configServer: ConfigServer; protected cloner: ICloner; protected repairConfig: IRepairConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, configServer: ConfigServer, cloner: ICloner); /** * Alter an items durability after a repair by trader/repair kit * @param itemToRepair item to update durability details diff --git a/TypeScript/6ReferenceAnotherClass/types/helpers/TraderAssortHelper.d.ts b/TypeScript/6ReferenceAnotherClass/types/helpers/TraderAssortHelper.d.ts index faf2a9d..8f8f802 100644 --- a/TypeScript/6ReferenceAnotherClass/types/helpers/TraderAssortHelper.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/helpers/TraderAssortHelper.d.ts @@ -9,7 +9,7 @@ import { ITrader, ITraderAssort } from "@spt/models/eft/common/tables/ITrader"; import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; @@ -21,7 +21,7 @@ export declare class TraderAssortHelper { protected logger: ILogger; protected mathUtil: MathUtil; protected timeUtil: TimeUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected assortHelper: AssortHelper; protected paymentHelper: PaymentHelper; @@ -37,7 +37,7 @@ export declare class TraderAssortHelper { protected traderConfig: ITraderConfig; protected mergedQuestAssorts: Record>; protected createdMergedQuestAssorts: boolean; - constructor(logger: ILogger, mathUtil: MathUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, profileHelper: ProfileHelper, assortHelper: AssortHelper, paymentHelper: PaymentHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, localisationService: LocalisationService, traderPurchasePersisterService: TraderPurchasePersisterService, traderHelper: TraderHelper, fenceService: FenceService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, mathUtil: MathUtil, timeUtil: TimeUtil, databaseService: DatabaseService, profileHelper: ProfileHelper, assortHelper: AssortHelper, paymentHelper: PaymentHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, localisationService: LocalisationService, traderPurchasePersisterService: TraderPurchasePersisterService, traderHelper: TraderHelper, fenceService: FenceService, configServer: ConfigServer, cloner: ICloner); /** * Get a traders assorts * Can be used for returning ragfair / fence assorts diff --git a/TypeScript/6ReferenceAnotherClass/types/helpers/TraderHelper.d.ts b/TypeScript/6ReferenceAnotherClass/types/helpers/TraderHelper.d.ts index 5f515da..eec1cc7 100644 --- a/TypeScript/6ReferenceAnotherClass/types/helpers/TraderHelper.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/helpers/TraderHelper.d.ts @@ -10,7 +10,7 @@ import { Traders } from "@spt/models/enums/Traders"; import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; @@ -18,7 +18,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class TraderHelper { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected handbookHelper: HandbookHelper; protected itemHelper: ItemHelper; @@ -33,7 +33,7 @@ export declare class TraderHelper { protected highestTraderPriceItems?: Record; /** Dictionary of item tpl and the highest trader buy back rouble price */ protected highestTraderBuyPriceItems?: Record; - constructor(logger: ILogger, databaseServer: DatabaseServer, profileHelper: ProfileHelper, handbookHelper: HandbookHelper, itemHelper: ItemHelper, playerService: PlayerService, localisationService: LocalisationService, fenceService: FenceService, timeUtil: TimeUtil, randomUtil: RandomUtil, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, profileHelper: ProfileHelper, handbookHelper: HandbookHelper, itemHelper: ItemHelper, playerService: PlayerService, localisationService: LocalisationService, fenceService: FenceService, timeUtil: TimeUtil, randomUtil: RandomUtil, configServer: ConfigServer); /** * Get a trader base object, update profile to reflect players current standing in profile * when trader not found in profile diff --git a/TypeScript/6ReferenceAnotherClass/types/models/eft/common/IGlobals.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/common/IGlobals.d.ts index 2209415..a0bb051 100644 --- a/TypeScript/6ReferenceAnotherClass/types/models/eft/common/IGlobals.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/models/eft/common/IGlobals.d.ts @@ -802,7 +802,6 @@ export interface IMaxActiveOfferCount { from: number; to: number; count: number; - countForSpecialEditions: number; } export interface IMaxSumForRarity { Common: IRarityMaxSum; diff --git a/TypeScript/6ReferenceAnotherClass/types/models/eft/common/ILocationBase.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/common/ILocationBase.d.ts index 65931f8..10f1a57 100644 --- a/TypeScript/6ReferenceAnotherClass/types/models/eft/common/ILocationBase.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/models/eft/common/ILocationBase.d.ts @@ -196,18 +196,24 @@ export interface Props { export interface Exit { /** % Chance out of 100 exit will appear in raid */ Chance: number; + ChancePVE: number; Count: number; + CountPVE: number; EntryPoints: string; EventAvailable: boolean; ExfiltrationTime: number; + ExfiltrationTimePVE: number; ExfiltrationType: string; RequiredSlot?: string; Id: string; MaxTime: number; + MaxTimePVE: number; MinTime: number; + MinTimePVE: number; Name: string; PassageRequirement: string; PlayersCount: number; + PlayersCountPVE: number; RequirementTip: string; Side?: string; } diff --git a/TypeScript/6ReferenceAnotherClass/types/models/eft/common/tables/IRepeatableQuests.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/common/tables/IRepeatableQuests.d.ts index 854c8ef..27ff49d 100644 --- a/TypeScript/6ReferenceAnotherClass/types/models/eft/common/tables/IRepeatableQuests.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/models/eft/common/tables/IRepeatableQuests.d.ts @@ -18,10 +18,13 @@ export interface IRepeatableTemplates { export interface IPmcDataRepeatableQuest { id?: string; name: string; + unavailableTime?: string; activeQuests: IRepeatableQuest[]; inactiveQuests: IRepeatableQuest[]; endTime: number; changeRequirement: Record; + freeChanges: number; + freeChangesAvailable: number; } export interface IChangeRequirement { changeCost: IChangeCost[]; diff --git a/TypeScript/6ReferenceAnotherClass/types/models/eft/common/tables/ITemplateItem.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/eft/common/tables/ITemplateItem.d.ts index a8ccfbb..e5c6632 100644 --- a/TypeScript/6ReferenceAnotherClass/types/models/eft/common/tables/ITemplateItem.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/models/eft/common/tables/ITemplateItem.d.ts @@ -63,7 +63,7 @@ export interface Props { DiscardingBlock?: boolean; DropSoundType?: string; RagFairCommissionModifier?: number; - RarityPvE: string; + RarityPvE?: string; IsAlwaysAvailableForInsurance?: boolean; DiscardLimit?: number; MaxResource?: number; @@ -414,6 +414,12 @@ export interface Props { LayoutName?: string; Lower75Prefab?: Prefab; MaxUsages?: number; + ScavKillExpPenalty?: number; + ScavKillExpPenaltyPVE?: number; + ScavKillStandingPenalty?: number; + ScavKillStandingPenaltyPVE?: number; + TradersDiscount?: number; + TradersDiscountPVE?: number; } export interface IHealthEffect { type: string; diff --git a/TypeScript/6ReferenceAnotherClass/types/models/spt/config/IQuestConfig.d.ts b/TypeScript/6ReferenceAnotherClass/types/models/spt/config/IQuestConfig.d.ts index 362602c..2cdf4fa 100644 --- a/TypeScript/6ReferenceAnotherClass/types/models/spt/config/IQuestConfig.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/models/spt/config/IQuestConfig.d.ts @@ -47,6 +47,8 @@ export interface IRepeatableQuestConfig { /** Item tplIds to ignore when generating rewards */ rewardBlacklist: string[]; rewardAmmoStackMinSize: number; + freeChangesAvailable: number; + freeChanges: number; } export interface IRewardScaling { levels: number[]; diff --git a/TypeScript/6ReferenceAnotherClass/types/services/BotEquipmentModPoolService.d.ts b/TypeScript/6ReferenceAnotherClass/types/services/BotEquipmentModPoolService.d.ts index c53f31b..7b2b442 100644 --- a/TypeScript/6ReferenceAnotherClass/types/services/BotEquipmentModPoolService.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/services/BotEquipmentModPoolService.d.ts @@ -4,7 +4,7 @@ import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { VFS } from "@spt/utils/VFS"; /** Store a mapping between weapons, their slots and the items that fit those slots */ @@ -12,7 +12,7 @@ export declare class BotEquipmentModPoolService { protected logger: ILogger; protected vfs: VFS; protected itemHelper: ItemHelper; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected botConfig: IBotConfig; @@ -20,7 +20,7 @@ export declare class BotEquipmentModPoolService { protected gearModPool: Mods; protected weaponPoolGenerated: boolean; protected armorPoolGenerated: boolean; - constructor(logger: ILogger, vfs: VFS, itemHelper: ItemHelper, databaseServer: DatabaseServer, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, vfs: VFS, itemHelper: ItemHelper, databaseService: DatabaseService, localisationService: LocalisationService, configServer: ConfigServer); /** * Store dictionary of mods for each item passed in * @param items items to find related mods and store in modPool diff --git a/TypeScript/6ReferenceAnotherClass/types/services/CustomLocationWaveService.d.ts b/TypeScript/6ReferenceAnotherClass/types/services/CustomLocationWaveService.d.ts index 728a1e8..c72d5bb 100644 --- a/TypeScript/6ReferenceAnotherClass/types/services/CustomLocationWaveService.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/services/CustomLocationWaveService.d.ts @@ -2,15 +2,15 @@ import { BossLocationSpawn, Wave } from "@spt/models/eft/common/ILocationBase"; import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class CustomLocationWaveService { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, configServer: ConfigServer); /** * Add a boss wave to a map * @param locationId e.g. factory4_day, bigmap diff --git a/TypeScript/6ReferenceAnotherClass/types/services/InsuranceService.d.ts b/TypeScript/6ReferenceAnotherClass/types/services/InsuranceService.d.ts index c54f9f9..0000e66 100644 --- a/TypeScript/6ReferenceAnotherClass/types/services/InsuranceService.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/services/InsuranceService.d.ts @@ -13,8 +13,8 @@ import { ILostOnDeathConfig } from "@spt/models/spt/config/ILostOnDeathConfig"; import { IInsuranceEquipmentPkg } from "@spt/models/spt/services/IInsuranceEquipmentPkg"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -24,7 +24,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class InsuranceService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected secureContainerHelper: SecureContainerHelper; protected randomUtil: RandomUtil; protected itemHelper: ItemHelper; @@ -42,7 +42,7 @@ export declare class InsuranceService { protected insured: Record>; protected insuranceConfig: IInsuranceConfig; protected lostOnDeathConfig: ILostOnDeathConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, handbookHelper: HandbookHelper, localisationService: LocalisationService, localeService: LocaleService, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, databaseService: DatabaseService, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, handbookHelper: HandbookHelper, localisationService: LocalisationService, localeService: LocaleService, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); /** * Does player have insurance array * @param sessionId Player id diff --git a/TypeScript/6ReferenceAnotherClass/types/services/MailSendService.d.ts b/TypeScript/6ReferenceAnotherClass/types/services/MailSendService.d.ts index d445841..8f1f974 100644 --- a/TypeScript/6ReferenceAnotherClass/types/services/MailSendService.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/services/MailSendService.d.ts @@ -9,8 +9,8 @@ import { MessageType } from "@spt/models/enums/MessageType"; import { Traders } from "@spt/models/enums/Traders"; import { IProfileChangeEvent, ISendMessageDetails } from "@spt/models/spt/dialog/ISendMessageDetails"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; @@ -19,7 +19,7 @@ export declare class MailSendService { protected hashUtil: HashUtil; protected timeUtil: TimeUtil; protected saveServer: SaveServer; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected notifierHelper: NotifierHelper; protected dialogueHelper: DialogueHelper; protected notificationSendHelper: NotificationSendHelper; @@ -27,7 +27,7 @@ export declare class MailSendService { protected itemHelper: ItemHelper; protected traderHelper: TraderHelper; protected readonly systemSenderId = "59e7125688a45068a6249071"; - constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, dialogueHelper: DialogueHelper, notificationSendHelper: NotificationSendHelper, localisationService: LocalisationService, itemHelper: ItemHelper, traderHelper: TraderHelper); + constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseService: DatabaseService, notifierHelper: NotifierHelper, dialogueHelper: DialogueHelper, notificationSendHelper: NotificationSendHelper, localisationService: LocalisationService, itemHelper: ItemHelper, traderHelper: TraderHelper); /** * Send a message from an NPC (e.g. prapor) to the player with or without items using direct message text, do not look up any locale * @param sessionId The session ID to send the message to diff --git a/TypeScript/6ReferenceAnotherClass/types/services/OpenZoneService.d.ts b/TypeScript/6ReferenceAnotherClass/types/services/OpenZoneService.d.ts index 1bc5f00..c7dd0bd 100644 --- a/TypeScript/6ReferenceAnotherClass/types/services/OpenZoneService.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/services/OpenZoneService.d.ts @@ -1,18 +1,18 @@ import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RandomUtil } from "@spt/utils/RandomUtil"; /** Service for adding new zones to a maps OpenZones property */ export declare class OpenZoneService { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, localisationService: LocalisationService, configServer: ConfigServer); /** * Add open zone to specified map * @param locationId map location (e.g. factory4_day) diff --git a/TypeScript/6ReferenceAnotherClass/types/services/PaymentService.d.ts b/TypeScript/6ReferenceAnotherClass/types/services/PaymentService.d.ts index 64ff2c1..61d5731 100644 --- a/TypeScript/6ReferenceAnotherClass/types/services/PaymentService.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/services/PaymentService.d.ts @@ -9,7 +9,7 @@ import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRo import { IProcessBuyTradeRequestData } from "@spt/models/eft/trade/IProcessBuyTradeRequestData"; import { IProcessSellTradeRequestData } from "@spt/models/eft/trade/IProcessSellTradeRequestData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; @@ -17,14 +17,14 @@ export declare class PaymentService { protected logger: ILogger; protected hashUtil: HashUtil; protected httpResponse: HttpResponseUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected handbookHelper: HandbookHelper; protected traderHelper: TraderHelper; protected itemHelper: ItemHelper; protected inventoryHelper: InventoryHelper; protected localisationService: LocalisationService; protected paymentHelper: PaymentHelper; - constructor(logger: ILogger, hashUtil: HashUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, localisationService: LocalisationService, paymentHelper: PaymentHelper); + constructor(logger: ILogger, hashUtil: HashUtil, httpResponse: HttpResponseUtil, databaseService: DatabaseService, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, localisationService: LocalisationService, paymentHelper: PaymentHelper); /** * Take money and insert items into return to server request * @param pmcData Pmc profile diff --git a/TypeScript/6ReferenceAnotherClass/types/services/PlayerService.d.ts b/TypeScript/6ReferenceAnotherClass/types/services/PlayerService.d.ts index ae57410..84c4c6f 100644 --- a/TypeScript/6ReferenceAnotherClass/types/services/PlayerService.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/services/PlayerService.d.ts @@ -1,14 +1,14 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class PlayerService { protected logger: ILogger; protected timeUtil: TimeUtil; protected localisationService: LocalisationService; - protected databaseServer: DatabaseServer; - constructor(logger: ILogger, timeUtil: TimeUtil, localisationService: LocalisationService, databaseServer: DatabaseServer); + protected databaseService: DatabaseService; + constructor(logger: ILogger, timeUtil: TimeUtil, localisationService: LocalisationService, databaseService: DatabaseService); /** * Get level of player * @param pmcData Player profile diff --git a/TypeScript/6ReferenceAnotherClass/types/services/RagfairLinkedItemService.d.ts b/TypeScript/6ReferenceAnotherClass/types/services/RagfairLinkedItemService.d.ts index 6011c1a..0d03459 100644 --- a/TypeScript/6ReferenceAnotherClass/types/services/RagfairLinkedItemService.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/services/RagfairLinkedItemService.d.ts @@ -1,11 +1,11 @@ import { ItemHelper } from "@spt/helpers/ItemHelper"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; export declare class RagfairLinkedItemService { - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected linkedItemsCache: Record>; - constructor(databaseServer: DatabaseServer, itemHelper: ItemHelper); + constructor(databaseService: DatabaseService, itemHelper: ItemHelper); getLinkedItems(linkedSearchId: string): Set; /** * Use ragfair linked item service to get an array of items that can fit on or in designated itemtpl diff --git a/TypeScript/6ReferenceAnotherClass/types/services/RagfairOfferService.d.ts b/TypeScript/6ReferenceAnotherClass/types/services/RagfairOfferService.d.ts index c044f6d..4bc07c3 100644 --- a/TypeScript/6ReferenceAnotherClass/types/services/RagfairOfferService.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/services/RagfairOfferService.d.ts @@ -6,8 +6,8 @@ import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RagfairOfferHolder } from "@spt/utils/RagfairOfferHolder"; @@ -15,7 +15,7 @@ import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class RagfairOfferService { protected logger: ILogger; protected timeUtil: TimeUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected saveServer: SaveServer; protected ragfairServerHelper: RagfairServerHelper; protected profileHelper: ProfileHelper; @@ -28,7 +28,7 @@ export declare class RagfairOfferService { protected expiredOffers: Record; protected ragfairConfig: IRagfairConfig; protected ragfairOfferHandler: RagfairOfferHolder; - constructor(logger: ILogger, timeUtil: TimeUtil, databaseServer: DatabaseServer, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, eventOutputHolder: EventOutputHolder, httpResponse: HttpResponseUtil, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, timeUtil: TimeUtil, databaseService: DatabaseService, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, eventOutputHolder: EventOutputHolder, httpResponse: HttpResponseUtil, localisationService: LocalisationService, configServer: ConfigServer); /** * Get all offers * @returns IRagfairOffer array diff --git a/TypeScript/6ReferenceAnotherClass/types/services/RagfairPriceService.d.ts b/TypeScript/6ReferenceAnotherClass/types/services/RagfairPriceService.d.ts index 5b8fa56..0a2f26e 100644 --- a/TypeScript/6ReferenceAnotherClass/types/services/RagfairPriceService.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/services/RagfairPriceService.d.ts @@ -12,7 +12,7 @@ import { IRagfairConfig, IUnreasonableModPrices } from "@spt/models/spt/config/I import { IRagfairServerPrices } from "@spt/models/spt/ragfair/IRagfairServerPrices"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RandomUtil } from "@spt/utils/RandomUtil"; /** @@ -20,7 +20,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; */ export declare class RagfairPriceService implements OnLoad { protected handbookHelper: HandbookHelper; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected logger: ILogger; protected itemHelper: ItemHelper; protected presetHelper: PresetHelper; @@ -30,7 +30,7 @@ export declare class RagfairPriceService implements OnLoad { protected configServer: ConfigServer; protected ragfairConfig: IRagfairConfig; protected prices: IRagfairServerPrices; - constructor(handbookHelper: HandbookHelper, databaseServer: DatabaseServer, logger: ILogger, itemHelper: ItemHelper, presetHelper: PresetHelper, traderHelper: TraderHelper, randomUtil: RandomUtil, localisationService: LocalisationService, configServer: ConfigServer); + constructor(handbookHelper: HandbookHelper, databaseService: DatabaseService, logger: ILogger, itemHelper: ItemHelper, presetHelper: PresetHelper, traderHelper: TraderHelper, randomUtil: RandomUtil, localisationService: LocalisationService, configServer: ConfigServer); /** * Generate static (handbook) and dynamic (prices.json) flea prices, store inside class as dictionaries */ diff --git a/TypeScript/6ReferenceAnotherClass/types/services/RagfairTaxService.d.ts b/TypeScript/6ReferenceAnotherClass/types/services/RagfairTaxService.d.ts index 4e4e648..effb9f0 100644 --- a/TypeScript/6ReferenceAnotherClass/types/services/RagfairTaxService.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/services/RagfairTaxService.d.ts @@ -4,15 +4,15 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { IStorePlayerOfferTaxAmountRequestData } from "@spt/models/eft/ragfair/IStorePlayerOfferTaxAmountRequestData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; export declare class RagfairTaxService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected ragfairPriceService: RagfairPriceService; protected itemHelper: ItemHelper; protected playerOfferTaxCache: Record; - constructor(logger: ILogger, databaseServer: DatabaseServer, ragfairPriceService: RagfairPriceService, itemHelper: ItemHelper); + constructor(logger: ILogger, databaseService: DatabaseService, ragfairPriceService: RagfairPriceService, itemHelper: ItemHelper); storeClientOfferTaxValue(sessionId: string, offer: IStorePlayerOfferTaxAmountRequestData): void; clearStoredOfferTaxById(offerIdToRemove: string): void; getStoredClientOfferTaxValueById(offerIdToGet: string): IStorePlayerOfferTaxAmountRequestData; diff --git a/TypeScript/6ReferenceAnotherClass/types/services/RaidTimeAdjustmentService.d.ts b/TypeScript/6ReferenceAnotherClass/types/services/RaidTimeAdjustmentService.d.ts index f770b64..bfc099a 100644 --- a/TypeScript/6ReferenceAnotherClass/types/services/RaidTimeAdjustmentService.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/services/RaidTimeAdjustmentService.d.ts @@ -7,17 +7,17 @@ import { ILocationConfig, IScavRaidTimeLocationSettings, LootMultiplier } from " import { IRaidChanges } from "@spt/models/spt/location/IRaidChanges"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RaidTimeAdjustmentService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected randomUtil: RandomUtil; protected weightedRandomHelper: WeightedRandomHelper; protected applicationContext: ApplicationContext; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, applicationContext: ApplicationContext, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, applicationContext: ApplicationContext, configServer: ConfigServer); /** * Make alterations to the base map data passed in * Loot multipliers/waves/wave start times diff --git a/TypeScript/6ReferenceAnotherClass/types/services/RepairService.d.ts b/TypeScript/6ReferenceAnotherClass/types/services/RepairService.d.ts index 9203417..48f306e 100644 --- a/TypeScript/6ReferenceAnotherClass/types/services/RepairService.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/services/RepairService.d.ts @@ -14,13 +14,13 @@ import { SkillTypes } from "@spt/models/enums/SkillTypes"; import { BonusSettings, IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RepairService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected randomUtil: RandomUtil; protected itemHelper: ItemHelper; @@ -31,7 +31,7 @@ export declare class RepairService { protected localisationService: LocalisationService; protected configServer: ConfigServer; protected repairConfig: IRepairConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, profileHelper: ProfileHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, traderHelper: TraderHelper, weightedRandomHelper: WeightedRandomHelper, paymentService: PaymentService, repairHelper: RepairHelper, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, profileHelper: ProfileHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, traderHelper: TraderHelper, weightedRandomHelper: WeightedRandomHelper, paymentService: PaymentService, repairHelper: RepairHelper, localisationService: LocalisationService, configServer: ConfigServer); /** * Use trader to repair an items durability * @param sessionID Session id diff --git a/TypeScript/6ReferenceAnotherClass/types/services/TraderServicesService.d.ts b/TypeScript/6ReferenceAnotherClass/types/services/TraderServicesService.d.ts index 111c71a..e441eb6 100644 --- a/TypeScript/6ReferenceAnotherClass/types/services/TraderServicesService.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/services/TraderServicesService.d.ts @@ -1,13 +1,13 @@ import { ProfileHelper } from "@spt/helpers/ProfileHelper"; import { ITraderServiceModel } from "@spt/models/spt/services/ITraderServiceModel"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderServicesService { protected profileHelper: ProfileHelper; protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected cloner: ICloner; - constructor(profileHelper: ProfileHelper, logger: ILogger, databaseServer: DatabaseServer, cloner: ICloner); + constructor(profileHelper: ProfileHelper, logger: ILogger, databaseService: DatabaseService, cloner: ICloner); getTraderServices(sessionId: string, traderId: string): ITraderServiceModel[]; } diff --git a/TypeScript/6ReferenceAnotherClass/types/services/mod/CustomItemService.d.ts b/TypeScript/6ReferenceAnotherClass/types/services/mod/CustomItemService.d.ts index 6dc4730..1926bed 100644 --- a/TypeScript/6ReferenceAnotherClass/types/services/mod/CustomItemService.d.ts +++ b/TypeScript/6ReferenceAnotherClass/types/services/mod/CustomItemService.d.ts @@ -9,11 +9,11 @@ import { HashUtil } from "@spt/utils/HashUtil"; export declare class CustomItemService { protected logger: ILogger; protected hashUtil: HashUtil; - protected databaseServer: DatabaseService; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected itemBaseClassService: ItemBaseClassService; protected cloner: ICloner; - constructor(logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseService, itemHelper: ItemHelper, itemBaseClassService: ItemBaseClassService, cloner: ICloner); + constructor(logger: ILogger, hashUtil: HashUtil, databaseService: DatabaseService, itemHelper: ItemHelper, itemBaseClassService: ItemBaseClassService, cloner: ICloner); /** * Create a new item from a cloned item base * WARNING - If no item id is supplied, an id will be generated, this id will be random every time you add an item and will not be the same on each subsequent server start diff --git a/TypeScript/7OnLoadHook/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts b/TypeScript/7OnLoadHook/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts index a7491b5..c51bf7e 100644 --- a/TypeScript/7OnLoadHook/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts +++ b/TypeScript/7OnLoadHook/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts @@ -6,7 +6,7 @@ import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { ISendMessageRequest } from "@spt/models/eft/dialog/ISendMessageRequest"; import { IUserDialogInfo } from "@spt/models/eft/profile/ISptProfile"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -19,7 +19,7 @@ export declare class GiveSptCommand implements ISptCommand { protected presetHelper: PresetHelper; protected mailSendService: MailSendService; protected localeService: LocaleService; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemFilterService: ItemFilterService; protected cloner: ICloner; /** @@ -34,7 +34,7 @@ export declare class GiveSptCommand implements ISptCommand { private static acceptableConfidence; private static excludedPresetItems; protected savedCommand: Map; - constructor(logger: ILogger, itemHelper: ItemHelper, hashUtil: HashUtil, presetHelper: PresetHelper, mailSendService: MailSendService, localeService: LocaleService, databaseServer: DatabaseServer, itemFilterService: ItemFilterService, cloner: ICloner); + constructor(logger: ILogger, itemHelper: ItemHelper, hashUtil: HashUtil, presetHelper: PresetHelper, mailSendService: MailSendService, localeService: LocaleService, databaseService: DatabaseService, itemFilterService: ItemFilterService, cloner: ICloner); getCommand(): string; getCommandHelp(): string; performAction(commandHandler: IUserDialogInfo, sessionId: string, request: ISendMessageRequest): string; diff --git a/TypeScript/7OnLoadHook/types/helpers/PresetHelper.d.ts b/TypeScript/7OnLoadHook/types/helpers/PresetHelper.d.ts index 5fc8a7c..e71e5b7 100644 --- a/TypeScript/7OnLoadHook/types/helpers/PresetHelper.d.ts +++ b/TypeScript/7OnLoadHook/types/helpers/PresetHelper.d.ts @@ -1,16 +1,16 @@ import { IPreset } from "@spt/models/eft/common/IGlobals"; import { BaseClasses } from "@spt/models/enums/BaseClasses"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; import { ItemHelper } from "./ItemHelper"; export declare class PresetHelper { - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected cloner: ICloner; protected lookup: Record; protected defaultEquipmentPresets: Record; protected defaultWeaponPresets: Record; - constructor(databaseServer: DatabaseServer, itemHelper: ItemHelper, cloner: ICloner); + constructor(databaseService: DatabaseService, itemHelper: ItemHelper, cloner: ICloner); hydratePresetStore(input: Record): void; /** * Get default weapon and equipment presets diff --git a/TypeScript/7OnLoadHook/types/helpers/ProfileHelper.d.ts b/TypeScript/7OnLoadHook/types/helpers/ProfileHelper.d.ts index 37937ff..e943bd3 100644 --- a/TypeScript/7OnLoadHook/types/helpers/ProfileHelper.d.ts +++ b/TypeScript/7OnLoadHook/types/helpers/ProfileHelper.d.ts @@ -7,8 +7,8 @@ import { SkillTypes } from "@spt/models/enums/SkillTypes"; import { IInventoryConfig } from "@spt/models/spt/config/IInventoryConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileSnapshotService } from "@spt/services/ProfileSnapshotService"; import { ICloner } from "@spt/utils/cloners/ICloner"; @@ -21,14 +21,14 @@ export declare class ProfileHelper { protected watermark: Watermark; protected timeUtil: TimeUtil; protected saveServer: SaveServer; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected profileSnapshotService: ProfileSnapshotService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected cloner: ICloner; protected inventoryConfig: IInventoryConfig; - constructor(logger: ILogger, hashUtil: HashUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileSnapshotService: ProfileSnapshotService, localisationService: LocalisationService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, hashUtil: HashUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseService: DatabaseService, itemHelper: ItemHelper, profileSnapshotService: ProfileSnapshotService, localisationService: LocalisationService, configServer: ConfigServer, cloner: ICloner); /** * Remove/reset a completed quest condtion from players profile quest data * @param sessionID Session id diff --git a/TypeScript/7OnLoadHook/types/helpers/QuestHelper.d.ts b/TypeScript/7OnLoadHook/types/helpers/QuestHelper.d.ts index 39ba2a9..93368fa 100644 --- a/TypeScript/7OnLoadHook/types/helpers/QuestHelper.d.ts +++ b/TypeScript/7OnLoadHook/types/helpers/QuestHelper.d.ts @@ -18,7 +18,7 @@ import { IQuestConfig } from "@spt/models/spt/config/IQuestConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -30,9 +30,9 @@ export declare class QuestHelper { protected timeUtil: TimeUtil; protected hashUtil: HashUtil; protected itemHelper: ItemHelper; + protected databaseService: DatabaseService; protected questConditionHelper: QuestConditionHelper; protected eventOutputHolder: EventOutputHolder; - protected databaseServer: DatabaseServer; protected localeService: LocaleService; protected ragfairServerHelper: RagfairServerHelper; protected dialogueHelper: DialogueHelper; @@ -45,7 +45,7 @@ export declare class QuestHelper { protected configServer: ConfigServer; protected cloner: ICloner; protected questConfig: IQuestConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, questConditionHelper: QuestConditionHelper, eventOutputHolder: EventOutputHolder, databaseServer: DatabaseServer, localeService: LocaleService, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, localisationService: LocalisationService, traderHelper: TraderHelper, presetHelper: PresetHelper, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, databaseService: DatabaseService, questConditionHelper: QuestConditionHelper, eventOutputHolder: EventOutputHolder, localeService: LocaleService, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, localisationService: LocalisationService, traderHelper: TraderHelper, presetHelper: PresetHelper, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); /** * Get status of a quest in player profile by its id * @param pmcData Profile to search diff --git a/TypeScript/7OnLoadHook/types/helpers/RagfairOfferHelper.d.ts b/TypeScript/7OnLoadHook/types/helpers/RagfairOfferHelper.d.ts index 27bb081..a08e60a 100644 --- a/TypeScript/7OnLoadHook/types/helpers/RagfairOfferHelper.d.ts +++ b/TypeScript/7OnLoadHook/types/helpers/RagfairOfferHelper.d.ts @@ -19,8 +19,8 @@ import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -34,7 +34,7 @@ export declare class RagfairOfferHelper { protected timeUtil: TimeUtil; protected hashUtil: HashUtil; protected eventOutputHolder: EventOutputHolder; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected traderHelper: TraderHelper; protected saveServer: SaveServer; protected itemHelper: ItemHelper; @@ -55,7 +55,7 @@ export declare class RagfairOfferHelper { protected static goodSoldTemplate: string; protected ragfairConfig: IRagfairConfig; protected questConfig: IQuestConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, eventOutputHolder: EventOutputHolder, databaseServer: DatabaseServer, traderHelper: TraderHelper, saveServer: SaveServer, itemHelper: ItemHelper, botHelper: BotHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, localeService: LocaleService, localisationService: LocalisationService, mailSendService: MailSendService, configServer: ConfigServer); + constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, eventOutputHolder: EventOutputHolder, databaseService: DatabaseService, traderHelper: TraderHelper, saveServer: SaveServer, itemHelper: ItemHelper, botHelper: BotHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, localeService: LocaleService, localisationService: LocalisationService, mailSendService: MailSendService, configServer: ConfigServer); /** * Passthrough to ragfairOfferService.getOffers(), get flea offers a player should see * @param searchRequest Data from client diff --git a/TypeScript/7OnLoadHook/types/helpers/RepairHelper.d.ts b/TypeScript/7OnLoadHook/types/helpers/RepairHelper.d.ts index 4bd0577..99a21da 100644 --- a/TypeScript/7OnLoadHook/types/helpers/RepairHelper.d.ts +++ b/TypeScript/7OnLoadHook/types/helpers/RepairHelper.d.ts @@ -3,17 +3,17 @@ import { ITemplateItem, Props } from "@spt/models/eft/common/tables/ITemplateIte import { IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RepairHelper { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected configServer: ConfigServer; protected cloner: ICloner; protected repairConfig: IRepairConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, configServer: ConfigServer, cloner: ICloner); /** * Alter an items durability after a repair by trader/repair kit * @param itemToRepair item to update durability details diff --git a/TypeScript/7OnLoadHook/types/helpers/TraderAssortHelper.d.ts b/TypeScript/7OnLoadHook/types/helpers/TraderAssortHelper.d.ts index faf2a9d..8f8f802 100644 --- a/TypeScript/7OnLoadHook/types/helpers/TraderAssortHelper.d.ts +++ b/TypeScript/7OnLoadHook/types/helpers/TraderAssortHelper.d.ts @@ -9,7 +9,7 @@ import { ITrader, ITraderAssort } from "@spt/models/eft/common/tables/ITrader"; import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; @@ -21,7 +21,7 @@ export declare class TraderAssortHelper { protected logger: ILogger; protected mathUtil: MathUtil; protected timeUtil: TimeUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected assortHelper: AssortHelper; protected paymentHelper: PaymentHelper; @@ -37,7 +37,7 @@ export declare class TraderAssortHelper { protected traderConfig: ITraderConfig; protected mergedQuestAssorts: Record>; protected createdMergedQuestAssorts: boolean; - constructor(logger: ILogger, mathUtil: MathUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, profileHelper: ProfileHelper, assortHelper: AssortHelper, paymentHelper: PaymentHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, localisationService: LocalisationService, traderPurchasePersisterService: TraderPurchasePersisterService, traderHelper: TraderHelper, fenceService: FenceService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, mathUtil: MathUtil, timeUtil: TimeUtil, databaseService: DatabaseService, profileHelper: ProfileHelper, assortHelper: AssortHelper, paymentHelper: PaymentHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, localisationService: LocalisationService, traderPurchasePersisterService: TraderPurchasePersisterService, traderHelper: TraderHelper, fenceService: FenceService, configServer: ConfigServer, cloner: ICloner); /** * Get a traders assorts * Can be used for returning ragfair / fence assorts diff --git a/TypeScript/7OnLoadHook/types/helpers/TraderHelper.d.ts b/TypeScript/7OnLoadHook/types/helpers/TraderHelper.d.ts index 5f515da..eec1cc7 100644 --- a/TypeScript/7OnLoadHook/types/helpers/TraderHelper.d.ts +++ b/TypeScript/7OnLoadHook/types/helpers/TraderHelper.d.ts @@ -10,7 +10,7 @@ import { Traders } from "@spt/models/enums/Traders"; import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; @@ -18,7 +18,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class TraderHelper { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected handbookHelper: HandbookHelper; protected itemHelper: ItemHelper; @@ -33,7 +33,7 @@ export declare class TraderHelper { protected highestTraderPriceItems?: Record; /** Dictionary of item tpl and the highest trader buy back rouble price */ protected highestTraderBuyPriceItems?: Record; - constructor(logger: ILogger, databaseServer: DatabaseServer, profileHelper: ProfileHelper, handbookHelper: HandbookHelper, itemHelper: ItemHelper, playerService: PlayerService, localisationService: LocalisationService, fenceService: FenceService, timeUtil: TimeUtil, randomUtil: RandomUtil, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, profileHelper: ProfileHelper, handbookHelper: HandbookHelper, itemHelper: ItemHelper, playerService: PlayerService, localisationService: LocalisationService, fenceService: FenceService, timeUtil: TimeUtil, randomUtil: RandomUtil, configServer: ConfigServer); /** * Get a trader base object, update profile to reflect players current standing in profile * when trader not found in profile diff --git a/TypeScript/7OnLoadHook/types/models/eft/common/IGlobals.d.ts b/TypeScript/7OnLoadHook/types/models/eft/common/IGlobals.d.ts index 2209415..a0bb051 100644 --- a/TypeScript/7OnLoadHook/types/models/eft/common/IGlobals.d.ts +++ b/TypeScript/7OnLoadHook/types/models/eft/common/IGlobals.d.ts @@ -802,7 +802,6 @@ export interface IMaxActiveOfferCount { from: number; to: number; count: number; - countForSpecialEditions: number; } export interface IMaxSumForRarity { Common: IRarityMaxSum; diff --git a/TypeScript/7OnLoadHook/types/models/eft/common/ILocationBase.d.ts b/TypeScript/7OnLoadHook/types/models/eft/common/ILocationBase.d.ts index 65931f8..10f1a57 100644 --- a/TypeScript/7OnLoadHook/types/models/eft/common/ILocationBase.d.ts +++ b/TypeScript/7OnLoadHook/types/models/eft/common/ILocationBase.d.ts @@ -196,18 +196,24 @@ export interface Props { export interface Exit { /** % Chance out of 100 exit will appear in raid */ Chance: number; + ChancePVE: number; Count: number; + CountPVE: number; EntryPoints: string; EventAvailable: boolean; ExfiltrationTime: number; + ExfiltrationTimePVE: number; ExfiltrationType: string; RequiredSlot?: string; Id: string; MaxTime: number; + MaxTimePVE: number; MinTime: number; + MinTimePVE: number; Name: string; PassageRequirement: string; PlayersCount: number; + PlayersCountPVE: number; RequirementTip: string; Side?: string; } diff --git a/TypeScript/7OnLoadHook/types/models/eft/common/tables/IRepeatableQuests.d.ts b/TypeScript/7OnLoadHook/types/models/eft/common/tables/IRepeatableQuests.d.ts index 854c8ef..27ff49d 100644 --- a/TypeScript/7OnLoadHook/types/models/eft/common/tables/IRepeatableQuests.d.ts +++ b/TypeScript/7OnLoadHook/types/models/eft/common/tables/IRepeatableQuests.d.ts @@ -18,10 +18,13 @@ export interface IRepeatableTemplates { export interface IPmcDataRepeatableQuest { id?: string; name: string; + unavailableTime?: string; activeQuests: IRepeatableQuest[]; inactiveQuests: IRepeatableQuest[]; endTime: number; changeRequirement: Record; + freeChanges: number; + freeChangesAvailable: number; } export interface IChangeRequirement { changeCost: IChangeCost[]; diff --git a/TypeScript/7OnLoadHook/types/models/eft/common/tables/ITemplateItem.d.ts b/TypeScript/7OnLoadHook/types/models/eft/common/tables/ITemplateItem.d.ts index a8ccfbb..e5c6632 100644 --- a/TypeScript/7OnLoadHook/types/models/eft/common/tables/ITemplateItem.d.ts +++ b/TypeScript/7OnLoadHook/types/models/eft/common/tables/ITemplateItem.d.ts @@ -63,7 +63,7 @@ export interface Props { DiscardingBlock?: boolean; DropSoundType?: string; RagFairCommissionModifier?: number; - RarityPvE: string; + RarityPvE?: string; IsAlwaysAvailableForInsurance?: boolean; DiscardLimit?: number; MaxResource?: number; @@ -414,6 +414,12 @@ export interface Props { LayoutName?: string; Lower75Prefab?: Prefab; MaxUsages?: number; + ScavKillExpPenalty?: number; + ScavKillExpPenaltyPVE?: number; + ScavKillStandingPenalty?: number; + ScavKillStandingPenaltyPVE?: number; + TradersDiscount?: number; + TradersDiscountPVE?: number; } export interface IHealthEffect { type: string; diff --git a/TypeScript/7OnLoadHook/types/models/spt/config/IQuestConfig.d.ts b/TypeScript/7OnLoadHook/types/models/spt/config/IQuestConfig.d.ts index 362602c..2cdf4fa 100644 --- a/TypeScript/7OnLoadHook/types/models/spt/config/IQuestConfig.d.ts +++ b/TypeScript/7OnLoadHook/types/models/spt/config/IQuestConfig.d.ts @@ -47,6 +47,8 @@ export interface IRepeatableQuestConfig { /** Item tplIds to ignore when generating rewards */ rewardBlacklist: string[]; rewardAmmoStackMinSize: number; + freeChangesAvailable: number; + freeChanges: number; } export interface IRewardScaling { levels: number[]; diff --git a/TypeScript/7OnLoadHook/types/services/BotEquipmentModPoolService.d.ts b/TypeScript/7OnLoadHook/types/services/BotEquipmentModPoolService.d.ts index c53f31b..7b2b442 100644 --- a/TypeScript/7OnLoadHook/types/services/BotEquipmentModPoolService.d.ts +++ b/TypeScript/7OnLoadHook/types/services/BotEquipmentModPoolService.d.ts @@ -4,7 +4,7 @@ import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { VFS } from "@spt/utils/VFS"; /** Store a mapping between weapons, their slots and the items that fit those slots */ @@ -12,7 +12,7 @@ export declare class BotEquipmentModPoolService { protected logger: ILogger; protected vfs: VFS; protected itemHelper: ItemHelper; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected botConfig: IBotConfig; @@ -20,7 +20,7 @@ export declare class BotEquipmentModPoolService { protected gearModPool: Mods; protected weaponPoolGenerated: boolean; protected armorPoolGenerated: boolean; - constructor(logger: ILogger, vfs: VFS, itemHelper: ItemHelper, databaseServer: DatabaseServer, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, vfs: VFS, itemHelper: ItemHelper, databaseService: DatabaseService, localisationService: LocalisationService, configServer: ConfigServer); /** * Store dictionary of mods for each item passed in * @param items items to find related mods and store in modPool diff --git a/TypeScript/7OnLoadHook/types/services/CustomLocationWaveService.d.ts b/TypeScript/7OnLoadHook/types/services/CustomLocationWaveService.d.ts index 728a1e8..c72d5bb 100644 --- a/TypeScript/7OnLoadHook/types/services/CustomLocationWaveService.d.ts +++ b/TypeScript/7OnLoadHook/types/services/CustomLocationWaveService.d.ts @@ -2,15 +2,15 @@ import { BossLocationSpawn, Wave } from "@spt/models/eft/common/ILocationBase"; import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class CustomLocationWaveService { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, configServer: ConfigServer); /** * Add a boss wave to a map * @param locationId e.g. factory4_day, bigmap diff --git a/TypeScript/7OnLoadHook/types/services/InsuranceService.d.ts b/TypeScript/7OnLoadHook/types/services/InsuranceService.d.ts index c54f9f9..0000e66 100644 --- a/TypeScript/7OnLoadHook/types/services/InsuranceService.d.ts +++ b/TypeScript/7OnLoadHook/types/services/InsuranceService.d.ts @@ -13,8 +13,8 @@ import { ILostOnDeathConfig } from "@spt/models/spt/config/ILostOnDeathConfig"; import { IInsuranceEquipmentPkg } from "@spt/models/spt/services/IInsuranceEquipmentPkg"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -24,7 +24,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class InsuranceService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected secureContainerHelper: SecureContainerHelper; protected randomUtil: RandomUtil; protected itemHelper: ItemHelper; @@ -42,7 +42,7 @@ export declare class InsuranceService { protected insured: Record>; protected insuranceConfig: IInsuranceConfig; protected lostOnDeathConfig: ILostOnDeathConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, handbookHelper: HandbookHelper, localisationService: LocalisationService, localeService: LocaleService, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, databaseService: DatabaseService, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, handbookHelper: HandbookHelper, localisationService: LocalisationService, localeService: LocaleService, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); /** * Does player have insurance array * @param sessionId Player id diff --git a/TypeScript/7OnLoadHook/types/services/MailSendService.d.ts b/TypeScript/7OnLoadHook/types/services/MailSendService.d.ts index d445841..8f1f974 100644 --- a/TypeScript/7OnLoadHook/types/services/MailSendService.d.ts +++ b/TypeScript/7OnLoadHook/types/services/MailSendService.d.ts @@ -9,8 +9,8 @@ import { MessageType } from "@spt/models/enums/MessageType"; import { Traders } from "@spt/models/enums/Traders"; import { IProfileChangeEvent, ISendMessageDetails } from "@spt/models/spt/dialog/ISendMessageDetails"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; @@ -19,7 +19,7 @@ export declare class MailSendService { protected hashUtil: HashUtil; protected timeUtil: TimeUtil; protected saveServer: SaveServer; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected notifierHelper: NotifierHelper; protected dialogueHelper: DialogueHelper; protected notificationSendHelper: NotificationSendHelper; @@ -27,7 +27,7 @@ export declare class MailSendService { protected itemHelper: ItemHelper; protected traderHelper: TraderHelper; protected readonly systemSenderId = "59e7125688a45068a6249071"; - constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, dialogueHelper: DialogueHelper, notificationSendHelper: NotificationSendHelper, localisationService: LocalisationService, itemHelper: ItemHelper, traderHelper: TraderHelper); + constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseService: DatabaseService, notifierHelper: NotifierHelper, dialogueHelper: DialogueHelper, notificationSendHelper: NotificationSendHelper, localisationService: LocalisationService, itemHelper: ItemHelper, traderHelper: TraderHelper); /** * Send a message from an NPC (e.g. prapor) to the player with or without items using direct message text, do not look up any locale * @param sessionId The session ID to send the message to diff --git a/TypeScript/7OnLoadHook/types/services/OpenZoneService.d.ts b/TypeScript/7OnLoadHook/types/services/OpenZoneService.d.ts index 1bc5f00..c7dd0bd 100644 --- a/TypeScript/7OnLoadHook/types/services/OpenZoneService.d.ts +++ b/TypeScript/7OnLoadHook/types/services/OpenZoneService.d.ts @@ -1,18 +1,18 @@ import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RandomUtil } from "@spt/utils/RandomUtil"; /** Service for adding new zones to a maps OpenZones property */ export declare class OpenZoneService { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, localisationService: LocalisationService, configServer: ConfigServer); /** * Add open zone to specified map * @param locationId map location (e.g. factory4_day) diff --git a/TypeScript/7OnLoadHook/types/services/PaymentService.d.ts b/TypeScript/7OnLoadHook/types/services/PaymentService.d.ts index 64ff2c1..61d5731 100644 --- a/TypeScript/7OnLoadHook/types/services/PaymentService.d.ts +++ b/TypeScript/7OnLoadHook/types/services/PaymentService.d.ts @@ -9,7 +9,7 @@ import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRo import { IProcessBuyTradeRequestData } from "@spt/models/eft/trade/IProcessBuyTradeRequestData"; import { IProcessSellTradeRequestData } from "@spt/models/eft/trade/IProcessSellTradeRequestData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; @@ -17,14 +17,14 @@ export declare class PaymentService { protected logger: ILogger; protected hashUtil: HashUtil; protected httpResponse: HttpResponseUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected handbookHelper: HandbookHelper; protected traderHelper: TraderHelper; protected itemHelper: ItemHelper; protected inventoryHelper: InventoryHelper; protected localisationService: LocalisationService; protected paymentHelper: PaymentHelper; - constructor(logger: ILogger, hashUtil: HashUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, localisationService: LocalisationService, paymentHelper: PaymentHelper); + constructor(logger: ILogger, hashUtil: HashUtil, httpResponse: HttpResponseUtil, databaseService: DatabaseService, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, localisationService: LocalisationService, paymentHelper: PaymentHelper); /** * Take money and insert items into return to server request * @param pmcData Pmc profile diff --git a/TypeScript/7OnLoadHook/types/services/PlayerService.d.ts b/TypeScript/7OnLoadHook/types/services/PlayerService.d.ts index ae57410..84c4c6f 100644 --- a/TypeScript/7OnLoadHook/types/services/PlayerService.d.ts +++ b/TypeScript/7OnLoadHook/types/services/PlayerService.d.ts @@ -1,14 +1,14 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class PlayerService { protected logger: ILogger; protected timeUtil: TimeUtil; protected localisationService: LocalisationService; - protected databaseServer: DatabaseServer; - constructor(logger: ILogger, timeUtil: TimeUtil, localisationService: LocalisationService, databaseServer: DatabaseServer); + protected databaseService: DatabaseService; + constructor(logger: ILogger, timeUtil: TimeUtil, localisationService: LocalisationService, databaseService: DatabaseService); /** * Get level of player * @param pmcData Player profile diff --git a/TypeScript/7OnLoadHook/types/services/RagfairLinkedItemService.d.ts b/TypeScript/7OnLoadHook/types/services/RagfairLinkedItemService.d.ts index 6011c1a..0d03459 100644 --- a/TypeScript/7OnLoadHook/types/services/RagfairLinkedItemService.d.ts +++ b/TypeScript/7OnLoadHook/types/services/RagfairLinkedItemService.d.ts @@ -1,11 +1,11 @@ import { ItemHelper } from "@spt/helpers/ItemHelper"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; export declare class RagfairLinkedItemService { - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected linkedItemsCache: Record>; - constructor(databaseServer: DatabaseServer, itemHelper: ItemHelper); + constructor(databaseService: DatabaseService, itemHelper: ItemHelper); getLinkedItems(linkedSearchId: string): Set; /** * Use ragfair linked item service to get an array of items that can fit on or in designated itemtpl diff --git a/TypeScript/7OnLoadHook/types/services/RagfairOfferService.d.ts b/TypeScript/7OnLoadHook/types/services/RagfairOfferService.d.ts index c044f6d..4bc07c3 100644 --- a/TypeScript/7OnLoadHook/types/services/RagfairOfferService.d.ts +++ b/TypeScript/7OnLoadHook/types/services/RagfairOfferService.d.ts @@ -6,8 +6,8 @@ import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RagfairOfferHolder } from "@spt/utils/RagfairOfferHolder"; @@ -15,7 +15,7 @@ import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class RagfairOfferService { protected logger: ILogger; protected timeUtil: TimeUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected saveServer: SaveServer; protected ragfairServerHelper: RagfairServerHelper; protected profileHelper: ProfileHelper; @@ -28,7 +28,7 @@ export declare class RagfairOfferService { protected expiredOffers: Record; protected ragfairConfig: IRagfairConfig; protected ragfairOfferHandler: RagfairOfferHolder; - constructor(logger: ILogger, timeUtil: TimeUtil, databaseServer: DatabaseServer, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, eventOutputHolder: EventOutputHolder, httpResponse: HttpResponseUtil, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, timeUtil: TimeUtil, databaseService: DatabaseService, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, eventOutputHolder: EventOutputHolder, httpResponse: HttpResponseUtil, localisationService: LocalisationService, configServer: ConfigServer); /** * Get all offers * @returns IRagfairOffer array diff --git a/TypeScript/7OnLoadHook/types/services/RagfairPriceService.d.ts b/TypeScript/7OnLoadHook/types/services/RagfairPriceService.d.ts index 5b8fa56..0a2f26e 100644 --- a/TypeScript/7OnLoadHook/types/services/RagfairPriceService.d.ts +++ b/TypeScript/7OnLoadHook/types/services/RagfairPriceService.d.ts @@ -12,7 +12,7 @@ import { IRagfairConfig, IUnreasonableModPrices } from "@spt/models/spt/config/I import { IRagfairServerPrices } from "@spt/models/spt/ragfair/IRagfairServerPrices"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RandomUtil } from "@spt/utils/RandomUtil"; /** @@ -20,7 +20,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; */ export declare class RagfairPriceService implements OnLoad { protected handbookHelper: HandbookHelper; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected logger: ILogger; protected itemHelper: ItemHelper; protected presetHelper: PresetHelper; @@ -30,7 +30,7 @@ export declare class RagfairPriceService implements OnLoad { protected configServer: ConfigServer; protected ragfairConfig: IRagfairConfig; protected prices: IRagfairServerPrices; - constructor(handbookHelper: HandbookHelper, databaseServer: DatabaseServer, logger: ILogger, itemHelper: ItemHelper, presetHelper: PresetHelper, traderHelper: TraderHelper, randomUtil: RandomUtil, localisationService: LocalisationService, configServer: ConfigServer); + constructor(handbookHelper: HandbookHelper, databaseService: DatabaseService, logger: ILogger, itemHelper: ItemHelper, presetHelper: PresetHelper, traderHelper: TraderHelper, randomUtil: RandomUtil, localisationService: LocalisationService, configServer: ConfigServer); /** * Generate static (handbook) and dynamic (prices.json) flea prices, store inside class as dictionaries */ diff --git a/TypeScript/7OnLoadHook/types/services/RagfairTaxService.d.ts b/TypeScript/7OnLoadHook/types/services/RagfairTaxService.d.ts index 4e4e648..effb9f0 100644 --- a/TypeScript/7OnLoadHook/types/services/RagfairTaxService.d.ts +++ b/TypeScript/7OnLoadHook/types/services/RagfairTaxService.d.ts @@ -4,15 +4,15 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { IStorePlayerOfferTaxAmountRequestData } from "@spt/models/eft/ragfair/IStorePlayerOfferTaxAmountRequestData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; export declare class RagfairTaxService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected ragfairPriceService: RagfairPriceService; protected itemHelper: ItemHelper; protected playerOfferTaxCache: Record; - constructor(logger: ILogger, databaseServer: DatabaseServer, ragfairPriceService: RagfairPriceService, itemHelper: ItemHelper); + constructor(logger: ILogger, databaseService: DatabaseService, ragfairPriceService: RagfairPriceService, itemHelper: ItemHelper); storeClientOfferTaxValue(sessionId: string, offer: IStorePlayerOfferTaxAmountRequestData): void; clearStoredOfferTaxById(offerIdToRemove: string): void; getStoredClientOfferTaxValueById(offerIdToGet: string): IStorePlayerOfferTaxAmountRequestData; diff --git a/TypeScript/7OnLoadHook/types/services/RaidTimeAdjustmentService.d.ts b/TypeScript/7OnLoadHook/types/services/RaidTimeAdjustmentService.d.ts index f770b64..bfc099a 100644 --- a/TypeScript/7OnLoadHook/types/services/RaidTimeAdjustmentService.d.ts +++ b/TypeScript/7OnLoadHook/types/services/RaidTimeAdjustmentService.d.ts @@ -7,17 +7,17 @@ import { ILocationConfig, IScavRaidTimeLocationSettings, LootMultiplier } from " import { IRaidChanges } from "@spt/models/spt/location/IRaidChanges"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RaidTimeAdjustmentService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected randomUtil: RandomUtil; protected weightedRandomHelper: WeightedRandomHelper; protected applicationContext: ApplicationContext; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, applicationContext: ApplicationContext, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, applicationContext: ApplicationContext, configServer: ConfigServer); /** * Make alterations to the base map data passed in * Loot multipliers/waves/wave start times diff --git a/TypeScript/7OnLoadHook/types/services/RepairService.d.ts b/TypeScript/7OnLoadHook/types/services/RepairService.d.ts index 9203417..48f306e 100644 --- a/TypeScript/7OnLoadHook/types/services/RepairService.d.ts +++ b/TypeScript/7OnLoadHook/types/services/RepairService.d.ts @@ -14,13 +14,13 @@ import { SkillTypes } from "@spt/models/enums/SkillTypes"; import { BonusSettings, IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RepairService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected randomUtil: RandomUtil; protected itemHelper: ItemHelper; @@ -31,7 +31,7 @@ export declare class RepairService { protected localisationService: LocalisationService; protected configServer: ConfigServer; protected repairConfig: IRepairConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, profileHelper: ProfileHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, traderHelper: TraderHelper, weightedRandomHelper: WeightedRandomHelper, paymentService: PaymentService, repairHelper: RepairHelper, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, profileHelper: ProfileHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, traderHelper: TraderHelper, weightedRandomHelper: WeightedRandomHelper, paymentService: PaymentService, repairHelper: RepairHelper, localisationService: LocalisationService, configServer: ConfigServer); /** * Use trader to repair an items durability * @param sessionID Session id diff --git a/TypeScript/7OnLoadHook/types/services/TraderServicesService.d.ts b/TypeScript/7OnLoadHook/types/services/TraderServicesService.d.ts index 111c71a..e441eb6 100644 --- a/TypeScript/7OnLoadHook/types/services/TraderServicesService.d.ts +++ b/TypeScript/7OnLoadHook/types/services/TraderServicesService.d.ts @@ -1,13 +1,13 @@ import { ProfileHelper } from "@spt/helpers/ProfileHelper"; import { ITraderServiceModel } from "@spt/models/spt/services/ITraderServiceModel"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderServicesService { protected profileHelper: ProfileHelper; protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected cloner: ICloner; - constructor(profileHelper: ProfileHelper, logger: ILogger, databaseServer: DatabaseServer, cloner: ICloner); + constructor(profileHelper: ProfileHelper, logger: ILogger, databaseService: DatabaseService, cloner: ICloner); getTraderServices(sessionId: string, traderId: string): ITraderServiceModel[]; } diff --git a/TypeScript/7OnLoadHook/types/services/mod/CustomItemService.d.ts b/TypeScript/7OnLoadHook/types/services/mod/CustomItemService.d.ts index 6dc4730..1926bed 100644 --- a/TypeScript/7OnLoadHook/types/services/mod/CustomItemService.d.ts +++ b/TypeScript/7OnLoadHook/types/services/mod/CustomItemService.d.ts @@ -9,11 +9,11 @@ import { HashUtil } from "@spt/utils/HashUtil"; export declare class CustomItemService { protected logger: ILogger; protected hashUtil: HashUtil; - protected databaseServer: DatabaseService; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected itemBaseClassService: ItemBaseClassService; protected cloner: ICloner; - constructor(logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseService, itemHelper: ItemHelper, itemBaseClassService: ItemBaseClassService, cloner: ICloner); + constructor(logger: ILogger, hashUtil: HashUtil, databaseService: DatabaseService, itemHelper: ItemHelper, itemBaseClassService: ItemBaseClassService, cloner: ICloner); /** * Create a new item from a cloned item base * WARNING - If no item id is supplied, an id will be generated, this id will be random every time you add an item and will not be the same on each subsequent server start diff --git a/TypeScript/8OnUpdateHook/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts b/TypeScript/8OnUpdateHook/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts index a7491b5..c51bf7e 100644 --- a/TypeScript/8OnUpdateHook/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts +++ b/TypeScript/8OnUpdateHook/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts @@ -6,7 +6,7 @@ import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { ISendMessageRequest } from "@spt/models/eft/dialog/ISendMessageRequest"; import { IUserDialogInfo } from "@spt/models/eft/profile/ISptProfile"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -19,7 +19,7 @@ export declare class GiveSptCommand implements ISptCommand { protected presetHelper: PresetHelper; protected mailSendService: MailSendService; protected localeService: LocaleService; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemFilterService: ItemFilterService; protected cloner: ICloner; /** @@ -34,7 +34,7 @@ export declare class GiveSptCommand implements ISptCommand { private static acceptableConfidence; private static excludedPresetItems; protected savedCommand: Map; - constructor(logger: ILogger, itemHelper: ItemHelper, hashUtil: HashUtil, presetHelper: PresetHelper, mailSendService: MailSendService, localeService: LocaleService, databaseServer: DatabaseServer, itemFilterService: ItemFilterService, cloner: ICloner); + constructor(logger: ILogger, itemHelper: ItemHelper, hashUtil: HashUtil, presetHelper: PresetHelper, mailSendService: MailSendService, localeService: LocaleService, databaseService: DatabaseService, itemFilterService: ItemFilterService, cloner: ICloner); getCommand(): string; getCommandHelp(): string; performAction(commandHandler: IUserDialogInfo, sessionId: string, request: ISendMessageRequest): string; diff --git a/TypeScript/8OnUpdateHook/types/helpers/PresetHelper.d.ts b/TypeScript/8OnUpdateHook/types/helpers/PresetHelper.d.ts index 5fc8a7c..e71e5b7 100644 --- a/TypeScript/8OnUpdateHook/types/helpers/PresetHelper.d.ts +++ b/TypeScript/8OnUpdateHook/types/helpers/PresetHelper.d.ts @@ -1,16 +1,16 @@ import { IPreset } from "@spt/models/eft/common/IGlobals"; import { BaseClasses } from "@spt/models/enums/BaseClasses"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; import { ItemHelper } from "./ItemHelper"; export declare class PresetHelper { - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected cloner: ICloner; protected lookup: Record; protected defaultEquipmentPresets: Record; protected defaultWeaponPresets: Record; - constructor(databaseServer: DatabaseServer, itemHelper: ItemHelper, cloner: ICloner); + constructor(databaseService: DatabaseService, itemHelper: ItemHelper, cloner: ICloner); hydratePresetStore(input: Record): void; /** * Get default weapon and equipment presets diff --git a/TypeScript/8OnUpdateHook/types/helpers/ProfileHelper.d.ts b/TypeScript/8OnUpdateHook/types/helpers/ProfileHelper.d.ts index 37937ff..e943bd3 100644 --- a/TypeScript/8OnUpdateHook/types/helpers/ProfileHelper.d.ts +++ b/TypeScript/8OnUpdateHook/types/helpers/ProfileHelper.d.ts @@ -7,8 +7,8 @@ import { SkillTypes } from "@spt/models/enums/SkillTypes"; import { IInventoryConfig } from "@spt/models/spt/config/IInventoryConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileSnapshotService } from "@spt/services/ProfileSnapshotService"; import { ICloner } from "@spt/utils/cloners/ICloner"; @@ -21,14 +21,14 @@ export declare class ProfileHelper { protected watermark: Watermark; protected timeUtil: TimeUtil; protected saveServer: SaveServer; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected profileSnapshotService: ProfileSnapshotService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected cloner: ICloner; protected inventoryConfig: IInventoryConfig; - constructor(logger: ILogger, hashUtil: HashUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileSnapshotService: ProfileSnapshotService, localisationService: LocalisationService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, hashUtil: HashUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseService: DatabaseService, itemHelper: ItemHelper, profileSnapshotService: ProfileSnapshotService, localisationService: LocalisationService, configServer: ConfigServer, cloner: ICloner); /** * Remove/reset a completed quest condtion from players profile quest data * @param sessionID Session id diff --git a/TypeScript/8OnUpdateHook/types/helpers/QuestHelper.d.ts b/TypeScript/8OnUpdateHook/types/helpers/QuestHelper.d.ts index 39ba2a9..93368fa 100644 --- a/TypeScript/8OnUpdateHook/types/helpers/QuestHelper.d.ts +++ b/TypeScript/8OnUpdateHook/types/helpers/QuestHelper.d.ts @@ -18,7 +18,7 @@ import { IQuestConfig } from "@spt/models/spt/config/IQuestConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -30,9 +30,9 @@ export declare class QuestHelper { protected timeUtil: TimeUtil; protected hashUtil: HashUtil; protected itemHelper: ItemHelper; + protected databaseService: DatabaseService; protected questConditionHelper: QuestConditionHelper; protected eventOutputHolder: EventOutputHolder; - protected databaseServer: DatabaseServer; protected localeService: LocaleService; protected ragfairServerHelper: RagfairServerHelper; protected dialogueHelper: DialogueHelper; @@ -45,7 +45,7 @@ export declare class QuestHelper { protected configServer: ConfigServer; protected cloner: ICloner; protected questConfig: IQuestConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, questConditionHelper: QuestConditionHelper, eventOutputHolder: EventOutputHolder, databaseServer: DatabaseServer, localeService: LocaleService, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, localisationService: LocalisationService, traderHelper: TraderHelper, presetHelper: PresetHelper, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, databaseService: DatabaseService, questConditionHelper: QuestConditionHelper, eventOutputHolder: EventOutputHolder, localeService: LocaleService, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, localisationService: LocalisationService, traderHelper: TraderHelper, presetHelper: PresetHelper, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); /** * Get status of a quest in player profile by its id * @param pmcData Profile to search diff --git a/TypeScript/8OnUpdateHook/types/helpers/RagfairOfferHelper.d.ts b/TypeScript/8OnUpdateHook/types/helpers/RagfairOfferHelper.d.ts index 27bb081..a08e60a 100644 --- a/TypeScript/8OnUpdateHook/types/helpers/RagfairOfferHelper.d.ts +++ b/TypeScript/8OnUpdateHook/types/helpers/RagfairOfferHelper.d.ts @@ -19,8 +19,8 @@ import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -34,7 +34,7 @@ export declare class RagfairOfferHelper { protected timeUtil: TimeUtil; protected hashUtil: HashUtil; protected eventOutputHolder: EventOutputHolder; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected traderHelper: TraderHelper; protected saveServer: SaveServer; protected itemHelper: ItemHelper; @@ -55,7 +55,7 @@ export declare class RagfairOfferHelper { protected static goodSoldTemplate: string; protected ragfairConfig: IRagfairConfig; protected questConfig: IQuestConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, eventOutputHolder: EventOutputHolder, databaseServer: DatabaseServer, traderHelper: TraderHelper, saveServer: SaveServer, itemHelper: ItemHelper, botHelper: BotHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, localeService: LocaleService, localisationService: LocalisationService, mailSendService: MailSendService, configServer: ConfigServer); + constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, eventOutputHolder: EventOutputHolder, databaseService: DatabaseService, traderHelper: TraderHelper, saveServer: SaveServer, itemHelper: ItemHelper, botHelper: BotHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, localeService: LocaleService, localisationService: LocalisationService, mailSendService: MailSendService, configServer: ConfigServer); /** * Passthrough to ragfairOfferService.getOffers(), get flea offers a player should see * @param searchRequest Data from client diff --git a/TypeScript/8OnUpdateHook/types/helpers/RepairHelper.d.ts b/TypeScript/8OnUpdateHook/types/helpers/RepairHelper.d.ts index 4bd0577..99a21da 100644 --- a/TypeScript/8OnUpdateHook/types/helpers/RepairHelper.d.ts +++ b/TypeScript/8OnUpdateHook/types/helpers/RepairHelper.d.ts @@ -3,17 +3,17 @@ import { ITemplateItem, Props } from "@spt/models/eft/common/tables/ITemplateIte import { IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RepairHelper { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected configServer: ConfigServer; protected cloner: ICloner; protected repairConfig: IRepairConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, configServer: ConfigServer, cloner: ICloner); /** * Alter an items durability after a repair by trader/repair kit * @param itemToRepair item to update durability details diff --git a/TypeScript/8OnUpdateHook/types/helpers/TraderAssortHelper.d.ts b/TypeScript/8OnUpdateHook/types/helpers/TraderAssortHelper.d.ts index faf2a9d..8f8f802 100644 --- a/TypeScript/8OnUpdateHook/types/helpers/TraderAssortHelper.d.ts +++ b/TypeScript/8OnUpdateHook/types/helpers/TraderAssortHelper.d.ts @@ -9,7 +9,7 @@ import { ITrader, ITraderAssort } from "@spt/models/eft/common/tables/ITrader"; import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; @@ -21,7 +21,7 @@ export declare class TraderAssortHelper { protected logger: ILogger; protected mathUtil: MathUtil; protected timeUtil: TimeUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected assortHelper: AssortHelper; protected paymentHelper: PaymentHelper; @@ -37,7 +37,7 @@ export declare class TraderAssortHelper { protected traderConfig: ITraderConfig; protected mergedQuestAssorts: Record>; protected createdMergedQuestAssorts: boolean; - constructor(logger: ILogger, mathUtil: MathUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, profileHelper: ProfileHelper, assortHelper: AssortHelper, paymentHelper: PaymentHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, localisationService: LocalisationService, traderPurchasePersisterService: TraderPurchasePersisterService, traderHelper: TraderHelper, fenceService: FenceService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, mathUtil: MathUtil, timeUtil: TimeUtil, databaseService: DatabaseService, profileHelper: ProfileHelper, assortHelper: AssortHelper, paymentHelper: PaymentHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, localisationService: LocalisationService, traderPurchasePersisterService: TraderPurchasePersisterService, traderHelper: TraderHelper, fenceService: FenceService, configServer: ConfigServer, cloner: ICloner); /** * Get a traders assorts * Can be used for returning ragfair / fence assorts diff --git a/TypeScript/8OnUpdateHook/types/helpers/TraderHelper.d.ts b/TypeScript/8OnUpdateHook/types/helpers/TraderHelper.d.ts index 5f515da..eec1cc7 100644 --- a/TypeScript/8OnUpdateHook/types/helpers/TraderHelper.d.ts +++ b/TypeScript/8OnUpdateHook/types/helpers/TraderHelper.d.ts @@ -10,7 +10,7 @@ import { Traders } from "@spt/models/enums/Traders"; import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; @@ -18,7 +18,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class TraderHelper { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected handbookHelper: HandbookHelper; protected itemHelper: ItemHelper; @@ -33,7 +33,7 @@ export declare class TraderHelper { protected highestTraderPriceItems?: Record; /** Dictionary of item tpl and the highest trader buy back rouble price */ protected highestTraderBuyPriceItems?: Record; - constructor(logger: ILogger, databaseServer: DatabaseServer, profileHelper: ProfileHelper, handbookHelper: HandbookHelper, itemHelper: ItemHelper, playerService: PlayerService, localisationService: LocalisationService, fenceService: FenceService, timeUtil: TimeUtil, randomUtil: RandomUtil, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, profileHelper: ProfileHelper, handbookHelper: HandbookHelper, itemHelper: ItemHelper, playerService: PlayerService, localisationService: LocalisationService, fenceService: FenceService, timeUtil: TimeUtil, randomUtil: RandomUtil, configServer: ConfigServer); /** * Get a trader base object, update profile to reflect players current standing in profile * when trader not found in profile diff --git a/TypeScript/8OnUpdateHook/types/models/eft/common/IGlobals.d.ts b/TypeScript/8OnUpdateHook/types/models/eft/common/IGlobals.d.ts index 2209415..a0bb051 100644 --- a/TypeScript/8OnUpdateHook/types/models/eft/common/IGlobals.d.ts +++ b/TypeScript/8OnUpdateHook/types/models/eft/common/IGlobals.d.ts @@ -802,7 +802,6 @@ export interface IMaxActiveOfferCount { from: number; to: number; count: number; - countForSpecialEditions: number; } export interface IMaxSumForRarity { Common: IRarityMaxSum; diff --git a/TypeScript/8OnUpdateHook/types/models/eft/common/ILocationBase.d.ts b/TypeScript/8OnUpdateHook/types/models/eft/common/ILocationBase.d.ts index 65931f8..10f1a57 100644 --- a/TypeScript/8OnUpdateHook/types/models/eft/common/ILocationBase.d.ts +++ b/TypeScript/8OnUpdateHook/types/models/eft/common/ILocationBase.d.ts @@ -196,18 +196,24 @@ export interface Props { export interface Exit { /** % Chance out of 100 exit will appear in raid */ Chance: number; + ChancePVE: number; Count: number; + CountPVE: number; EntryPoints: string; EventAvailable: boolean; ExfiltrationTime: number; + ExfiltrationTimePVE: number; ExfiltrationType: string; RequiredSlot?: string; Id: string; MaxTime: number; + MaxTimePVE: number; MinTime: number; + MinTimePVE: number; Name: string; PassageRequirement: string; PlayersCount: number; + PlayersCountPVE: number; RequirementTip: string; Side?: string; } diff --git a/TypeScript/8OnUpdateHook/types/models/eft/common/tables/IRepeatableQuests.d.ts b/TypeScript/8OnUpdateHook/types/models/eft/common/tables/IRepeatableQuests.d.ts index 854c8ef..27ff49d 100644 --- a/TypeScript/8OnUpdateHook/types/models/eft/common/tables/IRepeatableQuests.d.ts +++ b/TypeScript/8OnUpdateHook/types/models/eft/common/tables/IRepeatableQuests.d.ts @@ -18,10 +18,13 @@ export interface IRepeatableTemplates { export interface IPmcDataRepeatableQuest { id?: string; name: string; + unavailableTime?: string; activeQuests: IRepeatableQuest[]; inactiveQuests: IRepeatableQuest[]; endTime: number; changeRequirement: Record; + freeChanges: number; + freeChangesAvailable: number; } export interface IChangeRequirement { changeCost: IChangeCost[]; diff --git a/TypeScript/8OnUpdateHook/types/models/eft/common/tables/ITemplateItem.d.ts b/TypeScript/8OnUpdateHook/types/models/eft/common/tables/ITemplateItem.d.ts index a8ccfbb..e5c6632 100644 --- a/TypeScript/8OnUpdateHook/types/models/eft/common/tables/ITemplateItem.d.ts +++ b/TypeScript/8OnUpdateHook/types/models/eft/common/tables/ITemplateItem.d.ts @@ -63,7 +63,7 @@ export interface Props { DiscardingBlock?: boolean; DropSoundType?: string; RagFairCommissionModifier?: number; - RarityPvE: string; + RarityPvE?: string; IsAlwaysAvailableForInsurance?: boolean; DiscardLimit?: number; MaxResource?: number; @@ -414,6 +414,12 @@ export interface Props { LayoutName?: string; Lower75Prefab?: Prefab; MaxUsages?: number; + ScavKillExpPenalty?: number; + ScavKillExpPenaltyPVE?: number; + ScavKillStandingPenalty?: number; + ScavKillStandingPenaltyPVE?: number; + TradersDiscount?: number; + TradersDiscountPVE?: number; } export interface IHealthEffect { type: string; diff --git a/TypeScript/8OnUpdateHook/types/models/spt/config/IQuestConfig.d.ts b/TypeScript/8OnUpdateHook/types/models/spt/config/IQuestConfig.d.ts index 362602c..2cdf4fa 100644 --- a/TypeScript/8OnUpdateHook/types/models/spt/config/IQuestConfig.d.ts +++ b/TypeScript/8OnUpdateHook/types/models/spt/config/IQuestConfig.d.ts @@ -47,6 +47,8 @@ export interface IRepeatableQuestConfig { /** Item tplIds to ignore when generating rewards */ rewardBlacklist: string[]; rewardAmmoStackMinSize: number; + freeChangesAvailable: number; + freeChanges: number; } export interface IRewardScaling { levels: number[]; diff --git a/TypeScript/8OnUpdateHook/types/services/BotEquipmentModPoolService.d.ts b/TypeScript/8OnUpdateHook/types/services/BotEquipmentModPoolService.d.ts index c53f31b..7b2b442 100644 --- a/TypeScript/8OnUpdateHook/types/services/BotEquipmentModPoolService.d.ts +++ b/TypeScript/8OnUpdateHook/types/services/BotEquipmentModPoolService.d.ts @@ -4,7 +4,7 @@ import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { VFS } from "@spt/utils/VFS"; /** Store a mapping between weapons, their slots and the items that fit those slots */ @@ -12,7 +12,7 @@ export declare class BotEquipmentModPoolService { protected logger: ILogger; protected vfs: VFS; protected itemHelper: ItemHelper; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected botConfig: IBotConfig; @@ -20,7 +20,7 @@ export declare class BotEquipmentModPoolService { protected gearModPool: Mods; protected weaponPoolGenerated: boolean; protected armorPoolGenerated: boolean; - constructor(logger: ILogger, vfs: VFS, itemHelper: ItemHelper, databaseServer: DatabaseServer, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, vfs: VFS, itemHelper: ItemHelper, databaseService: DatabaseService, localisationService: LocalisationService, configServer: ConfigServer); /** * Store dictionary of mods for each item passed in * @param items items to find related mods and store in modPool diff --git a/TypeScript/8OnUpdateHook/types/services/CustomLocationWaveService.d.ts b/TypeScript/8OnUpdateHook/types/services/CustomLocationWaveService.d.ts index 728a1e8..c72d5bb 100644 --- a/TypeScript/8OnUpdateHook/types/services/CustomLocationWaveService.d.ts +++ b/TypeScript/8OnUpdateHook/types/services/CustomLocationWaveService.d.ts @@ -2,15 +2,15 @@ import { BossLocationSpawn, Wave } from "@spt/models/eft/common/ILocationBase"; import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class CustomLocationWaveService { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, configServer: ConfigServer); /** * Add a boss wave to a map * @param locationId e.g. factory4_day, bigmap diff --git a/TypeScript/8OnUpdateHook/types/services/InsuranceService.d.ts b/TypeScript/8OnUpdateHook/types/services/InsuranceService.d.ts index c54f9f9..0000e66 100644 --- a/TypeScript/8OnUpdateHook/types/services/InsuranceService.d.ts +++ b/TypeScript/8OnUpdateHook/types/services/InsuranceService.d.ts @@ -13,8 +13,8 @@ import { ILostOnDeathConfig } from "@spt/models/spt/config/ILostOnDeathConfig"; import { IInsuranceEquipmentPkg } from "@spt/models/spt/services/IInsuranceEquipmentPkg"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -24,7 +24,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class InsuranceService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected secureContainerHelper: SecureContainerHelper; protected randomUtil: RandomUtil; protected itemHelper: ItemHelper; @@ -42,7 +42,7 @@ export declare class InsuranceService { protected insured: Record>; protected insuranceConfig: IInsuranceConfig; protected lostOnDeathConfig: ILostOnDeathConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, handbookHelper: HandbookHelper, localisationService: LocalisationService, localeService: LocaleService, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, databaseService: DatabaseService, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, handbookHelper: HandbookHelper, localisationService: LocalisationService, localeService: LocaleService, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); /** * Does player have insurance array * @param sessionId Player id diff --git a/TypeScript/8OnUpdateHook/types/services/MailSendService.d.ts b/TypeScript/8OnUpdateHook/types/services/MailSendService.d.ts index d445841..8f1f974 100644 --- a/TypeScript/8OnUpdateHook/types/services/MailSendService.d.ts +++ b/TypeScript/8OnUpdateHook/types/services/MailSendService.d.ts @@ -9,8 +9,8 @@ import { MessageType } from "@spt/models/enums/MessageType"; import { Traders } from "@spt/models/enums/Traders"; import { IProfileChangeEvent, ISendMessageDetails } from "@spt/models/spt/dialog/ISendMessageDetails"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; @@ -19,7 +19,7 @@ export declare class MailSendService { protected hashUtil: HashUtil; protected timeUtil: TimeUtil; protected saveServer: SaveServer; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected notifierHelper: NotifierHelper; protected dialogueHelper: DialogueHelper; protected notificationSendHelper: NotificationSendHelper; @@ -27,7 +27,7 @@ export declare class MailSendService { protected itemHelper: ItemHelper; protected traderHelper: TraderHelper; protected readonly systemSenderId = "59e7125688a45068a6249071"; - constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, dialogueHelper: DialogueHelper, notificationSendHelper: NotificationSendHelper, localisationService: LocalisationService, itemHelper: ItemHelper, traderHelper: TraderHelper); + constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseService: DatabaseService, notifierHelper: NotifierHelper, dialogueHelper: DialogueHelper, notificationSendHelper: NotificationSendHelper, localisationService: LocalisationService, itemHelper: ItemHelper, traderHelper: TraderHelper); /** * Send a message from an NPC (e.g. prapor) to the player with or without items using direct message text, do not look up any locale * @param sessionId The session ID to send the message to diff --git a/TypeScript/8OnUpdateHook/types/services/OpenZoneService.d.ts b/TypeScript/8OnUpdateHook/types/services/OpenZoneService.d.ts index 1bc5f00..c7dd0bd 100644 --- a/TypeScript/8OnUpdateHook/types/services/OpenZoneService.d.ts +++ b/TypeScript/8OnUpdateHook/types/services/OpenZoneService.d.ts @@ -1,18 +1,18 @@ import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RandomUtil } from "@spt/utils/RandomUtil"; /** Service for adding new zones to a maps OpenZones property */ export declare class OpenZoneService { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, localisationService: LocalisationService, configServer: ConfigServer); /** * Add open zone to specified map * @param locationId map location (e.g. factory4_day) diff --git a/TypeScript/8OnUpdateHook/types/services/PaymentService.d.ts b/TypeScript/8OnUpdateHook/types/services/PaymentService.d.ts index 64ff2c1..61d5731 100644 --- a/TypeScript/8OnUpdateHook/types/services/PaymentService.d.ts +++ b/TypeScript/8OnUpdateHook/types/services/PaymentService.d.ts @@ -9,7 +9,7 @@ import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRo import { IProcessBuyTradeRequestData } from "@spt/models/eft/trade/IProcessBuyTradeRequestData"; import { IProcessSellTradeRequestData } from "@spt/models/eft/trade/IProcessSellTradeRequestData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; @@ -17,14 +17,14 @@ export declare class PaymentService { protected logger: ILogger; protected hashUtil: HashUtil; protected httpResponse: HttpResponseUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected handbookHelper: HandbookHelper; protected traderHelper: TraderHelper; protected itemHelper: ItemHelper; protected inventoryHelper: InventoryHelper; protected localisationService: LocalisationService; protected paymentHelper: PaymentHelper; - constructor(logger: ILogger, hashUtil: HashUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, localisationService: LocalisationService, paymentHelper: PaymentHelper); + constructor(logger: ILogger, hashUtil: HashUtil, httpResponse: HttpResponseUtil, databaseService: DatabaseService, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, localisationService: LocalisationService, paymentHelper: PaymentHelper); /** * Take money and insert items into return to server request * @param pmcData Pmc profile diff --git a/TypeScript/8OnUpdateHook/types/services/PlayerService.d.ts b/TypeScript/8OnUpdateHook/types/services/PlayerService.d.ts index ae57410..84c4c6f 100644 --- a/TypeScript/8OnUpdateHook/types/services/PlayerService.d.ts +++ b/TypeScript/8OnUpdateHook/types/services/PlayerService.d.ts @@ -1,14 +1,14 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class PlayerService { protected logger: ILogger; protected timeUtil: TimeUtil; protected localisationService: LocalisationService; - protected databaseServer: DatabaseServer; - constructor(logger: ILogger, timeUtil: TimeUtil, localisationService: LocalisationService, databaseServer: DatabaseServer); + protected databaseService: DatabaseService; + constructor(logger: ILogger, timeUtil: TimeUtil, localisationService: LocalisationService, databaseService: DatabaseService); /** * Get level of player * @param pmcData Player profile diff --git a/TypeScript/8OnUpdateHook/types/services/RagfairLinkedItemService.d.ts b/TypeScript/8OnUpdateHook/types/services/RagfairLinkedItemService.d.ts index 6011c1a..0d03459 100644 --- a/TypeScript/8OnUpdateHook/types/services/RagfairLinkedItemService.d.ts +++ b/TypeScript/8OnUpdateHook/types/services/RagfairLinkedItemService.d.ts @@ -1,11 +1,11 @@ import { ItemHelper } from "@spt/helpers/ItemHelper"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; export declare class RagfairLinkedItemService { - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected linkedItemsCache: Record>; - constructor(databaseServer: DatabaseServer, itemHelper: ItemHelper); + constructor(databaseService: DatabaseService, itemHelper: ItemHelper); getLinkedItems(linkedSearchId: string): Set; /** * Use ragfair linked item service to get an array of items that can fit on or in designated itemtpl diff --git a/TypeScript/8OnUpdateHook/types/services/RagfairOfferService.d.ts b/TypeScript/8OnUpdateHook/types/services/RagfairOfferService.d.ts index c044f6d..4bc07c3 100644 --- a/TypeScript/8OnUpdateHook/types/services/RagfairOfferService.d.ts +++ b/TypeScript/8OnUpdateHook/types/services/RagfairOfferService.d.ts @@ -6,8 +6,8 @@ import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RagfairOfferHolder } from "@spt/utils/RagfairOfferHolder"; @@ -15,7 +15,7 @@ import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class RagfairOfferService { protected logger: ILogger; protected timeUtil: TimeUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected saveServer: SaveServer; protected ragfairServerHelper: RagfairServerHelper; protected profileHelper: ProfileHelper; @@ -28,7 +28,7 @@ export declare class RagfairOfferService { protected expiredOffers: Record; protected ragfairConfig: IRagfairConfig; protected ragfairOfferHandler: RagfairOfferHolder; - constructor(logger: ILogger, timeUtil: TimeUtil, databaseServer: DatabaseServer, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, eventOutputHolder: EventOutputHolder, httpResponse: HttpResponseUtil, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, timeUtil: TimeUtil, databaseService: DatabaseService, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, eventOutputHolder: EventOutputHolder, httpResponse: HttpResponseUtil, localisationService: LocalisationService, configServer: ConfigServer); /** * Get all offers * @returns IRagfairOffer array diff --git a/TypeScript/8OnUpdateHook/types/services/RagfairPriceService.d.ts b/TypeScript/8OnUpdateHook/types/services/RagfairPriceService.d.ts index 5b8fa56..0a2f26e 100644 --- a/TypeScript/8OnUpdateHook/types/services/RagfairPriceService.d.ts +++ b/TypeScript/8OnUpdateHook/types/services/RagfairPriceService.d.ts @@ -12,7 +12,7 @@ import { IRagfairConfig, IUnreasonableModPrices } from "@spt/models/spt/config/I import { IRagfairServerPrices } from "@spt/models/spt/ragfair/IRagfairServerPrices"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RandomUtil } from "@spt/utils/RandomUtil"; /** @@ -20,7 +20,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; */ export declare class RagfairPriceService implements OnLoad { protected handbookHelper: HandbookHelper; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected logger: ILogger; protected itemHelper: ItemHelper; protected presetHelper: PresetHelper; @@ -30,7 +30,7 @@ export declare class RagfairPriceService implements OnLoad { protected configServer: ConfigServer; protected ragfairConfig: IRagfairConfig; protected prices: IRagfairServerPrices; - constructor(handbookHelper: HandbookHelper, databaseServer: DatabaseServer, logger: ILogger, itemHelper: ItemHelper, presetHelper: PresetHelper, traderHelper: TraderHelper, randomUtil: RandomUtil, localisationService: LocalisationService, configServer: ConfigServer); + constructor(handbookHelper: HandbookHelper, databaseService: DatabaseService, logger: ILogger, itemHelper: ItemHelper, presetHelper: PresetHelper, traderHelper: TraderHelper, randomUtil: RandomUtil, localisationService: LocalisationService, configServer: ConfigServer); /** * Generate static (handbook) and dynamic (prices.json) flea prices, store inside class as dictionaries */ diff --git a/TypeScript/8OnUpdateHook/types/services/RagfairTaxService.d.ts b/TypeScript/8OnUpdateHook/types/services/RagfairTaxService.d.ts index 4e4e648..effb9f0 100644 --- a/TypeScript/8OnUpdateHook/types/services/RagfairTaxService.d.ts +++ b/TypeScript/8OnUpdateHook/types/services/RagfairTaxService.d.ts @@ -4,15 +4,15 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { IStorePlayerOfferTaxAmountRequestData } from "@spt/models/eft/ragfair/IStorePlayerOfferTaxAmountRequestData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; export declare class RagfairTaxService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected ragfairPriceService: RagfairPriceService; protected itemHelper: ItemHelper; protected playerOfferTaxCache: Record; - constructor(logger: ILogger, databaseServer: DatabaseServer, ragfairPriceService: RagfairPriceService, itemHelper: ItemHelper); + constructor(logger: ILogger, databaseService: DatabaseService, ragfairPriceService: RagfairPriceService, itemHelper: ItemHelper); storeClientOfferTaxValue(sessionId: string, offer: IStorePlayerOfferTaxAmountRequestData): void; clearStoredOfferTaxById(offerIdToRemove: string): void; getStoredClientOfferTaxValueById(offerIdToGet: string): IStorePlayerOfferTaxAmountRequestData; diff --git a/TypeScript/8OnUpdateHook/types/services/RaidTimeAdjustmentService.d.ts b/TypeScript/8OnUpdateHook/types/services/RaidTimeAdjustmentService.d.ts index f770b64..bfc099a 100644 --- a/TypeScript/8OnUpdateHook/types/services/RaidTimeAdjustmentService.d.ts +++ b/TypeScript/8OnUpdateHook/types/services/RaidTimeAdjustmentService.d.ts @@ -7,17 +7,17 @@ import { ILocationConfig, IScavRaidTimeLocationSettings, LootMultiplier } from " import { IRaidChanges } from "@spt/models/spt/location/IRaidChanges"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RaidTimeAdjustmentService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected randomUtil: RandomUtil; protected weightedRandomHelper: WeightedRandomHelper; protected applicationContext: ApplicationContext; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, applicationContext: ApplicationContext, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, applicationContext: ApplicationContext, configServer: ConfigServer); /** * Make alterations to the base map data passed in * Loot multipliers/waves/wave start times diff --git a/TypeScript/8OnUpdateHook/types/services/RepairService.d.ts b/TypeScript/8OnUpdateHook/types/services/RepairService.d.ts index 9203417..48f306e 100644 --- a/TypeScript/8OnUpdateHook/types/services/RepairService.d.ts +++ b/TypeScript/8OnUpdateHook/types/services/RepairService.d.ts @@ -14,13 +14,13 @@ import { SkillTypes } from "@spt/models/enums/SkillTypes"; import { BonusSettings, IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RepairService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected randomUtil: RandomUtil; protected itemHelper: ItemHelper; @@ -31,7 +31,7 @@ export declare class RepairService { protected localisationService: LocalisationService; protected configServer: ConfigServer; protected repairConfig: IRepairConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, profileHelper: ProfileHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, traderHelper: TraderHelper, weightedRandomHelper: WeightedRandomHelper, paymentService: PaymentService, repairHelper: RepairHelper, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, profileHelper: ProfileHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, traderHelper: TraderHelper, weightedRandomHelper: WeightedRandomHelper, paymentService: PaymentService, repairHelper: RepairHelper, localisationService: LocalisationService, configServer: ConfigServer); /** * Use trader to repair an items durability * @param sessionID Session id diff --git a/TypeScript/8OnUpdateHook/types/services/TraderServicesService.d.ts b/TypeScript/8OnUpdateHook/types/services/TraderServicesService.d.ts index 111c71a..e441eb6 100644 --- a/TypeScript/8OnUpdateHook/types/services/TraderServicesService.d.ts +++ b/TypeScript/8OnUpdateHook/types/services/TraderServicesService.d.ts @@ -1,13 +1,13 @@ import { ProfileHelper } from "@spt/helpers/ProfileHelper"; import { ITraderServiceModel } from "@spt/models/spt/services/ITraderServiceModel"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderServicesService { protected profileHelper: ProfileHelper; protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected cloner: ICloner; - constructor(profileHelper: ProfileHelper, logger: ILogger, databaseServer: DatabaseServer, cloner: ICloner); + constructor(profileHelper: ProfileHelper, logger: ILogger, databaseService: DatabaseService, cloner: ICloner); getTraderServices(sessionId: string, traderId: string): ITraderServiceModel[]; } diff --git a/TypeScript/8OnUpdateHook/types/services/mod/CustomItemService.d.ts b/TypeScript/8OnUpdateHook/types/services/mod/CustomItemService.d.ts index 6dc4730..1926bed 100644 --- a/TypeScript/8OnUpdateHook/types/services/mod/CustomItemService.d.ts +++ b/TypeScript/8OnUpdateHook/types/services/mod/CustomItemService.d.ts @@ -9,11 +9,11 @@ import { HashUtil } from "@spt/utils/HashUtil"; export declare class CustomItemService { protected logger: ILogger; protected hashUtil: HashUtil; - protected databaseServer: DatabaseService; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected itemBaseClassService: ItemBaseClassService; protected cloner: ICloner; - constructor(logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseService, itemHelper: ItemHelper, itemBaseClassService: ItemBaseClassService, cloner: ICloner); + constructor(logger: ILogger, hashUtil: HashUtil, databaseService: DatabaseService, itemHelper: ItemHelper, itemBaseClassService: ItemBaseClassService, cloner: ICloner); /** * Create a new item from a cloned item base * WARNING - If no item id is supplied, an id will be generated, this id will be random every time you add an item and will not be the same on each subsequent server start diff --git a/TypeScript/9RouterHooks/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts b/TypeScript/9RouterHooks/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts index a7491b5..c51bf7e 100644 --- a/TypeScript/9RouterHooks/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts +++ b/TypeScript/9RouterHooks/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts @@ -6,7 +6,7 @@ import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { ISendMessageRequest } from "@spt/models/eft/dialog/ISendMessageRequest"; import { IUserDialogInfo } from "@spt/models/eft/profile/ISptProfile"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ItemFilterService } from "@spt/services/ItemFilterService"; import { LocaleService } from "@spt/services/LocaleService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -19,7 +19,7 @@ export declare class GiveSptCommand implements ISptCommand { protected presetHelper: PresetHelper; protected mailSendService: MailSendService; protected localeService: LocaleService; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemFilterService: ItemFilterService; protected cloner: ICloner; /** @@ -34,7 +34,7 @@ export declare class GiveSptCommand implements ISptCommand { private static acceptableConfidence; private static excludedPresetItems; protected savedCommand: Map; - constructor(logger: ILogger, itemHelper: ItemHelper, hashUtil: HashUtil, presetHelper: PresetHelper, mailSendService: MailSendService, localeService: LocaleService, databaseServer: DatabaseServer, itemFilterService: ItemFilterService, cloner: ICloner); + constructor(logger: ILogger, itemHelper: ItemHelper, hashUtil: HashUtil, presetHelper: PresetHelper, mailSendService: MailSendService, localeService: LocaleService, databaseService: DatabaseService, itemFilterService: ItemFilterService, cloner: ICloner); getCommand(): string; getCommandHelp(): string; performAction(commandHandler: IUserDialogInfo, sessionId: string, request: ISendMessageRequest): string; diff --git a/TypeScript/9RouterHooks/types/helpers/PresetHelper.d.ts b/TypeScript/9RouterHooks/types/helpers/PresetHelper.d.ts index 5fc8a7c..e71e5b7 100644 --- a/TypeScript/9RouterHooks/types/helpers/PresetHelper.d.ts +++ b/TypeScript/9RouterHooks/types/helpers/PresetHelper.d.ts @@ -1,16 +1,16 @@ import { IPreset } from "@spt/models/eft/common/IGlobals"; import { BaseClasses } from "@spt/models/enums/BaseClasses"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; import { ItemHelper } from "./ItemHelper"; export declare class PresetHelper { - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected cloner: ICloner; protected lookup: Record; protected defaultEquipmentPresets: Record; protected defaultWeaponPresets: Record; - constructor(databaseServer: DatabaseServer, itemHelper: ItemHelper, cloner: ICloner); + constructor(databaseService: DatabaseService, itemHelper: ItemHelper, cloner: ICloner); hydratePresetStore(input: Record): void; /** * Get default weapon and equipment presets diff --git a/TypeScript/9RouterHooks/types/helpers/ProfileHelper.d.ts b/TypeScript/9RouterHooks/types/helpers/ProfileHelper.d.ts index 37937ff..e943bd3 100644 --- a/TypeScript/9RouterHooks/types/helpers/ProfileHelper.d.ts +++ b/TypeScript/9RouterHooks/types/helpers/ProfileHelper.d.ts @@ -7,8 +7,8 @@ import { SkillTypes } from "@spt/models/enums/SkillTypes"; import { IInventoryConfig } from "@spt/models/spt/config/IInventoryConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { ProfileSnapshotService } from "@spt/services/ProfileSnapshotService"; import { ICloner } from "@spt/utils/cloners/ICloner"; @@ -21,14 +21,14 @@ export declare class ProfileHelper { protected watermark: Watermark; protected timeUtil: TimeUtil; protected saveServer: SaveServer; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected profileSnapshotService: ProfileSnapshotService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected cloner: ICloner; protected inventoryConfig: IInventoryConfig; - constructor(logger: ILogger, hashUtil: HashUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileSnapshotService: ProfileSnapshotService, localisationService: LocalisationService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, hashUtil: HashUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseService: DatabaseService, itemHelper: ItemHelper, profileSnapshotService: ProfileSnapshotService, localisationService: LocalisationService, configServer: ConfigServer, cloner: ICloner); /** * Remove/reset a completed quest condtion from players profile quest data * @param sessionID Session id diff --git a/TypeScript/9RouterHooks/types/helpers/QuestHelper.d.ts b/TypeScript/9RouterHooks/types/helpers/QuestHelper.d.ts index 39ba2a9..93368fa 100644 --- a/TypeScript/9RouterHooks/types/helpers/QuestHelper.d.ts +++ b/TypeScript/9RouterHooks/types/helpers/QuestHelper.d.ts @@ -18,7 +18,7 @@ import { IQuestConfig } from "@spt/models/spt/config/IQuestConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -30,9 +30,9 @@ export declare class QuestHelper { protected timeUtil: TimeUtil; protected hashUtil: HashUtil; protected itemHelper: ItemHelper; + protected databaseService: DatabaseService; protected questConditionHelper: QuestConditionHelper; protected eventOutputHolder: EventOutputHolder; - protected databaseServer: DatabaseServer; protected localeService: LocaleService; protected ragfairServerHelper: RagfairServerHelper; protected dialogueHelper: DialogueHelper; @@ -45,7 +45,7 @@ export declare class QuestHelper { protected configServer: ConfigServer; protected cloner: ICloner; protected questConfig: IQuestConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, questConditionHelper: QuestConditionHelper, eventOutputHolder: EventOutputHolder, databaseServer: DatabaseServer, localeService: LocaleService, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, localisationService: LocalisationService, traderHelper: TraderHelper, presetHelper: PresetHelper, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, databaseService: DatabaseService, questConditionHelper: QuestConditionHelper, eventOutputHolder: EventOutputHolder, localeService: LocaleService, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, localisationService: LocalisationService, traderHelper: TraderHelper, presetHelper: PresetHelper, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); /** * Get status of a quest in player profile by its id * @param pmcData Profile to search diff --git a/TypeScript/9RouterHooks/types/helpers/RagfairOfferHelper.d.ts b/TypeScript/9RouterHooks/types/helpers/RagfairOfferHelper.d.ts index 27bb081..a08e60a 100644 --- a/TypeScript/9RouterHooks/types/helpers/RagfairOfferHelper.d.ts +++ b/TypeScript/9RouterHooks/types/helpers/RagfairOfferHelper.d.ts @@ -19,8 +19,8 @@ import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -34,7 +34,7 @@ export declare class RagfairOfferHelper { protected timeUtil: TimeUtil; protected hashUtil: HashUtil; protected eventOutputHolder: EventOutputHolder; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected traderHelper: TraderHelper; protected saveServer: SaveServer; protected itemHelper: ItemHelper; @@ -55,7 +55,7 @@ export declare class RagfairOfferHelper { protected static goodSoldTemplate: string; protected ragfairConfig: IRagfairConfig; protected questConfig: IQuestConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, eventOutputHolder: EventOutputHolder, databaseServer: DatabaseServer, traderHelper: TraderHelper, saveServer: SaveServer, itemHelper: ItemHelper, botHelper: BotHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, localeService: LocaleService, localisationService: LocalisationService, mailSendService: MailSendService, configServer: ConfigServer); + constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, eventOutputHolder: EventOutputHolder, databaseService: DatabaseService, traderHelper: TraderHelper, saveServer: SaveServer, itemHelper: ItemHelper, botHelper: BotHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, localeService: LocaleService, localisationService: LocalisationService, mailSendService: MailSendService, configServer: ConfigServer); /** * Passthrough to ragfairOfferService.getOffers(), get flea offers a player should see * @param searchRequest Data from client diff --git a/TypeScript/9RouterHooks/types/helpers/RepairHelper.d.ts b/TypeScript/9RouterHooks/types/helpers/RepairHelper.d.ts index 4bd0577..99a21da 100644 --- a/TypeScript/9RouterHooks/types/helpers/RepairHelper.d.ts +++ b/TypeScript/9RouterHooks/types/helpers/RepairHelper.d.ts @@ -3,17 +3,17 @@ import { ITemplateItem, Props } from "@spt/models/eft/common/tables/ITemplateIte import { IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RepairHelper { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected configServer: ConfigServer; protected cloner: ICloner; protected repairConfig: IRepairConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, configServer: ConfigServer, cloner: ICloner); /** * Alter an items durability after a repair by trader/repair kit * @param itemToRepair item to update durability details diff --git a/TypeScript/9RouterHooks/types/helpers/TraderAssortHelper.d.ts b/TypeScript/9RouterHooks/types/helpers/TraderAssortHelper.d.ts index faf2a9d..8f8f802 100644 --- a/TypeScript/9RouterHooks/types/helpers/TraderAssortHelper.d.ts +++ b/TypeScript/9RouterHooks/types/helpers/TraderAssortHelper.d.ts @@ -9,7 +9,7 @@ import { ITrader, ITraderAssort } from "@spt/models/eft/common/tables/ITrader"; import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TraderAssortService } from "@spt/services/TraderAssortService"; @@ -21,7 +21,7 @@ export declare class TraderAssortHelper { protected logger: ILogger; protected mathUtil: MathUtil; protected timeUtil: TimeUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected assortHelper: AssortHelper; protected paymentHelper: PaymentHelper; @@ -37,7 +37,7 @@ export declare class TraderAssortHelper { protected traderConfig: ITraderConfig; protected mergedQuestAssorts: Record>; protected createdMergedQuestAssorts: boolean; - constructor(logger: ILogger, mathUtil: MathUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, profileHelper: ProfileHelper, assortHelper: AssortHelper, paymentHelper: PaymentHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, localisationService: LocalisationService, traderPurchasePersisterService: TraderPurchasePersisterService, traderHelper: TraderHelper, fenceService: FenceService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, mathUtil: MathUtil, timeUtil: TimeUtil, databaseService: DatabaseService, profileHelper: ProfileHelper, assortHelper: AssortHelper, paymentHelper: PaymentHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, localisationService: LocalisationService, traderPurchasePersisterService: TraderPurchasePersisterService, traderHelper: TraderHelper, fenceService: FenceService, configServer: ConfigServer, cloner: ICloner); /** * Get a traders assorts * Can be used for returning ragfair / fence assorts diff --git a/TypeScript/9RouterHooks/types/helpers/TraderHelper.d.ts b/TypeScript/9RouterHooks/types/helpers/TraderHelper.d.ts index 5f515da..eec1cc7 100644 --- a/TypeScript/9RouterHooks/types/helpers/TraderHelper.d.ts +++ b/TypeScript/9RouterHooks/types/helpers/TraderHelper.d.ts @@ -10,7 +10,7 @@ import { Traders } from "@spt/models/enums/Traders"; import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { FenceService } from "@spt/services/FenceService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PlayerService } from "@spt/services/PlayerService"; @@ -18,7 +18,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class TraderHelper { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected handbookHelper: HandbookHelper; protected itemHelper: ItemHelper; @@ -33,7 +33,7 @@ export declare class TraderHelper { protected highestTraderPriceItems?: Record; /** Dictionary of item tpl and the highest trader buy back rouble price */ protected highestTraderBuyPriceItems?: Record; - constructor(logger: ILogger, databaseServer: DatabaseServer, profileHelper: ProfileHelper, handbookHelper: HandbookHelper, itemHelper: ItemHelper, playerService: PlayerService, localisationService: LocalisationService, fenceService: FenceService, timeUtil: TimeUtil, randomUtil: RandomUtil, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, profileHelper: ProfileHelper, handbookHelper: HandbookHelper, itemHelper: ItemHelper, playerService: PlayerService, localisationService: LocalisationService, fenceService: FenceService, timeUtil: TimeUtil, randomUtil: RandomUtil, configServer: ConfigServer); /** * Get a trader base object, update profile to reflect players current standing in profile * when trader not found in profile diff --git a/TypeScript/9RouterHooks/types/models/eft/common/IGlobals.d.ts b/TypeScript/9RouterHooks/types/models/eft/common/IGlobals.d.ts index 2209415..a0bb051 100644 --- a/TypeScript/9RouterHooks/types/models/eft/common/IGlobals.d.ts +++ b/TypeScript/9RouterHooks/types/models/eft/common/IGlobals.d.ts @@ -802,7 +802,6 @@ export interface IMaxActiveOfferCount { from: number; to: number; count: number; - countForSpecialEditions: number; } export interface IMaxSumForRarity { Common: IRarityMaxSum; diff --git a/TypeScript/9RouterHooks/types/models/eft/common/ILocationBase.d.ts b/TypeScript/9RouterHooks/types/models/eft/common/ILocationBase.d.ts index 65931f8..10f1a57 100644 --- a/TypeScript/9RouterHooks/types/models/eft/common/ILocationBase.d.ts +++ b/TypeScript/9RouterHooks/types/models/eft/common/ILocationBase.d.ts @@ -196,18 +196,24 @@ export interface Props { export interface Exit { /** % Chance out of 100 exit will appear in raid */ Chance: number; + ChancePVE: number; Count: number; + CountPVE: number; EntryPoints: string; EventAvailable: boolean; ExfiltrationTime: number; + ExfiltrationTimePVE: number; ExfiltrationType: string; RequiredSlot?: string; Id: string; MaxTime: number; + MaxTimePVE: number; MinTime: number; + MinTimePVE: number; Name: string; PassageRequirement: string; PlayersCount: number; + PlayersCountPVE: number; RequirementTip: string; Side?: string; } diff --git a/TypeScript/9RouterHooks/types/models/eft/common/tables/IRepeatableQuests.d.ts b/TypeScript/9RouterHooks/types/models/eft/common/tables/IRepeatableQuests.d.ts index 854c8ef..27ff49d 100644 --- a/TypeScript/9RouterHooks/types/models/eft/common/tables/IRepeatableQuests.d.ts +++ b/TypeScript/9RouterHooks/types/models/eft/common/tables/IRepeatableQuests.d.ts @@ -18,10 +18,13 @@ export interface IRepeatableTemplates { export interface IPmcDataRepeatableQuest { id?: string; name: string; + unavailableTime?: string; activeQuests: IRepeatableQuest[]; inactiveQuests: IRepeatableQuest[]; endTime: number; changeRequirement: Record; + freeChanges: number; + freeChangesAvailable: number; } export interface IChangeRequirement { changeCost: IChangeCost[]; diff --git a/TypeScript/9RouterHooks/types/models/eft/common/tables/ITemplateItem.d.ts b/TypeScript/9RouterHooks/types/models/eft/common/tables/ITemplateItem.d.ts index a8ccfbb..e5c6632 100644 --- a/TypeScript/9RouterHooks/types/models/eft/common/tables/ITemplateItem.d.ts +++ b/TypeScript/9RouterHooks/types/models/eft/common/tables/ITemplateItem.d.ts @@ -63,7 +63,7 @@ export interface Props { DiscardingBlock?: boolean; DropSoundType?: string; RagFairCommissionModifier?: number; - RarityPvE: string; + RarityPvE?: string; IsAlwaysAvailableForInsurance?: boolean; DiscardLimit?: number; MaxResource?: number; @@ -414,6 +414,12 @@ export interface Props { LayoutName?: string; Lower75Prefab?: Prefab; MaxUsages?: number; + ScavKillExpPenalty?: number; + ScavKillExpPenaltyPVE?: number; + ScavKillStandingPenalty?: number; + ScavKillStandingPenaltyPVE?: number; + TradersDiscount?: number; + TradersDiscountPVE?: number; } export interface IHealthEffect { type: string; diff --git a/TypeScript/9RouterHooks/types/models/spt/config/IQuestConfig.d.ts b/TypeScript/9RouterHooks/types/models/spt/config/IQuestConfig.d.ts index 362602c..2cdf4fa 100644 --- a/TypeScript/9RouterHooks/types/models/spt/config/IQuestConfig.d.ts +++ b/TypeScript/9RouterHooks/types/models/spt/config/IQuestConfig.d.ts @@ -47,6 +47,8 @@ export interface IRepeatableQuestConfig { /** Item tplIds to ignore when generating rewards */ rewardBlacklist: string[]; rewardAmmoStackMinSize: number; + freeChangesAvailable: number; + freeChanges: number; } export interface IRewardScaling { levels: number[]; diff --git a/TypeScript/9RouterHooks/types/services/BotEquipmentModPoolService.d.ts b/TypeScript/9RouterHooks/types/services/BotEquipmentModPoolService.d.ts index c53f31b..7b2b442 100644 --- a/TypeScript/9RouterHooks/types/services/BotEquipmentModPoolService.d.ts +++ b/TypeScript/9RouterHooks/types/services/BotEquipmentModPoolService.d.ts @@ -4,7 +4,7 @@ import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { IBotConfig } from "@spt/models/spt/config/IBotConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { VFS } from "@spt/utils/VFS"; /** Store a mapping between weapons, their slots and the items that fit those slots */ @@ -12,7 +12,7 @@ export declare class BotEquipmentModPoolService { protected logger: ILogger; protected vfs: VFS; protected itemHelper: ItemHelper; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected botConfig: IBotConfig; @@ -20,7 +20,7 @@ export declare class BotEquipmentModPoolService { protected gearModPool: Mods; protected weaponPoolGenerated: boolean; protected armorPoolGenerated: boolean; - constructor(logger: ILogger, vfs: VFS, itemHelper: ItemHelper, databaseServer: DatabaseServer, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, vfs: VFS, itemHelper: ItemHelper, databaseService: DatabaseService, localisationService: LocalisationService, configServer: ConfigServer); /** * Store dictionary of mods for each item passed in * @param items items to find related mods and store in modPool diff --git a/TypeScript/9RouterHooks/types/services/CustomLocationWaveService.d.ts b/TypeScript/9RouterHooks/types/services/CustomLocationWaveService.d.ts index 728a1e8..c72d5bb 100644 --- a/TypeScript/9RouterHooks/types/services/CustomLocationWaveService.d.ts +++ b/TypeScript/9RouterHooks/types/services/CustomLocationWaveService.d.ts @@ -2,15 +2,15 @@ import { BossLocationSpawn, Wave } from "@spt/models/eft/common/ILocationBase"; import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class CustomLocationWaveService { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, configServer: ConfigServer); /** * Add a boss wave to a map * @param locationId e.g. factory4_day, bigmap diff --git a/TypeScript/9RouterHooks/types/services/InsuranceService.d.ts b/TypeScript/9RouterHooks/types/services/InsuranceService.d.ts index c54f9f9..0000e66 100644 --- a/TypeScript/9RouterHooks/types/services/InsuranceService.d.ts +++ b/TypeScript/9RouterHooks/types/services/InsuranceService.d.ts @@ -13,8 +13,8 @@ import { ILostOnDeathConfig } from "@spt/models/spt/config/ILostOnDeathConfig"; import { IInsuranceEquipmentPkg } from "@spt/models/spt/services/IInsuranceEquipmentPkg"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocaleService } from "@spt/services/LocaleService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { MailSendService } from "@spt/services/MailSendService"; @@ -24,7 +24,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class InsuranceService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected secureContainerHelper: SecureContainerHelper; protected randomUtil: RandomUtil; protected itemHelper: ItemHelper; @@ -42,7 +42,7 @@ export declare class InsuranceService { protected insured: Record>; protected insuranceConfig: IInsuranceConfig; protected lostOnDeathConfig: ILostOnDeathConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, handbookHelper: HandbookHelper, localisationService: LocalisationService, localeService: LocaleService, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); + constructor(logger: ILogger, databaseService: DatabaseService, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, handbookHelper: HandbookHelper, localisationService: LocalisationService, localeService: LocaleService, mailSendService: MailSendService, configServer: ConfigServer, cloner: ICloner); /** * Does player have insurance array * @param sessionId Player id diff --git a/TypeScript/9RouterHooks/types/services/MailSendService.d.ts b/TypeScript/9RouterHooks/types/services/MailSendService.d.ts index d445841..8f1f974 100644 --- a/TypeScript/9RouterHooks/types/services/MailSendService.d.ts +++ b/TypeScript/9RouterHooks/types/services/MailSendService.d.ts @@ -9,8 +9,8 @@ import { MessageType } from "@spt/models/enums/MessageType"; import { Traders } from "@spt/models/enums/Traders"; import { IProfileChangeEvent, ISendMessageDetails } from "@spt/models/spt/dialog/ISendMessageDetails"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HashUtil } from "@spt/utils/HashUtil"; import { TimeUtil } from "@spt/utils/TimeUtil"; @@ -19,7 +19,7 @@ export declare class MailSendService { protected hashUtil: HashUtil; protected timeUtil: TimeUtil; protected saveServer: SaveServer; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected notifierHelper: NotifierHelper; protected dialogueHelper: DialogueHelper; protected notificationSendHelper: NotificationSendHelper; @@ -27,7 +27,7 @@ export declare class MailSendService { protected itemHelper: ItemHelper; protected traderHelper: TraderHelper; protected readonly systemSenderId = "59e7125688a45068a6249071"; - constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, dialogueHelper: DialogueHelper, notificationSendHelper: NotificationSendHelper, localisationService: LocalisationService, itemHelper: ItemHelper, traderHelper: TraderHelper); + constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseService: DatabaseService, notifierHelper: NotifierHelper, dialogueHelper: DialogueHelper, notificationSendHelper: NotificationSendHelper, localisationService: LocalisationService, itemHelper: ItemHelper, traderHelper: TraderHelper); /** * Send a message from an NPC (e.g. prapor) to the player with or without items using direct message text, do not look up any locale * @param sessionId The session ID to send the message to diff --git a/TypeScript/9RouterHooks/types/services/OpenZoneService.d.ts b/TypeScript/9RouterHooks/types/services/OpenZoneService.d.ts index 1bc5f00..c7dd0bd 100644 --- a/TypeScript/9RouterHooks/types/services/OpenZoneService.d.ts +++ b/TypeScript/9RouterHooks/types/services/OpenZoneService.d.ts @@ -1,18 +1,18 @@ import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RandomUtil } from "@spt/utils/RandomUtil"; /** Service for adding new zones to a maps OpenZones property */ export declare class OpenZoneService { protected logger: ILogger; protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected localisationService: LocalisationService; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, randomUtil: RandomUtil, databaseServer: DatabaseServer, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, localisationService: LocalisationService, configServer: ConfigServer); /** * Add open zone to specified map * @param locationId map location (e.g. factory4_day) diff --git a/TypeScript/9RouterHooks/types/services/PaymentService.d.ts b/TypeScript/9RouterHooks/types/services/PaymentService.d.ts index 64ff2c1..61d5731 100644 --- a/TypeScript/9RouterHooks/types/services/PaymentService.d.ts +++ b/TypeScript/9RouterHooks/types/services/PaymentService.d.ts @@ -9,7 +9,7 @@ import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRo import { IProcessBuyTradeRequestData } from "@spt/models/eft/trade/IProcessBuyTradeRequestData"; import { IProcessSellTradeRequestData } from "@spt/models/eft/trade/IProcessSellTradeRequestData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HashUtil } from "@spt/utils/HashUtil"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; @@ -17,14 +17,14 @@ export declare class PaymentService { protected logger: ILogger; protected hashUtil: HashUtil; protected httpResponse: HttpResponseUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected handbookHelper: HandbookHelper; protected traderHelper: TraderHelper; protected itemHelper: ItemHelper; protected inventoryHelper: InventoryHelper; protected localisationService: LocalisationService; protected paymentHelper: PaymentHelper; - constructor(logger: ILogger, hashUtil: HashUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, localisationService: LocalisationService, paymentHelper: PaymentHelper); + constructor(logger: ILogger, hashUtil: HashUtil, httpResponse: HttpResponseUtil, databaseService: DatabaseService, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, localisationService: LocalisationService, paymentHelper: PaymentHelper); /** * Take money and insert items into return to server request * @param pmcData Pmc profile diff --git a/TypeScript/9RouterHooks/types/services/PlayerService.d.ts b/TypeScript/9RouterHooks/types/services/PlayerService.d.ts index ae57410..84c4c6f 100644 --- a/TypeScript/9RouterHooks/types/services/PlayerService.d.ts +++ b/TypeScript/9RouterHooks/types/services/PlayerService.d.ts @@ -1,14 +1,14 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class PlayerService { protected logger: ILogger; protected timeUtil: TimeUtil; protected localisationService: LocalisationService; - protected databaseServer: DatabaseServer; - constructor(logger: ILogger, timeUtil: TimeUtil, localisationService: LocalisationService, databaseServer: DatabaseServer); + protected databaseService: DatabaseService; + constructor(logger: ILogger, timeUtil: TimeUtil, localisationService: LocalisationService, databaseService: DatabaseService); /** * Get level of player * @param pmcData Player profile diff --git a/TypeScript/9RouterHooks/types/services/RagfairLinkedItemService.d.ts b/TypeScript/9RouterHooks/types/services/RagfairLinkedItemService.d.ts index 6011c1a..0d03459 100644 --- a/TypeScript/9RouterHooks/types/services/RagfairLinkedItemService.d.ts +++ b/TypeScript/9RouterHooks/types/services/RagfairLinkedItemService.d.ts @@ -1,11 +1,11 @@ import { ItemHelper } from "@spt/helpers/ItemHelper"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; export declare class RagfairLinkedItemService { - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected linkedItemsCache: Record>; - constructor(databaseServer: DatabaseServer, itemHelper: ItemHelper); + constructor(databaseService: DatabaseService, itemHelper: ItemHelper); getLinkedItems(linkedSearchId: string): Set; /** * Use ragfair linked item service to get an array of items that can fit on or in designated itemtpl diff --git a/TypeScript/9RouterHooks/types/services/RagfairOfferService.d.ts b/TypeScript/9RouterHooks/types/services/RagfairOfferService.d.ts index c044f6d..4bc07c3 100644 --- a/TypeScript/9RouterHooks/types/services/RagfairOfferService.d.ts +++ b/TypeScript/9RouterHooks/types/services/RagfairOfferService.d.ts @@ -6,8 +6,8 @@ import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { SaveServer } from "@spt/servers/SaveServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil"; import { RagfairOfferHolder } from "@spt/utils/RagfairOfferHolder"; @@ -15,7 +15,7 @@ import { TimeUtil } from "@spt/utils/TimeUtil"; export declare class RagfairOfferService { protected logger: ILogger; protected timeUtil: TimeUtil; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected saveServer: SaveServer; protected ragfairServerHelper: RagfairServerHelper; protected profileHelper: ProfileHelper; @@ -28,7 +28,7 @@ export declare class RagfairOfferService { protected expiredOffers: Record; protected ragfairConfig: IRagfairConfig; protected ragfairOfferHandler: RagfairOfferHolder; - constructor(logger: ILogger, timeUtil: TimeUtil, databaseServer: DatabaseServer, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, eventOutputHolder: EventOutputHolder, httpResponse: HttpResponseUtil, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, timeUtil: TimeUtil, databaseService: DatabaseService, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, eventOutputHolder: EventOutputHolder, httpResponse: HttpResponseUtil, localisationService: LocalisationService, configServer: ConfigServer); /** * Get all offers * @returns IRagfairOffer array diff --git a/TypeScript/9RouterHooks/types/services/RagfairPriceService.d.ts b/TypeScript/9RouterHooks/types/services/RagfairPriceService.d.ts index 5b8fa56..0a2f26e 100644 --- a/TypeScript/9RouterHooks/types/services/RagfairPriceService.d.ts +++ b/TypeScript/9RouterHooks/types/services/RagfairPriceService.d.ts @@ -12,7 +12,7 @@ import { IRagfairConfig, IUnreasonableModPrices } from "@spt/models/spt/config/I import { IRagfairServerPrices } from "@spt/models/spt/ragfair/IRagfairServerPrices"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { RandomUtil } from "@spt/utils/RandomUtil"; /** @@ -20,7 +20,7 @@ import { RandomUtil } from "@spt/utils/RandomUtil"; */ export declare class RagfairPriceService implements OnLoad { protected handbookHelper: HandbookHelper; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected logger: ILogger; protected itemHelper: ItemHelper; protected presetHelper: PresetHelper; @@ -30,7 +30,7 @@ export declare class RagfairPriceService implements OnLoad { protected configServer: ConfigServer; protected ragfairConfig: IRagfairConfig; protected prices: IRagfairServerPrices; - constructor(handbookHelper: HandbookHelper, databaseServer: DatabaseServer, logger: ILogger, itemHelper: ItemHelper, presetHelper: PresetHelper, traderHelper: TraderHelper, randomUtil: RandomUtil, localisationService: LocalisationService, configServer: ConfigServer); + constructor(handbookHelper: HandbookHelper, databaseService: DatabaseService, logger: ILogger, itemHelper: ItemHelper, presetHelper: PresetHelper, traderHelper: TraderHelper, randomUtil: RandomUtil, localisationService: LocalisationService, configServer: ConfigServer); /** * Generate static (handbook) and dynamic (prices.json) flea prices, store inside class as dictionaries */ diff --git a/TypeScript/9RouterHooks/types/services/RagfairTaxService.d.ts b/TypeScript/9RouterHooks/types/services/RagfairTaxService.d.ts index 4e4e648..effb9f0 100644 --- a/TypeScript/9RouterHooks/types/services/RagfairTaxService.d.ts +++ b/TypeScript/9RouterHooks/types/services/RagfairTaxService.d.ts @@ -4,15 +4,15 @@ import { Item } from "@spt/models/eft/common/tables/IItem"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { IStorePlayerOfferTaxAmountRequestData } from "@spt/models/eft/ragfair/IStorePlayerOfferTaxAmountRequestData"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService"; export declare class RagfairTaxService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected ragfairPriceService: RagfairPriceService; protected itemHelper: ItemHelper; protected playerOfferTaxCache: Record; - constructor(logger: ILogger, databaseServer: DatabaseServer, ragfairPriceService: RagfairPriceService, itemHelper: ItemHelper); + constructor(logger: ILogger, databaseService: DatabaseService, ragfairPriceService: RagfairPriceService, itemHelper: ItemHelper); storeClientOfferTaxValue(sessionId: string, offer: IStorePlayerOfferTaxAmountRequestData): void; clearStoredOfferTaxById(offerIdToRemove: string): void; getStoredClientOfferTaxValueById(offerIdToGet: string): IStorePlayerOfferTaxAmountRequestData; diff --git a/TypeScript/9RouterHooks/types/services/RaidTimeAdjustmentService.d.ts b/TypeScript/9RouterHooks/types/services/RaidTimeAdjustmentService.d.ts index f770b64..bfc099a 100644 --- a/TypeScript/9RouterHooks/types/services/RaidTimeAdjustmentService.d.ts +++ b/TypeScript/9RouterHooks/types/services/RaidTimeAdjustmentService.d.ts @@ -7,17 +7,17 @@ import { ILocationConfig, IScavRaidTimeLocationSettings, LootMultiplier } from " import { IRaidChanges } from "@spt/models/spt/location/IRaidChanges"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RaidTimeAdjustmentService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected randomUtil: RandomUtil; protected weightedRandomHelper: WeightedRandomHelper; protected applicationContext: ApplicationContext; protected configServer: ConfigServer; protected locationConfig: ILocationConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, applicationContext: ApplicationContext, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, randomUtil: RandomUtil, weightedRandomHelper: WeightedRandomHelper, applicationContext: ApplicationContext, configServer: ConfigServer); /** * Make alterations to the base map data passed in * Loot multipliers/waves/wave start times diff --git a/TypeScript/9RouterHooks/types/services/RepairService.d.ts b/TypeScript/9RouterHooks/types/services/RepairService.d.ts index 9203417..48f306e 100644 --- a/TypeScript/9RouterHooks/types/services/RepairService.d.ts +++ b/TypeScript/9RouterHooks/types/services/RepairService.d.ts @@ -14,13 +14,13 @@ import { SkillTypes } from "@spt/models/enums/SkillTypes"; import { BonusSettings, IRepairConfig } from "@spt/models/spt/config/IRepairConfig"; import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ConfigServer } from "@spt/servers/ConfigServer"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { LocalisationService } from "@spt/services/LocalisationService"; import { PaymentService } from "@spt/services/PaymentService"; import { RandomUtil } from "@spt/utils/RandomUtil"; export declare class RepairService { protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected profileHelper: ProfileHelper; protected randomUtil: RandomUtil; protected itemHelper: ItemHelper; @@ -31,7 +31,7 @@ export declare class RepairService { protected localisationService: LocalisationService; protected configServer: ConfigServer; protected repairConfig: IRepairConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, profileHelper: ProfileHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, traderHelper: TraderHelper, weightedRandomHelper: WeightedRandomHelper, paymentService: PaymentService, repairHelper: RepairHelper, localisationService: LocalisationService, configServer: ConfigServer); + constructor(logger: ILogger, databaseService: DatabaseService, profileHelper: ProfileHelper, randomUtil: RandomUtil, itemHelper: ItemHelper, traderHelper: TraderHelper, weightedRandomHelper: WeightedRandomHelper, paymentService: PaymentService, repairHelper: RepairHelper, localisationService: LocalisationService, configServer: ConfigServer); /** * Use trader to repair an items durability * @param sessionID Session id diff --git a/TypeScript/9RouterHooks/types/services/TraderServicesService.d.ts b/TypeScript/9RouterHooks/types/services/TraderServicesService.d.ts index 111c71a..e441eb6 100644 --- a/TypeScript/9RouterHooks/types/services/TraderServicesService.d.ts +++ b/TypeScript/9RouterHooks/types/services/TraderServicesService.d.ts @@ -1,13 +1,13 @@ import { ProfileHelper } from "@spt/helpers/ProfileHelper"; import { ITraderServiceModel } from "@spt/models/spt/services/ITraderServiceModel"; import { ILogger } from "@spt/models/spt/utils/ILogger"; -import { DatabaseServer } from "@spt/servers/DatabaseServer"; +import { DatabaseService } from "@spt/services/DatabaseService"; import { ICloner } from "@spt/utils/cloners/ICloner"; export declare class TraderServicesService { protected profileHelper: ProfileHelper; protected logger: ILogger; - protected databaseServer: DatabaseServer; + protected databaseService: DatabaseService; protected cloner: ICloner; - constructor(profileHelper: ProfileHelper, logger: ILogger, databaseServer: DatabaseServer, cloner: ICloner); + constructor(profileHelper: ProfileHelper, logger: ILogger, databaseService: DatabaseService, cloner: ICloner); getTraderServices(sessionId: string, traderId: string): ITraderServiceModel[]; } diff --git a/TypeScript/9RouterHooks/types/services/mod/CustomItemService.d.ts b/TypeScript/9RouterHooks/types/services/mod/CustomItemService.d.ts index 6dc4730..1926bed 100644 --- a/TypeScript/9RouterHooks/types/services/mod/CustomItemService.d.ts +++ b/TypeScript/9RouterHooks/types/services/mod/CustomItemService.d.ts @@ -9,11 +9,11 @@ import { HashUtil } from "@spt/utils/HashUtil"; export declare class CustomItemService { protected logger: ILogger; protected hashUtil: HashUtil; - protected databaseServer: DatabaseService; + protected databaseService: DatabaseService; protected itemHelper: ItemHelper; protected itemBaseClassService: ItemBaseClassService; protected cloner: ICloner; - constructor(logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseService, itemHelper: ItemHelper, itemBaseClassService: ItemBaseClassService, cloner: ICloner); + constructor(logger: ILogger, hashUtil: HashUtil, databaseService: DatabaseService, itemHelper: ItemHelper, itemBaseClassService: ItemBaseClassService, cloner: ICloner); /** * Create a new item from a cloned item base * WARNING - If no item id is supplied, an id will be generated, this id will be random every time you add an item and will not be the same on each subsequent server start