Fixed scoring and disabled vantage for AI mode

main
Elijah C. Voigt 1 year ago
parent 81d90ae837
commit 9d7fffdca0

@ -21,6 +21,7 @@ impl Plugin for AiPlugin {
.run_if(in_state(TurnState(Side::A))) .run_if(in_state(TurnState(Side::A)))
.run_if(in_state(TutorialState::None) .run_if(in_state(TutorialState::None)
.or_else(in_state(TutorialState::Empty)) .or_else(in_state(TutorialState::Empty))
.or_else(in_state(TutorialState::PieceEnd))
) )
); );
} }

@ -91,10 +91,10 @@ impl Plugin for Display3dPlugin {
.or_else(any_component_removed::<Selected>()) .or_else(any_component_removed::<Selected>())
), ),
// vantage point camera when playing against AI // vantage point camera when playing against AI
vantage_point // vantage_point
.run_if(in_state(GameState::Play)) // .run_if(in_state(GameState::Play))
.run_if(in_state(PlayState::AiBogo).and_then(in_state(TurnState(Side::B)))) // .run_if(in_state(PlayState::AiBogo).and_then(in_state(TurnState(Side::B))))
.run_if(any_component_added::<Selected>().or_else(any_component_removed::<Selected>())), // .run_if(any_component_added::<Selected>().or_else(any_component_removed::<Selected>())),
// vantage point camera when playing against human // vantage point camera when playing against human
vantage_point vantage_point
.run_if(in_state(GameState::Play)) .run_if(in_state(GameState::Play))

@ -37,7 +37,12 @@ impl Plugin for GamePlugin {
.run_if(resource_changed::<Score>) .run_if(resource_changed::<Score>)
) )
.add_systems(Update, reset_game.run_if(in_state(GameState::Restart))) .add_systems(Update, reset_game.run_if(in_state(GameState::Restart)))
.add_systems(OnEnter(GameState::Endgame), set_endgame.after(manage_score)) .add_systems(OnEnter(GameState::Endgame),
(
manage_score,
set_endgame.after(manage_score),
)
)
.add_systems(OnExit(GameState::Endgame), clear_endgame) .add_systems(OnExit(GameState::Endgame), clear_endgame)
.add_systems( .add_systems(
PreUpdate, PreUpdate,

Loading…
Cancel
Save