From 21ea4290a5cc72ec6e7ebf7e285cde0423347eb2 Mon Sep 17 00:00:00 2001 From: Nim <128169402+Nimfar11@users.noreply.github.com> Date: Fri, 4 Oct 2024 21:18:01 +0300 Subject: [PATCH] Paintings (#479) * oppa * fix * Update Resources/Textures/_CP14/Structures/Wallmount/wallmount_painting.rsi/meta.json --------- Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> --- .../Structures/Decorations/painting.yml | 63 ++++++++++++++++++ .../Structures/Furniture/wallmount.yml | 1 - .../candle_painting.png | Bin 0 -> 1142 bytes .../wallmount_painting.rsi/meta.json | 27 ++++++++ .../wallmount_painting.rsi/painting_saint.png | Bin 0 -> 1432 bytes .../wallmount_painting.rsi/painting_woman.png | Bin 0 -> 1467 bytes .../wallmount_painting.rsi/skull_painting.png | Bin 0 -> 1391 bytes 7 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 Resources/Prototypes/_CP14/Entities/Structures/Decorations/painting.yml create mode 100644 Resources/Textures/_CP14/Structures/Wallmount/wallmount_painting.rsi/candle_painting.png create mode 100644 Resources/Textures/_CP14/Structures/Wallmount/wallmount_painting.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Structures/Wallmount/wallmount_painting.rsi/painting_saint.png create mode 100644 Resources/Textures/_CP14/Structures/Wallmount/wallmount_painting.rsi/painting_woman.png create mode 100644 Resources/Textures/_CP14/Structures/Wallmount/wallmount_painting.rsi/skull_painting.png diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Decorations/painting.yml b/Resources/Prototypes/_CP14/Entities/Structures/Decorations/painting.yml new file mode 100644 index 0000000000..312d11345d --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Structures/Decorations/painting.yml @@ -0,0 +1,63 @@ +- type: entity + id: CP14BaseWallmountPainting + parent: CP14BaseWallmount + abstract: true + components: + - type: Damageable + damageContainer: Inorganic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 20 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + +- type: entity + id: CP14WallmountPaintingSkull + name: skull painting + parent: CP14BaseWallmountPainting + description: A bizarre skull painting. Depressing. + components: + - type: Sprite + sprite: _CP14/Structures/Wallmount/wallmount_painting.rsi + state: skull_painting + +- type: entity + id: CP14WallmountPaintingCandle + name: candle painting + parent: CP14BaseWallmountPainting + description: A nicely drawn candle in a frame. + components: + - type: Sprite + sprite: _CP14/Structures/Wallmount/wallmount_painting.rsi + state: candle_painting + +- type: entity + id: CP14WallmountPaintingWoman + name: painting of a woman + parent: CP14BaseWallmountPainting + description: The painting depicts a woman with a mysterious smile. + components: + - type: Sprite + sprite: _CP14/Structures/Wallmount/wallmount_painting.rsi + state: painting_woman + +- type: entity + id: CP14WallmountPaintingSaint + name: painting of a saint + parent: CP14BaseWallmountPainting + description: A drawing of a nun with a halo over her head. This is how you can feel the holiness of the picture. + components: + - type: Sprite + sprite: _CP14/Structures/Wallmount/wallmount_painting.rsi + state: painting_saint + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 60 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/wallmount.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/wallmount.yml index 54edaa4fc9..1ad7a5f129 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/wallmount.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/wallmount.yml @@ -177,4 +177,3 @@ - map: ["enum.StorageFillLayers.Fill"] - type: StorageFillVisualizer fillBaseName: bottleB - diff --git a/Resources/Textures/_CP14/Structures/Wallmount/wallmount_painting.rsi/candle_painting.png b/Resources/Textures/_CP14/Structures/Wallmount/wallmount_painting.rsi/candle_painting.png new file mode 100644 index 0000000000000000000000000000000000000000..40548c22e10798e190f952d74075dacb4d3f3448 GIT binary patch literal 1142 zcmeAS@N?(olHy`uVBq!ia0vp^4nTZ>gAGV-xtR*07>k44ofy`glX=O&z+&L(;uumf z=k4A2?5K1Z_7C}g)_?RcQRBTVbIHX$%iWp%rj$|CsT)g@#Zy}i+4i33mT2AA@{IRO zQfus6CDoeLm{S!;GJw*2S0Xm^48tQmQh$Bx;3{JrziXB#`4 z^XH#eo(rs(VN?QvMRq0^UUKi>Ba$U!v+c`kuj6mOdb!KS#c*urwOc=Bg7&H%zh86) zI9|9Lnfsx$WZBv?%9btMP3!vZ?K8YzuzOC&S~bDWqlV9c$1RIl*0GtboU6)U}5-i{#OBz-O{uv zV7Y_CbF~{W*M-*2vu|Gd`}BwTUlqT)OEGLHsh12tKi_fP3a-un8u|2E&;R_}tG!UL zLd88ga@`80U7J+Td|~hVnE7GO{rhDLl`kFW?0|w5_MAUe)66dyw{Sab2a;R|9y#s! z_@I#KvSWGl&0Cvo(o#Ij1zI={yp{gkJAdB3hBw8I-}oOVmh25J`+SSlCe}Y$d2K?? ziAC9#GTQbJRCdPt)qH7`y|h5Ka%s!=y)^SNW;=cVh)S~(h~ z<$eC}Je{Foy&Y#_(w!d1-J-XjYHhlyB&Rx$nZd5^dh^bg4v#-Z{qflB@O}N^y^EGU ztu-@mtlGPif10-GjWuaLr<8Y8zIAec%O%Xfu%phBWBFme$tO7&HbnSDbpLOCTf}O; zdpA&g#cp3krVG>N1+RQqY1Hji%B~#88MmD~ZSu>lU;lRtR5M)g+5NL{?@sm_**gBo zpE!Kfn0?%=zr8B0k^d>nP*9i?5Wd^#41=yMJA>Wd0;Z|2_;}hFHB?2n-nEtBWvj8X zXJyz03^tC2W7)>avvrf!$GI;IIhMAJV{4Fe+|6V2XR}u1rrpiu5^iu>*(4cx$SvyN z=|A@aLPh!71y`+Fv_NFz#4rP8Z;%-`ng7kbcJ_-*_tLd@w7g}PKIbUb{G+w(xqu*k zAX{=nR?^Qp_e|U2cjvF`i-{lNWoF>9%-#F$bm!$`ITmmBJO6f7n%kIo%KX=VQ~#Bk z_g7e$2UP`2H0-<2Ty?iIE}3DGcJ$tN&gWgiw^=YtG$=0jUGbme?KGf^6_@uKH!!|9 r{&Ib0@80?Q1r))#6rEUf`GtJEdCP@YMt$#r1qp+vtDnm{r-UW|InD^D literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Structures/Wallmount/wallmount_painting.rsi/meta.json b/Resources/Textures/_CP14/Structures/Wallmount/wallmount_painting.rsi/meta.json new file mode 100644 index 0000000000..e59c1b3021 --- /dev/null +++ b/Resources/Textures/_CP14/Structures/Wallmount/wallmount_painting.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "Created by Max Gab for CrystallPunk14", + "size": { + "x": 32, + "y": 96 + }, + "states": [ + { + "name": "skull_painting", + "directions": 4 + }, + { + "name": "candle_painting", + "directions": 4 + }, + { + "name": "painting_woman", + "directions": 4 + }, + { + "name": "painting_saint", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Structures/Wallmount/wallmount_painting.rsi/painting_saint.png b/Resources/Textures/_CP14/Structures/Wallmount/wallmount_painting.rsi/painting_saint.png new file mode 100644 index 0000000000000000000000000000000000000000..aee6309edefff6af822c5002fd281ccdf050f8ab GIT binary patch literal 1432 zcmZ`(c{JMz5dI~Ogsv9FCavp{Zc(Le#8EeKlPapElsX#s71!3$szsf#t3@m-wN>3B zt=KeZBVA2HE3}?c4OLQCgSe8o%BH*f=kB~WGw+)>Z)UzXZzkUz;~*n_NE!eD87D`y zhsaxrln#{?*|yQpZw`d>aIgVd`jzJaK*GZbZS9p>y*TdXsGI_0u8_zi%us}XfL4T| zFF4CE+3gTYR#)LeL!OPE3Cy{!LOm5Ku0afRbl$J6aMcmot9=iVr=Vj32S-<^ zY7#A6RE)=(UYw)7aUhP=ktTuyb#_Xad|(|k^OTTN8gkr!`YCfZcRG?Xy!|J2?o5(Do%U4CeX{RFZ03| zV}n~R?S`v(_^XvT(09tb|5TsRarfJnhX_YpUHe)^ z@wjGubPkBNq|)=Ut!qz`pQQLcIbxKP5N{_2WU9E{Da|nVld{sK(V37Gq?(KDcN-gP zJf_z<1y6yqoDpqX?7I7#3S8HcNj^k5N{Yj82!QPDuH%eO8Csh?cC>4(boY_+PS0w{ zO<-;(vY=rRT1RDTw`k<| zF2*14KeVSu3?zu=?s+dxbU%qJU;7j3hXUI(k4ohftfZMEqO<4QVZ=d=rrxEz_vxco`joSv4xG45X? zoG*|}T$CCda>uOqE));~uk`ySrFq)6*W>4@Q?hd^t65SF^Uqs#cemB{MMm>fUS&Y3 zK`7`}WywE>{lB)US$%7hreMYI4WJBF$b@_m2>7H7DHcoD^NDb1Jp5ymb}#PqVcu39 zi^oAOZ731=A-9y;IR)-qVw+Z@Tp&>7*2%NU*VpkRKbb8%4{Ed^3?v#}YKRGbh{-Ok zm3}q?iN2brv{v&v*L0lRkjlTf&@xA&0 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Structures/Wallmount/wallmount_painting.rsi/painting_woman.png b/Resources/Textures/_CP14/Structures/Wallmount/wallmount_painting.rsi/painting_woman.png new file mode 100644 index 0000000000000000000000000000000000000000..76780832ca34d674f33b7215e2562b71d2f070fb GIT binary patch literal 1467 zcmaKsc~H^`9L0ZlADN}5W?p58v80=89wn|RYL@F2ZZfD)3Z4+9l9mCLm8MzdYI)Z< zl{iIs3mRZnXr3(7DzcKdCMczqnn+9g_s+hV_ufC>f4(!HdAXs%0S0;&dH?_z1Rh0% ztJ+&-o{p9(n?$%D1xgJM@BtVDmLC8>Gd&P-1esB>I2N6Q#98t`$vso?WU^-?>x?}; zuRYoRcgMhy3t@?VN5ZgaHTQhXV$yy>-bn{%>^N#-a!f;SI}8zrFv8z`VcTZLnPHbO z95<4FiI>C=kPlS);txIAh<5wMmw)WYkn0yS`+zzzJ!LJOZusthBp(^MJGKkpL*FRT*R-us1?XBt4*P z;_J$3a92Mb4)L=DR*SxBqnUrW5 zn~#}&L7D5a0g)`VX(ut6M&plPZ5hPRx=m){7f#aYNT?EG$UOf&Op>A8{lh?t7%x}W zP&T<=^O<@sS^yFn0WF5+BJ?*5DTAEF+YR3eivgJhX0RPo-PuA|URQgURD5oI;HdYw z^&KbVK9jdfi1eV>;X=G{Hik@yHspzIDr^fAIxF=TdDJ4FE~&xq+%@Qk<_r%5|ycaD~sO+zY7Y6>w_0vW7t8 z#d;_2dFcl6XBKJk&$cNxBmDVKL`|%FJpvbQROv@4Wn*k+G!MLDNl;hZIDjqq3z1z* zw-UD-+B`X*2`Q>cRNb#DCQU-6n#1_FucmJ4W^govdC}xQYI8&D+ESv1a|vRZS5}4K zQzC`s+}W7SCe~q~{TH7aY+u{fZCYn?lj(wMBQ@ttxm#u}dX&JDR}8f;cF?BWn`3DG zW!FeLDG4E;%LCO0Tet4@I7jabVw-317Yj|bv`>FO{PVvY{fNYzA!Vd)>)h80-mqpF zPJDSMaO^~;{^>B4D%?#n~^WOK0lRdVBen2L0=yXj#`$&H@lN2OD0Cw&QM-d?I3Kq{Yc6Q zs5J&iNpTjmjbVmuxs&t3;!}k8V;yZXUL{Q}clym(S-6|cm(Dj{h{y*&+n<#dXHH`v zHl;?FoeErqdFUlOj6-2Uu3%VrOF95j#EJ^yt#vx&LlA5%_1SU$lm6sODzRpH{vYO#D+!{qcfD(C^CIt!t(&`<_1qPzm74w}jQJ4$`gv?3(LM7G z#Cci|j2EKn80c2naDCbXajMU+yFT0dN|y+$y{Rm;HY?6~f$O!p0t+qQGWMyl^I@e` z^LNz!K4tO?S+%m`A$%s}h9Ba86*rNWF(}ht@o~5{-Yh8}p zy=UTY3MS}{I~m{b)uhx`pYG@qQ{EqbSTG%07EiC#SxwC*YJ-6!eXx^jO!iZ~ShsKQaFxP_WI)+(x(Q^U|FMS4 zVH*B~nyn(w&h5%DzOm*#?5*}4PV@dZ1(d5hEhDqITA8M);{STal=B|sXb~w3d?eYU PT4Ny4FBrk_!Cv_XY7EFD literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Structures/Wallmount/wallmount_painting.rsi/skull_painting.png b/Resources/Textures/_CP14/Structures/Wallmount/wallmount_painting.rsi/skull_painting.png new file mode 100644 index 0000000000000000000000000000000000000000..ae6371b0a2c1e063692d6590d67c376873b66797 GIT binary patch literal 1391 zcmaKsdpOez7{`A@!`gB^LvvXquG=H}|; zBX*2<-pYW*tmfeVF;I*T))AohsLuhwo+EBf4!&`Z_#@rX%6On-`CAW>5d3+B$u&y# z({1kyg}C*<7Zcl{1mD-iqC$iFPLYxadW~&C1U4E%xVF5P5JPz`RnnyZ+?V=OP03~mK8ixLF3-LT^>;5Qe>`D$&ba_i4^!QF>kqQM+Y56kP2UUkwDf=tsZ=ls} z9pCl{7n^0n=X=Q22_8gMjKAKE)Ve{y<&ePky@n?1ee+J-C9R{HhJXpdUR%amsy_yD zEUyT3aU`d&SC)w~Cv zcZ3|kDsPHTwZJfK2{*Jp;9`?y7_W6LPopJK31L4<^<7tgfR>Vho9^+`aP&01+0);w zx*_S#zYP%cpizy=YvxyYAvLOZZlM9ANThk{u)M$TZqo+n2>Dk{!gHG+!6qjuDAWVO z49mpj&~-e1*;cEKH7-5T5Lt+P%n>XtO(@m`s2N0r=7Z@G8%=1v8jx*gRaIc)#hjoL z{7q>Op#y89CGZS4ab2h^S?U(s}isu0fm`e8@-7OAV-2@(VdraXa&J~f6L zHRM?ejs2uq2fg4L3jmuuU@|&Qkv{rlfEeFPtXMqkji8S+ZKHb8&xQmh0R|hVsPmF_ zLo8(+ws$T(cIRmsztRnIK#+6b zgZwNxWWlVyw^#A|> literal 0 HcmV?d00001