diff options
Diffstat (limited to 'src/server/mining.rs')
| -rw-r--r-- | src/server/mining.rs | 138 |
1 files changed, 63 insertions, 75 deletions
diff --git a/src/server/mining.rs b/src/server/mining.rs index fd8b6ff..2904d51 100644 --- a/src/server/mining.rs +++ b/src/server/mining.rs @@ -7,14 +7,14 @@ use std::collections::HashMap; use math::distance; use mass::{Mass, MassType}; use module::ModuleType; -use::server::connection::ServerConnection; +use server::connection::ServerConnection; #[derive(Serialize, Deserialize, Debug, Clone)] -struct ServerData { - has_astroid_target : bool, - is_within_range : bool, - mining_range : f64, - mining_status : bool, +pub struct MiningData { + pub has_astroid_target : bool, + pub is_within_range : bool, + pub mining_range : f64, + pub mining_status : bool, } impl ServerConnection { @@ -23,87 +23,75 @@ impl ServerConnection { let ship = masses.get_mut(&self.name).unwrap(); - match ship.mass_type { - MassType::Ship{ref modules, ..} => { - let mut mining_range = 0.0; - let mut mining_status = false; + if let MassType::Ship{ref mut modules, ..} = ship.mass_type { + let mut mining_range = 0.0; + let mut mining_status = false; - match modules.get("Mining").unwrap().module_type { - ModuleType::Mining{ref range, ref status, ..} => { - mining_range = *range; - mining_status = *status; + if let ModuleType::Mining{ref range, ref status, ..} = modules.get("Mining").unwrap().module_type { + mining_range = *range; + mining_status = *status; + } + + if let ModuleType::Navigation{ref target_name, ..} = modules.get("Navigation").unwrap().module_type { + let mut has_astroid_target = false; + let mut is_within_range = false; + match target_name.clone() { + Some(name) => { + let target = masses_clone.get(&name); + has_astroid_target = match target { + Some(target) => match target.mass_type { + MassType::Astroid{..} => true, + _ => false, + }, + None => false, + }; + is_within_range = match has_astroid_target { + true => match target { + Some(target) => mining_range > distance(ship.position, target.position), + _ => false, + } + _ => false, + }; } _ => (), } - match modules.get("Navigation").unwrap().module_type { - ModuleType::Navigation{ref target_name, ..} => { - let mut has_astroid_target = false; - let mut is_within_range = false; - match target_name.clone() { - Some(name) => { - let target = masses_clone.get(&name); - has_astroid_target = match target { - Some(target) => match target.mass_type { - MassType::Astroid{..} => true, - _ => false, - }, - None => false, - }; - is_within_range = match has_astroid_target { - true => match target { - Some(target) => mining_range > distance(ship.position, target.position), - _ => false, - } - _ => false, - }; - } - _ => (), - } - - let send = serde_json::to_string(&ServerData { - has_astroid_target : has_astroid_target, - is_within_range : is_within_range, - mining_range : mining_range, - mining_status : mining_status, - }).unwrap() + "\n"; + let send = serde_json::to_string(&MiningData { + has_astroid_target : has_astroid_target, + is_within_range : is_within_range, + mining_range : mining_range, + mining_status : mining_status, + }).unwrap() + "\n"; - match self.stream.write(send.as_bytes()) { - Ok(_result) => (), - Err(_error) => return false, - } - } - _ => (), + match self.stream.write(send.as_bytes()) { + Ok(_result) => (), + Err(_error) => return false, } + } - match modules.get("Mining").unwrap().module_type { - ModuleType::Mining{ref range, ref status, ..} => { - let mut recv = String::new(); - match self.buff_r.read_line(&mut recv) { - Ok(result) => match recv.as_bytes() { - b"F\n" => { - /* - if is_within_range { - match mining.status { - true => mining.stop(), - false => mining.start(), - } - } - */ - }, - _ => { - if result == 0 { - return false - } - }, + if let ModuleType::Mining{ref range, ref status, ..} = modules.get("Mining").unwrap().module_type { + let mut recv = String::new(); + match self.buff_r.read_line(&mut recv) { + Ok(result) => match recv.as_bytes() { + b"F\n" => { + /* + if is_within_range { + match mining.status { + true => mining.stop(), + false => mining.start(), + } } - Err(_error) => (), - } + */ + }, + _ => { + if result == 0 { + return false + } + }, } - _ => (), + Err(_error) => (), } } - _ => (), } true |