From 046d665c573b6e24dd868e615ca69e9744b338b1 Mon Sep 17 00:00:00 2001 From: dingo Date: Tue, 10 Feb 2026 12:41:32 -0500 Subject: [PATCH] Fix directional bucket helper mapping and fill diagonal-only wall cells - Update tile edit Neighbor Mask Helper to suggest new directional bucket names and masks - Include 8-neighbor adjacency when collecting wall candidate cells so single-diagonal corner masks are placed - Keep strict exact mask bucket matching in VNext wall resolver --- Game/Dungeon/DungeonGeneratorVNext.cs | 16 +++++++----- Services/Admin/Pages/TileMaps/TileEdit.cshtml | 25 +++++++++---------- 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/Game/Dungeon/DungeonGeneratorVNext.cs b/Game/Dungeon/DungeonGeneratorVNext.cs index ebd6e02..71b9e9c 100644 --- a/Game/Dungeon/DungeonGeneratorVNext.cs +++ b/Game/Dungeon/DungeonGeneratorVNext.cs @@ -523,7 +523,7 @@ public class DungeonGeneratorVNext for (int x = 0; x < layout.Width; x++) { if (layout.Walkable![x, y]) continue; - if (!HasAdjacentCardinalWalkable(layout, x, y)) continue; + if (!HasAdjacentWalkable(layout, x, y)) continue; wallCells.Add((x, y)); } } @@ -778,12 +778,16 @@ public class DungeonGeneratorVNext PlaceWallTile(layout, x, y, def); } - private static bool HasAdjacentCardinalWalkable(DungeonLayoutV2 layout, int x, int y) + private static bool HasAdjacentWalkable(DungeonLayoutV2 layout, int x, int y) { - return IsWalkable(layout, x, y - 1) || - IsWalkable(layout, x + 1, y) || - IsWalkable(layout, x, y + 1) || - IsWalkable(layout, x - 1, y); + return IsWalkable(layout, x, y - 1) || // N + IsWalkable(layout, x + 1, y - 1) || // NE + IsWalkable(layout, x + 1, y) || // E + IsWalkable(layout, x + 1, y + 1) || // SE + IsWalkable(layout, x, y + 1) || // S + IsWalkable(layout, x - 1, y + 1) || // SW + IsWalkable(layout, x - 1, y) || // W + IsWalkable(layout, x - 1, y - 1); // NW } private static int ComputeEightDirectionMask(DungeonLayoutV2 layout, int x, int y) diff --git a/Services/Admin/Pages/TileMaps/TileEdit.cshtml b/Services/Admin/Pages/TileMaps/TileEdit.cshtml index efa3cd6..46ddfc8 100644 --- a/Services/Admin/Pages/TileMaps/TileEdit.cshtml +++ b/Services/Admin/Pages/TileMaps/TileEdit.cshtml @@ -196,19 +196,18 @@ function filterBuckets() { } const wallBucketSets = [ - { name: "WallInnerCornerDownLeft", mode: 8, codes: [241,224,240,225,160,81,209,97,208,113,17,177,161,144,49,176,33,145] }, - { name: "WallInnerCornerDownRight", mode: 8, codes: [199,195,131,135,130,69,197,67,133,71,68,198,194,132,70,134,196,66] }, - { name: "WallDiagonalCornerDownLeft", mode: 8, codes: [64] }, - { name: "WallDiagonalCornerDownRight", mode: 8, codes: [1] }, - { name: "WallDiagonalCornerUpLeft", mode: 8, codes: [16,80] }, - { name: "WallDiagonalCornerUpRight", mode: 8, codes: [4,5] }, - { name: "WallFullEightDirections", mode: 8, codes: [20,228,147,116,23,22,52,21,84,18,36,19,100,151,244,150,180,229,211,245,215,117,87,101,83,82,37,53,86,213,212,149] }, - { name: "WallTop", mode: 4, codes: [15,6,3,2,10,12,14,11,7] }, - { name: "WallSideLeft", mode: 4, codes: [4] }, - { name: "WallSideRight", mode: 4, codes: [1] }, - { name: "WallBottom", mode: 4, codes: [8] }, - { name: "WallBottm", mode: 4, codes: [8] }, - { name: "WallFull", mode: 4, codes: [13,5,9] } + { name: "Wall_N", mode: 8, codes: [128,129,192,193] }, + { name: "Wall_S", mode: 8, codes: [8,24,12,28] }, + { name: "Wall_E", mode: 8, codes: [32,96,48,112] }, + { name: "Wall_W", mode: 8, codes: [2,6,3,7] }, + { name: "NWCornerLarge", mode: 8, codes: [131] }, + { name: "NECornerLarge", mode: 8, codes: [224] }, + { name: "SECornerLarge", mode: 8, codes: [56] }, + { name: "SWCornerLarge", mode: 8, codes: [14] }, + { name: "NWCornerSingle", mode: 8, codes: [1] }, + { name: "NECornerSingle", mode: 8, codes: [64] }, + { name: "SECornerSingle", mode: 8, codes: [16] }, + { name: "SWCornerSingle", mode: 8, codes: [4] } ]; const maskState = { n:0, ne:0, e:0, se:0, s:0, sw:0, w:0, nw:0 };