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.
151 lines
4.4 KiB
JSON
151 lines
4.4 KiB
JSON
[
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "025ff0bc-ff5b-4175-b963-1e393ee70543",
|
|
"name": "Spawner (101)",
|
|
"location": [6535, 848, 0],
|
|
"map": "Trammel",
|
|
"count": 4,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:10:00",
|
|
"team": 0,
|
|
"homeRange": 10,
|
|
"walkingRange": 10,
|
|
"entries": [
|
|
{ "name": "Abscess", "maxCount": 4, "probability": 100 },
|
|
{ "name": "Hydra", "maxCount": 4, "probability": 100 },
|
|
{ "name": "BogThing", "maxCount": 4, "probability": 100 }
|
|
]
|
|
},
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "04ebab40-c487-455f-8bea-211ae849bf2a",
|
|
"name": "Spawner (101)",
|
|
"location": [6518, 879, 0],
|
|
"map": "Trammel",
|
|
"count": 1,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:10:00",
|
|
"team": 0,
|
|
"homeRange": 5,
|
|
"walkingRange": 5,
|
|
"entries": [
|
|
{ "name": "InsaneDryad", "maxCount": 1, "probability": 100 }
|
|
]
|
|
},
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "3dbad35b-a4c0-4d6d-b1d7-ad4cb792da01",
|
|
"name": "Spawner (101)",
|
|
"location": [6489, 897, 0],
|
|
"map": "Trammel",
|
|
"count": 1,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:10:00",
|
|
"team": 0,
|
|
"homeRange": 5,
|
|
"walkingRange": 5,
|
|
"entries": [
|
|
{ "name": "InsaneDryad", "maxCount": 1, "probability": 100 }
|
|
]
|
|
},
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "43cff389-a041-49a6-89fb-cd5111466e70",
|
|
"name": "Spawner (101)",
|
|
"location": [6518, 870, 0],
|
|
"map": "Trammel",
|
|
"count": 9,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:10:00",
|
|
"team": 0,
|
|
"homeRange": 40,
|
|
"walkingRange": 40,
|
|
"entries": [
|
|
{ "name": "Thrasher", "maxCount": 9, "probability": 100 },
|
|
{ "name": "SwampTentacle", "maxCount": 9, "probability": 100 },
|
|
{ "name": "Reaper", "maxCount": 9, "probability": 100 },
|
|
{ "name": "Bogling", "maxCount": 9, "probability": 100 },
|
|
{ "name": "Alligator", "maxCount": 9, "probability": 100 },
|
|
{ "name": "Coil", "maxCount": 9, "probability": 100 },
|
|
{ "name": "WhippingVine", "maxCount": 9, "probability": 100 }
|
|
]
|
|
},
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "713c3e56-33d2-430c-b182-364da7607c83",
|
|
"name": "Spawner (101)",
|
|
"location": [6513, 871, 0],
|
|
"map": "Trammel",
|
|
"count": 17,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:10:00",
|
|
"team": 0,
|
|
"homeRange": 35,
|
|
"walkingRange": 35,
|
|
"entries": [
|
|
{ "name": "GiantSerpent", "maxCount": 17, "probability": 100 },
|
|
{ "name": "GiantToad", "maxCount": 17, "probability": 100 },
|
|
{ "name": "Harpy", "maxCount": 17, "probability": 100 },
|
|
{ "name": "SilverSerpent", "maxCount": 17, "probability": 100 },
|
|
{ "name": "Snake", "maxCount": 17, "probability": 100 },
|
|
{ "name": "Bogling", "maxCount": 17, "probability": 100 }
|
|
]
|
|
},
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "b04cfa39-6091-49da-bdba-1b737c266a0a",
|
|
"name": "Spawner (101)",
|
|
"location": [6507, 843, 0],
|
|
"map": "Trammel",
|
|
"count": 8,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:10:00",
|
|
"team": 0,
|
|
"homeRange": 10,
|
|
"walkingRange": 10,
|
|
"entries": [
|
|
{ "name": "Tangle", "maxCount": 8, "probability": 100 },
|
|
{ "name": "Bogling", "maxCount": 8, "probability": 100 },
|
|
{ "name": "Alligator", "maxCount": 8, "probability": 100 },
|
|
{ "name": "Reaper", "maxCount": 8, "probability": 100 },
|
|
{ "name": "Corpser", "maxCount": 8, "probability": 100 },
|
|
{ "name": "Changeling", "maxCount": 8, "probability": 100 },
|
|
{ "name": "WhippingVine", "maxCount": 8, "probability": 100 }
|
|
]
|
|
},
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "c6215ac8-c0e3-4c83-9394-984deb29c773",
|
|
"name": "Spawner (101)",
|
|
"location": [6585, 878, 0],
|
|
"map": "Trammel",
|
|
"count": 7,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:10:00",
|
|
"team": 0,
|
|
"homeRange": 10,
|
|
"walkingRange": 10,
|
|
"entries": [
|
|
{ "name": "Harpy", "maxCount": 7, "probability": 100 },
|
|
{ "name": "Saliva", "maxCount": 7, "probability": 100 },
|
|
{ "name": "Changeling", "maxCount": 7, "probability": 100 }
|
|
]
|
|
},
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "e840761f-1c5b-45f2-ba91-2a273e9739c2",
|
|
"name": "Spawner (101)",
|
|
"location": [6540, 872, 0],
|
|
"map": "Trammel",
|
|
"count": 1,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:10:00",
|
|
"team": 0,
|
|
"homeRange": 5,
|
|
"walkingRange": 5,
|
|
"entries": [
|
|
{ "name": "InsaneDryad", "maxCount": 1, "probability": 100 }
|
|
]
|
|
}
|
|
]
|