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.
163 lines
4.5 KiB
JSON
163 lines
4.5 KiB
JSON
[
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "0fe79572-c943-489f-917b-ac21ab051e1e",
|
|
"name": "Spawner (127)",
|
|
"location": [5857, 562, 15],
|
|
"map": "Trammel",
|
|
"count": 5,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:10:00",
|
|
"team": 0,
|
|
"homeRange": 7,
|
|
"walkingRange": 30,
|
|
"entries": [
|
|
{ "name": "JukaLord", "maxCount": 1, "probability": 100 },
|
|
{ "name": "JukaMage", "maxCount": 1, "probability": 100 },
|
|
{ "name": "JukaWarrior", "maxCount": 3, "probability": 100 }
|
|
]
|
|
},
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "2292c4c5-79a7-42fe-89a0-4cca8b5c9ae2",
|
|
"name": "Spawner (127)",
|
|
"location": [5792, 544, 10],
|
|
"map": "Trammel",
|
|
"count": 8,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:10:00",
|
|
"team": 0,
|
|
"homeRange": 6,
|
|
"walkingRange": 30,
|
|
"entries": [
|
|
{ "name": "GolemController", "maxCount": 4, "probability": 100 },
|
|
{ "name": "Golem", "maxCount": 4, "probability": 100 }
|
|
]
|
|
},
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "4c508240-4996-456a-904f-164a1574fda9",
|
|
"name": "Spawner (127)",
|
|
"location": [5819, 591, 0],
|
|
"map": "Trammel",
|
|
"count": 2,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:10:00",
|
|
"team": 0,
|
|
"homeRange": 5,
|
|
"walkingRange": 25,
|
|
"entries": [
|
|
{ "name": "JukaWarrior", "maxCount": 2, "probability": 100 }
|
|
]
|
|
},
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "7efd5b02-49ba-4d20-a39e-82d9bb6622bb",
|
|
"name": "Spawner (127)",
|
|
"location": [5857, 586, 15],
|
|
"map": "Trammel",
|
|
"count": 5,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:10:00",
|
|
"team": 0,
|
|
"homeRange": 7,
|
|
"walkingRange": 30,
|
|
"entries": [
|
|
{ "name": "JukaLord", "maxCount": 1, "probability": 100 },
|
|
{ "name": "JukaMage", "maxCount": 1, "probability": 100 },
|
|
{ "name": "JukaWarrior", "maxCount": 3, "probability": 100 }
|
|
]
|
|
},
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "8d70da7b-2571-4c11-a5fe-4f9a8a3d4083",
|
|
"name": "Spawner (127)",
|
|
"location": [5724, 561, 20],
|
|
"map": "Trammel",
|
|
"count": 6,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:10:00",
|
|
"team": 0,
|
|
"homeRange": 8,
|
|
"walkingRange": 30,
|
|
"entries": [
|
|
{ "name": "Golem", "maxCount": 1, "probability": 100 },
|
|
{ "name": "JukaLord", "maxCount": 1, "probability": 100 },
|
|
{ "name": "JukaMage", "maxCount": 1, "probability": 100 },
|
|
{ "name": "JukaWarrior", "maxCount": 3, "probability": 100 }
|
|
]
|
|
},
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "a3e4a12b-3ec2-4c5e-a333-211c738e2105",
|
|
"name": "Spawner (127)",
|
|
"location": [5828, 530, 0],
|
|
"map": "Trammel",
|
|
"count": 5,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:10:00",
|
|
"team": 0,
|
|
"homeRange": 8,
|
|
"walkingRange": 30,
|
|
"entries": [
|
|
{ "name": "JukaLord", "maxCount": 1, "probability": 100 },
|
|
{ "name": "JukaMage", "maxCount": 1, "probability": 100 },
|
|
{ "name": "JukaWarrior", "maxCount": 3, "probability": 100 }
|
|
]
|
|
},
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "aab64623-d091-4058-9ce0-6ca3c039b824",
|
|
"name": "Spawner (127)",
|
|
"location": [5690, 534, 0],
|
|
"map": "Trammel",
|
|
"count": 5,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:10:00",
|
|
"team": 0,
|
|
"homeRange": 8,
|
|
"walkingRange": 30,
|
|
"entries": [
|
|
{ "name": "JukaLord", "maxCount": 1, "probability": 100 },
|
|
{ "name": "JukaMage", "maxCount": 1, "probability": 100 },
|
|
{ "name": "JukaWarrior", "maxCount": 3, "probability": 100 }
|
|
]
|
|
},
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "b316ad79-73f6-44b1-99e7-34845ddd72cf",
|
|
"name": "Spawner (127)",
|
|
"location": [5659, 563, 20],
|
|
"map": "Trammel",
|
|
"count": 9,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:10:00",
|
|
"team": 0,
|
|
"homeRange": 10,
|
|
"walkingRange": 30,
|
|
"entries": [
|
|
{ "name": "Brigand", "maxCount": 4, "probability": 100 },
|
|
{ "name": "JukaLord", "maxCount": 1, "probability": 100 },
|
|
{ "name": "JukaMage", "maxCount": 1, "probability": 100 },
|
|
{ "name": "JukaWarrior", "maxCount": 3, "probability": 100 }
|
|
]
|
|
},
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "d0aa4dc9-71ae-41c9-b16a-457c9946ccc4",
|
|
"name": "Spawner (127)",
|
|
"location": [5808, 588, 12],
|
|
"map": "Trammel",
|
|
"count": 5,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:10:00",
|
|
"team": 0,
|
|
"homeRange": 15,
|
|
"walkingRange": 30,
|
|
"entries": [
|
|
{ "name": "JukaLord", "maxCount": 1, "probability": 100 },
|
|
{ "name": "JukaMage", "maxCount": 1, "probability": 100 },
|
|
{ "name": "JukaWarrior", "maxCount": 3, "probability": 100 }
|
|
]
|
|
}
|
|
]
|