diff --git a/Game/Dungeon/DungeonHandler.cs b/Game/Dungeon/DungeonHandler.cs index ea78a01..2d91484 100644 --- a/Game/Dungeon/DungeonHandler.cs +++ b/Game/Dungeon/DungeonHandler.cs @@ -2143,7 +2143,28 @@ public sealed partial class DungeonHandler : IClientMessageHandler var dungeonId = Guid.NewGuid(); int seed = Random.Shared.Next(); - var layout = DungeonGenerator.Generate(seed, tier); + // Try V2 generator with room templates first + DungeonLayout layout; + DungeonLayoutV2? layoutV2 = null; + + try + { + using var scope = _scopeFactory.CreateScope(); + var db = scope.ServiceProvider.GetRequiredService(); + + var generator = new DungeonGeneratorV2(db, seed, tier); + layoutV2 = await generator.GenerateAsync(); + layout = layoutV2; // V2 extends V1, use directly + + _log.LogInformation("Generated dungeon with V2 generator - {RoomCount} rooms, {TileCount} visual tiles", + layoutV2.Rooms.Count, layoutV2.TileDetails?.Count ?? 0); + } + catch (Exception ex) + { + _log.LogWarning(ex, "V2 dungeon generator failed, falling back to V1"); + layout = DungeonGenerator.Generate(seed, tier); + } + var simulation = new DungeonSimulation(layout, tier, _mobDefinitions, bracketMin, null, _mobSpriteConfigs); var instance = new DungeonInstance @@ -2157,7 +2178,8 @@ public sealed partial class DungeonHandler : IClientMessageHandler LevelBracketMax = bracketMax, CreatorLevel = playerLevel, CreatorCharacterId = session.CharacterId, - CreatorName = session.Character.Name + CreatorName = session.Character.Name, + LayoutV2 = layoutV2 // Store V2 layout for visual tile data }; _dungeons[dungeonId] = instance;