From 99891858cbed58bc0c6dab5ea37383182fda441b Mon Sep 17 00:00:00 2001 From: Chomp Date: Sat, 4 Oct 2025 13:32:48 +0100 Subject: [PATCH] Moved craft ids out of `UnlockHideoutLootCrateCrafts` into config --- .../SPT_Data/configs/hideout.json | 7 ++++++- .../Models/Spt/Config/HideoutConfig.cs | 3 +++ .../Services/PostDbLoadService.cs | 13 +++---------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/hideout.json b/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/hideout.json index b703167e..4aa3a240 100644 --- a/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/hideout.json +++ b/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/hideout.json @@ -626,5 +626,10 @@ } ] } - ] + ], + "hideoutLootCrateCraftIdsToUnlockInHideout": [ + "66582be04de4820934746cea", + "6745925da9c9adf0450d5bca", + "67449c79268737ef6908d636" + ] } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/HideoutConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/HideoutConfig.cs index 93ed7bda..1699cbe5 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/HideoutConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/HideoutConfig.cs @@ -44,6 +44,9 @@ public record HideoutConfig : BaseConfig [JsonPropertyName("hideoutCraftsToAdd")] public required List HideoutCraftsToAdd { get; set; } + + [JsonPropertyName("hideoutLootCrateCraftIdsToUnlockInHideout")] + public IEnumerable HideoutLootCrateCraftIdsToUnlockInHideout { get; set; } } public record HideoutCraftToAdd diff --git a/Libraries/SPTarkov.Server.Core/Services/PostDbLoadService.cs b/Libraries/SPTarkov.Server.Core/Services/PostDbLoadService.cs index 3fa81706..c2b6a2cb 100644 --- a/Libraries/SPTarkov.Server.Core/Services/PostDbLoadService.cs +++ b/Libraries/SPTarkov.Server.Core/Services/PostDbLoadService.cs @@ -93,7 +93,7 @@ public class PostDbLoadService( AdjustHideoutCraftTimes(HideoutConfig.OverrideCraftTimeSeconds); AdjustHideoutBuildTimes(HideoutConfig.OverrideBuildTimeSeconds); - UnlockHideoutLootCrateCrafts(); + UnlockHideoutLootCrateCrafts(HideoutConfig.HideoutLootCrateCraftIdsToUnlockInHideout); CloneExistingCraftsAndAddNew(); @@ -617,16 +617,9 @@ public class PostDbLoadService( } } - protected void UnlockHideoutLootCrateCrafts() + protected void UnlockHideoutLootCrateCrafts(IEnumerable craftIdsToUnlock) { - var hideoutLootBoxCraftIds = new List - { - "66582be04de4820934746cea", - "6745925da9c9adf0450d5bca", - "67449c79268737ef6908d636", - }; - - foreach (var craftId in hideoutLootBoxCraftIds) + foreach (var craftId in craftIdsToUnlock) { var recipe = databaseService.GetHideout().Production.Recipes.FirstOrDefault(craft => craft.Id == craftId); if (recipe is not null)