Vent and Siphon visualizer and icon fixes (#2288)

* Half pipes

* PipeVisualizer pipeRSI field

* Vent and Siphon visualizer fixes

Co-authored-by: py01 <pyronetics01@gmail.com>

Content.Client/GameObjects/Components/Atmos/PipeVisualizer.cs

@@ -2,20 +2,49 @@
 using Content.Shared.GameObjects.Components.Atmos;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Client.Graphics;
 using Robust.Client.Interfaces.GameObjects.Components;
+using Robust.Client.Interfaces.ResourceManagement;
+using Robust.Client.ResourceManagement;
+using Robust.Shared.GameObjects.Components.Renderable;
 using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.IoC;
+using Robust.Shared.Log;
+using Robust.Shared.Utility;
+using YamlDotNet.RepresentationModel;
 
 namespace Content.Client.GameObjects.Components.Atmos
 {
     [UsedImplicitly]
     public class PipeVisualizer : AppearanceVisualizer
     {
+        private RSI _pipeRSI;
+
+        public override void LoadData(YamlMappingNode node)
+        {
+            base.LoadData(node);
+
+            var rsiString = node.GetNode("pipeRSI").ToString();
+            var rsiPath = SharedSpriteComponent.TextureRoot / rsiString;
+            try
+            {
+                var resourceCache = IoCManager.Resolve<IResourceCache>();
+                var resource = resourceCache.GetResource<RSIResource>(rsiPath);
+                _pipeRSI = resource.RSI;
+            }
+            catch (Exception e)
+            {
+                Logger.ErrorS("go.ventvisualizer", "Unable to load RSI '{0}'. Trace:\n{1}", rsiPath, e);
+            }
+        }
+
         public override void InitializeEntity(IEntity entity)
         {
             base.InitializeEntity(entity);
             if (!entity.TryGetComponent(out ISpriteComponent sprite)) return;
             sprite.LayerMapReserveBlank(Layer.PipeBase);
             var pipeBaseLayer = sprite.LayerMapGet(Layer.PipeBase);
+            sprite.LayerSetRSI(pipeBaseLayer, _pipeRSI);
             sprite.LayerSetVisible(pipeBaseLayer, true);
         }
 

Content.Client/GameObjects/Components/Atmos/SiphonVisualizer.cs

@@ -11,6 +11,7 @@ using Robust.Shared.Utility;
 using System;
 using Content.Shared.GameObjects.Components.Atmos;
 using YamlDotNet.RepresentationModel;
+using Robust.Shared.Interfaces.GameObjects;
 
 namespace Content.Client.GameObjects.Components.Atmos
 {
@@ -37,23 +38,26 @@ namespace Content.Client.GameObjects.Components.Atmos
             }
         }
 
+        public override void InitializeEntity(IEntity entity)
+        {
+            base.InitializeEntity(entity);
+            if (!entity.TryGetComponent(out ISpriteComponent sprite)) return;
+            sprite.LayerMapReserveBlank(Layer.SiphonBase);
+            var pipeBaseLayer = sprite.LayerMapGet(Layer.SiphonBase);
+            sprite.LayerSetRSI(pipeBaseLayer, _siphonRSI);
+            sprite.LayerSetVisible(pipeBaseLayer, true);
+        }
+
         public override void OnChangeData(AppearanceComponent component)
         {
             base.OnChangeData(component);
 
-            if (!component.Owner.TryGetComponent(out ISpriteComponent sprite))
+            if (!component.Owner.TryGetComponent(out ISpriteComponent sprite)) return;
-            {
+            if (!component.TryGetData(SiphonVisuals.VisualState, out SiphonVisualState siphonVisualState)) return;
-                return;
-            }
-            if (!component.TryGetData(SiphonVisuals.VisualState, out SiphonVisualState siphonVisualState))
-            {
-                return;
-            }
 
             var siphonBaseState = "scrub";
             siphonBaseState += siphonVisualState.SiphonEnabled ? "On" : "Off";
 
-            sprite.LayerMapReserveBlank(Layer.SiphonBase);
             var baseSiphonLayer = sprite.LayerMapGet(Layer.SiphonBase);
             sprite.LayerSetRSI(baseSiphonLayer, _siphonRSI);
             sprite.LayerSetState(baseSiphonLayer, siphonBaseState);

Content.Client/GameObjects/Components/Atmos/VentVisualizer.cs

@@ -11,6 +11,7 @@ using Robust.Shared.Utility;
 using System;
 using Content.Shared.GameObjects.Components.Atmos;
 using YamlDotNet.RepresentationModel;
+using Robust.Shared.Interfaces.GameObjects;
 
 namespace Content.Client.GameObjects.Components.Atmos
 {
@@ -37,23 +38,26 @@ namespace Content.Client.GameObjects.Components.Atmos
             }
         }
 
+        public override void InitializeEntity(IEntity entity)
+        {
+            base.InitializeEntity(entity);
+            if (!entity.TryGetComponent(out ISpriteComponent sprite)) return;
+            sprite.LayerMapReserveBlank(Layer.VentBase);
+            var pipeBaseLayer = sprite.LayerMapGet(Layer.VentBase);
+            sprite.LayerSetRSI(pipeBaseLayer, _ventRSI);
+            sprite.LayerSetVisible(pipeBaseLayer, true);
+        }
+
         public override void OnChangeData(AppearanceComponent component)
         {
             base.OnChangeData(component);
 
-            if (!component.Owner.TryGetComponent(out ISpriteComponent sprite))
+            if (!component.Owner.TryGetComponent(out ISpriteComponent sprite)) return;
-            {
+            if (!component.TryGetData(VentVisuals.VisualState, out VentVisualState ventVisualState)) return;
-                return;
-            }
-            if (!component.TryGetData(VentVisuals.VisualState, out VentVisualState ventVisualState))
-            {
-                return;
-            }
 
             var ventBaseState = "vent";
             ventBaseState += ventVisualState.VentEnabled ? "On" : "Off";
 
-            sprite.LayerMapReserveBlank(Layer.VentBase);
             var baseVentLayer = sprite.LayerMapGet(Layer.VentBase);
             sprite.LayerSetRSI(baseVentLayer, _ventRSI);
             sprite.LayerSetState(baseVentLayer, ventBaseState);

Content.Shared/GameObjects/Components/Atmos/SharedPipeComponent.cs

@@ -57,6 +57,7 @@ namespace Content.Shared.GameObjects.Components.Atmos
 
     public enum PipeShape
     {
+        Half,
         Straight,
         Bend,
         TJunction,
@@ -126,6 +127,11 @@ namespace Content.Shared.GameObjects.Components.Atmos
         {
             return pipeDirection switch
             {
+                PipeDirection.North         => PipeShape.Half,
+                PipeDirection.South         => PipeShape.Half,
+                PipeDirection.East          => PipeShape.Half,
+                PipeDirection.West          => PipeShape.Half,
+
                 PipeDirection.Lateral       => PipeShape.Straight,
                 PipeDirection.Longitudinal  => PipeShape.Straight,
 

Resources/Prototypes/Entities/Constructible/Ground/pipes.yml

@@ -13,14 +13,26 @@
     offset: Center
   - type: Destructible
     thresholdvalue: 100
-  - type: Sprite
-    sprite: Constructible/Atmos/pipe.rsi
   - type: Appearance
     visuals:
     - type: PipeVisualizer
+      pipeRSI: Constructible/Atmos/pipe.rsi
   - type: Icon
     sprite: Constructible/Atmos/pipe.rsi
 
+- type: entity
+  parent: PipeBase
+  id: PipeHalf
+  suffix: Half
+  components:
+  - type: NodeContainer
+    nodes:
+    - !type:PipeNode
+      nodeGroupID: Pipe
+      pipeDirection: North
+  - type: Icon
+    state: pipeHalf2
+
 - type: entity
   parent: PipeBase
   id: PipeStraight

Resources/Textures/Constructible/Atmos/pipe.rsi/meta.json

@@ -25,6 +25,24 @@
             ]
          ]
       },
+      {
+         "name":"pipeHalf2",
+         "directions":4,
+         "delays":[
+            [
+               1.0
+            ],
+            [
+               1.0
+            ],
+            [
+               1.0
+            ],
+            [
+               1.0
+            ]
+         ]
+      },
       {
          "name":"pipeBend2",
          "directions":4,