From 6c05e7d869f612194052b33a520cab0688207d39 Mon Sep 17 00:00:00 2001
From: PhantomMorrigan <phantom.morrigan@proton.me>
Date: Sat, 15 Nov 2025 20:36:48 +0100
Subject: [PATCH] extract ghost into its own module and plugin

---
 assets/{collector.png => ghost.png} | Bin
 src/ghost.rs                        | 136 ++++++++++++++++++++++++++++
 src/leaderbord.rs                   |   2 +-
 src/main.rs                         | 133 ++-------------------------
 4 files changed, 144 insertions(+), 127 deletions(-)
 rename assets/{collector.png => ghost.png} (100%)
 create mode 100644 src/ghost.rs

diff --git a/assets/collector.png b/assets/ghost.png
similarity index 100%
rename from assets/collector.png
rename to assets/ghost.png
diff --git a/src/ghost.rs b/src/ghost.rs
new file mode 100644
index 0000000..766744b
--- /dev/null
+++ b/src/ghost.rs
@@ -0,0 +1,136 @@
+use bevy::prelude::*;
+use bevy_bae::prelude::*;
+use fake::{Fake, locales::EN};
+
+use crate::{
+    berries::{Berry, NewBerry},
+    sample_arena,
+};
+
+const SPEED: f32 = 100.0;
+
+pub fn ghost_plugin(app: &mut App) {
+    app.add_systems(Startup, setup);
+}
+
+pub fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
+    commands.spawn(Camera2d);
+    let mut rng = rand::rng();
+
+    commands.spawn((
+        Sprite::from_image(asset_server.load("arena.png")),
+        Transform::from_scale(Vec2::splat(18.0).extend(0.0)),
+    ));
+
+    for _ in 1..100 {
+        commands.spawn((
+            Plan::new(),
+            BerriesEaten(0),
+            Name::new(fake::faker::name::raw::FirstName(EN).fake::<String>()),
+            Sprite::from_image(asset_server.load("ghost.png")),
+            Sequence,
+            tasks!(
+                Operator::new(find_closest_berry),
+                Operator::new(go_to_berry),
+                Operator::new(collect_berry)
+            ),
+            Transform::from_translation(sample_arena(&mut rng).extend(0.1)),
+        ));
+    }
+}
+
+#[derive(Component)]
+#[relationship(relationship_target = TargetedBerry)]
+pub struct TargetBerry(pub Entity);
+
+#[derive(Component)]
+#[relationship_target(relationship = TargetBerry)]
+pub struct TargetedBerry(Entity);
+
+#[derive(Component)]
+pub struct BerriesEaten(pub usize);
+
+fn find_closest_berry(
+    In(input): In<OperatorInput>,
+    mut commands: Commands,
+    berries: Query<(Entity, &Transform), (With<Berry>, Without<TargetedBerry>, Without<Plan>)>,
+    planner: Query<&Transform, With<Plan>>,
+) -> OperatorStatus {
+    let pos = planner.get(input.entity).unwrap().translation.xy();
+    let mut closest: Option<Entity> = None;
+    let mut closest_dist = 0.0;
+    for (entity, transform) in berries {
+        let dist = transform.translation.xy().distance_squared(pos);
+        if closest.is_none() || dist < closest_dist {
+            closest = Some(entity);
+            closest_dist = dist;
+        }
+    }
+
+    if let Some(entity) = closest {
+        commands.entity(input.entity).insert(TargetBerry(entity));
+        return OperatorStatus::Success;
+    }
+    OperatorStatus::Ongoing
+}
+
+fn go_to_berry(
+    In(input): In<OperatorInput>,
+    mut planners: Query<(&mut Transform, &TargetBerry, &BerriesEaten), With<Plan>>,
+    berries: Query<&Transform, (With<Berry>, Without<Plan>)>,
+    new_berries: Query<&Transform, (With<Berry>, Without<TargetedBerry>, Without<Plan>)>,
+    time: Res<Time>,
+    mut news: MessageReader<NewBerry>,
+    mut commands: Commands,
+) -> OperatorStatus {
+    let Ok((mut trans, target_entity, eaten)) = planners.get_mut(input.entity) else {
+        return OperatorStatus::Failure;
+    };
+
+    if let Ok(target) = berries.get(target_entity.0) {
+        for new in news.read() {
+            let Ok(new_trans) = new_berries.get(new.0) else {
+                continue;
+            };
+
+            if (new_trans
+                .translation
+                .xy()
+                .distance_squared(trans.translation.xy())
+                - target
+                    .translation
+                    .xy()
+                    .distance_squared(trans.translation.xy()))
+                < 30.0
+            {
+                commands.entity(input.entity).insert(TargetBerry(new.0));
+                return OperatorStatus::Ongoing;
+            }
+        }
+
+        let dir = (target.translation.xy() - trans.translation.xy()).normalize();
+        let mov = dir * (SPEED * (1.0 + (eaten.0 as f32 + 1.0).log10())) * time.delta_secs();
+        if (target.translation.xy() - (trans.translation.xy() + mov)).length() < mov.length() {
+            trans.translation = target.translation;
+            return OperatorStatus::Success;
+        }
+        trans.translation += mov.extend(0.0);
+    } else {
+        return OperatorStatus::Failure;
+    }
+    OperatorStatus::Ongoing
+}
+
+fn collect_berry(
+    In(input): In<OperatorInput>,
+    mut planners: Query<(&TargetBerry, &mut BerriesEaten), With<Plan>>,
+    mut commands: Commands,
+) -> OperatorStatus {
+    let Ok((berry, mut eaten)) = planners.get_mut(input.entity) else {
+        return OperatorStatus::Failure;
+    };
+    eaten.0 += 1;
+    commands.entity(berry.0).despawn();
+    commands.entity(input.entity).remove::<TargetBerry>();
+    OperatorStatus::Success
+}
diff --git a/src/leaderbord.rs b/src/leaderbord.rs
index 4daaf82..d576be7 100644
--- a/src/leaderbord.rs
+++ b/src/leaderbord.rs
@@ -1,6 +1,6 @@
 use bevy::prelude::*;
 
