diff --git a/libMBIN/Source/NMS/GameComponents/GcMissionConditionHasSettlementBuilding.cs b/libMBIN/Source/NMS/GameComponents/GcMissionConditionHasSettlementBuilding.cs index 88b4a2c59..e5a90421a 100644 --- a/libMBIN/Source/NMS/GameComponents/GcMissionConditionHasSettlementBuilding.cs +++ b/libMBIN/Source/NMS/GameComponents/GcMissionConditionHasSettlementBuilding.cs @@ -2,7 +2,7 @@ namespace libMBIN.NMS.GameComponents { - [NMS(GUID = 0xF977893C581A9F6A, NameHash = 0xD9D7367B)] + [NMS(GUID = 0x8B6D9252B25E5EA7, NameHash = 0xD9D7367B)] public class GcMissionConditionHasSettlementBuilding : NMSTemplate { [NMS(Index = 2)] @@ -11,7 +11,9 @@ public class GcMissionConditionHasSettlementBuilding : NMSTemplate /* 0x4 */ public bool AnyBuildingClass; [NMS(Index = 0)] /* 0x5 */ public GcBuildingClassification BuildingClass; + [NMS(Index = 4)] + /* 0x6 */ public bool CheckAllSettlements; [NMS(Index = 3)] - /* 0x6 */ public bool RequireComplete; + /* 0x7 */ public bool RequireComplete; } } diff --git a/libMBIN/Source/NMS/GameComponents/GcSolarSystemData.cs b/libMBIN/Source/NMS/GameComponents/GcSolarSystemData.cs index 48b212e99..c5fe44233 100644 --- a/libMBIN/Source/NMS/GameComponents/GcSolarSystemData.cs +++ b/libMBIN/Source/NMS/GameComponents/GcSolarSystemData.cs @@ -3,56 +3,56 @@ namespace libMBIN.NMS.GameComponents { - [NMS(GUID = 0xD2B492508DB5AF13, NameHash = 0xC6DB83D2)] + [NMS(GUID = 0xEBD73D335367502C, NameHash = 0xC6DB83D2)] public class GcSolarSystemData : NMSTemplate { - [NMS(Index = 27)] + [NMS(Index = 28)] /* 0x0000 */ public GcPlanetColourData Colours; - [NMS(Index = 9, Size = 0x20, MxmlName = "Space Poi Positions")] + [NMS(Index = 10, Size = 0x20, MxmlName = "Space Poi Positions")] /* 0x1CE0 */ public Vector3f[] SpacePoiPositions; - [NMS(Index = 21)] + [NMS(Index = 22)] /* 0x1EE0 */ public GcSpaceStationSpawnData SpaceStationSpawn; - [NMS(Index = 29)] + [NMS(Index = 30)] /* 0x2020 */ public GcSpaceSkyProperties Sky; [NMS(Index = 5, Size = 0x8, MxmlName = "Planet Positions")] /* 0x20C0 */ public Vector3f[] PlanetPositions; - [NMS(Index = 28)] + [NMS(Index = 29)] /* 0x2140 */ public GcLightProperties Light; - [NMS(Index = 10)] + [NMS(Index = 11)] /* 0x2170 */ public Vector3f SunPosition; [NMS(Index = 6, Size = 0x8, MxmlName = "Planet Generation Inputs")] /* 0x2180 */ public GcPlanetGenerationInputData[] PlanetGenerationInputs; - [NMS(Index = 25)] + [NMS(Index = 26)] /* 0x2440 */ public List AsteroidGenerators; - [NMS(Index = 11)] + [NMS(Index = 12)] /* 0x2450 */ public NMSString0x10 AsteroidSubstanceID; - [NMS(Index = 31)] + [NMS(Index = 32)] /* 0x2460 */ public GcFilename HeavyAir; - [NMS(Index = 24)] + [NMS(Index = 25)] /* 0x2470 */ public List Locators; [NMS(Index = 0)] /* 0x2480 */ public GcSeed Seed; - [NMS(Index = 33)] + [NMS(Index = 34)] /* 0x2490 */ public GcSeed SentinelCrashSiteShipSeed; - [NMS(Index = 32)] + [NMS(Index = 33)] /* 0x24A0 */ public List SystemShips; [NMS(Index = 7, Size = 0x8, MxmlName = "Planet Orbits")] /* 0x24B0 */ public int[] PlanetOrbits; - [NMS(Index = 23)] + [NMS(Index = 24)] /* 0x24D0 */ public GcSolarSystemTraderSpawnData TraderSpawnInStations; - [NMS(Index = 22)] + [NMS(Index = 23)] /* 0x24E4 */ public GcSolarSystemTraderSpawnData TraderSpawnOnOutposts; - [NMS(Index = 19)] + [NMS(Index = 20)] /* 0x24F8 */ public Vector2f FlybyTimer; - [NMS(Index = 16)] + [NMS(Index = 17)] /* 0x2500 */ public Vector2f FreighterTimer; - [NMS(Index = 18)] + [NMS(Index = 19)] /* 0x2508 */ public Vector2f PlanetPirateTimer; - [NMS(Index = 20)] + [NMS(Index = 21)] /* 0x2510 */ public Vector2f PoliceTimer; - [NMS(Index = 17)] + [NMS(Index = 18)] /* 0x2518 */ public Vector2f SpacePirateTimer; - [NMS(Index = 35)] + [NMS(Index = 36)] /* 0x2520 */ public GcPlanetTradingData TradingData; // size: 0x3 public enum AsteroidLevelEnum : uint { @@ -60,31 +60,33 @@ public enum AsteroidLevelEnum : uint { SomeRares, LotsOfRares, } - [NMS(Index = 26)] + [NMS(Index = 27)] /* 0x2528 */ public AsteroidLevelEnum AsteroidLevel; [NMS(Index = 2)] /* 0x252C */ public GcSolarSystemClass Class; - [NMS(Index = 36)] + [NMS(Index = 37)] /* 0x2530 */ public GcPlayerConflictData ConflictData; - [NMS(Index = 34)] + [NMS(Index = 35)] /* 0x2534 */ public GcAlienRace InhabitingRace; - [NMS(Index = 14)] + [NMS(Index = 15)] /* 0x2538 */ public int MaxNumFreighters; - [NMS(Index = 12)] - /* 0x253C */ public int NumTradeRoutes; [NMS(Index = 13)] + /* 0x253C */ public int NumTradeRoutes; + [NMS(Index = 14)] /* 0x2540 */ public int NumVisibleTradeRoutes; [NMS(Index = 4)] /* 0x2544 */ public int Planets; [NMS(Index = 8)] /* 0x2548 */ public int PrimePlanets; - [NMS(Index = 30)] + [NMS(Index = 31)] /* 0x254C */ public GcScreenFilters ScreenFilter; [NMS(Index = 3)] /* 0x2550 */ public GcGalaxyStarTypes StarType; [NMS(Index = 1)] /* 0x2554 */ public NMSString0x80 Name; - [NMS(Index = 15)] - /* 0x25D4 */ public bool StartWithFreighters; + [NMS(Index = 9)] + /* 0x25D4 */ public bool PrimePlanetsIncludedInPlanetCount; + [NMS(Index = 16)] + /* 0x25D5 */ public bool StartWithFreighters; } } diff --git a/libMBIN/Source/Version.cs b/libMBIN/Source/Version.cs index d9ed81461..5ea1ad0f8 100644 --- a/libMBIN/Source/Version.cs +++ b/libMBIN/Source/Version.cs @@ -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 = "7.04.1.2"; + internal const string VERSION_STRING = "7.04.1.3"; /// Shorthand for AssemblyVersion.Major public static int Major => AssemblyVersion.Major;