tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GasFilter appearance, EnabledAtmosDeviceVisualizer improvements.

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-08-02 13:20:31 +02:00
parent 5422724040
commit 331604cc66
15 changed files with 68 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Content.Client/Atmos/Visualizers/EnabledAtmosDeviceVisualizer.cs
View File

@@ -9,22 +9,13 @@ namespace Content.Client.Atmos.Visualizers
[UsedImplicitly]
public abstract class EnabledAtmosDeviceVisualizer : AppearanceVisualizer
{
[DataField("disabledState")]
private string _disabledState = string.Empty;
[DataField("enabledState")]
private string _enabledState = string.Empty;
protected abstract object LayerMap { get; }
protected abstract Enum DataKey { get; }
public override void InitializeEntity(IEntity entity)
{
base.InitializeEntity(entity);
if (!entity.TryGetComponent(out ISpriteComponent? sprite))
return;
sprite.LayerMapSet(LayerMap, sprite.AddLayerState(_enabledState));
sprite.LayerSetVisible(LayerMap, false);
}
public override void OnChangeData(AppearanceComponent component)
{
base.OnChangeData(component);
@@ -32,8 +23,8 @@ namespace Content.Client.Atmos.Visualizers
if (!component.Owner.TryGetComponent(out ISpriteComponent? sprite))
return;
if(component.TryGetData(DataKey, out bool enabled))
sprite.LayerSetVisible(LayerMap, enabled);
if(component.TryGetData(DataKey, out bool enabled) && sprite.LayerMapTryGet(LayerMap, out var layer))
sprite.LayerSetState(layer, enabled ? _enabledState : _disabledState);
}
}
}

18
Content.Client/Atmos/Visualizers/GasFilterVisualizer.cs Normal file
View File

@@ -0,0 +1,18 @@
using System;
using Content.Shared.Atmos.Piping;
using JetBrains.Annotations;
namespace Content.Client.Atmos.Visualizers
{
[UsedImplicitly]
public class GasFilterVisualizer : EnabledAtmosDeviceVisualizer
{
protected override object LayerMap => Layers.Enabled;
protected override Enum DataKey => FilterVisuals.Enabled;
enum Layers : byte
{
Enabled,
}
}
}

2
Content.Client/Atmos/Visualizers/GasPortableVisualizer.cs
View File

@@ -46,7 +46,7 @@ namespace Content.Client.Atmos.Visualizers
}
}
private enum Layers
private enum Layers : byte
{
ConnectedToPort,
}

2
Content.Client/Atmos/Visualizers/OutletInjectorVisualizer.cs
View File

@@ -10,7 +10,7 @@ namespace Content.Client.Atmos.Visualizers
protected override object LayerMap => Layers.Enabled;
protected override Enum DataKey => OutletInjectorVisuals.Enabled;
enum Layers
enum Layers : byte
{
Enabled,
}

2
Content.Client/Atmos/Visualizers/PassiveVentVisualizer.cs
View File

@@ -10,7 +10,7 @@ namespace Content.Client.Atmos.Visualizers
protected override object LayerMap => Layers.Enabled;
protected override Enum DataKey => PassiveVentVisuals.Enabled;
enum Layers
enum Layers : byte
{
Enabled,
}

2
Content.Client/Atmos/Visualizers/PressurePumpVisualizer.cs
View File

@@ -10,7 +10,7 @@ namespace Content.Client.Atmos.Visualizers
protected override object LayerMap => Layers.Enabled;
protected override Enum DataKey => PressurePumpVisuals.Enabled;
enum Layers
enum Layers : byte
{
Enabled,
}

2
Content.Client/Atmos/Visualizers/ScrubberVisualizer.cs
View File

@@ -44,7 +44,7 @@ namespace Content.Client.Atmos.Visualizers
}
}
public enum ScrubberVisualLayers
public enum ScrubberVisualLayers : byte
{
Scrubber,
}

2
Content.Client/Atmos/Visualizers/ThermoMachineVisualizer.cs
View File

@@ -10,7 +10,7 @@ namespace Content.Client.Atmos.Visualizers
protected override object LayerMap => Layers.Enabled;
protected override Enum DataKey => ThermoMachineVisuals.Enabled;
enum Layers
enum Layers : byte
{
Enabled,
}

2
Content.Client/Atmos/Visualizers/VentPumpVisualizer.cs
View File

@@ -40,7 +40,7 @@ namespace Content.Client.Atmos.Visualizers
}
}
public enum VentVisualLayers
public enum VentVisualLayers : byte
{
Vent,
}

32
Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs
View File

