Feat: Endgame update

.gitattributes

@@ -2,3 +2,4 @@
 *.glb filter=lfs diff=lfs merge=lfs -text
 *.wav filter=lfs diff=lfs merge=lfs -text
 *.mp3 filter=lfs diff=lfs merge=lfs -text
+*.ttf filter=lfs diff=lfs merge=lfs -text

Cargo.toml

@@ -24,6 +24,7 @@ bevy = { version = "0.18.0", features = [
     "3d",
     "wav",
     "mp3",
+    "bevy_ui_debug",
     "bevy_dev_tools",
 ] }
 bevy_atmosphere = { git = "https://github.com/Arthur-Aillet/bevy_atmosphere", branch = "feat/z-up" }

src/debug.rs

@@ -1,10 +1,13 @@
 use avian3d::prelude::{PhysicsDebugPlugin, PhysicsGizmos};
 use bevy::dev_tools::fps_overlay::{FpsOverlayConfig, FpsOverlayPlugin, FrameTimeGraphConfig};
 use bevy::prelude::*;
+use bevy::ui_render::UiDebugOptions;
 use bevy_inspector_egui::bevy_egui::EguiPlugin;
 use bevy_inspector_egui::quick::WorldInspectorPlugin;
 
+use crate::node::OilNode;
 use crate::player::WorldModelCamera;
+use crate::player::marker::PLAYER_PLACE_DIST;
 use crate::settings::Settings;
 use crate::ui::OverlayImage;
 
@@ -31,21 +34,38 @@ impl Plugin for DebugPlugin {
         })
         .add_plugins((EguiPlugin::default(), PhysicsDebugPlugin))
         .add_plugins(WorldInspectorPlugin::new().run_if(if_debug_display))
-        .add_systems(Update, toggle_debug);
+        .add_systems(
+            Update,
+            (
+                toggle_debug,
+                display_oil_nodes_debug.run_if(if_debug_display),
+            ),
+        );
     }
 }
 
