diff --git a/Cargo.lock b/Cargo.lock index 8f2520a39b..406d047083 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2226,12 +2226,6 @@ dependencies = [ "rayon", ] -[[package]] -name = "hound" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a164bb2ceaeff4f42542bdb847c41517c78a60f5649671b2a07312b6e117549" - [[package]] name = "http" version = "0.2.4" @@ -4192,7 +4186,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b65c2eda643191f6d1bb12ea323a9db8d9ba95374e9be3780b5a9fb5cfb8520f" dependencies = [ "cpal", - "hound", "lewton", ] diff --git a/assets/voxygen/audio/music_transition_manifest.ron b/assets/voxygen/audio/music_transition_manifest.ron index ac1cfc8bcc..226ae5c830 100644 --- a/assets/voxygen/audio/music_transition_manifest.ron +++ b/assets/voxygen/audio/music_transition_manifest.ron @@ -1,15 +1,16 @@ ( combat_nearby_radius: 40.0, - combat_health_factor: 1000, + combat_health_factor: 750, combat_nearby_high_thresh: 4, - combat_nearby_low_thresh: 1, + combat_nearby_low_thresh: 4, fade_timings: { - (TitleMusic, Exploration): (2.0, 12.0), - (TitleMusic, Combat): (2.0, 3.0), - (Exploration, TitleMusic): (2.0, 12.0), - (Exploration, Combat): (5.0, 3.0), - (Combat, Exploration): (5.0, 3.0), - (Combat, TitleMusic): (2.0, 12.0), + //(Track 1, Track 2): (Track 1 fade out (sec), Track 2 fade in (sec)), + (TitleMusic, Exploration): (4.0, 4.0), + (TitleMusic, Combat): (4.0, 4.0), + (Exploration, TitleMusic): (2.0, 2.0), + (Exploration, Combat): (2.0, 2.0), + (Combat, Exploration): (3.0, 6.0), + (Combat, TitleMusic): (2.0, 2.0), }, interrupt_delay: 5.0, ) diff --git a/assets/voxygen/audio/null.ogg b/assets/voxygen/audio/null.ogg new file mode 100644 index 0000000000..2e3c875c46 --- /dev/null +++ b/assets/voxygen/audio/null.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e0f994c7bdeefe5d56df3ddcd58a5558a8a07a0e2960eba5273c03a1306c4c87 +size 3954 diff --git a/assets/voxygen/audio/sfx.ron b/assets/voxygen/audio/sfx.ron index 0067ad9737..d639752b2c 100644 --- a/assets/voxygen/audio/sfx.ron +++ b/assets/voxygen/audio/sfx.ron @@ -136,6 +136,13 @@ "voxygen.audio.sfx.footsteps.stone_step_3", "voxygen.audio.sfx.footsteps.stone_step_4", "voxygen.audio.sfx.footsteps.stone_step_5", + "voxygen.audio.sfx.footsteps.stone_step_6", + "voxygen.audio.sfx.footsteps.stone_step_7", + "voxygen.audio.sfx.footsteps.stone_step_8", + "voxygen.audio.sfx.footsteps.stone_step_9", + "voxygen.audio.sfx.footsteps.stone_step_10", + "voxygen.audio.sfx.footsteps.stone_step_11", + "voxygen.audio.sfx.footsteps.stone_step_12", ], threshold: 1.6, ), @@ -145,6 +152,14 @@ "voxygen.audio.sfx.footsteps.stone_step_2", "voxygen.audio.sfx.footsteps.stone_step_3", "voxygen.audio.sfx.footsteps.stone_step_4", + "voxygen.audio.sfx.footsteps.stone_step_5", + "voxygen.audio.sfx.footsteps.stone_step_6", + "voxygen.audio.sfx.footsteps.stone_step_7", + "voxygen.audio.sfx.footsteps.stone_step_8", + "voxygen.audio.sfx.footsteps.stone_step_9", + "voxygen.audio.sfx.footsteps.stone_step_10", + "voxygen.audio.sfx.footsteps.stone_step_11", + "voxygen.audio.sfx.footsteps.stone_step_12", ], threshold: 0.8, ), diff --git a/assets/voxygen/audio/sfx/abilities/arrow_shot_1.ogg b/assets/voxygen/audio/sfx/abilities/arrow_shot_1.ogg new file mode 100644 index 0000000000..f11be0050a --- /dev/null +++ b/assets/voxygen/audio/sfx/abilities/arrow_shot_1.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dbb34ae00f44e13c0b33543929e1330559644b2af76a5fe10ea22da38301b5db +size 6281 diff --git a/assets/voxygen/audio/sfx/abilities/arrow_shot_1.wav b/assets/voxygen/audio/sfx/abilities/arrow_shot_1.wav deleted file mode 100644 index b886694be1..0000000000 --- a/assets/voxygen/audio/sfx/abilities/arrow_shot_1.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0693a68985868127a618274010702402dada8cad3e2a055b5ac4413a0a56d3af -size 121082 diff --git a/assets/voxygen/audio/sfx/abilities/arrow_shot_2.ogg b/assets/voxygen/audio/sfx/abilities/arrow_shot_2.ogg new file mode 100644 index 0000000000..feeae05ec8 --- /dev/null +++ b/assets/voxygen/audio/sfx/abilities/arrow_shot_2.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4aaa0530e47cd4f504bfba85360d21ceaaaeadafaec3c7ad0b425c5936773610 +size 6177 diff --git a/assets/voxygen/audio/sfx/abilities/arrow_shot_2.wav b/assets/voxygen/audio/sfx/abilities/arrow_shot_2.wav deleted file mode 100644 index 7d2cc0937b..0000000000 --- a/assets/voxygen/audio/sfx/abilities/arrow_shot_2.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:153e0e75c176ed3652afd0157d9a16efb7ffde9b15cdb1472f111bd268c0bbd1 -size 81290 diff --git a/assets/voxygen/audio/sfx/abilities/arrow_shot_3.ogg b/assets/voxygen/audio/sfx/abilities/arrow_shot_3.ogg new file mode 100644 index 0000000000..9b3e9904a2 --- /dev/null +++ b/assets/voxygen/audio/sfx/abilities/arrow_shot_3.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8061767a0eaf48a58eee73757d4fb7968d06d116121b4d3cf7ad505117541c75 +size 6171 diff --git a/assets/voxygen/audio/sfx/abilities/arrow_shot_3.wav b/assets/voxygen/audio/sfx/abilities/arrow_shot_3.wav deleted file mode 100644 index b94c553030..0000000000 --- a/assets/voxygen/audio/sfx/abilities/arrow_shot_3.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0a7f51386d05029f1840cf33d5b1ec5314c8db7dae17a4fa479893befb27586c -size 81290 diff --git a/assets/voxygen/audio/sfx/abilities/arrow_shot_4.ogg b/assets/voxygen/audio/sfx/abilities/arrow_shot_4.ogg new file mode 100644 index 0000000000..1755adafe5 --- /dev/null +++ b/assets/voxygen/audio/sfx/abilities/arrow_shot_4.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c8830e0bfb51593b8f49cc1fbcb5d410bc5f2c902bd57ab4de35dff27d0d9e4f +size 6212 diff --git a/assets/voxygen/audio/sfx/abilities/arrow_shot_4.wav b/assets/voxygen/audio/sfx/abilities/arrow_shot_4.wav deleted file mode 100644 index 6fdeb696f2..0000000000 --- a/assets/voxygen/audio/sfx/abilities/arrow_shot_4.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4a07ed4d646ef3b35566dceaef30dba1a71740ad11437c8d2b8443851770e9b2 -size 81290 diff --git a/assets/voxygen/audio/sfx/abilities/explosion.ogg b/assets/voxygen/audio/sfx/abilities/explosion.ogg new file mode 100644 index 0000000000..871566b53f --- /dev/null +++ b/assets/voxygen/audio/sfx/abilities/explosion.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:442bd39f578bab269febf8f2eb8483bc4fcd3300a08c17f30547b1483e3c5c8b +size 22746 diff --git a/assets/voxygen/audio/sfx/abilities/explosion.wav b/assets/voxygen/audio/sfx/abilities/explosion.wav deleted file mode 100644 index ea6ceb7f49..0000000000 --- a/assets/voxygen/audio/sfx/abilities/explosion.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:71db7f53bd69d4e0723b8c6dff06edcdcbe0c043c5b1b5e87817cbb2be49b38e -size 453210 diff --git a/assets/voxygen/audio/sfx/abilities/fire_shot_1.ogg b/assets/voxygen/audio/sfx/abilities/fire_shot_1.ogg new file mode 100644 index 0000000000..3ce9352d23 --- /dev/null +++ b/assets/voxygen/audio/sfx/abilities/fire_shot_1.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cbc53165a1291604e801350b745edebbb98d314684601ae40ed969ae155e7b03 +size 20094 diff --git a/assets/voxygen/audio/sfx/abilities/fire_shot_1.wav b/assets/voxygen/audio/sfx/abilities/fire_shot_1.wav deleted file mode 100644 index 67312defdb..0000000000 --- a/assets/voxygen/audio/sfx/abilities/fire_shot_1.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e3a2320cac24dca29278c921ffefacd1a65d4bfbd545408035d6dfb806706021 -size 478296 diff --git a/assets/voxygen/audio/sfx/abilities/fire_shot_2.ogg b/assets/voxygen/audio/sfx/abilities/fire_shot_2.ogg new file mode 100644 index 0000000000..d4bf8396ed --- /dev/null +++ b/assets/voxygen/audio/sfx/abilities/fire_shot_2.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3ca7d5eda68ae3594a8bcc5153a1697aa661d93d30749f85604fc011242beaea +size 14291 diff --git a/assets/voxygen/audio/sfx/abilities/fire_shot_2.wav b/assets/voxygen/audio/sfx/abilities/fire_shot_2.wav deleted file mode 100644 index 0208712ca9..0000000000 --- a/assets/voxygen/audio/sfx/abilities/fire_shot_2.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bc317702a6d3450861009fdd73d2bb478cfe930e52a8a04f476ffaf9b491cdc7 -size 121182 diff --git a/assets/voxygen/audio/sfx/abilities/flame_thrower.ogg b/assets/voxygen/audio/sfx/abilities/flame_thrower.ogg new file mode 100644 index 0000000000..5f06891c6a --- /dev/null +++ b/assets/voxygen/audio/sfx/abilities/flame_thrower.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fb2cce225a6c8ffa002f79f9b9101a6cd478bbde6c772dc30426444e48338dc3 +size 10888 diff --git a/assets/voxygen/audio/sfx/abilities/flame_thrower.wav b/assets/voxygen/audio/sfx/abilities/flame_thrower.wav deleted file mode 100644 index 1f6b029d6d..0000000000 --- a/assets/voxygen/audio/sfx/abilities/flame_thrower.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b54842c0b98562ffc6f609f7f947544bee28269da0bab5ff2562b12cd2ae3aad -size 77368 diff --git a/assets/voxygen/audio/sfx/abilities/heal_bomb.ogg b/assets/voxygen/audio/sfx/abilities/heal_bomb.ogg new file mode 100644 index 0000000000..afd060cfe1 --- /dev/null +++ b/assets/voxygen/audio/sfx/abilities/heal_bomb.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7131cec3e0f4f93c1c9edaf89d33fa966e870346ccb4acb5bc88010125717469 +size 68521 diff --git a/assets/voxygen/audio/sfx/abilities/heal_bomb.wav b/assets/voxygen/audio/sfx/abilities/heal_bomb.wav deleted file mode 100644 index 6b8dad1c59..0000000000 --- a/assets/voxygen/audio/sfx/abilities/heal_bomb.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2f20ab33b5961aa650b311d380b5e973d34f5527c10cca102050c31f0ae8bf68 -size 1423964 diff --git a/assets/voxygen/audio/sfx/abilities/sceptre_aura.ogg b/assets/voxygen/audio/sfx/abilities/sceptre_aura.ogg new file mode 100644 index 0000000000..a7a73fc64a --- /dev/null +++ b/assets/voxygen/audio/sfx/abilities/sceptre_aura.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b77307ab81bbe75aba8d7769cd3fd655c29e504007acfe13be0625771c71d38d +size 41869 diff --git a/assets/voxygen/audio/sfx/abilities/sceptre_aura.wav b/assets/voxygen/audio/sfx/abilities/sceptre_aura.wav deleted file mode 100644 index 9dd330327f..0000000000 --- a/assets/voxygen/audio/sfx/abilities/sceptre_aura.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:028af8c927b70ece23f33b8e9705020755e516f2d7d9b93c900059a1a7d45675 -size 651354 diff --git a/assets/voxygen/audio/sfx/abilities/sceptre_channeling.ogg b/assets/voxygen/audio/sfx/abilities/sceptre_channeling.ogg new file mode 100644 index 0000000000..5ddb790434 --- /dev/null +++ b/assets/voxygen/audio/sfx/abilities/sceptre_channeling.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a3f7063eb79ebb4e5c4afd7d0e5fe463221210865e06adde842f786d20f50af8 +size 17060 diff --git a/assets/voxygen/audio/sfx/abilities/sceptre_channeling.wav b/assets/voxygen/audio/sfx/abilities/sceptre_channeling.wav deleted file mode 100644 index 768b9049f9..0000000000 --- a/assets/voxygen/audio/sfx/abilities/sceptre_channeling.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cbc64e9c923f80192a8cb6720335d6927824914a44c948b0915d09f00367eeac -size 156072 diff --git a/assets/voxygen/audio/sfx/abilities/separated_second_swing.ogg b/assets/voxygen/audio/sfx/abilities/separated_second_swing.ogg new file mode 100644 index 0000000000..899ed9f2a1 --- /dev/null +++ b/assets/voxygen/audio/sfx/abilities/separated_second_swing.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4463fb053e3a3f152d7e07b3857a57937d2a563e1e83fc36710d497511153367 +size 7759 diff --git a/assets/voxygen/audio/sfx/abilities/separated_second_swing.wav b/assets/voxygen/audio/sfx/abilities/separated_second_swing.wav deleted file mode 100644 index f0f72f1af7..0000000000 --- a/assets/voxygen/audio/sfx/abilities/separated_second_swing.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5df65fe61ad10ca08d1a144dba6bee37e8a612b6cb4327c189a7f7e3ec2068a1 -size 102854 diff --git a/assets/voxygen/audio/sfx/abilities/separated_third_swing.ogg b/assets/voxygen/audio/sfx/abilities/separated_third_swing.ogg new file mode 100644 index 0000000000..7071535bc8 --- /dev/null +++ b/assets/voxygen/audio/sfx/abilities/separated_third_swing.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d1e05ce64c0b5e35820a969681404fe280e83c5ee92a4dc98c99f3f9975be647 +size 7930 diff --git a/assets/voxygen/audio/sfx/abilities/separated_third_swing.wav b/assets/voxygen/audio/sfx/abilities/separated_third_swing.wav deleted file mode 100644 index 842a4f5f36..0000000000 --- a/assets/voxygen/audio/sfx/abilities/separated_third_swing.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:130d3295cb53434a7e9012e904f5a1aa1df2b08184e4124a04e5ff783114b41e -size 88454 diff --git a/assets/voxygen/audio/sfx/abilities/swing.ogg b/assets/voxygen/audio/sfx/abilities/swing.ogg new file mode 100644 index 0000000000..d14764eff9 --- /dev/null +++ b/assets/voxygen/audio/sfx/abilities/swing.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:598ec637431bcab7c492c79700eda13526da68d43b2dcad45c4d122494e81ec6 +size 7123 diff --git a/assets/voxygen/audio/sfx/abilities/swing.wav b/assets/voxygen/audio/sfx/abilities/swing.wav deleted file mode 100644 index f4bddbcf83..0000000000 --- a/assets/voxygen/audio/sfx/abilities/swing.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9184db868eb6d9b8ef8f4f2393bb9131daa675d4630733017995af8d67160952 -size 250454 diff --git a/assets/voxygen/audio/sfx/abilities/swing_sword.ogg b/assets/voxygen/audio/sfx/abilities/swing_sword.ogg new file mode 100644 index 0000000000..6528b2d068 --- /dev/null +++ b/assets/voxygen/audio/sfx/abilities/swing_sword.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9d5ac97f4b2fb65e482adef90074f7895719bf0fbc69ba152122ce13402cfc17 +size 7074 diff --git a/assets/voxygen/audio/sfx/abilities/swing_sword.wav b/assets/voxygen/audio/sfx/abilities/swing_sword.wav deleted file mode 100644 index 4582e5a58f..0000000000 --- a/assets/voxygen/audio/sfx/abilities/swing_sword.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:efef3b8e2e0a17b71f2fd71141393ac725e27b2ba49569a360216c866f6bbd23 -size 185654 diff --git a/assets/voxygen/audio/sfx/abilities/sword_dash.ogg b/assets/voxygen/audio/sfx/abilities/sword_dash.ogg new file mode 100644 index 0000000000..66bebfa2eb --- /dev/null +++ b/assets/voxygen/audio/sfx/abilities/sword_dash.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1b25331a749619d0e9c1d1d2a4f4e9e472f722e8974d13437bf4b7c557a53743 +size 16111 diff --git a/assets/voxygen/audio/sfx/abilities/sword_dash.wav b/assets/voxygen/audio/sfx/abilities/sword_dash.wav deleted file mode 100644 index 42ad15390f..0000000000 --- a/assets/voxygen/audio/sfx/abilities/sword_dash.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cd7da1ab25641c848f15e32edcd557da6391779ce21c1a51f2581206529b4e16 -size 279740 diff --git a/assets/voxygen/audio/sfx/ambient/bees_1.ogg b/assets/voxygen/audio/sfx/ambient/bees_1.ogg new file mode 100644 index 0000000000..57738d6ca8 --- /dev/null +++ b/assets/voxygen/audio/sfx/ambient/bees_1.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1eee9c850c3fba96e607284abac60c52ec7703a31fc42e0f97c367df1a12d168 +size 174456 diff --git a/assets/voxygen/audio/sfx/ambient/bees_1.wav b/assets/voxygen/audio/sfx/ambient/bees_1.wav deleted file mode 100644 index 04e7a81197..0000000000 --- a/assets/voxygen/audio/sfx/ambient/bees_1.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:548e72163d7fc09947562bafd1a54717386f4cdf644a21be2fc8d1f244aa6820 -size 3961434 diff --git a/assets/voxygen/audio/sfx/ambient/birdcall_1.ogg b/assets/voxygen/audio/sfx/ambient/birdcall_1.ogg new file mode 100644 index 0000000000..2d8abedaf2 --- /dev/null +++ b/assets/voxygen/audio/sfx/ambient/birdcall_1.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:673504d4e6e1ccf272782b8159baedabf7fde73d7c006cccaf0beaedc5d314fa +size 84946 diff --git a/assets/voxygen/audio/sfx/ambient/birdcall_1.wav b/assets/voxygen/audio/sfx/ambient/birdcall_1.wav deleted file mode 100644 index 3ff6765036..0000000000 --- a/assets/voxygen/audio/sfx/ambient/birdcall_1.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:48beac38a18f009deddf7ef64dd2ceed3e6e645b56b62e5ddab99626d0b89dc2 -size 1870938 diff --git a/assets/voxygen/audio/sfx/ambient/birdcall_2.ogg b/assets/voxygen/audio/sfx/ambient/birdcall_2.ogg new file mode 100644 index 0000000000..a9a5a7f47b --- /dev/null +++ b/assets/voxygen/audio/sfx/ambient/birdcall_2.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cedcdff91a632c439467420293b2f22f18399268f7ec08b76f81c34fdddaab29 +size 137561 diff --git a/assets/voxygen/audio/sfx/ambient/birdcall_2.wav b/assets/voxygen/audio/sfx/ambient/birdcall_2.wav deleted file mode 100644 index 84b1a71e47..0000000000 --- a/assets/voxygen/audio/sfx/ambient/birdcall_2.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:654d036baaa259367c38a343cf3ed006aa18b88a509bce6ddfc555606ad74e96 -size 3061338 diff --git a/assets/voxygen/audio/sfx/ambient/crickets_1.ogg b/assets/voxygen/audio/sfx/ambient/crickets_1.ogg new file mode 100644 index 0000000000..3f23db56b7 --- /dev/null +++ b/assets/voxygen/audio/sfx/ambient/crickets_1.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fbf4d49d95dea2bce5e51dadadae86e9b5f45d80c82686edbf326ff2385195f9 +size 7728 diff --git a/assets/voxygen/audio/sfx/ambient/crickets_1.wav b/assets/voxygen/audio/sfx/ambient/crickets_1.wav deleted file mode 100644 index 5d3863268f..0000000000 --- a/assets/voxygen/audio/sfx/ambient/crickets_1.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3331bb02dd24c96f087d9055af834cadce79968ed778f6e6ea1cd6367a2dbd55 -size 40118 diff --git a/assets/voxygen/audio/sfx/ambient/crickets_2.ogg b/assets/voxygen/audio/sfx/ambient/crickets_2.ogg new file mode 100644 index 0000000000..db765f666f --- /dev/null +++ b/assets/voxygen/audio/sfx/ambient/crickets_2.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2664c7bffe5beb47f6681098b8fed3a8b28e821391e2f80e2bfb3f038523c8ff +size 15345 diff --git a/assets/voxygen/audio/sfx/ambient/crickets_2.wav b/assets/voxygen/audio/sfx/ambient/crickets_2.wav deleted file mode 100644 index fb72ef8191..0000000000 --- a/assets/voxygen/audio/sfx/ambient/crickets_2.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:812511e90659174caeb6c790c97376aa31d011eb1dd36b2c40d736662645f5f8 -size 66092 diff --git a/assets/voxygen/audio/sfx/ambient/crickets_3.ogg b/assets/voxygen/audio/sfx/ambient/crickets_3.ogg new file mode 100644 index 0000000000..e49b981524 --- /dev/null +++ b/assets/voxygen/audio/sfx/ambient/crickets_3.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6faf342d22a899a407a1d4ec2ef3b54df755e89f164d4d9d046ab04ad1b32da0 +size 10841 diff --git a/assets/voxygen/audio/sfx/ambient/crickets_3.wav b/assets/voxygen/audio/sfx/ambient/crickets_3.wav deleted file mode 100644 index 68d9afb9a0..0000000000 --- a/assets/voxygen/audio/sfx/ambient/crickets_3.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b02474db3d826785d875be38b79a453274696e86af45a70f957490c5abd58a84 -size 64264 diff --git a/assets/voxygen/audio/sfx/ambient/fire.ogg b/assets/voxygen/audio/sfx/ambient/fire.ogg new file mode 100644 index 0000000000..2f986b1afd --- /dev/null +++ b/assets/voxygen/audio/sfx/ambient/fire.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8db2e559e6728e1fc3af94bf133d30f18c87d97c6f068cfca38463788be42bce +size 244312 diff --git a/assets/voxygen/audio/sfx/ambient/fire.wav b/assets/voxygen/audio/sfx/ambient/fire.wav deleted file mode 100644 index 7ba1eb1e7a..0000000000 --- a/assets/voxygen/audio/sfx/ambient/fire.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:39a70779ca6db3a7c362dde814d39068d63dbe38c678799537de3b795decc4ac -size 2096284 diff --git a/assets/voxygen/audio/sfx/ambient/frog_croak_1.ogg b/assets/voxygen/audio/sfx/ambient/frog_croak_1.ogg new file mode 100644 index 0000000000..e6fb9f3650 --- /dev/null +++ b/assets/voxygen/audio/sfx/ambient/frog_croak_1.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cfc457273f6a969f064ee8a149ea2b1ca5f2cd80c4747bb4a65a2b1b6cb7c439 +size 9212 diff --git a/assets/voxygen/audio/sfx/ambient/frog_croak_1.wav b/assets/voxygen/audio/sfx/ambient/frog_croak_1.wav deleted file mode 100644 index e399bc3d21..0000000000 --- a/assets/voxygen/audio/sfx/ambient/frog_croak_1.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:239c4895cbb65d42d1bc02d3570c4cacaf194dd37d92c414810bed36b69eacae -size 48902 diff --git a/assets/voxygen/audio/sfx/ambient/owl_1.ogg b/assets/voxygen/audio/sfx/ambient/owl_1.ogg new file mode 100644 index 0000000000..9b3e021872 --- /dev/null +++ b/assets/voxygen/audio/sfx/ambient/owl_1.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c735f1a54411abcc796c456b637f74fc06f579ce33669db179578c8a5bfced1a +size 36205 diff --git a/assets/voxygen/audio/sfx/ambient/owl_1.wav b/assets/voxygen/audio/sfx/ambient/owl_1.wav deleted file mode 100644 index 58d2c2d9db..0000000000 --- a/assets/voxygen/audio/sfx/ambient/owl_1.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a5ed42b21d86d81bdb7b1bca9c1af4af3a9adecd3aed3e3a1a7f64d9ace7cd23 -size 388260 diff --git a/assets/voxygen/audio/sfx/ambient/running_water_1.ogg b/assets/voxygen/audio/sfx/ambient/running_water_1.ogg new file mode 100644 index 0000000000..a329fb0aab --- /dev/null +++ b/assets/voxygen/audio/sfx/ambient/running_water_1.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c5be93f0523405d5d41aee6e22422aecdce88582f8a9538524c32c490bd781b5 +size 93039 diff --git a/assets/voxygen/audio/sfx/ambient/running_water_1.wav b/assets/voxygen/audio/sfx/ambient/running_water_1.wav deleted file mode 100644 index 55fa89b1e1..0000000000 --- a/assets/voxygen/audio/sfx/ambient/running_water_1.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7392c18ce33853b3a717fb291b4a6173102cc2a6996ae933e5d5879aa9a41eb6 -size 644772 diff --git a/assets/voxygen/audio/sfx/character/arrow_hit.ogg b/assets/voxygen/audio/sfx/character/arrow_hit.ogg new file mode 100644 index 0000000000..3e3f6fea62 --- /dev/null +++ b/assets/voxygen/audio/sfx/character/arrow_hit.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bd50a6f63f2c3a93e0b1f7f03df22f56223ec114296d45f862cde2e0d32becb5 +size 6205 diff --git a/assets/voxygen/audio/sfx/character/arrow_hit.wav b/assets/voxygen/audio/sfx/character/arrow_hit.wav deleted file mode 100644 index 251492a6ec..0000000000 --- a/assets/voxygen/audio/sfx/character/arrow_hit.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c988685b6fee850a9a66e4f9a62538fe93431bb04e6cd253b37e6cb56e478216 -size 16554 diff --git a/assets/voxygen/audio/sfx/character/arrow_miss.ogg b/assets/voxygen/audio/sfx/character/arrow_miss.ogg new file mode 100644 index 0000000000..3170322808 --- /dev/null +++ b/assets/voxygen/audio/sfx/character/arrow_miss.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5d916288320ddb14712633ca6f6ae72286d20f62fbf2e7d4399202687ed2d58f +size 18230 diff --git a/assets/voxygen/audio/sfx/character/arrow_miss.wav b/assets/voxygen/audio/sfx/character/arrow_miss.wav deleted file mode 100644 index 376df2f963..0000000000 --- a/assets/voxygen/audio/sfx/character/arrow_miss.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b1891ae965af462f2bb582c271f69eaa385f15fa3283ef9076361b1d25321254 -size 98712 diff --git a/assets/voxygen/audio/sfx/character/dive_roll_1.ogg b/assets/voxygen/audio/sfx/character/dive_roll_1.ogg new file mode 100644 index 0000000000..ccf1cec114 --- /dev/null +++ b/assets/voxygen/audio/sfx/character/dive_roll_1.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3a3f7f26a385ede32dc79744078967caf3449b8623785729c1f186f78d9399d3 +size 16489 diff --git a/assets/voxygen/audio/sfx/character/dive_roll_1.wav b/assets/voxygen/audio/sfx/character/dive_roll_1.wav deleted file mode 100644 index 4d2645cb5a..0000000000 --- a/assets/voxygen/audio/sfx/character/dive_roll_1.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9986ff72f3405f5c12ddb17cce0ab0b5e2f0816e73ed383e566846483bee6777 -size 160216 diff --git a/assets/voxygen/audio/sfx/character/dive_roll_2.ogg b/assets/voxygen/audio/sfx/character/dive_roll_2.ogg new file mode 100644 index 0000000000..3b05cabb0e --- /dev/null +++ b/assets/voxygen/audio/sfx/character/dive_roll_2.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7638f3a2053e3cadc7551bbe105eb1fb9afb934e4d71d551064e5d740c411df2 +size 20611 diff --git a/assets/voxygen/audio/sfx/character/dive_roll_2.wav b/assets/voxygen/audio/sfx/character/dive_roll_2.wav deleted file mode 100644 index 6b6650b5af..0000000000 --- a/assets/voxygen/audio/sfx/character/dive_roll_2.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1ca8b8bd0da5bf4e01cb308221b595e3aeaa4dadcc2c14f0f105f7b507f56059 -size 213136 diff --git a/assets/voxygen/audio/sfx/character/experience_gained_1.ogg b/assets/voxygen/audio/sfx/character/experience_gained_1.ogg new file mode 100644 index 0000000000..6fe7148a86 --- /dev/null +++ b/assets/voxygen/audio/sfx/character/experience_gained_1.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:652b5046cc89dd9ef2e842afdc1a8d15898102722c0edd8fe52732afc9100276 +size 8239 diff --git a/assets/voxygen/audio/sfx/character/experience_gained_1.wav b/assets/voxygen/audio/sfx/character/experience_gained_1.wav deleted file mode 100644 index c2d70b8e8a..0000000000 --- a/assets/voxygen/audio/sfx/character/experience_gained_1.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cfc7335bf55ecafffc44729315559996c14e5a2896603ec74421a6bf0a87c370 -size 237984 diff --git a/assets/voxygen/audio/sfx/character/experience_gained_2.ogg b/assets/voxygen/audio/sfx/character/experience_gained_2.ogg new file mode 100644 index 0000000000..81d3d1a96a --- /dev/null +++ b/assets/voxygen/audio/sfx/character/experience_gained_2.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3eeaedcff1217005b0f02dfe0c7ab7cd69175fe2e0f21d9e56069a7622a866e6 +size 8179 diff --git a/assets/voxygen/audio/sfx/character/experience_gained_2.wav b/assets/voxygen/audio/sfx/character/experience_gained_2.wav deleted file mode 100644 index cab9fc124c..0000000000 --- a/assets/voxygen/audio/sfx/character/experience_gained_2.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:95059cfcb3f595ea44c0f69bb27b1a7bbb60c6f37f895055346a6215f187f886 -size 237984 diff --git a/assets/voxygen/audio/sfx/character/experience_gained_3.ogg b/assets/voxygen/audio/sfx/character/experience_gained_3.ogg new file mode 100644 index 0000000000..8f7d870f33 --- /dev/null +++ b/assets/voxygen/audio/sfx/character/experience_gained_3.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a29b4920bd01ebd0e4c3cecced390f9c72a85563f2091101ac374cabca6aed9f +size 8209 diff --git a/assets/voxygen/audio/sfx/character/experience_gained_3.wav b/assets/voxygen/audio/sfx/character/experience_gained_3.wav deleted file mode 100644 index 44c7c01af2..0000000000 --- a/assets/voxygen/audio/sfx/character/experience_gained_3.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:19744afa5d9643c6962499591b79bf19a88f39e3a09c7cc20d7d3553532e9c5e -size 237984 diff --git a/assets/voxygen/audio/sfx/character/glider_close.ogg b/assets/voxygen/audio/sfx/character/glider_close.ogg new file mode 100644 index 0000000000..6f7c5bee9f --- /dev/null +++ b/assets/voxygen/audio/sfx/character/glider_close.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d4991394d9699534a64761deccbb9677d88b1c996c75a0b523f1252ec8ce04f2 +size 19092 diff --git a/assets/voxygen/audio/sfx/character/glider_close.wav b/assets/voxygen/audio/sfx/character/glider_close.wav deleted file mode 100644 index 2b7759a3b4..0000000000 --- a/assets/voxygen/audio/sfx/character/glider_close.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c926498273ccba1de8faed4dc9530a57b8f7f9b2c71ba22dc5f981f0ccb5b884 -size 136320 diff --git a/assets/voxygen/audio/sfx/character/glider_open.ogg b/assets/voxygen/audio/sfx/character/glider_open.ogg new file mode 100644 index 0000000000..299d941297 --- /dev/null +++ b/assets/voxygen/audio/sfx/character/glider_open.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eba27f40a0b94690c0c9b53bd3781d6110a5ea3d4a5157695f55f682739e9a7f +size 11700 diff --git a/assets/voxygen/audio/sfx/character/glider_open.wav b/assets/voxygen/audio/sfx/character/glider_open.wav deleted file mode 100644 index ef932c331b..0000000000 --- a/assets/voxygen/audio/sfx/character/glider_open.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3bcc0d2e51d68332e6e1845e06556cf3e311bf45f857491c23666118511d0f90 -size 146010 diff --git a/assets/voxygen/audio/sfx/character/hit_1.ogg b/assets/voxygen/audio/sfx/character/hit_1.ogg new file mode 100644 index 0000000000..31fa54f2c1 --- /dev/null +++ b/assets/voxygen/audio/sfx/character/hit_1.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6d4c816d2923ee72b3c49656de8c08b6b8f2ee9a3808d08e3e9e87dfdd5986bd +size 7690 diff --git a/assets/voxygen/audio/sfx/character/hit_1.wav b/assets/voxygen/audio/sfx/character/hit_1.wav deleted file mode 100644 index fbd3563d13..0000000000 --- a/assets/voxygen/audio/sfx/character/hit_1.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:afa3a9c622bcb61b2364d83816995fc1e704f87500a04509e066cd8ac05fab23 -size 33904 diff --git a/assets/voxygen/audio/sfx/character/hit_2.ogg b/assets/voxygen/audio/sfx/character/hit_2.ogg new file mode 100644 index 0000000000..16d3cad3e0 --- /dev/null +++ b/assets/voxygen/audio/sfx/character/hit_2.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:19b17a19910390497982e59fed5c7d36e5a2e508b7eeed9d3befec7df53306fa +size 7759 diff --git a/assets/voxygen/audio/sfx/character/hit_2.wav b/assets/voxygen/audio/sfx/character/hit_2.wav deleted file mode 100644 index dab62f63e3..0000000000 --- a/assets/voxygen/audio/sfx/character/hit_2.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dba2ff50929687cc7e06b23b178ee2d574deb1889f348f2021f52ff1ef600368 -size 33904 diff --git a/assets/voxygen/audio/sfx/character/hit_3.ogg b/assets/voxygen/audio/sfx/character/hit_3.ogg new file mode 100644 index 0000000000..928e26994e --- /dev/null +++ b/assets/voxygen/audio/sfx/character/hit_3.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c13fe7f3b9fc9806f9641c1627e8c40589a5a7964cff254629015a9fb72f9b12 +size 7658 diff --git a/assets/voxygen/audio/sfx/character/hit_3.wav b/assets/voxygen/audio/sfx/character/hit_3.wav deleted file mode 100644 index fc1846ed9f..0000000000 --- a/assets/voxygen/audio/sfx/character/hit_3.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d6120ce34ae17286338fe29bcdd8c697a4964c8fa21bd8fe7ebec73a89188e1b -size 33904 diff --git a/assets/voxygen/audio/sfx/character/hit_4.ogg b/assets/voxygen/audio/sfx/character/hit_4.ogg new file mode 100644 index 0000000000..4b54700640 --- /dev/null +++ b/assets/voxygen/audio/sfx/character/hit_4.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7cbd43236b9604b48678044d7c484d575c926c3e764a931e6c294758305d4109 +size 7672 diff --git a/assets/voxygen/audio/sfx/character/hit_4.wav b/assets/voxygen/audio/sfx/character/hit_4.wav deleted file mode 100644 index b1b5957d93..0000000000 --- a/assets/voxygen/audio/sfx/character/hit_4.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fb7906a8f7c63ed3466f9b2e9490342e641d9a619a9bb64b9547229076e0e78b -size 33904 diff --git a/assets/voxygen/audio/sfx/character/interrupted_1.wav b/assets/voxygen/audio/sfx/character/interrupted_1.wav deleted file mode 100644 index 2f87bfb0fb..0000000000 --- a/assets/voxygen/audio/sfx/character/interrupted_1.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5be02d146694a09e38aa155975ab206809d6aa45b3282aa63781b67637ab6b0f -size 300084 diff --git a/assets/voxygen/audio/sfx/character/level_up_sound_-_shorter_wind_up.ogg b/assets/voxygen/audio/sfx/character/level_up_sound_-_shorter_wind_up.ogg new file mode 100644 index 0000000000..4d4172e3dc --- /dev/null +++ b/assets/voxygen/audio/sfx/character/level_up_sound_-_shorter_wind_up.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5b8b166320e9aebce6fd056a8ff5f44133e945ae31688c31c3b5c9ed872956e0 +size 95492 diff --git a/assets/voxygen/audio/sfx/character/level_up_sound_-_shorter_wind_up.wav b/assets/voxygen/audio/sfx/character/level_up_sound_-_shorter_wind_up.wav deleted file mode 100644 index f8c2e41d0e..0000000000 --- a/assets/voxygen/audio/sfx/character/level_up_sound_-_shorter_wind_up.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:80f99964748efd5b7cf74f99310db1b303f42a891d4e44307920675a5c312fd3 -size 2542280 diff --git a/assets/voxygen/audio/sfx/character/stunned_1.wav b/assets/voxygen/audio/sfx/character/stunned_1.wav deleted file mode 100644 index d3daf4cf8d..0000000000 --- a/assets/voxygen/audio/sfx/character/stunned_1.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e839db11f05beab373587cb2f69db8c0ef3c9368c5e4a3c6cfef5266c46968ae -size 396948 diff --git a/assets/voxygen/audio/sfx/character/stunned_2.wav b/assets/voxygen/audio/sfx/character/stunned_2.wav deleted file mode 100644 index eef5e9ffaf..0000000000 --- a/assets/voxygen/audio/sfx/character/stunned_2.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aaa53994f26b3f257ddb9cb7cfda6b5b8dd3f3c956532e798db7bd8fa1f6b6c1 -size 396948 diff --git a/assets/voxygen/audio/sfx/crafting/hammer.ogg b/assets/voxygen/audio/sfx/crafting/hammer.ogg new file mode 100644 index 0000000000..231793d411 --- /dev/null +++ b/assets/voxygen/audio/sfx/crafting/hammer.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ad18acbbf98dcb1f6b0dcbb37c5bb97331d1eec6f0ea3e1b68c6aacf3a629afb +size 11280 diff --git a/assets/voxygen/audio/sfx/crafting/hammer.wav b/assets/voxygen/audio/sfx/crafting/hammer.wav deleted file mode 100644 index 03223c4ee4..0000000000 --- a/assets/voxygen/audio/sfx/crafting/hammer.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:be15f45edcf757e9e2135323d5d9d96069022ef21dcff72df80a49637bd31bc3 -size 185678 diff --git a/assets/voxygen/audio/sfx/footsteps/snow_step_1.ogg b/assets/voxygen/audio/sfx/footsteps/snow_step_1.ogg new file mode 100644 index 0000000000..3eb0d491ac --- /dev/null +++ b/assets/voxygen/audio/sfx/footsteps/snow_step_1.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c6aeabd16949b87a43d194d08f6aedd173103ce8535cd930029f280d6b00c841 +size 12849 diff --git a/assets/voxygen/audio/sfx/footsteps/snow_step_1.wav b/assets/voxygen/audio/sfx/footsteps/snow_step_1.wav deleted file mode 100644 index 38fb243d2a..0000000000 --- a/assets/voxygen/audio/sfx/footsteps/snow_step_1.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b5df4056f85354b477c81dfde450542c3684eb11ffc850ddebdd730cae5c16db -size 116752 diff --git a/assets/voxygen/audio/sfx/footsteps/snow_step_2.ogg b/assets/voxygen/audio/sfx/footsteps/snow_step_2.ogg new file mode 100644 index 0000000000..ab72e4cb88 --- /dev/null +++ b/assets/voxygen/audio/sfx/footsteps/snow_step_2.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9810dca5425173b196a794f46ed2f8a0e707c636290ef6cc84ca7686761cd924 +size 12297 diff --git a/assets/voxygen/audio/sfx/footsteps/snow_step_2.wav b/assets/voxygen/audio/sfx/footsteps/snow_step_2.wav deleted file mode 100644 index 28cb9352cc..0000000000 --- a/assets/voxygen/audio/sfx/footsteps/snow_step_2.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2d6ebde0ec293ba854987ac4473b3d0db0f83a9c4edfaf281b69b6fe33f49170 -size 116752 diff --git a/assets/voxygen/audio/sfx/footsteps/snow_step_3.ogg b/assets/voxygen/audio/sfx/footsteps/snow_step_3.ogg new file mode 100644 index 0000000000..9e63e16562 --- /dev/null +++ b/assets/voxygen/audio/sfx/footsteps/snow_step_3.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:07d11684646b9942e6fceb342a6b26e66b704a9072c2ca127dd2f896ff196fd3 +size 10593 diff --git a/assets/voxygen/audio/sfx/footsteps/snow_step_3.wav b/assets/voxygen/audio/sfx/footsteps/snow_step_3.wav deleted file mode 100644 index 0e05ef9814..0000000000 --- a/assets/voxygen/audio/sfx/footsteps/snow_step_3.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:37042b31ca33c07967a8f94dac7cc8f4887e22e812f8baedc774c0adf781049d -size 87952 diff --git a/assets/voxygen/audio/sfx/footsteps/stepdirt_1.ogg b/assets/voxygen/audio/sfx/footsteps/stepdirt_1.ogg new file mode 100644 index 0000000000..04bbdca71e --- /dev/null +++ b/assets/voxygen/audio/sfx/footsteps/stepdirt_1.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7407d6c8a1cad667f5a3759890b33fb250ba26cd4c734b1e21391b27c60ddc94 +size 14697 diff --git a/assets/voxygen/audio/sfx/footsteps/stepdirt_1.wav b/assets/voxygen/audio/sfx/footsteps/stepdirt_1.wav deleted file mode 100644 index 698bf5334d..0000000000 --- a/assets/voxygen/audio/sfx/footsteps/stepdirt_1.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:21d9fdd101f074a7b3181781e42d433ae6e2c4d2cf9ed9f622e74c5e8842a0c9 -size 93390 diff --git a/assets/voxygen/audio/sfx/footsteps/stepdirt_2.ogg b/assets/voxygen/audio/sfx/footsteps/stepdirt_2.ogg new file mode 100644 index 0000000000..0dc5a6cb34 --- /dev/null +++ b/assets/voxygen/audio/sfx/footsteps/stepdirt_2.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b04aeb8a40e815875105daf04c6d1600cbe6eaa63d5ee8a29fe53924a4f7a10c +size 14405 diff --git a/assets/voxygen/audio/sfx/footsteps/stepdirt_2.wav b/assets/voxygen/audio/sfx/footsteps/stepdirt_2.wav deleted file mode 100644 index 6ea1e5d2bc..0000000000 --- a/assets/voxygen/audio/sfx/footsteps/stepdirt_2.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4af32c6a13baf00c81a940a2781b90eaf0c5427c8a844eb925bd661a95c5249f -size 93390 diff --git a/assets/voxygen/audio/sfx/footsteps/stepdirt_3.ogg b/assets/voxygen/audio/sfx/footsteps/stepdirt_3.ogg new file mode 100644 index 0000000000..da88c81ef3 --- /dev/null +++ b/assets/voxygen/audio/sfx/footsteps/stepdirt_3.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be71757a2bb199ccf68e3f4f646287935faedd9106134e80b0020e886a2380d0 +size 12880 diff --git a/assets/voxygen/audio/sfx/footsteps/stepdirt_3.wav b/assets/voxygen/audio/sfx/footsteps/stepdirt_3.wav deleted file mode 100644 index 475950159b..0000000000 --- a/assets/voxygen/audio/sfx/footsteps/stepdirt_3.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9943f0ba9faad3e956bd8fafdfde1d18dc8dae54fb85eb9d8f69d0b972447ac8 -size 77340 diff --git a/assets/voxygen/audio/sfx/footsteps/stepdirt_4.ogg b/assets/voxygen/audio/sfx/footsteps/stepdirt_4.ogg new file mode 100644 index 0000000000..528b4c1551 --- /dev/null +++ b/assets/voxygen/audio/sfx/footsteps/stepdirt_4.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5bf93eebb428f5c2a4f82855ff20c9c681cf1cd2ffe6d5b3f661cb594f6b17b6 +size 12911 diff --git a/assets/voxygen/audio/sfx/footsteps/stepdirt_4.wav b/assets/voxygen/audio/sfx/footsteps/stepdirt_4.wav deleted file mode 100644 index d6a49dd4c8..0000000000 --- a/assets/voxygen/audio/sfx/footsteps/stepdirt_4.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f4d9f13579ae9c5a472aa800b65994e57d7b518a211e55b3dd1d4181bc8d67cf -size 88364 diff --git a/assets/voxygen/audio/sfx/footsteps/stepdirt_5.ogg b/assets/voxygen/audio/sfx/footsteps/stepdirt_5.ogg new file mode 100644 index 0000000000..8288ba9280 --- /dev/null +++ b/assets/voxygen/audio/sfx/footsteps/stepdirt_5.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:328fa89252289c9db1ab900bd43eafb5a90f714d27ec7c9514cffd2c598d72fe +size 13282 diff --git a/assets/voxygen/audio/sfx/footsteps/stepdirt_5.wav b/assets/voxygen/audio/sfx/footsteps/stepdirt_5.wav deleted file mode 100644 index 1f7e26fb71..0000000000 --- a/assets/voxygen/audio/sfx/footsteps/stepdirt_5.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:acab39b1ec950f4ddd4253b873c515a31d56214cd0e7145006128889713183a9 -size 88364 diff --git a/assets/voxygen/audio/sfx/footsteps/stepgrass_1.ogg b/assets/voxygen/audio/sfx/footsteps/stepgrass_1.ogg new file mode 100644 index 0000000000..8c16788985 --- /dev/null +++ b/assets/voxygen/audio/sfx/footsteps/stepgrass_1.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:35f97abb257fba6ab17af359de76dc4058713a15c3a8eee20c4f1f6f42770dd3 +size 8179 diff --git a/assets/voxygen/audio/sfx/footsteps/stepgrass_1.wav b/assets/voxygen/audio/sfx/footsteps/stepgrass_1.wav deleted file mode 100644 index 560d5922c6..0000000000 --- a/assets/voxygen/audio/sfx/footsteps/stepgrass_1.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ace7b9cf326fdde1c979983fcc549f3864ed2d370c6d5bd89c65e066ff7e4abe -size 47094 diff --git a/assets/voxygen/audio/sfx/footsteps/stepgrass_2.ogg b/assets/voxygen/audio/sfx/footsteps/stepgrass_2.ogg new file mode 100644 index 0000000000..bf1690a7cc --- /dev/null +++ b/assets/voxygen/audio/sfx/footsteps/stepgrass_2.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7bda137a42b0182ebe05922c8407965488153b0f7819e69b520765188f0fab3c +size 7978 diff --git a/assets/voxygen/audio/sfx/footsteps/stepgrass_2.wav b/assets/voxygen/audio/sfx/footsteps/stepgrass_2.wav deleted file mode 100644 index 7a4a3559da..0000000000 --- a/assets/voxygen/audio/sfx/footsteps/stepgrass_2.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c5b250d9d3b3ecc8437e38d59958e5b57e284236d1120df6209ce7c2ad215351 -size 43522 diff --git a/assets/voxygen/audio/sfx/footsteps/stepgrass_3.ogg b/assets/voxygen/audio/sfx/footsteps/stepgrass_3.ogg new file mode 100644 index 0000000000..f86c7b818c --- /dev/null +++ b/assets/voxygen/audio/sfx/footsteps/stepgrass_3.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b48d06c45097408db4c670a3dddc047e11a885632ac523ed2de14174df3a5914 +size 8100 diff --git a/assets/voxygen/audio/sfx/footsteps/stepgrass_3.wav b/assets/voxygen/audio/sfx/footsteps/stepgrass_3.wav deleted file mode 100644 index 1aec02694f..0000000000 --- a/assets/voxygen/audio/sfx/footsteps/stepgrass_3.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:19ed8e409fcaa2097df561beb7aeb008eca9ccc082aecb3d29ea5231480004c6 -size 44326 diff --git a/assets/voxygen/audio/sfx/footsteps/stepgrass_4.ogg b/assets/voxygen/audio/sfx/footsteps/stepgrass_4.ogg new file mode 100644 index 0000000000..45cf8c81e6 --- /dev/null +++ b/assets/voxygen/audio/sfx/footsteps/stepgrass_4.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cd4f4fde9a3887461c008d97e80634d2f25e50d7303f39dec1f85db07ef91c3d +size 8147 diff --git a/assets/voxygen/audio/sfx/footsteps/stepgrass_4.wav b/assets/voxygen/audio/sfx/footsteps/stepgrass_4.wav deleted file mode 100644 index 0a9dad5000..0000000000 --- a/assets/voxygen/audio/sfx/footsteps/stepgrass_4.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a2fd695fd77d2599721d69675a82bbaa12d8c2e827fd45350e4174ee76504c14 -size 44306 diff --git a/assets/voxygen/audio/sfx/footsteps/stepgrass_5.ogg b/assets/voxygen/audio/sfx/footsteps/stepgrass_5.ogg new file mode 100644 index 0000000000..7df3f5d29d --- /dev/null +++ b/assets/voxygen/audio/sfx/footsteps/stepgrass_5.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1ff1f05ce8b9204808a54c08e961c1ff6a9fb32e0c2029534d4faeba368a5010 +size 8122 diff --git a/assets/voxygen/audio/sfx/footsteps/stepgrass_5.wav b/assets/voxygen/audio/sfx/footsteps/stepgrass_5.wav deleted file mode 100644 index 5c62b32a53..0000000000 --- a/assets/voxygen/audio/sfx/footsteps/stepgrass_5.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ea4a5de1607cb6c13e25b559436529899021ca74c1ceed711e33b7492fb3a8f4 -size 44522 diff --git a/assets/voxygen/audio/sfx/footsteps/stepgrass_6.ogg b/assets/voxygen/audio/sfx/footsteps/stepgrass_6.ogg new file mode 100644 index 0000000000..aa901ef98a --- /dev/null +++ b/assets/voxygen/audio/sfx/footsteps/stepgrass_6.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e2b955354ae2dff523392803128c2f6fda906c0df1d2de9e36fa5da3c58b48fe +size 7988 diff --git a/assets/voxygen/audio/sfx/footsteps/stepgrass_6.wav b/assets/voxygen/audio/sfx/footsteps/stepgrass_6.wav deleted file mode 100644 index 5f3558ba53..0000000000 --- a/assets/voxygen/audio/sfx/footsteps/stepgrass_6.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7c5ca9b155c0d5285aac40e873d8dec7e4d7ad34b30252b21eba7d43a552a45c -size 46182 diff --git a/assets/voxygen/audio/sfx/footsteps/stone_step_1.ogg b/assets/voxygen/audio/sfx/footsteps/stone_step_1.ogg new file mode 100644 index 0000000000..e2cf0ab3dc --- /dev/null +++ b/assets/voxygen/audio/sfx/footsteps/stone_step_1.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3657e251496982183b385568bb2ce8f9f6f92a766aa6e82458d2c54914974b19 +size 8922 diff --git a/assets/voxygen/audio/sfx/footsteps/stone_step_1.wav b/assets/voxygen/audio/sfx/footsteps/stone_step_1.wav deleted file mode 100644 index 7eee6e0b61..0000000000 --- a/assets/voxygen/audio/sfx/footsteps/stone_step_1.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a3a9327b10a15419bdbff12f4a30cd988e8f6f560a0cafb7ce8db97c2aea71b4 -size 34638 diff --git a/assets/voxygen/audio/sfx/footsteps/stone_step_10.ogg b/assets/voxygen/audio/sfx/footsteps/stone_step_10.ogg new file mode 100644 index 0000000000..ceb0c632fe --- /dev/null +++ b/assets/voxygen/audio/sfx/footsteps/stone_step_10.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:084f2685d69bdd4561cec2f05e30187a66d7f88406032d5b007165b8dd3ea7e8 +size 9672 diff --git a/assets/voxygen/audio/sfx/footsteps/stone_step_11.ogg b/assets/voxygen/audio/sfx/footsteps/stone_step_11.ogg new file mode 100644 index 0000000000..06d0926117 --- /dev/null +++ b/assets/voxygen/audio/sfx/footsteps/stone_step_11.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d9df824b16ec4665398b0633eaa2a22b295a81f5062ce91443d1fc3efd040e6e +size 9578 diff --git a/assets/voxygen/audio/sfx/footsteps/stone_step_12.ogg b/assets/voxygen/audio/sfx/footsteps/stone_step_12.ogg new file mode 100644 index 0000000000..e30877d52a --- /dev/null +++ b/assets/voxygen/audio/sfx/footsteps/stone_step_12.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8a5ef868d5995c29e38072322c646c09a25d36921500dc517e17f2a33f13e3a1 +size 8961 diff --git a/assets/voxygen/audio/sfx/footsteps/stone_step_2.ogg b/assets/voxygen/audio/sfx/footsteps/stone_step_2.ogg new file mode 100644 index 0000000000..203af30890 --- /dev/null +++ b/assets/voxygen/audio/sfx/footsteps/stone_step_2.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bc34044fe0971cdacb9e7a07a9b11ac74b3652d89cd2f3ad64c04673976a3fe1 +size 9274 diff --git a/assets/voxygen/audio/sfx/footsteps/stone_step_2.wav b/assets/voxygen/audio/sfx/footsteps/stone_step_2.wav deleted file mode 100644 index 9fbedadce6..0000000000 --- a/assets/voxygen/audio/sfx/footsteps/stone_step_2.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6502ae4e40351e3bf42a5de86898f8cb38d010b17b03b03f977d9e5f60cd4a15 -size 34638 diff --git a/assets/voxygen/audio/sfx/footsteps/stone_step_3.ogg b/assets/voxygen/audio/sfx/footsteps/stone_step_3.ogg new file mode 100644 index 0000000000..63764df432 --- /dev/null +++ b/assets/voxygen/audio/sfx/footsteps/stone_step_3.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:945062960d4fcb4b369bbd1722b5df9e1bc6a6b9bf6a6d3492206d3e445172ca +size 9880 diff --git a/assets/voxygen/audio/sfx/footsteps/stone_step_3.wav b/assets/voxygen/audio/sfx/footsteps/stone_step_3.wav deleted file mode 100644 index 312c0001b6..0000000000 --- a/assets/voxygen/audio/sfx/footsteps/stone_step_3.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:305506adf51a2ba52cf1a2c9b048af778109ccafeda1586a4aaf8a58dbe3d883 -size 34638 diff --git a/assets/voxygen/audio/sfx/footsteps/stone_step_4.ogg b/assets/voxygen/audio/sfx/footsteps/stone_step_4.ogg new file mode 100644 index 0000000000..34d6573680 --- /dev/null +++ b/assets/voxygen/audio/sfx/footsteps/stone_step_4.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:18f486ad369b8300f5aae1ad3a822f2ae6221529cb9a1569b721f65e3101d350 +size 9001 diff --git a/assets/voxygen/audio/sfx/footsteps/stone_step_4.wav b/assets/voxygen/audio/sfx/footsteps/stone_step_4.wav deleted file mode 100644 index 6324a7bbdb..0000000000 --- a/assets/voxygen/audio/sfx/footsteps/stone_step_4.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0b64beb3dc97f4b354fcd6078d0e2d9d4382a7e88f0f4d8e2bd490ce0f4f6e7c -size 34638 diff --git a/assets/voxygen/audio/sfx/footsteps/stone_step_5.ogg b/assets/voxygen/audio/sfx/footsteps/stone_step_5.ogg new file mode 100644 index 0000000000..b6f77bbfd1 --- /dev/null +++ b/assets/voxygen/audio/sfx/footsteps/stone_step_5.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:db2faa7726196093e468c86699db62d107653dfbd581558567250291d2bb7863 +size 9344 diff --git a/assets/voxygen/audio/sfx/footsteps/stone_step_5.wav b/assets/voxygen/audio/sfx/footsteps/stone_step_5.wav deleted file mode 100644 index 7ad461c76e..0000000000 --- a/assets/voxygen/audio/sfx/footsteps/stone_step_5.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d524dc6285832112584cc58bc71979889464bbc68eceb866fe3983dc3dece431 -size 34638 diff --git a/assets/voxygen/audio/sfx/footsteps/stone_step_6.ogg b/assets/voxygen/audio/sfx/footsteps/stone_step_6.ogg new file mode 100644 index 0000000000..3c5b405fc2 --- /dev/null +++ b/assets/voxygen/audio/sfx/footsteps/stone_step_6.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3e6fef36a8db4988d1bf8ccf85ba69f82924e6b3c7b498745afed388f4a2007a +size 9011 diff --git a/assets/voxygen/audio/sfx/footsteps/stone_step_7.ogg b/assets/voxygen/audio/sfx/footsteps/stone_step_7.ogg new file mode 100644 index 0000000000..a37fbfdf3d --- /dev/null +++ b/assets/voxygen/audio/sfx/footsteps/stone_step_7.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c1a23fb6364b01c05708b143fa0d6430a9523c7fe6c38f1f6655888d6614b8a5 +size 10275 diff --git a/assets/voxygen/audio/sfx/footsteps/stone_step_8.ogg b/assets/voxygen/audio/sfx/footsteps/stone_step_8.ogg new file mode 100644 index 0000000000..dff59f3728 --- /dev/null +++ b/assets/voxygen/audio/sfx/footsteps/stone_step_8.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dedb921805da1674b39abad23b298d0f25ce1af0108497b842641937562a2dd3 +size 8945 diff --git a/assets/voxygen/audio/sfx/footsteps/stone_step_9.ogg b/assets/voxygen/audio/sfx/footsteps/stone_step_9.ogg new file mode 100644 index 0000000000..ca52acce89 --- /dev/null +++ b/assets/voxygen/audio/sfx/footsteps/stone_step_9.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d601304f23a4648d406b8c306d27d24af667e207ebb6324c3f4151b8f0ab07b1 +size 9492 diff --git a/assets/voxygen/audio/sfx/footsteps/water_splash_1.ogg b/assets/voxygen/audio/sfx/footsteps/water_splash_1.ogg new file mode 100644 index 0000000000..ba2ec8f00e --- /dev/null +++ b/assets/voxygen/audio/sfx/footsteps/water_splash_1.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bab5d822ef669790e531a453551acb92f82623c0e10e46480d00e70630fc7c61 +size 20086 diff --git a/assets/voxygen/audio/sfx/footsteps/water_splash_1.wav b/assets/voxygen/audio/sfx/footsteps/water_splash_1.wav deleted file mode 100644 index c5451a1418..0000000000 --- a/assets/voxygen/audio/sfx/footsteps/water_splash_1.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:13a2902c0a05d305f0a16ac109ba3104608e590983c81216037dfd44e7e3ff27 -size 213136 diff --git a/assets/voxygen/audio/sfx/footsteps/water_splash_2.ogg b/assets/voxygen/audio/sfx/footsteps/water_splash_2.ogg new file mode 100644 index 0000000000..ae03f24bc6 --- /dev/null +++ b/assets/voxygen/audio/sfx/footsteps/water_splash_2.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:06f4d71243b06105794b67b32f74dd3d7b95a558f075dc722eb30852a64f2536 +size 23947 diff --git a/assets/voxygen/audio/sfx/footsteps/water_splash_2.wav b/assets/voxygen/audio/sfx/footsteps/water_splash_2.wav deleted file mode 100644 index 6bcedebdc3..0000000000 --- a/assets/voxygen/audio/sfx/footsteps/water_splash_2.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6536fc3a8f4065099fc5d99c1ce215e6c6624bf20b96900aa2e298d3ae5485cc -size 266056 diff --git a/assets/voxygen/audio/sfx/footsteps/water_splash_3.ogg b/assets/voxygen/audio/sfx/footsteps/water_splash_3.ogg new file mode 100644 index 0000000000..de6bd55237 --- /dev/null +++ b/assets/voxygen/audio/sfx/footsteps/water_splash_3.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f0f5fa67424893403bb7543fa7b56add91d1701cbac43d5bfe6de5a6cd8ffcf9 +size 16378 diff --git a/assets/voxygen/audio/sfx/footsteps/water_splash_3.wav b/assets/voxygen/audio/sfx/footsteps/water_splash_3.wav deleted file mode 100644 index 10af299e2c..0000000000 --- a/assets/voxygen/audio/sfx/footsteps/water_splash_3.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0a838a67b35e1bc2ead97dcf00670038067730a0c54e7f721c37e8bbf11164ea -size 160216 diff --git a/assets/voxygen/audio/sfx/footsteps/water_splash_4.ogg b/assets/voxygen/audio/sfx/footsteps/water_splash_4.ogg new file mode 100644 index 0000000000..02639003ee --- /dev/null +++ b/assets/voxygen/audio/sfx/footsteps/water_splash_4.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f24f666b44b86376d7f1dd433f811587c1b44c83ff6ffb125fcf63e84468dc76 +size 16794 diff --git a/assets/voxygen/audio/sfx/footsteps/water_splash_4.wav b/assets/voxygen/audio/sfx/footsteps/water_splash_4.wav deleted file mode 100644 index dd52365f19..0000000000 --- a/assets/voxygen/audio/sfx/footsteps/water_splash_4.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e24c9c45c3c7d6f07f2a5c8001e640fc7d962ffc659d3c979d75a347251efca7 -size 161316 diff --git a/assets/voxygen/audio/sfx/footsteps/wood_step_1.ogg b/assets/voxygen/audio/sfx/footsteps/wood_step_1.ogg new file mode 100644 index 0000000000..3a32a68ca2 --- /dev/null +++ b/assets/voxygen/audio/sfx/footsteps/wood_step_1.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:651e757a4a4ce3d6f587bc74c408eb9f21a75485909e4d486e8c8d9386dae498 +size 7261 diff --git a/assets/voxygen/audio/sfx/footsteps/wood_step_1.wav b/assets/voxygen/audio/sfx/footsteps/wood_step_1.wav deleted file mode 100644 index 9db053954d..0000000000 --- a/assets/voxygen/audio/sfx/footsteps/wood_step_1.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fe0b447a9c967592d5d6da56d159d5dfa52caa25d3be1d2ab69891796940adaa -size 40026 diff --git a/assets/voxygen/audio/sfx/footsteps/wood_step_2.ogg b/assets/voxygen/audio/sfx/footsteps/wood_step_2.ogg new file mode 100644 index 0000000000..9e30d090e6 --- /dev/null +++ b/assets/voxygen/audio/sfx/footsteps/wood_step_2.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4348e461d550f7850a79ec72f1917da8d8da72ec327bfc6adb13d725a9ddeef1 +size 7156 diff --git a/assets/voxygen/audio/sfx/footsteps/wood_step_2.wav b/assets/voxygen/audio/sfx/footsteps/wood_step_2.wav deleted file mode 100644 index 05a236cc8f..0000000000 --- a/assets/voxygen/audio/sfx/footsteps/wood_step_2.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e40450a677232da26e15dfc04c4ac5612b04d90551219c531b5117322987fdbd -size 40026 diff --git a/assets/voxygen/audio/sfx/footsteps/wood_step_3.ogg b/assets/voxygen/audio/sfx/footsteps/wood_step_3.ogg new file mode 100644 index 0000000000..505c8e9aa0 --- /dev/null +++ b/assets/voxygen/audio/sfx/footsteps/wood_step_3.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8dda329b27958b569f897f303724697cc070f505c64079c1c3ec877435883687 +size 6601 diff --git a/assets/voxygen/audio/sfx/footsteps/wood_step_3.wav b/assets/voxygen/audio/sfx/footsteps/wood_step_3.wav deleted file mode 100644 index 5f3795040f..0000000000 --- a/assets/voxygen/audio/sfx/footsteps/wood_step_3.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d9164000a715d383cbc2672a72b197c21d39fbada1eaa72f6310f159d8a5f7c0 -size 40026 diff --git a/assets/voxygen/audio/sfx/footsteps/wood_step_4.ogg b/assets/voxygen/audio/sfx/footsteps/wood_step_4.ogg new file mode 100644 index 0000000000..ca39ae41aa --- /dev/null +++ b/assets/voxygen/audio/sfx/footsteps/wood_step_4.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eb5f821e0ab17ccac719c3e2e049e87187dda2259d051dc3131d2ae59d21889d +size 7273 diff --git a/assets/voxygen/audio/sfx/footsteps/wood_step_4.wav b/assets/voxygen/audio/sfx/footsteps/wood_step_4.wav deleted file mode 100644 index 510ff99854..0000000000 --- a/assets/voxygen/audio/sfx/footsteps/wood_step_4.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ae9d031dc88a342a66b7b9aad1abf3b829b6ed6cbbe6c922c286bca3c0a45239 -size 44634 diff --git a/assets/voxygen/audio/sfx/inventory/add_failed.ogg b/assets/voxygen/audio/sfx/inventory/add_failed.ogg new file mode 100644 index 0000000000..740d5a59db --- /dev/null +++ b/assets/voxygen/audio/sfx/inventory/add_failed.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5e6b6495452f4b772c66b3618b8b39607bd108f1a1afe1cd49183fa0020afbb6 +size 7958 diff --git a/assets/voxygen/audio/sfx/inventory/add_failed.wav b/assets/voxygen/audio/sfx/inventory/add_failed.wav deleted file mode 100644 index 462c33f6a9..0000000000 --- a/assets/voxygen/audio/sfx/inventory/add_failed.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:98815deb61f0e5098121915937fdf32a065122b24e6b20b388ee42e2b40fe575 -size 70746 diff --git a/assets/voxygen/audio/sfx/inventory/add_item.ogg b/assets/voxygen/audio/sfx/inventory/add_item.ogg new file mode 100644 index 0000000000..75c5ba6d9e --- /dev/null +++ b/assets/voxygen/audio/sfx/inventory/add_item.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:decdf31f4cb5e0cd3c696b5507d7cf5ae8cea11133e089a75af4637c8c31cb64 +size 6743 diff --git a/assets/voxygen/audio/sfx/inventory/add_item.wav b/assets/voxygen/audio/sfx/inventory/add_item.wav deleted file mode 100644 index 7529ef559e..0000000000 --- a/assets/voxygen/audio/sfx/inventory/add_item.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:01f0bf00472e9bfe7083be82441eaa6a425be6731e6de15427337791bd43b0b8 -size 17580 diff --git a/assets/voxygen/audio/sfx/inventory/consumable/apple.ogg b/assets/voxygen/audio/sfx/inventory/consumable/apple.ogg new file mode 100644 index 0000000000..828ac48675 --- /dev/null +++ b/assets/voxygen/audio/sfx/inventory/consumable/apple.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:29fb83b2032f6f39028986594bceba79fb525777f873820e9205ed733a761cb6 +size 10407 diff --git a/assets/voxygen/audio/sfx/inventory/consumable/apple.wav b/assets/voxygen/audio/sfx/inventory/consumable/apple.wav deleted file mode 100644 index f379852fac..0000000000 --- a/assets/voxygen/audio/sfx/inventory/consumable/apple.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ccb489b8661cf0c8b2fc28211053d8412c2bda6c45eca49f1acb04066931a214 -size 103002 diff --git a/assets/voxygen/audio/sfx/inventory/consumable/food.ogg b/assets/voxygen/audio/sfx/inventory/consumable/food.ogg new file mode 100644 index 0000000000..785ea90f3c --- /dev/null +++ b/assets/voxygen/audio/sfx/inventory/consumable/food.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aadeb9283d30ac59a6ce89c16774047cb991a3f9c3835dbb3786f584258bdde6 +size 9559 diff --git a/assets/voxygen/audio/sfx/inventory/consumable/food.wav b/assets/voxygen/audio/sfx/inventory/consumable/food.wav deleted file mode 100644 index ea39de567a..0000000000 --- a/assets/voxygen/audio/sfx/inventory/consumable/food.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0fd5074d0ec517b626e95bc34cb75e735d48dbb99473ffeadb79d90734f52f7d -size 31208 diff --git a/assets/voxygen/audio/sfx/inventory/consumable/liquid.ogg b/assets/voxygen/audio/sfx/inventory/consumable/liquid.ogg new file mode 100644 index 0000000000..554578a84b --- /dev/null +++ b/assets/voxygen/audio/sfx/inventory/consumable/liquid.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:60a90bb7431cacd6505a6908bd81e62ddc21ae3f8ed9df479f9869fae182846a +size 6937 diff --git a/assets/voxygen/audio/sfx/inventory/consumable/liquid.wav b/assets/voxygen/audio/sfx/inventory/consumable/liquid.wav deleted file mode 100644 index fa0db211f4..0000000000 --- a/assets/voxygen/audio/sfx/inventory/consumable/liquid.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8c3a38dede30bb4a8c13644bd43be5fe261f177f3c65f88e5d02da5b9ba68a97 -size 21548 diff --git a/assets/voxygen/audio/sfx/inventory/drop_item.ogg b/assets/voxygen/audio/sfx/inventory/drop_item.ogg new file mode 100644 index 0000000000..c478819fa9 --- /dev/null +++ b/assets/voxygen/audio/sfx/inventory/drop_item.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:99a13e4fb8841803f3630f72c2695c0efc8c8e664b8ce1c9abd1f2862ce542ba +size 6869 diff --git a/assets/voxygen/audio/sfx/inventory/drop_item.wav b/assets/voxygen/audio/sfx/inventory/drop_item.wav deleted file mode 100644 index 0e7771fe70..0000000000 --- a/assets/voxygen/audio/sfx/inventory/drop_item.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:64c73be822ac6ed22fa96f327cf4ba307752e8d5a4f6c590d4dc3ce9e3b0d95c -size 18632 diff --git a/assets/voxygen/audio/sfx/inventory/open_inventory.ogg b/assets/voxygen/audio/sfx/inventory/open_inventory.ogg new file mode 100644 index 0000000000..cd87172f92 --- /dev/null +++ b/assets/voxygen/audio/sfx/inventory/open_inventory.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d27f5caed2268f4c6dda42c4a55ee0019f54e402475de3decbee7f61df4ca9a5 +size 8682 diff --git a/assets/voxygen/audio/sfx/inventory/open_inventory.wav b/assets/voxygen/audio/sfx/inventory/open_inventory.wav deleted file mode 100644 index 380dc30d4d..0000000000 --- a/assets/voxygen/audio/sfx/inventory/open_inventory.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f811babdffe01795b1ff75827ab8e968b61baff8243ea031390dc49152885950 -size 40140 diff --git a/assets/voxygen/audio/sfx/inventory/pickup_staff.ogg b/assets/voxygen/audio/sfx/inventory/pickup_staff.ogg new file mode 100644 index 0000000000..3a332b3318 --- /dev/null +++ b/assets/voxygen/audio/sfx/inventory/pickup_staff.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e093133d0803c61711e84179c5339e9a8435c1ff6388c6382f46e740ae3acbf1 +size 8264 diff --git a/assets/voxygen/audio/sfx/inventory/pickup_staff.wav b/assets/voxygen/audio/sfx/inventory/pickup_staff.wav deleted file mode 100644 index aaa300fc40..0000000000 --- a/assets/voxygen/audio/sfx/inventory/pickup_staff.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ec108383091e16dd7e45a769ab676ffe595e067a6ee4c0dae7b6cb03c910520b -size 38418 diff --git a/assets/voxygen/audio/sfx/inventory/pickup_sword.ogg b/assets/voxygen/audio/sfx/inventory/pickup_sword.ogg new file mode 100644 index 0000000000..19f0ad005a --- /dev/null +++ b/assets/voxygen/audio/sfx/inventory/pickup_sword.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:21bcb39ca0c4e317434b4105db40590c10f2b42fb89e4c52b23c7e095caa4880 +size 20659 diff --git a/assets/voxygen/audio/sfx/inventory/pickup_sword.wav b/assets/voxygen/audio/sfx/inventory/pickup_sword.wav deleted file mode 100644 index 99eb77f675..0000000000 --- a/assets/voxygen/audio/sfx/inventory/pickup_sword.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7d3a5409656fb7bda8831e61b11d69344b950f63e0b7bf72a9ed599420379102 -size 165082 diff --git a/assets/voxygen/audio/sfx/ui/click1.ogg b/assets/voxygen/audio/sfx/ui/click1.ogg new file mode 100644 index 0000000000..f5ac1e94f8 --- /dev/null +++ b/assets/voxygen/audio/sfx/ui/click1.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:19df08ac1b585e3e0dc20ab50c4e9d5dc2b4a4c16760cbe970e8290290568cf6 +size 9612 diff --git a/assets/voxygen/audio/sfx/ui/click1.wav b/assets/voxygen/audio/sfx/ui/click1.wav deleted file mode 100644 index 6e443f9ec6..0000000000 --- a/assets/voxygen/audio/sfx/ui/click1.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ff202597b7cf37832b15d956ccbc5eafe7419a9bed9b81305256c10d5ce2045c -size 113546 diff --git a/assets/voxygen/audio/sfx/ui/click2.ogg b/assets/voxygen/audio/sfx/ui/click2.ogg new file mode 100644 index 0000000000..40a96a938b --- /dev/null +++ b/assets/voxygen/audio/sfx/ui/click2.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:08b44d5a8e8a63fc1cfc459e5e621ce34f5ff7501b7056e739b56002cda8dd1d +size 9419 diff --git a/assets/voxygen/audio/sfx/ui/click2.wav b/assets/voxygen/audio/sfx/ui/click2.wav deleted file mode 100644 index 45bb8d6cd2..0000000000 --- a/assets/voxygen/audio/sfx/ui/click2.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:863e2e4f2c1be1c91f3d35f135d2d416dc098f8efaa0ceef85cbff7b77f96c88 -size 104098 diff --git a/assets/voxygen/audio/sfx/weapon/dagger_in.ogg b/assets/voxygen/audio/sfx/weapon/dagger_in.ogg new file mode 100644 index 0000000000..1bfcce4fb8 --- /dev/null +++ b/assets/voxygen/audio/sfx/weapon/dagger_in.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7cd4e556660988c9cf4c26288c6c3cfc98df9e5f7b25157a82ae2b4196daa260 +size 11494 diff --git a/assets/voxygen/audio/sfx/weapon/dagger_in.wav b/assets/voxygen/audio/sfx/weapon/dagger_in.wav deleted file mode 100644 index 88c033bae3..0000000000 --- a/assets/voxygen/audio/sfx/weapon/dagger_in.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:88c8d33a9960c654114e4d13c23c4b960e12e3682975984a4f703c88fcbf3451 -size 66308 diff --git a/assets/voxygen/audio/sfx/weapon/dagger_out.ogg b/assets/voxygen/audio/sfx/weapon/dagger_out.ogg new file mode 100644 index 0000000000..42e69a7c41 --- /dev/null +++ b/assets/voxygen/audio/sfx/weapon/dagger_out.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2322541dc92a3ae304a6da1edcb3e96ecc3294c90e56a9aac9efc729a37cb2c8 +size 9889 diff --git a/assets/voxygen/audio/sfx/weapon/dagger_out.wav b/assets/voxygen/audio/sfx/weapon/dagger_out.wav deleted file mode 100644 index 047767d882..0000000000 --- a/assets/voxygen/audio/sfx/weapon/dagger_out.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0562232bf0d3609d940a7a1a12e8810a5fad579c831fcb56565d0f5d3b2fb5b7 -size 119500 diff --git a/assets/voxygen/audio/sfx/weapon/shield_out.ogg b/assets/voxygen/audio/sfx/weapon/shield_out.ogg new file mode 100644 index 0000000000..d765c3258f --- /dev/null +++ b/assets/voxygen/audio/sfx/weapon/shield_out.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:37afa8da4a439cd949b666831a1792fda871b51bfd9e0479765ef38d993c10cc +size 14406 diff --git a/assets/voxygen/audio/sfx/weapon/shield_out.wav b/assets/voxygen/audio/sfx/weapon/shield_out.wav deleted file mode 100644 index 444ba66ae4..0000000000 --- a/assets/voxygen/audio/sfx/weapon/shield_out.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:51d6a77b09a27c156eaf1d084375b818559995e802751d54e7f9c432408adc40 -size 314864 diff --git a/assets/voxygen/audio/sfx/weapon/staff_in.ogg b/assets/voxygen/audio/sfx/weapon/staff_in.ogg new file mode 100644 index 0000000000..56daaf3609 --- /dev/null +++ b/assets/voxygen/audio/sfx/weapon/staff_in.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bdc25cd6ea9e25c537d2a63f48e64823b2533f41cb102b45a2aa7334b85870df +size 35510 diff --git a/assets/voxygen/audio/sfx/weapon/staff_in.wav b/assets/voxygen/audio/sfx/weapon/staff_in.wav deleted file mode 100644 index c8817741dc..0000000000 --- a/assets/voxygen/audio/sfx/weapon/staff_in.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:52e1555f097b77860e3fb2803f0d0a91182ed85cfc2cb45bc1e4a83e909c8adb -size 1392710 diff --git a/assets/voxygen/audio/sfx/weapon/staff_out.ogg b/assets/voxygen/audio/sfx/weapon/staff_out.ogg new file mode 100644 index 0000000000..712f0b7528 --- /dev/null +++ b/assets/voxygen/audio/sfx/weapon/staff_out.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:374b6eafe7b200084de56e12167b55e7e586ab9b3473c8c79493820c3b6fbad2 +size 16853 diff --git a/assets/voxygen/audio/sfx/weapon/staff_out.wav b/assets/voxygen/audio/sfx/weapon/staff_out.wav deleted file mode 100644 index b27af02a3b..0000000000 --- a/assets/voxygen/audio/sfx/weapon/staff_out.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3c6a092616bb80ba2b927de35d90d1bd2bd99110fb96fc84dae433276118d139 -size 636950 diff --git a/assets/voxygen/audio/sfx/weapon/sword_in.ogg b/assets/voxygen/audio/sfx/weapon/sword_in.ogg new file mode 100644 index 0000000000..1bbd8002e4 --- /dev/null +++ b/assets/voxygen/audio/sfx/weapon/sword_in.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f0c64e54b5edc7cfe276904c9127031adc14e5ae13ae94c9338ec570a463a5cd +size 8581 diff --git a/assets/voxygen/audio/sfx/weapon/sword_in.wav b/assets/voxygen/audio/sfx/weapon/sword_in.wav deleted file mode 100644 index fd4d2361f2..0000000000 --- a/assets/voxygen/audio/sfx/weapon/sword_in.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:14de6bf4651f2cdd2fc515b7b90d0cb150b33fe023cc4216b13711cc748b7f55 -size 47504 diff --git a/assets/voxygen/audio/sfx/weapon/sword_out.ogg b/assets/voxygen/audio/sfx/weapon/sword_out.ogg new file mode 100644 index 0000000000..e3c5da409e --- /dev/null +++ b/assets/voxygen/audio/sfx/weapon/sword_out.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:68470c859ca239508ee44fa6b9c140221bd63620157dd8973df19aef92d5a19c +size 8523 diff --git a/assets/voxygen/audio/sfx/weapon/sword_out.wav b/assets/voxygen/audio/sfx/weapon/sword_out.wav deleted file mode 100644 index 896a8340db..0000000000 --- a/assets/voxygen/audio/sfx/weapon/sword_out.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:452022ad876c911ed2cd927b6d21bde668c1e0d416603a77e453179efe5d8dea -size 37444 diff --git a/assets/voxygen/audio/soundtrack.ron b/assets/voxygen/audio/soundtrack.ron index c7128aa303..6321af451f 100644 --- a/assets/voxygen/audio/soundtrack.ron +++ b/assets/voxygen/audio/soundtrack.ron @@ -1,8 +1,9 @@ // TODO: Add an ambient-soundtrack that runs independently from the musical soundtrack // Times: Some(Day), Some(Night), None [both] // Biomes: Grassland, Forest, Desert, Snowland, Lake, Mountain, Ocean, Jungle +// planned biomes: Savannah, Swamp // Sites: Cave, Dungeon, Void [none] -// Activities: Explore, Combat +// Music states: Explore, Combat ( tracks: [ @@ -51,8 +52,8 @@ artist: "Aeronic", )), Individual(( - title: "Dank Hallows", - path: "voxygen.audio.soundtrack.cave.dank_hallows", + title: "Saturated Hallows", + path: "voxygen.audio.soundtrack.cave.saturated_hallows", length: 227.0, timing: None, biomes: [], @@ -380,14 +381,14 @@ biomes: [], site: Some(Dungeon), segments: [ - ("voxygen.audio.soundtrack.barred_paths.barred_paths-hi-end", 6.0, Transition(Combat(High), Explore), None), - ("voxygen.audio.soundtrack.barred_paths.barred_paths-hi-loop", 54.0, Activity(Combat(High)), None), - ("voxygen.audio.soundtrack.barred_paths.barred_paths-hi-start", 55.0, Transition(Explore, Combat(High)), Some(Combat(High))), - ("voxygen.audio.soundtrack.barred_paths.barred_paths-lo-end", 3.0, Transition(Combat(Low), Explore), None), - ("voxygen.audio.soundtrack.barred_paths.barred_paths-lo-loop", 7.0, Activity(Combat(Low)), None), - ("voxygen.audio.soundtrack.barred_paths.barred_paths-lo-start", 10.0, Transition(Explore, Combat(Low)), None), - ("voxygen.audio.soundtrack.barred_paths.barred_paths-trans-hi-lo", 10.0, Transition(Combat(High), Combat(Low)), None), - ("voxygen.audio.soundtrack.barred_paths.barred_paths-trans-lo-hi", 7.0, Transition(Combat(Low), Combat(High)), None), + ("voxygen.audio.soundtrack.combat.barred_paths.barred_paths-hi-end", 6.0, Transition(Combat(High), Explore), None), + ("voxygen.audio.soundtrack.combat.barred_paths.barred_paths-hi-loop", 54.0, Activity(Combat(High)), None), + ("voxygen.audio.soundtrack.combat.barred_paths.barred_paths-hi-start", 56.0, Transition(Explore, Combat(High)), Some(Combat(High))), + // ("voxygen.audio.soundtrack.combat.barred_paths.barred_paths-lo-end", 3.0, Transition(Combat(Low), Explore), None), + // ("voxygen.audio.soundtrack.combat.barred_paths.barred_paths-lo-loop", 7.0, Activity(Combat(Low)), None), + // ("voxygen.audio.soundtrack.combat.barred_paths.barred_paths-lo-start", 10.0, Transition(Explore, Combat(Low)), None), + // ("voxygen.audio.soundtrack.combat.barred_paths.barred_paths-trans-hi-lo", 10.0, Transition(Combat(High), Combat(Low)), None), + // ("voxygen.audio.soundtrack.combat.barred_paths.barred_paths-trans-lo-hi", 7.0, Transition(Combat(Low), Combat(High)), None), ], ), ] diff --git a/assets/voxygen/audio/soundtrack/Town/im_home.ogg b/assets/voxygen/audio/soundtrack/Town/im_home.ogg index 14b25ae132..48530de440 100644 --- a/assets/voxygen/audio/soundtrack/Town/im_home.ogg +++ b/assets/voxygen/audio/soundtrack/Town/im_home.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c43ddc4a3943b1ff0b0b9a424822ae5a11750848a92c9975d53f82c1c87586b4 -size 1858898 +oid sha256:65f085c52ca397b6f56a8768ae9bd5a0821b6ea73d9ec20be8da2de79456bb9c +size 2028376 diff --git a/assets/voxygen/audio/soundtrack/Town/library_theme.ogg b/assets/voxygen/audio/soundtrack/Town/library_theme.ogg index 3ea6a24535..880fa8445e 100644 --- a/assets/voxygen/audio/soundtrack/Town/library_theme.ogg +++ b/assets/voxygen/audio/soundtrack/Town/library_theme.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5bd20e01b74c51319dcb502b81f41345651990096db5f120064044dd320f21dd -size 3639871 +oid sha256:642e074138fb620beb1fb77a65c11b9d619eaf25341e7b8890ad9f8d1770ee09 +size 1105366 diff --git a/assets/voxygen/audio/soundtrack/Town/onwards.ogg b/assets/voxygen/audio/soundtrack/Town/onwards.ogg index 6060bd33fe..0780504422 100644 --- a/assets/voxygen/audio/soundtrack/Town/onwards.ogg +++ b/assets/voxygen/audio/soundtrack/Town/onwards.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f82fa8d7cfc0153dcf65b07096202c4512e8f4ae5ca0480e1467e72177b3168c -size 7859387 +oid sha256:b032fdab184098600ae23424f73ec8c7251f93eb73d976485c53e2796fe82a9b +size 2770031 diff --git a/assets/voxygen/audio/soundtrack/Town/rest_assured.ogg b/assets/voxygen/audio/soundtrack/Town/rest_assured.ogg index a1ac11fb1c..b088fa2e75 100644 --- a/assets/voxygen/audio/soundtrack/Town/rest_assured.ogg +++ b/assets/voxygen/audio/soundtrack/Town/rest_assured.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a2d36509abc939c79feced7b48f27f533a91b279f68ed3dfac299f25dacb36a3 -size 3974200 +oid sha256:3fd0917407e2d164d47fa85851db96d2ea8a5d3be8615f0fb28696a5e0ba7577 +size 3102410 diff --git a/assets/voxygen/audio/soundtrack/barred_paths/barred_paths-hi-start.ogg b/assets/voxygen/audio/soundtrack/barred_paths/barred_paths-hi-start.ogg deleted file mode 100644 index 37da4f8d2e..0000000000 --- a/assets/voxygen/audio/soundtrack/barred_paths/barred_paths-hi-start.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:65a4a4dfde1c76ce8419e1acc26b10484c12dd3438b7a4ec1d441cd109411a46 -size 970650 diff --git a/assets/voxygen/audio/soundtrack/cave/dank_hallows.ogg b/assets/voxygen/audio/soundtrack/cave/dank_hallows.ogg deleted file mode 100644 index a5f7e66e9b..0000000000 --- a/assets/voxygen/audio/soundtrack/cave/dank_hallows.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cf8a691308088c846cce09fd19d6c7022f4bc22ed607c3fa21b4bede4d8d0d12 -size 4579430 diff --git a/assets/voxygen/audio/soundtrack/cave/mineral_deposits.ogg b/assets/voxygen/audio/soundtrack/cave/mineral_deposits.ogg index 68395464f6..2b1c73318a 100644 --- a/assets/voxygen/audio/soundtrack/cave/mineral_deposits.ogg +++ b/assets/voxygen/audio/soundtrack/cave/mineral_deposits.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e48b383e9ffedbf57544a34de87e2e5bb8be6a349e520b93be1cf55180d27c13 -size 2637115 +oid sha256:1805983ca8bf75cd3179228025fc79b66b142b02852dbc53fbe174aa1b0f39e1 +size 2326507 diff --git a/assets/voxygen/audio/soundtrack/cave/saturated_hallows.ogg b/assets/voxygen/audio/soundtrack/cave/saturated_hallows.ogg new file mode 100644 index 0000000000..492f8741cb --- /dev/null +++ b/assets/voxygen/audio/soundtrack/cave/saturated_hallows.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9dcbe130abd5fda65803bc93964abe41550a5138d80cc19d207c4408aab24bd3 +size 4537116 diff --git a/assets/voxygen/audio/soundtrack/barred_paths/barred_paths-hi-end.ogg b/assets/voxygen/audio/soundtrack/combat/barred_paths/barred_paths-hi-end.ogg similarity index 100% rename from assets/voxygen/audio/soundtrack/barred_paths/barred_paths-hi-end.ogg rename to assets/voxygen/audio/soundtrack/combat/barred_paths/barred_paths-hi-end.ogg diff --git a/assets/voxygen/audio/soundtrack/barred_paths/barred_paths-hi-loop.ogg b/assets/voxygen/audio/soundtrack/combat/barred_paths/barred_paths-hi-loop.ogg similarity index 100% rename from assets/voxygen/audio/soundtrack/barred_paths/barred_paths-hi-loop.ogg rename to assets/voxygen/audio/soundtrack/combat/barred_paths/barred_paths-hi-loop.ogg diff --git a/assets/voxygen/audio/soundtrack/combat/barred_paths/barred_paths-hi-start.ogg b/assets/voxygen/audio/soundtrack/combat/barred_paths/barred_paths-hi-start.ogg new file mode 100644 index 0000000000..ccf91c1338 --- /dev/null +++ b/assets/voxygen/audio/soundtrack/combat/barred_paths/barred_paths-hi-start.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:48152565c8c8204aabc55ef68f1afbb157e4890972411998f2b3c14b83bd798f +size 1011994 diff --git a/assets/voxygen/audio/soundtrack/barred_paths/barred_paths-lo-end.ogg b/assets/voxygen/audio/soundtrack/combat/barred_paths/barred_paths-lo-end.ogg similarity index 100% rename from assets/voxygen/audio/soundtrack/barred_paths/barred_paths-lo-end.ogg rename to assets/voxygen/audio/soundtrack/combat/barred_paths/barred_paths-lo-end.ogg diff --git a/assets/voxygen/audio/soundtrack/barred_paths/barred_paths-lo-loop.ogg b/assets/voxygen/audio/soundtrack/combat/barred_paths/barred_paths-lo-loop.ogg similarity index 100% rename from assets/voxygen/audio/soundtrack/barred_paths/barred_paths-lo-loop.ogg rename to assets/voxygen/audio/soundtrack/combat/barred_paths/barred_paths-lo-loop.ogg diff --git a/assets/voxygen/audio/soundtrack/barred_paths/barred_paths-lo-start.ogg b/assets/voxygen/audio/soundtrack/combat/barred_paths/barred_paths-lo-start.ogg similarity index 100% rename from assets/voxygen/audio/soundtrack/barred_paths/barred_paths-lo-start.ogg rename to assets/voxygen/audio/soundtrack/combat/barred_paths/barred_paths-lo-start.ogg diff --git a/assets/voxygen/audio/soundtrack/barred_paths/barred_paths-trans-hi-lo.ogg b/assets/voxygen/audio/soundtrack/combat/barred_paths/barred_paths-trans-hi-lo.ogg similarity index 100% rename from assets/voxygen/audio/soundtrack/barred_paths/barred_paths-trans-hi-lo.ogg rename to assets/voxygen/audio/soundtrack/combat/barred_paths/barred_paths-trans-hi-lo.ogg diff --git a/assets/voxygen/audio/soundtrack/barred_paths/barred_paths-trans-lo-hi.ogg b/assets/voxygen/audio/soundtrack/combat/barred_paths/barred_paths-trans-lo-hi.ogg similarity index 100% rename from assets/voxygen/audio/soundtrack/barred_paths/barred_paths-trans-lo-hi.ogg rename to assets/voxygen/audio/soundtrack/combat/barred_paths/barred_paths-trans-lo-hi.ogg diff --git a/assets/voxygen/audio/soundtrack/dungeon/dank_dungeon.ogg b/assets/voxygen/audio/soundtrack/dungeon/dank_dungeon.ogg index ea8941387d..547117e1f1 100644 --- a/assets/voxygen/audio/soundtrack/dungeon/dank_dungeon.ogg +++ b/assets/voxygen/audio/soundtrack/dungeon/dank_dungeon.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8bac2380012eba70f1b6f52ccebe7b08e3e27af8c4c0fbef3e7cf8e69d4181b4 -size 7223302 +oid sha256:fe25d37fc08f7b81a1e4f10467a3e51481b331656fa6509d7755e6debe1bc4f6 +size 2262047 diff --git a/assets/voxygen/audio/soundtrack/dungeon/down_the_rabbit_hole.ogg b/assets/voxygen/audio/soundtrack/dungeon/down_the_rabbit_hole.ogg index 4ecba0dfd8..1ddbd13aa0 100644 --- a/assets/voxygen/audio/soundtrack/dungeon/down_the_rabbit_hole.ogg +++ b/assets/voxygen/audio/soundtrack/dungeon/down_the_rabbit_hole.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f96cda2bdcb40f60ede7539e5a838604f8c5ac43063056b2fffb68324115deed -size 3819981 +oid sha256:9619bcd7a26e50d4c41c47bab057048f0aa2856f953f84a1f4c0d6a95622d0d8 +size 3826799 diff --git a/assets/voxygen/audio/soundtrack/dungeon/ruination.ogg b/assets/voxygen/audio/soundtrack/dungeon/ruination.ogg index 516cba9cf9..1aa793d36c 100644 --- a/assets/voxygen/audio/soundtrack/dungeon/ruination.ogg +++ b/assets/voxygen/audio/soundtrack/dungeon/ruination.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dc36bd7de61a370ab8d003142dbc57d188cc98b55f08cb71cdb784ff635cb195 -size 7631089 +oid sha256:e4f56eab9b925f62aaf3e90bb82ba3abef4a91c5b75aa5f7a63476d4dbad1c9e +size 5314599 diff --git a/assets/voxygen/audio/soundtrack/dungeon/sacred_temple.ogg b/assets/voxygen/audio/soundtrack/dungeon/sacred_temple.ogg index 3fde62fbea..498aec51a8 100644 --- a/assets/voxygen/audio/soundtrack/dungeon/sacred_temple.ogg +++ b/assets/voxygen/audio/soundtrack/dungeon/sacred_temple.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:72d779a4c23ca704084d457d0f8345153695672dbb8143249c265d3afced239f -size 4288770 +oid sha256:9c3766184b926618f38856122006fc6bbc6d9c5fa83671fb21608d56a6ee4128 +size 2454752 diff --git a/assets/voxygen/audio/soundtrack/dungeon/vast_onslaught.ogg b/assets/voxygen/audio/soundtrack/dungeon/vast_onslaught.ogg index 5b7a669a31..dfdce4b9f7 100644 --- a/assets/voxygen/audio/soundtrack/dungeon/vast_onslaught.ogg +++ b/assets/voxygen/audio/soundtrack/dungeon/vast_onslaught.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4a9233d42d76b1a993c451e4a1f8e5461038b668d091ad3cc96c70d9401e2f82 -size 13362063 +oid sha256:67c416fd0c35ea520e4144b490c4ff4d11108e3720f751718b83707e4278f573 +size 4116068 diff --git a/assets/voxygen/audio/soundtrack/overworld/a_solemn_quest.ogg b/assets/voxygen/audio/soundtrack/overworld/a_solemn_quest.ogg index 33a2cf5e4e..ffd8c018df 100644 --- a/assets/voxygen/audio/soundtrack/overworld/a_solemn_quest.ogg +++ b/assets/voxygen/audio/soundtrack/overworld/a_solemn_quest.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:41a51f0a0cc43ae76d7c372d6392a8d128979dcf542b14244479e6f00a2a480b -size 3662863 +oid sha256:41beda4f124a3837a97d21d7066f00536a37ba434761a740e161eacb70263ccc +size 3352297 diff --git a/assets/voxygen/audio/soundtrack/overworld/between_the_fairies.ogg b/assets/voxygen/audio/soundtrack/overworld/between_the_fairies.ogg index ac76bcf4d1..55c92399f1 100644 --- a/assets/voxygen/audio/soundtrack/overworld/between_the_fairies.ogg +++ b/assets/voxygen/audio/soundtrack/overworld/between_the_fairies.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:01a8d1a67fb0b60e0eb14a3f768cfd5d5b073fe2ecf952cd85468406e33240e9 -size 2870126 +oid sha256:04feda1b5aeb4d1055dfe8da6adb4f08b725bc4a0bf8d52a40c92a305b95115e +size 2786058 diff --git a/assets/voxygen/audio/soundtrack/overworld/calling_wild.ogg b/assets/voxygen/audio/soundtrack/overworld/calling_wild.ogg index 94900f1e64..ba97a10506 100644 --- a/assets/voxygen/audio/soundtrack/overworld/calling_wild.ogg +++ b/assets/voxygen/audio/soundtrack/overworld/calling_wild.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:32604908a81ea2c2f3c7a5a9770459f2db8f94c599a1e086504b34d788a3d9cb -size 1634614 +oid sha256:2ca914b2feda79a80dbb3b6cbe3d7205718a3e88196cfeb2bf0519722015f851 +size 1784635 diff --git a/assets/voxygen/audio/soundtrack/overworld/calming_hills.ogg b/assets/voxygen/audio/soundtrack/overworld/calming_hills.ogg index 9e48b603c6..5059b33175 100644 --- a/assets/voxygen/audio/soundtrack/overworld/calming_hills.ogg +++ b/assets/voxygen/audio/soundtrack/overworld/calming_hills.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:28fd39f1119b3eda67403fc2bbe20b287544710ba0897325e58935df9a4675b1 -size 2393935 +oid sha256:326df0fbeb246ff86c3b729a6f45053ce5d6bffa0a813eacb6cc7a6714d2f2b9 +size 1518038 diff --git a/assets/voxygen/audio/soundtrack/overworld/campfire_stories.ogg b/assets/voxygen/audio/soundtrack/overworld/campfire_stories.ogg index ae56af47b4..1582c849f6 100644 --- a/assets/voxygen/audio/soundtrack/overworld/campfire_stories.ogg +++ b/assets/voxygen/audio/soundtrack/overworld/campfire_stories.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:66a5159174d17727622a35ac8430cc88923662f36584ca9b3fba07f74cdad300 -size 1616058 +oid sha256:56ed12e0b86509be7a96756e514caf64d3d3f490159d58a8a34473e9e5501187 +size 1658237 diff --git a/assets/voxygen/audio/soundtrack/overworld/drifting_along.ogg b/assets/voxygen/audio/soundtrack/overworld/drifting_along.ogg index fb9cb3589f..98dd1e451f 100644 --- a/assets/voxygen/audio/soundtrack/overworld/drifting_along.ogg +++ b/assets/voxygen/audio/soundtrack/overworld/drifting_along.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:915b74eb010a794745367a67e5ad687fb3ab3e1529e231bd0ef9c2a7a478a003 -size 2879543 +oid sha256:658193400b2f3527c52222f35d226ffee6b77cfbdd20e303c62be147bcfc1258 +size 2620059 diff --git a/assets/voxygen/audio/soundtrack/overworld/ethereal_bonds.ogg b/assets/voxygen/audio/soundtrack/overworld/ethereal_bonds.ogg index fa53b42f72..f48c5b921c 100644 --- a/assets/voxygen/audio/soundtrack/overworld/ethereal_bonds.ogg +++ b/assets/voxygen/audio/soundtrack/overworld/ethereal_bonds.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:295cac684268e297ea4d534aea5aa1b1cb852001ee1b2fed10c1ee63bac3be83 -size 2560641 +oid sha256:2622770b11dfe3e4509faa9aac6aef64079d1233937416a091c16bff2d217faa +size 962247 diff --git a/assets/voxygen/audio/soundtrack/overworld/field_grazing.ogg b/assets/voxygen/audio/soundtrack/overworld/field_grazing.ogg index 363e5450a8..816dfb0daa 100644 --- a/assets/voxygen/audio/soundtrack/overworld/field_grazing.ogg +++ b/assets/voxygen/audio/soundtrack/overworld/field_grazing.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1ed4f4e2617060e6de8de218a6d139ac556b886ea458e706226646a661f1f7cf -size 2924974 +oid sha256:c2cee6b2de99e8dee744869dd04b7c6542862498e2a077d1966c20feaf6e911e +size 2527869 diff --git a/assets/voxygen/audio/soundtrack/overworld/fiesta_del_pueblo.ogg b/assets/voxygen/audio/soundtrack/overworld/fiesta_del_pueblo.ogg index a55e6e8ddf..c0fc068415 100644 --- a/assets/voxygen/audio/soundtrack/overworld/fiesta_del_pueblo.ogg +++ b/assets/voxygen/audio/soundtrack/overworld/fiesta_del_pueblo.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5530f8cb8b4be36ba845a451dfc4b2d49412977de6be0d0ad10fb1043a4b23aa -size 5455158 +oid sha256:39fb379d9d669ad319700809c5e9e6ba465542230c0f1e119e5d4d8c7d5ce054 +size 1964550 diff --git a/assets/voxygen/audio/soundtrack/overworld/highland_of_the_hawk.ogg b/assets/voxygen/audio/soundtrack/overworld/highland_of_the_hawk.ogg index c6e0897c0c..d7ec3aeac1 100644 --- a/assets/voxygen/audio/soundtrack/overworld/highland_of_the_hawk.ogg +++ b/assets/voxygen/audio/soundtrack/overworld/highland_of_the_hawk.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:15a6fe3c9f653166a81968b1c7966c5f75f9b397fb03a107e122157f64252670 -size 4773542 +oid sha256:6406c7397ce45dd6aab55d71e23a0e1295b3c60a3271d0eb60f8706743bef723 +size 4701998 diff --git a/assets/voxygen/audio/soundtrack/overworld/into_the_dark_forest.ogg b/assets/voxygen/audio/soundtrack/overworld/into_the_dark_forest.ogg index 634446e8fe..a539cb08f1 100644 --- a/assets/voxygen/audio/soundtrack/overworld/into_the_dark_forest.ogg +++ b/assets/voxygen/audio/soundtrack/overworld/into_the_dark_forest.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bb72527a937cdfe7bbbf663c6eed9e9770ba85ece796bdf2175ba615cf8a504f -size 3202814 +oid sha256:9272d2933c2d717be44c29b7a84bc22235935878a7d186b4e146886128d1ba45 +size 2920247 diff --git a/assets/voxygen/audio/soundtrack/overworld/jungle_ambient.ogg b/assets/voxygen/audio/soundtrack/overworld/jungle_ambient.ogg index 15c67808b1..f9ca239eda 100644 --- a/assets/voxygen/audio/soundtrack/overworld/jungle_ambient.ogg +++ b/assets/voxygen/audio/soundtrack/overworld/jungle_ambient.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:35dfcdc6fce75d27722d5562e94030c83d91d3c712e1635cd34a8d8612c064eb -size 3546966 +oid sha256:337d4a9bd532f44b4eaef79de3d637b900bc1eb49be6f89c1148a1f4cad322d0 +size 3564917 diff --git a/assets/voxygen/audio/soundtrack/overworld/just_the_beginning.ogg b/assets/voxygen/audio/soundtrack/overworld/just_the_beginning.ogg index b96429aa89..1b57c4bbbd 100644 --- a/assets/voxygen/audio/soundtrack/overworld/just_the_beginning.ogg +++ b/assets/voxygen/audio/soundtrack/overworld/just_the_beginning.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1e7ab1da4b606e46bf6f8476a85852c12420ea2bcb1260a7dfb416fba45c35c4 -size 3029482 +oid sha256:7e6b2637f8e0f1b5072a229cbc10d70c4cab9652831ec6dbab2a7475e610f963 +size 3046004 diff --git a/assets/voxygen/audio/soundtrack/overworld/leap_of_faith.ogg b/assets/voxygen/audio/soundtrack/overworld/leap_of_faith.ogg index faf8fc3231..386787b89d 100644 --- a/assets/voxygen/audio/soundtrack/overworld/leap_of_faith.ogg +++ b/assets/voxygen/audio/soundtrack/overworld/leap_of_faith.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:66408183c8c08f9cf219701741c920cb6dc803e7f7be1f4fbb50f9b4e5ab29d0 -size 4304618 +oid sha256:a97eec76572a140f368a3a277934d8df3edbe56646fc7c684b15194291cd838f +size 4223824 diff --git a/assets/voxygen/audio/soundtrack/overworld/limits.ogg b/assets/voxygen/audio/soundtrack/overworld/limits.ogg index 87b4a4ec49..fe960ec3de 100644 --- a/assets/voxygen/audio/soundtrack/overworld/limits.ogg +++ b/assets/voxygen/audio/soundtrack/overworld/limits.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:394b95004942f260fa2ddc573d1c64142ab2b7446939886ffb6bcdfc30a83756 -size 3057813 +oid sha256:2e88e345affff151fd24373eaa778659506130ea1d1459448fe1f1bf94bcde3c +size 3090960 diff --git a/assets/voxygen/audio/soundtrack/overworld/moonbeams.ogg b/assets/voxygen/audio/soundtrack/overworld/moonbeams.ogg index eb1d0a2d8a..30b1abf6ef 100644 --- a/assets/voxygen/audio/soundtrack/overworld/moonbeams.ogg +++ b/assets/voxygen/audio/soundtrack/overworld/moonbeams.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c5960253ec1abf308240178b5571b58f18706def3cf5ff4493ffb7cbad6140dc -size 2558857 +oid sha256:f2f08cb4e86be5421080361a1003a41b6da30cac7ace665629a250f7f7281b7f +size 2535490 diff --git a/assets/voxygen/audio/soundtrack/overworld/oceania.ogg b/assets/voxygen/audio/soundtrack/overworld/oceania.ogg index de1e135c76..97e35db2c1 100644 --- a/assets/voxygen/audio/soundtrack/overworld/oceania.ogg +++ b/assets/voxygen/audio/soundtrack/overworld/oceania.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2cad1ae1441be4e4f94919e39733acb4eb7767373d86e0a89439e83d0a29c1a7 -size 2141446 +oid sha256:9893710bd1cf021b41458c85191f88d2234c182286a267c50d8a8595f479a118 +size 1991689 diff --git a/assets/voxygen/audio/soundtrack/overworld/serene_meadows.ogg b/assets/voxygen/audio/soundtrack/overworld/serene_meadows.ogg index ca3740f85c..76f8ced7cb 100644 --- a/assets/voxygen/audio/soundtrack/overworld/serene_meadows.ogg +++ b/assets/voxygen/audio/soundtrack/overworld/serene_meadows.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9fa39788e7c2f006f2f2d83b3f9527dfe2cc744a19148b6ada1a0b54b2bc1be7 -size 2828061 +oid sha256:6ddf8b6eef30f7dc942f3d95057c280ea35106c738a0bcb68e3924980964f8b4 +size 2802295 diff --git a/assets/voxygen/audio/soundtrack/overworld/short_meandering.ogg b/assets/voxygen/audio/soundtrack/overworld/short_meandering.ogg index 09bbc6f4bf..ae747c4b19 100644 --- a/assets/voxygen/audio/soundtrack/overworld/short_meandering.ogg +++ b/assets/voxygen/audio/soundtrack/overworld/short_meandering.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:505279e8495c88a51efe3691243d69791fac12f51868bb8932a3ab603d31d1a8 -size 2596340 +oid sha256:3d12442ebd47391f32be9801b0f3ea1d8642eed4d29206e0a5d98e4ef6bc35ca +size 2439260 diff --git a/assets/voxygen/audio/soundtrack/overworld/snowtop_volume.ogg b/assets/voxygen/audio/soundtrack/overworld/snowtop_volume.ogg index d991691002..64954887f1 100644 --- a/assets/voxygen/audio/soundtrack/overworld/snowtop_volume.ogg +++ b/assets/voxygen/audio/soundtrack/overworld/snowtop_volume.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:96b7e4ec19089ebc4ee57008c2c2aa1d1d72a52c13764d0c198fcc77b9e75407 -size 1799241 +oid sha256:e9b216f52d8b347fcb92c4b087851488a700b37a035c125026ff093e6fcb348f +size 1596249 diff --git a/assets/voxygen/audio/soundtrack/overworld/true_nature.ogg b/assets/voxygen/audio/soundtrack/overworld/true_nature.ogg index 0ebc9a1b76..5cf75108b1 100644 --- a/assets/voxygen/audio/soundtrack/overworld/true_nature.ogg +++ b/assets/voxygen/audio/soundtrack/overworld/true_nature.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f165f6d145effd27e8010d90d595be69f492ef6ca5703397d620e96b29ea79e3 -size 3046202 +oid sha256:8e3b87825049b0c1c4b73f4314d4a9fad6dd9a7579443bd9f2dd4faddf109e6e +size 2705044 diff --git a/assets/voxygen/audio/soundtrack/overworld/verdant_glades.ogg b/assets/voxygen/audio/soundtrack/overworld/verdant_glades.ogg index 86fa1aa2b4..760206c256 100644 --- a/assets/voxygen/audio/soundtrack/overworld/verdant_glades.ogg +++ b/assets/voxygen/audio/soundtrack/overworld/verdant_glades.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:04ed321c4d040a4997d402a5fee34d4526aad1f5b040b3b610f0695de03d1962 -size 5459920 +oid sha256:87f927e81d5ef06df173ad61df8aaa0ad230330841880d739597fc874d8e010d +size 1630292 diff --git a/assets/voxygen/audio/soundtrack/overworld/wandering_voices.ogg b/assets/voxygen/audio/soundtrack/overworld/wandering_voices.ogg index 7fc29b502e..77bac68c68 100644 --- a/assets/voxygen/audio/soundtrack/overworld/wandering_voices.ogg +++ b/assets/voxygen/audio/soundtrack/overworld/wandering_voices.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a729163758ca6bc0bb9ef28a0bc4afcae177bf5e7f00f8896396780f53aed2da -size 2515729 +oid sha256:484ffdb477f2f6e54f7567af74c661f4902649834c1d71d37eacc32def44ea90 +size 2370278 diff --git a/assets/voxygen/audio/soundtrack/overworld/winter_falls.ogg b/assets/voxygen/audio/soundtrack/overworld/winter_falls.ogg index 1e4f78bf8a..556eff42e1 100644 --- a/assets/voxygen/audio/soundtrack/overworld/winter_falls.ogg +++ b/assets/voxygen/audio/soundtrack/overworld/winter_falls.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b5abe4f38cfa9b9f72e404fce11789107357eea8849838ac2e53da836e64b798 -size 3683399 +oid sha256:97d7796f7a1ecb2a12b54b16299064b93d6444b70aba9c6865662632f23015c8 +size 3302865 diff --git a/assets/voxygen/audio/soundtrack/veloren_title_tune.ogg b/assets/voxygen/audio/soundtrack/veloren_title_tune.ogg index 37c17ec878..dee7117822 100644 --- a/assets/voxygen/audio/soundtrack/veloren_title_tune.ogg +++ b/assets/voxygen/audio/soundtrack/veloren_title_tune.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ed589e262b641285d19ef0a699deeeedc0e126d2ad7b898381739d43dbd998d7 -size 807371 +oid sha256:5a9be8bcfa1eb6a04a0cf85ea26c3f2397d5acd44a3eb9c13cc1886d39145a3c +size 877600 diff --git a/voxygen/Cargo.toml b/voxygen/Cargo.toml index c67ee72d83..234a508e4c 100644 --- a/voxygen/Cargo.toml +++ b/voxygen/Cargo.toml @@ -83,7 +83,7 @@ native-dialog = { version = "0.5.2", optional = true } num = "0.4" ordered-float = { version = "2.0.1", default-features = false } rand = "0.8" -rodio = {version = "0.13", default-features = false, features = ["wav", "vorbis"]} +rodio = {version = "0.13", default-features = false, features = ["vorbis"]} ron = {version = "0.6", default-features = false} serde = {version = "1.0", features = [ "rc", "derive" ]} treeculler = "0.2" diff --git a/voxygen/src/audio/mod.rs b/voxygen/src/audio/mod.rs index 882d76cfc0..bc2690ee14 100644 --- a/voxygen/src/audio/mod.rs +++ b/voxygen/src/audio/mod.rs @@ -11,7 +11,7 @@ use channel::{AmbientChannel, AmbientChannelTag, MusicChannel, MusicChannelTag, use fader::Fader; use music::MusicTransitionManifest; use sfx::{SfxEvent, SfxTriggerItem}; -use soundcache::{OggSound, WavSound}; +use soundcache::OggSound; use std::time::Duration; use tracing::{debug, error}; @@ -249,7 +249,7 @@ impl AudioFrontend { /// Play (once) an sfx file by file path at the give position and volume pub fn play_sfx(&mut self, sound: &str, pos: Vec3, vol: Option) { if self.audio_stream.is_some() { - let sound = WavSound::load_expect(sound) + let sound = OggSound::load_expect(sound) .cloned() .decoder() .amplify(vol.unwrap_or(1.0)); @@ -268,7 +268,7 @@ impl AudioFrontend { /// being underwater pub fn play_underwater_sfx(&mut self, sound: &str, pos: Vec3, vol: Option) { if self.audio_stream.is_some() { - let sound = WavSound::load_expect(sound) + let sound = OggSound::load_expect(sound) .cloned() .decoder() .amplify(vol.unwrap_or(1.0)); diff --git a/voxygen/src/audio/soundcache.rs b/voxygen/src/audio/soundcache.rs index 943b584fa4..8cf703577f 100644 --- a/voxygen/src/audio/soundcache.rs +++ b/voxygen/src/audio/soundcache.rs @@ -1,4 +1,4 @@ -//! Handles caching and retrieval of decoded `.wav` sfx sound data, eliminating +//! Handles caching and retrieval of decoded `.ogg` sfx sound data, eliminating //! the need to decode files on each playback use common::assets; use std::{borrow::Cow, io, sync::Arc}; @@ -6,55 +6,9 @@ use tracing::warn; // Implementation of sound taken from this github issue: // https://github.com/RustAudio/rodio/issues/141 -#[derive(Clone)] -pub struct WavSound(Arc>); - -impl AsRef<[u8]> for WavSound { - fn as_ref(&self) -> &[u8] { &self.0 } -} pub struct SoundLoader; -impl assets::Loader for SoundLoader { - fn load(content: Cow<[u8]>, _: &str) -> Result { - let arc = Arc::new(content.into_owned()); - Ok(WavSound(arc)) - } -} - -impl assets::Asset for WavSound { - type Loader = SoundLoader; - - const EXTENSION: &'static str = "wav"; - - fn default_value(specifier: &str, error: assets::Error) -> Result { - warn!(?specifier, ?error, "Failed to load sound"); - - Ok(WavSound::empty()) - } -} - -/// Wrapper for decoded audio data -impl WavSound { - pub fn decoder(self) -> rodio::Decoder> { - let cursor = io::Cursor::new(self); - rodio::Decoder::new(cursor).unwrap() - } - - /// Returns a `WavSound` containing empty .wav data. This intentionally - /// doesn't load from the filesystem so we have a reliable fallback when - /// there is a failure to read a file. - /// - /// The data below is the result of passing a very short, silent .wav file - /// to `Sound::load()`. - pub fn empty() -> WavSound { - WavSound(Arc::new(vec![ - 82, 73, 70, 70, 40, 0, 0, 0, 87, 65, 86, 69, 102, 109, 116, 32, 16, 0, 0, 0, 1, 0, 1, - 0, 68, 172, 0, 0, 136, 88, 1, 0, 2, 0, 16, 0, 100, 97, 116, 97, 4, 0, 0, 0, 0, 0, 0, 0, - ])) - } -} - #[derive(Clone)] pub struct OggSound(Arc>); @@ -73,6 +27,12 @@ impl assets::Asset for OggSound { type Loader = SoundLoader; const EXTENSION: &'static str = "ogg"; + + fn default_value(specifier: &str, error: assets::Error) -> Result { + warn!(?specifier, ?error, "Failed to load sound"); + + Ok(OggSound::empty()) + } } /// Wrapper for decoded audio data @@ -81,4 +41,10 @@ impl OggSound { let cursor = io::Cursor::new(self); rodio::Decoder::new(cursor).unwrap() } + + pub fn empty() -> OggSound { + OggSound(Arc::new( + include_bytes!("../../../assets/voxygen/audio/null.ogg").to_vec(), + )) + } }