From 88f43e81f996574e4698e3642ba36b638fdc5680 Mon Sep 17 00:00:00 2001 From: Noah Pilarski Date: Sun, 16 Jun 2024 02:42:22 -0400 Subject: [PATCH] oops --- NewHorizons/Handlers/StarChartHandler.cs | 2 +- NewHorizons/Handlers/SystemCreationHandler.cs | 75 ++++++++++--------- 2 files changed, 40 insertions(+), 37 deletions(-) diff --git a/NewHorizons/Handlers/StarChartHandler.cs b/NewHorizons/Handlers/StarChartHandler.cs index b1ef9eea..3b874ee9 100644 --- a/NewHorizons/Handlers/StarChartHandler.cs +++ b/NewHorizons/Handlers/StarChartHandler.cs @@ -121,7 +121,7 @@ namespace NewHorizons.Handlers public static void OnRevealFact(string factID) { - if (_factIDToStarSystem.TryGetValue(factID, out var systemUnlocked)) + if (_factIDToStarSystem != null && _factIDToStarSystem.TryGetValue(factID, out var systemUnlocked)) { NHLogger.Log($"Just learned [{factID}] and unlocked [{systemUnlocked}]"); if (!Main.HasWarpDrive) diff --git a/NewHorizons/Handlers/SystemCreationHandler.cs b/NewHorizons/Handlers/SystemCreationHandler.cs index 7b043c28..db2951a3 100644 --- a/NewHorizons/Handlers/SystemCreationHandler.cs +++ b/NewHorizons/Handlers/SystemCreationHandler.cs @@ -48,49 +48,52 @@ namespace NewHorizons.Handlers TimeLoopUtilities.SetLoopDuration(system.Config.loopDuration); } - if (!string.IsNullOrEmpty(system.Config.GlobalMusic.travelAudio)) + if (system.Config.GlobalMusic != null) { - var audioType = AudioTypeHandler.GetAudioType(system.Config.GlobalMusic.travelAudio, system.Mod); - Delay.FireOnNextUpdate(() => Locator.GetGlobalMusicController()._travelSource.AssignAudioLibraryClip(audioType)); - } + if (!string.IsNullOrEmpty(system.Config.GlobalMusic.travelAudio)) + { + var audioType = AudioTypeHandler.GetAudioType(system.Config.GlobalMusic.travelAudio, system.Mod); + Delay.FireOnNextUpdate(() => Locator.GetGlobalMusicController()._travelSource.AssignAudioLibraryClip(audioType)); + } - if (!string.IsNullOrEmpty(system.Config.GlobalMusic.endTimesAudio)) - { - var audioType = AudioTypeHandler.GetAudioType(system.Config.GlobalMusic.endTimesAudio, system.Mod); - Delay.FireOnNextUpdate(() => { - Locator.GetGlobalMusicController().gameObject.GetAddComponent().SetEndTimesAudio(audioType); - Locator.GetGlobalMusicController()._endTimesSource.AssignAudioLibraryClip(audioType); - }); - } + if (!string.IsNullOrEmpty(system.Config.GlobalMusic.endTimesAudio)) + { + var audioType = AudioTypeHandler.GetAudioType(system.Config.GlobalMusic.endTimesAudio, system.Mod); + Delay.FireOnNextUpdate(() => { + Locator.GetGlobalMusicController().gameObject.GetAddComponent().SetEndTimesAudio(audioType); + Locator.GetGlobalMusicController()._endTimesSource.AssignAudioLibraryClip(audioType); + }); + } - if (!string.IsNullOrEmpty(system.Config.GlobalMusic.endTimesDreamAudio)) - { - var audioType = AudioTypeHandler.GetAudioType(system.Config.GlobalMusic.endTimesDreamAudio, system.Mod); - Delay.FireOnNextUpdate(() => Locator.GetGlobalMusicController().gameObject.GetAddComponent().SetEndTimesDreamAudio(audioType)); - } + if (!string.IsNullOrEmpty(system.Config.GlobalMusic.endTimesDreamAudio)) + { + var audioType = AudioTypeHandler.GetAudioType(system.Config.GlobalMusic.endTimesDreamAudio, system.Mod); + Delay.FireOnNextUpdate(() => Locator.GetGlobalMusicController().gameObject.GetAddComponent().SetEndTimesDreamAudio(audioType)); + } - if (!string.IsNullOrEmpty(system.Config.GlobalMusic.brambleDimensionAudio)) - { - var audioType = AudioTypeHandler.GetAudioType(system.Config.GlobalMusic.brambleDimensionAudio, system.Mod); - Delay.FireOnNextUpdate(() => Locator.GetGlobalMusicController()._darkBrambleSource.AssignAudioLibraryClip(audioType)); - } + if (!string.IsNullOrEmpty(system.Config.GlobalMusic.brambleDimensionAudio)) + { + var audioType = AudioTypeHandler.GetAudioType(system.Config.GlobalMusic.brambleDimensionAudio, system.Mod); + Delay.FireOnNextUpdate(() => Locator.GetGlobalMusicController()._darkBrambleSource.AssignAudioLibraryClip(audioType)); + } - if (!string.IsNullOrEmpty(system.Config.GlobalMusic.finalEndTimesIntroAudio)) - { - var audioType = AudioTypeHandler.GetAudioType(system.Config.GlobalMusic.finalEndTimesIntroAudio, system.Mod); - Delay.FireOnNextUpdate(() => Locator.GetGlobalMusicController()._finalEndTimesIntroSource.AssignAudioLibraryClip(audioType)); - } + if (!string.IsNullOrEmpty(system.Config.GlobalMusic.finalEndTimesIntroAudio)) + { + var audioType = AudioTypeHandler.GetAudioType(system.Config.GlobalMusic.finalEndTimesIntroAudio, system.Mod); + Delay.FireOnNextUpdate(() => Locator.GetGlobalMusicController()._finalEndTimesIntroSource.AssignAudioLibraryClip(audioType)); + } - if (!string.IsNullOrEmpty(system.Config.GlobalMusic.finalEndTimesLoopAudio)) - { - var audioType = AudioTypeHandler.GetAudioType(system.Config.GlobalMusic.finalEndTimesLoopAudio, system.Mod); - Delay.FireOnNextUpdate(() => Locator.GetGlobalMusicController()._finalEndTimesLoopSource.AssignAudioLibraryClip(audioType)); - } + if (!string.IsNullOrEmpty(system.Config.GlobalMusic.finalEndTimesLoopAudio)) + { + var audioType = AudioTypeHandler.GetAudioType(system.Config.GlobalMusic.finalEndTimesLoopAudio, system.Mod); + Delay.FireOnNextUpdate(() => Locator.GetGlobalMusicController()._finalEndTimesLoopSource.AssignAudioLibraryClip(audioType)); + } - if (!string.IsNullOrEmpty(system.Config.GlobalMusic.finalEndTimesBrambleDimensionAudio)) - { - var audioType = AudioTypeHandler.GetAudioType(system.Config.GlobalMusic.finalEndTimesBrambleDimensionAudio, system.Mod); - Delay.FireOnNextUpdate(() => Locator.GetGlobalMusicController()._finalEndTimesDarkBrambleSource.AssignAudioLibraryClip(audioType)); + if (!string.IsNullOrEmpty(system.Config.GlobalMusic.finalEndTimesBrambleDimensionAudio)) + { + var audioType = AudioTypeHandler.GetAudioType(system.Config.GlobalMusic.finalEndTimesBrambleDimensionAudio, system.Mod); + Delay.FireOnNextUpdate(() => Locator.GetGlobalMusicController()._finalEndTimesDarkBrambleSource.AssignAudioLibraryClip(audioType)); + } } } }