Skip to content

Commit 689c2a8

Browse files
authored
Merge pull request #619 from monkeyman192/update/15663204
Update for 15663204
2 parents 65a5033 + e902901 commit 689c2a8

14 files changed

+240
-227
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 = 0xBFA08CAFF95D227D, NameHash = 0xD4ED2AD7)]
6+
[NMS(GUID = 0x1D0071FCC0940C8B, NameHash = 0xD4ED2AD7)]
77
public class GcExperienceSpawnTable : NMSTemplate
88
{
99
[NMS(Index = 18)]

libMBIN/Source/NMS/GameComponents/GcInventoryLayoutGenerationData.cs

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

33
namespace libMBIN.NMS.GameComponents
44
{
5-
[NMS(GUID = 0xB69D92CF6E0EF806, NameHash = 0x5EB6EE4B)]
5+
[NMS(GUID = 0x20299C0BDB822D8C, NameHash = 0x5EB6EE4B)]
66
public class GcInventoryLayoutGenerationData : NMSTemplate
77
{
8-
[NMS(Index = 0, Size = 0x29, EnumType = typeof(GcInventoryLayoutSizeType.SizeTypeEnum))]
8+
[NMS(Index = 0, Size = 0x2A, EnumType = typeof(GcInventoryLayoutSizeType.SizeTypeEnum))]
99
/* 0x0 */ public GcInventoryLayoutGenerationDataEntry[] GenerationDataPerSizeType;
1010
}
1111
}

libMBIN/Source/NMS/GameComponents/GcInventoryLayoutSizeType.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 = 0xDF6D3D99AC1DDA5A, NameHash = 0x33060745)]
3+
[NMS(GUID = 0x1B33422173AFC92, NameHash = 0x33060745)]
44
public class GcInventoryLayoutSizeType : NMSTemplate
55
{
6-
// size: 0x29
6+
// size: 0x2A
77
public enum SizeTypeEnum : uint {
88
SciSmall,
99
SciMedium,
@@ -46,6 +46,7 @@ public enum SizeTypeEnum : uint {
4646
MaintObject,
4747
RocketLocker,
4848
FishBaitBox,
49+
FishingPlatform,
4950
}
5051
[NMS(Index = 0)]
5152
/* 0x0 */ public SizeTypeEnum SizeType;

libMBIN/Source/NMS/GameComponents/GcInventoryTable.cs

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

44
namespace libMBIN.NMS.GameComponents
55
{
6-
[NMS(GUID = 0xDB425BA370E05B8D, NameHash = 0x107C2CC0)]
6+
[NMS(GUID = 0x11F7005021984766, NameHash = 0x107C2CC0)]
77
public class GcInventoryTable : NMSTemplate
88
{
99
[NMS(Index = 7, Size = 0xA, EnumType = typeof(GcSpaceshipClasses.ShipClassEnum))]
@@ -19,16 +19,16 @@ public class GcInventoryTable : NMSTemplate
1919
[NMS(Index = 1)]
2020
/* 0x0560 */ public GcInventoryLayoutGenerationData GenerationData;
2121
[NMS(Index = 10, Size = 0xA, EnumType = typeof(GcSpaceshipClasses.ShipClassEnum))]
22-
/* 0x12D4 */ public GcShipInventoryMaxUpgradeCapacity[] ShipInventoryMaxUpgradeSize;
22+
/* 0x1328 */ public GcShipInventoryMaxUpgradeCapacity[] ShipInventoryMaxUpgradeSize;
2323
[NMS(Index = 2)]
24-
/* 0x14B4 */ public GcInventoryCostData ShipCostData;
24+
/* 0x1508 */ public GcInventoryCostData ShipCostData;
2525
[NMS(Index = 3, Size = 0xA, EnumType = typeof(GcWeaponClasses.WeaponStatClassEnum))]
26-
/* 0x1644 */ public GcInventoryCostDataEntry[] WeaponCostData;
26+
/* 0x1698 */ public GcInventoryCostDataEntry[] WeaponCostData;
2727
[NMS(Index = 5, Size = 0x4, EnumType = typeof(GcWealthClass.WealthClassEnum))]
28-
/* 0x17D4 */ public GcInventoryClassProbabilities[] ClassProbabilityData;
28+
/* 0x1828 */ public GcInventoryClassProbabilities[] ClassProbabilityData;
2929
[NMS(Index = 4)]
30-
/* 0x1814 */ public GcInventoryCostDataEntry VehicleCostData;
30+
/* 0x1868 */ public GcInventoryCostDataEntry VehicleCostData;
3131
[NMS(Index = 11)]
32-
/* 0x183C */ public GcWeaponInventoryMaxUpgradeCapacity WeaponInventoryMaxUpgradeSize;
32+
/* 0x1890 */ public GcWeaponInventoryMaxUpgradeCapacity WeaponInventoryMaxUpgradeSize;
3333
}
3434
}

libMBIN/Source/NMS/GameComponents/GcInventoryTableEntry.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 = 0x26CEC19AA7E3AC5B, NameHash = 0xEDB11DA4)]
5+
[NMS(GUID = 0xFBC9C6E19BD69FB6, NameHash = 0xEDB11DA4)]
66
public class GcInventoryTableEntry : NMSTemplate
77
{
88
[NMS(Index = 0)]

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 = 0x2E1A5C639ACFC8B, NameHash = 0x7714ED08)]
5+
[NMS(GUID = 0x683915DA7AC592B1, NameHash = 0x7714ED08)]
66
public class GcMarkerComponentData : NMSTemplate
77
{
88
[NMS(Index = 4)]

libMBIN/Source/NMS/GameComponents/GcRealityGameIcons.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 = 0xADA14C6F04360B71, NameHash = 0xC8C2FA1E)]
3+
[NMS(GUID = 0x860F222D8C0C8546, NameHash = 0xC8C2FA1E)]
44
public class GcRealityGameIcons : NMSTemplate
55
{
6-
// size: 0x59
6+
// size: 0x5B
77
public enum GameIconsEnum : uint {
88
Stamina,
99
NoStamina,
@@ -65,6 +65,8 @@ public enum GameIconsEnum : uint {
6565
TransferMech,
6666
TransferFreighter,
6767
TransferBase,
68+
TransferCooker,
69+
TransferSkiff,
6870
HazardIndicatorHot,
6971
HazardIndicatorCold,
7072
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 = 0x8D86794414610DAA, NameHash = 0xA547E834)]
7+
[NMS(GUID = 0x12297AEE8AD27A77, NameHash = 0xA547E834)]
88
public class GcRealityIconTable : NMSTemplate
99
{
10-
[NMS(Index = 15, Size = 0x59, EnumType = typeof(GcRealityGameIcons.GameIconsEnum))]
10+
[NMS(Index = 15, Size = 0x5B, EnumType = typeof(GcRealityGameIcons.GameIconsEnum))]
1111
/* 0x0000 */ public TkTextureResource[] GameIcons;
1212
[NMS(Index = 5, Size = 0x11, EnumType = typeof(GcDiscoveryType.DiscoveryTypeEnum))]
13-
/* 0x0858 */ public TkTextureResource[] BinocularDiscoveryIcons;
13+
/* 0x0888 */ public TkTextureResource[] BinocularDiscoveryIcons;
1414
[NMS(Index = 4, Size = 0xA, EnumType = typeof(GcMissionFaction.MissionFactionEnum))]
15-
/* 0x09F0 */ public TkTextureResource[] MissionFactionIcons;
15+
/* 0x0A20 */ public TkTextureResource[] MissionFactionIcons;
1616
[NMS(Index = 3, Size = 0xA, EnumType = typeof(GcProductCategory.ProductCategoryEnum))]
17-
/* 0x0AE0 */ public TkTextureResource[] ProductCategoryIcons;
17+
/* 0x0B10 */ public TkTextureResource[] ProductCategoryIcons;
1818
[NMS(Index = 8, Size = 0x9, EnumType = typeof(GcAlienRace.AlienRaceEnum))]
19-
/* 0x0BD0 */ public TkTextureResource[] DiscoveryPageRaceIcons;
19+
/* 0x0C00 */ public TkTextureResource[] DiscoveryPageRaceIcons;
2020
[NMS(Index = 2, Size = 0x9, EnumType = typeof(GcRealitySubstanceCategory.SubstanceCategoryEnum))]
21-
/* 0x0CA8 */ public TkTextureResource[] SubstanceCategoryIcons;
21+
/* 0x0CD8 */ public TkTextureResource[] SubstanceCategoryIcons;
2222
[NMS(Index = 17, Size = 0x7, EnumType = typeof(GcDifficultyPresetType.DifficultyPresetTypeEnum))]
23-
/* 0x0D80 */ public TkTextureResource[] DifficultyPresetIcons;
23+
/* 0x0DB0 */ public TkTextureResource[] DifficultyPresetIcons;
2424
[NMS(Index = 6, Size = 0x7, EnumType = typeof(GcTradingClass.TradingClassEnum))]
25-
/* 0x0E28 */ public TkTextureResource[] DiscoveryPageTradingIcons;
25+
/* 0x0E58 */ public TkTextureResource[] DiscoveryPageTradingIcons;
2626
[NMS(Index = 0, Size = 0x6, EnumType = typeof(GcPlayerHazardType.HazardEnum))]
27-
/* 0x0ED0 */ public TkTextureResource[] HazardIcons;
27+
/* 0x0F00 */ public TkTextureResource[] HazardIcons;
2828
[NMS(Index = 1, Size = 0x6, EnumType = typeof(GcPlayerHazardType.HazardEnum))]
29-
/* 0x0F60 */ public TkTextureResource[] HazardIconsHUD;
29+
/* 0x0F90 */ public TkTextureResource[] HazardIconsHUD;
3030
[NMS(Index = 20, Size = 0x5, EnumType = typeof(GcInventoryFilterOptions.InventoryFilterEnum))]
31-
/* 0x0FF0 */ public TkTextureResource[] InventoryFilterIcons;
31+
/* 0x1020 */ public TkTextureResource[] InventoryFilterIcons;
3232
[NMS(Index = 19, Size = 0x5, EnumType = typeof(GcOptionsUIHeaderIcons.OptionsUIHeaderIconTypeEnum))]
33-
/* 0x1068 */ public TkTextureResource[] OptionsUIHeaderIcons;
33+
/* 0x1098 */ public TkTextureResource[] OptionsUIHeaderIcons;
3434
[NMS(Index = 18, Size = 0x4, EnumType = typeof(GcDifficultyOptionGroups.DifficultyOptionGroupEnum))]
35-
/* 0x10E0 */ public TkTextureResource[] DifficultyUIOptionIcons;
35+
/* 0x1110 */ public TkTextureResource[] DifficultyUIOptionIcons;
3636
[NMS(Index = 7, Size = 0x4, EnumType = typeof(GcPlayerConflictData.ConflictLevelEnum))]
37-
/* 0x1140 */ public TkTextureResource[] DiscoveryPageConflictIcons;
37+
/* 0x1170 */ public TkTextureResource[] DiscoveryPageConflictIcons;
3838
[NMS(Index = 16)]
39-
/* 0x11A0 */ public HashMap<GcRealityIcon> MissionDetailIcons;
39+
/* 0x11D0 */ public HashMap<GcRealityIcon> MissionDetailIcons;
4040
[NMS(Index = 10)]
41-
/* 0x11D0 */ public TkTextureResource DiscoveryPageConflictUnknown;
41+
/* 0x1200 */ public TkTextureResource DiscoveryPageConflictUnknown;
4242
[NMS(Index = 11)]
43-
/* 0x11E8 */ public TkTextureResource DiscoveryPageRaceUnknown;
43+
/* 0x1218 */ public TkTextureResource DiscoveryPageRaceUnknown;
4444
[NMS(Index = 9)]
45-
/* 0x1200 */ public TkTextureResource DiscoveryPageTradingUnknown;
45+
/* 0x1230 */ public TkTextureResource DiscoveryPageTradingUnknown;
4646
[NMS(Index = 13)]
47-
/* 0x1218 */ public List<GcPlanetResourceIconLookup> PlanetResourceIconLookups;
47+
/* 0x1248 */ public List<GcPlanetResourceIconLookup> PlanetResourceIconLookups;
4848
[NMS(Index = 14)]
49-
/* 0x1228 */ public List<TkTextureResource> RepairTechIcons;
49+
/* 0x1258 */ public List<TkTextureResource> RepairTechIcons;
5050
[NMS(Index = 12)]
51-
/* 0x1238 */ public List<GcPlanetResourceIconLookup> TerrainIconLookups;
51+
/* 0x1268 */ public List<GcPlanetResourceIconLookup> TerrainIconLookups;
5252
}
5353
}

0 commit comments

Comments
 (0)