lute & oud

assets/common/abilities/ability_set_manifest.ron

@@ -1002,6 +1002,11 @@
         secondary: Simple(None, "common.abilities.music.lute"),
         abilities: [],
     ),
+    Custom("Oud"): (
+        primary: Simple(None, "common.abilities.music.oud"),
+        secondary: Simple(None, "common.abilities.music.oud"),
+        abilities: [],
+    ),    
     Custom("Guitar"): (
         primary: Simple(None, "common.abilities.music.guitar"),
         secondary: Simple(None, "common.abilities.music.guitar"),

assets/common/abilities/music/oud.ron

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

assets/common/item_i18n_manifest.ron

@@ -2546,6 +2546,9 @@
         Simple(
             "common.items.tool.instruments.lute",
         ): "weapon-tool-wooden_lute",
+        Simple(
+            "common.items.tool.instruments.oud",
+        ): "weapon-tool-wooden_oud",        
         Simple(
             "common.items.tool.instruments.lyre",
         ): "weapon-tool-wooden_lyre",

assets/common/items/recipes/instruments.ron

@@ -9,6 +9,7 @@ ItemDef(
             "lyre",
             "kalimba",
             "lute",
+            "oud",            
             "melodica",
             "washboard",
             "sitar",

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

@@ -0,0 +1,20 @@
+ItemDef(
+    legacy_name: "Oud",
+    legacy_description: "Wooden Oud.",
+    kind: Tool((
+        kind: Instrument,
+        hands: Two,
+        stats: (
+            equip_time_secs: 0.4,
+            power: 0.0,
+            effect_power: 1.0,
+            speed: 1.0,
+            range: 0.0,
+            energy_efficiency: 1.0,
+            buff_strength: 1.0,
+        ),
+    )),
+    quality: Common,
+    tags: [Utility],
+    ability_spec: Some(Custom("Oud")),
+)

assets/common/recipe_book_manifest.ron

@@ -2452,6 +2452,17 @@
         craft_sprite: Some(CraftingBench),
         is_recycling: false,
     ),
+    "oud": (
+        output: ("common.items.tool.instruments.oud", 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.ingot.iron"), 1, false),
+        ],
+        craft_sprite: Some(CraftingBench),
+        is_recycling: false,
+    ),    
     "melodica": (
         output: ("common.items.tool.instruments.melodica", 1),
         inputs: [

assets/server/manifests/kits.ron

@@ -436,6 +436,7 @@
         (Item("common.items.tool.instruments.icy_talharpa"),1),
         (Item("common.items.tool.instruments.kalimba"),1),
         (Item("common.items.tool.instruments.lute"),1),
+        (Item("common.items.tool.instruments.oud"),1),        
         (Item("common.items.tool.instruments.melodica"),1),
         (Item("common.items.tool.instruments.sitar"),1),
         (Item("common.items.tool.instruments.washboard"),1),

assets/voxygen/audio/sfx.ron

@@ -782,6 +782,20 @@
             threshold: 0.5,
             subtitle: "subtitle-instrument_lute",
         ),
+        Music(Instrument, Custom("Oud")): (
+            files: [
+            "voxygen.audio.sfx.instrument.oud.oud_cgc1",
+            "voxygen.audio.sfx.instrument.oud.oud_cgc1",
+            "voxygen.audio.sfx.instrument.oud.oud_cgc1",
+            "voxygen.audio.sfx.instrument.oud.oud_cgc1",
+            "voxygen.audio.sfx.instrument.oud.oud_dad1",
+            "voxygen.audio.sfx.instrument.oud.oud_ege1",
+            "voxygen.audio.sfx.instrument.oud.oud_gd1g1",
+            "voxygen.audio.sfx.instrument.oud.oud_ac1a1",
+            ],
+            threshold: 0.5,
+            subtitle: "subtitle-instrument_oud",
+        ),        
         Music(Instrument, Custom("Steeltonguedrum")): (
             files: [
             "voxygen.audio.sfx.instrument.steeltonguedrum.steeltonguedrum_eg",

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

@@ -81,6 +81,7 @@ subtitle-instrument_icy_talharpa = Icy Talharpa playing
 subtitle-instrument_kalimba = Kalimba playing
 subtitle-instrument_melodica = Melodica playing
 subtitle-instrument_lute = Lute playing
+subtitle-instrument_oud = Oud playing
 subtitle-instrument_steeldrum = Steeldrum playing
 subtitle-instrument_shamisen = Shamisen playing
 subtitle-instrument_sitar = Sitar playing

assets/voxygen/i18n/en/item/weapon/musical_instrument.ftl

@@ -21,6 +21,9 @@ weapon-tool-wooden_kalimba = Kalimba
 
 weapon-tool-wooden_lute = Lute
     .desc = Wooden Lute.
+    
+weapon-tool-wooden_oud = Oud
+    .desc = Wooden Oud.    
 
 weapon-tool-wooden_lyre = Lyre
     .desc = Wooden Lyre.

assets/voxygen/item_image_manifest.ron

@@ -1683,6 +1683,10 @@
         "voxel.weapon.tool.wooden_lute",
         (0.0, 0.0, 0.0), (45.0, 90.0, 0.0), 1.1,
     ),
+    Simple("common.items.tool.instruments.oud"): VoxTrans(
+        "voxel.weapon.tool.wooden_oud",
+        (0.0, 0.0, 0.0), (45.0, 90.0, 0.0), 1.1,
+    ),    
     Simple("common.items.tool.instruments.steeltonguedrum"): VoxTrans(
         "voxel.weapon.tool.steeltonguedrum",
         (0.0, 0.0, 0.0), (45.0, 90.0, 0.0), 1.0,

assets/voxygen/voxel/biped_weapon_manifest.ron

@@ -1164,6 +1164,10 @@
         vox_spec: ("weapon.tool.wooden_lute", (-3.5, -8.0, 3.5)),
         color: None
     ),
+    Tool("common.items.tool.instruments.oud"): (
+        vox_spec: ("weapon.tool.wooden_oud", (-3.5, -8.0, 3.5)),
+        color: None
+    ),    
     Tool("common.items.tool.instruments.steeltonguedrum"): (
         vox_spec: ("weapon.tool.steeltonguedrum", (-4.5, -8.0, 8.0)),
         color: None

assets/voxygen/voxel/item_drop_manifest.ron

@@ -412,6 +412,7 @@
     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.wooden_lute",
+    Simple("common.items.tool.instruments.oud"): "voxel.weapon.tool.wooden_oud",    
     Simple("common.items.tool.instruments.steeltonguedrum"): "voxel.weapon.tool.steeltonguedrum",
     Simple("common.items.tool.instruments.shamisen"): "voxel.weapon.tool.shamisen",
     Simple("common.items.tool.instruments.sitar"): "voxel.weapon.tool.wooden_sitar",

voxygen/anim/src/character/music.rs

@@ -125,6 +125,7 @@ impl Animation for MusicAnimation {
                         "common.abilities.music.guitar"
                         | "common.abilities.music.dark_guitar"
                         | "common.abilities.music.lute"
+                        | "common.abilities.music.oud"
                         | "common.abilities.music.kora"
                         | "common.abilities.music.banjo"
                         | "common.abilities.music.sitar",
@@ -372,6 +373,29 @@ impl Animation for MusicAnimation {
                             * Quaternion::rotation_y(2.0)
                             * Quaternion::rotation_z(PI / -3.0);
                     },
+                    Some("common.abilities.music.oud") => {
+                        next.hand_l.position = Vec3::new(
+                            2.0 - s_a.hand.0,
+                            5.0 + s_a.hand.1 + shortealt * -1.0,
+                            2.0 + s_a.hand.2 + shortealt * -1.5,
+                        );
+                        next.hand_l.orientation = Quaternion::rotation_x(1.8 + foot * 0.15)
+                            * Quaternion::rotation_y(-0.6)
+                            * Quaternion::rotation_z(0.8);
+
+                        next.hand_r.position = Vec3::new(
+                            -1.0 + s_a.hand.0 - shortealt * 2.25,
+                            6.0 + s_a.hand.1 + shortealt * 2.0,
+                            2.0 + s_a.hand.2 + shortealt * 0.25,
+                        );
+                        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.orientation = Quaternion::rotation_x(0.1)
+                            * Quaternion::rotation_y(2.0)
+                            * Quaternion::rotation_z(PI / -3.0);
+                    },
                     Some("common.abilities.music.melodica") => {
                         next.hand_l.position = Vec3::new(
                             4.0 - s_a.hand.0,

voxygen/anim/src/character/wield.rs

@@ -419,7 +419,7 @@ impl Animation for WieldAnimation {
                                     * Quaternion::rotation_y(2.0 + u_slow * 0.1)
                                     * Quaternion::rotation_z(u_slowalt * 0.1);
                             },
-                            "Lute" | "Shamisen" | "Banjo" => {
+                            "Lute" | "Shamisen" | "Banjo" | "Oud" => {
                                 if speed < 0.5 {
                                     next.head.orientation = Quaternion::rotation_z(head_look.x)
                                         * Quaternion::rotation_x(

voxygen/src/hud/util.rs

@@ -699,6 +699,7 @@ pub fn ability_image(imgs: &img_ids::Imgs, ability_id: &str) -> image::Id {
         "common.abilities.music.kalimba" => imgs.instrument,
         "common.abilities.music.melodica" => imgs.instrument,
         "common.abilities.music.lute" => imgs.instrument,
+        "common.abilities.music.oud" => imgs.instrument,
         "common.abilities.music.guitar" => imgs.instrument,
         "common.abilities.music.dark_guitar" => imgs.instrument,
         "common.abilities.music.sitar" => imgs.instrument,