Merge branch 'development' into ArraySizeInfo

Author: HolterPhylo

libMBIN/Source/NMS/GameComponents/GcMissionSequenceGetToScanEvent.cs

@@ -2,48 +2,50 @@
 
 namespace libMBIN.NMS.GameComponents
 {
-    [NMS(GUID = 0x510897D81FBE174C, NameHash = 0x3D1218BD)]
+    [NMS(GUID = 0xA5E7F62486910C23, NameHash = 0x3D1218BD)]
     public class GcMissionSequenceGetToScanEvent : NMSTemplate
     {
-        [NMS(Index = 4)]
+        [NMS(Index = 5)]
         /* 0x000 */ public NMSString0x20A Event;
-        [NMS(Index = 3)]
+        [NMS(Index = 4)]
         /* 0x020 */ public NMSString0x20A NexusMessage;
-        [NMS(Index = 17)]
+        [NMS(Index = 18)]
         /* 0x040 */ public NMSString0x20A SurveyHint;
-        [NMS(Index = 15)]
-        /* 0x060 */ public NMSString0x20A SurveyInactiveHint;
         [NMS(Index = 16)]
+        /* 0x060 */ public NMSString0x20A SurveyInactiveHint;
+        [NMS(Index = 17)]
         /* 0x080 */ public NMSString0x20A SurveySwapHint;
-        [NMS(Index = 18)]
-        /* 0x0A0 */ public NMSString0x20A SurveyVehicleHint;
         [NMS(Index = 19)]
+        /* 0x0A0 */ public NMSString0x20A SurveyVehicleHint;
+        [NMS(Index = 20)]
         /* 0x0C0 */ public VariableSizeString DebugText;
         [NMS(Index = 1)]
         /* 0x0D0 */ public VariableSizeString GalaxyMapMessage;
         [NMS(Index = 2)]
         /* 0x0E0 */ public VariableSizeString GalaxyMapMessageNotSpace;
         [NMS(Index = 0)]
         /* 0x0F0 */ public VariableSizeString Message;
-        [NMS(Index = 11)]
-        /* 0x100 */ public VariableSizeString TimeoutOSD;
-        [NMS(Index = 5)]
-        /* 0x110 */ public float Distance;
-        [NMS(Index = 9)]
-        /* 0x114 */ public float Timeout;
         [NMS(Index = 12)]
-        /* 0x118 */ public GcScanEventGPSHint UseGPSInText;
-        [NMS(Index = 14)]
-        /* 0x11C */ public bool AlwaysAllowInShip;
-        [NMS(Index = 13)]
-        /* 0x11D */ public bool CanFormatObjectives;
-        [NMS(Index = 10)]
-        /* 0x11E */ public bool DistanceTimeout;
+        /* 0x100 */ public VariableSizeString TimeoutOSD;
+        [NMS(Index = 3)]
+        /* 0x110 */ public VariableSizeString UseTeleporterMessage;
         [NMS(Index = 6)]
-        /* 0x11F */ public bool EndEventWhenReached;
-        [NMS(Index = 8)]
-        /* 0x120 */ public bool RequireInsideToEnd;
+        /* 0x120 */ public float Distance;
+        [NMS(Index = 10)]
+        /* 0x124 */ public float Timeout;
+        [NMS(Index = 13)]
+        /* 0x128 */ public GcScanEventGPSHint UseGPSInText;
+        [NMS(Index = 15)]
+        /* 0x12C */ public bool AlwaysAllowInShip;
+        [NMS(Index = 14)]
+        /* 0x12D */ public bool CanFormatObjectives;
+        [NMS(Index = 11)]
+        /* 0x12E */ public bool DistanceTimeout;
         [NMS(Index = 7)]
-        /* 0x121 */ public bool WaterworldEndEventWhenPlanetReached;
+        /* 0x12F */ public bool EndEventWhenReached;
+        [NMS(Index = 9)]
+        /* 0x130 */ public bool RequireInsideToEnd;
+        [NMS(Index = 8)]
+        /* 0x131 */ public bool WaterworldEndEventWhenPlanetReached;
     }
 }

libMBIN/Source/NMS/GameComponents/GcScannableComponentData.cs

@@ -3,7 +3,7 @@
 
 namespace libMBIN.NMS.GameComponents
 {
-    [NMS(GUID = 0x90B819F607AE7368, NameHash = 0x4E404FB0)]
+    [NMS(GUID = 0x1EE9203770C1368F, NameHash = 0x4E404FB0)]
     public class GcScannableComponentData : NMSTemplate
     {
         [NMS(Index = 16)]
@@ -49,17 +49,19 @@ public enum ScannableTypeEnum : uint {
         /* 0x77 */ public bool DisableIfBuildingPart;
         [NMS(Index = 8)]
         /* 0x78 */ public bool DisableIfInBase;
+        [NMS(Index = 23)]
+        /* 0x79 */ public bool ForceCompassMarkerOnForScannerIcon;
         [NMS(Index = 17)]
-        /* 0x79 */ public bool GetIconAndNameFromSettlementBuilding;
+        /* 0x7A */ public bool GetIconAndNameFromSettlementBuilding;
         [NMS(Index = 13)]
-        /* 0x7A */ public bool IsPlacedMarker;
+        /* 0x7B */ public bool IsPlacedMarker;
         [NMS(Index = 19)]
-        /* 0x7B */ public bool MarkerActiveWithNodeInactive;
+        /* 0x7C */ public bool MarkerActiveWithNodeInactive;
         [NMS(Index = 14)]
-        /* 0x7C */ public bool ShowInFreighterBranchRoom;
+        /* 0x7D */ public bool ShowInFreighterBranchRoom;
         [NMS(Index = 15)]
-        /* 0x7D */ public bool TellPlayerIfFreighterObjectUsed;
+        /* 0x7E */ public bool TellPlayerIfFreighterObjectUsed;
         [NMS(Index = 9)]
-        /* 0x7E */ public bool UseModelNode;
+        /* 0x7F */ public bool UseModelNode;
     }
 }