From 41f3e5df3bf0fe6094a702b27643ca4634302c7e Mon Sep 17 00:00:00 2001 From: xen-42 Date: Sun, 8 Jun 2025 00:28:49 -0400 Subject: [PATCH] Add in missing system merging --- NewHorizons/External/Configs/StarSystemConfig.cs | 6 ++++++ NewHorizons/manifest.json | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/NewHorizons/External/Configs/StarSystemConfig.cs b/NewHorizons/External/Configs/StarSystemConfig.cs index d2cab099..a59105ef 100644 --- a/NewHorizons/External/Configs/StarSystemConfig.cs +++ b/NewHorizons/External/Configs/StarSystemConfig.cs @@ -304,12 +304,18 @@ namespace NewHorizons.External.Configs // True by default so if one is false go false canEnterViaWarpDrive = canEnterViaWarpDrive && otherConfig.canEnterViaWarpDrive; + canExitViaWarpDrive = canExitViaWarpDrive && otherConfig.canExitViaWarpDrive; destroyStockPlanets = destroyStockPlanets && otherConfig.destroyStockPlanets; enableTimeLoop = enableTimeLoop && otherConfig.enableTimeLoop; + + // False by default + returnToSolarSystemWhenTooFar = returnToSolarSystemWhenTooFar || otherConfig.returnToSolarSystemWhenTooFar; + loopDuration = loopDuration == 22f ? otherConfig.loopDuration : loopDuration; // If current one is null take the other factRequiredForWarp = string.IsNullOrEmpty(factRequiredForWarp) ? otherConfig.factRequiredForWarp : factRequiredForWarp; + factRequiredToExitViaWarpDrive = string.IsNullOrEmpty(factRequiredToExitViaWarpDrive) ? otherConfig.factRequiredToExitViaWarpDrive : factRequiredToExitViaWarpDrive; Skybox = Skybox == null ? otherConfig.Skybox : Skybox; // False by default so if one is true go true diff --git a/NewHorizons/manifest.json b/NewHorizons/manifest.json index 8e5f40cb..e1bfa1ad 100644 --- a/NewHorizons/manifest.json +++ b/NewHorizons/manifest.json @@ -4,7 +4,7 @@ "author": "xen, Bwc9876, JohnCorby, MegaPiggy, and friends", "name": "New Horizons", "uniqueName": "xen.NewHorizons", - "version": "1.28.3", + "version": "1.28.4", "owmlVersion": "2.12.1", "dependencies": [ "JohnCorby.VanillaFix", "xen.CommonCameraUtility", "dgarro.CustomShipLogModes" ], "conflicts": [ "PacificEngine.OW_CommonResources" ],