Skip to content
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

Jump to bottom

fix shrike healing & crit healing and properly addresses regen delays #16607

Merged
merged 2 commits into from
Oct 3, 2024
Merged

fix shrike healing & crit healing and properly addresses regen delays #16607

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f1609b
fix shrike healing & crit healing and properly addresses regen delays
Arturlang Sep 29, 2024
76d8f22
critical healing positional args instead of named args
Arturlang Oct 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions code/modules/mob/living/carbon/xenomorph/life.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,22 +84,23 @@

/mob/living/carbon/xenomorph/proc/handle_critical_health_updates(seconds_per_tick)
if(loc_weeds_type)
heal_wounds(XENO_RESTING_HEAL, seconds_per_tick)
heal_wounds(XENO_RESTING_HEAL, FALSE, seconds_per_tick) // healing in critical while on weeds ignores scaling
else if(!endure) //If we're not Enduring we bleed out
adjustBruteLoss(XENO_CRIT_DAMAGE * seconds_per_tick * XENO_PER_SECOND_LIFE_MOD)

/mob/living/carbon/xenomorph/proc/heal_wounds(multiplier = XENO_RESTING_HEAL, scaling = FALSE, seconds_per_tick)
/mob/living/carbon/xenomorph/proc/heal_wounds(multiplier = XENO_RESTING_HEAL, scaling = FALSE, seconds_per_tick = 2)
var/amount = 1 + (maxHealth * 0.0375) // 1 damage + 3.75% max health, with scaling power.
if(recovery_aura)
amount += recovery_aura * maxHealth * 0.01 // +1% max health per recovery level, up to +5%
if(scaling)
var/time_modifier = seconds_per_tick * XENO_PER_SECOND_LIFE_MOD
if(recovery_aura)
regen_power = clamp(regen_power + xeno_caste.regen_ramp_amount*30,0,1) //Ignores the cooldown, and gives a 50% boost.
regen_power = clamp(regen_power + xeno_caste.regen_ramp_amount * time_modifier * 30, 0, 1) //Ignores the cooldown, and gives a 50% boost.
else if(regen_power < 0) // We're not supposed to regenerate yet. Start a countdown for regeneration.
regen_power += seconds_per_tick
regen_power += seconds_per_tick SECONDS
return
else
regen_power = min(regen_power + xeno_caste.regen_ramp_amount*20,1)
regen_power = min(regen_power + xeno_caste.regen_ramp_amount * time_modifier * 20, 1)
amount *= regen_power
amount *= multiplier * GLOB.xeno_stat_multiplicator_buff * seconds_per_tick * XENO_PER_SECOND_LIFE_MOD

Expand Down
Loading