diff --git a/Aetheria.State.Verify/Program.cs b/Aetheria.State.Verify/Program.cs index c45e40495..174f80d3f 100644 --- a/Aetheria.State.Verify/Program.cs +++ b/Aetheria.State.Verify/Program.cs @@ -8934,6 +8934,20 @@ static void RequireWeaponGroupRequestAuthority(string root) string.Join(", ", localAcceptanceHits)); } + var forbiddenPublicAcceptanceApis = new[] + { + "public bool RequestWeaponGroupMembership(" + }; + var publicAcceptanceApiHits = forbiddenPublicAcceptanceApis + .Where(symbol => actionGameManager.Contains(symbol, StringComparison.Ordinal)) + .ToArray(); + if (publicAcceptanceApiHits.Length > 0) + { + throw new InvalidOperationException( + "Weapon-group request APIs still expose submission as public acceptance state: " + + string.Join(", ", publicAcceptanceApiHits)); + } + var inventoryMenuPath = Path.Combine(root, "Assets", "Scripts", "UI", "Menu", "InventoryMenu.cs"); var inventoryMenu = File.Exists(inventoryMenuPath) ? File.ReadAllText(inventoryMenuPath) @@ -9170,8 +9184,10 @@ static void RequireInventoryDoubleClickTransferRequestAuthority(string root) "Unable to move item!", "Verify that cargo bays are empty before un-equipping them.", "var success = RequestDraggedItemTo", + "var submitted = RequestDraggedItemTo", "if (RequestCargoItemTransfer(", - "if (RequestEquippedItemTransfer(" + "if (RequestEquippedItemTransfer(", + "ShowUnableToSubmitItemMoveRequestDialog(" }; var inventorySubmissionAcceptanceHits = new[] { inventoryMenuPath, inventoryPanelPath } .SelectMany(path => File.ReadLines(path) @@ -9186,6 +9202,33 @@ static void RequireInventoryDoubleClickTransferRequestAuthority(string root) string.Join("; ", inventorySubmissionAcceptanceHits)); } + var forbiddenPublicAcceptanceApis = new[] + { + "public bool RequestCargoItemTransfer(", + "public bool RequestCargoItemEquip(", + "public bool RequestEquippedItemStore(", + "public bool RequestEquippedItemEquip(", + "private bool RequestDraggedItemToEntity(", + "private bool RequestDraggedItemToCargo(", + "private bool RequestCargoItemTransfer(", + "private bool RequestEquippedItemTransfer(", + "public bool EndDrag(", + "Func", + "RegisterDragTarget(Func" + }; + var publicAcceptanceApiHits = new[] { actionGameManagerPath, inventoryMenuPath, inventoryPanelPath } + .SelectMany(path => File.ReadLines(path) + .Select((line, index) => new { Path = path, LineNumber = index + 1, Line = line })) + .Where(line => forbiddenPublicAcceptanceApis.Any(symbol => line.Line.Contains(symbol, StringComparison.Ordinal))) + .Select(line => $"{Path.GetRelativePath(root, line.Path)}:{line.LineNumber}: {line.Line.Trim()}") + .ToArray(); + if (publicAcceptanceApiHits.Length > 0) + { + throw new InvalidOperationException( + "Inventory drag/request APIs still expose submission as public acceptance state: " + + string.Join("; ", publicAcceptanceApiHits)); + } + var requiredUiCalls = new[] { "GameManager.RequestCargoItemTransfer", @@ -9329,12 +9372,14 @@ static void RequireTradePurchaseRequestAuthority(string root) var forbiddenSubmissionAcceptanceSymbols = new[] { "if (!GameManager.RequestTradePurchase(", - "\"Purchase request rejected!\"" + "\"Purchase request rejected!\"", + "public bool RequestTradePurchase(" }; - var submissionAcceptanceHits = File.ReadLines(tradeMenuPath) - .Select((line, index) => new { LineNumber = index + 1, Line = line }) + var submissionAcceptanceHits = new[] { tradeMenuPath, actionGameManagerPath } + .SelectMany(path => File.ReadLines(path) + .Select((line, index) => new { Path = path, LineNumber = index + 1, Line = line })) .Where(line => forbiddenSubmissionAcceptanceSymbols.Any(symbol => line.Line.Contains(symbol, StringComparison.Ordinal))) - .Select(line => $"{Path.GetRelativePath(root, tradeMenuPath)}:{line.LineNumber}: {line.Line.Trim()}") + .Select(line => $"{Path.GetRelativePath(root, line.Path)}:{line.LineNumber}: {line.Line.Trim()}") .ToArray(); if (submissionAcceptanceHits.Length > 0) diff --git a/Assets/Scripts/Gameplay/ActionGameManager.cs b/Assets/Scripts/Gameplay/ActionGameManager.cs index 263c42c05..0c8f91e70 100644 --- a/Assets/Scripts/Gameplay/ActionGameManager.cs +++ b/Assets/Scripts/Gameplay/ActionGameManager.cs @@ -502,7 +502,7 @@ public class ActionGameManager : MonoBehaviour }; public DragObject DragObject { get; private set; } - private Func _endDragCallback; + private Action _endDragCallback; private List _stories = new List(); @@ -615,18 +615,16 @@ public class ActionGameManager : MonoBehaviour binding.WeaponGroup); } - private bool RequestActionBarBinding(ActionBarSlot slot, DragObject dragAction) + private void RequestActionBarBinding(ActionBarSlot slot, DragObject dragAction) { if (slot == null || dragAction == null || CurrentEntity == null) - return false; + return; var bindingCommit = CreateActionBarBindingCommit(slot, CurrentEntity, dragAction); if (bindingCommit == null) - return false; + return; - if (TryRequestDaemonActionBarBinding(bindingCommit)) - return true; - return false; + TryRequestDaemonActionBarBinding(bindingCommit); } public int GetActionBarSlotCount() @@ -1032,35 +1030,29 @@ public class ActionGameManager : MonoBehaviour return; } - public bool RequestWeaponGroupMembership(EquippedItem item, int groupIndex, bool assigned) + public void RequestWeaponGroupMembership(EquippedItem item, int groupIndex, bool assigned) { if (item == null) { - return false; + return; } - if (TryRequestDaemonWeaponGroupMembership(item, groupIndex, assigned)) - return true; - return false; + TryRequestDaemonWeaponGroupMembership(item, groupIndex, assigned); } - public bool RequestCargoItemTransfer(EquippedCargoBay origin, EquippedCargoBay destination, ItemInstance item) + public void RequestCargoItemTransfer(EquippedCargoBay origin, EquippedCargoBay destination, ItemInstance item) { if (origin == null || destination == null || item == null) { - return false; + return; } - if (TryRequestDaemonCargoItemTransfer(origin, destination, item, default, false)) - { - return true; - } - return false; + TryRequestDaemonCargoItemTransfer(origin, destination, item, default, false); } - public bool RequestCargoItemTransfer( + public void RequestCargoItemTransfer( EquippedCargoBay origin, EquippedCargoBay destination, ItemInstance item, @@ -1070,14 +1062,10 @@ public class ActionGameManager : MonoBehaviour destination == null || item == null) { - return false; + return; } - if (TryRequestDaemonCargoItemTransfer(origin, destination, item, destinationPosition, true)) - { - return true; - } - return false; + TryRequestDaemonCargoItemTransfer(origin, destination, item, destinationPosition, true); } private bool TryRequestDaemonCargoItemTransfer( @@ -1130,23 +1118,19 @@ public class ActionGameManager : MonoBehaviour } } - public bool RequestCargoItemEquip(EquippedCargoBay origin, Entity destination, EquippableItem item) + public void RequestCargoItemEquip(EquippedCargoBay origin, Entity destination, EquippableItem item) { if (origin == null || destination == null || item == null) { - return false; + return; } - if (TryRequestDaemonCargoItemEquip(origin, destination, item, default, false)) - { - return true; - } - return false; + TryRequestDaemonCargoItemEquip(origin, destination, item, default, false); } - public bool RequestCargoItemEquip( + public void RequestCargoItemEquip( EquippedCargoBay origin, Entity destination, EquippableItem item, @@ -1156,33 +1140,25 @@ public class ActionGameManager : MonoBehaviour destination == null || item == null) { - return false; + return; } - if (TryRequestDaemonCargoItemEquip(origin, destination, item, destinationPosition, true)) - { - return true; - } - return false; + TryRequestDaemonCargoItemEquip(origin, destination, item, destinationPosition, true); } - public bool RequestEquippedItemStore(Entity origin, EquippedItem equippedItem, EquippedCargoBay destination) + public void RequestEquippedItemStore(Entity origin, EquippedItem equippedItem, EquippedCargoBay destination) { if (origin == null || equippedItem?.EquippableItem == null || destination == null) { - return false; + return; } - if (TryRequestDaemonEquippedItemStore(origin, equippedItem, destination, default, false)) - { - return true; - } - return false; + TryRequestDaemonEquippedItemStore(origin, equippedItem, destination, default, false); } - public bool RequestEquippedItemStore( + public void RequestEquippedItemStore( Entity origin, EquippedItem equippedItem, EquippedCargoBay destination, @@ -1192,17 +1168,13 @@ public class ActionGameManager : MonoBehaviour equippedItem?.EquippableItem == null || destination == null) { - return false; + return; } - if (TryRequestDaemonEquippedItemStore(origin, equippedItem, destination, destinationPosition, true)) - { - return true; - } - return false; + TryRequestDaemonEquippedItemStore(origin, equippedItem, destination, destinationPosition, true); } - public bool RequestEquippedItemEquip( + public void RequestEquippedItemEquip( Entity origin, EquippedItem equippedItem, Entity destination, @@ -1212,14 +1184,10 @@ public class ActionGameManager : MonoBehaviour equippedItem?.EquippableItem == null || destination == null) { - return false; + return; } - if (TryRequestDaemonEquippedItemEquip(origin, equippedItem, destination, destinationPosition)) - { - return true; - } - return false; + TryRequestDaemonEquippedItemEquip(origin, equippedItem, destination, destinationPosition); } private bool TryRequestDaemonCargoItemEquip( @@ -1360,7 +1328,7 @@ public class ActionGameManager : MonoBehaviour } } - public bool RequestTradePurchase( + public void RequestTradePurchase( EquippedCargoBay stationInventory, EquippedCargoBay targetCargo, CraftedItemInstance item, @@ -1370,7 +1338,7 @@ public class ActionGameManager : MonoBehaviour if (item == null || price < 0) { - return false; + return; } if (createsDockedShip) @@ -1379,30 +1347,23 @@ public class ActionGameManager : MonoBehaviour Zone == null || DockedEntity == null) { - return false; + return; } - if (TryRequestDaemonTradePurchase(stationInventory, targetCargo, item, 1, price, price, true)) - { - return true; - } - return false; + TryRequestDaemonTradePurchase(stationInventory, targetCargo, item, 1, price, price, true); + return; } if (stationInventory == null || targetCargo == null) { - return false; + return; } - if (TryRequestDaemonTradePurchase(stationInventory, targetCargo, item, 1, price, price, false)) - { - return true; - } - return false; + TryRequestDaemonTradePurchase(stationInventory, targetCargo, item, 1, price, price, false); } - public bool RequestTradePurchase( + public void RequestTradePurchase( EquippedCargoBay stationInventory, EquippedCargoBay targetCargo, SimpleCommodity item, @@ -1415,18 +1376,14 @@ public class ActionGameManager : MonoBehaviour quantity <= 0 || unitPrice < 0) { - return false; + return; } var totalPrice = (long)quantity * unitPrice; if (totalPrice > int.MaxValue) - return false; + return; - if (TryRequestDaemonTradePurchase(stationInventory, targetCargo, item, quantity, unitPrice, (int)totalPrice, false)) - { - return true; - } - return false; + TryRequestDaemonTradePurchase(stationInventory, targetCargo, item, quantity, unitPrice, (int)totalPrice, false); } private bool TryRequestDaemonTradePurchase( @@ -2045,7 +2002,7 @@ public class ActionGameManager : MonoBehaviour this.DragObject = dragObject; } - public void RegisterDragTarget(Func onEndDrag) + public void RegisterDragTarget(Action onEndDrag) { _endDragCallback = onEndDrag; } @@ -2055,11 +2012,12 @@ public class ActionGameManager : MonoBehaviour _endDragCallback = null; } - public bool EndDrag() + public bool HasDragTarget => _endDragCallback != null; + + public void EndDrag() { - var success = _endDragCallback?.Invoke(DragObject); + _endDragCallback?.Invoke(DragObject); DragObject = null; - return success ?? false; } public void EnablePlayerInput() diff --git a/Assets/Scripts/UI/Menu/InventoryMenu.cs b/Assets/Scripts/UI/Menu/InventoryMenu.cs index b9f850edf..1e9ff16a6 100644 --- a/Assets/Scripts/UI/Menu/InventoryMenu.cs +++ b/Assets/Scripts/UI/Menu/InventoryMenu.cs @@ -691,15 +691,16 @@ private string BuildEquippedItemTitle(EquippedItem item, AetheriaRuntimeCatalogI item.Entity.WeaponGroups[groupIndex].items.Contains(item); } - private bool RequestCargoItemTransfer(EquippedCargoBay origin, InventoryPanel destination, ItemInstance item) + private void RequestCargoItemTransfer(EquippedCargoBay origin, InventoryPanel destination, ItemInstance item) { if (destination.DisplayedEntity != null && item is EquippableItem equippableItem) - return GameManager.RequestCargoItemEquip(origin, destination.DisplayedEntity, equippableItem); + { + GameManager.RequestCargoItemEquip(origin, destination.DisplayedEntity, equippableItem); + return; + } if (destination.DisplayedCargo != null) - return GameManager.RequestCargoItemTransfer(origin, destination.DisplayedCargo, item); - - return false; + GameManager.RequestCargoItemTransfer(origin, destination.DisplayedCargo, item); } private void ClearSelectedItemSelection() @@ -712,12 +713,10 @@ private string BuildEquippedItemTitle(EquippedItem item, AetheriaRuntimeCatalogI _selectedPosition = default; } - private bool RequestEquippedItemTransfer(Entity origin, EquippedItem item, InventoryPanel destination) + private void RequestEquippedItemTransfer(Entity origin, EquippedItem item, InventoryPanel destination) { if (destination.DisplayedCargo != null) - return GameManager.RequestEquippedItemStore(origin, item, destination.DisplayedCargo); - - return false; + GameManager.RequestEquippedItemStore(origin, item, destination.DisplayedCargo); } void Update() diff --git a/Assets/Scripts/UI/Menu/InventoryPanel.cs b/Assets/Scripts/UI/Menu/InventoryPanel.cs index 04e96027c..1f9534d4b 100644 --- a/Assets/Scripts/UI/Menu/InventoryPanel.cs +++ b/Assets/Scripts/UI/Menu/InventoryPanel.cs @@ -613,7 +613,9 @@ private void Update() { //Debug.Log("Entity Drag End"); IgnoreOccupancy = null; - if (!GameManager.EndDrag()) + var hadDragTarget = GameManager.HasDragTarget; + GameManager.EndDrag(); + if (!hadDragTarget) entity.GearOccupancy[v.x, v.y].EquippableItem.Rotation = _originalRotation; foreach(var dragObject in _dragCells) Destroy(dragObject.gameObject); @@ -636,11 +638,8 @@ private void Update() { //Debug.Log("Entity Drag Callback"); FakeOccupancy = null; - var submitted = RequestDraggedItemToEntity(drag, entity, placementPosition); - if (!submitted) - ShowUnableToSubmitItemMoveRequestDialog(); + RequestDraggedItemToEntity(drag, entity, placementPosition); // TODO: SFX: Equip - return submitted; }); }); cell.PointerExitTrigger.OnPointerExitAsObservable() @@ -831,11 +830,8 @@ private void Update() { //Debug.Log("Inventory Drag Callback"); FakeOccupancy = null; - var submitted = RequestDraggedItemToCargo(drag, cargo, placementPosition); - if (!submitted) - ShowUnableToSubmitItemMoveRequestDialog(); + RequestDraggedItemToCargo(drag, cargo, placementPosition); // TODO: SFX: Drop - return submitted; }); }); cell.PointerExitTrigger.OnPointerExitAsObservable() @@ -1094,56 +1090,48 @@ private void Update() return ActionGameManager.RuntimeCatalog?.FindItem(item?.ItemKey ?? ""); } - private bool RequestDraggedItemToEntity(DragObject drag, Entity destination, int2 destinationPosition) + private void RequestDraggedItemToEntity(DragObject drag, Entity destination, int2 destinationPosition) { switch (drag) { case EquippedItemDragObject equippedItemDragObject: - return GameManager.RequestEquippedItemEquip( + GameManager.RequestEquippedItemEquip( equippedItemDragObject.OriginEntity, equippedItemDragObject.EquippedItem, destination, destinationPosition); + return; case ItemInstanceDragObject itemInstanceDragObject when itemInstanceDragObject.Item is EquippableItem equippableItem: - return GameManager.RequestCargoItemEquip( + GameManager.RequestCargoItemEquip( itemInstanceDragObject.OriginInventory, destination, equippableItem, destinationPosition); - default: - return false; + return; } } - private bool RequestDraggedItemToCargo(DragObject drag, EquippedCargoBay destination, int2 destinationPosition) + private void RequestDraggedItemToCargo(DragObject drag, EquippedCargoBay destination, int2 destinationPosition) { switch (drag) { case EquippedItemDragObject equippedItemDragObject: - return GameManager.RequestEquippedItemStore( + GameManager.RequestEquippedItemStore( equippedItemDragObject.OriginEntity, equippedItemDragObject.EquippedItem, destination, destinationPosition); + return; case ItemInstanceDragObject itemInstanceDragObject: - return GameManager.RequestCargoItemTransfer( + GameManager.RequestCargoItemTransfer( itemInstanceDragObject.OriginInventory, destination, itemInstanceDragObject.Item, destinationPosition); - default: - return false; + return; } } - private void ShowUnableToSubmitItemMoveRequestDialog() - { - Dialog.Clear(); - Dialog.Title.text = "Unable to submit item move request!"; - Dialog.Show(); - Dialog.MoveToCursor(); - } - private void OnDestroy() { if (_dropdownSurfaceDocument != null)