From c664e963c859fd4b8b27185ddbf609919f8d49eb Mon Sep 17 00:00:00 2001 From: Meta Vens Date: Sun, 21 Jun 2026 19:46:44 +0100 Subject: [PATCH] Expose observed loadout templates as query --- Aetheria.State.Verify/Program.cs | 14 ++++++++++++-- Assets/Scripts/Gameplay/ActionGameManager.cs | 16 +++++++++++----- Assets/Scripts/UI/Menu/InventoryPanel.cs | 4 ++-- 3 files changed, 25 insertions(+), 9 deletions(-) diff --git a/Aetheria.State.Verify/Program.cs b/Aetheria.State.Verify/Program.cs index 4e814e7ca..1f0ca0120 100644 --- a/Aetheria.State.Verify/Program.cs +++ b/Aetheria.State.Verify/Program.cs @@ -4747,7 +4747,8 @@ static void RequireInventoryDropdownUseEveSurface(string root) "AetheriaRuntimeInventoryDropdownSurfaceBuilder.EntityEquipmentCommand(", "AetheriaRuntimeInventoryDropdownSurfaceBuilder.LoadoutCommand(", "GameManager.TryGetObservedDockingBay(out var dockingBay)", - "GameManager.ObservedAvailableEntities()" + "GameManager.ObservedAvailableEntities()", + "GameManager.ObservedLoadoutTemplates()" }; var missingSymbols = requiredSymbols @@ -4779,7 +4780,8 @@ static void RequireInventoryDropdownUseEveSurface(string root) "string.Equals(request.Command, AetheriaRuntimeInventoryDropdownSurfaceBuilder.Close", "_dropdownCommands.TryGetValue(request.Command", "GameManager.DockingBay", - "GameManager.AvailableEntities()" + "GameManager.AvailableEntities()", + "GameManager.LoadoutTemplates" }; var hits = forbiddenSymbols @@ -10470,6 +10472,14 @@ static void RequireInventoryLoadoutRestoreRequestAuthority(string root) throw new InvalidOperationException("InventoryPanel no longer routes loadout restore through ActionGameManager."); } + if (!actionGameManager.Contains("public IEnumerable ObservedLoadoutTemplates()", StringComparison.Ordinal) || + actionGameManager.Contains("public List LoadoutTemplates", StringComparison.Ordinal) || + inventoryPanel.Contains("GameManager.LoadoutTemplates", StringComparison.Ordinal)) + { + throw new InvalidOperationException( + "InventoryPanel must enumerate daemon-observed loadout templates through ActionGameManager.ObservedLoadoutTemplates()."); + } + if (actionGameManager.Contains("RequestRuntimeLoadoutRestore(AetheriaRuntimeLoadoutTemplateSnapshot template, out Entity", StringComparison.Ordinal) || actionGameManager.Contains("public bool RequestRuntimeLoadoutRestore(", StringComparison.Ordinal) || inventoryPanel.Contains("RequestRuntimeLoadoutRestore(template, out", StringComparison.Ordinal) || diff --git a/Assets/Scripts/Gameplay/ActionGameManager.cs b/Assets/Scripts/Gameplay/ActionGameManager.cs index 31c023f44..f785510c6 100644 --- a/Assets/Scripts/Gameplay/ActionGameManager.cs +++ b/Assets/Scripts/Gameplay/ActionGameManager.cs @@ -224,11 +224,11 @@ public class ActionGameManager : MonoBehaviour try { var loadouts = AetheriaRuntimeStateReader.ReadLoadoutTemplates(stateFilePath); - LoadoutTemplates.Clear(); - LoadoutTemplates.AddRange(loadouts); + _observedLoadoutTemplates.Clear(); + _observedLoadoutTemplates.AddRange(loadouts); - if (LoadoutTemplates.Count > 0) - Debug.Log($"Loaded {LoadoutTemplates.Count} Aetheria Verse loadout templates from typed state."); + if (_observedLoadoutTemplates.Count > 0) + Debug.Log($"Loaded {_observedLoadoutTemplates.Count} Aetheria Verse loadout templates from typed state."); } catch (FileNotFoundException) { @@ -473,6 +473,8 @@ public class ActionGameManager : MonoBehaviour private List _actionBarSlots = new List(); private List _actionBarActions = new List(); private float _hitMarkerTime; + private readonly List _observedLoadoutTemplates = + new List(); public AetheriaInput Input { get; private set; } public EquippedDockingBay DockingBay { get; private set; } @@ -534,7 +536,11 @@ public class ActionGameManager : MonoBehaviour public ItemManager ItemManager { get; private set; } public Zone Zone { get; private set; } - public List LoadoutTemplates { get; } = new List(); + + public IEnumerable ObservedLoadoutTemplates() + { + return _observedLoadoutTemplates; + } private readonly (float2 direction, string name)[] _directions = { (new float2(0, 1), "Front"), diff --git a/Assets/Scripts/UI/Menu/InventoryPanel.cs b/Assets/Scripts/UI/Menu/InventoryPanel.cs index ae12da144..6868b99ce 100644 --- a/Assets/Scripts/UI/Menu/InventoryPanel.cs +++ b/Assets/Scripts/UI/Menu/InventoryPanel.cs @@ -249,7 +249,7 @@ public class InventoryPanel : MonoBehaviour, IPointerClickHandler }; } - foreach (var loadoutEntry in GameManager.LoadoutTemplates.Select((template, templateIndex) => (template, templateIndex))) + foreach (var loadoutEntry in GameManager.ObservedLoadoutTemplates().Select((template, templateIndex) => (template, templateIndex))) { var blueprint = GameManager.CreateEntityConstructionBlueprint(loadoutEntry.template); if (blueprint == null) @@ -368,7 +368,7 @@ public class InventoryPanel : MonoBehaviour, IPointerClickHandler AetheriaRuntimeInventoryDropdownSurfaceBuilder.SaveLoadout)); } - foreach (var loadoutEntry in GameManager.LoadoutTemplates.Select((template, templateIndex) => (template, templateIndex))) + foreach (var loadoutEntry in GameManager.ObservedLoadoutTemplates().Select((template, templateIndex) => (template, templateIndex))) { var restoreCommand = AetheriaRuntimeInventoryDropdownSurfaceBuilder.LoadoutCommand(loadoutEntry.templateIndex); var blueprint = GameManager.CreateEntityConstructionBlueprint(loadoutEntry.template);