diff --git a/NewHorizons/Builder/General/ShipLogBuilder.cs b/NewHorizons/Builder/General/ShipLogBuilder.cs index 7e0f654f..1502b5e6 100644 --- a/NewHorizons/Builder/General/ShipLogBuilder.cs +++ b/NewHorizons/Builder/General/ShipLogBuilder.cs @@ -13,6 +13,7 @@ namespace NewHorizons.Builder.General public static void Init() { + /* var shipLogRoot = GameObject.Find("Ship_Body/Module_Cabin/Systems_Cabin/ShipLogPivot/ShipLog/ShipLogPivot/ShipLogCanvas"); var starChartLog = GameObject.Instantiate(shipLogRoot.transform.Find("DetectiveMode"), shipLogRoot.transform); starChartLog.transform.name = "StarChartMode"; @@ -33,6 +34,7 @@ namespace NewHorizons.Builder.General StarChartMode._cardDict = new Dictionary(); StarChartMode._cardList = new List(); StarChartMode._centerPromptList = detectiveMode.GetComponent()._centerPromptList; + */ } } } diff --git a/NewHorizons/Utility/Patches.cs b/NewHorizons/Utility/Patches.cs index a8e9b08a..3f3a6532 100644 --- a/NewHorizons/Utility/Patches.cs +++ b/NewHorizons/Utility/Patches.cs @@ -339,28 +339,15 @@ namespace NewHorizons.Utility return (Locator.GetPlayerRulesetDetector()?.GetPlanetoidRuleset()?.GetGravityVolume() != null); } - // Replacing the entire method public static bool OnShipLogControllerUpdate(ShipLogController __instance) { - if (__instance._exiting) - { - if (__instance._canvasAnimator.IsComplete()) - { - __instance.enabled = false; - __instance._shipLogCanvas.gameObject.SetActive(false); - } - return false; - } - if (OWInput.GetInputMode() != InputMode.ShipComputer) - { - return false; - } + if (__instance._exiting + || OWInput.GetInputMode() != InputMode.ShipComputer + || __instance._currentMode.AllowCancelInput() && OWInput.IsNewlyPressed(InputLibrary.cancel, InputMode.All) + || ShipLogBuilder.StarChartMode == null) + return true; + __instance._exitPrompt.SetVisibility(__instance._currentMode.AllowCancelInput()); - if (__instance._currentMode.AllowCancelInput() && OWInput.IsNewlyPressed(InputLibrary.cancel, InputMode.All)) - { - __instance.ExitShipComputer(); - return false; - } __instance._currentMode.UpdateMode(); if (__instance._currentMode.AllowModeSwap() && OWInput.IsNewlyPressed(InputLibrary.swapShipLogMode, InputMode.All)) { @@ -380,7 +367,6 @@ namespace NewHorizons.Utility __instance._currentMode.EnterMode(focusedEntryID, null); __instance._oneShotSource.PlayOneShot(flag ? global::AudioType.ShipLogEnterDetectiveMode : global::AudioType.ShipLogEnterMapMode, 1f); } - return false; } }