mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-24 13:38:41 +01:00
cb87e54d93
## About The Pull Request ### Notable changes Before: When taking suffocation damage, 3 oxyloss damage is dealt, or 0.66 damage if below 0 health (soft crit threshold). If below 0 hp, and you have `NOCRITDAMAGE`, gets nullified. After: When taking suffocation damage, 3 oxyloss damage is dealt, reduced if you had a partially successful breath (i.e. 75% of a breath = 0.25x damage) or are in soft crit or hard crit (0.22x less damage). If in crit, and you have `NOCRITDAMAGE`, gets nullified. Before: You skip 1 in every 4 breaths when your health is below 0 (soft crit threshold), and skip every breath when your health is below -30 (hard crit threshold) After: You skip 1 in every 4 breaths when in soft crit, and skip every breath when in hard crit Before: You don't heal from successful breaths when below 0 health (soft crit threshold) After: You don't heal from successful breaths when in soft or hard crit ### Other changes - Removed `gasp` from losebreath processing, ie removed chance to gasp twice in one tick when choking. - Deletes `respiration_type`s - Deletes `crit_stabilizing_reagent` - Deletes species `breathid`, replaces it with `get_breath_type` that checks the species' lungs ## Why It's Good For The Game - There was a strange inconsistency where being in crit would drastically reduce the amount of suffocation damage you were dealt, but only if you were not breathing. If you were somehow breathing, you took the full damage. I thought this was a little obtuse, so I wanted to change it to be consistent: Being in crit is just a multiplier. - Making them check for `stat` instead of `health` means they affect people with `NO_SOFTCRIT` or `NO_HARDCRIT` nicer. - See above. - Really just to be cleaner, handle gasping in one place. - I'm not sure why we have `respiration_type`. The only time they're (practically) referred to is in reagent handling, but there are no reagents that set it anything but `ALL`. All it does is make our oxyloss handling made more complicated and harder to read for no purpose. So I decided to axe it - I think anything special handing that should arise should just have some bespoke checks instead. - Nothing set this value to anything else. And guess what, if you changed it, epinephrine still worked because it applies `NO_CRITDAMAGE`. - Species de-hardcoding. Makes it easier to add new breath types. ## Changelog 🆑 Melbert balance: Suffocation damage is slightly more consistent now: You take 3 oxyloss per suffocation tick, reduced for partially successful breaths and or if you are in crit. Alternatively, if you are in crit and you have epinephrine/atropine in your system, it gets nullified entirely. code: Cleaned up lungs a bit, particularly relating to abnormal lungs like plasmamen or fish, report any oddities with them. del: You no longer have a chance to gasp twice in one suffocation tick. /🆑 --------- Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com> Co-authored-by: san7890 <the@san7890.com>
83 lines
3.5 KiB
Plaintext
83 lines
3.5 KiB
Plaintext
/**
|
|
* Adjusts the health of a simple mob by a set amount
|
|
*
|
|
* Arguments:
|
|
* * amount The amount that will be used to adjust the mob's health
|
|
* * updating_health If the mob's health should be immediately updated to the new value
|
|
* * forced If we should force update the adjustment of the mob's health no matter the restrictions, like TRAIT_GODMODE
|
|
* returns the net change in bruteloss after applying the damage amount
|
|
*/
|
|
/mob/living/basic/proc/adjust_health(amount, updating_health = TRUE, forced = FALSE)
|
|
. = FALSE
|
|
if(!forced && HAS_TRAIT(src, TRAIT_GODMODE))
|
|
return 0
|
|
. = bruteloss // bruteloss value before applying damage
|
|
bruteloss = round(clamp(bruteloss + amount, 0, maxHealth * 2), DAMAGE_PRECISION)
|
|
if(updating_health)
|
|
updatehealth()
|
|
return . - bruteloss
|
|
|
|
/mob/living/basic/get_damage_mod(damage_type)
|
|
var/modifier = ..()
|
|
if (damage_type in damage_coeff)
|
|
return modifier * damage_coeff[damage_type]
|
|
return modifier
|
|
|
|
/mob/living/basic/adjust_brute_loss(amount, updating_health = TRUE, forced = FALSE, required_bodytype)
|
|
if(!can_adjust_brute_loss(amount, forced, required_bodytype))
|
|
return 0
|
|
if(forced)
|
|
. = adjust_health(amount * CONFIG_GET(number/damage_multiplier), updating_health, forced)
|
|
else if(damage_coeff[BRUTE])
|
|
. = adjust_health(amount * damage_coeff[BRUTE] * CONFIG_GET(number/damage_multiplier), updating_health, forced)
|
|
|
|
/mob/living/basic/adjust_fire_loss(amount, updating_health = TRUE, forced = FALSE, required_bodytype)
|
|
if(!can_adjust_fire_loss(amount, forced, required_bodytype))
|
|
return 0
|
|
if(forced)
|
|
. = adjust_health(amount * CONFIG_GET(number/damage_multiplier), updating_health, forced)
|
|
else if(damage_coeff[BURN])
|
|
. = adjust_health(amount * damage_coeff[BURN] * CONFIG_GET(number/damage_multiplier), updating_health, forced)
|
|
|
|
/mob/living/basic/adjust_oxy_loss(amount, updating_health = TRUE, forced = FALSE, required_biotype)
|
|
if(!can_adjust_oxy_loss(amount, forced, required_biotype))
|
|
return 0
|
|
if(forced)
|
|
. = adjust_health(amount * CONFIG_GET(number/damage_multiplier), updating_health, forced)
|
|
else if(damage_coeff[OXY])
|
|
. = adjust_health(amount * damage_coeff[OXY] * CONFIG_GET(number/damage_multiplier), updating_health, forced)
|
|
|
|
/mob/living/basic/adjust_tox_loss(amount, updating_health = TRUE, forced = FALSE, required_biotype)
|
|
if(!can_adjust_tox_loss(amount, forced, required_biotype))
|
|
return 0
|
|
if(forced)
|
|
. = adjust_health(amount * CONFIG_GET(number/damage_multiplier), updating_health, forced)
|
|
else if(damage_coeff[TOX])
|
|
. = adjust_health(amount * damage_coeff[TOX] * CONFIG_GET(number/damage_multiplier), updating_health, forced)
|
|
|
|
/mob/living/basic/adjust_stamina_loss(amount, updating_stamina = TRUE, forced = FALSE, required_biotype)
|
|
if(!can_adjust_stamina_loss(amount, forced, required_biotype))
|
|
return 0
|
|
. = staminaloss
|
|
|
|
var/stamina_delta = forced ? amount : amount * damage_coeff[STAMINA]
|
|
staminaloss = max(0, min(max_stamina, staminaloss + stamina_delta))
|
|
|
|
if(stamina_delta > 0)
|
|
received_stamina_damage(staminaloss, -1 * stamina_delta, amount)
|
|
if(updating_stamina && stamina_delta)
|
|
update_stamina()
|
|
. -= staminaloss
|
|
|
|
/mob/living/basic/received_stamina_damage(current_level, amount_actual, amount)
|
|
if (stamina_recovery == 0)
|
|
return ..()
|
|
|
|
/mob/living/basic/received_stamina_damage(current_level, amount_actual, amount)
|
|
. = ..()
|
|
if (stat == DEAD || stamina_crit_threshold == BASIC_MOB_NO_STAMCRIT)
|
|
return
|
|
|
|
if (100 / (max_stamina / current_level) >= stamina_crit_threshold)
|
|
apply_status_effect(/datum/status_effect/incapacitating/stamcrit)
|