max
/
pixsy
1
0
Fork 0
Code Issues 8 Pull Requests Releases Wiki Activity

better tile names

This commit is contained in:
Max Bradbury 2020-11-08 15:37:38 +00:00
parent e76ff57053
commit 80df4a9a6a
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib.rs
View File

@ -49,9 +49,9 @@ lazy_static! {
); );
} }
fn tile_name(prefix: &Option<String>, index: &u32) -> Option<String> { fn tile_name(prefix: &Option<String>, x: &u32, y: &u32) -> Option<String> {
if let Some(prefix) = prefix { if let Some(prefix) = prefix {
Some(format!("{} {}", prefix, index)) Some(format!("{} ({},{})", prefix, x, y))
} else { } else {
None None
} }
@ -303,7 +303,7 @@ pub fn add_room() -> String {
let tile = Tile { let tile = Tile {
// "0" will get overwritten to a new, safe tile ID // "0" will get overwritten to a new, safe tile ID
id: "0".to_string(), id: "0".to_string(),
name: tile_name(&state.room_name, &((row * SD) + column + 1)), name: tile_name(&state.room_name, &row, &column),
wall: None, wall: None,
animation_frames: vec![Image { pixels }], animation_frames: vec![Image { pixels }],
colour_id: None colour_id: None

6
src/test-resources/expected.bitsy
View File

@ -70,7 +70,7 @@ TIL 1
00011000 00011000
00011000 00011000
00111100 00111100
NAME test 3 NAME test (0,2)
TIL 2 TIL 2
00111100 00111100
@ -81,7 +81,7 @@ TIL 2
00110000 00110000
01100000 01100000
01111110 01111110
NAME test 5 NAME test (0,4)
TIL 3 TIL 3
00111100 00111100
@ -92,7 +92,7 @@ TIL 3
01100110 01100110
01100110 01100110
00111100 00111100
NAME test 7 NAME test (0,6)
SPR A SPR A
00011000 00011000