From f9b0f6b6db9c336066819e05c0333bff43511cd0 Mon Sep 17 00:00:00 2001
From: Max Bradbury <max@tinybird.info>
Date: Sun, 8 Nov 2020 15:30:39 +0000
Subject: [PATCH] name room and give tiles appropriate names too

---
 src/lib.rs                        | 9 +++++----
 src/test-resources/expected.bitsy | 4 ++++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index b6c3063..390b07b 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -302,7 +302,7 @@ pub fn add_room() -> String {
             let tile = Tile {
                 // "0" will get overwritten to a new, safe tile ID
                 id: "0".to_string(),
-                name: tile_name(&state.room_name, &(row * column)),
+                name: tile_name(&state.room_name, &((row * SD) + column + 1)),
                 wall: None,
                 animation_frames: vec![Image { pixels }],
                 colour_id: None
@@ -324,7 +324,7 @@ pub fn add_room() -> String {
     game.add_room(bitsy_parser::Room {
         id: "0".to_string(),
         palette_id,
-        name: None,
+        name: state.room_name.clone(),
         tiles: tile_ids,
         items: vec![],
         exits: vec![],
@@ -357,7 +357,7 @@ pub fn output() -> String {
 
 #[cfg(test)]
 mod test {
-    use crate::{add_room, load_image, load_default_game, output, get_preview};
+    use crate::{add_room, load_image, load_default_game, output, get_preview, set_room_name};
 
     #[test]
     fn image_to_base64() {
@@ -388,8 +388,9 @@ mod test {
     fn example() {
         load_default_game();
         load_image(include_str!("test-resources/test.png.base64").trim().to_string());
+        set_room_name("test".to_string());
         println!("add_room(): {}", add_room());
         // todo what? why are extraneous pixels appearing in the output tiles?
-        assert_eq!( output(), include_str!("test-resources/expected.bitsy"));
+        assert_eq!(output(), include_str!("test-resources/expected.bitsy"));
     }
 }
diff --git a/src/test-resources/expected.bitsy b/src/test-resources/expected.bitsy
index 6919a0a..9614757 100644
--- a/src/test-resources/expected.bitsy
+++ b/src/test-resources/expected.bitsy
@@ -47,6 +47,7 @@ a,a,1,1,2,2,3,0,0,0,0,0,0,0,0,0
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+NAME test
 PAL 0
 
 TIL a
@@ -69,6 +70,7 @@ TIL 1
 00011000
 00011000
 00111100
+NAME test 3
 
 TIL 2
 00111100
@@ -79,6 +81,7 @@ TIL 2
 00110000
 01100000
 01111110
+NAME test 5
 
 TIL 3
 00111100
@@ -89,6 +92,7 @@ TIL 3
 01100110
 01100110
 00111100
+NAME test 7
 
 SPR A
 00011000