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

fixed bramble nodes not warping the player to their paired dimension

Browse Source
This commit is contained in:
FreezeDriedMangoes 2022-06-30 12:57:00 -04:00
parent 411020378e
commit b8fb35a351
1 changed files with 64 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
NewHorizons/Builder/Props/BrambleNodeBuilder.cs
View File

@ -1,3 +1,4 @@
using HarmonyLib;
using NewHorizons.Utility;
using System;
using System.Collections.Generic;
@ -10,6 +11,65 @@ using Logger = NewHorizons.Utility.Logger;
namespace NewHorizons.Builder.Props
{
// Issue: these nodes aren't getting added to the list PlayerFogWarpDetector._warpVolumes
// debugging: try overriding FogWarpDetector.TrackFogWarpVolume(FogWarpVolume volume) to see if it's even getting added to this list at all
[HarmonyPatch]
public static class FogDebuggingPatches
{
[HarmonyPrefix]
[HarmonyPatch(typeof(FogWarpVolume), nameof(FogWarpVolume.OnOccupantEnterSector))]
private static bool FogWarpVolume_OnOccupantEnterSector(FogWarpVolume __instance, SectorDetector detector)
{
Logger.LogWarning($"Warp volume {__instance.name} is attempting to get sector detector {detector.name} to register it");
FogWarpDetector component = detector.GetComponent<FogWarpDetector>();
if (component != null)
{
Logger.LogWarning("FogWarpDetector component was found");
component.TrackFogWarpVolume(__instance);
}
return false;
}
[HarmonyPrefix]
[HarmonyPatch(typeof(FogWarpDetector), nameof(FogWarpDetector.TrackFogWarpVolume))]
public static bool FogWarpDetector_TrackFogWarpVolume(FogWarpDetector __instance, FogWarpVolume volume)
{
Logger.LogWarning($"Detector {__instance.name} is attempting to track fog warp volume {volume.name}");
bool flag = false;
if (!__instance._warpVolumes.SafeAdd(volume))
{
Logger.LogError("Failed to add warp volume to tracking list");
return false;
}
__instance.enabled = true;
if (volume.IsOuterWarpVolume())
{
if (__instance._outerWarpVolume != null)
{
Logger.LogError("Entering an outer warp volume before leaving the old one!");
//Debug.Break();
}
if (__instance._outerWarpVolume != volume)
{
flag = true;
}
__instance._outerWarpVolume = (OuterFogWarpVolume)volume;
}
//if (__instance.OnTrackFogWarpVolume != null)
//{
// __instance.OnTrackFogWarpVolume(volume);
//}
//if (flag && __instance.OnOuterFogWarpVolumeChange != null)
//{
// __instance.OnOuterFogWarpVolumeChange(__instance._outerWarpVolume);
//}
return false;
}
}
public static class BrambleNodeBuilder
{
// keys are all dimension names that have been referenced by at least one node but do not (yet) exist
@ -90,6 +150,8 @@ namespace NewHorizons.Builder.Props
public static GameObject Make(GameObject go, Sector sector, BrambleNodeInfo config)
{
Logger.LogError($"Building node {config.name}");
//
// spawn the bramble node
//
@ -122,6 +184,8 @@ namespace NewHorizons.Builder.Props
var success = Pair(warpController, config.linksTo);
if (!success) RecordUnpairedNode(warpController, config.linksTo);
warpController.Awake(); // I can't spawn this game object disabled, but Awake needs to run after _sector is set. That means I need to call Awake myself
//var exitPointsParent = SearchUtilities.FindChild(brambleNode, "FogWarpExitPoints"); // "ExitPoint", "ExitPoint (1)" ... "ExitPoint (5)"
//var exitPointsNames = new string[]
//{