Skip to content

Add hover over satellite explanation to tutorial #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wannerdev wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add hover over satellite explanation to tutorial #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions src/hud/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ use crate::collision::FatalCollisionEvent;
use crate::launching::{LaunchState, SatellitePriceFactor};
use crate::score::Score;
use crate::screens::{gameover, Screen};
use crate::sun_system::{SolarSystemAssets, Sun};
use crate::sun_system::{SolarSystemAssets, Sun, Satellite};
use crate::sun_system::asteroids::AsteroidSwarmSpawned;
use crate::sun_system::navigation_instruments::NavigationInstruments;

// Generated at compile-time by build.rs
include!(concat!(env!("OUT_DIR"), "/build_info.rs"));
Expand Down Expand Up @@ -39,6 +40,7 @@ impl Plugin for HudPlugin {
already_pressed_space: false,
already_pressed_lmb: false,
is_mobile: false,
already_hovered_satellite: false,
});
}
}
Expand Down Expand Up @@ -74,6 +76,7 @@ struct HudState {
already_pressed_space: bool,
already_pressed_lmb: bool,
is_mobile: bool,
already_hovered_satellite: bool,
}

#[derive(Component)]
Expand Down Expand Up @@ -593,6 +596,7 @@ fn update_explanation_text(
mut explanation_text_query: Query<&mut Text, With<ExplanationText>>,
mut explanation_container_query: Query<&mut Visibility, With<ExplanationContainer>>,
mut hud_state: ResMut<HudState>,
satellite_query: Query<(), (With<Satellite>, With<NavigationInstruments>)>,
) {
let mut explanation_text = explanation_text_query.single_mut().unwrap();
let mut container_visibility = explanation_container_query.single_mut().unwrap();
Expand All @@ -602,6 +606,9 @@ fn update_explanation_text(
for _ in er_touch.read() { saw_touch = true; break; }
if saw_touch { hud_state.is_mobile = true; }

// Check if any satellite is currently selected (has NavigationInstruments)
let satellite_selected = !satellite_query.is_empty();

if hud_state.is_mobile {
// Mobile placeholder explanations
if !hud_state.already_pressed_space {
Expand All @@ -620,10 +627,16 @@ fn update_explanation_text(
}
return;
}else {
// Desktop (mouse/keyboard) behavior stays unchanged
// Desktop (mouse/keyboard) behavior with hover tutorial
if !hud_state.already_pressed_space {
if mouse_input.pressed(MouseButton::Left) {
hud_state.already_pressed_space = true;
explanation_text.0 = "HOVER OVER SATELLITE TO VIEW ORBIT".to_string();
}
} else if !hud_state.already_hovered_satellite {
// Check if user has hovered over a satellite
if satellite_selected {
hud_state.already_hovered_satellite = true;
explanation_text.0 = "PRESS SPACE TO SLOW DOWN".to_string();
}
} else if !hud_state.already_pressed_lmb {
Expand Down Expand Up @@ -718,4 +731,4 @@ fn handle_music_button(
}
}
}
}
}