diff --git a/libMBIN/Source/NMS/GameComponents/GcMissionConditionHasSwarmMissionsAvailable.cs b/libMBIN/Source/NMS/GameComponents/GcMissionConditionHasSwarmMissionsAvailable.cs index e2abf9dda..6e0b8c5df 100644 --- a/libMBIN/Source/NMS/GameComponents/GcMissionConditionHasSwarmMissionsAvailable.cs +++ b/libMBIN/Source/NMS/GameComponents/GcMissionConditionHasSwarmMissionsAvailable.cs @@ -1,7 +1,9 @@ namespace libMBIN.NMS.GameComponents { - [NMS(GUID = 0x27EA4CF1A3B336F3, NameHash = 0xFE3CE4AC)] + [NMS(GUID = 0xCE26CD56AEBA19A8, NameHash = 0xFE3CE4AC)] public class GcMissionConditionHasSwarmMissionsAvailable : NMSTemplate { + [NMS(Index = 0)] + /* 0x0 */ public VariableSizeString HasMainContextMessage; } } diff --git a/libMBIN/Source/NMS/GameComponents/GcMissionConditionHostileShipEncounterActive.cs b/libMBIN/Source/NMS/GameComponents/GcMissionConditionHostileShipEncounterActive.cs index 5793fa59c..3ad974bae 100644 --- a/libMBIN/Source/NMS/GameComponents/GcMissionConditionHostileShipEncounterActive.cs +++ b/libMBIN/Source/NMS/GameComponents/GcMissionConditionHostileShipEncounterActive.cs @@ -2,7 +2,7 @@ namespace libMBIN.NMS.GameComponents { - [NMS(GUID = 0xCAB5EBDED128423E, NameHash = 0x389D6F3B)] + [NMS(GUID = 0xE8AF5C28F3FF1837, NameHash = 0x389D6F3B)] public class GcMissionConditionHostileShipEncounterActive : NMSTemplate { [NMS(Index = 1)] diff --git a/libMBIN/Source/NMS/GameComponents/GcMissionConditionHostileShipEncounterPhase.cs b/libMBIN/Source/NMS/GameComponents/GcMissionConditionHostileShipEncounterPhase.cs index 065f5c5aa..d0d774f06 100644 --- a/libMBIN/Source/NMS/GameComponents/GcMissionConditionHostileShipEncounterPhase.cs +++ b/libMBIN/Source/NMS/GameComponents/GcMissionConditionHostileShipEncounterPhase.cs @@ -2,7 +2,7 @@ namespace libMBIN.NMS.GameComponents { - [NMS(GUID = 0xA8C970A95F159D5, NameHash = 0x671FAFA5)] + [NMS(GUID = 0xD75008F6C2C7122D, NameHash = 0x671FAFA5)] public class GcMissionConditionHostileShipEncounterPhase : NMSTemplate { [NMS(Index = 1)] diff --git a/libMBIN/Source/NMS/GameComponents/GcMissionConditionHostileShipEncounterResolution.cs b/libMBIN/Source/NMS/GameComponents/GcMissionConditionHostileShipEncounterResolution.cs index e700497d8..59690acae 100644 --- a/libMBIN/Source/NMS/GameComponents/GcMissionConditionHostileShipEncounterResolution.cs +++ b/libMBIN/Source/NMS/GameComponents/GcMissionConditionHostileShipEncounterResolution.cs @@ -2,7 +2,7 @@ namespace libMBIN.NMS.GameComponents { - [NMS(GUID = 0x801BEA640DB50DF3, NameHash = 0x439BD3BC)] + [NMS(GUID = 0xD35BCD77004563E7, NameHash = 0x439BD3BC)] public class GcMissionConditionHostileShipEncounterResolution : NMSTemplate { [NMS(Index = 1)] diff --git a/libMBIN/Source/NMS/GameComponents/GcMoveableObjectComponentData.cs b/libMBIN/Source/NMS/GameComponents/GcMoveableObjectComponentData.cs index 440778daa..be491600b 100644 --- a/libMBIN/Source/NMS/GameComponents/GcMoveableObjectComponentData.cs +++ b/libMBIN/Source/NMS/GameComponents/GcMoveableObjectComponentData.cs @@ -1,6 +1,6 @@ namespace libMBIN.NMS.GameComponents { - [NMS(GUID = 0x5969251BBAF2D500, NameHash = 0xC402725B)] + [NMS(GUID = 0x858E518ECD524D03, NameHash = 0xC402725B)] public class GcMoveableObjectComponentData : NMSTemplate { [NMS(Index = 10)] @@ -37,11 +37,9 @@ public class GcMoveableObjectComponentData : NMSTemplate /* 0x6C */ public float OnTruckImpactStrengthModifier; [NMS(Index = 12)] /* 0x70 */ public float OnTruckMinRelativeVelocityModifier; - [NMS(Index = 19)] - /* 0x74 */ public bool DeactivateSimpleInteractionUntilGrabbed; [NMS(Index = 18)] - /* 0x75 */ public bool NotifyParentEncounterWhenGrabbed; + /* 0x74 */ public bool NotifyParentEncounterWhenGrabbed; [NMS(Index = 9)] - /* 0x76 */ public bool UseGravGunGrabRotationTarget; + /* 0x75 */ public bool UseGravGunGrabRotationTarget; } } diff --git a/libMBIN/Source/NMS/GameComponents/GcRewardConditionalUnlockSpecial.cs b/libMBIN/Source/NMS/GameComponents/GcRewardConditionalUnlockSpecial.cs index 2938e1d04..67d8deb47 100644 --- a/libMBIN/Source/NMS/GameComponents/GcRewardConditionalUnlockSpecial.cs +++ b/libMBIN/Source/NMS/GameComponents/GcRewardConditionalUnlockSpecial.cs @@ -1,6 +1,6 @@ namespace libMBIN.NMS.GameComponents { - [NMS(GUID = 0x4142485FF95C13EA, NameHash = 0xF71AF52C)] + [NMS(GUID = 0x79BDA36B25B49650, NameHash = 0xF71AF52C)] public class GcRewardConditionalUnlockSpecial : NMSTemplate { [NMS(Index = 2)] @@ -15,13 +15,15 @@ public enum UnlockSpecialConditionEnum : uint { } [NMS(Index = 0)] /* 0x50 */ public UnlockSpecialConditionEnum UnlockSpecialCondition; - [NMS(Index = 7)] + [NMS(Index = 8)] /* 0x54 */ public bool FailIfAlreadyKnown; [NMS(Index = 6)] /* 0x55 */ public bool HideInSeasonRewards; [NMS(Index = 3)] /* 0x56 */ public bool ShowSpecialProductPopup; + [NMS(Index = 7)] + /* 0x57 */ public bool UnlockSeasonReward; [NMS(Index = 4)] - /* 0x57 */ public bool UseSpecialFormatting; + /* 0x58 */ public bool UseSpecialFormatting; } } diff --git a/libMBIN/Source/NMS/GameComponents/GcRewardRepairTech.cs b/libMBIN/Source/NMS/GameComponents/GcRewardRepairTech.cs index dbb2d6248..ebc9b8e67 100644 --- a/libMBIN/Source/NMS/GameComponents/GcRewardRepairTech.cs +++ b/libMBIN/Source/NMS/GameComponents/GcRewardRepairTech.cs @@ -2,10 +2,14 @@ namespace libMBIN.NMS.GameComponents { - [NMS(GUID = 0x1B6EE80C5B76B907, NameHash = 0xEED656C0)] + [NMS(GUID = 0xB203D07ED276578F, NameHash = 0xEED656C0)] public class GcRewardRepairTech : NMSTemplate { + [NMS(Index = 1)] + /* 0x00 */ public NMSString0x10 SpecificTechToRepair; [NMS(Index = 0)] - /* 0x0 */ public GcTechnologyCategory Category; + /* 0x10 */ public GcTechnologyCategory Category; + [NMS(Index = 2)] + /* 0x14 */ public bool ShowRepairMessage; } } diff --git a/libMBIN/Source/NMS/GameComponents/GcTriggerActionComponentData.cs b/libMBIN/Source/NMS/GameComponents/GcTriggerActionComponentData.cs index ee8b3e1e1..cbd3e4c0f 100644 --- a/libMBIN/Source/NMS/GameComponents/GcTriggerActionComponentData.cs +++ b/libMBIN/Source/NMS/GameComponents/GcTriggerActionComponentData.cs @@ -1,24 +1,23 @@ using libMBIN.NMS.GameComponents; -using System.Collections.Generic; namespace libMBIN.NMS.GameComponents { - [NMS(GUID = 0xF81D425C4F66EFAA, NameHash = 0x20597571)] + [NMS(GUID = 0xE2813EFD2D28E870, NameHash = 0x20597571)] public class GcTriggerActionComponentData : NMSTemplate { + [NMS(Index = 2, KeyField = "StateID")] + /* 0x00 */ public HashMap States; [NMS(Index = 4)] - /* 0x00 */ public NMSString0x10 PersistentState; - [NMS(Index = 2)] - /* 0x10 */ public List States; + /* 0x30 */ public NMSString0x10 PersistentState; [NMS(Index = 0)] - /* 0x20 */ public bool HideModel; + /* 0x40 */ public bool HideModel; [NMS(Index = 6)] - /* 0x21 */ public bool LinkStateToBaseGrid; + /* 0x41 */ public bool LinkStateToBaseGrid; [NMS(Index = 3)] - /* 0x22 */ public bool Persistent; + /* 0x42 */ public bool Persistent; [NMS(Index = 5)] - /* 0x23 */ public bool ResetShotTimeOnStateChange; + /* 0x43 */ public bool ResetShotTimeOnStateChange; [NMS(Index = 1)] - /* 0x24 */ public bool StartInactive; + /* 0x44 */ public bool StartInactive; } } diff --git a/libMBIN/Source/Version.cs b/libMBIN/Source/Version.cs index eb47f9ca2..40dd3f674 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.44.0.1"; + internal const string VERSION_STRING = "6.44.0.2"; /// Shorthand for AssemblyVersion.Major public static int Major => AssemblyVersion.Major;