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

574 lines
15 KiB
JSON
Raw Permalink Blame History

[
{
"$type": "Spawner",
"guid": "03886f2b-1e0e-48fd-8b92-35a1a60a95c5",
"name": "Spawner (110)",
"location": [5837, 245, -5],
"map": "Trammel",
"count": 1,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 1,
"walkingRange": 1,
"entries": [
{ "name": "TreasureChestLevel4", "maxCount": 1, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "106c22c9-9d01-43a0-8983-bea255146fd5",
"name": "Spawner (110)",
"location": [5833, 242, -2],
"map": "Trammel",
"count": 1,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 1,
"walkingRange": 1,
"entries": [
{ "name": "TreasureChestLevel3", "maxCount": 1, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "308a4f85-5d3f-4f44-af64-371951608f97",
"name": "Spawner (110)",
"location": [5785, 161, -6],
"map": "Trammel",
"count": 5,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 18,
"walkingRange": 20,
"entries": [
{ "name": "FrostOoze", "maxCount": 1, "probability": 100 },
{ "name": "FrostSpider", "maxCount": 1, "probability": 100 },
{ "name": "IceElemental", "maxCount": 1, "probability": 100 },
{ "name": "SnowElemental", "maxCount": 1, "probability": 100 },
{ "name": "IceSnake", "maxCount": 1, "probability": 100 },
{ "name": "FrostTroll", "maxCount": 1, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "3cfd9a1b-000a-430f-b44c-e64720d69237",
"name": "Spawner (110)",
"location": [5772, 188, -3],
"map": "Trammel",
"count": 1,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 1,
"walkingRange": 1,
"entries": [
{ "name": "TreasureChestLevel3", "maxCount": 1, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "3def478d-d193-49d2-96e0-b36023034db7",
"name": "Spawner (110)",
"location": [5752, 144, 9],
"map": "Trammel",
"count": 1,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 10,
"walkingRange": 10,
"entries": [
{ "name": "WhiteWyrm", "maxCount": 1, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "3ec99717-4da8-4d7c-9fb2-dd9ba4c845bc",
"name": "Spawner (110)",
"location": [5731, 176, -5],
"map": "Trammel",
"count": 18,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 25,
"walkingRange": 35,
"entries": [
{ "name": "IceSerpent", "maxCount": 9, "probability": 100 },
{ "name": "SnowElemental", "maxCount": 9, "probability": 100 },
{ "name": "IceElemental", "maxCount": 9, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "3f420eb7-724d-47e0-89fa-1e844feee72c",
"name": "Spawner (110)",
"location": [5666, 331, 0],
"map": "Trammel",
"count": 1,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 1,
"walkingRange": 1,
"entries": [
{ "name": "TreasureChestLevel4", "maxCount": 1, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "4133a659-4bcb-4b38-a3fe-097866c8aa4e",
"name": "Spawner (110)",
"location": [5680, 306, 0],
"map": "Trammel",
"count": 1,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 10,
"walkingRange": 20,
"entries": [
{ "name": "IceFiend", "maxCount": 1, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "44394753-6925-4e7f-95d0-d1998f5bb036",
"name": "Spawner (110)",
"location": [5831, 358, -1],
"map": "Trammel",
"count": 24,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 15,
"walkingRange": 25,
"entries": [
{ "name": "Ratman", "maxCount": 12, "probability": 100 },
{ "name": "RatmanArcher", "maxCount": 7, "probability": 100 },
{ "name": "RatmanMage", "maxCount": 5, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "49c552fa-1934-405a-8d30-4fb7db89313f",
"name": "Spawner (110)",
"location": [5839, 159, 0],
"map": "Trammel",
"count": 5,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 15,
"walkingRange": 20,
"entries": [
{ "name": "FrostOoze", "maxCount": 1, "probability": 100 },
{ "name": "FrostSpider", "maxCount": 1, "probability": 100 },
{ "name": "IceElemental", "maxCount": 1, "probability": 100 },
{ "name": "SnowElemental", "maxCount": 1, "probability": 100 },
{ "name": "IceSnake", "maxCount": 1, "probability": 100 },
{ "name": "FrostTroll", "maxCount": 1, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "4df74fc7-0443-4fdc-a6ad-57d9a4d6bc7f",
"name": "Spawner (110)",
"location": [5684, 181, -5],
"map": "Trammel",
"count": 1,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 1,
"walkingRange": 1,
"entries": [
{ "name": "TreasureChestLevel4", "maxCount": 1, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "6502c7e1-5c7a-43b7-a0de-33f73f78e6a3",
"name": "Spawner (110)",
"location": [5838, 355, 0],
"map": "Trammel",
"count": 1,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 1,
"walkingRange": 1,
"entries": [
{ "name": "TreasureChestLevel2", "maxCount": 1, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "66e9c531-1fee-42e4-910a-cdf71b212b95",
"name": "Spawner (110)",
"location": [5754, 211, -6],
"map": "Trammel",
"count": 1,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 1,
"walkingRange": 1,
"entries": [
{ "name": "TreasureChestLevel3", "maxCount": 1, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "722d603b-dddb-4b71-88c4-9e965918d6e9",
"name": "Spawner (110)",
"location": [5763, 187, 0],
"map": "Trammel",
"count": 1,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 1,
"walkingRange": 1,
"entries": [
{ "name": "TreasureChestLevel4", "maxCount": 1, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "76706bc3-f4c4-4040-b206-650aa04e041d",
"name": "Spawner (110)",
"location": [5824, 363, 0],
"map": "Trammel",
"count": 1,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 1,
"walkingRange": 1,
"entries": [
{ "name": "TreasureChestLevel3", "maxCount": 1, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "7ebb7a60-b45f-469c-ad0b-86490c855be1",
"name": "Spawner (110)",
"location": [5756, 203, -2],
"map": "Trammel",
"count": 1,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 1,
"walkingRange": 1,
"entries": [
{ "name": "TreasureChestLevel4", "maxCount": 1, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "84103371-1387-4ebe-af6a-91faf5d3a5f2",
"name": "Spawner (110)",
"location": [5850, 219, -3],
"map": "Trammel",
"count": 1,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 10,
"walkingRange": 20,
"entries": [
{ "name": "RatmanMage", "maxCount": 1, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "8855a9a7-aed4-4c54-94da-a94024783d51",
"name": "Spawner (110)",
"location": [5854, 227, 0],
"map": "Trammel",
"count": 1,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 1,
"walkingRange": 1,
"entries": [
{ "name": "TreasureChestLevel3", "maxCount": 1, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "9456469a-1f9f-43a1-9c7b-639ca4e367f3",
"name": "Spawner (110)",
"location": [5712, 145, -34],
"map": "Trammel",
"count": 1,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 1,
"walkingRange": 1,
"entries": [
{ "name": "TreasureChestLevel4", "maxCount": 1, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "947f998d-a84b-49c8-8619-852fff3e5295",
"name": "Spawner (110)",
"location": [5669, 330, 0],
"map": "Trammel",
"count": 1,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 10,
"walkingRange": 20,
"entries": [
{ "name": "IceFiend", "maxCount": 1, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "9cbfc951-e954-4e8d-b1af-cf9457216b53",
"name": "Spawner (110)",
"location": [5799, 188, -6],
"map": "Trammel",
"count": 6,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 10,
"walkingRange": 25,
"entries": [
{ "name": "IceSerpent", "maxCount": 2, "probability": 100 },
{ "name": "SnowElemental", "maxCount": 1, "probability": 100 },
{ "name": "Ratman", "maxCount": 1, "probability": 100 },
{ "name": "FrostTroll", "maxCount": 1, "probability": 100 },
{ "name": "FrostSpider", "maxCount": 1, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "9f689286-dcc8-44ac-9d6b-c34c002d5ff5",
"name": "Spawner (110)",
"location": [5682, 314, 0],
"map": "Trammel",
"count": 1,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 1,
"walkingRange": 1,
"entries": [
{ "name": "TreasureChestLevel4", "maxCount": 1, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "a6faf1f3-65fa-47a8-a597-1bd61d7dc350",
"name": "Spawner (110)",
"location": [5757, 213, -7],
"map": "Trammel",
"count": 10,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 15,
"walkingRange": 20,
"entries": [
{ "name": "IceSerpent", "maxCount": 3, "probability": 100 },
{ "name": "Ratman", "maxCount": 1, "probability": 100 },
{ "name": "SnowElemental", "maxCount": 4, "probability": 100 },
{ "name": "IceElemental", "maxCount": 4, "probability": 100 },
{ "name": "FrostTroll", "maxCount": 2, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "a74f4f2c-7906-46c3-bd5f-8ce30e43417c",
"name": "Spawner (110)",
"location": [5867, 218, -4],
"map": "Trammel",
"count": 4,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 15,
"walkingRange": 25,
"entries": [
{ "name": "FrostSpider", "maxCount": 1, "probability": 100 },
{ "name": "FrostOoze", "maxCount": 2, "probability": 100 },
{ "name": "IceSnake", "maxCount": 1, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "a9adcc2c-c67d-4f0d-8241-7aa8d73d0fdd",
"name": "Spawner (110)",
"location": [5681, 191, -6],
"map": "Trammel",
"count": 9,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 15,
"walkingRange": 20,
"entries": [
{ "name": "IceSerpent", "maxCount": 3, "probability": 100 },
{ "name": "SnowElemental", "maxCount": 4, "probability": 100 },
{ "name": "IceElemental", "maxCount": 4, "probability": 100 },
{ "name": "FrostTroll", "maxCount": 1, "probability": 100 },
{ "name": "Ratman", "maxCount": 1, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "ada3263b-aece-4dee-a69b-fe3ef96a3550",
"name": "Spawner (110)",
"location": [5814, 237, 0],
"map": "Trammel",
"count": 1,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 15,
"walkingRange": 15,
"entries": [
{ "name": "ArcticOgreLord", "maxCount": 1, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "b4e94abe-5829-4d51-acb5-e112d8b33ce1",
"name": "Spawner (110)",
"location": [5676, 331, 0],
"map": "Trammel",
"count": 1,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 1,
"walkingRange": 1,
"entries": [
{ "name": "TreasureChestLevel4", "maxCount": 1, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "b5f90c32-64bd-4524-bfc6-84716f186595",
"name": "Spawner (110)",
"location": [5683, 197, -4],
"map": "Trammel",
"count": 1,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 1,
"walkingRange": 1,
"entries": [
{ "name": "TreasureChestLevel3", "maxCount": 1, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "b69a34f7-3ff9-4b19-b38e-817c98a7c93f",
"name": "Spawner (110)",
"location": [5848, 226, 0],
"map": "Trammel",
"count": 1,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 1,
"walkingRange": 1,
"entries": [
{ "name": "TreasureChestLevel2", "maxCount": 1, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "bc1b0fa0-397d-400e-a8a1-46c6980d3ed7",
"name": "Spawner (110)",
"location": [5751, 140, 10],
"map": "Trammel",
"count": 1,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 1,
"walkingRange": 1,
"entries": [
{ "name": "TreasureChestLevel4", "maxCount": 1, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "c1a3b5ae-9c59-488f-8d7f-24d25e0c7673",
"name": "Spawner (110)",
"location": [5758, 139, 5],
"map": "Trammel",
"count": 1,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 1,
"walkingRange": 1,
"entries": [
{ "name": "TreasureChestLevel3", "maxCount": 1, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "ca52ec08-1f4f-400a-ab1f-9e05892dbdd2",
"name": "Spawner (110)",
"location": [5696, 303, 0],
"map": "Trammel",
"count": 1,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 1,
"walkingRange": 1,
"entries": [
{ "name": "TreasureChestLevel4", "maxCount": 1, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "dee07fb6-4dcc-43d5-bd0a-706c36801e8d",
"name": "Spawner (110)",
"location": [5771, 224, -2],
"map": "Trammel",
"count": 1,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 10,
"walkingRange": 20,
"entries": [
{ "name": "ArcticOgreLord", "maxCount": 1, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "f7a22de1-cc80-4060-aa02-9728d7e241a0",
"name": "Spawner (110)",
"location": [5721, 147, -1],
"map": "Trammel",
"count": 1,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 1,
"walkingRange": 1,
"entries": [
{ "name": "TreasureChestLevel3", "maxCount": 1, "probability": 100 }
]
}
]
Reference in a new issue View git blame Copy permalink