diff --git a/Aetheria.State.Verify/Program.cs b/Aetheria.State.Verify/Program.cs index b0c3ab47f..1d58770cc 100644 --- a/Aetheria.State.Verify/Program.cs +++ b/Aetheria.State.Verify/Program.cs @@ -1985,10 +1985,13 @@ static void RequireDaemonRenderQueryAuthority(string root) } if (zoneRenderer.Contains("_legacyEntityFacadeZone", StringComparison.Ordinal) || - zoneRenderer.Contains("_legacyEntityFacadeZone?.Radius", StringComparison.Ordinal)) + zoneRenderer.Contains("_legacyEntityFacadeZone?.Radius", StringComparison.Ordinal) || + zoneRenderer.Contains("_legacyLootFacadeZone", StringComparison.Ordinal) || + zoneRenderer.Contains("Zone legacyLootFacadeZone", StringComparison.Ordinal) || + zoneRenderer.Contains("gridObject.Zone = ", StringComparison.Ordinal)) { throw new InvalidOperationException( - "ZoneRenderer must not keep a broad Unity Zone facade; only explicitly scoped compatibility handles may remain."); + "ZoneRenderer must not keep Unity Zone facade handles; daemon snapshots and observed facade projections own renderer input."); } if (zoneRenderer.Contains("PerspectiveEntity.EntityInfoGathered", StringComparison.Ordinal)) @@ -2025,9 +2028,7 @@ static void RequireDaemonRenderQueryAuthority(string root) "private readonly HashSet _visibleDaemonEntityIndices", "private readonly List _daemonWormholeExits", "public Dictionary WormholeInstances", - "private Zone _legacyLootFacadeZone;", "public void LoadDaemonZoneView(", - "Zone legacyLootFacadeZone,", "IReadOnlyDictionary observedEntityFacadesByDaemonIndex,", "AetheriaRuntimeRunCheckpointCommit daemonRun = null", "public void ApplyDaemonFrame(", @@ -2066,7 +2067,6 @@ static void RequireDaemonRenderQueryAuthority(string root) "AddWormhole(exit)", "public void AddWormhole(AetheriaRuntimeDaemonWormholeExit exit)", "private double DaemonSimulationTimeSeconds => _daemonZoneSnapshot?.SimulationTimeSeconds ?? 0;", - "gridObject.Zone = _legacyLootFacadeZone;", "_daemonCompassMarkersByEntityIndex.TryGetValue(entityInstance.DaemonEntityIndex, out var marker)", "_daemonBodyPosesByBodyKey.TryGetValue(planet.Key, out var pose)", "pose.GravityWaveSpeed" @@ -7773,7 +7773,7 @@ static void RequireMainMenuContinueRunState(string root) "_observedEntityFacadesByRecordKey", "_observedEntityFacadesByDaemonIndex", "RebuildObservedEntityFacadeIndex();", - "ZoneRenderer.LoadDaemonZoneView(Zone, _observedEntityFacadesByDaemonIndex, daemonZone, daemonRun)", + "ZoneRenderer.LoadDaemonZoneView(_observedEntityFacadesByDaemonIndex, daemonZone, daemonRun)", "entity.RestoreStatGrids(entitySnapshot.StatGrids)", "RestoreThermalExposure((float)entitySnapshot.Heatstroke, (float)entitySnapshot.Hypothermia)", "entity.HeatsinksEnabled = entitySnapshot.HeatsinksEnabled", @@ -8031,7 +8031,7 @@ static void RequireUnityObserverDoesNotTickLocalSimulation(string root) "observed.IsAuthoritative", "TryRestoreEntityGraphFromDaemonRun(observed.Run)", "CreateDaemonZoneConstructionBlueprint(daemonZone)", - "ZoneRenderer.LoadDaemonZoneView(Zone, _observedEntityFacadesByDaemonIndex, daemonZone, daemonRun)", + "ZoneRenderer.LoadDaemonZoneView(_observedEntityFacadesByDaemonIndex, daemonZone, daemonRun)", "ZoneRenderer?.ApplyDaemonFrame(daemonZone, run)", "CreateDaemonEntitySnapshots(runId, daemonZone)", "FindCurrentDaemonZoneSnapshot()", diff --git a/Assets/Scripts/Gameplay/ActionGameManager.cs b/Assets/Scripts/Gameplay/ActionGameManager.cs index 2efc96c19..79d49d046 100644 --- a/Assets/Scripts/Gameplay/ActionGameManager.cs +++ b/Assets/Scripts/Gameplay/ActionGameManager.cs @@ -2098,7 +2098,7 @@ public class ActionGameManager : MonoBehaviour Zone.Log = s => Debug.Log($"Zone: {s}"); - ZoneRenderer.LoadDaemonZoneView(Zone, _observedEntityFacadesByDaemonIndex, daemonZone, daemonRun); + ZoneRenderer.LoadDaemonZoneView(_observedEntityFacadesByDaemonIndex, daemonZone, daemonRun); if (CurrentEntity != null) { diff --git a/Assets/Scripts/Gameplay/GridObject.cs b/Assets/Scripts/Gameplay/GridObject.cs index 180a2dd7c..fa471bec2 100644 --- a/Assets/Scripts/Gameplay/GridObject.cs +++ b/Assets/Scripts/Gameplay/GridObject.cs @@ -13,7 +13,6 @@ public class GridObject : MonoBehaviour private float _timeOffset; - public Zone Zone { get; set; } public Vector3 Velocity { get; set; } private void Start() diff --git a/Assets/Scripts/Gameplay/Weapons/MineManager.cs b/Assets/Scripts/Gameplay/Weapons/MineManager.cs index eadcf53b2..45c672205 100644 --- a/Assets/Scripts/Gameplay/Weapons/MineManager.cs +++ b/Assets/Scripts/Gameplay/Weapons/MineManager.cs @@ -24,6 +24,5 @@ public class MineManager : InstantWeaponEffectManager p.Damage = weapon.Damage; p.Range = weapon.Range; p.DamageType = weapon.DamageType; - p.GridObject.Zone = source.Entity.Zone; } } diff --git a/Assets/Scripts/Zone Display/ZoneRenderer.cs b/Assets/Scripts/Zone Display/ZoneRenderer.cs index 1aa51ca9c..273073a69 100644 --- a/Assets/Scripts/Zone Display/ZoneRenderer.cs +++ b/Assets/Scripts/Zone Display/ZoneRenderer.cs @@ -105,7 +105,6 @@ public class ZoneRenderer : MonoBehaviour public Dictionary WormholeInstances = new Dictionary(); private List _loot = new List(); - private Zone _legacyLootFacadeZone; public IReadOnlyDictionary DaemonEntityInstances => _entityInstancesByDaemonIndex; public IReadOnlyList ActiveLoot => _loot; public ItemManager ItemManager { get; set; } @@ -215,13 +214,11 @@ public class ZoneRenderer : MonoBehaviour } public void LoadDaemonZoneView( - Zone legacyLootFacadeZone, IReadOnlyDictionary observedEntityFacadesByDaemonIndex, AetheriaRuntimeZoneSnapshotCommit daemonZone = null, AetheriaRuntimeRunCheckpointCommit daemonRun = null) { ClearZone(); - _legacyLootFacadeZone = legacyLootFacadeZone; ApplyDaemonFrame(daemonZone, daemonRun); RefreshDaemonBodyPoses(); RefreshDaemonAsteroidBeltPoses(); @@ -763,7 +760,6 @@ public class ZoneRenderer : MonoBehaviour }; var t = gridObject.transform; t.parent = ZoneRoot; - gridObject.Zone = _legacyLootFacadeZone; t.position = position; gridObject.Velocity = velocity; var itemPickup = gridObject.gameObject.GetComponent();