c02909e2c8
## Summary Two small additive changes a derived spawner needs. - **`BaseSpawner.OnTick()` is now `virtual`.** A subclass that gates spawning on external state (time windows, event triggers) must gate *timer* spawns without gating the manual `Spawn()` API, and `OnTick` is the only place the two paths differ: it is the timer callback and `Spawn()` is both what it calls and what commands and scripts call. Cost: one virtual dispatch on the existing timer callback; no change to stock behaviour. - **`group` in the JSON DTO.** `BaseSpawner.Group` (all dead, then respawn) is binary-persisted but was missing from `SpawnerDto`, so it did not survive export/import. Added to the abstract record after `spawnLocationIsHome`, assigned in `ApplyDto` after `InitSpawn` (which resets it), and exported by the three stock `ToDto` implementations. ## Test plan - [x] A derived spawner overriding `OnTick` with a closed gate: `OnTick()` spawns nothing; manual `Spawn()` still spawns and does not pass through `OnTick`. - [x] DTO round trip with `Group = true` carries `group` and restores it on `ToSpawner()`. - [x] `UOContent.Tests` full suite green. - [ ] CI
39 lines
1.7 KiB
C#
39 lines
1.7 KiB
C#
/*************************************************************************
|
|
* ModernUO *
|
|
* Copyright 2019-2026 - ModernUO Development Team *
|
|
* Email: hi@modernuo.com *
|
|
* File: RegionSpawner.Dto.cs *
|
|
* *
|
|
* This program is free software: you can redistribute it and/or modify *
|
|
* it under the terms of the GNU General Public License as published by *
|
|
* the Free Software Foundation, either version 3 of the License, or *
|
|
* (at your option) any later version. *
|
|
* *
|
|
* You should have received a copy of the GNU General Public License *
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
|
|
*************************************************************************/
|
|
|
|
namespace Server.Engines.Spawners;
|
|
|
|
public partial class RegionSpawner
|
|
{
|
|
// RegionSpawner spawns from region rectangles, so it writes neither homeRange nor spawnBounds.
|
|
public override SpawnerDto ToDto() => new RegionSpawnerDto
|
|
{
|
|
Guid = Guid,
|
|
Name = DtoName,
|
|
Location = Location,
|
|
Map = Map,
|
|
Count = Count,
|
|
MinDelay = MinDelay,
|
|
MaxDelay = MaxDelay,
|
|
Team = Team,
|
|
WalkingRange = DtoWalkingRange,
|
|
Entries = EntryList ?? [],
|
|
SpawnLocationIsHome = SpawnLocationIsHome,
|
|
Group = Group,
|
|
SpawnPositionMode = DtoSpawnPositionMode,
|
|
MaxSpawnAttempts = DtoMaxSpawnAttempts,
|
|
Region = SpawnRegion?.Name
|
|
};
|
|
}
|