src/audio.rs

@@ -64,7 +64,6 @@ const PATHS: &[(SfxType, Sfx, &str)] = &[
     (SfxType::OneOff, Sfx::GaspRelief, "sounds/gasprelief.ogg"),
     (SfxType::OneOff, Sfx::Achieve, "sounds/achieve.ogg"),
     (SfxType::OneOff, Sfx::Click, "sounds/click.ogg"),
-    (SfxType::OneOff, Sfx::Click3, "sounds/click3.ogg"),
     (SfxType::OneOff, Sfx::Connect, "sounds/connect.ogg"),
     (SfxType::OneOff, Sfx::Crash, "sounds/crash.ogg"),
     (SfxType::OneOff, Sfx::Drink, "sounds/drink.ogg"),
@@ -90,7 +89,6 @@ pub enum Sfx {
     BGMActualJupiterRecording,
     BGMTakeoff,
     Click,
-    Click3,
     Connect,
     Crash,
     Drink,
@@ -119,7 +117,6 @@ pub fn str2sfx(sfx_label: &str) -> Sfx {
         "exit" => Sfx::ExitVehicle,
         "honk" => Sfx::Honk,
         "click" => Sfx::Click,
-        "click3" => Sfx::Click3,
         "drink" => Sfx::Drink,
         "woosh" => Sfx::Woosh,
         "zoom" => Sfx::Zoom,

src/chats/serenity.yaml

@@ -360,12 +360,13 @@
 
 - chat: Luna
 - "if $$player_suit_health_percent < 100":
-  - Holy shit! Look at all those scratches and tears on your suit!
+  - Holy shit!
+  - Look at all those scratches and tears on your suit!
   - script: repairsuit
   - set: grateful
   - Let me fix that!
-  - script: refilloxygen 1
   - And I topped off your oxygen tank while I'm at it.
+  - script: refilloxygen 1
   - goto: mainnode
 - Oh hey you! Have an oxygen refill!
 - script: refilloxygen 1
@@ -373,7 +374,7 @@
 
 - label: mainnode
 - if: "$grateful"
-  Thanks for the help!:
+  Thank you so much!:
   - No problem at all!
   - set: grateful 0
   - goto: mainnode
@@ -413,7 +414,8 @@
       - goto: EXIT
     - goto: mainnode
 - What are you up to?:
-  - Tinkering on various projects and running a workshop. Come by if you need any repairs!
+  - I'm running a workshop. Come by if you need any repairs!
+  - Tinkering on various projects.
   - What kind of projects?:
     - A tuned MotorAce spaceship, an impact dampener, and... a secret project.
     - label: projects
@@ -466,15 +468,17 @@
         - Uh huh.
         - Hey, I gotta do some stuff, see you around.
         - goto: EXIT
-      - Into the future only, of course.
+      - In the future only, of course.
       - label: continuemonologue
-      - I want to get all the way out to the edge of the visible universe.
-      - To the end of time, to watch the world evaporate into nothingness.
+      - I want to get all the way out to the edge of the visible universe, to the end of time, and watch the world evaporate into nothingness.
       - Got the popcorn waiting already.
-      - This is the ultimate engineering challenge, but I'm convinced that it is possible.
-      - I just *have* to do this.
+      - This is the ultimate engineering challenge, but I'm convinced that it is possible, and I just *have* to do this.
+      - And when I work on it, the whole universe turns silent.
+      - There is just me, my tools, and the metal.
+      - It's bliss.
       - Fascinating.:
         - Thanks for listening. I appreciate it.
+        - Usually nobody cares.
         - goto: projects
       - Wow, you're edgy.:
         - And you're a rounding error.
@@ -482,11 +486,9 @@
         - goto: EXIT
       - Yeah, sorry for the monologue. Anything else?
       - goto: projects
-    - There was something else I wanted...:
+    - Good luck with that!:
+      - Thanks!
       - goto: mainnode
-    - Bye.:
-      - So long, drifter!
-      - goto: EXIT
     - goto: timeout
   - Good luck with that!:
     - Thanks!
@@ -498,14 +500,15 @@
   - if ~$thinking:
     - Well, uh...
     - set: thinking
-    - Don't take it personally, but...
-    - I don't really like people.
-  - Don't get me wrong, I'm happy to help you.
+    - How should I put this? Don't take it personally, but...
+    - I really don't like people.
+  - I'm happy to help you, don't get me wrong.
+  - But... not really because I care about you.
   - I enjoy the challenge of fixing, mending, creating.
-  - People in general, though, ravage and exploit.
+  - Humans in general, though, ravage and exploit.
   - It's in their nature, and I can't stand it.
-  - I just want to get away from all this insanity...
-  - Just want to tinker without anyone bothering me.
+  - I just want to get away. From all this insanity, triviality,...
+  - Just want to pursue my projects without anyone standing in my way.
   - goto: mainnode
 - if: "$timetravel"
   Do you think time travel into the past is possible?:
@@ -569,7 +572,7 @@
   - We have talked before. You told me to die, come back to you with a chef hat, and say that sentence.:
     - Hah, so the plan worked out! YES!
     - Let me apologize though. I must have been rude before you showed me proof for your story.
-    - There are just so many bullshitters in the world and I don't have the patience anymore.
+    - There are just so many bullshiters in the world and I don't have the patience anymore.
     - But I believe you now.
     - If there is *anything* I can do for you, let me know. This is amazing!
     - goto: mainnode

src/game.rs

@@ -218,7 +218,6 @@ pub fn handle_game_event(
                 }
             }
             GameEvent::SetMenu(turn) => {
-                ew_sfx.send(audio::PlaySfxEvent(audio::Sfx::Click));
                 settings.menu_active = turn.to_bool(settings.menu_active);
                 for mut window in &mut q_window {
                     window.cursor.grab_mode = if settings.menu_active {

src/hud.rs

@@ -1080,6 +1080,7 @@ fn handle_input(
 
 fn handle_target_event(
     mut commands: Commands,
+    settings: Res<Settings>,
     mut er_target: EventReader<TargetEvent>,
     mut ew_sfx: EventWriter<audio::PlaySfxEvent>,
     mut ew_achievement: EventWriter<game::AchievementEvent>,
@@ -1104,8 +1105,8 @@ fn handle_target_event(
                 }
             }
         }
-        if play_sfx {
-            ew_sfx.send(audio::PlaySfxEvent(audio::Sfx::Click3));
+        if play_sfx && !settings.mute_sfx {
+            ew_sfx.send(audio::PlaySfxEvent(audio::Sfx::Click));
         }
         break; // Only accept a single event per frame
     }

src/menu.rs

@@ -543,7 +543,7 @@ pub fn handle_input(
         } else {
             menustate.cursor.saturating_sub(1)
         };
-        ew_sfx.send(audio::PlaySfxEvent(audio::Sfx::Click3));
+        ew_sfx.send(audio::PlaySfxEvent(audio::Sfx::Click));
         ew_updatemenu.send(UpdateMenuEvent);
     }
     if keyboard_input.just_pressed(settings.key_back)
@@ -555,7 +555,7 @@ pub fn handle_input(
         } else {
             menustate.cursor.saturating_add(1)
         };
-        ew_sfx.send(audio::PlaySfxEvent(audio::Sfx::Click3));
+        ew_sfx.send(audio::PlaySfxEvent(audio::Sfx::Click));
         ew_updatemenu.send(UpdateMenuEvent);
     }
     if keyboard_input.just_pressed(settings.key_interact)