new layer model

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

@@ -1,7 +1,7 @@
 //! Pushers are now scripted objects (the `pusher_*` archetypes expand into objects
 //! carrying the embedded `pusher.rhai` plus a `BUILTIN_pusher_<dir>` tag).
 
-use super::{layer, load_board, map};
+use super::{grid, load_board, map};
 use crate::archetype::Archetype;
 use crate::game::GameState;
 use crate::map_file::MapFile;
@@ -24,10 +24,10 @@ fn pusher_loads_as_a_tagged_scripted_solid_object() {
     let board = load_board(&map(
         3,
         1,
-        &[layer(
+        &grid(
             "P @",
             &[("P", "kind = \"pusher_east\""), ("@", "kind = \"player\"")],
-        )],
+        ),
     ));
     let mut id = 0;
     let p = pusher(&board, &mut id);
@@ -48,14 +48,14 @@ fn pusher_advances_and_shoves_a_crate() {
     let board = load_board(&map(
         5,
         1,
-        &[layer(
+        &grid(
             "Po  @",
             &[
                 ("P", "kind = \"pusher_east\""),
                 ("o", "kind = \"crate\""),
                 ("@", "kind = \"player\""),
             ],
-        )],
+        ),
     ));
     let mut pid = 0;
     pusher(&board, &mut pid);
@@ -69,12 +69,12 @@ fn pusher_advances_and_shoves_a_crate() {
     let b = game.board();
     assert!(b.objects[&pid].x > 0, "pusher advanced east");
     assert_eq!(
-        b.get(0, 1, 0).1,
+        b.get(1, 0).1,
         Archetype::Empty,
         "crate left its start cell"
     );
     assert!(
-        (2..b.width).any(|x| b.get(0, x, 0).1 == Archetype::Crate),
+        (2..b.width).any(|x| b.get(x, 0).1 == Archetype::Crate),
         "crate was shoved east"
     );
 }
@@ -84,14 +84,14 @@ fn pusher_blocked_by_wall_stays_put() {
     let board = load_board(&map(
         4,
         1,
-        &[layer(
+        &grid(
             "P# @",
             &[
                 ("P", "kind = \"pusher_east\""),
                 ("#", "kind = \"wall\""),
                 ("@", "kind = \"player\""),
             ],
-        )],
+        ),
     ));
     let mut pid = 0;
     pusher(&board, &mut pid);
@@ -113,10 +113,10 @@ fn pusher_round_trips_to_its_keyword() {
     let board = load_board(&map(
         3,
         1,
-        &[layer(
+        &grid(
             "P @",
             &[("P", "kind = \"pusher_east\""), ("@", "kind = \"player\"")],
-        )],
+        ),
     ));
     // Save collapses the expanded object back into the `pusher_east` keyword.
     let toml_out = toml::to_string_pretty(&MapFile::from(&board)).unwrap();