Merge remote-tracking branch 'origin/eye-of-the-universe' into eye-of-the-universe

This commit is contained in:
JohnCorby 2022-10-11 17:46:21 -07:00
commit 13f159e0ad
3 changed files with 3 additions and 1 deletions

View File

@ -54,7 +54,7 @@ namespace NewHorizons.Handlers
vesselSectorTriggerBox.size = new Vector3(600, 600, 600);
vesselSectorTriggerBox.SetLayer(Shape.Layer.Sector);
// Why were the vessel's lights inside the eye? Let's move them from the eye to vessel.
// Why were the vessel's lights inside the eye? Let's move them from the eye to vessel. Doesn't need to be moved positionally, only need to have the parent changed to vessel.
var vesselPointlight = eyeSector.gameObject.FindChild("Pointlight_NOM_Vessel");
vesselPointlight.transform.SetParent(vesselSector.transform, true);
var vesselSpotlight = eyeSector.gameObject.FindChild("Spotlight_NOM_Vessel");

View File

@ -9,6 +9,7 @@ namespace NewHorizons.Patches
[HarmonyPatch(typeof(MeteorController), nameof(MeteorController.Suspend), new System.Type[0])]
public static void MeteorController_Suspend(MeteorController __instance)
{
// Meteors launch inactive because of prefab. So let's fix that.
__instance.gameObject.SetActive(true);
}
}

View File

@ -58,6 +58,7 @@ namespace NewHorizons.Patches
if (__instance._mindSlideCollection == mindSlideCollection) return false;
// Original method didn't check if old _slideCollectionItem was null.
if (__instance._slideCollectionItem != null)
{
__instance._slideCollectionItem.onSlideTextureUpdated -= __instance.OnSlideTextureUpdated;