stray files

Author: tyler274

src/menu/pause.rs

@@ -1,20 +1,40 @@
 use crate::menu::{
-    state::GameMenuState,
-    systems::pause_menu::{
-        input_handler::esc_key_system, interactions::pause_menu_action, setup::setup_pause_menu,
-    },
+    // cleanup::despawn_screen, // Commented out - definition not found
+    // components::OnPauseMenuScreen, // Commented out - definition not found
+    state::{AppState, GameMenuState},
 };
 use bevy::prelude::*;
 
-/// Plugin for pause menu functionality
+use super::systems::pause_menu::{
+    // Correct path for systems
+    input_handler::esc_key_system,
+    interactions::pause_menu_action,
+    setup::setup_pause_menu,
+};
+
+/// Plugin for the pause menu
 pub struct PauseMenuPlugin;
 
 impl Plugin for PauseMenuPlugin {
     fn build(&self, app: &mut App) {
         app
-            // Register systems
+            // Enter pause menu setup
             .add_systems(OnEnter(GameMenuState::PauseMenu), setup_pause_menu)
-            .add_systems(Update, (pause_menu_action, esc_key_system));
+            // Systems to run only in the pause menu state and when app is paused
+            .add_systems(
+                Update,
+                (
+                    pause_menu_action,
+                    esc_key_system,
+                )
+                .run_if(in_state(GameMenuState::PauseMenu).and(in_state(AppState::Paused))),
+            )
+            // Exit pause menu cleanup - Commented out
+            // .add_systems(
+            //     OnExit(GameMenuState::PauseMenu),
+            //     despawn_screen::<OnPauseMenuScreen>,
+            // );
+            ;
 
         info!("Pause menu plugin registered");
     }

src/menu/plugin.rs

@@ -17,7 +17,6 @@ use crate::{
         star_of_david::StarOfDavidPlugin,
         state::StateTransitionContext,
         state::{AppState, GameMenuState},
-        state_transitions::setup_settings_transition,
         visibility::MenuVisibilityPlugin,
     },
 };
@@ -39,7 +38,7 @@ impl Plugin for MenuPlugin {
             // .insert_resource(NeedsMainMenuSetup(true))
             .init_resource::<UiHierarchyChecked>()
             // Setup state transitions
-            .add_systems(OnEnter(GameMenuState::Settings), setup_settings_transition)
+            // .add_systems(OnEnter(GameMenuState::Settings), setup_settings_transition)
             // Setup plugins
             .add_plugins((
                 CleanupPlugin,

src/menu/state_transitions.rs

@@ -1,74 +1,8 @@
 use crate::camera::components::GameCamera;
 use crate::cards::Card;
-use crate::menu::settings::SettingsMenuState;
 use crate::menu::state::{GameMenuState, StateTransitionContext};
 use bevy::prelude::*;
 
-/// Set up the transition context for settings menu
-pub fn setup_settings_transition(
-    mut context: ResMut<StateTransitionContext>,
-    current_state: Res<State<GameMenuState>>,
-    mut settings_state: ResMut<NextState<SettingsMenuState>>,
-    settings_current: Res<State<SettingsMenuState>>,
-) {
-    info!(
-        "Setting up settings transition from state: {:?}, from_pause_menu: {}",
-        current_state.get(),
-        context.from_pause_menu
-    );
-
-    info!("Current SettingsMenuState: {:?}", settings_current.get());
-
-    // Always reset from_pause_menu flag when transitioning from MainMenu
-    if *current_state.get() == GameMenuState::MainMenu {
-        info!("Resetting from_pause_menu flag because we're in MainMenu state");
-        context.from_pause_menu = false;
-        // Explicitly set the settings origin to MainMenu
-        info!("Explicitly setting settings_origin to MainMenu");
-        context.settings_origin = Some(GameMenuState::MainMenu);
-    } else if context.from_pause_menu || *current_state.get() == GameMenuState::PauseMenu {
-        // If the flag is set or we're coming from the pause menu, set the origin to PauseMenu
-        info!("Detected transition from pause menu");
-        context.settings_origin = Some(GameMenuState::PauseMenu);
-    } else {
-        // Fall back to checking the current state
-        match current_state.get() {
-            GameMenuState::Settings if context.settings_origin.is_none() => {
-                // If we're already in Settings state but have no origin,
-                // default to main menu
-                info!("Already in Settings state with no origin, defaulting to main menu");
-                context.settings_origin = Some(GameMenuState::MainMenu);
-            }
-            _ => {
-                if context.settings_origin.is_none() {
-                    // Default to main menu if coming from an unexpected state
-                    info!("Entering settings from unexpected state, defaulting to main menu");
-                    context.settings_origin = Some(GameMenuState::MainMenu);
-                } else {
-                    info!(
-                        "Using existing settings origin: {:?}",
-                        context.settings_origin
-                    );
-                }
-            }
-        }
-    }
-
-    // Only set the settings state if we're not already in Main
-    if *settings_current.get() != SettingsMenuState::Main {
-        info!(
-            "Setting SettingsMenuState to Main (was {:?})",
-            settings_current.get()
-        );
-        settings_state.set(SettingsMenuState::Main);
-    } else {
-        info!("Already in SettingsMenuState::Main, not changing state");
-    }
-
-    // Log that we're about to exit this function
-    info!("Completed settings transition setup");
-}
-
 /// Starts the game loading process
 pub fn start_game_loading(
     mut commands: Commands,