From 739c624b717aecb7ee2b99258965713925840d4f Mon Sep 17 00:00:00 2001 From: dingo Date: Sat, 31 Jan 2026 18:51:45 -0500 Subject: [PATCH] Dungeon Builder Change --- Game/Dungeon/DungeonGeneratorV3.cs | 202 +++++++++++- REVAMP.md | 196 +++++++++++ .../Pages/DungeonBuilder/Buckets/Edit.cshtml | 84 +++++ .../DungeonBuilder/Buckets/Edit.cshtml.cs | 114 +++++++ .../Pages/DungeonBuilder/Buckets/Index.cshtml | 68 ++++ .../DungeonBuilder/Buckets/Index.cshtml.cs | 61 ++++ .../Admin/Pages/DungeonBuilder/Index.cshtml | 46 ++- .../Pages/DungeonBuilder/Index.cshtml.cs | 4 + .../Pages/DungeonBuilder/PaletteEdit.cshtml | 37 +++ .../DungeonBuilder/PaletteEdit.cshtml.cs | 11 + .../Pages/DungeonBuilder/RoomEdit.cshtml | 217 +++++++++++- .../Pages/DungeonBuilder/RoomEdit.cshtml.cs | 40 +++ .../Pages/DungeonBuilder/Stamps/Edit.cshtml | 309 ++++++++++++++++++ .../DungeonBuilder/Stamps/Edit.cshtml.cs | 128 ++++++++ .../Pages/DungeonBuilder/Stamps/Index.cshtml | 66 ++++ .../DungeonBuilder/Stamps/Index.cshtml.cs | 39 +++ .../Pages/DungeonBuilder/TileEdit.cshtml | 10 +- .../Pages/DungeonBuilder/TileEdit.cshtml.cs | 14 + Services/Admin/Pages/TileMaps/Edit.cshtml | 66 +++- Services/Admin/Pages/TileMaps/Edit.cshtml.cs | 44 +++ Services/Admin/Pages/TileMaps/TileEdit.cshtml | 174 ++++++++++ .../Admin/Pages/TileMaps/TileEdit.cshtml.cs | 177 ++++++++++ TODO.md | 72 ++++ TileManagementRevamp.md | 292 +++++++++++++++++ data/GameDbContext.cs | 4 + data/entities/DungeonBuilder.cs | 12 + data/entities/TileBuckets.cs | 103 ++++++ data/entities/TileMap.cs | 3 + 28 files changed, 2575 insertions(+), 18 deletions(-) create mode 100644 REVAMP.md create mode 100644 Services/Admin/Pages/DungeonBuilder/Buckets/Edit.cshtml create mode 100644 Services/Admin/Pages/DungeonBuilder/Buckets/Edit.cshtml.cs create mode 100644 Services/Admin/Pages/DungeonBuilder/Buckets/Index.cshtml create mode 100644 Services/Admin/Pages/DungeonBuilder/Buckets/Index.cshtml.cs create mode 100644 Services/Admin/Pages/DungeonBuilder/Stamps/Edit.cshtml create mode 100644 Services/Admin/Pages/DungeonBuilder/Stamps/Edit.cshtml.cs create mode 100644 Services/Admin/Pages/DungeonBuilder/Stamps/Index.cshtml create mode 100644 Services/Admin/Pages/DungeonBuilder/Stamps/Index.cshtml.cs create mode 100644 Services/Admin/Pages/TileMaps/TileEdit.cshtml create mode 100644 Services/Admin/Pages/TileMaps/TileEdit.cshtml.cs create mode 100644 TODO.md create mode 100644 TileManagementRevamp.md create mode 100644 data/entities/TileBuckets.cs diff --git a/Game/Dungeon/DungeonGeneratorV3.cs b/Game/Dungeon/DungeonGeneratorV3.cs index 646b8f1..f6a90f5 100644 --- a/Game/Dungeon/DungeonGeneratorV3.cs +++ b/Game/Dungeon/DungeonGeneratorV3.cs @@ -31,6 +31,11 @@ public class DungeonGeneratorV3 /// compatibility with neighboring tiles' sockets. /// public static bool UseSocketMatching { get; set; } = true; + + /// + /// Enable bucket-based adjacency rules (allow-lists). + /// + public static bool UseBucketMatching { get; set; } = true; // ============================================================ // DEPENDENCIES @@ -99,6 +104,15 @@ public class DungeonGeneratorV3 // Tile data cache private Dictionary _tileDefinitions = new(); private Dictionary _tileSheets = new(); + + // Bucket rules and tile bucket assignments + private Dictionary> _tileBucketsByDefinitionId = new(); + private Dictionary> _bucketRules = new(); + private Dictionary _bucketNames = new(); + private Dictionary _bucketTypes = new(); + private HashSet _paletteAllowedBuckets = new(); + private bool _enforceBiomeBuckets = false; + private string? _paletteBiome = null; // Generation parameters (from palette or defaults) private int _minRooms = 5; @@ -275,6 +289,10 @@ public class DungeonGeneratorV3 Log($" Room Size: {_palette.MinRoomWidth}-{_palette.MaxRoomWidth} x {_palette.MinRoomHeight}-{_palette.MaxRoomHeight}"); Log($" Corridor Width: {_palette.MinCorridorWidth}-{_palette.MaxCorridorWidth}"); Log($" Densities: Decor={_palette.DecorationDensity}%, Trap={_palette.TrapDensity}%, Container={_palette.ContainerDensity}%"); + + _paletteAllowedBuckets = ParseIds(_palette.AllowedBucketIdsJson).ToHashSet(); + _enforceBiomeBuckets = _palette.EnforceBiomeBuckets; + _paletteBiome = _palette.Biome; // Apply palette generation parameters _minRooms = _palette.MinRooms; @@ -523,6 +541,9 @@ public class DungeonGeneratorV3 var walkable = _tileDefinitions.Values.Count(t => t.IsWalkable); var nonWalkable = _tileDefinitions.Values.Count(t => !t.IsWalkable); Log($" Walkable: {walkable}, Non-walkable: {nonWalkable}"); + + await LoadBucketDataAsync(); + ApplyBucketFilters(); } private async Task> GenerateRoomsAsync(DungeonLayoutV2 layout) @@ -926,6 +947,120 @@ public class DungeonGeneratorV3 return new List(); } } + + private async Task LoadBucketDataAsync() + { + _tileBucketsByDefinitionId.Clear(); + _bucketRules.Clear(); + _bucketNames.Clear(); + _bucketTypes.Clear(); + + var buckets = await _db.TileBuckets + .Where(b => b.IsEnabled) + .ToListAsync(); + + foreach (var b in buckets) + { + _bucketNames[b.Id] = b.Name.ToLower(); + _bucketTypes[b.Id] = b.BucketType?.ToLower(); + } + + var rules = await _db.TileBucketRules.ToListAsync(); + foreach (var rule in rules) + { + if (!_bucketRules.TryGetValue(rule.SourceBucketId, out var targets)) + { + targets = new HashSet(); + _bucketRules[rule.SourceBucketId] = targets; + } + targets.Add(rule.TargetBucketId); + } + + var links = await _db.TileDefinitionBuckets + .ToListAsync(); + + foreach (var link in links) + { + if (!_tileBucketsByDefinitionId.TryGetValue(link.TileDefinitionId, out var bucketSet)) + { + bucketSet = new HashSet(); + _tileBucketsByDefinitionId[link.TileDefinitionId] = bucketSet; + } + bucketSet.Add(link.TileBucketId); + } + + Log($"Loaded bucket rules: {_bucketRules.Count} source buckets, tile bucket links: {_tileBucketsByDefinitionId.Count}"); + } + + private void ApplyBucketFilters() + { + if (_paletteAllowedBuckets.Count == 0 && !_enforceBiomeBuckets) + { + return; + } + + _floorTemplates = _floorTemplates.Where(TemplateMatchesBucketFilters).ToList(); + _wallTemplates = _wallTemplates.Where(TemplateMatchesBucketFilters).ToList(); + _doorTemplates = _doorTemplates.Where(TemplateMatchesBucketFilters).ToList(); + + Log($"Bucket filtering applied: floors={_floorTemplates.Count}, walls={_wallTemplates.Count}, doors={_doorTemplates.Count}"); + + ParseSocketConfigurations(); + BuildSpriteToTemplateLookup(); + } + + private bool TemplateMatchesBucketFilters(TileTemplate template) + { + var buckets = GetTemplateBucketIds(template); + + if (_paletteAllowedBuckets.Count > 0) + { + if (buckets.Count == 0) return false; + if (!buckets.Overlaps(_paletteAllowedBuckets)) return false; + } + + if (_enforceBiomeBuckets && !string.IsNullOrWhiteSpace(_paletteBiome)) + { + if (!TemplateMatchesBiomeBucket(buckets)) return false; + } + + return true; + } + + private bool TemplateMatchesBiomeBucket(HashSet bucketIds) + { + if (bucketIds.Count == 0) return false; + var biome = _paletteBiome?.Trim().ToLower(); + if (string.IsNullOrEmpty(biome)) return true; + + foreach (var id in bucketIds) + { + if (_bucketNames.TryGetValue(id, out var name)) + { + if (name == biome || name == $"biome_{biome}") + { + return true; + } + } + if (_bucketTypes.TryGetValue(id, out var type) && type == "biome" && _bucketNames.TryGetValue(id, out var n2) && n2 == biome) + { + return true; + } + } + + return false; + } + + private HashSet GetTemplateBucketIds(TileTemplate template) + { + if (template.PrimaryTileDefinitionId.HasValue && + _tileBucketsByDefinitionId.TryGetValue(template.PrimaryTileDefinitionId.Value, out var buckets)) + { + return buckets; + } + + return new HashSet(); + } private async Task StampRoomTemplateAsync(DungeonLayoutV2 layout, DungeonRoomV2 room, BuilderRoomTemplate template) { Log($" Stamping room template '{template.Name}' at ({room.X},{room.Y})"); @@ -1762,6 +1897,7 @@ public class DungeonGeneratorV3 /// private bool IsSocketCompatible(TileTemplate template, int x, int y, DungeonLayoutV2 layout) { + if (!IsBucketCompatible(template, x, y, layout)) return false; if (!UseSocketMatching) return true; if (!_templateSocketConfigs.TryGetValue(template.Id, out var config)) return true; @@ -1837,6 +1973,70 @@ public class DungeonGeneratorV3 return true; } + + private bool IsBucketCompatible(TileTemplate template, int x, int y, DungeonLayoutV2 layout) + { + if (!UseBucketMatching || _bucketRules.Count == 0) return true; + + var sourceBuckets = GetTemplateBucketIds(template); + if (sourceBuckets.Count == 0) return true; + + if (y > 0 && _placedTemplates.TryGetValue($"{x},{y-1}", out var northTemplateId)) + { + if (!TemplatesBucketsCompatible(sourceBuckets, GetTemplateBucketIdsById(northTemplateId))) + return false; + } + + if (y < layout.Height - 1 && _placedTemplates.TryGetValue($"{x},{y+1}", out var southTemplateId)) + { + if (!TemplatesBucketsCompatible(sourceBuckets, GetTemplateBucketIdsById(southTemplateId))) + return false; + } + + if (x < layout.Width - 1 && _placedTemplates.TryGetValue($"{x+1},{y}", out var eastTemplateId)) + { + if (!TemplatesBucketsCompatible(sourceBuckets, GetTemplateBucketIdsById(eastTemplateId))) + return false; + } + + if (x > 0 && _placedTemplates.TryGetValue($"{x-1},{y}", out var westTemplateId)) + { + if (!TemplatesBucketsCompatible(sourceBuckets, GetTemplateBucketIdsById(westTemplateId))) + return false; + } + + return true; + } + + private HashSet GetTemplateBucketIdsById(int templateId) + { + var template = _floorTemplates.FirstOrDefault(t => t.Id == templateId) + ?? _wallTemplates.FirstOrDefault(t => t.Id == templateId) + ?? _doorTemplates.FirstOrDefault(t => t.Id == templateId); + + return template == null ? new HashSet() : GetTemplateBucketIds(template); + } + + private bool TemplatesBucketsCompatible(HashSet sourceBuckets, HashSet targetBuckets) + { + if (_bucketRules.Count == 0) return true; + if (sourceBuckets.Count == 0 || targetBuckets.Count == 0) return true; + + var anyRule = false; + foreach (var source in sourceBuckets) + { + if (_bucketRules.TryGetValue(source, out var allowed)) + { + anyRule = true; + if (allowed.Overlaps(targetBuckets)) + { + return true; + } + } + } + + return !anyRule; + } /// /// Calculate a socket compatibility score for a template at a given position. @@ -2073,4 +2273,4 @@ public class TemplateTilePlacement public int FrameIndex { get; set; } public int? TileDefId { get; set; } public int Layer { get; set; } -} \ No newline at end of file +} diff --git a/REVAMP.md b/REVAMP.md new file mode 100644 index 0000000..28f1b87 --- /dev/null +++ b/REVAMP.md @@ -0,0 +1,196 @@ +# REVAMP Notes: Current Dungeon Builder, TileMaps, and DungeonSimulation + +This document describes how the current systems work (no code), based on the admin pages and the runtime simulation. + +## 1) Dungeon Builder (Admin UI) + +### 1.1 Overview Page +- The Dungeon Builder landing page shows counts of Tile Templates, Object Templates, Room Templates, and Palettes. +- It provides navigation to each editor and a “Test Generator” preview tool. +- Recent items are pulled from each template type and displayed with edit links. + +### 1.2 Tile Templates +**Where:** `/admin/dungeonbuilder/tiles` and `/admin/dungeonbuilder/tiles/edit` + +**What a Tile Template is:** +- A reusable multi-tile pattern (size width/height) composed of tilemap frames. +- It has metadata (name, category, biome, tags, weight, tier gating) and tile properties (walkable/blocking flags). +- It stores a JSON array of placed cells (`TilesJson`) which maps template grid cells to a sprite sheet frame. + +**Category and properties:** +- Categories include floor/wall/door/etc. (used for filtering and palette grouping). +- Properties include: walkable, blocks movement, blocks projectiles, blocks line of sight. + +**Sockets:** +- Each template has edge sockets used for matching/connection during procedural placement. +- The editor exposes a socket grid with per-edge cells and three socket types: Open / Closed / Custom. +- Socket configuration is stored in JSON (new format) with legacy fields also maintained for backward compatibility. +- There is autocomplete for custom socket names, with storage in a dedicated socket names table. + +**Editor workflow:** +- Select a tile sheet, pick a frame, then paint cells in the template grid. +- The first tile placed becomes the primary tile definition. +- You can resize the template (1x1 up to 10x10), fill all, fill border, or clear. +- Tile placements are serialized back to JSON on save. + +### 1.3 Room Templates +**Where:** `/admin/dungeonbuilder/rooms` and `/admin/dungeonbuilder/rooms/edit` + +**What a Room Template is:** +- A fixed room layout (width/height) containing floor/wall tiles, spawns, and connection points. +- Stored as JSON arrays for tile placements, spawns, and connection points. + +**Editor workflow:** +- Grid editor with tools: paint, erase, fill. +- Layers: floor, wall, spawn. +- Tile palette is built from Tile Templates filtered by selected tilemap sheet and tags. +- Floor/wall choice is driven by the selected template’s walkable flag. +- Spawn layer supports: player spawn, exit portal, door connection points, chests, and mob spawns. + +**Data stored:** +- TileGridJson: combined floor+wall placements with isWalkable flag. +- ConnectionPointsJson: doorways on grid edges with a direction. +- MobSpawnsJson: per-cell mob spawns with mob definition id and count. +- Player/exit spawn coordinates stored separately. +- Object placements exist but are currently stored as empty JSON (not placed in UI). + +### 1.4 Object Templates +**Where:** `/admin/dungeonbuilder/objects` and `/admin/dungeonbuilder/objects/edit` + +**What an Object Template is:** +- A placeable object (decoration, container, trap, door, vendor, etc.) with sprite, size, interaction, and loot settings. + +**Key properties:** +- Sprite sheet + frame index or a direct CDN image path. +- Blocking: movement, projectiles, line of sight. +- Animation: isAnimated, frame count, fps, loops, states JSON. +- Interaction: interactable, triggered by walk, interaction type/state/cooldown. +- Rewards: loot table, gold, XP; trap/hazard damage with damage type. +- Generation: weight, tier limits, max per room, placement type. + +**Editor workflow:** +- Pick a sprite sheet and frame; live preview shows selected frame. +- Configure animation and interaction settings. +- Set generation constraints. + +### 1.5 Palettes +**Where:** `/admin/dungeonbuilder/palettes` and `/admin/dungeonbuilder/palettes/edit` + +**What a Palette is:** +- A themed collection of templates and rules used by the dungeon generator. + +**Palette contents:** +- Lists of Tile Templates: floors, walls, doors. +- Lists of Object Templates: decorations, containers, traps. +- List of Room Templates. + +**Palette settings:** +- Room count min/max and room size ranges. +- Corridor width ranges. +- Density sliders for decorations/containers/traps. +- Biome/tags and enabled flag. + +### 1.6 Test Generator +**Where:** `/admin/dungeonbuilder/testgen` + +**What it does:** +- Generates a simple dungeon preview with rooms and corridors. +- Uses palette settings if selected, otherwise uses override values. +- Produces a grid visualization with cell types (floor, wall, door, spawns, mobs, etc.). +- Tracks and displays generation stats but does not fully integrate tile templates or sockets. + +**Generation style:** +- Randomly places rectangular rooms with padding. +- Connects rooms using L-shaped corridors. +- Assigns entrance/exit, places mobs, chests, and decoration cells. + +## 2) TileMaps (Admin UI) + +### 2.1 TileMap Sheets +**Where:** `/admin/tilemaps` + +**What a TileMap Sheet is:** +- A sprite sheet definition with size, tile size, and CDN path. +- Includes metadata (name, tags, enabled). +- Shows preview image and counts of defined tiles. + +### 2.2 TileMap Editor +**Where:** `/admin/tilemaps/edit` + +**What it does:** +- Defines a sheet (dimensions, tile size, CDN path) and renders a grid overlay preview. +- Allows per-frame tile definitions (TileDefinition) to be created/edited. + +**TileDefinition fields:** +- Name, type, tags, walkable, blocks projectiles, blocks LOS, render layer. +- Socket fields: N/E/S/W with optional custom names. + +**Bulk tools:** +- Auto-generate definitions for all frames. +- Auto-configure sockets based on type. +- Bulk set sockets to a specific type. + +**CDN integration:** +- A CDN browser lists textures and can auto-fill the sheet path. + +## 3) DungeonSimulation (Runtime) + +### 3.1 Inputs +- Accepts a `DungeonLayout` with: + - Rooms (with type and positions) + - Walkability grid + - Mob spawns, chest spawns + - Tile details for visuals (handled elsewhere for rendering) + +### 3.2 Initialization +- Spawns mobs at layout mob spawn points. + - If a specific MobDefinition is set, uses it; otherwise selects by spawn type (normal/elite/boss). + - Uses bracket-aware stat scaling from MobDefinition. + - Loads abilities from MobDefinition assignments if available, otherwise creates a basic attack. +- Spawns chests at layout chest spawns. +- Spawns an exit portal in the entrance room (prefers corners away from hallways). + +### 3.3 Tick Loop +- Runs at 20 ticks/sec. +- If dungeon phase is Active: + - Updates mobs (AI), processes abilities/attacks. + - Updates projectiles and hazard zones. +- Always updates players (movement, status effects, regeneration). +- Handles corpse cleanup after loot is emptied (when cleared). +- Marks dungeon cleared when all mobs are dead and spawns an exit. + +### 3.4 Combat and Movement +- Movement uses the layout walkability grid (`Layout.IsWalkable`). +- Mob AI uses abilities with range checks and cooldowns. +- Damage is calculated using CombatCalculator (armor, resistances, etc.). +- Status effects and DOT damage are processed each tick. + +### 3.5 Events +- Generates lists of damage, death, ability, projectile events during tick. +- These are returned via TickResult for networking/client updates. + +### 3.6 Summoning +- Supports runtime mob summoning (queued then spawned at end of tick). + +## Observations (Current Couplings) +- Tile Templates and TileMap TileDefinitions overlap in “tile properties” but are separate systems. +- Room Editor uses Tile Templates, not TileDefinitions, for floor/wall selection. +- Tile sockets exist both in TileDefinitions (TileMaps) and TileTemplates (Builder), but with different data shapes. +- Test generator uses palette rules but does not apply template sockets or per-tile metadata. +- DungeonSimulation only reads the final layout walkability grid and spawn lists; it does not interpret template or tile metadata at runtime. + +## Likely Revamp Touchpoints (Non-Prescriptive) +- Consolidate tile metadata into a single definition model used by: + - TileMaps (definition), + - Builder (authoring), + - Live editor (runtime overrides). +- Replace/retire template socket logic or re-platform it to the unified tile model. +- Update Room editor to use unified tile definitions and decoration overlays. +- Update generation pipeline to interpret the new tile metadata (walkability, LOS, projectile blocking, interactables). +- Keep DungeonSimulation driven by resolved layout (walkability + overlays) rather than editor-specific concepts. + +## Decisions / Direction (from discussion) +- **Connection rules must support 1->many, many<->many, and 1->1**. The bucket model should allow explicit allow-lists (and optional weights) so a single bucket can target many, many buckets can target many, or exact 1-1 can be enforced. +- **Rules are global** (not per-palette), so one consistent connectivity grammar applies across dungeon + overworld. Palettes should filter which buckets/tiles are allowed in a given theme. +- **Biome is a bucket**. Biome membership should be expressible as bucket assignment (e.g., `biome_forest`, `biome_tundra`) and used in the same connectivity system. +- **Multi-tile patterns are undecided**. Keep open whether to retain “stamps” / patterns in Builder or simplify to single-tile defs + paint tools. diff --git a/Services/Admin/Pages/DungeonBuilder/Buckets/Edit.cshtml b/Services/Admin/Pages/DungeonBuilder/Buckets/Edit.cshtml new file mode 100644 index 0000000..78946e6 --- /dev/null +++ b/Services/Admin/Pages/DungeonBuilder/Buckets/Edit.cshtml @@ -0,0 +1,84 @@ +@page "/admin/dungeonbuilder/buckets/edit" +@model DungeonBuilder.Buckets.EditModel +@{ + ViewData["Title"] = Model.Bucket.Id == 0 ? "New Bucket" : $"Edit Bucket: {Model.Bucket.Name}"; +} + + + +

