more db fixes

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

@@ -46,12 +46,15 @@ public class Appearance
     public Dictionary<string, int> Feet { get; set; }
 
     [JsonPropertyName("hands")]
+    [JsonConverter(typeof(ArrayToObjectFactoryConverter))]
     public Dictionary<string, int> Hands { get; set; }
 
     [JsonPropertyName("head")]
+    [JsonConverter(typeof(ArrayToObjectFactoryConverter))]
     public Dictionary<string, int> Head { get; set; }
 
     [JsonPropertyName("voice")]
+    [JsonConverter(typeof(ArrayToObjectFactoryConverter))]
     public Dictionary<string, int> Voice { get; set; }
 }
 
@@ -61,10 +64,13 @@ public class Chances
     public EquipmentChances EquipmentChances { get; set; }
 
     [JsonPropertyName("weaponMods")]
-    public ModsChances WeaponModsChances { get; set; }
+    public Dictionary<string, double> WeaponModsChances { get; set; }
 
     [JsonPropertyName("equipmentMods")]
-    public ModsChances EquipmentModsChances { get; set; }
+    public Dictionary<string, double> EquipmentModsChances { get; set; }
+    
+    [JsonPropertyName("mods")]
+    public Dictionary<string, double> Mods { get; set; }
 }
 
 public class EquipmentChances
@@ -111,7 +117,11 @@ public class EquipmentChances
     [JsonPropertyName("TacticalVest")]
     public int TacticalVest { get; set; }
 }
-
+/* class removed in favor of Dictionary<string, double>
+ used to be used in:
+ Chances.WeaponModsChances
+ Chances.EquipmentModsChances
+ GenerateWeaponRequest.ModSpawnChances
 public class ModsChances
 {
     [JsonPropertyName("mod_charge")]
@@ -263,7 +273,14 @@ public class ModsChances
     
     [JsonPropertyName("mod_muzzle_001")]
     public double ModMuzzle001 { get; set; }
+    
+    [JsonPropertyName("mod_pistol_grip_akms")]
+    public double ModPistolGripAkms { get; set; }
+    
+    [JsonPropertyName("mod_pistolgrip")]
+    public double ModPistol_Grip { get; set; }
 }
+*/
 
 public class Difficulties
 {

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

@@ -223,6 +223,9 @@ public class QuestCondition
     
     [JsonPropertyName("conditionType")]
     public string? ConditionType { get; set; }
+    
+    [JsonPropertyName("areaType")]
+    public HideoutAreas AreaType { get; set; }
 }
 
 public class QuestConditionCounter

Core/Models/Eft/Hideout/HideoutArea.cs

@@ -44,7 +44,7 @@ public class HideoutAreaRequirement
     [JsonPropertyName("areaType")]
     public int AreaType { get; set; }
 
-    [JsonPropertyName("requiredlevel")]
+    [JsonPropertyName("requiredLevel")]
     public int RequiredLevel { get; set; }
 
     [JsonPropertyName("type")]
@@ -60,7 +60,7 @@ public class Stage
     public List<StageBonus> Bonuses { get; set; }
 
     [JsonPropertyName("constructionTime")]
-    public int ConstructionTime { get; set; }
+    public double ConstructionTime { get; set; }
 
     /** Containers inventory tpl */
     [JsonPropertyName("container")]
@@ -68,6 +68,9 @@ public class Stage
 
     [JsonPropertyName("description")]
     public string Description { get; set; }
+    
+    [JsonPropertyName("globalCounterId")]
+    public string GlobalCounterId { get; set; }
 
     [JsonPropertyName("displayInterface")]
     public bool DisplayInterface { get; set; }
@@ -99,11 +102,18 @@ public class StageImprovement
 
 public class StageImprovementBonus
 {
+    [JsonPropertyName("id")]
+    public string Id { get; set; }
+    
     [JsonPropertyName("passive")]
     public bool IsPassive { get; set; }
 
     [JsonPropertyName("production")]
     public bool IsProduction { get; set; }
+    
+    [JsonPropertyName("skillType")]
+    [JsonConverter(typeof(JsonStringEnumConverter))]
+    public SkillTypes SkillType { get; set; }
 
     [JsonPropertyName("type")]
     public string Type { get; set; }
@@ -129,6 +139,9 @@ public class StageImprovementRequirement
     [JsonPropertyName("templateId")]
     public string TemplateId { get; set; }
 
+    [JsonPropertyName("isSpawnedInSession")]
+    public bool IsSpawnedInSession { get; set; }
+
     [JsonPropertyName("type")]
     public string Type { get; set; }
 }
