Skip to content

Commit

Permalink
Merge pull request #591 from HolterPhylo/UpdateFor13913824
Browse files Browse the repository at this point in the history 
[MRG] Update for 13913824
  • Loading branch information
@monkeyman192
monkeyman192 authored Apr 2, 2024
2 parents 20b7f22 + 3b35d3f commit a3844aa
Show file tree
Hide file tree
Showing 4 changed files with 79 additions and 76 deletions.
5 changes: 3 additions & 2 deletions libMBIN/Source/NMS/GameComponents/GcRewardEndScanEvent.cs
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
namespace libMBIN.NMS.GameComponents
{
[NMS(GUID = 0x67F8CE2CC9703F74, NameHash = 0x9CF1833CA581E47A)]
[NMS(GUID = 0xD94E9D9F2996B998, NameHash = 0x9CF1833CA581E47A)]
public class GcRewardEndScanEvent : NMSTemplate
{
/* 0x0 */ public NMSString0x20A EventID;
/* 0x00 */ public NMSString0x20A EventID;
/* 0x20 */ public bool UseMatchingExpeditionSeed;
}
}
3 changes: 2 additions & 1 deletion libMBIN/Source/NMS/GameComponents/GcRewardMissionMessageSeeded.cs
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
namespace libMBIN.NMS.GameComponents
{
[NMS(GUID = 0x5FA26355282BB41A, NameHash = 0x56DEE85C9E579653)]
[NMS(GUID = 0x2825208A03CE2D36, NameHash = 0x56DEE85C9E579653)]
public class GcRewardMissionMessageSeeded : NMSTemplate
{
/* 0x00 */ public NMSString0x10 MessageID;
/* 0x10 */ public bool BroadcastInMultiplayer;
/* 0x11 */ public bool BroadcastToActiveMultiplayerMission;
/* 0x18 */ public NMSString0x10 SpecificMissionID;
/* 0x28 */ public bool UseMatchingExpeditionSeed;
}
}
145 changes: 73 additions & 72 deletions libMBIN/Source/NMS/Globals/GcFleetGlobals.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

