ItemCabinetVisualizer uses layers (#4445)

* ItemCabinetVisualizer uses layers

* Reviews applied

* Fixes the fireaxe cabinet as well

* I'm dumb

Content.Client/Cabinet/ItemCabinetVisualizer.cs

@@ -1,6 +1,7 @@
 using Content.Shared.Cabinet;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
 namespace Content.Client.Cabinet
@@ -8,19 +9,12 @@ namespace Content.Client.Cabinet
     [UsedImplicitly]
     public class ItemCabinetVisualizer : AppearanceVisualizer
     {
-        // TODO proper layering
+        [DataField("openState", required: true)]
-        [DataField("fullState", required: true)]
+        private string _openState = default!;
-        private string _fullState = default!;
-
-        [DataField("emptyState", required: true)]
-        private string _emptyState = default!;
 
         [DataField("closedState", required: true)]
         private string _closedState = default!;
 
-        [DataField("closedEmptyState", required: true)]
-        private string _closedEmptyState = default!;
-
         public override void OnChangeData(AppearanceComponent component)
         {
             base.OnChangeData(component);
@@ -29,28 +23,17 @@ namespace Content.Client.Cabinet
                 && component.TryGetData(ItemCabinetVisuals.IsOpen, out bool isOpen)
                 && component.TryGetData(ItemCabinetVisuals.ContainsItem, out bool contains))
             {
-                if (isOpen)
+                var state = isOpen ? _openState : _closedState;
-                {
+                sprite.LayerSetState(ItemCabinetVisualLayers.Door, state);
-                    if (contains)
+                sprite.LayerSetVisible(ItemCabinetVisualLayers.ContainsItem, contains);
-                    {
+            }
-                        sprite.LayerSetState(0, _fullState);
-                    }
-                    else
-                    {
-                        sprite.LayerSetState(0, _emptyState);
         }
     }
-                else
 
-                if (contains)
+    public enum ItemCabinetVisualLayers : byte
     {
-                    sprite.LayerSetState(0, _closedState);
+        Door,
-                }
+        ContainsItem
-                else
+        //Welded
-                {
-                    sprite.LayerSetState(0, _closedEmptyState);
-                }
-            }
-        }
     }
 }

Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml

@@ -8,7 +8,13 @@
     - type: Sprite
       sprite: Structures/Wallmounts/extinguisher_cabinet.rsi
       netsync: false
-      state: extinguisher_closed
+      layers:
+      - state: frame
+      - state: extinguisher
+        map: ["enum.ItemCabinetVisualLayers.ContainsItem"]
+        visible: true
+      - state: closed
+        map: ["enum.ItemCabinetVisualLayers.Door"]
     - type: ItemCabinet
       doorSound:
         path: /Audio/Machines/machine_switch.ogg
@@ -18,10 +24,8 @@
     - type: Appearance
       visuals:
         - type: ItemCabinetVisualizer
-          emptyState: extinguisher_empty
+          openState: open
-          fullState: extinguisher_full
+          closedState: closed
-          closedState: extinguisher_closed
-          closedEmptyState: extinguisher_closed
   placement:
     mode: SnapgridCenter
 

Resources/Prototypes/Entities/Structures/Wallmounts/fireaxe_cabinet.yml

@@ -8,7 +8,13 @@
     - type: Sprite
       sprite: Structures/Wallmounts/fireaxe_cabinet.rsi
       netsync: false
-      state: cabinet-filled-closed
+      layers:
+      - state: cabinet
+      - state: fireaxe
+        map: ["enum.ItemCabinetVisualLayers.ContainsItem"]
+        visible: true
+      - state: glass
+        map: ["enum.ItemCabinetVisualLayers.Door"]
     - type: ItemCabinet
       doorSound:
         path: /Audio/Machines/machine_switch.ogg
@@ -18,10 +24,8 @@
     - type: Appearance
       visuals:
         - type: ItemCabinetVisualizer
-          emptyState: cabinet-empty-open
+          closedState: glass
-          fullState: cabinet-filled-open
+          openState: glass-up
-          closedState: cabinet-filled-closed
-          closedEmptyState: cabinet-empty-closed
   placement:
     mode: SnapgridCenter