@@ -3,7 +3,9 @@ using Content.Server.Atmos.Piping.Trinary.Components;
using Content.Server.NodeContainer;
using Content.Server.NodeContainer.Nodes;
using Content.Shared.Atmos;
using Content.Shared.Atmos.Piping;
using JetBrains.Annotations;
using Robust.Server.GameObjects;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Timing;
@@ -24,33 +26,35 @@ namespace Content.Server.Atmos.Piping.Trinary.EntitySystems
private void OnFilterUpdated(EntityUid uid, GasFilterComponent filter, AtmosDeviceUpdateEvent args)
{
if (!filter.Enabled)
return;
var appearance = filter.Owner.GetComponentOrNull<AppearanceComponent>();
if (!ComponentManager.TryGetComponent(uid, out NodeContainerComponent? nodeContainer))
if (!filter.Enabled
|| !ComponentManager.TryGetComponent(uid, out NodeContainerComponent? nodeContainer)
|| !ComponentManager.TryGetComponent(uid, out AtmosDeviceComponent? device)
|| !nodeContainer.TryGetNode(filter.InletName, out PipeNode? inletNode)
|| !nodeContainer.TryGetNode(filter.FilterName, out PipeNode? filterNode)
|| !nodeContainer.TryGetNode(filter.OutletName, out PipeNode? outletNode)
|| outletNode.Air.Pressure >= Atmospherics.MaxOutputPressure) // No need to transfer if target is full.
{
appearance?.SetData(FilterVisuals.Enabled, false);
return;
if (!ComponentManager.TryGetComponent(uid, out AtmosDeviceComponent? device))
return;
if (!nodeContainer.TryGetNode(filter.InletName, out PipeNode? inletNode)
|| !nodeContainer.TryGetNode(filter.FilterName, out PipeNode? filterNode)
|| !nodeContainer.TryGetNode(filter.OutletName, out PipeNode? outletNode))
return;
if (outletNode.Air.Pressure >= Atmospherics.MaxOutputPressure)
return; // No need to transfer if target is full.
}
// We multiply the transfer rate in L/s by the seconds passed since the last process to get the liters.
var transferRatio = (float)(filter.TransferRate * (_gameTiming.CurTime - device.LastProcess).TotalSeconds) / inletNode.Air.Volume;
if (transferRatio <= 0)
{
appearance?.SetData(FilterVisuals.Enabled, false);
return;
}
var removed = inletNode.Air.RemoveRatio(transferRatio);
if (filter.FilteredGas.HasValue)
{
appearance?.SetData(FilterVisuals.Enabled, true);
var filteredOut = new GasMixture() {Temperature = removed.Temperature};
filteredOut.SetMoles(filter.FilteredGas.Value, removed.GetMoles(filter.FilteredGas.Value));

16
Content.Shared/Atmos/Piping/EnabledAtmosDeviceVisuals.cs
View File

@@ -4,31 +4,37 @@ using Robust.Shared.Serialization;
namespace Content.Shared.Atmos.Piping
{
[Serializable, NetSerializable]
public enum OutletInjectorVisuals
public enum OutletInjectorVisuals : byte
{
Enabled,
}
[Serializable, NetSerializable]
public enum PassiveVentVisuals
public enum PassiveVentVisuals : byte
{
Enabled,
}
[Serializable, NetSerializable]
public enum VentScrubberVisuals
public enum VentScrubberVisuals : byte
{
Enabled,
}
[Serializable, NetSerializable]
public enum ThermoMachineVisuals
public enum ThermoMachineVisuals : byte
{
Enabled,
}
[Serializable, NetSerializable]
public enum PressurePumpVisuals
public enum PressurePumpVisuals : byte
{
Enabled,
}
[Serializable, NetSerializable]
public enum FilterVisuals : byte
{
Enabled,
}

3
Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml
View File

@@ -33,13 +33,14 @@
state: pipeStraight
map: [ "enum.PipeColorVisualizer+Layers.Pipe" ]
- state: pumpPressure
map: [ "enum.SubFloorShowLayerVisualizer+Layers.FirstLayer" ]
map: [ "enum.SubFloorShowLayerVisualizer+Layers.FirstLayer", "enum.PressurePumpVisualizer+Layers.Enabled" ]
- type: Appearance
visuals:
- type: SubFloorShowLayerVisualizer
- type: PipeConnectorVisualizer
- type: PipeColorVisualizer
- type: PressurePumpVisualizer
disabledState: pumpPressure
enabledState: pumpPressureOn
- type: GasPressurePump

5
Resources/Prototypes/Entities/Structures/Piping/Atmospherics/trinary.yml
View File

@@ -38,12 +38,15 @@
state: pipeTJunction
map: [ "enum.PipeColorVisualizer+Layers.Pipe" ]
- state: gasFilter
map: [ "enum.SubFloorShowLayerVisualizer+Layers.FirstLayer" ]
map: [ "enum.SubFloorShowLayerVisualizer+Layers.FirstLayer", "enum.GasFilterVisualizer+Layers.Enabled" ]
- type: Appearance
visuals:
- type: SubFloorShowLayerVisualizer
- type: PipeConnectorVisualizer
- type: PipeColorVisualizer
- type: GasFilterVisualizer
disabledState: gasFilter
enabledState: gasFilterOn
- type: GasFilter
- type: entity

4
Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml
View File

@@ -148,6 +148,7 @@
- type: Sprite
layers:
- state: freezer_off
map: [ "enum.ThermoMachineVisualizer+Layers.Enabled" ]
- state: pipe
map: [ "enum.PipeColorVisualizer+Layers.Pipe" ]
- type: Appearance
@@ -155,6 +156,7 @@
- type: PipeConnectorVisualizer
- type: PipeColorVisualizer
- type: ThermoMachineVisualizer
disabledState: freezer_off
enabledState: freezer_on
- type: GasThermoMachine
mode: Freezer
@@ -170,6 +172,7 @@
- type: Sprite
layers:
- state: heater_off
map: [ "enum.ThermoMachineVisualizer+Layers.Enabled" ]
- state: pipe
map: [ "enum.PipeColorVisualizer+Layers.Pipe" ]
- type: Appearance
@@ -177,6 +180,7 @@
- type: PipeConnectorVisualizer
- type: PipeColorVisualizer
- type: ThermoMachineVisualizer
disabledState: heater_off
enabledState: heater_on
- type: GasThermoMachine
mode: Heater

BIN
Resources/Textures/Structures/Piping/Atmospherics/gasfilter.rsi/gasFilterOn.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 19 KiB