Refactor bot input to packet based

1 files changed, 22 insertions, 16 deletions

diff --git a/server/bot/src/lib.rs b/server/bot/src/lib.rs
index a3889021..337d18e8 100644
--- a/server/bot/src/lib.rs
+++ b/server/bot/src/lib.rs
@@ -18,31 +18,37 @@
 #![feature(random)]
 pub mod algos;
 pub mod pathfinding;
+pub mod step;
 
 use hurrycurry_game_core::Game;
-use hurrycurry_protocol::{
-    PacketS, PlayerID,
-    glam::{IVec2, Vec2},
-};
-use std::random::random;
+use hurrycurry_protocol::PacketS;
+use std::{collections::VecDeque, random::random};
 
-#[derive(Default, Clone)]
-pub struct BotInput {
-    pub direction: Vec2,
-    pub boost: bool,
-    pub interact: Option<IVec2>,
-    pub leave: bool,
-    pub extra: Vec<PacketS>,
+pub struct PacketSink<'a> {
+    buf: &'a mut VecDeque<PacketS>,
+}
+impl<'a> PacketSink<'a> {
+    pub fn new(buf: &'a mut VecDeque<PacketS>) -> Self {
+        Self { buf }
+    }
+    pub fn push(&mut self, p: PacketS) {
+        self.buf.push_back(p);
+    }
 }
 
 pub type DynBotAlgo = Box<dyn BotAlgo + Send + Sync + 'static>;
 pub trait BotAlgo {
-    fn tick(&mut self, me: PlayerID, game: &Game, dt: f32) -> BotInput;
+    fn tick(&mut self, out: PacketSink, game: &Game, dt: f32);
+    fn is_finished(&self) -> bool {
+        false
+    }
 }
-
 impl<T: BotAlgo + ?Sized> BotAlgo for Box<T> {
-    fn tick(&mut self, me: PlayerID, game: &Game, dt: f32) -> BotInput {
-        (**self).tick(me, game, dt)
+    fn tick(&mut self, out: PacketSink, game: &Game, dt: f32) {
+        (**self).tick(out, game, dt)
+    }
+    fn is_finished(&self) -> bool {
+        (**self).is_finished()
     }
 }