From 472a238a1cbb1a63ef40858cb3bc7fb047c32be2 Mon Sep 17 00:00:00 2001
From: Kristofers Solo <dev@kristofers.xyz>
Date: Thu, 16 Jan 2025 21:48:56 +0200
Subject: [PATCH 1/4] chore: update hexlab version

---
 Cargo.lock             | 58 ++++++++++++++++++++++++++++++++++++------
 Cargo.toml             |  2 +-
 justfile               |  2 +-
 src/maze/components.rs |  8 ------
 4 files changed, 52 insertions(+), 18 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a820783..42968c9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1409,7 +1409,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "regex",
- "rustc-hash",
+ "rustc-hash 1.1.0",
  "shlex",
  "syn",
 ]
@@ -1813,7 +1813,7 @@ dependencies = [
  "log",
  "rangemap",
  "rayon",
- "rustc-hash",
+ "rustc-hash 1.1.0",
  "rustybuzz",
  "self_cell",
  "swash",
@@ -1925,6 +1925,18 @@ version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
 
+[[package]]
+name = "deprecate-until"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a3767f826efbbe5a5ae093920b58b43b01734202be697e1354914e862e8e704"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "semver",
+ "syn",
+]
+
 [[package]]
 name = "derive_more"
 version = "1.0.0"
@@ -2644,15 +2656,16 @@ checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df"
 
 [[package]]
 name = "hexlab"
-version = "0.5.3"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d2fbc6c41965686841aa5ea0e1af448730d0902274e49251c7d1fb7c78fffb9"
+checksum = "e247b21d6885136e4a910e1e6fac755d8dc56112c40ebf1062582f0644d62c62"
 dependencies = [
  "bevy",
  "bevy_reflect",
  "bevy_utils",
  "glam",
  "hexx",
+ "pathfinding",
  "rand",
  "thiserror 2.0.6",
 ]
@@ -2894,6 +2907,15 @@ dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "integer-sqrt"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "276ec31bcb4a9ee45f58bec6f9ec700ae4cf4f4f8f2fa7e06cb406bd5ffdd770"
+dependencies = [
+ "num-traits",
+]
+
 [[package]]
 name = "io-kit-sys"
 version = "0.4.1"
