Board layers

kiln-core/src/tests/game_portals.rs

@@ -1,11 +1,13 @@
-use std::collections::{BTreeMap, HashMap};
-use std::rc::Rc;
-use std::cell::RefCell;
 use crate::archetype::Archetype;
 use crate::board::Board;
 use crate::game::GameState;
+use crate::glyph::Glyph;
+use crate::layer::Layer;
 use crate::utils::{Direction, Player, PortalDef};
 use crate::world::World;
+use std::cell::RefCell;
+use std::collections::{BTreeMap, HashMap};
+use std::rc::Rc;
 
 /// Builds a 3×3 board with the player at `(px, py)` and the given portals.
 fn make_board(px: i32, py: i32, portals: Vec<PortalDef>) -> Board {
@@ -13,9 +15,9 @@ fn make_board(px: i32, py: i32, portals: Vec<PortalDef>) -> Board {
         name: "test".into(),
         width: 3,
         height: 3,
-        cells: vec![(Archetype::Empty.default_glyph(), Archetype::Empty); 9],
-        floor: vec![Archetype::Empty.default_glyph(); 9],
-        floor_spec: None,
+        layers: vec![Layer {
+            cells: vec![(Glyph::transparent(), Archetype::Empty); 9],
+        }],
         player: Player { x: px, y: py },
         objects: BTreeMap::new(),
         next_object_id: 1,
@@ -31,12 +33,30 @@ fn make_board(px: i32, py: i32, portals: Vec<PortalDef>) -> Board {
 /// - `"b1"`: player at `(0, 0)`, portal `"to_b2"` at `(2, 0)` → `"b2"` / `"from_b1"`
 /// - `"b2"`: player at `(0, 0)`, portal `"from_b1"` at `(1, 1)` → `"b1"` / `"to_b2"`
 fn two_board_world() -> World {
-    let b1 = make_board(0, 0, vec![
-        PortalDef { name: "to_b2".into(), x: 2, y: 0, target_map: "b2".into(), target_entry: "from_b1".into() },
-    ]);
-    let b2 = make_board(0, 0, vec![
-        PortalDef { name: "from_b1".into(), x: 1, y: 1, target_map: "b1".into(), target_entry: "to_b2".into() },
-    ]);
+    let b1 = make_board(
+        0,
+        0,
+        vec![PortalDef {
+            name: "to_b2".into(),
+            x: 2,
+            y: 0,
+            z: 0,
+            target_map: "b2".into(),
+            target_entry: "from_b1".into(),
+        }],
+    );
+    let b2 = make_board(
+        0,
+        0,
+        vec![PortalDef {
+            name: "from_b1".into(),
+            x: 1,
+            y: 1,
+            z: 0,
+            target_map: "b1".into(),
+            target_entry: "to_b2".into(),
+        }],
+    );
     World {
         name: "test".into(),
         start: "b1".into(),