turn debug
This commit is contained in:
parent
4c8929ac68
commit
007ddf56b1
3 changed files with 33 additions and 15 deletions
19
src/turns.rs
19
src/turns.rs
|
|
@ -16,7 +16,7 @@ impl Plugin for TurnSystemPlugin {
|
|||
}
|
||||
|
||||
#[derive(Component)]
|
||||
pub struct TurnBusy(pub bool);
|
||||
pub struct TurnBusy;
|
||||
|
||||
#[derive(Component)]
|
||||
pub struct TurnPreEffect;
|
||||
|
|
@ -38,17 +38,17 @@ pub enum TurnState {
|
|||
|
||||
fn pre_effect_setup(mut commands: Commands, query: Query<Entity, With<TurnPreEffect>>) {
|
||||
for effect in query {
|
||||
commands.entity(effect).insert(TurnBusy(false));
|
||||
commands.entity(effect).insert(TurnBusy);
|
||||
}
|
||||
}
|
||||
fn unit_setup(mut commands: Commands, query: Query<Entity, With<TurnUnit>>) {
|
||||
for unit in query {
|
||||
commands.entity(unit).insert(TurnBusy(false));
|
||||
commands.entity(unit).insert(TurnBusy);
|
||||
}
|
||||
}
|
||||
fn post_effect_setup(mut commands: Commands, query: Query<Entity, With<TurnPostEffect>>) {
|
||||
for effect in query {
|
||||
commands.entity(effect).insert(TurnBusy(false));
|
||||
commands.entity(effect).insert(TurnBusy);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -59,16 +59,7 @@ pub fn try_confirm_turn(mut commands: Commands, turn_state: Res<State<TurnState>
|
|||
}
|
||||
|
||||
fn process_busy_turnables(mut commands: Commands, query: Query<(Entity, &TurnBusy)>) {
|
||||
let mut advance_flag: bool = true;
|
||||
for (turnable, component) in query {
|
||||
if component.0 {
|
||||
commands.entity(turnable).remove::<TurnBusy>();
|
||||
} else {
|
||||
advance_flag = false;
|
||||
}
|
||||
}
|
||||
|
||||
if advance_flag {
|
||||
if query.iter().len() == 0 {
|
||||
commands.run_system_cached(try_advance);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue