From e649c3e3e4a29695e01c6a6309a718c6cadf3fb2 Mon Sep 17 00:00:00 2001 From: HolterPhylo Date: Thu, 9 Nov 2023 10:45:20 -0500 Subject: [PATCH] Update for 12660810 --- .../Source/NMS/GameComponents/GcCostTable.cs | 2 +- .../NMS/GameComponents/GcCostTableEntry.cs | 11 +- .../NMS/GameComponents/GcDefaultSaveData.cs | 4 +- .../GcGenericMissionSequence.cs | 2 +- .../NMS/GameComponents/GcMissionTable.cs | 2 +- .../NMS/GameComponents/GcPlayerStateData.cs | 339 +++++++++--------- .../NMS/GameComponents/GcRewardInstallTech.cs | 9 +- .../GameComponents/GcSeasonalGameModeData.cs | 7 +- .../Source/NMS/Toolkit/TkMaterialMetaData.cs | 2 +- libMBIN/Source/Version.cs | 2 +- 10 files changed, 192 insertions(+), 188 deletions(-) diff --git a/libMBIN/Source/NMS/GameComponents/GcCostTable.cs b/libMBIN/Source/NMS/GameComponents/GcCostTable.cs index 8bc611830..2d264bd45 100644 --- a/libMBIN/Source/NMS/GameComponents/GcCostTable.cs +++ b/libMBIN/Source/NMS/GameComponents/GcCostTable.cs @@ -3,7 +3,7 @@ namespace libMBIN.NMS.GameComponents { - [NMS(GUID = 0xC0A6E8AAA2663D21, NameHash = 0x6E62CCB542C4E505)] + [NMS(GUID = 0xCE66A2E24432399E, NameHash = 0x6E62CCB542C4E505)] public class GcCostTable : NMSTemplate { /* 0x00 */ public List SimpleInteractionTable; diff --git a/libMBIN/Source/NMS/GameComponents/GcCostTableEntry.cs b/libMBIN/Source/NMS/GameComponents/GcCostTableEntry.cs index 39ac56e8c..18656f538 100644 --- a/libMBIN/Source/NMS/GameComponents/GcCostTableEntry.cs +++ b/libMBIN/Source/NMS/GameComponents/GcCostTableEntry.cs @@ -1,6 +1,6 @@ namespace libMBIN.NMS.GameComponents { - [NMS(GUID = 0xDA1B26031BC56E03, NameHash = 0x5923C0EE4B9AD427)] + [NMS(GUID = 0x2FEEF129329F7E46, NameHash = 0x5923C0EE4B9AD427)] public class GcCostTableEntry : NMSTemplate { /* 0x00 */ public NMSString0x10 Id; @@ -12,9 +12,10 @@ public class GcCostTableEntry : NMSTemplate /* 0x15 */ public bool RemoveOptionIfCantAfford; /* 0x16 */ public bool InvertCanAffordOutcome; /* 0x17 */ public bool MustAffordInCreative; - /* 0x18 */ public bool UseCommunityContributionCap; - /* 0x20 */ public NMSString0x20A CannotAffordOSDMsg; - /* 0x40 */ public NMSString0x10 MissionMessageWhenCharged; - /* 0x50 */ public NMSTemplate Cost; + /* 0x18 */ public int CommunityContributionValue; + /* 0x20 */ public NMSString0x20A CommunityContributionCapLocID; + /* 0x40 */ public NMSString0x20A CannotAffordOSDMsg; + /* 0x60 */ public NMSString0x10 MissionMessageWhenCharged; + /* 0x70 */ public NMSTemplate Cost; } } diff --git a/libMBIN/Source/NMS/GameComponents/GcDefaultSaveData.cs b/libMBIN/Source/NMS/GameComponents/GcDefaultSaveData.cs index 310b19a04..4ccaa7bf7 100644 --- a/libMBIN/Source/NMS/GameComponents/GcDefaultSaveData.cs +++ b/libMBIN/Source/NMS/GameComponents/GcDefaultSaveData.cs @@ -2,10 +2,10 @@ namespace libMBIN.NMS.GameComponents { - [NMS(GUID = 0x278CA3EA32FBF75C, NameHash = 0xF0829DCD8555A52E)] + [NMS(GUID = 0x91BD9250205F1E3A, NameHash = 0xF0829DCD8555A52E)] public class GcDefaultSaveData : NMSTemplate { /* 0x00000 */ public GcPlayerStateData State; - /* 0x79E10 */ public GcPlayerSpawnStateData Spawn; + /* 0x79E20 */ public GcPlayerSpawnStateData Spawn; } } diff --git a/libMBIN/Source/NMS/GameComponents/GcGenericMissionSequence.cs b/libMBIN/Source/NMS/GameComponents/GcGenericMissionSequence.cs index c4209de6c..d9e946fba 100644 --- a/libMBIN/Source/NMS/GameComponents/GcGenericMissionSequence.cs +++ b/libMBIN/Source/NMS/GameComponents/GcGenericMissionSequence.cs @@ -4,7 +4,7 @@ namespace libMBIN.NMS.GameComponents { - [NMS(GUID = 0x33DD87693095B1BD, NameHash = 0xFAE86B2801335B6D)] + [NMS(GUID = 0x6B0224459A14138F, NameHash = 0xFAE86B2801335B6D)] public class GcGenericMissionSequence : NMSTemplate { /* 0x000 */ public NMSString0x10 MissionID; diff --git a/libMBIN/Source/NMS/GameComponents/GcMissionTable.cs b/libMBIN/Source/NMS/GameComponents/GcMissionTable.cs index af3b6c907..7b587cf34 100644 --- a/libMBIN/Source/NMS/GameComponents/GcMissionTable.cs +++ b/libMBIN/Source/NMS/GameComponents/GcMissionTable.cs @@ -3,7 +3,7 @@ namespace libMBIN.NMS.GameComponents { - [NMS(GUID = 0x85AA2B5595E48164, NameHash = 0x26335C55292A7766)] + [NMS(GUID = 0xBEC4CC707D551EF6, NameHash = 0x26335C55292A7766)] public class GcMissionTable : NMSTemplate { /* 0x0 */ public List Missions; diff --git a/libMBIN/Source/NMS/GameComponents/GcPlayerStateData.cs b/libMBIN/Source/NMS/GameComponents/GcPlayerStateData.cs index 532503e3a..6b9c7328e 100644 --- a/libMBIN/Source/NMS/GameComponents/GcPlayerStateData.cs +++ b/libMBIN/Source/NMS/GameComponents/GcPlayerStateData.cs @@ -3,7 +3,7 @@ namespace libMBIN.NMS.GameComponents { - [NMS(GUID = 0xEFA8577F5439BF16, NameHash = 0x6C4510BB243EFA64)] + [NMS(GUID = 0x791BB62D03D761F, NameHash = 0x6C4510BB243EFA64)] public class GcPlayerStateData : NMSTemplate { /* 0x00000 */ public GcUniverseAddressData UniverseAddress; @@ -73,201 +73,202 @@ public class GcPlayerStateData : NMSTemplate /* 0x0A568 */ public List NewMPMarkerStack; /* 0x0A578 */ public List SurveyedEventPositions; /* 0x0A588 */ public int NextSurveyedEventPositionIndex; - /* 0x0A590 */ public List Stats; - /* 0x0A5A0 */ public List TelemetryStats; + /* 0x0A590 */ public ulong LastCheckedForStatResetsTime; + /* 0x0A598 */ public List Stats; + /* 0x0A5A8 */ public List TelemetryStats; [NMS(Size = 0xB, EnumType = typeof(GcInteractionBufferType.InteractionBufferTypeEnum))] - /* 0x0A5B0 */ public GcInteractionBuffer[] StoredInteractions; - /* 0x0A6B8 */ public List MaintenanceInteractions; - /* 0x0A6C8 */ public List PersonalMaintenanceInteractions; - /* 0x0A6D8 */ public List VisitedSystems; + /* 0x0A5B8 */ public GcInteractionBuffer[] StoredInteractions; + /* 0x0A6C0 */ public List MaintenanceInteractions; + /* 0x0A6D0 */ public List PersonalMaintenanceInteractions; + /* 0x0A6E0 */ public List VisitedSystems; [NMS(Size = 0x6, EnumType = typeof(GcPlayerHazardType.HazardEnum))] - /* 0x0A6E8 */ public float[] Hazard; - /* 0x0A700 */ public int BoltAmmo; - /* 0x0A704 */ public int ScatterAmmo; - /* 0x0A708 */ public int PulseAmmo; - /* 0x0A70C */ public int LaserAmmo; - /* 0x0A710 */ public Vector4f FirstSpawnPosition; + /* 0x0A6F0 */ public float[] Hazard; + /* 0x0A708 */ public int BoltAmmo; + /* 0x0A70C */ public int ScatterAmmo; + /* 0x0A710 */ public int PulseAmmo; + /* 0x0A714 */ public int LaserAmmo; + /* 0x0A720 */ public Vector4f FirstSpawnPosition; [NMS(Size = 0x8A, EnumType = typeof(GcInteractionType.InteractionTypeEnum))] - /* 0x0A720 */ public GcSavedInteractionRaceData[] SavedInteractionIndicies; - /* 0x0C100 */ public List SavedInteractionDialogTable; - /* 0x0C110 */ public List InteractionProgressTable; + /* 0x0A730 */ public GcSavedInteractionRaceData[] SavedInteractionIndicies; + /* 0x0C110 */ public List SavedInteractionDialogTable; + /* 0x0C120 */ public List InteractionProgressTable; [NMS(Size = 0xA)] - /* 0x0C120 */ public GcUniverseAddressData[] AtlasStationAdressData; + /* 0x0C130 */ public GcUniverseAddressData[] AtlasStationAdressData; [NMS(Size = 0xB)] - /* 0x0C210 */ public GcUniverseAddressData[] NewAtlasStationAdressData; - /* 0x0C318 */ public List VisitedAtlasStationsData; - /* 0x0C328 */ public bool FirstAtlasStationDiscovered; - /* 0x0C329 */ public bool UsesThirdPersonCharacterCam; - /* 0x0C32C */ public int ProgressionLevel; - /* 0x0C330 */ public int ProcTechIndex; - /* 0x0C334 */ public bool IsNew; - /* 0x0C335 */ public bool UseSmallerBlackholeJumps; - /* 0x0C338 */ public List UsedEntitlements; + /* 0x0C220 */ public GcUniverseAddressData[] NewAtlasStationAdressData; + /* 0x0C328 */ public List VisitedAtlasStationsData; + /* 0x0C338 */ public bool FirstAtlasStationDiscovered; + /* 0x0C339 */ public bool UsesThirdPersonCharacterCam; + /* 0x0C33C */ public int ProgressionLevel; + /* 0x0C340 */ public int ProcTechIndex; + /* 0x0C344 */ public bool IsNew; + /* 0x0C345 */ public bool UseSmallerBlackholeJumps; + /* 0x0C348 */ public List UsedEntitlements; [NMS(Size = 0x10)] - /* 0x0C350 */ public Vector3f[] PlanetPositions; + /* 0x0C360 */ public Vector3f[] PlanetPositions; [NMS(Size = 0x10)] - /* 0x0C450 */ public GcSeed[] PlanetSeeds; - /* 0x0C550 */ public int PrimaryPlanet; - /* 0x0C558 */ public ulong TimeLastSpaceBattle; - /* 0x0C560 */ public int WarpsLastSpaceBattle; - /* 0x0C568 */ public ulong ActiveSpaceBattleUA; - /* 0x0C570 */ public int ActiveSpaceBattleLevel; - /* 0x0C578 */ public ulong TimeLastMiniStation; - /* 0x0C580 */ public int WarpsLastMiniStation; - /* 0x0C588 */ public ulong MiniStationUA; - /* 0x0C590 */ public Vector4f AnomalyPositionOverride; - /* 0x0C5A0 */ public GcUniverseAddressData GameStartAddress1; - /* 0x0C5B8 */ public GcUniverseAddressData GameStartAddress2; + /* 0x0C460 */ public GcSeed[] PlanetSeeds; + /* 0x0C560 */ public int PrimaryPlanet; + /* 0x0C568 */ public ulong TimeLastSpaceBattle; + /* 0x0C570 */ public int WarpsLastSpaceBattle; + /* 0x0C578 */ public ulong ActiveSpaceBattleUA; + /* 0x0C580 */ public int ActiveSpaceBattleLevel; + /* 0x0C588 */ public ulong TimeLastMiniStation; + /* 0x0C590 */ public int WarpsLastMiniStation; + /* 0x0C598 */ public ulong MiniStationUA; + /* 0x0C5A0 */ public Vector4f AnomalyPositionOverride; + /* 0x0C5B0 */ public GcUniverseAddressData GameStartAddress1; + /* 0x0C5C8 */ public GcUniverseAddressData GameStartAddress2; [NMS(Size = 0x10)] - /* 0x0C5D0 */ public bool[] GalacticMapRequests; - /* 0x0C5E0 */ public Vector4f FirstShipPosition; - /* 0x0C5F0 */ public ulong HazardTimeAlive; - /* 0x0C5F8 */ public bool RevealBlackHoles; - /* 0x0C600 */ public GcSeed CurrentFreighterHomeSystemSeed; - /* 0x0C610 */ public GcResourceElement CurrentFreighter; - /* 0x0C8B8 */ public GcInventoryLayout FreighterLayout; - /* 0x0C8D8 */ public GcInventoryLayout FreighterCargoLayout; - /* 0x0C8F8 */ public GcInventoryContainer FreighterInventory; - /* 0x0CA50 */ public GcInventoryContainer FreighterInventory_TechOnly; - /* 0x0CBA8 */ public GcInventoryContainer FreighterInventory_Cargo; - /* 0x0CD00 */ public ulong FreighterLastSpawnTime; - /* 0x0CD08 */ public GcUniverseAddressData FreighterUniverseAddress; - /* 0x0CD20 */ public bool FreighterDismissed; - /* 0x0CD30 */ public Vector3f FreighterMatrixAt; - /* 0x0CD40 */ public Vector3f FreighterMatrixUp; - /* 0x0CD50 */ public Vector3f FreighterMatrixPos; + /* 0x0C5E0 */ public bool[] GalacticMapRequests; + /* 0x0C5F0 */ public Vector4f FirstShipPosition; + /* 0x0C600 */ public ulong HazardTimeAlive; + /* 0x0C608 */ public bool RevealBlackHoles; + /* 0x0C610 */ public GcSeed CurrentFreighterHomeSystemSeed; + /* 0x0C620 */ public GcResourceElement CurrentFreighter; + /* 0x0C8C8 */ public GcInventoryLayout FreighterLayout; + /* 0x0C8E8 */ public GcInventoryLayout FreighterCargoLayout; + /* 0x0C908 */ public GcInventoryContainer FreighterInventory; + /* 0x0CA60 */ public GcInventoryContainer FreighterInventory_TechOnly; + /* 0x0CBB8 */ public GcInventoryContainer FreighterInventory_Cargo; + /* 0x0CD10 */ public ulong FreighterLastSpawnTime; + /* 0x0CD18 */ public GcUniverseAddressData FreighterUniverseAddress; + /* 0x0CD30 */ public bool FreighterDismissed; + /* 0x0CD40 */ public Vector3f FreighterMatrixAt; + /* 0x0CD50 */ public Vector3f FreighterMatrixUp; + /* 0x0CD60 */ public Vector3f FreighterMatrixPos; [NMS(Size = 0x4)] - /* 0x0CD60 */ public bool[] SquadronUnlockedPilotSlots; + /* 0x0CD70 */ public bool[] SquadronUnlockedPilotSlots; [NMS(Size = 0x4)] - /* 0x0CD68 */ public GcSquadronPilotData[] SquadronPilots; - /* 0x0E2E8 */ public List SeenBaseBuildingObjects; - /* 0x0E2F8 */ public List BaseBuildingObjects; - /* 0x0E310 */ public GcTerrainEditsBuffer TerrainEditData; + /* 0x0CD78 */ public GcSquadronPilotData[] SquadronPilots; + /* 0x0E2F8 */ public List SeenBaseBuildingObjects; + /* 0x0E308 */ public List BaseBuildingObjects; + /* 0x0E320 */ public GcTerrainEditsBuffer TerrainEditData; [NMS(Size = 0x5, EnumType = typeof(GcNPCHabitationType.NPCHabitationTypeEnum))] - /* 0x4AA90 */ public GcNPCWorkerData[] NPCWorkers; - /* 0x4B8F0 */ public List PersistentPlayerBases; - /* 0x4B900 */ public List TeleportEndpoints; - /* 0x4B910 */ public GcInventoryLayout Chest1Layout; - /* 0x4B930 */ public GcInventoryContainer Chest1Inventory; - /* 0x4BA88 */ public GcInventoryLayout Chest2Layout; - /* 0x4BAA8 */ public GcInventoryContainer Chest2Inventory; - /* 0x4BC00 */ public GcInventoryLayout Chest3Layout; - /* 0x4BC20 */ public GcInventoryContainer Chest3Inventory; - /* 0x4BD78 */ public GcInventoryLayout Chest4Layout; - /* 0x4BD98 */ public GcInventoryContainer Chest4Inventory; - /* 0x4BEF0 */ public GcInventoryLayout Chest5Layout; - /* 0x4BF10 */ public GcInventoryContainer Chest5Inventory; - /* 0x4C068 */ public GcInventoryLayout Chest6Layout; - /* 0x4C088 */ public GcInventoryContainer Chest6Inventory; - /* 0x4C1E0 */ public GcInventoryLayout Chest7Layout; - /* 0x4C200 */ public GcInventoryContainer Chest7Inventory; - /* 0x4C358 */ public GcInventoryLayout Chest8Layout; - /* 0x4C378 */ public GcInventoryContainer Chest8Inventory; - /* 0x4C4D0 */ public GcInventoryLayout Chest9Layout; - /* 0x4C4F0 */ public GcInventoryContainer Chest9Inventory; - /* 0x4C648 */ public GcInventoryLayout Chest10Layout; - /* 0x4C668 */ public GcInventoryContainer Chest10Inventory; - /* 0x4C7C0 */ public GcInventoryLayout ChestMagicLayout; - /* 0x4C7E0 */ public GcInventoryContainer ChestMagicInventory; - /* 0x4C938 */ public GcInventoryLayout ChestMagic2Layout; - /* 0x4C958 */ public GcInventoryContainer ChestMagic2Inventory; - /* 0x4CAB0 */ public GcInventoryLayout CookingIngredientsLayout; - /* 0x4CAD0 */ public GcInventoryContainer CookingIngredientsInventory; - /* 0x4CC28 */ public GcInventoryLayout RocketLockerLayout; - /* 0x4CC48 */ public GcInventoryContainer RocketLockerInventory; - /* 0x4CDA0 */ public GcResourceElement CurrentFreighterNPC; + /* 0x4AAA0 */ public GcNPCWorkerData[] NPCWorkers; + /* 0x4B900 */ public List PersistentPlayerBases; + /* 0x4B910 */ public List TeleportEndpoints; + /* 0x4B920 */ public GcInventoryLayout Chest1Layout; + /* 0x4B940 */ public GcInventoryContainer Chest1Inventory; + /* 0x4BA98 */ public GcInventoryLayout Chest2Layout; + /* 0x4BAB8 */ public GcInventoryContainer Chest2Inventory; + /* 0x4BC10 */ public GcInventoryLayout Chest3Layout; + /* 0x4BC30 */ public GcInventoryContainer Chest3Inventory; + /* 0x4BD88 */ public GcInventoryLayout Chest4Layout; + /* 0x4BDA8 */ public GcInventoryContainer Chest4Inventory; + /* 0x4BF00 */ public GcInventoryLayout Chest5Layout; + /* 0x4BF20 */ public GcInventoryContainer Chest5Inventory; + /* 0x4C078 */ public GcInventoryLayout Chest6Layout; + /* 0x4C098 */ public GcInventoryContainer Chest6Inventory; + /* 0x4C1F0 */ public GcInventoryLayout Chest7Layout; + /* 0x4C210 */ public GcInventoryContainer Chest7Inventory; + /* 0x4C368 */ public GcInventoryLayout Chest8Layout; + /* 0x4C388 */ public GcInventoryContainer Chest8Inventory; + /* 0x4C4E0 */ public GcInventoryLayout Chest9Layout; + /* 0x4C500 */ public GcInventoryContainer Chest9Inventory; + /* 0x4C658 */ public GcInventoryLayout Chest10Layout; + /* 0x4C678 */ public GcInventoryContainer Chest10Inventory; + /* 0x4C7D0 */ public GcInventoryLayout ChestMagicLayout; + /* 0x4C7F0 */ public GcInventoryContainer ChestMagicInventory; + /* 0x4C948 */ public GcInventoryLayout ChestMagic2Layout; + /* 0x4C968 */ public GcInventoryContainer ChestMagic2Inventory; + /* 0x4CAC0 */ public GcInventoryLayout CookingIngredientsLayout; + /* 0x4CAE0 */ public GcInventoryContainer CookingIngredientsInventory; + /* 0x4CC38 */ public GcInventoryLayout RocketLockerLayout; + /* 0x4CC58 */ public GcInventoryContainer RocketLockerInventory; + /* 0x4CDB0 */ public GcResourceElement CurrentFreighterNPC; [NMS(Size = 0x7, EnumType = typeof(GcVehicleType.VehicleTypeEnum))] - /* 0x4D050 */ public GcPlayerOwnershipData[] VehicleOwnership; - /* 0x50230 */ public int PrimaryVehicle; + /* 0x4D060 */ public GcPlayerOwnershipData[] VehicleOwnership; + /* 0x50240 */ public int PrimaryVehicle; [NMS(Size = 0xC)] - /* 0x50240 */ public GcPlayerOwnershipData[] ShipOwnership; - /* 0x557C0 */ public int PrimaryShip; - /* 0x557C4 */ public bool MultiShipEnabled; - /* 0x557C5 */ public bool VehicleAIControlEnabled; - /* 0x557C6 */ public NMSString0x20 PlayerFreighterName; - /* 0x557F0 */ public Vector4f StartGameShipPosition; - /* 0x55800 */ public bool ShipNeedsTerrainPositioning; - /* 0x55804 */ public int TradingSupplyDataIndex; - /* 0x55808 */ public List TradingSupplyData; - /* 0x55818 */ public List LastPortal; - /* 0x55828 */ public GcPortalSaveData VisitedPortal; - /* 0x55848 */ public int KnownPortalRunes; - /* 0x5584C */ public bool OnOtherSideOfPortal; - /* 0x55850 */ public GcTeleportEndpoint OtherSideOfPortalReturnBase; - /* 0x558E0 */ public Vector4f PortalMarkerPosition_Local; - /* 0x558F0 */ public Vector4f PortalMarkerPosition_Offset; - /* 0x55900 */ public GcPlayerWeapons StartingPrimaryWeapon; - /* 0x55904 */ public GcPlayerWeapons StartingSecondaryWeapon; + /* 0x50250 */ public GcPlayerOwnershipData[] ShipOwnership; + /* 0x557D0 */ public int PrimaryShip; + /* 0x557D4 */ public bool MultiShipEnabled; + /* 0x557D5 */ public bool VehicleAIControlEnabled; + /* 0x557D6 */ public NMSString0x20 PlayerFreighterName; + /* 0x55800 */ public Vector4f StartGameShipPosition; + /* 0x55810 */ public bool ShipNeedsTerrainPositioning; + /* 0x55814 */ public int TradingSupplyDataIndex; + /* 0x55818 */ public List TradingSupplyData; + /* 0x55828 */ public List LastPortal; + /* 0x55838 */ public GcPortalSaveData VisitedPortal; + /* 0x55858 */ public int KnownPortalRunes; + /* 0x5585C */ public bool OnOtherSideOfPortal; + /* 0x55860 */ public GcTeleportEndpoint OtherSideOfPortalReturnBase; + /* 0x558F0 */ public Vector4f PortalMarkerPosition_Local; + /* 0x55900 */ public Vector4f PortalMarkerPosition_Offset; + /* 0x55910 */ public GcPlayerWeapons StartingPrimaryWeapon; + /* 0x55914 */ public GcPlayerWeapons StartingSecondaryWeapon; [NMS(Size = 0x17, EnumType = typeof(GcCustomisationComponentData.CustomisationDataTypeEnum))] - /* 0x55908 */ public GcCharacterCustomisationSaveData[] CharacterCustomisationData; + /* 0x55918 */ public GcCharacterCustomisationSaveData[] CharacterCustomisationData; [NMS(Size = 0xC)] - /* 0x560F0 */ public bool[] ShipUsesLegacyColours; + /* 0x56100 */ public bool[] ShipUsesLegacyColours; [NMS(Size = 0x3)] - /* 0x56100 */ public GcCharacterCustomisationData[] Outfits; - /* 0x561D8 */ public NMSString0x10 JetpackEffect; - /* 0x561E8 */ public NMSString0x10 FreighterEngineEffect; - /* 0x561F8 */ public GcSeed FleetSeed; - /* 0x56208 */ public List FleetFrigates; - /* 0x56218 */ public List FleetExpeditions; - /* 0x56228 */ public List ExpeditionSeedsSelectedToday; - /* 0x56238 */ public ulong LastKnownDay; - /* 0x56240 */ public ulong SunTimer; - /* 0x56248 */ public ulong MultiplayerLobbyID; - /* 0x56250 */ public GcUniverseAddressData MultiplayerUA; - /* 0x56270 */ public GcPlayerSpawnStateData MultiplayerSpawn; - /* 0x56340 */ public List RepairTechBuffer; - /* 0x56350 */ public ulong MultiplayerPrivileges; + /* 0x56110 */ public GcCharacterCustomisationData[] Outfits; + /* 0x561E8 */ public NMSString0x10 JetpackEffect; + /* 0x561F8 */ public NMSString0x10 FreighterEngineEffect; + /* 0x56208 */ public GcSeed FleetSeed; + /* 0x56218 */ public List FleetFrigates; + /* 0x56228 */ public List FleetExpeditions; + /* 0x56238 */ public List ExpeditionSeedsSelectedToday; + /* 0x56248 */ public ulong LastKnownDay; + /* 0x56250 */ public ulong SunTimer; + /* 0x56258 */ public ulong MultiplayerLobbyID; + /* 0x56260 */ public GcUniverseAddressData MultiplayerUA; + /* 0x56280 */ public GcPlayerSpawnStateData MultiplayerSpawn; + /* 0x56350 */ public List RepairTechBuffer; + /* 0x56360 */ public ulong MultiplayerPrivileges; [NMS(Size = 0x3, EnumType = typeof(GcHotActionMenuTypes.HotActionMenuTypesEnum))] - /* 0x56358 */ public GcHotActionsSaveData[] HotActions; - /* 0x56808 */ public ulong LastUABeforePortalWarp; - /* 0x56810 */ public ulong StoryPortalSeed; - /* 0x56818 */ public ushort ShopNumber; - /* 0x5681A */ public ushort ShopTier; - /* 0x5681C */ public bool HasAccessToNexus; - /* 0x56820 */ public GcUniverseAddressData NexusUniverseAddress; - /* 0x56840 */ public Vector3f NexusMatrixAt; - /* 0x56850 */ public Vector3f NexusMatrixUp; - /* 0x56860 */ public Vector3f NexusMatrixPos; - /* 0x56870 */ public GcPhotoModeSettings PhotoModeSettings; - /* 0x568C0 */ public int BannerIcon; - /* 0x568C4 */ public int BannerMainColour; - /* 0x568C8 */ public int BannerBackgroundColour; - /* 0x568D0 */ public NMSString0x10 BannerTitleId; - /* 0x568E0 */ public int TelemetryUploadVersion; - /* 0x568E4 */ public bool UsesThirdPersonVehicleCam; - /* 0x568E8 */ public float VRCameraOffset; - /* 0x568F0 */ public GcSeasonalGameModeData SeasonData; - /* 0x59DF8 */ public GcSeasonStateData SeasonState; - /* 0x59E50 */ public bool RestartAllInactiveSeasonalMissions; - /* 0x59E58 */ public List RedeemedSeasonRewards; - /* 0x59E68 */ public List RedeemedTwitchRewards; - /* 0x59E78 */ public List RedeemedPlatformRewards; + /* 0x56368 */ public GcHotActionsSaveData[] HotActions; + /* 0x56818 */ public ulong LastUABeforePortalWarp; + /* 0x56820 */ public ulong StoryPortalSeed; + /* 0x56828 */ public ushort ShopNumber; + /* 0x5682A */ public ushort ShopTier; + /* 0x5682C */ public bool HasAccessToNexus; + /* 0x56830 */ public GcUniverseAddressData NexusUniverseAddress; + /* 0x56850 */ public Vector3f NexusMatrixAt; + /* 0x56860 */ public Vector3f NexusMatrixUp; + /* 0x56870 */ public Vector3f NexusMatrixPos; + /* 0x56880 */ public GcPhotoModeSettings PhotoModeSettings; + /* 0x568D0 */ public int BannerIcon; + /* 0x568D4 */ public int BannerMainColour; + /* 0x568D8 */ public int BannerBackgroundColour; + /* 0x568E0 */ public NMSString0x10 BannerTitleId; + /* 0x568F0 */ public int TelemetryUploadVersion; + /* 0x568F4 */ public bool UsesThirdPersonVehicleCam; + /* 0x568F8 */ public float VRCameraOffset; + /* 0x56900 */ public GcSeasonalGameModeData SeasonData; + /* 0x59E08 */ public GcSeasonStateData SeasonState; + /* 0x59E60 */ public bool RestartAllInactiveSeasonalMissions; + /* 0x59E68 */ public List RedeemedSeasonRewards; + /* 0x59E78 */ public List RedeemedTwitchRewards; + /* 0x59E88 */ public List RedeemedPlatformRewards; [NMS(Size = 0x64)] - /* 0x59E90 */ public GcSettlementState[] SettlementStatesV2; - /* 0x79290 */ public int SettlementStateRingBufferIndexV2; - /* 0x79294 */ public bool NextLoadSpawnsWithFreshStart; + /* 0x59EA0 */ public GcSettlementState[] SettlementStatesV2; + /* 0x792A0 */ public int SettlementStateRingBufferIndexV2; + /* 0x792A4 */ public bool NextLoadSpawnsWithFreshStart; [NMS(Size = 0x9, EnumType = typeof(GcAlienRace.AlienRaceEnum))] - /* 0x79298 */ public GcStoryPageSeenDataArray[] SeenStories; - /* 0x79328 */ public bool BuildersKnown; + /* 0x792A8 */ public GcStoryPageSeenDataArray[] SeenStories; + /* 0x79338 */ public bool BuildersKnown; [NMS(Size = 0xB, EnumType = typeof(GcWonderPlanetCategory.WonderPlanetCategoryEnum))] - /* 0x79330 */ public GcWonderRecord[] WonderPlanetRecords; + /* 0x79340 */ public GcWonderRecord[] WonderPlanetRecords; [NMS(Size = 0xF, EnumType = typeof(GcWonderCreatureCategory.WonderCreatureCategoryEnum))] - /* 0x79438 */ public GcWonderRecord[] WonderCreatureRecords; + /* 0x79448 */ public GcWonderRecord[] WonderCreatureRecords; [NMS(Size = 0x8, EnumType = typeof(GcWonderFloraCategory.WonderFloraCategoryEnum))] - /* 0x795A0 */ public GcWonderRecord[] WonderFloraRecords; + /* 0x795B0 */ public GcWonderRecord[] WonderFloraRecords; [NMS(Size = 0x8, EnumType = typeof(GcWonderMineralCategory.WonderMineralCategoryEnum))] - /* 0x79660 */ public GcWonderRecord[] WonderMineralRecords; + /* 0x79670 */ public GcWonderRecord[] WonderMineralRecords; [NMS(Size = 0xD, EnumType = typeof(GcWonderTreasureCategory.WonderTreasureCategoryEnum))] - /* 0x79720 */ public GcWonderRecord[] WonderTreasureRecords; + /* 0x79730 */ public GcWonderRecord[] WonderTreasureRecords; [NMS(Size = 0xB, EnumType = typeof(GcWonderWeirdBasePartCategory.WonderWeirdBasePartCategoryEnum))] - /* 0x79858 */ public GcWonderRecord[] WonderWeirdBasePartRecords; + /* 0x79868 */ public GcWonderRecord[] WonderWeirdBasePartRecords; [NMS(Size = 0xC, EnumType = typeof(GcWonderCustomCategory.WonderCustomCategoryEnum))] - /* 0x79960 */ public GcWonderRecord[] WonderCustomRecords; + /* 0x79970 */ public GcWonderRecord[] WonderCustomRecords; [NMS(Size = 0xC, EnumType = typeof(GcWonderCustomCategory.WonderCustomCategoryEnum))] - /* 0x79A80 */ public GcWonderRecordCustomData[] WonderCustomRecordsExtraData; + /* 0x79A90 */ public GcWonderRecordCustomData[] WonderCustomRecordsExtraData; [NMS(Size = 0x4, EnumType = typeof(GcSynchronisedBufferType.SyncBufferTypeEnum))] - /* 0x79DB0 */ public GcSyncBufferSaveDataArray[] SyncBuffersData; - /* 0x79DF0 */ public List RefinerBufferKeys; - /* 0x79E00 */ public List RefinerBufferData; + /* 0x79DC0 */ public GcSyncBufferSaveDataArray[] SyncBuffersData; + /* 0x79E00 */ public List RefinerBufferKeys; + /* 0x79E10 */ public List RefinerBufferData; } } diff --git a/libMBIN/Source/NMS/GameComponents/GcRewardInstallTech.cs b/libMBIN/Source/NMS/GameComponents/GcRewardInstallTech.cs index 5f3300903..daea7ae23 100644 --- a/libMBIN/Source/NMS/GameComponents/GcRewardInstallTech.cs +++ b/libMBIN/Source/NMS/GameComponents/GcRewardInstallTech.cs @@ -1,9 +1,10 @@ namespace libMBIN.NMS.GameComponents { - [NMS(GUID = 0x21F8F59124D39327, NameHash = 0x75DF796697F3DB0A)] + [NMS(GUID = 0x8394A683A8878273, NameHash = 0x75DF796697F3DB0A)] public class GcRewardInstallTech : NMSTemplate { /* 0x00 */ public NMSString0x10 TechId; + /* 0x10 */ public NMSString0x10 ReplaceExistingTech; // size: 0x7 public enum InventoryToInstallInEnum : uint { Personal, @@ -14,8 +15,8 @@ public enum InventoryToInstallInEnum : uint { Vehicle, Weapon, } - /* 0x10 */ public InventoryToInstallInEnum InventoryToInstallIn; - /* 0x14 */ public bool Silent; - /* 0x15 */ public bool InstallBroken; + /* 0x20 */ public InventoryToInstallInEnum InventoryToInstallIn; + /* 0x24 */ public bool Silent; + /* 0x25 */ public bool InstallBroken; } } diff --git a/libMBIN/Source/NMS/GameComponents/GcSeasonalGameModeData.cs b/libMBIN/Source/NMS/GameComponents/GcSeasonalGameModeData.cs index 752a560a9..71bfeaf4f 100644 --- a/libMBIN/Source/NMS/GameComponents/GcSeasonalGameModeData.cs +++ b/libMBIN/Source/NMS/GameComponents/GcSeasonalGameModeData.cs @@ -4,7 +4,7 @@ namespace libMBIN.NMS.GameComponents { - [NMS(GUID = 0x2968EC49F636EDB1, NameHash = 0xFD6B0BE30E218605)] + [NMS(GUID = 0xCCC632C77B9B7F73, NameHash = 0xFD6B0BE30E218605)] public class GcSeasonalGameModeData : NMSTemplate { /* 0x0000 */ public int SeasonId; @@ -75,8 +75,9 @@ public class GcSeasonalGameModeData : NMSTemplate /* 0x3358 */ public float DistanceFromShipAtStartOfGame; /* 0x335C */ public float BuildingRadiusShipOffsetMultiplier; /* 0x3360 */ public bool ShipStartsDamaged; - /* 0x3361 */ public bool AllowMissionDetailMessages; - /* 0x3362 */ public bool UseStartPlanetObjectListOverrides; + /* 0x3361 */ public bool BlockStormsAtStart; + /* 0x3362 */ public bool AllowMissionDetailMessages; + /* 0x3363 */ public bool UseStartPlanetObjectListOverrides; /* 0x3368 */ public NMSString0x10 StartPlanetRareSubstanceOverride; /* 0x3378 */ public bool TrashInventoryOnGalaxyTravel; /* 0x337C */ public int FreighterBattleEarlyWarpsOverride; diff --git a/libMBIN/Source/NMS/Toolkit/TkMaterialMetaData.cs b/libMBIN/Source/NMS/Toolkit/TkMaterialMetaData.cs index 83a173f67..364d101dd 100644 --- a/libMBIN/Source/NMS/Toolkit/TkMaterialMetaData.cs +++ b/libMBIN/Source/NMS/Toolkit/TkMaterialMetaData.cs @@ -2,7 +2,7 @@ namespace libMBIN.NMS.Toolkit { - [NMS(GUID = 0xC4A5912184E05885, NameHash = 0xE39CB7AA4D818260)] + [NMS(GUID = 0x83268F02FC4A5E72, NameHash = 0xE39CB7AA4D818260)] public class TkMaterialMetaData : NMSTemplate { /* 0x000 */ public NMSString0x80 ExternalMaterial; diff --git a/libMBIN/Source/Version.cs b/libMBIN/Source/Version.cs index 1a51cff25..48dc5d3ee 100644 --- a/libMBIN/Source/Version.cs +++ b/libMBIN/Source/Version.cs @@ -25,7 +25,7 @@ public static class Version { // the Prerelease version should be reset to 1 // When the Release version is incremented: // the Prerelease version should be reset to 0 - internal const string VERSION_STRING = "4.44.0.1"; + internal const string VERSION_STRING = "4.45.0.1"; /// Shorthand for AssemblyVersion.Major public static int Major => AssemblyVersion.Major;