From 1f967a27b42e5e8621baa4c182f473b5720afa27 Mon Sep 17 00:00:00 2001 From: HolterPhylo Date: Tue, 3 Nov 2026 17:02:56 -0500 Subject: [PATCH] Update for 26413549 --- .../GcDeliverableSpawnerComponentData.cs | 6 +- .../GcMissionConditionDeliverableStatus.cs | 16 ++- .../GcMoveableObjectComponentData.cs | 34 ++--- .../GcNetworkOwnershipPriority.cs | 23 +-- .../Source/NMS/Globals/GcBuildingGlobals.cs | 132 +++++++++--------- libMBIN/Source/Version.cs | 2 +- 6 files changed, 113 insertions(+), 100 deletions(-) diff --git a/libMBIN/Source/NMS/GameComponents/GcDeliverableSpawnerComponentData.cs b/libMBIN/Source/NMS/GameComponents/GcDeliverableSpawnerComponentData.cs index 969b98a72..36281499b 100644 --- a/libMBIN/Source/NMS/GameComponents/GcDeliverableSpawnerComponentData.cs +++ b/libMBIN/Source/NMS/GameComponents/GcDeliverableSpawnerComponentData.cs @@ -3,10 +3,12 @@ namespace libMBIN.NMS.GameComponents { - [NMS(GUID = 0xCC4CEA885206F375, NameHash = 0xCB8DA6A6)] + [NMS(GUID = 0xD839C067418F5010, NameHash = 0xCB8DA6A6)] public class GcDeliverableSpawnerComponentData : NMSTemplate { [NMS(Index = 0)] - /* 0x0 */ public List SpawnEntries; + /* 0x00 */ public List SpawnEntries; + [NMS(Index = 1)] + /* 0x10 */ public float SpawnInterval; } } diff --git a/libMBIN/Source/NMS/GameComponents/GcMissionConditionDeliverableStatus.cs b/libMBIN/Source/NMS/GameComponents/GcMissionConditionDeliverableStatus.cs index c3370f33c..3ddd6906b 100644 --- a/libMBIN/Source/NMS/GameComponents/GcMissionConditionDeliverableStatus.cs +++ b/libMBIN/Source/NMS/GameComponents/GcMissionConditionDeliverableStatus.cs @@ -1,15 +1,21 @@ namespace libMBIN.NMS.GameComponents { - [NMS(GUID = 0x3729545429FB51AE, NameHash = 0xEDAF3B07)] + [NMS(GUID = 0x3C538D964D6206BA, NameHash = 0xEDAF3B07)] public class GcMissionConditionDeliverableStatus : NMSTemplate { + [NMS(Index = 5)] + /* 0x00 */ public VariableSizeString TextTagForCurrent; + [NMS(Index = 6)] + /* 0x10 */ public VariableSizeString TextTagForTarget; [NMS(Index = 3)] - /* 0x0 */ public float DistanceThreshold; + /* 0x20 */ public float DistanceThreshold; + [NMS(Index = 4)] + /* 0x24 */ public bool CheckDeliveredAll; [NMS(Index = 2)] - /* 0x4 */ public bool CheckDistance; + /* 0x25 */ public bool CheckDistance; [NMS(Index = 0)] - /* 0x5 */ public bool CheckExists; + /* 0x26 */ public bool CheckExists; [NMS(Index = 1)] - /* 0x6 */ public bool PassIfExists; + /* 0x27 */ public bool PassIfExists; } } diff --git a/libMBIN/Source/NMS/GameComponents/GcMoveableObjectComponentData.cs b/libMBIN/Source/NMS/GameComponents/GcMoveableObjectComponentData.cs index f5f7ad5f9..8ad130615 100644 --- a/libMBIN/Source/NMS/GameComponents/GcMoveableObjectComponentData.cs +++ b/libMBIN/Source/NMS/GameComponents/GcMoveableObjectComponentData.cs @@ -1,19 +1,19 @@ namespace libMBIN.NMS.GameComponents { - [NMS(GUID = 0x54D5EE5CA091C075, NameHash = 0xC402725B)] + [NMS(GUID = 0xB14A3EEF64EEF65B, NameHash = 0xC402725B)] public class GcMoveableObjectComponentData : NMSTemplate { [NMS(Index = 10)] /* 0x000 */ public Vector3f GravGunGrabRotationTarget; - [NMS(Index = 36)] + [NMS(Index = 37)] /* 0x010 */ public NMSString0x20A TipLocIdGrab; - [NMS(Index = 38)] - /* 0x030 */ public NMSString0x20A TipLocIdGrabNoTech; [NMS(Index = 39)] - /* 0x050 */ public NMSString0x20A TipLocIdGrabShoot; + /* 0x030 */ public NMSString0x20A TipLocIdGrabNoTech; [NMS(Index = 40)] + /* 0x050 */ public NMSString0x20A TipLocIdGrabShoot; + [NMS(Index = 41)] /* 0x070 */ public NMSString0x20A TipLocIdGrabShootCycle; - [NMS(Index = 37)] + [NMS(Index = 38)] /* 0x090 */ public NMSString0x20A TipLocIdGrabUnequipped; [NMS(Index = 5)] /* 0x0B0 */ public NMSString0x10 DefaultCollisionEffect; @@ -47,13 +47,13 @@ public class GcMoveableObjectComponentData : NMSTemplate /* 0x10C */ public float GravGunHoldOffsetSide; [NMS(Index = 19)] /* 0x110 */ public float GravGunHoldOffsetUp; - [NMS(Index = 31)] + [NMS(Index = 32)] /* 0x114 */ public float ImmediateMeltdownChance; [NMS(Index = 4)] /* 0x118 */ public float MaxImpactScale; [NMS(Index = 1)] /* 0x11C */ public float MaxImpactStrength; - [NMS(Index = 30)] + [NMS(Index = 31)] /* 0x120 */ public float MeltdownChance; [NMS(Index = 3)] /* 0x124 */ public float MinImpactScale; @@ -69,21 +69,23 @@ public class GcMoveableObjectComponentData : NMSTemplate /* 0x138 */ public float OnTruckMinRelativeVelocityModifier; [NMS(Index = 12)] /* 0x13C */ public float SecondsToDisableCollisionAfterGrabbing; - [NMS(Index = 32)] + [NMS(Index = 33)] /* 0x140 */ public float SpaceFloaterChanceOnDetatch; - [NMS(Index = 34)] + [NMS(Index = 35)] /* 0x144 */ public bool CanGoInBiggs; [NMS(Index = 27)] /* 0x145 */ public bool LocalOnlyDetach; - [NMS(Index = 28)] + [NMS(Index = 29)] /* 0x146 */ public bool MakeMasterModel; - [NMS(Index = 33)] + [NMS(Index = 34)] /* 0x147 */ public bool MarkPoiAsCompleteOnDetach; - [NMS(Index = 29)] + [NMS(Index = 30)] /* 0x148 */ public bool NotifyParentEncounterWhenGrabbed; + [NMS(Index = 28)] + /* 0x149 */ public bool ReplicateBeforeDetach; [NMS(Index = 9)] - /* 0x149 */ public bool UseGravGunGrabRotationTarget; - [NMS(Index = 35)] - /* 0x14A */ public bool UseHighlightEffect; + /* 0x14A */ public bool UseGravGunGrabRotationTarget; + [NMS(Index = 36)] + /* 0x14B */ public bool UseHighlightEffect; } } diff --git a/libMBIN/Source/NMS/GameComponents/GcNetworkOwnershipPriority.cs b/libMBIN/Source/NMS/GameComponents/GcNetworkOwnershipPriority.cs index 529cc5926..b225a4174 100644 --- a/libMBIN/Source/NMS/GameComponents/GcNetworkOwnershipPriority.cs +++ b/libMBIN/Source/NMS/GameComponents/GcNetworkOwnershipPriority.cs @@ -1,19 +1,20 @@ namespace libMBIN.NMS.GameComponents { - [NMS(GUID = 0x63D492675A119CD5, NameHash = 0x94497FE7)] + [NMS(GUID = 0x2407553FEC1F9C70, NameHash = 0x94497FE7)] public class GcNetworkOwnershipPriority : NMSTemplate { - // size: 0x9 - public enum NetworkOwnershipPriorityEnum : byte { + // size: 0xA + public enum NetworkOwnershipPriorityEnum : ushort { None = 0x0, - CargoAttractedByAttractor = 0x1, - CargoInScrapyard = 0x2, - CargoInVehicle = 0x4, - CargoHoveredByGravLaser = 0x8, - CargoInContactWithPlayer = 0x10, - CargoGrabbedByGravLaser = 0x20, - IsBeingInteractedWith = 0x40, - OwnedAndAbsolutelyBlocked = 0x80, + CargoAlwaysRequiresPermission = 0x1, + CargoAttractedByAttractor = 0x2, + CargoInScrapyard = 0x4, + CargoInVehicle = 0x8, + CargoHoveredByGravLaser = 0x10, + CargoInContactWithPlayer = 0x20, + CargoGrabbedByGravLaser = 0x40, + IsBeingInteractedWith = 0x80, + OwnedAndAbsolutelyBlocked = 0x100, } [NMS(Index = 0)] /* 0x0 */ public NetworkOwnershipPriorityEnum NetworkOwnershipPriority; diff --git a/libMBIN/Source/NMS/Globals/GcBuildingGlobals.cs b/libMBIN/Source/NMS/Globals/GcBuildingGlobals.cs index 27fd1efc0..5eb9aa4e6 100644 --- a/libMBIN/Source/NMS/Globals/GcBuildingGlobals.cs +++ b/libMBIN/Source/NMS/Globals/GcBuildingGlobals.cs @@ -3,7 +3,7 @@ namespace libMBIN.NMS.Globals { - [NMS(GUID = 0x90C93059DADEB69C, NameHash = 0x1A517154)] + [NMS(GUID = 0x5A81B3E16A36B7CB, NameHash = 0x1A517154)] public class GcBuildingGlobals : NMSTemplate { [NMS(Index = 0)] @@ -20,7 +20,7 @@ public class GcBuildingGlobals : NMSTemplate /* 0x950 */ public TkTextureResource ScreenSpaceRotationGlow; [NMS(Index = 13)] /* 0x968 */ public TkTextureResource ScreenSpaceRotationIcon; - [NMS(Index = 195)] + [NMS(Index = 196)] /* 0x980 */ public GcFilename FreighterBaseSpawnOverride; // size: 0x4 public enum ActiveLodDistancesEnum { @@ -66,15 +66,15 @@ public enum TotalSpaceFrameTimeForComplexityEnum { /* 0xA5C */ public float AmountToMoveMarkerRoundSphere; [NMS(Index = 174)] /* 0xA60 */ public GcBaseBuildingCameraMode BaseBuildingCamMode; - [NMS(Index = 197)] + [NMS(Index = 198)] /* 0xA64 */ public float BaseBuildingTerrainEditBaseYOffset; - [NMS(Index = 199)] + [NMS(Index = 200)] /* 0xA68 */ public float BaseBuildingTerrainEditBoundsScalar; - [NMS(Index = 198)] + [NMS(Index = 199)] /* 0xA6C */ public float BaseBuildingTerrainEditTopYOffset; - [NMS(Index = 200)] - /* 0xA70 */ public float BaseBuildingWiringSnappingScaleFactorEasy; [NMS(Index = 201)] + /* 0xA70 */ public float BaseBuildingWiringSnappingScaleFactorEasy; + [NMS(Index = 202)] /* 0xA74 */ public float BaseBuildingWiringSnappingScaleFactorHard; [NMS(Index = 125)] /* 0xA78 */ public float BaseRadiusExtension; @@ -222,9 +222,9 @@ public enum TotalSpaceFrameTimeForComplexityEnum { /* 0xB94 */ public float ChanceOfAddingShelter; [NMS(Index = 104)] /* 0xB98 */ public float CompassIconSize; - [NMS(Index = 190)] + [NMS(Index = 191)] /* 0xB9C */ public float ComplexityDensitySigmaSquared; - [NMS(Index = 189)] + [NMS(Index = 190)] /* 0xBA0 */ public float ComplexityDensityTestRange; [NMS(Index = 100)] /* 0xBA4 */ public float DistanceForTooltip; @@ -312,11 +312,11 @@ public enum TotalSpaceFrameTimeForComplexityEnum { /* 0xC48 */ public float MarkerTimeIncrease; [NMS(Index = 112)] /* 0xC4C */ public float MarkerTransitionDistance; - [NMS(Index = 202)] + [NMS(Index = 203)] /* 0xC50 */ public int MaxDownloadedBaseTerrainEditsToApply; [NMS(Index = 118)] /* 0xC54 */ public float MaxIconRange; - [NMS(Index = 188)] + [NMS(Index = 189)] /* 0xC58 */ public float MaximumComplexityDensity; [NMS(Index = 55)] /* 0xC5C */ public float MaxLineLength; @@ -340,105 +340,107 @@ public enum TotalSpaceFrameTimeForComplexityEnum { /* 0xC80 */ public float MinLineLengthShip; [NMS(Index = 186)] /* 0xC84 */ public float MinLoadingPercentageNodesBufferFree; + [NMS(Index = 187)] + /* 0xC88 */ public int MinNodesBufferFree; [NMS(Index = 185)] - /* 0xC88 */ public float MinPercentageNodesBufferFree; + /* 0xC8C */ public float MinPercentageNodesBufferFree; [NMS(Index = 64)] - /* 0xC8C */ public float MinRadius; + /* 0xC90 */ public float MinRadius; [NMS(Index = 124)] - /* 0xC90 */ public float MinRadiusForBases; + /* 0xC94 */ public float MinRadiusForBases; [NMS(Index = 131)] - /* 0xC94 */ public float MinRadiusFromFeaturedBases; + /* 0xC98 */ public float MinRadiusFromFeaturedBases; [NMS(Index = 121)] - /* 0xC98 */ public int MinShipScanBuildings; + /* 0xC9C */ public int MinShipScanBuildings; [NMS(Index = 77)] - /* 0xC9C */ public float MinTimeBetweenBuildingEntryMessage; + /* 0xCA0 */ public float MinTimeBetweenBuildingEntryMessage; [NMS(Index = 78)] - /* 0xCA0 */ public float MinTimeBetweenBuildingEntryMessageBase; + /* 0xCA4 */ public float MinTimeBetweenBuildingEntryMessageBase; [NMS(Index = 89)] - /* 0xCA4 */ public float NearLineScaleFactor; + /* 0xCA8 */ public float NearLineScaleFactor; [NMS(Index = 87)] - /* 0xCA8 */ public float NearMaxLineLength; + /* 0xCAC */ public float NearMaxLineLength; [NMS(Index = 81)] - /* 0xCAC */ public float NearMinAlpha; + /* 0xCB0 */ public float NearMinAlpha; [NMS(Index = 88)] - /* 0xCB0 */ public float NearMinLineLength; + /* 0xCB4 */ public float NearMinLineLength; [NMS(Index = 69)] - /* 0xCB4 */ public float ObjectFadeRadius; - [NMS(Index = 187)] - /* 0xCB8 */ public float PercentagePhysicsComponentsForComplexity; + /* 0xCB8 */ public float ObjectFadeRadius; + [NMS(Index = 188)] + /* 0xCBC */ public float PercentagePhysicsComponentsForComplexity; [NMS(Index = 17)] - /* 0xCBC */ public float PowerlineSnapDistance; + /* 0xCC0 */ public float PowerlineSnapDistance; [NMS(Index = 65)] - /* 0xCC0 */ public float RadiusMultiplier_DoNotPlace; + /* 0xCC4 */ public float RadiusMultiplier_DoNotPlace; [NMS(Index = 67)] - /* 0xCC4 */ public float RadiusMultiplier_DoNotPlaceAnywhereNear; + /* 0xCC8 */ public float RadiusMultiplier_DoNotPlaceAnywhereNear; [NMS(Index = 66)] - /* 0xCC8 */ public float RadiusMultiplier_DoNotPlaceClose; + /* 0xCCC */ public float RadiusMultiplier_DoNotPlaceClose; [NMS(Index = 68)] - /* 0xCCC */ public float RadiusMultiplier_OnlyPlaceAround; + /* 0xCD0 */ public float RadiusMultiplier_OnlyPlaceAround; [NMS(Index = 71)] - /* 0xCD0 */ public float Radius_DoNotPlaceAnywhereNear; + /* 0xCD4 */ public float Radius_DoNotPlaceAnywhereNear; [NMS(Index = 75)] - /* 0xCD4 */ public float SectorMessageCenterDistance; + /* 0xCD8 */ public float SectorMessageCenterDistance; [NMS(Index = 76)] - /* 0xCD8 */ public float SectorMessageMinTime; + /* 0xCDC */ public float SectorMessageMinTime; [NMS(Index = 74)] - /* 0xCDC */ public float SectorMessageReshowDistance; + /* 0xCE0 */ public float SectorMessageReshowDistance; [NMS(Index = 116)] - /* 0xCE0 */ public float ShowTimeNotDistance; + /* 0xCE4 */ public float ShowTimeNotDistance; [NMS(Index = 105)] - /* 0xCE4 */ public float SmallIconArrowOffset; + /* 0xCE8 */ public float SmallIconArrowOffset; [NMS(Index = 101)] - /* 0xCE8 */ public float SmallIconSize; + /* 0xCEC */ public float SmallIconSize; [NMS(Index = 130)] - /* 0xCEC */ public float SpaceBaseNexusExteriorSpawnDistance; + /* 0xCF0 */ public float SpaceBaseNexusExteriorSpawnDistance; [NMS(Index = 129)] - /* 0xCF0 */ public float SpaceBaseNexusInteriorSpawnDistance; + /* 0xCF4 */ public float SpaceBaseNexusInteriorSpawnDistance; [NMS(Index = 128)] - /* 0xCF4 */ public float SpaceBaseStationSpawnDistance; + /* 0xCF8 */ public float SpaceBaseStationSpawnDistance; [NMS(Index = 114)] - /* 0xCF8 */ public float SpaceMarkerMaxHeight; + /* 0xCFC */ public float SpaceMarkerMaxHeight; [NMS(Index = 113)] - /* 0xCFC */ public float SpaceMarkerMinHeight; + /* 0xD00 */ public float SpaceMarkerMinHeight; [NMS(Index = 106)] - /* 0xD00 */ public float SpaceMarkerOffset; + /* 0xD04 */ public float SpaceMarkerOffset; [NMS(Index = 107)] - /* 0xD04 */ public float SpaceMarkerOffsetPlanet; + /* 0xD08 */ public float SpaceMarkerOffsetPlanet; [NMS(Index = 108)] - /* 0xD08 */ public float SpaceMarkerOffsetSamePlanet; + /* 0xD0C */ public float SpaceMarkerOffsetSamePlanet; + [NMS(Index = 193)] + /* 0xD10 */ public float StartCrashSiteMaxDistance; [NMS(Index = 192)] - /* 0xD0C */ public float StartCrashSiteMaxDistance; - [NMS(Index = 191)] - /* 0xD10 */ public float StartCrashSiteMinDistance; + /* 0xD14 */ public float StartCrashSiteMinDistance; + [NMS(Index = 195)] + /* 0xD18 */ public float StartShelterMaxDistance; [NMS(Index = 194)] - /* 0xD14 */ public float StartShelterMaxDistance; - [NMS(Index = 193)] - /* 0xD18 */ public float StartShelterMinDistance; + /* 0xD1C */ public float StartShelterMinDistance; [NMS(Index = 123)] - /* 0xD1C */ public float TestDistanceForSettlementBaseBufferAlignment; + /* 0xD20 */ public float TestDistanceForSettlementBaseBufferAlignment; [NMS(Index = 92)] - /* 0xD20 */ public float TextStringXOffset; + /* 0xD24 */ public float TextStringXOffset; [NMS(Index = 98)] - /* 0xD24 */ public float TextTagLength; + /* 0xD28 */ public float TextTagLength; [NMS(Index = 95)] - /* 0xD28 */ public float TextTagWidthOffset; + /* 0xD2C */ public float TextTagWidthOffset; [NMS(Index = 93)] - /* 0xD2C */ public float TextTagXOffset; + /* 0xD30 */ public float TextTagXOffset; [NMS(Index = 94)] - /* 0xD30 */ public float TextTagYOffset; + /* 0xD34 */ public float TextTagYOffset; [NMS(Index = 117)] - /* 0xD34 */ public float UnknownBuildingRange; + /* 0xD38 */ public float UnknownBuildingRange; [NMS(Index = 20)] - /* 0xD38 */ public bool AllowBuildingUsingIntermediates; - [NMS(Index = 196)] - /* 0xD39 */ public bool BaseBuildingTerrainEditBoundsOverride; + /* 0xD3C */ public bool AllowBuildingUsingIntermediates; + [NMS(Index = 197)] + /* 0xD3D */ public bool BaseBuildingTerrainEditBoundsOverride; [NMS(Index = 167)] - /* 0xD3A */ public bool BuildingPlacementEffectEnabled; + /* 0xD3E */ public bool BuildingPlacementEffectEnabled; [NMS(Index = 156)] - /* 0xD3B */ public TkCurveType BuildingPlacementGhostHeartSizeCurve; + /* 0xD3F */ public TkCurveType BuildingPlacementGhostHeartSizeCurve; [NMS(Index = 182)] - /* 0xD3C */ public bool DebugForceShowInactives; + /* 0xD40 */ public bool DebugForceShowInactives; [NMS(Index = 61)] - /* 0xD3D */ public TkCurveType LineCurve; + /* 0xD41 */ public TkCurveType LineCurve; } } diff --git a/libMBIN/Source/Version.cs b/libMBIN/Source/Version.cs index d7982c42e..4cdb332a0 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 = "7.10.0.1"; + internal const string VERSION_STRING = "7.14.0.1"; /// Shorthand for AssemblyVersion.Major public static int Major => AssemblyVersion.Major;