Enforce exact corner mask matching in wall pass2

- Remove corner fallback candidate selection for elbow upgrades

- Upgrade elbow cells only when exact 8-bit bucket resolves to a corner bucket

- Prevent corner tiles from being placed when any 0-bit side touches floor
This commit is contained in:
dingo
2026-02-10 10:59:41 -05:00
parent 1faa296626
commit ceea824bb9
-26
View File
@@ -568,16 +568,6 @@ public class DungeonGeneratorVNext
wallDef = SelectWallDefinitionForBucket(tileContext, exact8);
}
// Fallback: orientation corner candidates for this elbow mask.
if (wallDef == null)
{
foreach (var cornerBucket in ResolveCornerBucketCandidatesForElbow(mask4))
{
wallDef = SelectWallDefinitionForBucket(tileContext, cornerBucket);
if (wallDef != null) break;
}
}
if (wallDef == null)
{
continue;
@@ -872,22 +862,6 @@ public class DungeonGeneratorVNext
return mask4 != 0b1010 && mask4 != 0b0101;
}
private static IReadOnlyList<string> ResolveCornerBucketCandidatesForElbow(int mask4)
{
return mask4 switch
{
// E + S
0b0110 => new[] { "WallDiagonalCornerDownRight", "WallInnerCornerDownRight", "WallDiagonalCornerUpLeft", "WallInnerCornerDownLeft" },
// S + W
0b0011 => new[] { "WallDiagonalCornerDownLeft", "WallInnerCornerDownLeft", "WallDiagonalCornerUpRight", "WallInnerCornerDownRight" },
// N + E
0b1100 => new[] { "WallDiagonalCornerUpRight", "WallInnerCornerDownRight", "WallDiagonalCornerDownLeft", "WallInnerCornerDownLeft" },
// N + W
0b1001 => new[] { "WallDiagonalCornerUpLeft", "WallInnerCornerDownLeft", "WallDiagonalCornerDownRight", "WallInnerCornerDownRight" },
_ => Array.Empty<string>()
};
}
private static IReadOnlyList<string> ResolveWallBucketCandidates(int mask4, int mask8)
{
// mask4 bit order: N,E,S,W