finish player logic

src/gamecore.rs

@@ -18,6 +18,7 @@ pub enum GameState {
     PauseMenu,
     GameQuit,
     InGame,
+    GameEnd
 }
 
 impl fmt::Display for GameState {

src/logic/gameend.rs

@@ -0,0 +1,126 @@
+use raylib::prelude::*;
+
+use crate::{
+    gamecore::{GameCore, GameState},
+    lib::wrappers::audio::player::AudioPlayer,
+};
+
+use super::screen::Screen;
+
+const SCREEN_PANEL_SIZE: Vector2 = Vector2 { x: 300.0, y: 300.0 };
+
+pub struct GameEndScreen {}
+
+impl GameEndScreen {
+    pub fn new() -> Self {
+        Self {}
+    }
+}
+
+impl Screen for GameEndScreen {
+    fn render(
+        &mut self,
+        draw_handle: &mut RaylibDrawHandle,
+        _thread: &RaylibThread,
+        audio_system: &mut AudioPlayer,
+        game_core: &mut GameCore,
+    ) -> Option<GameState> {
+        let mouse_position = draw_handle.get_mouse_position();
+        draw_handle.clear_background(Color::GRAY);
+        // TODO: Maybe we can stick some art here?
+
+
+        // Window dimensions
+        let win_height = draw_handle.get_screen_height();
+        let win_width = draw_handle.get_screen_width();
+
+        // Render the backing to the menu itself
+        draw_handle.draw_rectangle(
+            (win_width / 2) - ((SCREEN_PANEL_SIZE.x as i32 + 6) / 2),
+            (win_height / 2) - ((SCREEN_PANEL_SIZE.y as i32 + 6) / 2),
+            SCREEN_PANEL_SIZE.x as i32 + 6,
+            SCREEN_PANEL_SIZE.y as i32 + 6,
+            Color::BLACK,
+        );
+        draw_handle.draw_rectangle(
+            (win_width / 2) - (SCREEN_PANEL_SIZE.x as i32 / 2),
+            (win_height / 2) - (SCREEN_PANEL_SIZE.y as i32 / 2),
+            SCREEN_PANEL_SIZE.x as i32,
+            SCREEN_PANEL_SIZE.y as i32,
+            Color::WHITE,
+        );
+
+        // Render heading text
+        draw_handle.draw_text(
+            "OUT OF BREATH",
+            (win_width / 2) - 80,
+            (win_height / 2) - (SCREEN_PANEL_SIZE.y as i32 / 2) + 10,
+            40,
+            Color::BLACK,
+        );
+
+
+        // // Close and quit buttons
+        // let bottom_left_button_dimensions = Rectangle {
+        //     x: (win_width as f32 / 2.0) - (SCREEN_PANEL_SIZE.x / 2.0) + 5.0,
+        //     y: (win_height as f32 / 2.0) + (SCREEN_PANEL_SIZE.y / 2.0) - 50.0,
+        //     width: (SCREEN_PANEL_SIZE.x / 2.0) - 15.0,
+        //     height: 40.0,
+        // };
+        // let bottom_right_button_dimensions = Rectangle {
+        //     x: (win_width as f32 / 2.0) + 5.0,
+        //     y: bottom_left_button_dimensions.y,
+        //     width: bottom_left_button_dimensions.width,
+        //     height: bottom_left_button_dimensions.height,
+        // };
+
+        // // Check if the mouse is over either button
+        // let mouse_over_bottom_left_button =
+        //     bottom_left_button_dimensions.check_collision_point_rec(mouse_position);
+        // let mouse_over_bottom_right_button =
+        //     bottom_right_button_dimensions.check_collision_point_rec(mouse_position);
+
+        // // Render buttons
+        // draw_handle.draw_rectangle_lines_ex(
+        //     bottom_left_button_dimensions,
+        //     3,
+        //     match mouse_over_bottom_left_button {
+        //         true => Color::GRAY,
+        //         false => Color::BLACK,
+        //     },
+        // );
+        // draw_handle.draw_text(
+        //     "Quit",
+        //     bottom_left_button_dimensions.x as i32 + 15,
+        //     bottom_left_button_dimensions.y as i32 + 5,
+        //     30,
+        //     Color::BLACK,
+        // );
+        // draw_handle.draw_rectangle_lines_ex(
+        //     bottom_right_button_dimensions,
+        //     3,
+        //     match mouse_over_bottom_right_button {
+        //         true => Color::GRAY,
+        //         false => Color::BLACK,
+        //     },
+        // );
+        // draw_handle.draw_text(
+        //     "Close",
+        //     bottom_right_button_dimensions.x as i32 + 15,
+        //     bottom_right_button_dimensions.y as i32 + 5,
+        //     30,
+        //     Color::BLACK,
+        // );
+
+        // // Handle click actions on the buttons
+        // if draw_handle.is_mouse_button_pressed(MouseButton::MOUSE_LEFT_BUTTON) {
+        //     if mouse_over_bottom_left_button {
+        //         return Some(GameState::GameQuit);
+        //     } else if mouse_over_bottom_right_button {
+        //         return Some(game_core.last_state);
+        //     }
+        // }
+
+        return None;
+    }
+}

src/logic/ingame/mod.rs

@@ -13,7 +13,6 @@ use super::screen::Screen;
 pub enum InGameState {
     BUYING,
     SWIMMING,
-    DEAD,
 }
 
 pub struct InGameScreen {
@@ -79,6 +78,11 @@ impl Screen for InGameScreen {
         // Render the hud
         hud::render_hud(draw_handle, game_core, window_center);
 
+        // Handle player out of breath
+        if game_core.player.breath_percent == 0.0 {
+            return Some(GameState::GameEnd);
+        }
+
         return None;
     }
 }

src/logic/ingame/playerlogic.rs

@@ -51,6 +51,9 @@ pub fn update_player_movement(
             (game_core.player.boost_percent + BOOST_REGEN_PER_SECOND * dt as f32).clamp(0.0, 1.0);
     }
 
+    // Update the player's breath
+    game_core.player.breath_percent = (game_core.player.breath_percent - BREATH_DECREASE_PER_SECOND * dt as f32).clamp(0.0, 1.0);
+
     // Only do this if the mouse is far enough away
     let player_real_movement = game_core.player.direction * speed_multiplier;
     if raw_movement_direction.distance_to(Vector2::zero()) > game_core.player.size.y / 2.0 {

src/logic/mod.rs

@@ -2,4 +2,5 @@ pub mod screen;
 pub mod loadingscreen;
 pub mod mainmenu;
 pub mod pausemenu;
-pub mod ingame;
+pub mod ingame;
+pub mod gameend;

src/main.rs

@@ -9,10 +9,7 @@ mod pallette;
 use gamecore::{GameCore, GameState};
 use lib::{utils::profiler::GameProfiler, wrappers::audio::player::AudioPlayer};
 use log::info;
-use logic::{
+use logic::{gameend::GameEndScreen, ingame::InGameScreen, loadingscreen::LoadingScreen, mainmenu::MainMenuScreen, pausemenu::PauseMenuScreen, screen::Screen};
-    ingame::InGameScreen, loadingscreen::LoadingScreen, mainmenu::MainMenuScreen,
-    pausemenu::PauseMenuScreen, screen::Screen,
-};
 use raylib::prelude::*;
 use world::World;
 
@@ -59,6 +56,7 @@ fn main() {
     let mut main_menu_screen = MainMenuScreen::new();
     let mut pause_menu_screen = PauseMenuScreen::new();
     let mut ingame_screen = InGameScreen::new();
+    let mut game_end_screen = GameEndScreen::new();
 
     // Main rendering loop
     while !raylib.window_should_close() {
@@ -91,6 +89,12 @@ fn main() {
                 &mut audio_system,
                 &mut game_core,
             ),
+            GameState::GameEnd => game_end_screen.render(
+                &mut draw_handle,
+                &raylib_thread,
+                &mut audio_system,
+                &mut game_core,
+            ),
         };
 
         // If needed, update the global state

src/player.rs

@@ -20,7 +20,7 @@ impl Player {
                 x: 11.0 * 4.0,
                 y: 21.0 * 4.0
             },
-            breath_percent: 0.5,
+            breath_percent: 1.0,
             ..Default::default()
 			
         }