This commit is contained in:
2026-03-22 01:24:08 +00:00
parent deb3f741b0
commit 64a69d6a40
4 changed files with 2 additions and 13 deletions
+1 -2
View File
@@ -235,9 +235,8 @@ impl Plugin for PathfindingPlugin {
update_encumbrance, update_encumbrance,
collect_pathfinding_dirty_chunks, collect_pathfinding_dirty_chunks,
invalidate_paths_on_tile_change, invalidate_paths_on_tile_change,
crate::entities::tasks::task_executor_system,
prepare_paths, prepare_paths,
// DEPRECATED: Wandering now handled by Task::Idle in task executor
update_wandering_targets,
movement, movement,
) )
.chain(), .chain(),
-2
View File
@@ -34,8 +34,6 @@ pub fn task_executor_system(
mut completed_writer: MessageWriter<TaskCompleted>, mut completed_writer: MessageWriter<TaskCompleted>,
mut failed_writer: MessageWriter<TaskFailed>, mut failed_writer: MessageWriter<TaskFailed>,
) { ) {
// Create a deterministic RNG from global SEED + time
// This mirrors the forestry.rs pattern - no dependency on bevy_rand plugin
use std::collections::hash_map::DefaultHasher; use std::collections::hash_map::DefaultHasher;
use std::hash::{Hash, Hasher}; use std::hash::{Hash, Hasher};
let mut hasher = DefaultHasher::new(); let mut hasher = DefaultHasher::new();
-2
View File
@@ -43,7 +43,6 @@ pub(super) fn execute_idle(
} }
// Only reset path if target changed or no path exists // Only reset path if target changed or no path exists
// This avoids forcing pathfinding to recompute every frame
if target_changed || ambulatory.current_path.is_none() { if target_changed || ambulatory.current_path.is_none() {
ambulatory.target = Some(Vec3::new( ambulatory.target = Some(Vec3::new(
target.x as f32, target.x as f32,
@@ -53,7 +52,6 @@ pub(super) fn execute_idle(
ambulatory.current_path = None; ambulatory.current_path = None;
ambulatory.path_index = 0; ambulatory.path_index = 0;
} }
// Otherwise: keep existing path, let movement system continue along it
} }
/// Pick a random standable tile within wander radius of origin. /// Pick a random standable tile within wander radius of origin.
+1 -7
View File
@@ -16,12 +16,6 @@ impl Plugin for TasksPlugin {
.add_message::<TaskCompleted>() .add_message::<TaskCompleted>()
.add_message::<TaskFailed>() .add_message::<TaskFailed>()
.add_message::<TaskDropped>() .add_message::<TaskDropped>()
.add_message::<TaskBlocked>() .add_message::<TaskBlocked>();
.add_systems(
FixedUpdate,
task_executor_system
.after(crate::entities::shared_systems::pathfinding::prepare_paths)
.before(crate::entities::shared_systems::pathfinding::movement),
);
} }
} }