@ViewData["Title"]

+ +@if (!string.IsNullOrEmpty(Model.Message)) +{ +
+ @Model.Message +
+} + +
+ @Html.AntiForgeryToken() + + +
+
+

Bucket

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

Allow-List Rules

+

Select which buckets this bucket can connect to.

+ +
+ @foreach (var b in Model.AllBuckets) + { + if (b.Id == Model.Bucket.Id) { continue; } + + } +
+
+
+ +
+ Cancel + +
+
+ +@section Scripts { + +} diff --git a/Services/Admin/Pages/DungeonBuilder/Buckets/Edit.cshtml.cs b/Services/Admin/Pages/DungeonBuilder/Buckets/Edit.cshtml.cs new file mode 100644 index 0000000..70fa2ca --- /dev/null +++ b/Services/Admin/Pages/DungeonBuilder/Buckets/Edit.cshtml.cs @@ -0,0 +1,114 @@ +using DataServer.Data; +using DataServer.Data.Entities; +using Microsoft.AspNetCore.Mvc; +using Microsoft.EntityFrameworkCore; + +namespace GameServices.Admin.Pages.DungeonBuilder.Buckets; + +public class EditModel : AdminPageModel +{ + private readonly GameDbContext _db; + + public EditModel(GameDbContext db) + { + _db = db; + } + + [BindProperty] + public TileBucket Bucket { get; set; } = new(); + + public List AllBuckets { get; set; } = new(); + public HashSet AllowedBucketIds { get; set; } = new(); + + public string? Message { get; set; } + public bool IsError { get; set; } + + public async Task OnGetAsync(int? id) + { + await LoadBucketsAsync(); + + if (id.HasValue) + { + var bucket = await _db.TileBuckets.FindAsync(id.Value); + if (bucket != null) + { + Bucket = bucket; + AllowedBucketIds = await _db.TileBucketRules + .Where(r => r.SourceBucketId == bucket.Id) + .Select(r => r.TargetBucketId) + .ToHashSetAsync(); + } + } + else + { + Bucket.IsEnabled = true; + } + } + + public async Task OnPostAsync() + { + await LoadBucketsAsync(); + + if (string.IsNullOrWhiteSpace(Bucket.Name)) + { + IsError = true; + Message = "Name is required."; + return Page(); + } + + Bucket.UpdatedAt = DateTime.UtcNow; + + var allowedIds = Request.Form["allowedBucketIds"] + .Select(v => int.TryParse(v, out var id) ? id : 0) + .Where(id => id > 0) + .ToHashSet(); + + if (Bucket.Id == 0) + { + Bucket.CreatedAt = DateTime.UtcNow; + _db.TileBuckets.Add(Bucket); + await _db.SaveChangesAsync(); + } + else + { + var existing = await _db.TileBuckets.FindAsync(Bucket.Id); + if (existing == null) + { + IsError = true; + Message = "Bucket not found."; + return Page(); + } + + existing.Name = Bucket.Name.Trim(); + existing.BucketType = Bucket.BucketType?.Trim(); + existing.Description = Bucket.Description?.Trim(); + existing.IsEnabled = Bucket.IsEnabled; + existing.UpdatedAt = DateTime.UtcNow; + } + + var sourceId = Bucket.Id; + var existingRules = _db.TileBucketRules.Where(r => r.SourceBucketId == sourceId); + _db.TileBucketRules.RemoveRange(existingRules); + + foreach (var targetId in allowedIds.Where(id => id != sourceId)) + { + _db.TileBucketRules.Add(new TileBucketRule + { + SourceBucketId = sourceId, + TargetBucketId = targetId, + Weight = 1.0f + }); + } + + await _db.SaveChangesAsync(); + + return RedirectToPage(new { id = sourceId }); + } + + private async Task LoadBucketsAsync() + { + AllBuckets = await _db.TileBuckets + .OrderBy(b => b.Name) + .ToListAsync(); + } +} diff --git a/Services/Admin/Pages/DungeonBuilder/Buckets/Index.cshtml b/Services/Admin/Pages/DungeonBuilder/Buckets/Index.cshtml new file mode 100644 index 0000000..8613607 --- /dev/null +++ b/Services/Admin/Pages/DungeonBuilder/Buckets/Index.cshtml @@ -0,0 +1,68 @@ +@page "/admin/dungeonbuilder/buckets" +@model DungeonBuilder.Buckets.IndexModel +@{ + ViewData["Title"] = "Tile Buckets"; +} + + + +
+
+

