dark_guitar & icy_talharpa

assets/common/abilities/ability_set_manifest.ron

@@ -501,6 +501,11 @@
         secondary: "common.abilities.music.lyre",
         abilities: [],
     ),
+    Custom("IcyTalharpa"): (
+        primary: "common.abilities.music.icy_talharpa",
+        secondary: "common.abilities.music.icy_talharpa",
+        abilities: [],
+    ),
     Custom("Washboard"): (
         primary: "common.abilities.music.washboard",
         secondary: "common.abilities.music.washboard",
@@ -526,6 +531,11 @@
         secondary: "common.abilities.music.guitar",
         abilities: [],
     ),
+    Custom("DarkGuitar"): (
+        primary: "common.abilities.music.dark_guitar",
+        secondary: "common.abilities.music.dark_guitar",
+        abilities: [],
+    ),
     Custom("Sitar"): (
         primary: "common.abilities.music.sitar",
         secondary: "common.abilities.music.sitar",

assets/common/abilities/music/dark_guitar.ron

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

assets/common/abilities/music/icy_talharpa.ron

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

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

@@ -17,5 +17,5 @@ ItemDef(
     )),
     quality: Common,
     tags: [Utility],
-    ability_spec: Some(Custom("Guitar")),
+    ability_spec: Some(Custom("DarkGuitar")),
 )

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

@@ -0,0 +1,21 @@
+ItemDef(
+    name: "Icy Talharpa",
+    description: "Icy Talharpa.",
+    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("IcyTalharpa")),
+)

assets/server/manifests/kits.ron

@@ -385,6 +385,7 @@
         (Item("common.items.tool.instruments.guitar"),1),
         (Item("common.items.tool.instruments.guitar_dark"),1),
         (Item("common.items.tool.instruments.lyre"),1),
+        (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.melodica"),1),

assets/voxygen/audio/sfx.ron

@@ -609,6 +609,23 @@
             ],
             threshold: 0.5,
             ),
+        Music(Instrument, Custom("IcyTalharpa")): (
+            files: [
+            "voxygen.audio.sfx.instrument.icy_talharpa.icy_talharpa_c",
+            "voxygen.audio.sfx.instrument.icy_talharpa.icy_talharpa_g",
+            "voxygen.audio.sfx.instrument.icy_talharpa.icy_talharpa_d",
+            "voxygen.audio.sfx.instrument.icy_talharpa.icy_talharpa_a",
+            "voxygen.audio.sfx.instrument.icy_talharpa.icy_talharpa_e",
+            "voxygen.audio.sfx.instrument.icy_talharpa.icy_talharpa_c1",
+            "voxygen.audio.sfx.instrument.icy_talharpa.icy_talharpa_c1ag",
+            "voxygen.audio.sfx.instrument.icy_talharpa.icy_talharpa_cde",
+            "voxygen.audio.sfx.instrument.icy_talharpa.icy_talharpa_d1c1a",
+            "voxygen.audio.sfx.instrument.icy_talharpa.icy_talharpa_d1g",
+            "voxygen.audio.sfx.instrument.icy_talharpa.icy_talharpa_ec1",
+            "voxygen.audio.sfx.instrument.icy_talharpa.icy_talharpa_ega",
+            ],
+            threshold: 0.5,
+            ),
         Music(Instrument, Custom("Kalimba")): (
             files: [
             "voxygen.audio.sfx.instrument.kalimba.kalimba_c",
@@ -694,6 +711,25 @@
             ],
             threshold: 0.5,
             ),
