diff --git a/Cargo.lock b/Cargo.lock index 19c77a7..b5ab735 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -663,7 +663,7 @@ checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" [[package]] name = "pacman" -version = "0.77.0" +version = "0.77.1" dependencies = [ "anyhow", "bevy_ecs", diff --git a/Cargo.toml b/Cargo.toml index 61a74be..d387a98 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pacman" -version = "0.77.0" +version = "0.77.1" authors = ["Xevion"] edition = "2021" rust-version = "1.86.0" diff --git a/src/systems/render.rs b/src/systems/render.rs index f1b8bef..b40b6d1 100644 --- a/src/systems/render.rs +++ b/src/systems/render.rs @@ -2,7 +2,7 @@ use crate::map::builder::Map; use crate::systems::input::TouchState; use crate::systems::{ debug_render_system, BatchedLinesResource, Collider, CursorPosition, DebugState, DebugTextureResource, DeltaTime, - DirectionalAnimation, Dying, Frozen, GameStage, LinearAnimation, Looping, Position, Renderable, ScoreResource, + DirectionalAnimation, Dying, Frozen, GameStage, LinearAnimation, Looping, PlayerLives, Position, Renderable, ScoreResource, StartupSequence, SystemId, SystemTimings, TtfAtlasResource, Velocity, }; use crate::texture::sprite::SpriteAtlas; @@ -204,6 +204,7 @@ pub fn hud_render_system( mut backbuffer: NonSendMut, mut canvas: NonSendMut<&mut Canvas>, mut atlas: NonSendMut, + player_lives: Res, score: Res, stage: Res, mut errors: EventWriter, @@ -212,7 +213,7 @@ pub fn hud_render_system( let mut text_renderer = TextTexture::new(1.0); // Render lives and high score text in white - let lives = 3; // TODO: Get from actual lives resource + let lives = player_lives.0; let lives_text = format!("{lives}UP HIGH SCORE "); let lives_position = glam::UVec2::new(4 + 8 * 3, 2); // x_offset + lives_offset * 8, y_offset diff --git a/src/systems/state.rs b/src/systems/state.rs index b79eca8..15b31ce 100644 --- a/src/systems/state.rs +++ b/src/systems/state.rs @@ -78,7 +78,7 @@ pub struct PlayerLives(pub u8); impl Default for PlayerLives { fn default() -> Self { - Self(1) + Self(3) } }