message timeout replaces persist

7 files changed, 55 insertions, 35 deletions

diff --git a/server/bot/src/algos/customer.rs b/server/bot/src/algos/customer.rs
index 9c0ce210..2e0a45b4 100644
--- a/server/bot/src/algos/customer.rs
+++ b/server/bot/src/algos/customer.rs
@@ -91,16 +91,17 @@ impl BotAlgo for Customer {
                 if path.is_done() {
                     let demand = DemandIndex(random::<u32>() as usize % game.data.demands.len());
                     info!("{me:?} -> waiting");
+                    let timeout = 90. + random::<f32>() * 60.;
                     *self = Customer::Waiting {
                         chair: *chair,
-                        timeout: 90. + random::<f32>() * 60.,
+                        timeout,
                         demand,
                         origin: *origin,
                     };
                     BotInput {
                         extra: vec![PacketS::Communicate {
                             message: Some(Message::Item(game.data.demands[demand.0].input)),
-                            persist: true,
+                            timeout: Some(timeout),
                             player: me,
                         }],
                         ..Default::default()
@@ -137,13 +138,8 @@ impl BotAlgo for Customer {
                                 ..Default::default()
                             }),
                             PacketS::Communicate {
-                                message: None,
-                                persist: true,
-                                player: me,
-                            },
-                            PacketS::Communicate {
                                 message: Some(Message::Effect("angry".to_string())),
-                                persist: false,
+                                timeout: None,
                                 player: me,
                             },
                         ],
@@ -183,13 +179,8 @@ impl BotAlgo for Customer {
                         BotInput {
                             extra: vec![
                                 PacketS::Communicate {
-                                    persist: true,
-                                    message: None,
-                                    player: me,
-                                },
-                                PacketS::Communicate {
                                     message: Some(Message::Effect("satisfied".to_string())),
-                                    persist: false,
+                                    timeout: None,
                                     player: me,
                                 },
                                 PacketS::Interact {
diff --git a/server/bot/src/algos/simple.rs b/server/bot/src/algos/simple.rs
index 1be2cddc..27493d74 100644
--- a/server/bot/src/algos/simple.rs
+++ b/server/bot/src/algos/simple.rs
@@ -123,7 +123,7 @@ impl<S> Context<'_, S> {
             .players
             .iter()
             .find_map(|(_, pl)| match &pl.communicate_persist {
-                Some(Message::Item(item)) => {
+                Some((Message::Item(item), _)) => {
                     let pos = pl.movement.position.as_ivec2();
                     [IVec2::X, IVec2::Y, -IVec2::X, -IVec2::Y]
                         .into_iter()
diff --git a/server/bot/src/algos/test.rs b/server/bot/src/algos/test.rs
index a47befa9..73368de2 100644
--- a/server/bot/src/algos/test.rs
+++ b/server/bot/src/algos/test.rs
@@ -59,7 +59,7 @@ fn find_demand(game: &Game) -> Option<(ItemIndex, IVec2)> {
     game.players
         .iter()
         .find_map(|(_, pl)| match &pl.communicate_persist {
-            Some(Message::Item(item)) => {
+            Some((Message::Item(item), _)) => {
                 let pos = pl.movement.position.as_ivec2();
                 let t = pos;
                 Some((*item, t))
diff --git a/server/client-lib/src/lib.rs b/server/client-lib/src/lib.rs
index b04f46f7..38f1070e 100644
--- a/server/client-lib/src/lib.rs
+++ b/server/client-lib/src/lib.rs
@@ -20,8 +20,8 @@ pub mod network;
 pub mod spatial_index;
 
 use hurrycurry_protocol::{
-    glam::IVec2, movement::MovementBase, Gamedata, ItemIndex, ItemLocation, Message, PacketC,
-    PlayerID, RecipeIndex, Score, TileIndex,
+    glam::IVec2, movement::MovementBase, Gamedata, ItemIndex, ItemLocation, Message,
+    MessageTimeout, PacketC, PlayerID, RecipeIndex, Score, TileIndex,
 };
 use spatial_index::SpatialIndex;
 use std::{
@@ -54,7 +54,7 @@ pub struct Player {
     pub character: i32,
     pub interacting: Option<IVec2>,
     pub item: Option<Item>,
-    pub communicate_persist: Option<Message>,
+    pub communicate_persist: Option<(Message, MessageTimeout)>,
 
     pub movement: MovementBase,
 }
@@ -168,11 +168,11 @@ impl Game {
             PacketC::Communicate {
                 player,
                 message,
-                persist,
+                timeout,
             } => {
-                if persist {
+                if let Some(timeout) = &timeout {
                     if let Some(player) = self.players.get_mut(&player) {
-                        player.communicate_persist = message;
+                        player.communicate_persist = message.to_owned().map(|m| (m, *timeout));
                     }
                 }
             }
@@ -195,6 +195,12 @@ impl Game {
 
         for (&pid, player) in &mut self.players {
             player.movement.update(&self.walkable, dt);
+            if let Some((_, timeout)) = &mut player.communicate_persist {
+                timeout.remaining -= dt;
+                if timeout.remaining < 0. {
+                    player.communicate_persist = None;
+                }
+            }
             self.players_spatial_index
                 .update_entry(pid, player.movement.position);
         }
diff --git a/server/protocol/src/lib.rs b/server/protocol/src/lib.rs
index 06cc9552..ee9fc0a3 100644
--- a/server/protocol/src/lib.rs
+++ b/server/protocol/src/lib.rs
@@ -116,7 +116,7 @@ pub enum PacketS {
     Communicate {
         player: PlayerID,
         message: Option<Message>,
-        persist: bool,
+        timeout: Option<f32>,
     },
 
     #[serde(skip)]
@@ -199,7 +199,7 @@ pub enum PacketC {
     Communicate {
         player: PlayerID,
         message: Option<Message>,
-        persist: bool,
+        timeout: Option<MessageTimeout>,
     },
     ServerMessage {
         text: String,
@@ -231,6 +231,12 @@ pub enum Menu {
     Score(Score),
 }
 
+#[derive(Debug, Clone, Copy, Serialize, Deserialize, Encode, Decode)]
+pub struct MessageTimeout {
+    pub remaining: f32,
+    pub initial: f32,
+}
+
 #[derive(Debug, Clone, Serialize, Deserialize, Encode, Decode, Default)]
 pub struct Score {
     pub time_remaining: f64,
diff --git a/server/src/server.rs b/server/src/server.rs
index 41931ef7..2f93246d 100644
--- a/server/src/server.rs
+++ b/server/src/server.rs
@@ -25,7 +25,7 @@ use hurrycurry_client_lib::{Game, Item, Player, Tile};
 use hurrycurry_protocol::{
     glam::{IVec2, Vec2},
     movement::MovementBase,
-    Gamedata, ItemLocation, Menu, PacketC, PacketS, PlayerID, Score, TileIndex,
+    Gamedata, ItemLocation, Menu, MessageTimeout, PacketC, PacketS, PlayerID, Score, TileIndex,
 };
 use log::{info, warn};
 use std::{
@@ -177,11 +177,11 @@ impl GameServerExt for Game {
                     item: Some(item.kind),
                 })
             }
-            if let Some(c) = &player.communicate_persist {
+            if let Some((message, timeout)) = &player.communicate_persist {
                 out.push(PacketC::Communicate {
                     player: id,
-                    message: Some(c.to_owned()),
-                    persist: true,
+                    message: Some(message.to_owned()),
+                    timeout: Some(*timeout),
                 })
             }
         }
@@ -449,19 +449,30 @@ impl Server<'_> {
             }
             PacketS::Communicate {
                 message,
-                persist,
+                timeout,
                 player,
             } => {
                 info!("{player:?} message {message:?}");
-                if persist {
+                if let Some(timeout) = timeout {
                     if let Some(player) = self.game.players.get_mut(&player) {
-                        player.communicate_persist = message.clone()
+                        player.communicate_persist = message.clone().map(|m| {
+                            (
+                                m,
+                                MessageTimeout {
+                                    initial: timeout,
+                                    remaining: timeout,
+                                },
+                            )
+                        });
                     }
                 }
                 packet_out.push_back(PacketC::Communicate {
                     player,
                     message,
-                    persist,
+                    timeout: timeout.map(|t| MessageTimeout {
+                        initial: t,
+                        remaining: t,
+                    }),
                 })
             }
             PacketS::ReplaceHand { item, player } => {
@@ -595,6 +606,12 @@ impl Server<'_> {
 
         let mut players_auto_release = Vec::new();
         for (pid, player) in &mut self.game.players {
+            if let Some((_, timeout)) = &mut player.communicate_persist {
+                timeout.remaining -= dt;
+                if timeout.remaining < 0. {
+                    player.communicate_persist = None;
+                }
+            }
             if let Some(pos) = player.interacting {
                 if let Some(tile) = self.game.tiles.get(&pos) {
                     if let Some(item) = &tile.item {
diff --git a/server/src/state.rs b/server/src/state.rs
index 54beb3f7..f6304db5 100644
--- a/server/src/state.rs
+++ b/server/src/state.rs
@@ -148,7 +148,7 @@ impl State {
         match &packet {
             PacketS::Communicate {
                 message: Some(Message::Text(text)),
-                persist: false,
+                timeout: None,
                 player,
             } if let Some(command) = text.strip_prefix("/") => {
                 match self.handle_command_parse(*player, command).await {
@@ -288,7 +288,7 @@ impl State {
                     .send(PacketC::Communicate {
                         player,
                         message: Some(Message::Effect(name)),
-                        persist: false,
+                        timeout: None,
                     })
                     .ok();
             }
@@ -302,7 +302,7 @@ impl State {
                     .send(PacketC::Communicate {
                         player,
                         message: Some(Message::Item(item)),
-                        persist: false,
+                        timeout: None,
                     })
                     .ok();
             }