Load new background art and how to play info

game/src/character/mod.rs

@@ -21,6 +21,7 @@ pub enum CharacterState {
 
 #[derive(Debug)]
 pub struct MainCharacter {
+    pub start_position: Vector2,
     pub position: Vector2,
     pub movement_force: Vector2,
     pub base_velocity: Vector2,
@@ -34,6 +35,7 @@ pub struct MainCharacter {
 impl MainCharacter {
     pub fn new(position: Vector2, sprite_sheet: Texture2D) -> Self {
         Self {
+            start_position: position.clone(),
             position,
             movement_force: Vector2::zero(),
             velocity: Vector2::zero(),
@@ -78,7 +80,7 @@ impl MainCharacter {
     }
 
     pub fn reset(&mut self) {
-        self.position = Vector2::new(0.0, 0.0);
+        self.position = self.start_position;
         self.velocity = Vector2::zero();
         self.movement_force = Vector2::zero();
         self.current_state = CharacterState::default();

game/src/scenes/how_to_play_screen.rs

@@ -5,27 +5,31 @@ use dirty_fsm::{Action, ActionFlag};
 use pkg_version::pkg_version_major;
 use raylib::prelude::*;
 
-use crate::{GameConfig, context::GameContext, utilities::{
+use crate::{
+    context::GameContext,
+    utilities::{
         datastore::{load_texture_from_internal_data, ResourceLoadError},
         game_version::get_version_string,
         math::interpolate_exp,
         non_ref_raylib::HackedRaylibHandle,
         render_layer::ScreenSpaceRender,
-    }};
+    },
+    GameConfig,
+};
 
 use super::{Scenes, ScreenError};
 use tracing::{debug, info, trace};
 
 #[derive(Debug)]
 pub struct HowToPlayScreen {
-    is_btm_pressed: bool //Is back to menu button pressed
+    is_btm_pressed: bool, //Is back to menu button pressed
 }
 
 impl HowToPlayScreen {
     /// Construct a new `HowToPlayScreen`
     pub fn new() -> Self {
         Self {
-            is_btm_pressed: false
+            is_btm_pressed: false,
         }
     }
 }
@@ -52,8 +56,7 @@ impl Action<Scenes, ScreenError, GameContext> for HowToPlayScreen {
 
         if self.is_btm_pressed {
             Ok(ActionFlag::SwitchState(Scenes::MainMenuScreen))
-        }
+        } else {
-        else{
             Ok(ActionFlag::Continue)
         }
     }
@@ -69,13 +72,19 @@ impl ScreenSpaceRender for HowToPlayScreen {
     fn render_screen_space(
         &mut self,
         raylib: &mut crate::utilities::non_ref_raylib::HackedRaylibHandle,
-        config: &GameConfig
+        config: &GameConfig,
     ) {
         let screen_size = raylib.get_screen_size();
 
         // Render the background
         raylib.clear_background(Color::BLACK);
-        raylib.draw_rectangle_lines(0, 0, screen_size.x as i32, screen_size.y as i32, config.colors.white);
+        raylib.draw_rectangle_lines(
+            0,
+            0,
+            screen_size.x as i32,
+            screen_size.y as i32,
+            config.colors.white,
+        );
 
         let screen_size = raylib.get_screen_size();
 
@@ -84,89 +93,37 @@ impl ScreenSpaceRender for HowToPlayScreen {
 
         let mouse_pressed: bool = raylib.is_mouse_button_pressed(MouseButton::MOUSE_LEFT_BUTTON);
 
-        raylib.draw_text(
+        //Render the title
-
+        raylib.draw_rgb_split_text(
+            Vector2::new(40.0, 80.0),
             "How to Play",
-            37,
-            80,
             70,
-            Color::BLUE,
+            true,
+            Color::WHITE,
         );
 
-        raylib.draw_text(
+        // Render the instructions
-
+        raylib.draw_rgb_split_text(
-            "How to Play",
+            Vector2::new(100.0, 300.0),
-            43,
+            ">> SPACE to jump\n>> SHIFT to dash\n>> Don't die",
-            80,
+            45,
-            70,
+            true,
-            Color::RED,
-        );
-
-        raylib.draw_text(
-
-            "How to Play",
-            40,
-            80,
-            70,
             Color::WHITE,
         );
 
         //Back to Menu
-        if Rectangle::new(35.0, screen_size.y as f32 - 80.0, 200.0, 40.0).check_collision_point_rec(mouse_position){
+        let hovering_back_button = Rectangle::new(35.0, screen_size.y as f32 - 80.0, 200.0, 40.0)
-            raylib.draw_text(
+        .check_collision_point_rec(mouse_position);
-
+        raylib.draw_rgb_split_text(
-                "BACK TO MENU",
+            Vector2::new(25.0, screen_size.y - 50.0),
-                28,
+            "BACK TO MENU",
-                screen_size.y as i32 - 50,
+            25,
-                25,
+            hovering_back_button,
-                Color::RED,
+            Color::WHITE,
-            );
+        );
-            raylib.draw_text(
+        if hovering_back_button && mouse_pressed {
-
+            self.is_btm_pressed = true;
-                "BACK TO MENU",
-                22,
-                screen_size.y as i32 - 50,
-                25,
-                Color::BLUE,
-            );
-            raylib.draw_text(
-
-                "BACK TO MENU",
-                25,
-                screen_size.y as i32 - 50,
-                25,
-                Color::WHITE,
-            );
-
-            if mouse_pressed{
-                self.is_btm_pressed = true;
-            }
         }
-        else {
-            raylib.draw_text(
 
-                "BACK TO MENU",
-                26,
-                screen_size.y as i32 - 50,
-                25,
-                Color::RED,
-            );
-            raylib.draw_text(
-
-                "BACK TO MENU",
-                24,
-                screen_size.y as i32 - 50,
-                25,
-                Color::BLUE,
-            );
-            raylib.draw_text(
-
-                "BACK TO MENU",
-                25,
-                screen_size.y as i32 - 50,
-                25,
-                Color::WHITE,
-            );
-        }
     }
 }

game/src/scenes/ingame_scene/mod.rs

@@ -117,7 +117,8 @@ impl Action<Scenes, ScreenError, GameContext> for InGameScreen {
         } else if self.player_dead {
 
             // TODO: (luna) make this switch to the death screen plz
-            Ok(ActionFlag::SwitchState(Scenes::FsmErrorScreen))
+            // Ok(ActionFlag::SwitchState(Scenes::FsmErrorScreen))
+            Ok(ActionFlag::Continue)
         } else {
             Ok(ActionFlag::Continue)
         }

game/src/utilities/non_ref_raylib.rs

@@ -1,12 +1,12 @@
 use std::ops::{Deref, DerefMut};
 
+use raylib::prelude::*;
 use raylib::{math::Vector2, prelude::RaylibDraw, RaylibHandle};
 
 #[derive(Debug)]
 pub struct HackedRaylibHandle(RaylibHandle);
 
 impl HackedRaylibHandle {
-
     /// Get the screen size as a vector
     #[inline]
     pub fn get_screen_size(&self) -> Vector2 {
@@ -15,6 +15,33 @@ impl HackedRaylibHandle {
             self.get_screen_height() as f32,
         )
     }
+
+    #[inline]
+    pub fn draw_rgb_split_text(
+        &mut self,
+        position: Vector2,
+        text: &str,
+        font_size: i32,
+        hovering: bool,
+        color: Color,
+    ) {
+        let extra_smudge = if hovering { 2 } else { 0 };
+        self.draw_text(
+            text,
+            position.x as i32 - 1 - extra_smudge,
+            position.y as i32,
+            font_size,
+            Color::BLUE,
+        );
+        self.draw_text(
+            text,
+            position.x as i32 + 1 + extra_smudge,
+            position.y as i32,
+            font_size,
+            Color::RED,
+        );
+        self.draw_text(text, position.x as i32, position.y as i32, font_size, color);
+    }
 }
 
 impl RaylibDraw for HackedRaylibHandle {}