From a763a865feaa770d87b8770687bf5add01088d35 Mon Sep 17 00:00:00 2001 From: Monty Marz Date: Thu, 10 Nov 2022 20:59:53 +0000 Subject: [PATCH] Musical Instruments part 2 --- CHANGELOG.md | 10 +- .../common/abilities/ability_set_manifest.ron | 23 +++-- .../music/{bass.ron => double_bass.ron} | 0 .../music/{harp.ron => glass_flute.ron} | 0 .../abilities/music/{perc.ron => lyre.ron} | 0 assets/common/abilities/music/washboard.ron | 4 + .../halloween/aggressive/trickster.ron | 6 +- assets/common/entity/village/villager.ron | 3 + assets/common/items/crafting_ing/resin.ron | 10 ++ .../items/tool/instruments/double_bass.ron | 21 ++++ .../common/items/tool/instruments/flute.ron | 4 +- .../items/tool/instruments/glass_flute.ron | 21 ++++ .../common/items/tool/instruments/guitar.ron | 4 +- .../instruments/{bass.ron => guitar_dark.ron} | 8 +- .../common/items/tool/instruments/kalimba.ron | 4 +- assets/common/items/tool/instruments/lute.ron | 4 +- .../tool/instruments/{harp.ron => lyre.ron} | 8 +- .../items/tool/instruments/melodica.ron | 4 +- .../common/items/tool/instruments/sitar.ron | 4 +- .../instruments/{perc.ron => washboard.ron} | 8 +- .../creature/quad_low/deadwood.ron | 3 +- .../dungeon/sea_chapel/cardinal.ron | 5 +- .../loot_tables/dungeon/tier-0/woodgolem.ron | 3 +- assets/common/recipe_book.ron | 97 +++++++++++++++++++ assets/server/manifests/kits.ron | 8 +- assets/voxygen/audio/sfx.ron | 95 ++++++++++-------- .../double_bass_a.ogg} | 0 .../double_bass_ac1.ogg} | 0 .../double_bass_ag.ogg} | 0 .../double_bass_c.ogg} | 0 .../double_bass_c1.ogg} | 0 .../double_bass_cec.ogg} | 0 .../double_bass_d.ogg} | 0 .../double_bass_de.ogg} | 0 .../double_bass_e.ogg} | 0 .../double_bass_e1c1.ogg} | 0 .../double_bass_g.ogg} | 0 .../double_bass_ge.ogg} | 0 .../instrument/glass_flute/glass_flute_a.ogg | 3 + .../instrument/glass_flute/glass_flute_c.ogg | 3 + .../instrument/glass_flute/glass_flute_c1.ogg | 3 + .../glass_flute/glass_flute_c1a.ogg | 3 + .../glass_flute/glass_flute_c1ag.ogg | 3 + .../glass_flute/glass_flute_c1d1c1.ogg | 3 + .../glass_flute/glass_flute_ceg.ogg | 3 + .../instrument/glass_flute/glass_flute_d.ogg | 3 + .../glass_flute/glass_flute_dac1.ogg | 3 + .../instrument/glass_flute/glass_flute_e.ogg | 3 + .../instrument/glass_flute/glass_flute_eg.ogg | 3 + .../instrument/glass_flute/glass_flute_g.ogg | 3 + .../{harp/harp_a.ogg => lyre/lyre_a.ogg} | 0 .../{harp/harp_c.ogg => lyre/lyre_c.ogg} | 0 .../{harp/harp_c1.ogg => lyre/lyre_c1.ogg} | 0 .../harp_c1ag.ogg => lyre/lyre_c1ag.ogg} | 0 .../{harp/harp_cde.ogg => lyre/lyre_cde.ogg} | 0 .../{harp/harp_d.ogg => lyre/lyre_d.ogg} | 0 .../harp_d1c1a.ogg => lyre/lyre_d1c1a.ogg} | 0 .../{harp/harp_d1g.ogg => lyre/lyre_d1g.ogg} | 0 .../{harp/harp_e.ogg => lyre/lyre_e.ogg} | 0 .../{harp/harp_ec1.ogg => lyre/lyre_ec1.ogg} | 0 .../{harp/harp_ega.ogg => lyre/lyre_ega.ogg} | 0 .../{harp/harp_g.ogg => lyre/lyre_g.ogg} | 0 .../perc_a.ogg => washboard/washboard_a.ogg} | 0 .../perc_c.ogg => washboard/washboard_c.ogg} | 0 .../perc_d.ogg => washboard/washboard_d.ogg} | 0 .../washboard_d_d.ogg} | 0 .../washboard_d_dd.ogg} | 0 .../washboard_dd.ogg} | 0 .../washboard_dd_d.ogg} | 0 .../perc_e.ogg => washboard/washboard_e.ogg} | 0 .../perc_g.ogg => washboard/washboard_g.ogg} | 0 assets/voxygen/item_image_manifest.ron | 34 ++++--- .../voxel/armor/misc/head/helmet_orc_m.vox | 3 + .../voxygen/voxel/biped_weapon_manifest.ron | 32 +++--- .../voxel/humanoid_armor_head_manifest.ron | 4 +- assets/voxygen/voxel/item_drop_manifest.ron | 19 ++-- .../voxel/sprite/crafting_ing/resin.vox | 3 + assets/voxygen/voxel/weapon/tool/bass.vox | 3 - .../voxel/weapon/tool/black_velvet_guitar.vox | 3 + assets/voxygen/voxel/weapon/tool/flute.vox | 3 - .../voxygen/voxel/weapon/tool/glass_flute.vox | 3 + assets/voxygen/voxel/weapon/tool/guitar.vox | 3 - .../voxygen/voxel/weapon/tool/guitar_dark.vox | 3 + assets/voxygen/voxel/weapon/tool/harp.vox | 3 - assets/voxygen/voxel/weapon/tool/kalimba.vox | 3 - assets/voxygen/voxel/weapon/tool/lute.vox | 3 - assets/voxygen/voxel/weapon/tool/melodica.vox | 2 +- assets/voxygen/voxel/weapon/tool/perc.vox | 3 - assets/voxygen/voxel/weapon/tool/sitar.vox | 3 - .../voxygen/voxel/weapon/tool/washboard.vox | 3 + .../voxygen/voxel/weapon/tool/wooden_bass.vox | 3 + .../voxel/weapon/tool/wooden_flute.vox | 3 + .../voxel/weapon/tool/wooden_guitar.vox | 3 + .../voxel/weapon/tool/wooden_kalimba.vox | 3 + .../voxygen/voxel/weapon/tool/wooden_lute.vox | 3 + .../voxygen/voxel/weapon/tool/wooden_lyre.vox | 3 + .../voxel/weapon/tool/wooden_sitar.vox | 3 + .../migrations/V50__musical_instruments.sql | 6 ++ voxygen/anim/src/character/music.rs | 14 +-- voxygen/anim/src/character/sneakwield.rs | 2 +- voxygen/anim/src/character/wield.rs | 12 +-- voxygen/src/hud/group.rs | 4 +- voxygen/src/hud/util.rs | 4 + 103 files changed, 432 insertions(+), 157 deletions(-) rename assets/common/abilities/music/{bass.ron => double_bass.ron} (100%) rename assets/common/abilities/music/{harp.ron => glass_flute.ron} (100%) rename assets/common/abilities/music/{perc.ron => lyre.ron} (100%) create mode 100644 assets/common/abilities/music/washboard.ron create mode 100644 assets/common/items/crafting_ing/resin.ron create mode 100644 assets/common/items/tool/instruments/double_bass.ron create mode 100644 assets/common/items/tool/instruments/glass_flute.ron rename assets/common/items/tool/instruments/{bass.ron => guitar_dark.ron} (74%) rename assets/common/items/tool/instruments/{harp.ron => lyre.ron} (76%) rename assets/common/items/tool/instruments/{perc.ron => washboard.ron} (75%) rename assets/voxygen/audio/sfx/instrument/{bass/bass_a.ogg => double_bass/double_bass_a.ogg} (100%) rename assets/voxygen/audio/sfx/instrument/{bass/bass_ac1.ogg => double_bass/double_bass_ac1.ogg} (100%) rename assets/voxygen/audio/sfx/instrument/{bass/bass_ag.ogg => double_bass/double_bass_ag.ogg} (100%) rename assets/voxygen/audio/sfx/instrument/{bass/bass_c.ogg => double_bass/double_bass_c.ogg} (100%) rename assets/voxygen/audio/sfx/instrument/{bass/bass_c1.ogg => double_bass/double_bass_c1.ogg} (100%) rename assets/voxygen/audio/sfx/instrument/{bass/bass_cec.ogg => double_bass/double_bass_cec.ogg} (100%) rename assets/voxygen/audio/sfx/instrument/{bass/bass_d.ogg => double_bass/double_bass_d.ogg} (100%) rename assets/voxygen/audio/sfx/instrument/{bass/bass_de.ogg => double_bass/double_bass_de.ogg} (100%) rename assets/voxygen/audio/sfx/instrument/{bass/bass_e.ogg => double_bass/double_bass_e.ogg} (100%) rename assets/voxygen/audio/sfx/instrument/{bass/bass_e1c1.ogg => double_bass/double_bass_e1c1.ogg} (100%) rename assets/voxygen/audio/sfx/instrument/{bass/bass_g.ogg => double_bass/double_bass_g.ogg} (100%) rename assets/voxygen/audio/sfx/instrument/{bass/bass_ge.ogg => double_bass/double_bass_ge.ogg} (100%) create mode 100644 assets/voxygen/audio/sfx/instrument/glass_flute/glass_flute_a.ogg create mode 100644 assets/voxygen/audio/sfx/instrument/glass_flute/glass_flute_c.ogg create mode 100644 assets/voxygen/audio/sfx/instrument/glass_flute/glass_flute_c1.ogg create mode 100644 assets/voxygen/audio/sfx/instrument/glass_flute/glass_flute_c1a.ogg create mode 100644 assets/voxygen/audio/sfx/instrument/glass_flute/glass_flute_c1ag.ogg create mode 100644 assets/voxygen/audio/sfx/instrument/glass_flute/glass_flute_c1d1c1.ogg create mode 100644 assets/voxygen/audio/sfx/instrument/glass_flute/glass_flute_ceg.ogg create mode 100644 assets/voxygen/audio/sfx/instrument/glass_flute/glass_flute_d.ogg create mode 100644 assets/voxygen/audio/sfx/instrument/glass_flute/glass_flute_dac1.ogg create mode 100644 assets/voxygen/audio/sfx/instrument/glass_flute/glass_flute_e.ogg create mode 100644 assets/voxygen/audio/sfx/instrument/glass_flute/glass_flute_eg.ogg create mode 100644 assets/voxygen/audio/sfx/instrument/glass_flute/glass_flute_g.ogg rename assets/voxygen/audio/sfx/instrument/{harp/harp_a.ogg => lyre/lyre_a.ogg} (100%) rename assets/voxygen/audio/sfx/instrument/{harp/harp_c.ogg => lyre/lyre_c.ogg} (100%) rename assets/voxygen/audio/sfx/instrument/{harp/harp_c1.ogg => lyre/lyre_c1.ogg} (100%) rename assets/voxygen/audio/sfx/instrument/{harp/harp_c1ag.ogg => lyre/lyre_c1ag.ogg} (100%) rename assets/voxygen/audio/sfx/instrument/{harp/harp_cde.ogg => lyre/lyre_cde.ogg} (100%) rename assets/voxygen/audio/sfx/instrument/{harp/harp_d.ogg => lyre/lyre_d.ogg} (100%) rename assets/voxygen/audio/sfx/instrument/{harp/harp_d1c1a.ogg => lyre/lyre_d1c1a.ogg} (100%) rename assets/voxygen/audio/sfx/instrument/{harp/harp_d1g.ogg => lyre/lyre_d1g.ogg} (100%) rename assets/voxygen/audio/sfx/instrument/{harp/harp_e.ogg => lyre/lyre_e.ogg} (100%) rename assets/voxygen/audio/sfx/instrument/{harp/harp_ec1.ogg => lyre/lyre_ec1.ogg} (100%) rename assets/voxygen/audio/sfx/instrument/{harp/harp_ega.ogg => lyre/lyre_ega.ogg} (100%) rename assets/voxygen/audio/sfx/instrument/{harp/harp_g.ogg => lyre/lyre_g.ogg} (100%) rename assets/voxygen/audio/sfx/instrument/{perc/perc_a.ogg => washboard/washboard_a.ogg} (100%) rename assets/voxygen/audio/sfx/instrument/{perc/perc_c.ogg => washboard/washboard_c.ogg} (100%) rename assets/voxygen/audio/sfx/instrument/{perc/perc_d.ogg => washboard/washboard_d.ogg} (100%) rename assets/voxygen/audio/sfx/instrument/{perc/perc_d_d.ogg => washboard/washboard_d_d.ogg} (100%) rename assets/voxygen/audio/sfx/instrument/{perc/perc_d_dd.ogg => washboard/washboard_d_dd.ogg} (100%) rename assets/voxygen/audio/sfx/instrument/{perc/perc_dd.ogg => washboard/washboard_dd.ogg} (100%) rename assets/voxygen/audio/sfx/instrument/{perc/perc_dd_d.ogg => washboard/washboard_dd_d.ogg} (100%) rename assets/voxygen/audio/sfx/instrument/{perc/perc_e.ogg => washboard/washboard_e.ogg} (100%) rename assets/voxygen/audio/sfx/instrument/{perc/perc_g.ogg => washboard/washboard_g.ogg} (100%) create mode 100644 assets/voxygen/voxel/armor/misc/head/helmet_orc_m.vox create mode 100644 assets/voxygen/voxel/sprite/crafting_ing/resin.vox delete mode 100644 assets/voxygen/voxel/weapon/tool/bass.vox create mode 100644 assets/voxygen/voxel/weapon/tool/black_velvet_guitar.vox delete mode 100644 assets/voxygen/voxel/weapon/tool/flute.vox create mode 100644 assets/voxygen/voxel/weapon/tool/glass_flute.vox delete mode 100644 assets/voxygen/voxel/weapon/tool/guitar.vox create mode 100644 assets/voxygen/voxel/weapon/tool/guitar_dark.vox delete mode 100644 assets/voxygen/voxel/weapon/tool/harp.vox delete mode 100644 assets/voxygen/voxel/weapon/tool/kalimba.vox delete mode 100644 assets/voxygen/voxel/weapon/tool/lute.vox delete mode 100644 assets/voxygen/voxel/weapon/tool/perc.vox delete mode 100644 assets/voxygen/voxel/weapon/tool/sitar.vox create mode 100644 assets/voxygen/voxel/weapon/tool/washboard.vox create mode 100644 assets/voxygen/voxel/weapon/tool/wooden_bass.vox create mode 100644 assets/voxygen/voxel/weapon/tool/wooden_flute.vox create mode 100644 assets/voxygen/voxel/weapon/tool/wooden_guitar.vox create mode 100644 assets/voxygen/voxel/weapon/tool/wooden_kalimba.vox create mode 100644 assets/voxygen/voxel/weapon/tool/wooden_lute.vox create mode 100644 assets/voxygen/voxel/weapon/tool/wooden_lyre.vox create mode 100644 assets/voxygen/voxel/weapon/tool/wooden_sitar.vox create mode 100644 server/src/migrations/V50__musical_instruments.sql diff --git a/CHANGELOG.md b/CHANGELOG.md index 6febfb2b1b..bfc034fc32 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] ### Added + - Setting for disabling flashing lights - Spectate mode for moderators. - Currently playing music track and artist now shows in the debug menu. @@ -33,8 +34,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Graphics presets - Sword - Doors now animate opening when entities are near them. +- Musical instruments can now be crafted, looted and played ### Changed + - Use fluent for translations - First tab on Login screen triggers username focus - Certain NPCs will now attack when alone with victim @@ -48,9 +51,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Item pickup UI now displays items that members of your group pick up. - Improved shiny water shaders - Tweaked armor stats + ### Removed ### Fixed + - Fixed npc not handling interactions while fighting (especially merchants in trade) - Fixed bug where you would still be burning after dying in lava. - Workaround for rayon bug that caused lag spikes in slowjobs @@ -74,6 +79,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [0.13.0] - 2022-07-23 ### Added + - Chat commands to mute and unmute players - Waypoints saved between sessions and shared with group members. - New rocks @@ -129,9 +135,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Overhauled caves: they're now a multi-layer network spanning the entire world ### Removed + - Removed the options for single and cumulated damage. ### Fixed + - Fixed bug that would sometimes cause taking a screenshot to panic because a buffer was mapped at the wrong time. - Players can no longer push waypoints around - Sites will now also be placed near the edge of the map @@ -821,7 +829,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - New attack animation - Weapon control system - Game pauses when in single player and pause menu -- Added authentication system (to play on the official server register on https://account.veloren.net) +- Added authentication system (to play on the official server register on ) - Added gamepad/controller support - Added player feedback when attempting to pickup an item with a full inventory - Added free look diff --git a/assets/common/abilities/ability_set_manifest.ron b/assets/common/abilities/ability_set_manifest.ron index 67ce8b6ded..f50852a626 100644 --- a/assets/common/abilities/ability_set_manifest.ron +++ b/assets/common/abilities/ability_set_manifest.ron @@ -474,9 +474,9 @@ secondary: "common.abilities.tool.golf_club.charged", abilities: [], ), - Custom("Bass"): ( - primary: "common.abilities.music.bass", - secondary: "common.abilities.music.bass", + Custom("DoubleBass"): ( + primary: "common.abilities.music.double_bass", + secondary: "common.abilities.music.double_bass", abilities: [], ), Custom("Flute"): ( @@ -484,14 +484,19 @@ secondary: "common.abilities.music.flute", abilities: [], ), - Custom("Harp"): ( - primary: "common.abilities.music.harp", - secondary: "common.abilities.music.harp", + Custom("GlassFlute"): ( + primary: "common.abilities.music.glass_flute", + secondary: "common.abilities.music.glass_flute", abilities: [], ), - Custom("Perc"): ( - primary: "common.abilities.music.perc", - secondary: "common.abilities.music.perc", + Custom("Lyre"): ( + primary: "common.abilities.music.lyre", + secondary: "common.abilities.music.lyre", + abilities: [], + ), + Custom("Washboard"): ( + primary: "common.abilities.music.washboard", + secondary: "common.abilities.music.washboard", abilities: [], ), Custom("Kalimba"): ( diff --git a/assets/common/abilities/music/bass.ron b/assets/common/abilities/music/double_bass.ron similarity index 100% rename from assets/common/abilities/music/bass.ron rename to assets/common/abilities/music/double_bass.ron diff --git a/assets/common/abilities/music/harp.ron b/assets/common/abilities/music/glass_flute.ron similarity index 100% rename from assets/common/abilities/music/harp.ron rename to assets/common/abilities/music/glass_flute.ron diff --git a/assets/common/abilities/music/perc.ron b/assets/common/abilities/music/lyre.ron similarity index 100% rename from assets/common/abilities/music/perc.ron rename to assets/common/abilities/music/lyre.ron diff --git a/assets/common/abilities/music/washboard.ron b/assets/common/abilities/music/washboard.ron new file mode 100644 index 0000000000..18f0a9b200 --- /dev/null +++ b/assets/common/abilities/music/washboard.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/entity/calendar/halloween/aggressive/trickster.ron b/assets/common/entity/calendar/halloween/aggressive/trickster.ron index e4727c1900..f19bfe6f81 100644 --- a/assets/common/entity/calendar/halloween/aggressive/trickster.ron +++ b/assets/common/entity/calendar/halloween/aggressive/trickster.ron @@ -8,12 +8,12 @@ loadout: Inline(( inherit: Asset("common.loadout.calendar.halloween.trickster"), active_hands: InHands((Choice([ - (1, Item("common.items.tool.instruments.bass")), + (1, Item("common.items.tool.instruments.double_bass")), (1, Item("common.items.tool.instruments.flute")), - (1, Item("common.items.tool.instruments.harp")), + (1, Item("common.items.tool.instruments.lyre")), (1, Item("common.items.tool.instruments.kalimba")), (1, Item("common.items.tool.instruments.sitar")), - (1, Item("common.items.tool.instruments.perc")), + (1, Item("common.items.tool.instruments.washboard")), (1, Item("common.items.tool.instruments.lute")), (1, Item("common.items.tool.instruments.guitar")), (1, Item("common.items.tool.instruments.melodica")), diff --git a/assets/common/entity/village/villager.ron b/assets/common/entity/village/villager.ron index ee0b96e6cf..95ae84c0e2 100644 --- a/assets/common/entity/village/villager.ron +++ b/assets/common/entity/village/villager.ron @@ -14,6 +14,9 @@ (1, Item("common.items.weapons.tool.rake")), (1, Item("common.items.weapons.tool.shovel-0")), (1, Item("common.items.weapons.tool.shovel-1")), + (1, Item("common.items.tool.instruments.lyre")), + (1, Item("common.items.tool.instruments.lute")), + (1, Item("common.items.tool.instruments.guitar")), ]), None)), )), items: [ diff --git a/assets/common/items/crafting_ing/resin.ron b/assets/common/items/crafting_ing/resin.ron new file mode 100644 index 0000000000..02b188485e --- /dev/null +++ b/assets/common/items/crafting_ing/resin.ron @@ -0,0 +1,10 @@ +ItemDef( + name: "Resin", + description: "Used for woodworking.", + kind: Ingredient( + // Descriptor not needed + descriptor: "", + ), + quality: Common, + tags: [], +) diff --git a/assets/common/items/tool/instruments/double_bass.ron b/assets/common/items/tool/instruments/double_bass.ron new file mode 100644 index 0000000000..746a7b73f2 --- /dev/null +++ b/assets/common/items/tool/instruments/double_bass.ron @@ -0,0 +1,21 @@ +ItemDef( + name: "Double Bass", + description: "Wooden Bass.", + 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("DoubleBass")), +) \ No newline at end of file diff --git a/assets/common/items/tool/instruments/flute.ron b/assets/common/items/tool/instruments/flute.ron index 1680d8818c..ea53877979 100644 --- a/assets/common/items/tool/instruments/flute.ron +++ b/assets/common/items/tool/instruments/flute.ron @@ -1,6 +1,6 @@ ItemDef( name: "Flute", - description: "Common Flute.", + description: "Wooden Flute.", kind: Tool(( kind: Instrument, hands: Two, @@ -16,6 +16,6 @@ ItemDef( ), )), quality: Common, - tags: [], + tags: [Utility], ability_spec: Some(Custom("Flute")), ) \ No newline at end of file diff --git a/assets/common/items/tool/instruments/glass_flute.ron b/assets/common/items/tool/instruments/glass_flute.ron new file mode 100644 index 0000000000..a06524cc71 --- /dev/null +++ b/assets/common/items/tool/instruments/glass_flute.ron @@ -0,0 +1,21 @@ +ItemDef( + name: "Glass Flute", + description: "What's the Cardinal doing with it?", + 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("GlassFlute")), +) diff --git a/assets/common/items/tool/instruments/guitar.ron b/assets/common/items/tool/instruments/guitar.ron index 3125ed191c..da2b2a351e 100644 --- a/assets/common/items/tool/instruments/guitar.ron +++ b/assets/common/items/tool/instruments/guitar.ron @@ -1,6 +1,6 @@ ItemDef( name: "Guitar", - description: "Common Guitar.", + description: "Wooden Guitar.", kind: Tool(( kind: Instrument, hands: Two, @@ -16,6 +16,6 @@ ItemDef( ), )), quality: Common, - tags: [], + tags: [Utility], ability_spec: Some(Custom("Guitar")), ) \ No newline at end of file diff --git a/assets/common/items/tool/instruments/bass.ron b/assets/common/items/tool/instruments/guitar_dark.ron similarity index 74% rename from assets/common/items/tool/instruments/bass.ron rename to assets/common/items/tool/instruments/guitar_dark.ron index c6a1795ddf..891a0a80fa 100644 --- a/assets/common/items/tool/instruments/bass.ron +++ b/assets/common/items/tool/instruments/guitar_dark.ron @@ -1,6 +1,6 @@ ItemDef( - name: "Bass", - description: "Common Bass.", + name: "Dark Guitar", + description: "Sounds edgy.", kind: Tool(( kind: Instrument, hands: Two, @@ -16,6 +16,6 @@ ItemDef( ), )), quality: Common, - tags: [], - ability_spec: Some(Custom("Bass")), + tags: [Utility], + ability_spec: Some(Custom("Guitar")), ) \ No newline at end of file diff --git a/assets/common/items/tool/instruments/kalimba.ron b/assets/common/items/tool/instruments/kalimba.ron index 2a03e4dc03..430d676bd1 100644 --- a/assets/common/items/tool/instruments/kalimba.ron +++ b/assets/common/items/tool/instruments/kalimba.ron @@ -1,6 +1,6 @@ ItemDef( name: "Kalimba", - description: "Common Kalimba.", + description: "Wooden Kalimba.", kind: Tool(( kind: Instrument, hands: Two, @@ -16,6 +16,6 @@ ItemDef( ), )), quality: Common, - tags: [], + tags: [Utility], ability_spec: Some(Custom("Kalimba")), ) \ No newline at end of file diff --git a/assets/common/items/tool/instruments/lute.ron b/assets/common/items/tool/instruments/lute.ron index 5d893a8a45..f389d3ae8e 100644 --- a/assets/common/items/tool/instruments/lute.ron +++ b/assets/common/items/tool/instruments/lute.ron @@ -1,6 +1,6 @@ ItemDef( name: "Lute", - description: "Common Lute.", + description: "Wooden Lute.", kind: Tool(( kind: Instrument, hands: Two, @@ -16,6 +16,6 @@ ItemDef( ), )), quality: Common, - tags: [], + tags: [Utility], ability_spec: Some(Custom("Lute")), ) \ No newline at end of file diff --git a/assets/common/items/tool/instruments/harp.ron b/assets/common/items/tool/instruments/lyre.ron similarity index 76% rename from assets/common/items/tool/instruments/harp.ron rename to assets/common/items/tool/instruments/lyre.ron index 3edf1f79ab..d9754ad75e 100644 --- a/assets/common/items/tool/instruments/harp.ron +++ b/assets/common/items/tool/instruments/lyre.ron @@ -1,6 +1,6 @@ ItemDef( - name: "Harp", - description: "Common Harp.", + name: "Lyre", + description: "Wooden Lyre.", kind: Tool(( kind: Instrument, hands: Two, @@ -16,6 +16,6 @@ ItemDef( ), )), quality: Common, - tags: [], - ability_spec: Some(Custom("Harp")), + tags: [Utility], + ability_spec: Some(Custom("Lyre")), ) \ No newline at end of file diff --git a/assets/common/items/tool/instruments/melodica.ron b/assets/common/items/tool/instruments/melodica.ron index 4e6e51cd8b..5b2721f62d 100644 --- a/assets/common/items/tool/instruments/melodica.ron +++ b/assets/common/items/tool/instruments/melodica.ron @@ -1,6 +1,6 @@ ItemDef( name: "Melodica", - description: "Common Melodica.", + description: "Wooden Melodica.", kind: Tool(( kind: Instrument, hands: Two, @@ -16,6 +16,6 @@ ItemDef( ), )), quality: Common, - tags: [], + tags: [Utility], ability_spec: Some(Custom("Melodica")), ) \ No newline at end of file diff --git a/assets/common/items/tool/instruments/sitar.ron b/assets/common/items/tool/instruments/sitar.ron index d7f2b2275f..21f251487a 100644 --- a/assets/common/items/tool/instruments/sitar.ron +++ b/assets/common/items/tool/instruments/sitar.ron @@ -1,6 +1,6 @@ ItemDef( name: "Sitar", - description: "Common Sitar.", + description: "Wooden Sitar.", kind: Tool(( kind: Instrument, hands: Two, @@ -16,6 +16,6 @@ ItemDef( ), )), quality: Common, - tags: [], + tags: [Utility], ability_spec: Some(Custom("Sitar")), ) \ No newline at end of file diff --git a/assets/common/items/tool/instruments/perc.ron b/assets/common/items/tool/instruments/washboard.ron similarity index 75% rename from assets/common/items/tool/instruments/perc.ron rename to assets/common/items/tool/instruments/washboard.ron index 616b8f826a..eae2ea5830 100644 --- a/assets/common/items/tool/instruments/perc.ron +++ b/assets/common/items/tool/instruments/washboard.ron @@ -1,6 +1,6 @@ ItemDef( - name: "Waschbrett", - description: "Waschbrett.", + name: "Washboard", + description: "Washboard.", kind: Tool(( kind: Instrument, hands: Two, @@ -16,6 +16,6 @@ ItemDef( ), )), quality: Common, - tags: [], - ability_spec: Some(Custom("Perc")), + tags: [Utility], + ability_spec: Some(Custom("Washboard")), ) \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_low/deadwood.ron b/assets/common/loot_tables/creature/quad_low/deadwood.ron index 3ae06fcc0b..577458412b 100644 --- a/assets/common/loot_tables/creature/quad_low/deadwood.ron +++ b/assets/common/loot_tables/creature/quad_low/deadwood.ron @@ -1,6 +1,7 @@ [ (12.0, Item("common.items.log.wood")), - (12.0, Item("common.items.flowers.plant_fiber")), + (6.0, Item("common.items.flowers.plant_fiber")), + (6.0, Item("common.items.crafting_ing.resin")), (5.0, Item("common.items.crafting_ing.animal_misc.grim_eyeball")), (1.0, Item("common.items.armor.misc.head.bamboo_twig")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/dungeon/sea_chapel/cardinal.ron b/assets/common/loot_tables/dungeon/sea_chapel/cardinal.ron index d45657e9fb..537ed1c913 100644 --- a/assets/common/loot_tables/dungeon/sea_chapel/cardinal.ron +++ b/assets/common/loot_tables/dungeon/sea_chapel/cardinal.ron @@ -1,5 +1,6 @@ [ (0.5, Item("common.items.crafting_ing.abyssal_heart")), - (2.5, LootTable("common.loot_tables.food.prepared")), - (2.5, Item("common.items.crafting_ing.seashells")), + (2.0, Item("common.items.crafting_ing.coral_branch")), + (2.5, ItemQuantity("common.items.utility.coins", 50, 100)), + (0.2, Item("common.items.tool.instruments.glass_flute")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/dungeon/tier-0/woodgolem.ron b/assets/common/loot_tables/dungeon/tier-0/woodgolem.ron index 13a3693cbb..1fb9ded6cf 100644 --- a/assets/common/loot_tables/dungeon/tier-0/woodgolem.ron +++ b/assets/common/loot_tables/dungeon/tier-0/woodgolem.ron @@ -6,6 +6,7 @@ // Consumables (2.0, LootTable("common.loot_tables.consumable.poor")), // Crafting ingredients - (1.0, ItemQuantity("common.items.log.wood", 5, 10)), + (1.0, ItemQuantity("common.items.log.hardwood", 5, 10)), (0.5, LootTable("common.loot_tables.weapons.components.secondary.sceptre")), + (1.0, Item("common.items.crafting_ing.resin")), ] diff --git a/assets/common/recipe_book.ron b/assets/common/recipe_book.ron index 685280f7f1..1bc723599f 100644 --- a/assets/common/recipe_book.ron +++ b/assets/common/recipe_book.ron @@ -2067,4 +2067,101 @@ craft_sprite: Some(Cauldron), is_recycling: false, ), + // musical instruments + "double_bass": ( + output: ("common.items.tool.instruments.double_bass", 1), + inputs: [ + (Item("common.items.log.hardwood"), 6, false), + (Item("common.items.crafting_ing.resin"), 3, false), + (Item("common.items.flowers.plant_fiber"), 4, false), + (Item("common.items.mineral.ore.iron"), 2, false), + ], + craft_sprite: Some(CraftingBench), + is_recycling: false, + ), + "flute": ( + output: ("common.items.tool.instruments.flute", 1), + inputs: [ + (Item("common.items.log.hardwood"), 1, false), + (Item("common.items.crafting_ing.resin"), 1, false), + ], + craft_sprite: Some(CraftingBench), + is_recycling: false, + ), + "guitar": ( + output: ("common.items.tool.instruments.guitar", 1), + inputs: [ + (Item("common.items.log.hardwood"), 4, false), + (Item("common.items.crafting_ing.resin"), 2, false), + (Item("common.items.flowers.plant_fiber"), 6, false), + (Item("common.items.mineral.ore.iron"), 4, false), + ], + craft_sprite: Some(CraftingBench), + is_recycling: false, + ), + "lyre": ( + output: ("common.items.tool.instruments.lyre", 1), + inputs: [ + (Item("common.items.log.hardwood"), 3, false), + (Item("common.items.crafting_ing.resin"), 2, false), + (Item("common.items.flowers.plant_fiber"), 5, false), + (Item("common.items.mineral.ore.iron"), 1, false), + ], + craft_sprite: Some(CraftingBench), + is_recycling: false, + ), + "kalimba": ( + output: ("common.items.tool.instruments.kalimba", 1), + inputs: [ + (Item("common.items.log.hardwood"), 2, false), + (Item("common.items.crafting_ing.resin"), 1, false), + (Item("common.items.mineral.ore.iron"), 8, false), + ], + craft_sprite: Some(CraftingBench), + is_recycling: false, + ), + "lute": ( + output: ("common.items.tool.instruments.lute", 1), + inputs: [ + (Item("common.items.log.hardwood"), 2, false), + (Item("common.items.crafting_ing.resin"), 1, false), + (Item("common.items.flowers.plant_fiber"), 3, false), + (Item("common.items.mineral.ore.iron"), 1, false), + ], + craft_sprite: Some(CraftingBench), + is_recycling: false, + ), + "melodica": ( + output: ("common.items.tool.instruments.melodica", 1), + inputs: [ + (Item("common.items.log.hardwood"), 1, false), + (Item("common.items.crafting_ing.resin"), 1, false), + (Item("common.items.mineral.ore.tin"), 2, false), + ], + craft_sprite: Some(CraftingBench), + is_recycling: false, + ), + "washboard": ( + output: ("common.items.tool.instruments.washboard", 1), + inputs: [ + (Item("common.items.log.hardwood"), 2, false), + (Item("common.items.crafting_ing.resin"), 1, false), + (Item("common.items.mineral.ore.copper"), 2, false), + (Item("common.items.mineral.ore.tin"), 2, false), + (Item("common.items.mineral.ore.iron"), 2, false), + ], + craft_sprite: Some(CraftingBench), + is_recycling: false, + ), + "sitar": ( + output: ("common.items.tool.instruments.sitar", 1), + inputs: [ + (Item("common.items.log.hardwood"), 4, false), + (Item("common.items.crafting_ing.resin"), 2, false), + (Item("common.items.mineral.ore.iron"), 2, false), + (Item("common.items.mineral.ore.silver"), 12, false), + ], + craft_sprite: Some(CraftingBench), + is_recycling: false, + ), } diff --git a/assets/server/manifests/kits.ron b/assets/server/manifests/kits.ron index 044ad83a5b..3ba30db4f4 100644 --- a/assets/server/manifests/kits.ron +++ b/assets/server/manifests/kits.ron @@ -379,14 +379,16 @@ (Item("common.items.armor.merchant.shoulder"),1), ], "instruments": [ - (Item("common.items.tool.instruments.bass"),1), + (Item("common.items.tool.instruments.double_bass"),1), (Item("common.items.tool.instruments.flute"),1), + (Item("common.items.tool.instruments.glass_flute"),1), (Item("common.items.tool.instruments.guitar"),1), - (Item("common.items.tool.instruments.harp"),1), + (Item("common.items.tool.instruments.guitar_dark"),1), + (Item("common.items.tool.instruments.lyre"),1), (Item("common.items.tool.instruments.kalimba"),1), (Item("common.items.tool.instruments.lute"),1), (Item("common.items.tool.instruments.melodica"),1), (Item("common.items.tool.instruments.sitar"),1), - (Item("common.items.tool.instruments.perc"),1), + (Item("common.items.tool.instruments.washboard"),1), ], }) diff --git a/assets/voxygen/audio/sfx.ron b/assets/voxygen/audio/sfx.ron index 5a17cd3264..556a76e97a 100644 --- a/assets/voxygen/audio/sfx.ron +++ b/assets/voxygen/audio/sfx.ron @@ -541,20 +541,20 @@ ], threshold: 0.5, ), - Music(Instrument, Custom("Bass")): ( + Music(Instrument, Custom("DoubleBass")): ( files: [ - "voxygen.audio.sfx.instrument.bass.bass_c", - "voxygen.audio.sfx.instrument.bass.bass_g", - "voxygen.audio.sfx.instrument.bass.bass_d", - "voxygen.audio.sfx.instrument.bass.bass_a", - "voxygen.audio.sfx.instrument.bass.bass_e", - "voxygen.audio.sfx.instrument.bass.bass_c1", - "voxygen.audio.sfx.instrument.bass.bass_ac1", - "voxygen.audio.sfx.instrument.bass.bass_ag", - "voxygen.audio.sfx.instrument.bass.bass_cec", - "voxygen.audio.sfx.instrument.bass.bass_de", - "voxygen.audio.sfx.instrument.bass.bass_e1c1", - "voxygen.audio.sfx.instrument.bass.bass_ge", + "voxygen.audio.sfx.instrument.double_bass.double_bass_c", + "voxygen.audio.sfx.instrument.double_bass.double_bass_g", + "voxygen.audio.sfx.instrument.double_bass.double_bass_d", + "voxygen.audio.sfx.instrument.double_bass.double_bass_a", + "voxygen.audio.sfx.instrument.double_bass.double_bass_e", + "voxygen.audio.sfx.instrument.double_bass.double_bass_c1", + "voxygen.audio.sfx.instrument.double_bass.double_bass_ac1", + "voxygen.audio.sfx.instrument.double_bass.double_bass_ag", + "voxygen.audio.sfx.instrument.double_bass.double_bass_cec", + "voxygen.audio.sfx.instrument.double_bass.double_bass_de", + "voxygen.audio.sfx.instrument.double_bass.double_bass_e1c1", + "voxygen.audio.sfx.instrument.double_bass.double_bass_ge", ], threshold: 0.5, ), @@ -575,20 +575,37 @@ ], threshold: 0.5, ), - Music(Instrument, Custom("Harp")): ( + Music(Instrument, Custom("GlassFlute")): ( files: [ - "voxygen.audio.sfx.instrument.harp.harp_c", - "voxygen.audio.sfx.instrument.harp.harp_g", - "voxygen.audio.sfx.instrument.harp.harp_d", - "voxygen.audio.sfx.instrument.harp.harp_a", - "voxygen.audio.sfx.instrument.harp.harp_e", - "voxygen.audio.sfx.instrument.harp.harp_c1", - "voxygen.audio.sfx.instrument.harp.harp_c1ag", - "voxygen.audio.sfx.instrument.harp.harp_cde", - "voxygen.audio.sfx.instrument.harp.harp_d1c1a", - "voxygen.audio.sfx.instrument.harp.harp_d1g", - "voxygen.audio.sfx.instrument.harp.harp_ec1", - "voxygen.audio.sfx.instrument.harp.harp_ega", + "voxygen.audio.sfx.instrument.glass_flute.glass_flute_c", + "voxygen.audio.sfx.instrument.glass_flute.glass_flute_g", + "voxygen.audio.sfx.instrument.glass_flute.glass_flute_d", + "voxygen.audio.sfx.instrument.glass_flute.glass_flute_a", + "voxygen.audio.sfx.instrument.glass_flute.glass_flute_e", + "voxygen.audio.sfx.instrument.glass_flute.glass_flute_c1", + "voxygen.audio.sfx.instrument.glass_flute.glass_flute_c1a", + "voxygen.audio.sfx.instrument.glass_flute.glass_flute_c1ag", + "voxygen.audio.sfx.instrument.glass_flute.glass_flute_c1d1c1", + "voxygen.audio.sfx.instrument.glass_flute.glass_flute_ceg", + "voxygen.audio.sfx.instrument.glass_flute.glass_flute_dac1", + "voxygen.audio.sfx.instrument.glass_flute.glass_flute_eg", + ], + threshold: 0.5, + ), + Music(Instrument, Custom("Lyre")): ( + files: [ + "voxygen.audio.sfx.instrument.lyre.lyre_c", + "voxygen.audio.sfx.instrument.lyre.lyre_g", + "voxygen.audio.sfx.instrument.lyre.lyre_d", + "voxygen.audio.sfx.instrument.lyre.lyre_a", + "voxygen.audio.sfx.instrument.lyre.lyre_e", + "voxygen.audio.sfx.instrument.lyre.lyre_c1", + "voxygen.audio.sfx.instrument.lyre.lyre_c1ag", + "voxygen.audio.sfx.instrument.lyre.lyre_cde", + "voxygen.audio.sfx.instrument.lyre.lyre_d1c1a", + "voxygen.audio.sfx.instrument.lyre.lyre_d1g", + "voxygen.audio.sfx.instrument.lyre.lyre_ec1", + "voxygen.audio.sfx.instrument.lyre.lyre_ega", ], threshold: 0.5, ), @@ -677,20 +694,20 @@ ], threshold: 0.5, ), - Music(Instrument, Custom("Perc")): ( + Music(Instrument, Custom("Washboard")): ( files: [ - "voxygen.audio.sfx.instrument.perc.perc_c", - "voxygen.audio.sfx.instrument.perc.perc_g", - "voxygen.audio.sfx.instrument.perc.perc_d", - "voxygen.audio.sfx.instrument.perc.perc_d", - "voxygen.audio.sfx.instrument.perc.perc_d", - "voxygen.audio.sfx.instrument.perc.perc_d", - "voxygen.audio.sfx.instrument.perc.perc_d_d", - "voxygen.audio.sfx.instrument.perc.perc_dd", - "voxygen.audio.sfx.instrument.perc.perc_d_dd", - "voxygen.audio.sfx.instrument.perc.perc_dd_d", - "voxygen.audio.sfx.instrument.perc.perc_a", - "voxygen.audio.sfx.instrument.perc.perc_e", + "voxygen.audio.sfx.instrument.washboard.washboard_c", + "voxygen.audio.sfx.instrument.washboard.washboard_g", + "voxygen.audio.sfx.instrument.washboard.washboard_d", + "voxygen.audio.sfx.instrument.washboard.washboard_d", + "voxygen.audio.sfx.instrument.washboard.washboard_d", + "voxygen.audio.sfx.instrument.washboard.washboard_d", + "voxygen.audio.sfx.instrument.washboard.washboard_d_d", + "voxygen.audio.sfx.instrument.washboard.washboard_dd", + "voxygen.audio.sfx.instrument.washboard.washboard_d_dd", + "voxygen.audio.sfx.instrument.washboard.washboard_dd_d", + "voxygen.audio.sfx.instrument.washboard.washboard_a", + "voxygen.audio.sfx.instrument.washboard.washboard_e", ], threshold: 0.5, ), diff --git a/assets/voxygen/audio/sfx/instrument/bass/bass_a.ogg b/assets/voxygen/audio/sfx/instrument/double_bass/double_bass_a.ogg similarity index 100% rename from assets/voxygen/audio/sfx/instrument/bass/bass_a.ogg rename to assets/voxygen/audio/sfx/instrument/double_bass/double_bass_a.ogg diff --git a/assets/voxygen/audio/sfx/instrument/bass/bass_ac1.ogg b/assets/voxygen/audio/sfx/instrument/double_bass/double_bass_ac1.ogg similarity index 100% rename from assets/voxygen/audio/sfx/instrument/bass/bass_ac1.ogg rename to assets/voxygen/audio/sfx/instrument/double_bass/double_bass_ac1.ogg diff --git a/assets/voxygen/audio/sfx/instrument/bass/bass_ag.ogg b/assets/voxygen/audio/sfx/instrument/double_bass/double_bass_ag.ogg similarity index 100% rename from assets/voxygen/audio/sfx/instrument/bass/bass_ag.ogg rename to assets/voxygen/audio/sfx/instrument/double_bass/double_bass_ag.ogg diff --git a/assets/voxygen/audio/sfx/instrument/bass/bass_c.ogg b/assets/voxygen/audio/sfx/instrument/double_bass/double_bass_c.ogg similarity index 100% rename from assets/voxygen/audio/sfx/instrument/bass/bass_c.ogg rename to assets/voxygen/audio/sfx/instrument/double_bass/double_bass_c.ogg diff --git a/assets/voxygen/audio/sfx/instrument/bass/bass_c1.ogg b/assets/voxygen/audio/sfx/instrument/double_bass/double_bass_c1.ogg similarity index 100% rename from assets/voxygen/audio/sfx/instrument/bass/bass_c1.ogg rename to assets/voxygen/audio/sfx/instrument/double_bass/double_bass_c1.ogg diff --git a/assets/voxygen/audio/sfx/instrument/bass/bass_cec.ogg b/assets/voxygen/audio/sfx/instrument/double_bass/double_bass_cec.ogg similarity index 100% rename from assets/voxygen/audio/sfx/instrument/bass/bass_cec.ogg rename to assets/voxygen/audio/sfx/instrument/double_bass/double_bass_cec.ogg diff --git a/assets/voxygen/audio/sfx/instrument/bass/bass_d.ogg b/assets/voxygen/audio/sfx/instrument/double_bass/double_bass_d.ogg similarity index 100% rename from assets/voxygen/audio/sfx/instrument/bass/bass_d.ogg rename to assets/voxygen/audio/sfx/instrument/double_bass/double_bass_d.ogg diff --git a/assets/voxygen/audio/sfx/instrument/bass/bass_de.ogg b/assets/voxygen/audio/sfx/instrument/double_bass/double_bass_de.ogg similarity index 100% rename from assets/voxygen/audio/sfx/instrument/bass/bass_de.ogg rename to assets/voxygen/audio/sfx/instrument/double_bass/double_bass_de.ogg diff --git a/assets/voxygen/audio/sfx/instrument/bass/bass_e.ogg b/assets/voxygen/audio/sfx/instrument/double_bass/double_bass_e.ogg similarity index 100% rename from assets/voxygen/audio/sfx/instrument/bass/bass_e.ogg rename to assets/voxygen/audio/sfx/instrument/double_bass/double_bass_e.ogg diff --git a/assets/voxygen/audio/sfx/instrument/bass/bass_e1c1.ogg b/assets/voxygen/audio/sfx/instrument/double_bass/double_bass_e1c1.ogg similarity index 100% rename from assets/voxygen/audio/sfx/instrument/bass/bass_e1c1.ogg rename to assets/voxygen/audio/sfx/instrument/double_bass/double_bass_e1c1.ogg diff --git a/assets/voxygen/audio/sfx/instrument/bass/bass_g.ogg b/assets/voxygen/audio/sfx/instrument/double_bass/double_bass_g.ogg similarity index 100% rename from assets/voxygen/audio/sfx/instrument/bass/bass_g.ogg rename to assets/voxygen/audio/sfx/instrument/double_bass/double_bass_g.ogg diff --git a/assets/voxygen/audio/sfx/instrument/bass/bass_ge.ogg b/assets/voxygen/audio/sfx/instrument/double_bass/double_bass_ge.ogg similarity index 100% rename from assets/voxygen/audio/sfx/instrument/bass/bass_ge.ogg rename to assets/voxygen/audio/sfx/instrument/double_bass/double_bass_ge.ogg diff --git a/assets/voxygen/audio/sfx/instrument/glass_flute/glass_flute_a.ogg b/assets/voxygen/audio/sfx/instrument/glass_flute/glass_flute_a.ogg new file mode 100644 index 0000000000..9786f337a0 --- /dev/null +++ b/assets/voxygen/audio/sfx/instrument/glass_flute/glass_flute_a.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9fbd76ad167c484c5d1a7155106bdbfc8eb8616c995adcf80b53854a732338af +size 41112 diff --git a/assets/voxygen/audio/sfx/instrument/glass_flute/glass_flute_c.ogg b/assets/voxygen/audio/sfx/instrument/glass_flute/glass_flute_c.ogg new file mode 100644 index 0000000000..10966f2a0c --- /dev/null +++ b/assets/voxygen/audio/sfx/instrument/glass_flute/glass_flute_c.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3205c33f5df84456c36bf5fce3e41f23b86163feefa2b038c19a32fb40efe3eb +size 41342 diff --git a/assets/voxygen/audio/sfx/instrument/glass_flute/glass_flute_c1.ogg b/assets/voxygen/audio/sfx/instrument/glass_flute/glass_flute_c1.ogg new file mode 100644 index 0000000000..036c27618e --- /dev/null +++ b/assets/voxygen/audio/sfx/instrument/glass_flute/glass_flute_c1.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3d11c842d6f038296122e226d69a9a49099ad8d7460ca3b063794cc0ecdab38e +size 41053 diff --git a/assets/voxygen/audio/sfx/instrument/glass_flute/glass_flute_c1a.ogg b/assets/voxygen/audio/sfx/instrument/glass_flute/glass_flute_c1a.ogg new file mode 100644 index 0000000000..b187a7dd24 --- /dev/null +++ b/assets/voxygen/audio/sfx/instrument/glass_flute/glass_flute_c1a.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dc0f48e72156e520fb17a9f787728b8c37bcd3d74159e4d9a28c925e8da3541c +size 41053 diff --git a/assets/voxygen/audio/sfx/instrument/glass_flute/glass_flute_c1ag.ogg b/assets/voxygen/audio/sfx/instrument/glass_flute/glass_flute_c1ag.ogg new file mode 100644 index 0000000000..0318ef248b --- /dev/null +++ b/assets/voxygen/audio/sfx/instrument/glass_flute/glass_flute_c1ag.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d0114958d0311b3188c47111acaa5604ea421871f346ae0c4412cc2659b8a334 +size 41053 diff --git a/assets/voxygen/audio/sfx/instrument/glass_flute/glass_flute_c1d1c1.ogg b/assets/voxygen/audio/sfx/instrument/glass_flute/glass_flute_c1d1c1.ogg new file mode 100644 index 0000000000..b0199de473 --- /dev/null +++ b/assets/voxygen/audio/sfx/instrument/glass_flute/glass_flute_c1d1c1.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4e305e11b71c589426e0af81a254e92637b9c39a30378e1d66cfa8c17cee643e +size 41053 diff --git a/assets/voxygen/audio/sfx/instrument/glass_flute/glass_flute_ceg.ogg b/assets/voxygen/audio/sfx/instrument/glass_flute/glass_flute_ceg.ogg new file mode 100644 index 0000000000..118c18636d --- /dev/null +++ b/assets/voxygen/audio/sfx/instrument/glass_flute/glass_flute_ceg.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e35913cfb29be04eb4937654bcb2fa84d6e2526edcc836ca0958695c7abf18ee +size 41342 diff --git a/assets/voxygen/audio/sfx/instrument/glass_flute/glass_flute_d.ogg b/assets/voxygen/audio/sfx/instrument/glass_flute/glass_flute_d.ogg new file mode 100644 index 0000000000..ddce06378d --- /dev/null +++ b/assets/voxygen/audio/sfx/instrument/glass_flute/glass_flute_d.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:86b4a7379f1a8da0c3ac97c41aabc7c648af81f18c3e6fdc7f1c96a6911c5601 +size 41342 diff --git a/assets/voxygen/audio/sfx/instrument/glass_flute/glass_flute_dac1.ogg b/assets/voxygen/audio/sfx/instrument/glass_flute/glass_flute_dac1.ogg new file mode 100644 index 0000000000..14a4a59016 --- /dev/null +++ b/assets/voxygen/audio/sfx/instrument/glass_flute/glass_flute_dac1.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ffe0832c2b28b3f8987edbfe57fc5f8afd2669bdf528563544b1365830f86d4d +size 41342 diff --git a/assets/voxygen/audio/sfx/instrument/glass_flute/glass_flute_e.ogg b/assets/voxygen/audio/sfx/instrument/glass_flute/glass_flute_e.ogg new file mode 100644 index 0000000000..27eebc60f2 --- /dev/null +++ b/assets/voxygen/audio/sfx/instrument/glass_flute/glass_flute_e.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5e5e643dc9a966c455dd9a5465738e54058b767f7f624a13b3283beb9244a21d +size 41460 diff --git a/assets/voxygen/audio/sfx/instrument/glass_flute/glass_flute_eg.ogg b/assets/voxygen/audio/sfx/instrument/glass_flute/glass_flute_eg.ogg new file mode 100644 index 0000000000..f7ae5d6d36 --- /dev/null +++ b/assets/voxygen/audio/sfx/instrument/glass_flute/glass_flute_eg.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:601554f5cd5e42f4adf58a2623d20f60418efd3c4becd88876eb5a2c71395cde +size 41460 diff --git a/assets/voxygen/audio/sfx/instrument/glass_flute/glass_flute_g.ogg b/assets/voxygen/audio/sfx/instrument/glass_flute/glass_flute_g.ogg new file mode 100644 index 0000000000..40ba29d09a --- /dev/null +++ b/assets/voxygen/audio/sfx/instrument/glass_flute/glass_flute_g.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4796de4d593b6dbdb2da5d234ce5b69eb908f328fc15018634a494715cc30338 +size 41112 diff --git a/assets/voxygen/audio/sfx/instrument/harp/harp_a.ogg b/assets/voxygen/audio/sfx/instrument/lyre/lyre_a.ogg similarity index 100% rename from assets/voxygen/audio/sfx/instrument/harp/harp_a.ogg rename to assets/voxygen/audio/sfx/instrument/lyre/lyre_a.ogg diff --git a/assets/voxygen/audio/sfx/instrument/harp/harp_c.ogg b/assets/voxygen/audio/sfx/instrument/lyre/lyre_c.ogg similarity index 100% rename from assets/voxygen/audio/sfx/instrument/harp/harp_c.ogg rename to assets/voxygen/audio/sfx/instrument/lyre/lyre_c.ogg diff --git a/assets/voxygen/audio/sfx/instrument/harp/harp_c1.ogg b/assets/voxygen/audio/sfx/instrument/lyre/lyre_c1.ogg similarity index 100% rename from assets/voxygen/audio/sfx/instrument/harp/harp_c1.ogg rename to assets/voxygen/audio/sfx/instrument/lyre/lyre_c1.ogg diff --git a/assets/voxygen/audio/sfx/instrument/harp/harp_c1ag.ogg b/assets/voxygen/audio/sfx/instrument/lyre/lyre_c1ag.ogg similarity index 100% rename from assets/voxygen/audio/sfx/instrument/harp/harp_c1ag.ogg rename to assets/voxygen/audio/sfx/instrument/lyre/lyre_c1ag.ogg diff --git a/assets/voxygen/audio/sfx/instrument/harp/harp_cde.ogg b/assets/voxygen/audio/sfx/instrument/lyre/lyre_cde.ogg similarity index 100% rename from assets/voxygen/audio/sfx/instrument/harp/harp_cde.ogg rename to assets/voxygen/audio/sfx/instrument/lyre/lyre_cde.ogg diff --git a/assets/voxygen/audio/sfx/instrument/harp/harp_d.ogg b/assets/voxygen/audio/sfx/instrument/lyre/lyre_d.ogg similarity index 100% rename from assets/voxygen/audio/sfx/instrument/harp/harp_d.ogg rename to assets/voxygen/audio/sfx/instrument/lyre/lyre_d.ogg diff --git a/assets/voxygen/audio/sfx/instrument/harp/harp_d1c1a.ogg b/assets/voxygen/audio/sfx/instrument/lyre/lyre_d1c1a.ogg similarity index 100% rename from assets/voxygen/audio/sfx/instrument/harp/harp_d1c1a.ogg rename to assets/voxygen/audio/sfx/instrument/lyre/lyre_d1c1a.ogg diff --git a/assets/voxygen/audio/sfx/instrument/harp/harp_d1g.ogg b/assets/voxygen/audio/sfx/instrument/lyre/lyre_d1g.ogg similarity index 100% rename from assets/voxygen/audio/sfx/instrument/harp/harp_d1g.ogg rename to assets/voxygen/audio/sfx/instrument/lyre/lyre_d1g.ogg diff --git a/assets/voxygen/audio/sfx/instrument/harp/harp_e.ogg b/assets/voxygen/audio/sfx/instrument/lyre/lyre_e.ogg similarity index 100% rename from assets/voxygen/audio/sfx/instrument/harp/harp_e.ogg rename to assets/voxygen/audio/sfx/instrument/lyre/lyre_e.ogg diff --git a/assets/voxygen/audio/sfx/instrument/harp/harp_ec1.ogg b/assets/voxygen/audio/sfx/instrument/lyre/lyre_ec1.ogg similarity index 100% rename from assets/voxygen/audio/sfx/instrument/harp/harp_ec1.ogg rename to assets/voxygen/audio/sfx/instrument/lyre/lyre_ec1.ogg diff --git a/assets/voxygen/audio/sfx/instrument/harp/harp_ega.ogg b/assets/voxygen/audio/sfx/instrument/lyre/lyre_ega.ogg similarity index 100% rename from assets/voxygen/audio/sfx/instrument/harp/harp_ega.ogg rename to assets/voxygen/audio/sfx/instrument/lyre/lyre_ega.ogg diff --git a/assets/voxygen/audio/sfx/instrument/harp/harp_g.ogg b/assets/voxygen/audio/sfx/instrument/lyre/lyre_g.ogg similarity index 100% rename from assets/voxygen/audio/sfx/instrument/harp/harp_g.ogg rename to assets/voxygen/audio/sfx/instrument/lyre/lyre_g.ogg diff --git a/assets/voxygen/audio/sfx/instrument/perc/perc_a.ogg b/assets/voxygen/audio/sfx/instrument/washboard/washboard_a.ogg similarity index 100% rename from assets/voxygen/audio/sfx/instrument/perc/perc_a.ogg rename to assets/voxygen/audio/sfx/instrument/washboard/washboard_a.ogg diff --git a/assets/voxygen/audio/sfx/instrument/perc/perc_c.ogg b/assets/voxygen/audio/sfx/instrument/washboard/washboard_c.ogg similarity index 100% rename from assets/voxygen/audio/sfx/instrument/perc/perc_c.ogg rename to assets/voxygen/audio/sfx/instrument/washboard/washboard_c.ogg diff --git a/assets/voxygen/audio/sfx/instrument/perc/perc_d.ogg b/assets/voxygen/audio/sfx/instrument/washboard/washboard_d.ogg similarity index 100% rename from assets/voxygen/audio/sfx/instrument/perc/perc_d.ogg rename to assets/voxygen/audio/sfx/instrument/washboard/washboard_d.ogg diff --git a/assets/voxygen/audio/sfx/instrument/perc/perc_d_d.ogg b/assets/voxygen/audio/sfx/instrument/washboard/washboard_d_d.ogg similarity index 100% rename from assets/voxygen/audio/sfx/instrument/perc/perc_d_d.ogg rename to assets/voxygen/audio/sfx/instrument/washboard/washboard_d_d.ogg diff --git a/assets/voxygen/audio/sfx/instrument/perc/perc_d_dd.ogg b/assets/voxygen/audio/sfx/instrument/washboard/washboard_d_dd.ogg similarity index 100% rename from assets/voxygen/audio/sfx/instrument/perc/perc_d_dd.ogg rename to assets/voxygen/audio/sfx/instrument/washboard/washboard_d_dd.ogg diff --git a/assets/voxygen/audio/sfx/instrument/perc/perc_dd.ogg b/assets/voxygen/audio/sfx/instrument/washboard/washboard_dd.ogg similarity index 100% rename from assets/voxygen/audio/sfx/instrument/perc/perc_dd.ogg rename to assets/voxygen/audio/sfx/instrument/washboard/washboard_dd.ogg diff --git a/assets/voxygen/audio/sfx/instrument/perc/perc_dd_d.ogg b/assets/voxygen/audio/sfx/instrument/washboard/washboard_dd_d.ogg similarity index 100% rename from assets/voxygen/audio/sfx/instrument/perc/perc_dd_d.ogg rename to assets/voxygen/audio/sfx/instrument/washboard/washboard_dd_d.ogg diff --git a/assets/voxygen/audio/sfx/instrument/perc/perc_e.ogg b/assets/voxygen/audio/sfx/instrument/washboard/washboard_e.ogg similarity index 100% rename from assets/voxygen/audio/sfx/instrument/perc/perc_e.ogg rename to assets/voxygen/audio/sfx/instrument/washboard/washboard_e.ogg diff --git a/assets/voxygen/audio/sfx/instrument/perc/perc_g.ogg b/assets/voxygen/audio/sfx/instrument/washboard/washboard_g.ogg similarity index 100% rename from assets/voxygen/audio/sfx/instrument/perc/perc_g.ogg rename to assets/voxygen/audio/sfx/instrument/washboard/washboard_g.ogg diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index 13d82e3621..4fddc7bc66 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -1618,24 +1618,28 @@ "voxel.weapon.tool.shovel_gold", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.2, ), - Simple("common.items.tool.instruments.harp"): VoxTrans( - "voxel.weapon.tool.harp", + Simple("common.items.tool.instruments.lyre"): VoxTrans( + "voxel.weapon.tool.wooden_lyre", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0, ), Simple("common.items.tool.instruments.flute"): VoxTrans( - "voxel.weapon.tool.flute", + "voxel.weapon.tool.wooden_flute", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0, ), - Simple("common.items.tool.instruments.bass"): VoxTrans( - "voxel.weapon.tool.bass", + Simple("common.items.tool.instruments.glass_flute"): VoxTrans( + "voxel.weapon.tool.glass_flute", + (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0, + ), + Simple("common.items.tool.instruments.double_bass"): VoxTrans( + "voxel.weapon.tool.wooden_bass", (0.0, 0.0, 0.0), (45.0, 90.0, 0.0), 1.4, ), - Simple("common.items.tool.instruments.perc"): VoxTrans( - "voxel.weapon.tool.perc", + Simple("common.items.tool.instruments.washboard"): VoxTrans( + "voxel.weapon.tool.washboard", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 0.8, ), Simple("common.items.tool.instruments.kalimba"): VoxTrans( - "voxel.weapon.tool.kalimba", + "voxel.weapon.tool.wooden_kalimba", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 0.8, ), Simple("common.items.tool.instruments.melodica"): VoxTrans( @@ -1643,15 +1647,19 @@ (0.0, 0.0, 0.0), (45.0, 90.0, 0.0), 0.9, ), Simple("common.items.tool.instruments.lute"): VoxTrans( - "voxel.weapon.tool.lute", + "voxel.weapon.tool.wooden_lute", (0.0, 0.0, 0.0), (45.0, 90.0, 0.0), 1.0, ), Simple("common.items.tool.instruments.guitar"): VoxTrans( - "voxel.weapon.tool.guitar", + "voxel.weapon.tool.wooden_guitar", + (0.0, 0.0, 0.0), (45.0, 90.0, 0.0), 1.1, + ), + Simple("common.items.tool.instruments.guitar_dark"): VoxTrans( + "voxel.weapon.tool.black_velvet_guitar", (0.0, 0.0, 0.0), (45.0, 90.0, 0.0), 1.1, ), Simple("common.items.tool.instruments.sitar"): VoxTrans( - "voxel.weapon.tool.sitar", + "voxel.weapon.tool.wooden_sitar", (0.0, 0.0, 0.0), (45.0, 90.0, 0.0), 1.2, ), // Picks @@ -3444,6 +3452,10 @@ "voxel.sprite.crafting_ing.sticky_thread", (0.0, 0.0, 0.0), (-65.0, 0.0, 20.0), 0.9, ), + Simple("common.items.crafting_ing.resin"): VoxTrans( + "voxel.sprite.crafting_ing.resin", + (0.0, 0.0, 0.0), (-65.0, 0.0, 20.0), 0.9, + ), Simple("common.items.mineral.ingot.silver"): VoxTrans( "voxel.sprite.mineral.ingot.silver", (0.0, 0.0, 0.0), (70.0, 30.0, 170.0), 0.85, diff --git a/assets/voxygen/voxel/armor/misc/head/helmet_orc_m.vox b/assets/voxygen/voxel/armor/misc/head/helmet_orc_m.vox new file mode 100644 index 0000000000..66c3714ad3 --- /dev/null +++ b/assets/voxygen/voxel/armor/misc/head/helmet_orc_m.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:93fb57105ffbe32e14b6194af95c190fab7a23588ff23ab6cfd0cf83cd9c528f +size 45143 diff --git a/assets/voxygen/voxel/biped_weapon_manifest.ron b/assets/voxygen/voxel/biped_weapon_manifest.ron index 0892b818aa..0245b8722f 100644 --- a/assets/voxygen/voxel/biped_weapon_manifest.ron +++ b/assets/voxygen/voxel/biped_weapon_manifest.ron @@ -1120,24 +1120,28 @@ vox_spec: ("weapon.tool.shovel_gold", (-1.0, -2.5, -4.0)), color: None ), - Tool("common.items.tool.instruments.harp"): ( - vox_spec: ("weapon.tool.harp", (-3.5, -7.0, 6.0)), + Tool("common.items.tool.instruments.lyre"): ( + vox_spec: ("weapon.tool.wooden_lyre", (-3.5, -7.0, 6.0)), color: None ), Tool("common.items.tool.instruments.flute"): ( - vox_spec: ("weapon.tool.flute", (-4.5, -4.5, 8.0)), + vox_spec: ("weapon.tool.wooden_flute", (-4.5, -4.5, 8.0)), color: None ), - Tool("common.items.tool.instruments.bass"): ( - vox_spec: ("weapon.tool.bass", (-3.5, -6.0, 0.0)), + Tool("common.items.tool.instruments.glass_flute"): ( + vox_spec: ("weapon.tool.glass_flute", (-4.5, -4.5, 8.0)), color: None ), - Tool("common.items.tool.instruments.perc"): ( - vox_spec: ("weapon.tool.perc", (-3.0, -6.0, 9.0)), + Tool("common.items.tool.instruments.double_bass"): ( + vox_spec: ("weapon.tool.wooden_bass", (-3.5, -6.0, 0.0)), + color: None + ), + Tool("common.items.tool.instruments.washboard"): ( + vox_spec: ("weapon.tool.washboard", (-3.0, -6.0, 9.0)), color: None ), Tool("common.items.tool.instruments.kalimba"): ( - vox_spec: ("weapon.tool.kalimba", (-3.5, -7.0, 6.0)), + vox_spec: ("weapon.tool.wooden_kalimba", (-3.5, -7.0, 6.0)), color: None ), Tool("common.items.tool.instruments.melodica"): ( @@ -1145,15 +1149,19 @@ color: None ), Tool("common.items.tool.instruments.lute"): ( - vox_spec: ("weapon.tool.lute", (-2.5, -6.0, 4.0)), + vox_spec: ("weapon.tool.wooden_lute", (-2.5, -6.0, 4.0)), + color: None + ), + Tool("common.items.tool.instruments.guitar"): ( + vox_spec: ("weapon.tool.wooden_guitar", (-4.5, -6.0, 0.0)), color: None ), - Tool("common.items.tool.instruments.guitar"): ( - vox_spec: ("weapon.tool.guitar", (-4.5, -6.0, 0.0)), + Tool("common.items.tool.instruments.guitar_dark"): ( + vox_spec: ("weapon.tool.black_velvet_guitar", (-4.5, -6.0, 0.0)), color: None ), Tool("common.items.tool.instruments.sitar"): ( - vox_spec: ("weapon.tool.sitar", (-4.0, -6.0, 5.0)), + vox_spec: ("weapon.tool.wooden_sitar", (-4.0, -6.0, 5.0)), color: None ), // Staves diff --git a/assets/voxygen/voxel/humanoid_armor_head_manifest.ron b/assets/voxygen/voxel/humanoid_armor_head_manifest.ron index d689a95f76..8f15dc98fc 100644 --- a/assets/voxygen/voxel/humanoid_armor_head_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_head_manifest.ron @@ -635,11 +635,11 @@ color: None ), (Orc, Female, "common.items.armor.misc.head.helmet"): ( - vox_spec: ("armor.misc.head.helmet", (-3.0, -6.0, -1.0)), + vox_spec: ("armor.misc.head.helmet", (-3.0, -7.0, -1.0)), color: None ), (Orc, Male, "common.items.armor.misc.head.helmet"): ( - vox_spec: ("armor.misc.head.helmet", (-3.0, -6.0, 2.0)), + vox_spec: ("armor.misc.head.helmet_orc_m", (-3.0, -4.0, 0.0)), color: None ), (Dwarf, Female, "common.items.armor.misc.head.helmet"): ( diff --git a/assets/voxygen/voxel/item_drop_manifest.ron b/assets/voxygen/voxel/item_drop_manifest.ron index 432766f6ed..379f713ab6 100644 --- a/assets/voxygen/voxel/item_drop_manifest.ron +++ b/assets/voxygen/voxel/item_drop_manifest.ron @@ -398,15 +398,17 @@ Simple("common.items.tool.pickaxe_stone"): "voxel.weapon.tool.pickaxe_green-0", Simple("common.items.tool.pickaxe_steel"): "voxel.weapon.tool.pickaxe_green-1", // Instruments - Simple("common.items.tool.instruments.bass"): "voxel.weapon.tool.bass", - Simple("common.items.tool.instruments.flute"): "voxel.weapon.tool.flute", - Simple("common.items.tool.instruments.harp"): "voxel.weapon.tool.harp", - Simple("common.items.tool.instruments.perc"): "voxel.weapon.tool.perc", - Simple("common.items.tool.instruments.kalimba"): "voxel.weapon.tool.kalimba", + Simple("common.items.tool.instruments.double_bass"): "voxel.weapon.tool.wooden_bass", + 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.washboard"): "voxel.weapon.tool.washboard", + Simple("common.items.tool.instruments.kalimba"): "voxel.weapon.tool.wooden_kalimba", Simple("common.items.tool.instruments.melodica"): "voxel.weapon.tool.melodica", - Simple("common.items.tool.instruments.lute"): "voxel.weapon.tool.lute", - Simple("common.items.tool.instruments.sitar"): "voxel.weapon.tool.sitar", - Simple("common.items.tool.instruments.guitar"): "voxel.weapon.tool.guitar", + Simple("common.items.tool.instruments.lute"): "voxel.weapon.tool.wooden_lute", + Simple("common.items.tool.instruments.sitar"): "voxel.weapon.tool.wooden_sitar", + Simple("common.items.tool.instruments.guitar"): "voxel.weapon.tool.wooden_guitar", + Simple("common.items.tool.instruments.guitar_dark"): "voxel.weapon.tool.black_velvet_guitar", // Other Simple("common.items.utility.coins"): "voxel.object.v-coin", Simple("common.items.utility.collar"): "voxel.object.collar", @@ -873,6 +875,7 @@ Simple("common.items.crafting_ing.cloth.sunsilk"): "voxel.sprite.crafting_ing.cloth.sunsilk", Simple("common.items.crafting_ing.cloth.linen_red"): "voxel.sprite.crafting_ing.cloth.linen_red", Simple("common.items.crafting_ing.sticky_thread"): "voxel.sprite.crafting_ing.sticky_thread", + Simple("common.items.crafting_ing.resin"): "voxel.sprite.crafting_ing.resin", Simple("common.items.mineral.ingot.silver"): "voxel.sprite.mineral.ingot.silver", Simple("common.items.mineral.ingot.gold"): "voxel.sprite.mineral.ingot.gold", Simple("common.items.mineral.ingot.orichalcum"): "voxel.sprite.mineral.ingot.orichalcum", diff --git a/assets/voxygen/voxel/sprite/crafting_ing/resin.vox b/assets/voxygen/voxel/sprite/crafting_ing/resin.vox new file mode 100644 index 0000000000..0338ffecb3 --- /dev/null +++ b/assets/voxygen/voxel/sprite/crafting_ing/resin.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ab3df7cbdbdb22f0f854f91f413052be588e7290343a3e217ebd111bf02b9566 +size 1784 diff --git a/assets/voxygen/voxel/weapon/tool/bass.vox b/assets/voxygen/voxel/weapon/tool/bass.vox deleted file mode 100644 index 15ca2fba7f..0000000000 --- a/assets/voxygen/voxel/weapon/tool/bass.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a810ac89e4fc98481f310e9082a75d4b1c09ac2d91167b34c19dca10b5871068 -size 2432 diff --git a/assets/voxygen/voxel/weapon/tool/black_velvet_guitar.vox b/assets/voxygen/voxel/weapon/tool/black_velvet_guitar.vox new file mode 100644 index 0000000000..635b809bfe --- /dev/null +++ b/assets/voxygen/voxel/weapon/tool/black_velvet_guitar.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1cd9abc3a5637a924446ea7f114a238b7761982ff931c8b754f960daef2dc04f +size 2464 diff --git a/assets/voxygen/voxel/weapon/tool/flute.vox b/assets/voxygen/voxel/weapon/tool/flute.vox deleted file mode 100644 index d2c38d5dd6..0000000000 --- a/assets/voxygen/voxel/weapon/tool/flute.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:000d2af2baa0c4c126b7bd678afb9500d9cf87b19045b63805bd40923e41b1b6 -size 1296 diff --git a/assets/voxygen/voxel/weapon/tool/glass_flute.vox b/assets/voxygen/voxel/weapon/tool/glass_flute.vox new file mode 100644 index 0000000000..0425bb94ca --- /dev/null +++ b/assets/voxygen/voxel/weapon/tool/glass_flute.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a09fcf3e3049ab320b8de7ca2e5c500f8f7e9d03a1ce44aae7eb4e9f72403bf2 +size 1296 diff --git a/assets/voxygen/voxel/weapon/tool/guitar.vox b/assets/voxygen/voxel/weapon/tool/guitar.vox deleted file mode 100644 index f3820d0448..0000000000 --- a/assets/voxygen/voxel/weapon/tool/guitar.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:02532f058bf89fe6638bce47049baef4d7555e69ef38c069bfce85ca485a78eb -size 2464 diff --git a/assets/voxygen/voxel/weapon/tool/guitar_dark.vox b/assets/voxygen/voxel/weapon/tool/guitar_dark.vox new file mode 100644 index 0000000000..1e8f618f33 --- /dev/null +++ b/assets/voxygen/voxel/weapon/tool/guitar_dark.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:721e2ed7ec525d0704b86f071435bf815f08ddefb859371eb56314236f25d237 +size 28066 diff --git a/assets/voxygen/voxel/weapon/tool/harp.vox b/assets/voxygen/voxel/weapon/tool/harp.vox deleted file mode 100644 index 160d87a307..0000000000 --- a/assets/voxygen/voxel/weapon/tool/harp.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f265ae693ac68c7055849c091763e359d6ee286957ffd46264ceb1094551a399 -size 1464 diff --git a/assets/voxygen/voxel/weapon/tool/kalimba.vox b/assets/voxygen/voxel/weapon/tool/kalimba.vox deleted file mode 100644 index 2673dd9e66..0000000000 --- a/assets/voxygen/voxel/weapon/tool/kalimba.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bef938960cd1af6a5953f02b700eb404af5e45e1634aacb4116fce93d76d8ddc -size 2068 diff --git a/assets/voxygen/voxel/weapon/tool/lute.vox b/assets/voxygen/voxel/weapon/tool/lute.vox deleted file mode 100644 index 373899aa21..0000000000 --- a/assets/voxygen/voxel/weapon/tool/lute.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:19ad242a3cd402407d6f5f4588ec5e2f20ccafdab03a1c4fbe56f83af4ed1375 -size 1428 diff --git a/assets/voxygen/voxel/weapon/tool/melodica.vox b/assets/voxygen/voxel/weapon/tool/melodica.vox index 2e19f5c863..09bd74aa90 100644 --- a/assets/voxygen/voxel/weapon/tool/melodica.vox +++ b/assets/voxygen/voxel/weapon/tool/melodica.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f8157ee1dcc54068203bca210ab47da9ecef6e2569525ff7d4968056fbb19a1c +oid sha256:6b606849518fd61e0672ceb25bc72614f066f888664dcaaa88f1a2b88ead97b1 size 1444 diff --git a/assets/voxygen/voxel/weapon/tool/perc.vox b/assets/voxygen/voxel/weapon/tool/perc.vox deleted file mode 100644 index a478cdbc02..0000000000 --- a/assets/voxygen/voxel/weapon/tool/perc.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f1b869109fb6714e9c6f7d8732cd7ad7c5318f4780ff97d8aabcf83998c8dcc2 -size 1364 diff --git a/assets/voxygen/voxel/weapon/tool/sitar.vox b/assets/voxygen/voxel/weapon/tool/sitar.vox deleted file mode 100644 index eaaf8cba84..0000000000 --- a/assets/voxygen/voxel/weapon/tool/sitar.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8d66f0188b78934f6785ce71cce5067443c7813521609fa50b8bbc68d8d1fdc0 -size 1700 diff --git a/assets/voxygen/voxel/weapon/tool/washboard.vox b/assets/voxygen/voxel/weapon/tool/washboard.vox new file mode 100644 index 0000000000..73dc5226dd --- /dev/null +++ b/assets/voxygen/voxel/weapon/tool/washboard.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8bace74d8e42b156fe27535e76957987ddfffa0350cec8225bb9d92ceb698d80 +size 1364 diff --git a/assets/voxygen/voxel/weapon/tool/wooden_bass.vox b/assets/voxygen/voxel/weapon/tool/wooden_bass.vox new file mode 100644 index 0000000000..06a1d60324 --- /dev/null +++ b/assets/voxygen/voxel/weapon/tool/wooden_bass.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0300a1b7e7f9ae6433e87070903d742e4a886b988f2295a2ac10c0824e48785c +size 2564 diff --git a/assets/voxygen/voxel/weapon/tool/wooden_flute.vox b/assets/voxygen/voxel/weapon/tool/wooden_flute.vox new file mode 100644 index 0000000000..70871aa13c --- /dev/null +++ b/assets/voxygen/voxel/weapon/tool/wooden_flute.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ae9c7276c6261308808801287b687f25a46502bc0cde850a104c70fac39add1 +size 1296 diff --git a/assets/voxygen/voxel/weapon/tool/wooden_guitar.vox b/assets/voxygen/voxel/weapon/tool/wooden_guitar.vox new file mode 100644 index 0000000000..f760aa5791 --- /dev/null +++ b/assets/voxygen/voxel/weapon/tool/wooden_guitar.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:da30ac8c972e65bb098eb4b733dc581d07c99a8ce54d681d61d53ee0e7295a3a +size 2464 diff --git a/assets/voxygen/voxel/weapon/tool/wooden_kalimba.vox b/assets/voxygen/voxel/weapon/tool/wooden_kalimba.vox new file mode 100644 index 0000000000..eaf9a413c1 --- /dev/null +++ b/assets/voxygen/voxel/weapon/tool/wooden_kalimba.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f191928395cbdb886cc34f05fb2e564ea55f2e710e1b08954c250a4a5bc0b3da +size 2140 diff --git a/assets/voxygen/voxel/weapon/tool/wooden_lute.vox b/assets/voxygen/voxel/weapon/tool/wooden_lute.vox new file mode 100644 index 0000000000..087624b78a --- /dev/null +++ b/assets/voxygen/voxel/weapon/tool/wooden_lute.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0e4123a295560729fac3408cb616c72a68f1c8d945bc15b5efa62a818e09422d +size 1436 diff --git a/assets/voxygen/voxel/weapon/tool/wooden_lyre.vox b/assets/voxygen/voxel/weapon/tool/wooden_lyre.vox new file mode 100644 index 0000000000..660c8a6736 --- /dev/null +++ b/assets/voxygen/voxel/weapon/tool/wooden_lyre.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:19ce4de71fafd64b7ce20b744a25fc4d60dab3155715470dc6b725845c3d1c05 +size 1604 diff --git a/assets/voxygen/voxel/weapon/tool/wooden_sitar.vox b/assets/voxygen/voxel/weapon/tool/wooden_sitar.vox new file mode 100644 index 0000000000..91b58f9fb8 --- /dev/null +++ b/assets/voxygen/voxel/weapon/tool/wooden_sitar.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cfa04e41ce576f55aef6b94e4bb6580f0d1491f5361abc0604f23b37443f2275 +size 1812 diff --git a/server/src/migrations/V50__musical_instruments.sql b/server/src/migrations/V50__musical_instruments.sql new file mode 100644 index 0000000000..791b830b9a --- /dev/null +++ b/server/src/migrations/V50__musical_instruments.sql @@ -0,0 +1,6 @@ +UPDATE item +SET item_definition_id = 'common.items.tool.instruments.double_bass' WHERE item_definition_id = 'common.items.tool.instruments.bass'; +UPDATE item +SET item_definition_id = 'common.items.tool.instruments.lyre' WHERE item_definition_id = 'common.items.tool.instruments.harp'; +UPDATE item +SET item_definition_id = 'common.items.tool.instruments.washboard' WHERE item_definition_id = 'common.items.tool.instruments.perc'; \ No newline at end of file diff --git a/voxygen/anim/src/character/music.rs b/voxygen/anim/src/character/music.rs index fa583c5590..e42db84722 100644 --- a/voxygen/anim/src/character/music.rs +++ b/voxygen/anim/src/character/music.rs @@ -104,9 +104,9 @@ impl Animation for MusicAnimation { if let Some(AbilitySpec::Custom(spec)) = active_tool_spec { // instrument specific head_bop let head_bop = match spec.as_str() { - "Flute" | "Melodica" => 0.2, + "Flute" | "GlassFlute" | "Melodica" => 0.2, "Guitar" | "Lute" | "Sitar" => 0.5, - "Harp" | "Kalimba" => 0.3, + "Lyre" | "Kalimba" => 0.3, _ => 1.0, }; next.head.position = Vec3::new(0.0, s_a.head.0, s_a.head.1); @@ -116,7 +116,7 @@ impl Animation for MusicAnimation { ); // instrument specific hand and instrument animations match spec.as_str() { - "Bass" => { + "DoubleBass" => { next.hand_l.position = Vec3::new( 3.5 - s_a.hand.0, 7.0 + s_a.hand.1 + shortealt * -3.0, @@ -138,7 +138,7 @@ impl Animation for MusicAnimation { * Quaternion::rotation_y(3.0) * Quaternion::rotation_z(PI / -3.0); }, - "Flute" => { + "Flute" | "GlassFlute" => { next.hand_l.position = Vec3::new( 4.0 - s_a.hand.0, 6.0 + s_a.hand.1 + shortealt * -0.5, @@ -183,7 +183,7 @@ impl Animation for MusicAnimation { * Quaternion::rotation_y(2.0) * Quaternion::rotation_z(PI / -3.0); }, - "Harp" => { + "Lyre" => { next.hand_l.position = Vec3::new( 3.0 - s_a.hand.0, 4.0 + s_a.hand.1 + shortealt * -0.1, @@ -273,7 +273,7 @@ impl Animation for MusicAnimation { * Quaternion::rotation_y(PI) * Quaternion::rotation_z(PI / -2.0); }, - "Perc" => { + "Washboard" => { next.hand_l.position = Vec3::new( 3.0 - s_a.hand.0, 4.0 + s_a.hand.1 + shortealt * -0.1, @@ -313,7 +313,7 @@ impl Animation for MusicAnimation { next.hand_r.orientation = Quaternion::rotation_x(1.0 + foot * -0.15) * Quaternion::rotation_y(0.6); - next.main.position = Vec3::new(-14.0, 6.0, 4.0); + next.main.position = Vec3::new(-15.0, 6.0, 4.0); next.main.orientation = Quaternion::rotation_x(0.1) * Quaternion::rotation_y(2.0) * Quaternion::rotation_z(PI / -3.0); diff --git a/voxygen/anim/src/character/sneakwield.rs b/voxygen/anim/src/character/sneakwield.rs index 1a07f7a93d..1ab8060643 100644 --- a/voxygen/anim/src/character/sneakwield.rs +++ b/voxygen/anim/src/character/sneakwield.rs @@ -292,7 +292,7 @@ impl Animation for SneakWieldAnimation { Some(ToolKind::Instrument) => { if let Some(AbilitySpec::Custom(spec)) = active_tool_spec { match spec.as_str() { - "Perc" => { + "Washboard" => { next.hand_l.position = Vec3::new(-7.0, 0.0, 3.0); next.hand_l.orientation = Quaternion::rotation_x(1.27); next.main.position = Vec3::new(-5.0, -4.5, -5.0); diff --git a/voxygen/anim/src/character/wield.rs b/voxygen/anim/src/character/wield.rs index 6d71f25321..b8edcae9f2 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() { - "Harp" => { + "Lyre" => { if speed < 0.5 { next.head.orientation = Quaternion::rotation_z(head_look.x) * Quaternion::rotation_x( @@ -329,7 +329,7 @@ impl Animation for WieldAnimation { * Quaternion::rotation_y(2.0 + u_slow * 0.1) * Quaternion::rotation_z(u_slowalt * 0.1); }, - "Flute" => { + "Flute" | "GlassFlute" => { if speed < 0.5 { next.head.orientation = Quaternion::rotation_z(head_look.x) * Quaternion::rotation_x( @@ -351,14 +351,14 @@ impl Animation for WieldAnimation { * Quaternion::rotation_y(2.0 + u_slow * 0.1) * Quaternion::rotation_z(u_slowalt * 0.1); }, - "Bass" => { + "DoubleBass" => { if speed < 0.5 { next.head.orientation = Quaternion::rotation_z(head_look.x) * Quaternion::rotation_x( 0.0 + head_look.y.abs() + look_dir.z * 0.7, ); } - next.hand_l.position = Vec3::new(-6.0, 5.0, -5.0); + next.hand_l.position = Vec3::new(-6.0, 6.0, -5.0); next.hand_l.orientation = Quaternion::rotation_x((PI / 2.0) + 0.3) * Quaternion::rotation_y(0.7) * Quaternion::rotation_y(0.25) @@ -366,7 +366,7 @@ impl Animation for WieldAnimation { next.hand_r.position = Vec3::new(-2.0, 4.0, 5.0); next.hand_r.orientation = Quaternion::rotation_x(PI / 2.0) * Quaternion::rotation_z(PI / 2.0); - next.main.position = Vec3::new(-14.0, 4.0, -6.0); + next.main.position = Vec3::new(-14.0, 6.0, -6.0); next.main.orientation = Quaternion::rotation_x(-0.2) * Quaternion::rotation_y(1.2) * Quaternion::rotation_z(-1.2); @@ -376,7 +376,7 @@ impl Animation for WieldAnimation { * Quaternion::rotation_y(2.0 + u_slow * 0.1) * Quaternion::rotation_z(u_slowalt * 0.1); }, - "Perc" => { + "Washboard" => { if speed < 0.5 { next.head.orientation = Quaternion::rotation_z(head_look.x) * Quaternion::rotation_x( diff --git a/voxygen/src/hud/group.rs b/voxygen/src/hud/group.rs index 243bea8fb7..c826a979f6 100644 --- a/voxygen/src/hud/group.rs +++ b/voxygen/src/hud/group.rs @@ -393,8 +393,8 @@ impl<'a> Widget for Group<'a> { let char_name = stats.name.to_string(); let health_perc = health.current() / health.base_max().max(health.maximum()); // change panel positions when debug info is shown - let x = if debug_on { i / 8 } else { i / 12 }; - let y = if debug_on { i % 8 } else { i % 12 }; + let x = if debug_on { i / 8 } else { i / 11 }; + let y = if debug_on { i % 8 } else { i % 11 }; let back = Image::new(self.imgs.member_bg).top_left_with_margins_on( ui.window, 50.0 + offset + y as f64 * 77.0, diff --git a/voxygen/src/hud/util.rs b/voxygen/src/hud/util.rs index c0eecda954..7588fa5ea6 100644 --- a/voxygen/src/hud/util.rs +++ b/voxygen/src/hud/util.rs @@ -407,6 +407,10 @@ pub fn ability_image(imgs: &img_ids::Imgs, ability_id: &str) -> image::Id { "common.abilities.music.lute" => imgs.instrument, "common.abilities.music.guitar" => imgs.instrument, "common.abilities.music.sitar" => imgs.instrument, + "common.abilities.music.double_bass" => imgs.instrument, + "common.abilities.music.glass_flute" => imgs.instrument, + "common.abilities.music.lyre" => imgs.instrument, + "common.abilities.music.washboard" => imgs.instrument, _ => imgs.not_found, } }