Slice 3: Expedition Combat Spine — epoch-seeded zone waves (DR-040)

Reactivate the dormant Expedition region as a procedural combat venue. v1 loop: walk the gate -> fight an epoch-seeded enemy wave in the expedition -> clear -> return -> flat Ore reward (once per epoch) -> escalated retaliation base siege. - New sim types: ZoneEnemyTag, ZoneEnemyDirector (+ ZoneEnemyPrefab buffer), ZoneEnemyState, ZoneEnemyMath (grunt->charger composition by epoch). ZoneEnemyDirectorSystem (server, Burst): drip-spawns the wave at a deterministic ring under a MaxAlive cap while a player is out and the base is Calm; marks ClearedThisEpoch on a real clear. [UpdateAfter(ExpeditionFieldSystem)] only (avoids a sort cycle). - BLOCKER 1: EnemyAISystem region-filters target selection (player + structure snapshots gain parallel region lists; no base structures / no Core fallback for expedition husks). - BLOCKER 3: WaveSystem, ThreatDirectorSystem timeout cull, and CyclePhaseSystem DefendCleared + Core-breach cull all count/cull RegionTag{Base} husks only (the breach cull was caught region-blind by the post-impl review: a base breach wiped the live expedition wave and spuriously paid the reward). - BLOCKER 4: reward de-duped via CycleRuntime.LastRewardedEpoch + ClearedThisEpoch; ExpeditionGateSystem deposits RewardOre once/epoch. - ExpeditionFieldSystem teardown also culls zone enemies + region- guards the clutter loop. Subscene wired with the director + roster. 368/368 EditMode green + clean netcode Play smoke. Docs: DR-040 -> built, session log, CLAUDE.md cross-region tag-reaudit rule. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
2026-06-21 22:58:26 -07:00
parent cf45ec82ae
commit 3109b86d71
33 changed files with 1044 additions and 161 deletions
@@ -2848,54 +2848,6 @@ Transform:
  m_Children: []
  m_Father: {fileID: 0}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1527461111
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1527461113}
-  - component: {fileID: 1527461112}
-  m_Layer: 0
-  m_Name: UpgradePickupSpawner
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!114 &1527461112
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1527461111}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e367eb55e2c2248f18be10d6c3c9ad67, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: ProjectM.Authoring::ProjectM.Authoring.UpgradePickupSpawnerAuthoring
-  PickupPrefab: {fileID: 3885353946372160549, guid: d7dd0078c7b1f4cf995ca3a4b1155569, type: 3}
-  Count: 2
-  Spacing: 3
-  Origin: {x: -4, y: 0, z: 6}
--- !u!4 &1527461113
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1527461111}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1542636139
 GameObject:
  m_ObjectHideFlags: 0
@@ -3360,6 +3312,60 @@ BoxCollider:
  serializedVersion: 3
  m_Size: {x: 15.610933, y: 5, z: 1.5}
  m_Center: {x: 0, y: 2.5, z: 0}
+--- !u!1 &1957070222
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1957070224}
+  - component: {fileID: 1957070223}
+  m_Layer: 0
+  m_Name: ZoneEnemyDirector
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1957070223
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1957070222}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5918787bb2ebb7747afe473a7937ed53, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: ProjectM.Authoring::ProjectM.Authoring.ZoneEnemyDirectorAuthoring
+  EnemyPrefabs:
+  - {fileID: 3885353946372160549, guid: a6c2004a3cc32cc44b1bb7a795f86519, type: 3}
+  - {fileID: 3885353946372160549, guid: 0d42b4a8ef76489458ee1ecf51b4dbca, type: 3}
+  MaxAlive: 12
+  RingRadius: 14
+  RingSlots: 10
+  SpawnIntervalTicks: 30
+  GruntsPerWave: 4
+  ChargersPerWave: 1
+  RewardOre: 25
+--- !u!4 &1957070224
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1957070222}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1966551274
 GameObject:
  m_ObjectHideFlags: 0
@@ -3670,54 +3676,6 @@ BoxCollider:
  serializedVersion: 3
  m_Size: {x: 15.610933, y: 5, z: 1.5}
  m_Center: {x: 0, y: 2.5, z: 0}
--- !u!1 &2143686865
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2143686867}
-  - component: {fileID: 2143686866}
-  m_Layer: 0
-  m_Name: TrainingDummySpawner
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!114 &2143686866
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2143686865}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 51cc543c146d84239ba6dc219221df18, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: ProjectM.Authoring::ProjectM.Authoring.TrainingDummySpawnerAuthoring
-  DummyPrefab: {fileID: 6681740481886397972, guid: 9ee6032b77c444d07a1dc9dfbf5abd68, type: 3}
-  Count: 3
-  Spacing: 3
-  Origin: {x: 0, y: 0, z: 8}
--- !u!4 &2143686867
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2143686865}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &2145598868
 GameObject:
  m_ObjectHideFlags: 0
@@ -3773,9 +3731,7 @@ SceneRoots:
  m_Roots:
  - {fileID: 1498433572}
  - {fileID: 1379903946}
-  - {fileID: 2143686867}
  - {fileID: 409538539}
-  - {fileID: 1527461113}
  - {fileID: 1435545288}
  - {fileID: 874705788}
  - {fileID: 1930969067}
@@ -3791,3 +3747,4 @@ SceneRoots:
  - {fileID: 1268920429}
  - {fileID: 722706770}
  - {fileID: 2145598870}
+  - {fileID: 1957070224}