Merge branch 'zesterer/fixes' into 'master'

Various minor UX improvements based on player feedback

See merge request veloren/veloren!3931

CHANGELOG.md

@@ -62,6 +62,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   particularily noticeable when opening the map screen (which involves rescaling a few large
   images) and also when using the voxel minimap view (where a medium size image is updated often).
 - Towns now have a variety of sizes
+- The game now starts in fullscreen by default
+- Default audio volume should be less likely to destroy ear drums
+- Creatures flee less quickly when low on health
 
 ### Removed
 

Cargo.toml

@@ -139,7 +139,7 @@ hashbrown = { version = "0.13", features = ["rayon", "serde", "nightly"] }
 fxhash = { version = "0.2.1" }
 crossbeam-utils = { version = "0.8.1"}
 crossbeam-channel = { version = "0.5"}
-ordered-float = { version = "3", default-features = false }
+ordered-float = { version = "3", default-features = false, features = ["std"] }
 num = { version = "0.4" }
 num-traits = { version = "0.2" }
 vek = { version = "0.15.8", features = ["serde"] }

common/src/shared_server_config.rs

@@ -4,13 +4,7 @@ use serde::{Deserialize, Serialize};
 /// life.
 #[derive(Debug, Serialize, Deserialize, Clone)]
 pub struct ServerConstants {
+    /// How many times faster the in-game day/night cycle should be compared to
+    /// real time.
     pub day_cycle_coefficient: f64,
 }
-impl Default for ServerConstants {
-    fn default() -> Self {
-        ServerConstants {
-            // == 30.0 via server settings (the default)
-            day_cycle_coefficient: 24.0 * 2.0,
-        }
-    }
-}

common/systems/tests/character_state.rs

@@ -83,8 +83,9 @@ mod tests {
             },
             false,
             None,
-            // Dummy ServerConstants
+            &ServerConstants {
-            &ServerConstants::default(),
+                day_cycle_coefficient: 24.0,
+            },
             |_, _| {},
         );
     }

common/systems/tests/phys/basic.rs

@@ -18,7 +18,9 @@ fn simple_run() {
         },
         false,
         None,
-        &ServerConstants::default(),
+        &ServerConstants {
+            day_cycle_coefficient: 24.0,
+        },
         |_, _| {},
     );
 }

common/systems/tests/phys/utils.rs

@@ -65,7 +65,9 @@ pub fn tick(state: &mut State, dt: Duration) {
         },
         false,
         None,
-        &ServerConstants::default(),
+        &ServerConstants {
+            day_cycle_coefficient: 24.0,
+        },
         |_, _| {},
     );
 }

server/agent/src/action_nodes.rs

@@ -574,6 +574,9 @@ impl<'a> AgentData<'a> {
         read_data: &ReadData,
         tgt_pos: &Pos,
     ) {
+        // Proportion of full speed
+        const MAX_FLEE_SPEED: f32 = 0.65;
+
         if read_data.is_riders.contains(*self.entity) {
             controller.push_event(ControlEvent::Unmount);
         }
@@ -599,8 +602,8 @@ impl<'a> AgentData<'a> {
                 ..self.traversal_config
             },
         ) {
-            controller.inputs.move_dir =
+            controller.inputs.move_dir = bearing.xy().try_normalized().unwrap_or_else(Vec2::zero)
-                bearing.xy().try_normalized().unwrap_or_else(Vec2::zero) * speed;
+                * speed.min(MAX_FLEE_SPEED);
             self.jump_if(bearing.z > 1.5, controller);
             controller.inputs.move_z = bearing.z;
         }

server/src/lib.rs

@@ -573,7 +573,7 @@ impl Server {
         }
 
         let server_constants = ServerConstants {
-            day_cycle_coefficient: 1440.0 / settings.day_length,
+            day_cycle_coefficient: settings.day_cycle_coefficient(),
         };
 
         let this = Self {

server/src/settings.rs

@@ -324,6 +324,10 @@ impl Settings {
             self.day_length = default_values.day_length;
         }
     }
+
+    /// Derive a coefficient that is the relatively speed of the in-game
+    /// day/night cycle compared to reality.
+    pub fn day_cycle_coefficient(&self) -> f64 { 1440.0 / self.day_length }
 }
 
 pub enum InvalidSettingsError {

server/src/sys/msg/register.rs

@@ -352,7 +352,7 @@ impl<'a> System<'a> for Sys {
                             material_stats: (*read_data.material_stats).clone(),
                             ability_map: (*read_data.ability_map).clone(),
                             server_constants: ServerConstants {
-                                day_cycle_coefficient: 1440.0 / read_data.settings.day_length
+                                day_cycle_coefficient: read_data.settings.day_cycle_coefficient()
                             },
                         })?;
                         debug!("Done initial sync with client.");

voxygen/src/settings/audio.rs

@@ -56,9 +56,9 @@ pub struct AudioSettings {
 impl Default for AudioSettings {
     fn default() -> Self {
         Self {
-            master_volume: AudioVolume::new(1.0, false),
+            master_volume: AudioVolume::new(0.8, false),
             inactive_master_volume_perc: AudioVolume::new(0.5, false),
-            music_volume: AudioVolume::new(0.4, false),
+            music_volume: AudioVolume::new(0.3, false),
             sfx_volume: AudioVolume::new(0.6, false),
             ambience_volume: AudioVolume::new(0.6, false),
             num_sfx_channels: 60,

voxygen/src/window.rs

@@ -1380,7 +1380,7 @@ pub struct FullScreenSettings {
 impl Default for FullScreenSettings {
     fn default() -> Self {
         Self {
-            enabled: false,
+            enabled: true,
             mode: FullscreenMode::Borderless,
             resolution: [1920, 1080],
             bit_depth: None,