Add 3114

Exiled-Team · Nov 13, 2023 · 41f7fa3 · 41f7fa3
1 parent 8e46083
commit 41f7fa3
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/Exiled.API/Enums/DamageType.cs b/Exiled.API/Enums/DamageType.cs
@@ -234,5 +234,15 @@ public enum DamageType
         /// Damage caused by <see cref="ItemType.GunA7"/>.
         /// </summary>
         A7,
+
+        /// <summary>
+        /// Damage caused by <see cref="RoleTypeId.Scp3114"/>
+        /// </summary>
+        Scp3114,
+
+        /// <summary>
+        /// Damage caused by Scp3114's strangling ability.
+        /// </summary>
+        Strangled,
     }
 }
diff --git a/Exiled.API/Features/DamageHandlers/DamageHandlerBase.cs b/Exiled.API/Features/DamageHandlers/DamageHandlerBase.cs
@@ -15,7 +15,7 @@ namespace Exiled.API.Features.DamageHandlers
     using Enums;
 
     using Extensions;
-
+    using PlayerRoles.PlayableScps.Scp3114;
     using PlayerRoles.PlayableScps.Scp939;
 
     using PlayerStatsSystem;
@@ -116,6 +116,14 @@ public virtual DamageType Type
                         return DamageType.Scp939;
                     case JailbirdDamageHandler:
                         return DamageType.Jailbird;
+                    case Scp3114DamageHandler scp3114DamageHandler:
+                        return scp3114DamageHandler.Subtype switch
+                        {
+                            Scp3114DamageHandler.HandlerType.Strangulation => DamageType.Strangled,
+                            Scp3114DamageHandler.HandlerType.SkinSteal => DamageType.Scp3114,
+                            Scp3114DamageHandler.HandlerType.Slap => DamageType.Scp3114,
+                            _ => DamageType.Unknown,
+                        };
                     case Scp049DamageHandler scp049DamageHandler:
                         return scp049DamageHandler.DamageSubType switch
                         {

diff --git a/Exiled.Events/Patches/Events/Scp3114/Disguising.cs b/Exiled.Events/Patches/Events/Scp3114/Disguising.cs
@@ -38,8 +38,8 @@ private static bool Prefix(Scp3114Disguise __instance)
                 if (!disguising.IsAllowed)
                     return false;
 
-                __instance.ScpRole.Disguised = true;
-                Scp3114RagdollToBonesConverter.ServerConvertNew(__instance.ScpRole, ragdoll);
+                __instance.CastRole.Disguised = true;
+                Scp3114RagdollToBonesConverter.ServerConvertNew(__instance.CastRole, ragdoll);
 
                 DisguisedEventArgs disguised = new(__instance.Owner, ragdoll);
                 Scp3114.OnDisguised(disguised);