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 branch 'dev' into profiler

Browse Source
This commit is contained in:
JohnCorby 2025-02-14 15:52:53 -08:00
commit 23562015b6
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
NewHorizons/Patches/ToolPatches/ToolModeSwapperPatches.cs
View File

@ -5,8 +5,6 @@ namespace NewHorizons.Patches.ToolPatches
[HarmonyPatch(typeof(ToolModeSwapper))] [HarmonyPatch(typeof(ToolModeSwapper))]
public static class ToolModeSwapperPatches public static class ToolModeSwapperPatches
{ {
private static ShipCockpitController _shipCockpitController;
// Patches ToolModeSwapper.EquipToolMode(ToolMode mode) to deny swaps if you're holding a vision torch. // Patches ToolModeSwapper.EquipToolMode(ToolMode mode) to deny swaps if you're holding a vision torch.
// This is critical for preventing swapping to the scout launcher (causes memory slides to fail) but it // This is critical for preventing swapping to the scout launcher (causes memory slides to fail) but it
// just doesn't look right when you switch to other stuff (eg the signalscope), so I'm disabling swapping tools entirely // just doesn't look right when you switch to other stuff (eg the signalscope), so I'm disabling swapping tools entirely
@ -23,11 +21,8 @@ namespace NewHorizons.Patches.ToolPatches
mode == ToolMode.Probe || mode == ToolMode.Probe ||
mode == ToolMode.SignalScope || mode == ToolMode.SignalScope ||
mode == ToolMode.Translator; mode == ToolMode.Translator;
if (_shipCockpitController == null)
_shipCockpitController = UnityEngine.Object.FindObjectOfType<ShipCockpitController>();
var isInShip = _shipCockpitController != null ? _shipCockpitController._playerAtFlightConsole : false;
if (!isInShip && isHoldingVisionTorch && swappingToRestrictedTool) return false; if (!PlayerState.AtFlightConsole() && isHoldingVisionTorch && swappingToRestrictedTool) return false;
return true; return true;
} }