Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Move rotting stages and examine to shared (#24183)

Browse Source
This commit is contained in:
DrSmugleaf
2024-01-17 01:49:21 -08:00
committed by GitHub
parent 1f0cdf5af8
commit 8902701271
5 changed files with 81 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
Content.Server/Atmos/Rotting/RottingSystem.cs
View File

@@ -16,7 +16,7 @@ using Robust.Shared.Timing;
namespace Content.Server.Atmos.Rotting;
public sealed class RottingSystem : EntitySystem
public sealed class RottingSystem : SharedRottingSystem
{
[Dependency] private readonly IGameTiming _timing = default!;
[Dependency] private readonly AtmosphereSystem _atmosphere = default!;
@@ -37,7 +37,6 @@ public sealed class RottingSystem : EntitySystem
SubscribeLocalEvent<RottingComponent, ComponentShutdown>(OnShutdown);
SubscribeLocalEvent<RottingComponent, MobStateChangedEvent>(OnRottingMobStateChanged);
SubscribeLocalEvent<RottingComponent, BeingGibbedEvent>(OnGibbed);
SubscribeLocalEvent<RottingComponent, ExaminedEvent>(OnExamined);
SubscribeLocalEvent<RottingComponent, RejuvenateEvent>(OnRejuvenate);
SubscribeLocalEvent<TemperatureComponent, IsRottingEvent>(OnTempIsRotting);
@@ -45,12 +44,12 @@ public sealed class RottingSystem : EntitySystem
private void OnPerishableMapInit(EntityUid uid, PerishableComponent component, MapInitEvent args)
{
component.NextPerishUpdate = _timing.CurTime + component.PerishUpdateRate;
component.RotNextUpdate = _timing.CurTime + component.PerishUpdateRate;
}
private void OnPerishableUnpaused(EntityUid uid, PerishableComponent component, ref EntityUnpausedEvent args)
{
component.NextPerishUpdate += args.PausedTime;
component.RotNextUpdate += args.PausedTime;
}
private void OnMobStateChanged(EntityUid uid, PerishableComponent component, MobStateChangedEvent args)
@@ -62,7 +61,7 @@ public sealed class RottingSystem : EntitySystem
return;
component.RotAccumulator = TimeSpan.Zero;
component.NextPerishUpdate = _timing.CurTime + component.PerishUpdateRate;
component.RotNextUpdate = _timing.CurTime + component.PerishUpdateRate;
}
private void OnRottingUnpaused(EntityUid uid, RottingComponent component, ref EntityUnpausedEvent args)
@@ -74,7 +73,7 @@ public sealed class RottingSystem : EntitySystem
{
if (TryComp<PerishableComponent>(uid, out var perishable))
{
perishable.NextPerishUpdate = TimeSpan.Zero;
perishable.RotNextUpdate = TimeSpan.Zero;
}
}
@@ -127,9 +126,8 @@ public sealed class RottingSystem : EntitySystem
private void OnPerishableExamined(Entity<PerishableComponent> perishable, ref ExaminedEvent args)
{
int maxStages = 3;
int stage = PerishStage(perishable, maxStages);
if (stage < 1 || stage > maxStages)
int stage = PerishStage(perishable, MaxStages);
if (stage < 1 || stage > MaxStages)
{
// We dont push an examined string if it hasen't started "perishing" or it's already rotting
return;
@@ -150,29 +148,6 @@ public sealed class RottingSystem : EntitySystem
return (int)(1 + maxStages * perishable.Comp.RotAccumulator.TotalSeconds / perishable.Comp.RotAfter.TotalSeconds);
}
private void OnExamined(EntityUid uid, RottingComponent component, ExaminedEvent args)
{
var stage = RotStage(uid, component);
var description = stage switch
{
>= 2 => "rotting-extremely-bloated",
>= 1 => "rotting-bloated",
_ => "rotting-rotting"
};
args.PushMarkup(Loc.GetString(description, ("target", Identity.Entity(uid, EntityManager))));
}
/// <summary>
/// Return the rot stage, usually from 0 to 2 inclusive.
/// </summary>
public int RotStage(EntityUid uid, RottingComponent? comp = null, PerishableComponent? perishable = null)
{
if (!Resolve(uid, ref comp, ref perishable))
return 0;
return (int) (comp.TotalRotTime.TotalSeconds / perishable.RotAfter.TotalSeconds);
}
private void OnRejuvenate(EntityUid uid, RottingComponent component, RejuvenateEvent args)
{
RemCompDeferred<RottingComponent>(uid);
@@ -209,9 +184,16 @@ public sealed class RottingSystem : EntitySystem
var perishQuery = EntityQueryEnumerator<PerishableComponent>();
while (perishQuery.MoveNext(out var uid, out var perishable))
{
if (_timing.CurTime < perishable.NextPerishUpdate)
if (_timing.CurTime < perishable.RotNextUpdate)
continue;
perishable.NextPerishUpdate += perishable.PerishUpdateRate;
perishable.RotNextUpdate += perishable.PerishUpdateRate;
var stage = PerishStage((uid, perishable), MaxStages);
if (stage != perishable.Stage)
{
perishable.Stage = stage;
Dirty(uid, perishable);
}
if (IsRotten(uid) || !IsRotProgressing(uid, perishable))
continue;