Compare commits
2 commits
9769658bfd
...
69972f9f8e
Author | SHA1 | Date | |
---|---|---|---|
yuni | 69972f9f8e | ||
yuni | d358718081 |
|
@ -41,6 +41,7 @@
|
||||||
- zoom.ogg: Recorded a screw thread scraping against a saxophone ligature
|
- zoom.ogg: Recorded a screw thread scraping against a saxophone ligature
|
||||||
- Other sounds:
|
- Other sounds:
|
||||||
- achieve.ogg: UI Completed Status Alert Notification SFX001.wav [by Headphaze, CC BY 4.0](https://freesound.org/s/277033/)
|
- achieve.ogg: UI Completed Status Alert Notification SFX001.wav [by Headphaze, CC BY 4.0](https://freesound.org/s/277033/)
|
||||||
|
- Takeoff.ogg: [By Serat, CC BY 4.0](https://freemusicarchive.org/music/serat/route-remastered/takeoff-remastered/)
|
||||||
- JupiterRecording.ogg: 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: 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.
|
||||||
|
|
BIN
assets/music/Takeoff.ogg
Normal file
BIN
assets/music/Takeoff.ogg
Normal file
Binary file not shown.
|
@ -47,6 +47,11 @@ 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::BGMTakeoff,
|
||||||
|
"music/Takeoff.ogg",
|
||||||
|
),
|
||||||
(
|
(
|
||||||
SfxType::Radio,
|
SfxType::Radio,
|
||||||
Sfx::BGMActualJupiterRecording,
|
Sfx::BGMActualJupiterRecording,
|
||||||
|
@ -82,6 +87,7 @@ const PATHS: &[(SfxType, Sfx, &str)] = &[
|
||||||
pub enum Sfx {
|
pub enum Sfx {
|
||||||
Achieve,
|
Achieve,
|
||||||
BGMActualJupiterRecording,
|
BGMActualJupiterRecording,
|
||||||
|
BGMTakeoff,
|
||||||
Click,
|
Click,
|
||||||
Connect,
|
Connect,
|
||||||
Crash,
|
Crash,
|
||||||
|
|
|
@ -981,6 +981,7 @@ fn update_hud(
|
||||||
.iter()
|
.iter()
|
||||||
.filter(|msg: &&Message| match msg.level {
|
.filter(|msg: &&Message| match msg.level {
|
||||||
LogLevel::Chat => true,
|
LogLevel::Chat => true,
|
||||||
|
LogLevel::Info => true,
|
||||||
_ => false,
|
_ => false,
|
||||||
})
|
})
|
||||||
.rev()
|
.rev()
|
||||||
|
|
|
@ -335,7 +335,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;
|
||||||
match sfx {
|
match sfx {
|
||||||
audio::Sfx::BGMActualJupiterRecording => Some(radio == 1),
|
audio::Sfx::BGMTakeoff => Some(radio == 1),
|
||||||
|
audio::Sfx::BGMActualJupiterRecording => Some(radio == 2),
|
||||||
_ => None,
|
_ => None,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue