diff -r d46ad15c6dec -r 9502611bffc1 rust/mapgen/src/template/wavefront_collapse.rs --- a/rust/mapgen/src/template/wavefront_collapse.rs Mon Feb 13 17:02:08 2023 +0100 +++ b/rust/mapgen/src/template/wavefront_collapse.rs Tue Feb 14 08:52:20 2023 +0100 @@ -1,9 +1,9 @@ -use integral_geometry::{Size}; +use integral_geometry::Size; -use landgen::{wavefront_collapse::generator::*}; +use landgen::wavefront_collapse::generator::*; use serde_derive::Deserialize; -use std::{collections::hash_map::HashMap}; +use std::collections::hash_map::HashMap; #[derive(Deserialize)] #[serde(remote = "EdgeDescription")] @@ -32,12 +32,12 @@ pub name: String, #[serde(with = "EdgesDesc")] pub edges: EdgesDescription, - pub is_negative: bool, - pub can_flip: bool, - pub can_mirror: bool, - pub can_rotate90: bool, - pub can_rotate180: bool, - pub can_rotate270: bool, + pub is_negative: Option, + pub can_flip: Option, + pub can_mirror: Option, + pub can_rotate90: Option, + pub can_rotate180: Option, + pub can_rotate270: Option, } #[derive(Deserialize)] @@ -51,6 +51,7 @@ pub is_negative: bool, pub put_girders: bool, pub max_hedgehogs: u8, + pub wrap: bool, pub tiles: Vec, } @@ -69,6 +70,7 @@ .iter() .map(|TileDescriptionHelper(t)| t.clone()) .collect(), + wrap: desc.wrap, } } }