refactor(spawners): replace DynamicJson with typed SpawnerDto records (#2505)
## 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.
This commit is contained in:
Kamron Batman
GitHub
parent
a26219c837
commit
d8a64f3316
135 changed files with 7654 additions and 6079 deletions
|
|
@ -1,6 +1,6 @@
|
|||
[
|
||||
[
|
||||
{
|
||||
"type": "Spawner",
|
||||
"$type": "Spawner",
|
||||
"guid": "04856160-7e89-4672-a7d9-468b8634c3d6",
|
||||
"name": "Spawner (208)",
|
||||
"location": [4545, 1317, 8],
|
||||
|
|
@ -9,7 +9,10 @@
|
|||
"minDelay": "00:05:00",
|
||||
"maxDelay": "00:10:00",
|
||||
"team": 0,
|
||||
"spawnBounds": { "start": { "x": 4535, "y": 1307, "z": -128 }, "end": { "x": 4555, "y": 1327, "z": 25 } },
|
||||
"spawnBounds": {
|
||||
"start": { "x": 4535, "y": 1307, "z": -128 },
|
||||
"end": { "x": 4555, "y": 1327, "z": 25 }
|
||||
},
|
||||
"walkingRange": 20,
|
||||
"entries": [
|
||||
{ "name": "Spectre", "maxCount": 1, "probability": 100 },
|
||||
|
|
@ -20,7 +23,7 @@
|
|||
]
|
||||
},
|
||||
{
|
||||
"type": "Spawner",
|
||||
"$type": "Spawner",
|
||||
"guid": "14b45cdf-987e-4dff-9e9f-10e90e3662e6",
|
||||
"name": "Spawner (208)",
|
||||
"location": [2758, 867, 0],
|
||||
|
|
@ -29,7 +32,10 @@
|
|||
"minDelay": "00:05:00",
|
||||
"maxDelay": "00:10:00",
|
||||
"team": 0,
|
||||
"spawnBounds": { "start": { "x": 2738, "y": 847, "z": -128 }, "end": { "x": 2778, "y": 887, "z": 15 } },
|
||||
"spawnBounds": {
|
||||
"start": { "x": 2738, "y": 847, "z": -128 },
|
||||
"end": { "x": 2778, "y": 887, "z": 15 }
|
||||
},
|
||||
"walkingRange": 20,
|
||||
"entries": [
|
||||
{ "name": "Spectre", "maxCount": 2, "probability": 100 },
|
||||
|
|
@ -39,7 +45,7 @@
|
|||
]
|
||||
},
|
||||
{
|
||||
"type": "Spawner",
|
||||
"$type": "Spawner",
|
||||
"guid": "43d53b7d-95f9-4332-8d22-33e5f5a1fcf6",
|
||||
"name": "Spawner (208)",
|
||||
"location": [722, 1119, 0],
|
||||
|
|
@ -55,7 +61,7 @@
|
|||
]
|
||||
},
|
||||
{
|
||||
"type": "Spawner",
|
||||
"$type": "Spawner",
|
||||
"guid": "47aa8449-5b66-401f-ac38-c5b6538627b6",
|
||||
"name": "Spawner (208)",
|
||||
"location": [4543, 1314, 8],
|
||||
|
|
@ -64,14 +70,17 @@
|
|||
"minDelay": "00:05:00",
|
||||
"maxDelay": "00:10:00",
|
||||
"team": 0,
|
||||
"spawnBounds": { "start": { "x": 4533, "y": 1304, "z": -128 }, "end": { "x": 4553, "y": 1324, "z": 25 } },
|
||||
"spawnBounds": {
|
||||
"start": { "x": 4533, "y": 1304, "z": -128 },
|
||||
"end": { "x": 4553, "y": 1324, "z": 25 }
|
||||
},
|
||||
"walkingRange": 20,
|
||||
"entries": [
|
||||
{ "name": "Lich", "maxCount": 1, "probability": 100 }
|
||||
]
|
||||
},
|
||||
{
|
||||
"type": "Spawner",
|
||||
"$type": "Spawner",
|
||||
"guid": "522530f4-50ea-4fbf-9119-b783bd955678",
|
||||
"name": "Spawner (208)",
|
||||
"location": [2438, 1100, 8],
|
||||
|
|
@ -80,7 +89,10 @@
|
|||
"minDelay": "00:05:00",
|
||||
"maxDelay": "00:10:00",
|
||||
"team": 0,
|
||||
"spawnBounds": { "start": { "x": 2428, "y": 1090, "z": -128 }, "end": { "x": 2448, "y": 1110, "z": 30 } },
|
||||
"spawnBounds": {
|
||||
"start": { "x": 2428, "y": 1090, "z": -128 },
|
||||
"end": { "x": 2448, "y": 1110, "z": 30 }
|
||||
},
|
||||
"walkingRange": 20,
|
||||
"entries": [
|
||||
{ "name": "Spectre", "maxCount": 1, "probability": 100 },
|
||||
|
|
@ -92,7 +104,7 @@
|
|||
]
|
||||
},
|
||||
{
|
||||
"type": "Spawner",
|
||||
"$type": "Spawner",
|
||||
"guid": "7dfee8fd-49f0-457d-a88c-f38c65bf2474",
|
||||
"name": "Spawner (208)",
|
||||
"location": [1369, 1475, 10],
|
||||
|
|
@ -111,7 +123,7 @@
|
|||
]
|
||||
},
|
||||
{
|
||||
"type": "Spawner",
|
||||
"$type": "Spawner",
|
||||
"guid": "8bdfe6b3-df80-48b6-8d1e-8e052efde18b",
|
||||
"name": "Spawner (208)",
|
||||
"location": [3407, 2652, 48],
|
||||
|
|
@ -128,7 +140,7 @@
|
|||
]
|
||||
},
|
||||
{
|
||||
"type": "Spawner",
|
||||
"$type": "Spawner",
|
||||
"guid": "b3ba766a-4852-4c5e-adf1-0276e193317f",
|
||||
"name": "Spawner (208)",
|
||||
"location": [1285, 3731, 0],
|
||||
|
|
@ -137,7 +149,10 @@
|
|||
"minDelay": "00:05:00",
|
||||
"maxDelay": "00:10:00",
|
||||
"team": 0,
|
||||
"spawnBounds": { "start": { "x": 1275, "y": 3721, "z": -128 }, "end": { "x": 1295, "y": 3741, "z": 15 } },
|
||||
"spawnBounds": {
|
||||
"start": { "x": 1275, "y": 3721, "z": -128 },
|
||||
"end": { "x": 1295, "y": 3741, "z": 15 }
|
||||
},
|
||||
"walkingRange": 15,
|
||||
"entries": [
|
||||
{ "name": "Spectre", "maxCount": 2, "probability": 100 },
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue