Musical Instruments part 2

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 <https://account.veloren.net>)
 - Added gamepad/controller support
 - Added player feedback when attempting to pickup an item with a full inventory
 - Added free look

assets/common/abilities/ability_set_manifest.ron

@@ -474,9 +474,9 @@
         secondary: "common.abilities.tool.golf_club.charged",
         abilities: [],
     ),
-    Custom("Bass"): (
+    Custom("DoubleBass"): (
-        primary: "common.abilities.music.bass",
+        primary: "common.abilities.music.double_bass",
-        secondary: "common.abilities.music.bass",
+        secondary: "common.abilities.music.double_bass",
         abilities: [],
     ),
     Custom("Flute"): (
@@ -484,14 +484,19 @@
         secondary: "common.abilities.music.flute",
         abilities: [],
     ),
-    Custom("Harp"): (
+    Custom("GlassFlute"): (
-        primary: "common.abilities.music.harp",
+        primary: "common.abilities.music.glass_flute",
-        secondary: "common.abilities.music.harp",
+        secondary: "common.abilities.music.glass_flute",
         abilities: [],
     ),
-    Custom("Perc"): (
+    Custom("Lyre"): (
-        primary: "common.abilities.music.perc",
+        primary: "common.abilities.music.lyre",
-        secondary: "common.abilities.music.perc",
+        secondary: "common.abilities.music.lyre",
+        abilities: [],
+    ),
+    Custom("Washboard"): (
+        primary: "common.abilities.music.washboard",
+        secondary: "common.abilities.music.washboard",
         abilities: [],
     ),
     Custom("Kalimba"): (

assets/common/abilities/music/washboard.ron

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

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")),

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: [

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: [],
+)

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")),
+)

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")),
 )

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")),
+)

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")),
 )

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

@@ -1,6 +1,6 @@
 ItemDef(
-    name: "Bass",
+    name: "Dark Guitar",
-    description: "Common Bass.",
+    description: "Sounds edgy.",
     kind: Tool((
         kind: Instrument,
         hands: Two,
@@ -16,6 +16,6 @@ ItemDef(
         ),
     )),
     quality: Common,
-    tags: [],
+    tags: [Utility],
-    ability_spec: Some(Custom("Bass")),
+    ability_spec: Some(Custom("Guitar")),
 )

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")),
 )

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")),
 )

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

@@ -1,6 +1,6 @@
 ItemDef(
-    name: "Harp",
+    name: "Lyre",
-    description: "Common Harp.",
+    description: "Wooden Lyre.",
     kind: Tool((
         kind: Instrument,
         hands: Two,
@@ -16,6 +16,6 @@ ItemDef(
         ),
     )),
     quality: Common,
-    tags: [],
+    tags: [Utility],
-    ability_spec: Some(Custom("Harp")),
+    ability_spec: Some(Custom("Lyre")),
 )

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")),
 )

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")),
 )

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

