Merge pull request #637 from monkeyman192/mxml_fixes

HolterPhylo · web-flow · commit 443bb5298b49 · 2025-02-07T21:46:46.000-05:00
Improve mxml format compatibility
diff --git a/Tools/auto_extract/extractor.py b/Tools/auto_extract/extractor.py
@@ -328,8 +328,9 @@ def field_type(self):
         )
 
     @property
-    def has_space_in_name(self):
-        return " " in self._field_name
+    def has_mxml_name(self):
+        if " " in self._field_name or self._field_name[0].isdigit():
+            return True
 
     @property
     def field_name(self):
diff --git a/Tools/auto_extract/templates/default/class_template.j2 b/Tools/auto_extract/templates/default/class_template.j2
@@ -16,7 +16,7 @@
             {{ enum_val[1] }}{% if field.requires_values %} = {{ enum_val[0] }}{% endif %},
 {%- endfor %}
         }
-        [NMS(Index = {{ field.field_index }}{% if field.has_space_in_name %}, MxmlName = "{{ field._field_name }}"{% endif %})]
+        [NMS(Index = {{ field.field_index }}{% if field.has_mxml_name %}, MxmlName = "{{ field._field_name }}"{% endif %})]
         /* {{ field.field_offset }} */ public {{ field.field_name }}Enum {{ field.field_name }};
 {%- elif field._is_array_field %}{# End of enum chunk, start of array chunk #}
 {%- if field.local_enum %}
@@ -27,16 +27,16 @@
 {%- endfor %}
         }
 {%- endif %}
