Skip to content

Commit a3844aa

Browse files
monkeyman192monkeyman192
authored
Merge pull request #591 from HolterPhylo/UpdateFor13913824
[MRG] Update for 13913824
2 parents 20b7f22 + 3b35d3f commit a3844aa

File tree

4 files changed

+79
-76
lines changed

4 files changed

+79
-76
lines changed

‎libMBIN/Source/NMS/GameComponents/GcRewardEndScanEvent.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
namespace libMBIN.NMS.GameComponents
22
{
3-
[NMS(GUID = 0x67F8CE2CC9703F74, NameHash = 0x9CF1833CA581E47A)]
3+
[NMS(GUID = 0xD94E9D9F2996B998, NameHash = 0x9CF1833CA581E47A)]
44
public class GcRewardEndScanEvent : NMSTemplate
55
{
6-
/* 0x0 */ public NMSString0x20A EventID;
6+
/* 0x00 */ public NMSString0x20A EventID;
7+
/* 0x20 */ public bool UseMatchingExpeditionSeed;
78
}
89
}

‎libMBIN/Source/NMS/GameComponents/GcRewardMissionMessageSeeded.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
namespace libMBIN.NMS.GameComponents
22
{
3-
[NMS(GUID = 0x5FA26355282BB41A, NameHash = 0x56DEE85C9E579653)]
3+
[NMS(GUID = 0x2825208A03CE2D36, NameHash = 0x56DEE85C9E579653)]
44
public class GcRewardMissionMessageSeeded : NMSTemplate
55
{
66
/* 0x00 */ public NMSString0x10 MessageID;
77
/* 0x10 */ public bool BroadcastInMultiplayer;
88
/* 0x11 */ public bool BroadcastToActiveMultiplayerMission;
99
/* 0x18 */ public NMSString0x10 SpecificMissionID;
10+
/* 0x28 */ public bool UseMatchingExpeditionSeed;
1011
}
1112
}

‎libMBIN/Source/NMS/Globals/GcFleetGlobals.cs‎

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

