Add fill visuals and inhand sprites to water bottle (#24240)

* Add fill visuals and inhand sprites to water bottle

* adjust sprite

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
index 7837ae4e76105c7cc0f45ff3a3e830c184b7946f..6c0c719c7ac2707c1a5a6e5aa20fd82821d0e270 100644 (file)
--- 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 (file)
index 0000000..520e2ef
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon-1.png differ

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

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

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

diff --git a/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon-5.png b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon-5.png
new file mode 100644 (file)
index 0000000..ae700bd
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon-5.png differ

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

diff --git a/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..8ce789d
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..bf8dcba
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-right.png differ

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