Merge branch 'pfau/cactus_drink' into 'master'

Cactus Colada

See merge request veloren/veloren!2431

assets/common/items/crafting_ing/cactus.ron

@@ -0,0 +1,9 @@
+ItemDef(
+    name: "Cactus",
+    description: "Grows in warm and dry places.",
+    kind: Ingredient(
+        kind: "Cactus",
+    ),
+    quality: Common,
+    tags: [],
+)

assets/common/items/food/cactus_colada.ron

@@ -0,0 +1,22 @@
+ItemDef(
+    name: "Cactus Colada",
+    description: "Giving you that special prickle.",
+    kind: Consumable(
+        kind: "CactusColada",
+        effect: [
+            Buff((
+                kind: Saturation,
+                data: (
+                    strength: 25.0,
+                    duration: Some((
+                            secs: 15,
+                            nanos: 0,
+                        )),
+                    ),
+                cat_ids: [Natural],
+            )),
+        ]
+    ),
+    quality: Moderate,
+    tags: [Food],
+)

assets/common/loot_tables/food/prepared.ron

@@ -6,4 +6,5 @@
     (1.2, Item("common.items.food.plainsalad")),
     (0.5, Item("common.items.food.sunflower_icetea")),
     (1.0, Item("common.items.food.tomatosalad")),
+    (1.4, Item("common.items.food.cactus_colada")),
 ]

assets/common/recipe_book.ron

@@ -49,6 +49,14 @@
         ],
         craft_sprite: Some(Cauldron),
     ),
+    "cactus_colada": (
+        output: ("common.items.food.cactus_colada", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.empty_vial"), 1),
+            (Item("common.items.crafting_ing.cactus"), 8),
+        ],
+        craft_sprite: Some(Cauldron),
+    ),
     "collar_basic": (
         output: ("common.items.utility.collar", 1),
         inputs: [

assets/voxygen/item_image_manifest.ron

@@ -2272,6 +2272,10 @@
     Consumable("Coconut"): Png(
         "element.items.item_coconut",
     ),
+    Consumable("CactusColada"): VoxTrans(
+        "voxel.object.cactus_drink",
+        (-1.0, 1.0, 0.0), (-50.0, 30.0, 20.0), 0.8,
+    ),
     Consumable("PotionMed"): VoxTrans(
         "voxel.object.potion_red",
         (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.7,
@@ -2448,6 +2452,10 @@
         "voxel.sprite.rocks.rock-0",
         (0.0, 0.0, 0.0), (-50.0, 40.0, 20.0), 0.8,
     ),
+    Ingredient("Cactus"): VoxTrans(
+        "voxel.sprite.cacti.flat_cactus_med",
+        (0.0, 0.0, 0.0), (-50.0, 40.0, 20.0), 0.9,
+    ),
     Ingredient("Seashells"): VoxTrans(
         "voxel.sprite.seashells.shell-0",
         (0.0, 0.0, 0.0), (-50.0, 40.0, 20.0), 0.8,

common/src/comp/inventory/item/mod.rs

@@ -851,6 +851,9 @@ impl Item {
             SpriteKind::Pyrebloom => "common.items.flowers.pyrebloom",
             SpriteKind::WildFlax => "common.items.flowers.wild_flax",
             SpriteKind::Seashells => "common.items.crafting_ing.seashells",
+            SpriteKind::RoundCactus => "common.items.crafting_ing.cactus",
+            SpriteKind::ShortFlatCactus => "common.items.crafting_ing.cactus",
+            SpriteKind::MedFlatCactus => "common.items.crafting_ing.cactus",
             // Containers
             // IMPORTANT: Add any new container to `SpriteKind::is_container`
             container

common/src/terrain/sprite.rs

@@ -298,6 +298,9 @@ impl SpriteKind {
             SpriteKind::Moonbell => true,
             SpriteKind::Pyrebloom => true,
             SpriteKind::WildFlax => true,
+            SpriteKind::RoundCactus => true,
+            SpriteKind::ShortFlatCactus => true,
+            SpriteKind::MedFlatCactus => true,
             _ => false,
         }
     }