1.20.0 (#849)

## 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!
Outer-Wilds-New-Horizons · Apr 25, 2024 · 693d09b · 693d09b
2 parents e431ac8 + fd99bff
commit 693d09b
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 19 deletions.
diff --git a/NewHorizons/Assets/WarpDriveConfig.json b/NewHorizons/Assets/WarpDriveConfig.json
@@ -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"
+        }
+      }
+    ]
+  }
 }
diff --git a/NewHorizons/Main.cs b/NewHorizons/Main.cs
@@ -388,7 +388,7 @@ private void OnSceneLoaded(Scene scene, LoadSceneMode mode)
             {
                 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 @@ 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); // this used to be LoadSceneImmediate, but that breaks with qsb. hopefully it doesnt break nh
                 });
             }
         }

diff --git 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": [ "Raicuparta.QuantumSpaceBuddies", "PacificEngine.OW_CommonResources" ],
+  "conflicts": [ "PacificEngine.OW_CommonResources" ],
   "pathsToPreserve": [ "planets", "systems", "translations" ],
   "donateLink": "https://www.patreon.com/ownh"
 }