Jar now fills (#22384)

* Jar

* jar rsi

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
index 48f612702b87a892aa555af8a3879e490bbbdcdb..d63a4c6ac9e34add2adf69b13fc6561c233c51cc 100644 (file)
--- 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 (file)
index 0000000..2b1df12
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill1.png differ

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 (file)
index 0000000..e8cafc6
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill2.png differ

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 (file)
index 0000000..42ed8ab
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill3.png differ

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 (file)
index 0000000..a025896
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill4.png differ

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 (file)
index 0000000..acd8a99
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill5.png differ

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 (file)
index 0000000..65ad0b3
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill6.png differ

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 (file)
index 0000000..34d34e1
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill7.png differ

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 (file)
index 0000000..caecc33
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill8.png differ

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 (file)
index 0000000..ccc78f6
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/fill9.png differ

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 (file)
index 0000000..be6ea7b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/icon-front.png differ

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 (file)
Binary files a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/icon.png differ

diff --git a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/meta.json
index db0ac608ed068f887d184f45e9acd83fba0a3976..ed109341de520eab85d5253d23150b1815c2805b 100644 (file)
--- 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