-use crate::BerriesEaten;
+use crate::ghost::BerriesEaten;
 
 #[derive(Component)]
 pub struct LeaderBoard;
diff --git a/src/main.rs b/src/main.rs
index 359db01..bc25925 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -8,15 +8,17 @@ use bevy::{
     prelude::*,
 };
 use bevy_bae::prelude::*;
-use fake::{Fake, locales::EN};
 use rand::Rng;
 
-use crate::berries::{Berry, NewBerry};
+use crate::{
+    berries::NewBerry,
+    ghost::{TargetedBerry, ghost_plugin},
+};
 
 mod berries;
+mod ghost;
 mod leaderbord;
 
-const SPEED: f32 = 100.0;
 const RANGE: f32 = 450.0;
 
 pub fn sample_arena(rng: &mut impl Rng) -> Vec2 {
@@ -33,8 +35,9 @@ fn main() {
             BaePlugin::default(),
             LogDiagnosticsPlugin::default(),
             FrameTimeDiagnosticsPlugin::default(),
+            ghost_plugin,
         ))
-        .add_systems(Startup, (setup, leaderbord::setup).chain())
+        .add_systems(Startup, leaderbord::setup.after(ghost::setup))
         .add_message::<NewBerry>()
         .add_systems(
             FixedUpdate,
@@ -52,125 +55,3 @@ fn main() {
         )
         .run();
 }