Tile Buckets

+

Connectivity buckets and allow-lists

+
+ + New Bucket +
+ +@if (!string.IsNullOrEmpty(Model.Message)) +{ +
+ @Model.Message +
+} + +
+ + + + + + + + + + + + @foreach (var b in Model.Buckets) + { + + + + + + + + } + @if (!Model.Buckets.Any()) + { + + + + } + +
NameTypeRulesEnabledActions
@b.Name@(string.IsNullOrWhiteSpace(b.BucketType) ? "-" : b.BucketType)@b.RuleCount + + @(b.IsEnabled ? "On" : "Off") + + +
+ Edit +
+ + +
+
+
No buckets created yet.
+
diff --git a/Services/Admin/Pages/DungeonBuilder/Buckets/Index.cshtml.cs b/Services/Admin/Pages/DungeonBuilder/Buckets/Index.cshtml.cs new file mode 100644 index 0000000..4b09dbc --- /dev/null +++ b/Services/Admin/Pages/DungeonBuilder/Buckets/Index.cshtml.cs @@ -0,0 +1,61 @@ +using DataServer.Data; +using DataServer.Data.Entities; +using Microsoft.AspNetCore.Mvc; +using Microsoft.EntityFrameworkCore; + +namespace GameServices.Admin.Pages.DungeonBuilder.Buckets; + +public class IndexModel : AdminPageModel +{ + private readonly GameDbContext _db; + + public IndexModel(GameDbContext db) + { + _db = db; + } + + public List Buckets { get; set; } = new(); + + public string? Message { get; set; } + public bool IsError { get; set; } + + public async Task OnGetAsync() + { + Buckets = await _db.TileBuckets + .OrderBy(b => b.Name) + .Select(b => new BucketRow + { + Id = b.Id, + Name = b.Name, + BucketType = b.BucketType, + IsEnabled = b.IsEnabled, + RuleCount = _db.TileBucketRules.Count(r => r.SourceBucketId == b.Id) + }) + .ToListAsync(); + } + + public async Task OnPostDeleteAsync(int id) + { + var bucket = await _db.TileBuckets.FindAsync(id); + if (bucket != null) + { + // Remove rules and links first + var rules = _db.TileBucketRules.Where(r => r.SourceBucketId == id || r.TargetBucketId == id); + _db.TileBucketRules.RemoveRange(rules); + var links = _db.TileDefinitionBuckets.Where(l => l.TileBucketId == id); + _db.TileDefinitionBuckets.RemoveRange(links); + _db.TileBuckets.Remove(bucket); + await _db.SaveChangesAsync(); + } + return RedirectToPage(); + } + + public class BucketRow + { + public int Id { get; set; } + public string Name { get; set; } = ""; + public string? BucketType { get; set; } + public bool IsEnabled { get; set; } + public int RuleCount { get; set; } + } +} diff --git a/Services/Admin/Pages/DungeonBuilder/Index.cshtml b/Services/Admin/Pages/DungeonBuilder/Index.cshtml index 0c729c8..18def4d 100644 --- a/Services/Admin/Pages/DungeonBuilder/Index.cshtml +++ b/Services/Admin/Pages/DungeonBuilder/Index.cshtml @@ -17,7 +17,7 @@ } -
+
@Model.TileTemplateCount
Tile Templates
@@ -34,6 +34,14 @@
@Model.PaletteCount
Dungeon Palettes
+
+
@Model.BucketCount
+
Tile Buckets
+
+
+
@Model.StampCount
+
Tile Stamps
+
@@ -110,6 +118,42 @@
+ + + +
+
+ TB +
+
+

Tile Buckets

+

Define bucket rules and allow-lists

+
+ - Global adjacency rules
+ - Bucket metadata
+ - Connectivity weights +
+
+
+
+ + + +
+
+ TS +
+
+

Tile Stamps

+

Reusable multi-tile paint patterns

+
+ - Saved patterns
+ - Fast room painting
+ - Grid-based stamps +
+
+
+
diff --git a/Services/Admin/Pages/DungeonBuilder/Index.cshtml.cs b/Services/Admin/Pages/DungeonBuilder/Index.cshtml.cs index b19dc69..4a1d63b 100644 --- a/Services/Admin/Pages/DungeonBuilder/Index.cshtml.cs +++ b/Services/Admin/Pages/DungeonBuilder/Index.cshtml.cs @@ -18,6 +18,8 @@ public class IndexModel : AdminPageModel public int ObjectTemplateCount { get; set; } public int RoomTemplateCount { get; set; } public int PaletteCount { get; set; } + public int BucketCount { get; set; } + public int StampCount { get; set; } public List RecentItems { get; set; } = new(); @@ -31,6 +33,8 @@ public class IndexModel : AdminPageModel ObjectTemplateCount = await _db.ObjectTemplates.CountAsync(); RoomTemplateCount = await _db.BuilderRoomTemplates.CountAsync(); PaletteCount = await _db.DungeonPalettes.CountAsync(); + BucketCount = await _db.TileBuckets.CountAsync(); + StampCount = await _db.TileStamps.CountAsync(); // Get recent items (combined from all types) var recentTiles = await _db.TileTemplates diff --git a/Services/Admin/Pages/DungeonBuilder/PaletteEdit.cshtml b/Services/Admin/Pages/DungeonBuilder/PaletteEdit.cshtml index d2e3b58..d27bc93 100644 --- a/Services/Admin/Pages/DungeonBuilder/PaletteEdit.cshtml +++ b/Services/Admin/Pages/DungeonBuilder/PaletteEdit.cshtml @@ -27,6 +27,7 @@ +
@@ -59,6 +60,34 @@
+
+

Bucket Filters

+

Limit generation to these buckets.

+ +
+ @foreach (var b in Model.Buckets) + { + + } + @if (!Model.Buckets.Any()) + { +
No buckets defined yet.
+ } +
+
+ + +
+
+

Room Generation

@@ -291,7 +320,15 @@ function saveSelections() { document.getElementById('containerIds').value = JSON.stringify(collectIds('.container-check')); document.getElementById('trapIds').value = JSON.stringify(collectIds('.trap-check')); document.getElementById('roomIds').value = JSON.stringify(collectIds('.room-check')); + document.getElementById('bucketIds').value = JSON.stringify(collectIds('.bucket-check')); } document.querySelector('form').onsubmit = () => saveSelections(); + +function filterBuckets() { + const q = document.getElementById('bucketFilter').value.toLowerCase(); + document.querySelectorAll('.bucket-item').forEach(el => { + el.style.display = el.dataset.name.includes(q) ? '' : 'none'; + }); +} diff --git a/Services/Admin/Pages/DungeonBuilder/PaletteEdit.cshtml.cs b/Services/Admin/Pages/DungeonBuilder/PaletteEdit.cshtml.cs index ce31cd5..0ad6298 100644 --- a/Services/Admin/Pages/DungeonBuilder/PaletteEdit.cshtml.cs +++ b/Services/Admin/Pages/DungeonBuilder/PaletteEdit.cshtml.cs @@ -26,6 +26,7 @@ public class PaletteEditModel : AdminPageModel public List Containers { get; set; } = new(); public List Traps { get; set; } = new(); public List Rooms { get; set; } = new(); + public List Buckets { get; set; } = new(); // Selected IDs public List SelectedFloorIds { get; set; } = new(); @@ -35,6 +36,7 @@ public class PaletteEditModel : AdminPageModel public List SelectedContainerIds { get; set; } = new(); public List SelectedTrapIds { get; set; } = new(); public List SelectedRoomIds { get; set; } = new(); + public List SelectedBucketIds { get; set; } = new(); public string? Message { get; set; } public bool IsError { get; set; } @@ -58,6 +60,7 @@ public class PaletteEditModel : AdminPageModel SelectedContainerIds = ParseIds(palette.ContainerIdsJson); SelectedTrapIds = ParseIds(palette.TrapIdsJson); SelectedRoomIds = ParseIds(palette.RoomTemplateIdsJson); + SelectedBucketIds = ParseIds(palette.AllowedBucketIdsJson); } } else @@ -111,6 +114,8 @@ public class PaletteEditModel : AdminPageModel existing.Description = Palette.Description; existing.Biome = Palette.Biome; existing.Tags = Palette.Tags; + existing.AllowedBucketIdsJson = Palette.AllowedBucketIdsJson; + existing.EnforceBiomeBuckets = Palette.EnforceBiomeBuckets; existing.FloorTemplateIdsJson = Palette.FloorTemplateIdsJson; existing.WallTemplateIdsJson = Palette.WallTemplateIdsJson; existing.DoorTemplateIdsJson = Palette.DoorTemplateIdsJson; @@ -145,6 +150,7 @@ public class PaletteEditModel : AdminPageModel SelectedContainerIds = ParseIds(Palette.ContainerIdsJson); SelectedTrapIds = ParseIds(Palette.TrapIdsJson); SelectedRoomIds = ParseIds(Palette.RoomTemplateIdsJson); + SelectedBucketIds = ParseIds(Palette.AllowedBucketIdsJson); return RedirectToPage(new { id = Palette.Id }); } @@ -181,6 +187,11 @@ public class PaletteEditModel : AdminPageModel .Where(r => r.IsEnabled) .OrderBy(r => r.Name) .ToListAsync(); + + Buckets = await _db.TileBuckets + .Where(b => b.IsEnabled) + .OrderBy(b => b.Name) + .ToListAsync(); } private List ParseIds(string? json) diff --git a/Services/Admin/Pages/DungeonBuilder/RoomEdit.cshtml b/Services/Admin/Pages/DungeonBuilder/RoomEdit.cshtml index 99f6dc6..b93280e 100644 --- a/Services/Admin/Pages/DungeonBuilder/RoomEdit.cshtml +++ b/Services/Admin/Pages/DungeonBuilder/RoomEdit.cshtml @@ -84,6 +84,17 @@ } .mob-select-item:hover { background: #374151; } .mob-select-item.selected { background: #4f46e5; } + .stamp-select-item { + padding: 6px 8px; + background: #1f2937; + border-radius: 4px; + cursor: pointer; + display: flex; + align-items: center; + gap: 8px; + } + .stamp-select-item:hover { background: #374151; } + .stamp-select-item.selected { background: #4f46e5; } .tag-chip { display: inline-block; padding: 2px 8px; @@ -166,9 +177,13 @@
-
+
+ + + +
@@ -258,6 +273,28 @@
Select a TileMap to see templates
+ + +
+

Stamps

+
+ +
+
+ @foreach (var stamp in Model.TileStamps) + { +
+ 🗂️ + @stamp.Name + (@stamp.Width x @stamp.Height) +
+ } + @if (!Model.TileStamps.Any()) + { +
No stamps created yet.
+ } +
+
- + @if (Model.Sheet.Id > 0) {
💡
-

Create Tile Templates

+

Define Tile Properties

- To use tiles from this sheet, create Tile Templates - which define walkability, sockets, and other properties. + Use Tile Definitions below to set walkability, buckets, and other gameplay properties per frame.

} +@if (Model.Sheet.Id > 0) +{ +
+
+
+

Tile Definitions

+

Define gameplay properties and buckets per frame.

+
+
+ + +
+
+ +
+ + + + + + + + + + + + @foreach (var row in Model.TileDefinitionRows) + { + + + + + + + + } + @if (!Model.TileDefinitionRows.Any()) + { + + + + } + +
FrameNameTypeBucketsActions
@row.FrameIndex@(!string.IsNullOrWhiteSpace(row.Name) ? row.Name : "-")@row.Type@row.BucketCount + Edit +
No tile definitions yet. Use "Edit Frame" to create one.
+
+
+} +