Skip to content

Commit fcbd188

Browse files
monkeyman192monkeyman192
authored
Merge pull request #579 from HolterPhylo/UpdateFor13391537
[MRG] Update for 13391537
2 parents 3625342 + c048e20 commit fcbd188

File tree

297 files changed

+5342
-4401
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

297 files changed

+5342
-4401
lines changed

‎libMBIN/Source/NMS/GameComponents/GcAlienPuzzleEntry.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
namespace libMBIN.NMS.GameComponents
55
{
6-
[NMS(GUID = 0xD51E9869EF4F8219, NameHash = 0xDE1F17CE7E01A8C2)]
6+
[NMS(GUID = 0xE44C57D5D2EF5F26, NameHash = 0xDE1F17CE7E01A8C2)]
77
public class GcAlienPuzzleEntry : NMSTemplate
88
{
99
/* 0x000 */ public int ProgressionIndex;

‎libMBIN/Source/NMS/GameComponents/GcAlienPuzzleOption.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
namespace libMBIN.NMS.GameComponents
55
{
6-
[NMS(GUID = 0xD1A1152BE345016C, NameHash = 0x3FE862FE8570BE69)]
6+
[NMS(GUID = 0x6E7ADBE3D267823, NameHash = 0x3FE862FE8570BE69)]
77
public class GcAlienPuzzleOption : NMSTemplate
88
{
99
/* 0x00 */ public NMSString0x20A Name;

‎libMBIN/Source/NMS/GameComponents/GcAlienPuzzleTable.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
namespace libMBIN.NMS.GameComponents
55
{
6-
[NMS(GUID = 0x542BB9C1F4386AF0, NameHash = 0x5F6B19969ECDDFE)]
6+
[NMS(GUID = 0x5A0CE15BB94FC262, NameHash = 0x5F6B19969ECDDFE)]
77
public class GcAlienPuzzleTable : NMSTemplate
88
{
99
/* 0x0 */ public List<GcAlienPuzzleEntry> Table;

‎libMBIN/Source/NMS/GameComponents/GcAudioAreaTriggerComponentData.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace libMBIN.NMS.GameComponents
44
{
5-
[NMS(GUID = 0xE209C709F9C8F871, NameHash = 0xD1618D63DA15668C)]
5+
[NMS(GUID = 0x40F083738B45014, NameHash = 0xD1618D63DA15668C)]
66
public class GcAudioAreaTriggerComponentData : NMSTemplate
77
{
88
/* 0x0 */ public GcAudioWwiseEvents EventEnter;

‎libMBIN/Source/NMS/GameComponents/GcAudioWwiseEvents.cs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
namespace libMBIN.NMS.GameComponents
22
{
3-
[NMS(GUID = 0x343FBB9E2F0D5690, NameHash = 0x8B94093DC3901046)]
3+
[NMS(GUID = 0xF6D62DC781474A4F, NameHash = 0x8B94093DC3901046)]
44
public class GcAudioWwiseEvents : NMSTemplate
55
{
6-
// size: 0x9FF
6+
// size: 0xA01
77
public enum AkEventEnum : uint {
88
INVALID_EVENT = 0x0,
99
ABANDONED_DOOR_UNLOCK = 0x264BED2D,
@@ -1364,6 +1364,8 @@ public enum AkEventEnum : uint {
13641364
PL_SHIP_MINIWARP_COUNTDOWN = 0x5064D24A,
13651365
PL_SHIP_MINIWARP_END = 0x53B4B6F4,
13661366
PL_SHIP_MINIWARP_JUMP = 0xA54A1259,
1367+
PL_SHIP_RACER_LANDING = 0x23B40F78,
1368+
PL_SHIP_RACER_TAKEOFF = 0xB52D6DE5,
13671369
PL_SHIP_ROBOT_CARRIAGELOCK_LANDING = 0xECF68579,
13681370
PL_SHIP_ROBOT_CARRIAGELOCK_TAKEOFF = 0x19B453B0,
13691371
PL_SHIP_ROBOT_CHUNKYLEGS_LANDING = 0xECF46219,

‎libMBIN/Source/NMS/GameComponents/GcBackgroundSpaceEncounterInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace libMBIN.NMS.GameComponents
44
{
5-
[NMS(GUID = 0xB7BC453CD8ECA1E5, NameHash = 0x9803054FC61F20F4)]
5+
[NMS(GUID = 0xF022D46259E222D8, NameHash = 0x9803054FC61F20F4)]
66
public class GcBackgroundSpaceEncounterInfo : NMSTemplate
77
{
88
/* 0x00 */ public NMSString0x10 Id;

‎libMBIN/Source/NMS/GameComponents/GcBaseBuildingEntry.cs‎

Lines changed: 47 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -4,63 +4,64 @@
44

55
namespace libMBIN.NMS.GameComponents
66
{
7-
[NMS(GUID = 0x2E18738D74B90B8C, NameHash = 0xA6F7B710166F6076)]
7+
[NMS(GUID = 0x73BBAC671634F9F7, NameHash = 0xA6F7B710166F6076)]
88
public class GcBaseBuildingEntry : NMSTemplate
99
{
1010
/* 0x000 */ public NMSString0x10 ID;
1111
/* 0x010 */ public bool IsTemporary;
1212
/* 0x011 */ public bool IsFromModFolder;
1313
/* 0x014 */ public GcBaseBuildingPartStyle Style;
1414
/* 0x018 */ public TkModelResource PlacementScene;
15-
/* 0x09C */ public GcBaseBuildingObjectDecorationTypes DecorationType;
16-
/* 0x0A0 */ public bool IsPlaceable;
17-
/* 0x0A1 */ public bool IsDecoration;
18-
/* 0x0A4 */ public GcBiomeType Biome;
19-
/* 0x0A8 */ public bool BuildableOnPlanetBase;
20-
/* 0x0A9 */ public bool BuildableOnSpaceBase;
21-
/* 0x0AA */ public bool BuildableOnFreighter;
22-
/* 0x0AB */ public bool BuildableOnPlanet;
23-
/* 0x0AC */ public bool BuildableOnPlanetWithProduct;
24-
/* 0x0AD */ public bool BuildableUnderwater;
25-
/* 0x0AE */ public bool BuildableAboveWater;
26-
/* 0x0B0 */ public int PlanetLimit;
27-
/* 0x0B4 */ public int RegionLimit;
28-
/* 0x0B8 */ public int PlanetBaseLimit;
29-
/* 0x0BC */ public int FreighterBaseLimit;
30-
/* 0x0C0 */ public bool CheckPlaceholderCollision;
31-
/* 0x0C1 */ public bool CheckPlayerCollision;
32-
/* 0x0C2 */ public bool CanRotate3D;
33-
/* 0x0C3 */ public bool CanScale;
34-
/* 0x0C8 */ public List<GcBaseBuildingEntryGroup> Groups;
35-
/* 0x0D8 */ public int StorageContainerIndex;
36-
/* 0x0E0 */ public NMSString0x20A ColourPaletteGroupId;
37-
/* 0x100 */ public NMSString0x20A DefaultColourPaletteId;
38-
/* 0x120 */ public NMSString0x20A MaterialGroupId;
39-
/* 0x140 */ public NMSString0x20A DefaultMaterialId;
40-
/* 0x160 */ public bool CanChangeColour;
41-
/* 0x161 */ public bool CanChangeMaterial;
42-
/* 0x162 */ public bool CanPickUp;
43-
/* 0x163 */ public bool ShowInBuildMenu;
44-
/* 0x168 */ public List<NMSString0x10> CompositePartObjectIDs;
45-
/* 0x178 */ public List<NMSString0x10> FamilyIDs;
46-
/* 0x188 */ public float BuildEffectAccelerator;
47-
/* 0x18C */ public bool RemovesAttachedDecoration;
48-
/* 0x18D */ public bool RemovesWhenUnsnapped;
49-
/* 0x18E */ public bool EditsTerrain;
15+
/* 0x0A0 */ public NMSString0x20A SinglePartID;
16+
/* 0x0C0 */ public GcBaseBuildingObjectDecorationTypes DecorationType;
17+
/* 0x0C4 */ public bool IsPlaceable;
18+
/* 0x0C5 */ public bool IsDecoration;
19+
/* 0x0C8 */ public GcBiomeType Biome;
20+
/* 0x0CC */ public bool BuildableOnPlanetBase;
21+
/* 0x0CD */ public bool BuildableOnSpaceBase;
22+
/* 0x0CE */ public bool BuildableOnFreighter;
23+
/* 0x0CF */ public bool BuildableOnPlanet;
24+
/* 0x0D0 */ public bool BuildableOnPlanetWithProduct;
25+
/* 0x0D1 */ public bool BuildableUnderwater;
26+
/* 0x0D2 */ public bool BuildableAboveWater;
27+
/* 0x0D4 */ public int PlanetLimit;
28+
/* 0x0D8 */ public int RegionLimit;
29+
/* 0x0DC */ public int PlanetBaseLimit;
30+
/* 0x0E0 */ public int FreighterBaseLimit;
31+
/* 0x0E4 */ public bool CheckPlaceholderCollision;
32+
/* 0x0E5 */ public bool CheckPlayerCollision;
33+
/* 0x0E6 */ public bool CanRotate3D;
34+
/* 0x0E7 */ public bool CanScale;
35+
/* 0x0E8 */ public List<GcBaseBuildingEntryGroup> Groups;
36+
/* 0x0F8 */ public int StorageContainerIndex;
37+
/* 0x100 */ public NMSString0x20A ColourPaletteGroupId;
38+
/* 0x120 */ public NMSString0x20A DefaultColourPaletteId;
39+
/* 0x140 */ public NMSString0x20A MaterialGroupId;
40+
/* 0x160 */ public NMSString0x20A DefaultMaterialId;
41+
/* 0x180 */ public bool CanChangeColour;
42+
/* 0x181 */ public bool CanChangeMaterial;
43+
/* 0x182 */ public bool CanPickUp;
44+
/* 0x183 */ public bool ShowInBuildMenu;
45+
/* 0x188 */ public List<NMSString0x10> CompositePartObjectIDs;
46+
/* 0x198 */ public List<NMSString0x10> FamilyIDs;
47+
/* 0x1A8 */ public float BuildEffectAccelerator;
48+
/* 0x1AC */ public bool RemovesAttachedDecoration;
49+
/* 0x1AD */ public bool RemovesWhenUnsnapped;
50+
/* 0x1AE */ public bool EditsTerrain;
5051
// size: 0x2
5152
public enum BaseTerrainEditShapeEnum : uint {
5253
Cube,
5354
Cylinder,
5455
}
55-
/* 0x190 */ public BaseTerrainEditShapeEnum BaseTerrainEditShape;
56-
/* 0x194 */ public float MinimumDeleteDistance;
57-
/* 0x198 */ public bool IsSealed;
58-
/* 0x199 */ public bool CloseMenuAfterBuild;
59-
/* 0x1A0 */ public GcBaseLinkGridData LinkGridData;
60-
/* 0x1F8 */ public int GhostsCountOverride;
61-
/* 0x1FC */ public bool ShowGhosts;
62-
/* 0x200 */ public float SnappingDistanceOverride;
63-
/* 0x204 */ public int RegionSpawnLOD;
64-
/* 0x208 */ public TkModelResource NPCInteractionScene;
56+
/* 0x1B0 */ public BaseTerrainEditShapeEnum BaseTerrainEditShape;
57+
/* 0x1B4 */ public float MinimumDeleteDistance;
58+
/* 0x1B8 */ public bool IsSealed;
59+
/* 0x1B9 */ public bool CloseMenuAfterBuild;
60+
/* 0x1C0 */ public GcBaseLinkGridData LinkGridData;
61+
/* 0x218 */ public int GhostsCountOverride;
62+
/* 0x21C */ public bool ShowGhosts;
63+
/* 0x220 */ public float SnappingDistanceOverride;
64+
/* 0x224 */ public int RegionSpawnLOD;
65+
/* 0x228 */ public TkModelResource NPCInteractionScene;
6566
}
6667
}

‎libMBIN/Source/NMS/GameComponents/GcBaseBuildingTable.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
namespace libMBIN.NMS.GameComponents
66
{
7-
[NMS(GUID = 0x699CA7FB32674596, NameHash = 0x69B43206529CA591)]
7+
[NMS(GUID = 0x74C1CCE2975CDBA, NameHash = 0x69B43206529CA591)]
88
public class GcBaseBuildingTable : NMSTemplate
99
{
1010
/* 0x000 */ public TkModelResource LegModel;

‎libMBIN/Source/NMS/GameComponents/GcBreakTechByStatData.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace libMBIN.NMS.GameComponents
44
{
5-
[NMS(GUID = 0x1DF1F0AED684E465, NameHash = 0x543210B019526A44)]
5+
[NMS(GUID = 0x9326842970ACFB56, NameHash = 0x543210B019526A44)]
66
public class GcBreakTechByStatData : NMSTemplate
77
{
88
/* 0x0 */ public GcStatsTypes DamageTechWithStat;

‎libMBIN/Source/NMS/GameComponents/GcBuildingPlacementErrorTypes.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
namespace libMBIN.NMS.GameComponents
22
{
3-
[NMS(GUID = 0xBA85C40C7D96F32C, NameHash = 0xC2EE53901B0156DE)]
3+
[NMS(GUID = 0xF8944A35F1313994, NameHash = 0xC2EE53901B0156DE)]
44
public class GcBuildingPlacementErrorTypes : NMSTemplate
55
{
6-
// size: 0x16
6+
// size: 0x17
77
public enum InvalidPlacementReasonEnum : uint {
88
Offline,
99
InvalidBiome,
@@ -12,6 +12,7 @@ public enum InvalidPlacementReasonEnum : uint {
1212
PlanetLimitReached,
1313
BaseLimitReached,
1414
RegionLimitReached,
15+
InvalidMaxBasesReached,
1516
InvalidOverlappingAnyBase,
1617
InvalidOverlappingSettlement,
1718
InvalidOverlappingBase,

0 commit comments

Comments
 (0)