Skip to content

Commit 82f0f61

Browse files
authored
Merge pull request #662 from monkeyman192/update/19792402
Update for 19792402
2 parents 0616257 + 8294cf1 commit 82f0f61

File tree

84 files changed

+3567
-3545
lines changed

Some content is hidden

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

84 files changed

+3567
-3545
lines changed

Tools/auto_extract/extractor.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -657,7 +657,6 @@ def add_fields(self, fields: list[Field]):
657657
self.required_usings.update(field.required_using)
658658
# Check to make sure the field name isn't the same as the class name:
659659
if field.field_name == self.name:
660-
print(f"The class {self.name} has a field called {field.field_name}")
661660
field._has_mxml_name = True
662661
field._force_prefix = "_"
663662
if field.field_name not in self._field_names:

libMBIN/Source/NMS/GameComponents/GcAdditionalOptionMissionOverride.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 = 0x3016E60F568F5325, NameHash = 0x6A8BFA82)]
6+
[NMS(GUID = 0x9CB0CD01E63819B8, NameHash = 0x6A8BFA82)]
77
public class GcAdditionalOptionMissionOverride : NMSTemplate
88
{
99
[NMS(Index = 3)]

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 = 0x7A6C7DE26FF16DE8, NameHash = 0x35D4E04)]
6+
[NMS(GUID = 0x3354B6FEC89405F7, NameHash = 0x35D4E04)]
77
public class GcAlienPuzzleEntry : NMSTemplate
88
{
99
[NMS(Index = 2)]

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 = 0xA5907A80078F2C52, NameHash = 0x981A51EE)]
6+
[NMS(GUID = 0x1585334DEAD93A00, NameHash = 0x981A51EE)]
77
public class GcAlienPuzzleOption : NMSTemplate
88
{
99
[NMS(Index = 22)]

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 = 0xDC731DDCC3B2D0AF, NameHash = 0x3987E9FB)]
6+
[NMS(GUID = 0xD094D8E6CFB23167, NameHash = 0x3987E9FB)]
77
public class GcAlienPuzzleTable : NMSTemplate
88
{
99
[NMS(Index = 0)]

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 = 0xB32B4E2BD2CB8562, NameHash = 0xC0413ECB)]
5+
[NMS(GUID = 0xC7640E02A5726731, NameHash = 0xC0413ECB)]
66
public class GcAudioAreaTriggerComponentData : NMSTemplate
77
{
88
[NMS(Index = 2, MxmlName = "Enter Distance")]

libMBIN/Source/NMS/GameComponents/GcAudioWwiseEvents.cs

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
namespace libMBIN.NMS.GameComponents
22
{
3-
[NMS(GUID = 0x1E81BE78E241548E, NameHash = 0x7A0D33C8)]
3+
[NMS(GUID = 0x989A23F7259D1B30, NameHash = 0x7A0D33C8)]
44
public class GcAudioWwiseEvents : NMSTemplate
55
{
6-
// size: 0xAC8
6+
// size: 0xACF
77
public enum AkEventEnum : uint {
88
INVALID_EVENT = 0x0,
99
ABANDONED_DOOR_UNLOCK = 0x264BED2D,
@@ -692,6 +692,8 @@ public enum AkEventEnum : uint {
692692
JETPACK_BOOST_STOP = 0xE6CC9004,
693693
JETPACK_BOOST_TIMEOUT = 0x3D3E8565,
694694
JETPACK_DEPLETED = 0x4392405,
695+
JETPACK_PARTICLES_JETSPACEFX = 0x4C30345B,
696+
JETPACK_PARTICLES_JETSPACEFX_END = 0x968B943D,
695697
JETPACK_START = 0xBF36A0FC,
696698
JETPACK_STOP = 0x35973C50,
697699
JETPACK_WATER_TRANSITION_INTO_ATMOS = 0x3EBFB6F9,
@@ -1410,6 +1412,7 @@ public enum AkEventEnum : uint {
14101412
PL_FOLEY_CLOTHING_SWIM_STOPALL = 0x7F90AA67,
14111413
PL_FOLEY_COCKPIT_SIT_IN = 0x4A716F50,
14121414
PL_FOLEY_COCKPIT_SIT_OUT = 0x679690B7,
1415+
PL_FOLEY_COCKPIT_SIT_TO_STAND = 0x2568E81F,
14131416
PL_FOLEY_EMOTE_DANCELOOP = 0xD832CAD2,
14141417
PL_FOLEY_EMOTE_HELP = 0x3EAC0F72,
14151418
PL_FOLEY_EMOTE_JOY = 0xB65D913,
@@ -1453,6 +1456,8 @@ public enum AkEventEnum : uint {
14531456
PL_SHIP_BUILDABLE_LANDINGGEAR_START = 0xDF71E0F3,
14541457
PL_SHIP_BUILDABLE_LANDINGTHRUSTERS_END = 0xF92A8BDD,
14551458
PL_SHIP_BUILDABLE_LANDINGTHRUSTERS_START = 0x7B10416,
1459+
PL_SHIP_BUILDABLE_LIFT_RAMPDOWN = 0xAA976ED8,
1460+
PL_SHIP_BUILDABLE_LIFT_RAMPUP = 0xB5D8867B,
14561461
PL_SHIP_BUILDABLE_PROP_KITCHENA = 0x831C3D55,
14571462
PL_SHIP_BUILDABLE_PROP_LIVINGWALL = 0x6C4E6063,
14581463
PL_SHIP_BUILDABLE_PROP_RADAR = 0x1452DE58,
@@ -1468,6 +1473,8 @@ public enum AkEventEnum : uint {
14681473
PL_SHIP_BUILDABLE_RAMPB_DOWN = 0xAE432E2B,
14691474
PL_SHIP_BUILDABLE_RAMPB_OPENHALF = 0x31FF10A4,
14701475
PL_SHIP_BUILDABLE_RAMPB_UP = 0x6590EFEC,
1476+
PL_SHIP_BUILDABLE_RAMPDOWNLANDA = 0x2EFD9516,
1477+
PL_SHIP_BUILDABLE_RAMPDOWNLANDB = 0x2EFD9515,
14711478
PL_SHIP_BUILDABLE_VENT = 0xAE59D7FB,
14721479
PL_SHIP_BUILDABLE_VENT_END = 0x2CCE781D,
14731480
PL_SHIP_BURN = 0xB0660BE,

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

libMBIN/Source/NMS/GameComponents/GcCombatEffectsTable.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 = 0xAE4619AFA6ADC5E6, NameHash = 0xD7C08B15)]
5+
[NMS(GUID = 0x83657B67758660FD, NameHash = 0xD7C08B15)]
66
public class GcCombatEffectsTable : NMSTemplate
77
{
88
[NMS(Index = 0, Size = 0x6, EnumType = typeof(GcCombatEffectType.CombatEffectTypeEnum))]

libMBIN/Source/NMS/GameComponents/GcConsumableItem.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 = 0xF2D5571A8A86AA2A, NameHash = 0xE0C6D820)]
6+
[NMS(GUID = 0xBB69E47398E8E908, NameHash = 0xE0C6D820)]
77
public class GcConsumableItem : NMSTemplate
88
{
99
[NMS(Index = 11)]

0 commit comments

Comments
 (0)