Dungeon Builder Phase 2

This commit is contained in:
dingo
2026-01-31 19:12:15 -05:00
parent 739c624b71
commit f0587254c5
10 changed files with 7526 additions and 131 deletions
+252 -66
View File
@@ -104,6 +104,10 @@ public class DungeonGeneratorV3
// Tile data cache
private Dictionary<int, TileDefinition> _tileDefinitions = new();
private Dictionary<int, TileMapSheet> _tileSheets = new();
private List<TileDefinition> _floorTileDefinitions = new();
private List<TileDefinition> _wallTileDefinitions = new();
private List<TileDefinition> _doorTileDefinitions = new();
private Dictionary<string, int> _placedTileDefinitions = new();
// Bucket rules and tile bucket assignments
private Dictionary<int, HashSet<int>> _tileBucketsByDefinitionId = new();
@@ -544,6 +548,7 @@ public class DungeonGeneratorV3
await LoadBucketDataAsync();
ApplyBucketFilters();
BuildTileDefinitionLists();
}
private async Task<List<DungeonRoomV2>> GenerateRoomsAsync(DungeonLayoutV2 layout)
@@ -1009,6 +1014,49 @@ public class DungeonGeneratorV3
BuildSpriteToTemplateLookup();
}
private void BuildTileDefinitionLists()
{
var defs = _tileDefinitions.Values.Where(t => t.IsEnabled).ToList();
if (_paletteAllowedBuckets.Count > 0 || _enforceBiomeBuckets)
{
defs = defs.Where(TileDefinitionMatchesBucketFilters).ToList();
}
_floorTileDefinitions = defs
.Where(t => t.IsWalkable && t.Type != TileType.Wall && t.Type != TileType.WallDecor)
.ToList();
_wallTileDefinitions = defs
.Where(t => !t.IsWalkable || t.Type == TileType.Wall || t.Type == TileType.WallDecor)
.ToList();
_doorTileDefinitions = defs
.Where(t => t.Type == TileType.Door)
.ToList();
Log($"TileDefinitions: floor={_floorTileDefinitions.Count}, wall={_wallTileDefinitions.Count}, door={_doorTileDefinitions.Count}");
}
private bool TileDefinitionMatchesBucketFilters(TileDefinition def)
{
if (!_tileBucketsByDefinitionId.TryGetValue(def.Id, out var buckets) || buckets.Count == 0)
{
return _paletteAllowedBuckets.Count == 0 && !_enforceBiomeBuckets;
}
if (_paletteAllowedBuckets.Count > 0 && !buckets.Overlaps(_paletteAllowedBuckets))
{
return false;
}
if (_enforceBiomeBuckets && !string.IsNullOrWhiteSpace(_paletteBiome))
{
return TemplateMatchesBiomeBucket(buckets);
}
return true;
}
private bool TemplateMatchesBucketFilters(TileTemplate template)
{
var buckets = GetTemplateBucketIds(template);
@@ -1082,43 +1130,55 @@ public class DungeonGeneratorV3
if (worldX >= 0 && worldX < MapWidth && worldY >= 0 && worldY < MapHeight)
{
// Ensure the sheet is loaded for client rendering
EnsureSheetLoaded(t.SheetId);
// Use IsWalkable from the tile placement data (set by room editor)
// This is the primary source of truth for walkability
var layer = t.Layer ?? 0;
int tileDefId = t.TileDefinitionId ?? 0;
int sheetId = t.SheetId;
int frameIndex = t.FrameIndex;
bool isWalkable = t.IsWalkable;
int templateId = t.TemplateId ?? 0;
// If no templateId provided, try to find one by sprite lookup (legacy support)
if (templateId == 0)
if (tileDefId > 0 && _tileDefinitions.TryGetValue(tileDefId, out var def))
{
sheetId = def.TileMapSheetId;
frameIndex = def.FrameIndex;
if (layer == 0)
{
isWalkable = def.IsWalkable;
}
}
else if (templateId == 0)
{
var tileTemplate = FindTemplateBySprite(t.SheetId, t.FrameIndex);
if (tileTemplate != null)
{
templateId = tileTemplate.Id;
// Only override isWalkable if not explicitly set in placement
// (legacy data won't have IsWalkable set)
}
}
layout.Tiles[worldX, worldY] = templateId > 0 ? templateId : 1; // Non-zero to indicate tile is placed
layout.Walkable[worldX, worldY] = isWalkable;
// Track placement for socket matching if we found a template
if (templateId > 0)
EnsureSheetLoaded(sheetId);
if (layer == 0)
{
_placedTemplates[$"{worldX},{worldY}"] = templateId;
layout.Tiles[worldX, worldY] = tileDefId > 0 ? tileDefId : (templateId > 0 ? templateId : 1);
layout.Walkable[worldX, worldY] = isWalkable;
if (tileDefId > 0)
{
_placedTileDefinitions[$"{worldX},{worldY}"] = tileDefId;
}
else if (templateId > 0)
{
_placedTemplates[$"{worldX},{worldY}"] = templateId;
}
}
layout.TileDetails.Add(new PlacedTile
{
X = worldX,
Y = worldY,
TileDefinitionId = 0, // No TileDefinition - using template directly
SheetId = t.SheetId,
FrameIndex = t.FrameIndex,
Layer = 0
TileDefinitionId = tileDefId,
SheetId = sheetId,
FrameIndex = frameIndex,
Layer = layer
});
}
}
@@ -1369,6 +1429,7 @@ public class DungeonGeneratorV3
// Clear from placed templates tracking
_placedTemplates.Remove($"{x},{cy}");
_placedTileDefinitions.Remove($"{x},{cy}");
}
}
}
@@ -1396,6 +1457,7 @@ public class DungeonGeneratorV3
// Clear from placed templates tracking
_placedTemplates.Remove($"{cx},{y}");
_placedTileDefinitions.Remove($"{cx},{y}");
}
}
}
@@ -1412,58 +1474,93 @@ public class DungeonGeneratorV3
{
Log($"--- Filling Floor Tiles ---");
Log($"Floor templates available: {_floorTemplates.Count}");
Log($"Floor definitions available: {_floorTileDefinitions.Count}");
Log($"Socket matching: {(UseSocketMatching ? "ENABLED" : "DISABLED")}");
// Clear placement tracking for socket matching
_placedTemplates.Clear();
// Log detailed template info for debugging
if (_floorTileDefinitions.Count > 0)
{
int tileCount = 0;
bool loggedFirst = false;
for (int y = 0; y < MapHeight; y++)
{
for (int x = 0; x < MapWidth; x++)
{
if (layout.Walkable[x, y] && layout.Tiles[x, y] == 0)
{
var def = SelectFloorDefinition(x, y, layout);
if (def == null) continue;
if (!loggedFirst)
{
loggedFirst = true;
Log($"First selected floor: TileDef='{def.Name ?? def.Id.ToString()}', Sheet={def.TileMapSheetId}, Frame={def.FrameIndex}");
}
EnsureSheetLoaded(def.TileMapSheetId);
layout.Tiles[x, y] = def.Id;
layout.TileDetails.Add(new PlacedTile
{
X = x,
Y = y,
TileDefinitionId = def.Id,
SheetId = def.TileMapSheetId,
FrameIndex = def.FrameIndex,
Layer = 0
});
_placedTileDefinitions[$"{x},{y}"] = def.Id;
tileCount++;
}
}
}
Log($"Placed {tileCount} floor tiles");
return;
}
// Fallback to templates
foreach (var t in _floorTemplates)
{
LogTileTemplate(t, "Floor");
}
bool loggedFirst = false;
int tileCount = 0;
bool loggedFirstTemplate = false;
int templateCount = 0;
for (int y = 0; y < MapHeight; y++)
{
for (int x = 0; x < MapWidth; x++)
{
// Only fill walkable cells that don't have tiles yet
if (layout.Walkable[x, y] && layout.Tiles[x, y] == 0)
{
var result = SelectFloorTemplate(x, y, layout);
if (result != null)
{
if (!loggedFirst)
if (!loggedFirstTemplate)
{
loggedFirst = true;
loggedFirstTemplate = true;
Log($"First selected floor: Template='{result.Value.TemplateName}', Sheet={result.Value.SheetId}, Frame={result.Value.FrameIndex}");
}
layout.Tiles[x, y] = result.Value.TemplateId; // Use template ID for tracking
layout.Tiles[x, y] = result.Value.TemplateId;
layout.TileDetails.Add(new PlacedTile
{
X = x,
Y = y,
TileDefinitionId = 0, // No TileDefinition - using template directly
TileDefinitionId = 0,
SheetId = result.Value.SheetId,
FrameIndex = result.Value.FrameIndex,
Layer = 0
});
tileCount++;
if (LogEveryTile)
{
Log($" Floor ({x},{y}): Template='{result.Value.TemplateName}', Sheet={result.Value.SheetId}, Frame={result.Value.FrameIndex}");
}
templateCount++;
}
}
}
}
Log($"Placed {tileCount} floor tiles");
Log($"Placed {templateCount} floor tiles");
}
/// <summary>
@@ -1476,6 +1573,65 @@ public class DungeonGeneratorV3
public int SheetId;
public int FrameIndex;
}
private TileDefinition? SelectFloorDefinition(int x, int y, DungeonLayoutV2 layout)
{
if (_floorTileDefinitions.Count == 0) return null;
var compatible = GetCompatibleTileDefinitions(_floorTileDefinitions, x, y, layout);
if (compatible.Count == 0) compatible = _floorTileDefinitions;
return compatible[_rng.Next(compatible.Count)];
}
private TileDefinition? SelectWallDefinition(int x, int y, DungeonLayoutV2 layout)
{
if (_wallTileDefinitions.Count == 0) return null;
var compatible = GetCompatibleTileDefinitions(_wallTileDefinitions, x, y, layout);
if (compatible.Count == 0) compatible = _wallTileDefinitions;
return compatible[_rng.Next(compatible.Count)];
}
private List<TileDefinition> GetCompatibleTileDefinitions(List<TileDefinition> defs, int x, int y, DungeonLayoutV2 layout)
{
if (!UseBucketMatching || _bucketRules.Count == 0) return defs;
return defs.Where(d => IsBucketCompatible(d, x, y, layout)).ToList();
}
private bool IsBucketCompatible(TileDefinition def, int x, int y, DungeonLayoutV2 layout)
{
if (!UseBucketMatching || _bucketRules.Count == 0) return true;
if (!_tileBucketsByDefinitionId.TryGetValue(def.Id, out var sourceBuckets) || sourceBuckets.Count == 0) return true;
if (y > 0 && _placedTileDefinitions.TryGetValue($"{x},{y-1}", out var northDefId))
{
if (!BucketsCompatible(sourceBuckets, GetTileBuckets(northDefId)))
return false;
}
if (y < layout.Height - 1 && _placedTileDefinitions.TryGetValue($"{x},{y+1}", out var southDefId))
{
if (!BucketsCompatible(sourceBuckets, GetTileBuckets(southDefId)))
return false;
}
if (x < layout.Width - 1 && _placedTileDefinitions.TryGetValue($"{x+1},{y}", out var eastDefId))
{
if (!BucketsCompatible(sourceBuckets, GetTileBuckets(eastDefId)))
return false;
}
if (x > 0 && _placedTileDefinitions.TryGetValue($"{x-1},{y}", out var westDefId))
{
if (!BucketsCompatible(sourceBuckets, GetTileBuckets(westDefId)))
return false;
}
return true;
}
private HashSet<int> GetTileBuckets(int tileDefId)
{
return _tileBucketsByDefinitionId.TryGetValue(tileDefId, out var buckets) ? buckets : new HashSet<int>();
}
/// <summary>
/// Select a floor template for the given position.
@@ -1591,20 +1747,53 @@ public class DungeonGeneratorV3
{
Log($"--- Placing Wall Tiles ---");
Log($"Wall templates available: {_wallTemplates.Count}");
Log($"Wall definitions available: {_wallTileDefinitions.Count}");
Log($"Socket matching: {(UseSocketMatching ? "ENABLED" : "DISABLED")}");
// Clear placement tracking for socket matching (separate from floor tiles)
_placedTemplates.Clear();
// Log detailed template info for debugging
_placedTileDefinitions.Clear();
if (_wallTileDefinitions.Count > 0)
{
int wallCount = 0;
for (int y = 0; y < MapHeight; y++)
{
for (int x = 0; x < MapWidth; x++)
{
if (!layout.Walkable[x, y] && HasAdjacentWalkable(layout, x, y) && layout.Tiles[x, y] == 0)
{
var def = SelectWallDefinition(x, y, layout);
if (def == null) continue;
EnsureSheetLoaded(def.TileMapSheetId);
layout.Tiles[x, y] = def.Id;
layout.TileDetails.Add(new PlacedTile
{
X = x,
Y = y,
TileDefinitionId = def.Id,
SheetId = def.TileMapSheetId,
FrameIndex = def.FrameIndex,
Layer = 0
});
_placedTileDefinitions[$"{x},{y}"] = def.Id;
wallCount++;
}
}
}
Log($"Placed {wallCount} wall tiles");
return;
}
_placedTileDefinitions.Clear();
foreach (var t in _wallTemplates)
{
LogTileTemplate(t, "Wall");
}
int wallCount = 0;
// Find cells adjacent to walkable that aren't walkable themselves
int templateCount = 0;
for (int y = 0; y < MapHeight; y++)
{
for (int x = 0; x < MapWidth; x++)
@@ -1619,23 +1808,18 @@ public class DungeonGeneratorV3
{
X = x,
Y = y,
TileDefinitionId = 0, // No TileDefinition - using template directly
TileDefinitionId = 0,
SheetId = result.Value.SheetId,
FrameIndex = result.Value.FrameIndex,
Layer = 0
});
wallCount++;
if (LogEveryTile)
{
Log($" Wall ({x},{y}): Template='{result.Value.TemplateName}', Sheet={result.Value.SheetId}, Frame={result.Value.FrameIndex}");
}
templateCount++;
}
}
}
}
Log($"Placed {wallCount} wall tiles");
Log($"Placed {templateCount} wall tiles");
}
private bool HasAdjacentWalkable(DungeonLayoutV2 layout, int x, int y)
@@ -1983,25 +2167,25 @@ public class DungeonGeneratorV3
if (y > 0 && _placedTemplates.TryGetValue($"{x},{y-1}", out var northTemplateId))
{
if (!TemplatesBucketsCompatible(sourceBuckets, GetTemplateBucketIdsById(northTemplateId)))
if (!BucketsCompatible(sourceBuckets, GetTemplateBucketIdsById(northTemplateId)))
return false;
}
if (y < layout.Height - 1 && _placedTemplates.TryGetValue($"{x},{y+1}", out var southTemplateId))
{
if (!TemplatesBucketsCompatible(sourceBuckets, GetTemplateBucketIdsById(southTemplateId)))
if (!BucketsCompatible(sourceBuckets, GetTemplateBucketIdsById(southTemplateId)))
return false;
}
if (x < layout.Width - 1 && _placedTemplates.TryGetValue($"{x+1},{y}", out var eastTemplateId))
{
if (!TemplatesBucketsCompatible(sourceBuckets, GetTemplateBucketIdsById(eastTemplateId)))
if (!BucketsCompatible(sourceBuckets, GetTemplateBucketIdsById(eastTemplateId)))
return false;
}
if (x > 0 && _placedTemplates.TryGetValue($"{x-1},{y}", out var westTemplateId))
{
if (!TemplatesBucketsCompatible(sourceBuckets, GetTemplateBucketIdsById(westTemplateId)))
if (!BucketsCompatible(sourceBuckets, GetTemplateBucketIdsById(westTemplateId)))
return false;
}
@@ -2017,7 +2201,7 @@ public class DungeonGeneratorV3
return template == null ? new HashSet<int>() : GetTemplateBucketIds(template);
}
private bool TemplatesBucketsCompatible(HashSet<int> sourceBuckets, HashSet<int> targetBuckets)
private bool BucketsCompatible(HashSet<int> sourceBuckets, HashSet<int> targetBuckets)
{
if (_bucketRules.Count == 0) return true;
if (sourceBuckets.Count == 0 || targetBuckets.Count == 0) return true;
@@ -2246,6 +2430,8 @@ public class RoomTilePlacement
public int SheetId { get; set; }
public int FrameIndex { get; set; }
public int? TemplateId { get; set; } // TileTemplate ID (new format)
public int? TileDefinitionId { get; set; }
public int? Layer { get; set; }
public bool IsWalkable { get; set; } = true; // Whether this tile is walkable (new format)
}
File diff suppressed because it is too large Load Diff
@@ -0,0 +1,186 @@
using System;
using Microsoft.EntityFrameworkCore.Metadata;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace SystemRevivalServer.Migrations
{
/// <inheritdoc />
public partial class BuilderChanges : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<bool>(
name: "IsInteractable",
table: "tile_definitions",
type: "tinyint(1)",
nullable: false,
defaultValue: false);
migrationBuilder.AddColumn<string>(
name: "AllowedBucketIdsJson",
table: "dungeon_palettes",
type: "json",
nullable: true)
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AddColumn<bool>(
name: "EnforceBiomeBuckets",
table: "dungeon_palettes",
type: "tinyint(1)",
nullable: false,
defaultValue: false);
migrationBuilder.CreateTable(
name: "tile_buckets",
columns: table => new
{
Id = table.Column<int>(type: "int", nullable: false)
.Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
Name = table.Column<string>(type: "varchar(64)", maxLength: 64, nullable: false)
.Annotation("MySql:CharSet", "utf8mb4"),
BucketType = table.Column<string>(type: "varchar(32)", maxLength: 32, nullable: true)
.Annotation("MySql:CharSet", "utf8mb4"),
Description = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true)
.Annotation("MySql:CharSet", "utf8mb4"),
IsEnabled = table.Column<bool>(type: "tinyint(1)", nullable: false),
CreatedAt = table.Column<DateTime>(type: "datetime(6)", nullable: false),
UpdatedAt = table.Column<DateTime>(type: "datetime(6)", nullable: false)
},
constraints: table =>
{
table.PrimaryKey("PK_tile_buckets", x => x.Id);
})
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.CreateTable(
name: "tile_stamps",
columns: table => new
{
Id = table.Column<int>(type: "int", nullable: false)
.Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
Name = table.Column<string>(type: "varchar(64)", maxLength: 64, nullable: false)
.Annotation("MySql:CharSet", "utf8mb4"),
Description = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true)
.Annotation("MySql:CharSet", "utf8mb4"),
Width = table.Column<int>(type: "int", nullable: false),
Height = table.Column<int>(type: "int", nullable: false),
TilesJson = table.Column<string>(type: "json", nullable: true)
.Annotation("MySql:CharSet", "utf8mb4"),
IsEnabled = table.Column<bool>(type: "tinyint(1)", nullable: false),
CreatedAt = table.Column<DateTime>(type: "datetime(6)", nullable: false),
UpdatedAt = table.Column<DateTime>(type: "datetime(6)", nullable: false)
},
constraints: table =>
{
table.PrimaryKey("PK_tile_stamps", x => x.Id);
})
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.CreateTable(
name: "tile_bucket_rules",
columns: table => new
{
Id = table.Column<int>(type: "int", nullable: false)
.Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
SourceBucketId = table.Column<int>(type: "int", nullable: false),
TargetBucketId = table.Column<int>(type: "int", nullable: false),
Weight = table.Column<float>(type: "float", nullable: false)
},
constraints: table =>
{
table.PrimaryKey("PK_tile_bucket_rules", x => x.Id);
table.ForeignKey(
name: "FK_tile_bucket_rules_tile_buckets_SourceBucketId",
column: x => x.SourceBucketId,
principalTable: "tile_buckets",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
table.ForeignKey(
name: "FK_tile_bucket_rules_tile_buckets_TargetBucketId",
column: x => x.TargetBucketId,
principalTable: "tile_buckets",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
})
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.CreateTable(
name: "tile_definition_buckets",
columns: table => new
{
Id = table.Column<int>(type: "int", nullable: false)
.Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
TileDefinitionId = table.Column<int>(type: "int", nullable: false),
TileBucketId = table.Column<int>(type: "int", nullable: false)
},
constraints: table =>
{
table.PrimaryKey("PK_tile_definition_buckets", x => x.Id);
table.ForeignKey(
name: "FK_tile_definition_buckets_tile_buckets_TileBucketId",
column: x => x.TileBucketId,
principalTable: "tile_buckets",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
table.ForeignKey(
name: "FK_tile_definition_buckets_tile_definitions_TileDefinitionId",
column: x => x.TileDefinitionId,
principalTable: "tile_definitions",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
})
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.CreateIndex(
name: "IX_tile_bucket_rules_SourceBucketId",
table: "tile_bucket_rules",
column: "SourceBucketId");
migrationBuilder.CreateIndex(
name: "IX_tile_bucket_rules_TargetBucketId",
table: "tile_bucket_rules",
column: "TargetBucketId");
migrationBuilder.CreateIndex(
name: "IX_tile_definition_buckets_TileBucketId",
table: "tile_definition_buckets",
column: "TileBucketId");
migrationBuilder.CreateIndex(
name: "IX_tile_definition_buckets_TileDefinitionId",
table: "tile_definition_buckets",
column: "TileDefinitionId");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropTable(
name: "tile_bucket_rules");
migrationBuilder.DropTable(
name: "tile_definition_buckets");
migrationBuilder.DropTable(
name: "tile_stamps");
migrationBuilder.DropTable(
name: "tile_buckets");
migrationBuilder.DropColumn(
name: "IsInteractable",
table: "tile_definitions");
migrationBuilder.DropColumn(
name: "AllowedBucketIdsJson",
table: "dungeon_palettes");
migrationBuilder.DropColumn(
name: "EnforceBiomeBuckets",
table: "dungeon_palettes");
}
}
}
File diff suppressed because it is too large Load Diff
+22
View File
@@ -0,0 +1,22 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace SystemRevivalServer.Migrations
{
/// <inheritdoc />
public partial class datachange : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
}
}
}
+171
View File
@@ -1430,6 +1430,9 @@ namespace SystemRevivalServer.Migrations
MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
b.Property<string>("AllowedBucketIdsJson")
.HasColumnType("json");
b.Property<string>("Biome")
.HasMaxLength(32)
.HasColumnType("varchar(32)");
@@ -1456,6 +1459,9 @@ namespace SystemRevivalServer.Migrations
b.Property<string>("DoorTemplateIdsJson")
.HasColumnType("json");
b.Property<bool>("EnforceBiomeBuckets")
.HasColumnType("tinyint(1)");
b.Property<string>("FloorTemplateIdsJson")
.HasColumnType("json");
@@ -2392,6 +2398,67 @@ namespace SystemRevivalServer.Migrations
b.ToTable("socket_names");
});
modelBuilder.Entity("DataServer.Data.Entities.TileBucket", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("int");
MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
b.Property<string>("BucketType")
.HasMaxLength(32)
.HasColumnType("varchar(32)");
b.Property<DateTime>("CreatedAt")
.HasColumnType("datetime(6)");
b.Property<string>("Description")
.HasMaxLength(256)
.HasColumnType("varchar(256)");
b.Property<bool>("IsEnabled")
.HasColumnType("tinyint(1)");
b.Property<string>("Name")
.IsRequired()
.HasMaxLength(64)
.HasColumnType("varchar(64)");
b.Property<DateTime>("UpdatedAt")
.HasColumnType("datetime(6)");
b.HasKey("Id");
b.ToTable("tile_buckets");
});
modelBuilder.Entity("DataServer.Data.Entities.TileBucketRule", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("int");
MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
b.Property<int>("SourceBucketId")
.HasColumnType("int");
b.Property<int>("TargetBucketId")
.HasColumnType("int");
b.Property<float>("Weight")
.HasColumnType("float");
b.HasKey("Id");
b.HasIndex("SourceBucketId");
b.HasIndex("TargetBucketId");
b.ToTable("tile_bucket_rules");
});
modelBuilder.Entity("DataServer.Data.Entities.TileDefinition", b =>
{
b.Property<int>("Id")
@@ -2425,6 +2492,9 @@ namespace SystemRevivalServer.Migrations
b.Property<bool>("IsEnabled")
.HasColumnType("tinyint(1)");
b.Property<bool>("IsInteractable")
.HasColumnType("tinyint(1)");
b.Property<bool>("IsWalkable")
.HasColumnType("tinyint(1)");
@@ -2483,6 +2553,29 @@ namespace SystemRevivalServer.Migrations
b.ToTable("tile_definitions");
});
modelBuilder.Entity("DataServer.Data.Entities.TileDefinitionBucket", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("int");
MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
b.Property<int>("TileBucketId")
.HasColumnType("int");
b.Property<int>("TileDefinitionId")
.HasColumnType("int");
b.HasKey("Id");
b.HasIndex("TileBucketId");
b.HasIndex("TileDefinitionId");
b.ToTable("tile_definition_buckets");
});
modelBuilder.Entity("DataServer.Data.Entities.TileMapSheet", b =>
{
b.Property<int>("Id")
@@ -2531,6 +2624,46 @@ namespace SystemRevivalServer.Migrations
b.ToTable("tilemap_sheets");
});
modelBuilder.Entity("DataServer.Data.Entities.TileStamp", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("int");
MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
b.Property<DateTime>("CreatedAt")
.HasColumnType("datetime(6)");
b.Property<string>("Description")
.HasMaxLength(256)
.HasColumnType("varchar(256)");
b.Property<int>("Height")
.HasColumnType("int");
b.Property<bool>("IsEnabled")
.HasColumnType("tinyint(1)");
b.Property<string>("Name")
.IsRequired()
.HasMaxLength(64)
.HasColumnType("varchar(64)");
b.Property<string>("TilesJson")
.HasColumnType("json");
b.Property<DateTime>("UpdatedAt")
.HasColumnType("datetime(6)");
b.Property<int>("Width")
.HasColumnType("int");
b.HasKey("Id");
b.ToTable("tile_stamps");
});
modelBuilder.Entity("DataServer.Data.Entities.TileTemplate", b =>
{
b.Property<int>("Id")
@@ -3103,6 +3236,25 @@ namespace SystemRevivalServer.Migrations
b.Navigation("SpriteSheet");
});
modelBuilder.Entity("DataServer.Data.Entities.TileBucketRule", b =>
{
b.HasOne("DataServer.Data.Entities.TileBucket", "SourceBucket")
.WithMany()
.HasForeignKey("SourceBucketId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("DataServer.Data.Entities.TileBucket", "TargetBucket")
.WithMany()
.HasForeignKey("TargetBucketId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.Navigation("SourceBucket");
b.Navigation("TargetBucket");
});
modelBuilder.Entity("DataServer.Data.Entities.TileDefinition", b =>
{
b.HasOne("DataServer.Data.Entities.TileMapSheet", "TileMapSheet")
@@ -3114,6 +3266,25 @@ namespace SystemRevivalServer.Migrations
b.Navigation("TileMapSheet");
});
modelBuilder.Entity("DataServer.Data.Entities.TileDefinitionBucket", b =>
{
b.HasOne("DataServer.Data.Entities.TileBucket", "TileBucket")
.WithMany()
.HasForeignKey("TileBucketId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("DataServer.Data.Entities.TileDefinition", "TileDefinition")
.WithMany()
.HasForeignKey("TileDefinitionId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.Navigation("TileBucket");
b.Navigation("TileDefinition");
});
modelBuilder.Entity("DataServer.Data.Entities.TileTemplate", b =>
{
b.HasOne("DataServer.Data.Entities.TileDefinition", "PrimaryTileDefinition")
@@ -342,15 +342,15 @@ let currentSheetId = null; // Currently selected sheet for painting
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 floorData = {}; // Floor tiles (walkable) - { tileDefId, sheetId, frameIndex, isWalkable }
let wallData = {}; // Wall tiles (not walkable) - { tileDefId, sheetId, frameIndex }
let decorData = [{}, {}, {}, {}]; // Four decoration layers
let spawnData = {}; // Spawns - { type, mobId?, mobName? }
let connectionData = {}; // Connection points (doorways) - { direction }
// All tile templates loaded from server (pre-loaded, no API call needed)
const allTileTemplates = @Html.Raw(Model.TileTemplatesJson);
let tileTemplates = []; // Filtered for current sheet
// All tile definitions loaded from server (pre-loaded, no API call needed)
const allTileDefs = @Html.Raw(Model.TileDefinitionsJson);
let tileDefs = []; // Filtered for current sheet
let allTags = new Set();
const allStamps = @Html.Raw(Model.TileStampsJson);
const stampMap = {};
@@ -377,7 +377,7 @@ function preloadSheets() {
document.addEventListener('DOMContentLoaded', () => {
preloadSheets();
allTileTemplates.forEach(t => {
allTileDefs.forEach(t => {
if (t.sheetId != null) {
templateBySprite[`${t.sheetId}:${t.frameIndex}`] = t;
}
@@ -395,7 +395,7 @@ function loadData() {
JSON.parse(td).forEach(t => {
const key = `${t.x},${t.y}`;
const data = {
templateId: t.templateId || 0,
tileDefId: t.tileDefinitionId || t.tileDefId || t.templateId || 0,
sheetId: t.sheetId,
frameIndex: t.frameIndex,
isWalkable: t.isWalkable !== false
@@ -538,7 +538,7 @@ function paint(x, y) {
delete wallData[k];
const data = {
templateId: sel.templateId,
tileDefId: sel.tileDefId,
sheetId: sel.sheetId,
frameIndex: sel.frameIndex,
isWalkable: sel.isWalkable
@@ -553,7 +553,7 @@ function paint(x, y) {
const decorIdx = getDecorLayerIndex(layer);
if (decorIdx !== null) {
decorData[decorIdx][k] = {
templateId: sel.templateId,
tileDefId: sel.tileDefId,
sheetId: sel.sheetId,
frameIndex: sel.frameIndex,
isWalkable: true
@@ -639,7 +639,7 @@ function floodFill(sx, sy) {
delete wallData[k];
const data = {
templateId: sel.templateId,
tileDefId: sel.tileDefId,
sheetId: sel.sheetId,
frameIndex: sel.frameIndex,
isWalkable: sel.isWalkable
@@ -676,7 +676,7 @@ function floodFillDecor(sx, sy) {
visited.add(k);
layerData[k] = {
templateId: sel.templateId,
tileDefId: sel.tileDefId,
sheetId: sel.sheetId,
frameIndex: sel.frameIndex,
isWalkable: true
@@ -701,7 +701,7 @@ function applyStamp(x, y) {
const key = `${tx},${ty}`;
const data = {
templateId: template.id,
tileDefId: template.id,
sheetId: template.sheetId,
frameIndex: template.frameIndex,
isWalkable: template.isWalkable
@@ -766,7 +766,7 @@ function loadTileTemplates() {
const opt = document.getElementById('tileSheetSelect').selectedOptions[0];
if (!opt?.value) {
currentSheetId = null;
tileTemplates = [];
tileDefs = [];
document.getElementById('tilePalette').innerHTML = '<div class="text-gray-500 text-xs p-2">Select a TileMap</div>';
document.getElementById('commonTags').innerHTML = '';
return;
@@ -775,11 +775,11 @@ function loadTileTemplates() {
currentSheetId = +opt.value;
// Filter templates for this sheet (already loaded, no API call)
tileTemplates = allTileTemplates.filter(t => t.sheetId === currentSheetId);
tileDefs = allTileDefs.filter(t => t.sheetId === currentSheetId);
// Collect all tags
allTags.clear();
tileTemplates.forEach(t => {
tileDefs.forEach(t => {
if (t.tags) {
t.tags.split(',').map(tag => tag.trim().toLowerCase()).forEach(tag => {
if (tag) allTags.add(tag);
@@ -838,7 +838,7 @@ function renderTemplates(filterTags = []) {
return;
}
let filtered = tileTemplates;
let filtered = tileDefs;
// Filter by current layer (floor vs wall)
if (layer === 'floor') {
@@ -846,7 +846,7 @@ function renderTemplates(filterTags = []) {
} else if (layer === 'wall') {
filtered = filtered.filter(t => !t.isWalkable);
} else if (layer.startsWith('decor')) {
filtered = filtered.filter(t => t.category === 'Decoration');
filtered = filtered;
}
// Filter by tags
@@ -870,9 +870,9 @@ function renderTemplates(filterTags = []) {
const displayH = sheet.th * scale;
let html = '';
filtered.forEach(t => {
// frameIndex is pre-extracted by the server
const frameIndex = t.frameIndex || 0;
filtered.forEach(t => {
// frameIndex is pre-extracted by the server
const frameIndex = t.frameIndex || 0;
const col = frameIndex % sheet.cols;
const row = Math.floor(frameIndex / sheet.cols);
@@ -908,7 +908,7 @@ function selectPaletteItem(el) {
if (type === 'template') {
sel = {
type: 'template',
templateId: +el.dataset.templateId,
tileDefId: +el.dataset.templateId,
sheetId: +el.dataset.sheetId,
frameIndex: +el.dataset.frame,
isWalkable: el.dataset.walkable === 'true',
@@ -981,16 +981,16 @@ function saveData() {
const tiles = [];
Object.entries(floorData).forEach(([k, v]) => {
const [x, y] = k.split(',').map(Number);
tiles.push({ x, y, sheetId: v.sheetId, frameIndex: v.frameIndex, templateId: v.templateId, isWalkable: true });
tiles.push({ x, y, sheetId: v.sheetId, frameIndex: v.frameIndex, tileDefinitionId: v.tileDefId, isWalkable: true });
});
Object.entries(wallData).forEach(([k, v]) => {
const [x, y] = k.split(',').map(Number);
tiles.push({ x, y, sheetId: v.sheetId, frameIndex: v.frameIndex, templateId: v.templateId, isWalkable: false });
tiles.push({ x, y, sheetId: v.sheetId, frameIndex: v.frameIndex, tileDefinitionId: v.tileDefId, 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 });
tiles.push({ x, y, sheetId: v.sheetId, frameIndex: v.frameIndex, tileDefinitionId: v.tileDefId, layer: idx + 1, isWalkable: true });
});
});
document.getElementById('tileGridJson').value = JSON.stringify(tiles);
@@ -23,28 +23,23 @@ public class RoomEditModel : AdminPageModel
public List<TileMapSheet> TileSheets { get; set; } = new();
public List<ObjectTemplate> Objects { get; set; } = new();
public List<DungeonMobDefinition> Mobs { get; set; } = new();
public List<TileTemplate> TileTemplates { get; set; } = new();
public List<TileDefinition> TileDefinitions { get; set; } = new();
public List<TileStamp> TileStamps { get; set; } = new();
/// <summary>
/// TileTemplates serialized as JSON for JavaScript consumption.
/// Includes extracted sheetId and frameIndex for direct use.
/// TileDefinitions serialized as JSON for JavaScript consumption.
/// </summary>
public string TileTemplatesJson => JsonSerializer.Serialize(
TileTemplates.Select(t => {
var (sheetId, frameIndex) = ExtractTileInfo(t.TilesJson);
return new {
id = t.Id,
name = t.Name,
category = t.Category.ToString(),
tags = t.Tags,
isWalkable = t.IsWalkable,
blocksMovement = t.BlocksMovement,
weight = t.Weight,
sheetId = sheetId,
frameIndex = frameIndex
};
}).Where(t => t.sheetId.HasValue)
public string TileDefinitionsJson => JsonSerializer.Serialize(
TileDefinitions.Select(t => new
{
id = t.Id,
name = t.Name,
type = t.Type.ToString(),
tags = t.Tags,
isWalkable = t.IsWalkable,
sheetId = t.TileMapSheetId,
frameIndex = t.FrameIndex
})
);
public string TileStampsJson => JsonSerializer.Serialize(
@@ -58,31 +53,13 @@ public class RoomEditModel : AdminPageModel
})
);
private static (int? sheetId, int frameIndex) ExtractTileInfo(string? tilesJson)
{
if (string.IsNullOrEmpty(tilesJson)) return (null, 0);
try
{
var options = new JsonSerializerOptions { PropertyNameCaseInsensitive = true };
var tiles = JsonSerializer.Deserialize<List<TilePlacement>>(tilesJson, options);
var first = tiles?.FirstOrDefault();
return (first?.SheetId, first?.FrameIndex ?? 0);
}
catch { return (null, 0); }
}
private class TilePlacement
{
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? TileDefinitionId { get; set; }
public int? Layer { get; set; }
}
@@ -231,10 +208,10 @@ public class RoomEditModel : AdminPageModel
.ThenBy(m => m.Name)
.ToListAsync();
TileTemplates = await _db.TileTemplates
TileDefinitions = await _db.TileDefinitions
.Where(t => t.IsEnabled)
.OrderBy(t => t.Category)
.ThenBy(t => t.Name)
.OrderBy(t => t.TileMapSheetId)
.ThenBy(t => t.FrameIndex)
.ToListAsync();
TileStamps = await _db.TileStamps
+103 -1
View File
@@ -90,6 +90,7 @@ else
<button onclick="setEditMode('floor')" id="modeFloor" class="tool-btn">🟦 Floor</button>
<button onclick="setEditMode('wall')" id="modeWall" class="tool-btn">⬛ Wall</button>
<button onclick="setEditMode('tile')" id="modeTile" class="tool-btn">🎨 Tile</button>
<button onclick="setEditMode('stamp')" id="modeStamp" class="tool-btn">🗂️ Stamp</button>
<button onclick="setEditMode('erase')" id="modeErase" class="tool-btn">🗑️ Erase</button>
<button onclick="toggleTileDrawer()" id="drawerToggle" class="tool-btn ml-auto">📋 Tile Picker</button>
</div>
@@ -281,6 +282,12 @@ else
<div class="text-xs text-gray-400" id="drawerTileInfo">Select from below</div>
</div>
</div>
<div class="sheet-section">
<div class="text-xs text-gray-400 mb-2">Stamps</div>
<input type="text" id="stampFilter" class="input w-full text-xs mb-2" placeholder="Filter stamps..." oninput="filterStamps()" />
<div id="stampList" class="space-y-1 text-xs"></div>
</div>
<!-- Sheet list -->
<div id="sheetList">
@@ -299,6 +306,8 @@ else
let walkableData = @Html.Raw(Model.WalkableJson);
let visualTiles = @Html.Raw(Model.VisualTilesJson);
let tileSheets = @Html.Raw(Model.TileSheetsJson);
let tileDefinitions = @Html.Raw(Model.TileDefinitionsJson);
let tileStamps = @Html.Raw(Model.TileStampsJson);
let autoRefresh = true, refreshInterval;
let zoom = 1.0;
@@ -309,13 +318,28 @@ else
let editMode = 'none', isDrawing = false;
let teleportMode = false, godModeEnabled = false;
let selectedSheetId = 0, selectedFrameIndex = 0;
let selectedStampId = 0;
let sheetTextures = {};
let expandedSheets = {};
const tileDefMap = {};
const stampMap = {};
// ==================== INIT ====================
async function init() {
console.log('[Admin] Init - tileSheets:', tileSheets.length);
tileDefinitions.forEach(t => {
tileDefMap[t.id] = t;
});
tileStamps.forEach(s => {
try {
const tiles = typeof s.tiles === 'string' ? JSON.parse(s.tiles) : (s.tiles || []);
stampMap[s.id] = { ...s, tiles };
} catch {
stampMap[s.id] = { ...s, tiles: [] };
}
});
renderStampList();
document.getElementById('sheetCount').textContent = tileSheets.length;
await loadSheetTextures();
@@ -426,6 +450,43 @@ else
if (expandedSheets[sheetId]) renderSheetTiles(parseInt(sheetId));
}
}
function renderStampList(filter = '') {
const list = document.getElementById('stampList');
if (!list) return;
const q = (filter || '').toLowerCase();
const items = Object.values(stampMap)
.filter(s => !q || (s.name || '').toLowerCase().includes(q))
.sort((a, b) => (a.name || '').localeCompare(b.name || ''));
if (items.length === 0) {
list.innerHTML = '<div class="text-gray-500 text-xs">No stamps found.</div>';
return;
}
list.innerHTML = items.map(s => `
<button class="tool-btn w-full text-left ${selectedStampId === s.id ? 'active' : ''}" onclick="selectStamp(${s.id})">
${s.name || ('Stamp ' + s.id)} (${s.width}x${s.height})
</button>
`).join('');
}
function filterStamps() {
const q = document.getElementById('stampFilter')?.value || '';
renderStampList(q);
}
function selectStamp(id) {
selectedStampId = id;
selectedSheetId = 0;
selectedFrameIndex = 0;
setEditMode('stamp');
renderStampList(document.getElementById('stampFilter')?.value || '');
const stamp = stampMap[id];
if (stamp) {
document.getElementById('drawerTileName').textContent = stamp.name || `Stamp ${id}`;
document.getElementById('drawerTileInfo').textContent = `${stamp.width}x${stamp.height}`;
document.getElementById('selectedTileName').textContent = stamp.name || `Stamp ${id}`;
}
}
function toggleSheet(sheetId) {
expandedSheets[sheetId] = !expandedSheets[sheetId];
@@ -467,6 +528,8 @@ else
function selectTile(sheetId, frameIndex) {
selectedSheetId = sheetId;
selectedFrameIndex = frameIndex;
selectedStampId = 0;
renderStampList(document.getElementById('stampFilter')?.value || '');
const sheet = tileSheets.find(s => s.id === sheetId);
const texture = sheetTextures[sheetId];
@@ -564,7 +627,7 @@ else
document.querySelectorAll('[id^="mode"]').forEach(b => b.classList.remove('active'));
document.getElementById('mode' + mode.charAt(0).toUpperCase() + mode.slice(1))?.classList.add('active');
document.getElementById('mapCanvas').classList.toggle('edit-mode', mode !== 'none');
document.getElementById('selectedTileInfo').classList.toggle('hidden', mode !== 'tile');
document.getElementById('selectedTileInfo').classList.toggle('hidden', mode !== 'tile' && mode !== 'stamp');
}
async function paintTile(x, y) {
@@ -586,6 +649,9 @@ else
const idx = visualTiles.findIndex(t => t.x === x && t.y === y && t.l === layer);
const tile = { x, y, sid: selectedSheetId, frame: selectedFrameIndex, l: layer };
if (idx >= 0) visualTiles[idx] = tile; else visualTiles.push(tile);
} else if (editMode === 'stamp' && selectedStampId > 0) {
await applyStampLive(x, y);
return;
} else if (editMode === 'erase') {
handler = 'RemoveTile';
visualTiles = visualTiles.filter(t => t.x !== x || t.y !== y);
@@ -597,6 +663,42 @@ else
method: 'POST', headers: { 'RequestVerificationToken': document.querySelector('[name="__RequestVerificationToken"]').value }
});
}
async function applyStampLive(x, y) {
const stamp = stampMap[selectedStampId];
if (!stamp || !stamp.tiles) return;
const layerOverride = parseInt(document.getElementById('tileLayer').value);
for (const t of stamp.tiles) {
const tx = x + (t.x || 0);
const ty = y + (t.y || 0);
if (tx < 0 || tx >= mapWidth || ty < 0 || ty >= mapHeight) continue;
let sheetId = t.sheetId;
let frameIndex = t.frameIndex;
let layer = typeof t.layer === 'number' ? t.layer : layerOverride;
let walkable = true;
if (t.tileDefinitionId && tileDefMap[t.tileDefinitionId]) {
const def = tileDefMap[t.tileDefinitionId];
sheetId = def.sheetId;
frameIndex = def.frameIndex;
walkable = def.isWalkable;
}
const params = `id=${dungeonId}&x=${tx}&y=${ty}&sheetId=${sheetId}&frameIndex=${frameIndex}&layer=${layer}&walkable=${walkable}`;
await fetch(`/admin/dungeons/view?handler=PlaceVisualTile&${params}`, {
method: 'POST', headers: { 'RequestVerificationToken': document.querySelector('[name="__RequestVerificationToken"]').value }
});
const idx = visualTiles.findIndex(v => v.x === tx && v.y === ty && v.l === layer);
const tile = { x: tx, y: ty, sid: sheetId, frame: frameIndex, l: layer };
if (idx >= 0) visualTiles[idx] = tile; else visualTiles.push(tile);
if (layer === 0) walkableData[ty * mapWidth + tx] = walkable;
}
drawMap();
}
// ==================== ENTITIES ====================
@@ -27,6 +27,8 @@ public class ViewModel : AdminPageModel
public string MobsJson { get; set; } = "[]";
public string VisualTilesJson { get; set; } = "[]";
public string TileSheetsJson { get; set; } = "[]";
public string TileDefinitionsJson { get; set; } = "[]";
public string TileStampsJson { get; set; } = "[]";
public int VisualTileCount { get; set; }
public List<DungeonMobDefinition> MobDefinitions { get; set; } = new();
public List<MobAbilityDefinition> AbilityDefinitions { get; set; } = new();
@@ -65,6 +67,29 @@ public class ViewModel : AdminPageModel
sheetH = s.SheetHeight,
cols = s.Columns
}));
var tileDefs = await _db.TileDefinitions
.Where(t => t.IsEnabled)
.Select(t => new {
id = t.Id,
sheetId = t.TileMapSheetId,
frameIndex = t.FrameIndex,
isWalkable = t.IsWalkable
})
.ToListAsync();
TileDefinitionsJson = JsonSerializer.Serialize(tileDefs);
var stamps = await _db.TileStamps
.Where(s => s.IsEnabled)
.Select(s => new {
id = s.Id,
name = s.Name,
width = s.Width,
height = s.Height,
tiles = s.TilesJson
})
.ToListAsync();
TileStampsJson = JsonSerializer.Serialize(stamps);
if (dungeon == null) return;