+        Music(Instrument, Custom("DarkGuitar")): (
+            files: [
+            "voxygen.audio.sfx.instrument.dark_guitar.dark_guitar_a",
+            "voxygen.audio.sfx.instrument.dark_guitar.dark_guitar_c",
+            "voxygen.audio.sfx.instrument.dark_guitar.dark_guitar_c1",
+            "voxygen.audio.sfx.instrument.dark_guitar.dark_guitar_c1ae",
+            "voxygen.audio.sfx.instrument.dark_guitar.dark_guitar_cce",
+            "voxygen.audio.sfx.instrument.dark_guitar.dark_guitar_ceg",
+            "voxygen.audio.sfx.instrument.dark_guitar.dark_guitar_d",
+            "voxygen.audio.sfx.instrument.dark_guitar.dark_guitar_d1c1a",
+            "voxygen.audio.sfx.instrument.dark_guitar.dark_guitar_d1ge",
+            "voxygen.audio.sfx.instrument.dark_guitar.dark_guitar_dda",
+            "voxygen.audio.sfx.instrument.dark_guitar.dark_guitar_e",
+            "voxygen.audio.sfx.instrument.dark_guitar.dark_guitar_eeg",
+            "voxygen.audio.sfx.instrument.dark_guitar.dark_guitar_g",
+            "voxygen.audio.sfx.instrument.dark_guitar.dark_guitar_gec",
+            ],
+            threshold: 0.5,
+            ),
         Music(Instrument, Custom("Washboard")): (
             files: [
             "voxygen.audio.sfx.instrument.washboard.washboard_c",

assets/voxygen/item_image_manifest.ron

@@ -1622,6 +1622,10 @@
         "voxel.weapon.tool.wooden_lyre",
         (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0,
     ),
+    Simple("common.items.tool.instruments.icy_talharpa"): VoxTrans(
+        "voxel.weapon.tool.icy_talharpa",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0,
+    ),
     Simple("common.items.tool.instruments.flute"): VoxTrans(
         "voxel.weapon.tool.wooden_flute",
         (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0,

assets/voxygen/voxel/biped_weapon_manifest.ron

@@ -1124,6 +1124,10 @@
         vox_spec: ("weapon.tool.wooden_lyre", (-3.5, -7.0, 6.0)),
         color: None
     ),
+    Tool("common.items.tool.instruments.icy_talharpa"): (
+        vox_spec: ("weapon.tool.icy_talharpa", (-3.5, -7.0, 6.0)),
+        color: None
+    ),
     Tool("common.items.tool.instruments.flute"): (
         vox_spec: ("weapon.tool.wooden_flute", (-4.5, -4.5, 8.0)),
         color: None

assets/voxygen/voxel/item_drop_manifest.ron

@@ -402,6 +402,7 @@
     Simple("common.items.tool.instruments.flute"): "voxel.weapon.tool.wooden_flute",
     Simple("common.items.tool.instruments.glass_flute"): "voxel.weapon.tool.glass_flute",
     Simple("common.items.tool.instruments.lyre"): "voxel.weapon.tool.wooden_lyre",
+    Simple("common.items.tool.instruments.icy_talharpa"): "voxel.weapon.tool.icy_talharpa",
     Simple("common.items.tool.instruments.washboard"): "voxel.weapon.tool.washboard",
     Simple("common.items.tool.instruments.kalimba"): "voxel.weapon.tool.wooden_kalimba",
     Simple("common.items.tool.instruments.melodica"): "voxel.weapon.tool.melodica",

voxygen/anim/src/character/music.rs

@@ -105,8 +105,8 @@ impl Animation for MusicAnimation {
                     // instrument specific head_bop
                     let head_bop = match spec.as_str() {
                         "Flute" | "GlassFlute" | "Melodica" => 0.2,
-                        "Guitar" | "Lute" | "Sitar" => 0.5,
-                        "Lyre" | "Kalimba" => 0.3,
+                        "Guitar" | "DarkGuitar" | "Lute" | "Sitar" => 0.5,
+                        "Lyre" | "IcyTalharpa" | "Kalimba" => 0.3,
                         _ => 1.0,
                     };
                     next.head.position = Vec3::new(0.0, s_a.head.0, s_a.head.1);
@@ -160,7 +160,7 @@ impl Animation for MusicAnimation {
                                 * Quaternion::rotation_y(PI)
                                 * Quaternion::rotation_z(0.05);
                         },
-                        "Guitar" => {
+                        "Guitar" | "DarkGuitar" => {
                             next.hand_l.position = Vec3::new(
                                 1.0 - s_a.hand.0,
                                 6.0 + s_a.hand.1 + shortealt * -1.0,
@@ -183,7 +183,7 @@ impl Animation for MusicAnimation {
                                 * Quaternion::rotation_y(2.0)
                                 * Quaternion::rotation_z(PI / -3.0);
                         },
-                        "Lyre" => {
+                        "Lyre" | "IcyTalharpa" => {
                             next.hand_l.position = Vec3::new(
                                 3.0 - s_a.hand.0,
                                 4.0 + s_a.hand.1 + shortealt * -0.1,

voxygen/anim/src/character/wield.rs

@@ -308,7 +308,7 @@ impl Animation for WieldAnimation {
                 Some(ToolKind::Instrument) => {
                     if let Some(AbilitySpec::Custom(spec)) = active_tool_spec {
                         match spec.as_str() {
-                            "Lyre" => {
+                            "Lyre" | "IcyTalharpa" => {
                                 if speed < 0.5 {
                                     next.head.orientation = Quaternion::rotation_z(head_look.x)
                                         * Quaternion::rotation_x(
@@ -444,7 +444,7 @@ impl Animation for WieldAnimation {
                                     * Quaternion::rotation_y(2.0 + u_slow * 0.1)
                                     * Quaternion::rotation_z(u_slowalt * 0.1);
                             },
-                            "Guitar" => {
+                            "Guitar" | "DarkGuitar" => {
                                 if speed < 0.5 {
                                     next.head.orientation = Quaternion::rotation_z(head_look.x)
                                         * Quaternion::rotation_x(

voxygen/src/hud/util.rs

@@ -406,10 +406,12 @@ pub fn ability_image(imgs: &img_ids::Imgs, ability_id: &str) -> image::Id {
         "common.abilities.music.melodica" => imgs.instrument,
         "common.abilities.music.lute" => imgs.instrument,
         "common.abilities.music.guitar" => imgs.instrument,
+        "common.abilities.music.dark_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.icy_talharpa" => imgs.instrument,
         "common.abilities.music.washboard" => imgs.instrument,
         _ => imgs.not_found,
     }