Skip to content

Commit 078b7dc

Browse files
authored
Merge pull request #663 from HolterPhylo/UpdateFor19816668
Update for 19816668
2 parents 82f0f61 + 4b66226 commit 078b7dc

13 files changed

+147
-139
lines changed

libMBIN/Source/NMS/GameComponents/GcExperienceSpawnTable.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 = 0x2D9A76D8164E79D8, NameHash = 0xD4ED2AD7)]
6+
[NMS(GUID = 0x8F3A0F40CCA7A7C0, NameHash = 0xD4ED2AD7)]
77
public class GcExperienceSpawnTable : NMSTemplate
88
{
99
[NMS(Index = 18)]
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
namespace libMBIN.NMS.GameComponents
22
{
3-
[NMS(GUID = 0xC325B106C27C39E8, NameHash = 0x6F8BC0CA)]
3+
[NMS(GUID = 0xCD0AE47F9FDBCEE, NameHash = 0x6F8BC0CA)]
44
public class GcInputActionMapping2 : NMSTemplate
55
{
66
[NMS(Index = 1)]
7-
/* 0x00 */ public NMSString0x20 Action;
7+
/* 0x00 */ public NMSString0x40 Action;
88
[NMS(Index = 0)]
9-
/* 0x20 */ public NMSString0x20 ActionSet;
9+
/* 0x40 */ public NMSString0x20 ActionSet;
1010
[NMS(Index = 3)]
11-
/* 0x40 */ public NMSString0x20 Axis;
11+
/* 0x60 */ public NMSString0x20 Axis;
1212
[NMS(Index = 2)]
13-
/* 0x60 */ public NMSString0x20 Button;
13+
/* 0x80 */ public NMSString0x20 Button;
1414
}
1515
}

libMBIN/Source/NMS/GameComponents/GcLandingGearComponentData.cs

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,30 @@
33

44
namespace libMBIN.NMS.GameComponents
55
{
6-
[NMS(GUID = 0x6337902E501BBC7B, NameHash = 0xC1383C3B)]
6+
[NMS(GUID = 0x3D1599B55DDD831A, NameHash = 0xC1383C3B)]
77
public class GcLandingGearComponentData : NMSTemplate
88
{
99
[NMS(Index = 0)]
10-
/* 0x00 */ public float DeployTime;
10+
/* 0x00 */ public NMSString0x10 ExtendAnim;
11+
[NMS(Index = 7)]
12+
/* 0x10 */ public NMSString0x10 FlyingAnim;
13+
[NMS(Index = 1)]
14+
/* 0x20 */ public float DeployTime;
15+
[NMS(Index = 6)]
16+
/* 0x24 */ public GcAudioWwiseEvents EndAudioEvent;
17+
[NMS(Index = 9)]
18+
/* 0x28 */ public float LandTime;
19+
[NMS(Index = 3)]
20+
/* 0x2C */ public float RetractTime;
1121
[NMS(Index = 5)]
12-
/* 0x04 */ public GcAudioWwiseEvents EndAudioEvent;
22+
/* 0x30 */ public GcAudioWwiseEvents StartAudioEvent;
23+
[NMS(Index = 8)]
24+
/* 0x34 */ public float TakeOffTime;
1325
[NMS(Index = 2)]
14-
/* 0x08 */ public float RetractTime;
26+
/* 0x38 */ public TkCurveType DeployCurve;
27+
[NMS(Index = 10)]
28+
/* 0x39 */ public TkCurveType FlyingCurve;
1529
[NMS(Index = 4)]
16-
/* 0x0C */ public GcAudioWwiseEvents StartAudioEvent;
17-
[NMS(Index = 1)]
18-
/* 0x10 */ public TkCurveType DeployCurve;
19-
[NMS(Index = 3)]
20-
/* 0x11 */ public TkCurveType RetractCurve;
30+
/* 0x3A */ public TkCurveType RetractCurve;
2131
}
2232
}

libMBIN/Source/NMS/GameComponents/GcMarkerComponentData.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 = 0xB07DEECA80FC9D58, NameHash = 0x7714ED08)]
5+
[NMS(GUID = 0xAE7697868261E6D5, NameHash = 0x7714ED08)]
66
public class GcMarkerComponentData : NMSTemplate
77
{
88
[NMS(Index = 4)]

libMBIN/Source/NMS/GameComponents/GcRealityGameIcons.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 = 0x21D7284FD8EAA6AF, NameHash = 0xC8C2FA1E)]
3+
[NMS(GUID = 0x576382D59B5CC958, NameHash = 0xC8C2FA1E)]
44
public class GcRealityGameIcons : NMSTemplate
55
{
6-
// size: 0x72
6+
// size: 0x73
77
public enum GameIconsEnum : uint {
88
Stamina,
99
NoStamina,
@@ -67,6 +67,7 @@ public enum GameIconsEnum : uint {
6767
TransferBase,
6868
TransferCooker,
6969
TransferSkiff,
70+
TransferCorvette,
7071
HazardIndicatorHot,
7172
HazardIndicatorCold,
7273
HazardIndicatorRadiation,

libMBIN/Source/NMS/GameComponents/GcRealityIconTable.cs

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,50 +4,50 @@
44

55
namespace libMBIN.NMS.GameComponents
66
{
7-
[NMS(GUID = 0x79C630385813FF7E, NameHash = 0xA547E834)]
7+
[NMS(GUID = 0xCC5294707151FDBE, NameHash = 0xA547E834)]
88
public class GcRealityIconTable : NMSTemplate
99
{
10-
[NMS(Index = 15, Size = 0x72, EnumType = typeof(GcRealityGameIcons.GameIconsEnum))]
10+
[NMS(Index = 15, Size = 0x73, EnumType = typeof(GcRealityGameIcons.GameIconsEnum))]
1111
/* 0x0000 */ public TkTextureResource[] GameIcons;
1212
[NMS(Index = 5, Size = 0x11, EnumType = typeof(GcDiscoveryType.DiscoveryTypeEnum))]
13-
/* 0x0AB0 */ public TkTextureResource[] BinocularDiscoveryIcons;
13+
/* 0x0AC8 */ public TkTextureResource[] BinocularDiscoveryIcons;
1414
[NMS(Index = 3, Size = 0xB, EnumType = typeof(GcProductCategory.ProductCategoryEnum))]
15-
/* 0x0C48 */ public TkTextureResource[] ProductCategoryIcons;
15+
/* 0x0C60 */ public TkTextureResource[] ProductCategoryIcons;
1616
[NMS(Index = 4, Size = 0xA, EnumType = typeof(GcMissionFaction.MissionFactionEnum))]
17-
/* 0x0D50 */ public TkTextureResource[] MissionFactionIcons;
17+
/* 0x0D68 */ public TkTextureResource[] MissionFactionIcons;
1818
[NMS(Index = 8, Size = 0x9, EnumType = typeof(GcAlienRace.AlienRaceEnum))]
19-
/* 0x0E40 */ public TkTextureResource[] DiscoveryPageRaceIcons;
19+
/* 0x0E58 */ public TkTextureResource[] DiscoveryPageRaceIcons;
2020
[NMS(Index = 2, Size = 0x9, EnumType = typeof(GcRealitySubstanceCategory.SubstanceCategoryEnum))]
21-
/* 0x0F18 */ public TkTextureResource[] SubstanceCategoryIcons;
21+
/* 0x0F30 */ public TkTextureResource[] SubstanceCategoryIcons;
2222
[NMS(Index = 17, Size = 0x7, EnumType = typeof(GcDifficultyPresetType.DifficultyPresetTypeEnum))]
23-
/* 0x0FF0 */ public TkTextureResource[] DifficultyPresetIcons;
23+
/* 0x1008 */ public TkTextureResource[] DifficultyPresetIcons;
2424
[NMS(Index = 6, Size = 0x7, EnumType = typeof(GcTradingClass.TradingClassEnum))]
25-
/* 0x1098 */ public TkTextureResource[] DiscoveryPageTradingIcons;
25+
/* 0x10B0 */ public TkTextureResource[] DiscoveryPageTradingIcons;
2626
[NMS(Index = 0, Size = 0x7, EnumType = typeof(GcPlayerHazardType.HazardEnum))]
27-
/* 0x1140 */ public TkTextureResource[] HazardIcons;
27+
/* 0x1158 */ public TkTextureResource[] HazardIcons;
2828
[NMS(Index = 1, Size = 0x7, EnumType = typeof(GcPlayerHazardType.HazardEnum))]
29-
/* 0x11E8 */ public TkTextureResource[] HazardIconsHUD;
29+
/* 0x1200 */ public TkTextureResource[] HazardIconsHUD;
3030
[NMS(Index = 19, Size = 0x6, EnumType = typeof(GcOptionsUIHeaderIcons.OptionsUIHeaderIconTypeEnum))]
31-
/* 0x1290 */ public TkTextureResource[] OptionsUIHeaderIcons;
31+
/* 0x12A8 */ public TkTextureResource[] OptionsUIHeaderIcons;
3232
[NMS(Index = 20, Size = 0x5, EnumType = typeof(GcInventoryFilterOptions.InventoryFilterEnum))]
33-
/* 0x1320 */ public TkTextureResource[] InventoryFilterIcons;
33+
/* 0x1338 */ public TkTextureResource[] InventoryFilterIcons;
3434
[NMS(Index = 18, Size = 0x4, EnumType = typeof(GcDifficultyOptionGroups.DifficultyOptionGroupEnum))]
35-
/* 0x1398 */ public TkTextureResource[] DifficultyUIOptionIcons;
35+
/* 0x13B0 */ public TkTextureResource[] DifficultyUIOptionIcons;
3636
[NMS(Index = 7, Size = 0x4, EnumType = typeof(GcPlayerConflictData.ConflictLevelEnum))]
37-
/* 0x13F8 */ public TkTextureResource[] DiscoveryPageConflictIcons;
37+
/* 0x1410 */ public TkTextureResource[] DiscoveryPageConflictIcons;
3838
[NMS(Index = 16, KeyField = "ID")]
39-
/* 0x1458 */ public HashMap<GcRealityIcon> MissionDetailIcons;
39+
/* 0x1470 */ public HashMap<GcRealityIcon> MissionDetailIcons;
4040
[NMS(Index = 10)]
41-
/* 0x1488 */ public TkTextureResource DiscoveryPageConflictUnknown;
41+
/* 0x14A0 */ public TkTextureResource DiscoveryPageConflictUnknown;
4242
[NMS(Index = 11)]
43-
/* 0x14A0 */ public TkTextureResource DiscoveryPageRaceUnknown;
43+
/* 0x14B8 */ public TkTextureResource DiscoveryPageRaceUnknown;
4444
[NMS(Index = 9)]
45-
/* 0x14B8 */ public TkTextureResource DiscoveryPageTradingUnknown;
45+
/* 0x14D0 */ public TkTextureResource DiscoveryPageTradingUnknown;
4646
[NMS(Index = 13)]
47-
/* 0x14D0 */ public List<GcPlanetResourceIconLookup> PlanetResourceIconLookups;
47+
/* 0x14E8 */ public List<GcPlanetResourceIconLookup> PlanetResourceIconLookups;
4848
[NMS(Index = 14)]
49-
/* 0x14E0 */ public List<TkTextureResource> RepairTechIcons;
49+
/* 0x14F8 */ public List<TkTextureResource> RepairTechIcons;
5050
[NMS(Index = 12)]
51-
/* 0x14F0 */ public List<GcPlanetResourceIconLookup> TerrainIconLookups;
51+
/* 0x1508 */ public List<GcPlanetResourceIconLookup> TerrainIconLookups;
5252
}
5353
}

0 commit comments

Comments
 (0)