Merge pull request #581 from HolterPhylo/UpdateFor13407450

[MRG] Update for 13407450
monkeyman192 · Feb 8, 2024 · 09879ff · 09879ff
2 parents 6bb5f98 + f6afcce
commit 09879ff
Show file tree

Hide file tree

Showing 11 changed files with 1,417 additions and 1,400 deletions.
diff --git a/libMBIN/Source/NMS/GameComponents/GcBackgroundSpaceEncounterInfo.cs b/libMBIN/Source/NMS/GameComponents/GcBackgroundSpaceEncounterInfo.cs
@@ -2,7 +2,7 @@
 
 namespace libMBIN.NMS.GameComponents
 {
-    [NMS(GUID = 0xF022D46259E222D8, NameHash = 0x9803054FC61F20F4)]
+    [NMS(GUID = 0x57D664ECDFC788E7, NameHash = 0x9803054FC61F20F4)]
     public class GcBackgroundSpaceEncounterInfo : NMSTemplate
     {
         /* 0x00 */ public NMSString0x10 Id;
@@ -12,6 +12,6 @@ public class GcBackgroundSpaceEncounterInfo : NMSTemplate
         /* 0x30 */ public float SpawnDistance;
         /* 0x34 */ public float MinDuration;
         /* 0x38 */ public float DespawnDistance;
-        /* 0x3C */ public GcPulseEncounterSpawnObject Encounter;
+        /* 0x40 */ public GcPulseEncounterSpawnObject Encounter;
     }
 }
