From c46ae9f55eb5580e8c486d928a1a3cfaaa96f563 Mon Sep 17 00:00:00 2001 From: dingo Date: Sat, 3 Jan 2026 15:41:01 -0500 Subject: [PATCH] DungeonBuilder UI Attempt.3 --- .../Pages/DungeonBuilder/ObjectEdit.cshtml | 2 +- .../Pages/DungeonBuilder/ObjectEdit.cshtml.cs | 2 +- .../Pages/DungeonBuilder/RoomEdit.cshtml | 465 ++++++++++++++++++ .../Pages/DungeonBuilder/RoomEdit.cshtml.cs | 139 ++++++ .../Admin/Pages/DungeonBuilder/Rooms.cshtml | 142 ++++++ .../Pages/DungeonBuilder/Rooms.cshtml.cs | 86 ++++ .../Admin/Pages/DungeonBuilder/Tiles.cshtml | 148 ++++++ .../Pages/DungeonBuilder/Tiles.cshtml.cs | 95 ++++ 8 files changed, 1077 insertions(+), 2 deletions(-) create mode 100644 Services/Admin/Pages/DungeonBuilder/RoomEdit.cshtml create mode 100644 Services/Admin/Pages/DungeonBuilder/RoomEdit.cshtml.cs create mode 100644 Services/Admin/Pages/DungeonBuilder/Rooms.cshtml create mode 100644 Services/Admin/Pages/DungeonBuilder/Rooms.cshtml.cs create mode 100644 Services/Admin/Pages/DungeonBuilder/Tiles.cshtml create mode 100644 Services/Admin/Pages/DungeonBuilder/Tiles.cshtml.cs diff --git a/Services/Admin/Pages/DungeonBuilder/ObjectEdit.cshtml b/Services/Admin/Pages/DungeonBuilder/ObjectEdit.cshtml index 73a3710..8722b1e 100644 --- a/Services/Admin/Pages/DungeonBuilder/ObjectEdit.cshtml +++ b/Services/Admin/Pages/DungeonBuilder/ObjectEdit.cshtml @@ -269,7 +269,7 @@ @foreach (var dt in Model.DamageTypes) { - + } diff --git a/Services/Admin/Pages/DungeonBuilder/ObjectEdit.cshtml.cs b/Services/Admin/Pages/DungeonBuilder/ObjectEdit.cshtml.cs index c09e1b1..62c3290 100644 --- a/Services/Admin/Pages/DungeonBuilder/ObjectEdit.cshtml.cs +++ b/Services/Admin/Pages/DungeonBuilder/ObjectEdit.cshtml.cs @@ -156,7 +156,7 @@ public class ObjectEditModel : AdminPageModel .ToListAsync(); DamageTypes = await _db.DamageResistanceTypes - .OrderBy(d => d.DisplayName) + .OrderBy(d => d.Name) .ToListAsync(); } diff --git a/Services/Admin/Pages/DungeonBuilder/RoomEdit.cshtml b/Services/Admin/Pages/DungeonBuilder/RoomEdit.cshtml new file mode 100644 index 0000000..fa039d0 --- /dev/null +++ b/Services/Admin/Pages/DungeonBuilder/RoomEdit.cshtml @@ -0,0 +1,465 @@ +@page "/admin/dungeonbuilder/rooms/edit" +@model DungeonBuilder.RoomEditModel +@using DataServer.Data.Entities +@{ + ViewData["Title"] = Model.Room.Id == 0 ? "New Room Template" : $"Edit: {Model.Room.Name}"; + var roomTypes = Enum.GetValues(); +} + + + + + +@if (!string.IsNullOrEmpty(Model.Message)) +{ +
+ @Model.Message +
+} + +
+ +
+
+ @Html.AntiForgeryToken() + + + + + + + + + + +
+

Room Settings

+
+
+ + +
+
+ + +
+
+
+ + +
+
+ + +
+
+
+ + +
+ +
+
+ +
+

Tools

+
+ + + +
+
+ +
+ + + +
+
+
+ +
+

Generation

