projects/blackout
1
0
Fork 0
Code Pull Requests Projects Releases Wiki Activity

Small ordering/set tweaks.
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Nolan Darilek 2023-03-31 22:40:12 -05:00
parent d415345d2f
commit cbad1648e8
3 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/exploration.rs
View File

@ -399,7 +399,9 @@ where
.register_type::<Explorable>() .register_type::<Explorable>()
.add_plugin(InputManagerPlugin::<ExplorationAction>::default()) .add_plugin(InputManagerPlugin::<ExplorationAction>::default())
.add_system( .add_system(
exploration_changed_announcement::<ExplorationType, MapData>.pipe(error_handler), exploration_changed_announcement::<ExplorationType, MapData>
.pipe(error_handler)
.in_base_set(CoreSet::PostUpdate),
); );
if config.states.is_empty() { if config.states.is_empty() {
app.add_systems(( app.add_systems((

8
src/navigation.rs
View File

@ -417,15 +417,11 @@ where
.register_type::<RotationSpeed>() .register_type::<RotationSpeed>()
.register_type::<Speed>() .register_type::<Speed>()
.add_plugin(InputManagerPlugin::<NavigationAction>::default()) .add_plugin(InputManagerPlugin::<NavigationAction>::default())
.add_system(update_direction.in_base_set(CoreSet::PreUpdate)) .add_systems((update_direction, add_speed).in_base_set(CoreSet::PreUpdate))
.add_systems( .add_systems(
(remove_direction, log_area_descriptions::<State>).in_base_set(CoreSet::PostUpdate), (remove_direction, log_area_descriptions::<State>).in_base_set(CoreSet::PostUpdate),
) )
.add_systems(( .add_systems((tick_snap_timers, speak_direction.pipe(error_handler)));
tick_snap_timers,
speak_direction.pipe(error_handler),
add_speed,
));
if self.states.is_empty() { if self.states.is_empty() {
app.add_systems((controls.in_set(MovementControls), snap.pipe(error_handler)).chain()); app.add_systems((controls.in_set(MovementControls), snap.pipe(error_handler)).chain());
} else { } else {

11
src/sound/icon.rs
View File

@ -202,12 +202,11 @@ where
fn build(&self, app: &mut App) { fn build(&self, app: &mut App) {
app.insert_resource(self.clone()) app.insert_resource(self.clone())
.register_type::<SoundIcon>() .register_type::<SoundIcon>()
.add_system(added) .add_system(added.in_base_set(CoreSet::PreUpdate))
.add_system(update::<S>.in_base_set(CoreSet::PostUpdate)) .add_systems(
.add_system( (exploration_focus_changed, update::<S>)
exploration_focus_changed .chain()
.in_base_set(CoreSet::PostUpdate) .in_base_set(CoreSet::PostUpdate),
.after(update::<S>),
) )
.add_system( .add_system(
exploration_focus_removed exploration_focus_removed