diff --git a/libMBIN/Source/NMS/GameComponents/GcMarkerType.cs b/libMBIN/Source/NMS/GameComponents/GcMarkerType.cs index 8f7d747b1..dcd95acf7 100644 --- a/libMBIN/Source/NMS/GameComponents/GcMarkerType.cs +++ b/libMBIN/Source/NMS/GameComponents/GcMarkerType.cs @@ -1,9 +1,9 @@ namespace libMBIN.NMS.GameComponents { - [NMS(GUID = 0xD58453E281363F1, NameHash = 0xE51499F8)] + [NMS(GUID = 0x17A126A7CE2C5D9E, NameHash = 0xE51499F8)] public class GcMarkerType : NMSTemplate { - // size: 0x4A + // size: 0x4B public enum MarkerTypeEnum : byte { Default, PlanetPoleNorth, @@ -27,6 +27,7 @@ public enum MarkerTypeEnum : byte { Bounty, PlanetRaid, Battle, + SwarmHiveBattle, SpaceSignal, BlackHole, SpaceAnomalySignal, diff --git a/libMBIN/Source/NMS/GameComponents/GcMissionSequenceWaitForStat.cs b/libMBIN/Source/NMS/GameComponents/GcMissionSequenceWaitForStat.cs index 56191f2ad..2c0d221e6 100644 --- a/libMBIN/Source/NMS/GameComponents/GcMissionSequenceWaitForStat.cs +++ b/libMBIN/Source/NMS/GameComponents/GcMissionSequenceWaitForStat.cs @@ -1,9 +1,9 @@ namespace libMBIN.NMS.GameComponents { - [NMS(GUID = 0xCFA44D137958D7DB, NameHash = 0x32BF48D3)] + [NMS(GUID = 0x9E2A37A3A3C91CD2, NameHash = 0x32BF48D3)] public class GcMissionSequenceWaitForStat : NMSTemplate { - [NMS(Index = 5)] + [NMS(Index = 6)] /* 0x00 */ public VariableSizeString DebugText; [NMS(Index = 0)] /* 0x10 */ public VariableSizeString Message; @@ -15,5 +15,7 @@ public class GcMissionSequenceWaitForStat : NMSTemplate /* 0x40 */ public int Amount; [NMS(Index = 4)] /* 0x44 */ public int AmountMax; + [NMS(Index = 5)] + /* 0x48 */ public bool WriteProgressToMissionStat; } } diff --git a/libMBIN/Source/NMS/GameComponents/GcPlayerCommonStateData.cs b/libMBIN/Source/NMS/GameComponents/GcPlayerCommonStateData.cs index 0ce07a14a..94737daea 100644 --- a/libMBIN/Source/NMS/GameComponents/GcPlayerCommonStateData.cs +++ b/libMBIN/Source/NMS/GameComponents/GcPlayerCommonStateData.cs @@ -3,7 +3,7 @@ namespace libMBIN.NMS.GameComponents { - [NMS(GUID = 0x7C8CD78F28CD1DD, NameHash = 0xC7D918F3)] + [NMS(GUID = 0x52A9CF0D1435B969, NameHash = 0xC7D918F3)] public class GcPlayerCommonStateData : NMSTemplate { [NMS(Index = 5)] @@ -15,24 +15,24 @@ public class GcPlayerCommonStateData : NMSTemplate [NMS(Index = 8)] /* 0x8590 */ public GcSeasonStateData SeasonState; [NMS(Index = 9)] - /* 0x8758 */ public GcSeasonTransferInventoryData SeasonTransferInventoryData; + /* 0x8768 */ public GcSeasonTransferInventoryData SeasonTransferInventoryData; [NMS(Index = 10)] - /* 0x88D8 */ public List EarnedSeasonSpecialRewards; + /* 0x88E8 */ public List EarnedSeasonSpecialRewards; [NMS(Index = 13)] - /* 0x88E8 */ public List UsedDiscoveryOwnersV2; + /* 0x88F8 */ public List UsedDiscoveryOwnersV2; [NMS(Index = 12)] - /* 0x88F8 */ public List UsedPlatforms; + /* 0x8908 */ public List UsedPlatforms; [NMS(Index = 11)] - /* 0x8908 */ public ulong SaveUniversalId; + /* 0x8918 */ public ulong SaveUniversalId; [NMS(Index = 1)] - /* 0x8910 */ public ulong TotalPlayTime; + /* 0x8920 */ public ulong TotalPlayTime; [NMS(Index = 0)] - /* 0x8918 */ public NMSString0x80 SaveName; + /* 0x8928 */ public NMSString0x80 SaveName; [NMS(Index = 2)] - /* 0x8998 */ public bool UsesThirdPersonCharacterCam; + /* 0x89A8 */ public bool UsesThirdPersonCharacterCam; [NMS(Index = 4)] - /* 0x8999 */ public bool UsesThirdPersonShipCam; + /* 0x89A9 */ public bool UsesThirdPersonShipCam; [NMS(Index = 3)] - /* 0x899A */ public bool UsesThirdPersonVehicleCam; + /* 0x89AA */ public bool UsesThirdPersonVehicleCam; } } diff --git a/libMBIN/Source/NMS/GameComponents/GcScannerIcons.cs b/libMBIN/Source/NMS/GameComponents/GcScannerIcons.cs index 4364a60f1..03fa90c96 100644 --- a/libMBIN/Source/NMS/GameComponents/GcScannerIcons.cs +++ b/libMBIN/Source/NMS/GameComponents/GcScannerIcons.cs @@ -3,58 +3,58 @@ namespace libMBIN.NMS.GameComponents { - [NMS(GUID = 0x34C256D067AA1682, NameHash = 0xF873D7AD)] + [NMS(GUID = 0xE222DE89F2565EAB, NameHash = 0xF873D7AD)] public class GcScannerIcons : NMSTemplate { - [NMS(Index = 40, Size = 0x4E, EnumType = typeof(GcScannerIconTypes.ScanIconTypeEnum))] + [NMS(Index = 41, Size = 0x4E, EnumType = typeof(GcScannerIconTypes.ScanIconTypeEnum))] /* 0x0000 */ public Colour[] ScannableColours; - [NMS(Index = 62, Size = 0x4)] + [NMS(Index = 63, Size = 0x4)] /* 0x04E0 */ public Colour[] NetworkFSPlayerColours; - [NMS(Index = 41)] - /* 0x0520 */ public Colour BuildingColour; [NMS(Index = 42)] - /* 0x0530 */ public Colour GenericColour; + /* 0x0520 */ public Colour BuildingColour; [NMS(Index = 43)] - /* 0x0540 */ public Colour RelicColour; + /* 0x0530 */ public Colour GenericColour; [NMS(Index = 44)] - /* 0x0550 */ public Colour SignalColour; + /* 0x0540 */ public Colour RelicColour; [NMS(Index = 45)] + /* 0x0550 */ public Colour SignalColour; + [NMS(Index = 46)] /* 0x0560 */ public Colour UnknownColour; - [NMS(Index = 38, Size = 0x4E, EnumType = typeof(GcScannerIconTypes.ScanIconTypeEnum))] - /* 0x0570 */ public GcScannerIcon[] ScannableIcons; [NMS(Index = 39, Size = 0x4E, EnumType = typeof(GcScannerIconTypes.ScanIconTypeEnum))] + /* 0x0570 */ public GcScannerIcon[] ScannableIcons; + [NMS(Index = 40, Size = 0x4E, EnumType = typeof(GcScannerIconTypes.ScanIconTypeEnum))] /* 0x1680 */ public GcScannerIcon[] ScannableIconsBinocs; - [NMS(Index = 35, Size = 0x25, EnumType = typeof(GcScannerBuildingIconTypes.ScanBuildingIconTypeEnum))] - /* 0x2790 */ public GcScannerIcon[] BuildingIcons; [NMS(Index = 36, Size = 0x25, EnumType = typeof(GcScannerBuildingIconTypes.ScanBuildingIconTypeEnum))] - /* 0x2FA8 */ public GcScannerIcon[] BuildingIconsBinocs; + /* 0x2790 */ public GcScannerIcon[] BuildingIcons; [NMS(Index = 37, Size = 0x25, EnumType = typeof(GcScannerBuildingIconTypes.ScanBuildingIconTypeEnum))] + /* 0x2FA8 */ public GcScannerIcon[] BuildingIconsBinocs; + [NMS(Index = 38, Size = 0x25, EnumType = typeof(GcScannerBuildingIconTypes.ScanBuildingIconTypeEnum))] /* 0x37C0 */ public GcScannerIcon[] BuildingIconsHuge; [NMS(Index = 5, Size = 0x7, EnumType = typeof(GcVehicleType.VehicleTypeEnum))] /* 0x3FD8 */ public GcScannerIcon[] Vehicles; - [NMS(Index = 34, Size = 0x6, EnumType = typeof(GcGenericIconTypes.GenericIconTypeEnum))] + [NMS(Index = 35, Size = 0x6, EnumType = typeof(GcGenericIconTypes.GenericIconTypeEnum))] /* 0x4160 */ public GcScannerIcon[] GenericIcons; - [NMS(Index = 63, Size = 0x4)] + [NMS(Index = 64, Size = 0x4)] /* 0x42B0 */ public GcScannerIcon[] NetworkFSPlayerCorvetteTeleporter; - [NMS(Index = 60, Size = 0x4)] - /* 0x4390 */ public GcScannerIcon[] NetworkFSPlayerMarkers; [NMS(Index = 61, Size = 0x4)] + /* 0x4390 */ public GcScannerIcon[] NetworkFSPlayerMarkers; + [NMS(Index = 62, Size = 0x4)] /* 0x4470 */ public GcScannerIcon[] NetworkFSPlayerMarkersShip; - [NMS(Index = 64, Size = 0x4)] + [NMS(Index = 65, Size = 0x4)] /* 0x4550 */ public GcScannerIcon[] NetworkPlayerFreighter; - [NMS(Index = 73, Size = 0x5, EnumType = typeof(GcScannerIconHighlightTypes.ScannerIconHighlightTypeEnum))] + [NMS(Index = 74, Size = 0x5, EnumType = typeof(GcScannerIconHighlightTypes.ScannerIconHighlightTypeEnum))] /* 0x4630 */ public TkTextureResource[] HighlightIcons; - [NMS(Index = 33)] + [NMS(Index = 34)] /* 0x46A8 */ public GcScannerIcon ArrowLarge; - [NMS(Index = 32)] + [NMS(Index = 33)] /* 0x46E0 */ public GcScannerIcon ArrowSmall; - [NMS(Index = 51)] + [NMS(Index = 52)] /* 0x4718 */ public GcScannerIcon BaseBuildingMarker; [NMS(Index = 18)] /* 0x4750 */ public GcScannerIcon Battle; - [NMS(Index = 22)] + [NMS(Index = 23)] /* 0x4788 */ public GcScannerIcon BattleSmall; - [NMS(Index = 66)] + [NMS(Index = 67)] /* 0x47C0 */ public GcScannerIcon BlackHole; [NMS(Index = 15)] /* 0x47F8 */ public GcScannerIcon Bounty1; @@ -62,43 +62,43 @@ public class GcScannerIcons : NMSTemplate /* 0x4830 */ public GcScannerIcon Bounty2; [NMS(Index = 17)] /* 0x4868 */ public GcScannerIcon Bounty3; - [NMS(Index = 21)] + [NMS(Index = 22)] /* 0x48A0 */ public GcScannerIcon BountySmall; - [NMS(Index = 24)] + [NMS(Index = 25)] /* 0x48D8 */ public GcScannerIcon Checkpoint; - [NMS(Index = 29)] + [NMS(Index = 30)] /* 0x4910 */ public GcScannerIcon CircleAnimation; [NMS(Index = 3)] /* 0x4948 */ public GcScannerIcon Corvette; - [NMS(Index = 28)] + [NMS(Index = 29)] /* 0x4980 */ public GcScannerIcon CorvetteDeployedTeleporter; - [NMS(Index = 68)] + [NMS(Index = 69)] /* 0x49B8 */ public GcScannerIcon CreatureAction; - [NMS(Index = 67)] + [NMS(Index = 68)] /* 0x49F0 */ public GcScannerIcon CreatureCurious; - [NMS(Index = 70)] + [NMS(Index = 71)] /* 0x4A28 */ public GcScannerIcon CreatureDanger; - [NMS(Index = 46)] + [NMS(Index = 47)] /* 0x4A60 */ public GcScannerIcon CreatureDiscovered; - [NMS(Index = 71)] + [NMS(Index = 72)] /* 0x4A98 */ public GcScannerIcon CreatureFiend; - [NMS(Index = 79)] + [NMS(Index = 80)] /* 0x4AD0 */ public GcScannerIcon CreatureInteraction; - [NMS(Index = 72)] + [NMS(Index = 73)] /* 0x4B08 */ public GcScannerIcon CreatureMilk; - [NMS(Index = 69)] + [NMS(Index = 70)] /* 0x4B40 */ public GcScannerIcon CreatureTame; - [NMS(Index = 47)] - /* 0x4B78 */ public GcScannerIcon CreatureUndiscovered; [NMS(Index = 48)] + /* 0x4B78 */ public GcScannerIcon CreatureUndiscovered; + [NMS(Index = 49)] /* 0x4BB0 */ public GcScannerIcon CreatureUnknown; [NMS(Index = 9)] /* 0x4BE8 */ public GcScannerIcon DamagedFrigate; [NMS(Index = 14)] /* 0x4C20 */ public GcScannerIcon Death; - [NMS(Index = 20)] + [NMS(Index = 21)] /* 0x4C58 */ public GcScannerIcon DeathSmall; - [NMS(Index = 31)] + [NMS(Index = 32)] /* 0x4C90 */ public GcScannerIcon DiamondAnimation; [NMS(Index = 13)] /* 0x4CC8 */ public GcScannerIcon EditingBase; @@ -108,79 +108,81 @@ public class GcScannerIcons : NMSTemplate /* 0x4D38 */ public GcScannerIcon Freighter; [NMS(Index = 7)] /* 0x4D70 */ public GcScannerIcon FreighterBase; - [NMS(Index = 86)] + [NMS(Index = 87)] /* 0x4DA8 */ public GcScannerIcon FriendlyDrone; - [NMS(Index = 25)] + [NMS(Index = 26)] /* 0x4DE0 */ public GcScannerIcon Garage; - [NMS(Index = 30)] + [NMS(Index = 31)] /* 0x4E18 */ public GcScannerIcon HexAnimation; - [NMS(Index = 49)] - /* 0x4E50 */ public GcScannerIcon MessageBeacon; [NMS(Index = 50)] + /* 0x4E50 */ public GcScannerIcon MessageBeacon; + [NMS(Index = 51)] /* 0x4E88 */ public GcScannerIcon MessageBeaconSmall; - [NMS(Index = 78)] + [NMS(Index = 79)] /* 0x4EC0 */ public GcScannerIcon MissionAbandonedFreighter; - [NMS(Index = 75)] + [NMS(Index = 76)] /* 0x4EF8 */ public GcScannerIcon MissionEnterBuilding; - [NMS(Index = 77)] + [NMS(Index = 78)] /* 0x4F30 */ public GcScannerIcon MissionEnterFreighter; - [NMS(Index = 74)] + [NMS(Index = 75)] /* 0x4F68 */ public GcScannerIcon MissionEnterOrbit; - [NMS(Index = 76)] + [NMS(Index = 77)] /* 0x4FA0 */ public GcScannerIcon MissionEnterStation; - [NMS(Index = 56)] - /* 0x4FD8 */ public GcScannerIcon MonumentMarker; [NMS(Index = 57)] - /* 0x5010 */ public GcScannerIcon NetworkPlayerMarker; + /* 0x4FD8 */ public GcScannerIcon MonumentMarker; [NMS(Index = 58)] - /* 0x5048 */ public GcScannerIcon NetworkPlayerMarkerShip; + /* 0x5010 */ public GcScannerIcon NetworkPlayerMarker; [NMS(Index = 59)] + /* 0x5048 */ public GcScannerIcon NetworkPlayerMarkerShip; + [NMS(Index = 60)] /* 0x5080 */ public GcScannerIcon NetworkPlayerMarkerVehicle; - [NMS(Index = 26)] + [NMS(Index = 27)] /* 0x50B8 */ public GcScannerIcon NPC; - [NMS(Index = 85)] + [NMS(Index = 86)] /* 0x50F0 */ public GcScannerIcon OtherPlayerSettlement; - [NMS(Index = 81)] + [NMS(Index = 82)] /* 0x5128 */ public GcScannerIcon Pet; - [NMS(Index = 83)] + [NMS(Index = 84)] /* 0x5160 */ public GcScannerIcon PetActivity; - [NMS(Index = 80)] + [NMS(Index = 81)] /* 0x5198 */ public GcScannerIcon PetInteraction; - [NMS(Index = 82)] + [NMS(Index = 83)] /* 0x51D0 */ public GcScannerIcon PetSad; - [NMS(Index = 87)] + [NMS(Index = 88)] /* 0x5208 */ public GcScannerIcon PirateRaid; - [NMS(Index = 54)] + [NMS(Index = 55)] /* 0x5240 */ public GcScannerIcon PlanetPoleEast; - [NMS(Index = 52)] - /* 0x5278 */ public GcScannerIcon PlanetPoleNorth; [NMS(Index = 53)] + /* 0x5278 */ public GcScannerIcon PlanetPoleNorth; + [NMS(Index = 54)] /* 0x52B0 */ public GcScannerIcon PlanetPoleSouth; - [NMS(Index = 55)] + [NMS(Index = 56)] /* 0x52E8 */ public GcScannerIcon PlanetPoleWest; [NMS(Index = 12)] /* 0x5320 */ public GcScannerIcon PlayerBase; [NMS(Index = 8)] /* 0x5358 */ public GcScannerIcon PlayerFreighter; - [NMS(Index = 84)] + [NMS(Index = 85)] /* 0x5390 */ public GcScannerIcon PlayerSettlement; - [NMS(Index = 65)] + [NMS(Index = 66)] /* 0x53C8 */ public GcScannerIcon PortalMarker; [NMS(Index = 10)] /* 0x5400 */ public GcScannerIcon PurchasableFrigate; - [NMS(Index = 27)] + [NMS(Index = 28)] /* 0x5438 */ public GcScannerIcon SettlementNPC; [NMS(Index = 2)] /* 0x5470 */ public GcScannerIcon Ship; - [NMS(Index = 19)] + [NMS(Index = 20)] /* 0x54A8 */ public GcScannerIcon ShipSmall; + [NMS(Index = 19)] + /* 0x54E0 */ public GcScannerIcon SwarmHiveBattle; [NMS(Index = 0)] - /* 0x54E0 */ public GcScannerIcon TaggedBuilding; + /* 0x5518 */ public GcScannerIcon TaggedBuilding; [NMS(Index = 1)] - /* 0x5518 */ public GcScannerIcon TaggedPlanet; - [NMS(Index = 23)] - /* 0x5550 */ public GcScannerIcon TimedEvent; + /* 0x5550 */ public GcScannerIcon TaggedPlanet; + [NMS(Index = 24)] + /* 0x5588 */ public GcScannerIcon TimedEvent; [NMS(Index = 4)] - /* 0x5588 */ public GcScannerIcon VehicleGeneric; + /* 0x55C0 */ public GcScannerIcon VehicleGeneric; } } diff --git a/libMBIN/Source/NMS/GameComponents/GcSeasonStateData.cs b/libMBIN/Source/NMS/GameComponents/GcSeasonStateData.cs index f34f41dc2..503be48b9 100644 --- a/libMBIN/Source/NMS/GameComponents/GcSeasonStateData.cs +++ b/libMBIN/Source/NMS/GameComponents/GcSeasonStateData.cs @@ -3,30 +3,32 @@ namespace libMBIN.NMS.GameComponents { - [NMS(GUID = 0x9017817288EBBA82, NameHash = 0xF5D18571)] + [NMS(GUID = 0xBEB88A8FE789016C, NameHash = 0xF5D18571)] public class GcSeasonStateData : NMSTemplate { [NMS(Index = 9)] /* 0x000 */ public GcInventoryContainer SeasonTransferInventory; + [NMS(Index = 11)] + /* 0x160 */ public List AdditionalProtectedUAs; [NMS(Index = 0)] - /* 0x160 */ public List MilestoneValues; + /* 0x170 */ public List MilestoneValues; [NMS(Index = 7)] - /* 0x170 */ public List ProtectedEvents; + /* 0x180 */ public List ProtectedEvents; [NMS(Index = 5)] - /* 0x180 */ public List RendezvousParticipants; + /* 0x190 */ public List RendezvousParticipants; [NMS(Index = 4)] - /* 0x190 */ public List RendezvousUAs; + /* 0x1A0 */ public List RendezvousUAs; [NMS(Index = 1)] - /* 0x1A0 */ public List RewardCollected; + /* 0x1B0 */ public List RewardCollected; [NMS(Index = 10)] - /* 0x1B0 */ public GcSeasonEndRewardsRedemptionState EndRewardsRedemptionState; + /* 0x1C0 */ public GcSeasonEndRewardsRedemptionState EndRewardsRedemptionState; [NMS(Index = 3)] - /* 0x1B4 */ public int PinnedMilestone; + /* 0x1C4 */ public int PinnedMilestone; [NMS(Index = 2)] - /* 0x1B8 */ public int PinnedStage; + /* 0x1C8 */ public int PinnedStage; [NMS(Index = 8)] - /* 0x1BC */ public GcSeasonSaveStateOnDeath StateOnDeath; + /* 0x1CC */ public GcSeasonSaveStateOnDeath StateOnDeath; [NMS(Index = 6)] - /* 0x1C0 */ public bool HasCollectedFinalReward; + /* 0x1D0 */ public bool HasCollectedFinalReward; } } diff --git a/libMBIN/Source/Version.cs b/libMBIN/Source/Version.cs index e2f895aa6..eb47f9ca2 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 = "6.43.0.1"; + internal const string VERSION_STRING = "6.44.0.1"; /// Shorthand for AssemblyVersion.Major public static int Major => AssemblyVersion.Major;