From af83322c90d0ec49da1f8a82f44389a82700ec58 Mon Sep 17 00:00:00 2001
From: Ed <96445749+TheShuEd@users.noreply.github.com>
Date: Thu, 13 Feb 2025 18:12:17 +0300
Subject: [PATCH] Glass showcase (#891)

* glass showcase

* fixes

* Update closets.yml

* Update closets.yml
---
 .../Entities/Structures/Furniture/closets.yml |  72 +++++++++++++++++-
 .../Structures/Windows/directional.yml        |   4 +-
 .../Structures/Furniture/pallets.rsi/buy.png  | Bin 144 -> 152 bytes
 .../Furniture/pallets.rsi/meta.json           |   2 +-
 .../Structures/Furniture/pallets.rsi/sell.png | Bin 145 -> 154 bytes
 .../Furniture/pallets.rsi/wooden.png          | Bin 922 -> 626 bytes
 .../Storage/glass_showcase.rsi/base.png       | Bin 0 -> 776 bytes
 .../Storage/glass_showcase.rsi/base_door.png  | Bin 0 -> 296 bytes
 .../Storage/glass_showcase.rsi/base_open.png  | Bin 0 -> 322 bytes
 .../Storage/glass_showcase.rsi/meta.json      |  20 +++++
 10 files changed, 93 insertions(+), 5 deletions(-)
 create mode 100644 Resources/Textures/_CP14/Structures/Storage/glass_showcase.rsi/base.png
 create mode 100644 Resources/Textures/_CP14/Structures/Storage/glass_showcase.rsi/base_door.png
 create mode 100644 Resources/Textures/_CP14/Structures/Storage/glass_showcase.rsi/base_open.png
 create mode 100644 Resources/Textures/_CP14/Structures/Storage/glass_showcase.rsi/meta.json

diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/closets.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/closets.yml
index 1a43485f64..0cdff5a8ba 100644
--- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/closets.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/closets.yml
@@ -14,7 +14,6 @@
       map: ["enum.StorageVisualLayers.Base"]
     - state: base_door
       map: ["enum.StorageVisualLayers.Door"]
-  - type: ItemSlots
   - type: DamageOnHighSpeedImpact
     damage:
       types:
@@ -158,4 +157,73 @@
   name: vault safe
   components:
   - type: CP14Lock
-    autoGenerateShape: BankVault
\ No newline at end of file
+    autoGenerateShape: BankVault
+
+- type: entity
+  id: CP14ClosetGlassShowcase
+  parent: CP14ClosetBase
+  name: glass showcase
+  description: Something of value can be placed here without fear of it being discreetly stolen!
+  components:
+  - type: Sprite
+    drawdepth: Mobs
+    snapCardinals: true
+    sprite: _CP14/Structures/Storage/glass_showcase.rsi
+    state: base
+  - type: EntityStorage
+    isCollidableWhenOpen: true
+    enteringOffset: 0, 0
+    capacity: 5
+    showContents: true
+    occludesLight: false
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.40,-0.40,0.40,0.40"
+        density: 75
+        mask:
+        - MachineMask
+        layer:
+        - MachineLayer
+  - type: MeleeSound
+    soundGroups:
+      Brute:
+        collection: GlassSmack
+  - type: Damageable
+    damageContainer: Inorganic
+    damageModifierSet: Glass
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 150 #excess damage (nuke?). avoid computational cost of spawning entities.
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WindowShatter
+    - trigger:
+        !type:DamageTrigger
+        damage: 50
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WindowShatter
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          CP14GlassShard:
+            min: 1
+            max: 2
+      - !type:DoActsBehavior 
+        acts: [ "Destruction" ]
+  - type: ContainerContainer
+    containers:
+      entity_storage: !type:Container
+        showEnts: True
+        occludes: False
+      paper_label: !type:ContainerSlot
+        showEnts: False
+        occludes: True
\ No newline at end of file
diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Windows/directional.yml b/Resources/Prototypes/_CP14/Entities/Structures/Windows/directional.yml
index c9123c0428..3495ed92a0 100644
--- a/Resources/Prototypes/_CP14/Entities/Structures/Windows/directional.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Windows/directional.yml
@@ -60,7 +60,7 @@
           collection: WindowShatter
     - trigger:
         !type:DamageTrigger
-        damage: 25
+        damage: 50
       behaviors:
       - !type:PlaySoundBehavior
         sound:
@@ -69,7 +69,7 @@
         spawn:
           CP14GlassShard:
             min: 1
-            max: 1
+            max: 2
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
   - type: Airtight
diff --git a/Resources/Textures/_CP14/Structures/Furniture/pallets.rsi/buy.png b/Resources/Textures/_CP14/Structures/Furniture/pallets.rsi/buy.png
index 6c6f9f8e3085eb29b48862ee642a33e61856b018..7e5e79bd3791fa59b9dabe382894693f51972d08 100644
GIT binary patch
delta 110
zcmV-!0FnQY0hj@hF=tXqL_t(og=1hCEZ|v<$^U_{i-}&A;sS%m0YVx=bh8wzUDw@}
z=#~cPY1b$q9*mX)1MYy)a$pn;I2bJl2HXLo<-jNya4=d947dYE%YhLK09h$18H(AL
Q6951J07*qoM6N<$g0(6sWdHyG

delta 102
zcmV-s0Ga=o0gwTZF<(kaL_t(oh3%8E2>>7v#13b2JU4U?OW`NbUa<WWOcqF*NFZsn
zx?IkZEj}UOjezJgUF>k)VM7A!0c^;I1lR-EkPQj22e9GSY?`wwA*nx;?f?J)07*qo
IM6N<$f-Vm!asU7T

diff --git a/Resources/Textures/_CP14/Structures/Furniture/pallets.rsi/meta.json b/Resources/Textures/_CP14/Structures/Furniture/pallets.rsi/meta.json
index ecc9ee14e4..46812fed17 100644
--- a/Resources/Textures/_CP14/Structures/Furniture/pallets.rsi/meta.json
+++ b/Resources/Textures/_CP14/Structures/Furniture/pallets.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "All right reserved",
-  "copyright": "Created by TheShuEd (Github)  and resprite by Jaraten and vladimir.s",
+  "copyright": "Created by TheShuEd (Github) and resprite by Jaraten and vladimir.s",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/_CP14/Structures/Furniture/pallets.rsi/sell.png b/Resources/Textures/_CP14/Structures/Furniture/pallets.rsi/sell.png
index 4055504c28817a05ab46a3f44eff2e509c262217..3914d3fd0b57c205781873efa40d5cac3d02687c 100644
GIT binary patch
delta 112
zcmV-$0FVEX0h$4jF=<puL_t(og=1hCEWoJE`Ts!J#Y8Vlae=|(fPdo5bh8xMF1Q1J
z9ps^#1L$ejC?Fn;mIDLsfYEYb6bv{REe8hN0i)%>C>U@sS`G}j14he%5eoq0cqZvB
S=zv220000<MNUMnLSTZWbS(b>

delta 103
zcmV-t0GR)p0g(ZaF<?tcL_t(oh3%6u4FDhz#4Z@X3l{K(Mx^`(I|=I_39W&4sRWYR
z=*#6S+2Rud-Ux_U)5Q+w9X2Gu9>9idNPs<n4cU+YdjK1L%?5A=9`Q6=n?wKr002ov
JPDHLkV1hV#C!PQR

diff --git a/Resources/Textures/_CP14/Structures/Furniture/pallets.rsi/wooden.png b/Resources/Textures/_CP14/Structures/Furniture/pallets.rsi/wooden.png
index b493346d62036e1bc5e353c5969b6ab203da8093..8c6198b9dd3b1015cb50b230d9e9708c6b84f047 100644
GIT binary patch
delta 589
zcmV-T0<!&@2l51vFn<CpNkl<ZScUDDF>ljA7>1t^6Qi__f@RTxRs|^og$X7YJN6Io
zBl!c2tPF?>A?N}MhA;$KPGpzJP8*rQoP9p~PByLRl6P_L%YApB?|a|(3^$A(z{#_t
zOaz=k&zNA_eS-KB0MD_Cc$#jo?LKL`Y0Qh)SuOVZ{aLSA;eXJ()4J*%+rkeLc5JH>
zlb<SFW$XtD0JmE2dd*m_E&wRXb)8|W#4ujrIz#**X`R!Q4{=$*a&^J!G}I=kyb#By
z=E(D!dM@5tY+e)q@bsbDC3y2`&he8yZDA&S`MJOy*_GHKCC@&5&x^P*4vdGl0qF$p
zj&>WS%{B2Hi+|```+qzQnP@l?#;fA@)(5seu=Rnh5A*<DJep*pB7w4BWwlUhU+CSo
z`;{@&`|mkc;T<xJJ|OoCa^lHzRK3e%l}*3X%NoZ7f&U8!bnXZpeBfVnFEk%UX#-dC
z6DT+UWv@;5L6g3r<cw(zHMhb6S?{OQP<uDj-6Gd?SAV~_Rt~5NYJ=KcQ0-CJso#E(
z82zFdbKoxrUOs=E>3S>Q`Kp#Z$0AKPmEOue@ngBxZhtTy@apa7Zr=m4*8L#iz#AFo
zPwwZ>CQgM>3S5B$^2uBU7JxglJ8Rr^boWOc&S0Tk--295lfAsZ^7o#}!Qyp>=R~aw
z7P1rm@J4YKl?4F2`?>(&!9AxkHsRYZ81FW7XL+7f#$sKuu|UPHj`sH}QaGE<%%8|D
bVOsYOSEwQ7vpt;!00000NkvXXu0mjf|3M@^

delta 887
zcmV--1Bm?c1eynsFn<G7Nkl<ZScT13zfapx5dK_Qq>5rIwp19L&;btw2E>30Q^msG
zg};G6seeNk_AaOsMI9=H_%Vb5oD89oW7$zevbaNh&*$^A2~`KaCC<Bh_wL=h@9sSV
z3<sNj3IN^q3IHI8<~YCW8vt;;zm<~S)gT4{+ztlDOY@`*0Dr#yyfNt8guvnU8p33%
z{-0;RK{UtCx&_y2!nGUtaq~y%?5tY|;~8ALk;$hxzsqH=)dT>9$rNEcE39XbhtkU+
znoHl72Dc+2?V2>fwHs>CwVLp~>IHa&IB2I5{o%M^pF3j$fNM7jp^;%CojN&<%Z&hl
z?>XoX$M8J|u7A}mY`~!8@;#?)FjLg+%&}XA|KoU4npd?Eax{!*iyYWlx3m-XdR^^K
z{{`frbk68?Iw}d<t@r<J!8$~fXZ3Ax!NI1VcH1lJIKpI#uit+gI@#&PgQ^3^`&+5+
zIf`bk-B9yRj&{>9o~e0f*CSOU06{}QPa#g7*HElZpMP{ssiaFr*DlhICuNvSS+?h6
zFM-%%^00E$WipKst*RDvttR@zacP{^>kr2;gJ_N*8Wp0j*Xtrorr7XS0X&s<%)b{p
z&@QwnXimwwQXO#ZhBCx)KYT(M&lDYh-3BEca+vf1Xl+T1;|b2LM{kUVy-p|n^64Xh
zJWNC<l7G?o<zrH4xw7kV`jRY6riFO`qap9*b*Q7EM3pUW!vq#Rn;;vL9M?6QD)=5$
z69V!?<u=T2d!@|lOo5McLmawG26viwLS8Ki#>vsHN<vytM=70g>EyCbDZO|Glh<i#
zv3sJ`)`6%8<n(jw7B;e~NL^6ZzAqn>H%P<JTYn!a>2$cg1|Yv;={laIFUjb_%54II
zhPtk|%;og8m)Tkxa!?l2u62;iSf(TL2pcCyyD4=o3X@!n#tAy(Raq~cEHpD>0r!mR
zfNZn;f~un)Ij&o*ik3k%U$kT2bFks9;(qv~s6^kAJ{&|rGR`lt+!g>uOCYCa5WTf-
z$Z#*0k}~rB&>xP~Ba^BrucRa+n?QaP{BinDddCxxpPTPFs*K7cynIXw$t#~>{CY<(
zYeM05d^L#CZoSXAoD@QJdhw7QQ39YC#%S`4v+EIn#kq1B*_8GOe*s{bI(>4RG#&r|
N002ovPDHLkV1m-JvTgtX

diff --git a/Resources/Textures/_CP14/Structures/Storage/glass_showcase.rsi/base.png b/Resources/Textures/_CP14/Structures/Storage/glass_showcase.rsi/base.png
new file mode 100644
index 0000000000000000000000000000000000000000..0e83c0e57c27e4969ef95810effab6bc735a1e63
GIT binary patch
literal 776
zcmV+j1NZ!iP)<h;3K|Lk000e1NJLTq001BW002M;1^@s6dyaLk00001b5ch_0Itp)
z=>Px%!bwCyRA_<in9XYwK^VrL1{1K<5)w%x8Uk5z@Czwv@g(Mydk%t-;8pOr9t8gY
zZ(S9n(1RYNO2I=sc*@DEgeax79>S)`CbU_)A(WEB_7D$orn8^!W<L<z=d^ieGS6@4
z<DJ==1EamI>I48rVjSY?V*x&jYi;mJ?hF8M<6&ct#OcG{R&_EG<LHPg`sJF&d?58K
z8(zv?a}06y>j%EbC6MIKC`61DTA33QE2Dwbvjt?;FV}>QsA43>X)LC%VAp^jAbJl9
z;AYIdg0NmOyNW@9TrU>rvnPOAL4J0+MgW#7ED#L<OBFPT??W&Ph$%oWn+hG|f<8bX
zq{Cq#Ab`V3n9HUD>k(F(A&?G-hBpra<gb%3ED!^L-XshV(>xF+h;1GS1H@4(4idyw
zCJX{(rc~@Fh^M{44-g8VetgD<0g}t6G+vq>;946qLpTM|dr$y!X7>tV2SVB=UI4Qj
z{%T)DzH|xzC=K86<GX_A4-<B2&wt~2aOYkI09hFW?Rfye`awp(m)C{{7t;%_0FIRt
z=2u>Laz*B;*B@!-fUJzMsTKq)qhsYn*QmV~(+e8t^@EJSni~MVbN7YInY8Jj{Q_xT
zx}_OfIt2Z4O@P$Hk*wfm=?<Phdhpb-g9E*I|7mTvy?yTW?lS;g4;;ygpPr7SITO0+
zRxe_|4+1@wJJG)bFpzq#*SW6%z;q4-31PN;4MPytL^J@nx$6l80C1n{-HNo&zAOb;
z-f4K=hMhvNUNjNqOQ)!}yZmOlAXM(Hpt8Te=C}E7dmHscmnYl42B6iPV6`%Zc=_tB
z<ypXLrPxhgQlFT&niC@cfdIy+r@Q=*+f`q0N|$#UysV5NH??uY{QxjM7m!;`0O*J+
zid+I6Q3U{yI4L7BvvR5=K=wM*@<@>)MT!(DQlv=#t$qXI%WOy^qSkW&0000<MNUMn
GLSTZc)Kwz@

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_CP14/Structures/Storage/glass_showcase.rsi/base_door.png b/Resources/Textures/_CP14/Structures/Storage/glass_showcase.rsi/base_door.png
new file mode 100644
index 0000000000000000000000000000000000000000..5c9c0e7bc93ec1625fc2ed47eae97f5f097ad326
GIT binary patch
literal 296
zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!3HF&`%2dVDaPU;cPEB*=VV?2IgdPD978f1
z-%eV~cgR4Xf!ndKHHB~c0*?tCGUpFwH$37D__K#$R{4y>6M5_{+h<2U6IdXXuqF0%
z!_4=SufM)~{T?SH&=erJV4xfNVa~GG@g~yk4;RV2ULmx7_ug$D^F(hM+kcp|^wv7@
zKL;+Go!WdzBSSYK_(inRG5H_u9YyRRttrNnPZYl^s+f6tbLge}7MwpCmz$IezT{ok
zpRmX`ocl@S$8SpE6D@Xi9{#A3cDZxkZi6=sbK>Vpo_?lw@szB_{%had7rlFt`p$}T
qwdxw>pw_JoD?KBh2@8UqmC<9p@_K$F!!4C1Aik%opUXO@geCwb41K)-

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_CP14/Structures/Storage/glass_showcase.rsi/base_open.png b/Resources/Textures/_CP14/Structures/Storage/glass_showcase.rsi/base_open.png
new file mode 100644
index 0000000000000000000000000000000000000000..f64be8b74dddd38c970d95358fca0240639f89fb
GIT binary patch
literal 322
zcmV-I0lof-P)<h;3K|Lk000e1NJLTq001BW002M;1^@s6dyaLk00001b5ch_0Itp)
z=>Px#{7FPXRA_<i*S|_aaTvz&ugAjWP(q_PHHCwaG&pn_HR?sQ2@MUk`R@XBXl-fk
z0&2+Fq2(wog@j;IL>z1o6#vZcdxGb41MioI-|_<y5fKp)5s@V7MN!@AR$z7L{{-}+
zsNQUK`~s{cE5LgGjQ|hH3GkSIB>-UZG4&1b5Wsx?tIIYpU!hPc+6DmZ9fW2_w+47g
zKVF~DUS3D#@OxAq@9sYxpPo>woLyK2>|_sr$;2_4X$)UhXP1KKhZ*k!81{ecue0_B
z3Z<gy`~X3<d!PEuA2r^xxrXK8MS#cAtpOhMuLO8;4*=li_Rj1du+Dt}_W%)*KQE_2
UY<+@sTL1t607*qoM6N<$g4O|x3;+NC

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_CP14/Structures/Storage/glass_showcase.rsi/meta.json b/Resources/Textures/_CP14/Structures/Storage/glass_showcase.rsi/meta.json
new file mode 100644
index 0000000000..09e6d53dd6
--- /dev/null
+++ b/Resources/Textures/_CP14/Structures/Storage/glass_showcase.rsi/meta.json
@@ -0,0 +1,20 @@
+{
+  "version": 1,
+  "license": "All right reserved",
+  "copyright": "Created by TheShuEd (github)",
+  "size": {
+    "x": 32,
+    "y": 64
+  },
+  "states": [
+    {
+      "name": "base"
+    },
+    {
+      "name": "base_open"
+    },
+    {
+      "name": "base_door"
+    }
+  ]
+}