From 0f94e292bde8b9614aa48a6ba87f1a8d927b8133 Mon Sep 17 00:00:00 2001
From: metamuffin <metamuffin@disroot.org>
Date: Tue, 13 Aug 2024 14:50:10 +0200
Subject: replace customers with bots and refactor some more server code.

---
 server/src/entity/mod.rs | 22 ++++------------------
 1 file changed, 4 insertions(+), 18 deletions(-)

(limited to 'server/src/entity/mod.rs')

diff --git a/server/src/entity/mod.rs b/server/src/entity/mod.rs
index efee6a6d..20370d0c 100644
--- a/server/src/entity/mod.rs
+++ b/server/src/entity/mod.rs
@@ -25,17 +25,17 @@ pub mod player_portal;
 use crate::data::ItemTileRegistry;
 use anyhow::{anyhow, Result};
 use conveyor::Conveyor;
-use customers::{demands::generate_demands, Customers};
+use customers::Customers;
 use environment_effect::{EnvironmentController, EnvironmentEffect, EnvironmentEffectController};
 use hurrycurry_client_lib::Game;
 use hurrycurry_protocol::{
     glam::{IVec2, Vec2},
-    ItemIndex, PacketC, PacketS, Recipe, TileIndex,
+    PacketC, PacketS,
 };
 use item_portal::ItemPortal;
 use player_portal::PlayerPortal;
 use serde::{Deserialize, Serialize};
-use std::collections::{HashMap, HashSet, VecDeque};
+use std::collections::VecDeque;
 
 pub type DynEntity = Box<dyn Entity + Send + Sync + 'static>;
 pub type Entities = Vec<DynEntity>;
@@ -104,11 +104,6 @@ pub fn construct_entity(
     pos: Option<IVec2>,
     decl: &EntityDecl,
     reg: &ItemTileRegistry,
-    tiles_used: &HashSet<TileIndex>,
-    items_used: &HashSet<ItemIndex>,
-    raw_demands: &[(ItemIndex, Option<ItemIndex>, f32)],
-    recipes: &[Recipe],
-    initial_map: &HashMap<IVec2, (TileIndex, Option<ItemIndex>)>,
 ) -> Result<DynEntity> {
     Ok(match decl.to_owned() {
         EntityDecl::ItemPortal { from, to } => Box::new(ItemPortal {
@@ -142,16 +137,7 @@ pub fn construct_entity(
                 cooldown: 0.,
             })
         }
-        EntityDecl::Customers {} => {
-            let demands = generate_demands(tiles_used, items_used, raw_demands, recipes);
-            let chair = reg.register_tile("chair".to_string());
-            let chairs = initial_map
-                .iter()
-                .filter(|(_, (tile, _))| *tile == chair)
-                .map(|(e, _)| (*e, true))
-                .collect();
-            Box::new(Customers::new(chairs, demands)?)
-        }
+        EntityDecl::Customers {} => Box::new(Customers::new()?),
         EntityDecl::EnvironmentEffect(config) => Box::new(EnvironmentEffectController::new(config)),
         EntityDecl::Environment(names) => Box::new(EnvironmentController(names)),
     })
-- 
cgit v1.2.3-70-g09d2