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

Core/Generators/WeatherGenerator.cs

@@ -46,7 +46,7 @@ public class WeatherGenerator
      */
     public void CalculateGameTime(WeatherData data)
     {
-        var computedDate = new DateTime();
+        var computedDate = DateTime.Now;
         var formattedDate = this._timeUtil.FormatDate(computedDate);
 
         data.Date = formattedDate;

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

@@ -510,6 +510,8 @@ public class Hideout
     public Dictionary<string, Production>? Production { get; set; }
     public List<BotHideoutArea>? Areas { get; set; }
     public Dictionary<string, HideoutImprovement>? Improvements { get; set; }
+    
+    [JsonIgnore(Condition = JsonIgnoreCondition.Never)]
     public HideoutCounters? HideoutCounters { get; set; }
     public double? Seed { get; set; }
     public Dictionary<string, string>? MannequinPoses { get; set; }
@@ -769,6 +771,7 @@ public class Bonus
     public double? Value { get; set; }
 
     [JsonPropertyName("icon")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.Never)]
     public string? Icon { get; set; }
 
     [JsonPropertyName("filter")]

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

@@ -20,6 +20,7 @@ public class HandbookCategory
     public string? ParentId { get; set; }
 
     [JsonPropertyName("Icon")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.Never)]
     public string? Icon { get; set; }
 
     [JsonPropertyName("Color")]
@@ -35,8 +36,9 @@ public class HandbookItem
     public string? Id { get; set; }
 
     [JsonPropertyName("ParentId")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.Never)]
     public string? ParentId { get; set; }
 
     [JsonPropertyName("Price")]
     public decimal? Price { get; set; }
-}
+}

Core/Models/Eft/Health/WorkoutData.cs

@@ -1,4 +1,7 @@
-namespace Core.Models.Eft.Health;
+using Core.Models.Eft.Common.Tables;
+using Mastering = Core.Models.Eft.Common.Mastering;
+
+namespace Core.Models.Eft.Health;
 
 using System.Text.Json.Serialization;
 
@@ -14,10 +17,10 @@ public class WorkoutSkills
     public List<WorkoutSkillCommon>? Common { get; set; }
 
     [JsonPropertyName("Mastering")]
-    public List<object>? Mastering { get; set; }
+    public List<Mastering>? Mastering { get; set; }
 
     [JsonPropertyName("Bonuses")]
-    public object? Bonuses { get; set; }
+    public Bonus? Bonuses { get; set; }
 
     [JsonPropertyName("Points")]
     public int? Points { get; set; }
@@ -87,4 +90,4 @@ public class WorkoutBodyPart
 
     [JsonPropertyName("MildMusclePain")]
     public int? MildMusclePain { get; set; }
-}
+}