d8a64f3316
## 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.
235 lines
5.9 KiB
JSON
235 lines
5.9 KiB
JSON
[
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "027c989e-9d77-4dfd-85d8-b7c83f722bde",
|
|
"name": "Spawner (308)",
|
|
"location": [2094, 56, -32],
|
|
"map": "Ilshenar",
|
|
"count": 1,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:10:00",
|
|
"team": 0,
|
|
"homeRange": 5,
|
|
"walkingRange": 10,
|
|
"entries": [
|
|
{ "name": "Executioner", "maxCount": 1, "probability": 100 }
|
|
]
|
|
},
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "148839f1-8a5b-44bd-b6f5-3b310de5c951",
|
|
"name": "Spawner (308)",
|
|
"location": [2155, 24, -32],
|
|
"map": "Ilshenar",
|
|
"count": 2,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:10:00",
|
|
"team": 0,
|
|
"homeRange": 5,
|
|
"walkingRange": 10,
|
|
"entries": [
|
|
{ "name": "PoisonElemental", "maxCount": 2, "probability": 100 },
|
|
{ "name": "LichLord", "maxCount": 2, "probability": 100 }
|
|
]
|
|
},
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "151afe47-a4c7-42d9-999b-6be7ab8ed901",
|
|
"name": "Spawner (308)",
|
|
"location": [2125, 137, -32],
|
|
"map": "Ilshenar",
|
|
"count": 1,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:10:00",
|
|
"team": 0,
|
|
"homeRange": 5,
|
|
"walkingRange": 10,
|
|
"entries": [
|
|
{ "name": "Lich", "maxCount": 1, "probability": 100 }
|
|
]
|
|
},
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "2481376c-f54f-453e-aa09-b0ae25a2da13",
|
|
"name": "Spawner (308)",
|
|
"location": [2188, 310, -7],
|
|
"map": "Ilshenar",
|
|
"count": 3,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:10:00",
|
|
"team": 0,
|
|
"homeRange": 10,
|
|
"walkingRange": 15,
|
|
"entries": [
|
|
{ "name": "Skeleton", "maxCount": 3, "probability": 100 },
|
|
{ "name": "Wraith", "maxCount": 3, "probability": 100 },
|
|
{ "name": "Zombie", "maxCount": 3, "probability": 100 }
|
|
]
|
|
},
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "3a6c8beb-1840-4e1a-b55e-b44158315f59",
|
|
"name": "Spawner (308)",
|
|
"location": [2138, 97, -27],
|
|
"map": "Ilshenar",
|
|
"count": 1,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:10:00",
|
|
"team": 0,
|
|
"homeRange": 5,
|
|
"walkingRange": 10,
|
|
"entries": [
|
|
{ "name": "ElderGazer", "maxCount": 1, "probability": 100 }
|
|
]
|
|
},
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "4f5851f5-110c-4155-91a4-5d6715b52c2f",
|
|
"name": "Spawner (308)",
|
|
"location": [2183, 85, -32],
|
|
"map": "Ilshenar",
|
|
"count": 2,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:10:00",
|
|
"team": 0,
|
|
"homeRange": 5,
|
|
"walkingRange": 10,
|
|
"entries": [
|
|
{ "name": "EvilMage", "maxCount": 1, "probability": 100 },
|
|
{ "name": "EvilMageLord", "maxCount": 1, "probability": 100 }
|
|
]
|
|
},
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "5c78812b-3143-4ab4-a3e2-950a74181fb1",
|
|
"name": "Spawner (308)",
|
|
"location": [2185, 168, -32],
|
|
"map": "Ilshenar",
|
|
"count": 1,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:10:00",
|
|
"team": 0,
|
|
"homeRange": 5,
|
|
"walkingRange": 10,
|
|
"entries": [
|
|
{ "name": "TreasureChestLevel4", "maxCount": 1, "probability": 100 }
|
|
]
|
|
},
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "6d9c7f2b-dc74-4ca3-9396-fb2a38fa2d80",
|
|
"name": "Spawner (308)",
|
|
"location": [2207, 113, -27],
|
|
"map": "Ilshenar",
|
|
"count": 1,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:10:00",
|
|
"team": 0,
|
|
"homeRange": 5,
|
|
"walkingRange": 10,
|
|
"entries": [
|
|
{ "name": "StoneGargoyle", "maxCount": 1, "probability": 100 }
|
|
]
|
|
},
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "8d713f41-daf3-40c4-9d90-bbf4befb1b08",
|
|
"name": "Spawner (308)",
|
|
"location": [2229, 143, -32],
|
|
"map": "Ilshenar",
|
|
"count": 2,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:10:00",
|
|
"team": 0,
|
|
"homeRange": 5,
|
|
"walkingRange": 10,
|
|
"entries": [
|
|
{ "name": "EvilMage", "maxCount": 2, "probability": 100 },
|
|
{ "name": "Executioner", "maxCount": 2, "probability": 100 }
|
|
]
|
|
},
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "92ee0621-2fc1-434c-a2d8-11b9359e01bc",
|
|
"name": "Spawner (308)",
|
|
"location": [2124, 96, -32],
|
|
"map": "Ilshenar",
|
|
"count": 3,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:10:00",
|
|
"team": 0,
|
|
"homeRange": 8,
|
|
"walkingRange": 15,
|
|
"entries": [
|
|
{ "name": "PoisonElemental", "maxCount": 2, "probability": 100 },
|
|
{ "name": "Lich", "maxCount": 2, "probability": 100 },
|
|
{ "name": "LichLord", "maxCount": 1, "probability": 100 }
|
|
]
|
|
},
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "93052936-70f8-43b4-a20c-d68adab714c6",
|
|
"name": "Spawner (308)",
|
|
"location": [2220, 75, -27],
|
|
"map": "Ilshenar",
|
|
"count": 1,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:10:00",
|
|
"team": 0,
|
|
"homeRange": 5,
|
|
"walkingRange": 10,
|
|
"entries": [
|
|
{ "name": "AcidElemental", "maxCount": 1, "probability": 100 }
|
|
]
|
|
},
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "bdba50d6-07c1-40ad-ba33-ac67631712cc",
|
|
"name": "Spawner (308)",
|
|
"location": [2154, 163, -27],
|
|
"map": "Ilshenar",
|
|
"count": 1,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:10:00",
|
|
"team": 0,
|
|
"homeRange": 5,
|
|
"walkingRange": 10,
|
|
"entries": [
|
|
{ "name": "Lich", "maxCount": 1, "probability": 100 }
|
|
]
|
|
},
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "f8cc122d-1672-4b14-a6bf-4dcc6178efdc",
|
|
"name": "Spawner (308)",
|
|
"location": [2127, 29, -32],
|
|
"map": "Ilshenar",
|
|
"count": 2,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:10:00",
|
|
"team": 0,
|
|
"homeRange": 5,
|
|
"walkingRange": 10,
|
|
"entries": [
|
|
{ "name": "HellHound", "maxCount": 1, "probability": 100 },
|
|
{ "name": "LichLord", "maxCount": 1, "probability": 100 }
|
|
]
|
|
},
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "fc19f651-1312-4542-80df-b9f2362974da",
|
|
"name": "Spawner (308)",
|
|
"location": [2125, 165, -32],
|
|
"map": "Ilshenar",
|
|
"count": 2,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:10:00",
|
|
"team": 0,
|
|
"homeRange": 5,
|
|
"walkingRange": 10,
|
|
"entries": [
|
|
{ "name": "EvilMage", "maxCount": 2, "probability": 100 },
|
|
{ "name": "Executioner", "maxCount": 2, "probability": 100 }
|
|
]
|
|
}
|
|
]
|