## Major features
- Quantum Space Buddies is no longer incompatible. Expect there to still
be bugs when playing NH addons with QSB, especially code-oriented ones!
This commit is contained in:
xen-42 2024-04-25 17:07:14 -04:00 committed by GitHub
commit 693d09b469
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 30 additions and 19 deletions

View File

@ -1,17 +1,28 @@
{
"name" : "Ship",
"$schema": "https://raw.githubusercontent.com/xen-42/outer-wilds-new-horizons/master/NewHorizons/body_schema.json",
"Props" :
{
"dialogue": [
{
"position":{"x": -0.3071011, "y": 2.741472, "z": -4.005298},
"radius": 0,
"remoteTriggerRadius": 1,
"xmlFile":"Assets/WarpDriveDialogue.xml",
"remoteTriggerPosition": {"x": -0.05656214, "y": 0.5362684, "z": 0.5467669},
"blockAfterPersistentCondition" : "KnowsAboutWarpDrive"
}
]
}
"name": "Ship",
"$schema": "https://raw.githubusercontent.com/Outer-Wilds-New-Horizons/new-horizons/main/NewHorizons/Schemas/body_schema.json",
"Props": {
"dialogue": [
{
"position": {
"x": -0.3071011,
"y": 2.741472,
"z": -4.005298
},
"radius": 0,
"rename": "WarpDriveDialogue",
"xmlFile": "Assets/WarpDriveDialogue.xml",
"blockAfterPersistentCondition": "KnowsAboutWarpDrive",
"remoteTrigger": {
"radius": 1,
"position": {
"x": -0.05656214,
"y": 0.5362684,
"z": 0.5467669
},
"rename": "WarpDriveRemoteTrigger"
}
}
]
}
}

View File

@ -388,7 +388,7 @@ namespace NewHorizons
{
IsWarpingBackToEye = false;
OWTime.Pause(OWTime.PauseType.Loading);
LoadManager.LoadSceneImmediate(OWScene.EyeOfTheUniverse);
LoadManager.LoadScene(OWScene.EyeOfTheUniverse); // LoadScene loads one frame later in Update. will this break since we unpause before that in the next line?
OWTime.Unpause(OWTime.PauseType.Loading);
return;
}
@ -940,7 +940,7 @@ namespace NewHorizons
{
// Slide reel unloading is tied to being removed from the sector, so we do that here to prevent a softlock
Locator.GetPlayerSectorDetector().RemoveFromAllSectors();
LoadManager.LoadSceneImmediate(sceneToLoad);
LoadManager.LoadScene(sceneToLoad); // this used to be LoadSceneImmediate, but that breaks with qsb. hopefully it doesnt break nh
});
}
}

View File

@ -4,10 +4,10 @@
"author": "xen, Bwc9876, JohnCorby, MegaPiggy, Clay, Trifid, and friends",
"name": "New Horizons",
"uniqueName": "xen.NewHorizons",
"version": "1.19.9",
"version": "1.20.0",
"owmlVersion": "2.10.3",
"dependencies": [ "JohnCorby.VanillaFix", "xen.CommonCameraUtility", "dgarro.CustomShipLogModes" ],
"conflicts": [ "Raicuparta.QuantumSpaceBuddies", "PacificEngine.OW_CommonResources" ],
"conflicts": [ "PacificEngine.OW_CommonResources" ],
"pathsToPreserve": [ "planets", "systems", "translations" ],
"donateLink": "https://www.patreon.com/ownh"
}