new layer model

kiln-core/src/tests/map_file/mod.rs

@@ -16,33 +16,29 @@ fn load_board(toml: &str) -> Board {
     Board::try_from(mf).expect("convert to board")
 }
 
-/// Builds one `[[layers]]` block: a triple-quoted `content` grid plus an inline
+/// Builds the `[grid]` block: a triple-quoted `content` grid plus an inline
 /// `palette` table. Each palette entry is `(char_key, inline-body)` where the
 /// body is the inside of the entry's `{ ... }` (e.g. `kind = "wall"`).
-fn layer(content: &str, palette: &[(&str, &str)]) -> String {
+fn grid(content: &str, palette: &[(&str, &str)]) -> String {
     let pal = palette
         .iter()
         .map(|(k, body)| format!("\"{k}\" = {{ {body} }}"))
         .collect::<Vec<_>>()
         .join(", ");
-    format!("\n[[layers]]\ncontent = \"\"\"\n{content}\n\"\"\"\npalette = {{ {pal} }}\n")
+    format!("\n[grid]\ncontent = \"\"\"\n{content}\n\"\"\"\npalette = {{ {pal} }}\n")
 }
 
-/// Wraps a `[map]` header of the given size around the supplied `[[layers]]`
-/// blocks (each produced by [`layer`]).
-fn map(width: usize, height: usize, layers: &[String]) -> String {
-    let mut s = format!("[map]\nname = \"Test\"\nwidth = {width}\nheight = {height}\n");
-    for l in layers {
-        s.push_str(l);
-    }
-    s
+/// Wraps a `[map]` header of the given size around the single `[grid]` block
+/// (produced by [`grid`]).
+fn map(width: usize, height: usize, grid_block: &str) -> String {
+    format!("[map]\nname = \"Test\"\nwidth = {width}\nheight = {height}\n{grid_block}")
 }
 
 /// A 3×1 single-layer map: an `empty`/`wall` palette plus one `object` entry
 /// placed by char `ch` (cyan `@` glyph), with `extra` appended to its body. The
 /// player is placed at the far-right cell via a second char where room allows;
 /// callers that need the player elsewhere build the map directly.
-fn map_3x1_object(grid: &str, ch: &str, extra: &str) -> String {
+fn map_3x1_object(grid_str: &str, ch: &str, extra: &str) -> String {
     let body = if extra.is_empty() {
         "kind = \"object\", tile = 64, fg = \"#00FFFF\", bg = \"#000000\"".to_string()
     } else {
@@ -51,8 +47,8 @@ fn map_3x1_object(grid: &str, ch: &str, extra: &str) -> String {
     map(
         3,
         1,
-        &[layer(
-            grid,
+        &grid(
+            grid_str,
             &[
                 (" ", "kind = \"empty\""),
                 (".", "kind = \"empty\""),
@@ -63,6 +59,6 @@ fn map_3x1_object(grid: &str, ch: &str, extra: &str) -> String {
                 ("@", "kind = \"player\""),
                 (ch, &body),
             ],
-        )],
+        ),
     )
 }