cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-25 14:00:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Hydration/Nutrition Tweaks (#5439)

Browse Source
This commit is contained in:
BurgerLUA
2018-10-23 15:30:33 +02:00
committed by Werner
parent fd57a05ef0
commit 847ba919e3
6 changed files with 66 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/life.dm
+4 -4
View File
@@ -939,7 +939,7 @@
else //heal in the dark
heal_overall_damage(5,5)
// nutrition decrease
// nutrition decrease over time
if(max_nutrition > 0)
if (nutrition > 0 && stat != 2)
adjustNutritionLoss(nutrition_loss * nutrition_attrition_rate)
@@ -952,13 +952,13 @@
if(overeatduration > 1)
overeatduration -= 2 //doubled the unfat rate
// hydration decrease
// hydration decrease over time
if(max_hydration > 0)
if (hydration > 0 && stat != 2)
adjustHydrationLoss(hydration_loss * hydration_attrition_rate)
if (hydration / max_hydration > CREW_HYDRATION_OVERHYDRATED)
adjustHydrationLoss(1)
adjustHydrationLoss(2)
if(overdrinkduration < 600) //capped so people don't take forever to undrink
overdrinkduration++
else
@@ -1686,7 +1686,7 @@
if (regen > 0)
stamina = min(max_stamina, stamina+regen)
adjustNutritionLoss(stamina_recovery*0.09)
adjustHydrationLoss(stamina_recovery*0.18)
adjustHydrationLoss(stamina_recovery*0.32)
if (client)
hud_used.move_intent.update_move_icon(src)
code/modules/mob/mob_defines.dm
+6 -6
View File
@@ -111,19 +111,19 @@
var/old_y = 0
var/drowsyness = 0.0//Carbon
var/charges = 0.0
var/nutrition = 400.0//Carbon
var/nutrition = BASE_MAX_NUTRITION * CREW_NUTRITION_SLIGHTLYHUNGRY //carbon
var/nutrition_loss = HUNGER_FACTOR //How much hunger is lost per tick. This is modified by species
var/nutrition_attrition_rate = 1 // A multiplier for how much nutrition this specific mob loses per tick.
var/max_nutrition = 400
var/hydration = 400.0//Carbon
var/max_nutrition = BASE_MAX_NUTRITION
var/hydration = BASE_MAX_HYDRATION * CREW_HYDRATION_SLIGHTLYTHIRSTY //carbon
var/hydration_loss = THIRST_FACTOR //How much hunger is lost per tick. This is modified by species
var/hydration_attrition_rate = 1 // A multiplier for how much hydration this specific mob loses per tick.
var/max_hydration = 400
var/max_hydration = BASE_MAX_NUTRITION
var/overeatduration = 0 // How long this guy is overeating //Carbon
var/overdrinkduration = 0 // How long this guy is overdrinking //Carbon
var/paralysis = 0.0
var/stunned = 0.0
var/weakened = 0.0