Support showing all slots for CLES view

zcanann · Jan 13, 2023 · c0cf82e · c0cf82e
1 parent 2c29d3a
commit c0cf82e
Show file tree

Hide file tree

Showing 11 changed files with 541 additions and 56 deletions.
diff --git a/GES.Engine.Memory/GES.Engine.Memory.csproj b/GES.Engine.Memory/GES.Engine.Memory.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
     <LangVersion>latest</LangVersion>
-    <Version>2.0.0</Version>
+    <Version>2.1.1</Version>
     <Description>FFCC GES Tool</Description>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
@@ -21,8 +21,8 @@
   <PropertyGroup>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
-    <AssemblyVersion>2.0.0</AssemblyVersion>
-    <FileVersion>2.0.0</FileVersion>
+    <AssemblyVersion>2.1.1</AssemblyVersion>
+    <FileVersion>2.1.1</FileVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

diff --git a/GES.Engine.Processes/GES.Engine.Processes.csproj b/GES.Engine.Processes/GES.Engine.Processes.csproj
@@ -3,9 +3,9 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
     <LangVersion>latest</LangVersion>
-    <Version>2.0.0</Version>
-    <AssemblyVersion>2.0.0</AssemblyVersion>
-    <FileVersion>2.0.0</FileVersion>
+    <Version>2.1.1</Version>
+    <AssemblyVersion>2.1.1</AssemblyVersion>
+    <FileVersion>2.1.1</FileVersion>
     <UserSecretsId>ff02c859-7e0c-466a-8d97-eac2f037b653</UserSecretsId>
   </PropertyGroup>
 

diff --git a/GES.Engine.Scanning/GES.Engine.Scanning.csproj b/GES.Engine.Scanning/GES.Engine.Scanning.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
     <LangVersion>latest</LangVersion>
-    <Version>2.0.0</Version>
+    <Version>2.1.1</Version>
     <Description>GES engine component for performant memory scanning. GES achieves fast memory scanning (often faster than Cheat Engine) by leveraging multi-threaded parallelism along with single core parallelism via SIMD instructions.
 
 Scanners are JIT compiled into SSE, AVX, or AVX-512 instructions via RyuJIT through the System.Numerics.Vectors library.</Description>
@@ -21,8 +21,8 @@ Scanners are JIT compiled into SSE, AVX, or AVX-512 instructions via RyuJIT thro
   <PropertyGroup>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
-    <AssemblyVersion>2.0.0</AssemblyVersion>
-    <FileVersion>2.0.0</FileVersion>
+    <AssemblyVersion>2.1.1</AssemblyVersion>
+    <FileVersion>2.1.1</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/GES.Engine.Utils/GES.Engine.Common.csproj b/GES.Engine.Utils/GES.Engine.Common.csproj
@@ -3,9 +3,9 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
     <LangVersion>latest</LangVersion>
-    <Version>2.0.0</Version>
-    <AssemblyVersion>2.0.0</AssemblyVersion>
-    <FileVersion>2.0.0</FileVersion>
+    <Version>2.1.1</Version>
+    <AssemblyVersion>2.1.1</AssemblyVersion>
+    <FileVersion>2.1.1</FileVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

diff --git a/GES.Engine/GES.Engine.csproj b/GES.Engine/GES.Engine.csproj
@@ -15,7 +15,7 @@
     <Copyright></Copyright>
     <PackageTags></PackageTags>
     <NeutralLanguage />
-    <Version>2.0.0</Version>
+    <Version>2.1.1</Version>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
   </PropertyGroup>
 
@@ -30,8 +30,8 @@
   <PropertyGroup>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
-    <AssemblyVersion>2.0.0</AssemblyVersion>
-    <FileVersion>2.0.0</FileVersion>
+    <AssemblyVersion>2.1.1</AssemblyVersion>
+    <FileVersion>2.1.1</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/GES/GES.csproj b/GES/GES.csproj
@@ -12,8 +12,8 @@
     <NoWarn>$(NoWarn);NU1605</NoWarn>
     <SignAssembly>false</SignAssembly>
     <ApplicationManifest>Application.manifest</ApplicationManifest>
-    <AssemblyVersion>2.0.0</AssemblyVersion>
-    <FileVersion>2.0.0</FileVersion>
+    <AssemblyVersion>2.1.1</AssemblyVersion>
+    <FileVersion>2.1.1</FileVersion>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
   </PropertyGroup>
 

diff --git a/GES/Source/Mvvm/Converters/FFCC/ItemRefToIconConverter.cs b/GES/Source/Mvvm/Converters/FFCC/ItemRefToIconConverter.cs
@@ -82,7 +82,16 @@ public Object Convert(Object value, Type targetType, Object parameter, CultureIn
             if (rawCommandListEntry != null)
             {
                 inventorySlot = rawCommandListEntry.InventorySlotId;
-                playerSlotId = rawCommandListEntry.Parent.PlayerIndex;
+
+                // parameter for this case will be slot id, and if set, don't pull from the associated slot (used for CLES view)
+                if (playerId == -1)
+                {
+                    playerSlotId = rawCommandListEntry.Parent.PlayerIndex;
+                }
+                else
+                {
+                    playerSlotId = playerId;
+                }
             }
 
             PlayerSlotDataView slotDataView = InventoryViewerViewModel.GetInstance().PlayerSlots.ElementAtOrDefault(playerSlotId);

diff --git a/GES/Source/Mvvm/Converters/FFCC/ItemRefToIdConverter.cs b/GES/Source/Mvvm/Converters/FFCC/ItemRefToIdConverter.cs
@@ -63,7 +63,16 @@ public Object Convert(Object value, Type targetType, Object parameter, CultureIn
             if (rawCommandListEntry != null)
             {
                 inventorySlot = rawCommandListEntry.InventorySlotId;
-                playerSlotId = rawCommandListEntry.Parent.PlayerIndex;
+
+                // parameter for this case will be slot id, and if set, don't pull from the associated slot (used for CLES view)
+                if (playerId == -1)
+                {
+                    playerSlotId = rawCommandListEntry.Parent.PlayerIndex;
+                }
+                else
+                {
+                    playerSlotId = playerId;
+                }
             }
 
             PlayerSlotDataView slotDataView = InventoryViewerViewModel.GetInstance().PlayerSlots.ElementAtOrDefault(playerSlotId);

diff --git a/GES/Source/Mvvm/Converters/FFCC/ItemRefToNameConverter.cs b/GES/Source/Mvvm/Converters/FFCC/ItemRefToNameConverter.cs
@@ -93,7 +93,16 @@ public Object Convert(Object value, Type targetType, Object parameter, CultureIn
             if (rawCommandListEntry != null)
             {
                 inventorySlot = rawCommandListEntry.InventorySlotId;
-                playerSlotId = rawCommandListEntry.Parent.PlayerIndex;
+
+                // parameter for this case will be slot id, and if set, don't pull from the associated slot (used for CLES view)
+                if (playerId == -1)
+                {
+                    playerSlotId = rawCommandListEntry.Parent.PlayerIndex;
+                }
+                else
+                {
+                    playerSlotId = playerId;
+                }
             }
 
             PlayerSlotDataView slotDataView = InventoryViewerViewModel.GetInstance().PlayerSlots.ElementAtOrDefault(playerSlotId);