From b82cf5aa75b2076a1e8cfadddce9bd78494f03c9 Mon Sep 17 00:00:00 2001 From: xen-42 Date: Wed, 7 Aug 2024 14:21:28 -0400 Subject: [PATCH] Fix NH breaking ship hud marker with visible stranger installed --- NewHorizons/Patches/HUDPatches/ShipHUDMarkerPatches.cs | 6 +++--- NewHorizons/manifest.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/NewHorizons/Patches/HUDPatches/ShipHUDMarkerPatches.cs b/NewHorizons/Patches/HUDPatches/ShipHUDMarkerPatches.cs index c99ae6fe..df51f4bb 100644 --- a/NewHorizons/Patches/HUDPatches/ShipHUDMarkerPatches.cs +++ b/NewHorizons/Patches/HUDPatches/ShipHUDMarkerPatches.cs @@ -14,11 +14,11 @@ namespace NewHorizons.Patches.HUDPatches bool insideEYE = Locator.GetEyeStateManager() != null && Locator.GetEyeStateManager().IsInsideTheEye(); bool insideQM = __instance._quantumMoon != null && (__instance._quantumMoon.IsPlayerInside() || __instance._quantumMoon.IsShipInside()); bool insideRW = Locator.GetRingWorldController() != null && Locator.GetRingWorldController().isPlayerInside; - bool insideIP = Locator.GetCloakFieldController() != null && Locator.GetCloakFieldController().isPlayerInsideCloak == Locator.GetCloakFieldController().isShipInsideCloak; - bool insideCloak = CloakSectorController.isPlayerInside == CloakSectorController.isShipInside; + bool insideIPMatches = Locator.GetCloakFieldController() == null || Locator.GetCloakFieldController().isPlayerInsideCloak == Locator.GetCloakFieldController().isShipInsideCloak; + bool insideCloakMatches = CloakSectorController.isPlayerInside == CloakSectorController.isShipInside; bool sameInterference = InterferenceHandler.IsPlayerSameAsShip(); - __instance._isVisible = !insideEYE && !insideQM && !insideRW && !__instance._translatorEquipped && !__instance._inConversation && !__instance._shipDestroyed && !__instance._playerInShip && PlayerState.HasPlayerEnteredShip() && __instance._isWearingHelmet && insideIP && insideCloak && sameInterference; + __instance._isVisible = !insideEYE && !insideQM && !insideRW && !__instance._translatorEquipped && !__instance._inConversation && !__instance._shipDestroyed && !__instance._playerInShip && PlayerState.HasPlayerEnteredShip() && __instance._isWearingHelmet && insideIPMatches && insideCloakMatches && sameInterference; if (__instance._canvasMarker != null) __instance._canvasMarker.SetVisibility(__instance._isVisible); diff --git a/NewHorizons/manifest.json b/NewHorizons/manifest.json index 399bc919..b9be6583 100644 --- a/NewHorizons/manifest.json +++ b/NewHorizons/manifest.json @@ -5,7 +5,7 @@ "name": "New Horizons", "uniqueName": "xen.NewHorizons", "version": "1.22.3", - "owmlVersion": "2.12.1", + "owmlVersion": "2.12.2", "dependencies": [ "JohnCorby.VanillaFix", "xen.CommonCameraUtility", "dgarro.CustomShipLogModes" ], "conflicts": [ "PacificEngine.OW_CommonResources" ], "pathsToPreserve": [ "planets", "systems", "translations" ],