From 06264159e50777eb09692eb2b56717973e5d1b1e Mon Sep 17 00:00:00 2001 From: hut Date: Thu, 21 Mar 2024 19:01:18 +0100 Subject: [PATCH] tweaks --- src/camera.rs | 6 +++--- src/defs.txt | 10 +++++----- src/hud.rs | 3 +-- src/settings.rs | 4 ++-- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/camera.rs b/src/camera.rs index 3d7d4a6..5c91446 100644 --- a/src/camera.rs +++ b/src/camera.rs @@ -35,8 +35,8 @@ impl Default for CameraController { enabled: true, initialized: false, sensitivity: 0.5, - move_speed: 10.0, - friction: 0.1, + move_speed: 30.0, + friction: 0.05, pitch: 1.0, // pitch=0/yaw=0 -> face sun yaw: 0.3, velocity: Vec3::ZERO, @@ -98,7 +98,7 @@ fn run_camera_controller( } if key_input.pressed(settings.key_stop) { - actor.v = actor.v * 0.99; + actor.v = actor.v * (1.0 - controller.friction); if actor.v.length_squared() < 1e-6 { actor.v = Vec3::ZERO; } diff --git a/src/defs.txt b/src/defs.txt index d33e649..c0ea195 100644 --- a/src/defs.txt +++ b/src/defs.txt @@ -26,15 +26,15 @@ actor -3300 10 0 pizzeria lvl info msg 6 hi cool "Welcome to Space Pizza™, best pizza around the Main Ring!" msg 6 cool order "Great to see a customer, we don't get many lately" - msg 25 order special "Would you like to order today's special?" + msg 50 order special "Would you like to order today's special?" choice 3 special whatsthespecial "What's the special?" msg 4 whatsthespecial pineapple "Suspicious Spacefunghi" msg 4 pineapple smoothie "With free pineapple imiation" - msg 6 smoothie tube "Our pizza smoothies are freshly blended every day" + msg 7 smoothie tube "Our pizza smoothies are freshly blended every day" choice 3 tube wtftube "Wait... pizza smoothie?" msg 6 wtftube anyway "Huh? Of course, smoothie! How else do you want to get that pizza down your spacesuit feeding tube?" msg 6 anyway pass "An emulsion of deliciousness!" - msg 20 tube pass "Deliciousness for your spacesuit feeding tube!" + msg 30 tube pass "Deliciousness for your spacesuit feeding tube!" choice 3 pass yourloss "I think I'll pass..." msg 3 yourloss end "Your loss, mate" msg 3 pass prank "Hey? Are you still there?" @@ -79,7 +79,7 @@ actor 10 0 70 suit msg 4 hi vr "Oh hey there!" choice 3 vr vr1 "Uhm... hi" msg 25 vr1 notsochatty "Didn't even notice you! Was playing some VR Game! What's up?" - msg 25 vr notsochatty "Didn't even notice you! Was playing some VR Game! What's up, yo?" + msg 50 vr notsochatty "Didn't even notice you! Was playing some VR Game! What's up, yo?" choice 3 notsochatty spacewalk "Nice weather for a space walk, right?" msg 4 spacewalk meteorites "Hahaha, you're mad!" msg 5 meteorites chillin "Amalthea is on a flyby, better dodge the micrometeorites!" @@ -99,7 +99,7 @@ actor 10 0 70 suit msg 4 imbad repair "Yeah I can imagine, looks like your suit is leaking." msg 4 repair pizza "If I were you, I'd look out for a repair shop." msg 3.5 notsochatty pizza "Not so chatty, huh? That's ok. See you around." - msg 2.5 pizza end "Oh, and make sure to check out the Pizza place." + msg 3.5 pizza end "Oh, and make sure to check out the Pizza place." choice 3 end end1 "Will do, bye!" msg 0 end1 EXIT "Disconnected." lvl info diff --git a/src/hud.rs b/src/hud.rs index a87fd00..9c34e97 100644 --- a/src/hud.rs +++ b/src/hud.rs @@ -112,8 +112,7 @@ fn setup( mut log: ResMut, mut ambient_light: ResMut, ) { - log.info("Customer wake-up registered.".to_string()); - log.info("Systems reactivated.".to_string()); + log.info("Resuming from suspend".to_string()); log.warning("Oxygen Low".to_string()); let visibility = if settings.hud_active { Visibility::Inherited diff --git a/src/settings.rs b/src/settings.rs index 87c44b4..ad74109 100644 --- a/src/settings.rs +++ b/src/settings.rs @@ -37,8 +37,8 @@ pub struct Settings { impl Default for Settings { fn default() -> Self { Settings { - mute_sfx: true, - mute_music: true, + mute_sfx: false, + mute_music: false, volume_sfx: 100, volume_music: 100, font_size_hud: 32.0,