From 0eba37ce6a43d36fdc148c9965f1ed976bf807b8 Mon Sep 17 00:00:00 2001 From: flo Date: Fri, 13 Jan 2023 13:37:45 +0000 Subject: [PATCH] dark_guitar & icy_talharpa --- .../common/abilities/ability_set_manifest.ron | 10 ++++++ assets/common/abilities/music/dark_guitar.ron | 4 +++ .../common/abilities/music/icy_talharpa.ron | 4 +++ .../items/tool/instruments/guitar_dark.ron | 2 +- .../items/tool/instruments/icy_talharpa.ron | 21 +++++++++++ assets/server/manifests/kits.ron | 1 + assets/voxygen/audio/sfx.ron | 36 +++++++++++++++++++ .../instrument/dark_guitar/dark_guitar_a.ogg | 3 ++ .../instrument/dark_guitar/dark_guitar_c.ogg | 3 ++ .../instrument/dark_guitar/dark_guitar_c1.ogg | 3 ++ .../dark_guitar/dark_guitar_c1ae.ogg | 3 ++ .../dark_guitar/dark_guitar_cce.ogg | 3 ++ .../dark_guitar/dark_guitar_ceg.ogg | 3 ++ .../instrument/dark_guitar/dark_guitar_d.ogg | 3 ++ .../dark_guitar/dark_guitar_d1c1a.ogg | 3 ++ .../dark_guitar/dark_guitar_d1ge.ogg | 3 ++ .../dark_guitar/dark_guitar_dda.ogg | 3 ++ .../instrument/dark_guitar/dark_guitar_e.ogg | 3 ++ .../dark_guitar/dark_guitar_eeg.ogg | 3 ++ .../instrument/dark_guitar/dark_guitar_g.ogg | 3 ++ .../dark_guitar/dark_guitar_gec.ogg | 3 ++ .../icy_talharpa/icy_talharpa_a.ogg | 3 ++ .../icy_talharpa/icy_talharpa_c.ogg | 3 ++ .../icy_talharpa/icy_talharpa_c1.ogg | 3 ++ .../icy_talharpa/icy_talharpa_c1ag.ogg | 3 ++ .../icy_talharpa/icy_talharpa_cde.ogg | 3 ++ .../icy_talharpa/icy_talharpa_d.ogg | 3 ++ .../icy_talharpa/icy_talharpa_d1c1a.ogg | 3 ++ .../icy_talharpa/icy_talharpa_d1g.ogg | 3 ++ .../icy_talharpa/icy_talharpa_e.ogg | 3 ++ .../icy_talharpa/icy_talharpa_ec1.ogg | 3 ++ .../icy_talharpa/icy_talharpa_ega.ogg | 3 ++ .../icy_talharpa/icy_talharpa_g.ogg | 3 ++ assets/voxygen/item_image_manifest.ron | 4 +++ .../voxygen/voxel/biped_weapon_manifest.ron | 4 +++ assets/voxygen/voxel/item_drop_manifest.ron | 1 + .../voxel/weapon/tool/icy_talharpa.vox | 3 ++ voxygen/anim/src/character/music.rs | 8 ++--- voxygen/anim/src/character/wield.rs | 4 +-- voxygen/src/hud/util.rs | 2 ++ 40 files changed, 175 insertions(+), 7 deletions(-) create mode 100644 assets/common/abilities/music/dark_guitar.ron create mode 100644 assets/common/abilities/music/icy_talharpa.ron create mode 100644 assets/common/items/tool/instruments/icy_talharpa.ron create mode 100644 assets/voxygen/audio/sfx/instrument/dark_guitar/dark_guitar_a.ogg create mode 100644 assets/voxygen/audio/sfx/instrument/dark_guitar/dark_guitar_c.ogg create mode 100644 assets/voxygen/audio/sfx/instrument/dark_guitar/dark_guitar_c1.ogg create mode 100644 assets/voxygen/audio/sfx/instrument/dark_guitar/dark_guitar_c1ae.ogg create mode 100644 assets/voxygen/audio/sfx/instrument/dark_guitar/dark_guitar_cce.ogg create mode 100644 assets/voxygen/audio/sfx/instrument/dark_guitar/dark_guitar_ceg.ogg create mode 100644 assets/voxygen/audio/sfx/instrument/dark_guitar/dark_guitar_d.ogg create mode 100644 assets/voxygen/audio/sfx/instrument/dark_guitar/dark_guitar_d1c1a.ogg create mode 100644 assets/voxygen/audio/sfx/instrument/dark_guitar/dark_guitar_d1ge.ogg create mode 100644 assets/voxygen/audio/sfx/instrument/dark_guitar/dark_guitar_dda.ogg create mode 100644 assets/voxygen/audio/sfx/instrument/dark_guitar/dark_guitar_e.ogg create mode 100644 assets/voxygen/audio/sfx/instrument/dark_guitar/dark_guitar_eeg.ogg create mode 100644 assets/voxygen/audio/sfx/instrument/dark_guitar/dark_guitar_g.ogg create mode 100644 assets/voxygen/audio/sfx/instrument/dark_guitar/dark_guitar_gec.ogg create mode 100644 assets/voxygen/audio/sfx/instrument/icy_talharpa/icy_talharpa_a.ogg create mode 100644 assets/voxygen/audio/sfx/instrument/icy_talharpa/icy_talharpa_c.ogg create mode 100644 assets/voxygen/audio/sfx/instrument/icy_talharpa/icy_talharpa_c1.ogg create mode 100644 assets/voxygen/audio/sfx/instrument/icy_talharpa/icy_talharpa_c1ag.ogg create mode 100644 assets/voxygen/audio/sfx/instrument/icy_talharpa/icy_talharpa_cde.ogg create mode 100644 assets/voxygen/audio/sfx/instrument/icy_talharpa/icy_talharpa_d.ogg create mode 100644 assets/voxygen/audio/sfx/instrument/icy_talharpa/icy_talharpa_d1c1a.ogg create mode 100644 assets/voxygen/audio/sfx/instrument/icy_talharpa/icy_talharpa_d1g.ogg create mode 100644 assets/voxygen/audio/sfx/instrument/icy_talharpa/icy_talharpa_e.ogg create mode 100644 assets/voxygen/audio/sfx/instrument/icy_talharpa/icy_talharpa_ec1.ogg create mode 100644 assets/voxygen/audio/sfx/instrument/icy_talharpa/icy_talharpa_ega.ogg create mode 100644 assets/voxygen/audio/sfx/instrument/icy_talharpa/icy_talharpa_g.ogg create mode 100644 assets/voxygen/voxel/weapon/tool/icy_talharpa.vox diff --git a/assets/common/abilities/ability_set_manifest.ron b/assets/common/abilities/ability_set_manifest.ron index 8dc148e8de..524f2f3693 100644 --- a/assets/common/abilities/ability_set_manifest.ron +++ b/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", diff --git a/assets/common/abilities/music/dark_guitar.ron b/assets/common/abilities/music/dark_guitar.ron new file mode 100644 index 0000000000..18f0a9b200 --- /dev/null +++ b/assets/common/abilities/music/dark_guitar.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/abilities/music/icy_talharpa.ron b/assets/common/abilities/music/icy_talharpa.ron new file mode 100644 index 0000000000..18f0a9b200 --- /dev/null +++ b/assets/common/abilities/music/icy_talharpa.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/items/tool/instruments/guitar_dark.ron b/assets/common/items/tool/instruments/guitar_dark.ron index 891a0a80fa..efa9f76031 100644 --- a/assets/common/items/tool/instruments/guitar_dark.ron +++ b/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")), ) \ No newline at end of file diff --git a/assets/common/items/tool/instruments/icy_talharpa.ron b/assets/common/items/tool/instruments/icy_talharpa.ron new file mode 100644 index 0000000000..9e7588ebc0 --- /dev/null +++ b/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")), +) \ No newline at end of file diff --git a/assets/server/manifests/kits.ron b/assets/server/manifests/kits.ron index 3ba30db4f4..ac32ff1522 100644 --- a/assets/server/manifests/kits.ron +++ b/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), diff --git a/assets/voxygen/audio/sfx.ron b/assets/voxygen/audio/sfx.ron index df9754ab44..b1a7b0b9c7 100644 --- a/assets/voxygen/audio/sfx.ron +++ b/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", diff --git a/assets/voxygen/audio/sfx/instrument/dark_guitar/dark_guitar_a.ogg b/assets/voxygen/audio/sfx/instrument/dark_guitar/dark_guitar_a.ogg new file mode 100644 index 0000000000..b394c76fe2 --- /dev/null +++ b/assets/voxygen/audio/sfx/instrument/dark_guitar/dark_guitar_a.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:65e6a638d7e9bd053d58fed79267ec882e49129efa1e088b7264c45771bb52f8 +size 10031 diff --git a/assets/voxygen/audio/sfx/instrument/dark_guitar/dark_guitar_c.ogg b/assets/voxygen/audio/sfx/instrument/dark_guitar/dark_guitar_c.ogg new file mode 100644 index 0000000000..af28fa5409 --- /dev/null +++ b/assets/voxygen/audio/sfx/instrument/dark_guitar/dark_guitar_c.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5b17305cfdcc6677b6c8a1cab8c5b6043622b9b8dbd3d73661c88b7a5022d445 +size 9911 diff --git a/assets/voxygen/audio/sfx/instrument/dark_guitar/dark_guitar_c1.ogg b/assets/voxygen/audio/sfx/instrument/dark_guitar/dark_guitar_c1.ogg new file mode 100644 index 0000000000..2755229235 --- /dev/null +++ b/assets/voxygen/audio/sfx/instrument/dark_guitar/dark_guitar_c1.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:585d92940e2b4b16a8a77e9a3048d712d57f339277734ba099c90a8f4de6f76d +size 10282 diff --git a/assets/voxygen/audio/sfx/instrument/dark_guitar/dark_guitar_c1ae.ogg b/assets/voxygen/audio/sfx/instrument/dark_guitar/dark_guitar_c1ae.ogg new file mode 100644 index 0000000000..b8f4c6507d --- /dev/null +++ b/assets/voxygen/audio/sfx/instrument/dark_guitar/dark_guitar_c1ae.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:09cf48e807e85ca9165a4c6248b33a19937bc35dbafead6b799eabfb4326ce5e +size 10702 diff --git a/assets/voxygen/audio/sfx/instrument/dark_guitar/dark_guitar_cce.ogg b/assets/voxygen/audio/sfx/instrument/dark_guitar/dark_guitar_cce.ogg new file mode 100644 index 0000000000..70e2ed4f30 --- /dev/null +++ b/assets/voxygen/audio/sfx/instrument/dark_guitar/dark_guitar_cce.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:64415e03eb1841bfeec5472eccec49c236740d63dcc8fba728c3b5c2859c8ac2 +size 10355 diff --git a/assets/voxygen/audio/sfx/instrument/dark_guitar/dark_guitar_ceg.ogg b/assets/voxygen/audio/sfx/instrument/dark_guitar/dark_guitar_ceg.ogg new file mode 100644 index 0000000000..91305ae04c --- /dev/null +++ b/assets/voxygen/audio/sfx/instrument/dark_guitar/dark_guitar_ceg.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3af40d13084e9fa4103211a71c10b99b7e1aa6878dcd6611e452d0451aedc213 +size 10724 diff --git a/assets/voxygen/audio/sfx/instrument/dark_guitar/dark_guitar_d.ogg b/assets/voxygen/audio/sfx/instrument/dark_guitar/dark_guitar_d.ogg new file mode 100644 index 0000000000..54f8866c6d --- /dev/null +++ b/assets/voxygen/audio/sfx/instrument/dark_guitar/dark_guitar_d.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bee2f6cec4bb5f613f485e612eb3f788429dfb3b04b2fad651f7cdcac2291bf9 +size 10027 diff --git a/assets/voxygen/audio/sfx/instrument/dark_guitar/dark_guitar_d1c1a.ogg b/assets/voxygen/audio/sfx/instrument/dark_guitar/dark_guitar_d1c1a.ogg new file mode 100644 index 0000000000..c7dbf9bc17 --- /dev/null +++ b/assets/voxygen/audio/sfx/instrument/dark_guitar/dark_guitar_d1c1a.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d41d01adb8a983aa396002fb1d6505d1aac0b859e6bf7dda0d5531248b036c49 +size 10733 diff --git a/assets/voxygen/audio/sfx/instrument/dark_guitar/dark_guitar_d1ge.ogg b/assets/voxygen/audio/sfx/instrument/dark_guitar/dark_guitar_d1ge.ogg new file mode 100644 index 0000000000..c5e10295ba --- /dev/null +++ b/assets/voxygen/audio/sfx/instrument/dark_guitar/dark_guitar_d1ge.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e37b12bbdef849a618d5085be69b703189e3b9c47fb3354765cd96c11fd7a148 +size 10730 diff --git a/assets/voxygen/audio/sfx/instrument/dark_guitar/dark_guitar_dda.ogg b/assets/voxygen/audio/sfx/instrument/dark_guitar/dark_guitar_dda.ogg new file mode 100644 index 0000000000..a20254d41f --- /dev/null +++ b/assets/voxygen/audio/sfx/instrument/dark_guitar/dark_guitar_dda.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:92a56bdeae9e7e562f6f8b0ee444232cbbb46a83218cbeae82a4c5eb30d0c935 +size 10390 diff --git a/assets/voxygen/audio/sfx/instrument/dark_guitar/dark_guitar_e.ogg b/assets/voxygen/audio/sfx/instrument/dark_guitar/dark_guitar_e.ogg new file mode 100644 index 0000000000..17a7fe3208 --- /dev/null +++ b/assets/voxygen/audio/sfx/instrument/dark_guitar/dark_guitar_e.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0c92dfd4b09d5e04ce28ac6103db4f11429a456dccc2baf9dfd1735151a6d4cd +size 10320 diff --git a/assets/voxygen/audio/sfx/instrument/dark_guitar/dark_guitar_eeg.ogg b/assets/voxygen/audio/sfx/instrument/dark_guitar/dark_guitar_eeg.ogg new file mode 100644 index 0000000000..ea851a4826 --- /dev/null +++ b/assets/voxygen/audio/sfx/instrument/dark_guitar/dark_guitar_eeg.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ebbc7cc3358fc5c602c880faa55731e4c13c08b07e132f7fcca586e91b82cb4f +size 10791 diff --git a/assets/voxygen/audio/sfx/instrument/dark_guitar/dark_guitar_g.ogg b/assets/voxygen/audio/sfx/instrument/dark_guitar/dark_guitar_g.ogg new file mode 100644 index 0000000000..f5ba8d880b --- /dev/null +++ b/assets/voxygen/audio/sfx/instrument/dark_guitar/dark_guitar_g.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:038c8be5e654ba35c31da1b78c852f2d8c4e68b96f0b498ea0bc4a0ac2ad2b09 +size 10810 diff --git a/assets/voxygen/audio/sfx/instrument/dark_guitar/dark_guitar_gec.ogg b/assets/voxygen/audio/sfx/instrument/dark_guitar/dark_guitar_gec.ogg new file mode 100644 index 0000000000..7e5728a27c --- /dev/null +++ b/assets/voxygen/audio/sfx/instrument/dark_guitar/dark_guitar_gec.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:533584ce5befa85df383e1ed4a7da7387431a4ea5968a235ecf57b8cb02c4e96 +size 10871 diff --git a/assets/voxygen/audio/sfx/instrument/icy_talharpa/icy_talharpa_a.ogg b/assets/voxygen/audio/sfx/instrument/icy_talharpa/icy_talharpa_a.ogg new file mode 100644 index 0000000000..1ed1eddd3b --- /dev/null +++ b/assets/voxygen/audio/sfx/instrument/icy_talharpa/icy_talharpa_a.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5547a81596cd393ac824c4e47a63f775655c2340cb19261b25af063948f53148 +size 20351 diff --git a/assets/voxygen/audio/sfx/instrument/icy_talharpa/icy_talharpa_c.ogg b/assets/voxygen/audio/sfx/instrument/icy_talharpa/icy_talharpa_c.ogg new file mode 100644 index 0000000000..6339bad600 --- /dev/null +++ b/assets/voxygen/audio/sfx/instrument/icy_talharpa/icy_talharpa_c.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d09d46b38692117e93f362b482787e66abf2ff7b237f850f732474d95a70ff67 +size 22084 diff --git a/assets/voxygen/audio/sfx/instrument/icy_talharpa/icy_talharpa_c1.ogg b/assets/voxygen/audio/sfx/instrument/icy_talharpa/icy_talharpa_c1.ogg new file mode 100644 index 0000000000..f967668953 --- /dev/null +++ b/assets/voxygen/audio/sfx/instrument/icy_talharpa/icy_talharpa_c1.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:62db13a722539b7a8dbc3e31affe7886921f2df4e0fc4af68f5a445add5562d7 +size 18639 diff --git a/assets/voxygen/audio/sfx/instrument/icy_talharpa/icy_talharpa_c1ag.ogg b/assets/voxygen/audio/sfx/instrument/icy_talharpa/icy_talharpa_c1ag.ogg new file mode 100644 index 0000000000..38480488aa --- /dev/null +++ b/assets/voxygen/audio/sfx/instrument/icy_talharpa/icy_talharpa_c1ag.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:15c2b4a56c9283931d3c11a6919d6c7fcf29f5e4a40f27c5b87f88c4f51d13fa +size 25836 diff --git a/assets/voxygen/audio/sfx/instrument/icy_talharpa/icy_talharpa_cde.ogg b/assets/voxygen/audio/sfx/instrument/icy_talharpa/icy_talharpa_cde.ogg new file mode 100644 index 0000000000..c9d090286f --- /dev/null +++ b/assets/voxygen/audio/sfx/instrument/icy_talharpa/icy_talharpa_cde.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d0f27ace7eabe4c1541242af35dff7a8c59a9a8d3c91a8195c6fd757bc68826e +size 25967 diff --git a/assets/voxygen/audio/sfx/instrument/icy_talharpa/icy_talharpa_d.ogg b/assets/voxygen/audio/sfx/instrument/icy_talharpa/icy_talharpa_d.ogg new file mode 100644 index 0000000000..ffb33a98be --- /dev/null +++ b/assets/voxygen/audio/sfx/instrument/icy_talharpa/icy_talharpa_d.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:16a4bb3fb25df9458370ed4837cb9b8db6211e935ae923c3529559436a6f1951 +size 21635 diff --git a/assets/voxygen/audio/sfx/instrument/icy_talharpa/icy_talharpa_d1c1a.ogg b/assets/voxygen/audio/sfx/instrument/icy_talharpa/icy_talharpa_d1c1a.ogg new file mode 100644 index 0000000000..b9e7cc9e11 --- /dev/null +++ b/assets/voxygen/audio/sfx/instrument/icy_talharpa/icy_talharpa_d1c1a.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ecab5f391b7b9947551cc647a18d5a52a9b542fa6be4088aad7b21128c9ff58b +size 25663 diff --git a/assets/voxygen/audio/sfx/instrument/icy_talharpa/icy_talharpa_d1g.ogg b/assets/voxygen/audio/sfx/instrument/icy_talharpa/icy_talharpa_d1g.ogg new file mode 100644 index 0000000000..b2eb4b043f --- /dev/null +++ b/assets/voxygen/audio/sfx/instrument/icy_talharpa/icy_talharpa_d1g.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:12790b275d40afe23a927d65dceeecfc82c39a8672ad3a716d4ea822078bf8d5 +size 22357 diff --git a/assets/voxygen/audio/sfx/instrument/icy_talharpa/icy_talharpa_e.ogg b/assets/voxygen/audio/sfx/instrument/icy_talharpa/icy_talharpa_e.ogg new file mode 100644 index 0000000000..749665d0aa --- /dev/null +++ b/assets/voxygen/audio/sfx/instrument/icy_talharpa/icy_talharpa_e.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ca5c68791172d2cb446993c08a82fdedbe9138c1ca2f41396013b41f8238d531 +size 21572 diff --git a/assets/voxygen/audio/sfx/instrument/icy_talharpa/icy_talharpa_ec1.ogg b/assets/voxygen/audio/sfx/instrument/icy_talharpa/icy_talharpa_ec1.ogg new file mode 100644 index 0000000000..67674a37d1 --- /dev/null +++ b/assets/voxygen/audio/sfx/instrument/icy_talharpa/icy_talharpa_ec1.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:76a8fb5043ac7ab1b08188867b4116e8acdb2c19bb3183c6e77b7de06f69df71 +size 22015 diff --git a/assets/voxygen/audio/sfx/instrument/icy_talharpa/icy_talharpa_ega.ogg b/assets/voxygen/audio/sfx/instrument/icy_talharpa/icy_talharpa_ega.ogg new file mode 100644 index 0000000000..99cebc674d --- /dev/null +++ b/assets/voxygen/audio/sfx/instrument/icy_talharpa/icy_talharpa_ega.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7fc8747c3a5e1c9817d7b3168abe0e2fc2f5d40f3b300e5d52066f58e067b5f7 +size 25458 diff --git a/assets/voxygen/audio/sfx/instrument/icy_talharpa/icy_talharpa_g.ogg b/assets/voxygen/audio/sfx/instrument/icy_talharpa/icy_talharpa_g.ogg new file mode 100644 index 0000000000..5cf50b3ed9 --- /dev/null +++ b/assets/voxygen/audio/sfx/instrument/icy_talharpa/icy_talharpa_g.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d9f0c4e39a3191c6c00c00f7922910d4f86c035cbe91376f5cf06115954961fe +size 21694 diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index 4fddc7bc66..4e19648ce3 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/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, diff --git a/assets/voxygen/voxel/biped_weapon_manifest.ron b/assets/voxygen/voxel/biped_weapon_manifest.ron index 0245b8722f..a4aa3ca883 100644 --- a/assets/voxygen/voxel/biped_weapon_manifest.ron +++ b/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 diff --git a/assets/voxygen/voxel/item_drop_manifest.ron b/assets/voxygen/voxel/item_drop_manifest.ron index 379f713ab6..86993b9d50 100644 --- a/assets/voxygen/voxel/item_drop_manifest.ron +++ b/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", diff --git a/assets/voxygen/voxel/weapon/tool/icy_talharpa.vox b/assets/voxygen/voxel/weapon/tool/icy_talharpa.vox new file mode 100644 index 0000000000..8b5d69f989 --- /dev/null +++ b/assets/voxygen/voxel/weapon/tool/icy_talharpa.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:997251c92e7af606a43c002b4819f3c4f3912419b138033505493a07e5eb141f +size 1724 diff --git a/voxygen/anim/src/character/music.rs b/voxygen/anim/src/character/music.rs index c3a54003fc..d1680ac5d1 100644 --- a/voxygen/anim/src/character/music.rs +++ b/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, diff --git a/voxygen/anim/src/character/wield.rs b/voxygen/anim/src/character/wield.rs index 705bd8a65f..0fae93c927 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() { - "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( diff --git a/voxygen/src/hud/util.rs b/voxygen/src/hud/util.rs index 7588fa5ea6..ade7bc0a71 100644 --- a/voxygen/src/hud/util.rs +++ b/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, }