Skip to content

Medical Core - Make second chance deactivation timeout configurable #289

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
denispol wants to merge 2 commits into
base: medical/add-circulation
Choose a base branch
from
+17 −13
Open

Medical Core - Make second chance deactivation timeout configurable #289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
002924a
refactor(medical): make fall damage timeout configurable and consolid…
denispol Nov 1, 2025
f8b7c9d
Merge branch 'medical/add-circulation' into medical/refactor-fall-damage
Kexanone Dec 7, 2025
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 14 additions & 13 deletions ...pts/Game/ACE_Medical_SecondChance/Components/Damage/SCR_CharacterDamageManagerComponent.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ modded class SCR_CharacterDamageManagerComponent : SCR_DamageManagerComponent
protected float m_fACE_Medical_SecondChanceDeactivationTimeMS = -float.INFINITY;
protected float m_fACE_Medical_LastFallDamageTimeMS = -float.INFINITY;

protected static const float ACE_MEDICAL_SECOND_CHANCE_DEACTIVATION_TIMEOUT_MS = 1000;

//-----------------------------------------------------------------------------------------------------------
[Friend(ACE_Medical_SecondChanceSystem)]
protected void ACE_Medical_OnSecondChanceGranted()
Expand All @@ -24,7 +22,7 @@ modded class SCR_CharacterDamageManagerComponent : SCR_DamageManagerComponent
//! Second chance will be deactivated after ACE_MEDICAL_SECOND_CHANCE_DEACTIVATION_TIMEOUT_MS
void ACE_Medical_ScheduleSecondChanceDeactivation()
{
m_fACE_Medical_SecondChanceDeactivationTimeMS = GetOwner().GetWorld().GetWorldTime() + ACE_MEDICAL_SECOND_CHANCE_DEACTIVATION_TIMEOUT_MS;
m_fACE_Medical_SecondChanceDeactivationTimeMS = GetOwner().GetWorld().GetWorldTime() + s_ACE_Medical_Core_Settings.m_iSecondChanceDeactivationTimeoutMs;
}

//-----------------------------------------------------------------------------------------------------------
Expand All @@ -51,8 +49,8 @@ modded class SCR_CharacterDamageManagerComponent : SCR_DamageManagerComponent
// Check for fall damage
if (s_ACE_Medical_Core_Settings.m_bSecondChanceForFallDamageEnabled || m_fACE_Medical_SecondChanceDeactivationTimeMS < 0)
return true;

if (m_fACE_Medical_SecondChanceDeactivationTimeMS - m_fACE_Medical_LastFallDamageTimeMS <= ACE_MEDICAL_SECOND_CHANCE_DEACTIVATION_TIMEOUT_MS)
if (m_fACE_Medical_SecondChanceDeactivationTimeMS - m_fACE_Medical_LastFallDamageTimeMS <= s_ACE_Medical_Core_Settings.m_iSecondChanceDeactivationTimeoutMs)
return false;

return true;
Expand Down Expand Up @@ -101,16 +99,22 @@ modded class SCR_CharacterDamageManagerComponent : SCR_DamageManagerComponent
m_fACE_Medical_ResilienceRegenScale = Math.Min(m_fACE_Medical_ResilienceRegenScale, s_ACE_Medical_Core_Settings.m_fSecondChanceResilienceRegenScale);
}

//------------------------------------------------------------------------------------------------
protected void ACE_Medical_RecordFallDamageTime()
{
if (!Replication.IsServer())
return;

m_fACE_Medical_LastFallDamageTimeMS = GetOwner().GetWorld().GetWorldTime();
}

//-----------------------------------------------------------------------------------------------------------
//! Store the time of the latest fall damage
override void HandleAnimatedFallDamage(float damage)
{
super.HandleAnimatedFallDamage(damage);

if (!Replication.IsServer())
return;

m_fACE_Medical_LastFallDamageTimeMS = GetOwner().GetWorld().GetWorldTime();
ACE_Medical_RecordFallDamageTime();
}

//------------------------------------------------------------------------------------------------
Expand All @@ -119,9 +123,6 @@ modded class SCR_CharacterDamageManagerComponent : SCR_DamageManagerComponent
{
super.HandleRagdollFallDamage(contactingHitZone, damage);

if (!Replication.IsServer())
return;

m_fACE_Medical_LastFallDamageTimeMS = GetOwner().GetWorld().GetWorldTime();
ACE_Medical_RecordFallDamageTime();
}
}
3 changes: 3 additions & 0 deletions ...s/medical_core/scripts/Game/ACE_Medical_SecondChance/Settings/ACE_Medical_Core_Settings.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,7 @@ modded class ACE_Medical_Core_Settings : ACE_ModSettings

[Attribute(defvalue: "false", desc: "Whether AI can have second chance")]
bool m_bSecondChanceForAIEnabled;

[Attribute(defvalue: "1000", desc: "How long in milliseconds after a non-fatal hit second chance will be deactivated for fall damage")]
int m_iSecondChanceDeactivationTimeoutMs;
}