From a4881f56b021d6512955b2add88135ef446953d6 Mon Sep 17 00:00:00 2001 From: Tayrtahn Date: Tue, 4 Jun 2024 14:48:24 -0400 Subject: [PATCH] Add "fill level" sprites to mops and damp rag (#28590) --- .../Objects/Specific/Janitorial/janitor.yml | 34 ++++++++- .../Specific/Janitorial/advmop.rsi/fill-1.png | Bin 0 -> 200 bytes .../Specific/Janitorial/advmop.rsi/fill-2.png | Bin 0 -> 216 bytes .../advmop.rsi/inhand-left-fill-1.png | Bin 0 -> 155 bytes .../advmop.rsi/inhand-left-fill-2.png | Bin 0 -> 187 bytes .../advmop.rsi/inhand-right-fill-1.png | Bin 0 -> 157 bytes .../advmop.rsi/inhand-right-fill-2.png | Bin 0 -> 195 bytes .../Specific/Janitorial/advmop.rsi/meta.json | 62 +++++++++++++---- .../advmop.rsi/wielded-inhand-left-fill-1.png | Bin 0 -> 252 bytes .../advmop.rsi/wielded-inhand-left-fill-2.png | Bin 0 -> 282 bytes .../wielded-inhand-right-fill-1.png | Bin 0 -> 254 bytes .../wielded-inhand-right-fill-2.png | Bin 0 -> 279 bytes .../Specific/Janitorial/mop.rsi/fill-1.png | Bin 0 -> 179 bytes .../Specific/Janitorial/mop.rsi/fill-2.png | Bin 0 -> 191 bytes .../Specific/Janitorial/mop.rsi/fill-3.png | Bin 0 -> 197 bytes .../Janitorial/mop.rsi/inhand-left-fill-1.png | Bin 0 -> 145 bytes .../Janitorial/mop.rsi/inhand-left-fill-2.png | Bin 0 -> 156 bytes .../mop.rsi/inhand-right-fill-1.png | Bin 0 -> 147 bytes .../mop.rsi/inhand-right-fill-2.png | Bin 0 -> 160 bytes .../Specific/Janitorial/mop.rsi/meta.json | 65 ++++++++++++++---- .../mop.rsi/wielded-inhand-left-fill-1.png | Bin 0 -> 153 bytes .../mop.rsi/wielded-inhand-left-fill-2.png | Bin 0 -> 186 bytes .../mop.rsi/wielded-inhand-right-fill-1.png | Bin 0 -> 151 bytes .../mop.rsi/wielded-inhand-right-fill-2.png | Bin 0 -> 189 bytes .../Specific/Janitorial/rag.rsi/fill-1.png | Bin 0 -> 133 bytes .../Specific/Janitorial/rag.rsi/fill-2.png | Bin 0 -> 163 bytes .../Specific/Janitorial/rag.rsi/fill-3.png | Bin 0 -> 173 bytes .../Specific/Janitorial/rag.rsi/meta.json | 35 ++++++---- 28 files changed, 156 insertions(+), 40 deletions(-) create mode 100644 Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/fill-1.png create mode 100644 Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/fill-2.png create mode 100644 Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/inhand-left-fill-1.png create mode 100644 Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/inhand-left-fill-2.png create mode 100644 Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/inhand-right-fill-1.png create mode 100644 Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/inhand-right-fill-2.png create mode 100644 Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/wielded-inhand-left-fill-1.png create mode 100644 Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/wielded-inhand-left-fill-2.png create mode 100644 Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/wielded-inhand-right-fill-1.png create mode 100644 Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/wielded-inhand-right-fill-2.png create mode 100644 Resources/Textures/Objects/Specific/Janitorial/mop.rsi/fill-1.png create mode 100644 Resources/Textures/Objects/Specific/Janitorial/mop.rsi/fill-2.png create mode 100644 Resources/Textures/Objects/Specific/Janitorial/mop.rsi/fill-3.png create mode 100644 Resources/Textures/Objects/Specific/Janitorial/mop.rsi/inhand-left-fill-1.png create mode 100644 Resources/Textures/Objects/Specific/Janitorial/mop.rsi/inhand-left-fill-2.png create mode 100644 Resources/Textures/Objects/Specific/Janitorial/mop.rsi/inhand-right-fill-1.png create mode 100644 Resources/Textures/Objects/Specific/Janitorial/mop.rsi/inhand-right-fill-2.png create mode 100644 Resources/Textures/Objects/Specific/Janitorial/mop.rsi/wielded-inhand-left-fill-1.png create mode 100644 Resources/Textures/Objects/Specific/Janitorial/mop.rsi/wielded-inhand-left-fill-2.png create mode 100644 Resources/Textures/Objects/Specific/Janitorial/mop.rsi/wielded-inhand-right-fill-1.png create mode 100644 Resources/Textures/Objects/Specific/Janitorial/mop.rsi/wielded-inhand-right-fill-2.png create mode 100644 Resources/Textures/Objects/Specific/Janitorial/rag.rsi/fill-1.png create mode 100644 Resources/Textures/Objects/Specific/Janitorial/rag.rsi/fill-2.png create mode 100644 Resources/Textures/Objects/Specific/Janitorial/rag.rsi/fill-3.png diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml index 868d012a87..cb5f875204 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml @@ -6,7 +6,17 @@ components: - type: Sprite sprite: Objects/Specific/Janitorial/mop.rsi - state: mop + layers: + - state: mop + - map: ["enum.SolutionContainerLayers.Fill"] + state: fill-3 + visible: false + - type: Appearance + - type: SolutionContainerVisuals + maxFillLevels: 3 + fillBaseName: fill- + inHandsFillBaseName: -fill- + inHandsMaxFillLevels: 2 - type: MeleeWeapon damage: types: @@ -49,7 +59,17 @@ components: - type: Sprite sprite: Objects/Specific/Janitorial/advmop.rsi - state: advmop + layers: + - state: advmop + - map: ["enum.SolutionContainerLayers.Fill"] + state: fill-2 + visible: false + - type: Appearance + - type: SolutionContainerVisuals + maxFillLevels: 2 + fillBaseName: fill- + inHandsFillBaseName: -fill- + inHandsMaxFillLevels: 2 - type: MeleeWeapon damage: types: @@ -244,7 +264,15 @@ components: - type: Sprite sprite: Objects/Specific/Janitorial/rag.rsi - state: rag + layers: + - state: rag + - map: ["enum.SolutionContainerLayers.Fill"] + state: fill-3 + visible: false + - type: Appearance + - type: SolutionContainerVisuals + maxFillLevels: 3 + fillBaseName: fill- - type: Spillable solution: absorbed - type: MeleeWeapon diff --git a/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/fill-1.png b/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..d7e1ad3ef2f064a8d1ea982f935565ac368e0949 GIT binary patch literal 200 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|ECYN(Tn`*L zkgGGtOR=cm>{y-Q#x~>KW%|qK#p*D){y-Q#x~>KW%|qK#p*D)lHr)@ivQ=Y!~jB@u~ z-k-;X7VSD!dF#f4|6C*W|C=ZjiNRRpQ_N uyh=TYBt!I>XFO%kMY4`g2>sb4Y}v}bd!}~A6ie52AbC$$KbLh*2~7Y_j4>Ag literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/inhand-right-fill-2.png new file mode 100644 index 0000000000000000000000000000000000000000..b5136f499b53fabcea456e3dd7281420130e70b1 GIT binary patch literal 195 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|YCT;XLn`LH zy>*bc*?@;N;7kP1g`Gy?%q62>kO*+jb_W{CwcU z((4~%H&!k1y8SoFwnpyGeC0*5SN0v-_2uz9ONdg2I`{l@3#^uJIL-cLN708>?j85o k=Ks5=oMd%#waxMk3^&cKm%V8e@&l>%boFyt=akR{0QfdalmGw# literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/meta.json b/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/meta.json index 31192c23bf..b176776adb 100644 --- a/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/meta.json @@ -1,30 +1,68 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/b136cf653c4926e475f8d39b34cd1b713331865a, wielded versions by Psychpsyo", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/b136cf653c4926e475f8d39b34cd1b713331865a, wielded versions by Psychpsyo. Fill levels by Tayrtahn on GitHub.", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "advmop" + "name": "advmop" }, { - "name": "inhand-left", - "directions": 4 + "name": "fill-1" }, { - "name": "inhand-right", - "directions": 4 + "name": "fill-2" }, - { - "name": "wielded-inhand-left", - "directions": 4 + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-left-fill-1", + "directions": 4 + }, + { + "name": "inhand-left-fill-2", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-right-fill-1", + "directions": 4 + }, + { + "name": "inhand-right-fill-2", + "directions": 4 }, - { - "name": "wielded-inhand-right", - "directions": 4 + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-left-fill-1", + "directions": 4 + }, + { + "name": "wielded-inhand-left-fill-2", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-right-fill-1", + "directions": 4 + }, + { + "name": "wielded-inhand-right-fill-2", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/wielded-inhand-left-fill-1.png b/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/wielded-inhand-left-fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..57c1acc26e0a8cf5bc31f91b52fbbbb1cc5793a8 GIT binary patch literal 252 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`=mz+NxOyoT z)fsL~Gd`2XaHglHCs$|AyjUHEgvktUIkmO5D_5?}0;*(S_zwoN*T_5sa`;Pv{DL7O z5R&0oLubXJYe1f>XFU6Ne5;~}vGU17|GjkP>6cA@V!#Ph z_(0s@bQNm`qt79>W3|E;_zXC>XUsqBU;vZ?g8K~T5(2rk4@hc9J>*(&@9RE;ddCm{ dvlEmVlq7$J9&mMWvd{vl^K|udS?83{1OR07UM&Cs literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/wielded-inhand-left-fill-2.png b/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/wielded-inhand-left-fill-2.png new file mode 100644 index 0000000000000000000000000000000000000000..4f0245bb850ed5f5adabb9c7ab427bd9771da2c6 GIT binary patch literal 282 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`=mz+NxOyoT z)fsL~Gd`2XaHglHCs$|AyjUHEgvktUIkmO5D_5?}0;*(S_zwoN*T_5sa`;Pv{DL7O z5R&0oLubXJYe1<6PZ!6Kh}O5)E^-}E;9$LAr||dx`PkxSnH#!N&79lWId{nkRBgC2 zeYt>wLxTgKL+o9~kfou48Z{hq-m)byFip)&su=_tthjt0Mn`p^$(346Fh$_3-lYzyw6_uhyN1;`=x~klC`w7+d+=@ MboFyt=akR{0L9{JbpQYW literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/wielded-inhand-right-fill-1.png b/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/wielded-inhand-right-fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..07d042cc75b5da0ffa1eeecddfeeab4db9ab278b GIT binary patch literal 254 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`=mz+NxYikN z^inM9>FG&hIFn|4X64G2wY9bLVs#i2CNsF@I2;1`74H4tA$#cp&(@~24G*pB zDlIrS9NL!4w5f&HfxE#^!TARBlXC^{ODfobazOC6;Y0D)W=@tC`5Y#k44ofy`glX(f`=mz+NxYikN z^inM9>FG&hIFn|4X64G2wY9bLVs#i2CNsF@jex8m@^bEux$ur0V!*6@KmrppZLIX z-OY9Zb{UTjiwDpD))3f*Bw}#~OaxR2>Ei8hW}ohFJ6_ zCrGd^PDo+m3f*Bw}#~OaxR2>Ei+IqS;hFJ8z z?K9*9+HmAX)&Kg9O>6Ev$jCY565R2lCeFoHc)^|XT(>893v_t(2zB<(F%Em-U&E{& b@~n-OS(Y&%euoAl&>#j+S3j3^P63f*Bw}#~OaxR2>EiI(xb}hFJ8z z?NbzDP~bWI>em1LGm@jE?OWR j_rhPtzE>sWSt|EC4kopd?F)K=#xZ!h`njxgN@xNAXQfPj literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/inhand-left-fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..3007efa01e25ef63550f83ec0f74af6f5ccbc648 GIT binary patch literal 145 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|yggkULn`LH zy|t0|fB_G)!Oyk-`u9D3^EODqx2++DHG=&FCr}j#$gD4$Qu6(;*1BE$o9TAK`K05{an^LB{Ts5HPkhR literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/inhand-right-fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..17495e71826c0b9ad172f6879e8026e96b408c66 GIT binary patch literal 147 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|d_7$pLn`LH zy=lnTV8Fxd@I3nO{vTmCx>=Z87w(Eyjy(5<1*i%HwuO6Mx_kU-fa$;WpL_5AXNHJ2 luy0jLxp)75-uu;`-_7y3Ai%uoLy#ay&ePS;Wt~$(699$tGM4}V literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/inhand-right-fill-2.png new file mode 100644 index 0000000000000000000000000000000000000000..58c3bd2c42ff3e804745f8b893da469f69a79668 GIT binary patch literal 160 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|qC8z3Ln`LH zy>*bc!GMSPK$`Bi@atT{TRbj^aK2;P@TUBd6i^ii*iW8mYyA7Rtya&rqd5gGGF!L4 ys;!lW$T38({il25>uLdiW;fOM_wI#1kF{jfFw>KEc$QWNQsU|A=d#Wzp$PzY&ofm3 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/meta.json b/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/meta.json index 5ef52189ca..34768c16f7 100644 --- a/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/meta.json @@ -1,30 +1,71 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428, wielded versions from Easypoll", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428, wielded versions from Easypoll, fill levels by Tayrtahn on GitHub.", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "mop" + "name": "mop" }, { - "name": "inhand-left", - "directions": 4 + "name": "fill-1" }, { - "name": "inhand-right", - "directions": 4 + "name": "fill-2" }, - { - "name": "wielded-inhand-left", - "directions": 4 + { + "name": "fill-3" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left-fill-1", + "directions": 4 + }, + { + "name": "inhand-left-fill-2", + "directions": 4 }, - { - "name": "wielded-inhand-right", - "directions": 4 + { + "name": "inhand-right-fill-1", + "directions": 4 + }, + { + "name": "inhand-right-fill-2", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left-fill-1", + "directions": 4 + }, + { + "name": "wielded-inhand-left-fill-2", + "directions": 4 + }, + { + "name": "wielded-inhand-right-fill-1", + "directions": 4 + }, + { + "name": "wielded-inhand-right-fill-2", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/wielded-inhand-left-fill-1.png b/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/wielded-inhand-left-fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..997f3ae0398d3aab2bf9de11d8ba7e1ad495a62e GIT binary patch literal 153 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|f<0XvLn`LH zy}6P1fPw&vJi?#|6e*n=7ZcW4WH_dPB-X8=^nz;H+7M+n(=5-Rl|Wors-SUfgi%(P{TL^Y!*! dTHejxP{tklFT8&(L;4nwYEM@`mvv4FO#u8pM2!Fd literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/wielded-inhand-right-fill-1.png b/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/wielded-inhand-right-fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..956f9bbbd19035e10cfb628e544b645c0be7dabc GIT binary patch literal 151 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|0zF+ELn`LH zy=lnT;K0G+@aXjW=h^uSTLXE{Z83Qh6vPTt!|=h~GweHGzQwaU=h`mEJoDbPY?^_k tG)RVl;ehSFl~C0!g?voY|n;^ENcgcI*_D0XTX_GUVfQlLZ1x?zzt1W)V8{?BN zEcDc3pb%AgDrj<`WX1P$$>O06LAh>ho>+&DTSFM@*B^**Yt}<6>F8TD< hy(Qpe5;H^1Q8t~{@P5-ruOEPvdb;|#taD0e0swh>MyCJ( literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Janitorial/rag.rsi/fill-1.png b/Resources/Textures/Objects/Specific/Janitorial/rag.rsi/fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..6fb322fbdf212a7f567ac6f49be5a319b6679acb GIT binary patch literal 133 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}_MR?|ArY-_ zFKiTKP~dU8xM3M{+S!PkH!8Zq{#`FFZ~-b|Shgz5FK+uO)u)#k7yAUAJ9=)yTK2H= d`TH0i|y~EXe=> literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Janitorial/rag.rsi/fill-2.png b/Resources/Textures/Objects/Specific/Janitorial/rag.rsi/fill-2.png new file mode 100644 index 0000000000000000000000000000000000000000..7114d9a2e74ef60e00ed2786870d451fa2eea9b4 GIT binary patch literal 163 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}v7RoDArY-_ z&j)ffC6Yz{Z)v-aZ1$OXp2_{f&a4~jD=R)kPYifr$UNg5--lb?iV_n)iUPGWc)I$z JtaD0e0sv&AJiPz_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Janitorial/rag.rsi/fill-3.png b/Resources/Textures/Objects/Specific/Janitorial/rag.rsi/fill-3.png new file mode 100644 index 0000000000000000000000000000000000000000..0705b79b5086902440124793aea3a85690e2f1d2 GIT binary patch literal 173 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}>7Fi*ArY-_ zFCOGPpup4m@P?u6VMm$8mv>x#ebhNB!?Rh0>wkIoq3+H!pyD6Ko}rf}glv|)y=eQE zH_Bey9_QRhyXn7h>6@E(Zl~2