jpmschweitzer/settled-reach
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

style(simulation): cargo fmt + fix clippy doc-nested-refdefs warning

Browse Source 
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
jpmschweitzer
2026-04-10 23:57:48 +02:00
co-authored by Claude Opus 4.6
parent cf21904a0f
commit 309c05d441
9 changed files with 39 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/src/simulation/mod.rs
+5 -5
View File
@@ -6,19 +6,16 @@ use bevy_ecs::schedule::IntoScheduleConfigs;
pub mod chunk_streaming;
// Phase sub-plugins (#843)
pub mod economy_plugin;
pub mod input_plugin;
pub mod movement_plugin;
pub mod social_plugin;
pub mod time_plugin;
pub mod contraband;
pub mod conversation;
pub mod dialogue;
pub mod economy;
pub mod economy_plugin;
pub mod examine;
pub mod follow;
pub mod generator;
pub mod input;
pub mod input_plugin;
pub mod interaction;
pub mod inventory;
pub mod knowledge_grant;
@@ -27,6 +24,7 @@ pub mod listening;
pub mod modification;
pub mod monologue;
pub mod movement;
pub mod movement_plugin;
pub mod npc_knowledge_transfer;
pub mod path_follow;
pub mod pathfinding;
@@ -36,12 +34,14 @@ pub mod pressure;
pub mod rng;
pub mod save_io;
pub mod save_state;
pub mod social_plugin;
pub mod sound;
pub mod spatial;
pub mod stance;
pub mod ticker;
pub mod tier;
pub mod time;
pub mod time_plugin;
pub mod triangle;
pub mod zone;
server/src/simulation/movement_plugin.rs
+4 -8
View File
@@ -21,19 +21,15 @@ impl Plugin for MovementPlugin {
(
// Core movement chain (strict sequence)
super::pathfinding::compute_paths,
super::path_follow::follow_paths
.after(super::pathfinding::compute_paths),
super::movement::validate_movement
.after(super::path_follow::follow_paths),
super::path_follow::follow_paths.after(super::pathfinding::compute_paths),
super::movement::validate_movement.after(super::path_follow::follow_paths),
super::path_follow::cleanup_path_blocked
.after(super::movement::validate_movement),
// Post-movement indexing (all after validate_movement, parallel with each other)
super::spatial::sync_spatial_index
.after(super::movement::validate_movement),
super::spatial::sync_spatial_index.after(super::movement::validate_movement),
super::listening::update_listening_focus
.after(super::movement::validate_movement),
super::zone::detect_zone_crossings
.after(super::movement::validate_movement),
super::zone::detect_zone_crossings.after(super::movement::validate_movement),
)
.in_set(TickPhase::Movement),
);
server/src/simulation/time_plugin.rs
+7 -10
View File
@@ -1,9 +1,9 @@
//! Time and streaming plugin — tick advancement, chunk streaming, news ticker.
//!
//! Systems span two phases:
//! - [`TickPhase::PreInput`]: chunk_streaming (loads chunks before input processing)
//! - [`TickPhase::TickAdvance`]: advance_tick (must be last in the pipeline)
//! - [`TickPhase::Snapshot`]: tick_news_ticker (assembles display content)
//! Systems span three phases:
//! - PreInput: chunk_streaming (loads chunks before input processing)
//! - Snapshot: tick_news_ticker (assembles display content)
//! - TickAdvance: advance_tick (must be last in the pipeline)
use bevy_app::prelude::*;
use bevy_ecs::schedule::IntoScheduleConfigs;
@@ -20,18 +20,15 @@ impl Plugin for TimePlugin {
.init_resource::<super::ticker::TickerPool>()
.add_systems(
Update,
super::chunk_streaming::chunk_streaming
.in_set(TickPhase::PreInput),
super::chunk_streaming::chunk_streaming.in_set(TickPhase::PreInput),
)
.add_systems(
Update,
super::ticker::tick_news_ticker
.in_set(TickPhase::Snapshot),
super::ticker::tick_news_ticker.in_set(TickPhase::Snapshot),
)
.add_systems(
Update,
super::time::advance_tick
.in_set(TickPhase::TickAdvance),
super::time::advance_tick.in_set(TickPhase::TickAdvance),
);
}
}