add more loot

assets/common/abilities/ability_set_manifest.ron

@@ -698,6 +698,11 @@
         secondary: Simple(None, "common.abilities.music.lyre"),
         abilities: [],
     ),
+    Custom("Drum"): (
+        primary: Simple(None, "common.abilities.music.drum"),
+        secondary: Simple(None, "common.abilities.music.drum"),
+        abilities: [],
+    ),
     Custom("IcyTalharpa"): (
         primary: Simple(None, "common.abilities.music.icy_talharpa"),
         secondary: Simple(None, "common.abilities.music.icy_talharpa"),

assets/common/abilities/music/drum.ron

@@ -0,0 +1,4 @@
+Music(
+    play_duration: 0.4,
+    ori_modifier: 1.0,
+)

assets/common/items/armor/misc/head/bear_bonnet.ron

@@ -0,0 +1,14 @@
+ItemDef(
+    name: "Bear Bonnet",
+    description: "Wearing the guise of a ferocious bear, its fury becomes your own.",
+    kind: Armor((
+        kind: Head,
+        stats: Direct((
+            protection: Some(Normal(12.0)),
+            crit_power: Some(0.0095),
+            stealth: Some(0.21),
+        )),
+    )),
+    quality: Epic,
+    tags: [],
+)

assets/common/items/armor/misc/head/howl_cowl.ron

@@ -0,0 +1,14 @@
+ItemDef(
+    name: "Howl Cowl",
+    description: "Wearing the guise of a fearsome wolf befits a fearsome hunter.",
+    kind: Armor((
+        kind: Head,
+        stats: Direct((
+            protection: Some(Normal(4.0)),
+            crit_power: Some(0.065),
+            stealth: Some(0.21),
+        )),
+    )),
+    quality: Epic,
+    tags: [],
+)

assets/common/items/tool/instruments/drum.ron

@@ -0,0 +1,21 @@
+ItemDef(
+    name: "Drum",
+    description: "Primitive drum.",
+    kind: Tool((
+        kind: Instrument,
+        hands: Two,
+        stats: (
+            equip_time_secs: 0.4,
+            power: 0.0,
+            effect_power: 1.0,
+            speed: 1.0,
+            crit_chance: 0.0,
+            range: 0.0,
+            energy_efficiency: 1.0,
+            buff_strength: 1.0,
+        ),
+    )),
+    quality: Common,
+    tags: [Utility],
+    ability_spec: Some(Custom("Drum")),
+)

assets/common/loot_tables/dungeon/tier-1/boss.ron

@@ -5,4 +5,6 @@
     (4.0, LootTable("common.loot_tables.armor.tier-2")),
     // Misc
     (2.0, Item("common.items.armor.misc.neck.pendant_of_protection")),
+    (1.0, Item("common.items.armor.misc.head.bear_bonnet")),
+    (1.0, Item("common.items.armor.misc.head.howl_cowl")),
 ]

assets/common/loot_tables/dungeon/tier-1/chest.ron

@@ -6,6 +6,7 @@
     // Currency
     (3.0, MultiDrop(Item("common.items.utility.coins"), 20, 50)),
     // Materials
+    (2.0, MultiDrop(Item(""common.items.mineral.ore.veloritefrag", 3, 10)),
     (1.0, MultiDrop(Item("common.items.crafting_ing.cloth.wool"), 3, 10)),
     (1.0, MultiDrop(Item("common.items.crafting_ing.leather.thick_leather"), 3, 10)),
     (1.0, MultiDrop(Item("common.items.mineral.ingot.iron"), 3, 10)),

assets/common/loot_tables/dungeon/tier-3/chest.ron

@@ -10,6 +10,7 @@
     (1.0, MultiDrop(Item("common.items.crafting_ing.hide.carapace"), 2, 6)),
     (1.0, MultiDrop(Item("common.items.mineral.ingot.cobalt"), 2, 6)),
     (1.0, MultiDrop(Item("common.items.log.ironwood"), 3, 7)),
+    (2.0, MultiDrop(Item("common.items.mineral.ore.velorite", 3, 10)),
     // Consumables
     (2.0, LootTable("common.loot_tables.consumable.moderate")),
 ]

assets/server/manifests/kits.ron

@@ -401,5 +401,6 @@
         (Item("common.items.tool.instruments.melodica"),1),
         (Item("common.items.tool.instruments.sitar"),1),
         (Item("common.items.tool.instruments.washboard"),1),
+        (Item("common.items.tool.instruments.drum"),1),
     ],
 })