@@ -155,6 +168,9 @@ public class StageRequirement : RequirementBase
 
     [JsonPropertyName("traderId")]
     public string TraderId { get; set; }
+    
+    [JsonPropertyName("isSpawnedInSession")]
+    public bool IsSpawnedInSession { get; set; }
 
     [JsonPropertyName("loyaltyLevel")]
     public int? LoyaltyLevel { get; set; }
@@ -181,9 +197,11 @@ public class StageBonus
     public bool Visible { get; set; }
 
     [JsonPropertyName("skillType")]
+    [JsonConverter(typeof(JsonStringEnumConverter))]
     public BonusSkillType? SkillType { get; set; }
 
     [JsonPropertyName("type")]
+    [JsonConverter(typeof(JsonStringEnumConverter))]
     public BonusType Type { get; set; }
 
     [JsonPropertyName("filter")]

Core/Models/Eft/Hideout/HideoutProduction.cs

@@ -80,6 +80,12 @@ public class Requirement : RequirementBase
     
     [JsonPropertyName("questId")]
     public string? QuestId { get; set; }
+    
+    [JsonPropertyName("isSpawnedInSession")]
+    public bool? IsSpawnedInSession { get; set; }
+    
+    [JsonPropertyName("gameVersions")]
+    public List<string>? GameVersions { get; set; }
 }
 
 public class RequirementBase

Core/Models/Eft/Hideout/QteData.cs

@@ -45,16 +45,17 @@ public class QteData
 public class QuickTimeEvent
 {
     [JsonPropertyName("type")]
+    [JsonConverter(typeof(JsonStringEnumConverter))]
     public QteType EventType { get; set; }
     
     [JsonPropertyName("position")]
     public Position Coordinates { get; set; }
     
     [JsonPropertyName("startDelay")]
-    public int StartDelayInMilliseconds { get; set; }
+    public double StartDelay { get; set; }
     
     [JsonPropertyName("endDelay")]
-    public int EndDelayInMilliseconds { get; set; }
+    public double EndDelay { get; set; }
     
     [JsonPropertyName("speed")]
     public float MovementSpeed { get; set; }
@@ -87,10 +88,12 @@ public class QteResult
 public class QteEffect
 {
     [JsonPropertyName("type")]
+    [JsonConverter(typeof(JsonStringEnumConverter))]
     public QteRewardType EffectType { get; set; }
     
     [JsonPropertyName("skillId")]
-    public int SkillIdentifier { get; set; }
+    [JsonConverter(typeof(JsonStringEnumConverter))]
+    public SkillTypes SkillIdentifier { get; set; }
     
     [JsonPropertyName("levelMultipliers")]
     public List<SkillLevelMultiplier> LevelMultipliers { get; set; }
@@ -102,6 +105,7 @@ public class QteEffect
     public float EffectWeight { get; set; }
     
     [JsonPropertyName("result")]
+    [JsonConverter(typeof(JsonStringEnumConverter))]
     public QteResultType ResultType { get; set; }
 }
 

Core/Models/Enums/Hideout/QteType.cs

@@ -2,5 +2,5 @@ namespace Core.Models.Enums.Hideout;
 
 public enum QteType
 {
-    SHRINKING_CIRCLE = 0,
+    ShrinkingCircle,
 }

Core/Models/Enums/SkillTypes.cs

@@ -73,4 +73,6 @@ public enum SkillTypes
     DMR,
     DrawMaster,
     AimMaster,
+    Physical,
+    Combat
 }

Core/Models/Spt/Bots/GenerateWeaponRequest.cs

@@ -23,7 +23,7 @@ public class GenerateWeaponRequest
 
     /** Chance values mod will be added */
     [JsonPropertyName("modSpawnChances")]
-    public ModsChances ModSpawnChances { get; set; }
+    public Dictionary<string, double> ModSpawnChances { get; set; }
 
     /** Ammo tpl to use when generating magazines/cartridges */
     [JsonPropertyName("ammoTpl")]