From 2354e34142b2e3ec9e0c7925a2341950699bd4ad Mon Sep 17 00:00:00 2001
From: luckyturtledev <git@lukas1818.de>
Date: Sun, 7 Jul 2024 16:39:54 +0200
Subject: [PATCH] energie lost overworld

---
 src/activities/overworld/mod.rs | 13 +++++++++++--
 src/game.rs                     | 19 ++++++++++++++++---
 src/ui.rs                       | 16 ++++++++++------
 3 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/src/activities/overworld/mod.rs b/src/activities/overworld/mod.rs
index 50c354f..3ad9c12 100644
--- a/src/activities/overworld/mod.rs
+++ b/src/activities/overworld/mod.rs
@@ -1,6 +1,6 @@
 use crate::{activities::Activity, game::ZLayer, State};
 use comfy::{
-	draw_circle, draw_rect_outline, draw_sprite, error, info, is_key_down,
+	delta, draw_circle, draw_rect_outline, draw_sprite, error, info, is_key_down,
 	main_camera_mut, EngineContext, IVec2, KeyCode, Vec2, RED, WHITE
 };
 use std::time::Instant;
@@ -27,7 +27,7 @@ pub fn draw(state: &crate::State, _engine: &comfy::EngineContext<'_>) {
 	draw_circle(state.ghost.overworld_pos, 0.5, RED, ZLayer::Ghost.into());
 }
 
-fn update_move_player(state: &mut State, ctx: &mut EngineContext<'_>) {
+fn update_move_player(state: &mut State, _ctx: &mut EngineContext<'_>) {
 	let now = Instant::now();
 
 	// Are there any pending position updates? If so, we ignore all user input and execute
@@ -174,6 +174,15 @@ pub fn update(state: &mut State, ctx: &mut EngineContext<'_>) {
 		}
 	}
 
+	// energie lost
+	{
+		let ghost = &mut state.ghost;
+		ghost.charge -= 70.0 * ctx.delta;
+		if ghost.overworld_movement_pending != Vec2::ZERO {
+			ghost.charge -= 70.0 * ctx.delta;
+		}
+	}
+
 	// generate more chunks if needed
 	{
 		let half_viewport = (camera.world_viewport() * 0.5 + 3.0).as_ivec2();
diff --git a/src/game.rs b/src/game.rs
index 9cdbbe1..4a45a4a 100644
--- a/src/game.rs
+++ b/src/game.rs
@@ -4,7 +4,10 @@ use crate::{
 	State
 };
 use comfy::{EngineContext, Vec2};
-use std::{ops::Sub, time::Instant};
+use std::{
+	ops::{Add, Sub},
+	time::Instant
+};
 
 #[derive(Debug)]
 pub struct Ghost {
@@ -71,7 +74,8 @@ pub enum ZLayer {
 	ElectricLayer = -2,
 	MapMax = -1,
 	Human = 0,
-	Ghost = 1
+	Ghost = 1,
+	UI = 100
 }
 
 impl From<ZLayer> for i32 {
@@ -89,7 +93,15 @@ impl Sub<i32> for ZLayer {
 	}
 }
 
-pub fn setup(state: &mut State, ctx: &mut EngineContext<'_>) {
+impl Add<i32> for ZLayer {
+	type Output = i32;
+
+	fn add(self, other: i32) -> Self::Output {
+		i32::from(self) + other
+	}
+}
+
+pub fn setup(_state: &mut State, ctx: &mut EngineContext<'_>) {
 	Assets::load(ctx);
 
 	//house::setup(state, ctx);
@@ -101,6 +113,7 @@ pub fn update(state: &mut State, engine: &mut EngineContext<'_>) {
 		Activity::House(_) => house::update(state, engine),
 		Activity::Overworld => overworld::update(state, engine)
 	}
+	state.ghost.charge = state.ghost.charge.max(0.0);
 }
 
 pub fn draw(state: &State, engine: &EngineContext<'_>) {
diff --git a/src/ui.rs b/src/ui.rs
index 9d434b2..1f31ada 100644
--- a/src/ui.rs
+++ b/src/ui.rs
@@ -1,7 +1,7 @@
-use crate::State;
+use crate::{game::ZLayer, State};
 use comfy::{
 	draw_rect, draw_rect_outline, egui, screen_height, screen_to_world, screen_width,
-	EngineContext, Vec2, BLUE, RED, WHITE
+	EngineContext, Vec2, BLACK, BLUE, RED, WHITE
 };
 use egui::widget_text::RichText;
 
@@ -18,16 +18,20 @@ pub fn draw_batterie(state: &State, _engine: &EngineContext<'_>) {
 		let ghost = &state.ghost;
 		let percent = ghost.charge / ghost.max_charge;
 		let mut size = section_size;
-		size.y = section_size.y * section_count as f32 * percent;
+		size.y = section_size.y * section_count as f32;
 		let mut position = start_positon;
 		position.y += 0.5 * -section_size.y + 0.5 * size.y;
-		draw_rect(position, size, BLUE, 100);
+		draw_rect(position, size, BLACK, ZLayer::UI.into());
+		size.y *= percent;
+		let mut position = start_positon;
+		position.y += 0.5 * -section_size.y + 0.5 * size.y;
+		draw_rect(position, size, BLUE, ZLayer::UI + 1);
 	}
 	// draw sections
 	for i in 0 .. section_count {
 		let mut position = start_positon;
 		position.y += i as f32 * section_size.y;
-		draw_rect_outline(position, section_size, 0.1, RED, 100);
+		draw_rect_outline(position, section_size, 0.1, RED, ZLayer::UI + 2);
 	}
 }
 
@@ -36,7 +40,7 @@ pub fn draw_highscore(state: &State, _engine: &EngineContext<'_>) {
 		.anchor(egui::Align2::RIGHT_TOP, egui::vec2(0.0, 0.0))
 		.show(egui(), |ui| {
 			ui.label(
-				RichText::new(format!("{:.0}", state.score))
+				RichText::new(format!("{:.0}    ", state.score))
 					.color(WHITE)
 					.monospace()
 					.size(16.0)