1 files changed, 34 insertions, 42 deletions

diff --git a/server/protocol/src/lib.rs b/server/protocol/src/lib.rs
index 2be37730..a89d9c30 100644
--- a/server/protocol/src/lib.rs
+++ b/server/protocol/src/lib.rs
@@ -15,8 +15,10 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 */
+use crate::book::Book;
 use glam::{IVec2, Vec2};
-use serde::{Deserialize, Deserializer, Serialize};
+use helpers::deser::*;
+use serde::{Deserialize, Serialize};
 use std::{
     collections::{BTreeMap, BTreeSet, HashSet},
     sync::LazyLock,
@@ -24,8 +26,6 @@ use std::{
 
 pub use glam;
 
-use crate::book::Book;
-
 pub mod book;
 pub mod helpers;
 pub mod movement;
@@ -94,8 +94,18 @@ pub struct Gamedata {
     pub recipes: Vec<Recipe>,
     pub demands: Vec<Demand>,
     pub hand_count: usize,
+    pub flags: GamedataFlags,
+}
+
+#[rustfmt::skip]
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+pub struct GamedataFlags {
+    #[serde(default)] pub disable_unknown_orders: bool,
 }
 
+fn chef_class() -> PlayerClass {
+    PlayerClass::Chef
+}
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "snake_case", tag = "type")]
 pub enum PacketS {
@@ -139,22 +149,28 @@ pub enum PacketS {
         dt: f64,
     },
 
-    #[serde(skip)]
     /// For internal use only (customers)
+    #[serde(skip)]
     ReplaceHand {
         player: PlayerID,
         hand: Hand,
         item: Option<ItemIndex>,
     },
-    #[serde(skip)]
+
     /// For internal use only (customers)
-    ApplyScore(Score),
     #[serde(skip)]
+    ApplyScore(Score),
+
     /// For internal use only (customers)
+    #[serde(skip)]
     Effect {
         player: PlayerID,
         name: String,
     },
+
+    /// Used internally and only used when built with debug_events
+    #[serde(skip)]
+    Debug(DebugEvent),
 }
 
 #[derive(Debug, Default, Clone, Copy, Serialize, Deserialize)]
@@ -167,10 +183,6 @@ pub struct Character {
     pub headwear: i32,
 }
 
-fn chef_class() -> PlayerClass {
-    PlayerClass::Chef
-}
-
 #[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq)]
 #[serde(rename_all = "snake_case")]
 pub enum PlayerClass {
@@ -179,11 +191,6 @@ pub enum PlayerClass {
     Customer,
     Tram,
 }
-impl PlayerClass {
-    pub fn is_cheflike(&self) -> bool {
-        matches!(self, Self::Bot | Self::Chef)
-    }
-}
 
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
 #[serde(rename_all = "snake_case")]
@@ -294,6 +301,9 @@ pub enum PacketC {
     /// For use in replay sessions only
     ReplayStart,
     ReplayStop,
+
+    /// Only used when built with debug_events
+    Debug(DebugEvent),
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -369,32 +379,14 @@ pub enum ItemLocation {
     Player(PlayerID, Hand),
 }
 
-impl ItemLocation {
-    pub fn is_tile(&self) -> bool {
-        matches!(self, Self::Tile(..))
-    }
-    pub fn is_player(&self) -> bool {
-        matches!(self, Self::Player(..))
-    }
-}
-
-fn deser_i64<'de, D: Deserializer<'de>>(deserializer: D) -> Result<i64, D::Error> {
-    let x = f64::deserialize(deserializer)?;
-    Ok(x.trunc() as i64)
-}
-fn deser_i32<'de, D: Deserializer<'de>>(deserializer: D) -> Result<i32, D::Error> {
-    let x = f64::deserialize(deserializer)?;
-    Ok(x.trunc() as i32)
-}
-fn deser_usize<'de, D: Deserializer<'de>>(deserializer: D) -> Result<usize, D::Error> {
-    let x = f64::deserialize(deserializer)?;
-    Ok(x.trunc() as usize)
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct DebugEvent {
+    key: String,
+    display: Vec<DebugEventDisplay>,
+    timeout: Option<f32>,
 }
-fn deser_tile_index_map<'de, D: Deserializer<'de>>(
-    deserializer: D,
-) -> Result<BTreeMap<TileIndex, HashSet<ItemIndex>>, D::Error> {
-    let x = BTreeMap::<String, HashSet<ItemIndex>>::deserialize(deserializer)?;
-    Ok(x.into_iter()
-        .map(|(k, v)| (TileIndex(k.parse().ok().unwrap_or_default()), v))
-        .collect())
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub enum DebugEventDisplay {
+    Path(Vec<Vec2>),
+    Label(Vec2, String),
 }