From 99dec1c9a3aeedef50390d0134be89f90af38b0c Mon Sep 17 00:00:00 2001
From: Chomp <dev@dev.sp-tarkov.com>
Date: Sat, 5 Apr 2025 11:15:39 +0100
Subject: [PATCH] Updated `DeathCase.DeathCause` to use enum + same for other
 properties to match client

---
 .../Models/Eft/Common/Tables/BotBase.cs       |  6 ++--
 .../Models/Enums/DamageType.cs                | 31 +++++++++++++++++++
 .../Models/Enums/PlayerSide.cs                |  9 ++++++
 .../SPTarkov.Server.Core/Utils/JsonUtil.cs    |  2 ++
 4 files changed, 45 insertions(+), 3 deletions(-)
 create mode 100644 Libraries/SPTarkov.Server.Core/Models/Enums/DamageType.cs
 create mode 100644 Libraries/SPTarkov.Server.Core/Models/Enums/PlayerSide.cs

diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotBase.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotBase.cs
index f63036c3..51eeaa98 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotBase.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotBase.cs
@@ -1459,19 +1459,19 @@ public record DamageStats
 
 public record DeathCause
 {
-    public string? DamageType
+    public DamageType? DamageType
     {
         get;
         set;
     }
 
-    public string? Side
+    public PlayerSide? Side
     {
         get;
         set;
     }
 
-    public string? Role
+    public WildSpawnType? Role
     {
         get;
         set;
diff --git a/Libraries/SPTarkov.Server.Core/Models/Enums/DamageType.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/DamageType.cs
new file mode 100644
index 00000000..c7f4fa1b
--- /dev/null
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/DamageType.cs
@@ -0,0 +1,31 @@
+namespace SPTarkov.Server.Core.Models.Enums
+{
+    public enum DamageType
+    {
+        Undefined = 1,
+        Fall = 2,
+        Explosion = 4,
+        Barbed = 8,
+        Flame = 16,
+        GrenadeFragment = 32,
+        Impact = 64,
+        Existence = 128,
+        Medicine = 256,
+        Bullet = 512,
+        Melee = 1024,
+        Landmine = 2048,
+        Sniper = 4096,
+        Blunt = 8192,
+        LightBleeding = 16384,
+        HeavyBleeding = 32768,
+        Dehydration = 65536,
+        Exhaustion = 131072,
+        RadExposure = 262144,
+        Stimulator = 524288,
+        Poison = 1048576,
+        LethalToxin = 2097152,
+        Btr = 4194304,
+        Artillery = 8388608,
+        Environment = 16777216
+    }
+}
diff --git a/Libraries/SPTarkov.Server.Core/Models/Enums/PlayerSide.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/PlayerSide.cs
new file mode 100644
index 00000000..ab51afd3
--- /dev/null
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/PlayerSide.cs
@@ -0,0 +1,9 @@
+namespace SPTarkov.Server.Core.Models.Enums
+{
+    public enum PlayerSide
+    {
+        Usec = 1,
+        Bear = 2,
+        Savage = 4
+    }
+}
diff --git a/Libraries/SPTarkov.Server.Core/Utils/JsonUtil.cs b/Libraries/SPTarkov.Server.Core/Utils/JsonUtil.cs
index 61d0504f..2bf9ab0f 100644
--- a/Libraries/SPTarkov.Server.Core/Utils/JsonUtil.cs
+++ b/Libraries/SPTarkov.Server.Core/Utils/JsonUtil.cs
@@ -51,6 +51,8 @@ public class JsonUtil
             new EftEnumConverter<ExfiltrationType>(),
             new EftEnumConverter<EquipmentSlots>(),
             new EftListEnumConverter<EquipmentSlots>(),
+            new EftListEnumConverter<PlayerSide>(),
+            new EftListEnumConverter<DamageType>(),
             new BaseInteractionRequestDataConverter()
         }
     };