Version fix and add another function relating to spaceship heat factor

Author: monkeyman192

nmspy/data/enums/internal_enums.py

@@ -79,7 +79,7 @@ class eLanguageRegion(IntEnum):
     Korean = 0x10
 
 
-class EnvironmentLocation():
+class EnvironmentLocation:
     class Enum(IntEnum):
         None_ = 0x0
         Default = 0x1

nmspy/data/types.py

@@ -278,7 +278,6 @@ def StoreCurrentSystemSpaceStationEndpoint(
 
 @partial_struct
 class cGcPlayerShipOwnership(Structure):
-
     @partial_struct
     class sGcShipData(Structure):
         _total_size_ = 0x48
@@ -307,16 +306,16 @@ def SpawnNewShip(
         leLandingGearState: c_uint32,  # cGcPlayerShipOwnership::ShipSpawnLandingGearState
         liShipIndex: c_int32,
         lbSpawnShipOverride: c_bool,
-    ) -> c_bool:
-        ...
-    
-    @function_hook("48 89 5C 24 ? 48 89 6C 24 ? 48 89 74 24 ? 48 89 7C 24 ? 41 56 48 83 EC ? 48 8B 35 ? ? ? ? 8B DA")
+    ) -> c_bool: ...
+
+    @function_hook(
+        "48 89 5C 24 ? 48 89 6C 24 ? 48 89 74 24 ? 48 89 7C 24 ? 41 56 48 83 EC ? 48 8B 35 ? ? ? ? 8B DA"
+    )
     def DestroyShip(
         self,
         this: "_Pointer[cGcPlayerShipOwnership]",
         liShipIndex: c_int32,
-    ) -> c_bool:
-        ...
+    ) -> c_bool: ...
 
     # Not sure about this...
     mShips: Annotated[list[sGcShipData], Field(sGcShipData * 12, 0x58)]
@@ -328,7 +327,7 @@ def DestroyShip(
 @partial_struct
 class cGcGameState(Structure):
     mPlayerState: Annotated[cGcPlayerState, 0xA950]
-    # Found in cGcGameState:: Update
+    # Found in cGcGameState::Update
     mPlayerShipOwnership: Annotated[cGcPlayerShipOwnership, 0xA2BD0]
 
     @function_hook("48 89 5C 24 ? 48 89 74 24 ? 48 89 7C 24 ? 88 54 24")
@@ -626,11 +625,11 @@ class cGcPlayerEnvironment(Structure):
     mbInsidePlanetAtmosphere: Annotated[bool, Field(c_bool, 0x2EC)]
     meLocation: Annotated[
         enums.EnvironmentLocation.Enum,
-        Field(c_enum32[enums.EnvironmentLocation.Enum], 0x458)
+        Field(c_enum32[enums.EnvironmentLocation.Enum], 0x458),
     ]
     meLocationStable: Annotated[
         enums.EnvironmentLocation.Enum,
-        Field(c_enum32[enums.EnvironmentLocation.Enum], 0x464)
+        Field(c_enum32[enums.EnvironmentLocation.Enum], 0x464),
     ]
 
     @function_hook("48 83 EC ? 80 B9 ? ? ? ? ? C6 04 24")
@@ -1310,7 +1309,15 @@ def GetPulseDriveFuelFactor(
     ) -> c_float: ...
 
 
+@partial_struct
 class cGcSpaceshipWeapons(Structure):
+    # These can be found in cGcSpaceshipWeapons::GetHeatFactor and cGcSpaceshipWeapons::GetOverheatProgress
+    # This enum corresponds to the element in the following 3 arrays by index.
+    meWeaponMode: Annotated[c_enum32[enums.cGcShipWeapons], 0xA4]
+    mafWeaponHeat: Annotated[list[float], Field(c_float * 7, 0x5FA4)]
+    mafWeaponOverheatTimer: Annotated[list[float], Field(c_float * 7, 0x5FC0)]
+    mabWeaponOverheated: Annotated[list[bool], Field(c_bool * 7, 0x5FDC)]
+
     @function_hook("48 63 81 ?? ?? 00 00 80 BC 08 ?? ?? 00 00 00 74 12")
     def GetOverheatProgress(self, this: "_Pointer[cGcSpaceshipWeapons]") -> c_float: ...
 
@@ -1331,6 +1338,9 @@ def GetCurrentShootPoints(
     ) -> c_uint64:  # cGcShootPoint *
         ...
 
+    @function_hook("48 63 81 ? ? ? ? F3 0F 10 84 81")
+    def GetHeatFactor(self, this: "_Pointer[cGcSpaceshipWeapons]") -> c_float: ...
+
 
 class cGcPlayerCharacterComponent(Structure):
     @function_hook("48 8B C4 55 53 56 57 41 56 48 8D 68 A1 48 81 EC 90 00 00")

pyproject.toml

@@ -26,7 +26,7 @@ classifiers = [
 dependencies = [
   "pymhf[gui]>=0.2.1"
 ]
-version = "155759.0"
+version = "155983.0"
 
 [dependency-groups]
 dev = [

tools/data.json

@@ -768,5 +768,10 @@
   "name": "cGcPlayerShipOwnership::DestroyShip",
   "signature": "48 89 5C 24 ? 48 89 6C 24 ? 48 89 74 24 ? 48 89 7C 24 ? 41 56 48 83 EC ? 48 8B 35 ? ? ? ? 8B DA",
   "mangled_name": "?DestroyShip@cGcPlayerShipOwnership@@QEAA_NH@Z"
+ },
+ {
+  "name": "cGcSpaceshipWeapons::GetHeatFactor",
+  "signature": "48 63 81 ? ? ? ? F3 0F 10 84 81",
+  "mangled_name": "?GetHeatFactor@cGcSpaceshipWeapons@@UEBAMXZ"
  }
 ]