diff -r 07cb6dbc8444 -r 33f09636018b rust/mapgen/src/lib.rs --- a/rust/mapgen/src/lib.rs Mon Jan 27 14:06:10 2025 +0100 +++ b/rust/mapgen/src/lib.rs Mon Jan 27 15:48:24 2025 +0100 @@ -160,7 +160,7 @@ impl MapGenerator { pub fn import_yaml_templates(&mut self, text: &str) { - let mut desc: WfcTemplateCollectionDesc = serde_yaml::from_str(text).unwrap(); + let mut desc: WfcTemplateCollectionDesc = toml::from_str(text).unwrap(); let templates = std::mem::take(&mut desc.templates); self.templates = desc .template_types @@ -168,7 +168,7 @@ .map(|(size, indices)| { ( TemplateType(size), - indices.iter().map(|i| (&templates[*i]).into()).collect(), + indices.iter().map(|i| (&templates[*i]).to_template(&desc.tiles, &desc.edges)).collect(), ) }) .collect();