adding skulls and bones that spawn in dungeons. Bones can be picked up for Thick Bone crafting item, made Bone Staff craftable. Also added assets for wall grotesques, but these do not spawn in dungeons yet

assets/common/items/crafting_ing/bone.ron

@@ -5,4 +5,4 @@ ItemDef(
         kind: "Bone",
     ),
     quality: Common,
-)
+)

assets/common/recipe_book.ron

@@ -39,4 +39,5 @@
 	"adventure hands": (("common.items.armor.hand.leather_adventurer", 1),[("common.items.crafting_ing.leather_scraps", 4)]),
 	"adventure pants": (("common.items.armor.pants.leather_adventurer", 1),[("common.items.crafting_ing.leather_scraps", 8)]),
 	"adventure shoulder": (("common.items.armor.shoulder.leather_adventurer", 1),[("common.items.crafting_ing.leather_scraps", 12)]),
+	"bone staff": (("common.items.weapons.staff.bone_staff", 1),[("common.items.crafting_ing.twigs", 8),("common.items.crafting_ing.bone", 5),("common.items.crafting_ing.leather_scraps", 1),("common.items.ore.veloritefrag", 6)]),
 }

assets/voxygen/item_image_manifest.ron

@@ -1459,6 +1459,9 @@
     Ingredient("EmptyVial"): VoxTrans(
         "voxel.object.potion_empty",
         (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8,
+    ),
+        Ingredient("Bone"): Png(
+            "element.icons.item_bone",
     ),
     // Gliders
     Glider("Starter"): VoxTrans(

assets/voxygen/voxel/sprite_manifest.ron

@@ -2023,6 +2023,68 @@ FireBowlGround: Some((
 ],
     wind_sway: 0.0,
 )),
+// Skulls
+Skulls: Some((
+    variations: [
+        (
+            model: "voxygen.voxel.sprite.bones.skull-1",
+            offset: (-5.5, -5.5, 0.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.bones.skull-2",
+            offset: (-5.5, -5.5, 0.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.bones.skull-3",
+            offset: (-5.5, -5.5, 0.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+        ],
+    wind_sway: 0.0,
+)),
+// Bones
+Bones: Some((
+    variations: [
+        (
+            model: "voxygen.voxel.sprite.bones.spine-1",
+            offset: (-3.5, -3.5, 0.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.bones.spine-2",
+            offset: (-3.5, -3.5, 0.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.bones.ribs-1",
+            offset: (-3.5, -3.5, 0.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.bones.ribs-2",
+            offset: (-3.5, -3.5, 0.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.bones.femur-1",
+            offset: (-3.5, -3.5, 0.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.bones.femur-2",
+            offset: (-3.5, -3.5, 0.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.bones.femur-3",
+            offset: (-3.5, -3.5, 0.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+        ],
+    wind_sway: 0.0,
+)),
 // Underwater Grass
 GrassBlue: Some((
     variations: [

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

@@ -358,6 +358,7 @@ impl Item {
             SpriteKind::MediumGrass => "common.items.grasses.medium",
             SpriteKind::ShortGrass => "common.items.grasses.short",
             SpriteKind::Coconut => "common.items.food.coconut",
+            SpriteKind::Bones => "common.items.crafting_ing.bone",
             SpriteKind::Chest => {
                 chosen = Lottery::<String>::load_expect(match rng.gen_range(0, 7) {
                     0 => "common.loot_tables.loot_table_weapon_uncommon",

common/src/terrain/sprite.rs

@@ -110,6 +110,8 @@ make_case_elim!(
         Mud = 0x53,
         FireBowlGround = 0x54,
         CaveMushroom = 0x55,
+        Skulls = 0x56,
+        Bones = 0x57,
     }
 );
 
@@ -129,6 +131,7 @@ impl SpriteKind {
             SpriteKind::Carrot => 0.18,
             SpriteKind::Radish => 0.18,
             SpriteKind::FireBowlGround => 0.55,
+            SpriteKind::Skulls => 0.65,
             // TODO: Uncomment this when we have a way to open doors
             // SpriteKind::Door => 3.0,
             SpriteKind::Bed => 1.54,
@@ -200,6 +203,7 @@ impl SpriteKind {
             SpriteKind::PotionMinor => true,
             SpriteKind::ChestBurried => true,
             SpriteKind::Mud => true,
+            SpriteKind::Bones => true,
             _ => false,
         }
     }
@@ -240,6 +244,7 @@ impl SpriteKind {
                 | SpriteKind::PotionMinor
                 | SpriteKind::VialEmpty
                 | SpriteKind::FireBowlGround
+                | SpriteKind::Skulls
         )
     }
 }

world/src/site/dungeon/mod.rs

@@ -1139,6 +1139,8 @@ impl Floor {
                         2 => SpriteKind::Velorite,
                         3..=8 => SpriteKind::Mushroom,
                         9..=15 => SpriteKind::FireBowlGround,
+                        16..=19 => SpriteKind::Skulls,
+                        20..=24 => SpriteKind::Bones,
                         _ => SpriteKind::ShortGrass,
                     },
                 ),