+
+
+ + +
+
+
+ + +
+
+ + +
+
+
+ + +
+
+
+ + +
+
+ + +
+
+
+

Grid Editor

+
+ + +
+
+
+
+
+
+ (-, -) + Tiles: 0 | Objects: 0 | Spawns: 0 +
+
+
+ + +
+ +
+

Tiles

+ +
+
Select a sheet
+
+
+ + + + + + + + +
+

Selected

+
Nothing
+
+
+
+ + + +@functions { + string GetObjIcon(ObjectTemplateType t) => t switch { + ObjectTemplateType.Container => "πŸ“¦", ObjectTemplateType.Trap => "⚠️", ObjectTemplateType.Door => "πŸšͺ", + ObjectTemplateType.Light => "πŸ”₯", ObjectTemplateType.Shrine => "⛩️", ObjectTemplateType.Vendor => "πŸ›’", _ => "πŸͺ¨" + }; +} diff --git a/Services/Admin/Pages/DungeonBuilder/RoomEdit.cshtml.cs b/Services/Admin/Pages/DungeonBuilder/RoomEdit.cshtml.cs new file mode 100644 index 0000000..e6c7070 --- /dev/null +++ b/Services/Admin/Pages/DungeonBuilder/RoomEdit.cshtml.cs @@ -0,0 +1,139 @@ +using DataServer.Data; +using DataServer.Data.Entities; +using Microsoft.AspNetCore.Mvc; +using Microsoft.EntityFrameworkCore; + +namespace Server.Services.Admin.Pages.DungeonBuilder; + +public class RoomEditModel : AdminPageModel +{ + private readonly GameDbContext _db; + private readonly IConfiguration _config; + + public RoomEditModel(GameDbContext db, IConfiguration config) + { + _db = db; + _config = config; + } + + [BindProperty] + public BuilderRoomTemplate Room { get; set; } = new(); + + public List TileSheets { get; set; } = new(); + public List Objects { get; set; } = new(); + + public string CdnBaseUrl => _config["Cdn:BaseUrl"]?.TrimEnd('/') ?? ""; + + public string? Message { get; set; } + public bool IsError { get; set; } + + public async Task OnGetAsync(int? id) + { + await LoadReferenceData(); + + if (id.HasValue) + { + var room = await _db.BuilderRoomTemplates.FindAsync(id.Value); + if (room != null) + { + Room = room; + } + } + else + { + // Defaults + Room.IsEnabled = true; + Room.Width = 10; + Room.Height = 10; + Room.Weight = 100; + Room.MinConnections = 1; + Room.MaxConnections = 4; + Room.AllowRotation = true; + Room.AllowMirror = true; + } + } + + public async Task OnPostAsync() + { + await LoadReferenceData(); + + // Validate + if (string.IsNullOrWhiteSpace(Room.Name)) + { + IsError = true; + Message = "Name is required."; + return Page(); + } + + Room.UpdatedAt = DateTime.UtcNow; + + // Handle nullable spawn coordinates + if (Request.Form["Room.PlayerSpawnX"].ToString() == "") Room.PlayerSpawnX = null; + if (Request.Form["Room.PlayerSpawnY"].ToString() == "") Room.PlayerSpawnY = null; + if (Request.Form["Room.ExitPortalX"].ToString() == "") Room.ExitPortalX = null; + if (Request.Form["Room.ExitPortalY"].ToString() == "") Room.ExitPortalY = null; + + if (Room.Id == 0) + { + Room.CreatedAt = DateTime.UtcNow; + _db.BuilderRoomTemplates.Add(Room); + Message = "Room template created!"; + } + else + { + var existing = await _db.BuilderRoomTemplates.FindAsync(Room.Id); + if (existing == null) + { + IsError = true; + Message = "Room not found."; + return Page(); + } + + existing.Name = Room.Name; + existing.Description = Room.Description; + existing.Type = Room.Type; + existing.Tags = Room.Tags; + existing.Biome = Room.Biome; + existing.Width = Room.Width; + existing.Height = Room.Height; + existing.TileGridJson = Room.TileGridJson; + existing.TilePlacementsJson = Room.TilePlacementsJson; + existing.ObjectPlacementsJson = Room.ObjectPlacementsJson; + existing.ConnectionPointsJson = Room.ConnectionPointsJson; + existing.MobSpawnsJson = Room.MobSpawnsJson; + existing.ItemSpawnsJson = Room.ItemSpawnsJson; + existing.PlayerSpawnX = Room.PlayerSpawnX; + existing.PlayerSpawnY = Room.PlayerSpawnY; + existing.ExitPortalX = Room.ExitPortalX; + existing.ExitPortalY = Room.ExitPortalY; + existing.Weight = Room.Weight; + existing.MinTier = Room.MinTier; + existing.MaxTier = Room.MaxTier; + existing.MinConnections = Room.MinConnections; + existing.MaxConnections = Room.MaxConnections; + existing.AllowRotation = Room.AllowRotation; + existing.AllowMirror = Room.AllowMirror; + existing.IsEnabled = Room.IsEnabled; + existing.UpdatedAt = DateTime.UtcNow; + + Message = "Changes saved!"; + } + + await _db.SaveChangesAsync(); + + return RedirectToPage(new { id = Room.Id }); + } + + private async Task LoadReferenceData() + { + TileSheets = await _db.TileMapSheets + .Where(s => s.IsEnabled) + .OrderBy(s => s.Name) + .ToListAsync(); + + Objects = await _db.ObjectTemplates + .Where(o => o.IsEnabled) + .OrderBy(o => o.Name) + .ToListAsync(); + } +} diff --git a/Services/Admin/Pages/DungeonBuilder/Rooms.cshtml b/Services/Admin/Pages/DungeonBuilder/Rooms.cshtml new file mode 100644 index 0000000..a436154 --- /dev/null +++ b/Services/Admin/Pages/DungeonBuilder/Rooms.cshtml @@ -0,0 +1,142 @@ +@page "/admin/dungeonbuilder/rooms" +@model DungeonBuilder.RoomsModel +@using DataServer.Data.Entities +@{ + ViewData["Title"] = "Room Templates"; + var roomTypes = Enum.GetValues(); +} + + + +
+
+

Room Templates

+

Pre-built rooms with tiles, objects, and spawns

+
+ + New Room +
+ +@if (!string.IsNullOrEmpty(Model.Message)) +{ +
+ @Model.Message +
+} + + +
+
+
+ +
+ + + + Clear +
+
+ + +
+ @foreach (var room in Model.Rooms) + { +
+
+
+

@room.Name

+
+ @room.Type + @(room.Width)Γ—@(room.Height) + @if (!string.IsNullOrEmpty(room.Biome)) + { + @room.Biome + } +
+ + +
+ + @(room.MinConnections)-@(room.MaxConnections) doors + + @if (room.PlayerSpawnX.HasValue) + { + Spawn + } + @if (room.ExitPortalX.HasValue) + { + Exit + } +
+
+ + +
+ @GetRoomIcon(room.Type) +
+
+ +
+ ID: @room.Id +
+ Edit +
+ + +
+
+
+
+ } + + @if (!Model.Rooms.Any()) + { +
+ No room templates found. Create one! +
+ } +
+ +@functions { + string GetTypeColor(RoomType type) + { + return type switch + { + RoomType.Entrance => "text-yellow-400", + RoomType.Exit => "text-blue-400", + RoomType.Boss => "text-red-400", + RoomType.Treasure => "text-amber-400", + RoomType.Secret => "text-purple-400", + RoomType.Shop => "text-emerald-400", + _ => "text-gray-400" + }; + } + + string GetRoomIcon(RoomType type) + { + return type switch + { + RoomType.Entrance => "πŸšͺ", + RoomType.Exit => "πŸŒ€", + RoomType.Boss => "πŸ’€", + RoomType.Treasure => "πŸ’Ž", + RoomType.Secret => "❓", + RoomType.Shop => "πŸ›’", + _ => "🏠" + }; + } +} diff --git a/Services/Admin/Pages/DungeonBuilder/Rooms.cshtml.cs b/Services/Admin/Pages/DungeonBuilder/Rooms.cshtml.cs new file mode 100644 index 0000000..bf69f77 --- /dev/null +++ b/Services/Admin/Pages/DungeonBuilder/Rooms.cshtml.cs @@ -0,0 +1,86 @@ +using DataServer.Data; +using DataServer.Data.Entities; +using Microsoft.AspNetCore.Mvc; +using Microsoft.EntityFrameworkCore; + +namespace Server.Services.Admin.Pages.DungeonBuilder; + +public class RoomsModel : AdminPageModel +{ + private readonly GameDbContext _db; + + public RoomsModel(GameDbContext db) + { + _db = db; + } + + public List Rooms { get; set; } = new(); + public List Biomes { get; set; } = new(); + + public string? Search { get; set; } + public int? TypeFilter { get; set; } + public string? BiomeFilter { get; set; } + + public int CurrentPage { get; set; } = 1; + public int TotalPages { get; set; } + public int PageSize { get; set; } = 18; + + public string? Message { get; set; } + public bool IsError { get; set; } + + public async Task OnGetAsync(string? search, int? type, string? biome, int page = 1) + { + Search = search; + TypeFilter = type; + BiomeFilter = biome; + CurrentPage = Math.Max(1, page); + + // Get unique biomes + Biomes = await _db.BuilderRoomTemplates + .Where(r => r.Biome != null) + .Select(r => r.Biome!) + .Distinct() + .OrderBy(b => b) + .ToListAsync(); + + // Build query + var query = _db.BuilderRoomTemplates.AsQueryable(); + + if (!string.IsNullOrEmpty(search)) + { + query = query.Where(r => r.Name.Contains(search) || (r.Tags != null && r.Tags.Contains(search))); + } + + if (type.HasValue) + { + query = query.Where(r => r.Type == (RoomType)type.Value); + } + + if (!string.IsNullOrEmpty(biome)) + { + query = query.Where(r => r.Biome == biome); + } + + var total = await query.CountAsync(); + TotalPages = (int)Math.Ceiling(total / (double)PageSize); + + Rooms = await query + .OrderBy(r => r.Name) + .Skip((CurrentPage - 1) * PageSize) + .Take(PageSize) + .ToListAsync(); + } + + public async Task OnPostDeleteAsync(int id) + { + var room = await _db.BuilderRoomTemplates.FindAsync(id); + if (room != null) + { + _db.BuilderRoomTemplates.Remove(room); + await _db.SaveChangesAsync(); + Message = $"Deleted room template: {room.Name}"; + } + + return RedirectToPage(); + } +} diff --git a/Services/Admin/Pages/DungeonBuilder/Tiles.cshtml b/Services/Admin/Pages/DungeonBuilder/Tiles.cshtml new file mode 100644 index 0000000..dda0da6 --- /dev/null +++ b/Services/Admin/Pages/DungeonBuilder/Tiles.cshtml @@ -0,0 +1,148 @@ +@page "/admin/dungeonbuilder/tiles" +@model DungeonBuilder.TilesModel +@using DataServer.Data.Entities +@{ + ViewData["Title"] = "Tile Templates"; + var categories = Enum.GetValues(); +} + + + +
+
+

Tile Templates

+

Reusable floor, wall, and door patterns

+
+ + New Template +
+ +@if (!string.IsNullOrEmpty(Model.Message)) +{ +
+ @Model.Message +
+} + + +
+
+
+ +
+ + + + Clear +
+
+ + +
+ @foreach (var tile in Model.Tiles) + { +
+
+ +
+ @if (tile.PrimaryTileDefinition?.TileMapSheet != null) + { + var sheet = tile.PrimaryTileDefinition.TileMapSheet; + var cols = sheet.TileWidth > 0 ? sheet.SheetWidth / sheet.TileWidth : 1; + var row = tile.PrimaryTileDefinition.FrameIndex / cols; + var col = tile.PrimaryTileDefinition.FrameIndex % cols; + var bgX = -col * sheet.TileWidth; + var bgY = -row * sheet.TileHeight; + var imgUrl = Model.GetCdnUrl(sheet.CdnPath); + +
+ } + else + { + 🧱 + } +
+ + +
+

@tile.Name

+
+ @tile.Category + @if (!string.IsNullOrEmpty(tile.Biome)) + { + @tile.Biome + } +
+ + +
+ @if (tile.Width > 1 || tile.Height > 1) + { + @tile.WidthΓ—@tile.Height + } + @if (!tile.IsWalkable) + { + Solid + } + @if (tile.BlocksLineOfSight) + { + Blocks LoS + } +
+
+
+ +
+ Weight: @tile.Weight +
+ Edit +
+ + +
+
+
+
+ } + + @if (!Model.Tiles.Any()) + { +
+ No tile templates found. Create one! +
+ } +
+ +@functions { + string GetCategoryColor(TileTemplateCategory category) + { + return category switch + { + TileTemplateCategory.Floor => "text-green-400", + TileTemplateCategory.Wall => "text-red-400", + TileTemplateCategory.Door => "text-purple-400", + TileTemplateCategory.Window => "text-cyan-400", + TileTemplateCategory.Stairs => "text-yellow-400", + TileTemplateCategory.Water => "text-blue-400", + TileTemplateCategory.Lava => "text-orange-400", + _ => "text-gray-400" + }; + } +} diff --git a/Services/Admin/Pages/DungeonBuilder/Tiles.cshtml.cs b/Services/Admin/Pages/DungeonBuilder/Tiles.cshtml.cs new file mode 100644 index 0000000..d7bd72a --- /dev/null +++ b/Services/Admin/Pages/DungeonBuilder/Tiles.cshtml.cs @@ -0,0 +1,95 @@ +using DataServer.Data; +using DataServer.Data.Entities; +using Microsoft.AspNetCore.Mvc; +using Microsoft.EntityFrameworkCore; + +namespace Server.Services.Admin.Pages.DungeonBuilder; + +public class TilesModel : AdminPageModel +{ + private readonly GameDbContext _db; + private readonly IConfiguration _config; + + public TilesModel(GameDbContext db, IConfiguration config) + { + _db = db; + _config = config; + } + + public List Tiles { get; set; } = new(); + public List Biomes { get; set; } = new(); + + public string? Search { get; set; } + public int? CategoryFilter { get; set; } + public string? BiomeFilter { get; set; } + + public string? Message { get; set; } + public bool IsError { get; set; } + + public async Task OnGetAsync(string? search, int? category, string? biome) + { + Search = search; + CategoryFilter = category; + BiomeFilter = biome; + + // Get unique biomes + Biomes = await _db.TileTemplates + .Where(t => t.Biome != null) + .Select(t => t.Biome!) + .Distinct() + .OrderBy(b => b) + .ToListAsync(); + + // Build query + var query = _db.TileTemplates + .Include(t => t.PrimaryTileDefinition) + .ThenInclude(td => td!.TileMapSheet) + .AsQueryable(); + + if (!string.IsNullOrEmpty(search)) + { + query = query.Where(t => t.Name.Contains(search) || (t.Tags != null && t.Tags.Contains(search))); + } + + if (category.HasValue) + { + query = query.Where(t => t.Category == (TileTemplateCategory)category.Value); + } + + if (!string.IsNullOrEmpty(biome)) + { + query = query.Where(t => t.Biome == biome); + } + + Tiles = await query + .OrderBy(t => t.Category) + .ThenBy(t => t.Name) + .ToListAsync(); + } + + public async Task OnPostDeleteAsync(int id) + { + var tile = await _db.TileTemplates.FindAsync(id); + if (tile != null) + { + _db.TileTemplates.Remove(tile); + await _db.SaveChangesAsync(); + Message = $"Deleted tile template: {tile.Name}"; + } + + return RedirectToPage(); + } + + public string GetCdnUrl(string? path) + { + if (string.IsNullOrEmpty(path)) return ""; + + var baseUrl = _config["Cdn:BaseUrl"]?.TrimEnd('/') ?? ""; + if (!baseUrl.EndsWith("/downloads")) + { + baseUrl += "/downloads"; + } + + return $"{baseUrl}/{path.TrimStart('/')}"; + } +}