From cb758681ae579b0ef0753c7a25c9ece5ca086d49 Mon Sep 17 00:00:00 2001
From: AmadeusWM <63149896+AmadeusWM@users.noreply.github.com>
Date: Sun, 6 Apr 2025 22:45:12 +0200
Subject: [PATCH] fix border

---
 assets/images/id_card_toolbar.png | Bin 1434 -> 3903 bytes
 src/level_instantiation/mod.rs    |   2 --
 src/player.rs                     |  27 +++++++++++++++++++--------
 src/player/toolbar.rs             |  20 +++++++++++---------
 4 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/assets/images/id_card_toolbar.png b/assets/images/id_card_toolbar.png
index c4bb27a1056982bb750202c2dd52e8c085b6b774..bb3581d9afbb59a337311e0b7607279395a34090 100644
GIT binary patch
literal 3903
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

literal 1434
zcmeAS@N?(olHy`uVBq!ia0y~yV2lA_4xj+T!rI6WKuRImBgmJ5p-PQ`p`nF=;TKS-
z;RORjsR0ASs{{rHs~HRo;stYd1=;{5n3BBRT^Rni_n+Ah<gu4{`ns~eWMSi#6!H}f
z`pUq-67T8a7*cWT?cI%iqNx%M59gLTaA|DY@Kw&|g^tf2!Tc-74rzZ7dgIf;!r>TG
zru&y?rf})`>SqNt^IrWv`RDY9Pv$!5>C=9%-oHok^De{vvY&hR&X4(@aprn>$`Rg9
zX(4l!JdZmQb|@A)KWYOBM8)+VeQbC?_sr*6-@nP-dHn<|imB}0+gf(<GbgbbA!NSg
z-1*P-5}&^wvsqu6^#0&pKU6zlrY(H>G{Q#q^V?&8a?Y%OW4q%zF5_xsy5}FS$(zq;
z@qBN5&(EL7u0K41-Szb{-S3b6d3vw>o8-^hGxohVaT;kaw*T+#v(@+iGJfa(FZBOp
zcyd`0Gz?(wg9ggl{9})f&iH?F|Jn0D^PklvuRD9bdQS2D^Yaj)hNR>5-H10|>;G;I
zuG^RNFAkT_zs{*&_fYZMui~@s&s*$-hdz=ykJ_%uAA9tA@B3#=f2`8f(c=lC^1`pP
z5jDHN-;HTl`@Nzl1rmiQh8*FIeRJMr4l^zT?$3LA;&A1($DJLRX#p6KtEyu@SDW6#
zkqGp^?wwq{^WF?gBUti5vHRNI{0EmR*q>rI`$=S<A`VwgNVk-mnQl3+18WG+ds>kK
z#7bCw3-roF+}^3X^P5laj6BY$*4^K8wA(O$uS1fZ|AV~8*Vq3`ug*VSV~jKWKNacB
z>-$-jTxa$y9A9>M_F3#+PvzYi_xpYxyXU{I-UPRaRXTG0Kl763UEj0)`-3<fA#~wW
z-h1mE3AmD1Y2Cd4hi7cRx6}fE2DE3qvUAz)<h*D8z|u#x#5JNMC9x#cD!C{XNHG{0
z7@6uCnCKdqg%}!J8JSucT4);>SQ!}1(R2Y7bO;T(`6-!cmAEy$E&1aE)Sv;kp(Ham
zwYVfPw*a@EU5R%m1N8`l^yC7STa{E6q%vgYCZ?zA7v!byoGQ=`lxFaB^>bP0l+XkK
D^>le2

diff --git a/src/level_instantiation/mod.rs b/src/level_instantiation/mod.rs
index 41e9564..0543bd2 100644
--- a/src/level_instantiation/mod.rs
+++ b/src/level_instantiation/mod.rs
@@ -531,10 +531,8 @@ impl GameLevel {
         let end_node = self.nodes.get_mut(&self.end_node).unwrap();
         if self.end_node.1 >= self.end_node.0 {
             end_node.north = Side::Connection;
-            end_node.south = Side::Connection;
         } else {
             end_node.east = Side::Connection;
-            end_node.west = Side::Connection;
         }
     }
 
diff --git a/src/player.rs b/src/player.rs
index 53a4792..2437fe1 100644
--- a/src/player.rs
+++ b/src/player.rs
@@ -90,7 +90,7 @@ pub fn plugin(app: &mut App) {
                 handle_input,
                 apply_head_bob,
                 on_resize_system,
-                handle_flashlight,
+                (handle_flashlight, handle_spotlight).chain(),
                 (update_flashlight_button_animation, update_flashlight_charge, update_flashlight_sprite).chain(),
             )
                 .run_if(in_state(GameState::Playing)),
@@ -405,7 +405,7 @@ pub fn apply_head_bob(
 }
 pub fn handle_flashlight(
     player_query: Query<&PlayerAction, With<Player>>,
-    mut flashlight_query: Query<&mut SpotLight, With<SpotlightFlashlight>>,
+    mut flashlight_query: Query<&mut Flashlight>,
     mut flashlight_sprite_query: Query<&mut FlashlightButtonAnimation>,
     audio_assets: Res<AudioAssets>,
     audio: Res<Audio>,
@@ -413,17 +413,30 @@ pub fn handle_flashlight(
     let Ok(action) = player_query.get_single() else {
         return;
     };
-    if *action != PlayerAction::ToggleFlashlight {
+    if *action != PlayerAction::ToggleFlashlight  {
         return;
     }
+    if let Ok(flashlight) = flashlight_query.get_single() {
+        if flashlight.charge < 1.0 {
+            return;
+        }
+    }
     if let Ok(mut animation) = flashlight_sprite_query.get_single_mut() {
         animation.is_pressed = true;
         animation.timer.reset();
     }
-    if let Ok(mut spotlight) = flashlight_query.get_single_mut() {
+    if let Ok(mut flashlight) = flashlight_query.get_single_mut() {
         audio.play(audio_assets.flash_click.clone());
+        flashlight.is_on = !flashlight.is_on;
+    }
+}
 
-        spotlight.intensity = if spotlight.intensity > 0.0 {
+pub fn handle_spotlight(
+    mut spotlight_query: Query<&mut SpotLight, With<SpotlightFlashlight>>,
+    mut flashlight_query: Query<&mut Flashlight>,
+) {
+    if let (Ok(mut spotlight), Ok(flashlight)) = (spotlight_query.get_single_mut(), flashlight_query.get_single_mut()) {
+        spotlight.intensity = if !flashlight.is_on {
             0.0
         } else {
             320_000.0
@@ -468,9 +481,7 @@ pub fn update_flashlight_sprite(
     flashlights: Res<FlashlightAssets>,
 ){
     for (animation, mut image, flashlight) in query.iter_mut() {
-        println!("charge: {}", flashlight.charge);
-        let charge = flashlight.charge.ceil() as i32;
-        println!("charge: {}", charge);
+        let charge = flashlight.charge.round() as i32;
         let sprite_image = match (charge, animation.is_pressed) {
             (4, true) => flashlights.flash_hold_4_pressed.clone(),
             (4, false) => flashlights.flash_hold_4.clone(),
diff --git a/src/player/toolbar.rs b/src/player/toolbar.rs
index 2934a14..200ccd8 100644
--- a/src/player/toolbar.rs
+++ b/src/player/toolbar.rs
@@ -1,5 +1,5 @@
 use bevy::prelude::*;
-use bevy_egui::{EguiContexts, egui};
+use bevy_egui::{egui::{self, Shadow, Stroke}, EguiContexts};
 use std::default::Default;
 
 use crate::{GameState, interaction::Interact, util::single};
@@ -54,12 +54,14 @@ fn bottom_panel(
     });
 
     egui::TopBottomPanel::bottom("inventory_toolbar")
+        .show_separator_line(false)
         .frame(egui::Frame {
             fill: egui::Color32::from_rgba_premultiplied(0, 0, 0, 0),
             // Removed the stroke/border by setting it to none
             stroke: egui::Stroke::NONE,
             outer_margin: egui::epaint::Margin::same(0),
             inner_margin: egui::epaint::Margin::same(0),
+            shadow: Shadow::NONE,
             ..Default::default()
         })
         .show(egui_ctx.ctx_mut(), |ui| {
@@ -71,8 +73,8 @@ fn bottom_panel(
 
                     // Create a frame for the slot
                     let slot_frame = egui::Frame {
-                        fill: egui::Color32::from_rgba_premultiplied(75, 75, 75, 100),
-                        stroke: egui::Stroke::new(2.0, egui::Color32::WHITE),
+                        fill: egui::Color32::from_rgba_premultiplied(10, 10, 10, 100),
+                        stroke: Stroke::NONE,
                         ..Default::default()
                     };
 
@@ -88,15 +90,15 @@ fn bottom_panel(
                                             ));
                                         }
                                         None => {
-                                            ui.label(egui::RichText::new("Empty").size(12.0));
+                                            // ui.label(egui::RichText::new("Empty").size(12.0));
                                             return;
                                         }
                                     }
-                                    ui.label(
-                                        egui::RichText::new(name)
-                                            .color(egui::Color32::WHITE)
-                                            .size(12.0),
-                                    );
+                                    // ui.label(
+                                    //     egui::RichText::new(name)
+                                    //         .color(egui::Color32::WHITE)
+                                    //         .size(12.0),
+                                    // );
                                 });
                             });
                             ui.allocate_response(ui.available_size(), egui::Sense::click())