From 4ab064a50d527ee04567c997787c6ec6d32ac132 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Mon, 21 Sep 2020 20:58:33 -0700 Subject: [PATCH] fix --- code/controllers/configuration/entries/stamina_combat.dm | 8 ++++---- code/modules/mob/living/stamina_buffer.dm | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/controllers/configuration/entries/stamina_combat.dm b/code/controllers/configuration/entries/stamina_combat.dm index 2cc99bdbe5..3fa548366f 100644 --- a/code/controllers/configuration/entries/stamina_combat.dm +++ b/code/controllers/configuration/entries/stamina_combat.dm @@ -4,19 +4,19 @@ /// Maximum stamina buffer /datum/config_entry/number/stamina_combat/buffer_max - config_entry_value = 40 + config_entry_value = 30 /// Seconds until percent_regeneration_out_of_combat kicks in /datum/config_entry/number/stamina_combat/out_of_combat_timer - config_entry_value = 10 + config_entry_value = 15 /// Base regeneration per second /datum/config_entry/number/stamina_combat/base_regeneration - config_entry_value = 5 + config_entry_value = 0.5 /// Combat mode regeneration per second /datum/config_entry/number/stamina_combat/combat_regeneration - config_entry_value = 12.5 + config_entry_value = 5 /// After out_of_combat_timer elapses, additionally regenerate this percent of total stamina per second. Unaffected by combat mode. /datum/config_entry/number/stamina_combat/percent_regeneration_out_of_combat diff --git a/code/modules/mob/living/stamina_buffer.dm b/code/modules/mob/living/stamina_buffer.dm index c59498041f..a410df582b 100644 --- a/code/modules/mob/living/stamina_buffer.dm +++ b/code/modules/mob/living/stamina_buffer.dm @@ -9,7 +9,7 @@ return TRUE if(stamina_buffer < amount) var/stamina_health = getStaminaLoss() - if(stamina_health < STAMINA_NO_OVERDRAW_THRESHOLD) + if(stamina_health > STAMINA_NO_OVERDRAW_THRESHOLD) if(warn) to_chat(src, "You do not have enough action stamina to do that!") return FALSE @@ -41,7 +41,7 @@ CONFIG_CACHE_ENTRY_AND_FETCH_VALUE(number/stamina_combat/post_action_penalty_factor, post_action_penalty_factor) var/base_regen = (SEND_SIGNAL(src, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_INACTIVE))? base_regeneration : combat_regeneration var/time_since_last_action = world.time - stamina_buffer_last_use - var/action_penalty = (((time_since_last_action) < (post_action_penalty_delay * 10)) && post_action_penalty_factor) || 1 + var/action_penalty = ((time_since_last_action) < (post_action_penalty_delay * 10))? post_action_penalty_factor : 1 var/out_of_combat_bonus = (time_since_last_action < (out_of_combat_timer * 10))? 0 : ((buffer_max * percent_regeneration_out_of_combat * 0.01)) var/regen = ((base_regen * action_penalty) + out_of_combat_bonus) * time * 0.1 * stamina_buffer_regen_mod stamina_buffer += min((buffer_max - stamina_buffer), regen)