Merge branch 'master' into levels_update_img

game/assets/configs/application.json

@@ -49,5 +49,5 @@
             188
         ]
     },
-    "animation_fps": 15
+    "animation_fps": 23
 }

game/src/character/mod.rs

@@ -40,13 +40,13 @@ impl MainCharacter {
             movement_force: Vector2::zero(),
             velocity: Vector2::zero(),
             base_velocity: Vector2::new(0.0, GRAVITY_PPS),
-            size: Vector2::new(60.0, 100.0),
+            size: Vector2::new(85.0, 100.0),
             sprite_sheet: AnimatedSpriteSheet::new(
                 sprite_sheet,
-                Vector2::new(300.0, 300.0),
-                3,
-                8,
-                6,
+                Vector2::new(258.0, 277.0),
+                4,
+                15,
+                0,
             ),
             current_state: CharacterState::default(),
             state_set_timestamp: Utc::now(),

game/src/character/render.rs

@@ -22,7 +22,7 @@ pub fn render_character_in_camera_space(
 
     // Calculate the frame ID to render
     let frame_id = match player.current_state {
-        crate::character::CharacterState::Jumping => 4,
+        crate::character::CharacterState::Jumping => 6,
         _ => (frames_since_state_change % player.sprite_sheet.sprite_count as f32).floor() as usize,
     };
 

game/src/scenes/main_menu_screen.rs

@@ -27,7 +27,8 @@ pub struct MainMenuScreen {
     is_htp_pressed: bool,     //Is how to play button pressed
     is_options_pressed: bool, //Is options button pressed
     is_quit_pressed: bool,    //Is quit button pressed
-    level_times: Option<Vec<(usize, (usize, i64))>>
+    level_times: Option<Vec<(usize, (usize, i64))>>,
+    counter: i32,
 }
 
 impl MainMenuScreen {
@@ -38,7 +39,8 @@ impl MainMenuScreen {
             is_htp_pressed: false,
             is_options_pressed: false,
             is_quit_pressed: false,
-            level_times: None
+            level_times: None,
+            counter: 0,
         }
     }
 }
@@ -72,6 +74,7 @@ impl Action<Scenes, ScreenError, GameContext> for MainMenuScreen {
         trace!("execute() called on MainMenuScreen");
         self.render_screen_space(&mut context.renderer.borrow_mut(), &context.config);
 
+        self.counter += 1;
 
         self.level_times = Some(context.player_progress.level_best_times.iter().map(|x| (*x.0, *x.1)).collect::<Vec<(_,_)>>().iter().map(|x| *x).enumerate().collect());
 
@@ -111,6 +114,7 @@ impl Action<Scenes, ScreenError, GameContext> for MainMenuScreen {
         self.is_htp_pressed = false;
         self.is_options_pressed = false;
         self.is_quit_pressed = false;
+        self.counter = 0;
         Ok(())
     }
 }
@@ -178,6 +182,8 @@ impl ScreenSpaceRender for MainMenuScreen {
         );
 
         // Render the title
+        let timer: i32 = get_random_value(50, 400);
+        if self.counter > timer {
             raylib.draw_rgb_split_text(
                 Vector2::new(37.0, 80.0),
                 &format!("[{}]", config.name),
@@ -186,6 +192,20 @@ impl ScreenSpaceRender for MainMenuScreen {
                 Color::WHITE,
             );
 
+            if self.counter > timer + 20 {
+                self.counter = 0;
+            }
+
+        }else{
+            raylib.draw_rgb_split_text(
+                Vector2::new(37.0, 80.0),
+                &format!("[{}]", config.name),
+                70,
+                false,
+                Color::WHITE,
+            );
+        }
+
         // Start Game
         let hovering_start_game =
             Rectangle::new(80.0, 300.0, 170.0, 20.0).check_collision_point_rec(mouse_position);