From 6e1ef973f043259b32f2c558bfcb4009e4a96d56 Mon Sep 17 00:00:00 2001
From: Swept <sweptwastaken@protonmail.com>
Date: Tue, 17 Aug 2021 14:13:39 -0700
Subject: [PATCH] ItemCabinetVisualizer uses layers (#4445)

* ItemCabinetVisualizer uses layers

* Reviews applied

* Fixes the fireaxe cabinet as well

* I'm dumb
---
 .../Cabinet/ItemCabinetVisualizer.cs          | 43 ++++++-------------
 .../Wallmounts/extinguisher_cabinet.yml       | 14 +++---
 .../Structures/Wallmounts/fireaxe_cabinet.yml | 14 +++---
 3 files changed, 31 insertions(+), 40 deletions(-)

diff --git a/Content.Client/Cabinet/ItemCabinetVisualizer.cs b/Content.Client/Cabinet/ItemCabinetVisualizer.cs
index e0a9d64a92..d3f3d5bc57 100644
--- a/Content.Client/Cabinet/ItemCabinetVisualizer.cs
+++ b/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("fullState", required: true)]
-        private string _fullState = default!;
-
-        [DataField("emptyState", required: true)]
-        private string _emptyState = default!;
+        [DataField("openState", required: true)]
+        private string _openState = 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)
-                {
-                    if (contains)
-                    {
-                        sprite.LayerSetState(0, _fullState);
-                    }
-                    else
-                    {
-                        sprite.LayerSetState(0, _emptyState);
-                    }
-                }
-                else
-
-                if (contains)
-                {
-                    sprite.LayerSetState(0, _closedState);
-                }
-                else
-                {
-                    sprite.LayerSetState(0, _closedEmptyState);
-                }
+                var state = isOpen ? _openState : _closedState;
+                sprite.LayerSetState(ItemCabinetVisualLayers.Door, state);
+                sprite.LayerSetVisible(ItemCabinetVisualLayers.ContainsItem, contains);
             }
         }
     }
+
+    public enum ItemCabinetVisualLayers : byte
+    {
+        Door,
+        ContainsItem
+        //Welded
+    }
 }
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml
index 40e5c08394..0e0ddb4fbf 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml
+++ b/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
-          fullState: extinguisher_full
-          closedState: extinguisher_closed
-          closedEmptyState: extinguisher_closed
+          openState: open
+          closedState: closed
   placement:
     mode: SnapgridCenter
 
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/fireaxe_cabinet.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/fireaxe_cabinet.yml
index 2314d4dcfc..ab58b7a58f 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/fireaxe_cabinet.yml
+++ b/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
-          fullState: cabinet-filled-open
-          closedState: cabinet-filled-closed
-          closedEmptyState: cabinet-empty-closed
+          closedState: glass
+          openState: glass-up
   placement:
     mode: SnapgridCenter