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

Gas injector visuals & balance (#8963)

Browse Source
This commit is contained in:
Leon Friedrich
2022-06-21 14:04:55 +12:00
committed by GitHub
parent a59ceabfbe
commit 229627a934
8 changed files with 66 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Server/Atmos/Piping/Binary/Components/GasVolumePumpComponent.cs
View File

@@ -35,7 +35,8 @@ namespace Content.Server.Atmos.Piping.Binary.Components
public float LowerThreshold { get; set; } = 0.01f;
[DataField("higherThreshold")]
public float HigherThreshold { get; set; } = 2 * Atmospherics.MaxOutputPressure;
public float HigherThreshold { get; set; } = DefaultHigherThreshold;
public static readonly float DefaultHigherThreshold = 2 * Atmospherics.MaxOutputPressure;
[DataField("overclockThreshold")]
public float OverclockThreshold { get; set; } = 1000;

3
Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs
View File

@@ -66,6 +66,8 @@ namespace Content.Server.Atmos.Piping.Binary.EntitySystems
return;
}
appearance?.SetData(PumpVisuals.Enabled, true);
var inputStartingPressure = inlet.Air.Pressure;
var outputStartingPressure = outlet.Air.Pressure;
@@ -77,7 +79,6 @@ namespace Content.Server.Atmos.Piping.Binary.EntitySystems
if ((outputStartingPressure - inputStartingPressure > pump.OverclockThreshold) && pump.Overclocked)
return;
appearance?.SetData(PumpVisuals.Enabled, true);
_ambientSoundSystem.SetAmbience(pump.Owner, true);
// We multiply the transfer rate in L/s by the seconds passed since the last process to get the liters.

6
Content.Server/Atmos/Piping/Unary/Components/GasOutletInjectorComponent.cs
View File

@@ -1,3 +1,4 @@
using Content.Server.Atmos.Piping.Binary.Components;
using Content.Server.Atmos.Piping.Unary.EntitySystems;
using Content.Shared.Atmos;
@@ -11,9 +12,6 @@ namespace Content.Server.Atmos.Piping.Unary.Components
[ViewVariables(VVAccess.ReadWrite)]
public bool Enabled { get; set; } = true;
[ViewVariables(VVAccess.ReadWrite)]
public bool Injecting { get; set; } = false;
/// <summary>
/// Target volume to transfer. If <see cref="WideNet"/> is enabled, actual transfer rate will be much higher.
/// </summary>
@@ -31,7 +29,7 @@ namespace Content.Server.Atmos.Piping.Unary.Components
public float MaxTransferRate = Atmospherics.MaxTransferRate;
[DataField("maxPressure")]
public float MaxPressure { get; set; } = 2 * Atmospherics.MaxOutputPressure;
public float MaxPressure { get; set; } = GasVolumePumpComponent.DefaultHigherThreshold;
[DataField("inlet")]
public string InletName { get; set; } = "pipe";

30
Content.Server/Atmos/Piping/Unary/EntitySystems/GasOutletInjectorSystem.cs
View File

@@ -3,6 +3,8 @@ using Content.Server.Atmos.Piping.Components;
using Content.Server.Atmos.Piping.Unary.Components;
using Content.Server.NodeContainer;
using Content.Server.NodeContainer.Nodes;
using Content.Shared.Atmos.Piping;
using Content.Shared.Interaction;
using JetBrains.Annotations;
using Robust.Shared.Timing;
@@ -19,12 +21,31 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
base.Initialize();
SubscribeLocalEvent<GasOutletInjectorComponent, AtmosDeviceUpdateEvent>(OnOutletInjectorUpdated);
SubscribeLocalEvent<GasOutletInjectorComponent, ActivateInWorldEvent>(OnActivate);
SubscribeLocalEvent<GasOutletInjectorComponent, MapInitEvent>(OnMapInit);
}
private void OnMapInit(EntityUid uid, GasOutletInjectorComponent component, MapInitEvent args)
{
UpdateAppearance(component);
}
private void OnActivate(EntityUid uid, GasOutletInjectorComponent component, ActivateInWorldEvent args)
{
component.Enabled = !component.Enabled;
UpdateAppearance(component);
}
public void UpdateAppearance(GasOutletInjectorComponent component, AppearanceComponent? appearance = null)
{
if (!Resolve(component.Owner, ref appearance, false))
return;
appearance.SetData(OutletInjectorVisuals.Enabled, component.Enabled);
}
private void OnOutletInjectorUpdated(EntityUid uid, GasOutletInjectorComponent injector, AtmosDeviceUpdateEvent args)
{
injector.Injecting = false;
if (!injector.Enabled)
return;
@@ -45,7 +66,12 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
if (inlet.Air.Temperature < 0)
return;
if (environment.Pressure > injector.MaxPressure)
return;
var timeDelta = (float) (_gameTiming.CurTime - device.LastProcess).TotalSeconds;
// TODO adjust ratio so that environment does not go above MaxPressure?
var ratio = MathF.Min(1f, timeDelta * injector.TransferRate / inlet.Air.Volume);
var removed = inlet.Air.RemoveRatio(ratio);