From b279f5c9100485d9582ff3ba3873e87a8ab5bfc5 Mon Sep 17 00:00:00 2001
From: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com>
Date: Tue, 12 Dec 2023 02:54:15 -0500
Subject: [PATCH] Jar now fills (#22384)

* Jar

* jar rsi
---
 .../Consumable/Drinks/drinks_special.yml      |  21 ++++++++
 .../Consumable/Drinks/jar.rsi/fill1.png       | Bin 0 -> 116 bytes
 .../Consumable/Drinks/jar.rsi/fill2.png       | Bin 0 -> 141 bytes
 .../Consumable/Drinks/jar.rsi/fill3.png       | Bin 0 -> 148 bytes
 .../Consumable/Drinks/jar.rsi/fill4.png       | Bin 0 -> 177 bytes
 .../Consumable/Drinks/jar.rsi/fill5.png       | Bin 0 -> 152 bytes
 .../Consumable/Drinks/jar.rsi/fill6.png       | Bin 0 -> 153 bytes
 .../Consumable/Drinks/jar.rsi/fill7.png       | Bin 0 -> 154 bytes
 .../Consumable/Drinks/jar.rsi/fill8.png       | Bin 0 -> 154 bytes
 .../Consumable/Drinks/jar.rsi/fill9.png       | Bin 0 -> 156 bytes
 .../Consumable/Drinks/jar.rsi/icon-front.png  | Bin 0 -> 121 bytes
 .../Consumable/Drinks/jar.rsi/icon.png        | Bin 328 -> 266 bytes
 .../Consumable/Drinks/jar.rsi/meta.json       |  45 +++++++++++++++++-
 13 files changed, 65 insertions(+), 1 deletion(-)
 create mode 100644 Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill1.png
 create mode 100644 Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill2.png
 create mode 100644 Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill3.png
 create mode 100644 Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill4.png
 create mode 100644 Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill5.png
 create mode 100644 Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill6.png
 create mode 100644 Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill7.png
 create mode 100644 Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill8.png
 create mode 100644 Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill9.png
 create mode 100644 Resources/Textures/Objects/Consumable/Drinks/jar.rsi/icon-front.png

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
index 48f612702b..d63a4c6ac9 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
@@ -70,6 +70,27 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/jar.rsi
+    layers:
+      - state: icon
+        map: [ "enum.SolutionContainerLayers.Base" ]
+      - state: fill1
+        map: [ "enum.SolutionContainerLayers.Fill" ]
+        visible: false
+      - state: icon-front
+        map: [ "enum.SolutionContainerLayers.Overlay" ]
+  - type: Appearance
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 50
+  - type: SolutionContainerVisuals
+    maxFillLevels: 9
+    fillBaseName: fill
+    metamorphic: true
+    metamorphicDefaultSprite:
+      sprite: Objects/Consumable/Drinks/jar.rsi
+      state: icon
+  - type: TransformableContainer
 
 - type: entity
   parent: DrinkGlassBase
diff --git a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill1.png b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill1.png
new file mode 100644
index 0000000000000000000000000000000000000000..2b1df1297a9de472975d904a45438694644f4223
GIT binary patch
literal 116
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzYfl%)kch)?FC64#FyL?wj8*=9
zewyhmRxOW(6))<KH>gN30#*Id%kRrsAFQW2pLd0q_Fcor@(c!f%!2AXEb?xJXMhSA
NJYD@<);T3K0RY;8ApQUV

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill2.png b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill2.png
new file mode 100644
index 0000000000000000000000000000000000000000..e8cafc6f2c8dce5a87e9222d9333cacdaa5b7f39
GIT binary patch
literal 141
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ5KkA!kch)?FBx(jFyL^w$RT@_
zx#IukN`^xJ?S7oRtpQB`eI0$KWMl)?9ytHx^wN$Oi+Aiky^Sr+H9c(h&M<kC&Cln|
oTyGie9uRu?en4pA>c+=+?mpr-nkal*9jJ%F)78&qol`;+01*^38vp<R

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill3.png b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill3.png
new file mode 100644
index 0000000000000000000000000000000000000000..42ed8ab370611aad27ce2bff15ac01b8d627977e
GIT binary patch
literal 148
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJXipc%kch)?FB@_lFyL^w$RXLx
ze&X->XN*Vo-nCK<St9H8f3}l>Rz?&v1H*y)o=+#vlwJMXa`~QX2iCpt+ctBa?}}B|
xZ{E#M-c*&!GS#X7or8<cal>N*`$Rujs(ae<C%k(9;xEt|22WQ%mvv4FO#oQ$IZ6Nk

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill4.png b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill4.png
new file mode 100644
index 0000000000000000000000000000000000000000..a025896b674bd425aa4210fdd261a2550eca0437
GIT binary patch
literal 177
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ3Qrfukch*{2@<S}6GVEN0u8v@
zxGk#w9jY(-Vi<V%)48Lk|4m*!y*0|tzUb+#3!L8;W*h1<C|k~&XItH7%Ccn15{b-b
z3^CIlF&(jLdl7Ts_;L31`d?o<7f8)Yb1u?Zl<Da5-Q~yA)8cDhHnz97PfP^cafN|F
Ye5aD}{ke5gKsPXWy85}Sb4q9e0EwVP^Z)<=

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill5.png b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill5.png
new file mode 100644
index 0000000000000000000000000000000000000000..acd8a99b26f710f771a4e54fe1b90e0e6fc5c000
GIT binary patch
literal 152
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJcuyC{kch)?FB@_lFyLSf;FUbe
zT=9SNQ-(+P^5zODIcYBZ@2i+0V&Vc+%TRxO>Jr0arn}9J>((}gUYwd^Z2Nn`D!cUZ
y`^Qqgp5oAI4ZC&S`$pd%Rzbs955YvHhRb&@9^p@!8P0hbq}|ii&t;ucLK6V+ZZ*&V

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill6.png b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill6.png
new file mode 100644
index 0000000000000000000000000000000000000000..65ad0b33a6b65441cb3f5954dacffb06bcbe2502
GIT binary patch
literal 153
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ1Wy;okch)?FB@_lFyLSf(3L#O
zT=9SNQ-(+P^5!ZDE^IkeAI#zTCqab?sMw;%dit|D-?Q$Y`LUTH@}iIFnH6>`R=vM<
zcYFFOx8<yJoo2rNqVCdgO~UO+k&;UbC&RyIjMFFar#Y`H69sB#@O1TaS?83{1OW50
BIDr5F

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill7.png b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill7.png
new file mode 100644
index 0000000000000000000000000000000000000000..34d34e1586bd7866cabc141cd7edc28965ad94c8
GIT binary patch
literal 154
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJL{AsTkch)?uNZP2P~c&`;3DJ9
zH{tjEv&=1T-d^)GWbvB#&%ATRPl2f%K*j(1v}YfaxSn(G%#W=Ms~2hCG_b8+u*xpE
z{QkO=ucnHHaIM|4USE-Ei}L@*jv02If{9EGm+!<S@n?wa3z`ko&*16m=d#Wzp$Py+
Cj5xjk

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill8.png b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill8.png
new file mode 100644
index 0000000000000000000000000000000000000000..caecc33f20873c852df3087a74359fec72e746c9
GIT binary patch
literal 154
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJL{AsTkch)?uNZP2FyLSf(3L#O
zT=9SNQ-(+P^5!ZDE^IkeAI#zTCt(5yP%+=*b4x9s@4aPi{7=Ur%p{oCcoqMuSG&u;
zzn!`2Vy5HrfM-^JIRzOQqnb68rWrfB%wTwsFQ;b0pLIhyyA!CN!PC{xWt~$(69AFe
BH4p#*

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill9.png b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill9.png
new file mode 100644
index 0000000000000000000000000000000000000000..ccc78f6f15476fcd687160843a65b1c733bab9e8
GIT binary patch
literal 156
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJWKS2zkch)?uNZP2FyLSf(3L#O
zT=9Q%B|~BUcE8+7T&h$4nX?K#W_RuYD*o3uUu?(kd$-Mv>r@Y{C^Yq$y*D8Ae5ni1
z`7>ElcZN#cy%}cj#NyEKlyOJUl$q1#PwFsWJaAp+Pa}WMyV_3|fhI6`y85}Sb4q9e
E0OyZ5<^TWy

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/icon-front.png b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/icon-front.png
new file mode 100644
index 0000000000000000000000000000000000000000..be6ea7b3eb801554a0e7cb2a506f157c2263b9d4
GIT binary patch
literal 121
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz2TvErkch*{2@<S}6GVEN0u8v@
zxGk#w9jY(-Vi<V%)48Lk|4m*!y*0|tzUb+#3!L8;W`ERxtJPs-kh&yviD!S!1fW?A
Mp00i_>zopr0B^P^?f?J)

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/icon.png
index 5daac2d49b4b45e43a2ff7f31ededc94370cb637..29eda9dee94763a0d6d1a65f512477c0bf691ef7 100644
GIT binary patch
delta 239
zcmV<L01*Gk0*V5VBYyzVNkl<ZSi@sr7zLwX6bvw6Bvr%F^B4Z(leacBV5EryU=|;_
za*d%pHVUi0&c)0A+vsSK<q(Q|O^KcX4*^DEEr%IMY#Kn;gAcHf8njf6TLuOOrh(3e
zRCfTW36`o3=v=&v<lMqSZJ!^xa*h5DAU4HQJqlpHrX*)j<Y)kDWXS=~hAh-h>9~q%
ziX8y6`02}+43kO<v09SX)Bm5GtT>>xAyFZ4<jOUYYeQno1ES+AvA*fQhKdRU%mRFl
py>aIb!~DiNMut%^3Pu4D007>Ia*ce1hu{DJ002ovPDHLkV1hHkX}16X

delta 302
zcmV+}0nz@70>}c8BYy!8Nkl<Zc%1E(u?oU45QhJXnUh)Q)<H@aL2xO8uiy*#Y`%c6
zV395b!KD<3ZpA{kIy;<Gw$^yHAr8GYIsPwq|K+?SN#HVOPSq!X3E&?9=A6qyD*AN(
zdbXYw04<#61vdVoQzWZuildOYAfD+X5>gTOWt<$N2VT$C6Ms^XkczUZ?rlL<)uiuP
ztH8G&;6SiUIK*V8a6X2k0+?E472uOWtpf<DD2_s;dBM(QnXpe>n{(qY*!hDip!@yn
zWDEuvYb2eIA<F|Mr}r(Yp8>S+qiL{TuR29e*BfO30YEI(*8u;&4b!{;cN=p417igM
z;CQ~!G6)byp(hdcUY0oQw&Sg1+u?i+Cx8jy4cI`9BJr=ym;e9(07*qoM6N<$f_g`b
Aq5uE@

diff --git a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/meta.json
index db0ac608ed..ed109341de 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/meta.json
@@ -1 +1,44 @@
-{"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
+{
+    "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 transparencies by IProduceWidgets",
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon-front"
+        },
+        {
+            "name": "fill1"
+        },
+        {
+            "name": "fill2"
+        },
+        {
+            "name": "fill3"
+        },
+        {
+            "name": "fill4"
+        },
+        {
+            "name": "fill5"
+        },
+        {
+            "name": "fill6"
+        },
+        {
+            "name": "fill7"
+        },
+        {
+            "name": "fill8"
+        },
+        {
+            "name": "fill9"
+        }
+    ]
+}
\ No newline at end of file
-- 
2.51.2