edits: models, audio, anims

assets/common/abilities/ability_set_manifest.ron

@@ -1042,14 +1042,14 @@
         secondary: Simple(None, "common.abilities.music.viola_pizzicato"),
         abilities: [],
     ),
-    Custom("Conch"): (
-        primary: Simple(None, "common.abilities.music.conch"),
-        secondary: Simple(None, "common.abilities.music.conch"),
+    Custom("StarlightConch"): (
+        primary: Simple(None, "common.abilities.music.starlight_conch"),
+        secondary: Simple(None, "common.abilities.music.starlight_conch"),
         abilities: [],
     ),
-    Custom("Tambourine"): (
-        primary: Simple(None, "common.abilities.music.tambourine"),
-        secondary: Simple(None, "common.abilities.music.tambourine"),
+    Custom("TimbrelOfChaos"): (
+        primary: Simple(None, "common.abilities.music.timbrel_of_chaos"),
+        secondary: Simple(None, "common.abilities.music.timbrel_of_chaos"),
         abilities: [],
     ),
     Custom("Rhythmo"): (

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

@@ -1,6 +1,6 @@
 ItemDef(
-    legacy_name: "Conch",
-    legacy_description: "Conch.",
+    legacy_name: "Starlight Conch",
+    legacy_description: "Starlight Conch.",
     kind: Tool((
         kind: Instrument,
         hands: Two,
@@ -16,5 +16,5 @@ ItemDef(
     )),
     quality: Legendary,
     tags: [Utility],
-    ability_spec: Some(Custom("Conch")),
+    ability_spec: Some(Custom("StarlightConch")),
 )

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

@@ -1,6 +1,6 @@
 ItemDef(
-    legacy_name: "Tambourine",
-    legacy_description: "Tambourine.",
+    legacy_name: "Timbrel Of Chaos",
+    legacy_description: "Timbrel Of Chaos.",
     kind: Tool((
         kind: Instrument,
         hands: Two,
@@ -16,5 +16,5 @@ ItemDef(
     )),
     quality: Legendary,
     tags: [Utility],
-    ability_spec: Some(Custom("Tambourine")),
+    ability_spec: Some(Custom("TimbrelOfChaos")),
 )

assets/common/loot_tables/dungeon/cultist/mindflayer.ron

@@ -18,7 +18,7 @@
             (0.5, Item("common.items.crafting_ing.mindflayer_bag_damaged")),
             (6.9, Nothing),
             // Misc
-            (0.5, Item("common.items.tool.instruments.tambourine")),
+            (0.2, Item("common.items.tool.instruments.timbrel_of_chaos")),
         ]),
         // Allow for Eldwood to drop till entity droppers are implemented
         Lottery([

assets/common/loot_tables/dungeon/sahagin/karkatha.ron

@@ -3,4 +3,6 @@
     (4.0, LootTable("common.loot_tables.weapons.tier-3")),
     // Special
     (0.5, Item("common.items.glider.moonrise")),
+    // Misc
+    (0.2, Item("common.items.tool.instruments.starlight_conch")),    
 ]

assets/common/loot_tables/dungeon/sahagin/tidalwarrior.ron

@@ -4,6 +4,4 @@
     // Special
     (1.0, Item("common.items.armor.misc.neck.gem_of_resilience")),
     (0.5, Item("common.items.glider.moonrise")),
-    // Misc
-    (0.5, Item("common.items.tool.instruments.conch")),
 ]

assets/server/manifests/kits.ron

@@ -445,8 +445,8 @@
         (Item("common.items.tool.instruments.kora"),1),
         (Item("common.items.tool.instruments.banjo"),1),
         (Item("common.items.tool.instruments.viola_pizzicato"),1),
-        (Item("common.items.tool.instruments.conch"),1),
-        (Item("common.items.tool.instruments.tambourine"),1),
+        (Item("common.items.tool.instruments.starlight_conch"),1),
+        (Item("common.items.tool.instruments.timbrel_of_chaos"),1),
         (Item("common.items.tool.instruments.rhythmo"),1),
     ],
     "recipes": [

assets/voxygen/audio/sfx.ron

@@ -849,42 +849,42 @@
             threshold: 1.0,
             subtitle: "subtitle-instrument_viola_pizzicato",
         ),
-        Music(Instrument, Custom("Conch")): (
+        Music(Instrument, Custom("StarlightConch")): (
             files: [
-            "voxygen.audio.sfx.instrument.conch.conch_c",
-            "voxygen.audio.sfx.instrument.conch.conch_c",
-            "voxygen.audio.sfx.instrument.conch.conch_c",
-            "voxygen.audio.sfx.instrument.conch.conch_c",
-            "voxygen.audio.sfx.instrument.conch.conch_c",
-            "voxygen.audio.sfx.instrument.conch.conch_c",
-            "voxygen.audio.sfx.instrument.conch.conch_a",
-            "voxygen.audio.sfx.instrument.conch.conch_ac1",
-            "voxygen.audio.sfx.instrument.conch.conch_c",
-            "voxygen.audio.sfx.instrument.conch.conch_c1",
-            "voxygen.audio.sfx.instrument.conch.conch_cd",
-            "voxygen.audio.sfx.instrument.conch.conch_cge",
-            "voxygen.audio.sfx.instrument.conch.conch_d",
-            "voxygen.audio.sfx.instrument.conch.conch_d1",
-            "voxygen.audio.sfx.instrument.conch.conch_e",
-            "voxygen.audio.sfx.instrument.conch.conch_ec",
-            "voxygen.audio.sfx.instrument.conch.conch_ec1g",
-            "voxygen.audio.sfx.instrument.conch.conch_g",
-            "voxygen.audio.sfx.instrument.conch.conch_ga",
-            "voxygen.audio.sfx.instrument.conch.conch_gd1",
-            "voxygen.audio.sfx.instrument.conch.conch_ge",
+            "voxygen.audio.sfx.instrument.starlight_conch.starlight_conch_c",
+            "voxygen.audio.sfx.instrument.starlight_conch.starlight_conch_c",
+            "voxygen.audio.sfx.instrument.starlight_conch.starlight_conch_c",
+            "voxygen.audio.sfx.instrument.starlight_conch.starlight_conch_c",
+            "voxygen.audio.sfx.instrument.starlight_conch.starlight_conch_c",
+            "voxygen.audio.sfx.instrument.starlight_conch.starlight_conch_c",
+            "voxygen.audio.sfx.instrument.starlight_conch.starlight_conch_a",
+            "voxygen.audio.sfx.instrument.starlight_conch.starlight_conch_ac1",
+            "voxygen.audio.sfx.instrument.starlight_conch.starlight_conch_c",
+            "voxygen.audio.sfx.instrument.starlight_conch.starlight_conch_c1",
+            "voxygen.audio.sfx.instrument.starlight_conch.starlight_conch_cd",
+            "voxygen.audio.sfx.instrument.starlight_conch.starlight_conch_cge",
+            "voxygen.audio.sfx.instrument.starlight_conch.starlight_conch_d",
+            "voxygen.audio.sfx.instrument.starlight_conch.starlight_conch_d1",
+            "voxygen.audio.sfx.instrument.starlight_conch.starlight_conch_e",
+            "voxygen.audio.sfx.instrument.starlight_conch.starlight_conch_ec",
+            "voxygen.audio.sfx.instrument.starlight_conch.starlight_conch_ec1g",
+            "voxygen.audio.sfx.instrument.starlight_conch.starlight_conch_g",
+            "voxygen.audio.sfx.instrument.starlight_conch.starlight_conch_ga",
+            "voxygen.audio.sfx.instrument.starlight_conch.starlight_conch_gd1",
+            "voxygen.audio.sfx.instrument.starlight_conch.starlight_conch_ge",
             ],
             threshold: 0.5,
-            subtitle: "subtitle-instrument_conch",
+            subtitle: "subtitle-instrument_starlight_conch",
         ),
-        Music(Instrument, Custom("Tambourine")): (
+        Music(Instrument, Custom("TimbrelOfChaos")): (
             files: [
-            "voxygen.audio.sfx.instrument.tambourine.tambourine_0",
-            "voxygen.audio.sfx.instrument.tambourine.tambourine_1",
-            "voxygen.audio.sfx.instrument.tambourine.tambourine_2",
-            "voxygen.audio.sfx.instrument.tambourine.tambourine_3",
+            "voxygen.audio.sfx.instrument.timbrel_of_chaos.timbrel_of_chaos_0",
+            "voxygen.audio.sfx.instrument.timbrel_of_chaos.timbrel_of_chaos_1",
+            "voxygen.audio.sfx.instrument.timbrel_of_chaos.timbrel_of_chaos_2",
+            "voxygen.audio.sfx.instrument.timbrel_of_chaos.timbrel_of_chaos_3",
             ],
             threshold: 0.5,
-            subtitle: "subtitle-instrument_tambourine",
+            subtitle: "subtitle-instrument_timbrel_of_chaos",
         ),
         Music(Instrument, Custom("Rhythmo")): (
             files: [

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

@@ -91,8 +91,8 @@ subtitle-instrument_wildskin_drum = Wildskin Drum playing
 subtitle-instrument_kora = Kora playing
 subtitle-instrument_banjo = Banjo playing
 subtitle-instrument_viola_pizzicato = Viola Pizzicato playing
-subtitle-instrument_conch = Conch playing
-subtitle-instrument_tambourine = Tambourine playing
+subtitle-instrument_starlight_conch = Starlight Conch playing
+subtitle-instrument_timbrel_of_chaos = Timbrel Of Chaos playing
 subtitle-instrument_rhythmo = Rhythmo playing
 subtitle-pickup_instrument = Pickup instrument
 

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

@@ -52,11 +52,11 @@ weapon-tool-banjo = Banjo
 weapon-tool-viola_pizzicato = Viola Pizzicato
     .desc = Viola Pizzicato.
 
-weapon-tool-conch = Conch
-    .desc = Conch.
+weapon-tool-conch = Starlight Conch
+    .desc = Starlight Conch.
 
-weapon-tool-tambourine = Tambourine
-    .desc = Tambourine.
+weapon-tool-tambourine = Timbrel Of Chaos
+    .desc = Timbrel Of Chaos.
 
 weapon-tool-rhythmo = Rhythmo
-    .desc = Rhythmo.
+    .desc = Rhythmo.

assets/voxygen/item_image_manifest.ron

@@ -1715,12 +1715,12 @@
         "voxel.weapon.tool.viola_pizzicato",
         (0.0, 0.0, 0.0), (45.0, 90.0, 0.0), 1.0,
     ),
-    Simple("common.items.tool.instruments.conch"): VoxTrans(
-        "voxel.weapon.tool.conch",
+    Simple("common.items.tool.instruments.starlight_conch"): VoxTrans(
+        "voxel.weapon.tool.starlight_conch",
         (0.0, 0.0, 0.0), (45.0, 90.0, 0.0), 1.0,
     ),
-    Simple("common.items.tool.instruments.tambourine"): VoxTrans(
-        "voxel.weapon.tool.tambourine",
+    Simple("common.items.tool.instruments.timbrel_of_chaos"): VoxTrans(
+        "voxel.weapon.tool.timbrel_of_chaos",
         (0.0, 0.0, 0.0), (45.0, 90.0, 0.0), 1.0,
     ),
     Simple("common.items.tool.instruments.rhythmo"): VoxTrans(

assets/voxygen/voxel/biped_weapon_manifest.ron

@@ -1196,12 +1196,12 @@
         vox_spec: ("weapon.tool.viola_pizzicato", (-2.5, -8.0, 0.0)),
         color: None
     ),
-    Tool("common.items.tool.instruments.conch"): (
-        vox_spec: ("weapon.tool.conch", (-5.5, -8.0, 0.0)),
+    Tool("common.items.tool.instruments.starlight_conch"): (
+        vox_spec: ("weapon.tool.starlight_conch", (-5.5, -8.0, 0.0)),
         color: None
     ),
-    Tool("common.items.tool.instruments.tambourine"): (
-        vox_spec: ("weapon.tool.tambourine", (-2.5, -8.0, 8.0)),
+    Tool("common.items.tool.instruments.timbrel_of_chaos"): (
+        vox_spec: ("weapon.tool.timbrel_of_chaos", (-2.5, -8.0, 8.0)),
         color: None
     ),
     Tool("common.items.tool.instruments.rhythmo"): (

assets/voxygen/voxel/item_drop_manifest.ron

@@ -421,8 +421,8 @@
     Simple("common.items.tool.instruments.banjo"): "voxel.weapon.tool.banjo",
     Simple("common.items.tool.instruments.kora"): "voxel.weapon.tool.kora",
     Simple("common.items.tool.instruments.viola_pizzicato"): "voxel.weapon.tool.viola_pizzicato",
-    Simple("common.items.tool.instruments.conch"): "voxel.weapon.tool.conch",
-    Simple("common.items.tool.instruments.tambourine"): "voxel.weapon.tool.tambourine",
+    Simple("common.items.tool.instruments.starlight_conch"): "voxel.weapon.tool.starlight_conch",
+    Simple("common.items.tool.instruments.timbrel_of_chaos"): "voxel.weapon.tool.timbrel_of_chaos",
     Simple("common.items.tool.instruments.rhythmo"): "voxel.weapon.tool.rhythmo",
     // Other
     Simple("common.items.utility.coins"): "voxel.object.v-coin",

voxygen/anim/src/character/music.rs

@@ -118,7 +118,7 @@ impl Animation for MusicAnimation {
                     Some(
                         "common.abilities.music.flute"
                         | "common.abilities.music.glass_flute"
-                        | "common.abilities.music.conch"
+                        | "common.abilities.music.starlight_conch"
                         | "common.abilities.music.melodica",
                     ) => 0.2,
                     Some(
@@ -135,7 +135,7 @@ impl Animation for MusicAnimation {
                         | "common.abilities.music.icy_talharpa"
                         | "common.abilities.music.shamisen"
                         | "common.abilities.music.kalimba"
-                        | "common.abilities.music.tambourine"
+                        | "common.abilities.music.timbrel_of_chaos"
                         | "common.abilities.music.rhythmo"
                         | "common.abilities.music.steeltonguedrum",
                     ) => 0.3,
@@ -214,7 +214,7 @@ impl Animation for MusicAnimation {
                             * Quaternion::rotation_y(PI)
                             * Quaternion::rotation_z(0.05);
                     },
-                    Some("common.abilities.music.conch") => {
+                    Some("common.abilities.music.starlight_conch") => {
                         next.hand_l.position =
                             Vec3::new(2.0 - s_a.hand.0, 6.0 + s_a.hand.1, 4.0 + s_a.hand.2);
                         next.hand_l.orientation = Quaternion::rotation_x(2.4 + foot * 0.15)
@@ -259,7 +259,7 @@ impl Animation for MusicAnimation {
                         "common.abilities.music.lyre"
                         | "common.abilities.music.wildskin_drum"
                         | "common.abilities.music.steeltonguedrum"
-                        | "common.abilities.music.tambourine"
+                        | "common.abilities.music.timbrel_of_chaos"
                         | "common.abilities.music.icy_talharpa",
                     ) => {
                         next.hand_l.position = Vec3::new(
@@ -317,7 +317,7 @@ impl Animation for MusicAnimation {
 
                         next.hand_r.position = Vec3::new(
                             -6.0 + s_a.hand.0 - shortealt * 3.0,
-                            7.0 + s_a.hand.1 - shortealt * 1.5,
+                            8.5 + s_a.hand.1 - shortealt * 1.5,
                             5.0 + s_a.hand.2 + shortealt * 0.75,
                         );
                         next.hand_r.orientation = Quaternion::rotation_x(1.4 + foot * -0.15)
@@ -335,11 +335,8 @@ impl Animation for MusicAnimation {
                         next.hand_l.orientation =
                             Quaternion::rotation_x(1.4 + foot * 0.1) * Quaternion::rotation_y(-0.6);
 
-                        next.hand_r.position = Vec3::new(
-                            -2.0 + s_a.hand.0 - shortealt * 1.5,
-                            5.0 + s_a.hand.1,
-                            2.0 + s_a.hand.2,
-                        );
+                        next.hand_r.position =
+                            Vec3::new(-2.0 + s_a.hand.0, 5.0 + s_a.hand.1, 2.0 + s_a.hand.2);
                         next.hand_r.orientation =
                             Quaternion::rotation_x(1.4 + foot * -0.1) * Quaternion::rotation_y(0.9);
 

voxygen/anim/src/character/wield.rs

@@ -376,7 +376,7 @@ impl Animation for WieldAnimation {
                                     * Quaternion::rotation_y(2.0 + u_slow * 0.1)
                                     * Quaternion::rotation_z(u_slowalt * 0.1);
                             },
-                            "Washboard" | "Tambourine" | "Rhythmo" => {
+                            "Washboard" | "TimbrelOfChaos" | "Rhythmo" | "StarlightConch" => {
                                 if speed < 0.5 {
                                     next.head.orientation = Quaternion::rotation_z(head_look.x)
                                         * Quaternion::rotation_x(
@@ -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" | "Conch" => {
+                            "Lute" | "Shamisen" | "Banjo" => {
                                 if speed < 0.5 {
                                     next.head.orientation = Quaternion::rotation_z(head_look.x)
                                         * Quaternion::rotation_x(

voxygen/src/hud/util.rs

@@ -713,8 +713,8 @@ pub fn ability_image(imgs: &img_ids::Imgs, ability_id: &str) -> image::Id {
         "common.abilities.music.kora" => imgs.instrument,
         "common.abilities.music.banjo" => imgs.instrument,
         "common.abilities.music.viola_pizzicato" => imgs.instrument,
-        "common.abilities.music.conch" => imgs.instrument,
-        "common.abilities.music.tambourine" => imgs.instrument,
+        "common.abilities.music.starlight_conch" => imgs.instrument,
+        "common.abilities.music.timbrel_of_chaos" => imgs.instrument,
         "common.abilities.music.rhythmo" => imgs.instrument,
         // Glider
         "common.abilities.debug.glide_boost" => imgs.flyingrod_m2,