Make inventory requests submit-only

This commit is contained in:
Meta Vens 2026-06-21 14:12:06 +01:00
commit 98f714573b
4 changed files with 118 additions and 128 deletions

View file

@ -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()

View file

@ -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)