From 17b09c3f03fdbde62f8c48f3808b01aa67bbddf5 Mon Sep 17 00:00:00 2001 From: monkeyman192 Date: Fri, 30 Oct 2026 13:01:32 +1100 Subject: [PATCH] Update for NMS version 184069 --- broken_patterns.txt | 4 +- nmspy/data/types.py | 244 +++++++++++++++++++++++++------------------- pyproject.toml | 2 +- tools/data.json | 93 ++++++++++++++--- uv.lock | 2 +- 5 files changed, 221 insertions(+), 124 deletions(-) diff --git a/broken_patterns.txt b/broken_patterns.txt index 49a58df..af36f0f 100644 --- a/broken_patterns.txt +++ b/broken_patterns.txt @@ -1,10 +1,10 @@ Could not rename nvgArc Could not rename cTkRigidBody::SetAngularVelocity Could not rename cEgSceneGraphResource::ParseData -Could not rename cEgRenderer::DrawRenderables +Could not rename cTkResourceManager::GetDefaultResource Could not rename cEgDrawGeometry::Draw +Could not rename cEgRenderer::DrawRenderables Could not rename cEgGeometryResource::CreateVertexInfoForHash Could not rename GeometryStreaming::cEgGeometryStreamer::RequestStream Could not rename GeometryStreaming::cEgGeometryStreamer::OnBufferLoadFinish Could not rename EgInstancedModelExtension::cEgInstancedMeshNode::RenderAsync -Could not rename cTkResourceManager::GetDefaultResource diff --git a/nmspy/data/types.py b/nmspy/data/types.py index 96dd2d0..0ba522f 100644 --- a/nmspy/data/types.py +++ b/nmspy/data/types.py @@ -871,7 +871,7 @@ class CustomisationData(Structure): @partial_struct class cGcResourceCustomisation(Structure): - _total_size_ = 0x3920 + _total_size_ = 0x3AE0 mResourceCustomisation: Annotated[CustomisationData, 0x0] mForcedTextureName: Annotated[basic.TkID0x20, 0x3900] @@ -923,29 +923,28 @@ class cGcPlayerState(Structure): miPrimaryShip: Annotated[int, Field(c_uint32, 0x182A0)] # Found in cGcPlayerState::cGcPlayerState above the loop over something 5 times. Around line 220. - mPhotoModeSettings: Annotated[nmse.cGcPhotoModeSettings, 0x1AAC0] - maTeleportEndpoints: Annotated[std.vector[nmse.cGcTeleportEndpoint], 0x1AB10] + mPhotoModeSettings: Annotated[nmse.cGcPhotoModeSettings, 0x1AB20] + maTeleportEndpoints: Annotated[std.vector[nmse.cGcTeleportEndpoint], 0x1AB70] - mHoloExplorerInteraction: Annotated[cGcInteractionData, 0x1AD00] - mHoloScepticInteraction: Annotated[cGcInteractionData, 0x1AD20] - mHoloNooneInteraction: Annotated[cGcInteractionData, 0x1AD40] - mNetworkPlayerInteraction: Annotated[cGcInteractionData, 0x1AD60] + mHoloExplorerInteraction: Annotated[cGcInteractionData, 0x1AD60] + mHoloScepticInteraction: Annotated[cGcInteractionData, 0x1AD80] + mHoloNooneInteraction: Annotated[cGcInteractionData, 0x1ADA0] + mNetworkPlayerInteraction: Annotated[cGcInteractionData, 0x1ADC0] # Directly below the calls to cGcInteractionData::SetDefaults in cGcPlayerState::cGcPlayerState maCustomShipNames: Annotated[ tuple[basic.cTkFixedString0x20, ...], - Field(basic.cTkFixedString0x20 * 0xC, 0x1AD93), + Field(basic.cTkFixedString0x20 * 0xC, 0x1ADF3), ] # Found in cGcPlayerState::ClearIsOnOtherSideOfPortal, a BIT below a call to # cGcNameGenerator::GenerateSpaceStationName, before the two nested if # statements. Around line 215. - mbOnOtherSideOfPortal: Annotated[bool, Field(c_bool, 0x1B02C)] - mbOtherMaybe: Annotated[bool, Field(c_bool, 0x1B060)] + mbOnOtherSideOfPortal: Annotated[bool, Field(c_bool, 0x1B08C)] # This can be found in cGcPlayerShipOwnership::UpdateMeshRefresh mCustomisationData: Annotated[ tuple[cGcResourceCustomisation, ...], - Field(cGcResourceCustomisation * 0x1A, 0x1CA10), + Field(cGcResourceCustomisation * 0x1A, 0x1CA70), ] @function_hook( @@ -996,8 +995,7 @@ def GetStatValue( ) -> c_float: ... @function_hook( - "48 8B C4 48 89 50 ? 48 89 48 ? 55 48 8D A8 ? ? ? ? 48 81 EC ? ? ? ? 48 89 58 ? 48 89 70 ? 48 89 78 " - "? 4C 89 60" + "48 8B C4 48 89 50 ? 48 89 48 ? 55 48 8D A8 ? ? ? ? 48 81 EC ? ? ? ? 48 89 58 ? 48 89 70 ? 48 8B F2" ) def SaveToData(self, this: "_Pointer[cGcPlayerState]", lData: _Pointer[nmse.cGcPlayerStateData]): ... @@ -1955,9 +1953,77 @@ def Generate( ): ... +class PlanetGenerationQuery(Structure): ... + + +class cGcPlanetGenerator(Structure): + @function_hook( + "48 89 5C 24 ? 48 89 74 24 ? 48 89 7C 24 ? 55 41 54 41 55 41 56 41 57 48 8D AC 24 ? ? ? ? 48 81 EC ? " + "? ? ? 4D 8B F8 C6 85" + ) + def Generate( + self, + this: "_Pointer[cGcPlanetGenerator]", + lPlanetData: _Pointer[nmse.cGcPlanetData], + lGenerationData: _Pointer[nmse.cGcPlanetGenerationInputData], + lpPlanet: _Pointer[cGcPlanet], + ): ... + + @function_hook( + "48 8B C4 48 89 50 ? 48 89 48 ? 55 48 8D A8 ? ? ? ? 48 81 EC ? ? ? ? 48 89 58 ? 48 89 70 ? 49 8B F0" + ) + def GenerateCreatureRoles( + self, + this: "_Pointer[cGcPlanetGenerator]", + lPlanetData: _Pointer[nmse.cGcPlanetData], + lUA: c_uint64, + ): ... + + @function_hook( + "48 8B C4 48 89 50 ? 55 53 56 57 41 54 41 55 41 56 41 57 48 8D A8 ? ? ? ? 48 81 EC ? ? ? ? 0F 29 70 " + "? 33 F6" + ) + def GenerateCreatureInfo( + self, + this: "_Pointer[cGcPlanetGenerator]", + lPlanetData: _Pointer[nmse.cGcPlanetData], + lRole: _Pointer[nmse.cGcCreatureRoleData], + ): ... + + @function_hook( + "4C 89 4C 24 ? 48 89 54 24 ? 55 53 56 57 41 54 41 55 41 56 41 57 48 8D AC 24 ? ? ? ? B8 ? ? ? ? E8 ? " + "? ? ? 48 2B E0 49 8B F0" + ) + def GenerateQueryInfo( + self, + this: "_Pointer[cGcPlanetGenerator]", + lQueryData: _Pointer[PlanetGenerationQuery], + lGenerationData: _Pointer[nmse.cGcPlanetGenerationInputData], + lUA: c_uint64, + ): ... + + @function_hook( + "48 89 5C 24 ? 48 89 6C 24 ? 48 89 74 24 ? 48 89 7C 24 ? 41 54 41 56 41 57 48 83 EC ? 4C 8B F9 0F 29 " + "74 24" + ) + def FillCreatureSpawnDataFromDescription( + self, + this: "_Pointer[cGcPlanetGenerator]", + lRole: _Pointer[nmse.cGcCreatureRoleData], + lSpawnData: _Pointer[nmse.cGcCreatureSpawnData], + lPlanetData: _Pointer[nmse.cGcPlanetData], + ): ... + + @function_hook("48 89 4C 24 ? 53 57 41 55 41 56 41 57 48 83 EC ? 48 63 9A") + def GenerateCreatureSpawnData( + self, + this: "_Pointer[cGcPlanetGenerator]", + lPlanetData: _Pointer[nmse.cGcPlanetData], + ): ... + + @partial_struct class cGcSolarSystem(Structure): - _total_size_ = 0x522220 # These can be found in cGcSolarSystem::cGcSolarSystem mSolarSystemData: Annotated[nmse.cGcSolarSystemData, 0x0] mUA: Annotated[int, Field(c_uint64, 0x26B0)] @@ -1966,10 +2032,11 @@ class cGcSolarSystem(Structure): miPrimaryPlanet: Annotated[int, Field(c_int32, 0x5188D0)] mSolarSystemMap: Annotated[cGcSolarSystemMap, 0x51BC20] mSolarSystemMapMarker: Annotated[_Pointer[cGcSolarSystemMapMarker], 0x520270] - mSolarSystemGenerator: Annotated[cGcSolarSystemGenerator, 0x521180] - mSpacePoiGenerator: Annotated[cGcSpacePoiGenerator, 0x521860] + mPlanetGenerator: Annotated[cGcPlanetGenerator, 0x5217A0] + mSolarSystemGenerator: Annotated[cGcSolarSystemGenerator, 0x5223B0] + mSpacePoiGenerator: Annotated[cGcSpacePoiGenerator, 0x522A90] # Found in cGcPlayerState::StoreCurrentSystemSpaceStationEndpoint - mSpaceStationNode: Annotated[basic.TkHandle, 0x522AA0] + mSpaceStationNode: Annotated[basic.TkHandle, 0x522AC0] @function_hook("48 89 5C 24 ? 48 89 74 24 ? 57 48 83 EC ? 0F 29 74 24 ? 48 8B F9 48 8B D9") def cGcSolarSystem(self, this: "_Pointer[cGcSolarSystem]"): ... @@ -2225,9 +2292,7 @@ def RemoveMarker( lExampleMarker: _Pointer[cGcMarkerPoint], ) -> c_uint64: ... - @function_hook( - "48 89 5C 24 ? 48 89 6C 24 ? 48 89 74 24 ? 48 89 7C 24 ? 41 54 41 56 41 57 48 83 EC ? F6 82" - ) + @function_hook("40 57 41 54 41 56") def TryAddMarker( self, this: "_Pointer[cGcMarkerList]", @@ -2246,9 +2311,7 @@ class cGcScanManager(Structure): ) def UpdateConstantMarkers(self, this: "_Pointer[cGcScanManager]"): ... - @function_hook( - "48 89 4C 24 ? 55 53 57 41 54 41 57 48 8D AC 24 ? ? ? ? B8 ? ? ? ? E8 ? ? ? ? 48 2B E0 0F 29 B4 24" - ) + @function_hook("48 89 4C 24 ? 55 53 56 41 54 41 57 48 8D AC 24 ? ? ? ? B8") def UpdateScannableMarkers(self, this: "_Pointer[cGcScanManager]"): ... @@ -2271,6 +2334,23 @@ class cGcSpaceshipWarp(Structure): mfPulseDriveTimer: Annotated[float, Field(c_float, 0x1A8)] mfPulseDriveFuelTimer: Annotated[float, Field(c_float, 0x1AC)] + class eWarpEffectType(IntEnum): + # Might not be right. The below is from 4.13 with any known modifications. + Normal = 0x0 + Teleport = 0x1 + ToNextGalaxy = 0x2 + BlackHole = 0x3 + + GalaxyMap = 0x5 + Portal = 0x6 + PortalStorySpace = 0x7 + PortalStoryPlanet = 0x8 + PortalCommunity = 0x9 + Freighter = 0xA + NexusExit = 0xB + FreighterMegaWarp = 0xC + FakePortalTeleport = 0xD + @function_hook("40 55 56 48 8D AC 24 ? ? ? ? 48 81 EC ? ? ? ? 8B 81") def Update( self, @@ -2288,6 +2368,23 @@ def UpdatePulseDrive( @function_hook("48 89 4C 24 ? 53 48 83 EC ? 48 89 6C 24") def GetPulseDriveFuelFactor(self, this: "_Pointer[cGcSpaceshipWarp]") -> c_float: ... + @function_hook("48 89 5C 24 ? 48 89 6C 24 ? 48 89 74 24 ? 48 89 7C 24 ? 41 56 48 83 EC ? 41 8D 40") + def WarpToDistantSystem( + self, + this: "_Pointer[cGcSpaceshipWarp]", + lJumpTarget: _Pointer[cGcWarpJumpTarget], + leEffectType: c_enum32[eWarpEffectType], + lbSilent: Annotated[bool, c_bool], + ): ... + + @function_hook("48 89 5C 24 ? 48 89 74 24 ? 57 48 83 EC ? 89 91") + def Prepare( + self, + this: "_Pointer[cGcSpaceshipWarp]", + leEffectType: c_enum32[eWarpEffectType], + lbSilent: Annotated[bool, c_bool], + ): ... + @partial_struct class cGcSimulation(Structure): @@ -2415,7 +2512,7 @@ def RenderIndicatorPanel(self, this: "_Pointer[cGcPlayerHUD]"): ... @function_hook("48 8B C4 48 89 48 ? 55 41 56 48 8D A8 ? ? ? ? 48 81 EC ? ? ? ? 48 83 B9") def RenderWeaponPanel(self, this: "_Pointer[cGcPlayerHUD]"): ... - @function_hook("48 8B C4 55 56 57 41 54 41 55 41 56 48 8D 68") + @function_hook("48 8B C4 55 53 56 57 41 55 41 56 48 8D 68") def RenderCrosshair(self, this: "_Pointer[cGcPlayerHUD]"): ... @function_hook("F3 0F 11 4C 24 ? 55 41 55 48 8D AC 24") @@ -2523,7 +2620,7 @@ def FindFirstTypedComponent( ) -> c_uint64: # cGcInteractionComponent * ... - @function_hook("89 54 24 ? 55 41 55 41 56 48 8D AC 24") + @function_hook("40 55 41 55 41 56 48 8D AC 24 ? ? ? ? 48 81 EC ? ? ? ? 4C 8B F1 44 8B EA") def DoInteractionEvent( self, this: "_Pointer[cGcInteractionComponent]", @@ -2612,12 +2709,12 @@ class cTkNGuiInput(Structure): @partial_struct class cGcFrontendManager(Structure): # Passed into cGcNGuiManager::BeginFrame as 2nd argument. - mGameGuiInput: Annotated[cTkNGuiInput, 0x2250] + mGameGuiInput: Annotated[cTkNGuiInput, 0x2360] # Found in cGcFrontendManager::cGcFrontendManager - mFrontendRoot: Annotated[cGcNGuiLayer, 0x2880] + mFrontendRoot: Annotated[cGcNGuiLayer, 0x2990] # Found near the top of cGcFrontendManager::RenderPage - mPage: Annotated[cGcFrontendPage, 0x2BB0] - mSolarSystemMapUI: Annotated[cGcFrontendPageSolarSystemMap, 0x59620] + mPage: Annotated[cGcFrontendPage, 0x2CC0] + mSolarSystemMapUI: Annotated[cGcFrontendPageSolarSystemMap, 0x59730] @function_hook( "48 89 5C 24 ? 48 89 6C 24 ? 48 89 74 24 ? 48 89 7C 24 ? 41 54 41 56 41 57 48 83 EC ? 48 8D 05" @@ -2634,8 +2731,7 @@ def QueueFrontendPage( ): ... @function_hook( - "48 89 4C 24 ? 55 53 48 8D AC 24 ? ? ? ? B8 ? ? ? ? E8 ? ? ? ? 48 2B E0 48 89 B4 24 ? ? ? ? 48 89 BC " - "24" + "40 55 53 48 8D AC 24 ? ? ? ? B8 ? ? ? ? E8 ? ? ? ? 48 2B E0 48 89 B4 24 ? ? ? ? 48 89 BC 24" ) def RenderPage(self, this: "_Pointer[cGcFrontendManager]"): ... @@ -2728,9 +2824,9 @@ class Data(Structure): mHUDManager: Annotated[cGcHUDManager, 0x7330E0] mFrontendManager: Annotated[cGcFrontendManager, 0x87F920] # Passed into any cGcVibrationManager methods - mVibrationManager: Annotated[cGcVibrationManager, 0x95BBD0] - mNGuiManager: Annotated[cGcNGuiManager, 0x95C720] - mAudioManager: Annotated[cTkAudioManager, 0x95CF20] + mVibrationManager: Annotated[cGcVibrationManager, 0x95BCE0] + mNGuiManager: Annotated[cGcNGuiManager, 0x95C830] + mAudioManager: Annotated[cTkAudioManager, 0x95D030] @function_hook("48 89 5C 24 ? 48 89 6C 24 ? 48 89 74 24 ? 57 48 83 EC ? 33 F6 48 C7 41") def Data(self, this: "_Pointer[cGcApplication.Data]"): ... @@ -3475,7 +3571,10 @@ class cTkResourceManager(Structure): _total_size_ = 0x210 mResources: Annotated[basic.TkStd.tk_vector[_Pointer[cTkResource]], 0x58] - @function_hook("44 89 44 24 ? 55 53 57 41 54") + @function_hook( + "48 89 5C 24 ? 44 89 44 24 ? 55 56 57 41 54 41 55 41 56 41 57 48 8D AC 24 ? ? ? ? 48 81 EC ? ? ? ? " + "48 8D B9" + ) def AddResource( self, this: "_Pointer[cTkResourceManager]", @@ -3895,9 +3994,6 @@ class cGcNotificationSequenceStartEvent(Structure): def DeepInterstellarSearch(self, this: "_Pointer[cGcNotificationSequenceStartEvent]") -> c_char: ... -class PlanetGenerationQuery(Structure): ... - - class cGcScanEventSolarSystemLookup(Structure): ... @@ -3913,72 +4009,6 @@ def PassesPlanetInfoChecks( ) -> c_bool: ... -class cGcPlanetGenerator(Structure): - @function_hook( - "48 89 5C 24 ? 48 89 74 24 ? 48 89 7C 24 ? 55 41 54 41 55 41 56 41 57 48 8D AC 24 ? ? ? ? 48 81 EC ? " - "? ? ? 4D 8B F8 C6 85" - ) - def Generate( - self, - this: "_Pointer[cGcPlanetGenerator]", - lPlanetData: _Pointer[nmse.cGcPlanetData], - lGenerationData: _Pointer[nmse.cGcPlanetGenerationInputData], - lpPlanet: _Pointer[cGcPlanet], - ): ... - - @function_hook( - "48 8B C4 48 89 50 ? 48 89 48 ? 55 48 8D A8 ? ? ? ? 48 81 EC ? ? ? ? 48 89 58 ? 48 89 70 ? 49 8B F0" - ) - def GenerateCreatureRoles( - self, - this: "_Pointer[cGcPlanetGenerator]", - lPlanetData: _Pointer[nmse.cGcPlanetData], - lUA: c_uint64, - ): ... - - @function_hook( - "48 8B C4 48 89 50 ? 55 53 56 57 41 54 41 55 41 56 41 57 48 8D A8 ? ? ? ? 48 81 EC ? ? ? ? 0F 29 70 " - "? 33 F6" - ) - def GenerateCreatureInfo( - self, - this: "_Pointer[cGcPlanetGenerator]", - lPlanetData: _Pointer[nmse.cGcPlanetData], - lRole: _Pointer[nmse.cGcCreatureRoleData], - ): ... - - @function_hook( - "4C 89 4C 24 ? 48 89 54 24 ? 55 53 56 57 41 54 41 55 41 56 41 57 48 8D AC 24 ? ? ? ? B8 ? ? ? ? E8 ? " - "? ? ? 48 2B E0 49 8B F0" - ) - def GenerateQueryInfo( - self, - this: "_Pointer[cGcPlanetGenerator]", - lQueryData: _Pointer[PlanetGenerationQuery], - lGenerationData: _Pointer[nmse.cGcPlanetGenerationInputData], - lUA: c_uint64, - ): ... - - @function_hook( - "48 89 5C 24 ? 48 89 6C 24 ? 48 89 74 24 ? 48 89 7C 24 ? 41 54 41 56 41 57 48 83 EC ? 4C 8B F9 0F 29 " - "74 24" - ) - def FillCreatureSpawnDataFromDescription( - self, - this: "_Pointer[cGcPlanetGenerator]", - lRole: _Pointer[nmse.cGcCreatureRoleData], - lSpawnData: _Pointer[nmse.cGcCreatureSpawnData], - lPlanetData: _Pointer[nmse.cGcPlanetData], - ): ... - - @function_hook("48 89 4C 24 ? 53 57 41 55 41 56 41 57 48 83 EC ? 48 63 9A") - def GenerateCreatureSpawnData( - self, - this: "_Pointer[cGcPlanetGenerator]", - lPlanetData: _Pointer[nmse.cGcPlanetData], - ): ... - - class cGcSolarSystemQuery(Structure): @function_hook("44 88 4C 24 ? 53 56 57") def Run( @@ -4331,7 +4361,7 @@ class Data(Structure): mArchiveMountPoint: Annotated[basic.cTkFixedString0x100, 0x495C] @function_hook( - "48 89 5C 24 ? 48 89 6C 24 ? 48 89 74 24 ? 57 41 54 41 55 41 56 41 57 48 81 EC ? ? ? ? 48 8D 2D" + "48 89 5C 24 ? 48 89 6C 24 ? 48 89 74 24 ? 57 41 54 41 55 41 56 41 57 48 81 EC ? ? ? ? 4C 8D 2D" ) def Data( self, @@ -4387,7 +4417,7 @@ def DoesFileExist( ... @function_hook( - "48 89 5C 24 ? 4C 89 44 24 ? 55 56 57 41 54 41 55 41 56 41 57 48 8D 6C 24 ? 48 81 EC ? ? ? ? 33 F6" + "48 89 5C 24 ? 4C 89 44 24 ? 55 56 57 41 54 41 55 41 56 41 57 48 8D 6C 24 ? 48 81 EC ? ? ? ? 48 8B CA" ) def LoadModDirectory( self, @@ -5531,7 +5561,7 @@ def SetWantedLevel( class cGcFrontendPageClaimBase(Structure): - @static_function_hook("48 89 54 24 ? 55 53 41 54 41 56") + @static_function_hook("48 89 5C 24 ? 48 89 54 24 ? 55 57 41 54") @staticmethod def DoBaseClaimOptions( lpPage: _Pointer[cGcFrontendPage], diff --git a/pyproject.toml b/pyproject.toml index e0fb56f..e85b022 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -26,7 +26,7 @@ classifiers = [ dependencies = [ "pymhf[http_api,gui]==0.2.5" ] -version = "183877.0" +version = "184069.0" [dependency-groups] dev = [ diff --git a/tools/data.json b/tools/data.json index 095aef3..2ad0348 100644 --- a/tools/data.json +++ b/tools/data.json @@ -86,7 +86,7 @@ }, { "name": "cGcMarkerList::TryAddMarker", - "signature": "48 89 5C 24 ? 48 89 6C 24 ? 48 89 74 24 ? 48 89 7C 24 ? 41 54 41 56 41 57 48 83 EC ? F6 82", + "signature": "40 57 41 54 41 56", "mangled_name": "?TryAddMarker@cGcMarkerList@@QEAA_NAEBVcGcMarkerPoint@@_N@Z" }, { @@ -644,7 +644,7 @@ }, { "name": "cTkResourceManager::AddResource", - "signature": "44 89 44 24 ? 55 53 57 41 54", + "signature": "48 89 5C 24 ? 44 89 44 24 ? 55 56 57 41 54 41 55 41 56 41 57 48 8D AC 24 ? ? ? ? 48 81 EC ? ? ? ? 48 8D B9", "mangled_name": "?AddResource@cTkResourceManager@@QEAA?AVcTkSmartResHandle@@HPEBDH_NPEAVcTkResourceDescriptor@@@Z" }, { @@ -721,7 +721,7 @@ }, { "name": "cGcPlayerHUD::RenderCrosshair", - "signature": "48 8B C4 55 56 57 41 54 41 55 41 56 48 8D 68", + "signature": "48 8B C4 55 53 56 57 41 55 41 56 48 8D 68", "mangled_name": "?RenderCrosshair@cGcPlayerHUD@@IEAAXXZ", "unique_string": "UI_TERRAIN_EDIT_ROTATE_TIP" }, @@ -934,7 +934,7 @@ }, { "name": "cTkFileSystem::Data::Data", - "signature": "48 89 5C 24 ? 48 89 6C 24 ? 48 89 74 24 ? 57 41 54 41 55 41 56 41 57 48 81 EC ? ? ? ? 48 8D 2D", + "signature": "48 89 5C 24 ? 48 89 6C 24 ? 48 89 74 24 ? 57 41 54 41 55 41 56 41 57 48 81 EC ? ? ? ? 4C 8D 2D", "mangled_name": "??0Data@cTkFileSystem@@QEAA@_N0@Z", "unique_string": "%sPCBANKS/MODS/" }, @@ -981,7 +981,7 @@ }, { "name": "cTkFileSystem::LoadModDirectory", - "signature": "48 89 5C 24 ? 4C 89 44 24 ? 55 56 57 41 54 41 55 41 56 41 57 48 8D 6C 24 ? 48 81 EC ? ? ? ? 33 F6", + "signature": "48 89 5C 24 ? 4C 89 44 24 ? 55 56 57 41 54 41 55 41 56 41 57 48 8D 6C 24 ? 48 81 EC ? ? ? ? 48 8B CA", "mangled_name": "cTkFileSystem::LoadModDirectory" }, { @@ -1302,8 +1302,9 @@ }, { "name": "cGcPlayerState::SaveToData", - "signature": "48 8B C4 48 89 50 ? 48 89 48 ? 55 48 8D A8 ? ? ? ? 48 81 EC ? ? ? ? 48 89 58 ? 48 89 70 ? 48 89 78 ? 4C 89 60", - "mangled_name": "?SaveToData@cGcPlayerState@@QEAAXAEAVcGcPlayerStateData@@@Z" + "signature": "48 8B C4 48 89 50 ? 48 89 48 ? 55 48 8D A8 ? ? ? ? 48 81 EC ? ? ? ? 48 89 58 ? 48 89 70 ? 48 8B F2", + "mangled_name": "?SaveToData@cGcPlayerState@@QEAAXAEAVcGcPlayerStateData@@@Z", + "unique_string": "cGcPlayerState::SaveToData" }, { "name": "cGcPersistentInteractionsManager::PopulateArrays", @@ -1524,7 +1525,7 @@ }, { "name": "cGcInteractionComponent::DoInteractionEvent", - "signature": "89 54 24 ? 55 41 55 41 56 48 8D AC 24", + "signature": "40 55 41 55 41 56 48 8D AC 24 ? ? ? ? 48 81 EC ? ? ? ? 4C 8B F1 44 8B EA", "mangled_name": "?DoInteractionEvent@cGcInteractionComponent@@QEAAXW4eInteractionEvent@@@Z", "unique_string": "ALIENS_MET" }, @@ -1620,7 +1621,7 @@ }, { "name": "cGcFrontendPageClaimBase::DoBaseClaimOptions", - "signature": "48 89 54 24 ? 55 53 41 54 41 56", + "signature": "48 89 5C 24 ? 48 89 54 24 ? 55 57 41 54", "mangled_name": "?DoBaseClaimOptions@cGcFrontendPageClaimBase@@SAXPEAVcGcFrontendPage@@V?$array@PEAVcGcNGuiLayer@@$04@std@@W4ePersistentBaseTypes@@_NUBaseIndex@@@Z", "unique_string": "UI_BASE_MOVE_HERE" }, @@ -1766,7 +1767,7 @@ }, { "name": "cGcScanManager::UpdateScannableMarkers", - "signature": "48 89 4C 24 ? 55 53 57 41 54 41 57 48 8D AC 24 ? ? ? ? B8 ? ? ? ? E8 ? ? ? ? 48 2B E0 0F 29 B4 24", + "signature": "48 89 4C 24 ? 55 53 56 41 54 41 57 48 8D AC 24 ? ? ? ? B8", "mangled_name": "?UpdateScannableMarkers@cGcScanManager@@AEAAXXZ" }, { @@ -1854,8 +1855,9 @@ }, { "name": "cGcFrontendManager::RenderPage", - "signature": "48 89 4C 24 ? 55 53 48 8D AC 24 ? ? ? ? B8 ? ? ? ? E8 ? ? ? ? 48 2B E0 48 89 B4 24 ? ? ? ? 48 89 BC 24", - "mangled_name": "__ZN18cGcFrontendManager10RenderPageEv" + "signature": "40 55 53 48 8D AC 24 ? ? ? ? B8 ? ? ? ? E8 ? ? ? ? 48 2B E0 48 89 B4 24 ? ? ? ? 48 89 BC 24", + "mangled_name": "__ZN18cGcFrontendManager10RenderPageEv", + "unique_string": "UI_PICK_TIP_REFINER" }, { "name": "cGcFrontendPageFunctions::DoItemPopup", @@ -2155,6 +2157,17 @@ "name": "cEgMeshNode::cEgMeshNode", "signature": "48 89 5C 24 ? 57 48 83 EC ? 4C 8D 82", "mangled_name": "??0cEgMeshNode@@IEAA@AEBUcEgMeshNodeTemplate@@@Z" + }, + { + "name": "cGcSpaceshipWarp::WarpToDistantSystem", + "signature": "48 89 5C 24 ? 48 89 6C 24 ? 48 89 74 24 ? 48 89 7C 24 ? 41 56 48 83 EC ? 41 8D 40", + "mangled_name": "?WarpToDistantSystem@cGcSpaceshipWarp@@QEAAXAEBVcGcWarpJumpTarget@@W4eWarpEffectType@1@_N@Z" + }, + { + "name": "cGcSpaceshipWarp::Prepare", + "signature": "48 89 5C 24 ? 48 89 74 24 ? 57 48 83 EC ? 89 91", + "mangled_name": "?Prepare@cGcSpaceshipWarp@@QEAAXW4eWarpEffectType@1@_N@Z", + "unique_string": "pointLight5" } ], "global_objects": @@ -2412,6 +2425,18 @@ { "name": "mGalaxyAttributes", "signature": "48 8D 8F ? ? ? ? 48 89 B7 ? ? ? ? 48 89 B7 ? ? ? ? 48 89 B7 ? ? ? ? 48 89 B7 ? ? ? ? 48 89 B7 ? ? ? ? 48 89 B7 ? ? ? ? 48 89 B7 ? ? ? ? 48 89 B7 ? ? ? ? 48 89 B7 ? ? ? ? 48 89 B7 ? ? ? ? 89 B7" + }, + { + "name": "mSpacePoiGenerator", + "signature": "48 8D 8F ? ? ? ? E8 ? ? ? ? E8 ? ? ? ? 48 89 87" + }, + { + "name": "mSolarSystemGenerator", + "signature": "48 8B 88 ? ? ? ? 4C 8D A9" + }, + { + "name": "mPlanetGenerator", + "signature": "4C 8D A9 ? ? ? ? 48 81 C1 ? ? ? ? E8 ? ? ? ? 83 FE" } ] }, @@ -2547,7 +2572,7 @@ "fields": [ { "name": "muUnits", - "signature": "41 8B 87 ? ? ? ? 41 89 86 ? ? ? ? 41 8B 87 ? ? ? ? 41 89 86 ? ? ? ? 41 8B 87 ? ? ? ? 41 89 86 ? ? ? ? 48 8B 05" + "signature": "41 8B 86 ? ? ? ? 89 86 ? ? ? ? 41 8B 86 ? ? ? ? 89 86 ? ? ? ? 41 8B 86 ? ? ? ? 89 86 ? ? ? ? 48 8B 05" }, { "name": "muNanites", @@ -2562,6 +2587,48 @@ "name": "muUnits", "offset": 8 } + }, + { + "name": "mbOnOtherSideOfPortal", + "signature": "80 B9 ? ? ? ? ? 48 8B F1 0F 84 ? ? ? ? 80 B9 ? ? ? ? ? 0F 85", + "offset": 2 + }, + { + "name": "maCustomShipNames", + "signature": "48 8D 87 ? ? ? ? 49 8B CC" + }, + { + "name": "mHoloExplorerInteraction", + "signature": "48 8D 8F ? ? ? ? E8 ? ? ? ? 48 8D 8F ? ? ? ? E8 ? ? ? ? 48 8D 8F ? ? ? ? E8 ? ? ? ? 48 8D 8F ? ? ? ? E8 ? ? ? ? 48 8D 87 ? ? ? ? 49 8B CC" + }, + { + "name": "mHoloScepticInteraction", + "relative_to": { + "name": "mHoloExplorerInteraction", + "offset": 32 + } + }, + { + "name": "mHoloNooneInteraction", + "relative_to": { + "name": "mHoloExplorerInteraction", + "offset": 64 + } + }, + { + "name": "mNetworkPlayerInteraction", + "relative_to": { + "name": "mHoloExplorerInteraction", + "offset": 96 + } + }, + { + "name": "mPhotoModeSettings", + "signature": "48 8D 8F ? ? ? ? 48 89 87 ? ? ? ? 0F 57 C0" + }, + { + "name": "maTeleportEndpoints", + "signature": "4C 89 AF ? ? ? ? 48 8D B7" } ] }, diff --git a/uv.lock b/uv.lock index 9b10254..0cc8c10 100644 --- a/uv.lock +++ b/uv.lock @@ -411,7 +411,7 @@ wheels = [ [[package]] name = "nmspy" -version = "183877.0.dev0" +version = "184069.0" source = { editable = "." } dependencies = [ { name = "pymhf", extra = ["gui", "http-api"] },