Fix offset for 1.05 reg 1.08

FrankvdStam · Sep 10, 2023 · 9c091a1 · 9c091a1
1 parent 7c7b00b
commit 9c091a1
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 14 deletions.
diff --git a/Components/SoulMemory.dll b/Components/SoulMemory.dll
diff --git a/Components/SoulSplitter.dll b/Components/SoulSplitter.dll
diff --git a/Components/Updates.xml b/Components/Updates.xml
@@ -1,5 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <updates>
+    <update version="1.5.1">
+        <files>
+            <file path="Components/SoulMemory.dll"                  status="changed"/>
+            <file path="Components/SoulSplitter.dll"                status="changed"/>
+            <file path="Components/MaterialDesignThemes.Wpf.dll"    status="changed"/>
+            <file path="Components/MaterialDesignThemes.Wpf.xml"    status="changed"/>
+        </files>
+        <changelog>
+            <change>DS3 igt fix for 1.05 reg 1.08</change>
+        </changelog>
+    </update>
     <update version="1.5.0">
         <files>
             <file path="Components/SoulMemory.dll"                  status="changed"/>

diff --git a/src/SoulMemory/DarkSouls3/DarkSouls3.cs b/src/SoulMemory/DarkSouls3/DarkSouls3.cs
@@ -93,7 +93,9 @@ private ResultErr<RefreshError> InitPointers()
                         _igtOffset = 0xa4;
                         break;
 
+                    case DarkSouls3Version.Earlier:
                     case DarkSouls3Version.V104:
+                    case DarkSouls3Version.V105:
                         _igtOffset = 0x9c;
                         break;
 
@@ -105,12 +107,12 @@ private ResultErr<RefreshError> InitPointers()
                 var treeBuilder = GetTreeBuilder();
                 return MemoryScanner.TryResolvePointers(treeBuilder, _process);
             }
-            catch(Exception e)
+            catch (Exception e)
             {
                 return RefreshError.FromException(e);
             }
         }
-        
+
         private void ResetPointers()
         {
             _gameDataMan.Clear();
@@ -127,20 +129,33 @@ private void ResetPointers()
 
         public enum DarkSouls3Version
         {
+            Earlier,
             V104,
+            V105,
             Later,
         };
 
         public static DarkSouls3Version GetVersion(Version v)
         {
-            if (v.Minor <= 4)
+            switch (v.Minor)
             {
-                return DarkSouls3Version.V104;
-            }
+                case 0:
+                case 1:
+                case 2:
+                case 3:
+                    return DarkSouls3Version.Earlier;
+
+                case 4:
+                    return DarkSouls3Version.V104;
 
-            return DarkSouls3Version.Later;
+                case 5:
+                    return DarkSouls3Version.V105;
+
+                default:
+                    return DarkSouls3Version.Later;
+            }
         }
-        
+
         public bool IsLoading()
         {
             if (_loading == null)
@@ -178,7 +193,7 @@ public int GetInGameTimeMilliseconds()
 
         public Vector3f GetPosition()
         {
-            if(_sprjChrPhysicsModule == null)
+            if (_sprjChrPhysicsModule == null)
             {
                 return new Vector3f();
             }
@@ -209,9 +224,9 @@ public int ReadAttribute(Attribute attribute)
         public bool ReadEventFlag(uint eventFlagId)
         {
             var eventFlagIdDiv10000000 = (int)(eventFlagId / 10000000) % 10;
-            var eventFlagArea          = (int)(eventFlagId / 100000  ) % 100;
-            var eventFlagIdDiv10000    = (int)(eventFlagId / 10000   ) % 10;
-            var eventFlagIdDiv1000     = (int)(eventFlagId / 1000    ) % 10;
+            var eventFlagArea = (int)(eventFlagId / 100000) % 100;
+            var eventFlagIdDiv10000 = (int)(eventFlagId / 10000) % 10;
+            var eventFlagIdDiv1000 = (int)(eventFlagId / 1000) % 10;
 
             //14000002
 

diff --git a/src/SoulMemory/SoulMemory.csproj b/src/SoulMemory/SoulMemory.csproj
@@ -6,7 +6,7 @@
     <Platforms>x64</Platforms>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <Title>SoulMemory</Title>
-    <Version>1.5.0</Version>
+    <Version>1.5.1</Version>
     <Authors>Frank v.d. Stam</Authors>
     <PackageProjectUrl>https://github.com/FrankvdStam/SoulSplitter</PackageProjectUrl>
     <RepositoryUrl>https://github.com/FrankvdStam/SoulSplitter</RepositoryUrl>

diff --git a/src/SoulSplitter/SoulSplitter.csproj b/src/SoulSplitter/SoulSplitter.csproj
@@ -5,7 +5,7 @@
         <UseWPF>true</UseWPF>
         <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
         <Title>SoulSplitter</Title>
-        <Version>1.5.0</Version>
+        <Version>1.5.1</Version>
         <Authors>Frank v.d. Stam</Authors>
         <PackageProjectUrl>https://github.com/FrankvdStam/SoulSplitter</PackageProjectUrl>
         <RepositoryUrl>https://github.com/FrankvdStam/SoulSplitter</RepositoryUrl>

diff --git a/src/cli/Program.cs b/src/cli/Program.cs
@@ -29,6 +29,7 @@
 using SoulMemory;
 using SoulSplitter.UI.Generic;
 using SoulMemory.ArmoredCore6;
+using SoulMemory.DarkSouls3;
 using SoulMemory.MemoryV2.Process;
 using SoulMemory.Parameters;
 
@@ -43,7 +44,7 @@ internal class Program
         static void Main(string[] args)
         {
 
-            GameLoop<ArmoredCore6>((e) =>
+            GameLoop<DarkSouls3>((e) =>
             {
                 Console.WriteLine(e.GetInGameTimeMilliseconds());