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.
182 lines
5 KiB
JSON
182 lines
5 KiB
JSON
[
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "0cb005f6-2405-41d4-b9b6-9ad8c75a6851",
|
|
"name": "Spawner (403)",
|
|
"location": [1372, 1225, -90],
|
|
"map": "Malas",
|
|
"count": 10,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:15:00",
|
|
"team": 0,
|
|
"homeRange": 20,
|
|
"walkingRange": 40,
|
|
"entries": [
|
|
{ "name": "OrcBrute", "maxCount": 1, "probability": 100 },
|
|
{ "name": "OrcishLord", "maxCount": 2, "probability": 100 },
|
|
{ "name": "Orc", "maxCount": 4, "probability": 100 },
|
|
{ "name": "OrcishMage", "maxCount": 2, "probability": 100 },
|
|
{ "name": "OrcBomber", "maxCount": 1, "probability": 100 }
|
|
]
|
|
},
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "2abcbbd3-3842-46f6-95f1-41b743bb7083",
|
|
"name": "Spawner (403)",
|
|
"location": [1364, 596, -86],
|
|
"map": "Malas",
|
|
"count": 4,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:15:00",
|
|
"team": 0,
|
|
"homeRange": 4,
|
|
"walkingRange": 15,
|
|
"entries": [
|
|
{ "name": "Orc", "maxCount": 2, "probability": 100 },
|
|
{ "name": "OrcishLord", "maxCount": 1, "probability": 100 },
|
|
{ "name": "OrcishMage", "maxCount": 1, "probability": 100 }
|
|
]
|
|
},
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "415080ef-9b67-4529-8651-f82d4e0fba5c",
|
|
"name": "Spawner (403)",
|
|
"location": [1205, 700, -88],
|
|
"map": "Malas",
|
|
"count": 4,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:15:00",
|
|
"team": 0,
|
|
"homeRange": 4,
|
|
"walkingRange": 20,
|
|
"entries": [
|
|
{ "name": "Orc", "maxCount": 2, "probability": 100 },
|
|
{ "name": "OrcishLord", "maxCount": 1, "probability": 100 },
|
|
{ "name": "OrcishMage", "maxCount": 1, "probability": 100 }
|
|
]
|
|
},
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "778c0ad2-e39e-4c61-9b1c-e45b6a9b554e",
|
|
"name": "Spawner (403)",
|
|
"location": [1257, 1326, -90],
|
|
"map": "Malas",
|
|
"count": 4,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:15:00",
|
|
"team": 0,
|
|
"homeRange": 4,
|
|
"walkingRange": 15,
|
|
"entries": [
|
|
{ "name": "Orc", "maxCount": 2, "probability": 100 },
|
|
{ "name": "OrcishLord", "maxCount": 1, "probability": 100 },
|
|
{ "name": "OrcishMage", "maxCount": 1, "probability": 100 }
|
|
]
|
|
},
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "9a42ced3-e2d2-4d65-bb78-3903a4092c9f",
|
|
"name": "Spawner (403)",
|
|
"location": [1343, 1196, -90],
|
|
"map": "Malas",
|
|
"count": 2,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:15:00",
|
|
"team": 0,
|
|
"homeRange": 4,
|
|
"walkingRange": 4,
|
|
"entries": [
|
|
{ "name": "Orc", "maxCount": 2, "probability": 100 }
|
|
]
|
|
},
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "b187d6bd-fe00-43c8-906d-f18ee330f432",
|
|
"name": "Spawner (403)",
|
|
"location": [911, 194, -79],
|
|
"map": "Malas",
|
|
"count": 4,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:15:00",
|
|
"team": 0,
|
|
"homeRange": 4,
|
|
"walkingRange": 15,
|
|
"entries": [
|
|
{ "name": "Orc", "maxCount": 2, "probability": 100 },
|
|
{ "name": "OrcishLord", "maxCount": 1, "probability": 100 },
|
|
{ "name": "OrcishMage", "maxCount": 1, "probability": 100 }
|
|
]
|
|
},
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "c4a2ba68-4d62-480c-a9a9-b893f56a1a5d",
|
|
"name": "Spawner (403)",
|
|
"location": [1598, 1819, -110],
|
|
"map": "Malas",
|
|
"count": 4,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:15:00",
|
|
"team": 0,
|
|
"homeRange": 4,
|
|
"walkingRange": 15,
|
|
"entries": [
|
|
{ "name": "Orc", "maxCount": 2, "probability": 100 },
|
|
{ "name": "OrcishLord", "maxCount": 1, "probability": 100 },
|
|
{ "name": "OrcishMage", "maxCount": 1, "probability": 100 }
|
|
]
|
|
},
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "c93264b1-19bd-47d9-ae8d-261e8d36fc30",
|
|
"name": "Spawner (403)",
|
|
"location": [1665, 356, -50],
|
|
"map": "Malas",
|
|
"count": 4,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:15:00",
|
|
"team": 0,
|
|
"homeRange": 4,
|
|
"walkingRange": 25,
|
|
"entries": [
|
|
{ "name": "Orc", "maxCount": 2, "probability": 100 },
|
|
{ "name": "OrcishLord", "maxCount": 1, "probability": 100 },
|
|
{ "name": "OrcishMage", "maxCount": 1, "probability": 100 }
|
|
]
|
|
},
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "ea44d8fe-27b9-4650-9c22-fed0630e5cc3",
|
|
"name": "Spawner (403)",
|
|
"location": [1322, 1225, -90],
|
|
"map": "Malas",
|
|
"count": 10,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:15:00",
|
|
"team": 0,
|
|
"homeRange": 20,
|
|
"walkingRange": 40,
|
|
"entries": [
|
|
{ "name": "OrcBrute", "maxCount": 1, "probability": 100 },
|
|
{ "name": "OrcishLord", "maxCount": 2, "probability": 100 },
|
|
{ "name": "Orc", "maxCount": 4, "probability": 100 },
|
|
{ "name": "OrcishMage", "maxCount": 2, "probability": 100 },
|
|
{ "name": "OrcBomber", "maxCount": 1, "probability": 100 }
|
|
]
|
|
},
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "f4837b68-40f5-42db-b907-f4fe65248cf9",
|
|
"name": "Spawner (403)",
|
|
"location": [1343, 1248, -90],
|
|
"map": "Malas",
|
|
"count": 2,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:15:00",
|
|
"team": 0,
|
|
"homeRange": 4,
|
|
"walkingRange": 4,
|
|
"entries": [
|
|
{ "name": "Orc", "maxCount": 2, "probability": 100 }
|
|
]
|
|
}
|
|
]
|