aboutsummaryrefslogtreecommitdiff
path: root/server/src/data
diff options
context:
space:
mode:
authormetamuffin <metamuffin@disroot.org>2024-08-13 16:03:19 +0200
committermetamuffin <metamuffin@disroot.org>2024-08-13 16:03:38 +0200
commit8d83fcef94ce1558a2c0e29e8be6c966c7e10a5b (patch)
treef674b2ea255a5d80ef7ee320e313a02a9a72bc4b /server/src/data
parent0f94e292bde8b9614aa48a6ba87f1a8d927b8133 (diff)
downloadhurrycurry-8d83fcef94ce1558a2c0e29e8be6c966c7e10a5b.tar
hurrycurry-8d83fcef94ce1558a2c0e29e8be6c966c7e10a5b.tar.bz2
hurrycurry-8d83fcef94ce1558a2c0e29e8be6c966c7e10a5b.tar.zst
trying to reimplement customers
Diffstat (limited to 'server/src/data')
-rw-r--r--server/src/data/mod.rs11
1 files changed, 1 insertions, 10 deletions
diff --git a/server/src/data/mod.rs b/server/src/data/mod.rs
index 6555fbc4..f7f184d2 100644
--- a/server/src/data/mod.rs
+++ b/server/src/data/mod.rs
@@ -92,18 +92,9 @@ pub struct DemandDecl {
points: i64,
}
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct Demand {
- pub from: ItemIndex,
- pub to: Option<ItemIndex>,
- pub duration: f32,
- pub points: i64,
-}
-
#[derive(Debug,Clone, Default)]
#[rustfmt::skip]
pub struct Serverdata {
- pub demands: Vec<Demand>,
pub spec: String,
pub initial_map: HashMap<IVec2, (TileIndex, Option<ItemIndex>)>,
pub chef_spawn: Vec2,
@@ -301,11 +292,11 @@ pub fn build_data(
tile_interact,
recipes,
item_names,
+ demands,
tile_names,
},
Serverdata {
spec,
- demands,
initial_map,
chef_spawn,
customer_spawn,