@@ -3228,7 +3250,7 @@ dependencies = [
  "indexmap",
  "log",
  "pp-rs",
- "rustc-hash",
+ "rustc-hash 1.1.0",
  "spirv",
  "termcolor",
  "thiserror 1.0.69",
@@ -3249,7 +3271,7 @@ dependencies = [
  "once_cell",
  "regex",
  "regex-syntax 0.8.5",
- "rustc-hash",
+ "rustc-hash 1.1.0",
  "thiserror 1.0.69",
  "tracing",
  "unicode-ident",
@@ -3763,6 +3785,20 @@ version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 
+[[package]]
+name = "pathfinding"
+version = "4.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "301ad6aa19104eeb9af172b3d6a4ab8a5ea26234890baf2fcb1cbbc3f05f674b"
+dependencies = [
+ "deprecate-until",
+ "indexmap",
+ "integer-sqrt",
+ "num-traits",
+ "rustc-hash 2.1.0",
+ "thiserror 2.0.6",
+]
+
 [[package]]
 name = "percent-encoding"
 version = "2.3.1"
@@ -4184,6 +4220,12 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
+[[package]]
+name = "rustc-hash"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497"
+
 [[package]]
 name = "rustc_version"
 version = "0.4.1"
@@ -5224,7 +5266,7 @@ dependencies = [
  "parking_lot",
  "profiling",
  "raw-window-handle",
- "rustc-hash",
+ "rustc-hash 1.1.0",
  "smallvec",
  "thiserror 1.0.69",
  "wgpu-hal",
@@ -5266,7 +5308,7 @@ dependencies = [
  "range-alloc",
  "raw-window-handle",
  "renderdoc-sys",
- "rustc-hash",
+ "rustc-hash 1.1.0",
  "smallvec",
  "thiserror 1.0.69",
  "wasm-bindgen",
diff --git a/Cargo.toml b/Cargo.toml
index fecb335..234db65 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -18,7 +18,7 @@ tracing = { version = "0.1", features = [
   "release_max_level_warn",
 ] }
 hexx = { version = "0.19", features = ["bevy_reflect", "grid"] }
-hexlab = { version = "0.5", features = ["bevy"] }
+hexlab = { version = "0.6", features = ["bevy", "pathfinding"] }
 bevy-inspector-egui = { version = "0.28", optional = true }
 bevy_egui = { version = "0.31", optional = true }
 thiserror = "2.0"
diff --git a/justfile b/justfile
index eea0280..49c0731 100644
--- a/justfile
+++ b/justfile
@@ -8,7 +8,7 @@ native-dev:
 
 # Run native release
 native-release:
-   RUSTC_WRAPPER=sccache cargo run --release --no-default-features
+    RUSTC_WRAPPER=sccache cargo run --release --no-default-features
 
 # Run web dev
 web-dev:
diff --git a/src/maze/components.rs b/src/maze/components.rs
index 48cd62b..349bd62 100644
--- a/src/maze/components.rs
+++ b/src/maze/components.rs
@@ -95,14 +95,6 @@ impl MazeConfig {
     }
 }
 
-// TO
-// 3928551514041614914
-// (4, 0)
-
-// FROM
-// 7365371276044996661
-// ()
-
 impl Default for MazeConfig {
     fn default() -> Self {
         Self::new(

From d2dd57bcff6a0e911ba5f8892139211eb8d15ba6 Mon Sep 17 00:00:00 2001
From: Kristofers Solo <dev@kristofers.xyz>
Date: Thu, 16 Jan 2025 23:26:37 +0200
Subject: [PATCH 2/4] feat: add game stats

---
 src/constants.rs           |  3 +++
 src/hint/mod.rs            |  4 +++-
 src/lib.rs                 |  2 ++
 src/screens/gameplay.rs    |  8 +++++---
 src/stats/components.rs    |  9 +++++++++
 src/stats/mod.rs           | 20 +++++++++++++++++++
 src/stats/resources.rs     | 21 ++++++++++++++++++++
 src/stats/stats.rs         | 22 +++++++++++++++++++++
 src/stats/systems/mod.rs   | 16 ++++++++++++++++
 src/stats/systems/score.rs | 39 ++++++++++++++++++++++++++++++++++++++
 src/stats/systems/setup.rs | 17 +++++++++++++++++
 src/theme/mod.rs           |  2 +-
 src/theme/widgets.rs       | 16 ++++++++++++++++
 13 files changed, 174 insertions(+), 5 deletions(-)
 create mode 100644 src/stats/components.rs
 create mode 100644 src/stats/mod.rs
 create mode 100644 src/stats/resources.rs
 create mode 100644 src/stats/stats.rs
 create mode 100644 src/stats/systems/mod.rs
 create mode 100644 src/stats/systems/score.rs
 create mode 100644 src/stats/systems/setup.rs

diff --git a/src/constants.rs b/src/constants.rs
index c79e214..a31d151 100644
--- a/src/constants.rs
+++ b/src/constants.rs
@@ -3,3 +3,6 @@ pub const WALL_OVERLAP_MODIFIER: f32 = 1.25;
 pub const FLOOR_Y_OFFSET: u8 = 200;
 pub const MOVEMENT_COOLDOWN: f32 = 1.0; // one second cooldown
 pub const TITLE: &str = "Maze Ascension: The Labyrinth of Echoes";
+
+pub const FLOOR_SCORE_MULTIPLIER: f32 = 100.;
+pub const TIME_SCORE_MULTIPLIER: f32 = 10.0;
diff --git a/src/hint/mod.rs b/src/hint/mod.rs
index 371febd..08ea313 100644
--- a/src/hint/mod.rs
+++ b/src/hint/mod.rs
@@ -3,9 +3,11 @@ pub mod components;
 mod systems;
 
 use bevy::{ecs::system::RunSystemOnce, prelude::*};
+use components::IdleTimer;
 
 pub(super) fn plugin(app: &mut App) {
-    app.add_plugins(systems::plugin);
+    app.register_type::<IdleTimer>()
+        .add_plugins(systems::plugin);
 }
 
 pub fn spawn_hint_command(world: &mut World) {
diff --git a/src/lib.rs b/src/lib.rs
index 10921fe..e634cde 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -8,6 +8,7 @@ pub mod hint;
 pub mod maze;
 pub mod player;
 pub mod screens;
+pub mod stats;
 pub mod theme;
 
 use bevy::{
@@ -69,6 +70,7 @@ impl Plugin for AppPlugin {
             floor::plugin,
             player::plugin,
             hint::plugin,
+            stats::plugin,
         ));
 
         // Enable dev tools for dev builds.
diff --git a/src/screens/gameplay.rs b/src/screens/gameplay.rs
index 7374933..b41de50 100644
--- a/src/screens/gameplay.rs
+++ b/src/screens/gameplay.rs
@@ -1,8 +1,9 @@
 //! The screen state for the main gameplay.
 
-use crate::player::spawn_player_command;
-use crate::screens::Screen;
-use crate::{hint::spawn_hint_command, maze::spawn_level_command};
+use crate::{
+    hint::spawn_hint_command, maze::spawn_level_command, player::spawn_player_command,
+    screens::Screen, stats::spawn_stats_command,
+};
 
 use bevy::{input::common_conditions::input_just_pressed, prelude::*};
 
@@ -13,6 +14,7 @@ pub(super) fn plugin(app: &mut App) {
             spawn_level_command,
             spawn_player_command,
             spawn_hint_command,
+            spawn_stats_command,
         )
             .chain(),
     );
diff --git a/src/stats/components.rs b/src/stats/components.rs
new file mode 100644
index 0000000..8aad2aa
--- /dev/null
+++ b/src/stats/components.rs
@@ -0,0 +1,9 @@
+use bevy::prelude::*;
+
+#[derive(Debug, Reflect, Component, Deref, DerefMut)]
+#[reflect(Component)]
+pub struct Score(pub usize);
+
+#[derive(Debug, Reflect, Component)]
+#[reflect(Component)]
+pub struct StatsText;
diff --git a/src/stats/mod.rs b/src/stats/mod.rs
new file mode 100644
index 0000000..76c2c8a
--- /dev/null
+++ b/src/stats/mod.rs
@@ -0,0 +1,20 @@
+pub mod components;
+pub mod resources;
+pub mod stats;
+mod systems;
+
+use bevy::{ecs::system::RunSystemOnce, prelude::*};
+use components::Score;
+use resources::{FloorTimer, GameTimer};
+
+pub(super) fn plugin(app: &mut App) {
+    app.register_type::<Score>()
+        .init_resource::<GameTimer>()
+        .init_resource::<FloorTimer>()
+        .insert_resource(FloorTimer(Timer::from_seconds(0.0, TimerMode::Once)))
+        .add_plugins(systems::plugin);
+}
+
+pub fn spawn_stats_command(world: &mut World) {
+    let _ = world.run_system_once(systems::setup::setup);
+}
diff --git a/src/stats/resources.rs b/src/stats/resources.rs
new file mode 100644
index 0000000..5c7123f
--- /dev/null
+++ b/src/stats/resources.rs
@@ -0,0 +1,21 @@
+use bevy::prelude::*;
+
+#[derive(Debug, Reflect, Resource, Deref, DerefMut)]
+#[reflect(Resource)]
+pub struct GameTimer(pub Timer);
+
+#[derive(Debug, Reflect, Resource, Deref, DerefMut)]
+#[reflect(Resource)]
+pub struct FloorTimer(pub Timer);
+
+impl Default for GameTimer {
+    fn default() -> Self {
+        Self(Timer::from_seconds(0.0, TimerMode::Once))
+    }
+}
+
+impl Default for FloorTimer {
+    fn default() -> Self {
+        Self(Timer::from_seconds(0.0, TimerMode::Once))
+    }
+}
diff --git a/src/stats/stats.rs b/src/stats/stats.rs
new file mode 100644
index 0000000..95289b1
--- /dev/null
+++ b/src/stats/stats.rs
@@ -0,0 +1,22 @@
+use bevy::prelude::*;
+
+pub trait StatsContainer {
+    fn ui_stats(&mut self) -> EntityCommands;
+}
+
+impl StatsContainer for Commands<'_, '_> {
+    fn ui_stats(&mut self) -> EntityCommands {
+        self.spawn((
+            Name::new("Stats Root"),
+            Node {
+                position_type: PositionType::Absolute,
+                top: Val::Px(10.),
+                right: Val::Px(10.),
+                row_gap: Val::Px(8.),
+                align_items: AlignItems::End,
+                flex_direction: FlexDirection::Column,
+                ..default()
+            },
+        ))
+    }
+}
diff --git a/src/stats/systems/mod.rs b/src/stats/systems/mod.rs
new file mode 100644
index 0000000..f469cfc
--- /dev/null
+++ b/src/stats/systems/mod.rs
@@ -0,0 +1,16 @@
+mod score;
+pub mod setup;
+
+use bevy::prelude::*;
+use score::{update_score, update_score_display};
+
+use crate::screens::Screen;
+
+pub(super) fn plugin(app: &mut App) {
+    app.add_systems(
+        Update,
+        (update_score, update_score_display)
+            .chain()
+            .run_if(in_state(Screen::Gameplay)),
+    );
+}
diff --git a/src/stats/systems/score.rs b/src/stats/systems/score.rs
new file mode 100644
index 0000000..537b419
--- /dev/null
+++ b/src/stats/systems/score.rs
@@ -0,0 +1,39 @@
+use bevy::prelude::*;
+
+use crate::{
+    constants::{FLOOR_SCORE_MULTIPLIER, TIME_SCORE_MULTIPLIER},
+    floor::components::{CurrentFloor, Floor},
+    stats::{components::Score, resources::GameTimer},
+};
+
+pub fn update_score(
+    mut score_query: Query<&mut Score>,
+    mut game_timer: ResMut<GameTimer>,
+    floor_query: Query<&Floor, With<CurrentFloor>>,
+    time: Res<Time>,
+) {
+    game_timer.tick(time.delta());
+
+    let Ok(mut score) = score_query.get_single_mut() else {
+        return;
+    };
+
+    let Ok(current_floor) = floor_query.get_single() else {
+        return;
+    };
+
+    let time_score = game_timer.elapsed_secs() * TIME_SCORE_MULTIPLIER;
+    let floor_score = current_floor.0 as f32 * FLOOR_SCORE_MULTIPLIER;
+    score.0 = (time_score + floor_score) as usize;
+}
+
+pub fn update_score_display(score_query: Query<&Score>, mut text_query: Query<&mut Text>) {
+    let Ok(score) = score_query.get_single() else {
+        return;
+    };
+    let Ok(mut text) = text_query.get_single_mut() else {
+        return;
+    };
+
+    text.0 = format!("Score: {}", score.0);
+}
diff --git a/src/stats/systems/setup.rs b/src/stats/systems/setup.rs
new file mode 100644
index 0000000..7d5e7c9
--- /dev/null
+++ b/src/stats/systems/setup.rs
@@ -0,0 +1,17 @@
+use bevy::prelude::*;
+
+use crate::{
+    stats::{components::Score, stats::StatsContainer},
+    theme::widgets::Widgets,
+};
+
+pub fn setup(mut commands: Commands) {
+    commands.spawn((Name::new("Score"), Score(0)));
+
+    commands.ui_stats().with_children(|parent| {
+        parent.stats("Floor", "0");
+        parent.stats("Score", "0");
+        parent.stats("Floor timer", "00:00");
+        parent.stats("Game timer", "00:00");
+    });
+}
diff --git a/src/theme/mod.rs b/src/theme/mod.rs
index f64b348..222bc63 100644
--- a/src/theme/mod.rs
+++ b/src/theme/mod.rs
@@ -8,7 +8,7 @@ pub mod components;
 pub mod events;
 pub mod palette;
 mod systems;
-mod widgets;
+pub mod widgets;
 
 #[allow(unused_imports)]
 pub mod prelude {
diff --git a/src/theme/widgets.rs b/src/theme/widgets.rs
index df9107b..43f0e67 100644
--- a/src/theme/widgets.rs
+++ b/src/theme/widgets.rs
@@ -19,6 +19,8 @@ pub trait Widgets {
 
     /// Spawn a simple text label.
     fn label(&mut self, text: impl Into<String>) -> EntityCommands;
+
+    fn stats(&mut self, text: impl Into<String>, value: impl Into<String>) -> EntityCommands;
 }
 
 impl<T: SpawnUi> Widgets for T {
@@ -107,6 +109,20 @@ impl<T: SpawnUi> Widgets for T {
         ));
         entity
     }
+
+    fn stats(&mut self, text: impl Into<String>, value: impl Into<String>) -> EntityCommands {
+        let text = text.into();
+        let entity = self.spawn_ui((
+            Name::new(text.clone()),
+            Text(format!("{text}: {}", value.into())),
+            TextFont {
+                font_size: 24.0,
+                ..default()
+            },
+            TextColor(RosePineDawn::Foam.to_color()),
+        ));
+        entity
+    }
 }
 
 /// An extension trait for spawning UI containers.

From 58276ea8f7b74295dccf7be1eb3699cdc4c7698f Mon Sep 17 00:00:00 2001
From: Kristofers Solo <dev@kristofers.xyz>
Date: Fri, 17 Jan 2025 00:41:16 +0200
Subject: [PATCH 3/4] feat(score): add score calculator

---
 src/constants.rs                     | 10 ++++--
 src/stats/components.rs              | 20 ++++++++++--
 src/stats/{stats.rs => container.rs} |  0
 src/stats/mod.rs                     |  7 ++---
 src/stats/resources.rs               | 14 ++++++---
 src/stats/systems/common.rs          | 28 +++++++++++++++++
 src/stats/systems/floor.rs           | 39 +++++++++++++++++++++++
 src/stats/systems/floor_timer.rs     | 33 ++++++++++++++++++++
 src/stats/systems/mod.rs             | 16 ++++++++--
 src/stats/systems/score.rs           | 46 +++++++++++++++++++---------
 src/stats/systems/setup.rs           | 18 +++++++----
 src/stats/systems/total_timer.rs     | 23 ++++++++++++++
 src/theme/widgets.rs                 |  7 +++--
 13 files changed, 223 insertions(+), 38 deletions(-)
 rename src/stats/{stats.rs => container.rs} (100%)
 create mode 100644 src/stats/systems/common.rs
 create mode 100644 src/stats/systems/floor.rs
 create mode 100644 src/stats/systems/floor_timer.rs
 create mode 100644 src/stats/systems/total_timer.rs

diff --git a/src/constants.rs b/src/constants.rs
index a31d151..e960a29 100644
--- a/src/constants.rs
+++ b/src/constants.rs
@@ -4,5 +4,11 @@ pub const FLOOR_Y_OFFSET: u8 = 200;
 pub const MOVEMENT_COOLDOWN: f32 = 1.0; // one second cooldown
 pub const TITLE: &str = "Maze Ascension: The Labyrinth of Echoes";
 
-pub const FLOOR_SCORE_MULTIPLIER: f32 = 100.;
-pub const TIME_SCORE_MULTIPLIER: f32 = 10.0;
+// Base score constants
+pub const BASE_FLOOR_SCORE: usize = 1000;
+pub const BASE_TIME_SCORE: usize = 100;
+
+// Floor progression constants
+pub const FLOOR_DIFFICULTY_MULTIPLIER: f32 = 1.2; // Higher floors are exponentially harder
+pub const MIN_TIME_MULTIPLIER: f32 = 0.1; // Minimum score multiplier for time
+pub const TIME_REFERENCE_SECONDS: f32 = 60.0; // Reference time for score calculation
diff --git a/src/stats/components.rs b/src/stats/components.rs
index 8aad2aa..d714fbd 100644
--- a/src/stats/components.rs
+++ b/src/stats/components.rs
@@ -4,6 +4,22 @@ use bevy::prelude::*;
 #[reflect(Component)]
 pub struct Score(pub usize);
 
-#[derive(Debug, Reflect, Component)]
+#[derive(Debug, Clone, Reflect, Component)]
 #[reflect(Component)]
-pub struct StatsText;
+pub struct FloorDisplay;
+
+#[derive(Debug, Clone, Reflect, Component)]
+#[reflect(Component)]
+pub struct HighestFloorDisplay;
+
+#[derive(Debug, Clone, Reflect, Component)]
+#[reflect(Component)]
+pub struct ScoreDisplay;
+
+#[derive(Debug, Clone, Reflect, Component)]
+#[reflect(Component)]
+pub struct FloorTimerDisplay;
+
+#[derive(Debug, Clone, Reflect, Component)]
+#[reflect(Component)]
+pub struct TotalTimerDisplay;
diff --git a/src/stats/stats.rs b/src/stats/container.rs
similarity index 100%
rename from src/stats/stats.rs
rename to src/stats/container.rs
diff --git a/src/stats/mod.rs b/src/stats/mod.rs
index 76c2c8a..083f6d6 100644
--- a/src/stats/mod.rs
+++ b/src/stats/mod.rs
@@ -1,17 +1,16 @@
 pub mod components;
+pub mod container;
 pub mod resources;
-pub mod stats;
 mod systems;
 
 use bevy::{ecs::system::RunSystemOnce, prelude::*};
 use components::Score;
-use resources::{FloorTimer, GameTimer};
+use resources::{FloorTimer, TotalTimer};
 
 pub(super) fn plugin(app: &mut App) {
     app.register_type::<Score>()
-        .init_resource::<GameTimer>()
+        .init_resource::<TotalTimer>()
         .init_resource::<FloorTimer>()
-        .insert_resource(FloorTimer(Timer::from_seconds(0.0, TimerMode::Once)))
         .add_plugins(systems::plugin);
 }
 
diff --git a/src/stats/resources.rs b/src/stats/resources.rs
index 5c7123f..b4e2be8 100644
--- a/src/stats/resources.rs
+++ b/src/stats/resources.rs
@@ -1,21 +1,27 @@
+use std::time::Duration;
+
 use bevy::prelude::*;
 
 #[derive(Debug, Reflect, Resource, Deref, DerefMut)]
 #[reflect(Resource)]
-pub struct GameTimer(pub Timer);
+pub struct TotalTimer(pub Timer);
 
 #[derive(Debug, Reflect, Resource, Deref, DerefMut)]
 #[reflect(Resource)]
 pub struct FloorTimer(pub Timer);
 
-impl Default for GameTimer {
+impl Default for TotalTimer {
     fn default() -> Self {
-        Self(Timer::from_seconds(0.0, TimerMode::Once))
+        Self(init_timer())
     }
 }
 
 impl Default for FloorTimer {
     fn default() -> Self {
-        Self(Timer::from_seconds(0.0, TimerMode::Once))
+        Self(init_timer())
     }
 }
+
+fn init_timer() -> Timer {
+    Timer::new(Duration::MAX, TimerMode::Once)
+}
diff --git a/src/stats/systems/common.rs b/src/stats/systems/common.rs
new file mode 100644
index 0000000..e769e8b
--- /dev/null
+++ b/src/stats/systems/common.rs
@@ -0,0 +1,28 @@
+pub fn format_duration_adaptive(seconds: f32) -> String {
+    let total_millis = (seconds * 1000.0) as u64;
+    let millis = total_millis % 1000;
+    let total_seconds = total_millis / 1000;
+    let seconds = total_seconds % 60;
+    let total_minutes = total_seconds / 60;
+    let minutes = total_minutes % 60;
+    let total_hours = total_minutes / 60;
+    let hours = total_hours % 24;
+    let days = total_hours / 24;
+
+    let mut result = String::new();
+
+    if days > 0 {
+        result.push_str(&format!("{}d ", days));
+    }
+    if hours > 0 || days > 0 {
+        result.push_str(&format!("{:02}:", hours));
+    }
+    if minutes > 0 || hours > 0 || days > 0 {
+        result.push_str(&format!("{:02}:", minutes));
+    }
+
+    // Always show at least seconds and milliseconds
+    result.push_str(&format!("{:02}.{:03}", seconds, millis));
+
+    result
+}
diff --git a/src/stats/systems/floor.rs b/src/stats/systems/floor.rs
new file mode 100644
index 0000000..463abef
--- /dev/null
+++ b/src/stats/systems/floor.rs
@@ -0,0 +1,39 @@
+use bevy::prelude::*;
+
+use crate::{
+    floor::{
+        components::{CurrentFloor, Floor},
+        resources::HighestFloor,
+    },
+    stats::components::{FloorDisplay, HighestFloorDisplay},
+};
+
+pub fn update_floor_display(
+    floor_query: Query<&Floor, With<CurrentFloor>>,
+    mut text_query: Query<&mut Text, With<FloorDisplay>>,
+) {
+    let Ok(floor) = floor_query.get_single() else {
+        return;
+    };
+
+    let Ok(mut text) = text_query.get_single_mut() else {
+        return;
+    };
+
+    text.0 = format!("Floor: {}", floor.0);
+}
+
+pub fn update_highest_floor_display(
+    hightes_floor: Res<HighestFloor>,
+    mut text_query: Query<&mut Text, With<HighestFloorDisplay>>,
+) {
+    if !hightes_floor.is_changed() {
+        return;
+    }
+
+    let Ok(mut text) = text_query.get_single_mut() else {
+        return;
+    };
+
+    text.0 = format!("Highest Floor: {}", hightes_floor.0);
+}
diff --git a/src/stats/systems/floor_timer.rs b/src/stats/systems/floor_timer.rs
new file mode 100644
index 0000000..c5aec96
--- /dev/null
+++ b/src/stats/systems/floor_timer.rs
@@ -0,0 +1,33 @@
+use bevy::prelude::*;
+
+use crate::{
+    floor::resources::HighestFloor,
+    stats::{components::FloorTimerDisplay, resources::FloorTimer},
+};
+
+use super::common::format_duration_adaptive;
+
+pub fn update_floor_timer(
+    mut floor_timer: ResMut<FloorTimer>,
+    time: Res<Time>,
+    hightes_floor: Res<HighestFloor>,
+) {
+    floor_timer.tick(time.delta());
+    if hightes_floor.is_changed() {
+        floor_timer.0.reset();
+    }
+}
+
+pub fn update_floor_timer_display(
+    mut text_query: Query<&mut Text, With<FloorTimerDisplay>>,
+    floor_timer: Res<FloorTimer>,
+) {
+    let Ok(mut text) = text_query.get_single_mut() else {
+        return;
+    };
+
+    text.0 = format!(
+        "Floor Timer: {}",
+        format_duration_adaptive(floor_timer.0.elapsed_secs())
+    );
+}
diff --git a/src/stats/systems/mod.rs b/src/stats/systems/mod.rs
index f469cfc..2c067f8 100644
--- a/src/stats/systems/mod.rs
+++ b/src/stats/systems/mod.rs
@@ -1,16 +1,28 @@
+mod common;
+mod floor;
+mod floor_timer;
 mod score;
 pub mod setup;
+mod total_timer;
 
 use bevy::prelude::*;
+use floor::{update_floor_display, update_highest_floor_display};
+use floor_timer::{update_floor_timer, update_floor_timer_display};
 use score::{update_score, update_score_display};
+use total_timer::{update_total_timer, update_total_timer_display};
 
 use crate::screens::Screen;
 
 pub(super) fn plugin(app: &mut App) {
     app.add_systems(
         Update,
-        (update_score, update_score_display)
-            .chain()
+        (
+            (update_score, update_score_display).chain(),
+            (update_floor_timer, update_floor_timer_display).chain(),
+            (update_total_timer, update_total_timer_display).chain(),
+            update_floor_display,
+            update_highest_floor_display,
+        )
             .run_if(in_state(Screen::Gameplay)),
     );
 }
diff --git a/src/stats/systems/score.rs b/src/stats/systems/score.rs
index 537b419..f2eb7be 100644
--- a/src/stats/systems/score.rs
+++ b/src/stats/systems/score.rs
@@ -1,39 +1,55 @@
 use bevy::prelude::*;
 
 use crate::{
-    constants::{FLOOR_SCORE_MULTIPLIER, TIME_SCORE_MULTIPLIER},
-    floor::components::{CurrentFloor, Floor},
-    stats::{components::Score, resources::GameTimer},
+    constants::{
+        BASE_FLOOR_SCORE, FLOOR_DIFFICULTY_MULTIPLIER, MIN_TIME_MULTIPLIER, TIME_REFERENCE_SECONDS,
+    },
+    floor::resources::HighestFloor,
+    stats::{
+        components::{Score, ScoreDisplay},
+        resources::FloorTimer,
+    },
 };
 
 pub fn update_score(
     mut score_query: Query<&mut Score>,
-    mut game_timer: ResMut<GameTimer>,
-    floor_query: Query<&Floor, With<CurrentFloor>>,
-    time: Res<Time>,
+    hightes_floor: Res<HighestFloor>,
+    floor_timer: Res<FloorTimer>,
 ) {
-    game_timer.tick(time.delta());
+    if !hightes_floor.is_changed() || hightes_floor.is_added() {
+        return;
+    }
 
     let Ok(mut score) = score_query.get_single_mut() else {
         return;
     };
 
-    let Ok(current_floor) = floor_query.get_single() else {
-        return;
-    };
-
-    let time_score = game_timer.elapsed_secs() * TIME_SCORE_MULTIPLIER;
-    let floor_score = current_floor.0 as f32 * FLOOR_SCORE_MULTIPLIER;
-    score.0 = (time_score + floor_score) as usize;
+    score.0 = calculate_score(hightes_floor.0, floor_timer.elapsed_secs());
 }
 
-pub fn update_score_display(score_query: Query<&Score>, mut text_query: Query<&mut Text>) {
+pub fn update_score_display(
+    score_query: Query<&Score>,
+    mut text_query: Query<&mut Text, With<ScoreDisplay>>,
+) {
     let Ok(score) = score_query.get_single() else {
         return;
     };
+
     let Ok(mut text) = text_query.get_single_mut() else {
         return;
     };
 
     text.0 = format!("Score: {}", score.0);
 }
+
+fn calculate_score(floor_number: u8, completion_time: f32) -> usize {
+    // Calculate base floor score with exponential scaling
+    let floor_multiplier = (floor_number as f32).powf(FLOOR_DIFFICULTY_MULTIPLIER);
+    let base_score = BASE_FLOOR_SCORE as f32 * floor_multiplier;
+
+    // Calculate time multiplier (decreases as time increases)
+    let time_factor = 1. / (1. + (completion_time / TIME_REFERENCE_SECONDS));
+    let time_multiplier = time_factor.max(MIN_TIME_MULTIPLIER);
+
+    (base_score * time_multiplier) as usize
+}
diff --git a/src/stats/systems/setup.rs b/src/stats/systems/setup.rs
index 7d5e7c9..0fa9380 100644
--- a/src/stats/systems/setup.rs
+++ b/src/stats/systems/setup.rs
@@ -1,17 +1,23 @@
 use bevy::prelude::*;
 
 use crate::{
-    stats::{components::Score, stats::StatsContainer},
+    stats::{
+        components::{
+            FloorDisplay, FloorTimerDisplay, HighestFloorDisplay, Score, ScoreDisplay,
+            TotalTimerDisplay,
+        },
+        container::StatsContainer,
+    },
     theme::widgets::Widgets,
 };
 
 pub fn setup(mut commands: Commands) {
     commands.spawn((Name::new("Score"), Score(0)));
-
     commands.ui_stats().with_children(|parent| {
-        parent.stats("Floor", "0");
-        parent.stats("Score", "0");
-        parent.stats("Floor timer", "00:00");
-        parent.stats("Game timer", "00:00");
+        parent.stats("Floor: 1", FloorDisplay);
+        parent.stats("Highest Floor: 1", HighestFloorDisplay);
+        parent.stats("Score: 0", ScoreDisplay);
+        parent.stats("Floor Timer", FloorTimerDisplay);
+        parent.stats("Total Timer", TotalTimerDisplay);
     });
 }
diff --git a/src/stats/systems/total_timer.rs b/src/stats/systems/total_timer.rs
new file mode 100644
index 0000000..e43024f
--- /dev/null
+++ b/src/stats/systems/total_timer.rs
@@ -0,0 +1,23 @@
+use bevy::prelude::*;
+
+use crate::stats::{components::TotalTimerDisplay, resources::TotalTimer};
+
+use super::common::format_duration_adaptive;
+
+pub fn update_total_timer(mut total_timer: ResMut<TotalTimer>, time: Res<Time>) {
+    total_timer.tick(time.delta());
+}
+
+pub fn update_total_timer_display(
+    mut text_query: Query<&mut Text, With<TotalTimerDisplay>>,
+    total_timer: Res<TotalTimer>,
+) {
+    let Ok(mut text) = text_query.get_single_mut() else {
+        return;
+    };
+
+    text.0 = format!(
+        "Total Timer: {}",
+        format_duration_adaptive(total_timer.0.elapsed_secs())
+    );
+}
diff --git a/src/theme/widgets.rs b/src/theme/widgets.rs
index 43f0e67..e185efa 100644
--- a/src/theme/widgets.rs
+++ b/src/theme/widgets.rs
@@ -20,7 +20,7 @@ pub trait Widgets {
     /// Spawn a simple text label.
     fn label(&mut self, text: impl Into<String>) -> EntityCommands;
 
-    fn stats(&mut self, text: impl Into<String>, value: impl Into<String>) -> EntityCommands;
+    fn stats(&mut self, text: impl Into<String>, bundle: impl Bundle) -> EntityCommands;
 }
 
 impl<T: SpawnUi> Widgets for T {
@@ -110,15 +110,16 @@ impl<T: SpawnUi> Widgets for T {
         entity
     }
 
-    fn stats(&mut self, text: impl Into<String>, value: impl Into<String>) -> EntityCommands {
+    fn stats(&mut self, text: impl Into<String>, bundle: impl Bundle) -> EntityCommands {
         let text = text.into();
         let entity = self.spawn_ui((
             Name::new(text.clone()),
-            Text(format!("{text}: {}", value.into())),
+            Text(text),
             TextFont {
                 font_size: 24.0,
                 ..default()
             },
+            bundle,
             TextColor(RosePineDawn::Foam.to_color()),
         ));
         entity

From 5e1e4a546af22dfc78f2467f1603a940c1211297 Mon Sep 17 00:00:00 2001
From: Kristofers Solo <dev@kristofers.xyz>
Date: Fri, 17 Jan 2025 00:56:26 +0200
Subject: [PATCH 4/4] refactor(stats): make score a resource

---
 src/stats/components.rs    |  4 ----
 src/stats/mod.rs           |  7 +++----
 src/stats/resources.rs     |  4 ++++
 src/stats/systems/mod.rs   | 27 +++++++++++++++------------
 src/stats/systems/reset.rs | 13 +++++++++++++
 src/stats/systems/score.rs | 16 ++++------------
 src/stats/systems/setup.rs | 23 -----------------------
 src/stats/systems/spawn.rs | 25 +++++++++++++++++++++++++
 src/theme/widgets.rs       |  2 +-
 9 files changed, 65 insertions(+), 56 deletions(-)
 create mode 100644 src/stats/systems/reset.rs
 delete mode 100644 src/stats/systems/setup.rs
 create mode 100644 src/stats/systems/spawn.rs

diff --git a/src/stats/components.rs b/src/stats/components.rs
index d714fbd..f37e09b 100644
--- a/src/stats/components.rs
+++ b/src/stats/components.rs
@@ -1,9 +1,5 @@
 use bevy::prelude::*;
 
-#[derive(Debug, Reflect, Component, Deref, DerefMut)]
-#[reflect(Component)]
-pub struct Score(pub usize);
-
 #[derive(Debug, Clone, Reflect, Component)]
 #[reflect(Component)]
 pub struct FloorDisplay;
diff --git a/src/stats/mod.rs b/src/stats/mod.rs
index 083f6d6..7693d14 100644
--- a/src/stats/mod.rs
+++ b/src/stats/mod.rs
@@ -4,16 +4,15 @@ pub mod resources;
 mod systems;
 
 use bevy::{ecs::system::RunSystemOnce, prelude::*};
-use components::Score;
-use resources::{FloorTimer, TotalTimer};
+use resources::{FloorTimer, Score, TotalTimer};
 
 pub(super) fn plugin(app: &mut App) {
-    app.register_type::<Score>()
+    app.init_resource::<Score>()
         .init_resource::<TotalTimer>()
         .init_resource::<FloorTimer>()
         .add_plugins(systems::plugin);
 }
 
 pub fn spawn_stats_command(world: &mut World) {
-    let _ = world.run_system_once(systems::setup::setup);
+    let _ = world.run_system_once(systems::spawn::spawn_stats);
 }
diff --git a/src/stats/resources.rs b/src/stats/resources.rs
index b4e2be8..2da7f8b 100644
--- a/src/stats/resources.rs
+++ b/src/stats/resources.rs
@@ -2,6 +2,10 @@ use std::time::Duration;
 
 use bevy::prelude::*;
 
+#[derive(Debug, Default, Reflect, Resource, Deref, DerefMut)]
+#[reflect(Resource)]
+pub struct Score(pub usize);
+
 #[derive(Debug, Reflect, Resource, Deref, DerefMut)]
 #[reflect(Resource)]
 pub struct TotalTimer(pub Timer);
diff --git a/src/stats/systems/mod.rs b/src/stats/systems/mod.rs
index 2c067f8..62e0e8e 100644
--- a/src/stats/systems/mod.rs
+++ b/src/stats/systems/mod.rs
@@ -1,28 +1,31 @@
 mod common;
 mod floor;
 mod floor_timer;
+mod reset;
 mod score;
-pub mod setup;
+pub mod spawn;
 mod total_timer;
 
 use bevy::prelude::*;
 use floor::{update_floor_display, update_highest_floor_display};
 use floor_timer::{update_floor_timer, update_floor_timer_display};
+use reset::reset_timers;
 use score::{update_score, update_score_display};
 use total_timer::{update_total_timer, update_total_timer_display};
 
 use crate::screens::Screen;
 
 pub(super) fn plugin(app: &mut App) {
-    app.add_systems(
-        Update,
-        (
-            (update_score, update_score_display).chain(),
-            (update_floor_timer, update_floor_timer_display).chain(),
-            (update_total_timer, update_total_timer_display).chain(),
-            update_floor_display,
-            update_highest_floor_display,
-        )
-            .run_if(in_state(Screen::Gameplay)),
-    );
+    app.add_systems(OnEnter(Screen::Gameplay), reset_timers)
+        .add_systems(
+            Update,
+            (
+                (update_score, update_score_display).chain(),
+                (update_floor_timer, update_floor_timer_display).chain(),
+                (update_total_timer, update_total_timer_display).chain(),
+                update_floor_display,
+                update_highest_floor_display,
+            )
+                .run_if(in_state(Screen::Gameplay)),
+        );
 }
diff --git a/src/stats/systems/reset.rs b/src/stats/systems/reset.rs
new file mode 100644
index 0000000..ab795a2
--- /dev/null
+++ b/src/stats/systems/reset.rs
@@ -0,0 +1,13 @@
+use bevy::prelude::*;
+
+use crate::stats::resources::{FloorTimer, Score, TotalTimer};
+
+pub fn reset_timers(
+    mut floor_timer: ResMut<FloorTimer>,
+    mut total_timer: ResMut<TotalTimer>,
+    mut score: ResMut<Score>,
+) {
+    floor_timer.reset();
+    total_timer.reset();
+    score.0 = 0;
+}
diff --git a/src/stats/systems/score.rs b/src/stats/systems/score.rs
index f2eb7be..57b04e4 100644
--- a/src/stats/systems/score.rs
+++ b/src/stats/systems/score.rs
@@ -6,13 +6,13 @@ use crate::{
     },
     floor::resources::HighestFloor,
     stats::{
-        components::{Score, ScoreDisplay},
-        resources::FloorTimer,
+        components::ScoreDisplay,
+        resources::{FloorTimer, Score},
     },
 };
 
 pub fn update_score(
-    mut score_query: Query<&mut Score>,
+    mut score: ResMut<Score>,
     hightes_floor: Res<HighestFloor>,
     floor_timer: Res<FloorTimer>,
 ) {
@@ -20,21 +20,13 @@ pub fn update_score(
         return;
     }
 
-    let Ok(mut score) = score_query.get_single_mut() else {
-        return;
-    };
-
     score.0 = calculate_score(hightes_floor.0, floor_timer.elapsed_secs());
 }
 
 pub fn update_score_display(
-    score_query: Query<&Score>,
     mut text_query: Query<&mut Text, With<ScoreDisplay>>,
+    score: Res<Score>,
 ) {
-    let Ok(score) = score_query.get_single() else {
-        return;
-    };
-
     let Ok(mut text) = text_query.get_single_mut() else {
         return;
     };
diff --git a/src/stats/systems/setup.rs b/src/stats/systems/setup.rs
deleted file mode 100644
index 0fa9380..0000000
--- a/src/stats/systems/setup.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-use bevy::prelude::*;
-
-use crate::{
-    stats::{
-        components::{
-            FloorDisplay, FloorTimerDisplay, HighestFloorDisplay, Score, ScoreDisplay,
-            TotalTimerDisplay,
-        },
-        container::StatsContainer,
-    },
-    theme::widgets::Widgets,
-};
-
-pub fn setup(mut commands: Commands) {
-    commands.spawn((Name::new("Score"), Score(0)));
-    commands.ui_stats().with_children(|parent| {
-        parent.stats("Floor: 1", FloorDisplay);
-        parent.stats("Highest Floor: 1", HighestFloorDisplay);
-        parent.stats("Score: 0", ScoreDisplay);
-        parent.stats("Floor Timer", FloorTimerDisplay);
-        parent.stats("Total Timer", TotalTimerDisplay);
-    });
-}
diff --git a/src/stats/systems/spawn.rs b/src/stats/systems/spawn.rs
new file mode 100644
index 0000000..ca4283c
--- /dev/null
+++ b/src/stats/systems/spawn.rs
@@ -0,0 +1,25 @@
+use bevy::prelude::*;
+
+use crate::{
+    screens::Screen,
+    stats::{
+        components::{
+            FloorDisplay, FloorTimerDisplay, HighestFloorDisplay, ScoreDisplay, TotalTimerDisplay,
+        },
+        container::StatsContainer,
+    },
+    theme::widgets::Widgets,
+};
+
+pub fn spawn_stats(mut commands: Commands) {
+    commands
+        .ui_stats()
+        .insert(StateScoped(Screen::Gameplay))
+        .with_children(|parent| {
+            parent.stats("Floor: 1", FloorDisplay);
+            parent.stats("Highest Floor: 1", HighestFloorDisplay);
+            parent.stats("Score: 0", ScoreDisplay);
+            parent.stats("Floor Timer", FloorTimerDisplay);
+            parent.stats("Total Timer", TotalTimerDisplay);
+        });
+}
diff --git a/src/theme/widgets.rs b/src/theme/widgets.rs
index e185efa..3f30e85 100644
--- a/src/theme/widgets.rs
+++ b/src/theme/widgets.rs
@@ -120,7 +120,7 @@ impl<T: SpawnUi> Widgets for T {
                 ..default()
             },
             bundle,
-            TextColor(RosePineDawn::Foam.to_color()),
+            TextColor(RosePineDawn::Text.to_color()),
         ));
         entity
     }