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

Merge pull request #170 from dgarroDC/warp-promp-visibility

Browse Source 
Hide warp prompt in landing cam
This commit is contained in:
Will Corby 2022-05-30 11:45:07 -07:00 committed by GitHub
commit f379618375
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
NewHorizons/Components/ShipLogStarChartMode.cs
View File

@ -31,7 +31,6 @@ namespace NewHorizons.Components
private NotificationData _warpNotificationData = null;
private int _nextCardIndex;
private bool _isAtFlightConsole;
private void Awake()
{
@ -51,10 +50,6 @@ namespace NewHorizons.Components
_targetSystemPrompt = new ScreenPrompt(InputLibrary.markEntryOnHUD, "Lock Autopilot to Star System", 0, ScreenPrompt.DisplayState.Normal, false);
GlobalMessenger<ReferenceFrame>.AddListener("TargetReferenceFrame", new Callback<ReferenceFrame>(OnTargetReferenceFrame));
GlobalMessenger<OWRigidbody>.AddListener("EnterFlightConsole", new Callback<OWRigidbody>(OnEnterFlightConsole));
GlobalMessenger.AddListener("ExitFlightConsole", new Callback(OnExitFlightConsole));
GlobalMessenger.AddListener("GamePaused", new Callback(OnGamePaused));
GlobalMessenger.AddListener("GameUnpaused", new Callback(OnGameUnpaused));
_nextCardIndex = 0;
foreach (var starSystem in Main.SystemDict.Keys)
@ -96,42 +91,10 @@ namespace NewHorizons.Components
public void OnDestroy()
{
GlobalMessenger<ReferenceFrame>.RemoveListener("TargetReferenceFrame", new Callback<ReferenceFrame>(OnTargetReferenceFrame));
GlobalMessenger<OWRigidbody>.RemoveListener("EnterFlightConsole", new Callback<OWRigidbody>(OnEnterFlightConsole));
GlobalMessenger.RemoveListener("ExitFlightConsole", new Callback(OnExitFlightConsole));
GlobalMessenger.RemoveListener("GamePaused", new Callback(OnGamePaused));
GlobalMessenger.RemoveListener("GameUnpaused", new Callback(OnGameUnpaused));
Locator.GetPromptManager().RemoveScreenPrompt(_warpPrompt, PromptPosition.UpperLeft);
}
private void OnEnterFlightConsole(OWRigidbody _)
{
_isAtFlightConsole = true;
if (_target != null)
{
_warpPrompt.SetVisibility(true);
}
}
private void OnExitFlightConsole()
{
_isAtFlightConsole = false;
_warpPrompt.SetVisibility(false);
}
private void OnGamePaused()
{
_warpPrompt.SetVisibility(false);
}
private void OnGameUnpaused()
{
if (_target != null && _isAtFlightConsole)
{
_warpPrompt.SetVisibility(true);
}
}
public GameObject CreateCard(string uniqueID, Transform parent, Vector2 position)
{
if (_cardTemplate == null)
@ -329,8 +292,6 @@ namespace NewHorizons.Components
if (playSound) _oneShotSource.PlayOneShot(global::AudioType.ShipLogMarkLocation, 1f);
_target.SetMarkedOnHUD(false);
_target = null;
_warpPrompt.SetVisibility(false);
}
public string GetTargetStarSystem()
@ -343,7 +304,7 @@ namespace NewHorizons.Components
return OWInput.IsInputMode(InputMode.ShipCockpit) && _target != null;
}
private void Update()
public void UpdateWarpPromptVisibility()
{
_warpPrompt.SetVisibility(IsWarpDriveAvailable());
}

1
NewHorizons/Patches/WarpDrivePatches.cs
View File

@ -24,6 +24,7 @@ namespace NewHorizons.Patches
{
if (!Main.HasWarpDrive) return true;
StarChartHandler.ShipLogStarChartMode.UpdateWarpPromptVisibility();
if (__instance._playerAtFlightConsole && OWInput.IsNewlyPressed(InputLibrary.autopilot, InputMode.ShipCockpit))
{
var targetSystem = StarChartHandler.ShipLogStarChartMode.GetTargetStarSystem();