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

Better interference

Browse Source
This commit is contained in:
Noah Pilarski 2022-09-02 17:55:39 -04:00
parent ae1e74fedc
commit 18d5755133
4 changed files with 127 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
NewHorizons/Components/InterferenceVolume.cs
View File

@ -10,19 +10,21 @@ namespace NewHorizons.Components
{ {
public class InterferenceVolume : BaseVolume public class InterferenceVolume : BaseVolume
{ {
private string _id = Guid.NewGuid().ToString();
public override void OnTriggerVolumeEntry(GameObject hitObj) public override void OnTriggerVolumeEntry(GameObject hitObj)
{ {
if (hitObj.CompareTag("PlayerDetector")) if (hitObj.CompareTag("PlayerDetector"))
{ {
InterferenceHandler.OnPlayerEnterInterferenceVolume(); InterferenceHandler.OnPlayerEnterInterferenceVolume(_id);
} }
else if (hitObj.CompareTag("ProbeDetector")) else if (hitObj.CompareTag("ProbeDetector"))
{ {
InterferenceHandler.OnProbeEnterInterferenceVolume(); InterferenceHandler.OnProbeEnterInterferenceVolume(_id);
} }
else if (hitObj.CompareTag("ShipDetector")) else if (hitObj.CompareTag("ShipDetector"))
{ {
InterferenceHandler.OnShipEnterInterferenceVolume(); InterferenceHandler.OnShipEnterInterferenceVolume(_id);
} }
} }
@ -30,16 +32,25 @@ namespace NewHorizons.Components
{ {
if (hitObj.CompareTag("PlayerDetector")) if (hitObj.CompareTag("PlayerDetector"))
{ {
InterferenceHandler.OnPlayerExitInterferenceVolume(); InterferenceHandler.OnPlayerExitInterferenceVolume(_id);
} }
else if (hitObj.CompareTag("ProbeDetector")) else if (hitObj.CompareTag("ProbeDetector"))
{ {
InterferenceHandler.OnProbeExitInterferenceVolume(); InterferenceHandler.OnProbeExitInterferenceVolume(_id);
} }
else if (hitObj.CompareTag("ShipDetector")) else if (hitObj.CompareTag("ShipDetector"))
{ {
InterferenceHandler.OnShipExitInterferenceVolume(); InterferenceHandler.OnShipExitInterferenceVolume(_id);
} }
} }
public void OnPlayerEnter() => InterferenceHandler.OnPlayerEnterInterferenceVolume(_id);
public void OnPlayerExit() => InterferenceHandler.OnPlayerExitInterferenceVolume(_id);
public void OnProbeEnter() => InterferenceHandler.OnProbeEnterInterferenceVolume(_id);
public void OnProbeExit() => InterferenceHandler.OnProbeExitInterferenceVolume(_id);
public void OnShipEnter() => InterferenceHandler.OnShipEnterInterferenceVolume(_id);
public void OnShipExit() => InterferenceHandler.OnShipExitInterferenceVolume(_id);
} }
} }

60
NewHorizons/Handlers/InterferenceHandler.cs
View File

@ -8,21 +8,57 @@ namespace NewHorizons.Handlers
{ {
public static class InterferenceHandler public static class InterferenceHandler
{ {
public static bool _playerInterference; private static List<string> _playerInterference;
public static bool _probeInterference; private static List<string> _probeInterference;
public static bool _shipInterference; private static List<string> _shipInterference;
public static bool PlayerHasInterference() => _playerInterference; public static void Init()
public static bool ProbeHasInterference() => _probeInterference; {
public static bool ShipHasInterference() => _shipInterference; _playerInterference = new List<string>();
_probeInterference = new List<string>();
_shipInterference = new List<string>();
}
public static void OnPlayerEnterInterferenceVolume() => _playerInterference = true; public static bool PlayerHasInterference() => _playerInterference.Any();
public static void OnPlayerExitInterferenceVolume() => _playerInterference = false; public static bool ProbeHasInterference() => _probeInterference.Any();
public static bool ShipHasInterference() => _shipInterference.Any();
public static void OnProbeEnterInterferenceVolume() => _probeInterference = true; public static bool IsPlayerSameAsProbe() => _playerInterference.All(_probeInterference.Contains) && _playerInterference.Count == _probeInterference.Count;
public static void OnProbeExitInterferenceVolume() => _probeInterference = false; public static bool IsPlayerSameAsShip() => _playerInterference.All(_shipInterference.Contains) && _playerInterference.Count == _shipInterference.Count;
public static void OnShipEnterInterferenceVolume() => _shipInterference = true; public static void OnPlayerEnterInterferenceVolume(string id)
public static void OnShipExitInterferenceVolume() => _shipInterference = false; {
_playerInterference.SafeAdd(id);
GlobalMessenger.FireEvent("RefreshHUDVisibility");
}
public static void OnPlayerExitInterferenceVolume(string id)
{
_playerInterference.Remove(id);
GlobalMessenger.FireEvent("RefreshHUDVisibility");
}
public static void OnProbeEnterInterferenceVolume(string id)
{
_probeInterference.SafeAdd(id);
GlobalMessenger.FireEvent("RefreshHUDVisibility");
}
public static void OnProbeExitInterferenceVolume(string id)
{
_probeInterference.Remove(id);
GlobalMessenger.FireEvent("RefreshHUDVisibility");
}
public static void OnShipEnterInterferenceVolume(string id)
{
_shipInterference.SafeAdd(id);
GlobalMessenger.FireEvent("RefreshHUDVisibility");
}
public static void OnShipExitInterferenceVolume(string id)
{
_shipInterference.Remove(id);
GlobalMessenger.FireEvent("RefreshHUDVisibility");
}
} }
} }