-        [NMS(Index = {{ field.field_index }}, Size = {{ field.array_size }}{% if field.array_enum_type is not none %}, EnumType = typeof({{ field.array_enum_type }}){% endif %}{% if field.has_space_in_name %}, MxmlName = "{{ field._field_name }}"{% endif %})]
+        [NMS(Index = {{ field.field_index }}, Size = {{ field.array_size }}{% if field.array_enum_type is not none %}, EnumType = typeof({{ field.array_enum_type }}){% endif %}{% if field.has_mxml_name %}, MxmlName = "{{ field._field_name }}"{% endif %})]
         /* {{ field.field_offset }} */ public {{ field.field_type }}[] {{ field.field_name }};
 {%- elif field._is_list_field %}{# End of array chunk, start of list chunk #}
-        [NMS(Index = {{ field.field_index }}{% if field.has_space_in_name %}, MxmlName = "{{ field._field_name }}"{% endif %})]
+        [NMS(Index = {{ field.field_index }}{% if field.has_mxml_name %}, MxmlName = "{{ field._field_name }}"{% endif %})]
         /* {{ field.field_offset }} */ public List<{{ field.field_type }}> {{ field.field_name }};
 {%- elif field._is_hash_map_field %}{# End of array chunk, start of HashMap chunk #}
-        [NMS(Index = {{ field.field_index }}{% if field.has_space_in_name %}, MxmlName = "{{ field._field_name }}"{% endif %})]
+        [NMS(Index = {{ field.field_index }}{% if field.has_mxml_name %}, MxmlName = "{{ field._field_name }}"{% endif %})]
         /* {{ field.field_offset }} */ public HashMap<{{ field.field_type }}> {{ field.field_name }};
 {%- else %}{# End of array chunk, start of normal field chunk #}
-        [NMS(Index = {{ field.field_index }}{% if field.has_space_in_name %}, MxmlName = "{{ field._field_name }}"{% endif %})]
+        [NMS(Index = {{ field.field_index }}{% if field.has_mxml_name %}, MxmlName = "{{ field._field_name }}"{% endif %})]
         /* {{ field.field_offset }} */ public {{ field.field_type }} {{ field.field_name }};
 {%- endif %}
 {%- endfor %}
diff --git a/libMBIN/Source/NMS/GameComponents/GcBehaviourMaintainRangeFromTargetData.cs b/libMBIN/Source/NMS/GameComponents/GcBehaviourMaintainRangeFromTargetData.cs
@@ -15,7 +15,7 @@ public class GcBehaviourMaintainRangeFromTargetData : NMSTemplate
         /* 0x40 */ public float AvoidCreaturesStrength;
         [NMS(Index = 5)]
         /* 0x44 */ public float SpeedModifier;
-        [NMS(Index = 3)]
+        [NMS(Index = 3, MxmlName = "2D")]
         /* 0x48 */ public bool _2D;
         [NMS(Index = 4)]
         /* 0x49 */ public bool SucceedWhenInRange;
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 = 0x3786C6A187936C27, NameHash = 0xFC70ABE3)]
+    [NMS(GUID = 0x736C051B1E5187B3, NameHash = 0xFC70ABE3)]
     public class GcDestructableComponentData : NMSTemplate
     {
         [NMS(Index = 31, Size = 0x3, EnumType = typeof(GcRarity.RarityEnum))]
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 = 0xE0D3CBC490E48AF6, NameHash = 0x7FD50C85)]
+    [NMS(GUID = 0x3D2B98ABA8CC85E3, NameHash = 0x7FD50C85)]
     public class GcGenericMissionSequence : NMSTemplate
     {
         [NMS(Index = 24)]
diff --git a/libMBIN/Source/NMS/GameComponents/GcMissionConditionCanRenameDiscovery.cs b/libMBIN/Source/NMS/GameComponents/GcMissionConditionCanRenameDiscovery.cs
@@ -1,7 +1,9 @@
 namespace libMBIN.NMS.GameComponents
 {
-    [NMS(GUID = 0xABA81E6AF4F4DEA1, NameHash = 0xD86CF6EA)]
+    [NMS(GUID = 0x939BB1F09370CB2B, NameHash = 0xD86CF6EA)]
     public class GcMissionConditionCanRenameDiscovery : NMSTemplate
     {
+        [NMS(Index = 0)]
+        /* 0x0 */ public bool ValueToReturnWhileSearchActive;
     }
 }
diff --git a/libMBIN/Source/NMS/GameComponents/GcMissionConditionStatLevel.cs b/libMBIN/Source/NMS/GameComponents/GcMissionConditionStatLevel.cs
@@ -2,28 +2,30 @@
 
 namespace libMBIN.NMS.GameComponents
 {
-    [NMS(GUID = 0xF5241BD44B6627B2, NameHash = 0xFBADBD2)]
+    [NMS(GUID = 0x232C28E1E4FDF816, NameHash = 0xFBADBD2)]
     public class GcMissionConditionStatLevel : NMSTemplate
     {
         [NMS(Index = 7)]
         /* 0x00 */ public NMSString0x10 CompareStat;
+        [NMS(Index = 10)]
+        /* 0x10 */ public NMSString0x10 FormatItemNameIntoText;
         [NMS(Index = 0)]
-        /* 0x10 */ public NMSString0x10 Stat;
+        /* 0x20 */ public NMSString0x10 Stat;
         [NMS(Index = 1)]
-        /* 0x20 */ public NMSString0x10 StatGroup;
+        /* 0x30 */ public NMSString0x10 StatGroup;
         [NMS(Index = 8)]
-        /* 0x30 */ public int DisplayMilestoneNumber;
+        /* 0x40 */ public int DisplayMilestoneNumber;
         [NMS(Index = 2)]
-        /* 0x34 */ public int Level;
+        /* 0x44 */ public int Level;
         [NMS(Index = 3)]
-        /* 0x38 */ public int LevelledStatRank;
+        /* 0x48 */ public int LevelledStatRank;
         [NMS(Index = 9)]
-        /* 0x3C */ public TkEqualityEnum Test;
+        /* 0x4C */ public TkEqualityEnum Test;
         [NMS(Index = 5)]
-        /* 0x40 */ public bool ForceIgnoreLevelledStat;
+        /* 0x50 */ public bool ForceIgnoreLevelledStat;
         [NMS(Index = 6)]
-        /* 0x41 */ public bool MulAmountBySeasonTier;
+        /* 0x51 */ public bool MulAmountBySeasonTier;
         [NMS(Index = 4)]
-        /* 0x42 */ public bool TakeLevelFromSeasonData;
+        /* 0x52 */ public bool TakeLevelFromSeasonData;
     }
 }
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 = 0xD0A9D7F4019B983D, NameHash = 0x4E2556EB)]
+    [NMS(GUID = 0xC0F37F4F313F0B8D, NameHash = 0x4E2556EB)]
     public class GcMissionTable : NMSTemplate
     {
         [NMS(Index = 0)]
diff --git a/libMBIN/Source/NMS/GameComponents/GcPlayerCommonStateData.cs b/libMBIN/Source/NMS/GameComponents/GcPlayerCommonStateData.cs
@@ -3,7 +3,7 @@
 
 namespace libMBIN.NMS.GameComponents
 {
-    [NMS(GUID = 0x4E2BF7822A5EF19C, NameHash = 0xC7D918F3)]
+    [NMS(GUID = 0x4A21B3B24D86A472, NameHash = 0xC7D918F3)]
     public class GcPlayerCommonStateData : NMSTemplate
     {
         [NMS(Index = 5)]
diff --git a/libMBIN/Source/NMS/GameComponents/GcScanEventData.cs b/libMBIN/Source/NMS/GameComponents/GcScanEventData.cs
@@ -4,7 +4,7 @@
 
 namespace libMBIN.NMS.GameComponents
 {
-    [NMS(GUID = 0xEC28FD565252D1FD, NameHash = 0x37EE71BB)]
+    [NMS(GUID = 0xA9034A06B133F687, NameHash = 0x37EE71BB)]
     public class GcScanEventData : NMSTemplate
     {
         [NMS(Index = 41)]
diff --git a/libMBIN/Source/NMS/GameComponents/GcScanEventSolarSystemLookup.cs b/libMBIN/Source/NMS/GameComponents/GcScanEventSolarSystemLookup.cs
@@ -2,7 +2,7 @@
 
 namespace libMBIN.NMS.GameComponents
 {
-    [NMS(GUID = 0xD3F1335EAE3D36B3, NameHash = 0x9CE4FFF3)]
+    [NMS(GUID = 0x2C65FA5CE638A49C, NameHash = 0x9CE4FFF3)]
     public class GcScanEventSolarSystemLookup : NMSTemplate
     {
         [NMS(Index = 36)]
@@ -13,7 +13,7 @@ public class GcScanEventSolarSystemLookup : NMSTemplate
         /* 0x30 */ public NMSString0x10 SystemNeedsResourceHint;
         [NMS(Index = 7)]
         /* 0x40 */ public GcPlanetTradingData TradingData;
-        [NMS(Index = 45)]
+        [NMS(Index = 46)]
         /* 0x48 */ public int MinPlanets;
         [NMS(Index = 27)]
         /* 0x4C */ public GcBiomeType NeedsBiomeType;
@@ -69,33 +69,35 @@ public class GcScanEventSolarSystemLookup : NMSTemplate
         /* 0x7A */ public bool NeverAllowExtremeSentinelPlanet;
         [NMS(Index = 22)]
         /* 0x7B */ public bool NeverAllowExtremeWeatherPlanet;
+        [NMS(Index = 45)]
+        /* 0x7C */ public bool NeverAllowGasGiantSystem;
         [NMS(Index = 12)]
-        /* 0x7C */ public bool RequireUndiscovered;
+        /* 0x7D */ public bool RequireUndiscovered;
         [NMS(Index = 32)]
-        /* 0x7D */ public bool SuitableForCreatureDiscovery;
+        /* 0x7E */ public bool SuitableForCreatureDiscovery;
         [NMS(Index = 35)]
-        /* 0x7E */ public bool SuitableForCreatureTaming;
+        /* 0x7F */ public bool SuitableForCreatureTaming;
         [NMS(Index = 34)]
-        /* 0x7F */ public bool SuitableForRobotCreatureDiscovery;
+        /* 0x80 */ public bool SuitableForRobotCreatureDiscovery;
         [NMS(Index = 33)]
-        /* 0x80 */ public bool SuitableForWeirdCreatureDiscovery;
+        /* 0x81 */ public bool SuitableForWeirdCreatureDiscovery;
         [NMS(Index = 42)]
-        /* 0x81 */ public bool SystemNeedsCorruptSentinelPlanet;
+        /* 0x82 */ public bool SystemNeedsCorruptSentinelPlanet;
         [NMS(Index = 43)]
-        /* 0x82 */ public bool SystemNeedsExtremeStormPlanet;
+        /* 0x83 */ public bool SystemNeedsExtremeStormPlanet;
         [NMS(Index = 44)]
-        /* 0x83 */ public bool SystemNeedsGasGiant;
+        /* 0x84 */ public bool SystemNeedsGasGiant;
         [NMS(Index = 41)]
-        /* 0x84 */ public bool SystemNeedsInfestedPlanet;
+        /* 0x85 */ public bool SystemNeedsInfestedPlanet;
         [NMS(Index = 39)]
-        /* 0x85 */ public bool SystemNeedsWater;
+        /* 0x86 */ public bool SystemNeedsWater;
         [NMS(Index = 40)]
-        /* 0x86 */ public bool SystemNeedsWeirdPlanet;
+        /* 0x87 */ public bool SystemNeedsWeirdPlanet;
         [NMS(Index = 0)]
-        /* 0x87 */ public bool UseStarType;
+        /* 0x88 */ public bool UseStarType;
         [NMS(Index = 2)]
-        /* 0x88 */ public bool UseTrading;
+        /* 0x89 */ public bool UseTrading;
         [NMS(Index = 1)]
-        /* 0x89 */ public bool UseWealth;
+        /* 0x8A */ public bool UseWealth;
     }
 }
diff --git a/libMBIN/Source/NMS/GameComponents/GcScanEventTable.cs b/libMBIN/Source/NMS/GameComponents/GcScanEventTable.cs
@@ -3,7 +3,7 @@
 
 namespace libMBIN.NMS.GameComponents
 {
-    [NMS(GUID = 0x9992856DBF644817, NameHash = 0xEE47CB18)]
+    [NMS(GUID = 0x4960550D8C5158A4, NameHash = 0xEE47CB18)]
     public class GcScanEventTable : NMSTemplate
     {
         [NMS(Index = 0)]
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 = 0xCCF28A230265D581, NameHash = 0xC2909BE6)]
+    [NMS(GUID = 0x1DEF18D503CD2A6D, NameHash = 0xC2909BE6)]
     public class GcSeasonalGameModeData : NMSTemplate
     {
         [NMS(Index = 72, Size = 0x12)]
diff --git a/libMBIN/Source/NMS/GameComponents/GcSimpleInteractionComponentData.cs b/libMBIN/Source/NMS/GameComponents/GcSimpleInteractionComponentData.cs
@@ -3,7 +3,7 @@
 
 namespace libMBIN.NMS.GameComponents
 {
-    [NMS(GUID = 0xAF790E1049BF8155, NameHash = 0x60BCEB20)]
+    [NMS(GUID = 0xBEDD649FE0151D39, NameHash = 0x60BCEB20)]
     public class GcSimpleInteractionComponentData : NMSTemplate
     {
         [NMS(Index = 18)]
diff --git a/libMBIN/Source/NMS/GameComponents/GcStatsEnum.cs b/libMBIN/Source/NMS/GameComponents/GcStatsEnum.cs
@@ -1,9 +1,9 @@
 namespace libMBIN.NMS.GameComponents
 {
-    [NMS(GUID = 0x1E3BF6019ED33AC5, NameHash = 0xB29233BB)]
+    [NMS(GUID = 0xE7E255F6B3A8BEC4, NameHash = 0xB29233BB)]
     public class GcStatsEnum : NMSTemplate
     {
-        // size: 0x17
+        // size: 0x18
         public enum StatEnumEnum : uint {
             None,
             DEPOTS_BROKEN,
@@ -28,6 +28,7 @@ public enum StatEnumEnum : uint {
             MECHS_KILLED,
             SPIDERS_KILLED,
             SM_SPIDER_KILLS,
+            SEAGLASS,
         }
         [NMS(Index = 0)]
         /* 0x0 */ public StatEnumEnum StatEnum;
diff --git a/libMBIN/Source/NMS/Globals/GcDebugOptions.cs b/libMBIN/Source/NMS/Globals/GcDebugOptions.cs
@@ -61,9 +61,9 @@ public class GcDebugOptions : NMSTemplate
         /* 0x01A8 */ public ulong OverrideAbandonedFreighterSeed;
         [NMS(Index = 416)]
         /* 0x01B0 */ public TkGlobals ToolkitGlobals;
-        [NMS(Index = 189)]
+        [NMS(Index = 189, MxmlName = "3dTextDistance")]
         /* 0x068C */ public float _3dTextDistance;
-        [NMS(Index = 190)]
+        [NMS(Index = 190, MxmlName = "3dTextMinScale")]
         /* 0x0690 */ public float _3dTextMinScale;
         [NMS(Index = 406)]
         /* 0x0694 */ public GcBaseBuildingPartStyle AutomaticPartSpawnStyle;
diff --git a/libMBIN/Source/NMS/Globals/GcEnvironmentGlobals.cs b/libMBIN/Source/NMS/Globals/GcEnvironmentGlobals.cs
diff --git a/libMBIN/Source/NMS/Globals/GcSpaceshipGlobals.cs b/libMBIN/Source/NMS/Globals/GcSpaceshipGlobals.cs
diff --git a/libMBIN/Source/NMS/Toolkit/TkParticleData.cs b/libMBIN/Source/NMS/Toolkit/TkParticleData.cs
diff --git a/libMBIN/Source/NMS/Toolkit/TkPhysicsComponentData.cs b/libMBIN/Source/NMS/Toolkit/TkPhysicsComponentData.cs
diff --git a/libMBIN/Source/NMS/Toolkit/TkStaticPhysicsComponentData.cs b/libMBIN/Source/NMS/Toolkit/TkStaticPhysicsComponentData.cs
diff --git a/libMBIN/Source/Template/NMSTemplate.cs b/libMBIN/Source/Template/NMSTemplate.cs
diff --git a/libMBIN/Source/Version.cs b/libMBIN/Source/Version.cs

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace libMBIN.NMS.GameComponents`
`6`	`6`	`{`
`7`		`- [NMS(GUID = 0x3786C6A187936C27, NameHash = 0xFC70ABE3)]`
	`7`	`+ [NMS(GUID = 0x736C051B1E5187B3, NameHash = 0xFC70ABE3)]`
`8`	`8`	`public class GcDestructableComponentData : NMSTemplate`
`9`	`9`	`{`
`10`	`10`	`[NMS(Index = 31, Size = 0x3, EnumType = typeof(GcRarity.RarityEnum))]`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace libMBIN.NMS.GameComponents`
`6`	`6`	`{`
`7`		`- [NMS(GUID = 0xE0D3CBC490E48AF6, NameHash = 0x7FD50C85)]`
	`7`	`+ [NMS(GUID = 0x3D2B98ABA8CC85E3, NameHash = 0x7FD50C85)]`
`8`	`8`	`public class GcGenericMissionSequence : NMSTemplate`
`9`	`9`	`{`
`10`	`10`	`[NMS(Index = 24)]`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,9 @@`
`1`	`1`	`namespace libMBIN.NMS.GameComponents`
`2`	`2`	`{`
`3`		`- [NMS(GUID = 0xABA81E6AF4F4DEA1, NameHash = 0xD86CF6EA)]`
	`3`	`+ [NMS(GUID = 0x939BB1F09370CB2B, NameHash = 0xD86CF6EA)]`
`4`	`4`	`public class GcMissionConditionCanRenameDiscovery : NMSTemplate`
`5`	`5`	`{`
	`6`	`+ [NMS(Index = 0)]`
	`7`	`+ /* 0x0 */ public bool ValueToReturnWhileSearchActive;`
`6`	`8`	`}`
`7`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`namespace libMBIN.NMS.GameComponents`
`5`	`5`	`{`
`6`		`- [NMS(GUID = 0xD0A9D7F4019B983D, NameHash = 0x4E2556EB)]`
	`6`	`+ [NMS(GUID = 0xC0F37F4F313F0B8D, NameHash = 0x4E2556EB)]`
`7`	`7`	`public class GcMissionTable : NMSTemplate`
`8`	`8`	`{`
`9`	`9`	`[NMS(Index = 0)]`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`namespace libMBIN.NMS.GameComponents`
`5`	`5`	`{`
`6`		`- [NMS(GUID = 0x4E2BF7822A5EF19C, NameHash = 0xC7D918F3)]`
	`6`	`+ [NMS(GUID = 0x4A21B3B24D86A472, NameHash = 0xC7D918F3)]`
`7`	`7`	`public class GcPlayerCommonStateData : NMSTemplate`
`8`	`8`	`{`
`9`	`9`	`[NMS(Index = 5)]`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace libMBIN.NMS.GameComponents`
`6`	`6`	`{`
`7`		`- [NMS(GUID = 0xEC28FD565252D1FD, NameHash = 0x37EE71BB)]`
	`7`	`+ [NMS(GUID = 0xA9034A06B133F687, NameHash = 0x37EE71BB)]`
`8`	`8`	`public class GcScanEventData : NMSTemplate`
`9`	`9`	`{`
`10`	`10`	`[NMS(Index = 41)]`