diff options
Diffstat (limited to 'server/bot/src')
| -rw-r--r-- | server/bot/src/algos/simple.rs | 22 | ||||
| -rw-r--r-- | server/bot/src/algos/waiter.rs | 6 |
2 files changed, 27 insertions, 1 deletions
diff --git a/server/bot/src/algos/simple.rs b/server/bot/src/algos/simple.rs index 73099830..dbe8bbfe 100644 --- a/server/bot/src/algos/simple.rs +++ b/server/bot/src/algos/simple.rs @@ -139,6 +139,28 @@ impl<S> Context<'_, S> { _ => None, }) } + pub fn find_demands(&self) -> Vec<(ItemIndex, IVec2)> { + self.game + .players + .iter() + .filter_map(|(_, pl)| match &pl.communicate_persist { + Some((Message::Item(item), _)) => { + let pos = pl.movement.position.as_ivec2(); + [IVec2::X, IVec2::Y, -IVec2::X, -IVec2::Y] + .into_iter() + .find(|off| { + self.game + .tiles + .get(&(pos + *off)) + .map_or(false, |t| self.game.data.tile_interact[t.kind.0]) + }) + .map(|off| pos + off) + .map(|pos| (*item, pos)) + } + _ => None, + }) + .collect() + } pub fn find_recipe_with_output(&self, item: ItemIndex) -> Option<RecipeIndex> { self.game .data diff --git a/server/bot/src/algos/waiter.rs b/server/bot/src/algos/waiter.rs index adeded23..f3980170 100644 --- a/server/bot/src/algos/waiter.rs +++ b/server/bot/src/algos/waiter.rs @@ -102,7 +102,11 @@ impl Context<'_, Waiter> { if let Some(pos) = self.find_occupied_table_or_floor() { self.assert_tile_is_clear(pos)?; } - if let Some((item, table)) = self.find_demand() { + let dems = self.find_demands(); + for (item, table) in dems { + if self.game.data.item_name(item) == "unknown-order" { + self.interact_with(table, 0.)?; + } if self.aquire_item(item)? { self.interact_with(table, 0.)?; } |