From 2175cbdd1f0a5670326d443e04d31071b833a1c5 Mon Sep 17 00:00:00 2001 From: Meta Vens Date: Sun, 21 Jun 2026 19:28:00 +0100 Subject: [PATCH] Derive available entities from observed daemon state --- Aetheria.State.Verify/Program.cs | 16 +++++++++++----- Assets/Scripts/Gameplay/ActionGameManager.cs | 13 ++++++++----- Assets/Scripts/UI/Menu/InventoryPanel.cs | 4 ++-- Assets/Scripts/UI/Menu/TradeMenu.cs | 4 ++-- 4 files changed, 23 insertions(+), 14 deletions(-) diff --git a/Aetheria.State.Verify/Program.cs b/Aetheria.State.Verify/Program.cs index bb8b164cb..fceec3042 100644 --- a/Aetheria.State.Verify/Program.cs +++ b/Aetheria.State.Verify/Program.cs @@ -4414,7 +4414,7 @@ static void RequireTradeCargoSelectorUseEveSurface(string root) "AetheriaRuntimeTradeCargoSelectorCommandKind.Select", "CountAvailablePlayerShips(", "GameManager.TryGetObservedDockingBay(out var dockingBay)", - "GameManager.AvailableEntities()" + "GameManager.ObservedAvailableEntities()" }; var missingSymbols = requiredSymbols @@ -4444,7 +4444,8 @@ static void RequireTradeCargoSelectorUseEveSurface(string root) "GameManager.DockedEntity.Children", "GameManager.CurrentEntity.Parent.Children", "GameManager.DockedEntity == null", - "GameManager.DockingBay" + "GameManager.DockingBay", + "GameManager.AvailableEntities()" }; var hits = forbiddenSymbols @@ -4745,7 +4746,8 @@ static void RequireInventoryDropdownUseEveSurface(string root) "AetheriaRuntimeInventoryDropdownCommandKind.Select", "AetheriaRuntimeInventoryDropdownSurfaceBuilder.EntityEquipmentCommand(", "AetheriaRuntimeInventoryDropdownSurfaceBuilder.LoadoutCommand(", - "GameManager.TryGetObservedDockingBay(out var dockingBay)" + "GameManager.TryGetObservedDockingBay(out var dockingBay)", + "GameManager.ObservedAvailableEntities()" }; var missingSymbols = requiredSymbols @@ -4776,7 +4778,8 @@ static void RequireInventoryDropdownUseEveSurface(string root) "ContextMenu.Show();", "string.Equals(request.Command, AetheriaRuntimeInventoryDropdownSurfaceBuilder.Close", "_dropdownCommands.TryGetValue(request.Command", - "GameManager.DockingBay" + "GameManager.DockingBay", + "GameManager.AvailableEntities()" }; var hits = forbiddenSymbols @@ -7850,7 +7853,9 @@ static void RequireMainMenuContinueRunState(string root) "TryResolveDaemonDockingBay(", "IsCurrentEntityObservedUndocked(", "parentSnapshot.DockingBayAssignments", - "dockedEntitySnapshot.ChildEntityIndices", + "ObservedAvailableEntities(", + "TryGetObservedCurrentEntity(out var currentEntity)", + "parentSnapshot.ChildEntityIndices", "TryGetObservedEntityFacade(childEntityIndex, out var entity)" }; @@ -7885,6 +7890,7 @@ static void RequireMainMenuContinueRunState(string root) "CurrentEntity.VisibleFriendlies.ObserveRemove()", "foreach (var hostile in CurrentEntity.VisibleEnemies)", "foreach (var friendly in CurrentEntity.VisibleFriendlies)", + "dockedEntitySnapshot.ChildEntityIndices", "UpdateTargetPanel(CurrentEntity.Target.Value)", "var target = CurrentEntity.Target.Value;", "TargetIndicator.Target = CurrentEntity.Target.Value.Position", diff --git a/Assets/Scripts/Gameplay/ActionGameManager.cs b/Assets/Scripts/Gameplay/ActionGameManager.cs index 5abf2ee19..406b5884c 100644 --- a/Assets/Scripts/Gameplay/ActionGameManager.cs +++ b/Assets/Scripts/Gameplay/ActionGameManager.cs @@ -3479,20 +3479,23 @@ public class ActionGameManager : MonoBehaviour } } - public IEnumerable AvailableEntities() + public IEnumerable ObservedAvailableEntities() { - if (DockedEntity != null && TryGetDaemonEntitySnapshot(DockedEntity, out var dockedEntitySnapshot)) + if (!TryGetObservedCurrentEntity(out var currentEntity)) + yield break; + + if (TryGetDaemonParentSnapshot(currentEntity, out var parentSnapshot, out _)) { - foreach (var childEntityIndex in dockedEntitySnapshot.ChildEntityIndices ?? Array.Empty()) + foreach (var childEntityIndex in parentSnapshot.ChildEntityIndices ?? Array.Empty()) { if (TryGetObservedEntityFacade(childEntityIndex, out var entity) && entity is Ship { IsPlayerShip: true }) yield return entity; } } - else if (CurrentEntity != null) + else { - yield return CurrentEntity; + yield return currentEntity; } } diff --git a/Assets/Scripts/UI/Menu/InventoryPanel.cs b/Assets/Scripts/UI/Menu/InventoryPanel.cs index 4ae18e690..ae12da144 100644 --- a/Assets/Scripts/UI/Menu/InventoryPanel.cs +++ b/Assets/Scripts/UI/Menu/InventoryPanel.cs @@ -209,7 +209,7 @@ public class InventoryPanel : MonoBehaviour, IPointerClickHandler { _dropdownCommands.Clear(); - foreach (var entityEntry in GameManager.AvailableEntities().Select((entity, entityIndex) => (entity, entityIndex))) + foreach (var entityEntry in GameManager.ObservedAvailableEntities().Select((entity, entityIndex) => (entity, entityIndex))) { if (entityEntry.entity.CargoBays.Any()) { @@ -300,7 +300,7 @@ public class InventoryPanel : MonoBehaviour, IPointerClickHandler { var groups = new List(); - foreach (var entityEntry in GameManager.AvailableEntities().Select((entity, entityIndex) => (entity, entityIndex))) + foreach (var entityEntry in GameManager.ObservedAvailableEntities().Select((entity, entityIndex) => (entity, entityIndex))) { var options = new List(); var equipmentCommand = AetheriaRuntimeInventoryDropdownSurfaceBuilder.EntityEquipmentCommand(entityEntry.entityIndex); diff --git a/Assets/Scripts/UI/Menu/TradeMenu.cs b/Assets/Scripts/UI/Menu/TradeMenu.cs index 8d0e46ba6..2da01fe5e 100644 --- a/Assets/Scripts/UI/Menu/TradeMenu.cs +++ b/Assets/Scripts/UI/Menu/TradeMenu.cs @@ -1048,7 +1048,7 @@ public class TradeMenu : MonoBehaviour (dockingBay, "Docking Bay"); } - foreach (var ship in GameManager.AvailableEntities() + foreach (var ship in GameManager.ObservedAvailableEntities() .OfType() .Where(ship => ship.IsPlayerShip) .Select((ship, shipIndex) => (ship, shipIndex))) @@ -1186,7 +1186,7 @@ public class TradeMenu : MonoBehaviour private int CountAvailablePlayerShips(string itemKey) { - return GameManager.AvailableEntities() + return GameManager.ObservedAvailableEntities() .OfType() .Count(ship => ship.IsPlayerShip && ship.Hull?.ItemKey == itemKey); }