-made modules their own structs instead of structs with enumeration

1 files changed, 23 insertions, 67 deletions

diff --git a/src/server/engines.rs b/src/server/engines.rs
index b837a90..fcce76a 100644
--- a/src/server/engines.rs
+++ b/src/server/engines.rs
@@ -5,7 +5,6 @@ use std::io::BufRead;
 use std::collections::HashMap;
 
 use mass::{Mass, MassType};
-use module::{ModuleType};
 use module::NavigationStatus;
 use server::connection::ServerConnection;
 
@@ -14,78 +13,35 @@ impl ServerConnection {
         let masses_clone = masses.clone();
 
         let ship = masses.get_mut(&self.name).unwrap();
-        let mut acceleration = (0.0, 0.0, 0.0);
+        let ship_clone = ship.clone();
 
-        if let MassType::Ship{ref modules, ..} = ship.mass_type {
-            if let ModuleType::Navigation{ref status, ref target_name, ..} = modules.get("Navigation").unwrap().module_type {
-                let targeted = status == &NavigationStatus::Targeted;
+        if let MassType::Ship{ref mut engines, ref navigation, ..} = ship.mass_type {
+            let navigation = navigation.clone().unwrap();
+            let engines = engines.as_mut().unwrap();
+            let targeted = navigation.status == NavigationStatus::Targeted;
 
-                let send = serde_json::to_string(&targeted).unwrap() + "\n";
-                match self.stream.write(send.as_bytes()) {
-                    Ok(_result) => (),
-                    Err(_error) => return false,
-                }
+            let send = serde_json::to_string(&targeted).unwrap() + "\n";
+            match self.stream.write(send.as_bytes()) {
+                Ok(_result) => (),
+                Err(_error) => return false,
+            }
 
-                let mut recv = String::new();
-                match self.buff_r.read_line(&mut recv) {
-                    Ok(result) => match recv.as_bytes() {
-                        b"5\n" => acceleration.0 += 0.1,
-                        b"0\n" => acceleration.0 -= 0.1,
-                        b"8\n" => acceleration.1 += 0.1,
-                        b"2\n" => acceleration.1 -= 0.1,
-                        b"4\n" => acceleration.2 += 0.1,
-                        b"6\n" => acceleration.2 -= 0.1,
-                        b"+\n" => {
-                            let m_v = ship.velocity;
-                            acceleration = (m_v.0 * 0.05,
-                                            m_v.1 * 0.05,
-                                            m_v.2 * 0.05);
-                        },
-                        b"-\n" => {
-                            let m_v = ship.velocity;
-                            acceleration = (-1.0 * m_v.0 * 0.05,
-                                            -1.0 * m_v.1 * 0.05,
-                                            -1.0 * m_v.2 * 0.05);
-                        },
-                        b"c\n" => {
-                            match target_name {
-                                &Some(ref name) => {
-                                    let target = masses_clone.get(name).unwrap();
-                                    let d_v = target.velocity;
-                                    let m_v = ship.velocity;
-                                    acceleration = (d_v.0 - m_v.0,
-                                                    d_v.1 - m_v.1,
-                                                    d_v.2 - m_v.2);
-                                },
-                                &None => (),
-                            }
-                        },
-                        b"t\n" => {
-                            match target_name {
-                                &Some(ref name) => {
-                                    let target = masses_clone.get(name).unwrap();
-                                    let d_p = target.position;
-                                    let m_p = ship.position;
-                                    acceleration = ((d_p.0 - m_p.0) * 0.01,
-                                                    (d_p.1 - m_p.1) * 0.01,
-                                                    (d_p.2 - m_p.2) * 0.01);
-                                },
-                                &None => (),
-                            }
-                        },
-                        _ => {
-                            if result == 0 {
-                                return false
-                            }
-                        },
-                    },
-                    Err(_error) => (),
-                }
+            let target = match navigation.target_name {
+                Some(name) => masses_clone.get(&name),
+                None => None,
+            };
+            let mut recv = String::new();
+            match self.buff_r.read_line(&mut recv) {
+                Ok(result) => {
+                    engines.give_client_data(&ship_clone, target, recv);
+                    if result == 0 {
+                        return false;
+                    }
+                },
+                Err(_error) => (),
             }
         }
 
-        ship.accelerate(acceleration);
-
         true
     }
 }