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.
119 lines
3.7 KiB
JSON
119 lines
3.7 KiB
JSON
[
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "047a7695-7bd9-46ad-852d-f84b2895b843",
|
|
"name": "Spawner (224)",
|
|
"location": [5912, 1326, 0],
|
|
"map": "Felucca",
|
|
"count": 6,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:10:00",
|
|
"team": 0,
|
|
"homeRange": 10,
|
|
"walkingRange": 20,
|
|
"entries": [
|
|
{ "name": "DreadSpider", "maxCount": 2, "probability": 100 },
|
|
{ "name": "FireElemental", "maxCount": 1, "probability": 100 },
|
|
{ "name": "HellCat", "maxCount": 1, "probability": 100 },
|
|
{ "name": "LavaLizard", "maxCount": 1, "probability": 100 },
|
|
{ "name": "LavaSnake", "maxCount": 1, "probability": 100 }
|
|
]
|
|
},
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "37ea1620-9487-40df-8035-e76b2443a7b2",
|
|
"name": "Spawner (224)",
|
|
"location": [5915, 1302, 2],
|
|
"map": "Felucca",
|
|
"count": 3,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:10:00",
|
|
"team": 0,
|
|
"homeRange": 1,
|
|
"walkingRange": 1,
|
|
"entries": [
|
|
{ "name": "TreasureChestLevel2", "maxCount": 1, "probability": 100 },
|
|
{ "name": "TreasureChestLevel3", "maxCount": 2, "probability": 100 }
|
|
]
|
|
},
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "8190243a-f39d-48b2-9df3-9b00b6e418d4",
|
|
"name": "Spawner (224)",
|
|
"location": [5956, 1310, -2],
|
|
"map": "Felucca",
|
|
"count": 6,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:10:00",
|
|
"team": 0,
|
|
"homeRange": 10,
|
|
"walkingRange": 20,
|
|
"entries": [
|
|
{ "name": "DreadSpider", "maxCount": 2, "probability": 100 },
|
|
{ "name": "FireElemental", "maxCount": 1, "probability": 100 },
|
|
{ "name": "HellCat", "maxCount": 1, "probability": 100 },
|
|
{ "name": "LavaLizard", "maxCount": 1, "probability": 100 },
|
|
{ "name": "LavaSnake", "maxCount": 1, "probability": 100 }
|
|
]
|
|
},
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "c0481877-f573-4c00-af1f-c1f5873f4bbb",
|
|
"name": "Spawner (224)",
|
|
"location": [5940, 1356, -2],
|
|
"map": "Felucca",
|
|
"count": 6,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:10:00",
|
|
"team": 0,
|
|
"homeRange": 10,
|
|
"walkingRange": 20,
|
|
"entries": [
|
|
{ "name": "DreadSpider", "maxCount": 2, "probability": 100 },
|
|
{ "name": "FireElemental", "maxCount": 1, "probability": 100 },
|
|
{ "name": "HellCat", "maxCount": 1, "probability": 100 },
|
|
{ "name": "LavaLizard", "maxCount": 1, "probability": 100 },
|
|
{ "name": "LavaSnake", "maxCount": 1, "probability": 100 }
|
|
]
|
|
},
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "c08391fb-b609-4c8d-be85-2d3986f1639a",
|
|
"name": "Spawner (224)",
|
|
"location": [5976, 1387, -22],
|
|
"map": "Felucca",
|
|
"count": 6,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:10:00",
|
|
"team": 0,
|
|
"homeRange": 10,
|
|
"walkingRange": 20,
|
|
"entries": [
|
|
{ "name": "DreadSpider", "maxCount": 2, "probability": 100 },
|
|
{ "name": "FireElemental", "maxCount": 1, "probability": 100 },
|
|
{ "name": "HellCat", "maxCount": 1, "probability": 100 },
|
|
{ "name": "LavaLizard", "maxCount": 1, "probability": 100 },
|
|
{ "name": "LavaSnake", "maxCount": 1, "probability": 100 }
|
|
]
|
|
},
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "d661a6de-3520-464f-994f-77ff738ff5bd",
|
|
"name": "Spawner (224)",
|
|
"location": [5999, 1327, 10],
|
|
"map": "Felucca",
|
|
"count": 6,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:10:00",
|
|
"team": 0,
|
|
"homeRange": 10,
|
|
"walkingRange": 20,
|
|
"entries": [
|
|
{ "name": "DreadSpider", "maxCount": 2, "probability": 100 },
|
|
{ "name": "FireElemental", "maxCount": 1, "probability": 100 },
|
|
{ "name": "HellCat", "maxCount": 1, "probability": 100 },
|
|
{ "name": "LavaLizard", "maxCount": 1, "probability": 100 },
|
|
{ "name": "LavaSnake", "maxCount": 1, "probability": 100 }
|
|
]
|
|
}
|
|
]
|