From f9fb6c21da718a492ebd3ed91e5c84bd7f24c972 Mon Sep 17 00:00:00 2001
From: Muhammad Nauman Raza <devraza@devraza.duckdns.org>
Date: Wed, 6 Dec 2023 22:45:32 +0000
Subject: [PATCH] feat: begin on stamina

Former-commit-id: d4d8c9a8e6ed2fb5483465a70a10c612be2823dc
---
 assets/player/player-2x.png | Bin 715 -> 756 bytes
 assets/player/player-4x.png | Bin 1239 -> 1419 bytes
 assets/player/player.png    | Bin 375 -> 403 bytes
 src/main.rs                 |  38 ++++++++++++++++----------------
 src/player.rs               |  42 ++++++++++++++++++++++++++----------
 src/ui.rs                   |  27 +++++++++++++++--------
 6 files changed, 69 insertions(+), 38 deletions(-)

diff --git a/assets/player/player-2x.png b/assets/player/player-2x.png
index edfc2b33e14bcfb26ef02ac347f54357a14b6f59..c62aa7c27851e4023cb4d8406e8bafdcb0dd7531 100644
GIT binary patch
literal 756
zcmeAS@N?(olHy`uVBq!ia0vp^0U*r51|<6gKdl8)oCO|{#S9Fx?I6t9|MX)jP*AeO
zHKHUqKdq!Zu_%?Hyu4g5GcUV1Ik6yBFTW^#_B$IX1_q`^PZ!6KiaBqu@68SllsWeC
z`J5$UQyVTEbQ7?$aJlFxAny2Lfj9RomRHOEH!HO+;xwQ9!(5}oS^LVfOF3mlg)5s@
z?>5uF<R~CAWzJ(Ij!93{?9460E9{bs-k<D$Uwd-zvFiRct4bf={_xLZaYUt1)wD#P
zFy?Ewti^jb<}*ZOpSk+$(b>NjjCm)WY>;OEcxcX1YX<NA_P;W8^{)C)vuBsdR*<f0
z*uOT>+B|(@tNllY2V06O1Rs{#U5Ic_)qAkh@1J2qHuJuyvbp;GX}128d}0p;s;{$n
zpvqvJBb{Hcd}BnN-QkUHr+f~q*c@E6;Wq;p=j^)g_hK{WtlBsKXpE;(A?JGeZCre2
zZbdc>7Fj*Hc``@1FVD-CImqnR@#ateKedKSEW34|>Y82OFn9K~n8#dl7q;qO={fjn
z$#2OAziyVjduWn2E2D41_X8`$*ITv6{`uYbrD46>QLj1AVkUEl8T`6p^|<Kob_Tx*
z-nCl`roTS=s@>$-tdI%bKkD+|?>PN6`NKzs1rHJ)e?5H7qTXR8x6p?f|G$YG_$e}7
z=j{JC_QuNd<d>&DV|;!0nQcYA_S;h4fR&}Q%P+^7e=MK;t}#>YD*N7wn^t?64Az$4
zvP%e;Ix1bAsr#aFVxtiAHS0pNxKO6fuBQ{#13o-I@P97TB#{YA8dO+SG!;A<J-IxB
f93~C4(0&H{`o5Q`Rw}W;6wBc0>gTe~DWM4fGK)Pg

