Version 2.4

Fixed Corruption tracker not showing Energy Cells
UltiNaruto · Aug 14, 2021 · a33a97c · a33a97c
1 parent 3eed38b
commit a33a97c
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/MPItemTracker2/Forms/MainForm.Designer.cs b/MPItemTracker2/Forms/MainForm.Designer.cs
diff --git a/MPItemTracker2/MPItemTracker2.csproj b/MPItemTracker2/MPItemTracker2.csproj
@@ -4,7 +4,7 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>net4.8</TargetFramework>
     <Configurations>Debug_Windows;Release_Windows;Debug_Linux;Release_Linux</Configurations>
-    <Version>2.3</Version>
+    <Version>2.4</Version>
     <PackageId>MPItemTracker</PackageId>
     <Authors>MPItemTracker</Authors>
     <Company>MPItemTracker</Company>

diff --git a/MPItemTracker2/Wrapper/Corruption/Corruption.cs b/MPItemTracker2/Wrapper/Corruption/Corruption.cs
@@ -194,6 +194,7 @@ public override bool IsSwitchingState()
 
         public override bool HasPickup(string pickup)
         {
+            int i;
             switch (pickup)
             {
                 case "Energy Tanks":
@@ -250,9 +251,12 @@ public override bool HasPickup(string pickup)
                     return HaveCommandVisor;
                 case "XRay Visor":
                     return HaveXRayVisor;
+                case "Energy Cells":
+                    for (i = 1; i <= 9; i++)
+                        if (EnergyCells(i - 1))
+                            return true;
+                    return false;
                 default:
-                    if (pickup.StartsWith("Energy Cell ", StringComparison.InvariantCulture))
-                        return EnergyCells(Convert.ToInt32(pickup.Substring(12)) - 1);
                     return false;
             }
         }

diff --git a/MPItemTracker2/Wrapper/Prime/MPT_MP1_NTSC_J.cs b/MPItemTracker2/Wrapper/Prime/MPT_MP1_NTSC_J.cs
@@ -7,7 +7,7 @@ internal class MPT_MP1_NTSC_J : Prime
         protected const long OFF_CGAMEGLOBALOBJECTS = 0x804DEF10;
         protected const long OFF_CGAMESTATE = OFF_CGAMEGLOBALOBJECTS + 0x134;
         protected const long OFF_CSTATEMANAGER = 0x804BF69C;
-        protected const long OFF_MORPHBALLBOMBS_COUNT = 0x804C0F20;
+        protected const long OFF_MORPHBALLBOMBS_COUNT = 0x804C11A0;
 
         protected override long CPlayer
         {

diff --git a/MPItemTracker2/Wrapper/Prime/MPT_MP1_NTSC_U.cs b/MPItemTracker2/Wrapper/Prime/MPT_MP1_NTSC_U.cs
@@ -7,7 +7,7 @@ internal class MPT_MP1_NTSC_U : Prime
         protected const long OFF_CGAMEGLOBALOBJECTS = 0x804DEC90;
         protected const long OFF_CGAMESTATE = OFF_CGAMEGLOBALOBJECTS + 0x134;
         protected const long OFF_CSTATEMANAGER = 0x804BF41C;
-        protected const long OFF_MORPHBALLBOMBS_COUNT = 0x804C11A0;
+        protected const long OFF_MORPHBALLBOMBS_COUNT = 0x804C0F20;
 
         protected override long CPlayer
         {