Dungeon Building -Verbose logging on Floor tiles.
This commit is contained in:
@@ -390,6 +390,79 @@ public class DungeonGeneratorV2
|
||||
return layout;
|
||||
}
|
||||
|
||||
//private async Task LoadTemplatesAsync()
|
||||
//{
|
||||
// var templates = await _db.RoomTemplates
|
||||
// .Where(r => r.IsEnabled)
|
||||
// .Where(r => r.MinTier <= _tier && (r.MaxTier == 0 || r.MaxTier >= _tier))
|
||||
// .ToListAsync();
|
||||
|
||||
// _entranceTemplates = templates.Where(t => t.Type == RoomType.Entrance).ToList();
|
||||
// _exitTemplates = templates.Where(t => t.Type == RoomType.Exit).ToList();
|
||||
// _bossTemplates = templates.Where(t => t.Type == RoomType.Boss).ToList();
|
||||
// _treasureTemplates = templates.Where(t => t.Type == RoomType.Treasure).ToList();
|
||||
// _normalTemplates = templates.Where(t => t.Type == RoomType.Normal).ToList();
|
||||
// _hallwayTemplates = templates.Where(t => t.Type == RoomType.Hallway).ToList();
|
||||
|
||||
// Console.WriteLine($"[DungeonGenV2] Loaded templates for tier {_tier}: Entrance={_entranceTemplates.Count}, Exit={_exitTemplates.Count}, Boss={_bossTemplates.Count}, Treasure={_treasureTemplates.Count}, Normal={_normalTemplates.Count}");
|
||||
|
||||
// // Load tile definitions from templates
|
||||
// var tileIds = templates
|
||||
// .Where(t => !string.IsNullOrEmpty(t.TileDataJson))
|
||||
// .SelectMany(t => {
|
||||
// try
|
||||
// {
|
||||
// var placements = JsonSerializer.Deserialize<List<TilePlacement>>(t.TileDataJson!);
|
||||
// return placements?.Select(p => p.TileDefinitionId) ?? Enumerable.Empty<int>();
|
||||
// }
|
||||
// catch { return Enumerable.Empty<int>(); }
|
||||
// })
|
||||
// .Distinct()
|
||||
// .ToList();
|
||||
|
||||
// if (tileIds.Any())
|
||||
// {
|
||||
// var tiles = await _db.TileDefinitions
|
||||
// .Include(t => t.TileMapSheet)
|
||||
// .Where(t => tileIds.Contains(t.Id))
|
||||
// .ToListAsync();
|
||||
|
||||
// _tileDefinitions = tiles.ToDictionary(t => t.Id);
|
||||
// _tagIndex = new TileTagIndex(_tileDefinitions.Values);
|
||||
// _defaultSheet = tiles.FirstOrDefault()?.TileMapSheet;
|
||||
// _tileTags = _tileDefinitions.Values.ToDictionary(t => t.Id, t => ParseTags(t.Tags));
|
||||
// _tileSocketTypes = _tileDefinitions.Values.ToDictionary(
|
||||
// t => t.Id,
|
||||
// t => ParseSocketTypes(_tileTags[t.Id])
|
||||
// );
|
||||
|
||||
// Console.WriteLine($"[DungeonGenV2] Loaded {tiles.Count} tile definitions from templates");
|
||||
// }
|
||||
|
||||
// // Always load a default sheet for fallback generation
|
||||
// if (_defaultSheet == null)
|
||||
// {
|
||||
// _defaultSheet = await _db.TileMapSheets
|
||||
// .Include(s => s.Tiles)
|
||||
// .FirstOrDefaultAsync(s => s.IsEnabled);
|
||||
|
||||
// if (_defaultSheet?.Tiles != null)
|
||||
// {
|
||||
// foreach (var tile in _defaultSheet.Tiles)
|
||||
// {
|
||||
// tile.TileMapSheet = _defaultSheet; // Ensure navigation property is set
|
||||
// _tileDefinitions[tile.Id] = tile;
|
||||
// }
|
||||
// Console.WriteLine($"[DungeonGenV2] Loaded {_defaultSheet.Tiles.Count} tiles from default sheet '{_defaultSheet.Name}'");
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// Console.WriteLine($"[DungeonGenV2] WARNING: No tilemap sheets found in database!");
|
||||
// }
|
||||
// }
|
||||
|
||||
// Console.WriteLine($"[DungeonGenV2] Total tile definitions: {_tileDefinitions.Count}");
|
||||
//}
|
||||
private async Task LoadTemplatesAsync()
|
||||
{
|
||||
var templates = await _db.RoomTemplates
|
||||
@@ -404,64 +477,98 @@ public class DungeonGeneratorV2
|
||||
_normalTemplates = templates.Where(t => t.Type == RoomType.Normal).ToList();
|
||||
_hallwayTemplates = templates.Where(t => t.Type == RoomType.Hallway).ToList();
|
||||
|
||||
Console.WriteLine($"[DungeonGenV2] Loaded templates for tier {_tier}: Entrance={_entranceTemplates.Count}, Exit={_exitTemplates.Count}, Boss={_bossTemplates.Count}, Treasure={_treasureTemplates.Count}, Normal={_normalTemplates.Count}");
|
||||
Console.WriteLine($"[DungeonGenV2] Loaded templates for tier {_tier}: Entrance={_entranceTemplates.Count}, Exit={_exitTemplates.Count}, Boss={_bossTemplates.Count}, Treasure={_treasureTemplates.Count}, Normal={_normalTemplates.Count}, Hallway={_hallwayTemplates.Count}");
|
||||
|
||||
// Load tile definitions from templates
|
||||
var tileIds = templates
|
||||
// Start clean each generation.
|
||||
_tileDefinitions = new Dictionary<int, TileDefinition>();
|
||||
|
||||
// 1) Pull tile IDs referenced by templates (if any)
|
||||
var templateTileIds = templates
|
||||
.Where(t => !string.IsNullOrEmpty(t.TileDataJson))
|
||||
.SelectMany(t => {
|
||||
.SelectMany(t =>
|
||||
{
|
||||
try
|
||||
{
|
||||
var placements = JsonSerializer.Deserialize<List<TilePlacement>>(t.TileDataJson!);
|
||||
return placements?.Select(p => p.TileDefinitionId) ?? Enumerable.Empty<int>();
|
||||
}
|
||||
catch { return Enumerable.Empty<int>(); }
|
||||
catch
|
||||
{
|
||||
return Enumerable.Empty<int>();
|
||||
}
|
||||
})
|
||||
.Distinct()
|
||||
.ToList();
|
||||
|
||||
if (tileIds.Any())
|
||||
if (templateTileIds.Count > 0)
|
||||
{
|
||||
var tiles = await _db.TileDefinitions
|
||||
var templateTiles = await _db.TileDefinitions
|
||||
.Include(t => t.TileMapSheet)
|
||||
.Where(t => tileIds.Contains(t.Id))
|
||||
.Where(t => templateTileIds.Contains(t.Id))
|
||||
.ToListAsync();
|
||||
|
||||
_tileDefinitions = tiles.ToDictionary(t => t.Id);
|
||||
_tagIndex = new TileTagIndex(_tileDefinitions.Values);
|
||||
_defaultSheet = tiles.FirstOrDefault()?.TileMapSheet;
|
||||
_tileTags = _tileDefinitions.Values.ToDictionary(t => t.Id, t => ParseTags(t.Tags));
|
||||
_tileSocketTypes = _tileDefinitions.Values.ToDictionary(
|
||||
t => t.Id,
|
||||
t => ParseSocketTypes(_tileTags[t.Id])
|
||||
);
|
||||
foreach (var tile in templateTiles)
|
||||
_tileDefinitions[tile.Id] = tile;
|
||||
|
||||
Console.WriteLine($"[DungeonGenV2] Loaded {tiles.Count} tile definitions from templates");
|
||||
// Pick a sheet for rendering defaults if we got one from template tiles
|
||||
_defaultSheet = templateTiles.FirstOrDefault()?.TileMapSheet;
|
||||
|
||||
Console.WriteLine($"[DungeonGenV2] Loaded {templateTiles.Count} tile definitions referenced by templates");
|
||||
}
|
||||
else
|
||||
{
|
||||
Console.WriteLine($"[DungeonGenV2] No template tile references found (templates may be disabled or missing TileDataJson)");
|
||||
}
|
||||
|
||||
// Always load a default sheet for fallback generation
|
||||
// 2) Always load a default sheet for fallback generation (and merge its tiles)
|
||||
if (_defaultSheet == null)
|
||||
{
|
||||
_defaultSheet = await _db.TileMapSheets
|
||||
.Include(s => s.Tiles)
|
||||
.FirstOrDefaultAsync(s => s.IsEnabled);
|
||||
|
||||
if (_defaultSheet?.Tiles != null)
|
||||
{
|
||||
foreach (var tile in _defaultSheet.Tiles)
|
||||
{
|
||||
tile.TileMapSheet = _defaultSheet; // Ensure navigation property is set
|
||||
_tileDefinitions[tile.Id] = tile;
|
||||
}
|
||||
Console.WriteLine($"[DungeonGenV2] Loaded {_defaultSheet.Tiles.Count} tiles from default sheet '{_defaultSheet.Name}'");
|
||||
}
|
||||
else
|
||||
{
|
||||
Console.WriteLine($"[DungeonGenV2] WARNING: No tilemap sheets found in database!");
|
||||
}
|
||||
if (_defaultSheet == null)
|
||||
Console.WriteLine($"[DungeonGenV2] WARNING: No enabled TileMapSheet found in database!");
|
||||
}
|
||||
|
||||
Console.WriteLine($"[DungeonGenV2] Total tile definitions: {_tileDefinitions.Count}");
|
||||
if (_defaultSheet?.Tiles != null)
|
||||
{
|
||||
foreach (var tile in _defaultSheet.Tiles)
|
||||
{
|
||||
tile.TileMapSheet = _defaultSheet; // ensure nav prop set for client data building
|
||||
_tileDefinitions[tile.Id] = tile; // merge/overwrite if already present
|
||||
}
|
||||
|
||||
Console.WriteLine($"[DungeonGenV2] Loaded {_defaultSheet.Tiles.Count} tiles from default sheet '{_defaultSheet.Name}'");
|
||||
}
|
||||
|
||||
Console.WriteLine($"[DungeonGenV2] Total tile definitions merged: {_tileDefinitions.Count}");
|
||||
|
||||
// 3) ALWAYS build indexes/caches after all tiles are merged
|
||||
if (_tileDefinitions.Count > 0)
|
||||
{
|
||||
_tagIndex = new TileTagIndex(_tileDefinitions.Values);
|
||||
|
||||
_tileTags = _tileDefinitions.Values.ToDictionary(
|
||||
t => t.Id,
|
||||
t => ParseTags(t.Tags)
|
||||
);
|
||||
|
||||
_tileSocketTypes = _tileDefinitions.Values.ToDictionary(
|
||||
t => t.Id,
|
||||
t => ParseSocketTypes(_tileTags[t.Id])
|
||||
);
|
||||
|
||||
Console.WriteLine($"[DungeonGenV2] Built tag caches: tileTags={_tileTags.Count} socketTypes={_tileSocketTypes.Count}");
|
||||
}
|
||||
else
|
||||
{
|
||||
_tagIndex = null;
|
||||
_tileTags = new Dictionary<int, HashSet<string>>();
|
||||
_tileSocketTypes = new Dictionary<int, Dictionary<string, HashSet<string>>>();
|
||||
|
||||
Console.WriteLine($"[DungeonGenV2] WARNING: No tile definitions available; tag index/caches not built.");
|
||||
}
|
||||
}
|
||||
|
||||
private RoomType DetermineNextRoomType(List<DungeonRoomV2> existing, int targetCount)
|
||||
@@ -1781,6 +1888,7 @@ public class DungeonGeneratorV2
|
||||
}
|
||||
private static Dictionary<string, HashSet<string>> ParseSocketTypes(HashSet<string> tags)
|
||||
{
|
||||
// dir -> set of types; "" means untyped
|
||||
var map = new Dictionary<string, HashSet<string>>(StringComparer.OrdinalIgnoreCase)
|
||||
{
|
||||
["N"] = new HashSet<string>(StringComparer.OrdinalIgnoreCase),
|
||||
@@ -1794,22 +1902,46 @@ public class DungeonGeneratorV2
|
||||
if (!t.StartsWith("Socket", StringComparison.OrdinalIgnoreCase))
|
||||
continue;
|
||||
|
||||
// SocketN or SocketN_Lava
|
||||
// SocketE_Stone etc.
|
||||
var rest = t.Substring("Socket".Length); // e.g. "N" or "N_Lava"
|
||||
if (string.IsNullOrWhiteSpace(rest)) continue;
|
||||
// Support:
|
||||
// SocketE
|
||||
// SocketE=OuterBorder
|
||||
// SocketE_OuterBorder
|
||||
// SocketE:OuterBorder
|
||||
var cleaned = t.Replace(":", "=", StringComparison.Ordinal);
|
||||
|
||||
var parts = rest.Split('_', 2, StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
|
||||
string left = cleaned;
|
||||
string type = "";
|
||||
|
||||
var dir = parts[0]; // "N"
|
||||
int eq = cleaned.IndexOf('=');
|
||||
if (eq >= 0)
|
||||
{
|
||||
left = cleaned.Substring(0, eq);
|
||||
type = cleaned.Substring(eq + 1).Trim();
|
||||
}
|
||||
else
|
||||
{
|
||||
// underscore typed form
|
||||
var parts = cleaned.Split('_', 2, StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
|
||||
if (parts.Length == 2)
|
||||
{
|
||||
left = parts[0];
|
||||
type = parts[1];
|
||||
}
|
||||
}
|
||||
|
||||
// left is "SocketN" / "SocketE"
|
||||
if (left.Length < "Socket".Length + 1) continue;
|
||||
|
||||
var dir = left.Substring("Socket".Length); // "N" "E" "S" "W"
|
||||
if (!(dir is "N" or "E" or "S" or "W")) continue;
|
||||
|
||||
var type = parts.Length == 2 ? parts[1] : ""; // "" == untyped
|
||||
map[dir].Add(type);
|
||||
// untyped stored as ""
|
||||
map[dir].Add(string.IsNullOrWhiteSpace(type) ? "" : type);
|
||||
}
|
||||
|
||||
return map;
|
||||
}
|
||||
|
||||
private TileDefinition? PickRandomFloorTile(
|
||||
DungeonLayoutV2 layout,
|
||||
int x, int y,
|
||||
|
||||
Reference in New Issue
Block a user