From f8d95d074c36ec35eee8def73b8d9f2b83c922cb Mon Sep 17 00:00:00 2001
From: metamuffin <metamuffin@disroot.org>
Date: Mon, 20 Oct 2025 00:56:32 +0200
Subject: Pathfinding avoids chairs

---
 server/bot/src/algos/customer.rs | 9 ++++-----
 server/bot/src/algos/frank.rs    | 2 +-
 server/bot/src/algos/simple.rs   | 2 +-
 server/bot/src/algos/test.rs     | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'server/bot/src/algos')

diff --git a/server/bot/src/algos/customer.rs b/server/bot/src/algos/customer.rs
index 06dc373c..5a6f71f7 100644
--- a/server/bot/src/algos/customer.rs
+++ b/server/bot/src/algos/customer.rs
@@ -112,7 +112,7 @@ impl CustomerState {
                         .map(|(p, _)| *p)
                         .collect::<Vec<_>>();
                     if let Some(&chair) = chairs.get(random::<usize>(..) % chairs.len().max(1))
-                        && let Some(path) = find_path(&game.walkable, pos.as_ivec2(), chair)
+                        && let Some(path) = find_path(game, pos.as_ivec2(), chair)
                     {
                         debug!("{me:?} -> entering");
                         *self = CustomerState::Entering {
@@ -185,7 +185,7 @@ impl CustomerState {
                     *self = CustomerState::New;
                     BotInput::default()
                 } else if path.is_stuck() {
-                    if let Some(path) = find_path(&game.walkable, pos.as_ivec2(), *origin) {
+                    if let Some(path) = find_path(game, pos.as_ivec2(), *origin) {
                         *self = CustomerState::Exiting { path };
                     }
                     BotInput::default()
@@ -208,8 +208,7 @@ impl CustomerState {
                 *timeout -= dt;
                 *check += 1;
                 if *timeout <= 0. {
-                    let path = find_path(&game.walkable, pos.as_ivec2(), *origin)
-                        .expect("no path to exit");
+                    let path = find_path(game, pos.as_ivec2(), *origin).expect("no path to exit");
                     debug!("{me:?} -> exiting");
                     *self = CustomerState::Exiting { path };
                     return BotInput {
@@ -381,7 +380,7 @@ impl CustomerState {
                     .is_some_and(|pl| pl.items[0].is_none())
                 // TODO index out of bounds?
                 {
-                    if let Some(path) = find_path(&game.walkable, pos.as_ivec2(), *origin) {
+                    if let Some(path) = find_path(game, pos.as_ivec2(), *origin) {
                         *self = CustomerState::Exiting { path };
                     }
                     BotInput::default()
diff --git a/server/bot/src/algos/frank.rs b/server/bot/src/algos/frank.rs
index 3515f96d..489417a6 100644
--- a/server/bot/src/algos/frank.rs
+++ b/server/bot/src/algos/frank.rs
@@ -90,7 +90,7 @@ impl BotAlgo for Frank {
                         };
                     }
                 } else if let Some(path) =
-                    find_path_to_neighbour(&game.walkable, pos.as_ivec2(), tpos.as_ivec2())
+                    find_path_to_neighbour(game, pos.as_ivec2(), tpos.as_ivec2())
                 {
                     self.path = Some(path);
                 }
diff --git a/server/bot/src/algos/simple.rs b/server/bot/src/algos/simple.rs
index 0145cfcb..9c17cd82 100644
--- a/server/bot/src/algos/simple.rs
+++ b/server/bot/src/algos/simple.rs
@@ -243,7 +243,7 @@ impl<S: State> Context<'_, S> {
         }
     }
     pub fn interact_with(&mut self, tile: IVec2, duration: f32) -> LogicRes {
-        if let Some(path) = find_path_to_neighbour(&self.game.walkable, self.own_position, tile) {
+        if let Some(path) = find_path_to_neighbour(self.game, self.own_position, tile) {
             self.state.queue_segment(path, tile, duration);
             Err(())
         } else {
diff --git a/server/bot/src/algos/test.rs b/server/bot/src/algos/test.rs
index 20abbabd..387dd285 100644
--- a/server/bot/src/algos/test.rs
+++ b/server/bot/src/algos/test.rs
@@ -45,7 +45,7 @@ impl BotAlgo for Test {
             };
         } else if let Some((item, near)) = find_demand(game) {
             info!("demand {item:?} near {near}");
-            if let Some(path) = find_path_to_neighbour(&game.walkable, pos.as_ivec2(), near) {
+            if let Some(path) = find_path_to_neighbour(game, pos.as_ivec2(), near) {
                 self.path = Some(path);
             }
         }
-- 
cgit v1.3