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.
170 lines
5.1 KiB
JSON
170 lines
5.1 KiB
JSON
[
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "115246e3-d444-4ad4-ad93-ba5f98ade944",
|
|
"name": "Spawner (506)",
|
|
"location": [71, 29, -1],
|
|
"map": "Malas",
|
|
"count": 6,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:10:00",
|
|
"team": 0,
|
|
"homeRange": 30,
|
|
"walkingRange": 30,
|
|
"entries": [
|
|
{ "name": "EarthElemental", "maxCount": 2, "probability": 100 },
|
|
{ "name": "DullCopperElemental", "maxCount": 2, "probability": 100 },
|
|
{ "name": "YomotsuWarrior", "maxCount": 1, "probability": 100 },
|
|
{ "name": "YomotsuPriest", "maxCount": 1, "probability": 100 }
|
|
]
|
|
},
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "6561df12-d971-4504-9a84-fba65d6e3339",
|
|
"name": "Spawner (506)",
|
|
"location": [111, 20, -1],
|
|
"map": "Malas",
|
|
"count": 6,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:10:00",
|
|
"team": 0,
|
|
"homeRange": 30,
|
|
"walkingRange": 30,
|
|
"entries": [
|
|
{ "name": "EarthElemental", "maxCount": 1, "probability": 100 },
|
|
{ "name": "DullCopperElemental", "maxCount": 1, "probability": 100 },
|
|
{ "name": "YomotsuWarrior", "maxCount": 2, "probability": 100 },
|
|
{ "name": "YomotsuPriest", "maxCount": 2, "probability": 100 }
|
|
]
|
|
},
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "694ea01f-680b-4054-9f13-bf9e7317a6d8",
|
|
"name": "Spawner (506)",
|
|
"location": [107, 23, -1],
|
|
"map": "Malas",
|
|
"count": 1,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:10:00",
|
|
"team": 0,
|
|
"homeRange": 5,
|
|
"walkingRange": 5,
|
|
"entries": [
|
|
{ "name": "FireBeetle", "maxCount": 1, "probability": 100 }
|
|
]
|
|
},
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "922f0ff6-6efc-4787-aab1-32b8c41831ab",
|
|
"name": "Spawner (506)",
|
|
"location": [54, 67, -1],
|
|
"map": "Malas",
|
|
"count": 6,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:10:00",
|
|
"team": 0,
|
|
"homeRange": 30,
|
|
"walkingRange": 30,
|
|
"entries": [
|
|
{ "name": "EarthElemental", "maxCount": 1, "probability": 100 },
|
|
{ "name": "DullCopperElemental", "maxCount": 1, "probability": 100 },
|
|
{ "name": "YomotsuWarrior", "maxCount": 2, "probability": 100 },
|
|
{ "name": "YomotsuPriest", "maxCount": 2, "probability": 100 }
|
|
]
|
|
},
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "9cbd85a7-68f8-401d-a8c3-b2a220b2e431",
|
|
"name": "Spawner (506)",
|
|
"location": [16, 56, -1],
|
|
"map": "Malas",
|
|
"count": 6,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:10:00",
|
|
"team": 0,
|
|
"homeRange": 30,
|
|
"walkingRange": 30,
|
|
"entries": [
|
|
{ "name": "EarthElemental", "maxCount": 2, "probability": 100 },
|
|
{ "name": "DullCopperElemental", "maxCount": 2, "probability": 100 },
|
|
{ "name": "YomotsuWarrior", "maxCount": 1, "probability": 100 },
|
|
{ "name": "YomotsuPriest", "maxCount": 1, "probability": 100 }
|
|
]
|
|
},
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "a0525c92-565a-4b15-b6b0-61c6be263ae7",
|
|
"name": "Spawner (506)",
|
|
"location": [102, 84, -1],
|
|
"map": "Malas",
|
|
"count": 6,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:10:00",
|
|
"team": 0,
|
|
"homeRange": 30,
|
|
"walkingRange": 30,
|
|
"entries": [
|
|
{ "name": "EarthElemental", "maxCount": 1, "probability": 100 },
|
|
{ "name": "DullCopperElemental", "maxCount": 1, "probability": 100 },
|
|
{ "name": "YomotsuWarrior", "maxCount": 2, "probability": 100 },
|
|
{ "name": "YomotsuPriest", "maxCount": 2, "probability": 100 }
|
|
]
|
|
},
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "ba3f54b0-b977-476e-be97-2ad5ba39dc19",
|
|
"name": "Spawner (506)",
|
|
"location": [83, 114, -1],
|
|
"map": "Malas",
|
|
"count": 6,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:10:00",
|
|
"team": 0,
|
|
"homeRange": 30,
|
|
"walkingRange": 30,
|
|
"entries": [
|
|
{ "name": "EarthElemental", "maxCount": 2, "probability": 100 },
|
|
{ "name": "DullCopperElemental", "maxCount": 2, "probability": 100 },
|
|
{ "name": "YomotsuWarrior", "maxCount": 1, "probability": 100 },
|
|
{ "name": "YomotsuPriest", "maxCount": 1, "probability": 100 }
|
|
]
|
|
},
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "dc1fe934-3641-4ddd-8b6c-207ccf0861ef",
|
|
"name": "Spawner (506)",
|
|
"location": [116, 61, -1],
|
|
"map": "Malas",
|
|
"count": 6,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:10:00",
|
|
"team": 0,
|
|
"homeRange": 30,
|
|
"walkingRange": 30,
|
|
"entries": [
|
|
{ "name": "EarthElemental", "maxCount": 2, "probability": 100 },
|
|
{ "name": "DullCopperElemental", "maxCount": 2, "probability": 100 },
|
|
{ "name": "YomotsuWarrior", "maxCount": 1, "probability": 100 },
|
|
{ "name": "YomotsuPriest", "maxCount": 1, "probability": 100 }
|
|
]
|
|
},
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "ee2e7f73-a95f-40e6-8493-80dbe4c2ea65",
|
|
"name": "Spawner (506)",
|
|
"location": [25, 19, -1],
|
|
"map": "Malas",
|
|
"count": 6,
|
|
"minDelay": "00:05:00",
|
|
"maxDelay": "00:10:00",
|
|
"team": 0,
|
|
"homeRange": 30,
|
|
"walkingRange": 30,
|
|
"entries": [
|
|
{ "name": "EarthElemental", "maxCount": 1, "probability": 100 },
|
|
{ "name": "DullCopperElemental", "maxCount": 1, "probability": 100 },
|
|
{ "name": "YomotsuWarrior", "maxCount": 2, "probability": 100 },
|
|
{ "name": "YomotsuPriest", "maxCount": 2, "probability": 100 }
|
|
]
|
|
}
|
|
]
|