Merge pull request #24 from CWXDEV/main

update some types

Core/Models/Eft/Common/PmcData.cs

@@ -5,6 +5,8 @@ namespace Core.Models.Eft.Common;
 
 public class PmcData : BotBase
 {
+    [JsonPropertyName("Prestige")]
+    public Tables.Prestige Prestige { get; set; }
 }
 
 public class PostRaidPmcData : BotBase
@@ -21,4 +23,4 @@ public class PostRaidStats
     /** Only found in profile we get from client post raid */
     [JsonPropertyName("Arena")]
     public EftStats? Arena { get; set; }
-}
+}

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

@@ -68,6 +68,7 @@ public class BotBase
 
     /** Achievement id and timestamp */
     [JsonPropertyName("Achievements")]
+    [JsonConverter(typeof(ArrayToObjectFactoryConverter))]
     public Dictionary<string, int>? Achievements { get; set; }
 
     [JsonPropertyName("RepeatableQuests")]
@@ -781,4 +782,4 @@ public class Note
 {
     public double? Time { get; set; }
     public string? Text { get; set; }
-}
+}

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

@@ -1,4 +1,5 @@
 using System.Text.Json.Serialization;
+using Core.Utils.Json.Converters;
 
 namespace Core.Models.Eft.Common.Tables;
 
@@ -20,25 +21,25 @@ public class TraderServerSettings
 public class TraderServices
 {
     [JsonPropertyName("ExUsecLoyalty")]
-    public TraderServices? ExUsecLoyalty { get; set; }
+    public TraderService? ExUsecLoyalty { get; set; }
 
     [JsonPropertyName("ZryachiyAid")]
-    public TraderServices? ZryachiyAid { get; set; }
+    public TraderService? ZryachiyAid { get; set; }
 
     [JsonPropertyName("CultistsAid")]
-    public TraderServices? CultistsAid { get; set; }
+    public TraderService? CultistsAid { get; set; }
 
     [JsonPropertyName("PlayerTaxi")]
-    public TraderServices? PlayerTaxi { get; set; }
+    public TraderService? PlayerTaxi { get; set; }
 
     [JsonPropertyName("BtrItemsDelivery")]
-    public TraderServices? BtrItemsDelivery { get; set; }
+    public TraderService? BtrItemsDelivery { get; set; }
 
     [JsonPropertyName("BtrBotCover")]
-    public TraderServices? BtrBotCover { get; set; }
+    public TraderService? BtrBotCover { get; set; }
 
     [JsonPropertyName("TransitItemsDelivery")]
-    public TraderServices? TransitItemsDelivery { get; set; }
+    public TraderService? TransitItemsDelivery { get; set; }
 }
 
 public class TraderService
@@ -53,6 +54,7 @@ public class TraderService
     public ServiceRequirements? Requirements { get; set; }
 
     [JsonPropertyName("ServiceItemCost")]
+    [JsonConverter(typeof(ArrayToObjectFactoryConverter))]
     public Dictionary<string, ServiceItemCostDetails>? ServiceItemCost { get; set; }
 
     [JsonPropertyName("UniqueItems")]
@@ -65,6 +67,7 @@ public class ServiceRequirements
     public List<CompletedQuest>? CompletedQuests { get; set; }
 
     [JsonPropertyName("Standings")]
+    [JsonConverter(typeof(ArrayToObjectFactoryConverter))]
     public Dictionary<string, StandingRequirement>? Standings { get; set; }
 }
 
@@ -77,7 +80,7 @@ public class CompletedQuest
 public class StandingRequirement
 {
     [JsonPropertyName("Value")]
-    public int? Value { get; set; }
+    public double? Value { get; set; }
 }
 
 public class ServiceItemCostDetails
@@ -180,4 +183,4 @@ public class ServerMapBtrsettings
 
     [JsonPropertyName("BodySwingIntensity")]
     public float? BodySwingIntensity { get; set; }
-}
+}

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

@@ -5,10 +5,10 @@ using System.Text.Json.Serialization;
 public class Prestige
 {
     [JsonPropertyName("elements")]
-    public PretigeElement? Elements { get; set; }
+    public List<PrestigeElement>? Elements { get; set; }
 }
 
-public class PretigeElement
+public class PrestigeElement
 {
     [JsonPropertyName("id")]
     public string? Id { get; set; }
@@ -65,11 +65,11 @@ public class StashPrestigeFilters
 public class PrestigeSkillConfig
 {
     [JsonPropertyName("transferMultiplier")]
-    public int? TransferMultiplier { get; set; }
+    public double? TransferMultiplier { get; set; }
 }
 
 public class PrestigeMasteringConfig
 {
     [JsonPropertyName("transferMultiplier")]
-    public int? TransferMultiplier { get; set; }
-}
+    public double? TransferMultiplier { get; set; }
+}

Core/Models/Eft/Profile/SptProfile.cs

@@ -169,7 +169,7 @@ public class DefaultEquipmentPreset : UserBuild
     public string? Root { get; set; }
 
     [JsonPropertyName("BuildType")]
-    public EquipmentBuildType? BuildType { get; set; }
+    public string? BuildType { get; set; }
 
     [JsonPropertyName("type")]
     public string? Type { get; set; }
@@ -559,4 +559,4 @@ public class MessageContentRagfair
 
     [JsonPropertyName("handbookId")]
     public string? HandbookId { get; set; }
-}
+}