From 5da9cbedac1e28cc09bde854f9e9f0ff9dcae9e4 Mon Sep 17 00:00:00 2001 From: dingo Date: Wed, 11 Feb 2026 10:06:58 -0500 Subject: [PATCH] Builder changes --- Game/Dungeon/DungeonGeneratorV3.cs | 53 ++- Game/Dungeon/DungeonGeneratorVNext.cs | 387 +++++++++++++++++- Game/Dungeon/DungeonHandler.Dungeons.cs | 9 +- Game/Dungeon/DungeonHandler.Generation.cs | 77 +--- Game/Dungeon/DungeonLayoutV2.cs | 6 +- Game/Dungeon/DungeonRoom.cs | 6 + Game/Dungeon/DungeonRoomV2.cs | 12 +- Game/Dungeon/DungeonVisualTileExtensions.cs | 10 +- .../Pages/DungeonBuilder/RoomEdit.cshtml | 337 ++++++++++++--- .../Pages/DungeonBuilder/RoomEdit.cshtml.cs | 26 +- pending-clientChanges.md | 26 -- 11 files changed, 740 insertions(+), 209 deletions(-) diff --git a/Game/Dungeon/DungeonGeneratorV3.cs b/Game/Dungeon/DungeonGeneratorV3.cs index 9e70c84..caae509 100644 --- a/Game/Dungeon/DungeonGeneratorV3.cs +++ b/Game/Dungeon/DungeonGeneratorV3.cs @@ -100,6 +100,7 @@ public class DungeonGeneratorV3 private List _bossRooms = new(); private List _treasureRooms = new(); private List _normalRooms = new(); + private Dictionary _roomTemplateUseCounts = new(); // Tile data cache private Dictionary _tileDefinitions = new(); @@ -154,6 +155,7 @@ public class DungeonGeneratorV3 public async Task GenerateAsync(int? paletteId = null, string? biome = null) { Log($" Starting generation: seed={_seed}, tier={_tier}, palette={paletteId}, biome={biome}"); + _roomTemplateUseCounts.Clear(); // Load palette and templates (auto-selects if no palette/biome specified) await LoadPaletteAsync(paletteId, biome); @@ -624,13 +626,16 @@ public class DungeonGeneratorV3 if (templates.Count > 0) { - // Use weighted selection - template = SelectWeightedTemplate(templates); + // Use weighted selection with repeat-usage penalty. + template = SelectRoomTemplateWithRepeatPenalty(templates); roomWidth = template.Width; roomHeight = template.Height; if (!UsedRoomTemplates.Contains(template.Name)) UsedRoomTemplates.Add(template.Name); + + _roomTemplateUseCounts.TryGetValue(template.Id, out int useCount); + _roomTemplateUseCounts[template.Id] = useCount + 1; } else { @@ -953,6 +958,50 @@ public class DungeonGeneratorV3 } } + private BuilderRoomTemplate SelectRoomTemplateWithRepeatPenalty(List templates) + { + if (templates.Count == 1) + { + return templates[0]; + } + + // Strongly prefer unique templates first; repeat only when needed. + var unusedTemplates = templates + .Where(t => !_roomTemplateUseCounts.ContainsKey(t.Id)) + .ToList(); + var candidates = unusedTemplates.Count > 0 ? unusedTemplates : templates; + + double totalWeight = 0; + var adjustedWeights = new List(candidates.Count); + + foreach (var template in candidates) + { + int baseWeight = Math.Max(1, template.Weight); + _roomTemplateUseCounts.TryGetValue(template.Id, out int repeatCount); + + // Each repeat is 3x less likely than the previous placement. + double adjustedWeight = baseWeight / Math.Pow(3.0d, repeatCount); + adjustedWeight = Math.Max(0.01d, adjustedWeight); + + adjustedWeights.Add(adjustedWeight); + totalWeight += adjustedWeight; + } + + double roll = _rng.NextDouble() * totalWeight; + double cumulative = 0; + + for (int i = 0; i < candidates.Count; i++) + { + cumulative += adjustedWeights[i]; + if (roll < cumulative) + { + return candidates[i]; + } + } + + return candidates[^1]; + } + private async Task LoadBucketDataAsync() { _tileBucketsByDefinitionId.Clear(); diff --git a/Game/Dungeon/DungeonGeneratorVNext.cs b/Game/Dungeon/DungeonGeneratorVNext.cs index 719eb7f..5203781 100644 --- a/Game/Dungeon/DungeonGeneratorVNext.cs +++ b/Game/Dungeon/DungeonGeneratorVNext.cs @@ -20,6 +20,13 @@ public class DungeonGeneratorVNext private readonly int _tier; private readonly Random _rng; private readonly ILogger? _logger; + private DungeonPalette? _selectedPalette; + private List _roomTemplates = new(); + private readonly Dictionary _roomTemplateUseCounts = new(); + private readonly Dictionary> _templateMobSpawnsByRoom = new(); + private readonly Dictionary<(int X, int Y), List> _templateTilesByCell = new(); + private readonly Dictionary _tileDefinitionsById = new(); + private static readonly JsonSerializerOptions _jsonOptions = new() { PropertyNameCaseInsensitive = true }; public DungeonGeneratorVNext(GameDbContext db, int seed, int tier = 1, ILogger? logger = null) { @@ -38,6 +45,13 @@ public class DungeonGeneratorVNext public async Task GenerateAsync() { + _roomTemplateUseCounts.Clear(); + _templateMobSpawnsByRoom.Clear(); + _templateTilesByCell.Clear(); + _tileDefinitionsById.Clear(); + _selectedPalette = await SelectPaletteAsync(); + await LoadRoomTemplatesAsync(); + int size = 72 + (_tier * 8); if (_tier >= 6) size += (_tier - 5) * 12; int mapWidth = Math.Clamp(size, 64, 220); @@ -78,14 +92,17 @@ public class DungeonGeneratorVNext ConnectRoomsWithRandomWalk(layout, rooms); AddLoopConnections(layout, rooms, Math.Max(2, rooms.Count / 4)); AssignRoomTypes(rooms); + ApplyRoomTemplates(layout, rooms); GenerateSpawnsAndChests(layout, rooms); await BuildPaletteDrivenTileDetailsAsync(layout); layout.Rooms = rooms; var entrance = rooms.FirstOrDefault(r => r.Type == DungeonRoomType.Entrance) ?? rooms[0]; - layout.SpawnPoint = new DungeonPoint(entrance.CenterX, entrance.CenterY); - layout.PlayerSpawnX = entrance.CenterX; - layout.PlayerSpawnY = entrance.CenterY; + int spawnX = entrance.PlayerSpawnX ?? entrance.CenterX; + int spawnY = entrance.PlayerSpawnY ?? entrance.CenterY; + layout.SpawnPoint = new DungeonPoint(spawnX, spawnY); + layout.PlayerSpawnX = spawnX; + layout.PlayerSpawnY = spawnY; layout.TotalMobs = layout.MobSpawns.Count; layout.TotalChests = layout.ChestSpawns.Count; @@ -188,6 +205,43 @@ public class DungeonGeneratorVNext return rooms.OrderBy(r => r.X + r.Y).ToList(); } + private async Task LoadRoomTemplatesAsync() + { + IQueryable query = _db.BuilderRoomTemplates + .Where(r => r.IsEnabled) + .Where(r => r.MinTier <= _tier && (r.MaxTier == 0 || r.MaxTier >= _tier)); + + var roomTemplateIds = ParseIds(_selectedPalette?.RoomTemplateIdsJson); + if (roomTemplateIds.Count > 0) + { + query = query.Where(r => roomTemplateIds.Contains(r.Id)); + } + + _roomTemplates = await query.ToListAsync(); + + // Palette might reference disabled/out-of-tier templates only; fallback to all tier-enabled. + if (_roomTemplates.Count == 0 && roomTemplateIds.Count > 0) + { + _roomTemplates = await _db.BuilderRoomTemplates + .Where(r => r.IsEnabled) + .Where(r => r.MinTier <= _tier && (r.MaxTier == 0 || r.MaxTier >= _tier)) + .ToListAsync(); + } + + var defs = await _db.TileDefinitions + .Where(t => t.IsEnabled) + .ToListAsync(); + foreach (var def in defs) + { + _tileDefinitionsById[def.Id] = def; + } + + _logger?.LogInformation( + "VNext room templates loaded: {Count} templates (palette={PaletteId})", + _roomTemplates.Count, + _selectedPalette?.Id ?? 0); + } + private void CarveRoom(DungeonLayoutV2 layout, DungeonRoom room) { for (int x = room.X; x < room.X + room.Width; x++) @@ -360,6 +414,171 @@ public class DungeonGeneratorVNext } } + private void ApplyRoomTemplates(DungeonLayoutV2 layout, List rooms) + { + if (_roomTemplates.Count == 0 || rooms.Count == 0) + { + return; + } + + foreach (var room in rooms) + { + var candidates = GetTemplatesForRoomType(room.Type); + if (candidates.Count == 0) continue; + + var template = SelectRoomTemplateWithRepeatPenalty(candidates); + _roomTemplateUseCounts.TryGetValue(template.Id, out int useCount); + _roomTemplateUseCounts[template.Id] = useCount + 1; + + room.TemplateId = template.Id; + room.TemplateName = template.Name; + + if (template.PlayerSpawnX.HasValue && template.PlayerSpawnY.HasValue) + { + room.PlayerSpawnX = room.X + template.PlayerSpawnX.Value; + room.PlayerSpawnY = room.Y + template.PlayerSpawnY.Value; + } + + if (template.ExitPortalX.HasValue && template.ExitPortalY.HasValue) + { + room.ExitX = room.X + template.ExitPortalX.Value; + room.ExitY = room.Y + template.ExitPortalY.Value; + layout.ExitX = room.ExitX.Value; + layout.ExitY = room.ExitY.Value; + } + + StampRoomTemplateTiles(layout, room, template); + LoadTemplateMobSpawns(room, template); + } + } + + private List GetTemplatesForRoomType(DungeonRoomType roomType) + { + List candidates = roomType switch + { + DungeonRoomType.Entrance => _roomTemplates.Where(t => t.Type == RoomType.Entrance).ToList(), + DungeonRoomType.Boss => _roomTemplates.Where(t => t.Type == RoomType.Boss).ToList(), + DungeonRoomType.Treasure => _roomTemplates.Where(t => t.Type == RoomType.Treasure).ToList(), + _ => _roomTemplates.Where(t => + t.Type == RoomType.Normal || + t.Type == RoomType.Hallway || + t.Type == RoomType.Junction || + t.Type == RoomType.Challenge || + t.Type == RoomType.Secret || + t.Type == RoomType.Shop || + t.Type == RoomType.Shrine) + .ToList() + }; + + if (candidates.Count > 0) return candidates; + + // Fallback to any template for robustness. + return _roomTemplates; + } + + private BuilderRoomTemplate SelectRoomTemplateWithRepeatPenalty(List templates) + { + if (templates.Count == 1) return templates[0]; + + var unusedTemplates = templates + .Where(t => !_roomTemplateUseCounts.ContainsKey(t.Id)) + .ToList(); + var candidates = unusedTemplates.Count > 0 ? unusedTemplates : templates; + + double totalWeight = 0; + var adjustedWeights = new List(candidates.Count); + + foreach (var template in candidates) + { + int baseWeight = Math.Max(1, template.Weight); + _roomTemplateUseCounts.TryGetValue(template.Id, out int repeatCount); + double adjustedWeight = baseWeight / Math.Pow(3.0d, repeatCount); + adjustedWeight = Math.Max(0.01d, adjustedWeight); + adjustedWeights.Add(adjustedWeight); + totalWeight += adjustedWeight; + } + + double roll = _rng.NextDouble() * totalWeight; + double cumulative = 0; + for (int i = 0; i < candidates.Count; i++) + { + cumulative += adjustedWeights[i]; + if (roll < cumulative) return candidates[i]; + } + + return candidates[^1]; + } + + private void StampRoomTemplateTiles(DungeonLayoutV2 layout, DungeonRoom room, BuilderRoomTemplate template) + { + if (string.IsNullOrWhiteSpace(template.TileGridJson)) return; + + try + { + var tiles = JsonSerializer.Deserialize>(template.TileGridJson, _jsonOptions); + if (tiles == null || tiles.Count == 0) return; + + foreach (var tile in tiles) + { + int x = room.X + tile.X; + int y = room.Y + tile.Y; + if (x < 0 || y < 0 || x >= layout.Width || y >= layout.Height) continue; + + int layer = tile.Layer ?? 0; + int tileDefinitionId = tile.TileDefinitionId ?? 0; + int sheetId = tile.SheetId; + int frameIndex = tile.FrameIndex; + + if (tileDefinitionId > 0 && _tileDefinitionsById.TryGetValue(tileDefinitionId, out var def)) + { + sheetId = def.TileMapSheetId; + frameIndex = def.FrameIndex; + } + + var placed = new PlacedTile + { + X = x, + Y = y, + TileDefinitionId = tileDefinitionId, + SheetId = sheetId, + FrameIndex = frameIndex, + Layer = layer, + Rotation = 0, + FlipX = false, + FlipY = false + }; + + var key = (x, y); + if (!_templateTilesByCell.TryGetValue(key, out var list)) + { + list = new List(); + _templateTilesByCell[key] = list; + } + list.Add(placed); + } + } + catch (Exception ex) + { + _logger?.LogWarning(ex, "VNext failed parsing TileGridJson for template {TemplateId}:{TemplateName}", template.Id, template.Name); + } + } + + private void LoadTemplateMobSpawns(DungeonRoom room, BuilderRoomTemplate template) + { + if (string.IsNullOrWhiteSpace(template.MobSpawnsJson)) return; + + try + { + var spawns = JsonSerializer.Deserialize>(template.MobSpawnsJson, _jsonOptions); + if (spawns == null || spawns.Count == 0) return; + _templateMobSpawnsByRoom[room] = spawns; + } + catch (Exception ex) + { + _logger?.LogWarning(ex, "VNext failed parsing MobSpawnsJson for template {TemplateId}:{TemplateName}", template.Id, template.Name); + } + } + private void GenerateSpawnsAndChests(DungeonLayoutV2 layout, List rooms) { layout.MobSpawns.Clear(); @@ -373,24 +592,62 @@ public class DungeonGeneratorVNext var room = rooms[i]; if (room.Type == DungeonRoomType.Entrance) continue; - int mobCount = room.Type switch - { - DungeonRoomType.Boss => 1, - DungeonRoomType.Treasure => _rng.Next(1, 3), - _ => _rng.Next(2, 5 + Math.Max(0, _tier / 2)) - }; + bool hasTemplateMobs = _templateMobSpawnsByRoom.TryGetValue(room, out var templateSpawns) && + templateSpawns != null && + templateSpawns.Count > 0; - for (int m = 0; m < mobCount; m++) + if (hasTemplateMobs) { - var pos = RandomPointInRoom(room); - layout.MobSpawns.Add(new DungeonMobSpawn + foreach (var spawn in templateSpawns!) { - Id = mobId++, - X = pos.x, - Y = pos.y, - MobType = room.Type == DungeonRoomType.Boss ? DungeonMobSpawnType.Boss : DungeonMobSpawnType.Normal, - RoomIndex = i - }); + int count = Math.Max(1, spawn.Count); + var mobType = spawn.Type?.ToLowerInvariant() switch + { + "boss" => DungeonMobSpawnType.Boss, + "elite" => DungeonMobSpawnType.Elite, + _ => DungeonMobSpawnType.Normal + }; + + for (int c = 0; c < count; c++) + { + int spawnX = room.X + spawn.X; + int spawnY = room.Y + spawn.Y; + spawnX = Math.Clamp(spawnX, room.X + 1, room.X + room.Width - 2); + spawnY = Math.Clamp(spawnY, room.Y + 1, room.Y + room.Height - 2); + + layout.MobSpawns.Add(new DungeonMobSpawn + { + Id = mobId++, + X = spawnX, + Y = spawnY, + MobType = mobType, + MobDefinitionId = spawn.MobDefinitionId, + RoomIndex = i + }); + } + } + } + else + { + int mobCount = room.Type switch + { + DungeonRoomType.Boss => 1, + DungeonRoomType.Treasure => _rng.Next(1, 3), + _ => _rng.Next(2, 5 + Math.Max(0, _tier / 2)) + }; + + for (int m = 0; m < mobCount; m++) + { + var pos = RandomPointInRoom(room); + layout.MobSpawns.Add(new DungeonMobSpawn + { + Id = mobId++, + X = pos.x, + Y = pos.y, + MobType = room.Type == DungeonRoomType.Boss ? DungeonMobSpawnType.Boss : DungeonMobSpawnType.Normal, + RoomIndex = i + }); + } } int chestCount = room.Type switch @@ -498,6 +755,19 @@ public class DungeonGeneratorVNext { if (!layout.Walkable![x, y]) continue; + if (TryGetTemplateBaseTile(x, y, out var templateBaseTile)) + { + layout.Tiles[x, y] = templateBaseTile.TileDefinitionId > 0 + ? templateBaseTile.TileDefinitionId + : layout.Tiles[x, y]; + layout.TileDetails.Add(templateBaseTile); + if (templateBaseTile.SheetId > 0) + { + usedSheetIds.Add(templateBaseTile.SheetId); + } + continue; + } + var floorDef = SelectFloorDefinition(tileContext); if (floorDef == null) continue; @@ -556,8 +826,40 @@ public class DungeonGeneratorVNext continue; } - UpsertWallTile(layout, cell.X, cell.Y, wallDef); - usedSheetIds.Add(wallDef.TileMapSheetId); + if (TryGetTemplateBaseTile(cell.X, cell.Y, out var templateWallTile)) + { + layout.Tiles[cell.X, cell.Y] = templateWallTile.TileDefinitionId > 0 + ? templateWallTile.TileDefinitionId + : layout.Tiles[cell.X, cell.Y]; + layout.TileDetails.RemoveAll(t => t.X == cell.X && t.Y == cell.Y && t.Layer == 0); + layout.TileDetails.Add(templateWallTile); + if (templateWallTile.SheetId > 0) + { + usedSheetIds.Add(templateWallTile.SheetId); + } + } + else + { + UpsertWallTile(layout, cell.X, cell.Y, wallDef); + usedSheetIds.Add(wallDef.TileMapSheetId); + } + } + + foreach (var kv in _templateTilesByCell) + { + foreach (var tile in kv.Value.Where(t => t.Layer > 0)) + { + if (tile.X < 0 || tile.Y < 0 || tile.X >= layout.Width || tile.Y >= layout.Height) + { + continue; + } + + layout.TileDetails.Add(tile); + if (tile.SheetId > 0) + { + usedSheetIds.Add(tile.SheetId); + } + } } foreach (int sheetId in usedSheetIds) @@ -608,7 +910,8 @@ public class DungeonGeneratorVNext .ToListAsync(); var sheetsById = sheets.ToDictionary(s => s.Id); - var palette = await SelectPaletteAsync(); + var palette = _selectedPalette ?? await SelectPaletteAsync(); + _selectedPalette = palette; var allowedBucketIds = ParseIds(palette?.AllowedBucketIdsJson).ToHashSet(); var allTiles = await _db.TileDefinitions @@ -790,6 +1093,29 @@ public class DungeonGeneratorVNext PlaceWallTile(layout, x, y, def); } + private bool TryGetTemplateBaseTile(int x, int y, out PlacedTile placedTile) + { + placedTile = default!; + if (!_templateTilesByCell.TryGetValue((x, y), out var tiles) || tiles.Count == 0) + { + return false; + } + + var baseTile = tiles + .Where(t => t.Layer == 0) + .OrderByDescending(t => t.TileDefinitionId > 0) + .ThenByDescending(t => t.SheetId > 0) + .FirstOrDefault(); + + if (baseTile == null) + { + return false; + } + + placedTile = baseTile; + return true; + } + private static bool HasAdjacentWalkable(DungeonLayoutV2 layout, int x, int y) { return IsWalkable(layout, x, y - 1) || // N @@ -893,6 +1219,25 @@ public class DungeonGeneratorVNext yield return "Wall_W"; } + private sealed class TemplateTilePlacement + { + public int X { get; set; } + public int Y { get; set; } + public int SheetId { get; set; } + public int FrameIndex { get; set; } + public int? TileDefinitionId { get; set; } + public int? Layer { get; set; } + } + + private sealed class TemplateMobSpawn + { + public int X { get; set; } + public int Y { get; set; } + public int? MobDefinitionId { get; set; } + public string? Type { get; set; } + public int Count { get; set; } = 1; + } + private sealed record TileBuildContext( Dictionary SheetsById, List FloorCandidates, diff --git a/Game/Dungeon/DungeonHandler.Dungeons.cs b/Game/Dungeon/DungeonHandler.Dungeons.cs index 1832447..de8ebba 100644 --- a/Game/Dungeon/DungeonHandler.Dungeons.cs +++ b/Game/Dungeon/DungeonHandler.Dungeons.cs @@ -472,7 +472,10 @@ public sealed partial class DungeonHandler { try { - var layout = DungeonGenerator.Generate(persisted.Seed, persisted.Tier); + using var scope = _scopeFactory.CreateScope(); + var db = scope.ServiceProvider.GetRequiredService(); + var vnext = new DungeonGeneratorVNext(db, persisted.Seed, persisted.Tier); + var layout = await vnext.GenerateAsync(); var simulation = new DungeonSimulation(layout, persisted.Tier, _mobDefinitions, persisted.LevelBracketMin, _abilityDefinitions, _mobSpriteConfigs, _abilityAnimationMappings); var mobStatePayload = DeserializePersistedMobPayload(persisted.MobStateJson); var persistedMobStates = mobStatePayload?.Mobs; @@ -618,9 +621,7 @@ public sealed partial class DungeonHandler _log.LogInformation("Preserving {Count} mobs with carried player loot during respawn", mobsWithLoot.Count); } - // IMPORTANT: Reuse the existing layout to preserve mob spawn positions! - // Using DungeonGenerator.Generate() would create a V1 layout which has different - // room geometry than V2/V3, causing mobs to spawn in wrong positions. + // IMPORTANT: Reuse the existing layout to preserve mob spawn positions. var layout = instance.Simulation.Layout; var freshSimulation = new DungeonSimulation(layout, instance.Tier, _mobDefinitions, instance.LevelBracketMin, _abilityDefinitions, _mobSpriteConfigs, _abilityAnimationMappings); diff --git a/Game/Dungeon/DungeonHandler.Generation.cs b/Game/Dungeon/DungeonHandler.Generation.cs index bb80484..e08b957 100644 --- a/Game/Dungeon/DungeonHandler.Generation.cs +++ b/Game/Dungeon/DungeonHandler.Generation.cs @@ -1,5 +1,4 @@ using DataServer.Data; -using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; @@ -7,82 +6,16 @@ namespace GameServer.Dungeon; public sealed partial class DungeonHandler { - private bool IsVNextGeneratorEnabled() - { - //using var scope = _scopeFactory.CreateScope(); - //var configuration = scope.ServiceProvider.GetService(); - //var fromConfig = configuration?.GetValue("Dungeon:EnableVNextGenerator"); - //if (fromConfig.HasValue) - // return fromConfig.Value; - - //var raw = Environment.GetEnvironmentVariable("DUNGEON_VNEXT_ENABLED") - // ?? Environment.GetEnvironmentVariable("Dungeon__EnableVNextGenerator"); - //if (string.IsNullOrWhiteSpace(raw)) - // return false; - - //return raw == "1" || raw.Equals("true", StringComparison.OrdinalIgnoreCase); - return true; - } - private async Task<(DungeonLayout layout, DungeonLayoutV2? layoutV2)> GenerateDungeonLayoutWithFallbackAsync(int seed, int tier, CancellationToken ct) { using var scope = _scopeFactory.CreateScope(); var db = scope.ServiceProvider.GetRequiredService(); var vnextLogger = scope.ServiceProvider.GetService>(); - if (IsVNextGeneratorEnabled()) - { - try - { - var vnext = new DungeonGeneratorVNext(db, seed, tier, vnextLogger); - var vnextLayout = await vnext.GenerateAsync(); - if (vnextLayout.TileDetails.Count > 0) - { - _log.LogInformation("Generated dungeon with VNext - {RoomCount} rooms, {TileCount} visual tiles", - vnextLayout.Rooms.Count, vnextLayout.TileDetails.Count); - return (vnextLayout, vnextLayout); - } - - _log.LogWarning("VNext generator produced no tiles, falling back to V3/V2/V1"); - } - catch (Exception ex) - { - _log.LogWarning(ex, "VNext generator failed, falling back to V3/V2/V1"); - } - } - - try - { - var generatorV3 = new DungeonGeneratorV3(db, seed, tier); - var layoutV2 = await generatorV3.GenerateAsync(); - - if (layoutV2.TileDetails.Count == 0) - { - _log.LogWarning("V3 generator produced no tiles, falling back to V2"); - var generatorV2 = new DungeonGeneratorV2(db, seed, tier); - layoutV2 = await generatorV2.GenerateAsync(); - } - - _log.LogInformation("Generated dungeon - {RoomCount} rooms, {TileCount} visual tiles", - layoutV2.Rooms.Count, layoutV2.TileDetails?.Count ?? 0); - - return (layoutV2, layoutV2); - } - catch (Exception ex) - { - _log.LogWarning(ex, "Dungeon generator failed, falling back to V2"); - try - { - var generatorV2 = new DungeonGeneratorV2(db, seed, tier); - var layoutV2 = await generatorV2.GenerateAsync(); - return (layoutV2, layoutV2); - } - catch (Exception ex2) - { - _log.LogWarning(ex2, "V2 generator also failed, using V1"); - var layout = DungeonGenerator.Generate(seed, tier); - return (layout, null); - } - } + var vnext = new DungeonGeneratorVNext(db, seed, tier, vnextLogger); + var layoutV2 = await vnext.GenerateAsync(); + _log.LogInformation("Generated dungeon with VNext - {RoomCount} rooms, {TileCount} visual tiles", + layoutV2.Rooms.Count, layoutV2.TileDetails.Count); + return (layoutV2, layoutV2); } } diff --git a/Game/Dungeon/DungeonLayoutV2.cs b/Game/Dungeon/DungeonLayoutV2.cs index 68ec32c..b46adae 100644 --- a/Game/Dungeon/DungeonLayoutV2.cs +++ b/Game/Dungeon/DungeonLayoutV2.cs @@ -117,8 +117,8 @@ public class DungeonLayoutV2 : DungeonLayout { x = r.X, y = r.Y, w = r.Width, h = r.Height, type = r.Type.ToString(), - templateId = (r as DungeonRoomV2)?.TemplateId, - templateName = (r as DungeonRoomV2)?.TemplateName + templateId = r.TemplateId, + templateName = r.TemplateName }), mobs = MobSpawns.Select(m => new { @@ -229,4 +229,4 @@ public class DungeonLayoutV2 : DungeonLayout }) }); } -} \ No newline at end of file +} diff --git a/Game/Dungeon/DungeonRoom.cs b/Game/Dungeon/DungeonRoom.cs index 83cafbb..5e5a8f1 100644 --- a/Game/Dungeon/DungeonRoom.cs +++ b/Game/Dungeon/DungeonRoom.cs @@ -7,6 +7,12 @@ public class DungeonRoom public int Width { get; set; } public int Height { get; set; } public DungeonRoomType Type { get; set; } = DungeonRoomType.Combat; + public int? TemplateId { get; set; } + public string? TemplateName { get; set; } + public int? PlayerSpawnX { get; set; } + public int? PlayerSpawnY { get; set; } + public int? ExitX { get; set; } + public int? ExitY { get; set; } public int CenterX => X + Width / 2; public int CenterY => Y + Height / 2; diff --git a/Game/Dungeon/DungeonRoomV2.cs b/Game/Dungeon/DungeonRoomV2.cs index 7fbf287..51684db 100644 --- a/Game/Dungeon/DungeonRoomV2.cs +++ b/Game/Dungeon/DungeonRoomV2.cs @@ -7,8 +7,8 @@ namespace GameServer.Dungeon; /// public class DungeonRoomV2 : DungeonRoom { - public int? TemplateId { get; set; } - public string? TemplateName { get; set; } + public new int? TemplateId { get; set; } + public new string? TemplateName { get; set; } public HashSet TemplateTags { get; set; } = new(StringComparer.OrdinalIgnoreCase); public new RoomType Type { get; set; } = RoomType.Normal; @@ -19,12 +19,12 @@ public class DungeonRoomV2 : DungeonRoom public List MobSpawns { get; set; } = new(); /// Player spawn position (for entrance rooms) - public int? PlayerSpawnX { get; set; } - public int? PlayerSpawnY { get; set; } + public new int? PlayerSpawnX { get; set; } + public new int? PlayerSpawnY { get; set; } /// Exit position (for exit rooms) - public int? ExitX { get; set; } - public int? ExitY { get; set; } + public new int? ExitX { get; set; } + public new int? ExitY { get; set; } public DungeonRoomV2(int x, int y, int width, int height) : base(x, y, width, height) { } diff --git a/Game/Dungeon/DungeonVisualTileExtensions.cs b/Game/Dungeon/DungeonVisualTileExtensions.cs index b4ec699..6acf907 100644 --- a/Game/Dungeon/DungeonVisualTileExtensions.cs +++ b/Game/Dungeon/DungeonVisualTileExtensions.cs @@ -45,12 +45,10 @@ public static class DungeonVisualTileExtensions }; } - // For V1 layouts, try to build visual data from room templates if any were used - // This is a fallback - in practice V2 generator should be used for visual tiles + // Fallback path for layouts that do not have explicit TileDetails. - // Get rooms that have template IDs (from V2 rooms stored in V1 layout) + // Get rooms that have template IDs. var roomsWithTemplates = layout.Rooms - .OfType() .Where(r => r.TemplateId.HasValue) .ToList(); @@ -153,11 +151,11 @@ public static class DungeonVisualTileExtensions } /// - /// Generate a dungeon using V2 generator with room templates + /// Generate a dungeon using VNext generator with room templates /// public static async Task GenerateWithTemplatesAsync(GameDbContext db, int seed, int tier) { - var generator = new DungeonGeneratorV2(db, seed, tier); + var generator = new DungeonGeneratorVNext(db, seed, tier); return await generator.GenerateAsync(); } } diff --git a/Services/Admin/Pages/DungeonBuilder/RoomEdit.cshtml b/Services/Admin/Pages/DungeonBuilder/RoomEdit.cshtml index e9c8f03..752b51c 100644 --- a/Services/Admin/Pages/DungeonBuilder/RoomEdit.cshtml +++ b/Services/Admin/Pages/DungeonBuilder/RoomEdit.cshtml @@ -106,6 +106,42 @@ } .tag-chip:hover { background: #4b5563; } .tag-chip.active { background: #4f46e5; } + .bucket-result { + padding: 6px 8px; + background: #1f2937; + border: 1px solid #374151; + border-radius: 6px; + font-size: 12px; + color: #d1d5db; + cursor: pointer; + } + .bucket-result:hover { background: #374151; } + .sheet-frame-item { + width: 40px; + height: 40px; + border: 1px solid #374151; + border-radius: 4px; + cursor: pointer; + position: relative; + image-rendering: pixelated; + } + .sheet-frame-item:hover { border-color: #60a5fa; } + .sheet-frame-item.active { border-color: #fbbf24; } + .sheet-frame-item.undefined::after { + content: '!'; + position: absolute; + top: -4px; + right: -4px; + width: 12px; + height: 12px; + border-radius: 9999px; + background: #dc2626; + color: white; + font-size: 9px; + line-height: 12px; + text-align: center; + font-weight: bold; + }
@@ -272,6 +308,25 @@
Select a TileMap to see templates
+ +
+
+

