Merge branch 'main' of https://github.com/sp-tarkov/server-csharp

Core/Models/Eft/Common/PmcData.cs

@@ -1,11 +1,13 @@
 using System.Text.Json.Serialization;
 using Core.Models.Eft.Common.Tables;
+using Core.Utils.Json.Converters;
 
 namespace Core.Models.Eft.Common;
 
 public class PmcData : BotBase
 {
     [JsonPropertyName("Prestige")]
+    [JsonConverter(typeof(ArrayToObjectFactoryConverter))]
     public Tables.Prestige Prestige { get; set; }
 }
 

Core/Models/Eft/Common/Tables/BotBase.cs

@@ -153,6 +153,7 @@ public class Info
     public string? Voice { get; set; }
     public double? Level { get; set; }
     public double? Experience { get; set; }
+    [JsonConverter(typeof(StringToNumberFactoryConverter))]
     public long? RegistrationDate { get; set; }
     public string? GameVersion { get; set; }
     public double? AccountType { get; set; }
@@ -181,6 +182,7 @@ public class Info
 
     [JsonPropertyName("isMigratedSkills")]
     public bool? IsMigratedSkills { get; set; }
+    public double? PrestigeLevel { get; set; }
 }
 
 public class BotInfoSettings
@@ -219,6 +221,7 @@ public class Customization
     public string? Body { get; set; }
     public string? Feet { get; set; }
     public string? Hands { get; set; }
+    public string? DogTag { get; set; }
 }
 
 public class BotBaseHealth
@@ -518,6 +521,7 @@ public class Hideout
 
     [JsonPropertyName("sptUpdateLastRunTimestamp")]
     public long? SptUpdateLastRunTimestamp { get; set; }
+    public Dictionary<string, string>? Customization { get; set; }
 }
 
 public class HideoutCounters
@@ -751,6 +755,7 @@ public class Bonus
     public string? Id { get; set; }
 
     [JsonPropertyName("type")]
+    [JsonConverter(typeof(JsonStringEnumConverter))]
     public BonusType? Type { get; set; }
 
     [JsonPropertyName("templateId")]

Core/Models/Eft/Common/Tables/Trader.cs

@@ -197,6 +197,10 @@ public class TraderRepair
     [JsonPropertyName("quality")]
     [JsonConverter(typeof(StringToNumberFactoryConverter))]
     public double? Quality { get; set; }
+    
+    [JsonPropertyName("price_rate")]
+    public double? PriceRate { get; set; }
+
 }
 
 public class TraderAssort

Core/Models/Spt/Services/TraderServiceModel.cs

@@ -6,6 +6,7 @@ namespace Core.Models.Spt.Services;
 public class TraderServiceModel
 {
     [JsonPropertyName("serviceType")]
+    [JsonConverter(typeof(JsonStringEnumConverter))]
     public TraderServiceType? ServiceType { get; set; }
 
     [JsonPropertyName("itemsToPay")]
@@ -27,5 +28,5 @@ public class TraderServiceRequirementsModel
     public List<string>? CompletedQuests { get; set; }
 
     [JsonPropertyName("standings")]
-    public Dictionary<string, int>? Standings { get; set; }
-}
+    public Dictionary<string, double>? Standings { get; set; }
+}