@@ -1,6 +1,6 @@
 ItemDef(
-    name: "Waschbrett",
+    name: "Washboard",
-    description: "Waschbrett.",
+    description: "Washboard.",
     kind: Tool((
         kind: Instrument,
         hands: Two,
@@ -16,6 +16,6 @@ ItemDef(
         ),
     )),
     quality: Common,
-    tags: [],
+    tags: [Utility],
-    ability_spec: Some(Custom("Perc")),
+    ability_spec: Some(Custom("Washboard")),
 )

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")),
 ]

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.0, Item("common.items.crafting_ing.coral_branch")),
-    (2.5, Item("common.items.crafting_ing.seashells")),
+    (2.5, ItemQuantity("common.items.utility.coins", 50, 100)),
+    (0.2, Item("common.items.tool.instruments.glass_flute")),
 ]

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")),
 ]

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,
+    ),
 }

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),
     ],
 })

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.double_bass.double_bass_c",
-            "voxygen.audio.sfx.instrument.bass.bass_g",
+            "voxygen.audio.sfx.instrument.double_bass.double_bass_g",
-            "voxygen.audio.sfx.instrument.bass.bass_d",
+            "voxygen.audio.sfx.instrument.double_bass.double_bass_d",
-            "voxygen.audio.sfx.instrument.bass.bass_a",
+            "voxygen.audio.sfx.instrument.double_bass.double_bass_a",
-            "voxygen.audio.sfx.instrument.bass.bass_e",
+            "voxygen.audio.sfx.instrument.double_bass.double_bass_e",
-            "voxygen.audio.sfx.instrument.bass.bass_c1",
+            "voxygen.audio.sfx.instrument.double_bass.double_bass_c1",
-            "voxygen.audio.sfx.instrument.bass.bass_ac1",
+            "voxygen.audio.sfx.instrument.double_bass.double_bass_ac1",
-            "voxygen.audio.sfx.instrument.bass.bass_ag",
+            "voxygen.audio.sfx.instrument.double_bass.double_bass_ag",
-            "voxygen.audio.sfx.instrument.bass.bass_cec",
+            "voxygen.audio.sfx.instrument.double_bass.double_bass_cec",
-            "voxygen.audio.sfx.instrument.bass.bass_de",
+            "voxygen.audio.sfx.instrument.double_bass.double_bass_de",
-            "voxygen.audio.sfx.instrument.bass.bass_e1c1",
+            "voxygen.audio.sfx.instrument.double_bass.double_bass_e1c1",
-            "voxygen.audio.sfx.instrument.bass.bass_ge",
+            "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.glass_flute.glass_flute_c",
-            "voxygen.audio.sfx.instrument.harp.harp_g",
+            "voxygen.audio.sfx.instrument.glass_flute.glass_flute_g",
-            "voxygen.audio.sfx.instrument.harp.harp_d",
+            "voxygen.audio.sfx.instrument.glass_flute.glass_flute_d",
-            "voxygen.audio.sfx.instrument.harp.harp_a",
+            "voxygen.audio.sfx.instrument.glass_flute.glass_flute_a",
-            "voxygen.audio.sfx.instrument.harp.harp_e",
+            "voxygen.audio.sfx.instrument.glass_flute.glass_flute_e",
-            "voxygen.audio.sfx.instrument.harp.harp_c1",
+            "voxygen.audio.sfx.instrument.glass_flute.glass_flute_c1",
-            "voxygen.audio.sfx.instrument.harp.harp_c1ag",
+            "voxygen.audio.sfx.instrument.glass_flute.glass_flute_c1a",
-            "voxygen.audio.sfx.instrument.harp.harp_cde",
+            "voxygen.audio.sfx.instrument.glass_flute.glass_flute_c1ag",
-            "voxygen.audio.sfx.instrument.harp.harp_d1c1a",
+            "voxygen.audio.sfx.instrument.glass_flute.glass_flute_c1d1c1",
-            "voxygen.audio.sfx.instrument.harp.harp_d1g",
+            "voxygen.audio.sfx.instrument.glass_flute.glass_flute_ceg",
-            "voxygen.audio.sfx.instrument.harp.harp_ec1",
+            "voxygen.audio.sfx.instrument.glass_flute.glass_flute_dac1",
-            "voxygen.audio.sfx.instrument.harp.harp_ega",
+            "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.washboard.washboard_c",
-            "voxygen.audio.sfx.instrument.perc.perc_g",
+            "voxygen.audio.sfx.instrument.washboard.washboard_g",
-            "voxygen.audio.sfx.instrument.perc.perc_d",
+            "voxygen.audio.sfx.instrument.washboard.washboard_d",
-            "voxygen.audio.sfx.instrument.perc.perc_d",
+            "voxygen.audio.sfx.instrument.washboard.washboard_d",
-            "voxygen.audio.sfx.instrument.perc.perc_d",
+            "voxygen.audio.sfx.instrument.washboard.washboard_d",
-            "voxygen.audio.sfx.instrument.perc.perc_d",
+            "voxygen.audio.sfx.instrument.washboard.washboard_d",
-            "voxygen.audio.sfx.instrument.perc.perc_d_d",
+            "voxygen.audio.sfx.instrument.washboard.washboard_d_d",
-            "voxygen.audio.sfx.instrument.perc.perc_dd",
+            "voxygen.audio.sfx.instrument.washboard.washboard_dd",
-            "voxygen.audio.sfx.instrument.perc.perc_d_dd",
+            "voxygen.audio.sfx.instrument.washboard.washboard_d_dd",
-            "voxygen.audio.sfx.instrument.perc.perc_dd_d",
+            "voxygen.audio.sfx.instrument.washboard.washboard_dd_d",
-            "voxygen.audio.sfx.instrument.perc.perc_a",
+            "voxygen.audio.sfx.instrument.washboard.washboard_a",
-            "voxygen.audio.sfx.instrument.perc.perc_e",
+            "voxygen.audio.sfx.instrument.washboard.washboard_e",
             ],
             threshold: 0.5,
             ),

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(
+    Simple("common.items.tool.instruments.lyre"): VoxTrans(
-        "voxel.weapon.tool.harp",
+        "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(
+    Simple("common.items.tool.instruments.glass_flute"): VoxTrans(
-        "voxel.weapon.tool.bass",
+        "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(
+    Simple("common.items.tool.instruments.washboard"): VoxTrans(
-        "voxel.weapon.tool.perc",
+        "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,

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"): (
+    Tool("common.items.tool.instruments.lyre"): (
-        vox_spec: ("weapon.tool.harp", (-3.5, -7.0, 6.0)),
+        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"): (
+    Tool("common.items.tool.instruments.glass_flute"): (
-        vox_spec: ("weapon.tool.bass", (-3.5, -6.0, 0.0)),
+        vox_spec: ("weapon.tool.glass_flute", (-4.5, -4.5, 8.0)),
         color: None
     ),
-    Tool("common.items.tool.instruments.perc"): (
+    Tool("common.items.tool.instruments.double_bass"): (
-        vox_spec: ("weapon.tool.perc", (-3.0, -6.0, 9.0)),
+        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.guitar", (-4.5, -6.0, 0.0)),
+        vox_spec: ("weapon.tool.wooden_guitar", (-4.5, -6.0, 0.0)),
+        color: None
+    ),
+    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

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"): (

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.double_bass"): "voxel.weapon.tool.wooden_bass",
-    Simple("common.items.tool.instruments.flute"): "voxel.weapon.tool.flute",
+    Simple("common.items.tool.instruments.flute"): "voxel.weapon.tool.wooden_flute",
-    Simple("common.items.tool.instruments.harp"): "voxel.weapon.tool.harp",
+    Simple("common.items.tool.instruments.glass_flute"): "voxel.weapon.tool.glass_flute",
-    Simple("common.items.tool.instruments.perc"): "voxel.weapon.tool.perc",
+    Simple("common.items.tool.instruments.lyre"): "voxel.weapon.tool.wooden_lyre",
-    Simple("common.items.tool.instruments.kalimba"): "voxel.weapon.tool.kalimba",
+    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.lute"): "voxel.weapon.tool.wooden_lute",
-    Simple("common.items.tool.instruments.sitar"): "voxel.weapon.tool.sitar",
+    Simple("common.items.tool.instruments.sitar"): "voxel.weapon.tool.wooden_sitar",
-    Simple("common.items.tool.instruments.guitar"): "voxel.weapon.tool.guitar",
+    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",

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';

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);

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);