Added knowledge of weapons

Next step: knowledge of weapon's effects.

1 files changed, 44 insertions, 0 deletions

diff --git a/src/state.rs b/src/state.rs
index 8c176e1..1756ad0 100644
--- a/src/state.rs
+++ b/src/state.rs
@@ -4,17 +4,23 @@ use ships::*;
 
 pub struct State {
     pub map_size: u16,
+    pub player_map: PlayerMap,
     pub opponent_map: OpponentMap
 }
 
 impl State {
     pub fn new(json: &json::JsonValue) -> Result<State, String> {
         let map_size = State::map_size_from_json(&json)?;
+        
+        let ref player_map_json = json["PlayerMap"];
+        let player_map = PlayerMap::new(&player_map_json)?;
+            
         let ref opponent_map_json = json["OpponentMap"];
         let opponent_map = OpponentMap::new(&opponent_map_json, map_size)?;
 
         Ok(State {
             map_size: map_size,
+            player_map: player_map,
             opponent_map: opponent_map
         })
     }
@@ -100,3 +106,41 @@ impl Cell {
         }
     }
 }
+
+pub struct PlayerMap {
+    pub ships: HashMap<Ship, PlayerShip>,
+    pub energy: u16
+}
+
+impl PlayerMap {
+    fn new(json: &json::JsonValue) -> Result<PlayerMap, String> {
+        let mut ships = HashMap::new();
+        for json_ship in json["Owner"]["Ships"].members() {
+            let ship_type_string = json_ship["ShipType"]
+                .as_str()
+                .ok_or(String::from("Failed to read ShipType value of player map ship in json file"))?;
+            let ship_type = ship_type_string.parse::<Ship>()?;
+                
+            let destroyed = json_ship["Destroyed"]
+                .as_bool()
+                .ok_or(String::from("Failed to read Destroyed value of player map ship in json file"))?;
+            ships.insert(ship_type, PlayerShip {
+                destroyed: destroyed
+            });
+        }
+
+        let energy = json["Owner"]["Energy"]
+            .as_u16()
+            .ok_or(String::from("Did not find the energy in the state json file"))?;
+        
+        Ok(PlayerMap {
+            ships: ships,
+            energy: energy
+        })
+    }
+}
+
+
+pub struct PlayerShip {
+    pub destroyed: bool
+}