Adds paper label visuals to closets and lockers (#33318)

* Modifies label sprites and adds label visuals to closets

* Removes redundant GenericVisualizer component

diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml
index 7d7bc94bb327ad6dfb8394dd42a9b8a12b12cc91..8e2d1a6e54c0da4d12f6219f0c3bd8f21881d09b 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml
@@ -20,6 +20,11 @@
     - state: welded
       visible: false
       map: ["enum.WeldableLayers.BaseWelded"]
+    - state: paper
+      visible: false
+      sprite: Structures/Storage/closet_labels.rsi
+      offset: "-0.065,0"
+      map: ["enum.PaperLabelVisuals.Layer"]
   - type: Destructible
     thresholds:
     - trigger:

diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
index 9351a0d540caafbf64c514a0cb75488369ba07fc..2568c45a6acf5da89ebd46a71b46b30e2f172e04 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
@@ -19,6 +19,10 @@
     - state: welded
       visible: false
       map: ["enum.WeldableLayers.BaseWelded"]
+    - state: paper
+      visible: false
+      sprite: Structures/Storage/closet_labels.rsi
+      map: ["enum.PaperLabelVisuals.Layer"]
   - type: MovedByPressure
   - type: PaperLabel
     labelSlot:
@@ -86,6 +90,21 @@
           SheetSteel1:
             min: 1
             max: 1
+  - type: GenericVisualizer
+    visuals:
+      enum.PaperLabelVisuals.HasLabel:
+        enum.PaperLabelVisuals.Layer:
+          True: { visible: true }
+          False: { visible: false }
+      enum.StorageVisuals.Open:
+        enum.PaperLabelVisuals.Layer:
+          True: { visible: false }
+      enum.PaperLabelVisuals.LabelType:
+        enum.PaperLabelVisuals.Layer:
+          Paper: { state: paper }
+          Bounty: { state: bounty }
+          CaptainsPaper: { state: captains_paper }
+          Invoice: { state: invoice }
   - type: Appearance
   - type: EntityStorageVisuals
     stateBaseClosed: generic

diff --git a/Resources/Textures/Structures/Storage/Crates/labels.rsi/bounty.png b/Resources/Textures/Structures/Storage/Crates/labels.rsi/bounty.png
index 52e515e39b87c92c9c1601f94221ccaa7b9022d4..1258071a1a61a3784b3c57ccaf2b7661d263dbe0 100644 (file)
Binary files a/Resources/Textures/Structures/Storage/Crates/labels.rsi/bounty.png and b/Resources/Textures/Structures/Storage/Crates/labels.rsi/bounty.png differ

diff --git a/Resources/Textures/Structures/Storage/Crates/labels.rsi/captains_paper.png b/Resources/Textures/Structures/Storage/Crates/labels.rsi/captains_paper.png
index 961991bf349e71e7be007ec83fd2f148c114ee44..9a2c339936ad14b89c2c1ff6b49678c37922f8b9 100644 (file)
Binary files a/Resources/Textures/Structures/Storage/Crates/labels.rsi/captains_paper.png and b/Resources/Textures/Structures/Storage/Crates/labels.rsi/captains_paper.png differ

diff --git a/Resources/Textures/Structures/Storage/Crates/labels.rsi/invoice.png b/Resources/Textures/Structures/Storage/Crates/labels.rsi/invoice.png
index 3e00e7d806875df92f79b001cda052714c5c7e6b..30649e06ee8de381fd8a9b052af8b91e80e47ef4 100644 (file)
Binary files a/Resources/Textures/Structures/Storage/Crates/labels.rsi/invoice.png and b/Resources/Textures/Structures/Storage/Crates/labels.rsi/invoice.png differ

diff --git a/Resources/Textures/Structures/Storage/Crates/labels.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/labels.rsi/meta.json
index c180604984c49d957e624c3077b3bed37839912b..8ff0cc71798be7657cff0f6628ce28f401de3226 100644 (file)
--- a/Resources/Textures/Structures/Storage/Crates/labels.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/Crates/labels.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Sprites by Vermidia.",
+  "copyright": "Sprites by Vermidia and modified by SpaceRox1244.",
   "size": {
     "x": 32,
     "y": 32
@@ -20,4 +20,4 @@
       "name": "invoice"
     }
   ]
-}
\ No newline at end of file
+}

diff --git a/Resources/Textures/Structures/Storage/Crates/labels.rsi/paper.png b/Resources/Textures/Structures/Storage/Crates/labels.rsi/paper.png
index 8daf7770832d0af33409e26f65458e3e2e460cc3..bd6c7138f62280ce804a4e3f778d50a850e99899 100644 (file)
Binary files a/Resources/Textures/Structures/Storage/Crates/labels.rsi/paper.png and b/Resources/Textures/Structures/Storage/Crates/labels.rsi/paper.png differ

diff --git a/Resources/Textures/Structures/Storage/closet_labels.rsi/bounty.png b/Resources/Textures/Structures/Storage/closet_labels.rsi/bounty.png
new file mode 100644 (file)
index 0000000..8146de6
Binary files /dev/null and b/Resources/Textures/Structures/Storage/closet_labels.rsi/bounty.png differ

diff --git a/Resources/Textures/Structures/Storage/closet_labels.rsi/captains_paper.png b/Resources/Textures/Structures/Storage/closet_labels.rsi/captains_paper.png
new file mode 100644 (file)
index 0000000..d6c3de9
Binary files /dev/null and b/Resources/Textures/Structures/Storage/closet_labels.rsi/captains_paper.png differ

diff --git a/Resources/Textures/Structures/Storage/closet_labels.rsi/invoice.png b/Resources/Textures/Structures/Storage/closet_labels.rsi/invoice.png
new file mode 100644 (file)
index 0000000..7f1a379
Binary files /dev/null and b/Resources/Textures/Structures/Storage/closet_labels.rsi/invoice.png differ

diff --git a/Resources/Textures/Structures/Storage/closet_labels.rsi/meta.json b/Resources/Textures/Structures/Storage/closet_labels.rsi/meta.json
new file mode 100644 (file)
index 0000000..3e64ac9
--- /dev/null
+++ b/Resources/Textures/Structures/Storage/closet_labels.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprites by Vermidia and modified by SpaceRox1244.",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "paper"
+        },
+        {
+            "name": "bounty"
+        },
+        {
+            "name": "captains_paper"
+        },
+        {
+            "name": "invoice"
+        }
+    ]
+}

diff --git a/Resources/Textures/Structures/Storage/closet_labels.rsi/paper.png b/Resources/Textures/Structures/Storage/closet_labels.rsi/paper.png
new file mode 100644 (file)
index 0000000..83b15b9
Binary files /dev/null and b/Resources/Textures/Structures/Storage/closet_labels.rsi/paper.png differ