tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix thirst (#20472)

Browse Source 
Co-authored-by: DrSmugleaf <drsmugleaf@gmail.com>
This commit is contained in:
Slava0135
2023-09-24 22:50:41 +03:00
committed by GitHub
parent 47c107c431
commit c4f3f5177a
4 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs
View File

@@ -7,7 +7,7 @@ using JetBrains.Annotations;
using Robust.Shared.Random;
using Robust.Shared.Timing;
namespace Content.Server.Nutrition.EntitySystems;
namespace Content.Shared.Nutrition.EntitySystems;
[UsedImplicitly]
public sealed class ThirstSystem : EntitySystem
@@ -27,12 +27,12 @@ public sealed class ThirstSystem : EntitySystem
_sawmill = Logger.GetSawmill("thirst");
SubscribeLocalEvent<ThirstComponent, RefreshMovementSpeedModifiersEvent>(OnRefreshMovespeed);
SubscribeLocalEvent<ThirstComponent, ComponentStartup>(OnComponentStartup);
SubscribeLocalEvent<ThirstComponent, MapInitEvent>(OnMapInit);
SubscribeLocalEvent<ThirstComponent, RejuvenateEvent>(OnRejuvenate);
SubscribeLocalEvent<ThirstComponent, EntityUnpausedEvent>(OnUnpaused);
}
private void OnComponentStartup(EntityUid uid, ThirstComponent component, ComponentStartup args)
private void OnMapInit(EntityUid uid, ThirstComponent component, MapInitEvent args)
{
// Do not change behavior unless starting value is explicitly defined
if (component.CurrentThirst < 0)
@@ -41,6 +41,7 @@ public sealed class ThirstSystem : EntitySystem
(int) component.ThirstThresholds[ThirstThreshold.Thirsty] + 10,
(int) component.ThirstThresholds[ThirstThreshold.Okay] - 1);
}
component.NextUpdateTime = _timing.CurTime;
component.CurrentThirstThreshold = GetThirstThreshold(component, component.CurrentThirst);
component.LastThirstThreshold = ThirstThreshold.Okay; // TODO: Potentially change this -> Used Okay because no effects.
// TODO: Check all thresholds make sense and throw if they don't.
@@ -59,7 +60,7 @@ public sealed class ThirstSystem : EntitySystem
private void OnRejuvenate(EntityUid uid, ThirstComponent component, RejuvenateEvent args)
{
ResetThirst(component);
SetThirst(uid, component, component.ThirstThresholds[ThirstThreshold.Okay]);
}
private ThirstThreshold GetThirstThreshold(ThirstComponent component, float amount)
@@ -78,14 +79,18 @@ public sealed class ThirstSystem : EntitySystem
return result;
}
public void UpdateThirst(ThirstComponent component, float amount)
public void ModifyThirst(EntityUid uid, ThirstComponent component, float amount)
{
component.CurrentThirst = Math.Clamp(component.CurrentThirst + amount, component.ThirstThresholds[ThirstThreshold.Dead], component.ThirstThresholds[ThirstThreshold.OverHydrated]);
SetThirst(uid, component, component.CurrentThirst + amount);
}
public void ResetThirst(ThirstComponent component)
public void SetThirst(EntityUid uid, ThirstComponent component, float amount)
{
component.CurrentThirst = component.ThirstThresholds[ThirstThreshold.Okay];
component.CurrentThirst = Math.Clamp(amount,
component.ThirstThresholds[ThirstThreshold.Dead],
component.ThirstThresholds[ThirstThreshold.OverHydrated]
);
Dirty(uid, component);
}
private bool IsMovementThreshold(ThirstThreshold threshold)
@@ -166,7 +171,7 @@ public sealed class ThirstSystem : EntitySystem
thirst.NextUpdateTime += thirst.UpdateRate;
UpdateThirst(thirst, -thirst.ActualDecayRate);
ModifyThirst(uid, thirst, -thirst.ActualDecayRate);
var calculatedThirstThreshold = GetThirstThreshold(thirst, thirst.CurrentThirst);
if (calculatedThirstThreshold == thirst.CurrentThirstThreshold)