Gittes-archive/new-horizons
2
0
Fork 0
mirror of https://github.com/Outer-Wilds-New-Horizons/new-horizons.git synced 2025-12-11 20:15:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

MAYBE fix eye softlock (and use owml methods instead of copied qsb ones)

Browse Source
This commit is contained in:
JohnCorby 2024-06-01 00:43:31 -07:00
parent fb9e10fee7
commit 7489ecb7f8
3 changed files with 7 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
NewHorizons/Main.cs
View File

@ -388,7 +388,9 @@ namespace NewHorizons
{ {
IsWarpingBackToEye = false; IsWarpingBackToEye = false;
OWTime.Pause(OWTime.PauseType.Loading); OWTime.Pause(OWTime.PauseType.Loading);
LoadManager.LoadScene(OWScene.EyeOfTheUniverse); // LoadScene loads one frame later in Update. will this break since we unpause before that in the next line? // fire OnStartSceneLoad so qsb and other mods are happy
((Delegate)AccessTools.Field(typeof(LoadManager), nameof(LoadManager.OnStartSceneLoad)).GetValue(null)).DynamicInvoke();
LoadManager.LoadSceneImmediate(OWScene.EyeOfTheUniverse);
OWTime.Unpause(OWTime.PauseType.Loading); OWTime.Unpause(OWTime.PauseType.Loading);
return; return;
} }
@ -936,11 +938,13 @@ namespace NewHorizons
OWInput.ChangeInputMode(InputMode.None); OWInput.ChangeInputMode(InputMode.None);
// Hide unloading // Hide unloading
// fire OnStartSceneLoad so qsb and other mods are happy
((Delegate)AccessTools.Field(typeof(LoadManager), nameof(LoadManager.OnStartSceneLoad)).GetValue(null)).DynamicInvoke();
FadeHandler.FadeThen(1f, () => FadeHandler.FadeThen(1f, () =>
{ {
// Slide reel unloading is tied to being removed from the sector, so we do that here to prevent a softlock // Slide reel unloading is tied to being removed from the sector, so we do that here to prevent a softlock
Locator.GetPlayerSectorDetector().RemoveFromAllSectors(); Locator.GetPlayerSectorDetector().RemoveFromAllSectors();
LoadManager.LoadScene(sceneToLoad); // this used to be LoadSceneImmediate, but that breaks with qsb. hopefully it doesnt break nh LoadManager.LoadSceneImmediate(sceneToLoad);
}); });
} }
} }

2
NewHorizons/Patches/RigidbodyPatches.cs
View File

@ -1,5 +1,5 @@
using HarmonyLib; using HarmonyLib;
using NewHorizons.Utility; using OWML.Utils;
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;

34
NewHorizons/Utility/NewHorizonExtensions.cs
View File

@ -372,40 +372,6 @@ namespace NewHorizons.Utility
return curve; return curve;
} }
// From QSB
public static void RaiseEvent<T>(this T instance, string eventName, params object[] args)
{
const BindingFlags flags = BindingFlags.Instance
| BindingFlags.Static
| BindingFlags.Public
| BindingFlags.NonPublic
| BindingFlags.DeclaredOnly;
if (typeof(T)
.GetField(eventName, flags)?
.GetValue(instance) is not MulticastDelegate multiDelegate)
{
return;
}
multiDelegate.SafeInvoke(args);
}
// From QSB
public static void SafeInvoke(this MulticastDelegate multicast, params object[] args)
{
foreach (var del in multicast.GetInvocationList())
{
try
{
del.DynamicInvoke(args);
}
catch (TargetInvocationException ex)
{
NHLogger.LogError($"Error invoking delegate! {ex.InnerException}");
}
}
}
public static List<XmlNode> GetChildNodes(this XmlNode parentNode, string tagName) public static List<XmlNode> GetChildNodes(this XmlNode parentNode, string tagName)
{ {
return parentNode.ChildNodes.Cast<XmlNode>().Where(node => node.LocalName == tagName).ToList(); return parentNode.ChildNodes.Cast<XmlNode>().Where(node => node.LocalName == tagName).ToList();