Sheet Frames

+ +
+
Click any frame. Undefined frames open the tile definition editor popup.
+
+
+ +
+

Tile Buckets

+ +
+
No bucket selected
+
+
Choose a bucket to view tiles
+
+
@@ -327,6 +382,7 @@

Selected

Nothing
+
@@ -350,11 +406,14 @@ let connectionData = {}; // Connection points (doorways) - { direction } // All tile definitions loaded from server (pre-loaded, no API call needed) const allTileDefs = @Html.Raw(Model.TileDefinitionsJson); +const allBuckets = @Html.Raw(Model.TileBucketsJson); let tileDefs = []; // Filtered for current sheet let allTags = new Set(); const allStamps = @Html.Raw(Model.TileStampsJson); const stampMap = {}; const templateBySprite = {}; +const sheetFrameMap = {}; +let activeBucketId = null; let mouseDown = false; @@ -375,6 +434,29 @@ function preloadSheets() { }); } +function normalizeText(value) { + return (value || '').toString().trim().toLowerCase(); +} + +function updateSelectionUI(info, details, actionsHtml = '') { + document.getElementById('selectionInfo').textContent = info || 'Nothing'; + document.getElementById('selectionDetails').textContent = details || ''; + document.getElementById('selectionActions').innerHTML = actionsHtml; +} + +function clearSelectionVisuals() { + document.querySelectorAll('.palette-item').forEach(i => i.classList.remove('active')); + document.querySelectorAll('.mob-select-item').forEach(i => i.classList.remove('selected')); + document.querySelectorAll('.stamp-select-item').forEach(i => i.classList.remove('selected')); + document.querySelectorAll('.sheet-frame-item').forEach(i => i.classList.remove('active')); +} + +function getLayerFilteredTemplates(templates) { + if (layer === 'floor') return templates.filter(t => t.isWalkable); + if (layer === 'wall') return templates.filter(t => !t.isWalkable); + return templates; +} + document.addEventListener('DOMContentLoaded', () => { preloadSheets(); allTileDefs.forEach(t => { @@ -387,6 +469,7 @@ document.addEventListener('DOMContentLoaded', () => { }); loadData(); buildGrid(); + searchBuckets(); }); function loadData() { @@ -748,17 +831,13 @@ function setLayer(l) { document.getElementById('spawnPaletteCard').classList.toggle('hidden', l !== 'spawn'); document.getElementById('stampPaletteCard').classList.toggle('hidden', l === 'spawn'); sel = null; - document.querySelectorAll('.palette-item').forEach(i => i.classList.remove('active')); - document.querySelectorAll('.mob-select-item').forEach(i => i.classList.remove('selected')); - document.querySelectorAll('.stamp-select-item').forEach(i => i.classList.remove('selected')); - document.getElementById('selectionInfo').textContent = 'Nothing'; - document.getElementById('selectionDetails').textContent = ''; + clearSelectionVisuals(); + updateSelectionUI('Nothing', ''); - // Refresh templates when switching between floor/wall layers - if (l === 'floor' || l === 'wall') { - renderTemplates(); - } else if (l.startsWith('decor')) { + if (l === 'floor' || l === 'wall' || l.startsWith('decor')) { renderTemplates(); + renderBucketTiles(); + renderSheetFrames(); } } @@ -769,6 +848,9 @@ function loadTileTemplates() { tileDefs = []; document.getElementById('tilePalette').innerHTML = '
Select a TileMap
'; document.getElementById('commonTags').innerHTML = ''; + document.getElementById('sheetFramePalette').innerHTML = '
Select a TileMap
'; + renderBucketTiles(); + searchBuckets(); return; } @@ -789,6 +871,9 @@ function loadTileTemplates() { renderCommonTags(); renderTemplates(); + renderSheetFrames(); + renderBucketTiles(); + searchBuckets(); // Don't rebuild grid - just re-render to show existing tiles // Grid dimensions stay the same, tiles from other sheets still display @@ -799,6 +884,82 @@ function loadTileTemplates() { } } +function renderSheetFrames() { + const container = document.getElementById('sheetFramePalette'); + const sheet = currentSheetId ? loadedSheets[currentSheetId] : null; + if (!sheet) { + container.innerHTML = '
Select a TileMap
'; + return; + } + + const rows = Math.max(1, Math.floor(sheet.sh / sheet.th)); + const frameCount = Math.max(1, rows * sheet.cols); + let html = ''; + const scale = 2; + + for (let frameIndex = 0; frameIndex < frameCount; frameIndex++) { + const col = frameIndex % sheet.cols; + const row = Math.floor(frameIndex / sheet.cols); + const key = `${sheet.id}:${frameIndex}`; + const defined = !!templateBySprite[key]; + const active = sheetFrameMap[sheet.id] === frameIndex ? 'active' : ''; + const undefinedClass = defined ? '' : 'undefined'; + html += `
`; + } + + container.innerHTML = html; +} + +function openTileDefinitionPopup(sheetId, frameIndex) { + const url = `/admin/tilemaps/tiles/edit?sheetId=${sheetId}&frameIndex=${frameIndex}`; + window.open(url, '_blank', 'width=1200,height=900'); +} + +function selectSheetFrame(frameIndex) { + if (!currentSheetId) return; + const key = `${currentSheetId}:${frameIndex}`; + const template = templateBySprite[key]; + + clearSelectionVisuals(); + sheetFrameMap[currentSheetId] = frameIndex; + renderSheetFrames(); + + if (template) { + sel = { + type: 'template', + tileDefId: template.id, + sheetId: template.sheetId, + frameIndex: template.frameIndex, + isWalkable: template.isWalkable, + name: template.name || `Frame ${template.frameIndex}` + }; + updateSelectionUI( + sel.name, + sel.isWalkable ? 'Walkable (Floor)' : 'Blocking (Wall)' + ); + return; + } + + // Undefined frame: open tile-definition page and still arm this frame for painting. + const inferredWalkable = layer === 'wall' ? false : true; + sel = { + type: 'template', + tileDefId: 0, + sheetId: currentSheetId, + frameIndex, + isWalkable: inferredWalkable, + name: `Frame ${frameIndex} (undefined)` + }; + openTileDefinitionPopup(currentSheetId, frameIndex); + updateSelectionUI( + sel.name, + 'No tile definition yet. Define it in the popup, then click this frame again to bind the definition.', + `` + ); +} + function renderCommonTags() { const container = document.getElementById('commonTags'); const sorted = Array.from(allTags).sort(); @@ -838,16 +999,7 @@ function renderTemplates(filterTags = []) { return; } - let filtered = tileDefs; - - // Filter by current layer (floor vs wall) - if (layer === 'floor') { - filtered = filtered.filter(t => t.isWalkable); - } else if (layer === 'wall') { - filtered = filtered.filter(t => !t.isWalkable); - } else if (layer.startsWith('decor')) { - filtered = filtered; - } + let filtered = getLayerFilteredTemplates(tileDefs); // Filter by tags if (filterTags.length > 0) { @@ -863,94 +1015,142 @@ function renderTemplates(filterTags = []) { document.getElementById('tilePalette').innerHTML = `
No ${layer} templates found
`; return; } - - // Scale factor for palette display (2x for better visibility) - const scale = 2; - const displayW = sheet.tw * scale; - const displayH = sheet.th * scale; - + + document.getElementById('tilePalette').innerHTML = renderTemplateCards(filtered, true); +} + +function renderTemplateCards(templates, showName = false) { let html = ''; - filtered.forEach(t => { - // frameIndex is pre-extracted by the server - const frameIndex = t.frameIndex || 0; - + const scale = 2; + templates.forEach(t => { + const sheet = loadedSheets[t.sheetId]; + if (!sheet) return; + const frameIndex = t.frameIndex || 0; const col = frameIndex % sheet.cols; const row = Math.floor(frameIndex / sheet.cols); - - html += `
-
+
-
${t.name}
+ ${showName ? `
${t.name || ('Frame ' + frameIndex)}
` : ''}
`; }); - - document.getElementById('tilePalette').innerHTML = html; + return html; +} + +function getBucketTiles(bucketId) { + const matches = allTileDefs.filter(t => Array.isArray(t.bucketIds) && t.bucketIds.includes(bucketId)); + if (!currentSheetId) return matches; + return matches.filter(t => t.sheetId === currentSheetId); +} + +function searchBuckets() { + const query = normalizeText(document.getElementById('bucketSearch').value); + const container = document.getElementById('bucketResults'); + const matches = allBuckets + .filter(b => normalizeText(b.name).includes(query)) + .filter(b => getLayerFilteredTemplates(getBucketTiles(b.id)).length > 0) + .slice(0, 20); + + if (matches.length === 0) { + container.innerHTML = '
No matching buckets
'; + return; + } + + container.innerHTML = matches + .map(b => ``) + .join(''); +} + +function selectBucket(bucketId) { + activeBucketId = bucketId; + const bucket = allBuckets.find(b => b.id === bucketId); + document.getElementById('bucketSelectedInfo').textContent = bucket ? `Selected bucket: ${bucket.name}` : 'No bucket selected'; + if (bucket) { + document.getElementById('bucketSearch').value = bucket.name; + } + renderBucketTiles(); +} + +function renderBucketTiles() { + const container = document.getElementById('bucketTilePalette'); + if (!activeBucketId) { + container.innerHTML = '
Choose a bucket to view tiles
'; + return; + } + + const tiles = getLayerFilteredTemplates(getBucketTiles(activeBucketId)); + if (tiles.length === 0) { + container.innerHTML = '
No tiles in this bucket for the current layer/sheet
'; + return; + } + + container.innerHTML = renderTemplateCards(tiles, false); } function selectPaletteItem(el) { - document.querySelectorAll('.palette-item').forEach(i => i.classList.remove('active')); - document.querySelectorAll('.mob-select-item').forEach(i => i.classList.remove('selected')); - document.querySelectorAll('.stamp-select-item').forEach(i => i.classList.remove('selected')); + clearSelectionVisuals(); el.classList.add('active'); - + const type = el.dataset.type; if (type === 'template') { - sel = { - type: 'template', + sel = { + type: 'template', tileDefId: +el.dataset.templateId, - sheetId: +el.dataset.sheetId, + sheetId: +el.dataset.sheetId, frameIndex: +el.dataset.frame, isWalkable: el.dataset.walkable === 'true', name: el.dataset.name }; - document.getElementById('selectionInfo').textContent = sel.name; - document.getElementById('selectionDetails').textContent = sel.isWalkable ? '🟢 Walkable (Floor)' : '🔴 Blocking (Wall)'; + const isUndefined = !sel.tileDefId; + updateSelectionUI( + sel.name, + isUndefined + ? 'No tile definition id bound yet. Define this frame in TileMaps.' + : (sel.isWalkable ? 'Walkable (Floor)' : 'Blocking (Wall)'), + isUndefined + ? `` + : '' + ); } else if (type === 'spawn') { sel = { type: 'spawn', spawn: el.dataset.spawn }; - document.getElementById('selectionInfo').textContent = el.title; - document.getElementById('selectionDetails').textContent = ''; + updateSelectionUI(el.title, ''); } } function selectMob(el) { - document.querySelectorAll('.palette-item').forEach(i => i.classList.remove('active')); - document.querySelectorAll('.mob-select-item').forEach(i => i.classList.remove('selected')); - document.querySelectorAll('.stamp-select-item').forEach(i => i.classList.remove('selected')); + clearSelectionVisuals(); el.classList.add('selected'); - - sel = { - type: 'mob', - mobId: +el.dataset.mobId, + + sel = { + type: 'mob', + mobId: +el.dataset.mobId, mobName: el.dataset.mobName, mobType: el.dataset.mobType }; - document.getElementById('selectionInfo').textContent = `Mob: ${sel.mobName}`; - document.getElementById('selectionDetails').textContent = `Type: ${sel.mobType}`; + updateSelectionUI(`Mob: ${sel.mobName}`, `Type: ${sel.mobType}`); } function selectStamp(el) { - document.querySelectorAll('.palette-item').forEach(i => i.classList.remove('active')); - document.querySelectorAll('.mob-select-item').forEach(i => i.classList.remove('selected')); - document.querySelectorAll('.stamp-select-item').forEach(i => i.classList.remove('selected')); + clearSelectionVisuals(); el.classList.add('selected'); - + const stampId = +el.dataset.stampId; sel = { type: 'stamp', stampId }; - document.getElementById('selectionInfo').textContent = `Stamp: ${el.dataset.stampName}`; - document.getElementById('selectionDetails').textContent = ''; + updateSelectionUI(`Stamp: ${el.dataset.stampName}`, ''); } - function filterStamps() { const search = document.getElementById('stampSearch').value.toLowerCase(); document.querySelectorAll('.stamp-select-item').forEach(el => { @@ -1057,3 +1257,4 @@ function clearAll() { document.getElementById('roomForm').onsubmit = () => saveData(); + diff --git a/Services/Admin/Pages/DungeonBuilder/RoomEdit.cshtml.cs b/Services/Admin/Pages/DungeonBuilder/RoomEdit.cshtml.cs index 4060b7d..46aabc7 100644 --- a/Services/Admin/Pages/DungeonBuilder/RoomEdit.cshtml.cs +++ b/Services/Admin/Pages/DungeonBuilder/RoomEdit.cshtml.cs @@ -24,7 +24,9 @@ public class RoomEditModel : AdminPageModel public List Objects { get; set; } = new(); public List Mobs { get; set; } = new(); public List TileDefinitions { get; set; } = new(); + public List TileBuckets { get; set; } = new(); public List TileStamps { get; set; } = new(); + private Dictionary> TileBucketIdsByTileDefinitionId { get; set; } = new(); /// /// TileDefinitions serialized as JSON for JavaScript consumption. @@ -38,7 +40,18 @@ public class RoomEditModel : AdminPageModel tags = t.Tags, isWalkable = t.IsWalkable, sheetId = t.TileMapSheetId, - frameIndex = t.FrameIndex + frameIndex = t.FrameIndex, + bucketIds = TileBucketIdsByTileDefinitionId.TryGetValue(t.Id, out var bucketIds) + ? bucketIds + : new List() + }) + ); + + public string TileBucketsJson => JsonSerializer.Serialize( + TileBuckets.Select(b => new + { + id = b.Id, + name = b.Name }) ); @@ -214,6 +227,17 @@ public class RoomEditModel : AdminPageModel .ThenBy(t => t.FrameIndex) .ToListAsync(); + TileBuckets = await _db.TileBuckets + .Where(b => b.IsEnabled) + .OrderBy(b => b.Name) + .ToListAsync(); + + TileBucketIdsByTileDefinitionId = await _db.TileDefinitionBuckets + .GroupBy(tb => tb.TileDefinitionId) + .ToDictionaryAsync( + g => g.Key, + g => g.Select(tb => tb.TileBucketId).Distinct().ToList()); + TileStamps = await _db.TileStamps .Where(s => s.IsEnabled) .OrderBy(s => s.Name) diff --git a/pending-clientChanges.md b/pending-clientChanges.md index f5bd1c2..a331cfd 100644 --- a/pending-clientChanges.md +++ b/pending-clientChanges.md @@ -1,28 +1,2 @@ # Pending Client Changes -## Status -Three client-side updates are still required for animation/loot/projectile consistency. - -## Required Client Update -1. Gate loot prompt (`E`) by `hasLoot`. -- Server now sends `hasLoot` for each mob in join/state payloads. -- Show corpse loot interaction only when: - - `isAlive == false` - - `hasLoot == true` -- Hide loot interaction if `hasLoot == false` (corpse remains, but not lootable). - -2. Treat `currentAnimation` as authoritative on mob update. -- Server now sends `currentAnimation` on join/state payloads. -- On each update for an existing mob entity, client should apply server animation directly. -- Do not keep a previous local animation state when server sends a different value. - -3. Render active projectiles from `projectiles` in `DUNGEON_STATE`. -- Server now sends active projectile entities each tick (spatial-filtered). -- Use `x/y`, `velocityX/velocityY`, `spriteKey`, and linear metadata (`isLinear`, `frontX/frontY`, `backX/backY`) for rendering. -- Keep existing `events.projectileHits` / `events.projectileExpired` handling for impact/cleanup effects. - -## Notes -1. Server now includes `isAlive`/`hasLoot`/`currentAnimation` consistently in mob payloads and sends `mobCatalog` on dungeon-enter responses and one-time in dungeon state. -2. If invisible mobs still occur, keep a fallback render path when `spriteConfig` is null: -- Use `definitionId` -> local/default sprite mapping. -- Apply default tint `#ffffff` and scale `1.0`.