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

Fix hunger/thirst 'Dead' thresholds (#9453)

Browse Source
This commit is contained in:
themias
2022-07-05 23:08:57 -04:00
committed by GitHub
parent f9f460af31
commit 1014c7c335
5 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Content.Server/Nutrition/Components/HungerComponent.cs
View File

@@ -64,6 +64,7 @@ namespace Content.Server.Nutrition.Components
{ HungerThreshold.Overfed, AlertType.Overfed }, { HungerThreshold.Overfed, AlertType.Overfed },
{ HungerThreshold.Peckish, AlertType.Peckish }, { HungerThreshold.Peckish, AlertType.Peckish },
{ HungerThreshold.Starving, AlertType.Starving }, { HungerThreshold.Starving, AlertType.Starving },
{ HungerThreshold.Dead, AlertType.Starving },
}; };
public void HungerThresholdEffect(bool force = false) public void HungerThresholdEffect(bool force = false)

1
Content.Server/Nutrition/Components/ThirstComponent.cs
View File

@@ -48,6 +48,7 @@ namespace Content.Server.Nutrition.Components
{ThirstThreshold.OverHydrated, AlertType.Overhydrated}, {ThirstThreshold.OverHydrated, AlertType.Overhydrated},
{ThirstThreshold.Thirsty, AlertType.Thirsty}, {ThirstThreshold.Thirsty, AlertType.Thirsty},
{ThirstThreshold.Parched, AlertType.Parched}, {ThirstThreshold.Parched, AlertType.Parched},
{ThirstThreshold.Dead, AlertType.Parched},
}; };
} }
} }

2
Content.Server/Nutrition/EntitySystems/ThirstSystem.cs
View File

@@ -44,7 +44,7 @@ namespace Content.Server.Nutrition.EntitySystems
private void OnRefreshMovespeed(EntityUid uid, ThirstComponent component, RefreshMovementSpeedModifiersEvent args) private void OnRefreshMovespeed(EntityUid uid, ThirstComponent component, RefreshMovementSpeedModifiersEvent args)
{ {
var mod = (component.CurrentThirstThreshold & (ThirstThreshold.Parched | ThirstThreshold.Dead)) != 0x0 ? 0.75f : 1.0f; var mod = component.CurrentThirstThreshold <= ThirstThreshold.Parched ? 0.75f : 1.0f;
args.ModifySpeed(mod, mod); args.ModifySpeed(mod, mod);
} }

10
Content.Shared/Nutrition/Components/SharedHungerComponent.cs
View File

@@ -24,10 +24,10 @@ namespace Content.Shared.Nutrition.Components
[Serializable, NetSerializable] [Serializable, NetSerializable]
public enum HungerThreshold : byte public enum HungerThreshold : byte
{ {
Overfed, Overfed = 1 << 3,
Okay, Okay = 1 << 2,
Peckish, Peckish = 1 << 1,
Starving, Starving = 1 << 0,
Dead, Dead = 0,
} }
} }

4
Content.Shared/Nutrition/EntitySystems/SharedHungerSystem.cs
View File

@@ -1,4 +1,4 @@
using Content.Shared.Movement.Systems; using Content.Shared.Movement.Systems;
using Content.Shared.Nutrition.Components; using Content.Shared.Nutrition.Components;
namespace Content.Shared.Nutrition.EntitySystems namespace Content.Shared.Nutrition.EntitySystems
@@ -14,7 +14,7 @@ namespace Content.Shared.Nutrition.EntitySystems
private void OnRefreshMovespeed(EntityUid uid, SharedHungerComponent component, RefreshMovementSpeedModifiersEvent args) private void OnRefreshMovespeed(EntityUid uid, SharedHungerComponent component, RefreshMovementSpeedModifiersEvent args)
{ {
float mod = component.CurrentHungerThreshold == HungerThreshold.Starving ? 0.75f : 1.0f; float mod = component.CurrentHungerThreshold <= HungerThreshold.Starving ? 0.75f : 1.0f;
args.ModifySpeed(mod, mod); args.ModifySpeed(mod, mod);
} }
} }