From d9c677e91b8796aaa0a63aae6a84c309ed811338 Mon Sep 17 00:00:00 2001
From: SpaceRox1244 <138547931+SpaceRox1244@users.noreply.github.com>
Date: Sat, 16 Nov 2024 22:27:29 -0500
Subject: [PATCH] Adds paper label visuals to closets and lockers (#33318)

* Modifies label sprites and adds label visuals to closets

* Removes redundant GenericVisualizer component
---
 .../Closets/Lockers/base_structurelockers.yml |   5 ++++
 .../Storage/Closets/base_structureclosets.yml |  19 +++++++++++++++
 .../Storage/Crates/labels.rsi/bounty.png      | Bin 593 -> 192 bytes
 .../Crates/labels.rsi/captains_paper.png      | Bin 594 -> 192 bytes
 .../Storage/Crates/labels.rsi/invoice.png     | Bin 592 -> 192 bytes
 .../Storage/Crates/labels.rsi/meta.json       |   4 +--
 .../Storage/Crates/labels.rsi/paper.png       | Bin 592 -> 182 bytes
 .../Storage/closet_labels.rsi/bounty.png      | Bin 0 -> 185 bytes
 .../closet_labels.rsi/captains_paper.png      | Bin 0 -> 185 bytes
 .../Storage/closet_labels.rsi/invoice.png     | Bin 0 -> 185 bytes
 .../Storage/closet_labels.rsi/meta.json       |  23 ++++++++++++++++++
 .../Storage/closet_labels.rsi/paper.png       | Bin 0 -> 179 bytes
 12 files changed, 49 insertions(+), 2 deletions(-)
 create mode 100644 Resources/Textures/Structures/Storage/closet_labels.rsi/bounty.png
 create mode 100644 Resources/Textures/Structures/Storage/closet_labels.rsi/captains_paper.png
 create mode 100644 Resources/Textures/Structures/Storage/closet_labels.rsi/invoice.png
 create mode 100644 Resources/Textures/Structures/Storage/closet_labels.rsi/meta.json
 create mode 100644 Resources/Textures/Structures/Storage/closet_labels.rsi/paper.png

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 7d7bc94bb3..8e2d1a6e54 100644
--- 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 9351a0d540..2568c45a6a 100644
--- 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
GIT binary patch
delta 165
zcmV;W09yai1i%51BYyygNkl<ZScPL?7zLwX6pVsVFbYP&C>RB!V59>^S{PbaV)-AN
zcvH`D4EtDU;ehWy|1o4I8KH<xop%naS|(aJfPsO5;p69@3|DTvVfgs@Cth_la{xat
zJA<>GJlrvKcfiNbKN)V_eaG<l>1PIhUUr=7Xp#mP7#QG|@*Zoj6O4vYFtPyvrK2H^
TUNs0}00000NkvXXu0mjfCCEh0

delta 569
zcmV-90>=Ho0nr4IBYy#HX+uL$X=7sm04R}lk-JO7P!z_0wu;3E4myZ9WKeNX5Cw6R
z3c6H>wt}xEjZG^wF(fTgTm=`0f`jPdYw$nNRd7`h1Vs>WboRAKiRU&#i_{x#&X4cj
z?{M-3Lb04-d5x1`*?BiU6V(<Lm$c?r8i~+J4`JQ#oY};5l7D~K*F6oY-VLi>|KF>-
zT36Ga0Syu1al>)*!ZHo9jl83HN4U$#>Z`&>!b7eMD15E-RKPEaGXZ}nc9Zcb2&tZ0
zriN2BY-C+acu=^{$`y>?dDNG*rS18I)E?Qrc*L0@ibje8Yvjl?EY+6G>ib42zB$&#
zW60Z~h%1f^S%2{kiCU1ZX{n~@X?b!KRqlWD^vto*pnF>snx1|Cy&sx)p<MF)?_=LD
zpFsEtF72v+U2>ZE6unf{`VOIE3(l{qT51n2wxRpc(OtbFg=L3K6W-3CeGxiup=CM9
z>i3+}2S{$pFS>#K0~nC|9V<W6o@e!(8FB{z000SaNPk&#000XT000XT0n*)m`~Uy|
zib+I4R9Hu2U>F6XAut*OqaiRF0;3@?8UmvsFd71*Au!TIfRPpfP?~H0ADg+|lTTvU
z$3hDSfXvKJGD0zW>b!GUtzx2;13rHK$#CVy8wL=K575j3{JiW8&UW%(yYV@KW)1*Z
zdh6~xhBC)bKQn+FgA33s4J=uG6>jIjV~=PR)1&4NgAf1!GgKe%8rF^q00000NkvXX
Hu0mjfjc5Zg

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
GIT binary patch
delta 165
zcmcb_a)5Dyay>)4r;B4qL~C+_1nc4ik)EbN11`6N8X(RRX16GbsGv(9<Y!m-`!l!I
z>TD@EaDM)M$w`wp1sr*HZgyL!uCT7m0U-GB^K^QfwE23Yntz`p*IUi9Y?$6Y{ouKC
ztnVatSwHwZ{X9?k`+G?hzrF}E>+|dTm6~`m^YHK#c$>;y*~;m5SVQ6_1H&ax#kFR?
RI(9Gsfv2mV%Q~loCIG;UMbiKP

delta 570
zcmV-A0>%Bn0n!AJBYy#IX+uL$X=7sm04R}lk-JO7P!z_0wv`qiIMhKzB!h}W1yK-3
zsbCj%Xe(HCX<{Ejn}#GsimTw_AUKFFz6SpTT?JPKK~Mw{M`vG)lz6TcDpGH_IX}L8
zzr)EF@J$ztq7#^aqUqZ4SX7%&Eoi}K0)z-NPH)<9teM1Al7D~K$1P2&-VCW;|KDr4
zT9-490Zk#{F~hQ5VVQ>MRo7CyDcot~)62pK!Vy~r6uwltUgIalxf;JIwv+Km@Ts0!
z?icI7*vQ*O;X&cPVxesO%%i@fEo06lq;|{h!68nJC>lCtRw&>yB-ND68vBO7eY2Fr
zW60a0f-R05d4KUnL@i6#jMS{?8F>m+RPKNCbh4u(weD?EXnyp(*M10YLv_pZJ`X*w
zdIbIlI5+G5lH@f0F8Wqo>)VHpbvV7KYx)kHZ9vz(mA2F0l3%tjn}wGXXiq`-8d?@>
zS^b=Id<V%j`9)W-y9WbuzhmhOPYP%*Fjd-m00009aDPZya{vGf5&!@T5&_cPe*6Fc
z0E$UOK~z{rV_+BsqaiRF0;3@?8UmvsFd71*Aut*OqaiTTLx7PM0g#(p{vVsUlP7m#
z*vCQ(2Y}2>PRc?tdhWbwSgm5Bl><J1`OI+R=2Zp|jStYw0lYlC40d)dV7u`-f@Tf?
zS$g;GEi;CvPaiRW9D@tcEDfw$wHR*a(W3`x71N{U4ucQ?08>aGjJ{g~3IG5A07*qo
IM6N<$g7n+^Q2+n{

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
GIT binary patch
delta 165
zcmV;W09yah1i%51BYyygNkl<ZScPL?7zLwX6pVsVFbYP&C>RB!V59>^S{NEo*Zd!w
z_=cuh4EtDU;eg-YzA?CD=Awx0nLZh-S|(aJfPsO5;rr)L3{S3IVfg;}6JB*Ra{wnV
zAA`1&E8H=3cfj}0pBP@;zRB?R@goLKUOt@aXp#mP7#QG|${uLx5R8UVFtPyv+8QCR
Tw1rF300000NkvXXu0mjfHQz`d

delta 568
zcmV-80>}Np0nh}HBYy#GX+uL$X=7sm04R}lk-JO7P!z_0efU-!bP#dqP{pAIQ4mL|
zpi6bA6?`pi`VyKnBq<`Uf{TOTAiDS({10>$TonXC5kwrFeJxVrxs6Z}d&AB7@!k6!
zPQHLYUet6uI1akuSc$1vXntWa)bv7-78(f?Nolq@Jv*7C?tl8c!>8(PRQ0NV@88vy
z$=VwDnuSL-({hAm8se*tsd!7cTPvh8!iT~UO9m9aQhM6sXT^Ds-xXWQ#02<N&rtps
zr+=|luyo-;;jmsTYd`a-FKN#jbF)%=W%pr|V2T(a(v(@Dh(lDWA({Q}8>;$dD2Ydt
zx5*loIPw(48-EeCEM2owbE0SEDYB+=|C^_s8yWVxx5uF2$#viQp=k#y+pha{<hqq(
z2t2}tQS+B1r?C&ww`*GX06I6|?6Rh%cj0^!dLGP_m8wbs+5TJ(UQeN80lIFWb;-->
z=bV#!NUqB-x`w@d7?As&%ikx`XdLfm?K1!X010qNS$}f?01FZT01FZU(%pXi0001r
zNkl<ZSVv=E7zLvtFd71*Aut*OqaiRF0;3@?8UmvsFw#SSkrn~qT~hfUo4H$i+A-{7
zp@joLX1ZkNq8Pnr`edwDG11Ba-#>q1cyjFu1Bk{4XyyP;UOonGCs(lD_#8nq2Y@Vn
zar-92+cC$F7(kA}1!$HAjxJdUxAVrq{j`edQFDhu2mk=Ne;>F6Bl!gY0000<MNUMn
GLSTYLH3K~W

diff --git a/Resources/Textures/Structures/Storage/Crates/labels.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/labels.rsi/meta.json
index c180604984..8ff0cc7179 100644
--- 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
GIT binary patch
delta 155
zcmV;M0A&Br1hxT?BYyyWNkl<ZScUD<yA6Oa3<S^vQHMofjI0F81QD!9nzY#<Zc;*r
zg!oma;a+K-;*(;4h=_=Y=<h0xN1b!))!ci3+Sh0lD5YQ=hQn-{=gVxZQ2+q42$m3#
zMILi%1zKZZt=-FfULcDg#)y;>T4Qc=DmMUNU)p!w>o?H9Z4{StA)ox);{pHx002ov
JPDHLkV1hyfMHB!4

delta 568
zcmV-80>}Nf0nh}HBYy#IX+uL$X=7sm04R}lk-JO7P!z_0wu;3E6?Bl|&_TsPK`Mx&
zRIp2Rs1<xIY3xI2+K{A3aTQz~3J#)+ufhL7SHV?55EMbg(b?A`63=afinKS}oFCu4
z-{Is7_~Lopu$w2rC^%Lk77Z^fE`?iPXeK}x5ki`7n=^CMNq-uy&pVn_y&X}#8sDqC
z+E>%I4ov~!aow~WVVQ>bx??Kd7Vgn=+N$uO@USHV3STKb<?*xPtjF()tz=>fe5z+S
z`-fA1SkGC8@Q`r7kuT}L^QbTBNEhbkq=sboVUr+6lrSkutdYlIL~21YtM41F`erGL
zN0+xr8A}{la)06-7PTZ@(^4~{r{&30R=NMr)6R@VyzU)QXnAtow*hF~f$xgzejT~)
z_c8b%;i6FU7bT~O578?%t^WXmn{akn(^9)|z6HGxre<kX$uHZN$-wI=bS^^o4YVzL
zS^b`Kau3N3`9;^Tw-1AIKe+M(GTmq)TFP1j00009aDPZya{vGf5&!@T5&_cPe*6Fc
z0EkIMK~z{r?UJz(fFKYAU&k1$q8!YrfLtn|5{i(7ln$f;oi}jC5zRi)yM*j+XL%w7
z24DaNU;qYS00v+H2L5iKlMrC7-CDiQx!c|#0l=M;F_-Gu`{q<H1+dmiOG?D=Tf_iH
zrATXiY%#w<hyn0u&Y4On#4t}0yMYkGxfx@W`f2ojz`zd3&mUFfM5z4$0000<MNUMn
GLSTX+a|T}k

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
index 0000000000000000000000000000000000000000..8146de6c6ec0800d860a802faad2ff6270d601eb
GIT binary patch
literal 185
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ22U5qkcigg1PRu~2_ijBfd*V|
z2R+z(o@8j9HT~c3yQlh-=cKdAipLpwfZ(R5o5r7&pU+K9<rCh?_v6P;^}|!8^Cj%+
z{&}twoMPE9fBM{mH~r+^N$j$I@c8+Bp6&1UC0G3UV$5u>Z+(+b!J7Ag&eQ7&%Ppkb
f4r+ibOkrj?WG1)3w5uZq=oSV~S3j3^P6<r_lG8+t

literal 0
HcmV?d00001

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
index 0000000000000000000000000000000000000000..d6c3de92fdb631864d34d05031e7e4bc143ee4d7
GIT binary patch
literal 185
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ22U5qkcigg1PRu~2_ijBfd*V|
z2R+z(o@AUltNXv-x8~Cmze#746^}FW0KrMmNR2-`KQEh@$|t;&@5i5~#)o@nhfCVk
z|MXcWIK{GIdi(T)=gzUdlh|eb;PdqJJmv52B~|?TBFL=IuYZ$I!J7Ag&eeeH%Pgea
g4r+ibOkrjyIVg8ziH!L{pj#L`UHx3vIVCg!0Q{##oB#j-

literal 0
HcmV?d00001

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
index 0000000000000000000000000000000000000000..7f1a3795b87cfb5cdd0252d65980a3ce48ea407f
GIT binary patch
literal 185
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ22U5qkcigg1PRu~2_ijBfd*V|
z2R+z(o@9K|TluHow<g=)`sA~X6CN|L0m1Y$F(Uuwy_|f~sJ%0Wz2^U)&W9(rYV+K;
zuUERxaZ2XE$<xOdynVt|&U07x!{5*9ZQ|SWjrP?3>1dohy+4P2!d$k5X{Rz?2FUP2
c?b^i1Ffmr{L}tBuHqb2$p00i_>zopr0FSFk0{{R3

literal 0
HcmV?d00001

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
index 0000000000..3e64ac931c
--- /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
index 0000000000000000000000000000000000000000..83b15b95a2bbd4f48c941c1c57ff7a10c0179154
GIT binary patch
literal 179
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJDo+>3kcif|mp1Y?C<wGZT)wf*
zwS?!}!b_4%lFV~6ZZ<?aX#4u)*a%7AyY6`CqdJ3tpkUx@tFwyl|9;#ipZv!r{{joc
z0i*N%U!|I|{MPeoDBbub>*`{?Nbi6Y^Yc5hpQ{}N9lba$(<73vFut-ch_&iX{%R~B
cxb-cI)?K+>51w;Q1iFI3)78&qol`;+04Nhd>;M1&

literal 0
HcmV?d00001

-- 
2.51.2