Skip to content

Commit e04eea3

Browse files
monkeyman192monkeyman192
authored
Merge pull request #624 from HolterPhylo/UpdateFor16209713
[MRG] Update for 16209713
2 parents dfc4a1f + 8c61df7 commit e04eea3

File tree

8 files changed

+1582
-1574
lines changed

8 files changed

+1582
-1574
lines changed

‎libMBIN/Source/NMS/GameComponents/GcGenericMissionSequence.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 = 0x27A66DFF2178D507, NameHash = 0x7FD50C85)]
7+
[NMS(GUID = 0x2F1697643508B614, NameHash = 0x7FD50C85)]
88
public class GcGenericMissionSequence : NMSTemplate
99
{
1010
[NMS(Index = 23)]

‎libMBIN/Source/NMS/GameComponents/GcMissionTable.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 = 0xA75713137DD06E07, NameHash = 0x4E2556EB)]
6+
[NMS(GUID = 0x838451A9E11647E6, NameHash = 0x4E2556EB)]
77
public class GcMissionTable : NMSTemplate
88
{
99
[NMS(Index = 0)]

‎libMBIN/Source/NMS/GameComponents/GcPlayerCommonStateData.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 = 0x699ECD9A7F5DD149, NameHash = 0xC7D918F3)]
6+
[NMS(GUID = 0x80D3704DD3ADC8FF, NameHash = 0xC7D918F3)]
77
public class GcPlayerCommonStateData : NMSTemplate
88
{
99
[NMS(Index = 5)]

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

Lines changed: 68 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -4,52 +4,52 @@
44

55
namespace libMBIN.NMS.GameComponents
66
{
7-
[NMS(GUID = 0xF18C9A5DF8962BFA, NameHash = 0x37EE71BB)]
7+
[NMS(GUID = 0x9A6F6A3BBC7A0B32, NameHash = 0x37EE71BB)]
88
public class GcScanEventData : NMSTemplate
99
{
10-
[NMS(Index = 40)]
11-
/* 0x000 */ public GcScanEventSolarSystemLookup SolarSystemAttributes;
1210
[NMS(Index = 41)]
11+
/* 0x000 */ public GcScanEventSolarSystemLookup SolarSystemAttributes;
12+
[NMS(Index = 42)]
1313
/* 0x088 */ public GcScanEventSolarSystemLookup SolarSystemAttributesFallback;
14-
[NMS(Index = 64)]
14+
[NMS(Index = 65)]
1515
/* 0x110 */ public GcResourceElement ResourceOverride;
1616
[NMS(Index = 1)]
1717
/* 0x158 */ public NMSString0x20A ForceInteraction;
1818
[NMS(Index = 7)]
1919
/* 0x178 */ public NMSString0x20A MustMatchStoryUtilityPuzzle;
2020
[NMS(Index = 0)]
2121
/* 0x198 */ public NMSString0x20A Name;
22-
[NMS(Index = 45)]
22+
[NMS(Index = 46)]
2323
/* 0x1B8 */ public NMSString0x20A NextOption;
24-
[NMS(Index = 20)]
24+
[NMS(Index = 21)]
2525
/* 0x1D8 */ public NMSString0x20A PlanetLabelText;
26-
[NMS(Index = 22)]
27-
/* 0x1F8 */ public NMSString0x20A SurveyDiscoveryOSDMessage;
2826
[NMS(Index = 23)]
27+
/* 0x1F8 */ public NMSString0x20A SurveyDiscoveryOSDMessage;
28+
[NMS(Index = 24)]
2929
/* 0x218 */ public NMSString0x20A SurveyHUDName;
30-
[NMS(Index = 52)]
30+
[NMS(Index = 53)]
3131
/* 0x238 */ public TkTextureResource MarkerIcon;
32-
[NMS(Index = 46)]
32+
[NMS(Index = 47)]
3333
/* 0x250 */ public GcScanEventTriggers TriggerActions;
34-
[NMS(Index = 12)]
34+
[NMS(Index = 13)]
3535
/* 0x268 */ public NMSString0x10 ForceOverrideEncounter;
36-
[NMS(Index = 44)]
36+
[NMS(Index = 45)]
3737
/* 0x278 */ public NMSString0x10 HasReward;
38-
[NMS(Index = 50)]
39-
/* 0x288 */ public VariableSizeString InterstellarOSDMessage;
4038
[NMS(Index = 51)]
39+
/* 0x288 */ public VariableSizeString InterstellarOSDMessage;
40+
[NMS(Index = 52)]
4141
/* 0x298 */ public VariableSizeString MarkerLabel;
42-
[NMS(Index = 63)]
42+
[NMS(Index = 64)]
4343
/* 0x2A8 */ public NMSString0x10 MissionMessageOnInteract;
44-
[NMS(Index = 49)]
44+
[NMS(Index = 50)]
4545
/* 0x2B8 */ public VariableSizeString OSDMessage;
4646
[NMS(Index = 10)]
4747
/* 0x2C8 */ public NMSString0x10 ReplacementMaintData;
48-
[NMS(Index = 62)]
48+
[NMS(Index = 63)]
4949
/* 0x2D8 */ public VariableSizeString TooltipMessage;
50-
[NMS(Index = 47)]
50+
[NMS(Index = 48)]
5151
/* 0x2E8 */ public List<VariableSizeString> UAsList;
52-
[NMS(Index = 33)]
52+
[NMS(Index = 34)]
5353
/* 0x2F8 */ public GcBuildingClassification BuildingClass;
5454
// size: 0x7
5555
public enum BuildingLocationEnum : uint {
@@ -61,9 +61,9 @@ public enum BuildingLocationEnum : uint {
6161
PlanetSearch,
6262
PlayerSettlement,
6363
}
64-
[NMS(Index = 31)]
64+
[NMS(Index = 32)]
6565
/* 0x2FC */ public BuildingLocationEnum BuildingLocation;
66-
[NMS(Index = 15)]
66+
[NMS(Index = 16)]
6767
/* 0x300 */ public float BuildingPreventionRadius;
6868
// size: 0x19
6969
public enum BuildingTypeEnum : uint {
@@ -93,7 +93,7 @@ public enum BuildingTypeEnum : uint {
9393
FriendlyDrone,
9494
AnyRobotSite,
9595
}
96-
[NMS(Index = 32)]
96+
[NMS(Index = 33)]
9797
/* 0x304 */ public BuildingTypeEnum BuildingType;
9898
// size: 0x5
9999
public enum EventEndTypeEnum : uint {
@@ -103,14 +103,14 @@ public enum EventEndTypeEnum : uint {
103103
EnterBuilding,
104104
TimedInteract,
105105
}
106-
[NMS(Index = 25)]
106+
[NMS(Index = 26)]
107107
/* 0x308 */ public EventEndTypeEnum EventEndType;
108108
// size: 0x2
109109
public enum EventPriorityEnum : uint {
110110
Regular,
111111
High,
112112
}
113-
[NMS(Index = 26)]
113+
[NMS(Index = 27)]
114114
/* 0x30C */ public EventPriorityEnum EventPriority;
115115
// size: 0x6
116116
public enum EventStartTypeEnum : uint {
@@ -121,19 +121,19 @@ public enum EventStartTypeEnum : uint {
121121
ObjectScan,
122122
LeaveBuilding,
123123
}
124-
[NMS(Index = 24)]
124+
[NMS(Index = 25)]
125125
/* 0x310 */ public EventStartTypeEnum EventStartType;
126126
[NMS(Index = 3)]
127127
/* 0x314 */ public GcInteractionType ForceInteractionType;
128-
[NMS(Index = 58)]
128+
[NMS(Index = 59)]
129129
/* 0x318 */ public float IconTime;
130-
[NMS(Index = 57)]
130+
[NMS(Index = 58)]
131131
/* 0x31C */ public GcAudioWwiseEvents MessageAudio;
132-
[NMS(Index = 56)]
132+
[NMS(Index = 57)]
133133
/* 0x320 */ public float MessageDisplayTime;
134-
[NMS(Index = 55)]
134+
[NMS(Index = 56)]
135135
/* 0x324 */ public float MessageTime;
136-
[NMS(Index = 53)]
136+
[NMS(Index = 54)]
137137
/* 0x328 */ public GcScannerIconHighlightTypes MissionMarkerHighlightStyleOverride;
138138
[NMS(Index = 6)]
139139
/* 0x32C */ public GcAlienRace OverrideInteractionRace;
@@ -148,63 +148,65 @@ public enum SolarSystemLocationEnum : uint {
148148
FromList,
149149
SeasonParty,
150150
}
151-
[NMS(Index = 39)]
151+
[NMS(Index = 40)]
152152
/* 0x334 */ public SolarSystemLocationEnum SolarSystemLocation;
153-
[NMS(Index = 54)]
153+
[NMS(Index = 55)]
154154
/* 0x338 */ public float StartTime;
155-
[NMS(Index = 21)]
155+
[NMS(Index = 22)]
156156
/* 0x33C */ public float SurveyDistance;
157-
[NMS(Index = 48)]
157+
[NMS(Index = 49)]
158158
/* 0x340 */ public GcTechnologyCategory TechShopType;
159-
[NMS(Index = 59)]
159+
[NMS(Index = 60)]
160160
/* 0x344 */ public float TooltipTime;
161-
[NMS(Index = 34)]
161+
[NMS(Index = 35)]
162162
/* 0x348 */ public bool AllowFriendsBases;
163-
[NMS(Index = 37)]
163+
[NMS(Index = 38)]
164164
/* 0x349 */ public bool AllowOverriddenBuildings;
165-
[NMS(Index = 17)]
165+
[NMS(Index = 18)]
166166
/* 0x34A */ public bool AlwaysShow;
167-
[NMS(Index = 29)]
167+
[NMS(Index = 30)]
168168
/* 0x34B */ public bool BlockStartedOnUseEvents;
169-
[NMS(Index = 27)]
169+
[NMS(Index = 28)]
170170
/* 0x34C */ public bool CanEndFromOutsideMission;
171-
[NMS(Index = 14)]
171+
[NMS(Index = 15)]
172172
/* 0x34D */ public bool ClearForcedInteractionOnCompletion;
173-
[NMS(Index = 28)]
173+
[NMS(Index = 29)]
174174
/* 0x34E */ public bool DisableMultiplayerSync;
175175
[NMS(Index = 8)]
176176
/* 0x34F */ public bool ForceBroken;
177177
[NMS(Index = 9)]
178178
/* 0x350 */ public bool ForceFixed;
179-
[NMS(Index = 11)]
179+
[NMS(Index = 12)]
180180
/* 0x351 */ public bool ForceOverridesAll;
181+
[NMS(Index = 11)]
182+
/* 0x352 */ public bool ForceReplaceStoryPortalSeed;
183+
[NMS(Index = 44)]
184+
/* 0x353 */ public bool ForceResetPortal;
181185
[NMS(Index = 43)]
182-
/* 0x352 */ public bool ForceResetPortal;
183-
[NMS(Index = 42)]
184-
/* 0x353 */ public bool ForceRestartInteraction;
185-
[NMS(Index = 35)]
186-
/* 0x354 */ public bool ForceWideRandom;
187-
[NMS(Index = 13)]
188-
/* 0x355 */ public bool IsCommunityPortalOverride;
186+
/* 0x354 */ public bool ForceRestartInteraction;
189187
[NMS(Index = 36)]
190-
/* 0x356 */ public bool MustFindSystem;
191-
[NMS(Index = 18)]
192-
/* 0x357 */ public bool NeverShow;
188+
/* 0x355 */ public bool ForceWideRandom;
189+
[NMS(Index = 14)]
190+
/* 0x356 */ public bool IsCommunityPortalOverride;
191+
[NMS(Index = 37)]
192+
/* 0x357 */ public bool MustFindSystem;
193+
[NMS(Index = 19)]
194+
/* 0x358 */ public bool NeverShow;
193195
[NMS(Index = 4)]
194-
/* 0x358 */ public bool NPCReactsToPlayer;
195-
[NMS(Index = 30)]
196-
/* 0x359 */ public bool ReplaceEventIfAlreadyActive;
196+
/* 0x359 */ public bool NPCReactsToPlayer;
197+
[NMS(Index = 31)]
198+
/* 0x35A */ public bool ReplaceEventIfAlreadyActive;
199+
[NMS(Index = 62)]
200+
/* 0x35B */ public bool ShowEndTooltip;
201+
[NMS(Index = 20)]
202+
/* 0x35C */ public bool ShowOnlyIfSequenceTarget;
203+
[NMS(Index = 39)]
204+
/* 0x35D */ public bool TargetMustMatchMissionSeed;
197205
[NMS(Index = 61)]
198-
/* 0x35A */ public bool ShowEndTooltip;
199-
[NMS(Index = 19)]
200-
/* 0x35B */ public bool ShowOnlyIfSequenceTarget;
201-
[NMS(Index = 38)]
202-
/* 0x35C */ public bool TargetMustMatchMissionSeed;
203-
[NMS(Index = 60)]
204-
/* 0x35D */ public bool TooltipRepeats;
205-
[NMS(Index = 16)]
206-
/* 0x35E */ public bool UseMissionTradingDataOverride;
206+
/* 0x35E */ public bool TooltipRepeats;
207+
[NMS(Index = 17)]
208+
/* 0x35F */ public bool UseMissionTradingDataOverride;
207209
[NMS(Index = 2)]
208-
/* 0x35F */ public bool UseSeasonDataAsInteraction;
210+
/* 0x360 */ public bool UseSeasonDataAsInteraction;
209211
}
210212
}

‎libMBIN/Source/NMS/GameComponents/GcScanEventTable.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 = 0x2E564951E24A1276, NameHash = 0xEE47CB18)]
6+
[NMS(GUID = 0xB35657583A6EC28F, NameHash = 0xEE47CB18)]
77
public class GcScanEventTable : NMSTemplate
88
{
99
[NMS(Index = 0)]

‎libMBIN/Source/NMS/GameComponents/GcSeasonalGameModeData.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 = 0x688B32A485F7F50C, NameHash = 0xC2909BE6)]
7+
[NMS(GUID = 0xDA3BF1195C93CB23, NameHash = 0xC2909BE6)]
88
public class GcSeasonalGameModeData : NMSTemplate
99
{
1010
[NMS(Index = 71, Size = 0x12)]

0 commit comments

Comments
 (0)