0 16 (#5)

* 0.16- compiling, some stuff is not yet working

* Migration complete

* Game Turns into substate

* observer in children

* Animations for UI

Author: Leinnan

Cargo.lock

@@ -21,28 +21,27 @@ opt-level = 1
 opt-level = 2
 
 [workspace.dependencies]
-bevy = {version = "0.15"}
+bevy = {version = "0.16"}
 serde = { version =  "1", features = ["derive"] }
 serde_json = "1"
 
 [dependencies]
 game_core = {path = "crates/game_core", features = ["bevy"]}
 console_error_panic_hook = "0.1"
-bevy = {workspace = true, default-features = true}
+bevy = {workspace = true, default-features = true, features = ["configurable_error_handler"]}
 serde = {workspace = true}
 serde_json = {workspace = true}
 inline_tweak = "1"
-bevy_tweening = "0.12"
-bevy_pkv = "0.12"
+bevy_tweening = "0.13"
+bevy_pkv = "0.13"
 rand = "0.8"
-bevy_asset_loader = "0.22"
+bevy_asset_loader = "0.23.0-rc.3"
 webbrowser = "1"
-#bevy_ecss = {git = "https://github.com/afonsolage/bevy_ecss.git", rev = "ea1ef7bd5eab5fff289c7426018ecc8ab5669823"}
-bevy_common_assets = { version = "0.12", features = ["json"] }
-bevy_simple_text_input = "0.10"
+bevy_common_assets = { version = "0.13", features = ["json"] }
+bevy_simple_text_input = "0.11"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-bevy-inspector-egui = "0.29"
+bevy-inspector-egui = "0.31"
 #iyes_perf_ui = "0.2"
 
 [target.'cfg(target_arch = "wasm32")'.dependencies.web-sys]

Cargo.toml

@@ -1,6 +1,6 @@
 ![slavic castles logo](https://i.imgur.com/h6HYvQc.png "Slavic Castles Logo")
 
-Card game prototype written in Rust with Bevy 0.15
+Card game prototype written in Rust with Bevy 0.16
 
 itch.io page: [itch.io](https://leinnan.itch.io/slavic-castles)
 Play live here: [wasm version](https://leinnan.github.io/castles_fight/)

README.md

@@ -1,6 +1,6 @@
+use crate::consts;
 #[cfg(feature = "bevy")]
 use bevy::{prelude::Component, reflect::Reflect};
-use crate::consts;
 use serde::{Deserialize, Serialize};
 
 #[derive(Copy, Debug, Clone, Serialize, Deserialize)]

crates/game_core/src/data/player.rs

@@ -1,10 +1,10 @@
-use std::fmt;
 use bevy::app::{App, Plugin};
 use bevy::prelude::*;
 use bevy_inspector_egui::bevy_egui::{egui, EguiContext, EguiPlugin};
 use bevy_inspector_egui::{
     bevy_inspector::hierarchy::SelectedEntities, DefaultInspectorConfigPlugin,
 };
+use std::fmt;
 // use iyes_perf_ui::prelude::*;
 
 // const MY_ACCENT_COLOR32: bevy_inspector_egui::bevy_egui::egui::Color32 =
@@ -57,21 +57,24 @@ pub struct DebugPlugin;
 
 impl Plugin for DebugPlugin {
     fn build(&self, app: &mut App) {
+        app.add_plugins(EguiPlugin {
+            enable_multipass_for_primary_context: false,
+        });
         app.add_systems(Startup, configure_egui);
         app.add_systems(
-            Update,
+            bevy_inspector_egui::bevy_egui::EguiContextPass,
             inspector_ui, //.run_if(not(in_state(crate::states::MainState::Editor))),
         )
         // .add_systems(
         //     Update,
         //     (toggle_perf_ui).run_if(input_just_pressed(KeyCode::F2)),
         // )
-        .add_plugins(bevy::diagnostic::FrameTimeDiagnosticsPlugin)
-        .add_plugins(bevy::diagnostic::EntityCountDiagnosticsPlugin)
-        .add_plugins(bevy::diagnostic::SystemInformationDiagnosticsPlugin)
+        // .add_plugins(bevy::diagnostic::FrameTimeDiagnosticsPlugin)
+        // .add_plugins(bevy::diagnostic::EntityCountDiagnosticsPlugin)
+        // .add_plugins(bevy::diagnostic::SystemInformationDiagnosticsPlugin)
         // .add_plugins(PerfUiPlugin)
         // .insert_resource(bevy_mod_picking::debug::DebugPickingMode::Normal)
-        .add_plugins((EguiPlugin, DefaultInspectorConfigPlugin));
+        .add_plugins(DefaultInspectorConfigPlugin);
     }
 }
 // fn toggle_perf_ui(q: Query<Entity, With<PerfUiRoot>>, mut commands: Commands) {
@@ -128,7 +131,7 @@ fn inspector_ui(
     }
     let Ok(egui_context) = world
         .query_filtered::<&mut EguiContext, With<PrimaryWindow>>()
-        .get_single(world)
+        .single(world)
     else {
         return;
     };

src/base_systems/debug.rs

@@ -1,3 +1,4 @@
+use crate::states::game_states::GameState;
 use bevy::prelude::*;
 
 #[derive(Default, Debug, Reflect, Component)]
@@ -6,7 +7,8 @@ pub struct CurrentActorToken;
 #[derive(Deref, DerefMut, Component, Default, Reflect)]
 pub struct ActorTurn(pub usize);
 
-#[derive(Debug, Hash, PartialEq, Eq, Default, Clone, States)]
+#[derive(Debug, Hash, PartialEq, Eq, Default, Clone, SubStates)]
+#[source(GameState = GameState::Game)]
 pub enum GameTurnSteps {
     #[default]
     SearchForAgents,
@@ -17,21 +19,24 @@ pub enum GameTurnSteps {
 pub fn register_system(app: &mut App) {
     app.register_type::<ActorTurn>()
         .register_type::<CurrentActorToken>()
-        .init_state::<GameTurnSteps>()
+        .add_sub_state::<GameTurnSteps>()
         .add_systems(OnExit(GameTurnSteps::PerformAction), remove_token)
         .add_systems(
             Update,
-            search_for_actors.run_if(in_state(GameTurnSteps::SearchForAgents)),
+            search_for_actors.run_if(
+                in_state(GameTurnSteps::SearchForAgents)
+                    .and(not(crate::states::game::game_ended_condition)),
+            ),
         );
 }
 
 pub fn search_for_actors(
     mut commands: Commands,
     q: Query<(&ActorTurn, Entity)>,
     mut next_state: ResMut<NextState<GameTurnSteps>>,
-) {
+) -> Result {
     if q.is_empty() {
-        return;
+        return Ok(());
     }
 
     let mut lowest_delay = (usize::MAX, Entity::PLACEHOLDER);
@@ -42,19 +47,26 @@ pub fn search_for_actors(
         }
     }
     if lowest_delay.0 < usize::MAX {
-        commands.entity(lowest_delay.1).insert(CurrentActorToken);
+        commands
+            .get_entity(lowest_delay.1)?
+            .insert(CurrentActorToken);
         next_state.set(GameTurnSteps::ActionSelection);
         info!("FOUNDED ACTOR ENTITY {:?}", lowest_delay.1);
     }
+
+    Ok(())
 }
 
 fn remove_token(
     mut commands: Commands,
     mut query: Query<(Entity, &mut ActorTurn), With<CurrentActorToken>>,
 ) {
-    let Ok((entity, mut delay)) = query.get_single_mut() else {
+    warn!("Remove token");
+    let Ok((entity, mut delay)) = query.single_mut() else {
         return;
     };
     delay.0 = **delay + 2;
-    commands.entity(entity).remove::<CurrentActorToken>();
+    if let Ok(mut e) = commands.get_entity(entity) {
+        e.remove::<CurrentActorToken>();
+    }
 }