diff --git a/src/ship/map/area.rs b/src/ship/map/area.rs index 57ccd0a..a6c3dc1 100644 --- a/src/ship/map/area.rs +++ b/src/ship/map/area.rs @@ -1,19 +1,6 @@ // TOOD: `pub(super) for most of these?` - -use std::convert::Into; -use std::path::PathBuf; -use std::io::{Read}; -use std::fs::File; - -use byteorder::{LittleEndian, ReadBytesExt}; -use rand::Rng; use thiserror::Error; - -use crate::ship::monster::MonsterType; -use crate::ship::room::{Episode, RoomMode}; - -// TODO: don't use * -use crate::ship::map::*; +use crate::ship::room::Episode; #[derive(Debug, Copy, Clone, PartialEq)] pub enum MapArea { diff --git a/src/ship/map/enemy.rs b/src/ship/map/enemy.rs index ccd06ce..8eab744 100644 --- a/src/ship/map/enemy.rs +++ b/src/ship/map/enemy.rs @@ -1,15 +1,11 @@ // TOOD: `pub(super) for most of these?` -use std::convert::Into; -use std::path::PathBuf; use std::io::{Read}; -use std::fs::File; use byteorder::{LittleEndian, ReadBytesExt}; -use rand::Rng; use thiserror::Error; use crate::ship::monster::MonsterType; -use crate::ship::room::{Episode, RoomMode}; +use crate::ship::room::Episode; use crate::ship::map::*; diff --git a/src/ship/map/maps.rs b/src/ship/map/maps.rs index b28bd71..3f7f515 100644 --- a/src/ship/map/maps.rs +++ b/src/ship/map/maps.rs @@ -1,12 +1,9 @@ // TOOD: `pub(super) for most of these?` -use std::convert::Into; use std::path::PathBuf; use std::io::{Read}; use std::fs::File; -use byteorder::{LittleEndian, ReadBytesExt}; -use rand::Rng; use thiserror::Error; use crate::ship::monster::MonsterType; diff --git a/src/ship/map/mod.rs b/src/ship/map/mod.rs index 308b7ef..416ad0c 100644 --- a/src/ship/map/mod.rs +++ b/src/ship/map/mod.rs @@ -10,16 +10,3 @@ pub use enemy::*; pub use object::*; pub use variant::*; pub use maps::*; - -use std::convert::Into; -use std::path::PathBuf; -use std::io::{Read}; -use std::fs::File; - -use byteorder::{LittleEndian, ReadBytesExt}; -use rand::Rng; -use thiserror::Error; - -use crate::ship::monster::MonsterType; -use crate::ship::room::{Episode, RoomMode}; - diff --git a/src/ship/map/object.rs b/src/ship/map/object.rs index f8b47fc..dde1e7e 100644 --- a/src/ship/map/object.rs +++ b/src/ship/map/object.rs @@ -1,16 +1,10 @@ // TOOD: `pub(super) for most of these?` -use std::convert::Into; -use std::path::PathBuf; use std::io::{Read}; -use std::fs::File; use byteorder::{LittleEndian, ReadBytesExt}; -use rand::Rng; -use thiserror::Error; -use crate::ship::monster::MonsterType; -use crate::ship::room::{Episode, RoomMode}; +use crate::ship::room::Episode; // TODO: don't use * use crate::ship::map::*; diff --git a/src/ship/map/variant.rs b/src/ship/map/variant.rs index dee6de2..a969960 100644 --- a/src/ship/map/variant.rs +++ b/src/ship/map/variant.rs @@ -1,16 +1,6 @@ // TOOD: `pub(super) for most of these?` -use std::convert::Into; -use std::path::PathBuf; -use std::io::{Read}; -use std::fs::File; - -use byteorder::{LittleEndian, ReadBytesExt}; use rand::Rng; -use thiserror::Error; - -use crate::ship::monster::MonsterType; -use crate::ship::room::{Episode, RoomMode}; // TODO: don't use * use crate::ship::map::*;