From 9d7fffdca02dd72471f8432e2a3d03faf25b3144 Mon Sep 17 00:00:00 2001 From: "Elijah C. Voigt" Date: Mon, 20 May 2024 22:10:39 -0700 Subject: [PATCH] Fixed scoring and disabled vantage for AI mode --- src/ai.rs | 1 + src/display3d.rs | 8 ++++---- src/game.rs | 7 ++++++- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/ai.rs b/src/ai.rs index 6cd8251..d60993b 100644 --- a/src/ai.rs +++ b/src/ai.rs @@ -21,6 +21,7 @@ impl Plugin for AiPlugin { .run_if(in_state(TurnState(Side::A))) .run_if(in_state(TutorialState::None) .or_else(in_state(TutorialState::Empty)) + .or_else(in_state(TutorialState::PieceEnd)) ) ); } diff --git a/src/display3d.rs b/src/display3d.rs index f934a96..00b55f7 100644 --- a/src/display3d.rs +++ b/src/display3d.rs @@ -91,10 +91,10 @@ impl Plugin for Display3dPlugin { .or_else(any_component_removed::()) ), // vantage point camera when playing against AI - vantage_point - .run_if(in_state(GameState::Play)) - .run_if(in_state(PlayState::AiBogo).and_then(in_state(TurnState(Side::B)))) - .run_if(any_component_added::().or_else(any_component_removed::())), + // vantage_point + // .run_if(in_state(GameState::Play)) + // .run_if(in_state(PlayState::AiBogo).and_then(in_state(TurnState(Side::B)))) + // .run_if(any_component_added::().or_else(any_component_removed::())), // vantage point camera when playing against human vantage_point .run_if(in_state(GameState::Play)) diff --git a/src/game.rs b/src/game.rs index ef1a710..f80358f 100644 --- a/src/game.rs +++ b/src/game.rs @@ -37,7 +37,12 @@ impl Plugin for GamePlugin { .run_if(resource_changed::) ) .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( PreUpdate,