improved the default map a bit

2 files changed, 11 insertions, 54 deletions

diff --git a/src/main.rs b/src/main.rs
index 00f41e4..1079357 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -85,14 +85,14 @@ fn gen_room<'a, 'b>() -> Room<'a, 'b> {
 		"height": 22,
 		"spawn": [5, 15],
 		"field": [
-			"XXXXXXXXXXXXXXXXX~~~XXXXXXXXXXXXXXXXXXXXXX",
-			"X,,,,,,,,,,,,,,,,~~~,,,,,,,,,,,,,,,,,,,,,X",
-			"X,,,,,,,,,,,,,,,,~~~,,,,,,,,,,,,,,,,,,,,,X",
-			"X,,,,,,,,,,,,,,,,~~~~,,,,,,,,,,,,,,,,,,,,X",
-			"X,,,,,,,,,,,,,,,,,~~~,,,,,,,,,,,,,,,,,,,,X",
-			"X,,,,,,,,,,,,,,,,,~~~,,,,,,,,,,,,,,,,,,,,X",
-			"X,,,,,,,,,,,,,,,,,~~~,,,,,,,,,,,,,,,,,,,,X",
-			"X,,,,,,,,,,,,,,,,,~~~,,,,,,,,,,,,,,,,,,,,X",
+			"     XXXXXXXXXXXX~~~XXXXXXXXXXXXXXXXXXXXXX",
+			"     ,,,,,,,,,,,,~~~,,,,,,,,,,,,,,,,,,,,,X",
+			"    ,,,,,,,,,,,,,~~~,,,,,,,,,,,,,,,,,,,,,X",
+			"    ,,,,,,,,,,,,,~~~~,,,,,,,,,,,,,,,,,,,,X",
+			" bbbb,,,,,,,,,,,,,~~~,,,,,,,,,,,,,,,,,,,,X",
+			"    ,,,,,,,,,,,,,,~~~,,,,,,,,,,,,,,,,,,,,X",
+			"   ,,,,,,,,,,,,,,,~~~,,,,,,,,,,,,,,,,,,,,X",
+			"  ,,,,,,,,,,,,,,,,~~~,,,,,,,,,,,,,,,,,,,,X",
 			"X,,,,,,,,,,,,,,,,,~~~~,,,,,,T,,,,,,,,,,,,X",
 			"X,,,,,,,,,,,,,,,,,,~~~,,,,,,,,,,,,,,,,,,,X",
 			"X,,,,,,,,,,,,,,,,,,~~~,,,,,T,,,,######,,,X",
@@ -100,9 +100,9 @@ fn gen_room<'a, 'b>() -> Room<'a, 'b> {
 			"X,,,,,.............bbb...........++++#,,,X",
 			"X,**,,.,,,,,,,,,,,,bbb,,,,,,,,,,#++++#,,,X",
 			"X,*,*,.,,,,,,,,,,,,~~~,,,T,,,T,,#++++#,,,X",
-			"X,,*,,.,,,,   ,,,,,~~~,,,,,,,,,,######,,,X",
-			"X,**,,.,,,,   ,,,,~~~~,,,,,,,,,,f,,,,f,,,X",
-			"X,,*,,.,,,,   ,,,,~~~''''''''''''''''f'''X",
+			"X,,*,,.,,,,,,,,,,,,~~~,,,,,,,,,,######,,,X",
+			"X,**,,.,,,,,,,,,,,~~~~,,,,,,,,,,f,,,,f,,,X",
+			"X,,*,,.,,,,,,,,,,,~~~''''''''''''''''f'''X",
 			"X*,,,,.,,,,,,,,,,,~~~'''''''''''f''''f'''X",
 			"X,,,,,.,,,,,,,,,,,~~~'''''''''''ffffff'''X",
 			"X,,,,,.,,,,,,,,,,,~~~''''''''''''''''''''X",
diff --git a/src/systems/save.rs b/src/systems/save.rs
deleted file mode 100644
index 924533a..0000000
--- a/src/systems/save.rs
+++ /dev/null
@@ -1,43 +0,0 @@
-
-use std::collections::HashMap;
-
-use specs::{
-	Entities,
-	ReadStorage,
-	System,
-	Join,
-	Read
-};
-
-use crate::pos::Pos;
-
-use crate::components::{
-	Position,
-	Serialise
-};
-
-use crate::savestate::SaveState;
-
-const INTERVAL: i32 = 20;
-
-pub struct Save(pub i32);
-impl <'a> System<'a> for Save {
-	type SystemData = (
-		Entities<'a>,
-		ReadStorage<'a, Position>,
-		ReadStorage<'a, Serialise>,
-	);
-	
-	fn run(&mut self, (entities, positions, serialisers): Self::SystemData) {
-		self.0 -= 1;
-		if self.0 > 0 {
-			return
-		}
-		self.0 = INTERVAL;
-		let mut state = SaveState::new();
-		for (pos, serialiser) in (&positions, &serialisers).join() {
-			state.changes.entry(pos.pos).or_insert(Vec::new()).push(serialiser.template.clone());
-		}
-		println!("save {}", state.to_json().to_string());
-	}
-}