Fix various bugs

Author: benfrankel

src/game/actor.rs

@@ -30,7 +30,6 @@ use crate::game::actor::movement::MovementController;
 use crate::game::actor::movement::OldMovementController;
 use crate::game::audio::music::Beat;
 use crate::game::card::deck::Deck;
-use crate::game::combat::death::DespawnOnDeath;
 use crate::game::combat::hit::Hurtbox;
 use crate::game::sprite::SpriteAnimation;
 use crate::util::prelude::*;
@@ -142,8 +141,7 @@ impl EntityCommand for Actor {
                     AttackController::default(),
                     self.health,
                     Hurtbox,
-                    // TODO: Death animation instead, despawn when it's finished.
-                    DespawnOnDeath,
+                    // TODO: Death animation.
                 ),
                 // Inventory:
                 (Level::default(), Xp::default(), self.xp_reward, self.deck),

src/game/actor/enemy.rs

@@ -5,6 +5,7 @@ use bevy::prelude::*;
 use crate::game::actor::facing::FacePlayer;
 use crate::game::actor::faction::Faction;
 use crate::game::actor::ActorConfig;
+use crate::game::combat::death::DespawnOnDeath;
 use crate::game::GameLayer;
 use crate::game::GameRoot;
 use crate::util::prelude::*;
@@ -41,6 +42,8 @@ pub fn enemy(key: impl Into<String>) -> impl EntityCommand<World> {
                 Faction::Enemy,
                 CollisionLayers::new(GameLayer::Enemy, LayerMask::ALL),
                 FacePlayer,
+                // TODO: Despawn when death animation is finished, instead.
+                DespawnOnDeath,
             ))
             .set_parent(parent);
     }

src/game/audio/music.rs

@@ -5,6 +5,7 @@ use pyri_state::prelude::*;
 use crate::core::pause::Pause;
 use crate::core::UpdateSet;
 use crate::game::audio::AudioConfig;
+use crate::screen::playing::PlayingAssets;
 use crate::screen::Screen;
 use crate::util::prelude::*;
 
@@ -36,17 +37,22 @@ pub fn stop_music(
     mut audio_instances: ResMut<Assets<AudioInstance>>,
 ) {
     let music = r!(audio_instances.get_mut(&music_handle.0));
-    music.seek_to(0.0);
-    music.pause(AudioTween::default());
+    music.stop(AudioTween::default());
 }
 
 pub fn start_music(
-    music_handle: Res<MusicHandle>,
-    mut audio_instances: ResMut<Assets<AudioInstance>>,
+    config: ConfigRef<AudioConfig>,
+    audio: Res<Audio>,
+    assets: Res<PlayingAssets>,
+    mut music_handle: ResMut<MusicHandle>,
 ) {
-    let music = r!(audio_instances.get_mut(&music_handle.0));
-    music.seek_to(0.0);
-    music.resume(AudioTween::default());
+    let config = r!(config.get());
+    music_handle.0 = audio
+        .play(assets.music.clone())
+        .with_volume(config.music_volume)
+        .loop_from(config.music_loop_start)
+        .loop_until(config.music_loop_end)
+        .handle();
 }
 
 pub fn pause_music(

src/game/combat/death.rs

@@ -40,8 +40,15 @@ impl Configure for DespawnOnDeath {
     }
 }
 
