warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: Changes Spawner HomeRange to SpawnBounds (#2290)

Browse source 
### Summary

This PR transitions the spawner system from a simple radius-based model to a flexible 3D boundary system.

### Core Changes

* **Replaced `HomeRange` with `SpawnBounds`**: Spawners now use a `Rectangle3D` to define spawn areas instead of a circular integer range.
* **Backward Compatibility**:
* The `HomeRange` property remains as a helper that generates square `SpawnBounds` centered on the spawner.
* Included a migration path (v10 to v11) that automatically converts old range data into new bounds during deserialization.


* **Dynamic Bounds Shifting**: If a spawner is moved, its `SpawnBounds` will automatically shift with it, provided the bounds are currently configured as a centered square.
* **New Spawn Logic**: Added `SpawnLocationIsHome` toggle. If enabled, spawned mobiles treat their exact spawn coordinates as their "Home" rather than the spawner's location.

### Implementation Details

* **Interface Updates**: Updated `ISpawner` to include `WalkingRange`, `SpawnBounds`, and `IsInSpawnBounds()`.
* **UI Enhancements**: The Spawner Controller Gump now displays "Custom" for complex bounds and allows copying of the new boundary properties between spawners.
* **Refactored Constructors**: Streamlined `BaseSpawner`, `ProximitySpawner`, and `RegionSpawner` constructors to support the new data types.
This commit is contained in:
Quick 2025-12-26 20:07:26 -06:00 • committed by GitHub
parent bde072f81c
commit 0b34cc4417
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
16 changed files with 502 additions and 196 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Projects/UOContent/Engines/Spawners/SpawnerControllerGump.cs
View file

@ -275,15 +275,23 @@ public class SpawnerControllerGump : GumpGrid
//entry
var entry = i * EntryCount;
AddImageTiled(item.Cols[2].X - 2, list.Items[i].Y + 18, item.Cols[2].Width, 1, 9357);
AddTextEntry(item.Cols[2].X, list.Items[i].Y + 2, list.Header.Cols[2].Width, 80, (int)GridHues.White, entry, spawner.Name, 20);
AddImageTiled(item.Cols[2].X - 2, list.Items[i].Y + 18, item.Cols[2].Width - 8, 1, 9357);
AddTextEntry(item.Cols[2].X, list.Items[i].Y + 2, list.Header.Cols[2].Width - 8, 80, (int)GridHues.White, entry, spawner.Name, 20);
AddButton(item.Cols[2].X, list.Items[i].Y + vCenter + 9, 5837, 5838, GetButtonID(6, item.Index));
AddImageTiled(item.Cols[6].X + 8, list.Items[i].Y + 29, item.Cols[6].Width / 2, 1, 9357);
AddTextEntry(item.Cols[6].X + 12, list.Items[i].Y + 13, list.Header.Cols[6].Width, 80, (int)GridHues.White, entry + 1, spawner.WalkingRange.ToString(), 2);
AddImageTiled(item.Cols[7].X + 8, list.Items[i].Y + 29, item.Cols[7].Width / 2, 1, 9357);
AddTextEntry(item.Cols[7].X + 12, list.Items[i].Y + 13, list.Header.Cols[7].Width, 80, (int)GridHues.White, entry + 2, spawner.HomeRange.ToString(), 2);
// Show HomeRange if bounds are HomeRange-style, otherwise show "Custom"
if (spawner.IsHomeRangeStyle)
{
AddImageTiled(item.Cols[7].X + 8, list.Items[i].Y + 29, item.Cols[7].Width / 2, 1, 9357);
AddTextEntry(item.Cols[7].X + 12, list.Items[i].Y + 13, list.Header.Cols[7].Width, 80, (int)GridHues.White, entry + 2, spawner.HomeRange.ToString(), 2);
}
else
{
AddLabelHtml(item.Cols[7].X - 6, list.Items[i].Y + 13, list.Header.Cols[7].Width, 30, "Custom", GridColors.Yellow);
}
AddImageTiled(item.Cols[8].X + 6, list.Items[i].Y + 29, item.Cols[8].Width - 20, 1, 9357);
AddTextEntry(item.Cols[8].X + 8, list.Items[i].Y + 13, list.Header.Cols[8].Width, 80, (int)GridHues.White, entry + 3, spawner.MinDelay.ToString(), 8);
@ -362,7 +370,8 @@ public class SpawnerControllerGump : GumpGrid
target.MinDelay = spawner.MinDelay;
target.MaxDelay = spawner.MaxDelay;
target.WalkingRange = spawner.WalkingRange;
target.HomeRange = spawner.HomeRange;
target.SpawnBounds = spawner.SpawnBounds;
target.SpawnLocationIsHome = spawner.SpawnLocationIsHome;
target.Group = spawner.Group;
target.Count = spawner.Count;
}
@ -510,9 +519,11 @@ public class SpawnerControllerGump : GumpGrid
spawner.WalkingRange = walkRange;
}
if (int.TryParse(info.GetTextEntry(indexEntry + 2), out var homeHange))
// Only update HomeRange if text entry exists (HomeRange-style bounds)
// Custom bounds show a label instead, so this will be null/empty and skip
if (int.TryParse(info.GetTextEntry(indexEntry + 2), out var homeRange))
{
spawner.HomeRange = homeHange;
spawner.HomeRange = homeRange;
}
if (TimeSpan.TryParse(info.GetTextEntry(indexEntry + 3), out var minDelay))