Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[MRG] Update for 12034724 #566

Merged
merged 1 commit into from
Aug 25, 2023
Merged

[MRG] Update for 12034724 #566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions libMBIN/Source/NMS/GameComponents/GcCreatureFeederComponentData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@

namespace libMBIN.NMS.GameComponents
{
[NMS(GUID = 0x22B252B6D5AEE25B, NameHash = 0x32441F8B4528DF91)]
[NMS(GUID = 0xB822DB08128AAB11, NameHash = 0x32441F8B4528DF91)]
public class GcCreatureFeederComponentData : NMSTemplate
{
/* 0x000 */ public GcMaintenanceComponentData MaintenanceData;
/* 0x400 */ public int NumInputs;
/* 0x404 */ public int NumMealsPerBait;
/* 0x408 */ public List<NMSString0x100> DispenseNodes;
/* 0x418 */ public float DispenseVelocity;
/* 0x41C */ public float DispensePeriod;
/* 0x420 */ public int NumInputs;
/* 0x424 */ public int NumMealsPerBait;
/* 0x428 */ public List<NMSString0x100> DispenseNodes;
/* 0x438 */ public float DispenseVelocity;
/* 0x43C */ public float DispensePeriod;
}
}
4 changes: 2 additions & 2 deletions libMBIN/Source/NMS/GameComponents/GcCreatureHarvesterComponentData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

namespace libMBIN.NMS.GameComponents
{
[NMS(GUID = 0x34D28742C61983CD, NameHash = 0x5B935AA89717BCC4)]
[NMS(GUID = 0x1CDCED730B0F78FE, NameHash = 0x5B935AA89717BCC4)]
public class GcCreatureHarvesterComponentData : NMSTemplate
{
/* 0x000 */ public GcMaintenanceComponentData MaintenanceData;
/* 0x400 */ public int NumSlots;
/* 0x420 */ public int NumSlots;
}
}
4 changes: 2 additions & 2 deletions libMBIN/Source/NMS/GameComponents/GcEggMachineComponentData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

