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

Hunger Icon Tweaks (#5384)

Browse Source 
* Added

* aaaa
This commit is contained in:
BurgerLUA
2018-10-07 20:37:29 +02:00
committed by Werner
parent f0eb80db4e
commit bfe946bca7
3 changed files with 73 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/life.dm
+27 -7
View File
@@ -951,7 +951,7 @@
else
if(overeatduration > 1)
overeatduration -= 2 //doubled the unfat rate
// hydration decrease
if(max_hydration > 0)
if (hydration > 0 && stat != 2)
@@ -1196,16 +1196,36 @@
if((life_tick % 3 == 0))
if(nutrition_icon)
var/nut_factor = max(0,min(nutrition / max_nutrition,1))
var/nutrition_icons = 5 //Misnomer, basically the highest nutrition icon value.
var/new_val = "nutrition[nutrition_icons - round(nut_factor*nutrition_icons)]"
var/nut_icon = 5 //5 to 0, with 5 being lowest, 0 being highest
if(nut_factor >= CREW_NUTRITION_OVEREATEN)
nut_icon = 0
else if (nut_factor >= CREW_NUTRITION_FULL)
nut_icon = 1
else if (nut_factor >= CREW_NUTRITION_SLIGHTLYHUNGRY)
nut_icon = 2
else if (nut_factor >= CREW_NUTRITION_HUNGRY)
nut_icon = 3
else if (nut_factor >= CREW_NUTRITION_VERYHUNGRY )
nut_icon = 4
var/new_val = "nutrition[nut_icon]"
if (nutrition_icon.icon_state != new_val)
nutrition_icon.icon_state = new_val
if(hydration_icon)
var/hyd_factor = max(0,min(hydration / max_hydration,1))
var/hydration_icons = 5 //Misnomer, basically the highest thirst icon value.
var/new_val = "thirst[hydration_icons - round(hyd_factor*hydration_icons)]"
var/hyd_icon = 5
if(hyd_factor >= CREW_HYDRATION_OVERHYDRATED)
hyd_icon = 0
else if(hyd_factor >= CREW_HYDRATION_HYDRATED)
hyd_icon = 1
else if(hyd_factor >= CREW_HYDRATION_SLIGHTLYTHIRSTY)
hyd_icon = 2
else if(hyd_factor >= CREW_HYDRATION_THIRSTY)
hyd_icon = 3
else if(hyd_factor >= CREW_HYDRATION_VERYTHIRSTY)
hyd_icon = 4
var/new_val = "thirst[hyd_icon]"
if (hydration_icon.icon_state != new_val)
hydration_icon.icon_state = new_val
hydration_icon.icon_state = new_val
if(pressure)
var/new_pressure = "pressure[pressure_alert]"
@@ -1653,7 +1673,7 @@
if (prob(1.5))
src << span("warning", "You feel hungry and exhausted, eat something to regain your energy!")
return
if (hydration <= 0)
if (prob(1.5))
src << span("warning", "You feel thirsty and exhausted, drink something to regain your energy!")
code/modules/mob/mob_helpers.dm
+8 -8
View File
@@ -1190,16 +1190,16 @@ proc/is_blind(A)
var/hydration_mul = hydration/max_hydration
if(hydration_mul >= CREW_HYDRATION_OVERHYDRATED)
return minscale + ( (maxscale - minscale) * 0.75)
return minscale + ( (maxscale - minscale) * 0.66)
if(hydration_mul <= CREW_HYDRATION_DEHYDRATED)
return minscale + ( (maxscale - minscale) * 0.25)
return minscale
if(hydration_mul <= CREW_HYDRATION_VERYTHIRSTY)
return minscale + ( (maxscale - minscale) * 0.5)
return minscale + ( (maxscale - minscale) * 0.33)
if(hydration_mul <= CREW_HYDRATION_THIRSTY)
return minscale + ( (maxscale - minscale) * 0.75)
return minscale + ( (maxscale - minscale) * 0.66)
return minscale + ( (maxscale - minscale) * 1)
@@ -1214,16 +1214,16 @@ proc/is_blind(A)
var/nutrition_mul = nutrition/max_nutrition
if(nutrition_mul >= CREW_NUTRITION_OVEREATEN)
return minscale + ( (maxscale - minscale) * 0.75)
return minscale + ( (maxscale - minscale) * 0.66)
if(nutrition_mul <= CREW_NUTRITION_STARVING)
return minscale + ( (maxscale - minscale) * 0.25)
return minscale
if(nutrition_mul <= CREW_NUTRITION_VERYHUNGRY)
return minscale + ( (maxscale - minscale) * 0.5)
return minscale + ( (maxscale - minscale) * 0.33)
if(nutrition_mul <= CREW_NUTRITION_HUNGRY)
return minscale + ( (maxscale - minscale) * 0.75)
return minscale + ( (maxscale - minscale) * 0.66)
return minscale + ( (maxscale - minscale) * 1)