Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 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.Peckish, AlertType.Peckish },
{ HungerThreshold.Starving, AlertType.Starving },
{ HungerThreshold.Dead, AlertType.Starving },
};
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.Thirsty, AlertType.Thirsty},
{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)
{
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);
}