44
namespace libMBIN.NMS.Globals
55
{
6-
[NMS(GUID = 0xC99B2F79A254C789, NameHash = 0xB032629C37506E6A)]
6+
[NMS(GUID = 0x78C62618191354A2, NameHash = 0xB032629C37506E6A)]
77
public class GcFleetGlobals : NMSTemplate
88
{
99
/* 0x0000 */ public Vector3f FreighterCustomiserSunAngleAdjust;
@@ -95,76 +95,77 @@ public enum ForceDebriefEntryTypeEnum : uint {
9595
/* 0x04F0 */ public NMSString0x20A TerminalDamagePuzzleID;
9696
/* 0x0510 */ public NMSString0x20A TerminalActivePuzzleID;
9797
/* 0x0530 */ public NMSString0x20A TerminalDebriefPuzzleID;
98-
/* 0x0550 */ public NMSString0x20A NormandyActivePuzzleID;
99-
/* 0x0570 */ public NMSString0x20A NormandyDebriefPuzzleID;
100-
/* 0x0590 */ public NMSString0x20A DeepSpaceFrigateActivePuzzleID;
101-
/* 0x05B0 */ public NMSString0x20A DeepSpaceFrigateDebriefPuzzleID;
102-
/* 0x05D0 */ public NMSString0x20A NeedFrigatesPuzzleID;
103-
/* 0x05F0 */ public NMSString0x20A NewExpeditionsAvailablePuzzleID;
104-
/* 0x0610 */ public NMSString0x20A NeedExpeditionTerminalPuzzleID;
105-
/* 0x0630 */ public NMSString0x20A NeedAvailableExpeditionTerminalPuzzleID;
106-
/* 0x0650 */ public NMSString0x20A SelectExpeditionPuzzleID;
107-
/* 0x0670 */ public int NumberOfExpeditionChoices;
108-
/* 0x0674 */ public int ExpeditionDifficultyVariance;
109-
/* 0x0678 */ public float ExpeditionDifficultyIncreaseForEachAdditionalFrigate;
110-
/* 0x067C */ public int MinExpeditionStatValue;
111-
/* 0x0680 */ public int MaxExpeditionStatValue;
112-
/* 0x0684 */ public int NumberOfFrigatesPurchasedToEndEasyExpeditions;
113-
/* 0x0688 */ public int TimeTakenForExpeditionEvent_Easy;
114-
/* 0x068C */ public int TimeTakenForExpeditionEvent;
115-
/* 0x0690 */ public int LightYearsPerExpeditionEvent_Easy;
116-
/* 0x0694 */ public int LightYearsPerExpeditionEvent;
117-
/* 0x0698 */ public int NumberOfUAChangesPerExpeditionEvent;
118-
/* 0x069C */ public int TimeBetweenPassiveIncomeTicks;
119-
/* 0x06A0 */ public List<GcExpeditionPaymentToken> FreighterTokenProductIDs;
120-
/* 0x06B0 */ public GcPassiveFrigateIncomeArray PassiveIncomes;
121-
/* 0x07D0 */ public List<GcExpeditionPowerup> Powerups;
122-
/* 0x07E0 */ public int FreighterTokenMinimumSpend;
123-
/* 0x07E4 */ public int PercentChanceOfInterventionEvent;
124-
/* 0x07E8 */ public int FirstEventIndexWhichCanBeIntervention;
125-
/* 0x07EC */ public float TimeBeforePlayerAlertedToInterventionEvent;
126-
/* 0x07F0 */ public int MaxDiceRollWhenCalculatingExpeditionEventResult;
127-
/* 0x07F4 */ public float DifficultyMultiplierForBalancedExpeditions;
128-
/* 0x07F8 */ public float DifficultyMultiplierForNonPrimaryEvents;
129-
/* 0x07FC */ public int StatPointsAwardedForLevelUp;
130-
/* 0x0800 */ public int MinGapBetweenExpeditionLogEntries;
131-
/* 0x0804 */ public int MaxGapBetweenExpeditionLogEntries;
132-
/* 0x0808 */ public float TimeBetweenDebriefLettersAppearing;
133-
/* 0x080C */ public float TimeBetweenDebriefLogSectionsAppearing;
134-
/* 0x0810 */ public float TimeBetweenDebriefLogsAppearing;
135-
/* 0x0814 */ public float TimeBeforeDebriefLogsStart;
136-
/* 0x0818 */ public bool ShowMissingRewardDescriptions;
137-
/* 0x0820 */ public NMSString0x20A CommunicatorDamagePuzzleTableEntry;
138-
/* 0x0840 */ public NMSString0x20A FrigateDamagePuzzleTableEntry;
139-
/* 0x0860 */ public NMSString0x20A FrigatePurchasePuzzleTableEntry;
140-
/* 0x0880 */ public List<int> DifficultyModifier;
141-
/* 0x0890 */ public List<GcExpeditionDebriefPunctuation> DebriefPunctuationList;
142-
/* 0x08A0 */ public GcExpeditionDurationValues ExpeditionDurations;
143-
/* 0x08B4 */ public GcFrigateClassCost FrigateBaseCost;
144-
/* 0x08D8 */ public GcFrigateClassCost FrigateCostVariance;
145-
/* 0x08FC */ public GcInventoryClassCostMultiplier FrigateCostMultiplier;
146-
/* 0x0910 */ public GcFrigateTraitStrengthByType FrigateTraitStrengths;
147-
/* 0x0C80 */ public GcFrigateStatsByClass FrigateInitialStats;
148-
/* 0x1028 */ public GcFrigateTraitIcons TraitIcons;
149-
/* 0x15A8 */ public GcFrigateTraitIcons NegativeTraitIcons;
150-
/* 0x1B30 */ public GcScanEffectData FrigateScanEffect;
151-
/* 0x1B80 */ public GcScanEffectData FrigateHologramScanEffect;
152-
/* 0x1BD0 */ public GcScanEffectData CompletedFrigateHologramScanEffect;
153-
/* 0x1C20 */ public GcScanEffectData DamagedFrigateHologramScanEffect;
154-
/* 0x1C70 */ public GcScanEffectData DestroyedFrigateHologramScanEffect;
155-
/* 0x1CC0 */ public GcExpeditionEventOccurrenceRate EventTypeOccurrenceChance;
156-
/* 0x1D28 */ public List<NMSString0x80> FrigateHologramModels;
157-
/* 0x1D38 */ public List<NMSString0x80> FrigatePlanetModels;
158-
/* 0x1D48 */ public List<int> ExpeditionRankBoundaries;
159-
/* 0x1D58 */ public List<int> FrigateLevelVictoriesRequired;
160-
/* 0x1D68 */ public List<GcExpeditionDifficultyKeyframe> ExpeditionDifficultyKeyframes;
161-
/* 0x1D78 */ public List<NMSString0x80> FrigateInteriorsToCache;
162-
/* 0x1D88 */ public int NormandyFailures;
163-
/* 0x1D8C */ public int NormandyDamageEvents;
164-
/* 0x1D90 */ public List<NMSString0x10> NormandyTraits;
165-
/* 0x1DA0 */ public List<NMSString0x10> DeepSpaceFrigateTraits;
166-
/* 0x1DB0 */ public List<NMSString0x10> DeepSpaceCommonPrimaryTraits;
167-
/* 0x1DC0 */ public List<NMSString0x20> FrigateCaptainPuzzleIds;
168-
/* 0x1DD0 */ public int MaxNumberOfPlayerShipsInFreighterHangar;
98+
/* 0x0550 */ public NMSString0x20A NormandyInterventionPuzzleID;
99+
/* 0x0570 */ public NMSString0x20A NormandyActivePuzzleID;
100+
/* 0x0590 */ public NMSString0x20A NormandyDebriefPuzzleID;
101+
/* 0x05B0 */ public NMSString0x20A DeepSpaceFrigateActivePuzzleID;
102+
/* 0x05D0 */ public NMSString0x20A DeepSpaceFrigateDebriefPuzzleID;
103+
/* 0x05F0 */ public NMSString0x20A NeedFrigatesPuzzleID;
104+
/* 0x0610 */ public NMSString0x20A NewExpeditionsAvailablePuzzleID;
105+
/* 0x0630 */ public NMSString0x20A NeedExpeditionTerminalPuzzleID;
106+
/* 0x0650 */ public NMSString0x20A NeedAvailableExpeditionTerminalPuzzleID;
107+
/* 0x0670 */ public NMSString0x20A SelectExpeditionPuzzleID;
108+
/* 0x0690 */ public int NumberOfExpeditionChoices;
109+
/* 0x0694 */ public int ExpeditionDifficultyVariance;
110+
/* 0x0698 */ public float ExpeditionDifficultyIncreaseForEachAdditionalFrigate;
111+
/* 0x069C */ public int MinExpeditionStatValue;
112+
/* 0x06A0 */ public int MaxExpeditionStatValue;
113+
/* 0x06A4 */ public int NumberOfFrigatesPurchasedToEndEasyExpeditions;
114+
/* 0x06A8 */ public int TimeTakenForExpeditionEvent_Easy;
115+
/* 0x06AC */ public int TimeTakenForExpeditionEvent;
116+
/* 0x06B0 */ public int LightYearsPerExpeditionEvent_Easy;
117+
/* 0x06B4 */ public int LightYearsPerExpeditionEvent;
118+
/* 0x06B8 */ public int NumberOfUAChangesPerExpeditionEvent;
119+
/* 0x06BC */ public int TimeBetweenPassiveIncomeTicks;
120+
/* 0x06C0 */ public List<GcExpeditionPaymentToken> FreighterTokenProductIDs;
121+
/* 0x06D0 */ public GcPassiveFrigateIncomeArray PassiveIncomes;
122+
/* 0x07F0 */ public List<GcExpeditionPowerup> Powerups;
123+
/* 0x0800 */ public int FreighterTokenMinimumSpend;
124+
/* 0x0804 */ public int PercentChanceOfInterventionEvent;
125+
/* 0x0808 */ public int FirstEventIndexWhichCanBeIntervention;
126+
/* 0x080C */ public float TimeBeforePlayerAlertedToInterventionEvent;
127+
/* 0x0810 */ public int MaxDiceRollWhenCalculatingExpeditionEventResult;
128+
/* 0x0814 */ public float DifficultyMultiplierForBalancedExpeditions;
129+
/* 0x0818 */ public float DifficultyMultiplierForNonPrimaryEvents;
130+
/* 0x081C */ public int StatPointsAwardedForLevelUp;
131+
/* 0x0820 */ public int MinGapBetweenExpeditionLogEntries;
132+
/* 0x0824 */ public int MaxGapBetweenExpeditionLogEntries;
133+
/* 0x0828 */ public float TimeBetweenDebriefLettersAppearing;
134+
/* 0x082C */ public float TimeBetweenDebriefLogSectionsAppearing;
135+
/* 0x0830 */ public float TimeBetweenDebriefLogsAppearing;
136+
/* 0x0834 */ public float TimeBeforeDebriefLogsStart;
137+
/* 0x0838 */ public bool ShowMissingRewardDescriptions;
138+
/* 0x0840 */ public NMSString0x20A CommunicatorDamagePuzzleTableEntry;
139+
/* 0x0860 */ public NMSString0x20A FrigateDamagePuzzleTableEntry;
140+
/* 0x0880 */ public NMSString0x20A FrigatePurchasePuzzleTableEntry;
141+
/* 0x08A0 */ public List<int> DifficultyModifier;
142+
/* 0x08B0 */ public List<GcExpeditionDebriefPunctuation> DebriefPunctuationList;
143+
/* 0x08C0 */ public GcExpeditionDurationValues ExpeditionDurations;
144+
/* 0x08D4 */ public GcFrigateClassCost FrigateBaseCost;
145+
/* 0x08F8 */ public GcFrigateClassCost FrigateCostVariance;
146+
/* 0x091C */ public GcInventoryClassCostMultiplier FrigateCostMultiplier;
147+
/* 0x0930 */ public GcFrigateTraitStrengthByType FrigateTraitStrengths;
148+
/* 0x0CA0 */ public GcFrigateStatsByClass FrigateInitialStats;
149+
/* 0x1048 */ public GcFrigateTraitIcons TraitIcons;
150+
/* 0x15C8 */ public GcFrigateTraitIcons NegativeTraitIcons;
151+
/* 0x1B50 */ public GcScanEffectData FrigateScanEffect;
152+
/* 0x1BA0 */ public GcScanEffectData FrigateHologramScanEffect;
153+
/* 0x1BF0 */ public GcScanEffectData CompletedFrigateHologramScanEffect;
154+
/* 0x1C40 */ public GcScanEffectData DamagedFrigateHologramScanEffect;
155+
/* 0x1C90 */ public GcScanEffectData DestroyedFrigateHologramScanEffect;
156+
/* 0x1CE0 */ public GcExpeditionEventOccurrenceRate EventTypeOccurrenceChance;
157+
/* 0x1D48 */ public List<NMSString0x80> FrigateHologramModels;
158+
/* 0x1D58 */ public List<NMSString0x80> FrigatePlanetModels;
159+
/* 0x1D68 */ public List<int> ExpeditionRankBoundaries;
160+
/* 0x1D78 */ public List<int> FrigateLevelVictoriesRequired;
161+
/* 0x1D88 */ public List<GcExpeditionDifficultyKeyframe> ExpeditionDifficultyKeyframes;
162+
/* 0x1D98 */ public List<NMSString0x80> FrigateInteriorsToCache;
163+
/* 0x1DA8 */ public int NormandyFailures;
164+
/* 0x1DAC */ public int NormandyDamageEvents;
165+
/* 0x1DB0 */ public List<NMSString0x10> NormandyTraits;
166+
/* 0x1DC0 */ public List<NMSString0x10> DeepSpaceFrigateTraits;
167+
/* 0x1DD0 */ public List<NMSString0x10> DeepSpaceCommonPrimaryTraits;
168+
/* 0x1DE0 */ public List<NMSString0x20> FrigateCaptainPuzzleIds;
169+
/* 0x1DF0 */ public int MaxNumberOfPlayerShipsInFreighterHangar;
169170
}
170171
}

‎libMBIN/Source/Version.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public static class Version {
2525
// the Prerelease version should be reset to 1
2626
// When the Release version is incremented:
2727
// the Prerelease version should be reset to 0
28-
internal const string VERSION_STRING = "4.60.0.1";
28+
internal const string VERSION_STRING = "4.64.0.1";
2929

3030
/// <summary>Shorthand for AssemblyVersion.Major</summary>
3131
public static int Major => AssemblyVersion.Major;

0 commit comments

Comments
 (0)