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 @@
Layer
-
+
Floor
Wall
+ Decor 1
+ Decor 2
+ Decor 3
+ Decor 4
Spawn
@@ -258,6 +273,28 @@
Select a TileMap to see templates
+
+
+
@@ -307,6 +344,7 @@ const loadedSheets = {};
// Data stores - keyed by "x,y"
let floorData = {}; // Floor tiles (walkable) - { templateId, sheetId, frameIndex, isWalkable }
let wallData = {}; // Wall tiles (not walkable) - { templateId, sheetId, frameIndex }
+let decorData = [{}, {}, {}, {}]; // Four decoration layers
let spawnData = {}; // Spawns - { type, mobId?, mobName? }
let connectionData = {}; // Connection points (doorways) - { direction }
@@ -314,6 +352,9 @@ let connectionData = {}; // Connection points (doorways) - { direction }
const allTileTemplates = @Html.Raw(Model.TileTemplatesJson);
let tileTemplates = []; // Filtered for current sheet
let allTags = new Set();
+const allStamps = @Html.Raw(Model.TileStampsJson);
+const stampMap = {};
+const templateBySprite = {};
let mouseDown = false;
@@ -336,6 +377,14 @@ function preloadSheets() {
document.addEventListener('DOMContentLoaded', () => {
preloadSheets();
+ allTileTemplates.forEach(t => {
+ if (t.sheetId != null) {
+ templateBySprite[`${t.sheetId}:${t.frameIndex}`] = t;
+ }
+ });
+ allStamps.forEach(s => {
+ stampMap[s.id] = s;
+ });
loadData();
buildGrid();
});
@@ -344,16 +393,17 @@ function loadData() {
try {
const td = '@Html.Raw(Model.Room.TileGridJson ?? "[]")';
JSON.parse(td).forEach(t => {
- // Determine if floor or wall based on stored isWalkable flag or template lookup
- const isWalkable = t.isWalkable !== false; // Default to true if not specified
const key = `${t.x},${t.y}`;
const data = {
templateId: t.templateId || 0,
sheetId: t.sheetId,
frameIndex: t.frameIndex,
- isWalkable: isWalkable
+ isWalkable: t.isWalkable !== false
};
- if (isWalkable) {
+ const layerIndex = typeof t.layer === 'number' ? t.layer : 0;
+ if (layerIndex >= 1 && layerIndex <= 4) {
+ decorData[layerIndex - 1][key] = data;
+ } else if (data.isWalkable) {
floorData[key] = data;
} else {
wallData[key] = data;
@@ -454,6 +504,15 @@ function render(x, y) {
// Overlays
let html = '';
+ const decorLayers = decorData.map(layer => layer[k]).filter(Boolean);
+ decorLayers.forEach(d => {
+ if (d.sheetId && loadedSheets[d.sheetId]) {
+ const s = loadedSheets[d.sheetId];
+ const dc = d.frameIndex % s.cols;
+ const dr = Math.floor(d.frameIndex / s.cols);
+ html += `
`;
+ }
+ });
const sp = spawnData[k];
if (sp) {
const icons = { player:'🧑', exit:'🌀', mob:'👾', chest:'📦' };
@@ -471,7 +530,9 @@ function paint(x, y) {
const k = `${x},${y}`;
if (tool === 'paint' && sel) {
- if ((layer === 'floor' || layer === 'wall') && sel.type === 'template') {
+ if (sel.type === 'stamp') {
+ applyStamp(x, y);
+ } else if ((layer === 'floor' || layer === 'wall') && sel.type === 'template') {
// Remove from both to avoid duplicates
delete floorData[k];
delete wallData[k];
@@ -488,6 +549,16 @@ function paint(x, y) {
} else {
wallData[k] = data;
}
+ } else if (layer.startsWith('decor') && sel.type === 'template') {
+ const decorIdx = getDecorLayerIndex(layer);
+ if (decorIdx !== null) {
+ decorData[decorIdx][k] = {
+ templateId: sel.templateId,
+ sheetId: sel.sheetId,
+ frameIndex: sel.frameIndex,
+ isWalkable: true
+ };
+ }
} else if (layer === 'spawn') {
if (sel.type === 'spawn') {
if (sel.spawn === 'connection') {
@@ -518,12 +589,19 @@ function paint(x, y) {
} else if (tool === 'erase') {
if (layer === 'floor') delete floorData[k];
else if (layer === 'wall') delete wallData[k];
- else if (layer === 'spawn') {
+ else if (layer.startsWith('decor')) {
+ const decorIdx = getDecorLayerIndex(layer);
+ if (decorIdx !== null) delete decorData[decorIdx][k];
+ } else if (layer === 'spawn') {
delete spawnData[k];
delete connectionData[k];
}
} else if (tool === 'fill' && sel?.type === 'template') {
- floodFill(x, y);
+ if (layer.startsWith('decor')) {
+ floodFillDecor(x, y);
+ } else {
+ floodFill(x, y);
+ }
}
render(x, y);
@@ -578,25 +656,109 @@ function floodFill(sx, sy) {
}
}
+function floodFillDecor(sx, sy) {
+ const decorIdx = getDecorLayerIndex(layer);
+ if (decorIdx === null) return;
+ const layerData = decorData[decorIdx];
+ const sk = `${sx},${sy}`;
+ const startTile = layerData[sk];
+ const startF = startTile?.frameIndex ?? -1;
+ const visited = new Set(), queue = [[sx, sy]];
+
+ while (queue.length && visited.size < 500) {
+ const [x, y] = queue.shift();
+ const k = `${x},${y}`;
+ if (visited.has(k) || x < 0 || x >= gw || y < 0 || y >= gh) continue;
+
+ const current = layerData[k];
+ if ((current?.frameIndex ?? -1) !== startF) continue;
+
+ visited.add(k);
+
+ layerData[k] = {
+ templateId: sel.templateId,
+ sheetId: sel.sheetId,
+ frameIndex: sel.frameIndex,
+ isWalkable: true
+ };
+
+ render(x, y);
+ queue.push([x+1,y],[x-1,y],[x,y+1],[x,y-1]);
+ }
+}
+
+function applyStamp(x, y) {
+ const stamp = stampMap[sel.stampId];
+ if (!stamp || !stamp.tiles) return;
+
+ stamp.tiles.forEach(t => {
+ const tx = x + t.x;
+ const ty = y + t.y;
+ if (tx < 0 || tx >= gw || ty < 0 || ty >= gh) return;
+
+ const template = templateBySprite[`${t.sheetId}:${t.frameIndex}`];
+ if (!template) return;
+
+ const key = `${tx},${ty}`;
+ const data = {
+ templateId: template.id,
+ sheetId: template.sheetId,
+ frameIndex: template.frameIndex,
+ isWalkable: template.isWalkable
+ };
+
+ if (layer.startsWith('decor')) {
+ const decorIdx = getDecorLayerIndex(layer);
+ if (decorIdx !== null) {
+ decorData[decorIdx][key] = { ...data, isWalkable: true };
+ }
+ } else if (layer === 'floor' || layer === 'wall') {
+ delete floorData[key];
+ delete wallData[key];
+ if (data.isWalkable) floorData[key] = data;
+ else wallData[key] = data;
+ }
+
+ render(tx, ty);
+ });
+
+ updateStats();
+ saveData();
+}
+
function setTool(t) {
tool = t;
document.querySelectorAll('[data-tool]').forEach(b => b.classList.toggle('active', b.dataset.tool === t));
}
+function getDecorLayerIndex(layerKey) {
+ switch (layerKey) {
+ case 'decor1': return 0;
+ case 'decor2': return 1;
+ case 'decor3': return 2;
+ case 'decor4': return 3;
+ default: return null;
+ }
+}
+
function setLayer(l) {
layer = l;
document.querySelectorAll('[data-layer]').forEach(b => b.classList.toggle('active', b.dataset.layer === l));
document.getElementById('tilePaletteCard').classList.toggle('hidden', l === 'spawn');
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 = '';
// Refresh templates when switching between floor/wall layers
if (l === 'floor' || l === 'wall') {
renderTemplates();
+ } else if (l.startsWith('decor')) {
+ renderTemplates();
}
}
@@ -683,6 +845,8 @@ function renderTemplates(filterTags = []) {
filtered = filtered.filter(t => t.isWalkable);
} else if (layer === 'wall') {
filtered = filtered.filter(t => !t.isWalkable);
+ } else if (layer.startsWith('decor')) {
+ filtered = filtered.filter(t => t.category === 'Decoration');
}
// Filter by tags
@@ -737,6 +901,7 @@ function renderTemplates(filterTags = []) {
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'));
el.classList.add('active');
const type = el.dataset.type;
@@ -761,6 +926,7 @@ function selectPaletteItem(el) {
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'));
el.classList.add('selected');
sel = {
@@ -773,6 +939,26 @@ function selectMob(el) {
document.getElementById('selectionDetails').textContent = `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'));
+ 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 = '';
+}
+
+function filterStamps() {
+ const search = document.getElementById('stampSearch').value.toLowerCase();
+ document.querySelectorAll('.stamp-select-item').forEach(el => {
+ const name = el.dataset.stampName.toLowerCase();
+ el.style.display = name.includes(search) ? '' : 'none';
+ });
+}
+
function filterMobs() {
const search = document.getElementById('mobSearch').value.toLowerCase();
document.querySelectorAll('.mob-select-item').forEach(el => {
@@ -784,9 +970,10 @@ function filterMobs() {
function updateStats() {
const floors = Object.keys(floorData).length;
const walls = Object.keys(wallData).length;
+ const decors = decorData.reduce((acc, layer) => acc + Object.keys(layer).length, 0);
const spawns = Object.keys(spawnData).length;
const connections = Object.keys(connectionData).length;
- document.getElementById('statsInfo').textContent = `Tiles: ${floors} | Walls: ${walls} | Spawns: ${spawns} | Connections: ${connections}`;
+ document.getElementById('statsInfo').textContent = `Tiles: ${floors} | Walls: ${walls} | Decor: ${decors} | Spawns: ${spawns} | Connections: ${connections}`;
}
function saveData() {
@@ -800,6 +987,12 @@ function saveData() {
const [x, y] = k.split(',').map(Number);
tiles.push({ x, y, sheetId: v.sheetId, frameIndex: v.frameIndex, templateId: v.templateId, isWalkable: false });
});
+ decorData.forEach((layerData, idx) => {
+ Object.entries(layerData).forEach(([k, v]) => {
+ const [x, y] = k.split(',').map(Number);
+ tiles.push({ x, y, sheetId: v.sheetId, frameIndex: v.frameIndex, templateId: v.templateId, layer: idx + 1, isWalkable: true });
+ });
+ });
document.getElementById('tileGridJson').value = JSON.stringify(tiles);
// Connection points
@@ -843,6 +1036,10 @@ function clearLayer() {
if (!confirm(`Clear all ${layer}?`)) return;
if (layer === 'floor') floorData = {};
else if (layer === 'wall') wallData = {};
+ else if (layer.startsWith('decor')) {
+ const decorIdx = getDecorLayerIndex(layer);
+ if (decorIdx !== null) decorData[decorIdx] = {};
+ }
else {
spawnData = {};
connectionData = {};
@@ -853,7 +1050,7 @@ function clearLayer() {
function clearAll() {
if (!confirm('Clear everything?')) return;
- floorData = {}; wallData = {}; spawnData = {}; connectionData = {};
+ floorData = {}; wallData = {}; decorData = [{}, {}, {}, {}]; spawnData = {}; connectionData = {};
buildGrid();
saveData();
}
diff --git a/Services/Admin/Pages/DungeonBuilder/RoomEdit.cshtml.cs b/Services/Admin/Pages/DungeonBuilder/RoomEdit.cshtml.cs
index 615f39c..8cdf2ec 100644
--- a/Services/Admin/Pages/DungeonBuilder/RoomEdit.cshtml.cs
+++ b/Services/Admin/Pages/DungeonBuilder/RoomEdit.cshtml.cs
@@ -24,6 +24,7 @@ public class RoomEditModel : AdminPageModel
public List
Objects { get; set; } = new();
public List Mobs { get; set; } = new();
public List TileTemplates { get; set; } = new();
+ public List TileStamps { get; set; } = new();
///
/// TileTemplates serialized as JSON for JavaScript consumption.
@@ -45,6 +46,17 @@ public class RoomEditModel : AdminPageModel
};
}).Where(t => t.sheetId.HasValue)
);
+
+ public string TileStampsJson => JsonSerializer.Serialize(
+ TileStamps.Select(s => new
+ {
+ id = s.Id,
+ name = s.Name,
+ width = s.Width,
+ height = s.Height,
+ tiles = ParseStampTiles(s.TilesJson)
+ })
+ );
private static (int? sheetId, int frameIndex) ExtractTileInfo(string? tilesJson)
{
@@ -64,6 +76,29 @@ public class RoomEditModel : AdminPageModel
public int SheetId { get; set; }
public int FrameIndex { get; set; }
}
+
+ private class StampTile
+ {
+ public int X { get; set; }
+ public int Y { get; set; }
+ public int SheetId { get; set; }
+ public int FrameIndex { get; set; }
+ public int? Layer { get; set; }
+ }
+
+ private static List ParseStampTiles(string? json)
+ {
+ if (string.IsNullOrEmpty(json)) return new List();
+ try
+ {
+ var options = new JsonSerializerOptions { PropertyNameCaseInsensitive = true };
+ return JsonSerializer.Deserialize>(json, options) ?? new List();
+ }
+ catch
+ {
+ return new List();
+ }
+ }
public string CdnBaseUrl => NormalizeCdnBaseUrl(_config["Cdn:BaseUrl"]);
@@ -201,5 +236,10 @@ public class RoomEditModel : AdminPageModel
.OrderBy(t => t.Category)
.ThenBy(t => t.Name)
.ToListAsync();
+
+ TileStamps = await _db.TileStamps
+ .Where(s => s.IsEnabled)
+ .OrderBy(s => s.Name)
+ .ToListAsync();
}
}
diff --git a/Services/Admin/Pages/DungeonBuilder/Stamps/Edit.cshtml b/Services/Admin/Pages/DungeonBuilder/Stamps/Edit.cshtml
new file mode 100644
index 0000000..abb11b7
--- /dev/null
+++ b/Services/Admin/Pages/DungeonBuilder/Stamps/Edit.cshtml
@@ -0,0 +1,309 @@
+@page "/admin/dungeonbuilder/stamps/edit"
+@model DungeonBuilder.Stamps.EditModel
+@{
+ ViewData["Title"] = Model.Stamp.Id == 0 ? "New Tile Stamp" : $"Edit Stamp: {Model.Stamp.Name}";
+}
+
+
+
+
+
+@ViewData["Title"]
+
+@if (!string.IsNullOrEmpty(Model.Message))
+{
+
+ @Model.Message
+
+}
+
+
+
+
diff --git a/Services/Admin/Pages/DungeonBuilder/Stamps/Edit.cshtml.cs b/Services/Admin/Pages/DungeonBuilder/Stamps/Edit.cshtml.cs
new file mode 100644
index 0000000..a6159a7
--- /dev/null
+++ b/Services/Admin/Pages/DungeonBuilder/Stamps/Edit.cshtml.cs
@@ -0,0 +1,128 @@
+using DataServer.Data;
+using DataServer.Data.Entities;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using System.Text.Json;
+
+namespace GameServices.Admin.Pages.DungeonBuilder.Stamps;
+
+public class EditModel : AdminPageModel
+{
+ private readonly GameDbContext _db;
+ private readonly IConfiguration _config;
+
+ public EditModel(GameDbContext db, IConfiguration config)
+ {
+ _db = db;
+ _config = config;
+ }
+
+ [BindProperty]
+ public TileStamp Stamp { get; set; } = new();
+
+ public List TileSheets { get; set; } = new();
+ public List TileDefinitions { get; set; } = new();
+
+ public string TileDefinitionsJson => JsonSerializer.Serialize(
+ TileDefinitions.Select(t => new
+ {
+ id = t.Id,
+ sheetId = t.TileMapSheetId,
+ frameIndex = t.FrameIndex,
+ name = t.Name
+ })
+ );
+
+ public string CdnBaseUrl => NormalizeCdnBaseUrl(_config["Cdn:BaseUrl"]);
+
+ public string? Message { get; set; }
+ public bool IsError { get; set; }
+
+ public async Task OnGetAsync(int? id)
+ {
+ await LoadReferenceData();
+
+ if (id.HasValue)
+ {
+ var stamp = await _db.TileStamps.FindAsync(id.Value);
+ if (stamp != null)
+ {
+ Stamp = stamp;
+ }
+ }
+ else
+ {
+ Stamp.IsEnabled = true;
+ Stamp.Width = 1;
+ Stamp.Height = 1;
+ }
+ }
+
+ public async Task OnPostAsync()
+ {
+ await LoadReferenceData();
+
+ if (string.IsNullOrWhiteSpace(Stamp.Name))
+ {
+ IsError = true;
+ Message = "Name is required.";
+ return Page();
+ }
+
+ Stamp.UpdatedAt = DateTime.UtcNow;
+
+ if (Stamp.Id == 0)
+ {
+ Stamp.CreatedAt = DateTime.UtcNow;
+ _db.TileStamps.Add(Stamp);
+ Message = "Stamp created!";
+ }
+ else
+ {
+ var existing = await _db.TileStamps.FindAsync(Stamp.Id);
+ if (existing == null)
+ {
+ IsError = true;
+ Message = "Stamp not found.";
+ return Page();
+ }
+
+ existing.Name = Stamp.Name;
+ existing.Description = Stamp.Description;
+ existing.Width = Stamp.Width;
+ existing.Height = Stamp.Height;
+ existing.TilesJson = Stamp.TilesJson;
+ existing.IsEnabled = Stamp.IsEnabled;
+ existing.UpdatedAt = DateTime.UtcNow;
+ }
+
+ await _db.SaveChangesAsync();
+
+ return RedirectToPage(new { id = Stamp.Id });
+ }
+
+ private async Task LoadReferenceData()
+ {
+ TileSheets = await _db.TileMapSheets
+ .Where(s => s.IsEnabled)
+ .OrderBy(s => s.Name)
+ .ToListAsync();
+
+ TileDefinitions = await _db.TileDefinitions
+ .Where(t => t.IsEnabled)
+ .OrderBy(t => t.TileMapSheetId)
+ .ThenBy(t => t.FrameIndex)
+ .ToListAsync();
+ }
+
+ private string NormalizeCdnBaseUrl(string? baseUrl)
+ {
+ baseUrl = string.IsNullOrWhiteSpace(baseUrl)
+ ? "https://assets.aeternalisgames.com"
+ : baseUrl;
+ baseUrl = baseUrl.TrimEnd('/');
+ if (!baseUrl.EndsWith("/downloads", StringComparison.OrdinalIgnoreCase))
+ baseUrl += "/downloads";
+ return baseUrl;
+ }
+}
diff --git a/Services/Admin/Pages/DungeonBuilder/Stamps/Index.cshtml b/Services/Admin/Pages/DungeonBuilder/Stamps/Index.cshtml
new file mode 100644
index 0000000..8faddab
--- /dev/null
+++ b/Services/Admin/Pages/DungeonBuilder/Stamps/Index.cshtml
@@ -0,0 +1,66 @@
+@page "/admin/dungeonbuilder/stamps"
+@model DungeonBuilder.Stamps.IndexModel
+@{
+ ViewData["Title"] = "Tile Stamps";
+}
+
+
+
+
+
+
Tile Stamps
+
Saved multi-tile patterns for fast painting
+
+
+ New Stamp
+
+
+@if (!string.IsNullOrEmpty(Model.Message))
+{
+
+ @Model.Message
+
+}
+
+
+
+
+
+ Name
+ Size
+ Enabled
+ Actions
+
+
+
+ @foreach (var s in Model.Stamps)
+ {
+
+ @s.Name
+ @s.Width x @s.Height
+
+
+ @(s.IsEnabled ? "On" : "Off")
+
+
+
+
+
+
+ }
+ @if (!Model.Stamps.Any())
+ {
+
+ No stamps created yet.
+
+ }
+
+
+
diff --git a/Services/Admin/Pages/DungeonBuilder/Stamps/Index.cshtml.cs b/Services/Admin/Pages/DungeonBuilder/Stamps/Index.cshtml.cs
new file mode 100644
index 0000000..fde8ec4
--- /dev/null
+++ b/Services/Admin/Pages/DungeonBuilder/Stamps/Index.cshtml.cs
@@ -0,0 +1,39 @@
+using DataServer.Data;
+using DataServer.Data.Entities;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+
+namespace GameServices.Admin.Pages.DungeonBuilder.Stamps;
+
+public class IndexModel : AdminPageModel
+{
+ private readonly GameDbContext _db;
+
+ public IndexModel(GameDbContext db)
+ {
+ _db = db;
+ }
+
+ public List Stamps { get; set; } = new();
+
+ public string? Message { get; set; }
+ public bool IsError { get; set; }
+
+ public async Task OnGetAsync()
+ {
+ Stamps = await _db.TileStamps
+ .OrderBy(s => s.Name)
+ .ToListAsync();
+ }
+
+ public async Task OnPostDeleteAsync(int id)
+ {
+ var stamp = await _db.TileStamps.FindAsync(id);
+ if (stamp != null)
+ {
+ _db.TileStamps.Remove(stamp);
+ await _db.SaveChangesAsync();
+ }
+ return RedirectToPage();
+ }
+}
diff --git a/Services/Admin/Pages/DungeonBuilder/TileEdit.cshtml b/Services/Admin/Pages/DungeonBuilder/TileEdit.cshtml
index 79c76fa..a264249 100644
--- a/Services/Admin/Pages/DungeonBuilder/TileEdit.cshtml
+++ b/Services/Admin/Pages/DungeonBuilder/TileEdit.cshtml
@@ -288,6 +288,8 @@ let primarySet = false;
// All loaded sheets (by ID) for rendering tiles from any sheet
const loadedSheets = {};
+const tileDefs = @Html.Raw(Model.TileDefinitionsJson);
+const tileDefMap = {};
// Pre-load all sheet data from the dropdown
function preloadSheets() {
@@ -308,6 +310,9 @@ function preloadSheets() {
document.addEventListener('DOMContentLoaded', () => {
preloadSheets();
+ tileDefs.forEach(t => {
+ tileDefMap[`${t.sheetId}:${t.frameIndex}`] = t.id;
+ });
loadExisting();
buildTemplateGrid();
});
@@ -381,7 +386,7 @@ function paintCell(x, y) {
if (!selected) return;
const key = `${x},${y}`;
- templateData[key] = { sheetId: selected.sheetId, frameIndex: selected.frameIndex };
+ templateData[key] = { sheetId: selected.sheetId, frameIndex: selected.frameIndex, tileDefId: selected.tileDefId };
// First tile becomes primary
if (!primarySet) {
@@ -430,7 +435,8 @@ function selectTile(frameIndex) {
document.querySelector(`.palette-tile[data-frame="${frameIndex}"]`)?.classList.add('active');
const sheet = loadedSheets[currentSheetId];
- selected = { sheetId: currentSheetId, frameIndex };
+ const tileDefId = tileDefMap[`${currentSheetId}:${frameIndex}`] || null;
+ selected = { sheetId: currentSheetId, frameIndex, tileDefId };
document.getElementById('selectedInfo').textContent = `Frame ${frameIndex}`;
diff --git a/Services/Admin/Pages/DungeonBuilder/TileEdit.cshtml.cs b/Services/Admin/Pages/DungeonBuilder/TileEdit.cshtml.cs
index a06be8e..9a8bbea 100644
--- a/Services/Admin/Pages/DungeonBuilder/TileEdit.cshtml.cs
+++ b/Services/Admin/Pages/DungeonBuilder/TileEdit.cshtml.cs
@@ -30,6 +30,16 @@ public class TileEditModel : AdminPageModel
public string? SocketConfigJson { get; set; }
public List TileSheets { get; set; } = new();
+ public List TileDefinitions { get; set; } = new();
+
+ public string TileDefinitionsJson => JsonSerializer.Serialize(
+ TileDefinitions.Select(t => new
+ {
+ id = t.Id,
+ sheetId = t.TileMapSheetId,
+ frameIndex = t.FrameIndex
+ })
+ );
/// All existing socket names for autocomplete
public List AllSocketNames { get; set; } = new();
@@ -214,6 +224,10 @@ public class TileEditModel : AdminPageModel
.Where(s => s.IsEnabled)
.OrderBy(s => s.Name)
.ToListAsync();
+
+ TileDefinitions = await _db.TileDefinitions
+ .Where(t => t.IsEnabled)
+ .ToListAsync();
AllSocketNames = await _db.SocketNames
.OrderByDescending(s => s.UsageCount)
diff --git a/Services/Admin/Pages/TileMaps/Edit.cshtml b/Services/Admin/Pages/TileMaps/Edit.cshtml
index edd5775..2e27644 100644
--- a/Services/Admin/Pages/TileMaps/Edit.cshtml
+++ b/Services/Admin/Pages/TileMaps/Edit.cshtml
@@ -124,23 +124,72 @@
-
+
@if (Model.Sheet.Id > 0)
{