From 6b7ed8708450fdf19df427af2dfbe16816949178 Mon Sep 17 00:00:00 2001 From: Noah Pilarski Date: Sat, 3 Sep 2022 11:23:31 -0400 Subject: [PATCH] More comments --- NewHorizons/Builder/Body/GeometryBuilder.cs | 2 +- NewHorizons/Handlers/SystemCreationHandler.cs | 2 +- NewHorizons/Main.cs | 8 +++++++- NewHorizons/Patches/EyeOfTheUniversePatches.cs | 2 ++ 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/NewHorizons/Builder/Body/GeometryBuilder.cs b/NewHorizons/Builder/Body/GeometryBuilder.cs index bf2bc647..b05f8ac0 100644 --- a/NewHorizons/Builder/Body/GeometryBuilder.cs +++ b/NewHorizons/Builder/Body/GeometryBuilder.cs @@ -20,7 +20,7 @@ namespace NewHorizons.Builder.Body } else { - groundGO.transform.localScale *= 2; + groundGO.transform.localScale *= 2; // Multiply by 2 to match top layer } groundGO.SetActive(true); diff --git a/NewHorizons/Handlers/SystemCreationHandler.cs b/NewHorizons/Handlers/SystemCreationHandler.cs index 98e99ae3..cd0dc346 100644 --- a/NewHorizons/Handlers/SystemCreationHandler.cs +++ b/NewHorizons/Handlers/SystemCreationHandler.cs @@ -25,7 +25,7 @@ namespace NewHorizons.Handlers SkyboxBuilder.Make(system.Config.Skybox, system.Mod); } - + // No time loop or travel audio at the eye if (Main.Instance.CurrentStarSystem == "EyeOfTheUniverse") return; if (system.Config.enableTimeLoop) diff --git a/NewHorizons/Main.cs b/NewHorizons/Main.cs index aaaab893..09440ff1 100644 --- a/NewHorizons/Main.cs +++ b/NewHorizons/Main.cs @@ -295,6 +295,8 @@ namespace NewHorizons if (isEyeOfTheUniverse) { + // Create astro objects for eye and vessel because they didn't have them somehow. + var eyeOfTheUniverse = SearchUtilities.Find("EyeOfTheUniverse_Body"); var eyeSector = eyeOfTheUniverse.FindChild("Sector_EyeOfTheUniverse").GetComponent(); var eyeAO = eyeOfTheUniverse.AddComponent(); @@ -320,12 +322,14 @@ namespace NewHorizons eyeSector.GetComponent().SetLayer(Shape.Layer.Sector); + // Resize vessel sector so that the vessel is fully collidable. var vesselSectorTrigger = vesselSector.gameObject.FindChild("SectorTriggerVolume_VesselBridge"); vesselSectorTrigger.transform.localPosition = new Vector3(0, 0, -207.375f); var vesselSectorTriggerBox = vesselSectorTrigger.GetComponent(); 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. var vesselPointlight = eyeSector.gameObject.FindChild("Pointlight_NOM_Vessel"); vesselPointlight.transform.SetParent(vesselSector.transform, true); var vesselSpotlight = eyeSector.gameObject.FindChild("Spotlight_NOM_Vessel"); @@ -333,6 +337,7 @@ namespace NewHorizons var vesselAmbientLight = eyeSector.gameObject.FindChild("AmbientLight_Vessel"); vesselAmbientLight.transform.SetParent(vesselSector.transform, true); + // Add sector streaming to vessel just in case some one moves the vessel. var vesselStreaming = new GameObject("Sector_Streaming"); vesselStreaming.transform.SetParent(vesselSector.transform, false); var vessel_ss = vesselStreaming.AddComponent(); @@ -481,6 +486,7 @@ namespace NewHorizons } else if (isEyeOfTheUniverse) { + // There is no wake up in eye scene Instance.ModHelper.Events.Unity.FireOnNextUpdate(() => { IsSystemReady = true; @@ -768,7 +774,7 @@ namespace NewHorizons } else { - PlayerData.SaveEyeCompletion(); + PlayerData.SaveEyeCompletion(); // So that the title screen doesn't keep warping you back to eye if (SystemDict[_currentStarSystem].Config.enableTimeLoop) SecondsElapsedInLoop = TimeLoop.GetSecondsElapsed(); else SecondsElapsedInLoop = -1; diff --git a/NewHorizons/Patches/EyeOfTheUniversePatches.cs b/NewHorizons/Patches/EyeOfTheUniversePatches.cs index 589c2432..72e9acc7 100644 --- a/NewHorizons/Patches/EyeOfTheUniversePatches.cs +++ b/NewHorizons/Patches/EyeOfTheUniversePatches.cs @@ -15,6 +15,7 @@ namespace NewHorizons.Patches private static void SwitchToDefaultIfAtEyeGoingToSS(OWScene scene) { + // Switch to default just in case another mod warps back. if (Main.Instance.CurrentStarSystem == "EyeOfTheUniverse" && scene == OWScene.SolarSystem) Main.Instance._currentStarSystem = Main.Instance.DefaultStarSystem; } @@ -30,6 +31,7 @@ namespace NewHorizons.Patches [HarmonyPatch(typeof(SubmitActionLoadScene), nameof(SubmitActionLoadScene.ConfirmSubmit))] public static void SubmitActionLoadScene_ConfirmSubmit(SubmitActionLoadScene __instance) { + // Title screen can warp you to eye and cause problems. if (__instance._sceneToLoad == SubmitActionLoadScene.LoadableScenes.EYE) Main.Instance._currentStarSystem = "EyeOfTheUniverse"; }