From 46dad13e9eaf68a2052b235e6c59f09e3d5d24b0 Mon Sep 17 00:00:00 2001 From: Meta Vens Date: Sun, 21 Jun 2026 13:33:24 +0100 Subject: [PATCH] Wait for daemon weapon group state --- Aetheria.State.Verify/Program.cs | 19 +++++++++++++++++++ Assets/Scripts/UI/Menu/InventoryMenu.cs | 9 +++------ 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/Aetheria.State.Verify/Program.cs b/Aetheria.State.Verify/Program.cs index e1971266f..e79468ecf 100644 --- a/Aetheria.State.Verify/Program.cs +++ b/Aetheria.State.Verify/Program.cs @@ -8899,6 +8899,25 @@ static void RequireWeaponGroupRequestAuthority(string root) string.Join(", ", localAcceptanceHits)); } + var inventoryMenuPath = Path.Combine(root, "Assets", "Scripts", "UI", "Menu", "InventoryMenu.cs"); + var inventoryMenu = File.Exists(inventoryMenuPath) + ? File.ReadAllText(inventoryMenuPath) + : throw new InvalidOperationException("Cannot verify weapon group authority; InventoryMenu.cs is missing."); + var forbiddenUiSubmissionAcceptanceSymbols = new[] + { + "if (GameManager.RequestWeaponGroupMembership(", + "Unable to toggle equipped-item weapon group membership." + }; + var uiSubmissionAcceptanceHits = forbiddenUiSubmissionAcceptanceSymbols + .Where(symbol => inventoryMenu.Contains(symbol, StringComparison.Ordinal)) + .ToArray(); + if (uiSubmissionAcceptanceHits.Length > 0) + { + throw new InvalidOperationException( + "InventoryMenu still treats weapon-group membership submission as accepted equipment state: " + + string.Join(", ", uiSubmissionAcceptanceHits)); + } + var assignmentPath = Path.Combine(root, "Assets", "Scripts", "UI", "Menu", "WeaponGroupAssignment.cs"); var elementPath = Path.Combine(root, "Assets", "Scripts", "UI", "Menu", "WeaponGroupElement.cs"); var weaponGroupsPrefabPath = Path.Combine(root, "Assets", "Prefabs", "UI", "Properties Panel", "Fancy", "Weapon Groups.prefab"); diff --git a/Assets/Scripts/UI/Menu/InventoryMenu.cs b/Assets/Scripts/UI/Menu/InventoryMenu.cs index 5fda4d35d..7075ef9ad 100644 --- a/Assets/Scripts/UI/Menu/InventoryMenu.cs +++ b/Assets/Scripts/UI/Menu/InventoryMenu.cs @@ -348,14 +348,11 @@ public class InventoryMenu : MonoBehaviour if (command.GroupIndex >= 0) { var assigned = !IsWeaponGroupAssigned(item, command.GroupIndex); - if (GameManager.RequestWeaponGroupMembership(item, command.GroupIndex, assigned)) - { - RenderEquippedItemDetailsSurface(item); - return; - } + GameManager.RequestWeaponGroupMembership(item, command.GroupIndex, assigned); + return; } - Debug.LogWarning("Unable to toggle equipped-item weapon group membership."); + Debug.LogWarning("Unable to submit equipped-item weapon group membership request."); return; case AetheriaRuntimeEquippedItemDetailsCommandKind.BindWeaponGroup: if (command.GroupIndex >= 0 &&