Treat inventory transfer as submitted intent

This commit is contained in:
Meta Vens 2026-06-21 13:27:07 +01:00
commit 1e79431a9e
3 changed files with 37 additions and 26 deletions

View file

@ -99,12 +99,8 @@ public class InventoryMenu : MonoBehaviour
HideEquippedItemDetailsSurface();
ClearSelectedItemSelection();
var otherPanel = panel == InventoryPanels[0] ? InventoryPanels[1] : InventoryPanels[0];
if (RequestCargoItemTransfer(cargoEvent.CargoBay, otherPanel, item))
{
// TODO: SFX: Equip
panel.RefreshCells();
otherPanel.RefreshCells();
}
RequestCargoItemTransfer(cargoEvent.CargoBay, otherPanel, item);
// TODO: SFX: Equip
// else
// TODO: SFX: Fail
}
@ -135,14 +131,10 @@ public class InventoryMenu : MonoBehaviour
HideEquippedItemDetailsSurface();
ClearSelectedItemSelection();
var otherPanel = panel == InventoryPanels[0] ? InventoryPanels[1] : InventoryPanels[0];
if (RequestEquippedItemTransfer(entityEvent.Entity, item, otherPanel))
{
// TODO: SFX: Unequip
panel.RefreshCells();
otherPanel.RefreshCells();
// else
// TODO: SFX: Fail
}
RequestEquippedItemTransfer(entityEvent.Entity, item, otherPanel);
// TODO: SFX: Unequip
// else
// TODO: SFX: Fail
}
else
{

View file

@ -637,12 +637,11 @@ private void Update()
{
//Debug.Log("Entity Drag Callback");
FakeOccupancy = null;
var success = RequestDraggedItemToEntity(drag, entity, placementPosition);
if (!success)
ShowUnableToMoveItemDialog();
RefreshCells();
var submitted = RequestDraggedItemToEntity(drag, entity, placementPosition);
if (!submitted)
ShowUnableToSubmitItemMoveRequestDialog();
// TODO: SFX: Equip
return success;
return submitted;
});
});
cell.PointerExitTrigger.OnPointerExitAsObservable()
@ -837,11 +836,11 @@ private void Update()
{
//Debug.Log("Inventory Drag Callback");
FakeOccupancy = null;
var success = RequestDraggedItemToCargo(drag, cargo, placementPosition);
if (!success)
ShowUnableToMoveItemDialog();
var submitted = RequestDraggedItemToCargo(drag, cargo, placementPosition);
if (!submitted)
ShowUnableToSubmitItemMoveRequestDialog();
// TODO: SFX: Drop
return success;
return submitted;
});
});
cell.PointerExitTrigger.OnPointerExitAsObservable()
@ -1142,11 +1141,10 @@ private void Update()
}
}
private void ShowUnableToMoveItemDialog()
private void ShowUnableToSubmitItemMoveRequestDialog()
{
Dialog.Clear();
Dialog.Title.text = "Unable to move item!";
Dialog.AddProperty("Verify that cargo bays are empty before un-equipping them.");
Dialog.Title.text = "Unable to submit item move request!";
Dialog.Show();
Dialog.MoveToCursor();
}