hut/outfly
hut/outfly
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fix thruster boost in god mode

Browse source
This commit is contained in:
yuni 2024-11-29 18:16:16 +01:00
parent d9306b57d6
commit c7fb4eef3f
1 changed files with 43 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
src/actor.rs
View file

@ -339,49 +339,57 @@ pub fn update_power(
let d = time.delta_seconds(); let d = time.delta_seconds();
let inside_vehicle = !q_bike.is_empty(); let inside_vehicle = !q_bike.is_empty();
for (mut battery, mut engine) in &mut q_battery { for (mut battery, mut engine) in &mut q_battery {
if !inside_vehicle && !settings.god_mode { if !inside_vehicle {
if settings.flashlight_active {
battery.power -= POWER_DRAIN_FLASHLIGHT[prefs.flashlight_power] * d; // 2.4MW
if battery.power <= 0.0 {
power_down = true;
settings.flashlight_active = false;
for mut flashlight_vis in &mut q_flashlight {
*flashlight_vis = Visibility::Hidden;
}
}
}
if settings.hud_active {
let mut hud_drain = POWER_DRAIN_AR;
hud_drain += POWER_DRAIN_LIGHTAMP[prefs.light_amp];
battery.power -= hud_drain * d;
if battery.power <= 0.0 {
power_down = true;
ew_game.send(GameEvent::SetAR(Turn::Off));
for mut flashlight_vis in &mut q_flashlight {
*flashlight_vis = Visibility::Hidden;
}
}
}
let drain = POWER_DRAIN_THRUSTER[prefs.thruster_boost];
let boosting = !battery.overloaded_recovering let boosting = !battery.overloaded_recovering
&& prefs.thruster_boost != 2 && prefs.thruster_boost != 2
&& (prefs.thruster_boost == 1 || engine.currently_matching_velocity); && (prefs.thruster_boost == 1 || engine.currently_matching_velocity);
if boosting { if settings.god_mode {
if battery.power > drain * d * 100.0 { if boosting {
engine.current_boost_factor = THRUSTER_BOOST_FACTOR[prefs.thruster_boost]; engine.current_boost_factor = THRUSTER_BOOST_FACTOR[prefs.thruster_boost];
if engine.currently_firing {
battery.power -= drain * d;
}
} else { } else {
power_down = true;
battery.overloaded_recovering = true;
engine.current_boost_factor = 1.0; engine.current_boost_factor = 1.0;
} }
} else { } else {
engine.current_boost_factor = 1.0; if settings.flashlight_active {
} battery.power -= POWER_DRAIN_FLASHLIGHT[prefs.flashlight_power] * d; // 2.4MW
if power_down { if battery.power <= 0.0 {
ew_sfx.send(audio::PlaySfxEvent(audio::Sfx::PowerDown)); power_down = true;
settings.flashlight_active = false;
for mut flashlight_vis in &mut q_flashlight {
*flashlight_vis = Visibility::Hidden;
}
}
}
if settings.hud_active {
let mut hud_drain = POWER_DRAIN_AR;
hud_drain += POWER_DRAIN_LIGHTAMP[prefs.light_amp];
battery.power -= hud_drain * d;
if battery.power <= 0.0 {
power_down = true;
ew_game.send(GameEvent::SetAR(Turn::Off));
for mut flashlight_vis in &mut q_flashlight {
*flashlight_vis = Visibility::Hidden;
}
}
}
let drain = POWER_DRAIN_THRUSTER[prefs.thruster_boost];
if boosting {
if battery.power > drain * d * 100.0 {
engine.current_boost_factor = THRUSTER_BOOST_FACTOR[prefs.thruster_boost];
if engine.currently_firing {
battery.power -= drain * d;
}
} else {
power_down = true;
battery.overloaded_recovering = true;
engine.current_boost_factor = 1.0;
}
} else {
engine.current_boost_factor = 1.0;
}
if power_down {
ew_sfx.send(audio::PlaySfxEvent(audio::Sfx::PowerDown));
}
} }
} }
let reactor = POWER_GAIN_REACTOR[settings.reactor_state]; let reactor = POWER_GAIN_REACTOR[settings.reactor_state];