literal 715
zcmeAS@N?(olHy`uVBq!ia0vp^4nQ2h!3HE(?k{!)Qk(@Ik;M!Qvh5(u*#GonDo{|e
z#5JNMI6tkVJh3R1p}f3YFEcN@I61K(RWH9NefB#WDFz0n2u~Nskcv5PXY9=uag=DU
ze}8AL{E3@OJp2UK?YY6~!s58Wz;)FfHm6m8__G8#Ql|T={$mvryY=JX%)1jBT6@jR
z6qmaGQrX?UMBs?l9Um#x&KWOMH-Gm2X!rE)yWQt)j`NhOpR?T1@%yLEoZVaQbj59u
zX%SV>3sZABBhGNF<BtEaW#$rcQy98;|MWPVAnfq_y7%p456X;g{S~`)w59HWPSw`7
zgVHj3atwJ<-P<+ot~>u`;V)Rd#-91Z2mO584Nt!>Us&6e*SO`3GWQ;K1@*WmcVeoP
ztHe)fMl@`Rc^NT-m*MQ?^(FSb6L+7?_@2$NULiUmF@J4lV$q-Cj|>Xe*Bt%zD9<iv
zrvwv=fWx{s{BevgcnYI;=Y6OW+Zz=cw|}LLLre;1!@CXNISnl1u1wPku=+Pg>palx
zxmyb48RmSQT+%SxGdl3y<<}ZhSv`KQ&V7AHt>N>#r}Avy{4UM9`RU<T^{F|H$F29S
zzNUEir#L@@FZX2qH*5bMXSA}J%CaMFwLSZtmg5uWp8nlDz3A5WcH>934wuf)vq-r2
zJ%(}7Qlt7Owd>9sE9h;iR{F&0aQOCx$2>eKTA9A}UrYlYDLwwHSis2fFZsoyg^V|t
za!eSa8+zFixHnv6$YC^-YS2C4#=L>`Mh3$+25H^{VhM}srf4=ZXKOoyw<FtZU_xZ@
MboFyt=akR{03|&v!T<mO

diff --git a/assets/player/player-4x.png b/assets/player/player-4x.png
index db9490fba91daf305c4165beb3847ef6590f1e23..cc5a609a9072dc3290dfaaa082dcc279a1816542 100644
GIT binary patch
literal 1419
zcmeAS@N?(olHy`uVBq!ia0vp^3qY8I4M=vMPuB%foCO|{#S9GAd?3ttX4}GMprB-l
zYeY$Kep*R+Vo@qXd3m{BW?pu2a$-TMUVc&f>~}U&3=FIio-U3d6?5L+^6!{ZDs%kf
z`S&wp!=rfuFWyx>*v#IoqO#GU!$!r!=^V$ilX`y}`5aw2CK=msU!0#UtHkxoU2XO6
zHA1Xq6CGHLca?m&;OO!FrtV>fU(By<_Ukzbt=|3a+?n+GGrzyKu>SmKAJ6-l_c!m}
zFOV!Ew#;s-Y)H>(xAtuLUFn*u9U8cU=i6*FZF#b0i3;b#jmIwB`}}U^sSXD52Op;9
z_|`Ato@92f=EZcCi`$O<dbR%8Mla1m{s6PzreQDrOG5r1Rri$ca*AJObva#X^%jl~
zdbSh3?^S-;8Ckbw^NIfzt1o|^A{+f7*5mV<FpuM^t+(wok1@aWcpLG2nU*=zoaH9=
z8+Qg2#a%jOZEyT<rpm*MKs)?pCD%N;(e(V`g{#5Z+^RF5_4rRZlpvTqEpArC)o%xP
zF)*G}^ho^a^I6z)_Vd4sB+N{wA3YzmbkF|c2fVYKYm4?MuB_U=p4+jyYh`=imc%9N
z4%t4CUGnqDI;W4>o>N)l7I_HSUX6(VyJ~82sW8)?-Y=h4`noRtxp&FYd#7XlLvr$Y
z-tWHAwR0D5^aq`|*><)OA+u(R$<J3=t1~5~ecilS$Mp^Nwlky``u};Y?8(3F!=%~l
zX|v?pt^fYr;4b*!zsa&=@u5Bb+kfqHTqS#Q^YrN2yPF=%eGuzi`EhR7!!1k7{`zlU
zx#I3ikFU4QV)vJDd{}l}-9K+d%cG_xrMYphzN@t4_AcBz{nj2o%?+&HRWG0CvuQ1~
zSoiI?x@UIRijU!X{cB$wi1L<W^op|malU%ew(`8AJHFoYy8nA_bpFd%KN(*CJn}iP
zYTM=4ZZ8v*&(C}PWtX?F|9$3V!NRw@CH7A?NsvlZJGP^^WJ%ezE&F26v(4~Jf8FI|
z@3HH=jaS`bd%Hi!ZbjwIJG@AJ`-715U$a{KP69p8`~7UoM)5C>`>O@o=kXXkyMB-F
z(&KlQc^i{8;=eDe=4hXHyXp1hn~ee`S8R{xBwa9G?0nV#ZgEMFKWoH%yPc{cXN!X*
zO3oKa*B_5~BO!b9`{L>eelKV0TI@C1sCDGo51~H)NntG$dgS*_T3g6}Nz+y^VU>v{
z+oR`QiIc0RRo=KU{YCd*spuDqH-cVvGIXERE%o%@^?b&9g}1xvH(e4w{&V*~IfJ?9
zzKOK@t*VjVrg60PWr1!n|0Taz*#z$XtGi477XEW(-x1>fbKj5KGY@VxUpF^6+uzJO
zW{=s1KNHKt-|u@Tmtqze72?p%w_#%X-QS{JmP-#`b**Kb`gR{jY#T$OYr_U5hX_H1
uH5>wAEF9WQEuxHvx<-Ym9VV;m8GDy#9ACrFl?E(G89ZJ6T-G@yGywoQhh)P5

literal 1239
zcmeAS@N?(olHy`uVBq!ia0vp^4M4nrgAGU?nUwMuNO2Z;L>4nJSo47}<C$#>n}LFo
zC9V-A!TD(=<%vb94CUqJdYO6I#mR{Use1WE>9gP2NHH+5q<FeGhE&XXd&@pUB~|9w
z$LDkJs<b_IGI){uhgnlZ$g%H%=Ap(3heCuV={{LilB6zS!E#jg*t2&!t<8@&7;r2)
zGMBfB%WT<3gCpmRS|98bc0Q2ZBvW|*y4nKQqWU7^&*!Yqf7YCQcV@g%{3pF9>2rz`
zuHJpU{?N{g{mZQ9|C)DH{IHZm`Gwi$YQH!gL?k~)-HE&R&2}>X6vjRO-RrYd4)Hb2
ze60Uh&UJ^x{P>&SEvAW2e9w65o0^%_S&sMz``h^$&PR3Y3+I^H_CDo}WhlORqLf)@
z-iNiU=09F%y=1O*D`hznxr=Fr97FM|?m4^X*j)X&YR}3)i#QcdR&5r$c%DJ+-CwVA
z3D;*=fBZSMeksp0$)kcF?j1CLuCqwwd+iT~gs5vuzIC_f=+tcBT2afuW{~WD_&mcI
z+atH<$@lF#FRZfl|KBVB*x&G7y1_8Fy>`A~#o>3cKQ?sCT(#ude8x#R#TO6NvM(q+
z<{crieaaT=`_C-Hr(Q8@NXaigX0@F;;gz6%sk)R|T;Kf2TW6Ekty=k1a6?&j@*S%s
z6<>gUo4n1?XZ@d_&f4wSp?<o|Gcru_neyz8d+)nZ)V}pkd*EB97ioV@+1EU)jeTBV
zdG6PHAme`4SIGs|9{Q5Wbu0!!7j*x1_Eg&D>F0}<{JnHlt%0BK(#vNPf3hAZIk^2+
z|C(yex?RP)AN-!ONX-4f?H#6<Y>cEe{yk(qFxkv#Z+Y2%dF_XBt*c!b-oELSX3(2j
zaXMTs|L<SV&hOejAKV?v*YD4gxmJ7U_QAcPzpNrJF#gG3n|<dpN4aynI=5Ma@U>kv
zoK<smPMl|0zNYl2&=;%735<ItnA+Q=u01`Sb@ttz&#F5%bG+m5*i?6%DgJR>cI-Zu
z9e!dV49Bx$Z!?_xIqzx8!?lxHi&<pWmwpYr2@H{CsdHbqZ}Agz0Y*i?Ebn#3Gr#6N
z-8ZLFZ%OGUg*IR`NF3;TZz&hz@j7Mdf1U}4qo(USu9+Na)gW_ySIx>lR*|Xw4RavO
znJ@V+z52&F;ZW!|{e~&dj1z(xo`^75vO4&UGN~F4|5#VmOa023tQiU{lo&i+{an^L
HB{Ts5W(4?d

diff --git a/assets/player/player.png b/assets/player/player.png
index d0d9131aba61ea14cf6c7658046fde5820e5435b..47b4aa376c8b3640ad989189c3129dd095288e7d 100644
GIT binary patch
delta 353
zcmey)G?`hkGr-TCmrII^fq{Y7)59eQNNa#F2OE&=`L`o?qM~iRf~SjPNJQ(~EB0PT
z97K+PywAP6^@h$5_RSToYguOJe&L9ewzl5e>^hB;ql)!yj!TR0o<@!&)wqLh$JgrU
zntaY-VRcQdOa8tucGAPM?L3_;w1Pr^rA04z_34quRUc2*lK!(<0ee{{tbA2<RX%p<
zjM*$NmVHg)*ul8rPu=PLW%Z@0`E^fj-juXH@Nm&(wmFZO*%>OIyPhj6xRLt&vcp$@
zcBVD8pEG9sZmlh|D?Remd9P;E<oVZDB&?3o>P!CK!8Yyk=f;+AQWI{*PqSOymU#94
zj^3N<uR89=UKY+(uRp+epvS}P=HB(slfM1>#CCk2-}mI66Hi-f_ARrY^#5E#jyYS3
uvBGS|n>;7d9L$(ENlrN1kb^3;m(g`anDI5HS@VFQ#^CAd=d#Wzp$P!E@1O(#

delta 325
zcmV-L0lNN^1NQ<UiBL{Q4GJ0x0000DNk~Le0000W0000e2nGNE0G}!NnUNtqe*{TH
zK~z|U?bN?Y13?hS@$Za@O$Z1UQ9(#4c7lbKU}0~r5G!9JU~$J<iO*oKqH)D1u(1i2
zK7b(RL@aD<cWo>z{BwJpRx{=9>~B9X%Sw!qx|KiqU1FTxpU;l!W=LH?J{hfu=nbGM
zvR=$>jsFd>_vmNa$}Q0USb9)pf3@fho>Q|l^}se~Q*Gt=)8zn*A#mcjZv8o6xojN*
zn_p~gg!1(uH7{uduJl=eb3ndrigCv+WT%Y-Tsc|_=osk!+!^0gWv%E9?yBTg8o}`8
zsvA)M`{e-A2{C$ie>qbnTk^?8{g0r5N`8a}Fn|FJU;qOczyJm?fB_6(8vp|spy_%C
X2=Yi>cco(Y00000NkvXXu0mjfvHgmP

diff --git a/src/main.rs b/src/main.rs
index 13b058b..b24e6f3 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -55,12 +55,22 @@ fn main() {
         .init_resource::<UiState>()
         .init_resource::<OpenWindows>()
         .add_systems(Startup, (setup, setup_ui))
-        .add_systems(Update, (render_ui, movement, camera_follow))
+        .add_systems(Update, (render_ui, movement, camera_follow, player_regen))
         .run();
 }
 
 // Bevy engine setup
 fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
+    commands.spawn(SpriteBundle {
+        texture: asset_server.load("player/player-4x.png"),
+        transform: Transform {
+            scale: Vec3::splat(0.2),
+            ..default()
+        },
+        ..default()
+    });
+
+    // Spawn the 2D camera
     commands.spawn(Camera2dBundle {
         camera: Camera {
             hdr: true,
@@ -69,34 +79,26 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
         tonemapping: Tonemapping::TonyMcMapface,
         ..default()
     });
-    commands.spawn(
-        SpriteBundle {
+
+    // Spawn the player
+    commands
+        .spawn(SpriteBundle {
             texture: asset_server.load("player/player-4x.png"),
             transform: Transform {
                 scale: Vec3::splat(0.2),
                 ..default()
             },
             ..default()
-    });
-    commands.spawn((
-        SpriteBundle {
-            texture: asset_server.load("player/player-4x.png"),
-            transform: Transform {
-                scale: Vec3::splat(0.2),
-                ..default()
-            },
-            ..default()
-        },
-        Player {
+        })
+        .insert(Player {
             movement_speed: 512.,
             rotation_speed: f32::to_radians(360.),
 
-            health: 10.,
+            health: 1.,
             health_max: 10.,
-            stamina: 10.,
+            stamina: 1.,
             stamina_max: 10.,
 
             defence: 40.,
-        },
-    ));
+        });
 }
diff --git a/src/player.rs b/src/player.rs
index 3af183a..f0ba0ac 100644
--- a/src/player.rs
+++ b/src/player.rs
@@ -18,13 +18,25 @@ pub struct Player {
 pub fn movement(
     time: Res<Time>,
     keys: Res<Input<KeyCode>>,
-    mut player: Query<(&Player, &mut Transform)>,
+    mut player_query: Query<(&mut Player, &mut Transform), With<Player>>,
 ) {
-    let (player, mut transform) = player.single_mut();
+    let (mut player, mut transform) = player_query.single_mut();
 
     let mut rotation_factor = 0.;
     let mut movement_factor = 0.;
-    let mut blink_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.;
@@ -38,9 +50,8 @@ pub fn movement(
         rotation_factor -= 1.;
     }
 
-    if keys.pressed(KeyCode::Space) {
-        blink_factor += 4.;
-    }
+    // 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());
@@ -62,15 +73,12 @@ pub fn movement(
     // Get the player's *forward* vector
     let movement_direction = transform.rotation * Vec3::Y;
 
-    // Initialise the movement distance variable (to bring it into scope)
-    let movement_distance: f32;
-
-    if blink_factor == 0. {
+    if lock != true {
         movement_distance = movement_factor * player.movement_speed * time.delta_seconds();
         // Change the player rotation around the Z-axis only if not blinking
         transform.rotate_z(rotation_factor * player.rotation_speed * time.delta_seconds());
     } else {
-        movement_distance = blink_factor * player.movement_speed * 0.01;
+        movement_distance = player.stamina * movement_factor * player.movement_speed * time.delta_seconds();
     }
 
     // Update the player translation with the translation
@@ -90,3 +98,15 @@ pub fn camera_follow(
         camera_transform.translation.y = pos.y;
     }
 }
+
+pub fn player_regen(mut player_query: Query<&mut Player, With<Player>>, time: Res<Time>) {
+    let mut player = player_query.single_mut();
+    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 9c1cb5b..02a3075 100644
--- a/src/ui.rs
+++ b/src/ui.rs
@@ -39,10 +39,10 @@ pub fn render_ui(
     mut windows: Query<&mut Window>,
     mut ui_state: ResMut<UiState>,
     mut open_windows: ResMut<OpenWindows>,
-    mut query: Query<&Player>,
+    mut player_query: Query<&mut Player, With<Player>>,
 ) {
     // Query the player information and put it into scope
-    let player = query.single_mut();
+    let player = player_query.single_mut();
 
     let window = windows.single_mut();
     let window_width = window.resolution.width();
@@ -101,6 +101,7 @@ pub fn render_ui(
                 ui.add_space(window_height / 22.);
             });
         });
+
     egui::CentralPanel::default()
         .frame(egui::containers::Frame {
             fill: egui::Color32::TRANSPARENT,
@@ -111,20 +112,28 @@ pub fn render_ui(
             ui.visuals_mut().menu_rounding = egui::Rounding::ZERO;
             ui.visuals_mut().selection.bg_fill = purple;
 
-            let health =
-                egui::widgets::ProgressBar::new(player.health).desired_width(window_width / 10.);
-            let stamina =
-                egui::widgets::ProgressBar::new(player.stamina).desired_width(window_width / 10.);
-
+            // Show player stats
             egui::Grid::new("Stats")
                 .spacing(egui::Vec2::new(20., 10.))
                 .show(ui, |ui| {
+                    let health_bar = egui::widgets::ProgressBar::new(player.health)
+                        .desired_width(window_width / 10.);
+                    let mut stamina_bar = egui::widgets::ProgressBar::new(player.stamina)
+                        .desired_width(window_width / 10.);
+
+                    // 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));
+                    };
+
+                    // Show the progress bars!
                     ui.label(egui::RichText::new("Health").color(purple));
-                    ui.add(health);
+                    ui.add(health_bar);
                     ui.end_row();
 
                     ui.label(egui::RichText::new("Stamina").color(purple));
-                    ui.add(stamina);
+                    ui.add(stamina_bar);
                     ui.end_row();
                 });
         });