From 9443eabf1ea8b9743da8f1041c78a26aced0f4d9 Mon Sep 17 00:00:00 2001
From: PhantomMorrigan <phantom.morrigan@proton.me>
Date: Sat, 15 Nov 2025 14:56:43 +0100
Subject: [PATCH] track number of berries

---
 src/berries.rs |  9 +--------
 src/main.rs    | 23 +++++++++++------------
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/src/berries.rs b/src/berries.rs
index 8c0e3b5..328d8f8 100644
--- a/src/berries.rs
+++ b/src/berries.rs
@@ -1,5 +1,3 @@
-use std::time::Duration;
-
 use bevy::prelude::*;
 use rand::Rng;
 
@@ -11,14 +9,10 @@ pub struct NewBerry(pub Entity);
 
 pub fn spawn_berries(
     mut commands: Commands,
-    mut timer: Local<Timer>,
-    time: Res<Time>,
     asset_server: Res<AssetServer>,
     mut new_berries: MessageWriter<NewBerry>,
 ) {
-    timer.set_duration(Duration::from_millis(1));
-    timer.tick(time.delta());
-    if timer.is_finished() {
+    for _ in 0..5 {
         let new = commands
             .spawn((
                 Berry,
@@ -29,6 +23,5 @@ pub fn spawn_berries(
             ))
             .id();
         new_berries.write(NewBerry(new));
-        timer.reset();
     }
 }
diff --git a/src/main.rs b/src/main.rs
index e6402d8..26ab663 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -16,13 +16,7 @@ const SPEED: f32 = 100.0;
 fn main() {
     App::new()
         .add_plugins((
-            DefaultPlugins.build().set(WindowPlugin {
-                primary_window: Some(Window {
-                    present_mode: bevy::window::PresentMode::AutoNoVsync,
-                    ..default()
-                }),
-                ..default()
-            }),
+            DefaultPlugins,
             BaePlugin::default(),
             LogDiagnosticsPlugin::default(),
             FrameTimeDiagnosticsPlugin::default(),
@@ -49,6 +43,7 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
     for _ in 1..100 {
         commands.spawn((
             Plan::new(),
+            BerriesEaten(0),
             Sprite::from_image(asset_server.load("collector.png")),
             Sequence,
             tasks!(
@@ -71,6 +66,9 @@ pub struct TargetBerry(pub Entity);
 #[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,
@@ -97,14 +95,14 @@ fn find_closest_berry(
 
 fn go_to_berry(
     In(input): In<OperatorInput>,
-    mut planners: Query<(&mut Transform, &TargetBerry), With<Plan>>,
+    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)) = planners.get_mut(input.entity) else {
+    let Ok((mut trans, target_entity, eaten)) = planners.get_mut(input.entity) else {
         return OperatorStatus::Failure;
     };
 
@@ -130,7 +128,7 @@ fn go_to_berry(
         }
 
         let dir = (target.translation.xy() - trans.translation.xy()).normalize();
-        let mov = dir * SPEED * time.delta_secs();
+        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;
@@ -144,12 +142,13 @@ fn go_to_berry(
 
 fn collect_berry(
     In(input): In<OperatorInput>,
-    planners: Query<&TargetBerry, With<Plan>>,
+    mut planners: Query<(&TargetBerry, &mut BerriesEaten), With<Plan>>,
     mut commands: Commands,
 ) -> OperatorStatus {
-    let Ok(berry) = planners.get(input.entity) else {
+    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