Improve first and last round

manuelmauro · Apr 4, 2024 · c02d7c7 · c02d7c7
1 parent b26a84e
commit c02d7c7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/game/mod.rs b/src/game/mod.rs
@@ -40,10 +40,13 @@ impl Plugin for GamePlugin {
             .add_plugins(InputPlugin)
             .add_plugins(GameButtonPlugin)
             .add_systems(OnEnter(AppState::Game), setup)
+            .add_systems(
+                PreUpdate,
+                end_of_game_system.run_if(in_state(AppState::Game)),
+            )
             .add_systems(
                 Update,
-                (timer_system, end_of_round_system, end_of_game_system)
-                    .run_if(in_state(AppState::Game)),
+                (timer_system, end_of_round_system).run_if(in_state(AppState::Game)),
             )
             .add_systems(OnExit(AppState::Game), despawn_screen::<OnGameScreen>);
     }
@@ -143,7 +146,9 @@ fn setup(
 
     // start with a cue
     let mut timer = CueTimer::with_duration(settings.round_time);
-    timer.tick(Duration::from_secs_f32(settings.round_time - 0.1));
+    timer.tick(Duration::from_millis(
+        ((settings.round_time * 1000.0) as u64) - 1,
+    ));
 
     // game
     commands.spawn((

diff --git a/src/game/tile/color.rs b/src/game/tile/color.rs
@@ -37,7 +37,7 @@ impl From<&TileColor> for Color {
             TileColor::C => config::TILE_COLOR_C,
             TileColor::D => config::TILE_COLOR_D,
             TileColor::E => config::TILE_COLOR_E,
-            TileColor::None => Color::rgb(0.0, 0.0, 0.0),
+            TileColor::None => config::TILE_COLOR_C,
         }
     }
 }