assets/voxygen/audio/sfx.ron

@@ -871,6 +871,20 @@
             threshold: 0.5,
             subtitle: "subtitle-instrument_washboard",
         ),
+        Music(Instrument, Custom("Drum")): (
+            files: [
+            "voxygen.audio.sfx.instrument.drum.drum_c",
+            "voxygen.audio.sfx.instrument.drum.drum_d",
+            "voxygen.audio.sfx.instrument.drum.drum_e",
+            "voxygen.audio.sfx.instrument.drum.drum_f",
+            "voxygen.audio.sfx.instrument.drum.drum_g",
+            "voxygen.audio.sfx.instrument.drum.drum_a",
+            "voxygen.audio.sfx.instrument.drum.drum_b",
+            "voxygen.audio.sfx.instrument.drum.drum_c1",
+            ],
+            threshold: 0.5,
+            subtitle: "subtitle-instrument_drum",
+        ),
         Inventory(CollectedTool(Instrument)): (
             files: [
             "voxygen.audio.sfx.inventory.add_item",

assets/voxygen/i18n/en/hud/subtitles.ftl

@@ -80,6 +80,7 @@ subtitle-instrument_sitar = Sitar playing
 subtitle-instrument_guitar = Guitar playing
 subtitle-instrument_dark_guitar = Dark Guitar playing
 subtitle-instrument_washboard = Washboard playing
+subtitle-instrument_drum = Drum playing
 subtitle-pickup_instrument = Pickup instrument
 
 subtitle-explosion = Explosion

assets/voxygen/item_image_manifest.ron

@@ -1626,6 +1626,10 @@
         "voxel.weapon.tool.wooden_lyre",
         (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0,
     ),
+    Simple("common.items.tool.instruments.drum"): VoxTrans(
+        "voxel.weapon.tool.drum",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0,
+    ),
     Simple("common.items.tool.instruments.icy_talharpa"): VoxTrans(
         "voxel.weapon.tool.icy_talharpa",
         (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0,
@@ -2859,6 +2863,14 @@
         "voxel.armor.misc.head.hog_hood",
         (0.0, 2.0, -0.0), (-110.0, 210.0,15.0), 1.4,
     ),
+    Simple("common.items.armor.misc.head.howl_cowl"): VoxTrans(
+        "voxel.armor.misc.head.howl_cowl",
+        (0.0, 2.0, -0.0), (-110.0, 210.0,15.0), 1.4,
+    ),
+    Simple("common.items.armor.misc.head.bear_bonnet"): VoxTrans(
+        "voxel.armor.misc.head.bear_bonnet",
+        (0.0, 2.0, -0.0), (-110.0, 210.0,15.0), 1.4,
+    ),
     Simple("common.items.armor.misc.head.bamboo_twig"): VoxTrans(
         "voxel.armor.misc.head.bamboo_twig",
         (2.5, 4.5, 0.0), (-120.0, -240.0,1.0), 2.3,

assets/voxygen/voxel/biped_weapon_manifest.ron

@@ -1124,6 +1124,10 @@
         vox_spec: ("weapon.tool.wooden_lyre", (-3.5, -7.0, 6.0)),
         color: None
     ),
+    Tool("common.items.tool.instruments.drum"): (
+        vox_spec: ("weapon.tool.drum", (-4.5, -6.0, 8.0)),
+        color: None
+    ),
     Tool("common.items.tool.instruments.icy_talharpa"): (
         vox_spec: ("weapon.tool.icy_talharpa", (-3.5, -7.0, 6.0)),
         color: None

assets/voxygen/voxel/humanoid_armor_head_manifest.ron

@@ -125,6 +125,104 @@
         (Orc, Female, "common.items.armor.misc.head.hog_hood"): (
             vox_spec: ("armor.misc.head.hog_hood", (-3.0, -6.0, -8.0)),
             color: None
+        ),
+//
+        (Human, Male, "common.items.armor.misc.head.howl_cowl"): (
+            vox_spec: ("armor.misc.head.howl_cowl", (-4.0, -5, -8.0)),
+            color: None
+        ),
+        (Human, Female, "common.items.armor.misc.head.howl_cowl"): (
+            vox_spec: ("armor.misc.head.howl_cowl", (-4.0, -4, -8.0)),
+            color: None
+        ),
+        (Elf, Male, "common.items.armor.misc.head.howl_cowl"): (
+            vox_spec: ("armor.misc.head.howl_cowl", (-3.0, -5.0, -8.0)),
+            color: None
+        ),
+        (Elf, Female, "common.items.armor.misc.head.howl_cowl"): (
+            vox_spec: ("armor.misc.head.howl_cowl", (-3.0, -5.0, -8.0)),
+            color: None
+        ),
+        (Dwarf, Male, "common.items.armor.misc.head.howl_cowl"): (
+            vox_spec: ("armor.misc.head.howl_cowl", (-5.0, -4.0, -8)),
+            color: None
+        ),
+        (Dwarf, Female, "common.items.armor.misc.head.howl_cowl"): (
+            vox_spec: ("armor.misc.head.howl_cowl", (-5.0, -4.0, -8.0)),
+            color: None
+        ),
+        (Danari, Male, "common.items.armor.misc.head.howl_cowl"): (
+            vox_spec: ("armor.misc.head.howl_cowl", (-2.0, -5, -6)),
+            color: None
+        ),
+        (Danari, Female, "common.items.armor.misc.head.howl_cowl"): (
+            vox_spec: ("armor.misc.head.howl_cowl", (-2.0, -5, -6)),
+            color: None
+        ),
+        (Draugr, Male, "common.items.armor.misc.head.howl_cowl"): (
+            vox_spec: ("armor.misc.head.howl_cowl", (-6.0, -5.0, -7.0)),
+            color: None
+        ),
+        (Draugr, Female, "common.items.armor.misc.head.howl_cowl"): (
+            vox_spec: ("armor.misc.head.howl_cowl", (-6.0, -5.0, -8.0)),
+            color: None
+        ),
+        (Orc, Male, "common.items.armor.misc.head.howl_cowl"): (
+            vox_spec: ("armor.misc.head.howl_cowl", (-3.0, -4.0, -6.0)),
+            color: None
+        ),
+        (Orc, Female, "common.items.armor.misc.head.howl_cowl"): (
+            vox_spec: ("armor.misc.head.howl_cowl", (-3.0, -6.0, -8.0)),
+            color: None
+        ),
+//
+        (Human, Male, "common.items.armor.misc.head.bear_bonnet"): (
+            vox_spec: ("armor.misc.head.bear_bonnet", (-4.0, -5, -8.0)),
+            color: None
+        ),
+        (Human, Female, "common.items.armor.misc.head.bear_bonnet"): (
+            vox_spec: ("armor.misc.head.bear_bonnet", (-4.0, -4, -8.0)),
+            color: None
+        ),
+        (Elf, Male, "common.items.armor.misc.head.bear_bonnet"): (
+            vox_spec: ("armor.misc.head.bear_bonnet", (-3.0, -5.0, -8.0)),
+            color: None
+        ),
+        (Elf, Female, "common.items.armor.misc.head.bear_bonnet"): (
+            vox_spec: ("armor.misc.head.bear_bonnet", (-3.0, -5.0, -8.0)),
+            color: None
+        ),
+        (Dwarf, Male, "common.items.armor.misc.head.bear_bonnet"): (
+            vox_spec: ("armor.misc.head.bear_bonnet", (-5.0, -4.0, -8)),
+            color: None
+        ),
+        (Dwarf, Female, "common.items.armor.misc.head.bear_bonnet"): (
+            vox_spec: ("armor.misc.head.bear_bonnet", (-5.0, -4.0, -8.0)),
+            color: None
+        ),
+        (Danari, Male, "common.items.armor.misc.head.bear_bonnet"): (
+            vox_spec: ("armor.misc.head.bear_bonnet", (-2.0, -5, -6)),
+            color: None
+        ),
+        (Danari, Female, "common.items.armor.misc.head.bear_bonnet"): (
+            vox_spec: ("armor.misc.head.bear_bonnet", (-2.0, -5, -6)),
+            color: None
+        ),
+        (Draugr, Male, "common.items.armor.misc.head.bear_bonnet"): (
+            vox_spec: ("armor.misc.head.bear_bonnet", (-6.0, -5.0, -7.0)),
+            color: None
+        ),
+        (Draugr, Female, "common.items.armor.misc.head.bear_bonnet"): (
+            vox_spec: ("armor.misc.head.bear_bonnet", (-6.0, -5.0, -8.0)),
+            color: None
+        ),
+        (Orc, Male, "common.items.armor.misc.head.bear_bonnet"): (
+            vox_spec: ("armor.misc.head.bear_bonnet", (-3.0, -4.0, -6.0)),
+            color: None
+        ),
+        (Orc, Female, "common.items.armor.misc.head.bear_bonnet"): (
+            vox_spec: ("armor.misc.head.bear_bonnet", (-3.0, -6.0, -8.0)),
+            color: None
         ),
 		 //
         (Danari, Male, "common.items.armor.misc.head.bamboo_twig"): (

assets/voxygen/voxel/item_drop_manifest.ron

@@ -402,6 +402,7 @@
     Simple("common.items.tool.instruments.flute"): "voxel.weapon.tool.wooden_flute",
     Simple("common.items.tool.instruments.glass_flute"): "voxel.weapon.tool.glass_flute",
     Simple("common.items.tool.instruments.lyre"): "voxel.weapon.tool.wooden_lyre",
+    Simple("common.items.tool.instruments.drum"): "voxel.weapon.tool.drum",
     Simple("common.items.tool.instruments.icy_talharpa"): "voxel.weapon.tool.icy_talharpa",
     Simple("common.items.tool.instruments.washboard"): "voxel.weapon.tool.washboard",
     Simple("common.items.tool.instruments.kalimba"): "voxel.weapon.tool.wooden_kalimba",
@@ -720,6 +721,8 @@
     //Hats
     Simple("common.items.armor.witch.hat"): "voxel.armor.witch.hat",
     Simple("common.items.armor.misc.head.hog_hood"): "voxel.armor.misc.head.hog_hood",
+    Simple("common.items.armor.misc.head.howl_cowl"): "voxel.armor.misc.head.howl_cowl",
+    Simple("common.items.armor.misc.head.bear_bonnet"): "voxel.armor.misc.head.bear_bonnet",
     Simple("common.items.armor.misc.head.bamboo_twig"): "voxel.armor.misc.head.bamboo_twig",
     Simple("common.items.armor.pirate.hat"): "voxel.armor.pirate.hat",
     Simple("common.items.armor.misc.head.bandana.thief"): "voxel.armor.misc.head.bandana.thief",

voxygen/anim/src/character/music.rs

@@ -194,6 +194,7 @@ impl Animation for MusicAnimation {
                             * Quaternion::rotation_z(PI / -3.0);
                     },
                     Some("common.abilities.music.lyre")
+                    | Some("common.abilities.music.drum")
                     | Some("common.abilities.music.icy_talharpa") => {
                         next.hand_l.position = Vec3::new(
                             3.0 - s_a.hand.0,

voxygen/anim/src/character/wield.rs

@@ -308,7 +308,7 @@ impl Animation for WieldAnimation {
                 Some(ToolKind::Instrument) => {
                     if let Some(AbilitySpec::Custom(spec)) = active_tool_spec {
                         match spec.as_str() {
-                            "Lyre" | "IcyTalharpa" => {
+                            "Lyre" | "IcyTalharpa" | "Drum" => {
                                 if speed < 0.5 {
                                     next.head.orientation = Quaternion::rotation_z(head_look.x)
                                         * Quaternion::rotation_x(

voxygen/src/hud/util.rs

@@ -505,6 +505,7 @@ pub fn ability_image(imgs: &img_ids::Imgs, ability_id: &str) -> image::Id {
         "common.abilities.music.double_bass" => imgs.instrument,
         "common.abilities.music.glass_flute" => imgs.instrument,
         "common.abilities.music.lyre" => imgs.instrument,
+        "common.abilities.music.drum" => imgs.instrument,
         "common.abilities.music.icy_talharpa" => imgs.instrument,
         "common.abilities.music.washboard" => imgs.instrument,
         _ => imgs.not_found,

world/src/site2/plot/adlet.rs

@@ -480,7 +480,7 @@ impl Structure for AdletStronghold {
                 0..=8 => Block::air(SpriteKind::Bones),
                 9..=19 => Block::air(SpriteKind::GlowIceCrystal),
                 20..=28 => Block::air(SpriteKind::IceCrystal),
-                29..=30 => Block::air(SpriteKind::DungeonChest2),
+                29..=30 => Block::air(SpriteKind::DungeonChest3),
                 _ => Block::new(BlockKind::Air, Rgb::new(0, 0, 0)),
             })
         }));