## Summary Removes the dated `DynamicJson` JSON helper and migrates spawner JSON (de)serialization to a polymorphic `record SpawnerDto` hierarchy. `DynamicJson` was the last remaining consumer (regions moved off it in #1400). The key correctness improvement: **System.Text.Json deserializes plain DTO records, never a live `Item`.** Previously, deserializing directly into an `Item` meant STJ constructed world-registered objects *before* the data was validated — a malformed/hand-edited spawn file could leave orphaned spawner Items in the world save. Now a parse failure is GC-only; `dto.ToSpawner()` constructs the spawner only from a fully-validated DTO and self-cleans on failure. ## What changed - **New:** `SpawnerDto` (abstract) + `SpawnerDataDto` / `RegionSpawnerDto` / `ProximitySpawnerDto`, each marked with a reusable `[JsonDiscoverableType]` opt-in attribute. Auto-discovered at the `Configure` phase — no manual registration list (avoids the regions `Register<T>()` footgun), open to custom spawner subtypes. - **Symmetric mapping:** `BaseSpawner.ToDto()` (export) ⇄ `SpawnerDto.ToSpawner()` (import). `ToSpawner()` deletes-and-rethrows on any failure, so the importer can never orphan an Item. - **`SpawnerJsonSerializer`** wires `$type` polymorphism on the `SpawnerDto` root with loud collision/constructibility validation. - **Import/export commands** rewired to the typed DTO path (reflection `FindTypeByName`/`CreateInstance` removed). - **Data migration:** the 109 `Distribution/Data/Spawns/**` files moved from `"type"`→`"$type"` and legacy `homeRange`→`spawnBounds`. The runtime still *reads* legacy `homeRange` for external files. The `homeRange→spawnBounds` formula is proven equivalent to the runtime conversion (`BoundsEquivalenceTests`, hr=0/1/3/7). - **Deleted:** `Projects/Server/Json/DynamicJson.cs`. Sparse export output matches the legacy `ToJson` (nullable DTO properties + `WhenWritingNull`). Binary world-save serialization is untouched. ## Tests - DTO round-trip per spawner type; sparse-default omission; legacy `homeRange` read; export/import file round-trip. - `Import_MalformedFile_LeaksNoWorldItems` — proves a mid-array parse failure constructs zero world Items. - `AllSpawnFilesLoadTests` — every migrated spawn file deserializes and builds. - Duplicate-discriminator validation. - UOContent.Tests 485/485, Server.Tests 710/710, build clean. ## Follow-up (not in this PR) `Rectangle3DConverter.Write` (in `Projects/Server/`) omits `z1/z2` when `Start.Z == -128`, so a future server-side export of a `homeRange`-style spawner round-trips depth 256→255. Pre-existing and out of scope here (Server change); the migrated data reads correctly. Worth a separate small converter PR.
124 lines
3.9 KiB
C#
124 lines
3.9 KiB
C#
/*************************************************************************
|
|
* ModernUO *
|
|
* Copyright 2019-2026 - ModernUO Development Team *
|
|
* Email: hi@modernuo.com *
|
|
* File: RegionSpawner.cs *
|
|
* *
|
|
* This program is free software: you can redistribute it and/or modify *
|
|
* it under the terms of the GNU General Public License as published by *
|
|
* the Free Software Foundation, either version 3 of the License, or *
|
|
* (at your option) any later version. *
|
|
* *
|
|
* You should have received a copy of the GNU General Public License *
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
|
|
*************************************************************************/
|
|
|
|
using System;
|
|
using ModernUO.Serialization;
|
|
using Server.Regions;
|
|
|
|
namespace Server.Engines.Spawners;
|
|
|
|
[SerializationGenerator(0)]
|
|
public partial class RegionSpawner : Spawner
|
|
{
|
|
[SerializableField(0, getter: "private", setter: "private")]
|
|
private string _spawnRegionName;
|
|
|
|
private BaseRegion _spawnRegion;
|
|
|
|
public override Region Region => _spawnRegion;
|
|
|
|
[Constructible(AccessLevel.Developer)]
|
|
public RegionSpawner()
|
|
{
|
|
}
|
|
|
|
[Constructible(AccessLevel.Developer)]
|
|
public RegionSpawner(string spawnedName) : base(spawnedName)
|
|
{
|
|
}
|
|
|
|
[Constructible(AccessLevel.Developer)]
|
|
public RegionSpawner(
|
|
int amount,
|
|
TimeSpan minDelay,
|
|
TimeSpan maxDelay,
|
|
int team = 0,
|
|
params ReadOnlySpan<string> spawnedNames
|
|
) : base(amount, minDelay, maxDelay, team, spawnedNames: spawnedNames)
|
|
{
|
|
}
|
|
|
|
[CommandProperty(AccessLevel.Developer)]
|
|
public BaseRegion SpawnRegion
|
|
{
|
|
get => _spawnRegion;
|
|
set
|
|
{
|
|
_spawnRegion = value;
|
|
SpawnRegionName = _spawnRegion?.Name;
|
|
_spawnRegion?.InitRectangles();
|
|
InvalidateProperties();
|
|
}
|
|
}
|
|
|
|
// RegionSpawner does not support spiral scan (disjoint rectangles make it ineffective)
|
|
protected override bool SupportsSpiralScan => false;
|
|
|
|
protected override Rectangle3D GetBoundsForSpawnAttempt()
|
|
{
|
|
if (_spawnRegion == null || _spawnRegion.TotalWeight <= 0)
|
|
{
|
|
return default;
|
|
}
|
|
|
|
// Pick a weighted random rectangle from the region
|
|
var rand = Utility.Random(_spawnRegion.TotalWeight);
|
|
|
|
for (var j = 0; j < _spawnRegion.RectangleWeights.Length; j++)
|
|
{
|
|
var curWeight = _spawnRegion.RectangleWeights[j];
|
|
|
|
if (rand < curWeight)
|
|
{
|
|
return _spawnRegion.Rectangles[j];
|
|
}
|
|
|
|
rand -= curWeight;
|
|
}
|
|
|
|
return default;
|
|
}
|
|
|
|
protected override ReadOnlySpan<Rectangle3D> GetAllSpawnBounds() => _spawnRegion?.Rectangles;
|
|
|
|
public override Point3D GetSpawnPosition(ISpawnable spawned, Map map)
|
|
{
|
|
// Check for region/map mismatch before delegating to base
|
|
if (_spawnRegion == null || map == null || map == Map.Internal ||
|
|
map != _spawnRegion.Map || _spawnRegion.TotalWeight <= 0)
|
|
{
|
|
return Location;
|
|
}
|
|
|
|
return base.GetSpawnPosition(spawned, map);
|
|
}
|
|
|
|
public override void GetSpawnerProperties(IPropertyList list)
|
|
{
|
|
base.GetSpawnerProperties(list);
|
|
|
|
if (Running && _spawnRegion != null)
|
|
{
|
|
list.Add(1076228, $"{"region:"}\t{_spawnRegion.Name}"); // ~1_DUMMY~ ~2_DUMMY~
|
|
}
|
|
}
|
|
|
|
[AfterDeserialization(false)]
|
|
private void AfterDeserialization()
|
|
{
|
|
_spawnRegion = Region.Find(_spawnRegionName, Map) as BaseRegion;
|
|
_spawnRegion?.InitRectangles();
|
|
}
|
|
}
|