diff --git a/Aetheria.State.Verify/Program.cs b/Aetheria.State.Verify/Program.cs index 0ef259042..4e814e7ca 100644 --- a/Aetheria.State.Verify/Program.cs +++ b/Aetheria.State.Verify/Program.cs @@ -3712,7 +3712,7 @@ static void RequireSectorMapZoneDetailsUseEveSurface(string root) "AetheriaEveUnitySurfaceHost.Hide(_zoneDetailsSurfaceDocument)", "AetheriaRuntimeZoneDetailsSurfaceBuilder.Build(ProjectZoneDetailsSurfaceState(", "ProjectZoneDetailsSurfaceState(", - "GameManager?.FindDaemonZoneSnapshot(zone?.ZoneIndex ?? -1)", + "GameManager.TryGetObservedZoneSnapshot(zone?.ZoneIndex ?? -1, out var daemonZone)", "daemonZone.Bodies ?? Array.Empty()", "daemonZone.Entities ?? Array.Empty()", "typedHull.HullType", @@ -8130,7 +8130,7 @@ static void RequireUnityObserverDoesNotTickLocalSimulation(string root) { "ApplyLatestAuthoritativeDaemonFrame()", "ResolveDaemonObserver()", - "public AetheriaRuntimeZoneSnapshotCommit FindDaemonZoneSnapshot(int daemonZoneIndex)", + "public bool TryGetObservedZoneSnapshot(int daemonZoneIndex, out AetheriaRuntimeZoneSnapshotCommit snapshot)", "public bool TryGetObservedRunZone(out GalaxyZone galaxyZone)", "snapshot.ZoneIndex == daemonZoneIndex", "FindObservedGalaxyZone(run.CurrentZoneIndex)", @@ -8186,6 +8186,7 @@ static void RequireUnityObserverDoesNotTickLocalSimulation(string root) sectorRenderer.Contains("GameManager.CurrentEntity.Zone.GalaxyZone", StringComparison.Ordinal) || mapRenderer.Contains("GameManager.CurrentDaemonGalaxyZone", StringComparison.Ordinal) || sectorRenderer.Contains("GameManager.CurrentDaemonGalaxyZone", StringComparison.Ordinal) || + mapRenderer.Contains("GameManager.ZoneRenderer", StringComparison.Ordinal) || actionGameManager.Contains("public GalaxyZone CurrentDaemonGalaxyZone", StringComparison.Ordinal)) { throw new InvalidOperationException( @@ -8193,6 +8194,7 @@ static void RequireUnityObserverDoesNotTickLocalSimulation(string root) } if (!actionGameManager.Contains("public static bool TryGetObservedGalaxy(out Galaxy galaxy)", StringComparison.Ordinal) || + !actionGameManager.Contains("public bool TryGetObservedZoneSnapshot(int daemonZoneIndex, out AetheriaRuntimeZoneSnapshotCommit snapshot)", StringComparison.Ordinal) || !actionGameManager.Contains("public bool TryGetObservedRunZone(out GalaxyZone galaxyZone)", StringComparison.Ordinal) || !mapRenderer.Contains("GameManager.TryGetObservedRunZone(out var currentZone)", StringComparison.Ordinal) || !sectorRenderer.Contains("GameManager.TryGetObservedRunZone(out var currentZone)", StringComparison.Ordinal) || @@ -8247,8 +8249,8 @@ static void RequireUnityObserverDoesNotTickLocalSimulation(string root) "Unity gameplay must resolve observed zones by daemon zone identity, not projected array slot."); } - if (actionGameManager.Contains("FindDaemonZoneSnapshot(GalaxyZone", StringComparison.Ordinal) || - sectorRenderer.Contains("FindDaemonZoneSnapshot(zone)", StringComparison.Ordinal)) + if (actionGameManager.Contains("FindDaemonZoneSnapshot(", StringComparison.Ordinal) || + sectorRenderer.Contains("FindDaemonZoneSnapshot(", StringComparison.Ordinal)) { throw new InvalidOperationException( "Unity UI must query daemon zone snapshots by daemon zone identity instead of passing projected zone objects."); diff --git a/Assets/Scripts/Gameplay/ActionGameManager.cs b/Assets/Scripts/Gameplay/ActionGameManager.cs index ab22d214e..31c023f44 100644 --- a/Assets/Scripts/Gameplay/ActionGameManager.cs +++ b/Assets/Scripts/Gameplay/ActionGameManager.cs @@ -896,14 +896,16 @@ public class ActionGameManager : MonoBehaviour : ObservedGalaxy?.Zones?.FirstOrDefault(zone => zone != null && zone.ZoneIndex == daemonZoneIndex); } - public AetheriaRuntimeZoneSnapshotCommit FindDaemonZoneSnapshot(int daemonZoneIndex) + public bool TryGetObservedZoneSnapshot(int daemonZoneIndex, out AetheriaRuntimeZoneSnapshotCommit snapshot) { + snapshot = null; if (daemonZoneIndex < 0) - return null; + return false; var run = ResolveDaemonObserver()?.LastObservedState?.Run; - return (run?.Zones ?? Array.Empty()) + snapshot = (run?.Zones ?? Array.Empty()) .FirstOrDefault(snapshot => snapshot != null && snapshot.ZoneIndex == daemonZoneIndex); + return snapshot != null; } public bool TryGetObservedRunZone(out GalaxyZone galaxyZone) diff --git a/Assets/Scripts/UI/Menu/MapRenderer.cs b/Assets/Scripts/UI/Menu/MapRenderer.cs index f402a830c..85b41abcc 100644 --- a/Assets/Scripts/UI/Menu/MapRenderer.cs +++ b/Assets/Scripts/UI/Menu/MapRenderer.cs @@ -129,6 +129,6 @@ public class MapRenderer : MonoBehaviour InfluenceCamera.transform.position = pos; InfluenceCamera.orthographicSize = _size.y * Scale * .5f; - GameManager.ZoneRenderer.SetIconSize(IconSize * Scale); + ZoneRenderer.SetIconSize(IconSize * Scale); } } diff --git a/Assets/Scripts/UI/Menu/SectorRenderer.cs b/Assets/Scripts/UI/Menu/SectorRenderer.cs index 1ae6a1f5a..59dbae810 100644 --- a/Assets/Scripts/UI/Menu/SectorRenderer.cs +++ b/Assets/Scripts/UI/Menu/SectorRenderer.cs @@ -153,8 +153,8 @@ public class SectorRenderer : MonoBehaviour, IBeginDragHandler, IDragHandler, IS .Where(name => !string.IsNullOrWhiteSpace(name)) .ToArray(); - var daemonZone = GameManager?.FindDaemonZoneSnapshot(zone?.ZoneIndex ?? -1); - if (daemonZone == null) + if (GameManager == null || + !GameManager.TryGetObservedZoneSnapshot(zone?.ZoneIndex ?? -1, out var daemonZone)) { return new AetheriaRuntimeZoneDetailsSurfaceState( zone.Name,