diff --git a/LICENSE.md b/LICENSE.md index a5fa6c2..3227451 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -33,7 +33,6 @@ - https://pixabay.com/sound-effects/click-button-140881 - https://pixabay.com/sound-effects/data-transmission-sound-from-14664-72309 - https://pixabay.com/sound-effects/thrusters-loopwav-14699 - - https://pixabay.com/sound-effects/rocket-loop-99748 - https://pixabay.com/sound-effects/350cc-bike-firing-32391 - https://pixabay.com/sound-effects/electricity-6353 - https://pixabay.com/sound-effects/ducati-696-monster-33217 diff --git a/assets/sounds/rocket.ogg b/assets/sounds/rocket.ogg deleted file mode 100644 index 2e9a860..0000000 Binary files a/assets/sounds/rocket.ogg and /dev/null differ diff --git a/src/actor.rs b/src/actor.rs index e198fdc..79b2f10 100644 --- a/src/actor.rs +++ b/src/actor.rs @@ -198,7 +198,6 @@ impl Default for Vehicle { #[derive(Copy, Clone, PartialEq)] pub enum EngineType { Monopropellant, - Rocket, Ion, } diff --git a/src/audio.rs b/src/audio.rs index 2a6c11e..cb7ed38 100644 --- a/src/audio.rs +++ b/src/audio.rs @@ -63,7 +63,6 @@ const PATHS: &[(SfxType, Sfx, &str)] = &[ "sounds/electricmotor.ogg", ), (SfxType::LoopSfx, Sfx::Ion, "sounds/ion.ogg"), - (SfxType::LoopSfx, Sfx::Rocket, "sounds/rocket.ogg"), (SfxType::LoopSfx, Sfx::Thruster, "sounds/thruster.ogg"), (SfxType::LoopSfx, Sfx::Gasp, "sounds/gasp.ogg"), (SfxType::OneOff, Sfx::GaspRelief, "sounds/gasprelief.ogg"), @@ -107,7 +106,6 @@ pub enum Sfx { IncomingChatMessage, Ion, Ping, - Rocket, Switch, Thruster, WakeUp, diff --git a/src/camera.rs b/src/camera.rs index 69d37d4..4aecdaa 100644 --- a/src/camera.rs +++ b/src/camera.rs @@ -662,11 +662,6 @@ pub fn apply_input_to_player( actor::EngineType::Monopropellant, sinks.get(&audio::Sfx::Thruster), ), - ( - 1.0, - actor::EngineType::Rocket, - sinks.get(&audio::Sfx::Rocket), - ), (1.4, actor::EngineType::Ion, sinks.get(&audio::Sfx::Ion)), ]; let seconds_to_max_vol = 0.05; diff --git a/src/cmd.rs b/src/cmd.rs index 5b23684..6482f64 100644 --- a/src/cmd.rs +++ b/src/cmd.rs @@ -557,9 +557,6 @@ pub fn load_defs(mut ew_spawn: EventWriter) { state.warmup_seconds = warmup_time_float; } } - ["engine", "rocket"] => { - state.engine_type = actor::EngineType::Rocket; - } ["engine", "ion"] => { state.engine_type = actor::EngineType::Ion; }