From 75453b323b5a447e893c4e9bcd7fedda339de3c2 Mon Sep 17 00:00:00 2001 From: _nebula <41904486+misternebula@users.noreply.github.com> Date: Mon, 11 Mar 2024 01:04:00 +0000 Subject: [PATCH 1/7] don't use immediate because qsb hates it --- NewHorizons/Main.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NewHorizons/Main.cs b/NewHorizons/Main.cs index db83045f1..0d93c6edd 100644 --- a/NewHorizons/Main.cs +++ b/NewHorizons/Main.cs @@ -382,7 +382,7 @@ private void OnSceneLoaded(Scene scene, LoadSceneMode mode) { IsWarpingBackToEye = false; OWTime.Pause(OWTime.PauseType.Loading); - LoadManager.LoadSceneImmediate(OWScene.EyeOfTheUniverse); + LoadManager.LoadScene(OWScene.EyeOfTheUniverse); OWTime.Unpause(OWTime.PauseType.Loading); return; } @@ -931,7 +931,7 @@ public void ChangeCurrentStarSystem(string newStarSystem, bool warp = false, boo { // 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); }); } } From 103839d60585edc06f334258f3d2b8c33112f563 Mon Sep 17 00:00:00 2001 From: JohnCorby Date: Sun, 10 Mar 2024 18:11:40 -0700 Subject: [PATCH 2/7] comment --- NewHorizons/Main.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NewHorizons/Main.cs b/NewHorizons/Main.cs index 0d93c6edd..bc393776f 100644 --- a/NewHorizons/Main.cs +++ b/NewHorizons/Main.cs @@ -382,7 +382,7 @@ private void OnSceneLoaded(Scene scene, LoadSceneMode mode) { IsWarpingBackToEye = false; OWTime.Pause(OWTime.PauseType.Loading); - LoadManager.LoadScene(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; } @@ -931,7 +931,7 @@ public void ChangeCurrentStarSystem(string newStarSystem, bool warp = false, boo { // Slide reel unloading is tied to being removed from the sector, so we do that here to prevent a softlock Locator.GetPlayerSectorDetector().RemoveFromAllSectors(); - LoadManager.LoadScene(sceneToLoad); + LoadManager.LoadScene(sceneToLoad); // this used to be LoadSceneImmediate, but that breaks with qsb. hopefully it doesnt break nh }); } } From 129bd84e8087283a16407fd65f7b9edd9377f031 Mon Sep 17 00:00:00 2001 From: JohnCorby Date: Sun, 10 Mar 2024 18:32:48 -0700 Subject: [PATCH 3/7] give name to warp drive dialogue for qsb --- NewHorizons/Assets/WarpDriveConfig.json | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/NewHorizons/Assets/WarpDriveConfig.json b/NewHorizons/Assets/WarpDriveConfig.json index 1821c6e37..1622f23c5 100644 --- a/NewHorizons/Assets/WarpDriveConfig.json +++ b/NewHorizons/Assets/WarpDriveConfig.json @@ -1,17 +1,21 @@ { "name" : "Ship", - "$schema": "https://raw.githubusercontent.com/xen-42/outer-wilds-new-horizons/master/NewHorizons/body_schema.json", + "$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, - "remoteTriggerRadius": 1, - "xmlFile":"Assets/WarpDriveDialogue.xml", - "remoteTriggerPosition": {"x": -0.05656214, "y": 0.5362684, "z": 0.5467669}, - "blockAfterPersistentCondition" : "KnowsAboutWarpDrive" - } + "rename" : "WarpDriveDialogue", + "xmlFile":"Assets/WarpDriveDialogue.xml", + "blockAfterPersistentCondition" : "KnowsAboutWarpDrive", + "remoteTrigger" : { + "radius": 1, + "position": {"x": -0.05656214, "y": 0.5362684, "z": 0.5467669}, + "rename" : "WarpDriveRemoteTrigger" + } + } ] } } \ No newline at end of file From d506ab9fc0ee09b3461562a38756099f3e15dfa3 Mon Sep 17 00:00:00 2001 From: JohnCorby Date: Sun, 10 Mar 2024 19:03:09 -0700 Subject: [PATCH 4/7] qsb no longer incompat --- NewHorizons/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NewHorizons/manifest.json b/NewHorizons/manifest.json index 96641cc01..907b058b1 100644 --- a/NewHorizons/manifest.json +++ b/NewHorizons/manifest.json @@ -7,7 +7,7 @@ "version": "1.18.10", "owmlVersion": "2.9.8", "dependencies": [ "JohnCorby.VanillaFix", "_nebula.MenuFramework", "xen.CommonCameraUtility", "dgarro.CustomShipLogModes" ], - "conflicts": [ "Raicuparta.QuantumSpaceBuddies", "PacificEngine.OW_CommonResources" ], + "conflicts": [ "PacificEngine.OW_CommonResources" ], "pathsToPreserve": [ "planets", "systems", "translations" ], "donateLink": "https://www.patreon.com/ownh" } From 9873a853db3def6af921748048b3ee389ef75597 Mon Sep 17 00:00:00 2001 From: Nick Date: Thu, 4 Apr 2024 18:48:28 -0400 Subject: [PATCH 5/7] Update manifest --- NewHorizons/manifest.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/NewHorizons/manifest.json b/NewHorizons/manifest.json index 907b058b1..9436bccd6 100644 --- a/NewHorizons/manifest.json +++ b/NewHorizons/manifest.json @@ -4,10 +4,10 @@ "author": "xen, Bwc9876, JohnCorby, MegaPiggy, Clay, Trifid, and friends", "name": "New Horizons", "uniqueName": "xen.NewHorizons", - "version": "1.18.10", - "owmlVersion": "2.9.8", - "dependencies": [ "JohnCorby.VanillaFix", "_nebula.MenuFramework", "xen.CommonCameraUtility", "dgarro.CustomShipLogModes" ], + "version": "1.19.8", + "owmlVersion": "2.10.3", + "dependencies": [ "JohnCorby.VanillaFix", "xen.CommonCameraUtility", "dgarro.CustomShipLogModes" ], "conflicts": [ "PacificEngine.OW_CommonResources" ], "pathsToPreserve": [ "planets", "systems", "translations" ], "donateLink": "https://www.patreon.com/ownh" -} +} \ No newline at end of file From 791f7c33aa166060becb123ced7821d53ad349f1 Mon Sep 17 00:00:00 2001 From: Nick Date: Thu, 4 Apr 2024 18:48:39 -0400 Subject: [PATCH 6/7] Fix warp drive config spacing --- NewHorizons/Assets/WarpDriveConfig.json | 39 +++++++++++++++---------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/NewHorizons/Assets/WarpDriveConfig.json b/NewHorizons/Assets/WarpDriveConfig.json index 1622f23c5..a9e90356f 100644 --- a/NewHorizons/Assets/WarpDriveConfig.json +++ b/NewHorizons/Assets/WarpDriveConfig.json @@ -1,21 +1,28 @@ { - "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" : { + "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" + "position": { + "x": -0.05656214, + "y": 0.5362684, + "z": 0.5467669 + }, + "rename": "WarpDriveRemoteTrigger" } } - ] - } + ] + } } \ No newline at end of file From 1ca0507375817e284e319ff150430f719e5a7e3c Mon Sep 17 00:00:00 2001 From: xen-42 Date: Thu, 25 Apr 2024 17:00:38 -0400 Subject: [PATCH 7/7] Update manifest.json --- NewHorizons/manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NewHorizons/manifest.json b/NewHorizons/manifest.json index 3afd6129c..dc1e4dfe2 100644 --- a/NewHorizons/manifest.json +++ b/NewHorizons/manifest.json @@ -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": [ "PacificEngine.OW_CommonResources" ], "pathsToPreserve": [ "planets", "systems", "translations" ], "donateLink": "https://www.patreon.com/ownh" -} \ No newline at end of file +}