Skip to content

Commit bd6a360

Browse files
monkeyman192monkeyman192
authored
Merge pull request #632 from monkeyman192/update/17190683
Update for latest experimental (steam build id 1719083)
2 parents 7e04328 + 511bf90 commit bd6a360

9 files changed

+111
-82
lines changed

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
namespace libMBIN.NMS.GameComponents
2+
{
3+
[NMS(GUID = 0xE7713CC35A6610ED, NameHash = 0xC514DD27)]
4+
public class GcEasyRagdollSetUpBodyDimensions : NMSTemplate
5+
{
6+
[NMS(Index = 1)]
7+
/* 0x00 */ public Vector3f Centre;
8+
[NMS(Index = 2)]
9+
/* 0x10 */ public Vector3f Size;
10+
[NMS(Index = 0)]
11+
/* 0x20 */ public NMSString0x20 Joint;
12+
}
13+
}

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
1+
using libMBIN.NMS.GameComponents;
12
using System.Collections.Generic;
23

34
namespace libMBIN.NMS.GameComponents
45
{
5-
[NMS(GUID = 0xB9A61835A576E9AC, NameHash = 0x18118681)]
6+
[NMS(GUID = 0xF430399C0BBABCAA, NameHash = 0x18118681)]
67
public class GcEasyRagdollSetUpData : NMSTemplate
78
{
89
[NMS(Index = 0)]
910
/* 0x00 */ public List<NMSString0x20> ChainEnds;
1011
[NMS(Index = 1)]
1112
/* 0x10 */ public List<NMSString0x20> ExcludeJoints;
13+
[NMS(Index = 2)]
14+
/* 0x20 */ public List<GcEasyRagdollSetUpBodyDimensions> ForceBodyDimensions;
1215
}
1316
}

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

Lines changed: 49 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,28 @@
44

