From 191f9192061ca28d2c1fe678ca5b8fa9abfd1d0c Mon Sep 17 00:00:00 2001 From: dingo Date: Tue, 10 Feb 2026 07:59:51 -0500 Subject: [PATCH] Fix elbow wall corner precedence and fallback flow - Apply elbow->corner bucket mapping before cardinal bucket selection - Add 8-direction fallback in pass1 when cardinal candidate exists but has no definition - Keep pass2 unresolved resolution unchanged --- Game/Dungeon/DungeonGeneratorVNext.cs | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/Game/Dungeon/DungeonGeneratorVNext.cs b/Game/Dungeon/DungeonGeneratorVNext.cs index 51f16d3..594fc4d 100644 --- a/Game/Dungeon/DungeonGeneratorVNext.cs +++ b/Game/Dungeon/DungeonGeneratorVNext.cs @@ -554,15 +554,25 @@ public class DungeonGeneratorVNext continue; } - var wallDef = SelectWallDefinitionForBucket(tileContext, bucketName); + TileDefinition? wallDef = null; + + // Elbow masks should prefer corner buckets before broad cardinal buckets. + string? elbowBucket = ResolveElbowBucketName(mask4); + if (!string.IsNullOrEmpty(elbowBucket)) + { + wallDef = SelectWallDefinitionForBucket(tileContext, elbowBucket); + } + + wallDef ??= SelectWallDefinitionForBucket(tileContext, bucketName); + if (wallDef == null) { - // Elbow masks (two-cardinal-neighbor corners) should prefer explicit corner buckets - // before falling back to broad cardinal buckets. - string? elbowBucket = ResolveElbowBucketName(mask4); - if (!string.IsNullOrEmpty(elbowBucket)) + // Try any 8-direction bucket before deferring to pass 2. + int fallbackMask8 = ComputeEightDirectionMask(layout, cell.X, cell.Y); + string? any8Bucket = ResolveEightDirectionBucketName(fallbackMask8); + if (!string.IsNullOrEmpty(any8Bucket)) { - wallDef = SelectWallDefinitionForBucket(tileContext, elbowBucket); + wallDef = SelectWallDefinitionForBucket(tileContext, any8Bucket); } }