From 9381742e823da6cd9957346c1ebaf06e1320b4e5 Mon Sep 17 00:00:00 2001
From: Arthur-Aillet <arthur.aillet@epitech.eu>
Date: Sun, 8 Feb 2026 19:51:15 +0100
Subject: [PATCH 01/19] feat: first spil + gameplay and pos tweaks

---
 assets/oilspil.png     |  4 +--
 src/node.rs            | 66 +++++++++++++++++++++++++++++++++++++-----
 src/player/movement.rs |  4 +--
 src/player/spawn.rs    |  2 +-
 src/world.rs           | 28 ++++++++++--------
 5 files changed, 79 insertions(+), 25 deletions(-)

diff --git a/assets/oilspil.png b/assets/oilspil.png
index 1b2f6e6..a1ef59b 100644
--- a/assets/oilspil.png
+++ b/assets/oilspil.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8aec93fe5999935aa6a842902f956374f160bd7da613c76dcef259c36a5c35c2
-size 9899
+oid sha256:1e861252f77219347a2ef0006893f30a2d140a92b6d72fae60ed40a42cc81829
+size 9761
diff --git a/src/node.rs b/src/node.rs
index 731281a..688eb82 100644
--- a/src/node.rs
+++ b/src/node.rs
@@ -1,4 +1,7 @@
-use bevy::prelude::*;
+use std::f32::consts::PI;
+
+use bevy::{light::NotShadowCaster, prelude::*};
+use bevy_sprite3d::Sprite3d;
 
 #[derive(Component)]
 pub struct OilNode;
@@ -8,11 +11,58 @@ pub struct OilNodeResource {
     pub nodes_left: usize,
 }
 
-pub fn spawn_world_nodes(mut commands: Commands) {
-    commands.spawn_batch([
-        (OilNode, Transform::from_xyz(-62.0, -81.0, 22.0)),
-        (OilNode, Transform::from_xyz(-42.0, -81.0, 22.0)),
-        (OilNode, Transform::from_xyz(-42.0, -61.0, 22.0)),
-        (OilNode, Transform::from_xyz(0.0, 0.0, 22.0)),
-    ]);
+#[derive(Resource, Default)]
+pub struct OilAsset(Handle<Image>);
+
+pub fn load_oil(asset_server: Res<AssetServer>, mut oil: ResMut<OilAsset>) {
+    oil.0 = asset_server.load("oilspil.png");
+}
+
+pub fn spawn_world_nodes(
+    mut commands: Commands,
+    oil: Res<OilAsset>,
+    asset_server: Res<AssetServer>,
+    mut loaded: Local<bool>,
+) {
+    if *loaded {
+        return;
+    }
+
+    if !asset_server
+        .get_load_state(oil.0.id())
+        .is_some_and(|s| s.is_loaded())
+    {
+        return;
+    }
+    *loaded = true;
+
+    for transform in [
+        Transform::from_xyz(-62.0, -81.0, 22.15).with_rotation(Quat::from_euler(
+            EulerRot::XYZ,
+            4.5 * PI / 180.,
+            4.5 * PI / 180.,
+            0.,
+        )),
+        Transform::from_xyz(-42.0, -81.0, 22.0),
+        Transform::from_xyz(-42.0, -61.0, 22.0),
+        Transform::from_xyz(0.0, 0.0, 22.0),
+    ] {
+        commands.spawn((
+            Sprite3d {
+                pixels_per_metre: 400.,
+                alpha_mode: AlphaMode::Blend,
+                unlit: true,
+                // pivot: Some(Vec2::new(0.5, 0.5)),
+                ..default()
+            },
+            Sprite {
+                image: oil.0.clone(),
+                ..default()
+            },
+            NotShadowCaster,
+            Visibility::Visible,
+            OilNode,
+            transform.with_scale(Vec3::splat(20.)),
+        ));
+    }
 }
diff --git a/src/player/movement.rs b/src/player/movement.rs
index 453ac2d..9d749a4 100644
--- a/src/player/movement.rs
+++ b/src/player/movement.rs
@@ -7,7 +7,7 @@ use crate::{
 };
 
 /// Acceleration in m/s^2
-pub const PLAYER_ACCELERATION: f32 = 160.0 / 3.6;
+pub const PLAYER_ACCELERATION: f32 = 220.0 / 3.6;
 
 /// Velocity in m/s calculated from km/h
 pub const PLAYER_MAX_SPEED: f32 = 2.9 / 3.6;
@@ -15,7 +15,7 @@ pub const PLAYER_MAX_SPEED: f32 = 2.9 / 3.6;
 pub const PLAYER_MAX_SPEED_2: f32 = PLAYER_MAX_SPEED * PLAYER_MAX_SPEED;
 
 // Effective gravity in m/s^2 in Z
-pub const PLAYER_BUOYANCY: f32 = -10.;
+pub const PLAYER_BUOYANCY: f32 = -20.;
 
 // Jump velocity
 pub const PLAYER_JUMP_IMPULSE: f32 = 0.4;
diff --git a/src/player/spawn.rs b/src/player/spawn.rs
index 824c50c..c05e8db 100644
--- a/src/player/spawn.rs
+++ b/src/player/spawn.rs
@@ -89,7 +89,7 @@ pub fn spawn_player(mut commands: Commands) {
             playercast,
             avian3d::dynamics::prelude::RigidBody::Kinematic,
             LinearVelocity::default(),
-            Transform::from_xyz(-62.0, -81.0, 22.0),
+            Transform::from_xyz(-72.0, -83.0, 65.0),
             Visibility::default(),
         ))
         .add_child(camera);
diff --git a/src/world.rs b/src/world.rs
index 7982ef1..358b66c 100644
--- a/src/world.rs
+++ b/src/world.rs
@@ -5,7 +5,10 @@ use bevy::{light::NotShadowCaster, prelude::*};
 use bevy_atmosphere::prelude::*;
 use bevy_sprite3d::prelude::*;
 
-use crate::{node::spawn_world_nodes, player::PLAYER_FLOOR_LAYER};
+use crate::{
+    node::{OilAsset, load_oil, spawn_world_nodes},
+    player::PLAYER_FLOOR_LAYER,
+};
 
 pub struct WorldPlugin;
 
@@ -19,11 +22,12 @@ impl Plugin for WorldPlugin {
                     load_ladder,
                     setup_world,
                     play_background_audio,
-                    spawn_world_nodes,
+                    load_oil,
                 ),
             )
-            .add_systems(Update, (spawn_ground, spawn_world))
-            .insert_resource(Ladder::default());
+            .add_systems(Update, (spawn_ground, spawn_world, spawn_world_nodes))
+            .insert_resource(Ladder::default())
+            .insert_resource(OilAsset::default());
     }
 }
 
