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 13407450 #581

Merged
merged 1 commit into from
Feb 8, 2024
Merged

[MRG] Update for 13407450 #581

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
4 changes: 2 additions & 2 deletions libMBIN/Source/NMS/GameComponents/GcBackgroundSpaceEncounterInfo.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 = 0xF022D46259E222D8, NameHash = 0x9803054FC61F20F4)]
[NMS(GUID = 0x57D664ECDFC788E7, NameHash = 0x9803054FC61F20F4)]
public class GcBackgroundSpaceEncounterInfo : NMSTemplate
{
/* 0x00 */ public NMSString0x10 Id;
Expand All @@ -12,6 +12,6 @@ public class GcBackgroundSpaceEncounterInfo : NMSTemplate
/* 0x30 */ public float SpawnDistance;
/* 0x34 */ public float MinDuration;
/* 0x38 */ public float DespawnDistance;
/* 0x3C */ public GcPulseEncounterSpawnObject Encounter;
/* 0x40 */ public GcPulseEncounterSpawnObject Encounter;
}
}
2 changes: 1 addition & 1 deletion libMBIN/Source/NMS/GameComponents/GcExperienceSpawnTable.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 = 0xEBD87AB92DC14AE9, NameHash = 0x5F4CA33999F0D259)]
[NMS(GUID = 0x71941C5EACC5E4EA, NameHash = 0x5F4CA33999F0D259)]
public class GcExperienceSpawnTable : NMSTemplate
{
/* 0x000 */ public List<GcAIShipSpawnData> FlybySpawns;
Expand Down
3 changes: 2 additions & 1 deletion libMBIN/Source/NMS/GameComponents/GcMissionConditionCurrentPlanetVisited.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
namespace libMBIN.NMS.GameComponents
{
[NMS(GUID = 0xEBEF5DA2F06B2B34, NameHash = 0x7CCE260D959425EE)]
[NMS(GUID = 0x25BE49A604767DC8, NameHash = 0x7CCE260D959425EE)]
public class GcMissionConditionCurrentPlanetVisited : NMSTemplate
{
/* 0x0 */ public bool JustTestSeasonStartPlanetHack;
}
}
3 changes: 2 additions & 1 deletion libMBIN/Source/NMS/GameComponents/GcMissionConditionMissionCompleted.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
namespace libMBIN.NMS.GameComponents
{
[NMS(GUID = 0x7D58868B17FADC8C, NameHash = 0xC28C1E8A4FA47E3B)]
[NMS(GUID = 0x2997545CCDDD9AC1, NameHash = 0xC28C1E8A4FA47E3B)]
public class GcMissionConditionMissionCompleted : NMSTemplate
{
/* 0x00 */ public NMSString0x10 MissionID;
/* 0x10 */ public int SeasonalMissionSeed;
/* 0x14 */ public bool TakeIDFromSeasonData;
/* 0x15 */ public bool CalculateTextMissionTargetFromStageIndex;
/* 0x18 */ public int CalculateSeasonalSeedFromStageIndexOffset;
}
}
12 changes: 12 additions & 0 deletions libMBIN/Source/NMS/GameComponents/GcMissionConditionPlanetDiscoveries.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
using libMBIN.NMS.GameComponents;

namespace libMBIN.NMS.GameComponents
{
[NMS(GUID = 0xD523F943FA186627, NameHash = 0x792A334D3849EEA1)]
public class GcMissionConditionPlanetDiscoveries : NMSTemplate
{
/* 0x0 */ public GcDiscoveryType DiscoveryType;
/* 0x4 */ public float PercentDiscovered;
/* 0x8 */ public bool DeepSearchDoneDiscos;
}
}
8 changes: 0 additions & 8 deletions libMBIN/Source/NMS/GameComponents/GcMissionConditionPlanetPlantDiscoveries.cs
View file
Open in desktop

This file was deleted.

8 changes: 8 additions & 0 deletions libMBIN/Source/NMS/GameComponents/GcMissionConditionThisMissionStageIndex.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
namespace libMBIN.NMS.GameComponents
{
[NMS(GUID = 0xA99AE5AA393CACDF, NameHash = 0xA395C630BCD87BBC)]
public class GcMissionConditionThisMissionStageIndex : NMSTemplate
{
/* 0x0 */ public int StageIndex;
}
}
3 changes: 2 additions & 1 deletion libMBIN/Source/NMS/GameComponents/GcPulseEncounterSpawnObject.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 = 0x9BEFE5D4AA786C4B, NameHash = 0x82C7C611E7625A21)]
[NMS(GUID = 0xDBD6136FBBF407B7, NameHash = 0x82C7C611E7625A21)]
public class GcPulseEncounterSpawnObject : NMSTemplate
{
/* 0x00 */ public TkModelResource Object;
Expand All @@ -11,5 +11,6 @@ public class GcPulseEncounterSpawnObject : NMSTemplate
/* 0x8C */ public float Yaw;
/* 0x90 */ public float Roll;
/* 0x94 */ public float UpOffset;
/* 0x98 */ public NMSString0x10 TriggerActionOnSpawn;
}
}
2,769 changes: 1,385 additions & 1,384 deletions libMBIN/Source/NMS/Globals/GcUIGlobals.cs
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion libMBIN/Source/Version.cs
View file
Open in desktop
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.49.0.1";
internal const string VERSION_STRING = "4.49.0.2";

/// <summary>Shorthand for AssemblyVersion.Major</summary>
public static int Major => AssemblyVersion.Major;
Expand Down
3 changes: 2 additions & 1 deletion libMBIN/libMBIN-Shared.projitems
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1040,7 +1040,7 @@
<Compile Include="$(MSBuildThisFileDirectory)Source\NMS\GameComponents\GcMissionConditionPlanetAttackPiratesActive.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Source\NMS\GameComponents\GcMissionConditionPlanetCorruptSentinelGeneration.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Source\NMS\GameComponents\GcMissionConditionPlanetCreatureRoles.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Source\NMS\GameComponents\GcMissionConditionPlanetPlantDiscoveries.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Source\NMS\GameComponents\GcMissionConditionPlanetDiscoveries.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Source\NMS\GameComponents\GcMissionConditionPlanetResourceHint.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Source\NMS\GameComponents\GcMissionConditionPlanetStatLevel.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Source\NMS\GameComponents\GcMissionConditionPrimaryExocraft.cs" />
Expand Down Expand Up @@ -1081,6 +1081,7 @@
<Compile Include="$(MSBuildThisFileDirectory)Source\NMS\GameComponents\GcMissionConditionTakingDamage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Source\NMS\GameComponents\GcMissionConditionTechnologyKnown.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Source\NMS\GameComponents\GcMissionConditionTest.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Source\NMS\GameComponents\GcMissionConditionThisMissionStageIndex.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Source\NMS\GameComponents\GcMissionConditionTotalWarpsNumber.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Source\NMS\GameComponents\GcMissionConditionTrial.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Source\NMS\GameComponents\GcMissionConditionTutorialEnabled.cs" />
Expand Down