diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Globals.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Globals.cs index 2c8c2246..9b7c24cc 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Globals.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Globals.cs @@ -1398,8 +1398,22 @@ public record GlobalAudioSettings public record Triggers { - //TODO: add type - public object? HandlerDamage + public Dictionary>? HandlerDamage + { + get; + set; + } +} + +public record DamageData +{ + public int? Amount + { + get; + set; + } + + public BodyPartColliderType BodyPartColliderType { get; set; diff --git a/Libraries/SPTarkov.Server.Core/Models/Enums/BodyPartColliderType.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/BodyPartColliderType.cs new file mode 100644 index 00000000..e93b9e22 --- /dev/null +++ b/Libraries/SPTarkov.Server.Core/Models/Enums/BodyPartColliderType.cs @@ -0,0 +1,33 @@ +namespace SPTarkov.Server.Core.Models.Enums +{ + public enum BodyPartColliderType + { + None = -1, + HeadCommon, + RibcageUp, + Pelvis = 3, + LeftUpperArm, + LeftForearm, + RightUpperArm, + RightForearm, + LeftThigh, + LeftCalf, + RightThigh, + RightCalf, + ParietalHead, + BackHead, + Ears, + Eyes, + Jaw, + NeckFront, + NeckBack, + RightSideChestUp, + LeftSideChestUp, + SpineTop, + SpineDown, + PelvisBack, + RightSideChestDown, + LeftSideChestDown, + RibcageLow + } +} diff --git a/Libraries/SPTarkov.Server.Core/Utils/JsonUtil.cs b/Libraries/SPTarkov.Server.Core/Utils/JsonUtil.cs index 57b27841..33d0da44 100644 --- a/Libraries/SPTarkov.Server.Core/Utils/JsonUtil.cs +++ b/Libraries/SPTarkov.Server.Core/Utils/JsonUtil.cs @@ -8,6 +8,7 @@ using SPTarkov.Server.Core.Models.Enums; using SPTarkov.Server.Core.Models.Spt.Dialog; using SPTarkov.Server.Core.Utils.Json.Converters; using SPTarkov.Common.Annotations; +using SPTarkov.Server.Core.Models.Eft.Common; namespace SPTarkov.Server.Core.Utils; @@ -51,6 +52,7 @@ public class JsonUtil new EftEnumConverter(), new EftEnumConverter(), new EftEnumConverter(), + new EftEnumConverter(), new EftListEnumConverter(), new EftListEnumConverter(), new EftListEnumConverter(),