Merge branch 'DaforLynx/normalize' into 'master'

Normalize + shrink all sfx; tweaks to combat music; change footstep sounds

See merge request veloren/veloren!2120

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",
 ]
 

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),
+        //(Track 1, Track 2): (Track 1 fade out (sec), Track 2 fade in (sec)),
-        (TitleMusic, Combat): (2.0, 3.0),
+        (TitleMusic, Exploration): (4.0, 4.0),
-        (Exploration, TitleMusic): (2.0, 12.0),
+        (TitleMusic, Combat): (4.0, 4.0),
-        (Exploration, Combat): (5.0, 3.0),
+        (Exploration, TitleMusic): (2.0, 2.0),
-        (Combat, Exploration): (5.0, 3.0),
+        (Exploration, Combat): (2.0, 2.0),
-        (Combat, TitleMusic): (2.0, 12.0),
+        (Combat, Exploration): (3.0, 6.0),
+        (Combat, TitleMusic): (2.0, 2.0),
     },
     interrupt_delay: 5.0,
 )

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,
         ),