dave/Tarkov-UIFixes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prioritize smaller slots

Browse Source
This commit is contained in:
Tyfon
2024-08-31 10:54:34 -07:00
parent a61f0f8156
commit a81204b6ea
2 changed files with 47 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
Patches/ReorderGridsPatch.cs
View File

@@ -64,6 +64,8 @@ public static class ReorderGridsPatches
____presetGridViews = orderedGridView;
__instance.SetReordered(false);
}
GridMaps.Remove(compoundItem.TemplateId);
}
return;
@@ -99,26 +101,9 @@ public static class ReorderGridsPatches
}
var pairs = compoundItem.Grids.Zip(____presetGridViews, (g, gv) => new KeyValuePair<StashGridClass, GridView>(g, gv));
var sortedPairs = SortGrids(__instance, pairs);
RectTransform parentView = __instance.RectTransform();
Vector2 parentPosition = parentView.pivot.y == 1 ? parentView.position : new Vector2(parentView.position.x, parentView.position.y + parentView.sizeDelta.y);
Vector2 gridSize = new(64f * parentView.lossyScale.x, 64f * parentView.lossyScale.y);
var sorted = pairs.OrderBy(pair =>
{
var grid = pair.Key;
var gridView = pair.Value;
float xOffset = gridView.transform.position.x - parentPosition.x;
float yOffset = -(gridView.transform.position.y - parentPosition.y); // invert y since grid coords are upper-left origin
int x = (int)Math.Round(xOffset / gridSize.x, MidpointRounding.AwayFromZero);
int y = (int)Math.Round(yOffset / gridSize.y, MidpointRounding.AwayFromZero);
return y * 100 + x;
});
GridView[] orderedGridViews = sorted.Select(pair => pair.Value).ToArray();
GridView[] orderedGridViews = sortedPairs.Select(pair => pair.Value).ToArray();
// Populate the gridmap
if (!GridMaps.ContainsKey(compoundItem.TemplateId))
@@ -132,11 +117,41 @@ public static class ReorderGridsPatches
GridMaps.Add(compoundItem.TemplateId, map);
}
compoundItem.Grids = sorted.Select(pair => pair.Key).ToArray();
compoundItem.Grids = sortedPairs.Select(pair => pair.Key).ToArray();
____presetGridViews = orderedGridViews;
compoundItem.SetReordered(true);
__instance.SetReordered(true);
}
private static IOrderedEnumerable<KeyValuePair<StashGridClass, GridView>> SortGrids(
TemplatedGridsView __instance,
IEnumerable<KeyValuePair<StashGridClass, GridView>> pairs)
{
RectTransform parentView = __instance.RectTransform();
Vector2 parentPosition = parentView.pivot.y == 1 ? parentView.position : new Vector2(parentView.position.x, parentView.position.y + parentView.sizeDelta.y);
Vector2 gridSize = new(64f * parentView.lossyScale.x, 64f * parentView.lossyScale.y);
int calculateCoords(KeyValuePair<StashGridClass, GridView> pair)
{
var grid = pair.Key;
var gridView = pair.Value;
float xOffset = gridView.transform.position.x - parentPosition.x;
float yOffset = -(gridView.transform.position.y - parentPosition.y); // invert y since grid coords are upper-left origin
int x = (int)Math.Round(xOffset / gridSize.x, MidpointRounding.AwayFromZero);
int y = (int)Math.Round(yOffset / gridSize.y, MidpointRounding.AwayFromZero);
return y * 100 + x;
}
if (Settings.PrioritizeSmallerGrids.Value)
{
return pairs.OrderBy(pair => pair.Key.GridWidth.Value).ThenBy(pair => pair.Key.GridHeight.Value).ThenBy(calculateCoords);
}
return pairs.OrderBy(calculateCoords);
}
}
}

12
Settings.cs
View File

@@ -124,6 +124,7 @@ internal class Settings
public static ConfigEntry<bool> ModifyEquippedWeapons { get; set; } // Advanced
public static ConfigEntry<ModRaidWeapon> ModifyRaidWeapons { get; set; }
public static ConfigEntry<bool> ReorderGrids { get; set; }
public static ConfigEntry<bool> PrioritizeSmallerGrids { get; set; }
public static ConfigEntry<bool> SynchronizeStashScrolling { get; set; }
public static ConfigEntry<bool> GreedyStackMove { get; set; }
public static ConfigEntry<bool> StackBeforeSort { get; set; }
@@ -608,6 +609,15 @@ internal class Settings
null,
new ConfigurationManagerAttributes { })));
configEntries.Add(PrioritizeSmallerGrids = config.Bind(
InventorySection,
"Prioritize Smaller Slots (requires restart)",
false,
new ConfigDescription(
"When adding items to containers with multiple slots, place the item in the smallest slot that can hold it, rather than just the first empty space. Requires Standardize Grid Order.",
null,
new ConfigurationManagerAttributes { })));
configEntries.Add(SynchronizeStashScrolling = config.Bind(
InventorySection,
"Synchronize Stash Scroll Position",
@@ -960,6 +970,8 @@ internal class Settings
MakeDependent(EnableMultiSelect, EnableMultiClick);
MakeExclusive(EnableMultiClick, AutoOpenSortingTable, false);
MakeDependent(ReorderGrids, PrioritizeSmallerGrids, false);
}
private static void RecalcOrder(List<ConfigEntryBase> configEntries)