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.
222 lines
8.7 KiB
JSON
222 lines
8.7 KiB
JSON
[
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "01891c2e-7b0f-4f3e-81a6-199eb062ec9c",
|
|
"name": "Spawner (117)",
|
|
"location": [6168, 117, 0],
|
|
"map": "Trammel",
|
|
"count": 34,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:10:00",
|
|
"team": 0,
|
|
"homeRange": 30,
|
|
"walkingRange": 30,
|
|
"entries": [
|
|
{ "name": "Ratman", "maxCount": 11, "probability": 100 },
|
|
{ "name": "RatmanArcher", "maxCount": 11, "probability": 100 },
|
|
{ "name": "RatmanMage", "maxCount": 11, "probability": 100 },
|
|
{ "name": "Changeling", "maxCount": 11, "probability": 100 },
|
|
{ "name": "Doppleganger", "maxCount": 11, "probability": 100 },
|
|
{ "name": "Dog", "maxCount": 9, "probability": 100 },
|
|
{ "name": "Chicken", "maxCount": 9, "probability": 100 },
|
|
{ "name": "Cat", "maxCount": 9, "probability": 100 },
|
|
{ "name": "Boar", "maxCount": 9, "probability": 100 },
|
|
{ "name": "Bird", "maxCount": 9, "probability": 100 },
|
|
{ "name": "Gargoyle", "maxCount": 3, "probability": 100 },
|
|
{ "name": "Titan", "maxCount": 3, "probability": 100 },
|
|
{ "name": "Cyclops", "maxCount": 3, "probability": 100 },
|
|
{ "name": "OrcishMage", "maxCount": 5, "probability": 100 },
|
|
{ "name": "orcscout", "maxCount": 5, "probability": 100 }
|
|
]
|
|
},
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "0983061e-4deb-4750-8f2b-ee10756735ec",
|
|
"name": "Spawner (117)",
|
|
"location": [6184, 29, 0],
|
|
"map": "Trammel",
|
|
"count": 9,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:10:00",
|
|
"team": 0,
|
|
"homeRange": 10,
|
|
"walkingRange": 10,
|
|
"entries": [
|
|
{ "name": "Bird", "maxCount": 6, "probability": 100 },
|
|
{ "name": "Chicken", "maxCount": 6, "probability": 100 },
|
|
{ "name": "Rat", "maxCount": 6, "probability": 100 },
|
|
{ "name": "Dog", "maxCount": 6, "probability": 100 },
|
|
{ "name": "Doppleganger", "maxCount": 3, "probability": 100 }
|
|
]
|
|
},
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "18850a42-5089-43d9-9f0c-1adca014ed3e",
|
|
"name": "Spawner (117)",
|
|
"location": [6349, 89, -20],
|
|
"map": "Trammel",
|
|
"count": 30,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:10:00",
|
|
"team": 0,
|
|
"homeRange": 70,
|
|
"walkingRange": 70,
|
|
"entries": [
|
|
{ "name": "Ratman", "maxCount": 18, "probability": 100 },
|
|
{ "name": "RatmanArcher", "maxCount": 18, "probability": 100 },
|
|
{ "name": "Chiikkaha", "maxCount": 18, "probability": 100 },
|
|
{ "name": "Titan", "maxCount": 18, "probability": 100 },
|
|
{ "name": "Cyclops", "maxCount": 18, "probability": 100 },
|
|
{ "name": "Rat", "maxCount": 18, "probability": 100 },
|
|
{ "name": "Ratman", "maxCount": 4, "probability": 100 },
|
|
{ "name": "RatmanArcher", "maxCount": 4, "probability": 100 },
|
|
{ "name": "Chiikkaha", "maxCount": 2, "probability": 100 },
|
|
{ "name": "Titan", "maxCount": 2, "probability": 100 },
|
|
{ "name": "Cyclops", "maxCount": 2, "probability": 100 },
|
|
{ "name": "Rat", "maxCount": 2, "probability": 100 }
|
|
]
|
|
},
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "2862d617-a6ad-449e-b063-3a11f39753d7",
|
|
"name": "Spawner (117)",
|
|
"location": [6265, 48, -10],
|
|
"map": "Trammel",
|
|
"count": 53,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:10:00",
|
|
"team": 0,
|
|
"homeRange": 30,
|
|
"walkingRange": 30,
|
|
"entries": [
|
|
{ "name": "Szavetra", "maxCount": 22, "probability": 100 },
|
|
{ "name": "Imp", "maxCount": 22, "probability": 100 },
|
|
{ "name": "Titan", "maxCount": 22, "probability": 100 },
|
|
{ "name": "Snake", "maxCount": 22, "probability": 100 },
|
|
{ "name": "Ratman", "maxCount": 22, "probability": 100 },
|
|
{ "name": "Doppleganger", "maxCount": 22, "probability": 100 },
|
|
{ "name": "Gargoyle", "maxCount": 22, "probability": 100 },
|
|
{ "name": "Cow", "maxCount": 18, "probability": 100 },
|
|
{ "name": "Bull", "maxCount": 18, "probability": 100 },
|
|
{ "name": "Chicken", "maxCount": 18, "probability": 100 },
|
|
{ "name": "Bird", "maxCount": 18, "probability": 100 },
|
|
{ "name": "Pig", "maxCount": 18, "probability": 100 },
|
|
{ "name": "Dog", "maxCount": 18, "probability": 100 },
|
|
{ "name": "Goat", "maxCount": 18, "probability": 100 },
|
|
{ "name": "Cat", "maxCount": 18, "probability": 100 },
|
|
{ "name": "Rat", "maxCount": 18, "probability": 100 },
|
|
{ "name": "Orc", "maxCount": 9, "probability": 100 },
|
|
{ "name": "OrcCaptain", "maxCount": 9, "probability": 100 },
|
|
{ "name": "OrcishMage", "maxCount": 9, "probability": 100 },
|
|
{ "name": "Ogre", "maxCount": 4, "probability": 100 },
|
|
{ "name": "Ogre", "maxCount": 4, "probability": 100 },
|
|
{ "name": "OgreLord", "maxCount": 4, "probability": 100 }
|
|
]
|
|
},
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "28f37a01-81c7-4090-a181-5cd3f670ef72",
|
|
"name": "Spawner (117)",
|
|
"location": [6187, 101, 0],
|
|
"map": "Trammel",
|
|
"count": 34,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:10:00",
|
|
"team": 0,
|
|
"homeRange": 25,
|
|
"walkingRange": 25,
|
|
"entries": [
|
|
{ "name": "Titan", "maxCount": 10, "probability": 100 },
|
|
{ "name": "Ettin", "maxCount": 10, "probability": 100 },
|
|
{ "name": "Doppleganger", "maxCount": 10, "probability": 100 },
|
|
{ "name": "MougGuur", "maxCount": 10, "probability": 100 },
|
|
{ "name": "Dog", "maxCount": 10, "probability": 100 },
|
|
{ "name": "Chicken", "maxCount": 10, "probability": 100 },
|
|
{ "name": "Rat", "maxCount": 10, "probability": 100 },
|
|
{ "name": "Cow", "maxCount": 10, "probability": 100 },
|
|
{ "name": "Bull", "maxCount": 10, "probability": 100 },
|
|
{ "name": "OrcBomber", "maxCount": 7, "probability": 100 },
|
|
{ "name": "OrcBrute", "maxCount": 7, "probability": 100 },
|
|
{ "name": "Orc", "maxCount": 7, "probability": 100 },
|
|
{ "name": "Snake", "maxCount": 7, "probability": 100 },
|
|
{ "name": "Gargoyle", "maxCount": 7, "probability": 100 },
|
|
{ "name": "Ogre", "maxCount": 7, "probability": 100 }
|
|
]
|
|
},
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "499d7a5c-d73c-4e43-889f-f88bc94cf40e",
|
|
"name": "Spawner (117)",
|
|
"location": [6263, 118, -10],
|
|
"map": "Trammel",
|
|
"count": 24,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:10:00",
|
|
"team": 0,
|
|
"homeRange": 20,
|
|
"walkingRange": 20,
|
|
"entries": [
|
|
{ "name": "Chicken", "maxCount": 6, "probability": 100 },
|
|
{ "name": "Bird", "maxCount": 6, "probability": 100 },
|
|
{ "name": "Dog", "maxCount": 3, "probability": 100 },
|
|
{ "name": "Cat", "maxCount": 3, "probability": 100 },
|
|
{ "name": "Cow", "maxCount": 6, "probability": 100 },
|
|
{ "name": "Bull", "maxCount": 6, "probability": 100 },
|
|
{ "name": "Pig", "maxCount": 3, "probability": 100 },
|
|
{ "name": "Boar", "maxCount": 3, "probability": 100 }
|
|
]
|
|
},
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "5f510865-94bd-49b7-90bf-c24131ef1151",
|
|
"name": "Spawner (117)",
|
|
"location": [6191, 155, 0],
|
|
"map": "Trammel",
|
|
"count": 42,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:10:00",
|
|
"team": 0,
|
|
"homeRange": 25,
|
|
"walkingRange": 25,
|
|
"entries": [
|
|
{ "name": "Changeling", "maxCount": 18, "probability": 100 },
|
|
{ "name": "Ratman", "maxCount": 18, "probability": 100 },
|
|
{ "name": "Ettin", "maxCount": 18, "probability": 100 },
|
|
{ "name": "Titan", "maxCount": 18, "probability": 100 },
|
|
{ "name": "RatmanArcher", "maxCount": 18, "probability": 100 },
|
|
{ "name": "RatmanMage", "maxCount": 18, "probability": 100 },
|
|
{ "name": "Goat", "maxCount": 12, "probability": 100 },
|
|
{ "name": "Pig", "maxCount": 12, "probability": 100 },
|
|
{ "name": "Cow", "maxCount": 12, "probability": 100 },
|
|
{ "name": "Bull", "maxCount": 12, "probability": 100 },
|
|
{ "name": "Rat", "maxCount": 12, "probability": 100 },
|
|
{ "name": "GargoyleEnforcer", "maxCount": 9, "probability": 100 },
|
|
{ "name": "GargoyleDestroyer", "maxCount": 9, "probability": 100 },
|
|
{ "name": "Gargoyle", "maxCount": 9, "probability": 100 },
|
|
{ "name": "Snake", "maxCount": 3, "probability": 100 }
|
|
]
|
|
},
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "e35998b5-c9fa-4547-b793-3efeeca0253f",
|
|
"name": "Spawner (117)",
|
|
"location": [6189, 71, 0],
|
|
"map": "Trammel",
|
|
"count": 12,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:10:00",
|
|
"team": 0,
|
|
"homeRange": 25,
|
|
"walkingRange": 25,
|
|
"entries": [
|
|
{ "name": "OgreLord", "maxCount": 8, "probability": 100 },
|
|
{ "name": "OrcishLord", "maxCount": 8, "probability": 100 },
|
|
{ "name": "Ratman", "maxCount": 8, "probability": 100 },
|
|
{ "name": "Bird", "maxCount": 4, "probability": 100 },
|
|
{ "name": "Cow", "maxCount": 4, "probability": 100 },
|
|
{ "name": "Bull", "maxCount": 4, "probability": 100 },
|
|
{ "name": "Pig", "maxCount": 4, "probability": 100 },
|
|
{ "name": "Chicken", "maxCount": 4, "probability": 100 }
|
|
]
|
|
}
|
|
]
|