From a4efade392aa7127c373b0247d39274cb0decd10 Mon Sep 17 00:00:00 2001 From: tom barrett Date: Tue, 19 Feb 2019 13:24:25 -0600 Subject: unified all server->client connection and brought logic to modules --- src/server/construction.rs | 69 ---------------------------------------------- 1 file changed, 69 deletions(-) delete mode 100644 src/server/construction.rs (limited to 'src/server/construction.rs') diff --git a/src/server/construction.rs b/src/server/construction.rs deleted file mode 100644 index 0e24952..0000000 --- a/src/server/construction.rs +++ /dev/null @@ -1,69 +0,0 @@ -extern crate serde_json; - -use std::collections::HashMap; -use std::io::Write; - -use crate::constants; -use crate::item::ItemType; -use crate::mass::{Mass, MassType}; -use crate::modules::construction::Construction; -use crate::modules::construction::ConstructionStatus; -use crate::modules::types::ModuleType; -use crate::server::connection::ServerConnection; -use crate::storage::Storage; - -#[derive(Serialize, Deserialize, Debug, Clone)] -pub struct ConstructionData { - pub status: ConstructionStatus, - pub has_enough: bool, -} - -impl ServerConnection { - pub fn server_construction(&mut self, masses: &mut HashMap) { - let mut ship = masses.remove(&self.name).unwrap(); - - if let MassType::Ship { - ref mut construction, - ref mut storage, - .. - } = ship.mass_type - { - let construction_data = get_construction_data(storage, construction); - - let send = serde_json::to_string(&construction_data).unwrap() + "\n"; - self.open = self.stream.write(send.as_bytes()).is_ok(); - - let recv = self.receive(); - construction.give_recv(recv, &construction_data); - - if construction_data.status == ConstructionStatus::Constructed { - storage - .take_items(ItemType::Iron, constants::SHIP_CONSTRUCTION_IRON_COST) - .unwrap(); - masses.insert( - "Station".to_string(), - Mass::new_station( - ModuleType::Refinery, - ship.position.clone(), - ship.velocity.clone(), - ), - ); - construction.constructed(); - } - } - - masses.insert(self.name.clone(), ship); - } -} - -fn get_construction_data(storage: &Storage, construction: &Construction) -> ConstructionData { - ConstructionData { - status: construction.status.clone(), - has_enough: storage - .items - .iter() - .filter(|item| item.itemtype == ItemType::Iron) - .count() - >= constants::SHIP_CONSTRUCTION_IRON_COST, - } -} -- cgit v1.2.3