55
namespace libMBIN.NMS.GameComponents
66
{
7-
[NMS(GUID = 0xB8C49D6D26F9587, NameHash = 0x7FD50C85)]
7+
[NMS(GUID = 0xE0D3CBC490E48AF6, NameHash = 0x7FD50C85)]
88
public class GcGenericMissionSequence : NMSTemplate
99
{
10-
[NMS(Index = 23)]
10+
[NMS(Index = 24)]
1111
/* 0x000 */ public Colour MissionColourOverride;
12-
[NMS(Index = 39)]
12+
[NMS(Index = 40)]
1313
/* 0x010 */ public GcTradeData TradingDataOverride;
14-
[NMS(Index = 31)]
14+
[NMS(Index = 32)]
1515
/* 0x0E0 */ public GcMissionBoardOptions MissionBoardOptions;
1616
[NMS(Index = 7)]
1717
/* 0x160 */ public GcSeasonalLogOverrides SeasonalLogTextOverrides;
18-
[NMS(Index = 26)]
18+
[NMS(Index = 27)]
1919
/* 0x1D0 */ public GcDefaultMissionItemsTable DefaultItems;
20-
[NMS(Index = 20)]
20+
[NMS(Index = 21)]
2121
/* 0x220 */ public NMSString0x20A MissionPageLocID;
2222
[NMS(Index = 6)]
2323
/* 0x240 */ public GcNumberedTextList MissionDescriptions;
24-
[NMS(Index = 14)]
24+
[NMS(Index = 15)]
2525
/* 0x258 */ public TkTextureResource MissionIcon;
26-
[NMS(Index = 16)]
26+
[NMS(Index = 17)]
2727
/* 0x270 */ public TkTextureResource MissionIconNotSelected;
28-
[NMS(Index = 15)]
28+
[NMS(Index = 16)]
2929
/* 0x288 */ public TkTextureResource MissionIconSelected;
3030
[NMS(Index = 10)]
3131
/* 0x2A0 */ public GcNumberedTextList MissionProcDescriptionA;
@@ -39,31 +39,31 @@ public class GcGenericMissionSequence : NMSTemplate
3939
/* 0x300 */ public GcNumberedTextList MissionSubtitles;
4040
[NMS(Index = 4)]
4141
/* 0x318 */ public GcNumberedTextList MissionTitles;
42-
[NMS(Index = 44)]
42+
[NMS(Index = 45)]
4343
/* 0x330 */ public List<NMSTemplate> CancelingConditions;
44-
[NMS(Index = 38)]
44+
[NMS(Index = 39)]
4545
/* 0x340 */ public List<GcCostTableEntry> Costs;
46-
[NMS(Index = 35)]
46+
[NMS(Index = 36)]
4747
/* 0x350 */ public GcAlienPuzzleTable Dialog;
48-
[NMS(Index = 45)]
48+
[NMS(Index = 46)]
4949
/* 0x360 */ public List<GcGenericMissionVersionProgress> FinalStageVersions;
50-
[NMS(Index = 21)]
50+
[NMS(Index = 22)]
5151
/* 0x370 */ public NMSString0x10 MissionBuildMenuHint;
5252
[NMS(Index = 0)]
5353
/* 0x380 */ public NMSString0x10 MissionID;
54-
[NMS(Index = 28)]
54+
[NMS(Index = 29)]
5555
/* 0x390 */ public NMSString0x10 NextMissionHint;
56-
[NMS(Index = 37)]
56+
[NMS(Index = 38)]
5757
/* 0x3A0 */ public List<GcGenericRewardTableEntry> Rewards;
58-
[NMS(Index = 36)]
58+
[NMS(Index = 37)]
5959
/* 0x3B0 */ public List<GcScanEventData> ScanEvents;
60-
[NMS(Index = 46)]
60+
[NMS(Index = 47)]
6161
/* 0x3C0 */ public List<GcGenericMissionStage> Stages;
62-
[NMS(Index = 43)]
62+
[NMS(Index = 44)]
6363
/* 0x3D0 */ public List<NMSTemplate> StartingConditions;
64-
[NMS(Index = 54)]
64+
[NMS(Index = 55)]
6565
/* 0x3E0 */ public NMSString0x10 UseCommunityMissionForLog;
66-
[NMS(Index = 25)]
66+
[NMS(Index = 26)]
6767
/* 0x3F0 */ public List<int> WikiMissionBlockedBySeasons;
6868
// size: 0x4
6969
public enum AutoStartEnum : uint {
@@ -72,29 +72,29 @@ public enum AutoStartEnum : uint {
7272
Seasonal,
7373
OnSelected,
7474
}
75-
[NMS(Index = 32)]
75+
[NMS(Index = 33)]
7676
/* 0x400 */ public AutoStartEnum AutoStart;
77-
[NMS(Index = 24)]
77+
[NMS(Index = 25)]
7878
/* 0x404 */ public int BeginCheckFrequency;
79-
[NMS(Index = 41)]
79+
[NMS(Index = 42)]
8080
/* 0x408 */ public GcMissionConditionTest CancelConditionTest;
8181
// size: 0x3
8282
public enum MessageCompleteEnum : uint {
8383
Default,
8484
Always,
8585
Never,
8686
}
87-
[NMS(Index = 29)]
87+
[NMS(Index = 30)]
8888
/* 0x40C */ public MessageCompleteEnum MessageComplete;
8989
// size: 0x3
9090
public enum MessageStartEnum : uint {
9191
Default,
9292
Always,
9393
Never,
9494
}
95-
[NMS(Index = 30)]
95+
[NMS(Index = 31)]
9696
/* 0x410 */ public MessageStartEnum MessageStart;
97-
[NMS(Index = 18)]
97+
[NMS(Index = 19)]
9898
/* 0x414 */ public GcMissionCategory MissionCategory;
9999
// size: 0xA
100100
public enum MissionClassEnum : uint {
@@ -111,49 +111,51 @@ public enum MissionClassEnum : uint {
111111
}
112112
[NMS(Index = 1)]
113113
/* 0x418 */ public MissionClassEnum MissionClass;
114-
[NMS(Index = 19)]
114+
[NMS(Index = 20)]
115115
/* 0x41C */ public GcMissionPageHint MissionPageHint;
116-
[NMS(Index = 17)]
116+
[NMS(Index = 18)]
117117
/* 0x420 */ public int MissionPriority;
118-
[NMS(Index = 40)]
118+
[NMS(Index = 41)]
119119
/* 0x424 */ public GcMissionConditionTest StartConditionTest;
120120
[NMS(Index = 8)]
121121
/* 0x428 */ public NMSString0x20 MissionDescSwitchOverride;
122122
[NMS(Index = 3)]
123123
/* 0x448 */ public NMSString0x20 MissionObjective;
124-
[NMS(Index = 52)]
124+
[NMS(Index = 53)]
125125
/* 0x468 */ public bool BlocksPinning;
126-
[NMS(Index = 34)]
126+
[NMS(Index = 35)]
127127
/* 0x469 */ public bool CancelSetsComplete;
128-
[NMS(Index = 53)]
128+
[NMS(Index = 54)]
129129
/* 0x46A */ public bool CanRenounce;
130-
[NMS(Index = 48)]
130+
[NMS(Index = 49)]
131131
/* 0x46B */ public bool ForcesBuildMenuHint;
132-
[NMS(Index = 47)]
132+
[NMS(Index = 48)]
133133
/* 0x46C */ public bool ForcesPageHint;
134-
[NMS(Index = 51)]
134+
[NMS(Index = 52)]
135135
/* 0x46D */ public bool IsLegacy;
136-
[NMS(Index = 49)]
137-
/* 0x46E */ public bool IsProceduralAllowed;
138136
[NMS(Index = 50)]
137+
/* 0x46E */ public bool IsProceduralAllowed;
138+
[NMS(Index = 51)]
139139
/* 0x46F */ public bool IsRecurring;
140-
[NMS(Index = 22)]
140+
[NMS(Index = 23)]
141141
/* 0x470 */ public bool MissionHasColourOverride;
142142
[NMS(Index = 2)]
143143
/* 0x471 */ public bool MissionIsCritical;
144-
[NMS(Index = 27)]
144+
[NMS(Index = 28)]
145145
/* 0x472 */ public bool PrefixTitle;
146-
[NMS(Index = 33)]
146+
[NMS(Index = 34)]
147147
/* 0x473 */ public bool RestartOnCompletion;
148-
[NMS(Index = 42)]
148+
[NMS(Index = 43)]
149149
/* 0x474 */ public bool StartIsCancel;
150-
[NMS(Index = 55)]
151-
/* 0x475 */ public bool TakeCommunityMissionIDFromSeasonData;
152150
[NMS(Index = 56)]
151+
/* 0x475 */ public bool TakeCommunityMissionIDFromSeasonData;
152+
[NMS(Index = 57)]
153153
/* 0x476 */ public bool TelemetryUpload;
154+
[NMS(Index = 14)]
155+
/* 0x477 */ public bool UseFirstPurpleSystemDetailsInLogInfo;
154156
[NMS(Index = 13)]
155-
/* 0x477 */ public bool UseScanEventDetailsInLogInfo;
156-
[NMS(Index = 57)]
157-
/* 0x478 */ public bool UseSeasonTitleOverride;
157+
/* 0x478 */ public bool UseScanEventDetailsInLogInfo;
158+
[NMS(Index = 58)]
159+
/* 0x479 */ public bool UseSeasonTitleOverride;
158160
}
159161
}

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace libMBIN.NMS.GameComponents
44
{
5-
[NMS(GUID = 0xA80B56F99C67F88, NameHash = 0xDB330A9F)]
5+
[NMS(GUID = 0x612BA9575232E52B, NameHash = 0xDB330A9F)]
66
public class GcMissionConditionHasProduct : NMSTemplate
77
{
88
[NMS(Index = 1)]
@@ -43,13 +43,15 @@ public class GcMissionConditionHasProduct : NMSTemplate
4343
/* 0x3B */ public bool TakeAmountFromSeasonData;
4444
[NMS(Index = 11)]
4545
/* 0x3C */ public bool TakeIdFromSeasonData;
46+
[NMS(Index = 23)]
47+
/* 0x3D */ public bool TeachIfNotKnown;
4648
[NMS(Index = 15)]
47-
/* 0x3D */ public bool UseAffordRecipeForTextFormatting;
49+
/* 0x3E */ public bool UseAffordRecipeForTextFormatting;
4850
[NMS(Index = 3)]
49-
/* 0x3E */ public bool UseDefaultAmount;
51+
/* 0x3F */ public bool UseDefaultAmount;
5052
[NMS(Index = 21)]
51-
/* 0x3F */ public bool UseProductCategory;
53+
/* 0x40 */ public bool UseProductCategory;
5254
[NMS(Index = 19)]
53-
/* 0x40 */ public bool UseProductIconAsMissionIcon;
55+
/* 0x41 */ public bool UseProductIconAsMissionIcon;
5456
}
5557
}

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
namespace libMBIN.NMS.GameComponents
2+
{
3+
[NMS(GUID = 0x21D278FA51E1649E, NameHash = 0xA96B440A)]
4+
public class GcMissionConditionIsFirstPurpleSystemLocal : NMSTemplate
5+
{
6+
}
7+
}

‎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 = 0x8E6B48FF3C172C62, NameHash = 0x4E2556EB)]
6+
[NMS(GUID = 0xD0A9D7F4019B983D, NameHash = 0x4E2556EB)]
77
public class GcMissionTable : NMSTemplate
88
{
99
[NMS(Index = 0)]

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

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -3,62 +3,62 @@
33

44
namespace libMBIN.NMS.GameComponents
55
{
6-
[NMS(GUID = 0x43085F512BFAEFD9, NameHash = 0xBA126FE5)]
6+
[NMS(GUID = 0x857D1E3E879EEA94, NameHash = 0xBA126FE5)]
77
public class GcRagdollComponentData : NMSTemplate
88
{
99
[NMS(Index = 2)]
1010
/* 0x000 */ public GcEasyRagdollSetUpData EasySetUpData;
1111
[NMS(Index = 26)]
12-
/* 0x020 */ public List<NMSString0x40> OtherKnownAnimations;
12+
/* 0x030 */ public List<NMSString0x40> OtherKnownAnimations;
1313
[NMS(Index = 4)]
14-
/* 0x030 */ public List<GcRagdollBone> RagdollBones;
14+
/* 0x040 */ public List<GcRagdollBone> RagdollBones;
1515
[NMS(Index = 19)]
16-
/* 0x040 */ public float AnimationSpeedOverride;
16+
/* 0x050 */ public float AnimationSpeedOverride;
1717
[NMS(Index = 21)]
18-
/* 0x044 */ public float BlendIntoStartPoseDuration;
18+
/* 0x054 */ public float BlendIntoStartPoseDuration;
1919
[NMS(Index = 25)]
20-
/* 0x048 */ public float InertiaScale;
20+
/* 0x058 */ public float InertiaScale;
2121
[NMS(Index = 14)]
22-
/* 0x04C */ public float JointFriction;
22+
/* 0x05C */ public float JointFriction;
2323
[NMS(Index = 16)]
24-
/* 0x050 */ public float KineticEnergyForRest;
24+
/* 0x060 */ public float KineticEnergyForRest;
2525
[NMS(Index = 20)]
26-
/* 0x054 */ public float MaxDamping;
26+
/* 0x064 */ public float MaxDamping;
2727
[NMS(Index = 17)]
28-
/* 0x058 */ public float MaxWaitForRest;
28+
/* 0x068 */ public float MaxWaitForRest;
2929
[NMS(Index = 18)]
30-
/* 0x05C */ public float MinWaitForRest;
30+
/* 0x06C */ public float MinWaitForRest;
3131
[NMS(Index = 5)]
32-
/* 0x060 */ public float ModelScaleAtCreation;
32+
/* 0x070 */ public float ModelScaleAtCreation;
3333
[NMS(Index = 15)]
34-
/* 0x064 */ public float OverallDurationScale;
34+
/* 0x074 */ public float OverallDurationScale;
3535
[NMS(Index = 23)]
36-
/* 0x068 */ public float PhasingOutRagdollDuration;
36+
/* 0x078 */ public float PhasingOutRagdollDuration;
3737
[NMS(Index = 22)]
38-
/* 0x06C */ public float PlayAnimationDuration;
38+
/* 0x07C */ public float PlayAnimationDuration;
3939
[NMS(Index = 24)]
40-
/* 0x070 */ public float WholeBodyMass;
40+
/* 0x080 */ public float WholeBodyMass;
4141
[NMS(Index = 11)]
42-
/* 0x074 */ public NMSString0x40 FallAnimation_Back;
42+
/* 0x084 */ public NMSString0x40 FallAnimation_Back;
4343
[NMS(Index = 10)]
44-
/* 0x0B4 */ public NMSString0x40 FallAnimation_Front;
44+
/* 0x0C4 */ public NMSString0x40 FallAnimation_Front;
4545
[NMS(Index = 12)]
46-
/* 0x0F4 */ public NMSString0x40 FallAnimation_Left;
46+
/* 0x104 */ public NMSString0x40 FallAnimation_Left;
4747
[NMS(Index = 13)]
48-
/* 0x134 */ public NMSString0x40 FallAnimation_Right;
48+
/* 0x144 */ public NMSString0x40 FallAnimation_Right;
4949
[NMS(Index = 7)]
50-
/* 0x174 */ public NMSString0x40 GetUpAnimation_Back;
50+
/* 0x184 */ public NMSString0x40 GetUpAnimation_Back;
5151
[NMS(Index = 6)]
52-
/* 0x1B4 */ public NMSString0x40 GetUpAnimation_Front;
52+
/* 0x1C4 */ public NMSString0x40 GetUpAnimation_Front;
5353
[NMS(Index = 8)]
54-
/* 0x1F4 */ public NMSString0x40 GetUpAnimation_Left;
54+
/* 0x204 */ public NMSString0x40 GetUpAnimation_Left;
5555
[NMS(Index = 9)]
56-
/* 0x234 */ public NMSString0x40 GetUpAnimation_Right;
56+
/* 0x244 */ public NMSString0x40 GetUpAnimation_Right;
5757
[NMS(Index = 3)]
58-
/* 0x274 */ public NMSString0x40 Name;
58+
/* 0x284 */ public NMSString0x40 Name;
5959
[NMS(Index = 1)]
60-
/* 0x2B4 */ public bool EasySetUp;
60+
/* 0x2C4 */ public bool EasySetUp;
6161
[NMS(Index = 0)]
62-
/* 0x2B5 */ public bool Enabled;
62+
/* 0x2C5 */ public bool Enabled;
6363
}
6464
}

‎libMBIN/Source/Version.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public static class Version {
2525
// the Prerelease version should be reset to 1
2626
// When the Release version is incremented:
2727
// the Prerelease version should be reset to 0
28-
internal const string VERSION_STRING = "5.51.0.1";
28+
internal const string VERSION_STRING = "5.52.0.1";
2929

3030
/// <summary>Shorthand for AssemblyVersion.Major</summary>
3131
public static int Major => AssemblyVersion.Major;

‎libMBIN/libMBIN-Shared.projitems‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -614,6 +614,7 @@
614614
<Compile Include="$(MSBuildThisFileDirectory)Source\NMS\GameComponents\GcDungeonGenerationParams.cs" />
615615
<Compile Include="$(MSBuildThisFileDirectory)Source\NMS\GameComponents\GcDungeonQuestParams.cs" />
616616
<Compile Include="$(MSBuildThisFileDirectory)Source\NMS\GameComponents\GcDungeonRoomParams.cs" />
617+
<Compile Include="$(MSBuildThisFileDirectory)Source\NMS\GameComponents\GcEasyRagdollSetUpBodyDimensions.cs" />
617618
<Compile Include="$(MSBuildThisFileDirectory)Source\NMS\GameComponents\GcEasyRagdollSetUpData.cs" />
618619
<Compile Include="$(MSBuildThisFileDirectory)Source\NMS\GameComponents\GcEcosystemCreatureData.cs" />
619620
<Compile Include="$(MSBuildThisFileDirectory)Source\NMS\GameComponents\GcEcosystemSpawnData.cs" />
@@ -1068,6 +1069,7 @@
10681069
<Compile Include="$(MSBuildThisFileDirectory)Source\NMS\GameComponents\GcMissionConditionIsAnomalyLoaded.cs" />
10691070
<Compile Include="$(MSBuildThisFileDirectory)Source\NMS\GameComponents\GcMissionConditionIsCurrentMission.cs" />
10701071
<Compile Include="$(MSBuildThisFileDirectory)Source\NMS\GameComponents\GcMissionConditionIsDepotDestroyed.cs" />
1072+
<Compile Include="$(MSBuildThisFileDirectory)Source\NMS\GameComponents\GcMissionConditionIsFirstPurpleSystemLocal.cs" />
10711073
<Compile Include="$(MSBuildThisFileDirectory)Source\NMS\GameComponents\GcMissionConditionIsFishing.cs" />
10721074
<Compile Include="$(MSBuildThisFileDirectory)Source\NMS\GameComponents\GcMissionConditionIsFrigateFlybyActive.cs" />
10731075
<Compile Include="$(MSBuildThisFileDirectory)Source\NMS\GameComponents\GcMissionConditionIsGrabbed.cs" />

0 commit comments

Comments
 (0)