From 229627a934bbf62d93cc3b8f651f68785fe3078c Mon Sep 17 00:00:00 2001 From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Date: Tue, 21 Jun 2022 14:04:55 +1200 Subject: [PATCH] Gas injector visuals & balance (#8963) --- .../Components/GasVolumePumpComponent.cs | 3 +- .../EntitySystems/GasVolumePumpSystem.cs | 3 +- .../Components/GasOutletInjectorComponent.cs | 6 ++-- .../EntitySystems/GasOutletInjectorSystem.cs | 30 ++++++++++++++++-- .../Structures/Piping/Atmospherics/unary.yml | 15 +++++++-- .../outletinjector.rsi/injector-unshaded.png | Bin 0 -> 1149 bytes .../outletinjector.rsi/injector.png | Bin 0 -> 906 bytes .../Atmospherics/outletinjector.rsi/meta.json | 19 +++++++++++ 8 files changed, 66 insertions(+), 10 deletions(-) create mode 100644 Resources/Textures/Structures/Piping/Atmospherics/outletinjector.rsi/injector-unshaded.png create mode 100644 Resources/Textures/Structures/Piping/Atmospherics/outletinjector.rsi/injector.png create mode 100644 Resources/Textures/Structures/Piping/Atmospherics/outletinjector.rsi/meta.json diff --git a/Content.Server/Atmos/Piping/Binary/Components/GasVolumePumpComponent.cs b/Content.Server/Atmos/Piping/Binary/Components/GasVolumePumpComponent.cs index 172c0eb32d..3826887097 100644 --- a/Content.Server/Atmos/Piping/Binary/Components/GasVolumePumpComponent.cs +++ b/Content.Server/Atmos/Piping/Binary/Components/GasVolumePumpComponent.cs @@ -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; diff --git a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs index 71061b98a7..7ff6967dd5 100644 --- a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs +++ b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs @@ -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. diff --git a/Content.Server/Atmos/Piping/Unary/Components/GasOutletInjectorComponent.cs b/Content.Server/Atmos/Piping/Unary/Components/GasOutletInjectorComponent.cs index 9841b0df14..adac9d8b05 100644 --- a/Content.Server/Atmos/Piping/Unary/Components/GasOutletInjectorComponent.cs +++ b/Content.Server/Atmos/Piping/Unary/Components/GasOutletInjectorComponent.cs @@ -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; - /// /// Target volume to transfer. If is enabled, actual transfer rate will be much higher. /// @@ -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"; diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasOutletInjectorSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasOutletInjectorSystem.cs index a02378f5a1..d7514d79fc 100644 --- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasOutletInjectorSystem.cs +++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasOutletInjectorSystem.cs @@ -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(OnOutletInjectorUpdated); + SubscribeLocalEvent(OnActivate); + SubscribeLocalEvent(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); diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml index d2cc059719..f0af4748b4 100644 --- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml +++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml @@ -139,15 +139,26 @@ placement: mode: SnapgridCenter components: - - # TODO ATMOS: Actual sprite for this. - type: Sprite drawdepth: FloorObjects netsync: false + sprite: Structures/Piping/Atmospherics/outletinjector.rsi layers: - state: pipeHalf sprite: Structures/Piping/Atmospherics/pipe.rsi map: [ "enum.PipeColorVisualizer+Layers.Pipe", "enum.SubfloorLayers.FirstLayer" ] + - state: injector + - state: injector-unshaded + shader: unshaded + map: [ "unshaded" ] + color: "#990000" + - type: GenericVisualizer + visuals: + # toggle color of the unshaded light: + enum.OutletInjectorVisuals.Enabled: + unshaded: + True: { color: "#5eff5e" } + False: { color: "#990000" } - type: Appearance visuals: - type: PipeColorVisualizer diff --git a/Resources/Textures/Structures/Piping/Atmospherics/outletinjector.rsi/injector-unshaded.png b/Resources/Textures/Structures/Piping/Atmospherics/outletinjector.rsi/injector-unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..fea21c780e4d0b2eb66510d93f526b94ded754c5 GIT binary patch literal 1149 zcmV-@1cLjCP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U=KHk{l@vMgLjFECERf!E$&;%noMxbD`*Zx!i8I z{b5IR5|xlb2+)zpEI0o9ce;OYF|l_+EyWz8#}#tOT+m4Va$RcjVc+)^P8XgZqmU}pf;N4c|h?4)Dpbi5gqH8Z1e^wKdTe38?6cKM7e;ch$U*Ty#C z=@@-}4hCm*g;3b>5Xf64q_OKp4ND9>*ibV!mMu$SoVjh+hgE2@0Y-O{ zK&gS6K+M;*(4IH%`5Gn6+zFaYFh-l~Q*p0^pD9;EbFR=O^6Ba;tczFFU>S?tx@%3V&D&1mBHfMpJ`ruAFll5Z&F2dZ3#gKr2k0eTw zyfGUQ{FuO}VC5`Kq!*NfClLTSRp9l$3j93 z6%`FmRim0F&03wXvHdOnM!o+*hE>h=WiT|h4*$>YQf$L)F(|`-&jBB(-Dd}W8TwEyfR)|< z?`H&|6NfY500006VoOIv0GR*)001Rb{vH4T010qNS#tmY4#NNd4#NS*Z>VGd000Mc zNliru<^~fN0U?b(%LD)b08U9nK~#9!?b$I3z%U2}(B$9$%r;XXbD$LJdy|VG>LQK- z0MOLDO{}VC$4RDE0sugdTi|PM5dZ)H007_>=M&;@^``r9W4{3a0HB=(T{aK-Qb%Lr P00000NkvXXu0mjfLxl*U literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Piping/Atmospherics/outletinjector.rsi/injector.png b/Resources/Textures/Structures/Piping/Atmospherics/outletinjector.rsi/injector.png new file mode 100644 index 0000000000000000000000000000000000000000..c2bd54b1df7278b9d31720a9be5e3dac9c5ed68c GIT binary patch literal 906 zcmV;519kj~P)u5W3O<9{*a^0RSXe0{TIBkN9SKU6o$miX91ha+0Ly?vq2S04yx;GYCMB-^`Fy6$X5+Tg z>GY3&T>Ym8V9-vda%|W z5Ep~vX1{JG2yia0dHd;vJFcug%K$Ox=jW$;j$^CU3hl2Gzdolw7wJiGKA#6(<9@*? z=+;+$3*3HV_qO58-ip=NzC@U-=1m$HW(h zzO(_ac-6g9pJf0RA>74994kS;KH3vaD^d0nz%?O`Ww2lW$6n-i?%#`Wd1?SQ6xdjh zB)WEkLHgK$dGS6GGWx71z&n`OkLPkZDi(`wFk-jcxz|+oy`TbK1B^nzZ+!( zX0zEnF+m2SWB{@-w?DTH6Ubna-5^;`VgOlAVgOlAVgOlAVgOl=vGoDE^p)xZ!my$~ zKu14WepP({r@u~&tq)KwT=ITCiarOH0h8~zyH|jlo5M{YhUg`zsuLBUqW!G&ElA&= zG?_UNd^#PjojjRvQsc&q3fG&OM`ha)vtLg*(HxdKLauNf` gauNf`a;!JtA6HZL6io`a0{{R307*qoM6N<$g5e97LI3~& literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Piping/Atmospherics/outletinjector.rsi/meta.json b/Resources/Textures/Structures/Piping/Atmospherics/outletinjector.rsi/meta.json new file mode 100644 index 0000000000..53dad6b05d --- /dev/null +++ b/Resources/Textures/Structures/Piping/Atmospherics/outletinjector.rsi/meta.json @@ -0,0 +1,19 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "injector state taken from https://github.com/tgstation/tgstation at commit 3e8407c4716bd8abcc79326f464384a5156eddfa.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "injector", + "directions": 4 + }, + { + "name": "injector-unshaded", + "directions": 4 + } + ] +}