namespace libMBIN.NMS.Globals
{
[NMS(GUID = 0xC99B2F79A254C789, NameHash = 0xB032629C37506E6A)]
[NMS(GUID = 0x78C62618191354A2, NameHash = 0xB032629C37506E6A)]
public class GcFleetGlobals : NMSTemplate
{
/* 0x0000 */ public Vector3f FreighterCustomiserSunAngleAdjust;
Expand Down Expand Up @@ -95,76 +95,77 @@ public enum ForceDebriefEntryTypeEnum : uint {
/* 0x04F0 */ public NMSString0x20A TerminalDamagePuzzleID;
/* 0x0510 */ public NMSString0x20A TerminalActivePuzzleID;
/* 0x0530 */ public NMSString0x20A TerminalDebriefPuzzleID;
/* 0x0550 */ public NMSString0x20A NormandyActivePuzzleID;
/* 0x0570 */ public NMSString0x20A NormandyDebriefPuzzleID;
/* 0x0590 */ public NMSString0x20A DeepSpaceFrigateActivePuzzleID;
/* 0x05B0 */ public NMSString0x20A DeepSpaceFrigateDebriefPuzzleID;
/* 0x05D0 */ public NMSString0x20A NeedFrigatesPuzzleID;
/* 0x05F0 */ public NMSString0x20A NewExpeditionsAvailablePuzzleID;
/* 0x0610 */ public NMSString0x20A NeedExpeditionTerminalPuzzleID;
/* 0x0630 */ public NMSString0x20A NeedAvailableExpeditionTerminalPuzzleID;
/* 0x0650 */ public NMSString0x20A SelectExpeditionPuzzleID;
/* 0x0670 */ public int NumberOfExpeditionChoices;
/* 0x0674 */ public int ExpeditionDifficultyVariance;
/* 0x0678 */ public float ExpeditionDifficultyIncreaseForEachAdditionalFrigate;
/* 0x067C */ public int MinExpeditionStatValue;
/* 0x0680 */ public int MaxExpeditionStatValue;
/* 0x0684 */ public int NumberOfFrigatesPurchasedToEndEasyExpeditions;
/* 0x0688 */ public int TimeTakenForExpeditionEvent_Easy;
/* 0x068C */ public int TimeTakenForExpeditionEvent;
/* 0x0690 */ public int LightYearsPerExpeditionEvent_Easy;
/* 0x0694 */ public int LightYearsPerExpeditionEvent;
/* 0x0698 */ public int NumberOfUAChangesPerExpeditionEvent;
/* 0x069C */ public int TimeBetweenPassiveIncomeTicks;
/* 0x06A0 */ public List<GcExpeditionPaymentToken> FreighterTokenProductIDs;
/* 0x06B0 */ public GcPassiveFrigateIncomeArray PassiveIncomes;
/* 0x07D0 */ public List<GcExpeditionPowerup> Powerups;
/* 0x07E0 */ public int FreighterTokenMinimumSpend;
/* 0x07E4 */ public int PercentChanceOfInterventionEvent;
/* 0x07E8 */ public int FirstEventIndexWhichCanBeIntervention;
/* 0x07EC */ public float TimeBeforePlayerAlertedToInterventionEvent;
/* 0x07F0 */ public int MaxDiceRollWhenCalculatingExpeditionEventResult;
/* 0x07F4 */ public float DifficultyMultiplierForBalancedExpeditions;
/* 0x07F8 */ public float DifficultyMultiplierForNonPrimaryEvents;
/* 0x07FC */ public int StatPointsAwardedForLevelUp;
/* 0x0800 */ public int MinGapBetweenExpeditionLogEntries;
/* 0x0804 */ public int MaxGapBetweenExpeditionLogEntries;
/* 0x0808 */ public float TimeBetweenDebriefLettersAppearing;
/* 0x080C */ public float TimeBetweenDebriefLogSectionsAppearing;
/* 0x0810 */ public float TimeBetweenDebriefLogsAppearing;
/* 0x0814 */ public float TimeBeforeDebriefLogsStart;
/* 0x0818 */ public bool ShowMissingRewardDescriptions;
/* 0x0820 */ public NMSString0x20A CommunicatorDamagePuzzleTableEntry;
/* 0x0840 */ public NMSString0x20A FrigateDamagePuzzleTableEntry;
/* 0x0860 */ public NMSString0x20A FrigatePurchasePuzzleTableEntry;
/* 0x0880 */ public List<int> DifficultyModifier;
/* 0x0890 */ public List<GcExpeditionDebriefPunctuation> DebriefPunctuationList;
/* 0x08A0 */ public GcExpeditionDurationValues ExpeditionDurations;
/* 0x08B4 */ public GcFrigateClassCost FrigateBaseCost;
/* 0x08D8 */ public GcFrigateClassCost FrigateCostVariance;
/* 0x08FC */ public GcInventoryClassCostMultiplier FrigateCostMultiplier;
/* 0x0910 */ public GcFrigateTraitStrengthByType FrigateTraitStrengths;
/* 0x0C80 */ public GcFrigateStatsByClass FrigateInitialStats;
/* 0x1028 */ public GcFrigateTraitIcons TraitIcons;
/* 0x15A8 */ public GcFrigateTraitIcons NegativeTraitIcons;
/* 0x1B30 */ public GcScanEffectData FrigateScanEffect;
/* 0x1B80 */ public GcScanEffectData FrigateHologramScanEffect;
/* 0x1BD0 */ public GcScanEffectData CompletedFrigateHologramScanEffect;
/* 0x1C20 */ public GcScanEffectData DamagedFrigateHologramScanEffect;
/* 0x1C70 */ public GcScanEffectData DestroyedFrigateHologramScanEffect;
/* 0x1CC0 */ public GcExpeditionEventOccurrenceRate EventTypeOccurrenceChance;
/* 0x1D28 */ public List<NMSString0x80> FrigateHologramModels;
/* 0x1D38 */ public List<NMSString0x80> FrigatePlanetModels;
/* 0x1D48 */ public List<int> ExpeditionRankBoundaries;
/* 0x1D58 */ public List<int> FrigateLevelVictoriesRequired;
/* 0x1D68 */ public List<GcExpeditionDifficultyKeyframe> ExpeditionDifficultyKeyframes;
/* 0x1D78 */ public List<NMSString0x80> FrigateInteriorsToCache;
/* 0x1D88 */ public int NormandyFailures;
/* 0x1D8C */ public int NormandyDamageEvents;
/* 0x1D90 */ public List<NMSString0x10> NormandyTraits;
/* 0x1DA0 */ public List<NMSString0x10> DeepSpaceFrigateTraits;
/* 0x1DB0 */ public List<NMSString0x10> DeepSpaceCommonPrimaryTraits;
/* 0x1DC0 */ public List<NMSString0x20> FrigateCaptainPuzzleIds;
/* 0x1DD0 */ public int MaxNumberOfPlayerShipsInFreighterHangar;
/* 0x0550 */ public NMSString0x20A NormandyInterventionPuzzleID;
/* 0x0570 */ public NMSString0x20A NormandyActivePuzzleID;
/* 0x0590 */ public NMSString0x20A NormandyDebriefPuzzleID;
/* 0x05B0 */ public NMSString0x20A DeepSpaceFrigateActivePuzzleID;
/* 0x05D0 */ public NMSString0x20A DeepSpaceFrigateDebriefPuzzleID;
/* 0x05F0 */ public NMSString0x20A NeedFrigatesPuzzleID;
/* 0x0610 */ public NMSString0x20A NewExpeditionsAvailablePuzzleID;
/* 0x0630 */ public NMSString0x20A NeedExpeditionTerminalPuzzleID;
/* 0x0650 */ public NMSString0x20A NeedAvailableExpeditionTerminalPuzzleID;
/* 0x0670 */ public NMSString0x20A SelectExpeditionPuzzleID;
/* 0x0690 */ public int NumberOfExpeditionChoices;
/* 0x0694 */ public int ExpeditionDifficultyVariance;
/* 0x0698 */ public float ExpeditionDifficultyIncreaseForEachAdditionalFrigate;
/* 0x069C */ public int MinExpeditionStatValue;
/* 0x06A0 */ public int MaxExpeditionStatValue;
/* 0x06A4 */ public int NumberOfFrigatesPurchasedToEndEasyExpeditions;
/* 0x06A8 */ public int TimeTakenForExpeditionEvent_Easy;
/* 0x06AC */ public int TimeTakenForExpeditionEvent;
/* 0x06B0 */ public int LightYearsPerExpeditionEvent_Easy;
/* 0x06B4 */ public int LightYearsPerExpeditionEvent;
/* 0x06B8 */ public int NumberOfUAChangesPerExpeditionEvent;
/* 0x06BC */ public int TimeBetweenPassiveIncomeTicks;
/* 0x06C0 */ public List<GcExpeditionPaymentToken> FreighterTokenProductIDs;
/* 0x06D0 */ public GcPassiveFrigateIncomeArray PassiveIncomes;
/* 0x07F0 */ public List<GcExpeditionPowerup> Powerups;
/* 0x0800 */ public int FreighterTokenMinimumSpend;
/* 0x0804 */ public int PercentChanceOfInterventionEvent;
/* 0x0808 */ public int FirstEventIndexWhichCanBeIntervention;
/* 0x080C */ public float TimeBeforePlayerAlertedToInterventionEvent;
/* 0x0810 */ public int MaxDiceRollWhenCalculatingExpeditionEventResult;
/* 0x0814 */ public float DifficultyMultiplierForBalancedExpeditions;
/* 0x0818 */ public float DifficultyMultiplierForNonPrimaryEvents;
/* 0x081C */ public int StatPointsAwardedForLevelUp;
/* 0x0820 */ public int MinGapBetweenExpeditionLogEntries;
/* 0x0824 */ public int MaxGapBetweenExpeditionLogEntries;
/* 0x0828 */ public float TimeBetweenDebriefLettersAppearing;
/* 0x082C */ public float TimeBetweenDebriefLogSectionsAppearing;
/* 0x0830 */ public float TimeBetweenDebriefLogsAppearing;
/* 0x0834 */ public float TimeBeforeDebriefLogsStart;
/* 0x0838 */ public bool ShowMissingRewardDescriptions;
/* 0x0840 */ public NMSString0x20A CommunicatorDamagePuzzleTableEntry;
/* 0x0860 */ public NMSString0x20A FrigateDamagePuzzleTableEntry;
/* 0x0880 */ public NMSString0x20A FrigatePurchasePuzzleTableEntry;
/* 0x08A0 */ public List<int> DifficultyModifier;
/* 0x08B0 */ public List<GcExpeditionDebriefPunctuation> DebriefPunctuationList;
/* 0x08C0 */ public GcExpeditionDurationValues ExpeditionDurations;
/* 0x08D4 */ public GcFrigateClassCost FrigateBaseCost;
/* 0x08F8 */ public GcFrigateClassCost FrigateCostVariance;
/* 0x091C */ public GcInventoryClassCostMultiplier FrigateCostMultiplier;
/* 0x0930 */ public GcFrigateTraitStrengthByType FrigateTraitStrengths;
/* 0x0CA0 */ public GcFrigateStatsByClass FrigateInitialStats;
/* 0x1048 */ public GcFrigateTraitIcons TraitIcons;
/* 0x15C8 */ public GcFrigateTraitIcons NegativeTraitIcons;
/* 0x1B50 */ public GcScanEffectData FrigateScanEffect;
/* 0x1BA0 */ public GcScanEffectData FrigateHologramScanEffect;
/* 0x1BF0 */ public GcScanEffectData CompletedFrigateHologramScanEffect;
/* 0x1C40 */ public GcScanEffectData DamagedFrigateHologramScanEffect;
/* 0x1C90 */ public GcScanEffectData DestroyedFrigateHologramScanEffect;
/* 0x1CE0 */ public GcExpeditionEventOccurrenceRate EventTypeOccurrenceChance;
/* 0x1D48 */ public List<NMSString0x80> FrigateHologramModels;
/* 0x1D58 */ public List<NMSString0x80> FrigatePlanetModels;
/* 0x1D68 */ public List<int> ExpeditionRankBoundaries;
/* 0x1D78 */ public List<int> FrigateLevelVictoriesRequired;
/* 0x1D88 */ public List<GcExpeditionDifficultyKeyframe> ExpeditionDifficultyKeyframes;
/* 0x1D98 */ public List<NMSString0x80> FrigateInteriorsToCache;
/* 0x1DA8 */ public int NormandyFailures;
/* 0x1DAC */ public int NormandyDamageEvents;
/* 0x1DB0 */ public List<NMSString0x10> NormandyTraits;
/* 0x1DC0 */ public List<NMSString0x10> DeepSpaceFrigateTraits;
/* 0x1DD0 */ public List<NMSString0x10> DeepSpaceCommonPrimaryTraits;
/* 0x1DE0 */ public List<NMSString0x20> FrigateCaptainPuzzleIds;
/* 0x1DF0 */ public int MaxNumberOfPlayerShipsInFreighterHangar;
}
}
2 changes: 1 addition & 1 deletion libMBIN/Source/Version.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public static class Version {
// the Prerelease version should be reset to 1
// When the Release version is incremented:
// the Prerelease version should be reset to 0
internal const string VERSION_STRING = "4.60.0.1";
internal const string VERSION_STRING = "4.64.0.1";

/// <summary>Shorthand for AssemblyVersion.Major</summary>
public static int Major => AssemblyVersion.Major;
Expand Down

0 comments on commit a3844aa

Please sign in to comment.