multi board

kiln-core/src/tests/mod.rs

@@ -4,20 +4,22 @@ mod map_file;
 mod movement;
 mod scripting;
 
-use std::collections::BTreeMap;
+use std::collections::{BTreeMap, HashMap};
 use crate::archetype::Archetype;
 use crate::board::Board;
 use crate::object_def::ObjectDef;
 use crate::utils::Player;
 use crate::game::GameState;
 
-/// Builds a 1×1 board with a single object that optionally references a
-/// script, plus the given `(name, source)` script table entries.
-fn board_with_object(object_script: Option<&str>, scripts: &[(&str, &str)]) -> Board {
+/// 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>) {
     let mut object = ObjectDef::new(0, 0);
     object.id = 1;
     object.script_name = object_script.map(str::to_string);
-    Board {
+    let board = Board {
         name: "test".into(),
         width: 1,
         height: 1,
@@ -30,10 +32,16 @@ fn board_with_object(object_script: Option<&str>, scripts: &[(&str, &str)]) -> B
         portals: Vec::new(),
         font: None,
         zoom: 1,
-        scripts: scripts.iter().map(|(k, v)| (k.to_string(), v.to_string())).collect(),
         board_script_name: None,
         load_errors: Vec::new(),
-    }
+    };
+    (board, scripts_from(scripts))
+}
+
+/// 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()
 }
 
 /// Returns an `ObjectDef` at `(x, y)` bound to the named script.