From 7739aaff78862beea04d6ebed7e1fedc9b878d0b Mon Sep 17 00:00:00 2001 From: flo666 Date: Thu, 20 Apr 2023 14:00:34 +0200 Subject: [PATCH] add more loot --- .../common/abilities/ability_set_manifest.ron | 5 + assets/common/abilities/music/drum.ron | 4 + .../items/armor/misc/head/bear_bonnet.ron | 14 +++ .../items/armor/misc/head/howl_cowl.ron | 14 +++ assets/common/items/tool/instruments/drum.ron | 21 ++++ .../loot_tables/dungeon/tier-1/boss.ron | 2 + .../loot_tables/dungeon/tier-1/chest.ron | 1 + .../loot_tables/dungeon/tier-3/chest.ron | 1 + assets/server/manifests/kits.ron | 1 + assets/voxygen/audio/sfx.ron | 14 +++ .../audio/sfx/instrument/drum/drum_a.ogg | 3 + .../audio/sfx/instrument/drum/drum_b.ogg | 3 + .../audio/sfx/instrument/drum/drum_c.ogg | 3 + .../audio/sfx/instrument/drum/drum_c1.ogg | 3 + .../audio/sfx/instrument/drum/drum_d.ogg | 3 + .../audio/sfx/instrument/drum/drum_e.ogg | 3 + .../audio/sfx/instrument/drum/drum_f.ogg | 3 + .../audio/sfx/instrument/drum/drum_g.ogg | 3 + assets/voxygen/i18n/en/hud/subtitles.ftl | 1 + assets/voxygen/item_image_manifest.ron | 12 +++ .../voxel/armor/misc/head/bear_bonnet.vox | 3 + .../voxel/armor/misc/head/hog_hood.vox | 4 +- .../voxel/armor/misc/head/howl_cowl.vox | 3 + .../voxygen/voxel/biped_weapon_manifest.ron | 4 + .../voxel/humanoid_armor_head_manifest.ron | 98 +++++++++++++++++++ assets/voxygen/voxel/item_drop_manifest.ron | 3 + assets/voxygen/voxel/weapon/tool/drum.vox | 3 + voxygen/anim/src/character/music.rs | 1 + voxygen/anim/src/character/wield.rs | 2 +- voxygen/src/hud/util.rs | 1 + world/src/site2/plot/adlet.rs | 2 +- 31 files changed, 234 insertions(+), 4 deletions(-) create mode 100644 assets/common/abilities/music/drum.ron create mode 100644 assets/common/items/armor/misc/head/bear_bonnet.ron create mode 100644 assets/common/items/armor/misc/head/howl_cowl.ron create mode 100644 assets/common/items/tool/instruments/drum.ron create mode 100644 assets/voxygen/audio/sfx/instrument/drum/drum_a.ogg create mode 100644 assets/voxygen/audio/sfx/instrument/drum/drum_b.ogg create mode 100644 assets/voxygen/audio/sfx/instrument/drum/drum_c.ogg create mode 100644 assets/voxygen/audio/sfx/instrument/drum/drum_c1.ogg create mode 100644 assets/voxygen/audio/sfx/instrument/drum/drum_d.ogg create mode 100644 assets/voxygen/audio/sfx/instrument/drum/drum_e.ogg create mode 100644 assets/voxygen/audio/sfx/instrument/drum/drum_f.ogg create mode 100644 assets/voxygen/audio/sfx/instrument/drum/drum_g.ogg create mode 100644 assets/voxygen/voxel/armor/misc/head/bear_bonnet.vox create mode 100644 assets/voxygen/voxel/armor/misc/head/howl_cowl.vox create mode 100644 assets/voxygen/voxel/weapon/tool/drum.vox diff --git a/assets/common/abilities/ability_set_manifest.ron b/assets/common/abilities/ability_set_manifest.ron index bfd5ef7cd4..547553edec 100644 --- a/assets/common/abilities/ability_set_manifest.ron +++ b/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"), diff --git a/assets/common/abilities/music/drum.ron b/assets/common/abilities/music/drum.ron new file mode 100644 index 0000000000..18f0a9b200 --- /dev/null +++ b/assets/common/abilities/music/drum.ron @@ -0,0 +1,4 @@ +Music( + play_duration: 0.4, + ori_modifier: 1.0, +) \ No newline at end of file diff --git a/assets/common/items/armor/misc/head/bear_bonnet.ron b/assets/common/items/armor/misc/head/bear_bonnet.ron new file mode 100644 index 0000000000..c1c1ffc2a4 --- /dev/null +++ b/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: [], +) diff --git a/assets/common/items/armor/misc/head/howl_cowl.ron b/assets/common/items/armor/misc/head/howl_cowl.ron new file mode 100644 index 0000000000..bd5cd34afb --- /dev/null +++ b/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: [], +) diff --git a/assets/common/items/tool/instruments/drum.ron b/assets/common/items/tool/instruments/drum.ron new file mode 100644 index 0000000000..baad181d8c --- /dev/null +++ b/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")), +) \ 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 07d279f000..966172be3d 100644 --- a/assets/common/loot_tables/dungeon/tier-1/boss.ron +++ b/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")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/dungeon/tier-1/chest.ron b/assets/common/loot_tables/dungeon/tier-1/chest.ron index a0e5d20283..4b686afd45 100644 --- a/assets/common/loot_tables/dungeon/tier-1/chest.ron +++ b/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)), diff --git a/assets/common/loot_tables/dungeon/tier-3/chest.ron b/assets/common/loot_tables/dungeon/tier-3/chest.ron index 544f723012..e4a0fc9fe0 100644 --- a/assets/common/loot_tables/dungeon/tier-3/chest.ron +++ b/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")), ] diff --git a/assets/server/manifests/kits.ron b/assets/server/manifests/kits.ron index e1719de679..7ce758129a 100644 --- a/assets/server/manifests/kits.ron +++ b/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), ], }) diff --git a/assets/voxygen/audio/sfx.ron b/assets/voxygen/audio/sfx.ron index 7d1fadb5fc..4cd379d40c 100644 --- a/assets/voxygen/audio/sfx.ron +++ b/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", diff --git a/assets/voxygen/audio/sfx/instrument/drum/drum_a.ogg b/assets/voxygen/audio/sfx/instrument/drum/drum_a.ogg new file mode 100644 index 0000000000..4753f8e2f6 --- /dev/null +++ b/assets/voxygen/audio/sfx/instrument/drum/drum_a.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f57ed7d32dd21317967928b4ae5201aaf84520b45c1b17213c6d08fc1c2048f6 +size 26664 diff --git a/assets/voxygen/audio/sfx/instrument/drum/drum_b.ogg b/assets/voxygen/audio/sfx/instrument/drum/drum_b.ogg new file mode 100644 index 0000000000..b75a459528 --- /dev/null +++ b/assets/voxygen/audio/sfx/instrument/drum/drum_b.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:20e9fd6af3a3ccb9f63ab1a35a65ca2bb919e8d23839ded680ca51b2a7fa8329 +size 25761 diff --git a/assets/voxygen/audio/sfx/instrument/drum/drum_c.ogg b/assets/voxygen/audio/sfx/instrument/drum/drum_c.ogg new file mode 100644 index 0000000000..aa176f7738 --- /dev/null +++ b/assets/voxygen/audio/sfx/instrument/drum/drum_c.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:29ca58b21f067bc46b7fa784d1daeed7e40c39eaf8ea58f459301a05003a1ee0 +size 26022 diff --git a/assets/voxygen/audio/sfx/instrument/drum/drum_c1.ogg b/assets/voxygen/audio/sfx/instrument/drum/drum_c1.ogg new file mode 100644 index 0000000000..07441e7c50 --- /dev/null +++ b/assets/voxygen/audio/sfx/instrument/drum/drum_c1.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e27c3480fe2e5b595f48fe9b564c7a47359175af90ed9a31a9c6bb3a01d510b3 +size 28035 diff --git a/assets/voxygen/audio/sfx/instrument/drum/drum_d.ogg b/assets/voxygen/audio/sfx/instrument/drum/drum_d.ogg new file mode 100644 index 0000000000..4c9355f893 --- /dev/null +++ b/assets/voxygen/audio/sfx/instrument/drum/drum_d.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ac60347e501b63d21705e5b9bf4b16c6ad90fe0cff3afdba0027a2946a354229 +size 29074 diff --git a/assets/voxygen/audio/sfx/instrument/drum/drum_e.ogg b/assets/voxygen/audio/sfx/instrument/drum/drum_e.ogg new file mode 100644 index 0000000000..a880a8a251 --- /dev/null +++ b/assets/voxygen/audio/sfx/instrument/drum/drum_e.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e131fdff9f896a64bf2759786457c3cf45f2df7deb56e16827be547d1d1628a9 +size 28018 diff --git a/assets/voxygen/audio/sfx/instrument/drum/drum_f.ogg b/assets/voxygen/audio/sfx/instrument/drum/drum_f.ogg new file mode 100644 index 0000000000..52df04e3bc --- /dev/null +++ b/assets/voxygen/audio/sfx/instrument/drum/drum_f.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:33edfb0788106d068fa92836340508cba35d4b35dcba1c3dd315ccb2f1c73fc6 +size 27497 diff --git a/assets/voxygen/audio/sfx/instrument/drum/drum_g.ogg b/assets/voxygen/audio/sfx/instrument/drum/drum_g.ogg new file mode 100644 index 0000000000..f8cfdf6bd6 --- /dev/null +++ b/assets/voxygen/audio/sfx/instrument/drum/drum_g.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:847f3b58bdbb142b98effe237730642779d728f40617520f6552ad6c12c6968f +size 26797 diff --git a/assets/voxygen/i18n/en/hud/subtitles.ftl b/assets/voxygen/i18n/en/hud/subtitles.ftl index 469593b339..e8251e6860 100644 --- a/assets/voxygen/i18n/en/hud/subtitles.ftl +++ b/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 diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index eee0131bfb..6a0c366681 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/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, diff --git a/assets/voxygen/voxel/armor/misc/head/bear_bonnet.vox b/assets/voxygen/voxel/armor/misc/head/bear_bonnet.vox new file mode 100644 index 0000000000..e0ffa72a05 --- /dev/null +++ b/assets/voxygen/voxel/armor/misc/head/bear_bonnet.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:13b0013379e13b4044c45b95239fba4b097e3ece48f6f098f9fb812632553795 +size 49796 diff --git a/assets/voxygen/voxel/armor/misc/head/hog_hood.vox b/assets/voxygen/voxel/armor/misc/head/hog_hood.vox index a80867f58f..e8dfa70265 100644 --- a/assets/voxygen/voxel/armor/misc/head/hog_hood.vox +++ b/assets/voxygen/voxel/armor/misc/head/hog_hood.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ccfdc45490dca6bc25082c7d628e5ffdcd22d95f275571d1b6a9f4d38fce0d9c -size 69303 +oid sha256:d0738e33edc8153634fc6a375350112928cb140d05edf18c3d8e70b3676653f1 +size 52556 diff --git a/assets/voxygen/voxel/armor/misc/head/howl_cowl.vox b/assets/voxygen/voxel/armor/misc/head/howl_cowl.vox new file mode 100644 index 0000000000..09714cdaf1 --- /dev/null +++ b/assets/voxygen/voxel/armor/misc/head/howl_cowl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:63ac53b1741894697fc65ec165d234427d08fc086212b633fedf8ce798b4cb55 +size 52152 diff --git a/assets/voxygen/voxel/biped_weapon_manifest.ron b/assets/voxygen/voxel/biped_weapon_manifest.ron index f041bb9cf3..8d6aee735b 100644 --- a/assets/voxygen/voxel/biped_weapon_manifest.ron +++ b/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 diff --git a/assets/voxygen/voxel/humanoid_armor_head_manifest.ron b/assets/voxygen/voxel/humanoid_armor_head_manifest.ron index 59f4cb98ab..49db7892f0 100644 --- a/assets/voxygen/voxel/humanoid_armor_head_manifest.ron +++ b/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"): ( diff --git a/assets/voxygen/voxel/item_drop_manifest.ron b/assets/voxygen/voxel/item_drop_manifest.ron index d4a875b3a2..06c7bd6e86 100644 --- a/assets/voxygen/voxel/item_drop_manifest.ron +++ b/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", diff --git a/assets/voxygen/voxel/weapon/tool/drum.vox b/assets/voxygen/voxel/weapon/tool/drum.vox new file mode 100644 index 0000000000..9958319b98 --- /dev/null +++ b/assets/voxygen/voxel/weapon/tool/drum.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f3f1855ce0cbc0d93841d9b8bf8c8728764b44de4239e3190e893fbedcb9a049 +size 1548 diff --git a/voxygen/anim/src/character/music.rs b/voxygen/anim/src/character/music.rs index 244fddc78f..e2b66853aa 100644 --- a/voxygen/anim/src/character/music.rs +++ b/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, diff --git a/voxygen/anim/src/character/wield.rs b/voxygen/anim/src/character/wield.rs index 0fae93c927..57a5c8d912 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" => { + "Lyre" | "IcyTalharpa" | "Drum" => { 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 bcff1114c3..17c5c93bd4 100644 --- a/voxygen/src/hud/util.rs +++ b/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, diff --git a/world/src/site2/plot/adlet.rs b/world/src/site2/plot/adlet.rs index 082f0883a7..6f1639fe3f 100644 --- a/world/src/site2/plot/adlet.rs +++ b/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)), }) }));