Game Scene Split up

Assets/_Project/Scripts/Server/Economy/ExpeditionFieldSystem.cs

@@ -8,14 +8,14 @@ using Unity.Transforms;
 namespace ProjectM.Server
 {
     /// <summary>
-    /// Server-only procedural expedition-field manager. Edge-triggered off the cycle phase (via the server-only
-    /// <see cref="CycleRuntime.PrevPhase"/>): on ENTERING Expedition for a not-yet-seeded cycle it scatters
-    /// <see cref="ResourceFieldSpawner.Count"/> resource-node ghosts (seeded by CycleNumber via
-    /// <see cref="Unity.Mathematics.Random"/>) around the expedition region origin, each
-    /// <see cref="RegionTag"/>{Expedition}; on LEAVING Expedition it destroys every node. Runs in the plain
-    /// server SimulationSystemGroup <c>[UpdateAfter(CyclePhaseSystem)]</c> so the phase edge is observed the
-    /// same tick. Server-authoritative; clients despawn nodes via GhostDespawnSystem. Per-cycle reproducible
-    /// (the seed is the monotonic int CycleNumber, compared by equality — never tick math; never seed 0).
+    /// Server-only procedural expedition-field manager. Re-keyed off PER-PLAYER PRESENCE (no global phase): it
+    /// counts players whose server-only <see cref="RegionTag"/> is the Expedition region, and on the
+    /// empty-&gt;occupied edge (a new sortie) bumps <see cref="CycleRuntime.ExpeditionEpoch"/> and scatters
+    /// <see cref="ResourceFieldSpawner.Count"/> resource-node ghosts (seeded by the epoch) around the expedition
+    /// origin, each RegionTag{Expedition}; on the occupied-&gt;empty edge (the LAST player left) it destroys every
+    /// node. So the field lives as long as anyone is out there, not on a global timer. Plain server
+    /// SimulationSystemGroup. Server-authoritative; clients despawn nodes via GhostDespawnSystem. Per-epoch
+    /// reproducible (the seed is the monotonic int epoch, compared by equality — never tick math, never 0).
     /// </summary>
     [BurstCompile]
     [WorldSystemFilter(WorldSystemFilterFlags.ServerSimulation)]
@@ -34,10 +34,21 @@ namespace ProjectM.Server
         public void OnUpdate(ref SystemState state)
         {
             var cycleEntity = SystemAPI.GetSingletonEntity<CycleState>();
-            var cycle = SystemAPI.GetComponent<CycleState>(cycleEntity);
             var runtime = SystemAPI.GetComponent<CycleRuntime>(cycleEntity);
             var spawner = SystemAPI.GetSingleton<ResourceFieldSpawner>();
 
+            // Per-player presence: is anyone currently out in the expedition region?
+            int expeditionPlayers = 0;
+            foreach (var region in SystemAPI.Query<RefRO<RegionTag>>().WithAll<PlayerTag>())
+                if (region.ValueRO.Region == RegionId.Expedition)
+                    expeditionPlayers++;
+            bool occupied = expeditionPlayers > 0;
+            bool wasOccupied = runtime.PrevExpeditionOccupied != 0;
+
+            // empty -> occupied: a new sortie begins; bump the epoch so the field reseeds fresh.
+            if (occupied && !wasOccupied)
+                runtime.ExpeditionEpoch += 1;
+
             float3 baseCenter = new float3(0f, 1f, 0f);
             if (SystemAPI.TryGetSingleton<BaseAnchor>(out var anchor))
                 baseCenter = BaseGridMath.PlotCenter(anchor);
@@ -45,14 +56,14 @@ namespace ProjectM.Server
 
             var ecb = new EntityCommandBuffer(Allocator.Temp);
 
-            // SPAWN edge: entered Expedition for a cycle we have not seeded yet.
-            if (cycle.Phase == CyclePhase.Expedition
-                && runtime.LastSpawnedCycle != cycle.CycleNumber
+            // SPAWN: a player is out and this epoch has not been seeded yet.
+            if (occupied
+                && runtime.LastSpawnedEpoch != runtime.ExpeditionEpoch
                 && spawner.Prefab != Entity.Null)
             {
                 var baseXform = SystemAPI.GetComponent<LocalTransform>(spawner.Prefab);
                 var prefabNode = SystemAPI.GetComponent<ResourceNode>(spawner.Prefab);
-                var rng = new Random((uint)math.max(1, cycle.CycleNumber));
+                var rng = new Random((uint)math.max(1, runtime.ExpeditionEpoch));
                 int count = math.max(1, spawner.Count);
                 for (int i = 0; i < count; i++)
                 {
@@ -69,17 +80,17 @@ namespace ProjectM.Server
                     rn.ResourceId = (byte)(ResourceId.Aether + (byte)(i % 3));
                     ecb.SetComponent(node, rn);
                 }
-                runtime.LastSpawnedCycle = cycle.CycleNumber;
+                runtime.LastSpawnedEpoch = runtime.ExpeditionEpoch;
             }
 
-            // DESTROY edge: left Expedition — clear the whole field.
-            if (runtime.PrevPhase == CyclePhase.Expedition && cycle.Phase != CyclePhase.Expedition)
+            // DESTROY: the last player left the expedition — clear the whole field.
+            if (wasOccupied && !occupied)
             {
                 foreach (var (rn, e) in SystemAPI.Query<RefRO<ResourceNode>>().WithEntityAccess())
                     ecb.DestroyEntity(e);
             }
 
-            runtime.PrevPhase = cycle.Phase;
+            runtime.PrevExpeditionOccupied = (byte)(occupied ? 1 : 0);
             SystemAPI.SetComponent(cycleEntity, runtime);
 
             ecb.Playback(state.EntityManager);