space-syndicate/space-station-14
1
0
Fork 1
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-02-15 00:54:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Predict Rotting Examine (#42254)

Browse Source 
* init

* review

* test

* Apply suggestions from code review

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
This commit is contained in:
ScarKy0
2026-01-07 16:58:28 +01:00
committed by GitHub
parent 20d1b2c6cb
commit a8469ca509
3 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -72,19 +72,21 @@ public sealed class RottingSystem : SharedRottingSystem
{
if (_timing.CurTime < perishable.RotNextUpdate)
continue;
perishable.RotNextUpdate += perishable.PerishUpdateRate;
var stage = PerishStage((uid, perishable), MaxStages);
if (stage != perishable.Stage)
{
perishable.Stage = stage;
Dirty(uid, perishable);
DirtyField(uid, perishable, nameof(PerishableComponent.Stage));
}
if (IsRotten(uid) || !IsRotProgressing(uid, perishable))
continue;
perishable.RotAccumulator += perishable.PerishUpdateRate * GetRotRate(uid);
DirtyField(uid, perishable, nameof(PerishableComponent.RotAccumulator));
if (perishable.RotAccumulator >= perishable.RotAfter)
{
var rot = AddComp<RottingComponent>(uid);

4
Content.Shared/Atmos/Rotting/PerishableComponent.cs
View File

@@ -7,7 +7,7 @@ namespace Content.Shared.Atmos.Rotting;
/// This makes mobs eventually start rotting when they die.
/// It may be expanded to food at some point, but it's just for mobs right now.
/// </summary>
[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, AutoGenerateComponentPause]
[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(fieldDeltas: true), AutoGenerateComponentPause]
[Access(typeof(SharedRottingSystem))]
public sealed partial class PerishableComponent : Component
{
@@ -20,7 +20,7 @@ public sealed partial class PerishableComponent : Component
/// <summary>
/// How much rotting has occured
/// </summary>
[DataField]
[DataField, AutoNetworkedField]
public TimeSpan RotAccumulator = TimeSpan.Zero;
/// <summary>

21
Content.Shared/Atmos/Rotting/SharedRottingSystem.cs
View File

@@ -31,21 +31,22 @@ public abstract class SharedRottingSystem : EntitySystem
SubscribeLocalEvent<RottingComponent, ExaminedEvent>(OnExamined);
}
private void OnPerishableMapInit(EntityUid uid, PerishableComponent component, MapInitEvent args)
private void OnPerishableMapInit(Entity<PerishableComponent> ent, ref MapInitEvent args)
{
component.RotNextUpdate = _timing.CurTime + component.PerishUpdateRate;
ent.Comp.RotNextUpdate = _timing.CurTime + ent.Comp.PerishUpdateRate;
}
private void OnMobStateChanged(EntityUid uid, PerishableComponent component, MobStateChangedEvent args)
private void OnMobStateChanged(Entity<PerishableComponent> ent, ref MobStateChangedEvent args)
{
if (args.NewMobState != MobState.Dead && args.OldMobState != MobState.Dead)
return;
if (HasComp<RottingComponent>(uid))
if (HasComp<RottingComponent>(ent))
return;
component.RotAccumulator = TimeSpan.Zero;
component.RotNextUpdate = _timing.CurTime + component.PerishUpdateRate;
ent.Comp.RotAccumulator = TimeSpan.Zero;
ent.Comp.RotNextUpdate = _timing.CurTime + ent.Comp.PerishUpdateRate;
DirtyField(ent.Owner, ent.Comp, nameof(PerishableComponent.RotAccumulator));
}
private void OnPerishableExamined(Entity<PerishableComponent> perishable, ref ExaminedEvent args)
@@ -62,9 +63,9 @@ public abstract class SharedRottingSystem : EntitySystem
args.PushMarkup(Loc.GetString(description, ("target", Identity.Entity(perishable, EntityManager))));
}
private void OnShutdown(EntityUid uid, RottingComponent component, ComponentShutdown args)
private void OnShutdown(Entity<RottingComponent> ent, ref ComponentShutdown args)
{
if (TryComp<PerishableComponent>(uid, out var perishable))
if (TryComp<PerishableComponent>(ent, out var perishable))
{
perishable.RotNextUpdate = TimeSpan.Zero;
}
@@ -74,6 +75,7 @@ public abstract class SharedRottingSystem : EntitySystem
{
if (args.NewMobState == MobState.Dead)
return;
RemCompDeferred(uid, component);
}
@@ -148,6 +150,7 @@ public abstract class SharedRottingSystem : EntitySystem
if (!TryComp<RottingComponent>(uid, out var rotting))
{
perishable.RotAccumulator -= time;
DirtyField(uid, perishable, nameof(PerishableComponent.RotAccumulator));
return;
}
var total = (rotting.TotalRotTime + perishable.RotAccumulator) - time;
@@ -156,8 +159,8 @@ public abstract class SharedRottingSystem : EntitySystem
{
RemCompDeferred(uid, rotting);
perishable.RotAccumulator = total;
DirtyField(uid, perishable, nameof(PerishableComponent.RotAccumulator));
}
else
rotting.TotalRotTime = total - perishable.RotAfter;
}