player class decoupled from character id

11 files changed, 80 insertions, 31 deletions

diff --git a/server/bot/src/algos/customer.rs b/server/bot/src/algos/customer.rs
index e602addc..6a45e379 100644
--- a/server/bot/src/algos/customer.rs
+++ b/server/bot/src/algos/customer.rs
@@ -20,7 +20,9 @@ use crate::{
     BotAlgo, BotInput,
 };
 use hurrycurry_client_lib::Game;
-use hurrycurry_protocol::{glam::IVec2, DemandIndex, Message, PacketS, PlayerID, Score};
+use hurrycurry_protocol::{
+    glam::IVec2, DemandIndex, Message, PacketS, PlayerClass, PlayerID, Score,
+};
 use log::info;
 use rand::{random, seq::IndexedRandom, thread_rng};
 
@@ -124,7 +126,7 @@ impl BotAlgo for Customer {
                         .players
                         .iter()
                         .find(|(id, p)| {
-                            p.character < 0
+                            p.class == PlayerClass::Customer
                                 && **id != me
                                 && p.movement.position.distance(chair.as_vec2() + 0.5) < 1.
                         })
@@ -186,7 +188,11 @@ impl BotAlgo for Customer {
                     if !*pinned {
                         let mut pin = false;
                         game.players_spatial_index.query(pos, 3., |pid, _| {
-                            if game.players.get(&pid).map_or(false, |p| p.character >= 0) {
+                            if game
+                                .players
+                                .get(&pid)
+                                .map_or(false, |p| p.class.is_cheflike())
+                            {
                                 pin = true
                             }
                         });
diff --git a/server/bot/src/algos/frank.rs b/server/bot/src/algos/frank.rs
index 854c73bb..1e02e297 100644
--- a/server/bot/src/algos/frank.rs
+++ b/server/bot/src/algos/frank.rs
@@ -20,7 +20,7 @@ use crate::{
     BotAlgo, BotInput,
 };
 use hurrycurry_client_lib::Game;
-use hurrycurry_protocol::{glam::Vec2, Message, PacketS, PlayerID};
+use hurrycurry_protocol::{glam::Vec2, Message, PacketS, PlayerClass, PlayerID};
 use rand::{seq::IndexedRandom, thread_rng};
 
 #[derive(Default)]
@@ -116,7 +116,7 @@ fn find_chef(game: &Game, me: PlayerID) -> Option<PlayerID> {
     let chefs = game
         .players
         .iter()
-        .filter(|(i, p)| p.character >= 0 && **i != me)
+        .filter(|(i, p)| p.class == PlayerClass::Chef && **i != me)
         .map(|(i, _)| *i)
         .collect::<Vec<_>>();
     chefs.choose(&mut thread_rng()).copied()
diff --git a/server/bot/src/main.rs b/server/bot/src/main.rs
index 0e6aed36..61ae1c1c 100644
--- a/server/bot/src/main.rs
+++ b/server/bot/src/main.rs
@@ -19,7 +19,7 @@ use anyhow::Result;
 use clap::Parser;
 use hurrycurry_bot::{algos::ALGO_CONSTRUCTORS, BotAlgo, BotInput};
 use hurrycurry_client_lib::{network::sync::Network, Game};
-use hurrycurry_protocol::{PacketC, PacketS, PlayerID};
+use hurrycurry_protocol::{PacketC, PacketS, PlayerClass, PlayerID};
 use log::warn;
 use std::{thread::sleep, time::Duration};
 
@@ -29,7 +29,7 @@ struct Args {
     #[arg(short, long)]
     username: Option<String>,
     /// Bot character id
-    #[arg(short, long, default_value_t = 51)]
+    #[arg(short, long, default_value_t = 0)]
     character: i32,
     algo: String,
     /// Websocket address of the server
@@ -57,6 +57,7 @@ fn main() -> Result<()> {
     network.queue_out.push_back(PacketS::Join {
         name: format!("{}-bot", args.username.clone().unwrap_or(args.algo.clone())),
         character: args.character,
+        class: PlayerClass::Bot,
         id: None,
     });
 
diff --git a/server/client-lib/src/lib.rs b/server/client-lib/src/lib.rs
index fc0f8ae6..2bd8fb09 100644
--- a/server/client-lib/src/lib.rs
+++ b/server/client-lib/src/lib.rs
@@ -21,7 +21,7 @@ pub mod spatial_index;
 
 use hurrycurry_protocol::{
     glam::IVec2, movement::MovementBase, Gamedata, ItemIndex, ItemLocation, Message,
-    MessageTimeout, PacketC, PlayerID, RecipeIndex, Score, TileIndex,
+    MessageTimeout, PacketC, PlayerClass, PlayerID, RecipeIndex, Score, TileIndex,
 };
 use spatial_index::SpatialIndex;
 use std::{
@@ -52,6 +52,7 @@ pub struct Tile {
 
 pub struct Player {
     pub name: String,
+    pub class: PlayerClass,
     pub character: i32,
     pub interacting: Option<IVec2>,
     pub item: Option<Item>,
@@ -84,6 +85,7 @@ impl Game {
                 id,
                 position,
                 character,
+                class,
                 name,
             } => {
                 self.players.insert(
@@ -91,6 +93,7 @@ impl Game {
                     Player {
                         name,
                         character,
+                        class,
                         interacting: None,
                         item: None,
                         communicate_persist: None,
diff --git a/server/protocol/src/lib.rs b/server/protocol/src/lib.rs
index b44a55fb..4c2ff3f4 100644
--- a/server/protocol/src/lib.rs
+++ b/server/protocol/src/lib.rs
@@ -95,6 +95,8 @@ pub enum PacketS {
     Join {
         name: String,
         character: i32,
+        #[serde(default = "chef_class")]
+        class: PlayerClass,
         #[serde(skip)] // TODO fix bincode can still set id
         id: Option<PlayerID>, // used entity bots that cant receive a response
     },
@@ -146,6 +148,23 @@ pub enum PacketS {
     },
 }
 
+fn chef_class() -> PlayerClass {
+    PlayerClass::Chef
+}
+
+#[derive(Debug, Clone, Copy, Serialize, Deserialize, Encode, Decode, PartialEq, Eq)]
+#[serde(rename_all = "snake_case")]
+pub enum PlayerClass {
+    Chef,
+    Bot,
+    Customer,
+}
+impl PlayerClass {
+    pub fn is_cheflike(&self) -> bool {
+        matches!(self, Self::Bot | Self::Chef)
+    }
+}
+
 #[derive(Debug, Clone, Serialize, Deserialize, Encode, Decode, PartialEq, Eq)]
 #[serde(rename_all = "snake_case")]
 pub enum Message {
@@ -173,6 +192,7 @@ pub enum PacketC {
         id: PlayerID,
         #[bincode(with_serde)]
         position: Vec2,
+        class: PlayerClass,
         character: i32,
         name: String,
     },
diff --git a/server/registry/src/lobby.rs b/server/registry/src/lobby.rs
index 8b501c46..886443f5 100644
--- a/server/registry/src/lobby.rs
+++ b/server/registry/src/lobby.rs
@@ -4,7 +4,7 @@ use hurrycurry_protocol::{
     glam::{ivec2, vec2, IVec2, Vec2},
     movement::MovementBase,
     registry::Entry,
-    Gamedata, PacketC, PacketS, PlayerID, TileIndex, VERSION,
+    Gamedata, PacketC, PacketS, PlayerClass, PlayerID, TileIndex, VERSION,
 };
 use log::{error, info, warn};
 use rocket::futures::{SinkExt, StreamExt};
@@ -133,6 +133,7 @@ async fn handle_conn(sock: TcpStream, addr: SocketAddr, entries: &[Entry]) -> Re
                 out.push(PacketC::AddPlayer {
                     id: PlayerID(0),
                     position: movement.position,
+                    class: PlayerClass::Chef,
                     character,
                     name,
                 });
diff --git a/server/src/commands.rs b/server/src/commands.rs
index 9d34c28c..06659161 100644
--- a/server/src/commands.rs
+++ b/server/src/commands.rs
@@ -23,7 +23,7 @@ use crate::{
 use anyhow::{anyhow, bail, Result};
 use clap::{Parser, ValueEnum};
 use hurrycurry_bot::algos::ALGO_CONSTRUCTORS;
-use hurrycurry_protocol::{Menu, Message, PacketC, PlayerID};
+use hurrycurry_protocol::{Menu, Message, PacketC, PlayerClass, PlayerID};
 use std::{fmt::Write, time::Duration};
 
 #[derive(Parser)]
@@ -218,6 +218,7 @@ impl Server {
                 self.entities.push(Box::new(BotDriver::new(
                     format!("{}-bot", name.unwrap_or((*aname).to_owned())),
                     51,
+                    PlayerClass::Bot,
                     algo,
                 )));
             }
diff --git a/server/src/entity/bot.rs b/server/src/entity/bot.rs
index cd505c4f..fe4d711f 100644
--- a/server/src/entity/bot.rs
+++ b/server/src/entity/bot.rs
@@ -18,7 +18,7 @@
 use super::{Entity, EntityContext};
 use anyhow::Result;
 use hurrycurry_bot::{BotAlgo, DynBotAlgo};
-use hurrycurry_protocol::{PacketS, PlayerID};
+use hurrycurry_protocol::{PacketS, PlayerClass, PlayerID};
 use log::info;
 use rand::random;
 use std::any::Any;
@@ -27,19 +27,19 @@ pub type DynBotDriver = BotDriver<DynBotAlgo>;
 
 pub struct BotDriver<T> {
     algo: T,
-    join_data: Option<(String, i32)>,
+    join_data: Option<(String, i32, PlayerClass)>,
     id: PlayerID,
     interacting: bool,
     left: bool,
 }
 
 impl<T: BotAlgo> BotDriver<T> {
-    pub fn new(name: String, character: i32, algo: T) -> Self {
+    pub fn new(name: String, character: i32, class: PlayerClass, algo: T) -> Self {
         Self {
             algo,
             id: PlayerID(0),
             interacting: false,
-            join_data: Some((name, character)),
+            join_data: Some((name, character, class)),
             left: false,
         }
     }
@@ -49,13 +49,14 @@ impl<T: BotAlgo + Any> Entity for BotDriver<T> {
         self.left
     }
     fn tick(&mut self, c: EntityContext<'_>) -> Result<()> {
-        if let Some((name, character)) = self.join_data.take() {
+        if let Some((name, character, class)) = self.join_data.take() {
             self.id = PlayerID(random()); // TODO bad code, can collide
             info!("spawn {:?} ({name:?}, {character})", self.id);
             c.packet_in.push_back(PacketS::Join {
                 name,
                 character,
                 id: Some(self.id),
+                class,
             })
         }
 
diff --git a/server/src/entity/customers.rs b/server/src/entity/customers.rs
index aaf6995f..388f7b26 100644
--- a/server/src/entity/customers.rs
+++ b/server/src/entity/customers.rs
@@ -18,6 +18,7 @@
 use super::{bot::BotDriver, Entity, EntityContext};
 use anyhow::Result;
 use hurrycurry_bot::algos::Customer;
+use hurrycurry_protocol::PlayerClass;
 use rand::random;
 
 pub struct Customers {
@@ -53,7 +54,8 @@ impl Entity for Customers {
             self.spawn_cooldown = 10. + random::<f32>() * 10.;
             let bot = BotDriver::new(
                 "".to_string(),
-                -1 - (random::<u16>() as i32),
+                random::<u16>() as i32,
+                PlayerClass::Customer,
                 Customer::default(),
             );
             self.customers.push(bot)
diff --git a/server/src/main.rs b/server/src/main.rs
index b72a961b..23c14e60 100644
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -300,7 +300,7 @@ async fn run(args: Args) -> anyhow::Result<()> {
 
 #[cfg(test)]
 mod test {
-    use hurrycurry_protocol::{PacketS, PlayerID};
+    use hurrycurry_protocol::{PacketS, PlayerClass, PlayerID};
     use hurrycurry_server::{data::DATA_DIR, server::Server, ConnectionID};
     use std::future::Future;
     use tokio::sync::broadcast;
@@ -357,6 +357,7 @@ mod test {
                     PacketS::Join {
                         name: format!("test {conn}"),
                         character: 1,
+                        class: PlayerClass::Chef,
                         id: None,
                     },
                 )
diff --git a/server/src/server.rs b/server/src/server.rs
index 5d31bd58..d44a949b 100644
--- a/server/src/server.rs
+++ b/server/src/server.rs
@@ -28,7 +28,8 @@ use hurrycurry_client_lib::{Game, Involvement, Item, Player, Tile};
 use hurrycurry_protocol::{
     glam::{IVec2, Vec2},
     movement::MovementBase,
-    Gamedata, ItemLocation, Menu, MessageTimeout, PacketC, PacketS, PlayerID, Score, TileIndex,
+    Gamedata, ItemLocation, Menu, MessageTimeout, PacketC, PacketS, PlayerClass, PlayerID, Score,
+    TileIndex,
 };
 use log::{info, warn};
 use rand::random;
@@ -71,6 +72,7 @@ pub trait GameServerExt {
         id: PlayerID,
         name: String,
         character: i32,
+        class: PlayerClass,
         serverdata: &Serverdata,
         packet_out: Option<&mut VecDeque<PacketC>>,
     );
@@ -105,11 +107,12 @@ impl GameServerExt for Game {
         timer: Option<Duration>,
         packet_out: &mut VecDeque<PacketC>,
     ) {
+        // TODO cleanup
         let players = self
             .players
             .iter()
-            .filter(|(_, p)| p.character >= 0)
-            .map(|(id, p)| (*id, (p.name.to_owned(), p.character)))
+            .filter(|(_, p)| p.class == PlayerClass::Chef)
+            .map(|(id, p)| (*id, (p.name.to_owned(), p.character, p.class)))
             .collect::<HashMap<_, _>>();
 
         self.unload(packet_out);
@@ -137,8 +140,8 @@ impl GameServerExt for Game {
                 self.walkable.insert(p);
             }
         }
-        for (id, (name, character)) in players {
-            self.join_player(id, name, character, serverdata, None);
+        for (id, (name, character, class)) in players {
+            self.join_player(id, name, character, class, serverdata, None);
         }
 
         packet_out.extend(self.prime_client());
@@ -155,6 +158,7 @@ impl GameServerExt for Game {
         for (&id, player) in &self.players {
             out.push(PacketC::AddPlayer {
                 id,
+                class: player.class,
                 position: player.movement.position,
                 character: player.character,
                 name: player.name.clone(),
@@ -236,19 +240,20 @@ impl GameServerExt for Game {
         id: PlayerID,
         name: String,
         character: i32,
+        class: PlayerClass,
         serverdata: &Serverdata,
         packet_out: Option<&mut VecDeque<PacketC>>,
     ) {
-        let position = if character < 0 {
-            serverdata.customer_spawn
-        } else {
-            serverdata.chef_spawn
+        let position = match class {
+            PlayerClass::Customer => serverdata.customer_spawn,
+            PlayerClass::Bot | PlayerClass::Chef => serverdata.chef_spawn,
         } + (Vec2::new(random(), random()) - 0.5);
         self.players.insert(
             id,
             Player {
                 item: None,
                 character,
+                class,
                 movement: MovementBase::new(position),
                 communicate_persist: None,
                 interacting: None,
@@ -260,6 +265,7 @@ impl GameServerExt for Game {
             packet_out.push_back(PacketC::AddPlayer {
                 id,
                 name,
+                class,
                 position,
                 character,
             });
@@ -357,14 +363,21 @@ impl Server {
                 name,
                 character,
                 id,
+                class,
             } => {
                 let id = id.unwrap_or_else(|| {
                     let id = self.player_id_counter;
                     self.player_id_counter.0 += 1;
                     id
                 });
-                self.game
-                    .join_player(id, name, character, &self.data, Some(&mut self.packet_out));
+                self.game.join_player(
+                    id,
+                    name,
+                    character,
+                    class,
+                    &self.data,
+                    Some(&mut self.packet_out),
+                );
                 replies.push(PacketC::Joined { id })
             }
             PacketS::Leave { player } => {
@@ -488,7 +501,7 @@ impl Server {
                         .get_many_mut([&pid, &base_pid])
                         .ok_or(tre!("s.error.self_interact"))?;
 
-                    if this.character < 0 || other.character < 0 {
+                    if this.class == PlayerClass::Customer || other.class == PlayerClass::Customer {
                         return Err(tre!("s.error.customer_interact"));
                     }
 
@@ -730,7 +743,7 @@ impl Server {
                     self.game
                         .players
                         .values()
-                        .filter(|m| m.character >= 0)
+                        .filter(|m| m.class == PlayerClass::Chef)
                         .map(|m| m.name.clone())
                         .collect(),
                     self.game.score.clone(),
@@ -748,7 +761,7 @@ impl Server {
         self.game
             .players
             .values()
-            .map(|p| if p.character >= 0 { 1 } else { 0 })
+            .map(|p| if p.class == PlayerClass::Chef { 1 } else { 0 })
             .sum()
     }
 }