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.
105 lines
3.4 KiB
JSON
105 lines
3.4 KiB
JSON
[
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "b37c3d38-2d53-4d2d-a8aa-a2e4926a29c6",
|
|
"name": "Spawner (402)",
|
|
"location": [1119, 530, -90],
|
|
"map": "Malas",
|
|
"count": 22,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:10:00",
|
|
"team": 0,
|
|
"homeRange": 39,
|
|
"walkingRange": 60,
|
|
"entries": [
|
|
{ "name": "Bird", "maxCount": 10, "probability": 100 },
|
|
{ "name": "GreatHart", "maxCount": 1, "probability": 100 },
|
|
{ "name": "JackRabbit", "maxCount": 10, "probability": 100 },
|
|
{ "name": "Hind", "maxCount": 1, "probability": 100 }
|
|
]
|
|
},
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "e1ba3ada-d1fd-44fb-83b8-82e0e1fcf94f",
|
|
"name": "Spawner (402)",
|
|
"location": [1674, 659, -84],
|
|
"map": "Malas",
|
|
"count": 15,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:10:00",
|
|
"team": 0,
|
|
"homeRange": 100,
|
|
"walkingRange": 120,
|
|
"entries": [
|
|
{ "name": "CrystalElemental", "maxCount": 3, "probability": 100 },
|
|
{ "name": "SkitteringHopper", "maxCount": 3, "probability": 100 },
|
|
{ "name": "Bird", "maxCount": 3, "probability": 100 },
|
|
{ "name": "Hind", "maxCount": 2, "probability": 100 },
|
|
{ "name": "GreatHart", "maxCount": 1, "probability": 100 },
|
|
{ "name": "JackRabbit", "maxCount": 3, "probability": 100 }
|
|
]
|
|
},
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "099efd1a-520c-4e6b-bb39-552def69e2df",
|
|
"name": "Spawner (402)",
|
|
"location": [1434, 607, -89],
|
|
"map": "Malas",
|
|
"count": 15,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:10:00",
|
|
"team": 0,
|
|
"homeRange": 100,
|
|
"walkingRange": 120,
|
|
"entries": [
|
|
{ "name": "CrystalElemental", "maxCount": 3, "probability": 100 },
|
|
{ "name": "SkitteringHopper", "maxCount": 3, "probability": 100 },
|
|
{ "name": "Bird", "maxCount": 3, "probability": 100 },
|
|
{ "name": "Hind", "maxCount": 2, "probability": 100 },
|
|
{ "name": "GreatHart", "maxCount": 1, "probability": 100 },
|
|
{ "name": "JackRabbit", "maxCount": 3, "probability": 100 }
|
|
]
|
|
},
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "c9c80a39-40db-4cb9-a3c7-243957ecdd39",
|
|
"name": "Spawner (402)",
|
|
"location": [1194, 638, -84],
|
|
"map": "Malas",
|
|
"count": 20,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:10:00",
|
|
"team": 0,
|
|
"homeRange": 100,
|
|
"walkingRange": 120,
|
|
"entries": [
|
|
{ "name": "CrystalElemental", "maxCount": 4, "probability": 100 },
|
|
{ "name": "SkitteringHopper", "maxCount": 4, "probability": 100 },
|
|
{ "name": "Bird", "maxCount": 4, "probability": 100 },
|
|
{ "name": "Hind", "maxCount": 3, "probability": 100 },
|
|
{ "name": "GreatHart", "maxCount": 1, "probability": 100 },
|
|
{ "name": "JackRabbit", "maxCount": 4, "probability": 100 }
|
|
]
|
|
},
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "0335054c-d38b-4c5a-9fc6-c04c42ba9de1",
|
|
"name": "Spawner (402)",
|
|
"location": [920, 356, -85],
|
|
"map": "Malas",
|
|
"count": 20,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:10:00",
|
|
"team": 0,
|
|
"homeRange": 60,
|
|
"walkingRange": 70,
|
|
"entries": [
|
|
{ "name": "CrystalElemental", "maxCount": 4, "probability": 100 },
|
|
{ "name": "SkitteringHopper", "maxCount": 4, "probability": 100 },
|
|
{ "name": "Bird", "maxCount": 4, "probability": 100 },
|
|
{ "name": "Hind", "maxCount": 3, "probability": 100 },
|
|
{ "name": "GreatHart", "maxCount": 1, "probability": 100 },
|
|
{ "name": "JackRabbit", "maxCount": 4, "probability": 100 }
|
|
]
|
|
}
|
|
]
|