Board layers

kiln-core/src/tests/mod.rs

@@ -5,18 +5,23 @@ mod map_file;
 mod movement;
 mod scripting;
 
-use std::collections::{BTreeMap, HashMap};
 use crate::archetype::Archetype;
 use crate::board::Board;
+use crate::game::GameState;
+use crate::glyph::Glyph;
+use crate::layer::Layer;
 use crate::object_def::ObjectDef;
 use crate::utils::Player;
-use crate::game::GameState;
+use std::collections::{BTreeMap, HashMap};
 
 /// Builds a 1×1 board with a single object that optionally references a script,
 /// and returns both the board and the `(name, source)` entries as a script map.
 ///
 /// Pass the returned scripts to [`GameState::with_scripts`] so they are compiled.
-fn board_with_object(object_script: Option<&str>, scripts: &[(&str, &str)]) -> (Board, HashMap<String, String>) {
+fn board_with_object(
+    object_script: Option<&str>,
+    scripts: &[(&str, &str)],
+) -> (Board, HashMap<String, String>) {
     let mut object = ObjectDef::new(0, 0);
     object.id = 1;
     object.script_name = object_script.map(str::to_string);
@@ -24,9 +29,9 @@ fn board_with_object(object_script: Option<&str>, scripts: &[(&str, &str)]) -> (
         name: "test".into(),
         width: 1,
         height: 1,
-        cells: vec![(Archetype::Empty.default_glyph(), Archetype::Empty)],
-        floor: vec![Archetype::Empty.default_glyph()],
-        floor_spec: None,
+        layers: vec![Layer {
+            cells: vec![(Glyph::transparent(), Archetype::Empty)],
+        }],
         player: Player { x: 0, y: 0 },
         objects: BTreeMap::from([(1, object)]),
         next_object_id: 2,
@@ -41,7 +46,10 @@ fn board_with_object(object_script: Option<&str>, scripts: &[(&str, &str)]) -> (
 /// Converts a `(name, source)` slice into a `HashMap` suitable for
 /// [`GameState::with_scripts`].
 fn scripts_from(pairs: &[(&str, &str)]) -> HashMap<String, String> {
-    pairs.iter().map(|(k, v)| (k.to_string(), v.to_string())).collect()
+    pairs
+        .iter()
+        .map(|(k, v)| (k.to_string(), v.to_string()))
+        .collect()
 }
 
 /// Returns an `ObjectDef` at `(x, y)` bound to the named script.