Refactor, enable possible dynamic level loading (later)

Cargo.toml

@@ -8,7 +8,7 @@ version = "0.1.0"
 avian2d = { git = "https://github.com/Jondolf/avian", branch = "main" }
 bevy = "0.15.0"
 bevy-inspector-egui = "0.28.0"
-bevy_asset_loader = { features = ["2d"], version = "0.22.0" }
+bevy_asset_loader = { features = ["2d", "standard_dynamic_assets"], version = "0.22.0" }
 bevy_sparse_tilemap = "0.4.0"
 leafwing-input-manager = "0.16.0"
 # Compile low-severity logs out of native builds for performance.

src/dev_tools.rs

@@ -8,10 +8,11 @@ use bevy::{
 };
 use bevy_inspector_egui::quick::WorldInspectorPlugin;
 
-use crate::screens::Screen;
+use crate::{game::Game, screens::Screen};
 
 pub(super) fn plugin(app: &mut App) {
     app.add_systems(Update, log_transitions::<Screen>);
+    app.add_systems(Update, log_transitions::<Game>);
 
     app.add_plugins(DebugUiPlugin);
     app.add_plugins(WorldInspectorPlugin::default().run_if(input_toggle_active(false, TOGGLE_KEY)));

src/game.rs

@@ -0,0 +1,31 @@
+use bevy::prelude::*;
+
+use crate::screens::Screen;
+
+#[derive(SubStates, Clone, PartialEq, Eq, Hash, Debug, Default)]
+#[source(Screen = Screen::InGame)]
+pub enum Game {
+    /// Player has successfully completed the level.
+    Complete,
+    /// Player has failed the level, menu shows with offer to retry or quit.
+    Failed,
+    /// Takes care of loading resources for the level to come, and providing hints to the player.
+    #[default]
+    Intro,
+    /// Player has hit the pause key, pause menu shows.
+    Paused,
+    /// Active gameplay.
+    Playing,
+}
+
+pub fn plugin(app: &mut App) {
+    app.init_state::<Game>();
+    app.enable_state_scoped_entities::<Game>();
+
+    app.add_systems(OnEnter(Game::Intro), init);
+}
+
+fn init(mut next_state: ResMut<NextState<Game>>) {
+    // TODO: later, we can use this state for intro screens and/or resource loading
+    next_state.set(Game::Playing);
+}

src/lib.rs

@@ -1,6 +1,7 @@
 mod assets;
 #[cfg(feature = "dev")]
 mod dev_tools;
+mod game;
 mod screens;
 mod ui;
 
@@ -52,7 +53,7 @@ impl Plugin for GamePlugin {
                 }),
         );
 
-        app.add_plugins((assets::plugin, screens::plugin));
+        app.add_plugins((assets::plugin, screens::plugin, game::plugin));
 
         #[cfg(feature = "dev")]
         app.add_plugins(dev_tools::plugin);

src/screens.rs

@@ -1,19 +1,17 @@
+mod ingame;
 mod loading;
-mod playing;
 mod splash;
 mod title;
 
 use bevy::prelude::*;
 
 pub fn plugin(app: &mut App) {
     app.init_state::<Screen>();
-    app.init_state::<Game>();
     app.enable_state_scoped_entities::<Screen>();
-    app.enable_state_scoped_entities::<Game>();
 
     app.add_plugins((
         loading::plugin,
-        playing::plugin,
+        ingame::plugin,
         splash::plugin,
         title::plugin,
     ));
@@ -23,16 +21,8 @@ pub fn plugin(app: &mut App) {
 pub enum Screen {
     Loading,
     // Over,
-    Playing,
+    InGame,
     #[default]
     Splash,
     Title,
 }
-
-#[derive(SubStates, Clone, PartialEq, Eq, Hash, Debug, Default)]
-#[source(Screen = Screen::Playing)]
-pub enum Game {
-    #[default]
-    Playing,
-    Paused,
-}

src/screens/playing.rs → src/screens/ingame.rs

@@ -1,25 +1,21 @@
 mod pause;
 
+use crate::game::Game;
 use bevy::{input::common_conditions::input_just_pressed, prelude::*};
 
 use crate::screens::Screen;
 
-use super::Game;
-
 pub fn plugin(app: &mut App) {
     app.add_plugins(pause::plugin);
     // app.add_systems(OnEnter(Screen::Playing), spawn_level);
 
     // app.load_resource::<PlayingMusic>();
     // app.add_systems(OnEnter(Screen::Playing), play_gameplay_music);
     // app.add_systems(OnExit(Screen::Playing), stop_music);
-
-    app.add_systems(
-        Update,
-        pause.run_if(in_state(Screen::Playing).and(input_just_pressed(KeyCode::Escape))),
-    );
 }
 
+fn init(mut commands: Commands) {}
+
 // fn spawn_level(mut commands: Commands) {
 // commands.queue(spawn_level_command);
 // }
@@ -58,7 +54,3 @@ pub fn plugin(app: &mut App) {
 //         commands.entity(entity).despawn_recursive();
 //     }
 // }
-
-fn pause(mut game: ResMut<NextState<Game>>) {
-    game.set(Game::Paused);
-}

src/screens/playing/pause.rs → src/screens/ingame/pause.rs

@@ -13,7 +13,11 @@ pub fn plugin(app: &mut App) {
 
     app.add_systems(
         Update,
-        pause.run_if(in_state(Game::Paused).and(input_just_pressed(KeyCode::Escape))),
+        pause.run_if(in_state(Game::Playing).and(input_just_pressed(KeyCode::Escape))),
+    );
+    app.add_systems(
+        Update,
+        unpause.run_if(in_state(Game::Paused).and(input_just_pressed(KeyCode::Escape))),
     );
 }
 
@@ -114,3 +118,6 @@ fn init(mut commands: Commands) {
 fn pause(mut game: ResMut<NextState<Game>>) {
     game.set(Game::Paused);
 }
+fn unpause(mut game: ResMut<NextState<Game>>) {
+    game.set(Game::Playing);
+}

src/screens/title.rs

@@ -39,7 +39,7 @@ fn spawn_title_screen(mut commands: Commands) {
             })
             .observe(
                 |_ev: Trigger<Pointer<Click>>, mut next_state: ResMut<NextState<Screen>>| {
-                    next_state.set(Screen::Playing);
+                    next_state.set(Screen::InGame);
                 },
             );
         });