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..3a87acd10d
Binary files /dev/null and b/assets/voxygen/audio/null.ogg differ
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..cdefb74bb8
Binary files /dev/null and b/assets/voxygen/audio/sfx/abilities/arrow_shot_1.ogg differ
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 737e05bce3..0000000000
Binary files a/assets/voxygen/audio/sfx/abilities/arrow_shot_1.wav and /dev/null differ
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..72df26e284
Binary files /dev/null and b/assets/voxygen/audio/sfx/abilities/arrow_shot_2.ogg differ
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 7112b973f1..0000000000
Binary files a/assets/voxygen/audio/sfx/abilities/arrow_shot_2.wav and /dev/null differ
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..c4970412ea
Binary files /dev/null and b/assets/voxygen/audio/sfx/abilities/arrow_shot_3.ogg differ
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 ec2426eec2..0000000000
Binary files a/assets/voxygen/audio/sfx/abilities/arrow_shot_3.wav and /dev/null differ
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..f09e307ce2
Binary files /dev/null and b/assets/voxygen/audio/sfx/abilities/arrow_shot_4.ogg differ
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 37bb7d962d..0000000000
Binary files a/assets/voxygen/audio/sfx/abilities/arrow_shot_4.wav and /dev/null differ
diff --git a/assets/voxygen/audio/sfx/abilities/explosion.ogg b/assets/voxygen/audio/sfx/abilities/explosion.ogg
new file mode 100644
index 0000000000..dd3de0a8e5
Binary files /dev/null and b/assets/voxygen/audio/sfx/abilities/explosion.ogg differ
diff --git a/assets/voxygen/audio/sfx/abilities/explosion.wav b/assets/voxygen/audio/sfx/abilities/explosion.wav
deleted file mode 100644
index 2f3d00925f..0000000000
Binary files a/assets/voxygen/audio/sfx/abilities/explosion.wav and /dev/null differ
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..f12ee3d109
Binary files /dev/null and b/assets/voxygen/audio/sfx/abilities/fire_shot_1.ogg differ
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 39242548f9..0000000000
Binary files a/assets/voxygen/audio/sfx/abilities/fire_shot_1.wav and /dev/null differ
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..e32699a370
Binary files /dev/null and b/assets/voxygen/audio/sfx/abilities/fire_shot_2.ogg differ
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 f56efc50dc..0000000000
Binary files a/assets/voxygen/audio/sfx/abilities/fire_shot_2.wav and /dev/null differ
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..a9052f6d27
Binary files /dev/null and b/assets/voxygen/audio/sfx/abilities/flame_thrower.ogg differ
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 034d62c919..0000000000
Binary files a/assets/voxygen/audio/sfx/abilities/flame_thrower.wav and /dev/null differ
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..b18e95d2f6
Binary files /dev/null and b/assets/voxygen/audio/sfx/abilities/heal_bomb.ogg differ
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 8da94533df..0000000000
Binary files a/assets/voxygen/audio/sfx/abilities/heal_bomb.wav and /dev/null differ
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..cb54bb8065
Binary files /dev/null and b/assets/voxygen/audio/sfx/abilities/sceptre_aura.ogg differ
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 948eb080e1..0000000000
Binary files a/assets/voxygen/audio/sfx/abilities/sceptre_aura.wav and /dev/null differ
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..fabd7e7b87
Binary files /dev/null and b/assets/voxygen/audio/sfx/abilities/sceptre_channeling.ogg differ
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 f7c16d68e2..0000000000
Binary files a/assets/voxygen/audio/sfx/abilities/sceptre_channeling.wav and /dev/null differ
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..c27d363812
Binary files /dev/null and b/assets/voxygen/audio/sfx/abilities/separated_second_swing.ogg differ
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 10b2b7208c..0000000000
Binary files a/assets/voxygen/audio/sfx/abilities/separated_second_swing.wav and /dev/null differ
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..5d25aa854c
Binary files /dev/null and b/assets/voxygen/audio/sfx/abilities/separated_third_swing.ogg differ
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 0f7e3414d2..0000000000
Binary files a/assets/voxygen/audio/sfx/abilities/separated_third_swing.wav and /dev/null differ
diff --git a/assets/voxygen/audio/sfx/abilities/swing.ogg b/assets/voxygen/audio/sfx/abilities/swing.ogg
new file mode 100644
index 0000000000..2f48755161
Binary files /dev/null and b/assets/voxygen/audio/sfx/abilities/swing.ogg differ
diff --git a/assets/voxygen/audio/sfx/abilities/swing.wav b/assets/voxygen/audio/sfx/abilities/swing.wav
deleted file mode 100644
index 9a730c4b29..0000000000
Binary files a/assets/voxygen/audio/sfx/abilities/swing.wav and /dev/null differ
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..67c4b1f29d
Binary files /dev/null and b/assets/voxygen/audio/sfx/abilities/swing_sword.ogg differ
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 e1a4b895f8..0000000000
Binary files a/assets/voxygen/audio/sfx/abilities/swing_sword.wav and /dev/null differ
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..aa748dc003
Binary files /dev/null and b/assets/voxygen/audio/sfx/abilities/sword_dash.ogg differ
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 4f5bf9470d..0000000000
Binary files a/assets/voxygen/audio/sfx/abilities/sword_dash.wav and /dev/null differ
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..f8662155db
Binary files /dev/null and b/assets/voxygen/audio/sfx/ambient/bees_1.ogg differ
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 3c3ec206a6..0000000000
Binary files a/assets/voxygen/audio/sfx/ambient/bees_1.wav and /dev/null differ
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..8d33df9b63
Binary files /dev/null and b/assets/voxygen/audio/sfx/ambient/birdcall_1.ogg differ
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 2573454d71..0000000000
Binary files a/assets/voxygen/audio/sfx/ambient/birdcall_1.wav and /dev/null differ
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..cde190e6f2
Binary files /dev/null and b/assets/voxygen/audio/sfx/ambient/birdcall_2.ogg differ
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 bf5f2157c6..0000000000
Binary files a/assets/voxygen/audio/sfx/ambient/birdcall_2.wav and /dev/null differ
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..9c2b80a73c
Binary files /dev/null and b/assets/voxygen/audio/sfx/ambient/crickets_1.ogg differ
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 39e5729bb4..0000000000
Binary files a/assets/voxygen/audio/sfx/ambient/crickets_1.wav and /dev/null differ
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..d0e6bb3f20
Binary files /dev/null and b/assets/voxygen/audio/sfx/ambient/crickets_2.ogg differ
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 d901d8701a..0000000000
Binary files a/assets/voxygen/audio/sfx/ambient/crickets_2.wav and /dev/null differ
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..fc7e0518d5
Binary files /dev/null and b/assets/voxygen/audio/sfx/ambient/crickets_3.ogg differ
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 9ccdff08a3..0000000000
Binary files a/assets/voxygen/audio/sfx/ambient/crickets_3.wav and /dev/null differ
diff --git a/assets/voxygen/audio/sfx/ambient/fire.ogg b/assets/voxygen/audio/sfx/ambient/fire.ogg
new file mode 100644
index 0000000000..fa4bca36d5
Binary files /dev/null and b/assets/voxygen/audio/sfx/ambient/fire.ogg differ
diff --git a/assets/voxygen/audio/sfx/ambient/fire.wav b/assets/voxygen/audio/sfx/ambient/fire.wav
deleted file mode 100644
index 9ededb7131..0000000000
Binary files a/assets/voxygen/audio/sfx/ambient/fire.wav and /dev/null differ
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..64cf41f38e
Binary files /dev/null and b/assets/voxygen/audio/sfx/ambient/frog_croak_1.ogg differ
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 901938d872..0000000000
Binary files a/assets/voxygen/audio/sfx/ambient/frog_croak_1.wav and /dev/null differ
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..457f0db637
Binary files /dev/null and b/assets/voxygen/audio/sfx/ambient/owl_1.ogg differ
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 c0acba36c7..0000000000
Binary files a/assets/voxygen/audio/sfx/ambient/owl_1.wav and /dev/null differ
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..54c90e9c4c
Binary files /dev/null and b/assets/voxygen/audio/sfx/ambient/running_water_1.ogg differ
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 f84eacbd2d..0000000000
Binary files a/assets/voxygen/audio/sfx/ambient/running_water_1.wav and /dev/null differ
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..54e1911d83
Binary files /dev/null and b/assets/voxygen/audio/sfx/character/arrow_hit.ogg differ
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 a82d2db942..0000000000
Binary files a/assets/voxygen/audio/sfx/character/arrow_hit.wav and /dev/null differ
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..d61e0fa76c
Binary files /dev/null and b/assets/voxygen/audio/sfx/character/arrow_miss.ogg differ
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 773371f77b..0000000000
Binary files a/assets/voxygen/audio/sfx/character/arrow_miss.wav and /dev/null differ
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..f1bbcbd405
Binary files /dev/null and b/assets/voxygen/audio/sfx/character/dive_roll_1.ogg differ
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 0cbf68025e..0000000000
Binary files a/assets/voxygen/audio/sfx/character/dive_roll_1.wav and /dev/null differ
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..4af4d8e203
Binary files /dev/null and b/assets/voxygen/audio/sfx/character/dive_roll_2.ogg differ
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 a279441c80..0000000000
Binary files a/assets/voxygen/audio/sfx/character/dive_roll_2.wav and /dev/null differ
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..d1a1d52d23
Binary files /dev/null and b/assets/voxygen/audio/sfx/character/experience_gained_1.ogg differ
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 263fac89ee..0000000000
Binary files a/assets/voxygen/audio/sfx/character/experience_gained_1.wav and /dev/null differ
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..777484e62f
Binary files /dev/null and b/assets/voxygen/audio/sfx/character/experience_gained_2.ogg differ
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 d7f9219d77..0000000000
Binary files a/assets/voxygen/audio/sfx/character/experience_gained_2.wav and /dev/null differ
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..5550eb7e7b
Binary files /dev/null and b/assets/voxygen/audio/sfx/character/experience_gained_3.ogg differ
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 3729d79b89..0000000000
Binary files a/assets/voxygen/audio/sfx/character/experience_gained_3.wav and /dev/null differ
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..c26414bd09
Binary files /dev/null and b/assets/voxygen/audio/sfx/character/glider_close.ogg differ
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 167ea91603..0000000000
Binary files a/assets/voxygen/audio/sfx/character/glider_close.wav and /dev/null differ
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..c21e702150
Binary files /dev/null and b/assets/voxygen/audio/sfx/character/glider_open.ogg differ
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 dcd4ccd576..0000000000
Binary files a/assets/voxygen/audio/sfx/character/glider_open.wav and /dev/null differ
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..58b74ca17e
Binary files /dev/null and b/assets/voxygen/audio/sfx/character/hit_1.ogg differ
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 d791cd1468..0000000000
Binary files a/assets/voxygen/audio/sfx/character/hit_1.wav and /dev/null differ
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..1f64516f53
Binary files /dev/null and b/assets/voxygen/audio/sfx/character/hit_2.ogg differ
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 c7c4e94c17..0000000000
Binary files a/assets/voxygen/audio/sfx/character/hit_2.wav and /dev/null differ
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..733f219d1f
Binary files /dev/null and b/assets/voxygen/audio/sfx/character/hit_3.ogg differ
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 45618b2e97..0000000000
Binary files a/assets/voxygen/audio/sfx/character/hit_3.wav and /dev/null differ
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..9d8fb36f18
Binary files /dev/null and b/assets/voxygen/audio/sfx/character/hit_4.ogg differ
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 2b514b2dbc..0000000000
Binary files a/assets/voxygen/audio/sfx/character/hit_4.wav and /dev/null differ
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 4ae3496cf8..0000000000
Binary files a/assets/voxygen/audio/sfx/character/interrupted_1.wav and /dev/null differ
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..c71810df9d
Binary files /dev/null and b/assets/voxygen/audio/sfx/character/level_up_sound_-_shorter_wind_up.ogg differ
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 89a6a949f0..0000000000
Binary files a/assets/voxygen/audio/sfx/character/level_up_sound_-_shorter_wind_up.wav and /dev/null differ
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 a08e039010..0000000000
Binary files a/assets/voxygen/audio/sfx/character/stunned_1.wav and /dev/null differ
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 efeeacbab8..0000000000
Binary files a/assets/voxygen/audio/sfx/character/stunned_2.wav and /dev/null differ
diff --git a/assets/voxygen/audio/sfx/crafting/hammer.ogg b/assets/voxygen/audio/sfx/crafting/hammer.ogg
new file mode 100644
index 0000000000..e876692640
Binary files /dev/null and b/assets/voxygen/audio/sfx/crafting/hammer.ogg differ
diff --git a/assets/voxygen/audio/sfx/crafting/hammer.wav b/assets/voxygen/audio/sfx/crafting/hammer.wav
deleted file mode 100644
index 6702c5f379..0000000000
Binary files a/assets/voxygen/audio/sfx/crafting/hammer.wav and /dev/null differ
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..ab2d09a081
Binary files /dev/null and b/assets/voxygen/audio/sfx/footsteps/snow_step_1.ogg differ
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 cdab83165f..0000000000
Binary files a/assets/voxygen/audio/sfx/footsteps/snow_step_1.wav and /dev/null differ
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..434fa16f83
Binary files /dev/null and b/assets/voxygen/audio/sfx/footsteps/snow_step_2.ogg differ
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 a163769c4e..0000000000
Binary files a/assets/voxygen/audio/sfx/footsteps/snow_step_2.wav and /dev/null differ
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..c2ec4c0392
Binary files /dev/null and b/assets/voxygen/audio/sfx/footsteps/snow_step_3.ogg differ
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 3bfe1d2d02..0000000000
Binary files a/assets/voxygen/audio/sfx/footsteps/snow_step_3.wav and /dev/null differ
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..a6cbe4e74f
Binary files /dev/null and b/assets/voxygen/audio/sfx/footsteps/stepdirt_1.ogg differ
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 9a12c5e069..0000000000
Binary files a/assets/voxygen/audio/sfx/footsteps/stepdirt_1.wav and /dev/null differ
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..baf009c6f7
Binary files /dev/null and b/assets/voxygen/audio/sfx/footsteps/stepdirt_2.ogg differ
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 4fc1f74a25..0000000000
Binary files a/assets/voxygen/audio/sfx/footsteps/stepdirt_2.wav and /dev/null differ
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..0159573c27
Binary files /dev/null and b/assets/voxygen/audio/sfx/footsteps/stepdirt_3.ogg differ
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 3debef6515..0000000000
Binary files a/assets/voxygen/audio/sfx/footsteps/stepdirt_3.wav and /dev/null differ
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..21320f4775
Binary files /dev/null and b/assets/voxygen/audio/sfx/footsteps/stepdirt_4.ogg differ
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 4ffdf7ecc7..0000000000
Binary files a/assets/voxygen/audio/sfx/footsteps/stepdirt_4.wav and /dev/null differ
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..b5d5fb0dbc
Binary files /dev/null and b/assets/voxygen/audio/sfx/footsteps/stepdirt_5.ogg differ
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 f38956169c..0000000000
Binary files a/assets/voxygen/audio/sfx/footsteps/stepdirt_5.wav and /dev/null differ
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..56c151ff29
Binary files /dev/null and b/assets/voxygen/audio/sfx/footsteps/stepgrass_1.ogg differ
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 54e07c037f..0000000000
Binary files a/assets/voxygen/audio/sfx/footsteps/stepgrass_1.wav and /dev/null differ
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..c32b60ed57
Binary files /dev/null and b/assets/voxygen/audio/sfx/footsteps/stepgrass_2.ogg differ
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 a9dc04be87..0000000000
Binary files a/assets/voxygen/audio/sfx/footsteps/stepgrass_2.wav and /dev/null differ
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..33ddd65d0f
Binary files /dev/null and b/assets/voxygen/audio/sfx/footsteps/stepgrass_3.ogg differ
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 f6a75141a5..0000000000
Binary files a/assets/voxygen/audio/sfx/footsteps/stepgrass_3.wav and /dev/null differ
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..98d068c0d2
Binary files /dev/null and b/assets/voxygen/audio/sfx/footsteps/stepgrass_4.ogg differ
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 5b0a90a210..0000000000
Binary files a/assets/voxygen/audio/sfx/footsteps/stepgrass_4.wav and /dev/null differ
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..baeed6cac7
Binary files /dev/null and b/assets/voxygen/audio/sfx/footsteps/stepgrass_5.ogg differ
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 8b27c7e41d..0000000000
Binary files a/assets/voxygen/audio/sfx/footsteps/stepgrass_5.wav and /dev/null differ
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..c3a72bde5a
Binary files /dev/null and b/assets/voxygen/audio/sfx/footsteps/stepgrass_6.ogg differ
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 d5639b80e1..0000000000
Binary files a/assets/voxygen/audio/sfx/footsteps/stepgrass_6.wav and /dev/null differ
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..34088b802a
Binary files /dev/null and b/assets/voxygen/audio/sfx/footsteps/stone_step_1.ogg differ
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 a243acbb53..0000000000
Binary files a/assets/voxygen/audio/sfx/footsteps/stone_step_1.wav and /dev/null differ
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..7abd33dbf2
Binary files /dev/null and b/assets/voxygen/audio/sfx/footsteps/stone_step_10.ogg differ
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..efaf0037fa
Binary files /dev/null and b/assets/voxygen/audio/sfx/footsteps/stone_step_11.ogg differ
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..b8c52a9245
Binary files /dev/null and b/assets/voxygen/audio/sfx/footsteps/stone_step_12.ogg differ
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..6e4c8e53db
Binary files /dev/null and b/assets/voxygen/audio/sfx/footsteps/stone_step_2.ogg differ
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 0eb824f310..0000000000
Binary files a/assets/voxygen/audio/sfx/footsteps/stone_step_2.wav and /dev/null differ
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..d903f338e4
Binary files /dev/null and b/assets/voxygen/audio/sfx/footsteps/stone_step_3.ogg differ
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 b590d66b5b..0000000000
Binary files a/assets/voxygen/audio/sfx/footsteps/stone_step_3.wav and /dev/null differ
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..c81a9ebf6e
Binary files /dev/null and b/assets/voxygen/audio/sfx/footsteps/stone_step_4.ogg differ
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 e059320a08..0000000000
Binary files a/assets/voxygen/audio/sfx/footsteps/stone_step_4.wav and /dev/null differ
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..a6d5ac268a
Binary files /dev/null and b/assets/voxygen/audio/sfx/footsteps/stone_step_5.ogg differ
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 a8b71e3b02..0000000000
Binary files a/assets/voxygen/audio/sfx/footsteps/stone_step_5.wav and /dev/null differ
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..529878643c
Binary files /dev/null and b/assets/voxygen/audio/sfx/footsteps/stone_step_6.ogg differ
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..929220685e
Binary files /dev/null and b/assets/voxygen/audio/sfx/footsteps/stone_step_7.ogg differ
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..cf8cd50630
Binary files /dev/null and b/assets/voxygen/audio/sfx/footsteps/stone_step_8.ogg differ
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..a88a27cac8
Binary files /dev/null and b/assets/voxygen/audio/sfx/footsteps/stone_step_9.ogg differ
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..df5ddb7ed3
Binary files /dev/null and b/assets/voxygen/audio/sfx/footsteps/water_splash_1.ogg differ
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 4f82453716..0000000000
Binary files a/assets/voxygen/audio/sfx/footsteps/water_splash_1.wav and /dev/null differ
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..672ef5b664
Binary files /dev/null and b/assets/voxygen/audio/sfx/footsteps/water_splash_2.ogg differ
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 89d63dd482..0000000000
Binary files a/assets/voxygen/audio/sfx/footsteps/water_splash_2.wav and /dev/null differ
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..eee7f58812
Binary files /dev/null and b/assets/voxygen/audio/sfx/footsteps/water_splash_3.ogg differ
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 075615749e..0000000000
Binary files a/assets/voxygen/audio/sfx/footsteps/water_splash_3.wav and /dev/null differ
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..7c1587af10
Binary files /dev/null and b/assets/voxygen/audio/sfx/footsteps/water_splash_4.ogg differ
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 a3bbd8d78a..0000000000
Binary files a/assets/voxygen/audio/sfx/footsteps/water_splash_4.wav and /dev/null differ
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..df33a6accd
Binary files /dev/null and b/assets/voxygen/audio/sfx/footsteps/wood_step_1.ogg differ
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 78b3c703db..0000000000
Binary files a/assets/voxygen/audio/sfx/footsteps/wood_step_1.wav and /dev/null differ
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..c063e43770
Binary files /dev/null and b/assets/voxygen/audio/sfx/footsteps/wood_step_2.ogg differ
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 9e76a3edfd..0000000000
Binary files a/assets/voxygen/audio/sfx/footsteps/wood_step_2.wav and /dev/null differ
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..b7525627b7
Binary files /dev/null and b/assets/voxygen/audio/sfx/footsteps/wood_step_3.ogg differ
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 ecec996cc6..0000000000
Binary files a/assets/voxygen/audio/sfx/footsteps/wood_step_3.wav and /dev/null differ
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..403049081a
Binary files /dev/null and b/assets/voxygen/audio/sfx/footsteps/wood_step_4.ogg differ
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 b193db2829..0000000000
Binary files a/assets/voxygen/audio/sfx/footsteps/wood_step_4.wav and /dev/null differ
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..91817f3cbe
Binary files /dev/null and b/assets/voxygen/audio/sfx/inventory/add_failed.ogg differ
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 e4fd519f18..0000000000
Binary files a/assets/voxygen/audio/sfx/inventory/add_failed.wav and /dev/null differ
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..a2a9ab37d2
Binary files /dev/null and b/assets/voxygen/audio/sfx/inventory/add_item.ogg differ
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 5d0bc79ddf..0000000000
Binary files a/assets/voxygen/audio/sfx/inventory/add_item.wav and /dev/null differ
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..e776e23e42
Binary files /dev/null and b/assets/voxygen/audio/sfx/inventory/consumable/apple.ogg differ
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 d464ac1375..0000000000
Binary files a/assets/voxygen/audio/sfx/inventory/consumable/apple.wav and /dev/null differ
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..76cc03892a
Binary files /dev/null and b/assets/voxygen/audio/sfx/inventory/consumable/food.ogg differ
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 13f5fdcf1b..0000000000
Binary files a/assets/voxygen/audio/sfx/inventory/consumable/food.wav and /dev/null differ
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..2411a52cf9
Binary files /dev/null and b/assets/voxygen/audio/sfx/inventory/consumable/liquid.ogg differ
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 6d048a79c5..0000000000
Binary files a/assets/voxygen/audio/sfx/inventory/consumable/liquid.wav and /dev/null differ
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..d1438516b1
Binary files /dev/null and b/assets/voxygen/audio/sfx/inventory/drop_item.ogg differ
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 2933f4cf5b..0000000000
Binary files a/assets/voxygen/audio/sfx/inventory/drop_item.wav and /dev/null differ
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..67526f40a5
Binary files /dev/null and b/assets/voxygen/audio/sfx/inventory/open_inventory.ogg differ
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 df250bc0ed..0000000000
Binary files a/assets/voxygen/audio/sfx/inventory/open_inventory.wav and /dev/null differ
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..e12250f9bd
Binary files /dev/null and b/assets/voxygen/audio/sfx/inventory/pickup_staff.ogg differ
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 a0bb545408..0000000000
Binary files a/assets/voxygen/audio/sfx/inventory/pickup_staff.wav and /dev/null differ
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..41d547635e
Binary files /dev/null and b/assets/voxygen/audio/sfx/inventory/pickup_sword.ogg differ
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 5403d69370..0000000000
Binary files a/assets/voxygen/audio/sfx/inventory/pickup_sword.wav and /dev/null differ
diff --git a/assets/voxygen/audio/sfx/ui/click1.ogg b/assets/voxygen/audio/sfx/ui/click1.ogg
new file mode 100644
index 0000000000..a38ff2a4e5
Binary files /dev/null and b/assets/voxygen/audio/sfx/ui/click1.ogg differ
diff --git a/assets/voxygen/audio/sfx/ui/click1.wav b/assets/voxygen/audio/sfx/ui/click1.wav
deleted file mode 100644
index 8fc3e638c9..0000000000
Binary files a/assets/voxygen/audio/sfx/ui/click1.wav and /dev/null differ
diff --git a/assets/voxygen/audio/sfx/ui/click2.ogg b/assets/voxygen/audio/sfx/ui/click2.ogg
new file mode 100644
index 0000000000..5c92034f50
Binary files /dev/null and b/assets/voxygen/audio/sfx/ui/click2.ogg differ
diff --git a/assets/voxygen/audio/sfx/ui/click2.wav b/assets/voxygen/audio/sfx/ui/click2.wav
deleted file mode 100644
index 46ce25c793..0000000000
Binary files a/assets/voxygen/audio/sfx/ui/click2.wav and /dev/null differ
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..a9aaa09c93
Binary files /dev/null and b/assets/voxygen/audio/sfx/weapon/dagger_in.ogg differ
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 e2d6ba61c8..0000000000
Binary files a/assets/voxygen/audio/sfx/weapon/dagger_in.wav and /dev/null differ
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..2997fcafbf
Binary files /dev/null and b/assets/voxygen/audio/sfx/weapon/dagger_out.ogg differ
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 e74d591916..0000000000
Binary files a/assets/voxygen/audio/sfx/weapon/dagger_out.wav and /dev/null differ
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..2516d89f57
Binary files /dev/null and b/assets/voxygen/audio/sfx/weapon/shield_out.ogg differ
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 541f93bffa..0000000000
Binary files a/assets/voxygen/audio/sfx/weapon/shield_out.wav and /dev/null differ
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..90fe2ef32a
Binary files /dev/null and b/assets/voxygen/audio/sfx/weapon/staff_in.ogg differ
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 a7df73c362..0000000000
Binary files a/assets/voxygen/audio/sfx/weapon/staff_in.wav and /dev/null differ
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..a8658c1bc4
Binary files /dev/null and b/assets/voxygen/audio/sfx/weapon/staff_out.ogg differ
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 4a1d946f3c..0000000000
Binary files a/assets/voxygen/audio/sfx/weapon/staff_out.wav and /dev/null differ
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..f6204165e4
Binary files /dev/null and b/assets/voxygen/audio/sfx/weapon/sword_in.ogg differ
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 1e5c802cdb..0000000000
Binary files a/assets/voxygen/audio/sfx/weapon/sword_in.wav and /dev/null differ
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..bba657347a
Binary files /dev/null and b/assets/voxygen/audio/sfx/weapon/sword_out.ogg differ
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 7a96048c44..0000000000
Binary files a/assets/voxygen/audio/sfx/weapon/sword_out.wav and /dev/null differ
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 a85f30c6f7..a1b491cc67 100644
Binary files a/assets/voxygen/audio/soundtrack/Town/im_home.ogg and b/assets/voxygen/audio/soundtrack/Town/im_home.ogg differ
diff --git a/assets/voxygen/audio/soundtrack/Town/library_theme.ogg b/assets/voxygen/audio/soundtrack/Town/library_theme.ogg
index 3a0fd33050..d5ea4e88c4 100644
Binary files a/assets/voxygen/audio/soundtrack/Town/library_theme.ogg and b/assets/voxygen/audio/soundtrack/Town/library_theme.ogg differ
diff --git a/assets/voxygen/audio/soundtrack/Town/onwards.ogg b/assets/voxygen/audio/soundtrack/Town/onwards.ogg
index ba8d4c0ae1..a5e236ea42 100644
Binary files a/assets/voxygen/audio/soundtrack/Town/onwards.ogg and b/assets/voxygen/audio/soundtrack/Town/onwards.ogg differ
diff --git a/assets/voxygen/audio/soundtrack/Town/rest_assured.ogg b/assets/voxygen/audio/soundtrack/Town/rest_assured.ogg
index 0e92bb3853..fc7823efc7 100644
Binary files a/assets/voxygen/audio/soundtrack/Town/rest_assured.ogg and b/assets/voxygen/audio/soundtrack/Town/rest_assured.ogg differ
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 093942bf08..0000000000
Binary files a/assets/voxygen/audio/soundtrack/barred_paths/barred_paths-hi-start.ogg and /dev/null differ
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 bd2a99f4cb..0000000000
Binary files a/assets/voxygen/audio/soundtrack/cave/dank_hallows.ogg and /dev/null differ
diff --git a/assets/voxygen/audio/soundtrack/cave/mineral_deposits.ogg b/assets/voxygen/audio/soundtrack/cave/mineral_deposits.ogg
index c4d848580b..537e7bb1f6 100644
Binary files a/assets/voxygen/audio/soundtrack/cave/mineral_deposits.ogg and b/assets/voxygen/audio/soundtrack/cave/mineral_deposits.ogg differ
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..5f6bf793f5
Binary files /dev/null and b/assets/voxygen/audio/soundtrack/cave/saturated_hallows.ogg differ
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..5e13245f74
Binary files /dev/null and b/assets/voxygen/audio/soundtrack/combat/barred_paths/barred_paths-hi-start.ogg differ
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 9d595ee17f..ac435ea688 100644
Binary files a/assets/voxygen/audio/soundtrack/dungeon/dank_dungeon.ogg and b/assets/voxygen/audio/soundtrack/dungeon/dank_dungeon.ogg differ
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 fa54d54ea1..18a9ed1375 100644
Binary files a/assets/voxygen/audio/soundtrack/dungeon/down_the_rabbit_hole.ogg and b/assets/voxygen/audio/soundtrack/dungeon/down_the_rabbit_hole.ogg differ
diff --git a/assets/voxygen/audio/soundtrack/dungeon/ruination.ogg b/assets/voxygen/audio/soundtrack/dungeon/ruination.ogg
index e71d2f5b58..86e5198395 100644
Binary files a/assets/voxygen/audio/soundtrack/dungeon/ruination.ogg and b/assets/voxygen/audio/soundtrack/dungeon/ruination.ogg differ
diff --git a/assets/voxygen/audio/soundtrack/dungeon/sacred_temple.ogg b/assets/voxygen/audio/soundtrack/dungeon/sacred_temple.ogg
index c63fa25d92..de1dcd10b2 100644
Binary files a/assets/voxygen/audio/soundtrack/dungeon/sacred_temple.ogg and b/assets/voxygen/audio/soundtrack/dungeon/sacred_temple.ogg differ
diff --git a/assets/voxygen/audio/soundtrack/dungeon/vast_onslaught.ogg b/assets/voxygen/audio/soundtrack/dungeon/vast_onslaught.ogg
index 85cf95259a..85d636fd60 100644
Binary files a/assets/voxygen/audio/soundtrack/dungeon/vast_onslaught.ogg and b/assets/voxygen/audio/soundtrack/dungeon/vast_onslaught.ogg differ
diff --git a/assets/voxygen/audio/soundtrack/overworld/a_solemn_quest.ogg b/assets/voxygen/audio/soundtrack/overworld/a_solemn_quest.ogg
index e2928f83df..81da88b6e9 100644
Binary files a/assets/voxygen/audio/soundtrack/overworld/a_solemn_quest.ogg and b/assets/voxygen/audio/soundtrack/overworld/a_solemn_quest.ogg differ
diff --git a/assets/voxygen/audio/soundtrack/overworld/between_the_fairies.ogg b/assets/voxygen/audio/soundtrack/overworld/between_the_fairies.ogg
index b9e2ace346..02e2eee5d8 100644
Binary files a/assets/voxygen/audio/soundtrack/overworld/between_the_fairies.ogg and b/assets/voxygen/audio/soundtrack/overworld/between_the_fairies.ogg differ
diff --git a/assets/voxygen/audio/soundtrack/overworld/calling_wild.ogg b/assets/voxygen/audio/soundtrack/overworld/calling_wild.ogg
index 81a17fd551..e39222e84b 100644
Binary files a/assets/voxygen/audio/soundtrack/overworld/calling_wild.ogg and b/assets/voxygen/audio/soundtrack/overworld/calling_wild.ogg differ
diff --git a/assets/voxygen/audio/soundtrack/overworld/calming_hills.ogg b/assets/voxygen/audio/soundtrack/overworld/calming_hills.ogg
index ba7b2a7e40..89ed18ffba 100644
Binary files a/assets/voxygen/audio/soundtrack/overworld/calming_hills.ogg and b/assets/voxygen/audio/soundtrack/overworld/calming_hills.ogg differ
diff --git a/assets/voxygen/audio/soundtrack/overworld/campfire_stories.ogg b/assets/voxygen/audio/soundtrack/overworld/campfire_stories.ogg
index ce926b36c9..9dd0b2849e 100644
Binary files a/assets/voxygen/audio/soundtrack/overworld/campfire_stories.ogg and b/assets/voxygen/audio/soundtrack/overworld/campfire_stories.ogg differ
diff --git a/assets/voxygen/audio/soundtrack/overworld/drifting_along.ogg b/assets/voxygen/audio/soundtrack/overworld/drifting_along.ogg
index c75536a282..b366a6925d 100644
Binary files a/assets/voxygen/audio/soundtrack/overworld/drifting_along.ogg and b/assets/voxygen/audio/soundtrack/overworld/drifting_along.ogg differ
diff --git a/assets/voxygen/audio/soundtrack/overworld/ethereal_bonds.ogg b/assets/voxygen/audio/soundtrack/overworld/ethereal_bonds.ogg
index e3baf53eb6..01bbe09177 100644
Binary files a/assets/voxygen/audio/soundtrack/overworld/ethereal_bonds.ogg and b/assets/voxygen/audio/soundtrack/overworld/ethereal_bonds.ogg differ
diff --git a/assets/voxygen/audio/soundtrack/overworld/field_grazing.ogg b/assets/voxygen/audio/soundtrack/overworld/field_grazing.ogg
index 8a0a8dad41..f6dff3ce7c 100644
Binary files a/assets/voxygen/audio/soundtrack/overworld/field_grazing.ogg and b/assets/voxygen/audio/soundtrack/overworld/field_grazing.ogg differ
diff --git a/assets/voxygen/audio/soundtrack/overworld/fiesta_del_pueblo.ogg b/assets/voxygen/audio/soundtrack/overworld/fiesta_del_pueblo.ogg
index 2229213785..db00244154 100644
Binary files a/assets/voxygen/audio/soundtrack/overworld/fiesta_del_pueblo.ogg and b/assets/voxygen/audio/soundtrack/overworld/fiesta_del_pueblo.ogg differ
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 b42677456a..01236e2841 100644
Binary files a/assets/voxygen/audio/soundtrack/overworld/highland_of_the_hawk.ogg and b/assets/voxygen/audio/soundtrack/overworld/highland_of_the_hawk.ogg differ
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 4a9a47ce8e..b4bc2d5398 100644
Binary files a/assets/voxygen/audio/soundtrack/overworld/into_the_dark_forest.ogg and b/assets/voxygen/audio/soundtrack/overworld/into_the_dark_forest.ogg differ
diff --git a/assets/voxygen/audio/soundtrack/overworld/jungle_ambient.ogg b/assets/voxygen/audio/soundtrack/overworld/jungle_ambient.ogg
index 0870195f08..cb10c8989f 100644
Binary files a/assets/voxygen/audio/soundtrack/overworld/jungle_ambient.ogg and b/assets/voxygen/audio/soundtrack/overworld/jungle_ambient.ogg differ
diff --git a/assets/voxygen/audio/soundtrack/overworld/just_the_beginning.ogg b/assets/voxygen/audio/soundtrack/overworld/just_the_beginning.ogg
index 8bbac971d4..5cfdf7ff68 100644
Binary files a/assets/voxygen/audio/soundtrack/overworld/just_the_beginning.ogg and b/assets/voxygen/audio/soundtrack/overworld/just_the_beginning.ogg differ
diff --git a/assets/voxygen/audio/soundtrack/overworld/leap_of_faith.ogg b/assets/voxygen/audio/soundtrack/overworld/leap_of_faith.ogg
index f115a17ae0..31016d9998 100644
Binary files a/assets/voxygen/audio/soundtrack/overworld/leap_of_faith.ogg and b/assets/voxygen/audio/soundtrack/overworld/leap_of_faith.ogg differ
diff --git a/assets/voxygen/audio/soundtrack/overworld/limits.ogg b/assets/voxygen/audio/soundtrack/overworld/limits.ogg
index 7a0514ce95..419b8767b4 100644
Binary files a/assets/voxygen/audio/soundtrack/overworld/limits.ogg and b/assets/voxygen/audio/soundtrack/overworld/limits.ogg differ
diff --git a/assets/voxygen/audio/soundtrack/overworld/moonbeams.ogg b/assets/voxygen/audio/soundtrack/overworld/moonbeams.ogg
index ca69b00dcc..0b37b11f33 100644
Binary files a/assets/voxygen/audio/soundtrack/overworld/moonbeams.ogg and b/assets/voxygen/audio/soundtrack/overworld/moonbeams.ogg differ
diff --git a/assets/voxygen/audio/soundtrack/overworld/oceania.ogg b/assets/voxygen/audio/soundtrack/overworld/oceania.ogg
index 2fab86e68f..f13c8424fa 100644
Binary files a/assets/voxygen/audio/soundtrack/overworld/oceania.ogg and b/assets/voxygen/audio/soundtrack/overworld/oceania.ogg differ
diff --git a/assets/voxygen/audio/soundtrack/overworld/serene_meadows.ogg b/assets/voxygen/audio/soundtrack/overworld/serene_meadows.ogg
index 561e12efee..95649132ba 100644
Binary files a/assets/voxygen/audio/soundtrack/overworld/serene_meadows.ogg and b/assets/voxygen/audio/soundtrack/overworld/serene_meadows.ogg differ
diff --git a/assets/voxygen/audio/soundtrack/overworld/short_meandering.ogg b/assets/voxygen/audio/soundtrack/overworld/short_meandering.ogg
index 2534fd7dbd..f3164af352 100644
Binary files a/assets/voxygen/audio/soundtrack/overworld/short_meandering.ogg and b/assets/voxygen/audio/soundtrack/overworld/short_meandering.ogg differ
diff --git a/assets/voxygen/audio/soundtrack/overworld/snowtop_volume.ogg b/assets/voxygen/audio/soundtrack/overworld/snowtop_volume.ogg
index 854f31b745..3c2b016fe6 100644
Binary files a/assets/voxygen/audio/soundtrack/overworld/snowtop_volume.ogg and b/assets/voxygen/audio/soundtrack/overworld/snowtop_volume.ogg differ
diff --git a/assets/voxygen/audio/soundtrack/overworld/true_nature.ogg b/assets/voxygen/audio/soundtrack/overworld/true_nature.ogg
index 92b717296c..7cb7e54dd7 100644
Binary files a/assets/voxygen/audio/soundtrack/overworld/true_nature.ogg and b/assets/voxygen/audio/soundtrack/overworld/true_nature.ogg differ
diff --git a/assets/voxygen/audio/soundtrack/overworld/verdant_glades.ogg b/assets/voxygen/audio/soundtrack/overworld/verdant_glades.ogg
index 5a02232f53..80a2cda7d7 100644
Binary files a/assets/voxygen/audio/soundtrack/overworld/verdant_glades.ogg and b/assets/voxygen/audio/soundtrack/overworld/verdant_glades.ogg differ
diff --git a/assets/voxygen/audio/soundtrack/overworld/wandering_voices.ogg b/assets/voxygen/audio/soundtrack/overworld/wandering_voices.ogg
index 86a26f15d6..6f711d4e09 100644
Binary files a/assets/voxygen/audio/soundtrack/overworld/wandering_voices.ogg and b/assets/voxygen/audio/soundtrack/overworld/wandering_voices.ogg differ
diff --git a/assets/voxygen/audio/soundtrack/overworld/winter_falls.ogg b/assets/voxygen/audio/soundtrack/overworld/winter_falls.ogg
index 09ea5a9403..526fd57393 100644
Binary files a/assets/voxygen/audio/soundtrack/overworld/winter_falls.ogg and b/assets/voxygen/audio/soundtrack/overworld/winter_falls.ogg differ
diff --git a/assets/voxygen/audio/soundtrack/veloren_title_tune.ogg b/assets/voxygen/audio/soundtrack/veloren_title_tune.ogg
index 7bd33ca402..cc4c351ed2 100644
Binary files a/assets/voxygen/audio/soundtrack/veloren_title_tune.ogg and b/assets/voxygen/audio/soundtrack/veloren_title_tune.ogg differ
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<f32>, vol: Option<f32>) {
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<f32>, vol: Option<f32>) {
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<Vec<u8>>);
-
-impl AsRef<[u8]> for WavSound {
- fn as_ref(&self) -> &[u8] { &self.0 }
-}
pub struct SoundLoader;
-impl assets::Loader<WavSound> for SoundLoader {
- fn load(content: Cow<[u8]>, _: &str) -> Result<WavSound, assets::BoxedError> {
- 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<Self, assets::Error> {
- warn!(?specifier, ?error, "Failed to load sound");
-
- Ok(WavSound::empty())
- }
-}
-
-/// Wrapper for decoded audio data
-impl WavSound {
- pub fn decoder(self) -> rodio::Decoder<io::Cursor<WavSound>> {
- 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<Vec<u8>>);
@@ -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<Self, assets::Error> {
+ 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(),
+ ))
+ }
}