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

Libraries/Core/Helpers/HealthHelper.cs

@@ -1,10 +1,10 @@
 using SptCommon.Annotations;
 using Core.Models.Eft.Common;
+using Core.Models.Eft.Common.Tables;
 using Core.Models.Eft.Health;
 using Core.Models.Eft.Profile;
 using BodyPartHealth = Core.Models.Eft.Common.Tables.BodyPartHealth;
 using Effects = Core.Models.Eft.Profile.Effects;
-using Health = Core.Models.Eft.Profile.Health;
 
 namespace Core.Helpers;
 
@@ -32,7 +32,7 @@ public class HealthHelper
     /// <param name="deleteExistingEffects">Should all prior effects be removed before apply new ones  (default - true)</param>
     public void UpdateProfileHealthPostRaid(
         PmcData pmcData,
-        Health postRaidHealth,
+        BotBaseHealth postRaidHealth,
         string sessionID,
         bool isDead)
     {

Libraries/Core/Models/Eft/Common/Location.cs

@@ -22,7 +22,7 @@ public record Location
     public StaticContainerDetails? StaticContainers { get; set; }
 
     [JsonPropertyName("staticAmmo")]
-    public Dictionary<string, StaticAmmoDetails[]> StaticAmmo { get; set; }
+    public Dictionary<string, List<StaticAmmoDetails>> StaticAmmo { get; set; }
 
     /** All possible static containers on map + their assign groupings */
     [JsonPropertyName("statics")]

Libraries/Core/Models/Eft/Common/LocationBase.cs

@@ -575,7 +575,7 @@ public record AdditionalHostilitySettings
     public List<string>? AlwaysFriends { get; set; }
 
     [JsonPropertyName("BearEnemyChance")]
-    public int? BearEnemyChance { get; set; }
+    public double? BearEnemyChance { get; set; }
 
     [JsonPropertyName("BearPlayerBehaviour")]
     public string? BearPlayerBehaviour { get; set; }
@@ -593,10 +593,10 @@ public record AdditionalHostilitySettings
     public string? SavagePlayerBehaviour { get; set; }
 
     [JsonPropertyName("SavageEnemyChance")]
-    public int? SavageEnemyChance { get; set; }
+    public double? SavageEnemyChance { get; set; }
 
     [JsonPropertyName("UsecEnemyChance")]
-    public int? UsecEnemyChance { get; set; }
+    public double? UsecEnemyChance { get; set; }
 
     [JsonPropertyName("UsecPlayerBehaviour")]
     public string? UsecPlayerBehaviour { get; set; }

Libraries/Core/Services/BotNameService.cs

@@ -27,7 +27,7 @@ public class BotNameService(
     /// </summary>
     public void ClearNameCache()
     {
-        throw new NotImplementedException();
+        _usedNameCache.Clear();
     }
 
     /// <summary>