Fixes thirst not applying speed debuffs properly , Makes Thirst a server-side component only (#7767)
Co-authored-by: MLGTASTICa <ak9bc01d@yahoo.com> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
This commit is contained in:
@@ -1,14 +1,131 @@
|
||||
using Content.Server.Nutrition.Components;
|
||||
using JetBrains.Annotations;
|
||||
using Robust.Shared.GameObjects;
|
||||
using Content.Shared.Movement.EntitySystems;
|
||||
using Content.Shared.Nutrition.Components;
|
||||
using Robust.Shared.Random;
|
||||
using Content.Shared.MobState.Components;
|
||||
using Content.Shared.Movement.Components;
|
||||
using Content.Shared.Alert;
|
||||
using Content.Server.Administration.Logs;
|
||||
using Content.Shared.Administration.Logs;
|
||||
using Content.Shared.Database;
|
||||
using Content.Shared.Damage;
|
||||
|
||||
namespace Content.Server.Nutrition.EntitySystems
|
||||
{
|
||||
[UsedImplicitly]
|
||||
public sealed class ThirstSystem : EntitySystem
|
||||
{
|
||||
[Dependency] private readonly IRobustRandom _random = default!;
|
||||
[Dependency] private readonly AlertsSystem _alerts = default!;
|
||||
[Dependency] private readonly AdminLogSystem _adminlog = default!;
|
||||
[Dependency] private readonly DamageableSystem _damage = default!;
|
||||
[Dependency] private readonly MovementSpeedModifierSystem _movement = default!;
|
||||
|
||||
private ISawmill _sawmill = default!;
|
||||
private float _accumulatedFrameTime;
|
||||
|
||||
public override void Initialize()
|
||||
{
|
||||
base.Initialize();
|
||||
|
||||
_sawmill = Logger.GetSawmill("thirst");
|
||||
SubscribeLocalEvent<ThirstComponent, RefreshMovementSpeedModifiersEvent>(OnRefreshMovespeed);
|
||||
SubscribeLocalEvent<ThirstComponent, ComponentStartup>(OnComponentStartup);
|
||||
}
|
||||
private void OnComponentStartup(EntityUid uid, ThirstComponent component, ComponentStartup args)
|
||||
{
|
||||
component.CurrentThirst = _random.Next(
|
||||
(int) component.ThirstThresholds[ThirstThreshold.Thirsty] + 10,
|
||||
(int) component.ThirstThresholds[ThirstThreshold.Okay] - 1);
|
||||
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.
|
||||
UpdateEffects(component);
|
||||
}
|
||||
|
||||
private void OnRefreshMovespeed(EntityUid uid, ThirstComponent component, RefreshMovementSpeedModifiersEvent args)
|
||||
{
|
||||
var mod = (component.CurrentThirstThreshold & (ThirstThreshold.Parched | ThirstThreshold.Dead)) != 0x0 ? 0.75f : 1.0f;
|
||||
args.ModifySpeed(mod, mod);
|
||||
}
|
||||
|
||||
private ThirstThreshold GetThirstThreshold(ThirstComponent component, float amount)
|
||||
{
|
||||
ThirstThreshold result = ThirstThreshold.Dead;
|
||||
var value = component.ThirstThresholds[ThirstThreshold.OverHydrated];
|
||||
foreach (var threshold in component.ThirstThresholds)
|
||||
{
|
||||
if (threshold.Value <= value && threshold.Value >= amount)
|
||||
{
|
||||
result = threshold.Key;
|
||||
value = threshold.Value;
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
public void UpdateThirst(ThirstComponent component, float amount)
|
||||
{
|
||||
component.CurrentThirst = Math.Min(component.CurrentThirst + amount, component.ThirstThresholds[ThirstThreshold.OverHydrated]);
|
||||
}
|
||||
|
||||
public void ResetThirst(ThirstComponent component)
|
||||
{
|
||||
component.CurrentThirst = component.ThirstThresholds[ThirstThreshold.Okay];
|
||||
}
|
||||
|
||||
private void UpdateEffects(ThirstComponent component)
|
||||
{
|
||||
if (component.LastThirstThreshold == ThirstThreshold.Parched && component.CurrentThirstThreshold != ThirstThreshold.Dead &&
|
||||
EntityManager.TryGetComponent(component.Owner, out MovementSpeedModifierComponent? movementSlowdownComponent))
|
||||
{
|
||||
_movement.RefreshMovementSpeedModifiers(component.Owner);
|
||||
}
|
||||
|
||||
// Update UI
|
||||
if (ThirstComponent.ThirstThresholdAlertTypes.TryGetValue(component.CurrentThirstThreshold, out var alertId))
|
||||
{
|
||||
_alerts.ShowAlert(component.Owner, alertId);
|
||||
}
|
||||
else
|
||||
{
|
||||
_alerts.ClearAlertCategory(component.Owner, AlertCategory.Thirst);
|
||||
}
|
||||
|
||||
switch (component.CurrentThirstThreshold)
|
||||
{
|
||||
case ThirstThreshold.OverHydrated:
|
||||
component.LastThirstThreshold = component.CurrentThirstThreshold;
|
||||
component.ActualDecayRate = component.BaseDecayRate * 1.2f;
|
||||
return;
|
||||
|
||||
case ThirstThreshold.Okay:
|
||||
component.LastThirstThreshold = component.CurrentThirstThreshold;
|
||||
component.ActualDecayRate = component.BaseDecayRate;
|
||||
return;
|
||||
|
||||
case ThirstThreshold.Thirsty:
|
||||
// Same as okay except with UI icon saying drink soon.
|
||||
component.LastThirstThreshold = component.CurrentThirstThreshold;
|
||||
component.ActualDecayRate = component.BaseDecayRate * 0.8f;
|
||||
return;
|
||||
case ThirstThreshold.Parched:
|
||||
_movement.RefreshMovementSpeedModifiers(component.Owner);
|
||||
component.LastThirstThreshold = component.CurrentThirstThreshold;
|
||||
component.ActualDecayRate = component.BaseDecayRate * 0.6f;
|
||||
return;
|
||||
|
||||
case ThirstThreshold.Dead:
|
||||
return;
|
||||
|
||||
default:
|
||||
_sawmill.Error($"No thirst threshold found for {component.CurrentThirstThreshold}");
|
||||
throw new ArgumentOutOfRangeException($"No thirst threshold found for {component.CurrentThirstThreshold}");
|
||||
}
|
||||
}
|
||||
public override void Update(float frameTime)
|
||||
{
|
||||
_accumulatedFrameTime += frameTime;
|
||||
@@ -17,7 +134,28 @@ namespace Content.Server.Nutrition.EntitySystems
|
||||
{
|
||||
foreach (var component in EntityManager.EntityQuery<ThirstComponent>())
|
||||
{
|
||||
component.OnUpdate(_accumulatedFrameTime);
|
||||
component.CurrentThirst -= component.ActualDecayRate;
|
||||
var calculatedThirstThreshold = GetThirstThreshold(component, component.CurrentThirst);
|
||||
if (calculatedThirstThreshold != component.CurrentThirstThreshold)
|
||||
{
|
||||
if (component.CurrentThirstThreshold == ThirstThreshold.Dead)
|
||||
_adminlog.Add(LogType.Thirst, $"{EntityManager.ToPrettyString(component.Owner):entity} has stopped taking dehydration damage");
|
||||
else if (calculatedThirstThreshold == ThirstThreshold.Dead)
|
||||
_adminlog.Add(LogType.Thirst, $"{EntityManager.ToPrettyString(component.Owner):entity} has started taking dehydration damage");
|
||||
|
||||
component.CurrentThirstThreshold = calculatedThirstThreshold;
|
||||
UpdateEffects(component);
|
||||
}
|
||||
if (component.CurrentThirstThreshold == ThirstThreshold.Dead)
|
||||
{
|
||||
if (!EntityManager.TryGetComponent(component.Owner, out MobStateComponent? mobState))
|
||||
return;
|
||||
|
||||
if (!mobState.IsDead())
|
||||
{
|
||||
_damage.TryChangeDamage(component.Owner, component.Damage, true);
|
||||
}
|
||||
}
|
||||
}
|
||||
_accumulatedFrameTime -= 1;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user