diff --git a/Aetheria.State.Verify/Program.cs b/Aetheria.State.Verify/Program.cs index 4e087f94d..abec77ad0 100644 --- a/Aetheria.State.Verify/Program.cs +++ b/Aetheria.State.Verify/Program.cs @@ -13347,8 +13347,10 @@ static void RequireMainMenuContinueRunState(string root) "private AetheriaUnityEntityBlueprintMaterializer EntityBlueprintMaterializer =>", "EntityBlueprintMaterializer.MaterializeObservedEntity", "_loadoutItemFactory.CreateLoadoutItem", - "private AetheriaUnityObservedDockingIndex ObservedDocking =>", - "ObservedDocking.IsEntityUndocked(CurrentEntity)", + "ResolveDockParent = ResolveDockParentFromCurrentDocking", + "CurrentDockingSnapshot()", + ".RuntimeState(\"unity-action-game-manager\")", + ".CurrentDockingState()", "IsCurrentEntityObservedUndocked(", "private AetheriaUnityCurrentEntityBinder CurrentEntityBinder =>", "private readonly AetheriaUnityCurrentEntityPresentation _currentEntityPresentation", @@ -13743,7 +13745,8 @@ static void RequireMainMenuContinueRunState(string root) "public void RestoreBinding(", "public void ClearBinding()", "private void BindUndocked(", - "ObservedDocking.TryResolveDockingBay(currentEntity, out var dockParent, out _)", + "public Func ResolveDockParent { get; set; }", + "var dockParent = ResolveDockParent?.Invoke(currentEntity)", "CurrentEntityPresentation?.BindDocked(", "CurrentEntityPresentation?.BindUndocked(", "TargetPresentation?.ClearIndicators();", @@ -13766,6 +13769,8 @@ static void RequireMainMenuContinueRunState(string root) var forbiddenManagerCurrentEntityBinderSymbols = new[] { "if (ObservedDocking.TryResolveDockingBay(currentEntity, out var dockParent, out _))", + "private AetheriaUnityObservedDockingIndex ObservedDocking =>", + "ObservedDocking.IsEntityUndocked(CurrentEntity)", "_currentEntityPresentation.BindDocked(", "_currentEntityPresentation.BindUndocked(", "_targetPresentation.ClearIndicators();", @@ -14771,7 +14776,7 @@ static void RequireUnityObserverDoesNotTickLocalSimulation(string root) } if (!currentEntityBinder.Contains("public void RestoreBinding(", StringComparison.Ordinal) || - !currentEntityBinder.Contains("ObservedDocking.TryResolveDockingBay(currentEntity, out var dockParent, out _)", StringComparison.Ordinal) || + !currentEntityBinder.Contains("var dockParent = ResolveDockParent?.Invoke(currentEntity)", StringComparison.Ordinal) || !currentEntityBinder.Contains("CurrentEntityPresentation?.BindDocked(", StringComparison.Ordinal) || !currentEntityBinder.Contains("CurrentEntityPresentation?.BindUndocked(", StringComparison.Ordinal)) { diff --git a/Assets/Scripts/Gameplay/ActionGameManager.cs b/Assets/Scripts/Gameplay/ActionGameManager.cs index f142dca55..c822e1411 100644 --- a/Assets/Scripts/Gameplay/ActionGameManager.cs +++ b/Assets/Scripts/Gameplay/ActionGameManager.cs @@ -16,7 +16,6 @@ public class ActionGameManager : MonoBehaviour { private AetheriaDaemonObserver _daemonObserver; private AetheriaUnityPilotCommandSender _pilotCommands; - private AetheriaUnityObservedDockingIndex _observedDocking; private AetheriaUnityObservedEntityRestorer _observedEntityRestorer; private AetheriaUnityCurrentEntityBinder _currentEntityBinder; private AetheriaUnityObservedZoneContextFactory _observedZoneContextFactory; @@ -35,8 +34,6 @@ public class ActionGameManager : MonoBehaviour _pilotCommands ??= new AetheriaUnityPilotCommandSender( () => AetheriaUnityRuntimeClientProvider.Control("unity-pilot-commands"), () => Time.unscaledTime); - private AetheriaUnityObservedDockingIndex ObservedDocking => - _observedDocking ??= new AetheriaUnityObservedDockingIndex(_observedEntityIndex); private AetheriaUnityObservedEntityRestorer ObservedEntityRestorer => _observedEntityRestorer ??= new AetheriaUnityObservedEntityRestorer( _observedEntityIndex, @@ -57,10 +54,10 @@ public class ActionGameManager : MonoBehaviour ZoneRenderer = ZoneRenderer, DeathPost = DeathPost, GameplayUI = GameplayUI, - ObservedDocking = ObservedDocking, CurrentEntityPresentation = _currentEntityPresentation, TargetPresentation = _targetPresentation, GetCurrentEntity = () => CurrentEntity, + ResolveDockParent = ResolveDockParentFromCurrentDocking, SetCurrentEntity = entity => CurrentEntity = entity, GetViewDirection = () => _viewDirection, SetViewDirection = direction => _viewDirection = direction, @@ -297,7 +294,6 @@ public class ActionGameManager : MonoBehaviour { _gameplayInputShell?.Dispose(); _observedTargetQuery = null; - _observedDocking = null; AetheriaUnityRuntimeClientProvider.Dispose(); } @@ -348,7 +344,61 @@ public class ActionGameManager : MonoBehaviour private bool IsCurrentEntityObservedUndocked() { - return ObservedDocking.IsEntityUndocked(CurrentEntity); + var docking = CurrentDockingSnapshot(); + if (CurrentEntity == null || + docking == null || + docking.CurrentEntityIndex != CurrentEntity.DaemonEntityIndex) + { + return false; + } + + if (_observedEntityIndex.TryResolveEntityRecordKey(CurrentEntity, out var currentEntityKey) && + !string.IsNullOrWhiteSpace(docking.CurrentEntityKey) && + !string.Equals(docking.CurrentEntityKey, currentEntityKey, StringComparison.Ordinal)) + { + return false; + } + + return !docking.IsDocked; + } + + private Entity ResolveDockParentFromCurrentDocking(Entity currentEntity) + { + var docking = CurrentDockingSnapshot(); + if (currentEntity == null || + docking == null || + !docking.IsDocked || + docking.CurrentEntityIndex != currentEntity.DaemonEntityIndex || + string.IsNullOrWhiteSpace(docking.DockParentEntityKey)) + { + return null; + } + + if (_observedEntityIndex.TryResolveEntityRecordKey(currentEntity, out var currentEntityKey) && + !string.IsNullOrWhiteSpace(docking.CurrentEntityKey) && + !string.Equals(docking.CurrentEntityKey, currentEntityKey, StringComparison.Ordinal)) + { + return null; + } + + return _observedEntityIndex.TryResolveEntityByRecordKey(docking.DockParentEntityKey, out var dockParent) + ? dockParent + : null; + } + + private static AetheriaRuntimeCurrentDockingDocument CurrentDockingSnapshot() + { + try + { + return AetheriaUnityRuntimeClientProvider + .RuntimeState("unity-action-game-manager") + .CurrentDockingState(); + } + catch (Exception ex) + { + Debug.LogWarning($"Failed to read Aetheria current docking for gameplay manager: {ex.Message}"); + return null; + } } private GalaxyZone ResolveObservedGalaxyZone(int daemonZoneIndex) diff --git a/Assets/Scripts/Gameplay/AetheriaUnityCurrentEntityBinder.cs b/Assets/Scripts/Gameplay/AetheriaUnityCurrentEntityBinder.cs index 979fe3d1a..3c7e33649 100644 --- a/Assets/Scripts/Gameplay/AetheriaUnityCurrentEntityBinder.cs +++ b/Assets/Scripts/Gameplay/AetheriaUnityCurrentEntityBinder.cs @@ -15,10 +15,10 @@ public sealed class AetheriaUnityCurrentEntityBinder public ZoneRenderer ZoneRenderer { get; set; } public PostProcessVolume DeathPost { get; set; } public CanvasGroup GameplayUI { get; set; } - public AetheriaUnityObservedDockingIndex ObservedDocking { get; set; } public AetheriaUnityCurrentEntityPresentation CurrentEntityPresentation { get; set; } public AetheriaUnityTargetPresentation TargetPresentation { get; set; } public Func GetCurrentEntity { get; set; } + public Func ResolveDockParent { get; set; } public Action SetCurrentEntity { get; set; } public Func GetViewDirection { get; set; } public Action SetViewDirection { get; set; } @@ -31,8 +31,8 @@ public sealed class AetheriaUnityCurrentEntityBinder public void RestoreBinding(Entity currentEntity) { - if (ObservedDocking != null && - ObservedDocking.TryResolveDockingBay(currentEntity, out var dockParent, out _)) + var dockParent = ResolveDockParent?.Invoke(currentEntity); + if (dockParent != null) { SetCurrentEntity?.Invoke(currentEntity); ApplyActionBarBindings?.Invoke(Array.Empty());