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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
JohnCorby 2022-06-14 23:24:31 -07:00
commit dc9756e423
3 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
NewHorizons/Builder/Body/CloakBuilder.cs
View File

@ -12,16 +12,26 @@ namespace NewHorizons.Builder.Body
var radius = module.radius;
AudioClip clip = null;
if (module.audioClip != null) clip = SearchUtilities.FindResourceOfTypeAndName<AudioClip>(module.audioClip);
else if (module.audioFilePath != null)
if (!string.IsNullOrEmpty(module.audioClip))
{
clip = SearchUtilities.FindResourceOfTypeAndName<AudioClip>(module.audioClip);
if (clip == null)
{
Utility.Logger.LogError($"Couldn't get audio from clip [{module.audioClip}]");
}
}
else if (!string.IsNullOrEmpty(module.audioFilePath))
{
try
{
clip = AudioUtilities.LoadAudio(mod.ModHelper.Manifest.ModFolderPath + "/" + module.audioFilePath);
}
catch (System.Exception e)
catch { }
if (clip == null)
{
Utility.Logger.LogError($"Couldn't load audio file {module.audioFilePath} : {e.Message}");
Utility.Logger.LogError($"Couldn't get audio from file [{module.audioFilePath}]");
}
}

9
NewHorizons/Builder/Props/SignalBuilder.cs
View File

@ -153,17 +153,14 @@ namespace NewHorizons.Builder.Props
var name = StringToSignalName(info.name);
AudioClip clip = null;
if (info.audioClip != null) clip = SearchUtilities.FindResourceOfTypeAndName<AudioClip>(info.audioClip);
else if (info.audioFilePath != null)
if (!string.IsNullOrEmpty(info.audioClip)) clip = SearchUtilities.FindResourceOfTypeAndName<AudioClip>(info.audioClip);
else if (!string.IsNullOrEmpty(info.audioFilePath))
{
try
{
clip = AudioUtilities.LoadAudio(mod.ModHelper.Manifest.ModFolderPath + "/" + info.audioFilePath);
}
catch (Exception e)
{
Logger.LogError($"Couldn't load audio file {info.audioFilePath} : {e.Message}");
}
catch { }
}
if (clip == null)

15
NewHorizons/Handlers/SystemCreationHandler.cs
View File

@ -54,12 +54,15 @@ namespace NewHorizons.Handlers
if (clip != null)
{
var travelSource = Locator.GetGlobalMusicController()._travelSource;
travelSource._audioLibraryClip = AudioType.None;
travelSource._clipArrayIndex = 0;
travelSource._clipArrayLength = 0;
travelSource._clipSelectionOnPlay = OWAudioSource.ClipSelectionOnPlay.MANUAL;
travelSource.clip = clip;
Main.Instance.ModHelper.Events.Unity.FireOnNextUpdate(() =>
{
var travelSource = Locator.GetGlobalMusicController()._travelSource;
travelSource._audioLibraryClip = AudioType.None;
travelSource._clipArrayIndex = 0;
travelSource._clipArrayLength = 0;
travelSource._clipSelectionOnPlay = OWAudioSource.ClipSelectionOnPlay.MANUAL;
travelSource.clip = clip;
});
}
}
}