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

410 lines
18 KiB
JSON
Raw Blame History

[
{
"$type": "Spawner",
"guid": "85bca9f2-2bf4-4400-ac33-e72e379d2bb0",
"name": "Spawner (2126)",
"location": [3607, 2417, 45],
"map": "Trammel",
"count": 19,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 50,
"walkingRange": 50,
"entries": [
{ "name": "Boar", "maxCount": 7, "probability": 100 },
{ "name": "Cougar", "maxCount": 7, "probability": 100 },
{ "name": "Goat", "maxCount": 7, "probability": 100 },
{ "name": "Horse", "maxCount": 7, "probability": 100 },
{ "name": "Panther", "maxCount": 7, "probability": 100 },
{ "name": "Pig", "maxCount": 7, "probability": 100 },
{ "name": "Sheep", "maxCount": 7, "probability": 100 },
{ "name": "BlackBear", "maxCount": 5, "probability": 100 },
{ "name": "GrizzlyBear", "maxCount": 5, "probability": 100 },
{ "name": "BrownBear", "maxCount": 5, "probability": 100 },
{ "name": "TimberWolf", "maxCount": 5, "probability": 100 },
{ "name": "GreyWolf", "maxCount": 5, "probability": 100 },
{ "name": "WanderingHealer", "maxCount": 1, "probability": 100 },
{ "name": "Bird", "maxCount": 2, "probability": 100 },
{ "name": "Eagle", "maxCount": 2, "probability": 100 },
{ "name": "GreatHart", "maxCount": 2, "probability": 100 },
{ "name": "Hind", "maxCount": 2, "probability": 100 },
{ "name": "Bull", "maxCount": 2, "probability": 100 },
{ "name": "Cow", "maxCount": 2, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "2828aaaa-15bc-48ca-8200-b30244c9e88f",
"name": "Spawner (2126)",
"location": [3555, 2525, 13],
"map": "Trammel",
"count": 19,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 50,
"walkingRange": 50,
"entries": [
{ "name": "Boar", "maxCount": 7, "probability": 100 },
{ "name": "Cougar", "maxCount": 7, "probability": 100 },
{ "name": "Goat", "maxCount": 7, "probability": 100 },
{ "name": "Horse", "maxCount": 7, "probability": 100 },
{ "name": "Panther", "maxCount": 7, "probability": 100 },
{ "name": "Pig", "maxCount": 7, "probability": 100 },
{ "name": "Sheep", "maxCount": 7, "probability": 100 },
{ "name": "BlackBear", "maxCount": 5, "probability": 100 },
{ "name": "GrizzlyBear", "maxCount": 5, "probability": 100 },
{ "name": "BrownBear", "maxCount": 5, "probability": 100 },
{ "name": "TimberWolf", "maxCount": 5, "probability": 100 },
{ "name": "GreyWolf", "maxCount": 5, "probability": 100 },
{ "name": "WanderingHealer", "maxCount": 1, "probability": 100 },
{ "name": "Bird", "maxCount": 2, "probability": 100 },
{ "name": "Eagle", "maxCount": 2, "probability": 100 },
{ "name": "GreatHart", "maxCount": 2, "probability": 100 },
{ "name": "Hind", "maxCount": 2, "probability": 100 },
{ "name": "Bull", "maxCount": 2, "probability": 100 },
{ "name": "Cow", "maxCount": 2, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "bf2cf539-4f86-4a2c-81a2-6d09d6a36dee",
"name": "Spawner (2126)",
"location": [3506, 2477, 28],
"map": "Trammel",
"count": 19,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 50,
"walkingRange": 50,
"entries": [
{ "name": "Boar", "maxCount": 7, "probability": 100 },
{ "name": "Cougar", "maxCount": 7, "probability": 100 },
{ "name": "Goat", "maxCount": 7, "probability": 100 },
{ "name": "Horse", "maxCount": 7, "probability": 100 },
{ "name": "Panther", "maxCount": 7, "probability": 100 },
{ "name": "Pig", "maxCount": 7, "probability": 100 },
{ "name": "Sheep", "maxCount": 7, "probability": 100 },
{ "name": "BlackBear", "maxCount": 5, "probability": 100 },
{ "name": "GrizzlyBear", "maxCount": 5, "probability": 100 },
{ "name": "BrownBear", "maxCount": 5, "probability": 100 },
{ "name": "TimberWolf", "maxCount": 5, "probability": 100 },
{ "name": "GreyWolf", "maxCount": 5, "probability": 100 },
{ "name": "WanderingHealer", "maxCount": 1, "probability": 100 },
{ "name": "Bird", "maxCount": 2, "probability": 100 },
{ "name": "Eagle", "maxCount": 2, "probability": 100 },
{ "name": "GreatHart", "maxCount": 2, "probability": 100 },
{ "name": "Hind", "maxCount": 2, "probability": 100 },
{ "name": "Bull", "maxCount": 2, "probability": 100 },
{ "name": "Cow", "maxCount": 2, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "335130b1-2341-4f80-88b6-1a2b1261d158",
"name": "Spawner (2126)",
"location": [3452, 2563, 32],
"map": "Trammel",
"count": 19,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 50,
"walkingRange": 50,
"entries": [
{ "name": "Boar", "maxCount": 7, "probability": 100 },
{ "name": "Cougar", "maxCount": 7, "probability": 100 },
{ "name": "Goat", "maxCount": 7, "probability": 100 },
{ "name": "Horse", "maxCount": 7, "probability": 100 },
{ "name": "Panther", "maxCount": 7, "probability": 100 },
{ "name": "Pig", "maxCount": 7, "probability": 100 },
{ "name": "Sheep", "maxCount": 7, "probability": 100 },
{ "name": "BlackBear", "maxCount": 5, "probability": 100 },
{ "name": "GrizzlyBear", "maxCount": 5, "probability": 100 },
{ "name": "BrownBear", "maxCount": 5, "probability": 100 },
{ "name": "TimberWolf", "maxCount": 5, "probability": 100 },
{ "name": "GreyWolf", "maxCount": 5, "probability": 100 },
{ "name": "WanderingHealer", "maxCount": 1, "probability": 100 },
{ "name": "Bird", "maxCount": 2, "probability": 100 },
{ "name": "Eagle", "maxCount": 2, "probability": 100 },
{ "name": "GreatHart", "maxCount": 2, "probability": 100 },
{ "name": "Hind", "maxCount": 2, "probability": 100 },
{ "name": "Bull", "maxCount": 2, "probability": 100 },
{ "name": "Cow", "maxCount": 2, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "21e1d3a4-1447-4e38-9b17-70a49c7b9093",
"name": "Spawner (2126)",
"location": [3429, 2650, 43],
"map": "Trammel",
"count": 19,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 50,
"walkingRange": 50,
"entries": [
{ "name": "Boar", "maxCount": 7, "probability": 100 },
{ "name": "Cougar", "maxCount": 7, "probability": 100 },
{ "name": "Goat", "maxCount": 7, "probability": 100 },
{ "name": "Horse", "maxCount": 7, "probability": 100 },
{ "name": "Panther", "maxCount": 7, "probability": 100 },
{ "name": "Pig", "maxCount": 7, "probability": 100 },
{ "name": "Sheep", "maxCount": 7, "probability": 100 },
{ "name": "BlackBear", "maxCount": 5, "probability": 100 },
{ "name": "GrizzlyBear", "maxCount": 5, "probability": 100 },
{ "name": "BrownBear", "maxCount": 5, "probability": 100 },
{ "name": "TimberWolf", "maxCount": 5, "probability": 100 },
{ "name": "GreyWolf", "maxCount": 5, "probability": 100 },
{ "name": "WanderingHealer", "maxCount": 1, "probability": 100 },
{ "name": "Bird", "maxCount": 2, "probability": 100 },
{ "name": "Eagle", "maxCount": 2, "probability": 100 },
{ "name": "GreatHart", "maxCount": 2, "probability": 100 },
{ "name": "Hind", "maxCount": 2, "probability": 100 },
{ "name": "Bull", "maxCount": 2, "probability": 100 },
{ "name": "Cow", "maxCount": 2, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "37fab5a5-6dcf-4ea0-9bcf-cee7546a8788",
"name": "Spawner (2126)",
"location": [3449, 2737, 49],
"map": "Trammel",
"count": 19,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 50,
"walkingRange": 50,
"entries": [
{ "name": "Boar", "maxCount": 7, "probability": 100 },
{ "name": "Cougar", "maxCount": 7, "probability": 100 },
{ "name": "Goat", "maxCount": 7, "probability": 100 },
{ "name": "Horse", "maxCount": 7, "probability": 100 },
{ "name": "Panther", "maxCount": 7, "probability": 100 },
{ "name": "Pig", "maxCount": 7, "probability": 100 },
{ "name": "Sheep", "maxCount": 7, "probability": 100 },
{ "name": "BlackBear", "maxCount": 5, "probability": 100 },
{ "name": "GrizzlyBear", "maxCount": 5, "probability": 100 },
{ "name": "BrownBear", "maxCount": 5, "probability": 100 },
{ "name": "TimberWolf", "maxCount": 5, "probability": 100 },
{ "name": "GreyWolf", "maxCount": 5, "probability": 100 },
{ "name": "WanderingHealer", "maxCount": 1, "probability": 100 },
{ "name": "Bird", "maxCount": 2, "probability": 100 },
{ "name": "Eagle", "maxCount": 2, "probability": 100 },
{ "name": "GreatHart", "maxCount": 2, "probability": 100 },
{ "name": "Hind", "maxCount": 2, "probability": 100 },
{ "name": "Bull", "maxCount": 2, "probability": 100 },
{ "name": "Cow", "maxCount": 2, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "85d1ae4d-d1dd-431f-a749-7ba9e19b7adc",
"name": "Spawner (2126)",
"location": [3736, 2512, 35],
"map": "Trammel",
"count": 19,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 50,
"walkingRange": 50,
"entries": [
{ "name": "Boar", "maxCount": 7, "probability": 100 },
{ "name": "Cougar", "maxCount": 7, "probability": 100 },
{ "name": "Goat", "maxCount": 7, "probability": 100 },
{ "name": "Horse", "maxCount": 7, "probability": 100 },
{ "name": "Panther", "maxCount": 7, "probability": 100 },
{ "name": "Pig", "maxCount": 7, "probability": 100 },
{ "name": "Sheep", "maxCount": 7, "probability": 100 },
{ "name": "BlackBear", "maxCount": 5, "probability": 100 },
{ "name": "GrizzlyBear", "maxCount": 5, "probability": 100 },
{ "name": "BrownBear", "maxCount": 5, "probability": 100 },
{ "name": "TimberWolf", "maxCount": 5, "probability": 100 },
{ "name": "GreyWolf", "maxCount": 5, "probability": 100 },
{ "name": "WanderingHealer", "maxCount": 1, "probability": 100 },
{ "name": "Bird", "maxCount": 2, "probability": 100 },
{ "name": "Eagle", "maxCount": 2, "probability": 100 },
{ "name": "GreatHart", "maxCount": 2, "probability": 100 },
{ "name": "Hind", "maxCount": 2, "probability": 100 },
{ "name": "Bull", "maxCount": 2, "probability": 100 },
{ "name": "Cow", "maxCount": 2, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "03dcb299-f89d-4554-8700-c389b70b560e",
"name": "Spawner (2126)",
"location": [3718, 2736, 38],
"map": "Trammel",
"count": 19,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 50,
"walkingRange": 50,
"entries": [
{ "name": "Boar", "maxCount": 7, "probability": 100 },
{ "name": "Cougar", "maxCount": 7, "probability": 100 },
{ "name": "Goat", "maxCount": 7, "probability": 100 },
{ "name": "Horse", "maxCount": 7, "probability": 100 },
{ "name": "Panther", "maxCount": 7, "probability": 100 },
{ "name": "Pig", "maxCount": 7, "probability": 100 },
{ "name": "Sheep", "maxCount": 7, "probability": 100 },
{ "name": "BlackBear", "maxCount": 5, "probability": 100 },
{ "name": "GrizzlyBear", "maxCount": 5, "probability": 100 },
{ "name": "BrownBear", "maxCount": 5, "probability": 100 },
{ "name": "TimberWolf", "maxCount": 5, "probability": 100 },
{ "name": "GreyWolf", "maxCount": 5, "probability": 100 },
{ "name": "WanderingHealer", "maxCount": 1, "probability": 100 },
{ "name": "Bird", "maxCount": 2, "probability": 100 },
{ "name": "Eagle", "maxCount": 2, "probability": 100 },
{ "name": "GreatHart", "maxCount": 2, "probability": 100 },
{ "name": "Hind", "maxCount": 2, "probability": 100 },
{ "name": "Bull", "maxCount": 2, "probability": 100 },
{ "name": "Cow", "maxCount": 2, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "4415e8ab-b437-46d7-a245-8056c9611fa4",
"name": "Spawner (2126)",
"location": [3654, 2866, 61],
"map": "Trammel",
"count": 19,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 50,
"walkingRange": 50,
"entries": [
{ "name": "Boar", "maxCount": 7, "probability": 100 },
{ "name": "Cougar", "maxCount": 7, "probability": 100 },
{ "name": "Goat", "maxCount": 7, "probability": 100 },
{ "name": "Horse", "maxCount": 7, "probability": 100 },
{ "name": "Panther", "maxCount": 7, "probability": 100 },
{ "name": "Pig", "maxCount": 7, "probability": 100 },
{ "name": "Sheep", "maxCount": 7, "probability": 100 },
{ "name": "BlackBear", "maxCount": 5, "probability": 100 },
{ "name": "GrizzlyBear", "maxCount": 5, "probability": 100 },
{ "name": "BrownBear", "maxCount": 5, "probability": 100 },
{ "name": "TimberWolf", "maxCount": 5, "probability": 100 },
{ "name": "GreyWolf", "maxCount": 5, "probability": 100 },
{ "name": "WanderingHealer", "maxCount": 1, "probability": 100 },
{ "name": "Bird", "maxCount": 2, "probability": 100 },
{ "name": "Eagle", "maxCount": 2, "probability": 100 },
{ "name": "GreatHart", "maxCount": 2, "probability": 100 },
{ "name": "Hind", "maxCount": 2, "probability": 100 },
{ "name": "Bull", "maxCount": 2, "probability": 100 },
{ "name": "Cow", "maxCount": 2, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "363b94f4-e1ba-474a-ab21-76e457b14abf",
"name": "Spawner (2126)",
"location": [3662, 2802, 51],
"map": "Trammel",
"count": 19,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 50,
"walkingRange": 50,
"entries": [
{ "name": "Boar", "maxCount": 7, "probability": 100 },
{ "name": "Cougar", "maxCount": 7, "probability": 100 },
{ "name": "Goat", "maxCount": 7, "probability": 100 },
{ "name": "Horse", "maxCount": 7, "probability": 100 },
{ "name": "Panther", "maxCount": 7, "probability": 100 },
{ "name": "Pig", "maxCount": 7, "probability": 100 },
{ "name": "Sheep", "maxCount": 7, "probability": 100 },
{ "name": "BlackBear", "maxCount": 5, "probability": 100 },
{ "name": "GrizzlyBear", "maxCount": 5, "probability": 100 },
{ "name": "BrownBear", "maxCount": 5, "probability": 100 },
{ "name": "TimberWolf", "maxCount": 5, "probability": 100 },
{ "name": "GreyWolf", "maxCount": 5, "probability": 100 },
{ "name": "WanderingHealer", "maxCount": 1, "probability": 100 },
{ "name": "Bird", "maxCount": 2, "probability": 100 },
{ "name": "Eagle", "maxCount": 2, "probability": 100 },
{ "name": "GreatHart", "maxCount": 2, "probability": 100 },
{ "name": "Hind", "maxCount": 2, "probability": 100 },
{ "name": "Bull", "maxCount": 2, "probability": 100 },
{ "name": "Cow", "maxCount": 2, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "8d4ae520-6345-40f2-b7cb-3bb2e98d2219",
"name": "Spawner (2126)",
"location": [3596, 2804, 51],
"map": "Trammel",
"count": 19,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 50,
"walkingRange": 50,
"entries": [
{ "name": "Boar", "maxCount": 7, "probability": 100 },
{ "name": "Cougar", "maxCount": 7, "probability": 100 },
{ "name": "Goat", "maxCount": 7, "probability": 100 },
{ "name": "Horse", "maxCount": 7, "probability": 100 },
{ "name": "Panther", "maxCount": 7, "probability": 100 },
{ "name": "Pig", "maxCount": 7, "probability": 100 },
{ "name": "Sheep", "maxCount": 7, "probability": 100 },
{ "name": "BlackBear", "maxCount": 5, "probability": 100 },
{ "name": "GrizzlyBear", "maxCount": 5, "probability": 100 },
{ "name": "BrownBear", "maxCount": 5, "probability": 100 },
{ "name": "TimberWolf", "maxCount": 5, "probability": 100 },
{ "name": "GreyWolf", "maxCount": 5, "probability": 100 },
{ "name": "WanderingHealer", "maxCount": 1, "probability": 100 },
{ "name": "Bird", "maxCount": 2, "probability": 100 },
{ "name": "Eagle", "maxCount": 2, "probability": 100 },
{ "name": "GreatHart", "maxCount": 2, "probability": 100 },
{ "name": "Hind", "maxCount": 2, "probability": 100 },
{ "name": "Bull", "maxCount": 2, "probability": 100 },
{ "name": "Cow", "maxCount": 2, "probability": 100 }
]
},
{
"$type": "Spawner",
"guid": "1105d916-9527-4d49-8ca2-54e4ca61a342",
"name": "Spawner (2126)",
"location": [3546, 2812, 13],
"map": "Trammel",
"count": 19,
"minDelay": "00:05:00",
"maxDelay": "00:10:00",
"team": 0,
"homeRange": 50,
"walkingRange": 50,
"entries": [
{ "name": "Boar", "maxCount": 7, "probability": 100 },
{ "name": "Cougar", "maxCount": 7, "probability": 100 },
{ "name": "Goat", "maxCount": 7, "probability": 100 },
{ "name": "Horse", "maxCount": 7, "probability": 100 },
{ "name": "Panther", "maxCount": 7, "probability": 100 },
{ "name": "Pig", "maxCount": 7, "probability": 100 },
{ "name": "Sheep", "maxCount": 7, "probability": 100 },
{ "name": "BlackBear", "maxCount": 5, "probability": 100 },
{ "name": "GrizzlyBear", "maxCount": 5, "probability": 100 },
{ "name": "BrownBear", "maxCount": 5, "probability": 100 },
{ "name": "TimberWolf", "maxCount": 5, "probability": 100 },
{ "name": "GreyWolf", "maxCount": 5, "probability": 100 },
{ "name": "WanderingHealer", "maxCount": 1, "probability": 100 },
{ "name": "Bird", "maxCount": 2, "probability": 100 },
{ "name": "Eagle", "maxCount": 2, "probability": 100 },
{ "name": "GreatHart", "maxCount": 2, "probability": 100 },
{ "name": "Hind", "maxCount": 2, "probability": 100 },
{ "name": "Bull", "maxCount": 2, "probability": 100 },
{ "name": "Cow", "maxCount": 2, "probability": 100 }
]
}
]
Reference in a new issue View git blame Copy permalink