-fn despawn_on_death(trigger: Trigger<OnDeath>, mut despawn: ResMut<LateDespawn>) {
-    despawn.recursive(r!(trigger.get_entity()));
+fn despawn_on_death(
+    trigger: Trigger<OnDeath>,
+    despawn_query: Query<(), With<DespawnOnDeath>>,
+    mut despawn: ResMut<LateDespawn>,
+) {
+    let entity = r!(trigger.get_entity());
+    if despawn_query.contains(entity) {
+        despawn.recursive(entity);
+    }
 }
 
 #[derive(Component, Reflect)]

src/screen/playing.rs

@@ -22,15 +22,14 @@ use crate::game::wave::wave;
 use crate::game::GameRoot;
 use crate::screen::fade_in;
 use crate::screen::playing::hud::playing_hud;
-use crate::screen::playing::victory_menu::reset_endless_mode;
 use crate::screen::Screen;
 use crate::ui::prelude::*;
 use crate::util::prelude::*;
 
 pub(super) fn plugin(app: &mut App) {
     app.add_systems(
         StateFlush,
-        Screen::Playing.on_edge(stop_music, (enter_playing, start_music, reset_endless_mode)),
+        Screen::Playing.on_edge(stop_music, (enter_playing, start_music)),
     );
 
     app.configure::<(PlayingAssets, PlayingAction, PlayingMenu)>();
@@ -127,15 +126,18 @@ impl Configure for PlayingAction {
         app.add_plugins(InputManagerPlugin::<Self>::default());
         app.add_systems(
             StateFlush,
-            PlayingMenu::Pause
-                .toggle()
-                .in_set(ResolveStateSet::<PlayingMenu>::Compute)
-                .run_if(
-                    Screen::Playing
-                        .will_exit()
-                        .and_then(not(PlayingMenu::LevelUp.will_exit()))
-                        .and_then(action_just_pressed(Self::TogglePause)),
-                ),
+            (
+                Screen::Playing.on_exit(PlayingMenu::disable),
+                PlayingMenu::Pause
+                    .toggle()
+                    .in_set(ResolveStateSet::<PlayingMenu>::Compute)
+                    .run_if(
+                        PlayingMenu::is_disabled
+                            .or_else(PlayingMenu::Pause.will_exit())
+                            .and_then(Screen::Playing.will_enter())
+                            .and_then(action_just_pressed(Self::TogglePause)),
+                    ),
+            ),
         );
     }
 }

src/screen/playing/defeat_menu.rs

@@ -5,8 +5,8 @@ use pyri_state::extra::entity_scope::StateScope;
 use pyri_state::prelude::*;
 
 use crate::core::pause::Pause;
-use crate::core::UpdateSet;
 use crate::game::actor::player::IsPlayer;
+use crate::game::combat::death::OnDeath;
 use crate::screen::fade_out;
 use crate::screen::playing::PlayingAssets;
 use crate::screen::playing::PlayingMenu;
@@ -15,29 +15,32 @@ use crate::ui::prelude::*;
 use crate::util::prelude::*;
 
 pub(super) fn plugin(app: &mut App) {
+    app.observe(detect_defeat);
+
     app.add_systems(
         StateFlush,
         PlayingMenu::Defeat.on_edge(Pause::disable, (Pause::enable_default, open_defeat_menu)),
     );
+}
 
-    app.add_systems(
-        Update,
-        PlayingMenu::Defeat
-            .enter()
-            .in_set(UpdateSet::SyncLate)
-            .run_if(detect_defeat),
-    );
+fn detect_defeat(
+    trigger: Trigger<OnDeath>,
+    player_query: Query<(), With<IsPlayer>>,
+    mut playing_menu: NextMut<PlayingMenu>,
+) {
+    let entity = r!(trigger.get_entity());
+    if !player_query.contains(entity) {
+        return;
+    }
+
+    playing_menu.enter(PlayingMenu::Defeat);
 }
 
 fn open_defeat_menu(mut commands: Commands, ui_root: Res<UiRoot>) {
     commands.spawn_with(defeat_overlay).set_parent(ui_root.body);
     commands.spawn_with(defeat_menu).set_parent(ui_root.body);
 }
 
-pub fn detect_defeat(player_query: Query<Entity, With<IsPlayer>>) -> bool {
-    player_query.is_empty()
-}
-
 fn defeat_overlay(mut entity: EntityWorldMut) {
     entity.add(widget::blocking_overlay).insert((
         Name::new("DefeatOverlay"),
@@ -126,7 +129,9 @@ fn restart_button(mut entity: EntityWorldMut) {
 
 fn quit_to_title_button(mut entity: EntityWorldMut) {
     entity.add(widget::menu_button("Quit to title")).insert((
-        On::<Pointer<Click>>::run(Screen::Title.enter()),
+        On::<Pointer<Click>>::run(|mut commands: Commands| {
+            commands.spawn_with(fade_out(Screen::Title));
+        }),
         Style {
             height: Vw(9.0),
             width: Vw(38.0),

src/screen/playing/pause_menu.rs

@@ -51,7 +51,7 @@ fn pause_menu(mut entity: EntityWorldMut) {
         });
 }
 
-const HEADER: &str = "Paused :)";
+const HEADER: &str = "Paused :|";
 
 fn header(mut entity: EntityWorldMut) {
     entity.insert((
@@ -133,7 +133,9 @@ fn restart_button(mut entity: EntityWorldMut) {
 
 fn quit_to_title_button(mut entity: EntityWorldMut) {
     entity.add(widget::menu_button("Quit to title")).insert((
-        On::<Pointer<Click>>::run(Screen::Title.enter()),
+        On::<Pointer<Click>>::run(|mut commands: Commands| {
+            commands.spawn_with(fade_out(Screen::Title));
+        }),
         Style {
             height: Vw(9.0),
             width: Vw(38.0),

src/screen/playing/victory_menu.rs

@@ -7,6 +7,7 @@ use pyri_state::prelude::*;
 use crate::core::pause::Pause;
 use crate::core::UpdateSet;
 use crate::game::actor::level::up::LevelUp;
+use crate::game::actor::level::IsLevelDisplay;
 use crate::game::actor::level::Level;
 use crate::screen::fade_out;
 use crate::screen::playing::PlayingAssets;
@@ -21,7 +22,7 @@ pub(super) fn plugin(app: &mut App) {
         PlayingMenu::Victory.on_edge(Pause::disable, (Pause::enable_default, open_victory_menu)),
     );
 
-    app.init_resource::<EndlessMode>();
+    app.configure::<EndlessMode>();
 
     app.add_systems(
         Update,
@@ -32,28 +33,40 @@ pub(super) fn plugin(app: &mut App) {
     );
 }
 
-#[derive(Default, Resource)]
+pub fn detect_victory(
+    level_display_query: Query<&Selection, With<IsLevelDisplay>>,
+    level_query: Query<&Level>,
+    endless_mode: Res<EndlessMode>,
+) -> bool {
+    let selection = r!(false, level_display_query.get_single());
+    let level = r!(false, level_query.get(selection.0));
+
+    !endless_mode.0 && level.current >= 10
+}
+
+#[derive(Resource, Reflect, Default)]
+#[reflect(Resource)]
 pub struct EndlessMode(bool);
 
+impl Configure for EndlessMode {
+    fn configure(app: &mut App) {
+        app.register_type::<Self>();
+        app.init_resource::<Self>();
+        app.add_systems(StateFlush, Screen::Playing.on_enter(reset_endless_mode));
+    }
+}
+
+fn reset_endless_mode(mut endless_mode: ResMut<EndlessMode>) {
+    endless_mode.0 = false;
+}
+
 fn open_victory_menu(mut commands: Commands, ui_root: Res<UiRoot>) {
     commands
         .spawn_with(victory_overlay)
         .set_parent(ui_root.body);
     commands.spawn_with(victory_menu).set_parent(ui_root.body);
 }
 
-pub fn detect_victory(level_query: Query<&Level>, endless_mode: Res<EndlessMode>) -> bool {
-    if endless_mode.0 {
-        return false;
-    }
-
-    if let Some(level) = level_query.iter().last() {
-        return level.current >= 10;
-    }
-
-    false
-}
-
 fn victory_overlay(mut entity: EntityWorldMut) {
     entity.add(widget::blocking_overlay).insert((
         Name::new("VictoryOverlay"),
@@ -123,10 +136,6 @@ fn button_container(mut entity: EntityWorldMut) {
         });
 }
 
-pub fn reset_endless_mode(mut endless_mode: ResMut<EndlessMode>) {
-    endless_mode.0 = false;
-}
-
 fn keep_playing_button(mut entity: EntityWorldMut) {
     entity.add(widget::menu_button("Keep Playing")).insert((
         On::<Pointer<Click>>::run(
@@ -165,7 +174,9 @@ fn restart_button(mut entity: EntityWorldMut) {
 
 fn quit_to_title_button(mut entity: EntityWorldMut) {
     entity.add(widget::menu_button("Quit to title")).insert((
-        On::<Pointer<Click>>::run(Screen::Title.enter()),
+        On::<Pointer<Click>>::run(|mut commands: Commands| {
+            commands.spawn_with(fade_out(Screen::Title));
+        }),
         Style {
             height: Vw(9.0),
             width: Vw(38.0),