diff --git a/libMBIN/Source/NMS/GameComponents/GcExperienceSpawnTable.cs b/libMBIN/Source/NMS/GameComponents/GcExperienceSpawnTable.cs
@@ -3,7 +3,7 @@
 
 namespace libMBIN.NMS.GameComponents
 {
-    [NMS(GUID = 0xEBD87AB92DC14AE9, NameHash = 0x5F4CA33999F0D259)]
+    [NMS(GUID = 0x71941C5EACC5E4EA, NameHash = 0x5F4CA33999F0D259)]
     public class GcExperienceSpawnTable : NMSTemplate
     {
         /* 0x000 */ public List<GcAIShipSpawnData> FlybySpawns;

diff --git a/libMBIN/Source/NMS/GameComponents/GcMissionConditionCurrentPlanetVisited.cs b/libMBIN/Source/NMS/GameComponents/GcMissionConditionCurrentPlanetVisited.cs
@@ -1,7 +1,8 @@
 namespace libMBIN.NMS.GameComponents
 {
-    [NMS(GUID = 0xEBEF5DA2F06B2B34, NameHash = 0x7CCE260D959425EE)]
+    [NMS(GUID = 0x25BE49A604767DC8, NameHash = 0x7CCE260D959425EE)]
     public class GcMissionConditionCurrentPlanetVisited : NMSTemplate
     {
+        /* 0x0 */ public bool JustTestSeasonStartPlanetHack;
     }
 }
diff --git a/libMBIN/Source/NMS/GameComponents/GcMissionConditionMissionCompleted.cs b/libMBIN/Source/NMS/GameComponents/GcMissionConditionMissionCompleted.cs
@@ -1,11 +1,12 @@
 namespace libMBIN.NMS.GameComponents
 {
-    [NMS(GUID = 0x7D58868B17FADC8C, NameHash = 0xC28C1E8A4FA47E3B)]
+    [NMS(GUID = 0x2997545CCDDD9AC1, NameHash = 0xC28C1E8A4FA47E3B)]
     public class GcMissionConditionMissionCompleted : NMSTemplate
     {
         /* 0x00 */ public NMSString0x10 MissionID;
         /* 0x10 */ public int SeasonalMissionSeed;
         /* 0x14 */ public bool TakeIDFromSeasonData;
         /* 0x15 */ public bool CalculateTextMissionTargetFromStageIndex;
+        /* 0x18 */ public int CalculateSeasonalSeedFromStageIndexOffset;
     }
 }
diff --git a/libMBIN/Source/NMS/GameComponents/GcMissionConditionPlanetDiscoveries.cs b/libMBIN/Source/NMS/GameComponents/GcMissionConditionPlanetDiscoveries.cs
@@ -0,0 +1,12 @@
+using libMBIN.NMS.GameComponents;
+
+namespace libMBIN.NMS.GameComponents
+{
+    [NMS(GUID = 0xD523F943FA186627, NameHash = 0x792A334D3849EEA1)]
+    public class GcMissionConditionPlanetDiscoveries : NMSTemplate
+    {
+        /* 0x0 */ public GcDiscoveryType DiscoveryType;
+        /* 0x4 */ public float PercentDiscovered;
+        /* 0x8 */ public bool DeepSearchDoneDiscos;
+    }
+}
diff --git a/libMBIN/Source/NMS/GameComponents/GcMissionConditionPlanetPlantDiscoveries.cs b/libMBIN/Source/NMS/GameComponents/GcMissionConditionPlanetPlantDiscoveries.cs
diff --git a/libMBIN/Source/NMS/GameComponents/GcMissionConditionThisMissionStageIndex.cs b/libMBIN/Source/NMS/GameComponents/GcMissionConditionThisMissionStageIndex.cs
@@ -0,0 +1,8 @@
+namespace libMBIN.NMS.GameComponents
+{
+    [NMS(GUID = 0xA99AE5AA393CACDF, NameHash = 0xA395C630BCD87BBC)]
+    public class GcMissionConditionThisMissionStageIndex : NMSTemplate
+    {
+        /* 0x0 */ public int StageIndex;
+    }
+}
diff --git a/libMBIN/Source/NMS/GameComponents/GcPulseEncounterSpawnObject.cs b/libMBIN/Source/NMS/GameComponents/GcPulseEncounterSpawnObject.cs
@@ -2,7 +2,7 @@
 
 namespace libMBIN.NMS.GameComponents
 {
-    [NMS(GUID = 0x9BEFE5D4AA786C4B, NameHash = 0x82C7C611E7625A21)]
+    [NMS(GUID = 0xDBD6136FBBF407B7, NameHash = 0x82C7C611E7625A21)]
     public class GcPulseEncounterSpawnObject : NMSTemplate
     {
         /* 0x00 */ public TkModelResource Object;
@@ -11,5 +11,6 @@ public class GcPulseEncounterSpawnObject : NMSTemplate
         /* 0x8C */ public float Yaw;
         /* 0x90 */ public float Roll;
         /* 0x94 */ public float UpOffset;
+        /* 0x98 */ public NMSString0x10 TriggerActionOnSpawn;
     }
 }
diff --git a/libMBIN/Source/NMS/Globals/GcUIGlobals.cs b/libMBIN/Source/NMS/Globals/GcUIGlobals.cs
diff --git 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.49.0.1";
+        internal const string VERSION_STRING = "4.49.0.2";
 
         /// <summary>Shorthand for AssemblyVersion.Major</summary>
         public static int Major      => AssemblyVersion.Major;

diff --git a/libMBIN/libMBIN-Shared.projitems b/libMBIN/libMBIN-Shared.projitems
@@ -1040,7 +1040,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Source\NMS\GameComponents\GcMissionConditionPlanetAttackPiratesActive.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Source\NMS\GameComponents\GcMissionConditionPlanetCorruptSentinelGeneration.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Source\NMS\GameComponents\GcMissionConditionPlanetCreatureRoles.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Source\NMS\GameComponents\GcMissionConditionPlanetPlantDiscoveries.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Source\NMS\GameComponents\GcMissionConditionPlanetDiscoveries.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Source\NMS\GameComponents\GcMissionConditionPlanetResourceHint.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Source\NMS\GameComponents\GcMissionConditionPlanetStatLevel.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Source\NMS\GameComponents\GcMissionConditionPrimaryExocraft.cs" />
@@ -1081,6 +1081,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Source\NMS\GameComponents\GcMissionConditionTakingDamage.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Source\NMS\GameComponents\GcMissionConditionTechnologyKnown.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Source\NMS\GameComponents\GcMissionConditionTest.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Source\NMS\GameComponents\GcMissionConditionThisMissionStageIndex.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Source\NMS\GameComponents\GcMissionConditionTotalWarpsNumber.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Source\NMS\GameComponents\GcMissionConditionTrial.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Source\NMS\GameComponents\GcMissionConditionTutorialEnabled.cs" />