From 25d556ad995a83c0c783f0bf9ca555b17cb0bfb0 Mon Sep 17 00:00:00 2001 From: tom barrett Date: Tue, 26 Jun 2018 04:49:31 -0500 Subject: -moved to enum states for mining and refinery, added mining module knowing if astroid has no minerals --- src/server/refinery.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/server/refinery.rs') diff --git a/src/server/refinery.rs b/src/server/refinery.rs index b1af971..9df078c 100644 --- a/src/server/refinery.rs +++ b/src/server/refinery.rs @@ -7,11 +7,12 @@ use std::collections::HashMap; use item::Item; use mass::{Mass, MassType}; use server::connection::ServerConnection; +use modules::refinery::RefineryStatus; #[derive(Serialize, Deserialize, Debug, Clone)] pub struct RefineryData { pub has_minerals : bool, - pub status : bool, + pub status : RefineryStatus, } impl ServerConnection { @@ -25,7 +26,7 @@ impl ServerConnection { let refinery_data = RefineryData { has_minerals : ship_clone.has_minerals(), - status : refinery.status, + status : refinery.status.clone(), }; if self.open { @@ -38,7 +39,7 @@ impl ServerConnection { refinery.off(); } - if refinery.status && refinery.ready { + if refinery.status == RefineryStatus::Refined { refinery.take(); refine = true; } -- cgit v1.2.3