From cebb20d5355ec613d575df20d3a10fae974a2be0 Mon Sep 17 00:00:00 2001
From: Tayrtahn <tayrtahn@gmail.com>
Date: Mon, 29 Jan 2024 18:19:55 -0500
Subject: [PATCH] Add fill level visuals for water bottle in-hand sprites
 (#24708)

Fill level visuals for water bottle inhands
---
 .../Consumable/Drinks/drinks_bottles.yml      |   2 ++
 .../waterbottle.rsi/inhand-left-fill-1.png    | Bin 0 -> 158 bytes
 .../waterbottle.rsi/inhand-left-fill-2.png    | Bin 0 -> 181 bytes
 .../waterbottle.rsi/inhand-right-fill-1.png   | Bin 0 -> 169 bytes
 .../waterbottle.rsi/inhand-right-fill-2.png   | Bin 0 -> 186 bytes
 .../Drinks/waterbottle.rsi/meta.json          |  18 +++++++++++++++++-
 6 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-left-fill-1.png
 create mode 100644 Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-left-fill-2.png
 create mode 100644 Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-right-fill-1.png
 create mode 100644 Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-right-fill-2.png

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
index b90f9ffa5c..77db111195 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
@@ -526,6 +526,8 @@
   - type: SolutionContainerVisuals
     maxFillLevels: 5
     fillBaseName: icon-
+    inHandsMaxFillLevels: 2
+    inHandsFillBaseName: -fill-
 
 - type: entity
   parent: DrinkWaterBottleFull
diff --git a/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-left-fill-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..b726087730f2e7a40ea2484d7f65c6cc2b6d599d
GIT binary patch
literal 158
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|B0OCjLn`LH
zy=BPjpeW$t`04LzhXblR99czeD-_%v|MfIn&)K~csE~m{X4S<o`Qp17-wnfir``Lv
ysd<0+;-&hfi#frv3<tE0{&D<cT>n{?fx%)6<4GSigM05B!IGY?elF{r5}E*4A~R_K

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-left-fill-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..154c205bf16a7b5e2226e1c2038b55d500f91e78
GIT binary patch
literal 181
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|@;zM~Ln`LH
zy|t0I!GMRw;mE(>lm?HRZJH}yEMy97j*Zwk`BGit&Ct3?pkju)jM_Q3>umIuKF_`W
zi{oUA%6HC`l=Qg=q+}z`eqrVSip5{;@d2r1V9+}GLfJu4u(svp{^QH#9V&M*Gcd@<
Xe$WosswTZz2&BT()z4*}Q$iB}kf%P1

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-right-fill-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..1530ff913fe0440aa2a7dc9c177012afa844e114
GIT binary patch
literal 169
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|l097<Ln`LH
zy}6OMK|#bd@X^0u0|w692CSmCVP$TMI|HB0;mrG|AI||)%fMjmm211~&i!{5Lc#Br
zZu9Ov9c;K?DEQx>@8-%|nZPO-nk5pA?2Z50*!^Y9+kBXrfhUjEFj&pVu3Tn0NP(xT
KpUXO@geCwXyEI<_

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-right-fill-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..66a831d2cc0d516d39e83d5e2f5a83da64971e6c
GIT binary patch
literal 186
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|N<3X0Ln`LH
zy=BPNV8Fu~@bTaB7mQqcdzTj!t)HyGx5(+@jqeMR9|%v<lm!{l(3~0f>RXWB*S9w5
zL3*Y0zrVHl<F!O|N3iiWE@9X2ygO8$e){?GzRM|)3m6za)K2`z<KSE$(fIEC<Gbb$
e49hDR8Xko4e+k$cSN8B5NQtMbpUXO@geCyo3P-^J

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 7ad5fd0c1d..0922ee1d1a 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/meta.json
@@ -29,11 +29,27 @@
     {
       "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
     }
   ],
   "version": 1
-}
\ No newline at end of file
+}
-- 
2.52.0