From 7b9ce7fb4f636658db938e6f3fbe4231aee783f2 Mon Sep 17 00:00:00 2001
From: Muhammad Nauman Raza <devraza@devraza.duckdns.org>
Date: Thu, 7 Dec 2023 09:55:41 +0000
Subject: [PATCH] hotfix: make some progress on dashing

Former-commit-id: 83e4577bb5f86359edae1d2e25e1cdb7b3627c2a
---
 src/main.rs   |  2 ++
 src/player.rs | 55 ++++++++++++++++++++++++++-------------------------
 src/ui.rs     |  3 +--
 3 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index b24e6f3..157411b 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -100,5 +100,7 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
             stamina_max: 10.,
 
             defence: 40.,
+
+            is_dashing: false,
         });
 }
diff --git a/src/player.rs b/src/player.rs
index f0ba0ac..d528365 100644
--- a/src/player.rs
+++ b/src/player.rs
@@ -12,6 +12,8 @@ pub struct Player {
     pub stamina_max: f32,
 
     pub defence: f32,
+
+    pub is_dashing: bool,
 }
 
 // Define the player movement system
@@ -25,60 +27,59 @@ pub fn movement(
     let mut rotation_factor = 0.;
     let mut movement_factor = 0.;
 
-   let mut lock: bool = false;
-
-    if keys.pressed(KeyCode::Space) && lock == false {
-        lock = true;
-        movement_factor = 5.;
-        if player.stamina > 0. {
-            player.stamina -= 0.05;
-        }
-        if player.stamina < 0. {
-            player.stamina = 0.;
-        }
-    }
-
     if keys.pressed(KeyCode::W) {
         movement_factor += 1.;
     } else if keys.pressed(KeyCode::S) {
         movement_factor -= 1.;
     }
-
     if keys.pressed(KeyCode::A) {
         rotation_factor += 1.;
     } else if keys.pressed(KeyCode::D) {
         rotation_factor -= 1.;
     }
 
+    if keys.pressed(KeyCode::Space) && player.is_dashing == false {
+        player.is_dashing = true;
+        movement_factor = 5.;
+        if player.stamina > 0. {
+            player.stamina -= 0.025;
+        }
+        if player.stamina < 0. {
+            player.stamina = 0.;
+        }
+    }
+
+
+
     // Initialise the movement distance variable (to bring it into scope)
     let movement_distance: f32;
 
-    if keys.pressed(KeyCode::Up) {
-        transform.rotation = Quat::from_rotation_z((0_f32).to_radians());
-        movement_factor = 1.;
-    }
-    if keys.pressed(KeyCode::Down) {
-        transform.rotation = Quat::from_rotation_z((180_f32).to_radians());
-        movement_factor = 1.;
-    }
     if keys.pressed(KeyCode::Left) {
         transform.rotation = Quat::from_rotation_z((90_f32).to_radians());
         movement_factor = 1.;
-    }
-    if keys.pressed(KeyCode::Right) {
+    } else if keys.pressed(KeyCode::Right) {
         transform.rotation = Quat::from_rotation_z((270_f32).to_radians());
         movement_factor = 1.;
     }
 
+    if keys.pressed(KeyCode::Up) {
+        transform.rotation = Quat::from_rotation_z((0_f32).to_radians());
+        movement_factor = 1.;
+    } else if keys.pressed(KeyCode::Down) {
+        transform.rotation = Quat::from_rotation_z((180_f32).to_radians());
+        movement_factor = 1.;
+    } 
+
     // Get the player's *forward* vector
     let movement_direction = transform.rotation * Vec3::Y;
 
-    if lock != true {
+    if player.is_dashing == true {
         movement_distance = movement_factor * player.movement_speed * time.delta_seconds();
-        // Change the player rotation around the Z-axis only if not blinking
+        // Change the player rotation around the Z-axis only if not dashing
         transform.rotate_z(rotation_factor * player.rotation_speed * time.delta_seconds());
     } else {
         movement_distance = player.stamina * movement_factor * player.movement_speed * time.delta_seconds();
+        player.is_dashing = false;
     }
 
     // Update the player translation with the translation
@@ -101,9 +102,9 @@ pub fn camera_follow(
 
 pub fn player_regen(mut player_query: Query<&mut Player, With<Player>>, time: Res<Time>) {
     let mut player = player_query.single_mut();
+    println!("{}", player.stamina);
     if player.stamina < 1. {
         if player.stamina < 0. {
-            player.stamina = 0.;
             player.stamina += 0.1 * time.delta_seconds();
         } else {
             player.stamina += 0.1 * time.delta_seconds();
diff --git a/src/ui.rs b/src/ui.rs
index 02a3075..01c695e 100644
--- a/src/ui.rs
+++ b/src/ui.rs
@@ -123,8 +123,7 @@ pub fn render_ui(
 
                     // Show the stamina bar to be empty if the player has no stamina
                     if player.stamina <= 0. {
-                        stamina_bar =
-                            stamina_bar.fill(egui::Color32::from_rgba_unmultiplied(0, 0, 0, 0));
+                        stamina_bar = stamina_bar.fill(egui::Color32::from_rgba_unmultiplied(0, 0, 0, 0));
                     };
 
                     // Show the progress bars!