From 6931848f1d875b22a1529e0868bff72f5dde663d Mon Sep 17 00:00:00 2001 From: themias <89101928+themias@users.noreply.github.com> Date: Thu, 18 Jan 2024 16:55:05 -0500 Subject: [PATCH] Add fill visuals and inhand sprites to water bottle (#24240) * Add fill visuals and inhand sprites to water bottle * adjust sprite --- .../Consumable/Drinks/drinks_bottles.yml | 23 +++++----- .../Drinks/waterbottle.rsi/icon-1.png | Bin 0 -> 170 bytes .../Drinks/waterbottle.rsi/icon-2.png | Bin 0 -> 215 bytes .../Drinks/waterbottle.rsi/icon-3.png | Bin 0 -> 246 bytes .../Drinks/waterbottle.rsi/icon-4.png | Bin 0 -> 280 bytes .../Drinks/waterbottle.rsi/icon-5.png | Bin 0 -> 318 bytes .../Drinks/waterbottle.rsi/icon.png | Bin 406 -> 382 bytes .../Drinks/waterbottle.rsi/inhand-left.png | Bin 0 -> 387 bytes .../Drinks/waterbottle.rsi/inhand-right.png | Bin 0 -> 425 bytes .../Drinks/waterbottle.rsi/meta.json | 40 +++++++++++++++++- 10 files changed, 52 insertions(+), 11 deletions(-) create mode 100644 Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon-1.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon-2.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon-3.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon-4.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon-5.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-right.png diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml index 7837ae4e76..6c0c719c7a 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml @@ -497,9 +497,18 @@ - type: Drink - type: Sprite sprite: Objects/Consumable/Drinks/waterbottle.rsi - -- type: entity - parent: DrinkBottlePlasticBaseFull + layers: + - state: icon + - state: icon-1 + map: ["enum.SolutionContainerLayers.Fill"] + visible: false + - type: Appearance + - type: SolutionContainerVisuals + maxFillLevels: 5 + fillBaseName: icon- + +- type: entity + parent: DrinkWaterBottleFull id: DrinkSodaWaterBottleFull name: soda water bottle description: Like water, but angry! @@ -511,12 +520,9 @@ reagents: - ReagentId: SodaWater Quantity: 150 - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/waterbottle.rsi - type: entity - parent: DrinkBottlePlasticBaseFull + parent: DrinkWaterBottleFull id: DrinkTonicWaterBottleFull name: tonic water bottle description: Like soda water, but angrier maybe? Often sweeter. @@ -528,9 +534,6 @@ reagents: - ReagentId: TonicWater Quantity: 150 - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/waterbottle.rsi # Cartons, TODO: this needs to be moved elsewhere eventually, since cartons shouldnt smash into glass shards diff --git a/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon-1.png new file mode 100644 index 0000000000000000000000000000000000000000..520e2ef51786c916bbdd202685d1e914f22d7981 GIT binary patch literal 170 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}DV{ElArY-_ z&nfaX7>F=ma1ziExzku&+@Pu<`h*q-t5kt1F1b?z@F``!`}5Cnpsi&WR_@o+PC zGmcZ4zTwj5tCe0m#g=?NcHtXCL&?1pTPv2;usZ^ThU2H2b@qRVKu{@Q|U%o$z Qf%Y+Yy85}Sb4q9e00jR$%K!iX literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon-2.png b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon-2.png new file mode 100644 index 0000000000000000000000000000000000000000..11e9421b770bc34cf16933accf2546c772538cbc GIT binary patch literal 215 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}6FprVLn2y} z6C_v{Cy4Yk1sZU<9n_FuW#*AMd2vg|-DCfy%C2c7ne)k}c5r`EziA^@B%`3Ic1%H2 zp+V_epihs?Vu=|iE`IrQRhum?Ev@ajyq$r~{|}6Z>b`dAuul+Wy8rKQQpLxA+RXC8 z?94!Lxchs&1H(3JWy{qShhl(^WAJqKb6Mw< G&;$S@>`Gh! literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon-3.png new file mode 100644 index 0000000000000000000000000000000000000000..475c272afcab30528c5c39d6dbf46bca827f23d1 GIT binary patch literal 246 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}8$4YcLn2z= zUNGc322(EtZJ$Gi3_$8i s?Bn$gR&!a8AKv%>OayO>K>d40mSctt|5x?a0^QEw>FVdQ&MBb@07sTyHUIzs literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon-4.png b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon-4.png new file mode 100644 index 0000000000000000000000000000000000000000..d14515fe61b4e5eb1dc3b4a123790036b81c5b62 GIT binary patch literal 280 zcmV+z0q6dSP)Px#(n&-?R9J=W)WHgZKoADt-|Wz(5Gegb+e7xPCyVG^Mafd?{$3rXSg1yTfX^Fgh7v>NuF$Hm>(O0AOgEC>)2=iZ?)%BsgZ- z`wp;Q0eb^e%lgQ;8({wfL(@d06e6Xb=Pox;wKd{gW7Hb}0ODMuYU}O>n2#rhw^`G7 e#+pC~@%J986P)Px#_(?=TR9J=WltF63Koo|*n3Qy55!8SOsCWTEaFZJpdH}EKt_%gCv==B{c9Rga ziG~q1j^m=xqB|dwjq|N$ewd$+2XDaPa5!!qPx449MHPg0I35A;F?-`~zxCoczPPI) z5vYRD_6LuY#!wo=a6F<4LM!PK30xDAK$2wu=+y?j+K}e@FLTs_QtE15f#lKm&(gln z=O@|c>x{|s)5U8o66i${{dSwu7yz2S&oYW6RWgAj%lKL>{_h~(0`UZTt=35%*=-fkCJ1sh6oe&qM|ehvVis0=!dM3R-U7 QLjV8(07*qoM6N<$f=9oKS^xk5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon.png index 43f809403377102d1d703f173e31e3666dc1125b..cf51fc855297f081ece4e3dca93f07acb1ce7727 100644 GIT binary patch delta 356 zcmV-q0h|7o1O5V#BYyw^b5ch_0Itp)=>Px$I7vi7R9J=Wlrc-gP!Pv|6^ATp2h$={ zT>1e7Da9?_ic5!l1aWY4)6p@b6dbaNyU^g0%}jO>w1`t2T+*SpyZD2UKG?N>X}2EuBzHC-f-U0joMA z8Ru-X0YEa&v8uE31f1Agm5bp(zUKxi2?m4Vzw-gOEOjYAt1wIe0000%ropJ}2N^Z(~5bndfym!fY zp2uIVxj)@K17v^vRrc{O0 z05{U&gZdf{;D9n>_CCUa9|BMd1hqim2jV+76~J!v#_G}~3(tM_j0^I2SGfD<(ty-m z&~D%G^m4++`Ypp@lS-veueU7?$jST>ndVsxJ4tkn=N;yz2I#(i#+z1sBKP1t(kbVq z5UG!#YUpg~C3T!6wg6%1$PT2`fPo*Pg(Hede4pf6<@|I2RYT`PFa65NRzPYFSU@ox zQ4B{|pfm?kS3oO_@dLpMivak6Kr4&^xg(Hj!_)A6V)h^D%hGKqbsej0_;bzPWt0K_ a9pDSX*l#14^k={T0000Px$JxN4CRCt{2+M!B=Q5eSY=M%#g94iI|!-7}f4VLpjNAJCHuJHz3*ISx38Mh$? zNo(ebiTU>fFkRIUf-c^sQIbwKw=(BkB{Km400000002OG7P|vwGtBz|KW*L}ILONV z@g)5&`*{C_EuY!wJBMq-Kfd^{GZ}@KGhN9{Q*i$} zL(-t|9b@TCNrQ)+)@wT|W^*&ldHbfyYo(8~AP@vH+A+qiELFRa!*UTA O_6(k`elF{r5}E)2*|N3( literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/meta.json index db0ac608ed..7ad5fd0c1d 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/meta.json @@ -1 +1,39 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]} \ No newline at end of file +{ + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", + "license": "CC-BY-SA-3.0", + "size": + { + "x": 32, + "y": 32 + }, + "states": + [ + { + "name": "icon" + }, + { + "name": "icon-1" + }, + { + "name": "icon-2" + }, + { + "name": "icon-3" + }, + { + "name": "icon-4" + }, + { + "name": "icon-5" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ], + "version": 1 +} \ No newline at end of file -- 2.51.2