namespace libMBIN.NMS.GameComponents
{
[NMS(GUID = 0x7C8951FEB1FDE59B, NameHash = 0x54575BF82BE5C4BA)]
[NMS(GUID = 0xBA49876B13B4436D, NameHash = 0x54575BF82BE5C4BA)]
public class GcEggMachineComponentData : NMSTemplate
{
/* 0x000 */ public GcMaintenanceComponentData MaintenanceData;
/* 0x400 */ public int NumInputs;
/* 0x420 */ public int NumInputs;
}
}
2 changes: 1 addition & 1 deletion libMBIN/Source/NMS/GameComponents/GcGeneratorUnitComponentData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace libMBIN.NMS.GameComponents
{
[NMS(GUID = 0xF361BF138C69854B, NameHash = 0xE7D049A3A9D077A8)]
[NMS(GUID = 0xD680A52305A6790D, NameHash = 0xE7D049A3A9D077A8)]
public class GcGeneratorUnitComponentData : NMSTemplate
{
// size: 0x3
Expand Down
72 changes: 36 additions & 36 deletions libMBIN/Source/NMS/GameComponents/GcInteractionComponentData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace libMBIN.NMS.GameComponents
{
[NMS(GUID = 0x8A1A3D693A371D6A, NameHash = 0xDAB0554EA36957B5)]
[NMS(GUID = 0x758B742446C82F24, NameHash = 0xDAB0554EA36957B5)]
public class GcInteractionComponentData : NMSTemplate
{
// size: 0x3
Expand All @@ -17,46 +17,46 @@ public enum InteractionActionEnum : uint {
/* 0x004 */ public GcInteractionType InteractionType;
/* 0x008 */ public bool UseIntermediateUI;
/* 0x010 */ public TkModelRendererData Renderer;
/* 0x0C0 */ public TkModelRendererData RendererAlt;
/* 0x170 */ public GcAlienRace Race;
/* 0x174 */ public float AttractDistanceSq;
/* 0x178 */ public bool SecondaryMeshAlwaysVisible;
/* 0x179 */ public bool RepeatInteraction;
/* 0x17A */ public bool UseInteractCamera;
/* 0x17C */ public float BlendToCameraTime;
/* 0x180 */ public float BlendFromCameraTime;
/* 0x188 */ public GcInteractionActivationCost ActivationCost;
/* 0x1F0 */ public NMSString0x10 TriggerAction;
/* 0x200 */ public NMSString0x10 TriggerActionOnPrepare;
/* 0x210 */ public bool BroadcastTriggerAction;
/* 0x214 */ public float InteractAngle;
/* 0x218 */ public float InteractDistance;
/* 0x21C */ public bool InteractInvertFace;
/* 0x220 */ public GcInteractionType SecondaryInteractionType;
/* 0x228 */ public GcInteractionActivationCost SecondaryActivationCost;
/* 0x290 */ public List<TkModelRendererData> EventRenderers;
/* 0x2A0 */ public List<TkModelRendererData> EventRenderersAlt;
/* 0x2B0 */ public float SecondaryCameraTransitionTime;
/* 0x2B4 */ public GcInteractionDof DepthOfField;
/* 0x2C8 */ public List<GcAlienPuzzleMissionOverride> PuzzleMissionOverrideTable;
/* 0x2D8 */ public GcStoryUtilityOverride StoryUtilityOverrideData;
/* 0x0D0 */ public TkModelRendererData RendererAlt;
/* 0x190 */ public GcAlienRace Race;
/* 0x194 */ public float AttractDistanceSq;
/* 0x198 */ public bool SecondaryMeshAlwaysVisible;
/* 0x199 */ public bool RepeatInteraction;
/* 0x19A */ public bool UseInteractCamera;
/* 0x19C */ public float BlendToCameraTime;
/* 0x1A0 */ public float BlendFromCameraTime;
/* 0x1A8 */ public GcInteractionActivationCost ActivationCost;
/* 0x210 */ public NMSString0x10 TriggerAction;
/* 0x220 */ public NMSString0x10 TriggerActionOnPrepare;
/* 0x230 */ public bool BroadcastTriggerAction;
/* 0x234 */ public float InteractAngle;
/* 0x238 */ public float InteractDistance;
/* 0x23C */ public bool InteractInvertFace;
/* 0x240 */ public GcInteractionType SecondaryInteractionType;
/* 0x248 */ public GcInteractionActivationCost SecondaryActivationCost;
/* 0x2B0 */ public List<TkModelRendererData> EventRenderers;
/* 0x2C0 */ public List<TkModelRendererData> EventRenderersAlt;
/* 0x2D0 */ public float SecondaryCameraTransitionTime;
/* 0x2D4 */ public GcInteractionDof DepthOfField;
/* 0x2E8 */ public List<GcAlienPuzzleMissionOverride> PuzzleMissionOverrideTable;
/* 0x2F8 */ public GcStoryUtilityOverride StoryUtilityOverrideData;
// size: 0x3
public enum OverrideInteriorExteriorMarkerEnum : uint {
No,
Interior,
Exterior,
}
/* 0x318 */ public OverrideInteriorExteriorMarkerEnum OverrideInteriorExteriorMarker;
/* 0x31C */ public bool ReseedAfterRewardSuccess;
/* 0x31D */ public bool UsePersonalPersistentBuffer;
/* 0x320 */ public float InWorldUIScaler;
/* 0x324 */ public float InWorldUIMinDistOverride;
/* 0x328 */ public float InWorldUIMinDistOverrideV2;
/* 0x32C */ public float InWorldUIForcedOffset;
/* 0x330 */ public float InWorldUIForcedOffsetV2;
/* 0x334 */ public bool InWorldUIUseCameraUp;
/* 0x338 */ public NMSString0x10 StartMissionOnUse;
/* 0x348 */ public bool AllowMissionUnderwater;
/* 0x349 */ public bool UseUnlockedInteractionIfMaintDone;
/* 0x338 */ public OverrideInteriorExteriorMarkerEnum OverrideInteriorExteriorMarker;
/* 0x33C */ public bool ReseedAfterRewardSuccess;
/* 0x33D */ public bool UsePersonalPersistentBuffer;
/* 0x340 */ public float InWorldUIScaler;
/* 0x344 */ public float InWorldUIMinDistOverride;
/* 0x348 */ public float InWorldUIMinDistOverrideV2;
/* 0x34C */ public float InWorldUIForcedOffset;
/* 0x350 */ public float InWorldUIForcedOffsetV2;
/* 0x354 */ public bool InWorldUIUseCameraUp;
/* 0x358 */ public NMSString0x10 StartMissionOnUse;
/* 0x368 */ public bool AllowMissionUnderwater;
/* 0x369 */ public bool UseUnlockedInteractionIfMaintDone;
}
}
62 changes: 31 additions & 31 deletions libMBIN/Source/NMS/GameComponents/GcMaintenanceComponentData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace libMBIN.NMS.GameComponents
{
[NMS(GUID = 0x4B073F1DAAA23991, NameHash = 0x479CFCB871ABBE0)]
[NMS(GUID = 0xA04402698077DA68, NameHash = 0x479CFCB871ABBE0)]
public class GcMaintenanceComponentData : NMSTemplate
{
/* 0x000 */ public List<GcMaintenanceElement> PreInstalledTech;
Expand Down Expand Up @@ -37,40 +37,40 @@ public enum InteractableEnum : uint {
/* 0x030 */ public bool ShareInteractionModelRender;
/* 0x031 */ public bool UseInteractionStyleCameraEvent;
/* 0x040 */ public TkModelRendererData ModelRenderData;
/* 0x0F0 */ public TkModelRendererData ModelRenderDataAlt;
/* 0x100 */ public TkModelRendererData ModelRenderDataAlt;
// size: 0x2
public enum ModelRendererResourceEnum : uint {
ModelNode,
MasterModelNode,
}
/* 0x1A0 */ public ModelRendererResourceEnum ModelRendererResource;
/* 0x1A4 */ public GcBroadcastLevel BroadcastLevel;
/* 0x1A8 */ public NMSString0x20A Title;
/* 0x1C8 */ public NMSString0x20A Description;
/* 0x1E8 */ public NMSString0x20A ActionButtonOverride;
/* 0x208 */ public NMSString0x20A ActionDescriptionOverride;
/* 0x228 */ public NMSString0x20A TransferButtonOverride;
/* 0x248 */ public NMSString0x20A TransferDescriptionOverride;
/* 0x268 */ public NMSString0x20A DiscardButtonOverride;
/* 0x288 */ public NMSString0x20A DiscardDescriptionOverride;
/* 0x2A8 */ public NMSString0x20A ChargeButtonOverride;
/* 0x2C8 */ public NMSString0x20A ChargeDescriptionOverride;
/* 0x2E8 */ public NMSString0x20A ActionWarningOverride;
/* 0x308 */ public bool SilenceSuitVOIAlerts;
/* 0x30C */ public float InWorldUIScaler;
/* 0x310 */ public float InWorldUIMinDistOverride;
/* 0x314 */ public float InWorldUIMinDistOverrideV2;
/* 0x318 */ public float InWorldUIForcedOffset;
/* 0x31C */ public float InWorldUIForcedOffsetV2;
/* 0x320 */ public bool InWorldUIUseCameraUp;
/* 0x321 */ public bool InteractionRequiresPower;
/* 0x328 */ public NMSString0x10 StartMissionOnUse;
/* 0x338 */ public NMSString0x10 StartMissionOnCompletion;
/* 0x348 */ public NMSString0x10 GiveRewardOnCompletion;
/* 0x358 */ public bool OpenInteractionOnQuit;
/* 0x359 */ public bool ForceOneClickRepair;
/* 0x35C */ public GcAudioWwiseEvents AudioIDOnSuccess;
/* 0x360 */ public GcMaintenanceGroupInstallData GroupInstallSetup;
/* 0x3F0 */ public bool DisableSynchronise;
/* 0x1C0 */ public ModelRendererResourceEnum ModelRendererResource;
/* 0x1C4 */ public GcBroadcastLevel BroadcastLevel;
/* 0x1C8 */ public NMSString0x20A Title;
/* 0x1E8 */ public NMSString0x20A Description;
/* 0x208 */ public NMSString0x20A ActionButtonOverride;
/* 0x228 */ public NMSString0x20A ActionDescriptionOverride;
/* 0x248 */ public NMSString0x20A TransferButtonOverride;
/* 0x268 */ public NMSString0x20A TransferDescriptionOverride;
/* 0x288 */ public NMSString0x20A DiscardButtonOverride;
/* 0x2A8 */ public NMSString0x20A DiscardDescriptionOverride;
/* 0x2C8 */ public NMSString0x20A ChargeButtonOverride;
/* 0x2E8 */ public NMSString0x20A ChargeDescriptionOverride;
/* 0x308 */ public NMSString0x20A ActionWarningOverride;
/* 0x328 */ public bool SilenceSuitVOIAlerts;
/* 0x32C */ public float InWorldUIScaler;
/* 0x330 */ public float InWorldUIMinDistOverride;
/* 0x334 */ public float InWorldUIMinDistOverrideV2;
/* 0x338 */ public float InWorldUIForcedOffset;
/* 0x33C */ public float InWorldUIForcedOffsetV2;
/* 0x340 */ public bool InWorldUIUseCameraUp;
/* 0x341 */ public bool InteractionRequiresPower;
/* 0x348 */ public NMSString0x10 StartMissionOnUse;
/* 0x358 */ public NMSString0x10 StartMissionOnCompletion;
/* 0x368 */ public NMSString0x10 GiveRewardOnCompletion;
/* 0x378 */ public bool OpenInteractionOnQuit;
/* 0x379 */ public bool ForceOneClickRepair;
/* 0x37C */ public GcAudioWwiseEvents AudioIDOnSuccess;
/* 0x380 */ public GcMaintenanceGroupInstallData GroupInstallSetup;
/* 0x410 */ public bool DisableSynchronise;
}
}
2 changes: 1 addition & 1 deletion libMBIN/Source/NMS/GameComponents/GcModelViewCollection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace libMBIN.NMS.GameComponents
{
[NMS(GUID = 0x7B1249563A2BFE0, NameHash = 0xC3362B34D26192B6)]
[NMS(GUID = 0xDB7516835AF20A98, NameHash = 0xC3362B34D26192B6)]
public class GcModelViewCollection : NMSTemplate
{
// size: 0x29
Expand Down
6 changes: 3 additions & 3 deletions libMBIN/Source/NMS/GameComponents/GcModularCustomisationConfig.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@

namespace libMBIN.NMS.GameComponents
{
[NMS(GUID = 0xF6E845CFA1D694B9, NameHash = 0x39F4E912A931EB8F)]
[NMS(GUID = 0x4C04230340562676, NameHash = 0x39F4E912A931EB8F)]
public class GcModularCustomisationConfig : NMSTemplate
{
/* 0x000 */ public NMSString0x20A TitleLocId;
/* 0x020 */ public GcExactResource BaseResource;
/* 0x0B0 */ public TkModelRendererData ModelRenderData;
/* 0x160 */ public TkModelRendererData InteractionCameraData;
/* 0x210 */ public List<GcModularCustomisationSlotConfig> Slots;
/* 0x170 */ public TkModelRendererData InteractionCameraData;
/* 0x230 */ public List<GcModularCustomisationSlotConfig> Slots;
}
}
5 changes: 3 additions & 2 deletions libMBIN/Source/NMS/GameComponents/GcNPCNavigationAreaComponentData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace libMBIN.NMS.GameComponents
{
[NMS(GUID = 0xA0E00875B7A6ABD0, NameHash = 0xB4FC959D6A910DEB)]
[NMS(GUID = 0xAB6146971456B356, NameHash = 0xB4FC959D6A910DEB)]
public class GcNPCNavigationAreaComponentData : NMSTemplate
{
// size: 0x9
Expand All @@ -21,6 +21,7 @@ public enum NavAreaTypeEnum : uint {
/* 0x0C */ public float SphereCastHeightClearance;
/* 0x10 */ public float NeighbourCandidateDistance;
/* 0x14 */ public float MaxNeighbourSlope;
/* 0x18 */ public float ConnectionLengthFactor;
/* 0x18 */ public bool LimitPOIConnections;
/* 0x1C */ public float ConnectionLengthFactor;
}
}
14 changes: 8 additions & 6 deletions libMBIN/Source/NMS/GameComponents/GcPlayerCharacterStateData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace libMBIN.NMS.GameComponents
{
[NMS(GUID = 0xE6898B66105B6B49, NameHash = 0xCCEE5C02303ACEC6)]
[NMS(GUID = 0xAD7B7C55753138F2, NameHash = 0xCCEE5C02303ACEC6)]
public class GcPlayerCharacterStateData : NMSTemplate
{
/* 0x00 */ public NMSString0x10 Locomotion0H;
Expand All @@ -11,10 +11,12 @@ public class GcPlayerCharacterStateData : NMSTemplate
/* 0x50 */ public NMSString0x10 AimTree1HYaw;
/* 0x60 */ public NMSString0x10 AimTree2HPitch;
/* 0x70 */ public NMSString0x10 AimTree2HYaw;
/* 0x80 */ public NMSString0x10 HitReact0H;
/* 0x90 */ public NMSString0x10 HitReact1H;
/* 0xA0 */ public NMSString0x10 HitReact2H;
/* 0xB0 */ public NMSString0x10 HitReactStaff;
/* 0xC0 */ public bool KeepHeadForward;
/* 0x80 */ public NMSString0x10 AimTreeStaffPitch;
/* 0x90 */ public NMSString0x10 AimTreeStaffYaw;
/* 0xA0 */ public NMSString0x10 HitReact0H;
/* 0xB0 */ public NMSString0x10 HitReact1H;
/* 0xC0 */ public NMSString0x10 HitReact2H;
/* 0xD0 */ public NMSString0x10 HitReactStaff;
/* 0xE0 */ public bool KeepHeadForward;
}
}
2 changes: 1 addition & 1 deletion libMBIN/Source/NMS/GameComponents/GcPlayerCharacterStateTable.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace libMBIN.NMS.GameComponents
{
[NMS(GUID = 0x58B5A60C2A56F87E, NameHash = 0xDE03C95CFD766DA8)]
[NMS(GUID = 0x1C81158B6BB7CBF8, NameHash = 0xDE03C95CFD766DA8)]
public class GcPlayerCharacterStateTable : NMSTemplate
{
[NMS(Size = 0x12, EnumType = typeof(GcPlayerCharacterStateType.CharacterStateEnum))]
Expand Down
6 changes: 3 additions & 3 deletions libMBIN/Source/NMS/GameComponents/GcRefinerUnitComponentData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

namespace libMBIN.NMS.GameComponents
{
[NMS(GUID = 0x9168FB15EDCB07DA, NameHash = 0xD2A73F296D17A20)]
[NMS(GUID = 0x8F35E468D8A4DBF8, NameHash = 0xD2A73F296D17A20)]
public class GcRefinerUnitComponentData : NMSTemplate
{
/* 0x000 */ public GcMaintenanceComponentData MaintenanceData;
/* 0x400 */ public int NumInputs;
/* 0x404 */ public bool IsCooker;
/* 0x420 */ public int NumInputs;
/* 0x424 */ public bool IsCooker;
}
}
3 changes: 2 additions & 1 deletion libMBIN/Source/NMS/GameComponents/GcRewardProceduralProduct.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@

namespace libMBIN.NMS.GameComponents
{
[NMS(GUID = 0xB83297F73B33E488, NameHash = 0x28EDE156F726CF4C)]
[NMS(GUID = 0x27834B15BE89F698, NameHash = 0x28EDE156F726CF4C)]
public class GcRewardProceduralProduct : NMSTemplate
{
/* 0x00 */ public GcProceduralProductCategory Type;
/* 0x08 */ public NMSString0x20A OSDMessage;
/* 0x28 */ public bool SubIfPlayerAlreadyHasOne;
/* 0x29 */ public bool OverrideRarity;
/* 0x2C */ public GcRarity Rarity;
/* 0x30 */ public int FreighterTechQualityOverride;
}
}
2 changes: 1 addition & 1 deletion libMBIN/Source/NMS/GameComponents/GcShipOwnershipComponentData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace libMBIN.NMS.GameComponents
{
[NMS(GUID = 0x9963AD3F4EFAC000, NameHash = 0xA947081E204C32BB)]
[NMS(GUID = 0xAA840B2D1E8B9B99, NameHash = 0xA947081E204C32BB)]
public class GcShipOwnershipComponentData : NMSTemplate
{
/* 0x0 */ public GcSpaceshipComponentData Data;
Expand Down
2 changes: 1 addition & 1 deletion libMBIN/Source/NMS/GameComponents/GcSpaceshipComponentData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

namespace libMBIN.NMS.GameComponents
{
[NMS(GUID = 0x3BF2793CD5E47362, NameHash = 0x1C94F7F917E32E73)]
[NMS(GUID = 0x3708CA140E85D480, NameHash = 0x1C94F7F917E32E73)]
public class GcSpaceshipComponentData : NMSTemplate
{
/* 0x00 */ public GcSpaceshipClasses Class;
Expand Down
Loading
Loading