-pub fn if_debug_display(settings: Res<Settings>) -> bool {
+fn if_debug_display(settings: Res<Settings>) -> bool {
     settings.debug_display
 }
 
+fn display_oil_nodes_debug(mut gizmos: Gizmos, oil_nodes: Query<&GlobalTransform, With<OilNode>>) {
+    for oil_node in oil_nodes {
+        gizmos.sphere(
+            oil_node.translation(),
+            PLAYER_PLACE_DIST,
+            Color::srgb(1., 0.7, 0.7),
+        );
+    }
+}
+
 fn toggle_debug(
     input: Res<ButtonInput<KeyCode>>,
     mut fps_overlay: ResMut<FpsOverlayConfig>,
     mut cam: Single<(&mut DistanceFog, &mut Projection), With<WorldModelCamera>>,
     mut image_overlay: Single<&mut Visibility, With<OverlayImage>>,
     mut settings: ResMut<Settings>,
     mut store: ResMut<GizmoConfigStore>,
+    mut debug_ui: ResMut<UiDebugOptions>,
 ) {
     if input.just_pressed(KeyCode::F1) {
         fps_overlay.enabled = !fps_overlay.enabled;
@@ -67,6 +87,7 @@ fn toggle_debug(
     } else {
         **image_overlay = Visibility::Visible;
     }
+    debug_ui.enabled = settings.debug && !settings.debug_display;
 
     let phys_config = store.config_mut::<PhysicsGizmos>().0;
     if settings.debug_display == true {

src/ladder.rs

@@ -0,0 +1,146 @@
+use bevy::{light::NotShadowCaster, prelude::*};
+use bevy_sprite3d::Sprite3d;
+
+use crate::{node::OilNodeResource, player::PlayerCamera, ui::CenteredText};
+
+pub struct LadderPlugin;
+
+impl Plugin for LadderPlugin {
+    fn build(&self, app: &mut App) {
+        app.insert_resource(Ladder::default())
+            .add_systems(Startup, load_ladder)
+            .add_systems(Update, spawn_ladder)
+            .add_systems(PostUpdate, game_state)
+            .insert_resource(GameState::default());
+    }
+}
+
+#[derive(Resource, Default)]
+pub struct GameState {
+    current_step: Step,
+    since_last_change: Timer,
+}
+
+#[derive(Default, PartialEq)]
+pub enum Step {
+    #[default]
+    LocateOil,
+    Exit,
+    SorryBuddy,
+}
+
+pub fn game_state(
+    text: Single<(&mut Node, &mut Text), With<CenteredText>>,
+    oil_res: If<Res<OilNodeResource>>,
+    mut game_state: ResMut<GameState>,
+    ladder: Single<&GlobalTransform, With<LadderInteract>>,
+    mut ladder_parent: Single<&mut Transform, With<LadderParent>>,
+    player_cam: Single<&GlobalTransform, With<PlayerCamera>>,
+    time: Res<Time>,
+) {
+    if !game_state.since_last_change.is_finished() {
+        game_state.since_last_change.tick(time.delta());
+    }
+
+    let (mut node, mut text) = text.into_inner();
+
+    if oil_res.nodes_left <= 0 && game_state.current_step == Step::LocateOil {
+        game_state.current_step = Step::Exit;
+        game_state.since_last_change = Timer::from_seconds(10.0, TimerMode::Once);
+
+        node.display = Display::Block;
+        text.0 = "Just get back to the ladder now!".to_string();
+    }
+
+    if game_state.current_step == Step::Exit {
+        if game_state.since_last_change.just_finished() {
+            node.display = Display::None;
+        }
+        if !game_state.since_last_change.is_finished() {
+            ladder_parent.translation += Vec3::Z * 30.0 * time.delta_secs();
+        }
+    }
+
+    if game_state.current_step == Step::Exit
+        && (ladder.translation().xy() - player_cam.translation().xy()).length() <= 7.0
+    {
+        game_state.current_step = Step::SorryBuddy;
+
+        node.display = Display::Block;
+        text.0 = "Sorry buddy... got an order from up there...".to_string();
+    }
+}
+
+#[derive(Resource, Default)]
+pub struct Ladder(Handle<Image>);
+
+#[derive(Component)]
+pub struct LadderInteract;
+
+#[derive(Component)]
+pub struct LadderParent;
+
+fn load_ladder(asset_server: Res<AssetServer>, mut ladder: ResMut<Ladder>) {
+    ladder.0 = asset_server.load("ladder.png");
+}
+
+fn spawn_ladder(
+    asset_server: Res<AssetServer>,
+    ladder: Res<Ladder>,
+    mut commands: Commands,
+    mut loaded: Local<bool>,
+) {
+    if *loaded {
+        return;
+    }
+
+    if !asset_server
+        .get_load_state(ladder.0.id())
+        .is_some_and(|s| s.is_loaded())
+    {
+        return;
+    }
+
+    *loaded = true;
+
+    let mut ladder_parent = commands.spawn((
+        Visibility::Visible,
+        LadderParent,
+        Transform::from_xyz(-72.0, -85.0, 25.)
+            .looking_to(Vec3::Y, Vec3::Z)
+            .with_scale(Vec3::splat(3.)),
+    ));
+
+    ladder_parent.with_child((
+        Sprite3d {
+            pixels_per_metre: 400.,
+            alpha_mode: AlphaMode::Blend,
+            unlit: false,
+            ..default()
+        },
+        Sprite {
+            image: ladder.0.clone(),
+            ..default()
+        },
+        Visibility::Visible,
+        LadderInteract,
+        Transform::from_xyz(0., 0., 0.),
+    ));
+    for i in 1..72 {
+        ladder_parent.with_child((
+            Sprite3d {
+                pixels_per_metre: 400.,
+                alpha_mode: AlphaMode::Blend,
+                unlit: false,
+                ..default()
+            },
+            Sprite {
+                image: ladder.0.clone(),
+                ..default()
+            },
+            NotShadowCaster,
+            Visibility::Visible,
+            Transform::from_xyz(0., i as f32 * 2.24, 0.),
+        ));
+    }
+}

src/main.rs

@@ -1,13 +1,13 @@
 mod debug;
-mod marker;
+mod ladder;
 mod monster;
 mod node;
 mod particle;
 mod player;
 mod settings;
 mod speaker;
 mod ui;
-mod world;
+pub mod world;
 
 use avian3d::{PhysicsPlugins, prelude::Gravity};
 use bevy::prelude::*;
@@ -16,7 +16,7 @@ use bevy_atmosphere::plugin::AtmospherePlugin;
 use particle::ParticlePlugin;
 
 use crate::{
-    debug::DebugPlugin, marker::MarkerPlugin, monster::MonsterPlugin, player::PlayerPlugin,
+    debug::DebugPlugin, ladder::LadderPlugin, monster::MonsterPlugin, player::PlayerPlugin,
     settings::Settings, speaker::SpeakerPlugin, ui::UiPlugin, world::WorldPlugin,
 };
 
@@ -28,8 +28,8 @@ fn main() {
                 .set(ImagePlugin::default_nearest())
                 .set(WindowPlugin {
                     primary_window: Some(Window {
-                        title: "550fathom".into(),
-                        name: Some("550fathom".into()),
+                        title: "550fathoms".into(),
+                        name: Some("550fathoms".into()),
                         ..default()
                     }),
                     ..default()
@@ -51,8 +51,8 @@ fn main() {
             WorldPlugin,
             PlayerPlugin,
             MonsterPlugin,
-            MarkerPlugin,
             SpeakerPlugin,
+            LadderPlugin,
         ))
         .insert_resource(Gravity(Vec3::NEG_Z * 0.3))
         .run();

src/monster.rs

@@ -255,6 +255,6 @@ pub fn spawn_monster(
         PlaybackSettings::LOOP
             .with_spatial(true)
             .with_spatial_scale(SpatialScale::new(0.07))
-            .with_volume(bevy::audio::Volume::Linear(0.2)),
+            .with_volume(bevy::audio::Volume::Linear(0.4)),
     ));
 }