diff options
| author | metamuffin <metamuffin@disroot.org> | 2026-01-28 11:57:55 +0100 |
|---|---|---|
| committer | metamuffin <metamuffin@disroot.org> | 2026-01-28 11:57:55 +0100 |
| commit | e1e05a2ebd6ba0322b09fac0e8181ef383ca98b0 (patch) | |
| tree | 26c1117b5ab6e2f478c3928ec875a450e66f6af3 | |
| parent | d72f6030f8f344127725db1214f152804caa0031 (diff) | |
| download | hurrycurry-e1e05a2ebd6ba0322b09fac0e8181ef383ca98b0.tar hurrycurry-e1e05a2ebd6ba0322b09fac0e8181ef383ca98b0.tar.bz2 hurrycurry-e1e05a2ebd6ba0322b09fac0e8181ef383ca98b0.tar.zst | |
tile flags matching without tile parameters
| -rw-r--r-- | data/tiles.yaml | 13 | ||||
| -rw-r--r-- | 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<TileIndex> { 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)); } |