1
NewHorizons/Main.cs
View File

@ -305,6 +305,7 @@ namespace NewHorizons
AstroObjectLocator.Init(); AstroObjectLocator.Init();
StreamingHandler.Init(); StreamingHandler.Init();
AudioTypeHandler.Init(); AudioTypeHandler.Init();
InterferenceHandler.Init();
RemoteHandler.Init(); RemoteHandler.Init();
AtmosphereBuilder.Init(); AtmosphereBuilder.Init();
BrambleNodeBuilder.Init(BodyDict[CurrentStarSystem].Select(x => x.Config).Where(x => x.Bramble?.dimension != null).ToArray()); BrambleNodeBuilder.Init(BodyDict[CurrentStarSystem].Select(x => x.Config).Where(x => x.Bramble?.dimension != null).ToArray());

62
NewHorizons/Patches/HUDPatches.cs
View File

@ -10,6 +10,8 @@ namespace NewHorizons.Patches
[HarmonyPatch(typeof(HUDMarker), nameof(HUDMarker.Awake))] [HarmonyPatch(typeof(HUDMarker), nameof(HUDMarker.Awake))]
public static void HUDMarker_Awake(HUDMarker __instance) public static void HUDMarker_Awake(HUDMarker __instance)
{ {
GlobalMessenger.AddListener("RefreshHUDVisibility", __instance.RefreshOwnVisibility);
GlobalMessenger.AddListener("RefreshHUDVisibility", __instance.RefreshOwnVisibility);
GlobalMessenger.AddListener("PlayerEnterCloakField", __instance.OnPlayerEnterCloakField); GlobalMessenger.AddListener("PlayerEnterCloakField", __instance.OnPlayerEnterCloakField);
GlobalMessenger.AddListener("PlayerExitCloakField", __instance.OnPlayerExitCloakField); GlobalMessenger.AddListener("PlayerExitCloakField", __instance.OnPlayerExitCloakField);
} }
@ -18,6 +20,8 @@ namespace NewHorizons.Patches
[HarmonyPatch(typeof(HUDMarker), nameof(HUDMarker.OnDestroy))] [HarmonyPatch(typeof(HUDMarker), nameof(HUDMarker.OnDestroy))]
public static void HUDMarker_OnDestroy(HUDMarker __instance) public static void HUDMarker_OnDestroy(HUDMarker __instance)
{ {
GlobalMessenger.RemoveListener("RefreshHUDVisibility", __instance.RefreshOwnVisibility);
GlobalMessenger.RemoveListener("RefreshHUDVisibility", __instance.RefreshOwnVisibility);
GlobalMessenger.RemoveListener("PlayerEnterCloakField", __instance.OnPlayerEnterCloakField); GlobalMessenger.RemoveListener("PlayerEnterCloakField", __instance.OnPlayerEnterCloakField);
GlobalMessenger.RemoveListener("PlayerExitCloakField", __instance.OnPlayerExitCloakField); GlobalMessenger.RemoveListener("PlayerExitCloakField", __instance.OnPlayerExitCloakField);
} }
@ -54,11 +58,67 @@ namespace NewHorizons.Patches
GlobalMessenger.RemoveListener("ShipExitCloakField", __instance.RefreshOwnVisibility); GlobalMessenger.RemoveListener("ShipExitCloakField", __instance.RefreshOwnVisibility);
} }
[HarmonyPrefix]
[HarmonyPatch(typeof(ProbeHUDMarker), nameof(ProbeHUDMarker.RefreshOwnVisibility))]
public static bool ProbeHUDMarker_RefreshOwnVisibility(ProbeHUDMarker __instance)
{
bool insideEYE = Locator.GetEyeStateManager() != null && Locator.GetEyeStateManager().IsInsideTheEye();
bool insideQM = __instance._quantumMoon != null && (__instance._quantumMoon.IsPlayerInside() || __instance._quantumMoon.IsProbeInside());
bool insideRW = Locator.GetRingWorldController() != null && Locator.GetRingWorldController().isPlayerInside == Locator.GetRingWorldController().isProbeInside;
bool insideIP = Locator.GetCloakFieldController() != null && Locator.GetCloakFieldController().isPlayerInsideCloak == Locator.GetCloakFieldController().isProbeInsideCloak;
bool insideCloak = Components.CloakSectorController.isPlayerInside == Components.CloakSectorController.isProbeInside;
bool sameInterference = InterferenceHandler.IsPlayerSameAsProbe();
bool isActive = __instance.gameObject.activeInHierarchy || __instance._isTLCDuplicate;
__instance._isVisible = isActive && !insideEYE && !insideQM && !__instance._translatorEquipped && !__instance._inConversation && __instance._launched && (__instance._isWearingHelmet || __instance._atFlightConsole) && insideRW && insideIP && insideCloak && sameInterference;
if (__instance._canvasMarker != null) __instance._canvasMarker.SetVisibility(__instance._isVisible);
return false;
}
[HarmonyPrefix]
[HarmonyPatch(typeof(ShipHUDMarker), nameof(ShipHUDMarker.RefreshOwnVisibility))]
public static bool ShipHUDMarker_RefreshOwnVisibility(ShipHUDMarker __instance)
{
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 ? true : Locator.GetCloakFieldController().isPlayerInsideCloak == Locator.GetCloakFieldController().isShipInsideCloak;
bool insideCloak = Components.CloakSectorController.isPlayerInside == Components.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;
if (__instance._canvasMarker != null) __instance._canvasMarker.SetVisibility(__instance._isVisible);
return false;
}
[HarmonyPrefix]
[HarmonyPatch(typeof(ShipLogEntryHUDMarker), nameof(ShipLogEntryHUDMarker.RefreshOwnVisibility))]
public static bool ShipLogEntryHUDMarker_RefreshOwnVisibility(ShipLogEntryHUDMarker __instance)
{
bool hasEntryLocation = ShipLogEntryHUDMarker.s_entryLocation != null;
bool insideEYE = Locator.GetEyeStateManager() != null && Locator.GetEyeStateManager().IsInsideTheEye();
bool insideQM = __instance._quantumMoon != null && __instance._quantumMoon.IsPlayerInside();
bool insideRW = Locator.GetRingWorldController() != null && Locator.GetRingWorldController().isPlayerInside && ShipLogEntryHUDMarker.s_entryLocationID == "IP_RING_WORLD";
bool insideIP = (hasEntryLocation && ShipLogEntryHUDMarker.s_entryLocation.IsWithinCloakField()) || !(Locator.GetCloakFieldController() != null && Locator.GetCloakFieldController().isPlayerInsideCloak);
bool insideCloak = (hasEntryLocation && ShipLogEntryHUDMarker.s_entryLocation.IsWithinCloakField()) || !Components.CloakSectorController.isPlayerInside;
__instance._isVisible = (!insideEYE && !insideQM && !insideRW && !__instance._translatorEquipped && !__instance._inConversation && hasEntryLocation && (__instance._isWearingHelmet || __instance._atFlightConsole) && insideIP && insideCloak);
if (__instance._canvasMarker != null) __instance._canvasMarker.SetVisibility(__instance._isVisible);
return false;
}
[HarmonyPostfix] [HarmonyPostfix]
[HarmonyPatch(typeof(ProbeCamera), nameof(ProbeCamera.HasInterference))] [HarmonyPatch(typeof(ProbeCamera), nameof(ProbeCamera.HasInterference))]
public static void ProbeCamera_HasInterference(ProbeCamera __instance, ref bool __result) public static void ProbeCamera_HasInterference(ProbeCamera __instance, ref bool __result)
{ {
__result = __result || (__instance._id != ProbeCamera.ID.PreLaunch && (Components.CloakSectorController.isPlayerInside != Components.CloakSectorController.isProbeInside || InterferenceHandler.PlayerHasInterference() != InterferenceHandler.ProbeHasInterference())); __result = __result || (__instance._id != ProbeCamera.ID.PreLaunch && (Components.CloakSectorController.isPlayerInside != Components.CloakSectorController.isProbeInside || !InterferenceHandler.IsPlayerSameAsProbe()));
} }
} }
} }