diff --git a/addons/medical_hitzones/scripts/Game/ACE_Medical_Hitzones/HitZone/ACE_Medical_FemoralArteryHitZone.c b/addons/medical_hitzones/scripts/Game/ACE_Medical_Hitzones/HitZone/ACE_Medical_FemoralArteryHitZone.c index da035c41e..5dd258bd9 100644 --- a/addons/medical_hitzones/scripts/Game/ACE_Medical_Hitzones/HitZone/ACE_Medical_FemoralArteryHitZone.c +++ b/addons/medical_hitzones/scripts/Game/ACE_Medical_Hitzones/HitZone/ACE_Medical_FemoralArteryHitZone.c @@ -22,7 +22,10 @@ class ACE_Medical_FemoralArteryHitZone : ACE_Medical_OrganHitZone if (Replication.IsServer()) { charDamageManager.AddBleedingEffectOnHitZone(SCR_CharacterHitZone.Cast(charDamageManager.GetHitZoneByName("Hips"))); - charDamageManager.GetResilienceHitZone().SetHealthScaled(0); + + ACE_Medical_Hitzones_Settings settings = ACE_SettingsHelperT.GetModSettings(); + if (settings && settings.m_bInstantUnconOnMassiveBleeding) + GetGame().GetCallqueue().Call(charDamageManager.GetResilienceHitZone().SetHealthScaled, 0); } if (!System.IsConsoleApp()) diff --git a/addons/medical_hitzones/scripts/Game/ACE_Medical_Hitzones/HitZone/ACE_Medical_NeckHitZone.c b/addons/medical_hitzones/scripts/Game/ACE_Medical_Hitzones/HitZone/ACE_Medical_NeckHitZone.c index 7f04cc1a0..d60d424b8 100644 --- a/addons/medical_hitzones/scripts/Game/ACE_Medical_Hitzones/HitZone/ACE_Medical_NeckHitZone.c +++ b/addons/medical_hitzones/scripts/Game/ACE_Medical_Hitzones/HitZone/ACE_Medical_NeckHitZone.c @@ -15,6 +15,9 @@ modded class ACE_Medical_NeckHitZone : SCR_CharacterHitZone return; charDamageManager.AddBleedingEffectOnHitZone(this); - charDamageManager.GetResilienceHitZone().SetHealthScaled(0); + + ACE_Medical_Hitzones_Settings settings = ACE_SettingsHelperT.GetModSettings(); + if (settings && settings.m_bInstantUnconOnMassiveBleeding) + GetGame().GetCallqueue().Call(charDamageManager.GetResilienceHitZone().SetHealthScaled, 0); } } diff --git a/addons/medical_hitzones/scripts/Game/ACE_Medical_Hitzones/Settings/ACE_Medical_Hitzones_Settings.c b/addons/medical_hitzones/scripts/Game/ACE_Medical_Hitzones/Settings/ACE_Medical_Hitzones_Settings.c index 8e6dcc98b..1d9c1e762 100644 --- a/addons/medical_hitzones/scripts/Game/ACE_Medical_Hitzones/Settings/ACE_Medical_Hitzones_Settings.c +++ b/addons/medical_hitzones/scripts/Game/ACE_Medical_Hitzones/Settings/ACE_Medical_Hitzones_Settings.c @@ -7,4 +7,7 @@ class ACE_Medical_Hitzones_Settings : ACE_ModSettings [Attribute(defvalue: "0", desc: "Probability for second chance for killing blows to the heart", uiwidget: UIWidgets.Slider, params: "0 1")] float m_fSecondChanceOnHeart; + + [Attribute(defvalue: "true", desc: "Whether neck or femoral bleeding instantly cause unconsciousness.")] + bool m_bInstantUnconOnMassiveBleeding; } diff --git a/docs/src/content/docs/components/medical.mdx b/docs/src/content/docs/components/medical.mdx index f414b28bd..b2431e92f 100644 --- a/docs/src/content/docs/components/medical.mdx +++ b/docs/src/content/docs/components/medical.mdx @@ -144,6 +144,7 @@ Summary of settings that can be modified in the server config: | ------------------------------------- | -------------------- | -------------------------------------------------- | | `m_bOrganHitZonesEnabled` | Type: `bool`*
Default: `true` | Whether organ hit zones should be enabled | | `m_fSecondChanceOnHeart` | Type: `float`**
Range: 0 to 1
Default: `0.0` | Probability for second chance for killing blows to the heart | +| `m_bInstantUnconOnMassiveBleeding` | Type: `bool`
Default: `true` | Whether neck or femoral bleeding instantly cause unconsciousness. |
@@ -153,7 +154,8 @@ Template for the `missionHeader` in a server config: "m_ACE_Settings": { "m_ACE_Medical_Hitzones": { "m_bOrganHitZonesEnabled": 1, - "m_fSecondChanceOnHeart": 0.0 + "m_fSecondChanceOnHeart": 0.0, + "m_bInstantUnconOnMassiveBleeding": true } } }