56cf60cce3
Adds the server-authoritative mechanics for three new enemy archetypes on top of the Grunt/Charger base, plus the weighted wave-composition that introduces them: - Spitter: a ranged Husk variant (SpitterState) that holds a preferred range-band (advance/retreat/hold via EnemyAIMath.BandVelocity) and fires a telegraphed, dodgeable EnemyProjectile. New server EnemyProjectileMoveSystem (integrate + store LastStep) + EnemyProjectileDamageSystem (region-filtered swept hit-test rebuilt from LastStep — DR-018 anti-tunnelling; players use HitRadius, structures a const radius; at-most-once destroy). Concurrent-spit soft cap, soft-fail retry. - Swarmer: marker tag + deterministic cluster spawn (1 slot = 1 pack; EnemyAIMath.ClusterOffset), MaxAlive counts ENTITIES so a pack defers if it won't fit. - 4-type weighted mix: MixBands -> ZoneEnemyMath.WaveSlots/KindForSlot/ PackSizeForSlot drives both the expedition director and (fork-4a) the base siege, with a mandatory MaxAlive cap. Legacy WaveSize/IsChargerSlot kept + parity-tested. - Discriminator stays component-presence (no enum in Bursted systems): query- partition guards keep each enemy moved by exactly one EnemyAISystem pass (sole-Position-writer). EnemyTelegraph.IsCharger -> Kind byte for the client cue. New authoring (Spitter/Swarmer/EnemyProjectile) + expanded director authorings with tunable mix/cluster defaults. 13 new EditMode tests (mix composition + legacy parity, band/cluster math, projectile move + cross-region + swept anti-tunnelling regressions); full suite green before commit. Dormant until the prefab/subscene wiring lands (next): the new systems guard on TryGetSingleton/RequireForUpdate, so with no prefabs wired the new types stay inert. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
152 lines
7.7 KiB
C#
152 lines
7.7 KiB
C#
using ProjectM.Simulation;
|
|
using Unity.Burst;
|
|
using Unity.Collections;
|
|
using Unity.Entities;
|
|
using Unity.Mathematics;
|
|
using Unity.NetCode;
|
|
using Unity.Transforms;
|
|
|
|
namespace ProjectM.Server
|
|
{
|
|
/// <summary>
|
|
/// Server-only Husk wave/threat director: a state machine that escalates the swarm. In <c>Lull</c> it waits
|
|
/// until the lull timer expires, then starts the next wave (count = <c>BaseCount + (wave-1)*CountPerWave</c>). In
|
|
/// <c>Spawning</c> it spawns one Husk every <c>SpawnIntervalTicks</c> at a deterministic ring slot around the
|
|
/// <see cref="BaseAnchor"/>, round-robin over the <see cref="WaveEnemyPrefab"/> pool, until the wave is fully
|
|
/// spawned; then it waits for the field to be cleared (no live <see cref="EnemyTag"/>) before returning to
|
|
/// <c>Lull</c>. Plain <see cref="SimulationSystemGroup"/>, server-authoritative (Husks are interpolated ghosts).
|
|
/// Replaces the flat <c>EnemySpawnSystem</c> sustain. Tick gating uses the wrap-safe <see cref="NetworkTick"/>
|
|
/// compare + <see cref="TickUtil.NonZero"/>.
|
|
/// </summary>
|
|
[BurstCompile]
|
|
[WorldSystemFilter(WorldSystemFilterFlags.ServerSimulation)]
|
|
[UpdateInGroup(typeof(SimulationSystemGroup))]
|
|
public partial struct WaveSystem : ISystem
|
|
{
|
|
|
|
[BurstCompile]
|
|
public void OnCreate(ref SystemState state)
|
|
{
|
|
state.RequireForUpdate<WaveDirector>();
|
|
state.RequireForUpdate<WaveState>();
|
|
state.RequireForUpdate<NetworkTime>();
|
|
}
|
|
|
|
[BurstCompile]
|
|
public void OnUpdate(ref SystemState state)
|
|
{
|
|
var serverTick = SystemAPI.GetSingleton<NetworkTime>().ServerTick;
|
|
if (!serverTick.IsValid)
|
|
return;
|
|
uint now = serverTick.TickIndexForValidTick;
|
|
// Player-driven loop: the base-defense wave only spawns during a Siege.
|
|
if (SystemAPI.TryGetSingleton<CycleState>(out var cycle) && cycle.Phase != CyclePhase.Siege)
|
|
return;
|
|
|
|
var director = SystemAPI.GetSingleton<WaveDirector>();
|
|
var directorEntity = SystemAPI.GetSingletonEntity<WaveDirector>();
|
|
var prefabs = SystemAPI.GetBuffer<WaveEnemyPrefab>(directorEntity);
|
|
if (prefabs.Length == 0)
|
|
return;
|
|
|
|
var wave = SystemAPI.GetComponent<WaveState>(directorEntity);
|
|
|
|
// MC-2 fork-4a: the base siege adopts the 4-type weighted mix (BaseCount = the Grunt base). The size
|
|
// curve becomes WaveSlots(wave, bands) — a deliberate, operator-approved redefinition; MaxAlive is the
|
|
// mandatory cap so spitter spits + swarmer packs can't spike the relevancy loop during the END-game climax.
|
|
var bands = new MixBands
|
|
{
|
|
GruntBase = director.BaseCount,
|
|
ChargerBase = director.ChargerBase,
|
|
SpitterBase = director.SpitterBase,
|
|
SwarmerSlotBase = director.SwarmerSlotBase,
|
|
ChargerPerEpoch = director.ChargerPerEpoch,
|
|
SpitterPerEpoch = director.SpitterPerEpoch,
|
|
SwarmerSlotPerEpoch = director.SwarmerSlotPerEpoch,
|
|
SwarmerPackPerEpoch = director.SwarmerPackPerEpoch,
|
|
};
|
|
|
|
// Ring centre on the base plot when present.
|
|
float3 center = new float3(0f, 1f, 0f);
|
|
if (SystemAPI.TryGetSingleton<BaseAnchor>(out var baseAnchor))
|
|
center = BaseGridMath.PlotCenter(baseAnchor);
|
|
|
|
// Due when no action is scheduled yet (NextActionTick 0) or the scheduled tick is at/behind now.
|
|
bool dueNow = wave.NextActionTick == 0 || !new NetworkTick(wave.NextActionTick).IsNewerThan(serverTick);
|
|
|
|
if (wave.Phase == WavePhase.Lull)
|
|
{
|
|
if (dueNow)
|
|
{
|
|
// Start the next (bigger) wave.
|
|
wave.WaveNumber += 1;
|
|
wave.RemainingToSpawn = ZoneEnemyMath.WaveSlots(wave.WaveNumber, bands);
|
|
wave.Phase = WavePhase.Spawning;
|
|
wave.NextActionTick = TickUtil.NonZero(now); // spawn the first Husk this tick
|
|
}
|
|
}
|
|
else // Spawning
|
|
{
|
|
if (wave.RemainingToSpawn > 0)
|
|
{
|
|
if (dueNow)
|
|
{
|
|
int slots = math.max(1, director.RingSlots);
|
|
byte kind = ZoneEnemyMath.KindForSlot(wave.WaveNumber, wave.SpawnCounter, bands);
|
|
int packSize = kind == ZoneEnemyMath.KindSwarmer
|
|
? ZoneEnemyMath.PackSizeForSlot(wave.WaveNumber, wave.SpawnCounter, bands, director.SwarmerPackSize) : 1;
|
|
|
|
// Live BASE husks for the entity cap (expedition zone enemies are EnemyTag too -> excluded).
|
|
int aliveBase = 0;
|
|
foreach (var hr in SystemAPI.Query<RefRO<RegionTag>>().WithAll<EnemyTag>())
|
|
if (hr.ValueRO.Region == RegionId.Base) aliveBase++;
|
|
|
|
// MaxAlive counts ENTITIES; spawn the whole pack only if it fits (else WAIT — don't consume the slot).
|
|
if (aliveBase + packSize <= math.max(1, director.MaxAlive))
|
|
{
|
|
int prefabIdx = kind;
|
|
if (prefabIdx >= prefabs.Length) prefabIdx = 0; // 4-entry buffer expected; clamp defensively
|
|
float3 packCenter = EnemyAIMath.RingPosition(center, wave.SpawnCounter, slots, director.RingRadius);
|
|
packCenter.y = center.y;
|
|
var baked = state.EntityManager.GetComponentData<LocalTransform>(prefabs[prefabIdx].Prefab);
|
|
|
|
var ecb = new EntityCommandBuffer(Allocator.Temp);
|
|
for (int k = 0; k < packSize; k++)
|
|
{
|
|
float3 pos = packSize > 1
|
|
? EnemyAIMath.ClusterOffset(packCenter, k, packSize, director.ClusterTightRadius) : packCenter;
|
|
pos.y = center.y;
|
|
var husk = ecb.Instantiate(prefabs[prefabIdx].Prefab);
|
|
ecb.SetComponent(husk, baked.WithPosition(pos)); // preserve baked [GhostField] Scale
|
|
ecb.AddComponent(husk, new RegionTag { Region = RegionId.Base });
|
|
}
|
|
ecb.Playback(state.EntityManager);
|
|
ecb.Dispose();
|
|
|
|
wave.SpawnCounter += 1; // ONE slot consumed even for a pack
|
|
wave.RemainingToSpawn -= 1;
|
|
wave.NextActionTick = TickUtil.NonZero(now + (uint)math.max(1, director.SpawnIntervalTicks));
|
|
}
|
|
}
|
|
}
|
|
else
|
|
{
|
|
// Wave fully spawned: cleared only when no BASE husk remains. Expedition zone enemies are also
|
|
// EnemyTag but RegionTag{Expedition}; they must NOT hold the base siege open (DR-040 BLOCKER 3).
|
|
int baseHusks = 0;
|
|
foreach (var hr in SystemAPI.Query<RefRO<RegionTag>>().WithAll<EnemyTag>())
|
|
if (hr.ValueRO.Region == RegionId.Base) baseHusks++;
|
|
if (baseHusks == 0)
|
|
{
|
|
// Wave cleared: calm before the next.
|
|
wave.Phase = WavePhase.Lull;
|
|
wave.NextActionTick = TickUtil.NonZero(now + (uint)math.max(1, director.LullTicks));
|
|
}
|
|
}
|
|
}
|
|
|
|
SystemAPI.SetComponent(directorEntity, wave);
|
|
}
|
|
}
|
|
}
|