Merge pull request #576 from HolterPhylo/UpdateFor12660810

[MRG] Update for 12660810
monkeyman192 · Nov 9, 2023 · b1b9614 · b1b9614
2 parents aa74654 + e649c3e
commit b1b9614
Show file tree

Hide file tree

Showing 10 changed files with 192 additions and 188 deletions.
diff --git a/libMBIN/Source/NMS/GameComponents/GcCostTable.cs b/libMBIN/Source/NMS/GameComponents/GcCostTable.cs
@@ -3,7 +3,7 @@
 
 namespace libMBIN.NMS.GameComponents
 {
-    [NMS(GUID = 0xC0A6E8AAA2663D21, NameHash = 0x6E62CCB542C4E505)]
+    [NMS(GUID = 0xCE66A2E24432399E, NameHash = 0x6E62CCB542C4E505)]
     public class GcCostTable : NMSTemplate
     {
         /* 0x00 */ public List<GcCostTableEntry> SimpleInteractionTable;

diff --git a/libMBIN/Source/NMS/GameComponents/GcCostTableEntry.cs b/libMBIN/Source/NMS/GameComponents/GcCostTableEntry.cs
@@ -1,6 +1,6 @@
 namespace libMBIN.NMS.GameComponents
 {
-    [NMS(GUID = 0xDA1B26031BC56E03, NameHash = 0x5923C0EE4B9AD427)]
+    [NMS(GUID = 0x2FEEF129329F7E46, NameHash = 0x5923C0EE4B9AD427)]
     public class GcCostTableEntry : NMSTemplate
     {
         /* 0x00 */ public NMSString0x10 Id;
@@ -12,9 +12,10 @@ public class GcCostTableEntry : NMSTemplate
         /* 0x15 */ public bool RemoveOptionIfCantAfford;
         /* 0x16 */ public bool InvertCanAffordOutcome;
         /* 0x17 */ public bool MustAffordInCreative;
-        /* 0x18 */ public bool UseCommunityContributionCap;
-        /* 0x20 */ public NMSString0x20A CannotAffordOSDMsg;
-        /* 0x40 */ public NMSString0x10 MissionMessageWhenCharged;
-        /* 0x50 */ public NMSTemplate Cost;
+        /* 0x18 */ public int CommunityContributionValue;
+        /* 0x20 */ public NMSString0x20A CommunityContributionCapLocID;
+        /* 0x40 */ public NMSString0x20A CannotAffordOSDMsg;
+        /* 0x60 */ public NMSString0x10 MissionMessageWhenCharged;
+        /* 0x70 */ public NMSTemplate Cost;
     }
 }
diff --git a/libMBIN/Source/NMS/GameComponents/GcDefaultSaveData.cs b/libMBIN/Source/NMS/GameComponents/GcDefaultSaveData.cs
@@ -2,10 +2,10 @@
 
 namespace libMBIN.NMS.GameComponents
 {
-    [NMS(GUID = 0x278CA3EA32FBF75C, NameHash = 0xF0829DCD8555A52E)]
+    [NMS(GUID = 0x91BD9250205F1E3A, NameHash = 0xF0829DCD8555A52E)]
     public class GcDefaultSaveData : NMSTemplate
     {
         /* 0x00000 */ public GcPlayerStateData State;
-        /* 0x79E10 */ public GcPlayerSpawnStateData Spawn;
+        /* 0x79E20 */ public GcPlayerSpawnStateData Spawn;
     }
 }
diff --git a/libMBIN/Source/NMS/GameComponents/GcGenericMissionSequence.cs b/libMBIN/Source/NMS/GameComponents/GcGenericMissionSequence.cs
@@ -4,7 +4,7 @@
 
 namespace libMBIN.NMS.GameComponents
 {
-    [NMS(GUID = 0x33DD87693095B1BD, NameHash = 0xFAE86B2801335B6D)]
+    [NMS(GUID = 0x6B0224459A14138F, NameHash = 0xFAE86B2801335B6D)]
     public class GcGenericMissionSequence : NMSTemplate
     {
         /* 0x000 */ public NMSString0x10 MissionID;

diff --git a/libMBIN/Source/NMS/GameComponents/GcMissionTable.cs b/libMBIN/Source/NMS/GameComponents/GcMissionTable.cs
@@ -3,7 +3,7 @@
 
 namespace libMBIN.NMS.GameComponents
 {
-    [NMS(GUID = 0x85AA2B5595E48164, NameHash = 0x26335C55292A7766)]
+    [NMS(GUID = 0xBEC4CC707D551EF6, NameHash = 0x26335C55292A7766)]
     public class GcMissionTable : NMSTemplate
     {
         /* 0x0 */ public List<GcGenericMissionSequence> Missions;

diff --git a/libMBIN/Source/NMS/GameComponents/GcPlayerStateData.cs b/libMBIN/Source/NMS/GameComponents/GcPlayerStateData.cs
diff --git a/libMBIN/Source/NMS/GameComponents/GcRewardInstallTech.cs b/libMBIN/Source/NMS/GameComponents/GcRewardInstallTech.cs
@@ -1,9 +1,10 @@
 namespace libMBIN.NMS.GameComponents
 {
-    [NMS(GUID = 0x21F8F59124D39327, NameHash = 0x75DF796697F3DB0A)]
+    [NMS(GUID = 0x8394A683A8878273, NameHash = 0x75DF796697F3DB0A)]
     public class GcRewardInstallTech : NMSTemplate
     {
         /* 0x00 */ public NMSString0x10 TechId;
+        /* 0x10 */ public NMSString0x10 ReplaceExistingTech;
         // size: 0x7
         public enum InventoryToInstallInEnum : uint {
             Personal,
@@ -14,8 +15,8 @@ public enum InventoryToInstallInEnum : uint {
             Vehicle,
             Weapon,
         }
-        /* 0x10 */ public InventoryToInstallInEnum InventoryToInstallIn;
-        /* 0x14 */ public bool Silent;
-        /* 0x15 */ public bool InstallBroken;
+        /* 0x20 */ public InventoryToInstallInEnum InventoryToInstallIn;
+        /* 0x24 */ public bool Silent;
+        /* 0x25 */ public bool InstallBroken;
     }
 }
diff --git a/libMBIN/Source/NMS/GameComponents/GcSeasonalGameModeData.cs b/libMBIN/Source/NMS/GameComponents/GcSeasonalGameModeData.cs
@@ -4,7 +4,7 @@
 
 namespace libMBIN.NMS.GameComponents
 {
-    [NMS(GUID = 0x2968EC49F636EDB1, NameHash = 0xFD6B0BE30E218605)]
+    [NMS(GUID = 0xCCC632C77B9B7F73, NameHash = 0xFD6B0BE30E218605)]
     public class GcSeasonalGameModeData : NMSTemplate
     {
         /* 0x0000 */ public int SeasonId;
@@ -75,8 +75,9 @@ public class GcSeasonalGameModeData : NMSTemplate
         /* 0x3358 */ public float DistanceFromShipAtStartOfGame;
         /* 0x335C */ public float BuildingRadiusShipOffsetMultiplier;
         /* 0x3360 */ public bool ShipStartsDamaged;
-        /* 0x3361 */ public bool AllowMissionDetailMessages;
-        /* 0x3362 */ public bool UseStartPlanetObjectListOverrides;
+        /* 0x3361 */ public bool BlockStormsAtStart;
+        /* 0x3362 */ public bool AllowMissionDetailMessages;
+        /* 0x3363 */ public bool UseStartPlanetObjectListOverrides;
         /* 0x3368 */ public NMSString0x10 StartPlanetRareSubstanceOverride;
         /* 0x3378 */ public bool TrashInventoryOnGalaxyTravel;
         /* 0x337C */ public int FreighterBattleEarlyWarpsOverride;

diff --git a/libMBIN/Source/NMS/Toolkit/TkMaterialMetaData.cs b/libMBIN/Source/NMS/Toolkit/TkMaterialMetaData.cs
@@ -2,7 +2,7 @@
 
 namespace libMBIN.NMS.Toolkit
 {
-    [NMS(GUID = 0xC4A5912184E05885, NameHash = 0xE39CB7AA4D818260)]
+    [NMS(GUID = 0x83268F02FC4A5E72, NameHash = 0xE39CB7AA4D818260)]
     public class TkMaterialMetaData : NMSTemplate
     {
         /* 0x000 */ public NMSString0x80 ExternalMaterial;

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.44.0.1";
+        internal const string VERSION_STRING = "4.45.0.1";
 
         /// <summary>Shorthand for AssemblyVersion.Major</summary>
         public static int Major      => AssemblyVersion.Major;