Merge pull request #574 from monkeyman192/update/12141065

[MRG] Update for 12141065
monkeyman192 · Sep 8, 2023 · aa74654 · aa74654
2 parents 10cede7 + 4078b02
commit aa74654
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/conftest.py b/conftest.py
@@ -10,7 +10,7 @@
 
 TEST_ROOT_PATH = op.join(op.dirname(__file__), 'tests')
 DATA_PATH = op.join(TEST_ROOT_PATH, 'data')
-BASE_PATH = op.join("Build", "Release", "win-x64")
+BASE_PATH = op.join("Build", "Release", "net6.0", "win-x64", "publish")
 FAILED_FNAME = '_failed.txt'
 REPORT_FNAME = op.join(op.dirname(__file__), 'results.txt')
 JSON_REPORT_FNAME = op.join(op.dirname(__file__), 'report.json')

diff --git a/libMBIN/Source/NMS/GameComponents/GcDestructableComponentData.cs b/libMBIN/Source/NMS/GameComponents/GcDestructableComponentData.cs
@@ -4,7 +4,7 @@
 
 namespace libMBIN.NMS.GameComponents
 {
-    [NMS(GUID = 0x1DB3113BBEA2B461, NameHash = 0xE24B3D78ED0634BD)]
+    [NMS(GUID = 0x4014343A9EF34D90, NameHash = 0xE24B3D78ED0634BD)]
     public class GcDestructableComponentData : NMSTemplate
     {
         /* 0x000 */ public NMSString0x10 Explosion;
@@ -26,7 +26,8 @@ public class GcDestructableComponentData : NMSTemplate
         /* 0x070 */ public List<GcSubstanceAmount> GivesSubstances;
         /* 0x080 */ public GcStatsEnum StatToTrack;
         /* 0x088 */ public NMSString0x10 GivesReward;
-        /* 0x098 */ public int OverrideChipAmount;
+        /* 0x098 */ public bool BlockDestructionIfRewardFails;
+        /* 0x09C */ public int OverrideChipAmount;
         /* 0x0A0 */ public NMSString0x10 PirateSystemAltReward;
         /* 0x0B0 */ public bool RewardIfDestroyedByOther;
         /* 0x0B1 */ public bool NoConsequencesDuringPirateBattle;

diff --git a/libMBIN/Source/NMS/GameComponents/GcMissionConditionNearObject.cs b/libMBIN/Source/NMS/GameComponents/GcMissionConditionNearObject.cs
@@ -1,13 +1,14 @@
 namespace libMBIN.NMS.GameComponents
 {
-    [NMS(GUID = 0x98A8088CCBCB2360, NameHash = 0x748605335FA1C427)]
+    [NMS(GUID = 0x450C3B881FF849F0, NameHash = 0x748605335FA1C427)]
     public class GcMissionConditionNearObject : NMSTemplate
     {
-        // size: 0x4
+        // size: 0x5
         public enum MissionObjectEnum : uint {
             PlayerShip,
             PlayerVehicle,
             StoryPortal,
+            OpenStoryPortal,
             OpenStandardPortal,
         }
         /* 0x0 */ public MissionObjectEnum MissionObject;

diff --git a/libMBIN/Source/NMS/GameComponents/GcMissionSequenceStartScanEvent.cs b/libMBIN/Source/NMS/GameComponents/GcMissionSequenceStartScanEvent.cs
@@ -2,7 +2,7 @@
 
 namespace libMBIN.NMS.GameComponents
 {
-    [NMS(GUID = 0x42C7729718B0EBF7, NameHash = 0x84E26BAA3B367507)]
+    [NMS(GUID = 0x267ABDC52CF84838, NameHash = 0x84E26BAA3B367507)]
     public class GcMissionSequenceStartScanEvent : NMSTemplate
     {
         /* 0x00 */ public GcScanEventTableType Table;
@@ -11,6 +11,7 @@ public class GcMissionSequenceStartScanEvent : NMSTemplate
         /* 0x28 */ public float Time;
         /* 0x2C */ public bool DoAerialScan;
         /* 0x2D */ public bool AllowOtherPlayersBase;
-        /* 0x2E */ public NMSString0x80 DebugText;
+        /* 0x2E */ public bool IgnoreIfAlreadyActive;
+        /* 0x2F */ public NMSString0x80 DebugText;
     }
 }
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.43.0.1";
+        internal const string VERSION_STRING = "4.44.0.1";
 
         /// <summary>Shorthand for AssemblyVersion.Major</summary>
         public static int Major      => AssemblyVersion.Major;