Compare commits

...

2 Commits

Author SHA1 Message Date
xen-42
1270d1c61f
1.28.4 (#1095)
## Improvements

- `canExitViaWarpDrive` and `factRequiredToExitViaWarpDrive` will now be
properly merged when two mods define the same system config.
2025-06-08 00:32:41 -04:00
xen-42
41f3e5df3b Add in missing system merging 2025-06-08 00:28:49 -04:00
2 changed files with 7 additions and 1 deletions

View File

@ -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

View File

@ -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" ],