refactor: refactor some code

ShenMian · Jan 16, 2024 · 6654ce6 · 6654ce6
1 parent cdffe0a
commit 6654ce6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/src/main.rs b/src/main.rs
@@ -121,17 +121,11 @@ fn main() {
     );
 
     app.add_systems(
-        OnEnter(AppState::AutomaticSolution),
+        OnEnter(AppState::AutoSolve),
         (spawn_lowerbound_marks, clear_action_state),
     )
-    .add_systems(
-        Update,
-        update_solver.run_if(in_state(AppState::AutomaticSolution)),
-    )
-    .add_systems(
-        OnExit(AppState::AutomaticSolution),
-        despawn_lowerbound_marks,
-    )
+    .add_systems(Update, update_solver.run_if(in_state(AppState::AutoSolve)))
+    .add_systems(OnExit(AppState::AutoSolve), despawn_lowerbound_marks)
     .insert_resource(SolverState::default());
 
     app.add_systems(OnEnter(AppState::AutoCratePush), spawn_crate_pushable_marks)

diff --git a/src/state.rs b/src/state.rs
@@ -4,6 +4,6 @@ use bevy::prelude::*;
 pub enum AppState {
     #[default]
     Main,
-    AutomaticSolution,
+    AutoSolve,
     AutoCratePush,
 }
diff --git a/src/systems/input.rs b/src/systems/input.rs
@@ -327,7 +327,7 @@ pub fn handle_automatic_solution_action(
             *solver = Solver::new(board.level.clone());
             solver.initial(settings.solver.strategy, settings.solver.lower_bound_method);
 
-            next_state.set(AppState::AutomaticSolution);
+            next_state.set(AppState::AutoSolve);
             *timer = std::time::Instant::now();
         } else {
             next_state.set(AppState::Main);
@@ -346,7 +346,7 @@ pub fn spawn_crate_pushable_marks(
 
     let paths = board.level.crate_pushable_paths(crate_position);
 
-    // spawn crate reachable marks
+    // spawn crate pushable marks
     for crate_position in paths.keys().map(|state| state.crate_position).unique() {
         commands.spawn((
             SpriteBundle {