From 8e20a97d5d1159646542a573ea6c540a8edd2416 Mon Sep 17 00:00:00 2001 From: R3ality Date: Sat, 26 Jul 2025 21:55:11 +0300 Subject: [PATCH 1/6] Fix typo in cultistCircle.rewardPriceMultiplerMinMax --- Libraries/SPTarkov.Server.Assets/SPT_Data/configs/hideout.json | 2 +- .../SPTarkov.Server.Core/Models/Spt/Config/HideoutConfig.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/hideout.json b/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/hideout.json index e70d6292..01404e8e 100644 --- a/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/hideout.json +++ b/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/hideout.json @@ -12,7 +12,7 @@ "cultistCircle": { "maxRewardItemCount": 5, "maxAttemptsToPickRewardsWithinBudget": 5, - "rewardPriceMultiplerMinMax": { + "rewardPriceMultiplierMinMax": { "min": 0.7, "max": 1.4 }, diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/HideoutConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/HideoutConfig.cs index 03b48be6..90821e67 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/HideoutConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/HideoutConfig.cs @@ -78,7 +78,7 @@ public record CultistCircleSettings [JsonPropertyName("maxAttemptsToPickRewardsWithinBudget")] public int MaxAttemptsToPickRewardsWithinBudget { get; set; } - [JsonPropertyName("rewardPriceMultiplerMinMax")] + [JsonPropertyName("rewardPriceMultiplierMinMax")] public required MinMax RewardPriceMultiplierMinMax { get; set; } [JsonPropertyName("bonusChanceMultiplier")] From 08a279c4e4e94951747637db7d5c09637c8712a9 Mon Sep 17 00:00:00 2001 From: R3ality Date: Sat, 26 Jul 2025 21:57:04 +0300 Subject: [PATCH 2/6] Fix typo in cultistCircle.craftTimeThreshholds --- .../SPTarkov.Server.Assets/SPT_Data/configs/hideout.json | 2 +- .../SPTarkov.Server.Core/Models/Spt/Config/HideoutConfig.cs | 4 ++-- .../SPTarkov.Server.Core/Services/CircleOfCultistService.cs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/hideout.json b/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/hideout.json index 01404e8e..b703167e 100644 --- a/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/hideout.json +++ b/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/hideout.json @@ -20,7 +20,7 @@ "highValueThresholdRub": 70000, "hideoutTaskRewardTimeSeconds": 21600, "hideoutCraftSacrificeThresholdRub": 400000, - "craftTimeThreshholds": [ + "craftTimeThresholds": [ { "min": 1, "max": 350000, diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/HideoutConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/HideoutConfig.cs index 90821e67..b3322313 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/HideoutConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/HideoutConfig.cs @@ -102,8 +102,8 @@ public record CultistCircleSettings [JsonPropertyName("hideoutCraftSacrificeThresholdRub")] public int HideoutCraftSacrificeThresholdRub { get; set; } - [JsonPropertyName("craftTimeThreshholds")] - public required List CraftTimeThreshholds { get; set; } + [JsonPropertyName("craftTimeThresholds")] + public required List CraftTimeThresholds { get; set; } /// /// -1 means no override, value in seconds diff --git a/Libraries/SPTarkov.Server.Core/Services/CircleOfCultistService.cs b/Libraries/SPTarkov.Server.Core/Services/CircleOfCultistService.cs index 5a4492d4..1c35530d 100644 --- a/Libraries/SPTarkov.Server.Core/Services/CircleOfCultistService.cs +++ b/Libraries/SPTarkov.Server.Core/Services/CircleOfCultistService.cs @@ -250,7 +250,7 @@ public class CircleOfCultistService( // Get a threshold where sacrificed amount is between thresholds min and max var matchingThreshold = GetMatchingThreshold( - circleConfig.CraftTimeThreshholds, + circleConfig.CraftTimeThresholds, rewardAmountRoubles ); if ( From 9eaa46e024366bafd08bb8038c46845b5737062f Mon Sep 17 00:00:00 2001 From: R3ality Date: Sun, 27 Jul 2025 03:16:42 +0300 Subject: [PATCH 3/6] Fix typo in skillGainMultiplers --- .../SPTarkov.Server.Core/Models/Spt/Config/InventoryConfig.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/InventoryConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/InventoryConfig.cs index f52014a9..fa8ffd0e 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/InventoryConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/InventoryConfig.cs @@ -23,7 +23,7 @@ public record InventoryConfig : BaseConfig /// /// Multipliers for skill gain when inside menus, NOT in-game /// - [JsonPropertyName("skillGainMultiplers")] + [JsonPropertyName("skillGainMultipliers")] public required Dictionary SkillGainMultipliers { get; set; } /// From 8c52c15d6ec1a040a320916116c910999dc193c9 Mon Sep 17 00:00:00 2001 From: R3ality Date: Sun, 27 Jul 2025 03:28:27 +0300 Subject: [PATCH 4/6] Fix typo in handbookPriceMultipier --- Libraries/SPTarkov.Server.Assets/SPT_Data/configs/ragfair.json | 2 +- .../SPTarkov.Server.Core/Models/Spt/Config/RagfairConfig.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/ragfair.json b/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/ragfair.json index a2e3de5e..6d26acd6 100644 --- a/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/ragfair.json +++ b/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/ragfair.json @@ -261,7 +261,7 @@ }, "offerAdjustment": { "adjustPriceWhenBelowHandbookPrice": false, - "handbookPriceMultipier": 1.1, + "handbookPriceMultiplier": 1.1, "maxPriceDifferenceBelowHandbookPercent": 64, "priceThreshholdRub": 20000 }, diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/RagfairConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/RagfairConfig.cs index 1a541a02..b62f1be5 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/RagfairConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/RagfairConfig.cs @@ -351,7 +351,7 @@ public record OfferAdjustment /// /// How much to multiply the handbook price to get the new price /// - [JsonPropertyName("handbookPriceMultipier")] + [JsonPropertyName("handbookPriceMultiplier")] public double HandbookPriceMultiplier { get; set; } /// From 765adcac5eb83b3ad442e715fd0b2ec915ab0c9d Mon Sep 17 00:00:00 2001 From: R3ality Date: Sun, 27 Jul 2025 03:30:04 +0300 Subject: [PATCH 5/6] Fix typo in priceThreshholdRub --- Libraries/SPTarkov.Server.Assets/SPT_Data/configs/ragfair.json | 2 +- .../SPTarkov.Server.Core/Models/Spt/Config/RagfairConfig.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/ragfair.json b/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/ragfair.json index 6d26acd6..992b8dbc 100644 --- a/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/ragfair.json +++ b/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/ragfair.json @@ -263,7 +263,7 @@ "adjustPriceWhenBelowHandbookPrice": false, "handbookPriceMultiplier": 1.1, "maxPriceDifferenceBelowHandbookPercent": 64, - "priceThreshholdRub": 20000 + "priceThresholdRub": 20000 }, "offerItemCount": { "default": { diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/RagfairConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/RagfairConfig.cs index b62f1be5..edf6d955 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/RagfairConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/RagfairConfig.cs @@ -357,7 +357,7 @@ public record OfferAdjustment /// /// What is the minimum rouble price to consider adjusting price of item /// - [JsonPropertyName("priceThreshholdRub")] + [JsonPropertyName("priceThresholdRub")] public double PriceThresholdRub { get; set; } } From 6dc35d732d210854fe49b92d7c1a6799d2055f88 Mon Sep 17 00:00:00 2001 From: R3ality Date: Sun, 27 Jul 2025 11:41:08 +0300 Subject: [PATCH 6/6] Rebase onto formatted Jsons (conflict resolve) --- Libraries/SPTarkov.Server.Assets/SPT_Data/configs/core.json | 6 +++--- .../SPTarkov.Server.Assets/SPT_Data/configs/inventory.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/core.json b/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/core.json index f35c9a0a..b8669e37 100644 --- a/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/core.json +++ b/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/core.json @@ -25,7 +25,7 @@ "question_1": "An update to a popular mod that makes the game more realistic has been released, which of the following actions on discord will you do?", "question_1_answer_1": "Ignore the changelog", "question_1_answer_2": "Ignore the readme", - "question_1_answer_3": "Ask in general chat why the guns dont shoot", + "question_1_answer_3": "Ask in general chat why the guns don't shoot", "question_1_answer_4": "Argue with general chat when they tell you to read the readme", "question_1_answer_5": "Install as many mods as you can at the same time and get mad when everything breaks", "question_1_answer_6": "Inform general chat of your displeasure and get mad when they laugh at you", @@ -39,11 +39,11 @@ "question_2_answer_2": "Get REAL mad and voice your opinion in every possible chat you can", "question_2_answer_3": "Travel around various discords informing anyone who listens what bad people SPT are", "question_2_answer_4": "Create dozens of alt accounts to DM staff and inform them of your displeasure", - "question_2_answer_5": "Ask when the old SPT verison is coming back every day for weeks", + "question_2_answer_5": "Ask when the old SPT version is coming back every day for weeks", "title": "Feedback survey", "time": "About 1 minute", "description": "This was the second SPT survey, what a valuable use of 20 minutes that was.", - "farewell": "You knew the first survey didnt do anything yet you still submitted the second one, you're quite an odd one." + "farewell": "You knew the first survey didn't do anything yet you still submitted the second one, you're quite an odd one." } }, "survey": { diff --git a/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/inventory.json b/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/inventory.json index c7b8fb43..d55845ae 100644 --- a/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/inventory.json +++ b/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/inventory.json @@ -1594,7 +1594,7 @@ "allowBossItems": false }, "customMoneyTpls": [], - "skillGainMultiplers": { + "skillGainMultipliers": { "Strength": 1 }, "deprioritisedMoneyContainers": [