Merge pull request #3 from SpeedrunTooling/develop

v1.1.4.0: Proposed changes to fix HP values.
SpeedrunTooling · Apr 15, 2024 · 950d3d6 · 950d3d6
2 parents 77ddd10 + f82271c
commit 950d3d6
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 23 deletions.
diff --git a/SRTPluginProviderRE1/GameMemoryRE1Scanner.cs b/SRTPluginProviderRE1/GameMemoryRE1Scanner.cs
@@ -8,7 +8,7 @@ namespace SRTPluginProviderRE1
     internal class GameMemoryRE1Scanner : IDisposable
     {
         private readonly int MAX_ITEMS = 10;
-        private readonly int MAX_ENTITIES = 32;
+        private readonly int MAX_ENTITIES = 48 - 1;
 
         // Variables
         private ProcessMemoryHandler memoryAccess;
@@ -25,7 +25,7 @@ internal class GameMemoryRE1Scanner : IDisposable
         private IntPtr BaseAddress { get; set; }
         private MultilevelPointer PointerGameState { get; set; }
         private MultilevelPointer PointerPlayerHP { get; set; }
-        private MultilevelPointer[] PointerEnemyHP { get; set; }
+        private MultilevelPointer[] PointerEntities { get; set; }
 
         private GameInventoryEntry EmptySlot = new GameInventoryEntry();
 
@@ -61,24 +61,19 @@ internal void Initialize(Process process)
                 PointerPlayerHP = new MultilevelPointer(
                     memoryAccess,
                     IntPtr.Add(BaseAddress, pointerAddressHP),
-                    0x1C8,
-                    0x30
+                    0x14C
                 );
 
                 // GET ENEMIES
-                PointerEnemyHP = new MultilevelPointer[MAX_ENTITIES];
+                PointerEntities = new MultilevelPointer[MAX_ENTITIES];
                 gameMemoryValues._enemyHealth = new GameEnemyHP[MAX_ENTITIES];
-                var position = 0;
-                for (var i = 0; i < PointerEnemyHP.Length; i++)
+                for (int i = 0; i < PointerEntities.Length; ++i)
                 {
-                    position = (i * 0x8) + 0x18;
                     gameMemoryValues._enemyHealth[i] = new GameEnemyHP();
-                    PointerEnemyHP[i] = new MultilevelPointer(
+                    PointerEntities[i] = new MultilevelPointer(
                         memoryAccess,
                         IntPtr.Add(BaseAddress, pointerAddressHP),
-                        0x6CC,
-                        position,
-                        0xFDC
+                        ((i + 1) * 0x8) + 0x14C
                     );
                 }
 
@@ -113,10 +108,8 @@ internal void UpdatePointers()
         {
             PointerGameState.UpdatePointers();
             PointerPlayerHP.UpdatePointers();
-            for (var i = 0; i < PointerEnemyHP.Length; i++)
-            {
-                PointerEnemyHP[i].UpdatePointers();
-            }
+            for (int i = 0; i < PointerEntities.Length; ++i)
+                PointerEntities[i].UpdatePointers();
         }
 
         internal IGameMemoryRE1 Refresh()
@@ -146,8 +139,8 @@ internal IGameMemoryRE1 Refresh()
                 gameMemoryValues._inventory[i] = PointerGameState.Deref<GameInventoryEntry>(0x38 + (i * 0x8));
             }
 
-            for (var i = 0; i < PointerEnemyHP.Length; i++)
-                gameMemoryValues._enemyHealth[i] = PointerEnemyHP[i].Deref<GameEnemyHP>(0x13BC);
+            for (int i = 0; i < PointerEntities.Length; ++i)
+                gameMemoryValues._enemyHealth[i] = PointerEntities[i].Deref<GameEnemyHP>(0x13BC);
 
             HasScanned = true;
             return gameMemoryValues;

diff --git a/SRTPluginProviderRE1/SRTPluginProviderRE1.csproj b/SRTPluginProviderRE1/SRTPluginProviderRE1.csproj
@@ -5,13 +5,13 @@
     <TargetFramework>net5.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <Platforms>x86</Platforms>
-    <Authors>Travis J. Gutjahr</Authors>
-    <Company>Travis J. Gutjahr</Company>
-    <Copyright>Copyright © 2023 Travis J. Gutjahr</Copyright>
+    <Authors>SpeedRunTooling</Authors>
+    <Company>$(Authors)</Company>
+    <Copyright>Copyright © 2024 $(Authors)</Copyright>
     <Product>Resident Evil 1 Memory Provider Plugin</Product>
     <Description>A provider plugin for the SRT Host to provide memory values to other plugins.</Description>
-    <Version>1.1.3.0</Version>
-    <FileVersion>1.1.3.0</FileVersion>
+    <Version>1.1.4.0</Version>
+    <FileVersion>1.1.4.0</FileVersion>
     <AssemblyVersion>3.0.0.0</AssemblyVersion>
     <!-- netcoreapp3.1 had to be hardcoded here because this project reports $(TargetFramework) as netstandard2.0 (rightfully so) and I am not sure how this project's csproj can auto-detect another project's framework version to copy it to the appropriate folder so we're just... hardcoding this. -->
     <CopyDestionationPath>$(SolutionDir)..\..\SpeedRunTool\SRTHost\SRTHost\bin\$(Configuration)\net5.0-windows\plugins</CopyDestionationPath>