✨ states

Author: fabienjuif

src/castles.rs

@@ -9,6 +9,7 @@ use crate::{
     common::Rewards,
     health::Health,
     racks::Rack,
+    states::GameState,
     teams::{Team, Teams},
 };
 
@@ -65,8 +66,8 @@ pub struct CastlesPlugin;
 
 impl Plugin for CastlesPlugin {
     fn build(&self, app: &mut App) {
-        app.add_systems(Startup, setup)
-            .add_systems(PostUpdate, destroy);
+        app.add_systems(OnEnter(GameState::Game), setup)
+            .add_systems(PostUpdate, destroy.run_if(in_state(GameState::Game)));
     }
 }
 

src/main.rs

@@ -6,6 +6,7 @@ mod minions;
 mod physics;
 mod player;
 mod racks;
+mod states;
 mod teams;
 
 use audio::AudioPlugin;
@@ -23,6 +24,7 @@ use minions::MinionsPlugin;
 use physics::PhysicsPlugin;
 use player::LocalPlayerPlugin;
 use racks::RacksPlugin;
+use states::GameState;
 use teams::TeamsPlugin;
 use xxhash_rust::xxh3::xxh3_64;
 
@@ -51,6 +53,9 @@ fn main() {
             }),
         RngPlugin::new().with_rng_seed(xxh3_64(seed)),
         PhysicsPlugin,
+    ))
+    .add_state::<GameState>()
+    .add_plugins((
         TeamsPlugin,
         MinionsPlugin,
         RacksPlugin,
@@ -74,5 +79,20 @@ fn main() {
         gravity: Vec2::new(0.0, 0.0),
         ..default()
     })
+    .insert_resource(GameTimer(Timer::from_seconds(1.0, TimerMode::Once)))
+    .add_systems(Update, countdown)
     .run();
 }
+
+#[derive(Resource, Deref, DerefMut)]
+struct GameTimer(Timer);
+
+fn countdown(
+    mut game_state: ResMut<NextState<GameState>>,
+    time: Res<Time>,
+    mut timer: ResMut<GameTimer>,
+) {
+    if timer.tick(time.delta()).finished() {
+        game_state.set(GameState::Game);
+    }
+}

src/minions.rs

@@ -1,4 +1,4 @@
-use crate::{common::*, health::Health, physics::CollisionEvent, teams::Team};
+use crate::{common::*, health::Health, physics::CollisionEvent, states::GameState, teams::Team};
 use bevy::{
     prelude::*,
     sprite::MaterialMesh2dBundle,
@@ -40,9 +40,13 @@ impl Plugin for MinionsPlugin {
                     check_collisions_minions,
                     decay_life,
                     explosion_damage,
-                ),
+                )
+                    .run_if(in_state(GameState::Game)),
             )
-            .add_systems(PostUpdate, (destroy_minions, destroy_after_timer));
+            .add_systems(
+                PostUpdate,
+                (destroy_minions, destroy_after_timer).run_if(in_state(GameState::Game)),
+            );
     }
 }
 

src/physics.rs

@@ -3,6 +3,8 @@ use std::{collections::HashMap, hash::Hash, hash::Hasher};
 use bevy::prelude::*;
 use bevy_rapier2d::prelude::RapierContext;
 
+use crate::states::GameState;
+
 #[derive(Event)]
 pub enum CollisionEvent {
     /// Event occurring when two colliders start colliding
@@ -77,7 +79,10 @@ impl Plugin for PhysicsPlugin {
     fn build(&self, app: &mut App) {
         app.insert_resource(Collisions::new())
             .add_event::<CollisionEvent>()
-            .add_systems(PostUpdate, check_collisions);
+            .add_systems(
+                PostUpdate,
+                check_collisions.run_if(in_state(GameState::Game)),
+            );
     }
 }
 

src/player.rs

@@ -2,6 +2,7 @@ use crate::common::*;
 use crate::health::Health;
 use crate::physics::CollisionEvent;
 use crate::racks::{RackBundle, RACK_GOLD_VALUE};
+use crate::states::GameState;
 use crate::teams::{Team, Teams};
 use bevy::sprite::MaterialMesh2dBundle;
 use bevy::window::PrimaryWindow;
@@ -76,24 +77,26 @@ pub struct LocalPlayerPlugin;
 
 impl Plugin for LocalPlayerPlugin {
     fn build(&self, app: &mut App) {
-        app.add_systems(Startup, (setup, setup_ui)).add_systems(
-            Update,
-            (
-                // movements
-                update_axes,
-                keyboard_movements,
-                mouse_movements,
-                // actions
-                update_button_values,
-                mouse_actions,
-                keyboard_actions,
-                // others
-                check_collisions_sword,
-                update_ui,
-                update_sword,
-                update_cooldowns,
-            ),
-        );
+        app.add_systems(OnEnter(GameState::Game), (setup, setup_ui))
+            .add_systems(
+                Update,
+                (
+                    // movements
+                    update_axes,
+                    keyboard_movements,
+                    mouse_movements,
+                    // actions
+                    update_button_values,
+                    mouse_actions,
+                    keyboard_actions,
+                    // others
+                    check_collisions_sword,
+                    update_ui,
+                    update_sword,
+                    update_cooldowns,
+                )
+                    .run_if(in_state(GameState::Game)),
+            );
     }
 }
 

src/racks.rs

@@ -12,6 +12,7 @@ use crate::{
     common::Rewards,
     health::Health,
     minions::MinionBundle,
+    states::GameState,
     teams::{Team, Teams},
 };
 
@@ -80,9 +81,9 @@ pub struct RacksPlugin;
 
 impl Plugin for RacksPlugin {
     fn build(&self, app: &mut App) {
-        app.add_systems(Startup, setup)
-            .add_systems(Update, spawn_minions)
-            .add_systems(PostUpdate, destroy);
+        app.add_systems(OnEnter(GameState::Game), setup)
+            .add_systems(Update, spawn_minions.run_if(in_state(GameState::Game)))
+            .add_systems(PostUpdate, destroy.run_if(in_state(GameState::Game)));
     }
 }
 

src/states.rs

@@ -0,0 +1,9 @@
+use bevy::ecs::schedule::States;
+
+#[derive(Clone, Copy, Default, Eq, PartialEq, Debug, Hash, States)]
+pub enum GameState {
+    #[default]
+    Splash,
+    // Pause,
+    Game,
+}