From c7831a8ca983be90267155f04bb759b633ce02b8 Mon Sep 17 00:00:00 2001 From: flo666 Date: Wed, 3 May 2023 01:18:04 +0200 Subject: [PATCH] loot_tables yeti&elder , change drum to wildskin_drum, add map icons, yeti attacks buff --- .../common/abilities/ability_set_manifest.ron | 6 +++--- .../abilities/custom/yeti/frostbreath.ron | 2 +- .../abilities/custom/yeti/icespikes.ron | 2 +- .../common/abilities/custom/yeti/snowball.ron | 2 +- .../common/abilities/custom/yeti/strike.ron | 2 +- .../music/{drum.ron => wildskin_drum.ron} | 0 assets/common/entity/dungeon/adlet/elder.ron | 2 +- .../{drum.ron => wildskin_drum.ron} | 8 ++++---- .../loot_tables/dungeon/tier-1/boss.ron | 5 ++--- .../loot_tables/dungeon/tier-1/elder.ron | 4 +++- .../dungeon/tier-1/elder_extra.ron | 9 +++++++++ assets/server/manifests/kits.ron | 2 +- assets/voxygen/audio/sfx.ron | 20 +++++++++---------- .../wildskin_drum_a.ogg} | 0 .../wildskin_drum_b.ogg} | 0 .../wildskin_drum_c.ogg} | 0 .../wildskin_drum_c1.ogg} | 0 .../wildskin_drum_d.ogg} | 0 .../wildskin_drum_e.ogg} | 0 .../wildskin_drum_f.ogg} | 0 .../wildskin_drum_g.ogg} | 0 .../voxygen/element/ui/map/buttons/adlet.png | 4 ++-- .../element/ui/map/buttons/adlet_bg.png | 4 ++-- .../element/ui/map/buttons/adlet_hover.png | 4 ++-- assets/voxygen/i18n/en/hud/subtitles.ftl | 2 +- assets/voxygen/item_image_manifest.ron | 4 ++-- .../voxygen/voxel/biped_weapon_manifest.ron | 4 ++-- assets/voxygen/voxel/item_drop_manifest.ron | 2 +- assets/voxygen/voxel/weapon/tool/drum.vox | 3 --- .../voxel/weapon/tool/wildskin_drum.vox | 3 +++ voxygen/anim/src/character/music.rs | 2 +- voxygen/anim/src/character/wield.rs | 2 +- voxygen/src/hud/util.rs | 2 +- 33 files changed, 55 insertions(+), 45 deletions(-) rename assets/common/abilities/music/{drum.ron => wildskin_drum.ron} (100%) rename assets/common/items/tool/instruments/{drum.ron => wildskin_drum.ron} (70%) create mode 100644 assets/common/loot_tables/dungeon/tier-1/elder_extra.ron rename assets/voxygen/audio/sfx/instrument/{drum/drum_a.ogg => wildskin_drum/wildskin_drum_a.ogg} (100%) rename assets/voxygen/audio/sfx/instrument/{drum/drum_b.ogg => wildskin_drum/wildskin_drum_b.ogg} (100%) rename assets/voxygen/audio/sfx/instrument/{drum/drum_c.ogg => wildskin_drum/wildskin_drum_c.ogg} (100%) rename assets/voxygen/audio/sfx/instrument/{drum/drum_c1.ogg => wildskin_drum/wildskin_drum_c1.ogg} (100%) rename assets/voxygen/audio/sfx/instrument/{drum/drum_d.ogg => wildskin_drum/wildskin_drum_d.ogg} (100%) rename assets/voxygen/audio/sfx/instrument/{drum/drum_e.ogg => wildskin_drum/wildskin_drum_e.ogg} (100%) rename assets/voxygen/audio/sfx/instrument/{drum/drum_f.ogg => wildskin_drum/wildskin_drum_f.ogg} (100%) rename assets/voxygen/audio/sfx/instrument/{drum/drum_g.ogg => wildskin_drum/wildskin_drum_g.ogg} (100%) delete mode 100644 assets/voxygen/voxel/weapon/tool/drum.vox create mode 100644 assets/voxygen/voxel/weapon/tool/wildskin_drum.vox diff --git a/assets/common/abilities/ability_set_manifest.ron b/assets/common/abilities/ability_set_manifest.ron index 547553edec..263094e734 100644 --- a/assets/common/abilities/ability_set_manifest.ron +++ b/assets/common/abilities/ability_set_manifest.ron @@ -698,9 +698,9 @@ secondary: Simple(None, "common.abilities.music.lyre"), abilities: [], ), - Custom("Drum"): ( - primary: Simple(None, "common.abilities.music.drum"), - secondary: Simple(None, "common.abilities.music.drum"), + Custom("WildskinDrum"): ( + primary: Simple(None, "common.abilities.music.wildskin_drum"), + secondary: Simple(None, "common.abilities.music.wildskin_drum"), abilities: [], ), Custom("IcyTalharpa"): ( diff --git a/assets/common/abilities/custom/yeti/frostbreath.ron b/assets/common/abilities/custom/yeti/frostbreath.ron index 0574864e5f..25abaef325 100644 --- a/assets/common/abilities/custom/yeti/frostbreath.ron +++ b/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, diff --git a/assets/common/abilities/custom/yeti/icespikes.ron b/assets/common/abilities/custom/yeti/icespikes.ron index a1452397b4..11baff03c9 100644 --- a/assets/common/abilities/custom/yeti/icespikes.ron +++ b/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, diff --git a/assets/common/abilities/custom/yeti/snowball.ron b/assets/common/abilities/custom/yeti/snowball.ron index ca97b55794..a23735dba2 100644 --- a/assets/common/abilities/custom/yeti/snowball.ron +++ b/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, ), diff --git a/assets/common/abilities/custom/yeti/strike.ron b/assets/common/abilities/custom/yeti/strike.ron index ef4792e52f..911bb6f07d 100644 --- a/assets/common/abilities/custom/yeti/strike.ron +++ b/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, diff --git a/assets/common/abilities/music/drum.ron b/assets/common/abilities/music/wildskin_drum.ron similarity index 100% rename from assets/common/abilities/music/drum.ron rename to assets/common/abilities/music/wildskin_drum.ron diff --git a/assets/common/entity/dungeon/adlet/elder.ron b/assets/common/entity/dungeon/adlet/elder.ron index 0802f29a00..c88884ae00 100644 --- a/assets/common/entity/dungeon/adlet/elder.ron +++ b/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, ), diff --git a/assets/common/items/tool/instruments/drum.ron b/assets/common/items/tool/instruments/wildskin_drum.ron similarity index 70% rename from assets/common/items/tool/instruments/drum.ron rename to assets/common/items/tool/instruments/wildskin_drum.ron index baad181d8c..4bd3dfbcc2 100644 --- a/assets/common/items/tool/instruments/drum.ron +++ b/assets/common/items/tool/instruments/wildskin_drum.ron @@ -1,6 +1,6 @@ ItemDef( - name: "Drum", - description: "Primitive drum.", + name: "Wildskin 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")), ) \ No newline at end of file diff --git a/assets/common/loot_tables/dungeon/tier-1/boss.ron b/assets/common/loot_tables/dungeon/tier-1/boss.ron index 966172be3d..a07296fcfc 100644 --- a/assets/common/loot_tables/dungeon/tier-1/boss.ron +++ b/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")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/dungeon/tier-1/elder.ron b/assets/common/loot_tables/dungeon/tier-1/elder.ron index feb1531f84..e84bc8e7d6 100644 --- a/assets/common/loot_tables/dungeon/tier-1/elder.ron +++ b/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")), + ] \ No newline at end of file diff --git a/assets/common/loot_tables/dungeon/tier-1/elder_extra.ron b/assets/common/loot_tables/dungeon/tier-1/elder_extra.ron new file mode 100644 index 0000000000..414283ba42 --- /dev/null +++ b/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")), +] \ No newline at end of file diff --git a/assets/server/manifests/kits.ron b/assets/server/manifests/kits.ron index 7ce758129a..4bedef0acd 100644 --- a/assets/server/manifests/kits.ron +++ b/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), ], }) diff --git a/assets/voxygen/audio/sfx.ron b/assets/voxygen/audio/sfx.ron index 4cd379d40c..a97129db14 100644 --- a/assets/voxygen/audio/sfx.ron +++ b/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.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", + "voxygen.audio.sfx.instrument.wildskin_drum.wildskin_drum_c", + "voxygen.audio.sfx.instrument.wildskin_drum.wildskin_drum_d", + "voxygen.audio.sfx.instrument.wildskin_drum.wildskin_drum_e", + "voxygen.audio.sfx.instrument.wildskin_drum.wildskin_drum_f", + "voxygen.audio.sfx.instrument.wildskin_drum.wildskin_drum_g", + "voxygen.audio.sfx.instrument.wildskin_drum.wildskin_drum_a", + "voxygen.audio.sfx.instrument.wildskin_drum.wildskin_drum_b", + "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: [ diff --git a/assets/voxygen/audio/sfx/instrument/drum/drum_a.ogg b/assets/voxygen/audio/sfx/instrument/wildskin_drum/wildskin_drum_a.ogg similarity index 100% rename from assets/voxygen/audio/sfx/instrument/drum/drum_a.ogg rename to assets/voxygen/audio/sfx/instrument/wildskin_drum/wildskin_drum_a.ogg diff --git a/assets/voxygen/audio/sfx/instrument/drum/drum_b.ogg b/assets/voxygen/audio/sfx/instrument/wildskin_drum/wildskin_drum_b.ogg similarity index 100% rename from assets/voxygen/audio/sfx/instrument/drum/drum_b.ogg rename to assets/voxygen/audio/sfx/instrument/wildskin_drum/wildskin_drum_b.ogg diff --git a/assets/voxygen/audio/sfx/instrument/drum/drum_c.ogg b/assets/voxygen/audio/sfx/instrument/wildskin_drum/wildskin_drum_c.ogg similarity index 100% rename from assets/voxygen/audio/sfx/instrument/drum/drum_c.ogg rename to assets/voxygen/audio/sfx/instrument/wildskin_drum/wildskin_drum_c.ogg diff --git a/assets/voxygen/audio/sfx/instrument/drum/drum_c1.ogg b/assets/voxygen/audio/sfx/instrument/wildskin_drum/wildskin_drum_c1.ogg similarity index 100% rename from assets/voxygen/audio/sfx/instrument/drum/drum_c1.ogg rename to assets/voxygen/audio/sfx/instrument/wildskin_drum/wildskin_drum_c1.ogg diff --git a/assets/voxygen/audio/sfx/instrument/drum/drum_d.ogg b/assets/voxygen/audio/sfx/instrument/wildskin_drum/wildskin_drum_d.ogg similarity index 100% rename from assets/voxygen/audio/sfx/instrument/drum/drum_d.ogg rename to assets/voxygen/audio/sfx/instrument/wildskin_drum/wildskin_drum_d.ogg diff --git a/assets/voxygen/audio/sfx/instrument/drum/drum_e.ogg b/assets/voxygen/audio/sfx/instrument/wildskin_drum/wildskin_drum_e.ogg similarity index 100% rename from assets/voxygen/audio/sfx/instrument/drum/drum_e.ogg rename to assets/voxygen/audio/sfx/instrument/wildskin_drum/wildskin_drum_e.ogg diff --git a/assets/voxygen/audio/sfx/instrument/drum/drum_f.ogg b/assets/voxygen/audio/sfx/instrument/wildskin_drum/wildskin_drum_f.ogg similarity index 100% rename from assets/voxygen/audio/sfx/instrument/drum/drum_f.ogg rename to assets/voxygen/audio/sfx/instrument/wildskin_drum/wildskin_drum_f.ogg diff --git a/assets/voxygen/audio/sfx/instrument/drum/drum_g.ogg b/assets/voxygen/audio/sfx/instrument/wildskin_drum/wildskin_drum_g.ogg similarity index 100% rename from assets/voxygen/audio/sfx/instrument/drum/drum_g.ogg rename to assets/voxygen/audio/sfx/instrument/wildskin_drum/wildskin_drum_g.ogg diff --git a/assets/voxygen/element/ui/map/buttons/adlet.png b/assets/voxygen/element/ui/map/buttons/adlet.png index df6d06ab0b..008fb734af 100644 --- a/assets/voxygen/element/ui/map/buttons/adlet.png +++ b/assets/voxygen/element/ui/map/buttons/adlet.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a38a3d9d487f491c1dd9f548ac925abb82767b2b9a679405dc3fa240dced10e2 -size 10475 +oid sha256:0150ada3a06879253b193c6d5e1887750966e5bc673604b2394cf1938d48b989 +size 3328 diff --git a/assets/voxygen/element/ui/map/buttons/adlet_bg.png b/assets/voxygen/element/ui/map/buttons/adlet_bg.png index 798da26aad..000c24bd30 100644 --- a/assets/voxygen/element/ui/map/buttons/adlet_bg.png +++ b/assets/voxygen/element/ui/map/buttons/adlet_bg.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:88e0efb6af9050b880651c9c858fb827c9a805d95b2ce93379bb1a8ff396c2ac -size 2880 +oid sha256:93dc70e4dd1249a44b68501aa42a3f7f10b4674f728f71de9578598900f0837a +size 4958 diff --git a/assets/voxygen/element/ui/map/buttons/adlet_hover.png b/assets/voxygen/element/ui/map/buttons/adlet_hover.png index cd7b9aa693..76789fa4dd 100644 --- a/assets/voxygen/element/ui/map/buttons/adlet_hover.png +++ b/assets/voxygen/element/ui/map/buttons/adlet_hover.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f06c8ba6af09babdcfb960d75a384f5aab8e03f1079de3708ed98f74dfd06ef0 -size 3301 +oid sha256:32f0d38c254a58c50f87589c54aca5e147a6addb5343c3c57f2f64a593c3832b +size 18114 diff --git a/assets/voxygen/i18n/en/hud/subtitles.ftl b/assets/voxygen/i18n/en/hud/subtitles.ftl index e8251e6860..8d12305a3c 100644 --- a/assets/voxygen/i18n/en/hud/subtitles.ftl +++ b/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 diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index 6a0c366681..40dd2f6f69 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/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( - "voxel.weapon.tool.drum", + Simple("common.items.tool.instruments.wildskin_drum"): VoxTrans( + "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( diff --git a/assets/voxygen/voxel/biped_weapon_manifest.ron b/assets/voxygen/voxel/biped_weapon_manifest.ron index 8d6aee735b..f49c3b2acd 100644 --- a/assets/voxygen/voxel/biped_weapon_manifest.ron +++ b/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"): ( - vox_spec: ("weapon.tool.drum", (-4.5, -6.0, 8.0)), + Tool("common.items.tool.instruments.wildskin_drum"): ( + vox_spec: ("weapon.tool.wildskin_drum", (-4.5, -8.0, 8.0)), color: None ), Tool("common.items.tool.instruments.icy_talharpa"): ( diff --git a/assets/voxygen/voxel/item_drop_manifest.ron b/assets/voxygen/voxel/item_drop_manifest.ron index 06c7bd6e86..09c0f7cead 100644 --- a/assets/voxygen/voxel/item_drop_manifest.ron +++ b/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", diff --git a/assets/voxygen/voxel/weapon/tool/drum.vox b/assets/voxygen/voxel/weapon/tool/drum.vox deleted file mode 100644 index 9958319b98..0000000000 --- a/assets/voxygen/voxel/weapon/tool/drum.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f3f1855ce0cbc0d93841d9b8bf8c8728764b44de4239e3190e893fbedcb9a049 -size 1548 diff --git a/assets/voxygen/voxel/weapon/tool/wildskin_drum.vox b/assets/voxygen/voxel/weapon/tool/wildskin_drum.vox new file mode 100644 index 0000000000..eb3d6236dc --- /dev/null +++ b/assets/voxygen/voxel/weapon/tool/wildskin_drum.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1c3b5626549f5557d9e6419778d1c980460600371910d8fcd274afd6a2a328f6 +size 1772 diff --git a/voxygen/anim/src/character/music.rs b/voxygen/anim/src/character/music.rs index e2b66853aa..84cfdc3f78 100644 --- a/voxygen/anim/src/character/music.rs +++ b/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, diff --git a/voxygen/anim/src/character/wield.rs b/voxygen/anim/src/character/wield.rs index 57a5c8d912..7863d3a424 100644 --- a/voxygen/anim/src/character/wield.rs +++ b/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( diff --git a/voxygen/src/hud/util.rs b/voxygen/src/hud/util.rs index 17c5c93bd4..f444e4b23a 100644 --- a/voxygen/src/hud/util.rs +++ b/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,