juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix hunger + thirst mispredicts (#36549)

Browse Source 
* Fix hunger + thirst mispredicts

* Review
This commit is contained in:
metalgearsloth
2025-04-17 21:43:16 +10:00
committed by GitHub
parent a85370cc81
commit 9b7af5dfcf
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,6 +49,8 @@ public sealed class ThirstSystem : EntitySystem
component.CurrentThirst = _random.Next(
(int) component.ThirstThresholds[ThirstThreshold.Thirsty] + 10,
(int) component.ThirstThresholds[ThirstThreshold.Okay] - 1);
DirtyField(uid, component, nameof(ThirstComponent.CurrentThirst));
}
component.NextUpdateTime = _timing.CurTime;
component.CurrentThirstThreshold = GetThirstThreshold(component, component.CurrentThirst);
@@ -56,6 +58,8 @@ public sealed class ThirstSystem : EntitySystem
// TODO: Check all thresholds make sense and throw if they don't.
UpdateEffects(uid, component);
DirtyFields(uid, component, null, nameof(ThirstComponent.NextUpdateTime), nameof(ThirstComponent.CurrentThirstThreshold), nameof(ThirstComponent.LastThirstThreshold));
TryComp(uid, out MovementSpeedModifierComponent? moveMod);
_movement.RefreshMovementSpeedModifiers(uid, moveMod);
}
@@ -103,7 +107,7 @@ public sealed class ThirstSystem : EntitySystem
component.ThirstThresholds[ThirstThreshold.OverHydrated]
);
EntityManager.DirtyField(uid, component, nameof(ThirstComponent.CurrentThirst));
DirtyField(uid, component, nameof(ThirstComponent.CurrentThirst));
}
private bool IsMovementThreshold(ThirstThreshold threshold)
@@ -164,6 +168,9 @@ public sealed class ThirstSystem : EntitySystem
_alerts.ClearAlertCategory(uid, component.ThirstyCategory);
}
DirtyField(uid, component, nameof(ThirstComponent.LastThirstThreshold));
DirtyField(uid, component, nameof(ThirstComponent.ActualDecayRate));
switch (component.CurrentThirstThreshold)
{
case ThirstThreshold.OverHydrated: