Merge branch 'Sarrakitty/RotsysItemSprites' into 'master'

Sarrakitty/rotsys item sprites

See merge request veloren/veloren!1695

assets/common/items/crafting_ing/bowl.ron

@@ -0,0 +1,8 @@
+ItemDef(
+    name: "Bowl",
+    description: "a simple bowl for preparing meals.",
+    kind: Ingredient(
+        kind: "Bowl",
+    ),
+    quality: Common,
+)

assets/common/items/food/fish.ron

@@ -0,0 +1,21 @@
+ItemDef(
+    name: "Fish",
+    description: "Restores 10 Health over 20 seconds\n\nA fresh seafood steak, chopped from a fish.",
+    kind: Consumable(
+        kind: "Fish",
+        effect: [
+            Buff((
+                kind: Saturation,
+                data: (
+                    strength: 5.0,
+                    duration: Some((
+                            secs: 10,
+                            nanos: 0,
+                        )),
+                    ),
+                cat_ids: [Natural],
+            )),
+        ]
+    ),
+    quality: Common,
+)

assets/common/loot_tables/loot_table_fish.ron

@@ -0,0 +1,3 @@
+[     
+    (1, "common.items.food.fish"),
+]

assets/common/loot_tables/loot_table_food.ron

@@ -4,6 +4,9 @@
     (3, "common.items.food.apple"),
     (3, "common.items.food.mushroom"),
     (1, "common.items.food.coconut"),
+    (1, "common.items.food.lettuce"),
+    (1, "common.items.food.tomato"),
+    (2, "common.items.food.carrot"),
     // crafted
     (0.05, "common.items.food.apple_mushroom_curry"),
     (0.10, "common.items.food.apple_stick"),

assets/common/loot_tables/loot_table_villager.ron

@@ -1,5 +1,6 @@
 [    
     // Crafting Ingredients
+    (2, "common.items.crafting_ing.bowl"),
     (1, "common.items.crafting_ing.empty_vial"),
     (0.10, "common.items.crafting_ing.shiny_gem"),
     (1, "common.items.crafting_ing.cloth_scraps"),   
@@ -21,6 +22,9 @@
     (0.05, "common.items.utility.collar"),
     // Food
     (0.5, "common.items.food.coconut"),
+    (0.5, "common.items.food.lettuce"),
+    (0.75, "common.items.food.carrot"),
+    (0.75, "common.items.food.tomato"),
     (0.05, "common.items.food.apple_mushroom_curry"),
     (0.10, "common.items.food.apple_stick"),
     (0.10, "common.items.food.mushroom_stick"),

assets/common/recipe_book.ron

@@ -119,6 +119,21 @@
             ("common.items.crafting_tools.mortar_pestle", 0),
         ],
     ),
+    "salad_plain": (
+        ("common.items.food.plainsalad", 1),
+        [
+            ("common.items.food.lettuce", 1),
+            ("common.items.crafting_ing.bowl", 1),
+        ],
+    ),
+    "salad_tomato": (
+        ("common.items.food.tomatosalad", 1),
+        [
+            ("common.items.food.lettuce", 1),
+            ("common.items.food.tomato", 2),
+            ("common.items.crafting_ing.bowl", 1),
+        ],
+    ),
     "apples_stick": (
         ("common.items.food.apple_stick", 1),
         [("common.items.crafting_ing.twigs", 2), ("common.items.food.apple", 2)],

assets/voxygen/audio/sfx.ron

@@ -1,6 +1,6 @@
 (
     {
-        // 
+        //
         // Ambient
         //
         Campfire: (
@@ -153,7 +153,7 @@
             ],
             threshold: 0.5,
         ),
-        //Glide: ( 
+        //Glide: (
         //    files: [
         //        // Event Missing or not implemented?
         //    ],
@@ -565,6 +565,24 @@
             ],
             threshold: 0.3,
         ),
