diff --git a/LICENSE.md b/LICENSE.md index 772d342..3f83913 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -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. - 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. - - [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) - 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) diff --git a/assets/music/Aleksey Chistilin - Cinematic Cello.ogg b/assets/music/Aleksey Chistilin - Cinematic Cello.ogg deleted file mode 100644 index 9f790d1..0000000 Binary files a/assets/music/Aleksey Chistilin - Cinematic Cello.ogg and /dev/null differ diff --git a/src/audio.rs b/src/audio.rs index 3e48824..234aabb 100644 --- a/src/audio.rs +++ b/src/audio.rs @@ -47,11 +47,6 @@ impl Plugin for AudioPlugin { pub struct ZoomTimer(Timer); const PATHS: &[(SfxType, Sfx, &str)] = &[ - ( - SfxType::Radio, - Sfx::BGM, - "music/Aleksey Chistilin - Cinematic Cello.ogg", - ), ( SfxType::Radio, Sfx::BGMActualJupiterRecording, @@ -86,7 +81,6 @@ const PATHS: &[(SfxType, Sfx, &str)] = &[ #[derive(Component, PartialEq, Hash, Eq, Copy, Clone)] pub enum Sfx { Achieve, - BGM, BGMActualJupiterRecording, Click, Connect, diff --git a/src/var.rs b/src/var.rs index 0cd7cd2..349a8af 100644 --- a/src/var.rs +++ b/src/var.rs @@ -180,7 +180,6 @@ impl Default for Settings { radio_modes: vec![ // see also: settings.is_radio_playing() "Off".to_string(), - "Cinematic Frequency".to_string(), "Amplify outside recordings".to_string(), ], volume_sfx: 100, @@ -336,8 +335,7 @@ impl Settings { pub fn is_radio_playing(&self, sfx: audio::Sfx) -> Option { let radio = self.radio_mode; match sfx { - audio::Sfx::BGM => Some(radio == 1), - audio::Sfx::BGMActualJupiterRecording => Some(radio == 2), + audio::Sfx::BGMActualJupiterRecording => Some(radio == 1), _ => None, } }