Compare commits

..

2 commits

4 changed files with 4 additions and 15 deletions

View file

@ -44,7 +44,6 @@
- JupiterRecording.ogg is an [actual Jupiter recording by NASA](https://archive.org/download/voyager-1-and-2-1990-jupiter-nasa-voyager-space-sounds-electronic), public domain. - JupiterRecording.ogg is an [actual Jupiter recording by NASA](https://archive.org/download/voyager-1-and-2-1990-jupiter-nasa-voyager-space-sounds-electronic), public domain.
- Processed by cutting out min 1:47-3:47 and applying a 10s linear crossfade at the end. Exported as ogg with quality=3, see [.kdenlive file](src/audio/JupiterRecording.kdenlive). - Processed by cutting out min 1:47-3:47 and applying a 10s linear crossfade at the end. Exported as ogg with quality=3, see [.kdenlive file](src/audio/JupiterRecording.kdenlive).
- The source file has been taken down, and generally, I can't find information on how exactly this was produced. Hoping it's not a hoax. - The source file has been taken down, and generally, I can't find information on how exactly this was produced. Hoping it's not a hoax.
- [Cinematic Cello](https://pixabay.com/music/build-up-scenes-cinematic-cello-115667) by [Aleksey Chistilin](https://pixabay.com/users/lexin_music-28841948/), [Pixabay Content License](https://pixabay.com/service/license-summary)
- Star chart based on the [HYG Stellar database](https://github.com/astronexus/HYG-Database) - Star chart based on the [HYG Stellar database](https://github.com/astronexus/HYG-Database)
- Font Yupiter-Regular.ttf is placed under the SIL OPEN FONT LICENSE Version 1.1 and is based on: - Font Yupiter-Regular.ttf is placed under the SIL OPEN FONT LICENSE Version 1.1 and is based on:
- Noto Sans Symbols 2, Copyright 2022 The Noto Project Authors (https://github.com/notofonts/symbols) - Noto Sans Symbols 2, Copyright 2022 The Noto Project Authors (https://github.com/notofonts/symbols)

View file

@ -47,11 +47,6 @@ impl Plugin for AudioPlugin {
pub struct ZoomTimer(Timer); pub struct ZoomTimer(Timer);
const PATHS: &[(SfxType, Sfx, &str)] = &[ const PATHS: &[(SfxType, Sfx, &str)] = &[
(
SfxType::Radio,
Sfx::BGM,
"music/Aleksey Chistilin - Cinematic Cello.ogg",
),
( (
SfxType::Radio, SfxType::Radio,
Sfx::BGMActualJupiterRecording, Sfx::BGMActualJupiterRecording,
@ -86,7 +81,6 @@ const PATHS: &[(SfxType, Sfx, &str)] = &[
#[derive(Component, PartialEq, Hash, Eq, Copy, Clone)] #[derive(Component, PartialEq, Hash, Eq, Copy, Clone)]
pub enum Sfx { pub enum Sfx {
Achieve, Achieve,
BGM,
BGMActualJupiterRecording, BGMActualJupiterRecording,
Click, Click,
Connect, Connect,

View file

@ -174,15 +174,13 @@ impl Default for Settings {
noise_cancellation_mode: 0, noise_cancellation_mode: 0,
noise_cancellation_modes: vec![ noise_cancellation_modes: vec![
"Off".to_string(), "Off".to_string(),
"Ambience".to_string(), "On".to_string(),
"Mechanical".to_string(),
"Max".to_string(),
], ],
radio_mode: 1, radio_mode: 1,
radio_modes: vec![ radio_modes: vec![
// see also: settings.is_radio_playing() // see also: settings.is_radio_playing()
"Off".to_string(), "Off".to_string(),
"Cinematic Frequency".to_string(), "Amplify outside recordings".to_string(),
], ],
volume_sfx: 100, volume_sfx: 100,
volume_music: 100, volume_music: 100,
@ -336,10 +334,8 @@ impl Settings {
pub fn is_radio_playing(&self, sfx: audio::Sfx) -> Option<bool> { pub fn is_radio_playing(&self, sfx: audio::Sfx) -> Option<bool> {
let radio = self.radio_mode; let radio = self.radio_mode;
let ambience = self.noise_cancellation_mode != 1 && self.noise_cancellation_mode != 3;
match sfx { match sfx {
audio::Sfx::BGM => Some(radio == 1), audio::Sfx::BGMActualJupiterRecording => Some(radio == 1),
audio::Sfx::BGMActualJupiterRecording => Some(radio == 0 && ambience),
_ => None, _ => None,
} }
} }
@ -352,7 +348,7 @@ impl Settings {
value value
}; };
self.noise_cancellation_mode = value; self.noise_cancellation_mode = value;
self.mute_sfx = value >= 2; self.mute_sfx = value >= 1;
} }
} }