Merge pull request #522 from R3ality/json-adjustments

Json adjustments (spelling/grammar, key name refactor)

Libraries/SPTarkov.Server.Assets/SPT_Data/configs/pmc.json

@@ -276,7 +276,7 @@
           "value": 50000
         }
       ],
-      "locationMultipler": {
+      "locationMultiplier": {
         "default": 1,
         "laboratory": 2,
         "labyrinth": 4
@@ -290,7 +290,7 @@
           "value": 50000
         }
       ],
-      "locationMultipler": {
+      "locationMultiplier": {
         "default": 1,
         "laboratory": 2,
         "labyrinth": 4
@@ -324,7 +324,7 @@
           "value": 2500000
         }
       ],
-      "locationMultipler": {
+      "locationMultiplier": {
         "default": 1,
         "laboratory": 2,
         "labyrinth": 4

Libraries/SPTarkov.Server.Assets/SPT_Data/configs/ragfair.json

@@ -1,6 +1,5 @@
 {
   "dynamic": {
-    "_currencies": "what percentage of the offers are in each currency",
     "armor": {
       "plateSlotIdToRemovePool": [
         "front_plate",
@@ -229,7 +228,7 @@
         }
       }
     },
-    "currencies": {
+    "offerCurrencyChancePercent": {
       "5449016a4bdc2d6f028b456f": 78,
       "5696686a4bdc2da3298b456a": 14,
       "569668774bdc2da2298b4568": 8

Libraries/SPTarkov.Server.Assets/SPT_Data/configs/trader.json

@@ -84,7 +84,7 @@
   "updateTimeDefault": 3600,
   "tradersResetFromServerStart": true,
   "purchasesAreFoundInRaid": false,
-  "traderPriceMultipler": 1,
+  "traderPriceMultiplier": 1,
   "fence": {
     "discountOptions": {
       "assortSize": 45,

Libraries/SPTarkov.Server.Core/Extensions/LootContainerSettingsExtensions.cs

@@ -24,9 +24,9 @@ namespace SPTarkov.Server.Core.Extensions
             }
 
             // Get multiplier for map, use default if map not found
-            if (!settings.LocationMultipler.TryGetValue(locationId, out var multiplier))
+            if (!settings.LocationMultiplier.TryGetValue(locationId, out var multiplier))
             {
-                if (!settings.LocationMultipler.TryGetValue("default", out multiplier))
+                if (!settings.LocationMultiplier.TryGetValue("default", out multiplier))
                 {
                     return roubleTotalByLevel;
                 }

Libraries/SPTarkov.Server.Core/Helpers/RagfairServerHelper.cs

@@ -199,7 +199,9 @@ public class RagfairServerHelper(
     /// <returns>Currency TPL</returns>
     public MongoId GetDynamicOfferCurrency()
     {
-        return weightedRandomHelper.GetWeightedValue(ragfairConfig.Dynamic.Currencies);
+        return weightedRandomHelper.GetWeightedValue(
+            ragfairConfig.Dynamic.OfferCurrencyChangePercent
+        );
     }
 
     /// <summary>

Libraries/SPTarkov.Server.Core/Models/Spt/Config/PmcConfig.cs

@@ -172,8 +172,8 @@ public record LootContainerSettings
     [JsonPropertyName("totalRubByLevel")]
     public List<MinMaxLootValue> TotalRubByLevel { get; set; }
 
-    [JsonPropertyName("locationMultipler")]
-    public Dictionary<string, double> LocationMultipler { get; set; }
+    [JsonPropertyName("locationMultiplier")]
+    public Dictionary<string, double> LocationMultiplier { get; set; }
 }
 
 public record HostilitySettings

Libraries/SPTarkov.Server.Core/Models/Spt/Config/RagfairConfig.cs

@@ -202,10 +202,10 @@ public record Dynamic
     public Dictionary<MongoId, double>? ItemPriceMultiplier { get; set; }
 
     /// <summary>
-    ///     Percentages to sell offers in each currency
+    ///     Percentage chance for offers to be listed in specified currency
     /// </summary>
-    [JsonPropertyName("currencies")]
-    public required Dictionary<MongoId, double> Currencies { get; set; }
+    [JsonPropertyName("offerCurrencyChancePercent")]
+    public required Dictionary<MongoId, double> OfferCurrencyChangePercent { get; set; }
 
     /// <summary>
     ///     Item tpls that should be forced to sell as a single item

Libraries/SPTarkov.Server.Core/Models/Spt/Config/TraderConfig.cs

@@ -24,7 +24,7 @@ public record TraderConfig : BaseConfig
     [JsonPropertyName("tradersResetFromServerStart")]
     public bool TradersResetFromServerStart { get; set; }
 
-    [JsonPropertyName("traderPriceMultipler")]
+    [JsonPropertyName("traderPriceMultiplier")]
     public double TraderPriceMultiplier { get; set; }
 
     [JsonPropertyName("fence")]