-
-fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
-    commands.spawn(Camera2d);
-    let mut rng = rand::rng();
-
-    commands.spawn((
-        Sprite::from_image(asset_server.load("arena.png")),
-        Transform::from_scale(Vec2::splat(18.0).extend(0.0)),
-    ));
-
-    for _ in 1..100 {
-        commands.spawn((
-            Plan::new(),
-            BerriesEaten(0),
-            Name::new(fake::faker::name::raw::FirstName(EN).fake::<String>()),
-            Sprite::from_image(asset_server.load("collector.png")),
-            Sequence,
-            tasks!(
-                Operator::new(find_closest_berry),
-                Operator::new(go_to_berry),
-                Operator::new(collect_berry)
-            ),
-            Transform::from_translation(sample_arena(&mut rng).extend(0.1)),
-        ));
-    }
-}
-
-#[derive(Component)]
-#[relationship(relationship_target = TargetedBerry)]
-pub struct TargetBerry(pub Entity);
-
-#[derive(Component)]
-#[relationship_target(relationship = TargetBerry)]
-pub struct TargetedBerry(Entity);
-
-#[derive(Component)]
-pub struct BerriesEaten(pub usize);
-
-fn find_closest_berry(
-    In(input): In<OperatorInput>,
-    mut commands: Commands,
-    berries: Query<(Entity, &Transform), (With<Berry>, Without<TargetedBerry>, Without<Plan>)>,
-    planner: Query<&Transform, With<Plan>>,
-) -> OperatorStatus {
-    let pos = planner.get(input.entity).unwrap().translation.xy();
-    let mut closest: Option<Entity> = None;
-    let mut closest_dist = 0.0;
-    for (entity, transform) in berries {
-        let dist = transform.translation.xy().distance_squared(pos);
-        if closest.is_none() || dist < closest_dist {
-            closest = Some(entity);
-            closest_dist = dist;
-        }
-    }
-
-    if let Some(entity) = closest {
-        commands.entity(input.entity).insert(TargetBerry(entity));
-        return OperatorStatus::Success;
-    }
-    OperatorStatus::Ongoing
-}
-
-fn go_to_berry(
-    In(input): In<OperatorInput>,
-    mut planners: Query<(&mut Transform, &TargetBerry, &BerriesEaten), With<Plan>>,
-    berries: Query<&Transform, (With<Berry>, Without<Plan>)>,
-    new_berries: Query<&Transform, (With<Berry>, Without<TargetedBerry>, Without<Plan>)>,
-    time: Res<Time>,
-    mut news: MessageReader<NewBerry>,
-    mut commands: Commands,
-) -> OperatorStatus {
-    let Ok((mut trans, target_entity, eaten)) = planners.get_mut(input.entity) else {
-        return OperatorStatus::Failure;
-    };
-
-    if let Ok(target) = berries.get(target_entity.0) {
-        for new in news.read() {
-            let Ok(new_trans) = new_berries.get(new.0) else {
-                continue;
-            };
-
-            if (new_trans
-                .translation
-                .xy()
-                .distance_squared(trans.translation.xy())
-                - target
-                    .translation
-                    .xy()
-                    .distance_squared(trans.translation.xy()))
-                < 30.0
-            {
-                commands.entity(input.entity).insert(TargetBerry(new.0));
-                return OperatorStatus::Ongoing;
-            }
-        }
-
-        let dir = (target.translation.xy() - trans.translation.xy()).normalize();
-        let mov = dir * (SPEED * (1.0 + (eaten.0 as f32 + 1.0).log10())) * time.delta_secs();
-        if (target.translation.xy() - (trans.translation.xy() + mov)).length() < mov.length() {
-            trans.translation = target.translation;
-            return OperatorStatus::Success;
-        }
-        trans.translation += mov.extend(0.0);
-    } else {
-        return OperatorStatus::Failure;
-    }
-    OperatorStatus::Ongoing
-}
-
-fn collect_berry(
-    In(input): In<OperatorInput>,
-    mut planners: Query<(&TargetBerry, &mut BerriesEaten), With<Plan>>,
-    mut commands: Commands,
-) -> OperatorStatus {
-    let Ok((berry, mut eaten)) = planners.get_mut(input.entity) else {
-        return OperatorStatus::Failure;
-    };
-    eaten.0 += 1;
-    commands.entity(berry.0).despawn();
-    commands.entity(input.entity).remove::<TargetBerry>();
-    OperatorStatus::Success
-}
-- 
2.51.2