Better stepping sounds (and minor voxel model fixes)

common/src/comp/body/humanoid.rs

@@ -77,7 +77,7 @@ pub const ALL_RACES: [Race; 6] = [
 ];
 
 // Hair Colors
-pub const DANARI_HAIR_COLORS: [(u8, u8, u8); 17] = [
+pub const DANARI_HAIR_COLORS: [(u8, u8, u8); 16] = [
     (198, 169, 113), // Philosopher's Grey
     (245, 232, 175), // Cream Blonde
     (228, 208, 147), // Gold Blonde
@@ -91,12 +91,11 @@ pub const DANARI_HAIR_COLORS: [(u8, u8, u8); 17] = [
     (101, 83, 95),   // Matte Purple
     (101, 57, 90),   // Witch Purple
     (107, 32, 60),   // Grape Purple
-    (168, 45, 47),   // Lobster Red
     (135, 38, 39),   // Dark Red
     (88, 26, 29),    // Wine Red
     (146, 32, 32),   // Autumn Red
 ];
-pub const DWARF_HAIR_COLORS: [(u8, u8, u8); 21] = [
+pub const DWARF_HAIR_COLORS: [(u8, u8, u8); 20] = [
     (245, 232, 175), // Cream Blonde
     (228, 208, 147), // Gold Blonde
     (228, 223, 141), // Platinum Blonde
@@ -108,7 +107,6 @@ pub const DWARF_HAIR_COLORS: [(u8, u8, u8); 21] = [
     (57, 56, 61),    // Raven Black
     (101, 83, 95),   // Matte Purple
     (101, 57, 90),   // Witch Purple
-    (168, 45, 47),   // Lobster Red
     (135, 38, 39),   // Dark Red
     (88, 26, 29),    // Wine Red
     (191, 228, 254), // Ice NobleBlue
@@ -119,7 +117,7 @@ pub const DWARF_HAIR_COLORS: [(u8, u8, u8); 21] = [
     (84, 139, 107),  // Grass Green
     (48, 61, 52),    // Dark Green
 ];
-pub const ELF_HAIR_COLORS: [(u8, u8, u8); 24] = [
+pub const ELF_HAIR_COLORS: [(u8, u8, u8); 23] = [
     (66, 83, 113),   // Mysterious Blue
     (13, 76, 41),    // Rainforest Green
     (245, 232, 175), // Cream Blonde
@@ -133,7 +131,6 @@ pub const ELF_HAIR_COLORS: [(u8, u8, u8); 24] = [
     (57, 56, 61),    // Raven Black
     (101, 83, 95),   // Matte Purple
     (101, 57, 90),   // Witch Purple
-    (168, 45, 47),   // Lobster Red
     (135, 38, 39),   // Dark Red
     (88, 26, 29),    // Wine Red
     (191, 228, 254), // Ice Blue
@@ -145,7 +142,7 @@ pub const ELF_HAIR_COLORS: [(u8, u8, u8); 24] = [
     (84, 139, 107),  // Grass Green
     (48, 61, 52),    // Dark Green
 ];
-pub const HUMAN_HAIR_COLORS: [(u8, u8, u8); 22] = [
+pub const HUMAN_HAIR_COLORS: [(u8, u8, u8); 21] = [
     (245, 232, 175), // Cream Blonde
     (228, 208, 147), // Gold Blonde
     (228, 223, 141), // Platinum Blonde
@@ -157,7 +154,6 @@ pub const HUMAN_HAIR_COLORS: [(u8, u8, u8); 22] = [
     (57, 56, 61),    // Raven Black
     (101, 83, 95),   // Matte Purple
     (101, 57, 90),   // Witch Purple
-    (168, 45, 47),   // Lobster Red
     (135, 38, 39),   // Dark Red
     (88, 26, 29),    // Wine Red
     (191, 228, 254), // Ice Blue
@@ -169,7 +165,7 @@ pub const HUMAN_HAIR_COLORS: [(u8, u8, u8); 22] = [
     (84, 139, 107),  // Grass Green
     (48, 61, 52),    // Dark Green
 ];
-pub const ORC_HAIR_COLORS: [(u8, u8, u8); 15] = [
+pub const ORC_HAIR_COLORS: [(u8, u8, u8); 14] = [
     (66, 66, 59),   // Wise Grey
     (125, 111, 51), // Muddy Blonde
     (199, 131, 58), // Summer Blonde
@@ -181,12 +177,11 @@ pub const ORC_HAIR_COLORS: [(u8, u8, u8); 15] = [
     (57, 56, 61),   // Raven Black
     (101, 83, 95),  // Matte Purple
     (101, 57, 90),  // Witch Purple
-    (168, 45, 47),  // Lobster Red
     (135, 38, 39),  // Dark Red
     (88, 26, 29),   // Wine Red
     (66, 83, 113),  // Mysterious Blue
 ];
-pub const UNDEAD_HAIR_COLORS: [(u8, u8, u8); 25] = [
+pub const UNDEAD_HAIR_COLORS: [(u8, u8, u8); 24] = [
     (245, 232, 175), // Cream Blonde
     (228, 208, 147), // Gold Blonde
     (228, 223, 141), // Platinum Blonde
@@ -199,7 +194,6 @@ pub const UNDEAD_HAIR_COLORS: [(u8, u8, u8); 25] = [
     (101, 83, 95),   // Matte Purple
     (101, 57, 90),   // Witch Purple
     (111, 54, 117),  // Punky Purple
-    (168, 45, 47),   // Lobster Red
     (135, 38, 39),   // Dark Red
     (88, 26, 29),    // Wine Red
     (191, 228, 254), // Ice Blue

voxygen/src/audio/mod.rs

@@ -221,7 +221,7 @@ pub fn get_default_device() -> String {
 
 /// Load the audio file directory selected by genre.
 pub fn load_soundtracks() -> Vec<String> {
-    let assets = assets::read_dir("voxygen.audio.soundtrack").unwrap();
+    let assets = assets::read_dir("voxygen.audio.soundtrack.regional").unwrap();
     let soundtracks = assets
         .filter_map(|entry| {
             entry.ok().map(|f| {

voxygen/src/menu/char_selection/scene.rs

@@ -123,7 +123,7 @@ impl Scene {
 
         let (view_mat, proj_mat, cam_pos) = self.camera.compute_dependents(client);
         const VD: f32 = 115.0; //View Distance
-        const TIME: f64 = 36000.0; // hours*3600 seconds
+        const TIME: f64 = 43200.0; // hours*3600 seconds
         if let Err(err) = renderer.update_consts(
             &mut self.globals,
             &[Globals::new(

voxygen/src/scene/sound.rs

@@ -54,9 +54,9 @@ impl SoundMgr {
 
                 if character.movement == Run && state.last_step_sound.elapsed().as_secs_f64() > 0.25
                 {
-                    let rand_step = (rand::random::<usize>() % 7) + 1;
+                    let rand_step = (rand::random::<usize>() % 5) + 1;
                     audio.play_sound(
-                        &format!("voxygen.audio.footsteps.stepdirt_{}", rand_step),
+                        &format!("voxygen.audio.sfx.steps.step_{}", rand_step),
                         pos.0,
                     );
                     state.last_step_sound = Instant::now();

voxygen/src/settings.rs

@@ -65,8 +65,8 @@ impl Default for ControlSettings {
             jump: KeyMouse::Key(VirtualKeyCode::Space),
             sit: KeyMouse::Key(VirtualKeyCode::K),
             glide: KeyMouse::Key(VirtualKeyCode::LShift),
-            climb: KeyMouse::Key(VirtualKeyCode::LControl),
+            climb: KeyMouse::Key(VirtualKeyCode::LShift),
-            climb_down: KeyMouse::Key(VirtualKeyCode::LShift),
+            climb_down: KeyMouse::Key(VirtualKeyCode::LControl),
             wall_leap: KeyMouse::Mouse(MouseButton::Middle),
             mount: KeyMouse::Key(VirtualKeyCode::F),
             map: KeyMouse::Key(VirtualKeyCode::M),