@@ -95,7 +99,7 @@ fn spawn_world(
 
     let mut ladder_parent = commands.spawn((
         Visibility::Visible,
-        Transform::from_xyz(-62.0, -83.0, 25.5)
+        Transform::from_xyz(-72.0, -85.0, 25.)
             .looking_to(Vec3::Y, Vec3::Z)
             .with_scale(Vec3::splat(3.)),
     ));
@@ -137,7 +141,7 @@ fn spawn_world(
     commands.spawn((
         Mesh3d(meshes.add(Capsule3d::default().mesh().latitudes(7).longitudes(7))),
         MeshMaterial3d(materials.add(Color::srgb_u8(165, 42, 42))),
-        Transform::from_xyz(-62.0, -83.0, 500.0).with_scale(Vec3::splat(14.)),
+        Transform::from_xyz(-72.0, -85.0, 500.0).with_scale(Vec3::splat(14.)),
         NotShadowCaster,
     ));
     let mut light_mat = StandardMaterial::default();
@@ -150,32 +154,32 @@ fn spawn_world(
     commands.spawn((
         SpotLight {
             color: Color::srgb_u8(255, 252, 220),
-            intensity: 200000000000_f32,
+            intensity: 100000000000_f32,
             range: 500.0,
             radius: 0.5,
             shadows_enabled: true,
-            outer_angle: PI / 2.0 * 0.013,
+            outer_angle: PI / 2.0 * 0.01,
             ..Default::default()
         },
-        Transform::from_xyz(-62.0, -83.0, 493.0).looking_to(-Vec3::Z, Vec3::Z),
+        Transform::from_xyz(-72.0, -85.0, 493.0).looking_to(-Vec3::Z, Vec3::Z),
     ));
     commands.spawn((
         Mesh3d(light_mesh.clone()),
         MeshMaterial3d(materials.add(light_mat.clone())),
         NotShadowCaster,
-        Transform::from_xyz(-62.0, -89.0, 493.0).with_scale(Vec3::splat(2.)),
+        Transform::from_xyz(-72.0, -91.0, 493.0).with_scale(Vec3::splat(2.)),
     ));
     commands.spawn((
         Mesh3d(light_mesh.clone()),
         MeshMaterial3d(materials.add(light_mat.clone())),
         NotShadowCaster,
-        Transform::from_xyz(-59.0, -78.0, 493.0).with_scale(Vec3::splat(2.)),
+        Transform::from_xyz(-69.0, -80.0, 493.0).with_scale(Vec3::splat(2.)),
     ));
     commands.spawn((
         Mesh3d(light_mesh),
         MeshMaterial3d(materials.add(light_mat)),
         NotShadowCaster,
-        Transform::from_xyz(-65.0, -78.0, 493.0).with_scale(Vec3::splat(2.)),
+        Transform::from_xyz(-75.0, -80.0, 493.0).with_scale(Vec3::splat(2.)),
     ));
 }
 

From 6e54a009ae3e2a1bcf5f09a19e0b87a8e7f16006 Mon Sep 17 00:00:00 2001
From: Arthur-Aillet <arthur.aillet@epitech.eu>
Date: Sun, 8 Feb 2026 20:29:59 +0100
Subject: [PATCH 02/19] feat: spils placed

---
 src/node.rs            | 30 +++++++++++++++++++++++-------
 src/player/movement.rs | 17 ++++++++++-------
 2 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/src/node.rs b/src/node.rs
index 688eb82..9511de7 100644
--- a/src/node.rs
+++ b/src/node.rs
@@ -37,17 +37,33 @@ pub fn spawn_world_nodes(
     *loaded = true;
 
     for transform in [
-        Transform::from_xyz(-62.0, -81.0, 22.15).with_rotation(Quat::from_euler(
+        Transform::from_xyz(-62.5, -80.9, 22.16).with_rotation(Quat::from_euler(
             EulerRot::XYZ,
-            4.5 * PI / 180.,
-            4.5 * PI / 180.,
+            0.0783,
+            0.068,
+            0.,
+        )),
+        Transform::from_xyz(-130., 74., 52.9).with_rotation(Quat::from_euler(
+            EulerRot::XYZ,
+            0.3,
+            -0.03,
+            0.,
+        )),
+        Transform::from_xyz(-186.7, -111., 53.6).with_rotation(Quat::from_euler(
+            EulerRot::XYZ,
+            -0.34,
+            -0.06,
+            0.,
+        )),
+        Transform::from_xyz(173.4, 46.4, 16.7).with_rotation(Quat::from_euler(
+            EulerRot::XYZ,
+            0.19,
+            -0.07,
             0.,
         )),
-        Transform::from_xyz(-42.0, -81.0, 22.0),
-        Transform::from_xyz(-42.0, -61.0, 22.0),
-        Transform::from_xyz(0.0, 0.0, 22.0),
     ] {
         commands.spawn((
+            Name::new("Decal"),
             Sprite3d {
                 pixels_per_metre: 400.,
                 alpha_mode: AlphaMode::Blend,
@@ -62,7 +78,7 @@ pub fn spawn_world_nodes(
             NotShadowCaster,
             Visibility::Visible,
             OilNode,
-            transform.with_scale(Vec3::splat(20.)),
+            transform.with_scale(Vec3::splat(40.)),
         ));
     }
 }
diff --git a/src/player/movement.rs b/src/player/movement.rs
index 9d749a4..802d8f9 100644
--- a/src/player/movement.rs
+++ b/src/player/movement.rs
@@ -1,5 +1,5 @@
 use avian3d::{math::PI, prelude::*};
-use bevy::{input::mouse::AccumulatedMouseMotion, prelude::*};
+use bevy::{input::mouse::AccumulatedMouseMotion, prelude::*, window::CursorOptions};
 
 use crate::{
     player::{Player, PlayerCamera},
@@ -129,6 +129,7 @@ pub fn move_op(
 }
 
 pub fn move_player(
+    cursor_options: Single<&CursorOptions>,
     time: Res<Time>,
     inputs: Res<ButtonInput<KeyCode>>,
     accumulated_mouse_motion: Res<AccumulatedMouseMotion>,
@@ -144,12 +145,14 @@ pub fn move_player(
 
     player_transform.translation += velocity.0 * time.delta_secs();
 
-    move_player_camera(
-        &accumulated_mouse_motion.delta,
-        &mut player_transform,
-        &mut camera_transform,
-        settings.camera_sensitivity,
-    );
+    if cursor_options.visible == false {
+        move_player_camera(
+            &accumulated_mouse_motion.delta,
+            &mut player_transform,
+            &mut camera_transform,
+            settings.camera_sensitivity,
+        );
+    }
 
     let mut wishdir = get_wishdir(&inputs, &settings.inputs);
 

From 58840c5a6a70252e989f3340fe73f5677cbff7ae Mon Sep 17 00:00:00 2001
From: Arthur-Aillet <arthur.aillet@epitech.eu>
Date: Sun, 8 Feb 2026 21:10:14 +0100
Subject: [PATCH 03/19] feat: removed ground layer, speaker have gravity

---
 src/main.rs          |  3 ++-
 src/monster.rs       |  4 ++--
 src/player/action.rs |  1 +
 src/player/mod.rs    |  2 --
 src/player/spawn.rs  |  4 ++--
 src/speaker.rs       | 16 ++++++++++++----
 src/world.rs         |  8 +++-----
 7 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index b9fa638..70478cb 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -9,7 +9,7 @@ mod speaker;
 mod ui;
 mod world;
 
-use avian3d::PhysicsPlugins;
+use avian3d::{PhysicsPlugins, prelude::Gravity};
 use bevy::prelude::*;
 use bevy_aspect_ratio_mask::{AspectRatioMask, AspectRatioPlugin, Resolution};
 use bevy_atmosphere::plugin::AtmospherePlugin;
@@ -54,5 +54,6 @@ fn main() {
             MarkerPlugin,
             SpeakerPlugin,
         ))
+        .insert_resource(Gravity(Vec3::NEG_Z * 0.3))
         .run();
 }
diff --git a/src/monster.rs b/src/monster.rs
index 364d33e..2f8d5c3 100644
--- a/src/monster.rs
+++ b/src/monster.rs
@@ -21,7 +21,7 @@ use bevy::{
     transform::components::Transform,
 };
 
-use crate::{player::PLAYER_FLOOR_LAYER, speaker::Speaker};
+use crate::speaker::Speaker;
 
 const MONSTER_GRAVITY: f32 = 5.0;
 
@@ -195,7 +195,7 @@ pub fn spawn_monster(
     let floor_cast = RayCaster::new(Vec3::Z * MONSTER_RAY_PRE_LEN, Dir3::NEG_Z)
         .with_max_hits(1)
         .with_query_filter(SpatialQueryFilter {
-            mask: LayerMask::NONE | PLAYER_FLOOR_LAYER,
+            mask: LayerMask::ALL,
             excluded_entities: Default::default(),
         });
 
diff --git a/src/player/action.rs b/src/player/action.rs
index 574622f..9d95992 100644
--- a/src/player/action.rs
+++ b/src/player/action.rs
@@ -1,5 +1,6 @@
 use std::ops::{Add, Sub};
 
+use avian3d::prelude::{RigidBody, RigidBodyDisabled};
 use bevy::prelude::*;
 
 use crate::{
diff --git a/src/player/mod.rs b/src/player/mod.rs
index 70ebb75..ecade6d 100644
--- a/src/player/mod.rs
+++ b/src/player/mod.rs
@@ -36,8 +36,6 @@ pub struct PlayerFloorCast;
 #[derive(Debug, Component)]
 pub struct WorldModelCamera;
 
-pub const PLAYER_FLOOR_LAYER: u32 = 2;
-
 pub struct PlayerPlugin;
 
 impl Plugin for PlayerPlugin {
diff --git a/src/player/spawn.rs b/src/player/spawn.rs
index c05e8db..38c0de8 100644
--- a/src/player/spawn.rs
+++ b/src/player/spawn.rs
@@ -13,7 +13,7 @@ use avian3d::prelude::{LayerMask, LinearVelocity, RayCaster, SpatialQueryFilter}
 
 use crate::player::flashlight::Flashlight;
 use crate::player::movement::FLOOR_RAY_PRE_LEN;
-use crate::player::{PLAYER_FLOOR_LAYER, Player, PlayerCamera, WorldModelCamera};
+use crate::player::{Player, PlayerCamera, WorldModelCamera};
 
 pub fn spawn_player(mut commands: Commands) {
     let camera = commands
@@ -76,7 +76,7 @@ pub fn spawn_player(mut commands: Commands) {
         .with_max_distance(FLOOR_RAY_PRE_LEN)
         .with_max_hits(1)
         .with_query_filter(SpatialQueryFilter {
-            mask: LayerMask::NONE | PLAYER_FLOOR_LAYER,
+            mask: LayerMask::ALL,
             excluded_entities: Default::default(),
         });
 
diff --git a/src/speaker.rs b/src/speaker.rs
index 6ad42d6..21a31d0 100644
--- a/src/speaker.rs
+++ b/src/speaker.rs
@@ -1,4 +1,4 @@
-use avian3d::prelude::LinearVelocity;
+use avian3d::prelude::*;
 use bevy::math::FloatPow;
 use bevy::prelude::*;
 
@@ -109,9 +109,9 @@ fn spawn_speaker(
         SceneRoot(gltf.scenes[0].clone()),
         Pickup,
         Speaker::default(),
-        avian3d::dynamics::prelude::RigidBody::Kinematic,
-        LinearVelocity::default(),
-        Transform::from_xyz(-64.0, -81.0, 22.25),
+        Collider::cuboid(0.9, 0.75, 1.5),
+        RigidBody::Dynamic,
+        Transform::from_xyz(-64.0, -81.0, 22.5),
     ));
 }
 
@@ -202,6 +202,10 @@ pub fn ungrab(
     *tm = player_tm.compute_transform();
     // commands.entity(entity).remove::<ChildOf>();
     commands.entity(player).detach_child(entity);
+    commands
+        .entity(entity)
+        .remove::<RigidBodyDisabled>()
+        .remove::<GravityScale>();
 }
 
 pub fn grab(commands: &mut Commands, entity: Entity, tm: &mut Transform, player: Entity) {
@@ -212,4 +216,8 @@ pub fn grab(commands: &mut Commands, entity: Entity, tm: &mut Transform, player:
         0.0,
     ));
     commands.entity(player).add_child(entity);
+    commands
+        .entity(entity)
+        .insert(RigidBodyDisabled)
+        .insert(GravityScale(0.));
 }
diff --git a/src/world.rs b/src/world.rs
index 358b66c..7b81c2b 100644
--- a/src/world.rs
+++ b/src/world.rs
@@ -5,10 +5,7 @@ use bevy::{light::NotShadowCaster, prelude::*};
 use bevy_atmosphere::prelude::*;
 use bevy_sprite3d::prelude::*;
 
-use crate::{
-    node::{OilAsset, load_oil, spawn_world_nodes},
-    player::PLAYER_FLOOR_LAYER,
-};
+use crate::node::{OilAsset, load_oil, spawn_world_nodes};
 
 pub struct WorldPlugin;
 
@@ -201,7 +198,8 @@ fn spawn_ground(
                 commands.entity(e).insert((
                     ColliderConstructor::TrimeshFromMesh,
                     NotShadowCaster,
-                    CollisionLayers::new(PLAYER_FLOOR_LAYER, 0),
+                    RigidBody::Static,
+                    CollisionMargin(1.),
                 ));
             }
         }

From 3e6258e4a7ab9ea9e7744784c6d97e1bf15f2ad2 Mon Sep 17 00:00:00 2001
From: Arthur-Aillet <arthur.aillet@epitech.eu>
Date: Sun, 8 Feb 2026 21:21:18 +0100
Subject: [PATCH 04/19] feat: speaker dont clip

---
 src/speaker.rs | 6 +++++-
 src/world.rs   | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/speaker.rs b/src/speaker.rs
index 21a31d0..9bfb695 100644
--- a/src/speaker.rs
+++ b/src/speaker.rs
@@ -200,16 +200,19 @@ pub fn ungrab(
     player: Entity,
 ) {
     *tm = player_tm.compute_transform();
+    tm.translation.z += 0.7;
+    tm.translation += player_tm.up() * 0.5;
     // commands.entity(entity).remove::<ChildOf>();
     commands.entity(player).detach_child(entity);
     commands
         .entity(entity)
+        .remove::<ColliderDisabled>()
         .remove::<RigidBodyDisabled>()
         .remove::<GravityScale>();
 }
 
 pub fn grab(commands: &mut Commands, entity: Entity, tm: &mut Transform, player: Entity) {
-    *tm = Transform::from_xyz(0.3, -1.4, -0.7).with_rotation(Quat::from_euler(
+    *tm = Transform::from_xyz(0.3, -0.74, -0.7).with_rotation(Quat::from_euler(
         EulerRot::XYZ,
         -90.0f32.to_radians(),
         0.0,
@@ -218,6 +221,7 @@ pub fn grab(commands: &mut Commands, entity: Entity, tm: &mut Transform, player:
     commands.entity(player).add_child(entity);
     commands
         .entity(entity)
+        .insert(ColliderDisabled)
         .insert(RigidBodyDisabled)
         .insert(GravityScale(0.));
 }
diff --git a/src/world.rs b/src/world.rs
index 7b81c2b..8e3de1a 100644
--- a/src/world.rs
+++ b/src/world.rs
@@ -199,7 +199,7 @@ fn spawn_ground(
                     ColliderConstructor::TrimeshFromMesh,
                     NotShadowCaster,
                     RigidBody::Static,
-                    CollisionMargin(1.),
+                    CollisionMargin(0.1),
                 ));
             }
         }

From 231d0c24d529c25fa607688cfa4716db63b8ccb1 Mon Sep 17 00:00:00 2001
From: Arthur-Aillet <arthur.aillet@epitech.eu>
Date: Sun, 8 Feb 2026 22:06:22 +0100
Subject: [PATCH 05/19] feat: sounds for speaker and for monster

---
 .gitattributes      |  1 +
 Cargo.lock          | 59 +++++++++++++++++++++++++++++++++++++++++++++
 Cargo.toml          |  1 +
 assets/ping.mp3     |  3 +++
 assets/whimper.wav  |  3 +++
 src/monster.rs      | 11 ++++++++-
 src/player/spawn.rs |  1 +
 src/speaker.rs      |  7 ++++++
 src/world.rs        |  2 +-
 9 files changed, 86 insertions(+), 2 deletions(-)
 create mode 100644 assets/ping.mp3
 create mode 100644 assets/whimper.wav

diff --git a/.gitattributes b/.gitattributes
index 9e6a6ab..c1e5f83 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,4 @@
 *.png filter=lfs diff=lfs merge=lfs -text
 *.glb filter=lfs diff=lfs merge=lfs -text
 *.wav filter=lfs diff=lfs merge=lfs -text
+*.mp3 filter=lfs diff=lfs merge=lfs -text
diff --git a/Cargo.lock b/Cargo.lock
index 8be879f..bafdd4b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2586,6 +2586,15 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "encoding_rs"
+version = "0.8.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3"
+dependencies = [
+ "cfg-if",
+]
+
 [[package]]
 name = "epaint"
 version = "0.33.3"
@@ -4819,6 +4828,7 @@ dependencies = [
  "cpal",
  "hound",
  "lewton",
+ "symphonia",
 ]
 
 [[package]]
@@ -5213,6 +5223,55 @@ dependencies = [
  "zeno",
 ]
 
+[[package]]
+name = "symphonia"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5773a4c030a19d9bfaa090f49746ff35c75dfddfa700df7a5939d5e076a57039"
+dependencies = [
+ "lazy_static",
+ "symphonia-bundle-mp3",
+ "symphonia-core",
+ "symphonia-metadata",
+]
+
+[[package]]
+name = "symphonia-bundle-mp3"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4872dd6bb56bf5eac799e3e957aa1981086c3e613b27e0ac23b176054f7c57ed"
+dependencies = [
+ "lazy_static",
+ "log",
+ "symphonia-core",
+ "symphonia-metadata",
+]
+
+[[package]]
+name = "symphonia-core"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea00cc4f79b7f6bb7ff87eddc065a1066f3a43fe1875979056672c9ef948c2af"
+dependencies = [
+ "arrayvec",
+ "bitflags 1.3.2",
+ "bytemuck",
+ "lazy_static",
+ "log",
+]
+
+[[package]]
+name = "symphonia-metadata"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "36306ff42b9ffe6e5afc99d49e121e0bd62fe79b9db7b9681d48e29fa19e6b16"
+dependencies = [
+ "encoding_rs",
+ "lazy_static",
+ "log",
+ "symphonia-core",
+]
+
 [[package]]
 name = "syn"
 version = "2.0.114"
diff --git a/Cargo.toml b/Cargo.toml
index a502c20..a785866 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -23,6 +23,7 @@ bevy = { version = "0.18.0", features = [
     "dynamic_linking",
     "3d",
     "wav",
+    "mp3",
     "bevy_dev_tools",
 ] }
 bevy_atmosphere = { git = "https://github.com/Arthur-Aillet/bevy_atmosphere", branch = "feat/z-up" }
diff --git a/assets/ping.mp3 b/assets/ping.mp3
new file mode 100644
index 0000000..280f874
--- /dev/null
+++ b/assets/ping.mp3
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e6fec9ee5be21a584787f75c41271d2dbd310d00abfa2310ba51f6be39ad2738
+size 1778303
diff --git a/assets/whimper.wav b/assets/whimper.wav
new file mode 100644
index 0000000..db60bbf
--- /dev/null
+++ b/assets/whimper.wav
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2b6a57b722d4513bfaaa134ff53e8b6818883a0f862b0c4bdb26696da54134c8
+size 1699990
diff --git a/src/monster.rs b/src/monster.rs
index 2f8d5c3..fdd8543 100644
--- a/src/monster.rs
+++ b/src/monster.rs
@@ -1,9 +1,12 @@
 use std::{f32::consts::PI, ops::Neg};
 
-use avian3d::prelude::{LayerMask, LinearVelocity, RayCaster, RayHits, SpatialQueryFilter};
+use avian3d::prelude::*;
+use bevy::audio::SpatialScale;
+use bevy::prelude::*;
 use bevy::{
     app::{Plugin, Startup, Update},
     asset::{AssetServer, Assets, Handle},
+    audio::AudioPlayer,
     camera::visibility::Visibility,
     color::{Color, LinearRgba},
     ecs::{
@@ -166,6 +169,7 @@ pub fn spawn_monster(
     gltf: Res<Assets<Gltf>>,
     mut materials: ResMut<Assets<StandardMaterial>>,
     mut loaded: Local<bool>,
+    asset_server: Res<AssetServer>,
 ) {
     if *loaded {
         return;
@@ -213,5 +217,10 @@ pub fn spawn_monster(
         LinearVelocity::from(Vec3::new(0.0, 5.0, 1.0)),
         Transform::from_xyz(20.0, 3.0, 30.0),
         Visibility::default(),
+        AudioPlayer::new(asset_server.load("whimper.wav")),
+        PlaybackSettings::LOOP
+            .with_spatial(true)
+            .with_spatial_scale(SpatialScale::new(0.07))
+            .with_volume(bevy::audio::Volume::Linear(0.2)),
     ));
 }
diff --git a/src/player/spawn.rs b/src/player/spawn.rs
index 38c0de8..29057cf 100644
--- a/src/player/spawn.rs
+++ b/src/player/spawn.rs
@@ -52,6 +52,7 @@ pub fn spawn_player(mut commands: Commands) {
                         falloff: FogFalloff::Exponential { density: 0.25 },
                         ..default()
                     },
+                    SpatialListener::new(4.0),
                 ),
                 (
                     SpotLight {
diff --git a/src/speaker.rs b/src/speaker.rs
index 9bfb695..c9845e4 100644
--- a/src/speaker.rs
+++ b/src/speaker.rs
@@ -1,4 +1,5 @@
 use avian3d::prelude::*;
+use bevy::audio::SpatialScale;
 use bevy::math::FloatPow;
 use bevy::prelude::*;
 
@@ -86,6 +87,7 @@ fn load_speaker_gltf(mut commands: Commands, assets: Res<AssetServer>) {
 fn spawn_speaker(
     mut commands: Commands,
     gltf: Res<Assets<Gltf>>,
+    asset_server: Res<AssetServer>,
     mut speaker_resource: ResMut<SpeakerResource>,
     mut stop: Local<bool>,
 ) {
@@ -112,6 +114,11 @@ fn spawn_speaker(
         Collider::cuboid(0.9, 0.75, 1.5),
         RigidBody::Dynamic,
         Transform::from_xyz(-64.0, -81.0, 22.5),
+        AudioPlayer::new(asset_server.load("ping.mp3")),
+        PlaybackSettings::LOOP
+            .with_spatial(true)
+            .with_spatial_scale(SpatialScale::new(0.5))
+            .with_volume(bevy::audio::Volume::Linear(0.25)),
     ));
 }
 
diff --git a/src/world.rs b/src/world.rs
index 8e3de1a..b9d1441 100644
--- a/src/world.rs
+++ b/src/world.rs
@@ -69,7 +69,7 @@ fn load_ladder(asset_server: Res<AssetServer>, mut ladder: ResMut<Ladder>) {
 fn play_background_audio(asset_server: Res<AssetServer>, mut commands: Commands) {
     commands.spawn((
         AudioPlayer::new(asset_server.load("ambience.wav")),
-        PlaybackSettings::LOOP,
+        PlaybackSettings::LOOP.with_volume(bevy::audio::Volume::Linear(0.06)),
     ));
 }
 

From ae8439d7e69c2d84e62ba2e0b73061542bfe03b6 Mon Sep 17 00:00:00 2001
From: Arthur-Aillet <arthur.aillet@epitech.eu>
Date: Sun, 8 Feb 2026 23:13:23 +0100
Subject: [PATCH 06/19] feat: start of ladder interract

---
 src/main.rs          |  6 +++---
 src/player/action.rs |  1 +
 src/player/mod.rs    |  2 +-
 src/ui.rs            | 34 ++++++++++++++++++++++++++++++++++
 src/world.rs         |  6 +++++-
 5 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 70478cb..935500c 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -7,7 +7,7 @@ mod player;
 mod settings;
 mod speaker;
 mod ui;
-mod world;
+pub mod world;
 
 use avian3d::{PhysicsPlugins, prelude::Gravity};
 use bevy::prelude::*;
@@ -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()
diff --git a/src/player/action.rs b/src/player/action.rs
index 9d95992..14a0034 100644
--- a/src/player/action.rs
+++ b/src/player/action.rs
@@ -3,6 +3,7 @@ use std::ops::{Add, Sub};
 use avian3d::prelude::{RigidBody, RigidBodyDisabled};
 use bevy::prelude::*;
 
+use crate::world::LadderInteract;
 use crate::{
     marker::MarkerAssets,
     player::{Player, PlayerAction, PlayerCamera, flashlight, marker::Pickup},
diff --git a/src/player/mod.rs b/src/player/mod.rs
index ecade6d..6d05a73 100644
--- a/src/player/mod.rs
+++ b/src/player/mod.rs
@@ -6,7 +6,7 @@ pub mod spawn;
 
 use bevy::prelude::*;
 
-use crate::player::action::player_action;
+use crate::player::action::{player_action, player_ladder};
 use crate::player::flashlight::control_flashlight;
 use crate::player::marker::MarkerPlugin;
 use crate::player::movement::move_player;
diff --git a/src/ui.rs b/src/ui.rs
index 5b24e18..0d216ef 100644
--- a/src/ui.rs
+++ b/src/ui.rs
@@ -68,9 +68,43 @@ fn spawn_ui(mut commands: Commands, asset_server: Res<AssetServer>, hud: Res<Hud
                 ..Default::default()
             },
         ));
+        parent.spawn((
+            Node {
+                justify_self: JustifySelf::Center,
+                align_self: AlignSelf::Center,
+                left: Val::Vw(30.0),
+                width: Val::Vw(20.0),
+                height: Val::Vh(7.0),
+                position_type: PositionType::Absolute,
+                ..Default::default()
+            },
+            InvalidText,
+            Visibility::Hidden,
+            Text2d::new("The company isn't proud yet, unmarked oil sources remains..."),
+        ));
+        parent.spawn((
+            Node {
+                justify_self: JustifySelf::Center,
+                align_self: AlignSelf::Center,
+                left: Val::Vw(30.0),
+                width: Val::Vw(20.0),
+                height: Val::Vh(7.0),
+                position_type: PositionType::Absolute,
+                ..Default::default()
+            },
+            Visibility::Hidden,
+            ValidText,
+            Text2d::new("You did a great job! You might even get a raise."),
+        ));
     });
 }
 
+#[derive(Component)]
+struct ValidText;
+
+#[derive(Component)]
+struct InvalidText;
+
 fn move_overlay(
     overlay: Single<(&mut Node, &mut OverlayImage), With<OverlayImage>>,
     accumulated_mouse_motion: Res<AccumulatedMouseMotion>,
diff --git a/src/world.rs b/src/world.rs
index b9d1441..f3a2ce8 100644
--- a/src/world.rs
+++ b/src/world.rs
@@ -60,7 +60,7 @@ fn load_ground_gltf(mut commands: Commands, assets: Res<AssetServer>) {
 }
 
 #[derive(Resource, Default)]
-struct Ladder(Handle<Image>);
+pub struct Ladder(Handle<Image>);
 
 fn load_ladder(asset_server: Res<AssetServer>, mut ladder: ResMut<Ladder>) {
     ladder.0 = asset_server.load("ladder.png");
@@ -73,6 +73,9 @@ fn play_background_audio(asset_server: Res<AssetServer>, mut commands: Commands)
     ));
 }
 
+#[derive(Component)]
+pub(crate) struct LadderInteract;
+
 fn spawn_world(
     asset_server: Res<AssetServer>,
     ladder: Res<Ladder>,
@@ -114,6 +117,7 @@ fn spawn_world(
             ..default()
         },
         Visibility::Visible,
+        LadderInteract,
         Transform::from_xyz(0., 0., 0.),
     ));
     for i in 1..72 {

From 68e18d0764b0da55f671fe4e373cf21437a07768 Mon Sep 17 00:00:00 2001
From: Arthur-Aillet <arthur.aillet@epitech.eu>
Date: Sun, 8 Feb 2026 23:26:38 +0100
Subject: [PATCH 07/19] feat: fake win conditions

---
 src/player/action.rs | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/player/action.rs b/src/player/action.rs
index a8673b5..49e5763 100644
--- a/src/player/action.rs
+++ b/src/player/action.rs
@@ -1,4 +1,7 @@
-use std::ops::{Add, Sub};
+use std::{
+    ops::{Add, Sub},
+    process::exit,
+};
 
 use avian3d::prelude::*;
 use bevy::prelude::*;
@@ -32,6 +35,9 @@ pub fn player_place_marker(
     ));
 }
 
+#[derive(Resource, Default)]
+pub struct Placed(u32);
+
 pub fn player_action(
     mut commands: Commands,
     time: Res<Time>,
@@ -63,6 +69,7 @@ pub fn player_action(
         (Entity, &GlobalTransform),
         (Without<Player>, Without<PlayerCamera>, Without<Pickup>),
     >,
+    mut placed: Local<Placed>,
 ) {
     let (player_entity, player_global, mut player_tm, mut player, player_hits) =
         player.into_inner();
@@ -108,6 +115,10 @@ pub fn player_action(
                         && input.just_pressed(MouseButton::Left)
                         && !player_hits.is_empty()
                     {
+                        placed.0 += 1;
+                        if placed.0 == 4 {
+                            exit(0);
+                        }
                         player_place_marker(
                             &mut commands,
                             node.clone(),
@@ -138,6 +149,7 @@ pub fn player_action(
         }
         PlayerAction::Dying(timeout, e) => {
             if timeout.gt(&1.0) {
+                exit(0);
                 Some(PlayerAction::Dead)
             } else {
                 if let Ok((_, global)) = entities.get(e.entity()) {

From 3a4b3502a0d0c1cef00d19ab6419c85511d51bf6 Mon Sep 17 00:00:00 2001
From: Arthur-Aillet <arthur.aillet@epitech.eu>
Date: Sun, 15 Feb 2026 02:14:17 +0100
Subject: [PATCH 08/19] feat: marker logic reworked with messages

---
 src/marker.rs        | 52 +++++++++++++++++++++++++++++---------------
 src/monster.rs       |  2 +-
 src/player/action.rs | 41 +++++-----------------------------
 src/player/marker.rs |  2 --
 src/speaker.rs       |  2 +-
 src/world.rs         |  2 +-
 6 files changed, 44 insertions(+), 57 deletions(-)

diff --git a/src/marker.rs b/src/marker.rs
index cfcdc05..31f32d8 100644
--- a/src/marker.rs
+++ b/src/marker.rs
@@ -1,33 +1,51 @@
-use bevy::{
-    app::{Plugin, Startup},
-    asset::{AssetServer, Handle},
-    ecs::{
-        component::Component,
-        resource::Resource,
-        system::{Commands, Res},
-    },
-    gltf::GltfAssetLabel,
-    scene::Scene,
-};
+use avian3d::prelude::*;
+use bevy::prelude::*;
+
+use crate::player::Player;
 
 pub struct MarkerPlugin;
 
 impl Plugin for MarkerPlugin {
     fn build(&self, app: &mut bevy::app::App) {
-        app.add_systems(Startup, load_marker_gltf);
-        // .add_systems(Update, spawn_marker);
+        app.add_message::<PlaceMarker>()
+            .add_systems(Startup, load_marker_gltf)
+            .add_systems(PostUpdate, place_markers);
     }
 }
 
-#[derive(Component)]
-pub struct Marker;
-
 #[derive(Resource)]
-pub struct MarkerAssets {
+struct MarkerAssets {
     pub model: Handle<Scene>,
     // pub material_blink: Option<Handle<StandardMaterial>>,
 }
 
+#[derive(Message)]
+pub struct PlaceMarker {
+    pub oil: Entity,
+}
+
+fn place_markers(
+    mut reader: MessageReader<PlaceMarker>,
+    mut commands: Commands,
+    marker_assets: Res<MarkerAssets>,
+    player: Single<(&GlobalTransform, &RayHits), With<Player>>,
+) {
+    let (player_transform, _) = player.into_inner();
+
+    for PlaceMarker { oil } in reader.read() {
+        println!("Message received!");
+        let origin = player_transform.transform_point((0.0, 0.5, 0.0).into());
+
+        commands.entity(*oil).despawn();
+
+        commands.spawn((
+            SceneRoot(marker_assets.model.clone()),
+            Transform::from_translation(origin),
+            Visibility::default(),
+        ));
+    }
+}
+
 fn load_marker_gltf(mut commands: Commands, assets: Res<AssetServer>) {
     // let model = assets.load::<Gltf>("marker.glb");
 
diff --git a/src/monster.rs b/src/monster.rs
index b947b0c..576f904 100644
--- a/src/monster.rs
+++ b/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)),
     ));
 }
diff --git a/src/player/action.rs b/src/player/action.rs
index 49e5763..25037d0 100644
--- a/src/player/action.rs
+++ b/src/player/action.rs
@@ -7,7 +7,7 @@ use avian3d::prelude::*;
 use bevy::prelude::*;
 
 use crate::{
-    marker::MarkerAssets,
+    marker::PlaceMarker,
     player::{Player, PlayerAction, PlayerCamera, marker::Pickup},
     speaker::{Speaker, SpeakerMode, SpeakerResource, grab, ungrab},
     ui,
@@ -18,23 +18,6 @@ const PLAYER_SPEAKER_PLACE_DIST: f32 = 4.0;
 /// squared distance for easy compute
 const PLAYER_SPEAKER_PLACE_DIST_2: f32 = PLAYER_SPEAKER_PLACE_DIST * PLAYER_SPEAKER_PLACE_DIST;
 
-pub fn player_place_marker(
-    commands: &mut Commands,
-    node: Entity,
-    player_transform: &GlobalTransform,
-    marker_model: &Handle<Scene>,
-) {
-    let origin = player_transform.transform_point((0.0, 0.5, 0.0).into());
-
-    commands.entity(node).despawn();
-
-    commands.spawn((
-        SceneRoot(marker_model.clone()),
-        Transform::from_translation(origin),
-        Visibility::default(),
-    ));
-}
-
 #[derive(Resource, Default)]
 pub struct Placed(u32);
 
@@ -42,20 +25,13 @@ pub fn player_action(
     mut commands: Commands,
     time: Res<Time>,
     player: Single<
-        (
-            Entity,
-            &GlobalTransform,
-            &mut Transform,
-            &mut Player,
-            &RayHits,
-        ),
+        (&GlobalTransform, &mut Transform, &mut Player, &RayHits),
         (Without<PlayerCamera>, Without<Pickup>),
     >,
+    mut place_speaker: MessageWriter<PlaceMarker>,
     speaker: Single<&GlobalTransform, With<Speaker>>,
     speaker_resource: Res<SpeakerResource>,
     input: Res<ButtonInput<MouseButton>>,
-    marker_assets: Res<MarkerAssets>,
-
     mut cursor_icon: Single<&mut Visibility, With<ui::Cursor>>,
     camera: Single<
         (Entity, &GlobalTransform, &mut Transform),
@@ -71,8 +47,7 @@ pub fn player_action(
     >,
     mut placed: Local<Placed>,
 ) {
-    let (player_entity, player_global, mut player_tm, mut player, player_hits) =
-        player.into_inner();
+    let (player_global, mut player_tm, mut player, player_hits) = player.into_inner();
 
     let (camera_entity, camera_global, mut camera_tm) = camera.into_inner();
 
@@ -119,12 +94,8 @@ pub fn player_action(
                         if placed.0 == 4 {
                             exit(0);
                         }
-                        player_place_marker(
-                            &mut commands,
-                            node.clone(),
-                            &player_global,
-                            &marker_assets.model,
-                        );
+                        println!("Message sent!");
+                        place_speaker.write(PlaceMarker { oil: *node });
                     }
                 } else {
                 }
diff --git a/src/player/marker.rs b/src/player/marker.rs
index a34b22f..9eddd34 100644
--- a/src/player/marker.rs
+++ b/src/player/marker.rs
@@ -1,5 +1,3 @@
-use std::ops::{Add, Sub};
-
 use bevy::prelude::*;
 
 use crate::{
diff --git a/src/speaker.rs b/src/speaker.rs
index c9845e4..568d951 100644
--- a/src/speaker.rs
+++ b/src/speaker.rs
@@ -118,7 +118,7 @@ fn spawn_speaker(
         PlaybackSettings::LOOP
             .with_spatial(true)
             .with_spatial_scale(SpatialScale::new(0.5))
-            .with_volume(bevy::audio::Volume::Linear(0.25)),
+            .with_volume(bevy::audio::Volume::Linear(0.5)),
     ));
 }
 
diff --git a/src/world.rs b/src/world.rs
index f3a2ce8..5a7b302 100644
--- a/src/world.rs
+++ b/src/world.rs
@@ -69,7 +69,7 @@ fn load_ladder(asset_server: Res<AssetServer>, mut ladder: ResMut<Ladder>) {
 fn play_background_audio(asset_server: Res<AssetServer>, mut commands: Commands) {
     commands.spawn((
         AudioPlayer::new(asset_server.load("ambience.wav")),
-        PlaybackSettings::LOOP.with_volume(bevy::audio::Volume::Linear(0.06)),
+        PlaybackSettings::LOOP.with_volume(bevy::audio::Volume::Linear(0.12)),
     ));
 }
 

From 7d4e28d7f03aef3804ba8f789c22ad768f45e5f2 Mon Sep 17 00:00:00 2001
From: Arthur-Aillet <arthur.aillet@epitech.eu>
Date: Sun, 15 Feb 2026 02:21:17 +0100
Subject: [PATCH 09/19] feat: restore marker light material

---
 src/marker.rs | 97 +++++++++++++++++++++++++--------------------------
 1 file changed, 47 insertions(+), 50 deletions(-)

diff --git a/src/marker.rs b/src/marker.rs
index 31f32d8..989c590 100644
--- a/src/marker.rs
+++ b/src/marker.rs
@@ -15,8 +15,8 @@ impl Plugin for MarkerPlugin {
 
 #[derive(Resource)]
 struct MarkerAssets {
-    pub model: Handle<Scene>,
-    // pub material_blink: Option<Handle<StandardMaterial>>,
+    pub model: Handle<Gltf>,
+    pub material_light: Handle<StandardMaterial>,
 }
 
 #[derive(Message)]
@@ -28,66 +28,63 @@ fn place_markers(
     mut reader: MessageReader<PlaceMarker>,
     mut commands: Commands,
     marker_assets: Res<MarkerAssets>,
+    gltf: Res<Assets<Gltf>>,
+    mut materials: ResMut<Assets<StandardMaterial>>,
     player: Single<(&GlobalTransform, &RayHits), With<Player>>,
 ) {
     let (player_transform, _) = player.into_inner();
 
     for PlaceMarker { oil } in reader.read() {
-        println!("Message received!");
+        let Some(gltf) = gltf.get(&marker_assets.model) else {
+            return;
+        };
+
+        let Some(light) = gltf.named_materials.get("light") else {
+            return;
+        };
+
+        *materials.get_mut(light).unwrap() = materials
+            .get(&marker_assets.material_light)
+            .unwrap()
+            .clone();
+
         let origin = player_transform.transform_point((0.0, 0.5, 0.0).into());
 
         commands.entity(*oil).despawn();
 
-        commands.spawn((
-            SceneRoot(marker_assets.model.clone()),
-            Transform::from_translation(origin),
-            Visibility::default(),
-        ));
+        commands
+            .spawn((
+                SceneRoot(gltf.scenes[0].clone()),
+                Transform::from_translation(origin),
+                Visibility::default(),
+            ))
+            .with_children(|parent| {
+                parent.spawn((
+                    PointLight {
+                        color: Color::srgb(1., 0.5, 0.5),
+                        intensity: 5000.0,
+                        ..Default::default()
+                    },
+                    Transform::from_xyz(0.0, 0.0, 0.8),
+                ));
+            });
     }
 }
 
-fn load_marker_gltf(mut commands: Commands, assets: Res<AssetServer>) {
-    // let model = assets.load::<Gltf>("marker.glb");
+pub fn load_marker_gltf(
+    mut commands: Commands,
+    mut materials: ResMut<Assets<StandardMaterial>>,
+    assets: Res<AssetServer>,
+) {
+    let model = assets.load::<Gltf>("marker.glb");
 
-    let model = assets.load::<Scene>(GltfAssetLabel::Scene(0).from_asset("marker.glb"));
+    let mut material_light = StandardMaterial::default();
+    material_light.base_color = Color::linear_rgb(10.0, 3.0, 3.0);
+    material_light.emissive = LinearRgba::rgb(10.0, 3.0, 3.0);
+    let material_light = materials.add(material_light);
 
-    commands.insert_resource(MarkerAssets { model });
+    commands.insert_resource(MarkerAssets {
+        model,
+        material_light,
+    });
 }
-
-// fn spawn_marker(
-//     mut commands: Commands,
-//     gltf: Res<Assets<Gltf>>,
-//     mut Marker_assets: ResMut<MarkerAssets>,
-//     mut materials: ResMut<Assets<StandardMaterial>>,
-//     mut stop: Local<bool>,
-// ) {
-//     if *stop {
-//         return;
-//     }
-
-//     let Some(gltf) = gltf.get(&Marker_assets.model) else {
-//         return;
-//     };
-
-//     let Some(blink) = gltf.named_materials.get("light") else {
-//         return;
-//     };
-
-//     let Some(material) = materials.get_mut(blink) else {
-//         return;
-//     };
-
-//     material.emissive = LinearRgba::rgb(0.0, 4.0, 0.0);
-
-//     Marker_assets.material_blink = Some(blink.clone());
-
-//     *stop = true;
-
-//     commands.spawn((
-//         SceneRoot(gltf.scenes[0].clone()),
-//         Marker::default(),
-//         avian3d::dynamics::prelude::RigidBody::Kinematic,
-//         LinearVelocity::default(),
-//         Transform::from_xyz(-64.0, -81.0, 22.25),
-//     ));
-// }

From a724e966d64edbe6f25fd4386a483a7de5c69036 Mon Sep 17 00:00:00 2001
From: Arthur-Aillet <arthur.aillet@epitech.eu>
Date: Sun, 15 Feb 2026 02:30:05 +0100
Subject: [PATCH 10/19] chore: remove marker deadcode

---
 src/main.rs          |   6 +--
 src/marker.rs        |  90 --------------------------------
 src/player/action.rs |   5 +-
 src/player/marker.rs | 120 ++++++++++++++++++++-----------------------
 src/speaker.rs       |   4 +-
 5 files changed, 64 insertions(+), 161 deletions(-)
 delete mode 100644 src/marker.rs

diff --git a/src/main.rs b/src/main.rs
index 935500c..25a75ee 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,5 +1,4 @@
 mod debug;
-mod marker;
 mod monster;
 mod node;
 mod particle;
@@ -16,8 +15,8 @@ use bevy_atmosphere::plugin::AtmospherePlugin;
 use particle::ParticlePlugin;
 
 use crate::{
-    debug::DebugPlugin, marker::MarkerPlugin, monster::MonsterPlugin, player::PlayerPlugin,
-    settings::Settings, speaker::SpeakerPlugin, ui::UiPlugin, world::WorldPlugin,
+    debug::DebugPlugin, monster::MonsterPlugin, player::PlayerPlugin, settings::Settings,
+    speaker::SpeakerPlugin, ui::UiPlugin, world::WorldPlugin,
 };
 
 fn main() {
@@ -51,7 +50,6 @@ fn main() {
             WorldPlugin,
             PlayerPlugin,
             MonsterPlugin,
-            MarkerPlugin,
             SpeakerPlugin,
         ))
         .insert_resource(Gravity(Vec3::NEG_Z * 0.3))
diff --git a/src/marker.rs b/src/marker.rs
deleted file mode 100644
index 989c590..0000000
--- a/src/marker.rs
+++ /dev/null
@@ -1,90 +0,0 @@
-use avian3d::prelude::*;
-use bevy::prelude::*;
-
-use crate::player::Player;
-
-pub struct MarkerPlugin;
-
-impl Plugin for MarkerPlugin {
-    fn build(&self, app: &mut bevy::app::App) {
-        app.add_message::<PlaceMarker>()
-            .add_systems(Startup, load_marker_gltf)
-            .add_systems(PostUpdate, place_markers);
-    }
-}
-
-#[derive(Resource)]
-struct MarkerAssets {
-    pub model: Handle<Gltf>,
-    pub material_light: Handle<StandardMaterial>,
-}
-
-#[derive(Message)]
-pub struct PlaceMarker {
-    pub oil: Entity,
-}
-
-fn place_markers(
-    mut reader: MessageReader<PlaceMarker>,
-    mut commands: Commands,
-    marker_assets: Res<MarkerAssets>,
-    gltf: Res<Assets<Gltf>>,
-    mut materials: ResMut<Assets<StandardMaterial>>,
-    player: Single<(&GlobalTransform, &RayHits), With<Player>>,
-) {
-    let (player_transform, _) = player.into_inner();
-
-    for PlaceMarker { oil } in reader.read() {
-        let Some(gltf) = gltf.get(&marker_assets.model) else {
-            return;
-        };
-
-        let Some(light) = gltf.named_materials.get("light") else {
-            return;
-        };
-
-        *materials.get_mut(light).unwrap() = materials
-            .get(&marker_assets.material_light)
-            .unwrap()
-            .clone();
-
-        let origin = player_transform.transform_point((0.0, 0.5, 0.0).into());
-
-        commands.entity(*oil).despawn();
-
-        commands
-            .spawn((
-                SceneRoot(gltf.scenes[0].clone()),
-                Transform::from_translation(origin),
-                Visibility::default(),
-            ))
-            .with_children(|parent| {
-                parent.spawn((
-                    PointLight {
-                        color: Color::srgb(1., 0.5, 0.5),
-                        intensity: 5000.0,
-                        ..Default::default()
-                    },
-                    Transform::from_xyz(0.0, 0.0, 0.8),
-                ));
-            });
-    }
-}
-
-pub fn load_marker_gltf(
-    mut commands: Commands,
-    mut materials: ResMut<Assets<StandardMaterial>>,
-    assets: Res<AssetServer>,
-) {
-    let model = assets.load::<Gltf>("marker.glb");
-
-    let mut material_light = StandardMaterial::default();
-    material_light.base_color = Color::linear_rgb(10.0, 3.0, 3.0);
-    material_light.emissive = LinearRgba::rgb(10.0, 3.0, 3.0);
-    let material_light = materials.add(material_light);
-
-    commands.insert_resource(MarkerAssets {
-        model,
-        material_light,
-    });
-}
diff --git a/src/player/action.rs b/src/player/action.rs
index 25037d0..c9d1eed 100644
--- a/src/player/action.rs
+++ b/src/player/action.rs
@@ -7,9 +7,8 @@ use avian3d::prelude::*;
 use bevy::prelude::*;
 
 use crate::{
-    marker::PlaceMarker,
-    player::{Player, PlayerAction, PlayerCamera, marker::Pickup},
-    speaker::{Speaker, SpeakerMode, SpeakerResource, grab, ungrab},
+    player::{Player, PlayerAction, PlayerCamera, marker::PlaceMarker},
+    speaker::{Pickup, Speaker, SpeakerMode, SpeakerResource, grab, ungrab},
     ui,
 };
 
diff --git a/src/player/marker.rs b/src/player/marker.rs
index 9eddd34..989c590 100644
--- a/src/player/marker.rs
+++ b/src/player/marker.rs
@@ -1,35 +1,75 @@
+use avian3d::prelude::*;
 use bevy::prelude::*;
 
-use crate::{
-    player::{Player, PlayerAction, PlayerCamera},
-    speaker::grab,
-    ui::Cursor,
-};
+use crate::player::Player;
 
 pub struct MarkerPlugin;
 
 impl Plugin for MarkerPlugin {
-    fn build(&self, app: &mut App) {
-        app.add_systems(Startup, load_marker_gltf);
-        // .add_systems(Update, (spawn_marker, grab_pickup));
+    fn build(&self, app: &mut bevy::app::App) {
+        app.add_message::<PlaceMarker>()
+            .add_systems(Startup, load_marker_gltf)
+            .add_systems(PostUpdate, place_markers);
     }
 }
 
 #[derive(Resource)]
-pub struct MarkerAssets {
+struct MarkerAssets {
     pub model: Handle<Gltf>,
     pub material_light: Handle<StandardMaterial>,
 }
 
-// fn grab_pickup(
-//     mut commands: Commands,
-//     mut cursor_icon: Single<&mut Visibility, With<Cursor>>,
-//     mut player: Single<(Entity, &mut Player), Without<PlayerCamera>>,
-//     camera: Single<&GlobalTransform, (With<PlayerCamera>, Without<Player>)>,
-//     mut pickups: Query<(Entity, &GlobalTransform, &mut Transform), With<Pickup>>,
-// ) {
+#[derive(Message)]
+pub struct PlaceMarker {
+    pub oil: Entity,
+}
 
-// }
+fn place_markers(
+    mut reader: MessageReader<PlaceMarker>,
+    mut commands: Commands,
+    marker_assets: Res<MarkerAssets>,
+    gltf: Res<Assets<Gltf>>,
+    mut materials: ResMut<Assets<StandardMaterial>>,
+    player: Single<(&GlobalTransform, &RayHits), With<Player>>,
+) {
+    let (player_transform, _) = player.into_inner();
+
+    for PlaceMarker { oil } in reader.read() {
+        let Some(gltf) = gltf.get(&marker_assets.model) else {
+            return;
+        };
+
+        let Some(light) = gltf.named_materials.get("light") else {
+            return;
+        };
+
+        *materials.get_mut(light).unwrap() = materials
+            .get(&marker_assets.material_light)
+            .unwrap()
+            .clone();
+
+        let origin = player_transform.transform_point((0.0, 0.5, 0.0).into());
+
+        commands.entity(*oil).despawn();
+
+        commands
+            .spawn((
+                SceneRoot(gltf.scenes[0].clone()),
+                Transform::from_translation(origin),
+                Visibility::default(),
+            ))
+            .with_children(|parent| {
+                parent.spawn((
+                    PointLight {
+                        color: Color::srgb(1., 0.5, 0.5),
+                        intensity: 5000.0,
+                        ..Default::default()
+                    },
+                    Transform::from_xyz(0.0, 0.0, 0.8),
+                ));
+            });
+    }
+}
 
 pub fn load_marker_gltf(
     mut commands: Commands,
@@ -48,49 +88,3 @@ pub fn load_marker_gltf(
         material_light,
     });
 }
-
-#[derive(Component)]
-pub struct Pickup;
-
-pub fn spawn_marker(
-    mut commands: Commands,
-    marker_assets: Res<MarkerAssets>,
-    gltf: Res<Assets<Gltf>>,
-    mut materials: ResMut<Assets<StandardMaterial>>,
-    mut loaded: Local<bool>,
-) {
-    if *loaded {
-        return;
-    }
-
-    let Some(gltf) = gltf.get(&marker_assets.model) else {
-        return;
-    };
-
-    *loaded = true;
-
-    let Some(light) = gltf.named_materials.get("light") else {
-        return;
-    };
-
-    *materials.get_mut(light).unwrap() = materials
-        .get(&marker_assets.material_light)
-        .unwrap()
-        .clone();
-
-    commands
-        .spawn((
-            SceneRoot(gltf.scenes[0].clone()),
-            Pickup,
-            Transform::from_xyz(-62.0, -84.0, 22.3).with_scale(Vec3::splat(1.1)),
-        ))
-        .with_children(|parent| {
-            parent.spawn((
-                PointLight {
-                    color: Color::srgb(1., 0.5, 0.5),
-                    ..Default::default()
-                },
-                Transform::from_xyz(0.0, 0.0, 0.5),
-            ));
-        });
-}
diff --git a/src/speaker.rs b/src/speaker.rs
index 568d951..c94d93b 100644
--- a/src/speaker.rs
+++ b/src/speaker.rs
@@ -20,7 +20,6 @@ use bevy::{
 };
 
 use crate::node::OilNode;
-use crate::player::marker::Pickup;
 
 pub struct SpeakerPlugin;
 
@@ -57,6 +56,9 @@ impl Speaker {
     }
 }
 
+#[derive(Component)]
+pub struct Pickup;
+
 #[derive(Default)]
 pub enum SpeakerMode {
     #[default]

From c10e3bbb74fd164680e8908d198f76487a8528cf Mon Sep 17 00:00:00 2001
From: Arthur-Aillet <arthur.aillet@epitech.eu>
Date: Sun, 15 Feb 2026 13:06:48 +0100
Subject: [PATCH 11/19] feat: marker placed with raycast for perfect ground
 placement

---
 src/player/marker.rs | 51 +++++++++++++++++++++++++-------------------
 1 file changed, 29 insertions(+), 22 deletions(-)

diff --git a/src/player/marker.rs b/src/player/marker.rs
index 989c590..55decc9 100644
--- a/src/player/marker.rs
+++ b/src/player/marker.rs
@@ -1,7 +1,7 @@
 use avian3d::prelude::*;
 use bevy::prelude::*;
 
-use crate::player::Player;
+use crate::player::{Player, PlayerCamera};
 
 pub struct MarkerPlugin;
 
@@ -30,10 +30,9 @@ fn place_markers(
     marker_assets: Res<MarkerAssets>,
     gltf: Res<Assets<Gltf>>,
     mut materials: ResMut<Assets<StandardMaterial>>,
-    player: Single<(&GlobalTransform, &RayHits), With<Player>>,
+    spatial_query: SpatialQuery,
+    cam: Single<&GlobalTransform, With<PlayerCamera>>,
 ) {
-    let (player_transform, _) = player.into_inner();
-
     for PlaceMarker { oil } in reader.read() {
         let Some(gltf) = gltf.get(&marker_assets.model) else {
             return;
@@ -48,26 +47,34 @@ fn place_markers(
             .unwrap()
             .clone();
 
-        let origin = player_transform.transform_point((0.0, 0.5, 0.0).into());
+        if let Some(hits) = spatial_query.cast_ray(
+            cam.translation(),
+            cam.forward(),
+            3.0,
+            false,
+            &SpatialQueryFilter::default(),
+        ) {
+            commands.entity(*oil).despawn();
 
-        commands.entity(*oil).despawn();
+            let pos = cam.translation() + hits.distance * cam.forward();
 
-        commands
-            .spawn((
-                SceneRoot(gltf.scenes[0].clone()),
-                Transform::from_translation(origin),
-                Visibility::default(),
-            ))
-            .with_children(|parent| {
-                parent.spawn((
-                    PointLight {
-                        color: Color::srgb(1., 0.5, 0.5),
-                        intensity: 5000.0,
-                        ..Default::default()
-                    },
-                    Transform::from_xyz(0.0, 0.0, 0.8),
-                ));
-            });
+            commands
+                .spawn((
+                    SceneRoot(gltf.scenes[0].clone()),
+                    Transform::from_translation(pos),
+                    Visibility::default(),
+                ))
+                .with_children(|parent| {
+                    parent.spawn((
+                        PointLight {
+                            color: Color::srgb(1., 0.5, 0.5),
+                            intensity: 5000.0,
+                            ..Default::default()
+                        },
+                        Transform::from_xyz(0.0, 0.0, 0.8),
+                    ));
+                });
+        }
     }
 }
 

From 9f380eb1ca5f57f064d0d3e0a6add2e1c5a6ba3d Mon Sep 17 00:00:00 2001
From: Arthur-Aillet <arthur.aillet@epitech.eu>
Date: Sun, 15 Feb 2026 13:56:52 +0100
Subject: [PATCH 12/19] feat: resolved warnings

---
 src/node.rs              | 2 --
 src/player/flashlight.rs | 4 +---
 src/player/marker.rs     | 2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/node.rs b/src/node.rs
index 9511de7..c523b84 100644
--- a/src/node.rs
+++ b/src/node.rs
@@ -1,5 +1,3 @@
-use std::f32::consts::PI;
-
 use bevy::{light::NotShadowCaster, prelude::*};
 use bevy_sprite3d::Sprite3d;
 
diff --git a/src/player/flashlight.rs b/src/player/flashlight.rs
index e477197..4283f03 100644
--- a/src/player/flashlight.rs
+++ b/src/player/flashlight.rs
@@ -1,14 +1,12 @@
 use bevy::prelude::*;
 
-use crate::{player::WorldModelCamera, ui::Cursor};
+use crate::ui::Cursor;
 
 #[derive(Component)]
 pub struct Flashlight;
 
 pub fn control_flashlight(
     mouse: Res<ButtonInput<KeyCode>>,
-    mut cam: Single<&mut DistanceFog, With<WorldModelCamera>>,
-
     mut flashlight: Single<&mut Visibility, With<Flashlight>>,
     mut hand_ui: Single<&mut ImageNode, With<Cursor>>,
 ) {
diff --git a/src/player/marker.rs b/src/player/marker.rs
index 55decc9..53ff451 100644
--- a/src/player/marker.rs
+++ b/src/player/marker.rs
@@ -1,7 +1,7 @@
 use avian3d::prelude::*;
 use bevy::prelude::*;
 
-use crate::player::{Player, PlayerCamera};
+use crate::player::PlayerCamera;
 
 pub struct MarkerPlugin;
 

From 9b8ed5b22e3d14c284100192b5a93859a05cc0f6 Mon Sep 17 00:00:00 2001
From: Arthur-Aillet <arthur.aillet@epitech.eu>
Date: Sun, 15 Feb 2026 14:42:26 +0100
Subject: [PATCH 13/19] feat: marker placing logic reworked to be independant
 from speaker state

---
 src/node.rs          | 30 +++++++++++------
 src/player/action.rs | 41 ++++-------------------
 src/player/marker.rs | 79 ++++++++++++++++++++++++++++----------------
 src/speaker.rs       | 14 ++++----
 4 files changed, 83 insertions(+), 81 deletions(-)

diff --git a/src/node.rs b/src/node.rs
index c523b84..99027ff 100644
--- a/src/node.rs
+++ b/src/node.rs
@@ -10,31 +10,33 @@ pub struct OilNodeResource {
 }
 
 #[derive(Resource, Default)]
-pub struct OilAsset(Handle<Image>);
+pub struct OilAsset {
+    asset: Handle<Image>,
+    pub loaded: bool,
+}
 
 pub fn load_oil(asset_server: Res<AssetServer>, mut oil: ResMut<OilAsset>) {
-    oil.0 = asset_server.load("oilspil.png");
+    oil.asset = asset_server.load("oilspil.png");
 }
 
 pub fn spawn_world_nodes(
     mut commands: Commands,
-    oil: Res<OilAsset>,
+    mut oil: ResMut<OilAsset>,
     asset_server: Res<AssetServer>,
-    mut loaded: Local<bool>,
 ) {
-    if *loaded {
+    if oil.loaded {
         return;
     }
 
     if !asset_server
-        .get_load_state(oil.0.id())
+        .get_load_state(oil.asset.id())
         .is_some_and(|s| s.is_loaded())
     {
         return;
     }
-    *loaded = true;
+    oil.loaded = true;
 
-    for transform in [
+    let node_transforms = [
         Transform::from_xyz(-62.5, -80.9, 22.16).with_rotation(Quat::from_euler(
             EulerRot::XYZ,
             0.0783,
@@ -59,9 +61,15 @@ pub fn spawn_world_nodes(
             -0.07,
             0.,
         )),
-    ] {
+    ];
+
+    commands.insert_resource(OilNodeResource {
+        nodes_left: node_transforms.len(),
+    });
+
+    for (idx, transform) in node_transforms.iter().enumerate() {
         commands.spawn((
-            Name::new("Decal"),
+            Name::new(format!("OilNode-{idx}")),
             Sprite3d {
                 pixels_per_metre: 400.,
                 alpha_mode: AlphaMode::Blend,
@@ -70,7 +78,7 @@ pub fn spawn_world_nodes(
                 ..default()
             },
             Sprite {
-                image: oil.0.clone(),
+                image: oil.asset.clone(),
                 ..default()
             },
             NotShadowCaster,
diff --git a/src/player/action.rs b/src/player/action.rs
index c9d1eed..e476223 100644
--- a/src/player/action.rs
+++ b/src/player/action.rs
@@ -3,33 +3,22 @@ use std::{
     process::exit,
 };
 
-use avian3d::prelude::*;
 use bevy::prelude::*;
 
 use crate::{
-    player::{Player, PlayerAction, PlayerCamera, marker::PlaceMarker},
-    speaker::{Pickup, Speaker, SpeakerMode, SpeakerResource, grab, ungrab},
+    player::{Player, PlayerAction, PlayerCamera, marker::TryPlaceMarker},
+    speaker::{Pickup, grab, ungrab},
     ui,
 };
 
-/// distance from the speaker in which the player may place a marker
-const PLAYER_SPEAKER_PLACE_DIST: f32 = 4.0;
-/// squared distance for easy compute
-const PLAYER_SPEAKER_PLACE_DIST_2: f32 = PLAYER_SPEAKER_PLACE_DIST * PLAYER_SPEAKER_PLACE_DIST;
-
-#[derive(Resource, Default)]
-pub struct Placed(u32);
-
 pub fn player_action(
     mut commands: Commands,
     time: Res<Time>,
     player: Single<
-        (&GlobalTransform, &mut Transform, &mut Player, &RayHits),
+        (&GlobalTransform, &mut Transform, &mut Player),
         (Without<PlayerCamera>, Without<Pickup>),
     >,
-    mut place_speaker: MessageWriter<PlaceMarker>,
-    speaker: Single<&GlobalTransform, With<Speaker>>,
-    speaker_resource: Res<SpeakerResource>,
+    mut place_speaker: MessageWriter<TryPlaceMarker>,
     input: Res<ButtonInput<MouseButton>>,
     mut cursor_icon: Single<&mut Visibility, With<ui::Cursor>>,
     camera: Single<
@@ -44,9 +33,8 @@ pub fn player_action(
         (Entity, &GlobalTransform),
         (Without<Player>, Without<PlayerCamera>, Without<Pickup>),
     >,
-    mut placed: Local<Placed>,
 ) {
-    let (player_global, mut player_tm, mut player, player_hits) = player.into_inner();
+    let (player_global, mut player_tm, mut player) = player.into_inner();
 
     let (camera_entity, camera_global, mut camera_tm) = camera.into_inner();
 
@@ -80,23 +68,8 @@ pub fn player_action(
             } else {
                 **cursor_icon = Visibility::Hidden;
 
-                if let SpeakerMode::Ready(node) = &speaker_resource.mode {
-                    if player_global
-                        .translation()
-                        .distance_squared(speaker.translation())
-                        < PLAYER_SPEAKER_PLACE_DIST_2
-                        && player.action == PlayerAction::None
-                        && input.just_pressed(MouseButton::Left)
-                        && !player_hits.is_empty()
-                    {
-                        placed.0 += 1;
-                        if placed.0 == 4 {
-                            exit(0);
-                        }
-                        println!("Message sent!");
-                        place_speaker.write(PlaceMarker { oil: *node });
-                    }
-                } else {
+                if lmb {
+                    place_speaker.write(TryPlaceMarker);
                 }
                 None
             }
diff --git a/src/player/marker.rs b/src/player/marker.rs
index 53ff451..6f29ead 100644
--- a/src/player/marker.rs
+++ b/src/player/marker.rs
@@ -1,18 +1,29 @@
+use std::process::exit;
+
 use avian3d::prelude::*;
 use bevy::prelude::*;
 
-use crate::player::PlayerCamera;
+use crate::{
+    node::{OilAsset, OilNode, OilNodeResource},
+    player::PlayerCamera,
+};
 
 pub struct MarkerPlugin;
 
 impl Plugin for MarkerPlugin {
     fn build(&self, app: &mut bevy::app::App) {
-        app.add_message::<PlaceMarker>()
+        app.add_message::<TryPlaceMarker>()
             .add_systems(Startup, load_marker_gltf)
-            .add_systems(PostUpdate, place_markers);
+            .add_systems(
+                PostUpdate,
+                place_markers.run_if(|oil: Res<OilAsset>| oil.loaded),
+            );
     }
 }
 
+/// distance from the oil node in which the player may place a marker
+const PLAYER_PLACE_DIST: f32 = 8.0;
+
 #[derive(Resource)]
 struct MarkerAssets {
     pub model: Handle<Gltf>,
@@ -20,20 +31,20 @@ struct MarkerAssets {
 }
 
 #[derive(Message)]
-pub struct PlaceMarker {
-    pub oil: Entity,
-}
+pub struct TryPlaceMarker;
 
 fn place_markers(
-    mut reader: MessageReader<PlaceMarker>,
+    mut reader: MessageReader<TryPlaceMarker>,
     mut commands: Commands,
     marker_assets: Res<MarkerAssets>,
     gltf: Res<Assets<Gltf>>,
     mut materials: ResMut<Assets<StandardMaterial>>,
+    mut oil_node_res: ResMut<OilNodeResource>,
     spatial_query: SpatialQuery,
     cam: Single<&GlobalTransform, With<PlayerCamera>>,
+    nodes: Query<(Entity, &GlobalTransform), With<OilNode>>,
 ) {
-    for PlaceMarker { oil } in reader.read() {
+    for TryPlaceMarker in reader.read() {
         let Some(gltf) = gltf.get(&marker_assets.model) else {
             return;
         };
@@ -50,30 +61,40 @@ fn place_markers(
         if let Some(hits) = spatial_query.cast_ray(
             cam.translation(),
             cam.forward(),
-            3.0,
+            4.0,
             false,
             &SpatialQueryFilter::default(),
         ) {
-            commands.entity(*oil).despawn();
-
-            let pos = cam.translation() + hits.distance * cam.forward();
-
-            commands
-                .spawn((
-                    SceneRoot(gltf.scenes[0].clone()),
-                    Transform::from_translation(pos),
-                    Visibility::default(),
-                ))
-                .with_children(|parent| {
-                    parent.spawn((
-                        PointLight {
-                            color: Color::srgb(1., 0.5, 0.5),
-                            intensity: 5000.0,
-                            ..Default::default()
-                        },
-                        Transform::from_xyz(0.0, 0.0, 0.8),
-                    ));
-                });
+            let contact_pos = cam.translation() + hits.distance * cam.forward();
+
+            for (id, transform) in nodes {
+                if contact_pos.distance(transform.translation()) < PLAYER_PLACE_DIST {
+                    oil_node_res.nodes_left -= 1;
+
+                    commands.entity(id).despawn();
+
+                    commands
+                        .spawn((
+                            SceneRoot(gltf.scenes[0].clone()),
+                            Transform::from_translation(contact_pos),
+                            Visibility::default(),
+                        ))
+                        .with_children(|parent| {
+                            parent.spawn((
+                                PointLight {
+                                    color: Color::srgb(1., 0.5, 0.5),
+                                    intensity: 5000.0,
+                                    ..Default::default()
+                                },
+                                Transform::from_xyz(0.0, 0.0, 0.8),
+                            ));
+                        });
+
+                    if oil_node_res.nodes_left == 0 {
+                        exit(0);
+                    }
+                }
+            }
         }
     }
 }
diff --git a/src/speaker.rs b/src/speaker.rs
index c94d93b..9cdf11a 100644
--- a/src/speaker.rs
+++ b/src/speaker.rs
@@ -64,7 +64,7 @@ pub enum SpeakerMode {
     #[default]
     None,
     Blink(f32),
-    Ready(Entity),
+    Ready,
 }
 
 #[derive(Resource)]
@@ -153,7 +153,7 @@ pub fn apply_color(speaker_resource: &SpeakerResource, materials: &mut Assets<St
     let color = match speaker_resource.mode {
         SpeakerMode::None => LinearRgba::BLACK,
         SpeakerMode::Blink(blink) => EMIT_RED * blink,
-        SpeakerMode::Ready(_) => EMIT_GREEN,
+        SpeakerMode::Ready => EMIT_GREEN,
     };
 
     let need_change = if let Some(mat_handle) = &speaker_resource.material_blink {
@@ -177,19 +177,19 @@ pub fn apply_color(speaker_resource: &SpeakerResource, materials: &mut Assets<St
 
 pub fn speaker_preupdate(
     time: Res<Time>,
-    nodes: Query<(Entity, &GlobalTransform), With<OilNode>>,
+    nodes: Query<&GlobalTransform, With<OilNode>>,
     speaker: Single<&GlobalTransform, With<Speaker>>,
     mut speaker_resource: ResMut<SpeakerResource>,
     mut materials: ResMut<Assets<StandardMaterial>>,
 ) {
-    speaker_resource.mode = if let Some((e, n, power)) = nodes
+    speaker_resource.mode = if let Some((n, power)) = nodes
         .iter()
-        .map(|(e, n)| (e, n, bias(&speaker, n)))
-        .reduce(|a, b| if a.2 < b.2 { b } else { a })
+        .map(|n| (n, bias(&speaker, n)))
+        .reduce(|a, b| if a.1 < b.1 { b } else { a })
     {
         if n.translation().distance_squared(speaker.translation()) < NODE_SPEAKER_ACTIVATION_DIST_2
         {
-            SpeakerMode::Ready(e)
+            SpeakerMode::Ready
         } else {
             speaker_resource.time += (power * 40.0) * time.delta_secs();
             SpeakerMode::Blink(speaker_resource.time.sin().abs().squared())

From 8dc5ccc652f9082dbc22f0f56ae24cd5fe4e9adf Mon Sep 17 00:00:00 2001
From: Arthur-Aillet <arthur.aillet@epitech.eu>
Date: Sun, 15 Feb 2026 14:53:52 +0100
Subject: [PATCH 14/19] feat: oil spil range displayed in debug

---
 src/debug.rs         | 22 ++++++++++++++++++++--
 src/player/marker.rs |  2 +-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/debug.rs b/src/debug.rs
index dc1f8bf..7a85566 100644
--- a/src/debug.rs
+++ b/src/debug.rs
@@ -4,7 +4,9 @@ use bevy::prelude::*;
 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,14 +33,30 @@ 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>,
diff --git a/src/player/marker.rs b/src/player/marker.rs
index 6f29ead..1edb6ec 100644
--- a/src/player/marker.rs
+++ b/src/player/marker.rs
@@ -22,7 +22,7 @@ impl Plugin for MarkerPlugin {
 }
 
 /// distance from the oil node in which the player may place a marker
-const PLAYER_PLACE_DIST: f32 = 8.0;
+pub const PLAYER_PLACE_DIST: f32 = 4.0;
 
 #[derive(Resource)]
 struct MarkerAssets {

From 8c6233daeabdd8d88e48ca0d17acb9d0349d0a0a Mon Sep 17 00:00:00 2001
From: Arthur-Aillet <arthur.aillet@epitech.eu>
Date: Sun, 15 Feb 2026 16:01:25 +0100
Subject: [PATCH 15/19] feat: ui debug toggleable

---
 Cargo.toml   | 1 +
 src/debug.rs | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/Cargo.toml b/Cargo.toml
index a785866..f2a11f1 100644
--- a/Cargo.toml
+++ b/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" }
diff --git a/src/debug.rs b/src/debug.rs
index 7a85566..cc575f6 100644
--- a/src/debug.rs
+++ b/src/debug.rs
@@ -1,6 +1,7 @@
 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;
 
@@ -64,6 +65,7 @@ fn toggle_debug(
     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;
@@ -85,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 {

From 6475625f3ccb6d4e8038cf659c8939418b5d322f Mon Sep 17 00:00:00 2001
From: Arthur-Aillet <arthur.aillet@epitech.eu>
Date: Sun, 15 Feb 2026 16:02:12 +0100
Subject: [PATCH 16/19] feat: UI Text refactored to be centered more cleanly

---
 src/ui.rs | 89 +++++++++++++++++++++++++++----------------------------
 1 file changed, 43 insertions(+), 46 deletions(-)

diff --git a/src/ui.rs b/src/ui.rs
index 0d216ef..6e61d62 100644
--- a/src/ui.rs
+++ b/src/ui.rs
@@ -51,59 +51,56 @@ fn spawn_ui(mut commands: Commands, asset_server: Res<AssetServer>, hud: Res<Hud
             Outline::new(Val::Px(200.0), Val::Px(0.0), Color::BLACK),
             OverlayImage::default(),
         ));
-        parent.spawn((
-            Node {
-                top: Val::Px((900.0 - 70.0) / 2.),
-                left: Val::Px((1600.0 - 70.0) / 2.),
+        parent
+            .spawn((Node {
                 position_type: PositionType::Absolute,
-                width: Val::Px(70.0),
-                height: Val::Px(70.0),
-                ..Default::default()
-            },
-            Visibility::Hidden,
-            Cursor,
-            ImageNode {
-                image: asset_server.load("hand_icon.png"),
-                color: Color::WHITE,
-                ..Default::default()
-            },
-        ));
-        parent.spawn((
-            Node {
-                justify_self: JustifySelf::Center,
+                justify_content: JustifyContent::Center,
+                align_content: AlignContent::Center,
                 align_self: AlignSelf::Center,
-                left: Val::Vw(30.0),
-                width: Val::Vw(20.0),
-                height: Val::Vh(7.0),
-                position_type: PositionType::Absolute,
-                ..Default::default()
-            },
-            InvalidText,
-            Visibility::Hidden,
-            Text2d::new("The company isn't proud yet, unmarked oil sources remains..."),
-        ));
-        parent.spawn((
-            Node {
                 justify_self: JustifySelf::Center,
-                align_self: AlignSelf::Center,
-                left: Val::Vw(30.0),
-                width: Val::Vw(20.0),
-                height: Val::Vh(7.0),
-                position_type: PositionType::Absolute,
-                ..Default::default()
-            },
-            Visibility::Hidden,
-            ValidText,
-            Text2d::new("You did a great job! You might even get a raise."),
-        ));
+                width: Val::Vw(100.0),
+                height: Val::Vh(100.0),
+                ..default()
+            },))
+            .with_children(|centered| {
+                centered.spawn((
+                    Node {
+                        position_type: PositionType::Absolute,
+                        align_self: AlignSelf::Center,
+                        justify_self: JustifySelf::Center,
+                        display: Display::None,
+                        ..default()
+                    },
+                    Text::new("-"),
+                    TextFont::from_font_size(12.0),
+                    TextLayout::new_with_justify(Justify::Center).with_no_wrap(),
+                    TextColor(Color::WHITE),
+                    CenteredText,
+                ));
+
+                centered.spawn((
+                    Node {
+                        position_type: PositionType::Absolute,
+                        align_self: AlignSelf::Center,
+                        justify_self: JustifySelf::Center,
+                        width: Val::Px(70.0),
+                        height: Val::Px(70.0),
+                        ..Default::default()
+                    },
+                    Visibility::Hidden,
+                    Cursor,
+                    ImageNode {
+                        image: asset_server.load("hand_icon.png"),
+                        color: Color::WHITE,
+                        ..Default::default()
+                    },
+                ));
+            });
     });
 }
 
 #[derive(Component)]
-struct ValidText;
-
-#[derive(Component)]
-struct InvalidText;
+pub struct CenteredText;
 
 fn move_overlay(
     overlay: Single<(&mut Node, &mut OverlayImage), With<OverlayImage>>,

From 9a16725375b5b9c00fb6aa0908446c465de75785 Mon Sep 17 00:00:00 2001
From: Arthur-Aillet <arthur.aillet@epitech.eu>
Date: Sun, 15 Feb 2026 16:02:32 +0100
Subject: [PATCH 17/19] feat: ladder code in his own plugin

---
 src/ladder.rs | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++
 src/main.rs   |  6 ++--
 src/world.rs  | 73 ++---------------------------------------
 3 files changed, 97 insertions(+), 73 deletions(-)
 create mode 100644 src/ladder.rs

diff --git a/src/ladder.rs b/src/ladder.rs
new file mode 100644
index 0000000..9ce10c0
--- /dev/null
+++ b/src/ladder.rs
@@ -0,0 +1,91 @@
+use bevy::{light::NotShadowCaster, prelude::*};
+use bevy_sprite3d::Sprite3d;
+
+use crate::{node::OilNodeResource, 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, (/*ladder_interraction,*/spawn_ladder));
+    }
+}
+
+// pub fn ladder_interraction(
+//     win_text: Query<(&mut Node, &mut Text), With<CenteredText>>,
+//     mut oil_res: ResMut<OilNodeResource>,
+// ) {
+//     if oil_res.nodes_left == 0 {}
+// }
+
+#[derive(Resource, Default)]
+pub struct Ladder(Handle<Image>);
+
+#[derive(Component)]
+pub struct LadderInteract;
+
+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,
+        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.),
+        ));
+    }
+}
diff --git a/src/main.rs b/src/main.rs
index 25a75ee..1c50c18 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,4 +1,5 @@
 mod debug;
+mod ladder;
 mod monster;
 mod node;
 mod particle;
@@ -15,8 +16,8 @@ use bevy_atmosphere::plugin::AtmospherePlugin;
 use particle::ParticlePlugin;
 
 use crate::{
-    debug::DebugPlugin, monster::MonsterPlugin, player::PlayerPlugin, settings::Settings,
-    speaker::SpeakerPlugin, ui::UiPlugin, world::WorldPlugin,
+    debug::DebugPlugin, ladder::LadderPlugin, monster::MonsterPlugin, player::PlayerPlugin,
+    settings::Settings, speaker::SpeakerPlugin, ui::UiPlugin, world::WorldPlugin,
 };
 
 fn main() {
@@ -51,6 +52,7 @@ fn main() {
             PlayerPlugin,
             MonsterPlugin,
             SpeakerPlugin,
+            LadderPlugin,
         ))
         .insert_resource(Gravity(Vec3::NEG_Z * 0.3))
         .run();
diff --git a/src/world.rs b/src/world.rs
index 5a7b302..5479bbe 100644
--- a/src/world.rs
+++ b/src/world.rs
@@ -16,14 +16,13 @@ impl Plugin for WorldPlugin {
                 Startup,
                 (
                     load_ground_gltf,
-                    load_ladder,
                     setup_world,
                     play_background_audio,
                     load_oil,
+                    spawn_world,
                 ),
             )
-            .add_systems(Update, (spawn_ground, spawn_world, spawn_world_nodes))
-            .insert_resource(Ladder::default())
+            .add_systems(Update, (spawn_ground, spawn_world_nodes))
             .insert_resource(OilAsset::default());
     }
 }
@@ -59,13 +58,6 @@ fn load_ground_gltf(mut commands: Commands, assets: Res<AssetServer>) {
     ));
 }
 
-#[derive(Resource, Default)]
-pub struct Ladder(Handle<Image>);
-
-fn load_ladder(asset_server: Res<AssetServer>, mut ladder: ResMut<Ladder>) {
-    ladder.0 = asset_server.load("ladder.png");
-}
-
 fn play_background_audio(asset_server: Res<AssetServer>, mut commands: Commands) {
     commands.spawn((
         AudioPlayer::new(asset_server.load("ambience.wav")),
@@ -73,72 +65,11 @@ fn play_background_audio(asset_server: Res<AssetServer>, mut commands: Commands)
     ));
 }
 
-#[derive(Component)]
-pub(crate) struct LadderInteract;
-
 fn spawn_world(
-    asset_server: Res<AssetServer>,
-    ladder: Res<Ladder>,
     mut meshes: ResMut<Assets<Mesh>>,
     mut materials: ResMut<Assets<StandardMaterial>>,
     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,
-        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,
-            // pivot: Some(Vec2::new(0.5, 0.5)),
-            ..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,
-                // pivot: Some(Vec2::new(0.5, 0.5)),
-                ..default()
-            },
-            Sprite {
-                image: ladder.0.clone(),
-                ..default()
-            },
-            NotShadowCaster,
-            Visibility::Visible,
-            Transform::from_xyz(0., i as f32 * 2.24, 0.),
-        ));
-    }
-
     commands.spawn((
         Mesh3d(meshes.add(Capsule3d::default().mesh().latitudes(7).longitudes(7))),
         MeshMaterial3d(materials.add(Color::srgb_u8(165, 42, 42))),

From 33febf98b99ca4116508667de0a974a0361d6fe1 Mon Sep 17 00:00:00 2001
From: Arthur-Aillet <arthur.aillet@epitech.eu>
Date: Sun, 15 Feb 2026 17:44:22 +0100
Subject: [PATCH 18/19] feat: Game State progresses until end of the game

---
 src/ladder.rs        | 71 +++++++++++++++++++++++++++++++++++++++-----
 src/player/marker.rs | 15 ++--------
 2 files changed, 66 insertions(+), 20 deletions(-)

diff --git a/src/ladder.rs b/src/ladder.rs
index 9ce10c0..77b3bb8 100644
--- a/src/ladder.rs
+++ b/src/ladder.rs
@@ -1,7 +1,7 @@
 use bevy::{light::NotShadowCaster, prelude::*};
 use bevy_sprite3d::Sprite3d;
 
-use crate::{node::OilNodeResource, ui::CenteredText};
+use crate::{node::OilNodeResource, player::PlayerCamera, ui::CenteredText};
 
 pub struct LadderPlugin;
 
@@ -9,16 +9,67 @@ impl Plugin for LadderPlugin {
     fn build(&self, app: &mut App) {
         app.insert_resource(Ladder::default())
             .add_systems(Startup, load_ladder)
-            .add_systems(Update, (/*ladder_interraction,*/spawn_ladder));
+            .add_systems(Update, spawn_ladder)
+            .add_systems(PostUpdate, game_state)
+            .insert_resource(GameState::default());
     }
 }
 
-// pub fn ladder_interraction(
-//     win_text: Query<(&mut Node, &mut Text), With<CenteredText>>,
-//     mut oil_res: ResMut<OilNodeResource>,
-// ) {
-//     if oil_res.nodes_left == 0 {}
-// }
+#[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 <= 3 && 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>);
@@ -26,6 +77,9 @@ 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");
 }
@@ -51,6 +105,7 @@ fn spawn_ladder(
 
     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.)),
diff --git a/src/player/marker.rs b/src/player/marker.rs
index 1edb6ec..d63e3ca 100644
--- a/src/player/marker.rs
+++ b/src/player/marker.rs
@@ -1,10 +1,8 @@
-use std::process::exit;
-
 use avian3d::prelude::*;
 use bevy::prelude::*;
 
 use crate::{
-    node::{OilAsset, OilNode, OilNodeResource},
+    node::{OilNode, OilNodeResource},
     player::PlayerCamera,
 };
 
@@ -14,10 +12,7 @@ impl Plugin for MarkerPlugin {
     fn build(&self, app: &mut bevy::app::App) {
         app.add_message::<TryPlaceMarker>()
             .add_systems(Startup, load_marker_gltf)
-            .add_systems(
-                PostUpdate,
-                place_markers.run_if(|oil: Res<OilAsset>| oil.loaded),
-            );
+            .add_systems(PostUpdate, place_markers);
     }
 }
 
@@ -39,7 +34,7 @@ fn place_markers(
     marker_assets: Res<MarkerAssets>,
     gltf: Res<Assets<Gltf>>,
     mut materials: ResMut<Assets<StandardMaterial>>,
-    mut oil_node_res: ResMut<OilNodeResource>,
+    mut oil_node_res: If<ResMut<OilNodeResource>>,
     spatial_query: SpatialQuery,
     cam: Single<&GlobalTransform, With<PlayerCamera>>,
     nodes: Query<(Entity, &GlobalTransform), With<OilNode>>,
@@ -89,10 +84,6 @@ fn place_markers(
                                 Transform::from_xyz(0.0, 0.0, 0.8),
                             ));
                         });
-
-                    if oil_node_res.nodes_left == 0 {
-                        exit(0);
-                    }
                 }
             }
         }

From ba350570286ca940a50ea5db23a8facdad64cdec Mon Sep 17 00:00:00 2001
From: Arthur-Aillet <arthur.aillet@epitech.eu>
Date: Sun, 15 Feb 2026 18:11:01 +0100
Subject: [PATCH 19/19] feat: text has a pixelated font

---
 .gitattributes                | 1 +
 assets/VCR_OSD_MONO_1.001.ttf | 3 +++
 src/ladder.rs                 | 2 +-
 src/ui.rs                     | 8 ++++++--
 4 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 assets/VCR_OSD_MONO_1.001.ttf

diff --git a/.gitattributes b/.gitattributes
index c1e5f83..35820e4 100644
--- a/.gitattributes
+++ b/.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
diff --git a/assets/VCR_OSD_MONO_1.001.ttf b/assets/VCR_OSD_MONO_1.001.ttf
new file mode 100644
index 0000000..227241f
--- /dev/null
+++ b/assets/VCR_OSD_MONO_1.001.ttf
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:01918d86cb163a715dcb97165b997256734dfcc9f550beeb7c142fa4a064cf1c
+size 75864
diff --git a/src/ladder.rs b/src/ladder.rs
index 77b3bb8..b186809 100644
--- a/src/ladder.rs
+++ b/src/ladder.rs
@@ -44,7 +44,7 @@ pub fn game_state(
 
     let (mut node, mut text) = text.into_inner();
 
-    if oil_res.nodes_left <= 3 && game_state.current_step == Step::LocateOil {
+    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);
 
diff --git a/src/ui.rs b/src/ui.rs
index 6e61d62..994b6f5 100644
--- a/src/ui.rs
+++ b/src/ui.rs
@@ -71,8 +71,12 @@ fn spawn_ui(mut commands: Commands, asset_server: Res<AssetServer>, hud: Res<Hud
                         display: Display::None,
                         ..default()
                     },
-                    Text::new("-"),
-                    TextFont::from_font_size(12.0),
+                    Text::new(""),
+                    TextFont {
+                        font: asset_server.load("VCR_OSD_MONO_1.001.ttf"),
+                        font_size: 16.0,
+                        ..default()
+                    },
                     TextLayout::new_with_justify(Justify::Center).with_no_wrap(),
                     TextColor(Color::WHITE),
                     CenteredText,