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

Fix multiselect refreshing to parent context

Browse Source
This commit is contained in:
Tyfon
2024-07-16 00:59:35 -07:00
parent e731a4fec4
commit a35c0f1084
4 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Multiselect/MultiSelect.cs
View File

@@ -162,7 +162,10 @@ public class MultiSelect
if (oldItemContext != null) if (oldItemContext != null)
{ {
MultiSelectItemContext newContext = oldItemContext.Refresh(); MultiSelectItemContext newContext = oldItemContext.Refresh();
SelectedItems.Add(newContext, SelectedItems[oldItemContext]); if (newContext != null)
{
SelectedItems.Add(newContext, SelectedItems[oldItemContext]);
}
SelectedItems.Remove(oldItemContext); SelectedItems.Remove(oldItemContext);
oldItemContext.Dispose(); oldItemContext.Dispose();
@@ -463,7 +466,12 @@ public class MultiSelectItemContext : DragItemContext
public MultiSelectItemContext Refresh() public MultiSelectItemContext Refresh()
{ {
return new MultiSelectItemContext(ItemContextAbstractClass, ItemRotation); if (Item == ItemContextAbstractClass.Item)
{
return new MultiSelectItemContext(ItemContextAbstractClass, ItemRotation);
}
return null;
} }
public void UpdateDragContext(DragItemContext itemContext) public void UpdateDragContext(DragItemContext itemContext)

4
Multiselect/MultiSelectDebug.cs
View File

@@ -66,9 +66,7 @@ public class MultiSelectDebug : MonoBehaviour
} }
ItemAddress address = itemContext is DragItemContext dragItemContext ? dragItemContext.ItemAddress : itemContext.Item.CurrentAddress; ItemAddress address = itemContext is DragItemContext dragItemContext ? dragItemContext.ItemAddress : itemContext.Item.CurrentAddress;
LocationInGrid location = address is GridItemAddress gridAddress ? LocationInGrid location = address is GridItemAddress gridAddress ? gridAddress.LocationInGrid : null;
itemContext is MultiSelectItemContext ? MultiGrid.GetGridLocation(gridAddress) : gridAddress.LocationInGrid :
null;
string locationString = location != null ? $"({location.x}, {location.y})" : "(slot)"; string locationString = location != null ? $"({location.x}, {location.y})" : "(slot)";
return $"x{itemContext.Item.StackObjectsCount} {address.Container.ID} {locationString} {itemContext.Item.Name.Localized()}"; return $"x{itemContext.Item.StackObjectsCount} {address.Container.ID} {locationString} {itemContext.Item.Name.Localized()}";

2
UIFixes.csproj
View File

@@ -4,7 +4,7 @@
<TargetFramework>net471</TargetFramework> <TargetFramework>net471</TargetFramework>
<AssemblyName>Tyfon.UIFixes</AssemblyName> <AssemblyName>Tyfon.UIFixes</AssemblyName>
<Description>SPT UI Fixes</Description> <Description>SPT UI Fixes</Description>
<Version>2.2.0</Version> <Version>2.2.1</Version>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<LangVersion>latest</LangVersion> <LangVersion>latest</LangVersion>
<Configurations>Debug;Release</Configurations> <Configurations>Debug;Release</Configurations>

2
server/package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "uifixes", "name": "uifixes",
"version": "2.2.0", "version": "2.2.1",
"main": "src/mod.js", "main": "src/mod.js",
"license": "MIT", "license": "MIT",
"author": "Tyfon", "author": "Tyfon",