+        Inventory(Consumed("Tomato")): (
+            files: [
+                "voxygen.audio.sfx.inventory.consumable.food",
+            ],
+            threshold: 0.3,
+        ),
+        Inventory(Consumed("Fish")): (
+            files: [
+                "voxygen.audio.sfx.inventory.consumable.food",
+            ],
+            threshold: 0.3,
+        ),
+        Inventory(Consumed("Carrot")): (
+            files: [
+                "voxygen.audio.sfx.inventory.consumable.food",
+            ],
+            threshold: 0.3,
+        ),
         Inventory(Consumed("Velorite")): (
             files: [
                 "voxygen.audio.sfx.inventory.consumable.food",

assets/voxygen/item_image_manifest.ron

@@ -1459,6 +1459,30 @@
     Consumable("SunflowerTea"): Png(
         "element.icons.item_sunflower_tea",
     ),
+    Consumable("Carrot"): VoxTrans(
+        "voxel.sprite.carrot.carrot",
+        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
+    ),
+    Consumable("Tomato"): VoxTrans(
+        "voxel.sprite.tomato.tomato",
+        (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8,
+    ),
+    Consumable("Lettuce"): VoxTrans(
+        "voxel.sprite.cabbage.cabbage",
+        (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8,
+    ),
+    Consumable("Fish"): VoxTrans(
+        "voxel.sprite.food.meat_fish",
+        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
+    ),
+    Consumable("PlainSalad"): VoxTrans(
+        "voxel.sprite.food.salad_plain",
+        (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8,
+    ),
+    Consumable("TomatoSalad"): VoxTrans(
+        "voxel.sprite.food.salad_tomato",
+        (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8,
+    ),
     // Throwables
     Throwable(Bomb): VoxTrans(
         "voxel.object.bomb",
@@ -1529,6 +1553,14 @@
         "voxel.sprite.twigs.twigs-0",
         (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
     ),
+    Ingredient("AnimalPelt"): VoxTrans(
+        "voxel.sprite.crafting_ing.pelt",
+        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
+    ),
+    Ingredient("Claw"): VoxTrans(
+        "voxel.sprite.crafting_ing.claw",
+        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
+    ),
     Ingredient("Honey"): Png(
         "element.icons.item_honey",
     ),
@@ -1554,6 +1586,18 @@
         "voxel.object.potion_empty",
         (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8,
     ),
+    Ingredient("Bowl"): VoxTrans(
+        "voxel.sprite.crafting_ing.bowl",
+        (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8,
+    ),
+    Ingredient("Oil"): VoxTrans(
+        "voxel.sprite.crafting_ing.oil",
+        (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8,
+    ),
+    Ingredient("ViscousOoze"): VoxTrans(
+        "voxel.sprite.crafting_ing.ooze",
+        (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8,
+    ),
     // Gliders
     Glider("Starter"): VoxTrans(
         "voxel.glider.glider_starter",

assets/voxygen/voxel/sprite_manifest.ron

@@ -2001,6 +2001,17 @@ VialEmpty: Some((
     ],
     wind_sway: 0.0,
 )),
+// Bowls
+Bowl: Some((
+    variations: [
+        (
+            model: "voxygen.voxel.sprite.crafting_ing.bowl",
+            offset: (-5.5, -5.5, 0.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+    ],
+    wind_sway: 0.0,
+)),
 // Minor Potion
 PotionMinor: Some((
     variations: [

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

@@ -537,6 +537,7 @@ impl Item {
             SpriteKind::Twigs => "common.items.crafting_ing.twigs",
             SpriteKind::ShinyGem => "common.items.crafting_ing.shiny_gem",
             SpriteKind::VialEmpty => "common.items.crafting_ing.empty_vial",
+            SpriteKind::Bowl => "common.items.crafting_ing.bowl",
             SpriteKind::PotionMinor => "common.items.consumable.potion_minor",
             _ => return None,
         }))

common/src/terrain/sprite.rs

@@ -110,6 +110,7 @@ make_case_elim!(
         Mud = 0x53,
         FireBowlGround = 0x54,
         CaveMushroom = 0x55,
+        Bowl = 0x56,
     }
 );
 
@@ -198,6 +199,7 @@ impl SpriteKind {
             SpriteKind::Beehive => true,
             SpriteKind::VialEmpty => true,
             SpriteKind::PotionMinor => true,
+            SpriteKind::Bowl => true,
             SpriteKind::ChestBurried => true,
             SpriteKind::Mud => true,
             _ => false,
@@ -238,6 +240,7 @@ impl SpriteKind {
                 | SpriteKind::Door
                 | SpriteKind::Beehive
                 | SpriteKind::PotionMinor
+                | SpriteKind::Bowl
                 | SpriteKind::VialEmpty
                 | SpriteKind::FireBowlGround
         )

server/src/events/entity_manipulation.rs

@@ -343,6 +343,8 @@ pub fn handle_destroy(server: &mut Server, entity: EcsEntity, cause: HealthSourc
                     0 => "common.loot_tables.loot_table_food",
                     _ => "common.loot_tables.loot_table",
                 },
+                Some(common::comp::Body::FishMedium(_)) => "common.loot_tables.loot_table_fish",
+                Some(common::comp::Body::FishSmall(_)) => "common.loot_tables.loot_table_fish",
                 Some(common::comp::Body::BipedLarge(biped_large)) => match biped_large.species {
                     biped_large::Species::Wendigo => match rng.gen_range(0, 7) {
                         0 => "common.loot_tables.loot_table_food",

world/src/site/settlement/building/archetype/house.rs

@@ -561,7 +561,13 @@ impl Archetype for House {
                                     SpriteKind::VialEmpty
                                 }
                             },
-                            _ => SpriteKind::Pot,
+                            _ => {
+                                if dynamic_rng.gen_range(0, 2) == 0 {
+                                    SpriteKind::Bowl
+                                } else {
+                                    SpriteKind::Pot
+                                }
+                            },
                         };
 
                         return BlockMask::new(