warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
ModernUO/Distribution/Data/Spawns/uoml/trammel/Outdoors.json
Kamron Batman d8a64f3316
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.
2026-06-25 23:24:45 -07:00

189 lines
6.1 KiB
JSON
Raw Blame History

[
{
"$type": "Spawner",
"guid": "949f3b33-3f72-4065-b212-a15495e305d6",
"name": "Spawner (2113)",
"location": [3619, 2814, 21],
"map": "Trammel",
"count": 17,
"minDelay": "01:00:00",
"maxDelay": "01:00:00",
"team": 0,
"homeRange": 50,
"walkingRange": 50,
"entries": [
{ "name": "HordeMinion", "maxCount": 17, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "b4555e77-ee2f-44d0-b85b-d7d6f26612ef",
"name": "Spawner (2113)",
"location": [3619, 2814, 21],
"map": "Trammel",
"count": 17,
"minDelay": "01:00:00",
"maxDelay": "01:00:00",
"team": 0,
"homeRange": 50,
"walkingRange": 50,
"entries": [
{ "name": "Mongbat", "maxCount": 17, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "8cd18e64-2c1c-4853-b82e-8842b4b71dcd",
"name": "Spawner (2113)",
"location": [3485, 2595, 12],
"map": "Trammel",
"count": 3,
"minDelay": "01:00:00",
"maxDelay": "01:00:00",
"team": 0,
"homeRange": 30,
"walkingRange": 30,
"entries": [
{ "name": "Brigand", "maxCount": 3, "probability": 100 },
{ "name": "Harpy", "maxCount": 3, "probability": 100 },
{ "name": "Lizardman", "maxCount": 3, "probability": 100 },
{ "name": "OrcishMage", "maxCount": 3, "probability": 100 },
{ "name": "Orc", "maxCount": 3, "probability": 100 },
{ "name": "Ratman", "maxCount": 3, "probability": 100 },
{ "name": "Spectre", "maxCount": 3, "probability": 100 },
{ "name": "Troll", "maxCount": 3, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "c08f91a3-eb9d-464c-96ce-d70f6c5a8fc4",
"name": "Spawner (2113)",
"location": [3446, 2741, 49],
"map": "Trammel",
"count": 7,
"minDelay": "01:00:00",
"maxDelay": "01:00:00",
"team": 0,
"homeRange": 50,
"walkingRange": 50,
"entries": [
{ "name": "Brigand", "maxCount": 7, "probability": 100 },
{ "name": "Harpy", "maxCount": 7, "probability": 100 },
{ "name": "Lizardman", "maxCount": 7, "probability": 100 },
{ "name": "OrcishMage", "maxCount": 7, "probability": 100 },
{ "name": "Orc", "maxCount": 7, "probability": 100 },
{ "name": "Ratman", "maxCount": 7, "probability": 100 },
{ "name": "Spectre", "maxCount": 7, "probability": 100 },
{ "name": "Troll", "maxCount": 7, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "0111020b-4ccf-45e7-bfbe-8a4f4fbeedad",
"name": "Spawner (2113)",
"location": [3459, 2655, 9],
"map": "Trammel",
"count": 3,
"minDelay": "01:00:00",
"maxDelay": "01:00:00",
"team": 0,
"homeRange": 30,
"walkingRange": 30,
"entries": [
{ "name": "Brigand", "maxCount": 3, "probability": 100 },
{ "name": "Harpy", "maxCount": 3, "probability": 100 },
{ "name": "Lizardman", "maxCount": 3, "probability": 100 },
{ "name": "OrcishMage", "maxCount": 3, "probability": 100 },
{ "name": "Orc", "maxCount": 3, "probability": 100 },
{ "name": "Ratman", "maxCount": 3, "probability": 100 },
{ "name": "Spectre", "maxCount": 3, "probability": 100 },
{ "name": "Troll", "maxCount": 3, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "ed918ae7-13cc-45da-a9ee-166d198bb83f",
"name": "Spawner (2113)",
"location": [3379, 2693, 35],
"map": "Trammel",
"count": 3,
"minDelay": "01:00:00",
"maxDelay": "01:00:00",
"team": 0,
"homeRange": 30,
"walkingRange": 30,
"entries": [
{ "name": "Brigand", "maxCount": 3, "probability": 100 },
{ "name": "Harpy", "maxCount": 3, "probability": 100 },
{ "name": "Lizardman", "maxCount": 3, "probability": 100 },
{ "name": "OrcishMage", "maxCount": 3, "probability": 100 },
{ "name": "Orc", "maxCount": 3, "probability": 100 },
{ "name": "Ratman", "maxCount": 3, "probability": 100 },
{ "name": "Spectre", "maxCount": 3, "probability": 100 },
{ "name": "Troll", "maxCount": 3, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "63c48500-e80c-4662-a58d-b32b2591f94d",
"name": "Spawner (2113)",
"location": [3411, 2592, 44],
"map": "Trammel",
"count": 6,
"minDelay": "01:00:00",
"maxDelay": "01:00:00",
"team": 0,
"homeRange": 40,
"walkingRange": 40,
"entries": [
{ "name": "Brigand", "maxCount": 6, "probability": 100 },
{ "name": "Harpy", "maxCount": 6, "probability": 100 },
{ "name": "Lizardman", "maxCount": 6, "probability": 100 },
{ "name": "OrcishMage", "maxCount": 6, "probability": 100 },
{ "name": "Orc", "maxCount": 6, "probability": 100 },
{ "name": "Ratman", "maxCount": 6, "probability": 100 },
{ "name": "Spectre", "maxCount": 6, "probability": 100 },
{ "name": "Troll", "maxCount": 6, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "8dc26593-aecf-4d5c-97c6-d4d11e8411dc",
"name": "Spawner (2113)",
"location": [3464, 2503, 49],
"map": "Trammel",
"count": 7,
"minDelay": "01:00:00",
"maxDelay": "01:00:00",
"team": 0,
"homeRange": 50,
"walkingRange": 50,
"entries": [
{ "name": "Brigand", "maxCount": 7, "probability": 100 },
{ "name": "Harpy", "maxCount": 7, "probability": 100 },
{ "name": "Lizardman", "maxCount": 7, "probability": 100 },
{ "name": "OrcishMage", "maxCount": 7, "probability": 100 },
{ "name": "Orc", "maxCount": 7, "probability": 100 },
{ "name": "Ratman", "maxCount": 7, "probability": 100 },
{ "name": "Spectre", "maxCount": 7, "probability": 100 },
{ "name": "Troll", "maxCount": 7, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "2733ca83-6c31-48d5-b360-eedf6f885beb",
"name": "Spawner (2113)",
"location": [3602, 2815, 28],
"map": "Trammel",
"count": 1,
"minDelay": "00:45:00",
"maxDelay": "01:00:00",
"team": 0,
"homeRange": 1,
"walkingRange": 10,
"entries": [
{ "name": "OrcCamp", "maxCount": 1, "probability": 100 },
{ "name": "RatCamp", "maxCount": 1, "probability": 100 }
]
}
]
Reference in a new issue View git blame Copy permalink