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

679 lines
17 KiB
JSON
Raw Blame History

[
{
"$type": "Spawner",
"guid": "00f9e4a9-d9a7-4d44-aecc-c2bb20a79c9c",
"name": "Spawner (220)",
"location": [5920, 1842, 1],
"map": "Felucca",
"count": 2,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 15,
"walkingRange": 30,
"entries": [
{ "name": "BlackSolenWorker", "maxCount": 2, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "022918a5-aa50-4cf1-b286-bae8de9c9537",
"name": "Spawner (220)",
"location": [5884, 1920, -15],
"map": "Felucca",
"count": 1,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 10,
"walkingRange": 20,
"entries": [
{ "name": "AntLion", "maxCount": 1, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "04a12d97-707d-4bc9-ad99-b32f0e88e158",
"name": "Spawner (220)",
"location": [5671, 1979, 0],
"map": "Felucca",
"count": 1,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 20,
"walkingRange": 30,
"entries": [
{ "name": "BlackSolenWarrior", "maxCount": 1, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "0876305c-d6ce-46ff-bb97-e34d5fb772a9",
"name": "Spawner (220)",
"location": [5798, 1963, 0],
"map": "Felucca",
"count": 2,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 10,
"walkingRange": 35,
"entries": [
{ "name": "BlackSolenWorker", "maxCount": 2, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "0b57c719-bf1c-4cbe-ac70-5aaabda64779",
"name": "Spawner (220)",
"location": [5681, 1886, 2],
"map": "Felucca",
"count": 1,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 10,
"walkingRange": 50,
"entries": [
{ "name": "BlackSolenWarrior", "maxCount": 1, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "0cda81be-bbe3-4312-af53-dcf5b33a1be8",
"name": "Spawner (220)",
"location": [5699, 1921, 2],
"map": "Felucca",
"count": 2,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 10,
"walkingRange": 30,
"entries": [
{ "name": "BlackSolenWarrior", "maxCount": 2, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "164e28e4-c77f-450f-916a-493904e79d9b",
"name": "Spawner (220)",
"location": [3218, 502, 0],
"map": "Felucca",
"count": 3,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 10,
"walkingRange": 10,
"entries": [
{ "name": "RedSolenInfiltratorQueen", "maxCount": 1, "probability": 100 },
{ "name": "RedSolenInfiltratorWarrior", "maxCount": 2, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "292f941a-a9c4-4ec2-8957-0252fe7be988",
"name": "Spawner (220)",
"location": [5673, 1846, 1],
"map": "Felucca",
"count": 1,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 6,
"walkingRange": 20,
"entries": [
{ "name": "BlackSolenWorker", "maxCount": 1, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "308e3de7-9304-466e-9cc0-e71367242d75",
"name": "Spawner (220)",
"location": [5815, 1881, 2],
"map": "Felucca",
"count": 1,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 7,
"walkingRange": 20,
"entries": [
{ "name": "BlackSolenWarrior", "maxCount": 1, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "315f85b8-ba97-4ca0-b2c4-92b7cd539c5b",
"name": "Spawner (220)",
"location": [5847, 1819, 1],
"map": "Felucca",
"count": 2,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 10,
"walkingRange": 25,
"entries": [
{ "name": "BlackSolenWorker", "maxCount": 2, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "39cbbb5e-744c-4179-8646-fb1290698ad1",
"name": "Spawner (220)",
"location": [5829, 1798, 1],
"map": "Felucca",
"count": 1,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 10,
"walkingRange": 15,
"entries": [
{ "name": "BlackSolenWorker", "maxCount": 1, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "3bdddcd1-a470-49d7-bc08-41a4e9049e3d",
"name": "Spawner (220)",
"location": [5767, 1962, 2],
"map": "Felucca",
"count": 2,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 15,
"walkingRange": 50,
"entries": [
{ "name": "DreadSpider", "maxCount": 2, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "40a36fd0-161f-42c1-9cca-9db682d9c50e",
"name": "Spawner (220)",
"location": [5703, 1991, 0],
"map": "Felucca",
"count": 2,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 20,
"walkingRange": 35,
"entries": [
{ "name": "BlackSolenWarrior", "maxCount": 2, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "451c7289-0639-4054-879d-fd66e27e866c",
"name": "Spawner (220)",
"location": [5912, 1800, 1],
"map": "Felucca",
"count": 1,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 20,
"walkingRange": 30,
"entries": [
{ "name": "BlackSolenWorker", "maxCount": 1, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "487e7cad-478d-4ffb-b109-fe2f398f2980",
"name": "Spawner (220)",
"location": [5825, 1968, 4],
"map": "Felucca",
"count": 2,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 10,
"walkingRange": 25,
"entries": [
{ "name": "BlackSolenWorker", "maxCount": 2, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "4adcd151-0741-4ae0-88ef-f4b01523826c",
"name": "Spawner (220)",
"location": [5838, 2019, 3],
"map": "Felucca",
"count": 1,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 10,
"walkingRange": 20,
"entries": [
{ "name": "BlackSolenWorker", "maxCount": 1, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "4e878d51-e601-4e8c-b034-fcc572f4a840",
"name": "Spawner (220)",
"location": [5693, 1834, 0],
"map": "Felucca",
"count": 1,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 4,
"walkingRange": 20,
"entries": [
{ "name": "BlackSolenWorker", "maxCount": 1, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "4fc74f26-5c3b-4122-8a88-9581e5d02e5a",
"name": "Spawner (220)",
"location": [5910, 1991, 0],
"map": "Felucca",
"count": 3,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 15,
"walkingRange": 25,
"entries": [
{ "name": "BlackSolenWorker", "maxCount": 3, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "616e54a8-e1fd-4877-8f77-92f3361b266e",
"name": "Spawner (220)",
"location": [5722, 1820, 5],
"map": "Felucca",
"count": 1,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 10,
"walkingRange": 20,
"entries": [
{ "name": "BlackSolenWorker", "maxCount": 1, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "6f5ddf7f-8608-44e9-841d-b1b6248e54bf",
"name": "Spawner (220)",
"location": [5736, 1939, 7],
"map": "Felucca",
"count": 3,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 10,
"walkingRange": 20,
"entries": [
{ "name": "BlackSolenQueen", "maxCount": 1, "probability": 100 },
{ "name": "BlackSolenWorker", "maxCount": 2, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "76303de9-d601-4f18-b341-ed8741315132",
"name": "Spawner (220)",
"location": [1940, 3261, 1],
"map": "Felucca",
"count": 3,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 10,
"walkingRange": 10,
"entries": [
{ "name": "RedSolenInfiltratorQueen", "maxCount": 1, "probability": 100 },
{ "name": "RedSolenInfiltratorWarrior", "maxCount": 2, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "7841012e-e50b-44c7-80e5-9f0901304abd",
"name": "Spawner (220)",
"location": [5704, 1807, 4],
"map": "Felucca",
"count": 1,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 6,
"walkingRange": 20,
"entries": [
{ "name": "BlackSolenWorker", "maxCount": 1, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "818ebcff-8a3d-4e6d-a8ac-fbd782899100",
"name": "Spawner (220)",
"location": [5799, 1857, 5],
"map": "Felucca",
"count": 2,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 10,
"walkingRange": 20,
"entries": [
{ "name": "BlackSolenWarrior", "maxCount": 2, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "81d29a4d-f337-46b8-971f-402bce72c1a3",
"name": "Spawner (220)",
"location": [5709, 1874, 1],
"map": "Felucca",
"count": 1,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 10,
"walkingRange": 50,
"entries": [
{ "name": "BlackSolenWarrior", "maxCount": 1, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "8bfb6db7-bd95-4b69-9274-330a3806885b",
"name": "Spawner (220)",
"location": [5782, 2021, -11],
"map": "Felucca",
"count": 1,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 10,
"walkingRange": 25,
"entries": [
{ "name": "AntLion", "maxCount": 1, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "92c760f1-55bf-44cd-b51f-b3425595c3f4",
"name": "Spawner (220)",
"location": [5776, 2019, 2],
"map": "Felucca",
"count": 1,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 10,
"walkingRange": 20,
"entries": [
{ "name": "BlackSolenWorker", "maxCount": 1, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "9c112ab3-aaed-483c-a895-12d56c3da76c",
"name": "Spawner (220)",
"location": [5831, 1910, 3],
"map": "Felucca",
"count": 2,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 10,
"walkingRange": 15,
"entries": [
{ "name": "Beetle", "maxCount": 2, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "9fccb18d-7d55-428d-9a0e-6975b0f2f213",
"name": "Spawner (220)",
"location": [5837, 1992, -2],
"map": "Felucca",
"count": 2,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 10,
"walkingRange": 15,
"entries": [
{ "name": "Beetle", "maxCount": 2, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "a130822d-7738-4410-a154-7860ca71cba2",
"name": "Spawner (220)",
"location": [5887, 1840, -18],
"map": "Felucca",
"count": 1,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 10,
"walkingRange": 25,
"entries": [
{ "name": "AntLion", "maxCount": 1, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "a2fd7f95-2496-4594-9ed9-ab55fa31d08f",
"name": "Spawner (220)",
"location": [5707, 1843, -15],
"map": "Felucca",
"count": 1,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 10,
"walkingRange": 10,
"entries": [
{ "name": "AntLion", "maxCount": 1, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "abaf512d-5839-439d-964e-888303a40d48",
"name": "Spawner (220)",
"location": [5782, 1793, 1],
"map": "Felucca",
"count": 1,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 10,
"walkingRange": 20,
"entries": [
{ "name": "BlackSolenWarrior", "maxCount": 1, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "b280605e-0ebe-492d-a0c0-f57d1e05e5a4",
"name": "Spawner (220)",
"location": [5665, 1868, 11],
"map": "Felucca",
"count": 3,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 10,
"walkingRange": 20,
"entries": [
{ "name": "AntLion", "maxCount": 3, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "c02ed532-4fdd-4e4a-83c4-f2f8a0e025e1",
"name": "Spawner (220)",
"location": [5873, 1798, 0],
"map": "Felucca",
"count": 3,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 10,
"walkingRange": 15,
"entries": [
{ "name": "BlackSolenWorker", "maxCount": 2, "probability": 100 },
{ "name": "BlackSolenQueen", "maxCount": 1, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "c1cfb2f5-31c9-4686-8478-7e23db2e9ab0",
"name": "Spawner (220)",
"location": [5856, 2018, 0],
"map": "Felucca",
"count": 1,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 10,
"walkingRange": 20,
"entries": [
{ "name": "BlackSolenWorker", "maxCount": 1, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "c6783361-a68d-4811-a162-86af961cf503",
"name": "Spawner (220)",
"location": [5670, 1807, 4],
"map": "Felucca",
"count": 2,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 25,
"walkingRange": 30,
"entries": [
{ "name": "BlackSolenWorker", "maxCount": 2, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "d1b08137-55ba-4356-8927-30febaac045b",
"name": "Spawner (220)",
"location": [1361, 894, 0],
"map": "Felucca",
"count": 2,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 4,
"walkingRange": 8,
"entries": [
{ "name": "RedSolenInfiltratorQueen", "maxCount": 1, "probability": 100 },
{ "name": "RedSolenInfiltratorWarrior", "maxCount": 1, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "d94b6b1f-efd6-427f-aa69-88b326e256fd",
"name": "Spawner (220)",
"location": [5876, 2018, 3],
"map": "Felucca",
"count": 1,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 10,
"walkingRange": 20,
"entries": [
{ "name": "BlackSolenWorker", "maxCount": 1, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "e5998826-a85a-4fff-81d0-382fa35bf4ae",
"name": "Spawner (220)",
"location": [5863, 1958, 2],
"map": "Felucca",
"count": 2,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 10,
"walkingRange": 25,
"entries": [
{ "name": "BlackSolenWarrior", "maxCount": 2, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "e82f829e-9f6f-494c-afe4-98c2cb4f1e33",
"name": "Spawner (220)",
"location": [5855, 1932, 3],
"map": "Felucca",
"count": 2,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 10,
"walkingRange": 20,
"entries": [
{ "name": "BlackSolenWarrior", "maxCount": 2, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "f7c24d72-6e8d-4e78-9cd2-fd6bf7e427e3",
"name": "Spawner (220)",
"location": [5718, 2024, 4],
"map": "Felucca",
"count": 2,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 15,
"walkingRange": 25,
"entries": [
{ "name": "BlackSolenWorker", "maxCount": 2, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "f9cdf3b9-37a7-456b-a24a-a9fc19153cda",
"name": "Spawner (220)",
"location": [5748, 1923, 0],
"map": "Felucca",
"count": 1,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 5,
"walkingRange": 20,
"entries": [
{ "name": "BlackSolenWarrior", "maxCount": 1, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "fe17cd01-9207-4132-b25a-b23b6d0a21cd",
"name": "Spawner (220)",
"location": [5756, 1857, 4],
"map": "Felucca",
"count": 1,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 10,
"walkingRange": 50,
"entries": [
{ "name": "BlackSolenWarrior", "maxCount": 1, "probability": 100 }
]
}
]
Reference in a new issue View git blame Copy permalink