enable ammo merging on direct drop

This commit is contained in:
Tyfon
2024-06-18 15:17:11 -07:00
parent 62bfdd6042
commit 3faaf65b08
2 changed files with 1 additions and 2 deletions

View File

@@ -196,7 +196,6 @@ namespace UIFixes
public class MultiSelectItemContext(ItemContextAbstractClass itemContext, ItemRotation rotation) : ItemContextClass(itemContext, rotation)
{
public override bool MergeAvailable => false;
public override bool SplitAvailable => false;
}

View File

@@ -570,7 +570,7 @@ namespace UIFixes
.Where(ic => ic.Item != itemContext.Item)
.OrderByDescending(ic => ic.ItemAddress is GClass2769)
.ThenByDescending(ic => itemContext.ItemAddress is GClass2769 originalDraggedAddress && ic.ItemAddress is GClass2769 selectedGridAddress && selectedGridAddress.Grid == originalDraggedAddress.Grid)
.ThenByDescending(ic => ic.ItemAddress is GClass2769 selectedGridAddress ? selectedGridAddress.Grid : null)
.ThenByDescending(ic => ic.ItemAddress is GClass2769 selectedGridAddress ? selectedGridAddress.Grid.Id : null)
.ThenBy(ic => ic.ItemAddress is GClass2769 selectedGridAddress ? gridOrder(selectedGridAddress.LocationInGrid, selectedGridAddress.Grid) : 0);
return prepend ? result.Prepend(itemContext) : result;