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

Use a more reliable event to check all frequencies

Browse Source
This commit is contained in:
Nick 2023-07-03 11:17:23 -04:00
parent 0c1f0a0d30
commit 9b81cdc275
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
NewHorizons/Builder/Props/Audio/SignalBuilder.cs
View File

@ -1,9 +1,11 @@
using HarmonyLib;
using NewHorizons.External.Modules.Props.Audio; using NewHorizons.External.Modules.Props.Audio;
using NewHorizons.Utility; using NewHorizons.Utility;
using NewHorizons.Utility.OWML; using NewHorizons.Utility.OWML;
using OWML.Common; using OWML.Common;
using OWML.Utils; using OWML.Utils;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using UnityEngine; using UnityEngine;
using UnityEngine.SceneManagement; using UnityEngine.SceneManagement;
@ -39,7 +41,7 @@ namespace NewHorizons.Builder.Props.Audio
Initialized = true; Initialized = true;
SceneManager.sceneUnloaded += OnSceneUnloaded; SceneManager.sceneUnloaded += OnSceneUnloaded;
SceneManager.sceneLoaded += OnSceneLoaded; Main.Instance.OnStarSystemLoaded.AddListener(OnStarSystemLoaded);
} }
private static HashSet<SignalFrequency> _frequenciesInUse = new(); private static HashSet<SignalFrequency> _frequenciesInUse = new();
@ -49,11 +51,10 @@ namespace NewHorizons.Builder.Props.Audio
_frequenciesInUse.Clear(); _frequenciesInUse.Clear();
} }
private static void OnSceneLoaded(Scene scene, LoadSceneMode _) private static void OnStarSystemLoaded(string starSystem)
{ {
// If its the base game solar system or eye we get all the main frequencies // If its the base game solar system or eye we get all the main frequencies
if (scene.name == LoadManager.SceneToName(OWScene.EyeOfTheUniverse) || if (starSystem == "SolarSystem" || starSystem == "EyeOfTheUniverse")
(scene.name == LoadManager.SceneToName(OWScene.SolarSystem) && Main.Instance.CurrentStarSystem == "SolarSystem"))
{ {
_frequenciesInUse.Add(SignalFrequency.Quantum); _frequenciesInUse.Add(SignalFrequency.Quantum);
_frequenciesInUse.Add(SignalFrequency.EscapePod); _frequenciesInUse.Add(SignalFrequency.EscapePod);
@ -61,8 +62,11 @@ namespace NewHorizons.Builder.Props.Audio
_frequenciesInUse.Add(SignalFrequency.HideAndSeek); _frequenciesInUse.Add(SignalFrequency.HideAndSeek);
} }
// By default lets always have travelers // Always show the traveler frequency. The signalscope defaults to this on spawn, and is the only frequency known by default
// We don't want a scenario where the player knows no frequencies
_frequenciesInUse.Add(SignalFrequency.Traveler); _frequenciesInUse.Add(SignalFrequency.Traveler);
NHLogger.LogVerbose($"Frequencies in use in {starSystem}: {_frequenciesInUse.Join(x => x.ToString())}");
} }
public static bool IsFrequencyInUse(SignalFrequency freq) => _frequenciesInUse.Contains(freq); public static bool IsFrequencyInUse(SignalFrequency freq) => _frequenciesInUse.Contains(freq);