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

2025-01-07 22:40:30 +00:00
parent 52a643b06e 9e0f3eb333
commit d60bbfe823
7 changed files with 28 additions and 11397 deletions
@@ -300,8 +300,10 @@ public class BaseJsonSkills

 public class Skills
 {
-    public List<Common> Common { get; set; }
-    public List<Mastering> Mastering { get; set; }
+    [JsonConverter(typeof(ArrayToObjectFactoryConverter))]
+    public Dictionary<SkillTypes, Common> Common { get; set; }
+    [JsonConverter(typeof(ArrayToObjectFactoryConverter))]
+    public Dictionary<string, Mastering> Mastering { get; set; }
    public double Points { get; set; }
 }

@@ -116,6 +116,21 @@ public class ModsChances
 {
    [JsonPropertyName("mod_charge")]
    public double ModCharge { get; set; }
+    
+    [JsonPropertyName("mod_bipod")]
+    public double ModBipod { get; set; }
+    
+    [JsonPropertyName("mod_barrel")]
+    public double ModBarrel { get; set; }
+    
+    [JsonPropertyName("mod_catch")]
+    public double ModCatch { get; set; }
+    
+    [JsonPropertyName("mod_gas_block")]
+    public double ModGasBlock { get; set; }
+    
+    [JsonPropertyName("mod_hammer")]
+    public double ModHammer { get; set; }

    [JsonPropertyName("mod_equipment")]
    public double ModEquipment { get; set; }
@@ -237,6 +252,12 @@ public class ModsChances
    [JsonPropertyName("mod_mount_004")]
    public double ModMount004 { get; set; }
    
+    [JsonPropertyName("mod_mount_005")]
+    public double ModMount005 { get; set; }
+    
+    [JsonPropertyName("mod_mount_006")]
+    public double ModMount006 { get; set; }
+    
    [JsonPropertyName("mod_muzzle_000")]
    public double ModMuzzle000 { get; set; }
    
@@ -1,5 +1,8 @@
+using System.Text.Json.Serialization;
+
 namespace Core.Models.Enums;

+[JsonConverter(typeof(JsonStringEnumConverter))]
 public enum SkillTypes
 {
    BotReload,