warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
ModernUO/Distribution/Data/Spawns/shared/trammel/Despise.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

702 lines
17 KiB
JSON
Raw Blame History

[
{
"$type": "Spawner",
"guid": "0c1a2c73-e451-4e78-8fff-e320bb67ea7d",
"name": "Spawner (105)",
"location": [5420, 746, 5],
"map": "Trammel",
"count": 10,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 18,
"walkingRange": 25,
"entries": [
{ "name": "EarthElemental", "maxCount": 4, "probability": 100 },
{ "name": "Ettin", "maxCount": 6, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "0c46651c-0760-476e-8ebe-d51ca00006bf",
"name": "Spawner (105)",
"location": [5426, 791, 60],
"map": "Trammel",
"count": 3,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 12,
"walkingRange": 25,
"entries": [
{ "name": "Troll", "maxCount": 3, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "0de2bfd4-ccb8-4e8c-88b7-e234eb2f5122",
"name": "Spawner (105)",
"location": [5483, 711, 15],
"map": "Trammel",
"count": 4,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 12,
"walkingRange": 25,
"entries": [
{ "name": "Ettin", "maxCount": 4, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "193bc157-aeb6-4e74-88e4-11e980858cec",
"name": "Spawner (105)",
"location": [5564, 821, 45],
"map": "Trammel",
"count": 2,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 5,
"walkingRange": 5,
"entries": [
{ "name": "TreasureChestLevel4", "maxCount": 2, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "1eb2840b-690f-4f10-80d0-00a7e8d22a07",
"name": "Spawner (105)",
"location": [5475, 748, 5],
"map": "Trammel",
"count": 5,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 12,
"walkingRange": 25,
"entries": [
{ "name": "EarthElemental", "maxCount": 3, "probability": 100 },
{ "name": "Ettin", "maxCount": 2, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "20ae1a8a-90cd-4046-819f-f7eae50c6b24",
"name": "Spawner (105)",
"location": [5405, 576, 61],
"map": "Trammel",
"count": 5,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 12,
"walkingRange": 25,
"entries": [
{ "name": "Lizardman", "maxCount": 5, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "20f0fb49-eaea-4b6b-a14d-0868d204ceaf",
"name": "Spawner (105)",
"location": [5441, 680, 20],
"map": "Trammel",
"count": 6,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 12,
"walkingRange": 25,
"entries": [
{ "name": "EarthElemental", "maxCount": 6, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "25b5c0ec-29bf-4618-b857-9e68e23fa088",
"name": "Spawner (105)",
"location": [5398, 996, 5],
"map": "Trammel",
"count": 3,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 15,
"walkingRange": 25,
"entries": [
{ "name": "AcidElemental", "maxCount": 3, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "2fbd19bb-2caa-494d-ac09-70784915cc6e",
"name": "Spawner (105)",
"location": [5590, 871, 45],
"map": "Trammel",
"count": 3,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 20,
"walkingRange": 35,
"entries": [
{ "name": "Ogre", "maxCount": 3, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "306d0efd-88fc-4880-a46d-d2f9e5b04ec7",
"name": "Spawner (105)",
"location": [5487, 902, 30],
"map": "Trammel",
"count": 4,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 15,
"walkingRange": 25,
"entries": [
{ "name": "Ettin", "maxCount": 4, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "312b70e0-4afc-411d-8f1a-d902ea0f9e16",
"name": "Spawner (105)",
"location": [5504, 597, 45],
"map": "Trammel",
"count": 5,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 12,
"walkingRange": 25,
"entries": [
{ "name": "Lizardman", "maxCount": 5, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "36aa83bc-3e2a-42f8-bdeb-0ee9cb004a64",
"name": "Spawner (105)",
"location": [5490, 676, 20],
"map": "Trammel",
"count": 4,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 12,
"walkingRange": 25,
"entries": [
{ "name": "Ettin", "maxCount": 4, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "39d6eab1-27c8-4f51-b3d7-4befdbd17478",
"name": "Spawner (105)",
"location": [5410, 611, 45],
"map": "Trammel",
"count": 5,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 12,
"walkingRange": 25,
"entries": [
{ "name": "Lizardman", "maxCount": 5, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "3e8b1378-fe18-4c3b-9e86-5b35a30a1c6f",
"name": "Spawner (105)",
"location": [5482, 791, 60],
"map": "Trammel",
"count": 3,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 12,
"walkingRange": 25,
"entries": [
{ "name": "Troll", "maxCount": 3, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "41a2d01b-14a5-4b87-a4fc-85053f7ae31a",
"name": "Spawner (105)",
"location": [5460, 526, 60],
"map": "Trammel",
"count": 5,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 12,
"walkingRange": 25,
"entries": [
{ "name": "Lizardman", "maxCount": 5, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "462a3304-fa2a-4473-99f4-438e9f55886e",
"name": "Spawner (105)",
"location": [5439, 851, 45],
"map": "Trammel",
"count": 3,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 12,
"walkingRange": 25,
"entries": [
{ "name": "Troll", "maxCount": 3, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "4f3cb4cd-569f-4ad1-9343-e7fe4eb4775a",
"name": "Spawner (105)",
"location": [5464, 600, 45],
"map": "Trammel",
"count": 5,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 12,
"walkingRange": 25,
"entries": [
{ "name": "Lizardman", "maxCount": 5, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "5329add2-7d3f-4884-8b4c-61dd7b78d29b",
"name": "Spawner (105)",
"location": [5593, 794, 60],
"map": "Trammel",
"count": 1,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 5,
"walkingRange": 5,
"entries": [
{ "name": "TreasureChestLevel2", "maxCount": 1, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "5e82bdcb-378c-4879-af67-03ecc96f3ff0",
"name": "Spawner (105)",
"location": [5391, 905, 30],
"map": "Trammel",
"count": 4,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 15,
"walkingRange": 25,
"entries": [
{ "name": "Ettin", "maxCount": 4, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "60ec080d-a3a9-44a8-b00c-e1d1bb81818f",
"name": "Spawner (105)",
"location": [5394, 525, 65],
"map": "Trammel",
"count": 3,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 5,
"walkingRange": 5,
"entries": [
{ "name": "TreasureChestLevel1", "maxCount": 1, "probability": 100 },
{ "name": "TreasureChestLevel2", "maxCount": 2, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "68d435c5-668c-4af0-a9fd-5e9c3e2002d0",
"name": "Spawner (105)",
"location": [5532, 787, 60],
"map": "Trammel",
"count": 3,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 15,
"walkingRange": 25,
"entries": [
{ "name": "Ogre", "maxCount": 3, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "6c3fc410-6d7c-4e7e-80fb-62d05f146e28",
"name": "Spawner (105)",
"location": [5503, 529, 60],
"map": "Trammel",
"count": 7,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 12,
"walkingRange": 25,
"entries": [
{ "name": "Lizardman", "maxCount": 5, "probability": 100 },
{ "name": "TreasureChestLevel2", "maxCount": 1, "probability": 100 },
{ "name": "TreasureChestLevel3", "maxCount": 1, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "6eb7ccc4-5d54-4e56-b637-4726b2606957",
"name": "Spawner (105)",
"location": [5386, 612, 45],
"map": "Trammel",
"count": 8,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 12,
"walkingRange": 25,
"entries": [
{ "name": "Lizardman", "maxCount": 5, "probability": 100 },
{ "name": "TreasureChestLevel2", "maxCount": 1, "probability": 100 },
{ "name": "TreasureChestLevel3", "maxCount": 2, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "77392dd3-f72b-43fa-b5b4-9ce81858fe4f",
"name": "Spawner (105)",
"location": [5411, 541, 60],
"map": "Trammel",
"count": 5,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 12,
"walkingRange": 25,
"entries": [
{ "name": "Lizardman", "maxCount": 5, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "8ecf5903-3e52-48af-8a3e-3deececd5314",
"name": "Spawner (105)",
"location": [5546, 888, 30],
"map": "Trammel",
"count": 3,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 8,
"walkingRange": 8,
"entries": [
{ "name": "TreasureChestLevel2", "maxCount": 1, "probability": 100 },
{ "name": "TreasureChestLevel3", "maxCount": 2, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "90882c2e-a2b4-4c37-905e-b87f5ed61a60",
"name": "Spawner (105)",
"location": [5390, 587, 45],
"map": "Trammel",
"count": 3,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 5,
"walkingRange": 5,
"entries": [
{ "name": "TreasureChestLevel1", "maxCount": 1, "probability": 100 },
{ "name": "TreasureChestLevel2", "maxCount": 2, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "9a3db886-d50c-4e9c-b241-c3a0c5ee9e98",
"name": "Spawner (105)",
"location": [5470, 860, 45],
"map": "Trammel",
"count": 3,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 12,
"walkingRange": 25,
"entries": [
{ "name": "Troll", "maxCount": 3, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "9ed82ee8-dd07-43ef-a454-a1dd5e964fa7",
"name": "Spawner (105)",
"location": [5507, 656, 20],
"map": "Trammel",
"count": 3,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 5,
"walkingRange": 5,
"entries": [
{ "name": "TreasureChestLevel2", "maxCount": 1, "probability": 100 },
{ "name": "TreasureChestLevel3", "maxCount": 2, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "9fcd5ea5-3722-49ef-8d15-8c6f86f1d10c",
"name": "Spawner (105)",
"location": [5505, 747, 5],
"map": "Trammel",
"count": 5,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 18,
"walkingRange": 25,
"entries": [
{ "name": "EarthElemental", "maxCount": 3, "probability": 100 },
{ "name": "Ettin", "maxCount": 2, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "ac09482f-cf78-4b67-849e-81d969044806",
"name": "Spawner (105)",
"location": [5385, 703, 15],
"map": "Trammel",
"count": 4,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 15,
"walkingRange": 25,
"entries": [
{ "name": "Ettin", "maxCount": 4, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "b7c5f3ca-e60d-4623-b31c-86583932aa77",
"name": "Spawner (105)",
"location": [5426, 943, 20],
"map": "Trammel",
"count": 4,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 15,
"walkingRange": 25,
"entries": [
{ "name": "Ettin", "maxCount": 4, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "cab315f4-6eaf-4772-a991-c2f4ee6c5284",
"name": "Spawner (105)",
"location": [5471, 973, 15],
"map": "Trammel",
"count": 3,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 18,
"walkingRange": 25,
"entries": [
{ "name": "Cyclops", "maxCount": 3, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "cd736cc2-c0d3-4259-bbe2-949af88f94e7",
"name": "Spawner (105)",
"location": [5504, 939, 20],
"map": "Trammel",
"count": 4,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 15,
"walkingRange": 25,
"entries": [
{ "name": "Ettin", "maxCount": 4, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "cf63c3f7-751e-498b-bc4f-3e185280593b",
"name": "Spawner (105)",
"location": [5557, 828, 45],
"map": "Trammel",
"count": 1,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 7,
"walkingRange": 7,
"entries": [
{ "name": "TreasureChestLevel3", "maxCount": 1, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "d35770ae-714d-4f38-b2ea-ce1e4320a82e",
"name": "Spawner (105)",
"location": [5387, 697, 15],
"map": "Trammel",
"count": 5,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 5,
"walkingRange": 5,
"entries": [
{ "name": "TreasureChestLevel2", "maxCount": 1, "probability": 100 },
{ "name": "TreasureChestLevel3", "maxCount": 4, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "d710fdd3-1600-4436-a76b-7062ab33aa72",
"name": "Spawner (105)",
"location": [5391, 660, 20],
"map": "Trammel",
"count": 4,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 12,
"walkingRange": 25,
"entries": [
{ "name": "Ettin", "maxCount": 4, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "d88f3a9b-067f-48cc-ba7f-636f89d9445e",
"name": "Spawner (105)",
"location": [5605, 799, 60],
"map": "Trammel",
"count": 3,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 10,
"walkingRange": 10,
"entries": [
{ "name": "TreasureChestLevel3", "maxCount": 3, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "de0083f1-6b11-411b-8875-f94bbd11846b",
"name": "Spawner (105)",
"location": [5558, 824, 45],
"map": "Trammel",
"count": 5,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 12,
"walkingRange": 25,
"entries": [
{ "name": "OgreLord", "maxCount": 5, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "e6a67238-55d8-4735-8ac3-7efcc25d3193",
"name": "Spawner (105)",
"location": [5604, 789, 60],
"map": "Trammel",
"count": 3,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 15,
"walkingRange": 25,
"entries": [
{ "name": "Ogre", "maxCount": 3, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "e6b0982f-8c36-4bc7-be61-f5fb371fd66f",
"name": "Spawner (105)",
"location": [5528, 902, 30],
"map": "Trammel",
"count": 3,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 15,
"walkingRange": 25,
"entries": [
{ "name": "Ogre", "maxCount": 3, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "e9e70e19-7819-454d-8641-1fab82224c65",
"name": "Spawner (105)",
"location": [5397, 995, 5],
"map": "Trammel",
"count": 1,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 10,
"walkingRange": 10,
"entries": [
{ "name": "TreasureChestLevel3", "maxCount": 1, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "f9357ebd-0256-47bb-b849-2add953fab65",
"name": "Spawner (105)",
"location": [5398, 995, 5],
"map": "Trammel",
"count": 2,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 10,
"walkingRange": 10,
"entries": [
{ "name": "TreasureChestLevel4", "maxCount": 2, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "ff5edaf2-353f-4e22-8d77-75ba2cb489be",
"name": "Spawner (105)",
"location": [5435, 589, 47],
"map": "Trammel",
"count": 5,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 12,
"walkingRange": 25,
"entries": [
{ "name": "Lizardman", "maxCount": 5, "probability": 100 }
]
}
]
Reference in a new issue View git blame Copy permalink