diff options
Diffstat (limited to 'server/data/src')
| -rw-r--r-- | server/data/src/lib.rs | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/server/data/src/lib.rs b/server/data/src/lib.rs index 5d30afb7..09a1bd43 100644 --- a/server/data/src/lib.rs +++ b/server/data/src/lib.rs @@ -26,7 +26,7 @@ use anyhow::{Result, anyhow, bail}; use clap::Parser; use filter_demands::filter_demands_and_recipes; use hurrycurry_protocol::{ - Demand, Gamedata, ItemIndex, MapMetadata, Recipe, TileIndex, + Demand, Gamedata, GamedataFlags, ItemIndex, MapMetadata, Recipe, TileIndex, book::Book, glam::{IVec2, Vec2}, }; @@ -78,7 +78,7 @@ pub struct MapDecl { #[serde(default)] entities: Vec<EntityDecl>, #[serde(default)] score_baseline: i64, #[serde(default)] default_timer: Option<u64>, - #[serde(default)] flags: ServerdataFlags, + #[serde(default)] flags: GamedataFlags, } #[derive(Parser)] @@ -119,17 +119,10 @@ pub struct Serverdata { pub score_baseline: i64, pub default_timer: Option<Duration>, pub book: Book, - pub flags: ServerdataFlags, pub entity_decls: Vec<EntityDecl>, pub recipe_groups: BTreeMap<String, BTreeSet<ItemIndex>>, } -#[rustfmt::skip] -#[derive(Debug, Clone, Default, Deserialize)] -pub struct ServerdataFlags { - #[serde(default)] pub disable_unknown_orders: bool, -} - fn build_data( maps: &HashMap<String, MapMetadata>, map_name: String, @@ -272,6 +265,7 @@ fn build_data( tile_walkable, tile_placeable_items, tile_interactable_empty, + flags: map_in.flags, recipes, item_names, demands, @@ -287,7 +281,6 @@ fn build_data( let mut serverdata = Serverdata { initial_map, chef_spawn, - flags: map_in.flags, customer_spawn, default_timer, book: Book::default(), |