From e1e05a2ebd6ba0322b09fac0e8181ef383ca98b0 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Wed, 28 Jan 2026 11:57:55 +0100 Subject: tile flags matching without tile parameters --- data/tiles.yaml | 13 ++++++------- server/data/src/lib.rs | 3 ++- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/data/tiles.yaml b/data/tiles.yaml index 730207e3..2400c9a2 100644 --- a/data/tiles.yaml +++ b/data/tiles.yaml @@ -4,14 +4,13 @@ # x | exclusive to items used in recipes book: e -counter: ac counter-window: ac -oven: c -freezer: c +counter: ac +crate: c +deep-fryer: x +freezer: cx +lamp: c +oven: cx stove: c tree: c wall: c -lamp: c -deep-fryer: x -freezer: x -oven: x diff --git a/server/data/src/lib.rs b/server/data/src/lib.rs index faaf3980..aff895fa 100644 --- a/server/data/src/lib.rs +++ b/server/data/src/lib.rs @@ -355,7 +355,8 @@ fn tiles_flagged( ) -> HashSet { let mut out = HashSet::new(); for (i, tile) in tiles.iter().enumerate() { - if let Some(flags) = tile_flags.get(tile) { + let (kind, _params) = tile.split_once(":").unwrap_or((tile, "")); + if let Some(flags) = tile_flags.get(kind) { if flags.contains(flag) { out.insert(TileIndex(i)); } -- cgit v1.3