From 480d3b26c4213617429e017668c69922dcd7cfda Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Sun, 17 Nov 2019 12:26:31 +1100
Subject: [PATCH] Make nutrition less harsh (#439)

* Make nutrition less harsh

Also fix the accumulator because why did I put that in the loop.
Decay rates decreased and made drink thirst levels same as hunger for now.

* Also fix stomach frametime accumulation
---
 .../Components/Nutrition/HungerComponent.cs            |  2 +-
 .../Components/Nutrition/ThirstComponent.cs            | 10 +++++-----
 .../GameObjects/EntitySystems/HungerSystem.cs          |  2 +-
 .../GameObjects/EntitySystems/StomachSystem.cs         |  2 +-
 .../GameObjects/EntitySystems/ThirstSystem.cs          |  2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Content.Server/GameObjects/Components/Nutrition/HungerComponent.cs b/Content.Server/GameObjects/Components/Nutrition/HungerComponent.cs
index 410789ddac..364ef8d438 100644
--- a/Content.Server/GameObjects/Components/Nutrition/HungerComponent.cs
+++ b/Content.Server/GameObjects/Components/Nutrition/HungerComponent.cs
@@ -48,7 +48,7 @@ namespace Content.Server.GameObjects.Components.Nutrition
         public override void ExposeData(ObjectSerializer serializer)
         {
             base.ExposeData(serializer);
-            serializer.DataField(ref _baseDecayRate, "base_decay_rate", 0.5f);
+            serializer.DataField(ref _baseDecayRate, "base_decay_rate", 0.1f);
         }
 
         public void HungerThresholdEffect(bool force = false)
diff --git a/Content.Server/GameObjects/Components/Nutrition/ThirstComponent.cs b/Content.Server/GameObjects/Components/Nutrition/ThirstComponent.cs
index d9a1c1bbcf..cef1be09f5 100644
--- a/Content.Server/GameObjects/Components/Nutrition/ThirstComponent.cs
+++ b/Content.Server/GameObjects/Components/Nutrition/ThirstComponent.cs
@@ -38,17 +38,17 @@ namespace Content.Server.GameObjects.Components.Nutrition
         public Dictionary<ThirstThreshold, float> ThirstThresholds => _thirstThresholds;
         private Dictionary<ThirstThreshold, float> _thirstThresholds = new Dictionary<ThirstThreshold, float>
         {
-            {ThirstThreshold.OverHydrated, 400.0f},
-            {ThirstThreshold.Okay, 300.0f},
-            {ThirstThreshold.Thirsty, 200.0f},
-            {ThirstThreshold.Parched, 100.0f},
+            {ThirstThreshold.OverHydrated, 600.0f},
+            {ThirstThreshold.Okay, 450.0f},
+            {ThirstThreshold.Thirsty, 300.0f},
+            {ThirstThreshold.Parched, 150.0f},
             {ThirstThreshold.Dead, 0.0f},
         };
 
         public override void ExposeData(ObjectSerializer serializer)
         {
             base.ExposeData(serializer);
-            serializer.DataField(ref _baseDecayRate, "base_decay_rate", 0.5f);
+            serializer.DataField(ref _baseDecayRate, "base_decay_rate", 0.1f);
         }
 
         public void ThirstThresholdEffect(bool force = false)
diff --git a/Content.Server/GameObjects/EntitySystems/HungerSystem.cs b/Content.Server/GameObjects/EntitySystems/HungerSystem.cs
index c1e8b2b348..671bc7f051 100644
--- a/Content.Server/GameObjects/EntitySystems/HungerSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/HungerSystem.cs
@@ -23,8 +23,8 @@ namespace Content.Server.GameObjects.EntitySystems
                 {
                     var comp = entity.GetComponent<HungerComponent>();
                     comp.OnUpdate(_accumulatedFrameTime);
-                    _accumulatedFrameTime = 0.0f;
                 }
+                _accumulatedFrameTime = 0.0f;
             }
         }
     }
diff --git a/Content.Server/GameObjects/EntitySystems/StomachSystem.cs b/Content.Server/GameObjects/EntitySystems/StomachSystem.cs
index 164c6b7428..4b30bcfffb 100644
--- a/Content.Server/GameObjects/EntitySystems/StomachSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/StomachSystem.cs
@@ -24,8 +24,8 @@ namespace Content.Server.GameObjects.EntitySystems
                 {
                     var comp = entity.GetComponent<StomachComponent>();
                     comp.OnUpdate(_accumulatedFrameTime);
-                    _accumulatedFrameTime = 0.0f;
                 }
+                _accumulatedFrameTime = 0.0f;
             }
         }
     }
diff --git a/Content.Server/GameObjects/EntitySystems/ThirstSystem.cs b/Content.Server/GameObjects/EntitySystems/ThirstSystem.cs
index 92b8fde44d..1312b4e8ac 100644
--- a/Content.Server/GameObjects/EntitySystems/ThirstSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/ThirstSystem.cs
@@ -23,8 +23,8 @@ namespace Content.Server.GameObjects.EntitySystems
                 {
                     var comp = entity.GetComponent<ThirstComponent>();
                     comp.OnUpdate(_accumulatedFrameTime);
-                    _accumulatedFrameTime = 0.0f;
                 }
+                _accumulatedFrameTime = 0.0f;
             }
         }
     }