funman300/Ferrous-Solitaire
1
1
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 28 Wiki Activity

feat(engine): HUD shows Time Attack countdown instead of game elapsed time

Browse Source 
During Time Attack sessions the time display updates every frame with the
remaining countdown (from TimeAttackResource) rather than the per-second
game clock tick, giving the player a live countdown. Non-Time-Attack mode
is unchanged — the clock still updates once per second via game state change.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
root
2026-04-27 02:08:30 +00:00
parent 07bf1977bd
commit c6a596299e
1 changed files with 38 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
solitaire_engine/src/hud_plugin.rs
+38 -23
View File
@@ -10,6 +10,7 @@ use solitaire_core::game_state::GameMode;
use crate::game_plugin::GameMutation; use crate::game_plugin::GameMutation;
use crate::resources::GameStateResource; use crate::resources::GameStateResource;
use crate::time_attack_plugin::TimeAttackResource;
/// Marker on the score text node. /// Marker on the score text node.
#[derive(Component, Debug)] #[derive(Component, Debug)]
@@ -71,36 +72,50 @@ fn spawn_hud(mut commands: Commands) {
#[allow(clippy::type_complexity)] #[allow(clippy::type_complexity)]
fn update_hud( fn update_hud(
game: Res<GameStateResource>, game: Res<GameStateResource>,
time_attack: Option<Res<TimeAttackResource>>,
mut score_q: Query<&mut Text, (With<HudScore>, Without<HudMoves>, Without<HudTime>, Without<HudMode>)>, mut score_q: Query<&mut Text, (With<HudScore>, Without<HudMoves>, Without<HudTime>, Without<HudMode>)>,
mut moves_q: Query<&mut Text, (With<HudMoves>, Without<HudScore>, Without<HudTime>, Without<HudMode>)>, mut moves_q: Query<&mut Text, (With<HudMoves>, Without<HudScore>, Without<HudTime>, Without<HudMode>)>,
mut time_q: Query<&mut Text, (With<HudTime>, Without<HudScore>, Without<HudMoves>, Without<HudMode>)>, mut time_q: Query<&mut Text, (With<HudTime>, Without<HudScore>, Without<HudMoves>, Without<HudMode>)>,
mut mode_q: Query<&mut Text, (With<HudMode>, Without<HudScore>, Without<HudMoves>, Without<HudTime>)>, mut mode_q: Query<&mut Text, (With<HudMode>, Without<HudScore>, Without<HudMoves>, Without<HudTime>)>,
) { ) {
if !game.is_changed() { let ta_active = time_attack.as_ref().is_some_and(|ta| ta.active);
return;
// Score, moves, and mode only need updating when the game state changes.
if game.is_changed() {
let g = &game.0;
if let Ok(mut t) = score_q.get_single_mut() {
**t = format!("Score: {}", g.score);
}
if let Ok(mut t) = moves_q.get_single_mut() {
**t = format!("Moves: {}", g.move_count);
}
if let Ok(mut t) = mode_q.get_single_mut() {
**t = match g.mode {
GameMode::Classic => String::new(),
GameMode::Zen => "ZEN".to_string(),
GameMode::Challenge => "CHALLENGE".to_string(),
GameMode::TimeAttack => "TIME ATTACK".to_string(),
};
}
} }
let g = &game.0; // Time display: show Time Attack countdown every frame when active;
// otherwise show game elapsed time (updates once per second via game.is_changed()).
if let Ok(mut t) = score_q.get_single_mut() { let update_time = ta_active || game.is_changed();
**t = format!("Score: {}", g.score); if update_time {
} if let Ok(mut t) = time_q.get_single_mut() {
if let Ok(mut t) = moves_q.get_single_mut() { if let Some(ta) = time_attack.as_ref().filter(|ta| ta.active) {
**t = format!("Moves: {}", g.move_count); let remaining = ta.remaining_secs.max(0.0) as u64;
} let m = remaining / 60;
if let Ok(mut t) = time_q.get_single_mut() { let s = remaining % 60;
let secs = g.elapsed_seconds; **t = format!("{m}:{s:02}");
let m = secs / 60; } else {
let s = secs % 60; let secs = game.0.elapsed_seconds;
**t = format!("{m}:{s:02}"); let m = secs / 60;
} let s = secs % 60;
if let Ok(mut t) = mode_q.get_single_mut() { **t = format!("{m}:{s:02}");
**t = match g.mode { }
GameMode::Classic => String::new(), }
GameMode::Zen => "ZEN".to_string(),
GameMode::Challenge => "CHALLENGE".to_string(),
GameMode::TimeAttack => "TIME ATTACK".to_string(),
};
} }
} }