Body code cleanup (#24946)
* Fix test * Kill float accumulators * Use entity proxy methods * DataField auto name generation where possible * Kill comp properties * Clean up server comps * Make events record structs * Clean up shared body code * Clean up server body code * Rename organ events to be same names as in med refactor
This commit is contained in:
@@ -1,21 +1,26 @@
|
||||
using Content.Server.Body.Systems;
|
||||
using Content.Server.Body.Systems;
|
||||
using Content.Server.Nutrition.EntitySystems;
|
||||
using Content.Shared.Chemistry.Components;
|
||||
using Content.Shared.Chemistry.Reagent;
|
||||
using Content.Shared.Whitelist;
|
||||
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
|
||||
|
||||
namespace Content.Server.Body.Components
|
||||
{
|
||||
[RegisterComponent, Access(typeof(StomachSystem), typeof(FoodSystem))]
|
||||
public sealed partial class StomachComponent : Component
|
||||
{
|
||||
public float AccumulatedFrameTime;
|
||||
/// <summary>
|
||||
/// The next time that the stomach will try to digest its contents.
|
||||
/// </summary>
|
||||
[DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
|
||||
public TimeSpan NextUpdate;
|
||||
|
||||
/// <summary>
|
||||
/// How fast should this component update, in seconds?
|
||||
/// The interval at which this stomach digests its contents.
|
||||
/// </summary>
|
||||
[DataField]
|
||||
public float UpdateInterval = 1.0f;
|
||||
public TimeSpan UpdateInterval = TimeSpan.FromSeconds(1);
|
||||
|
||||
/// <summary>
|
||||
/// The solution inside of this stomach this transfers reagents to the body.
|
||||
@@ -30,11 +35,11 @@ namespace Content.Server.Body.Components
|
||||
public string BodySolutionName = BloodstreamComponent.DefaultChemicalsSolutionName;
|
||||
|
||||
/// <summary>
|
||||
/// Time in seconds between reagents being ingested and them being
|
||||
/// Time between reagents being ingested and them being
|
||||
/// transferred to <see cref="BloodstreamComponent"/>
|
||||
/// </summary>
|
||||
[DataField]
|
||||
public float DigestionDelay = 20;
|
||||
public TimeSpan DigestionDelay = TimeSpan.FromSeconds(20);
|
||||
|
||||
/// <summary>
|
||||
/// A whitelist for what special-digestible-required foods this stomach is capable of eating.
|
||||
@@ -54,15 +59,15 @@ namespace Content.Server.Body.Components
|
||||
public sealed class ReagentDelta
|
||||
{
|
||||
public readonly ReagentQuantity ReagentQuantity;
|
||||
public float Lifetime { get; private set; }
|
||||
public TimeSpan Lifetime { get; private set; }
|
||||
|
||||
public ReagentDelta(ReagentQuantity reagentQuantity)
|
||||
{
|
||||
ReagentQuantity = reagentQuantity;
|
||||
Lifetime = 0.0f;
|
||||
Lifetime = TimeSpan.Zero;
|
||||
}
|
||||
|
||||
public void Increment(float delta) => Lifetime += delta;
|
||||
public void Increment(TimeSpan delta) => Lifetime += delta;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user