loot_tables yeti&elder ,

change drum to wildskin_drum,
add map icons,
yeti attacks buff

assets/common/abilities/ability_set_manifest.ron

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

assets/common/abilities/custom/yeti/frostbreath.ron

@@ -2,7 +2,7 @@ BasicBeam(
     buildup_duration: 1.2,
     recover_duration: 0.5,
     beam_duration: 0.5,
-    damage: 1.5,
+    damage: 1.7,
     tick_rate: 5.0,
     range: 15.0,
     max_angle: 30.0,

assets/common/abilities/custom/yeti/icespikes.ron

@@ -3,7 +3,7 @@ Shockwave(
     buildup_duration: 0.9,
     swing_duration: 0.15,
     recover_duration: 2.0,
-    damage: 15.0,
+    damage: 18.0,
     poise_damage: 10,
     knockback: (strength: 18.0, direction: Up),
     shockwave_angle: 90.0,

assets/common/abilities/custom/yeti/snowball.ron

@@ -3,7 +3,7 @@ BasicRanged(
     buildup_duration: 0.75,
     recover_duration: 1.8,
     projectile: Snowball(
-        damage: 30.0,
+        damage: 35.0,
         radius: 5.0,
         min_falloff: 0.7,
     ),

assets/common/abilities/custom/yeti/strike.ron

@@ -5,7 +5,7 @@ BasicMelee(
     recover_duration: 2.0,
     melee_constructor: (
         kind: Bash(
-            damage: 10.0,
+            damage: 18.0,
             poise: 50.0,
             knockback: 50.0,
             energy_regen: 0.0,

assets/common/entity/dungeon/adlet/elder.ron

@@ -3,7 +3,7 @@
     name: Automatic,
     body: RandomWith("adlet_elder"),
     alignment: Alignment(Enemy),
-    loot: LootTable("common.loot_tables.dungeon.tier-1.elder"),
+    loot: MultiDrop(LootTable("common.loot_tables.dungeon.tier-1.elder"), 2, 2),
     inventory: (
         loadout: FromBody,
     ),

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

@@ -1,6 +1,6 @@
 ItemDef(
-    name: "Drum",
+    name: "Wildskin Drum",
-    description: "Primitive drum.",
+    description: "one, two, you know what to do!",
     kind: Tool((
         kind: Instrument,
         hands: Two,
@@ -15,7 +15,7 @@ ItemDef(
             buff_strength: 1.0,
         ),
     )),
-    quality: Common,
+    quality: Legendary,
     tags: [Utility],
-    ability_spec: Some(Custom("Drum")),
+    ability_spec: Some(Custom("WildskinDrum")),
 )

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

@@ -1,10 +1,9 @@
 [
     // Weapons
-    (4.0, LootTable("common.loot_tables.weapons.tier-2")),
+    (4.0, LootTable("common.loot_tables.weapons.tier-3")),
     // Armor
-    (4.0, LootTable("common.loot_tables.armor.tier-2")),
+    (4.0, LootTable("common.loot_tables.armor.tier-3")),
     // 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/elder.ron

@@ -1,4 +1,6 @@
 [
     // Misc
-    (1.0, Item("common.items.keys.bone_key")),
+    (5.0, Item("common.items.keys.bone_key")),
+    (1.0, LootTable("common.loot_tables.dungeon.tier-1.elder_extra")),
+
 ]

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

@@ -0,0 +1,9 @@
+[
+    // Weapons
+    (4.0, LootTable("common.loot_tables.weapons.tier-2")),
+    // Armor
+    (4.0, LootTable("common.loot_tables.armor.tier-2")),
+    // Misc
+    (2.0, Item("common.items.armor.misc.neck.pendant_of_protection")),
+    (0.5, Item("common.items.tool.instruments.wildskin_drum")),
+]

assets/server/manifests/kits.ron

@@ -401,6 +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),
+        (Item("common.items.tool.instruments.wildskin_drum"),1),
     ],
 })

assets/voxygen/audio/sfx.ron

@@ -871,19 +871,19 @@
             threshold: 0.5,
             subtitle: "subtitle-instrument_washboard",
         ),
-        Music(Instrument, Custom("Drum")): (
+        Music(Instrument, Custom("WildskinDrum")): (
             files: [
-            "voxygen.audio.sfx.instrument.drum.drum_c",
+            "voxygen.audio.sfx.instrument.wildskin_drum.wildskin_drum_c",
-            "voxygen.audio.sfx.instrument.drum.drum_d",
+            "voxygen.audio.sfx.instrument.wildskin_drum.wildskin_drum_d",
-            "voxygen.audio.sfx.instrument.drum.drum_e",
+            "voxygen.audio.sfx.instrument.wildskin_drum.wildskin_drum_e",
-            "voxygen.audio.sfx.instrument.drum.drum_f",
+            "voxygen.audio.sfx.instrument.wildskin_drum.wildskin_drum_f",
-            "voxygen.audio.sfx.instrument.drum.drum_g",
+            "voxygen.audio.sfx.instrument.wildskin_drum.wildskin_drum_g",
-            "voxygen.audio.sfx.instrument.drum.drum_a",
+            "voxygen.audio.sfx.instrument.wildskin_drum.wildskin_drum_a",
-            "voxygen.audio.sfx.instrument.drum.drum_b",
+            "voxygen.audio.sfx.instrument.wildskin_drum.wildskin_drum_b",
-            "voxygen.audio.sfx.instrument.drum.drum_c1",
+            "voxygen.audio.sfx.instrument.wildskin_drum.wildskin_drum_c1",
             ],
             threshold: 0.5,
-            subtitle: "subtitle-instrument_drum",
+            subtitle: "subtitle-instrument_wildskin_drum",
         ),
         Inventory(CollectedTool(Instrument)): (
             files: [

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

@@ -80,7 +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-instrument_wildskin_drum = Wildskin Drum playing
 subtitle-pickup_instrument = Pickup instrument
 
 subtitle-explosion = Explosion

assets/voxygen/item_image_manifest.ron

@@ -1626,8 +1626,8 @@
         "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(
+    Simple("common.items.tool.instruments.wildskin_drum"): VoxTrans(
-        "voxel.weapon.tool.drum",
+        "voxel.weapon.tool.wildskin_drum",
         (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0,
     ),
     Simple("common.items.tool.instruments.icy_talharpa"): VoxTrans(

assets/voxygen/voxel/biped_weapon_manifest.ron

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

assets/voxygen/voxel/item_drop_manifest.ron

@@ -402,7 +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.wildskin_drum"): "voxel.weapon.tool.wildskin_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",

voxygen/anim/src/character/music.rs

@@ -194,7 +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.wildskin_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" | "Drum" => {
+                            "Lyre" | "IcyTalharpa" | "WildskinDrum" => {
                                 if speed < 0.5 {
                                     next.head.orientation = Quaternion::rotation_z(head_look.x)
                                         * Quaternion::rotation_x(

voxygen/src/hud/util.rs

@@ -505,7 +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.wildskin_drum" => imgs.instrument,
         "common.abilities.music.icy_talharpa" => imgs.instrument,
         "common.abilities.music.washboard" => imgs.instrument,
         _ => imgs.not_found,