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

Try catch pairing singularities, get radius from black hole size

Browse Source
This commit is contained in:
Nick 2024-02-25 20:07:08 -05:00
parent 73817ed54b
commit ceb688c988
1 changed files with 48 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
NewHorizons/Builder/Body/SingularityBuilder.cs
View File

@ -12,6 +12,7 @@ using NewHorizons.Utility.OWML;
using NewHorizons.Utility.OuterWilds; using NewHorizons.Utility.OuterWilds;
using NewHorizons.External.SerializableData; using NewHorizons.External.SerializableData;
using NewHorizons.Builder.Volumes; using NewHorizons.Builder.Volumes;
using System;
namespace NewHorizons.Builder.Body namespace NewHorizons.Builder.Body
{ {
@ -110,41 +111,51 @@ namespace NewHorizons.Builder.Body
{ {
foreach (var pair in _pairsToLink) foreach (var pair in _pairsToLink)
{ {
var (blackHoleID, whiteHoleID) = pair; try
if (!_singularitiesByID.TryGetValue(blackHoleID, out GameObject blackHole))
{ {
NHLogger.LogWarning($"Black hole [{blackHoleID}] is missing."); var (blackHoleID, whiteHoleID) = pair;
continue; if (!_singularitiesByID.TryGetValue(blackHoleID, out GameObject blackHole))
} {
if (!_singularitiesByID.TryGetValue(whiteHoleID, out GameObject whiteHole)) NHLogger.LogWarning($"Black hole [{blackHoleID}] is missing.");
{ continue;
NHLogger.LogWarning($"White hole [{whiteHoleID}] is missing."); }
continue; if (!_singularitiesByID.TryGetValue(whiteHoleID, out GameObject whiteHole))
} {
var whiteHoleVolume = whiteHole.GetComponentInChildren<WhiteHoleVolume>(); NHLogger.LogWarning($"White hole [{whiteHoleID}] is missing.");
var blackHoleVolume = blackHole.GetComponentInChildren<BlackHoleVolume>(); continue;
if (whiteHoleVolume == null || blackHoleVolume == null) }
{ var whiteHoleVolume = whiteHole.GetComponentInChildren<WhiteHoleVolume>();
NHLogger.LogWarning($"Singularities [{blackHoleID}] and [{whiteHoleID}] do not have compatible polarities."); var blackHoleVolume = blackHole.GetComponentInChildren<BlackHoleVolume>();
continue; if (whiteHoleVolume == null || blackHoleVolume == null)
} {
if (blackHoleVolume._whiteHole != null && blackHoleVolume._whiteHole != whiteHoleVolume) NHLogger.LogWarning($"Singularities [{blackHoleID}] and [{whiteHoleID}] do not have compatible polarities.");
{ continue;
NHLogger.LogWarning($"Black hole [{blackHoleID}] has already been linked!"); }
continue; if (blackHoleVolume._whiteHole != null && blackHoleVolume._whiteHole != whiteHoleVolume)
} {
NHLogger.LogVerbose($"Pairing singularities [{blackHoleID}], [{whiteHoleID}]"); NHLogger.LogWarning($"Black hole [{blackHoleID}] has already been linked!");
blackHoleVolume._whiteHole = whiteHoleVolume; continue;
}
NHLogger.LogVerbose($"Pairing singularities [{blackHoleID}], [{whiteHoleID}]");
blackHoleVolume._whiteHole = whiteHoleVolume;
// If warping to a vanilla planet, we add a streaming volume to pre-load it // If warping to a vanilla planet, we add a streaming volume to pre-load it
var streamingGroup = whiteHoleVolume.GetAttachedOWRigidbody().GetComponentInChildren<StreamingGroup>(); var streamingGroup = whiteHoleVolume.GetAttachedOWRigidbody().GetComponentInChildren<StreamingGroup>();
if (streamingGroup != null) if (streamingGroup != null)
{
var sphereCollider = blackHoleVolume.GetComponent<SphereCollider>();
// Shouldn't ever be null but doesn't hurt ig
var loadRadius = sphereCollider == null ? 100f : sphereCollider.radius + 50f;
var streamingVolume = VolumeBuilder.Make<StreamingWarpVolume>(blackHoleVolume.GetAttachedOWRigidbody().gameObject, blackHoleVolume.GetComponentInParent<Sector>(),
new External.Modules.Volumes.VolumeInfos.VolumeInfo() { radius = loadRadius });
streamingVolume.streamingGroup = streamingGroup;
streamingVolume.transform.parent = blackHoleVolume.transform;
streamingVolume.transform.localPosition = Vector3.zero;
}
}
catch (Exception e)
{ {
var streamingVolume = VolumeBuilder.Make<StreamingWarpVolume>(blackHoleVolume.GetAttachedOWRigidbody().gameObject, blackHoleVolume.GetComponentInParent<Sector>(), NHLogger.LogError($"Failed to pair singularities {e}");
new External.Modules.Volumes.VolumeInfos.VolumeInfo() { radius = 100f });
streamingVolume.streamingGroup = streamingGroup;
streamingVolume.transform.parent = blackHoleVolume.transform;
streamingVolume.transform.localPosition = Vector3.zero;
} }
} }
} }
@ -179,7 +190,7 @@ namespace NewHorizons.Builder.Body
OWAudioSource oneShotOWAudioSource = null; OWAudioSource oneShotOWAudioSource = null;
var singularityAmbience = Object.Instantiate(_blackHoleAmbience, singularity.transform); var singularityAmbience = GameObject.Instantiate(_blackHoleAmbience, singularity.transform);
singularityAmbience.name = polarity ? "BlackHoleAmbience" : "WhiteHoleAmbience"; singularityAmbience.name = polarity ? "BlackHoleAmbience" : "WhiteHoleAmbience";
singularityAmbience.SetActive(true); singularityAmbience.SetActive(true);
singularityAmbience.GetComponent<SectorAudioGroup>().SetSector(sector); singularityAmbience.GetComponent<SectorAudioGroup>().SetSector(sector);
@ -226,7 +237,7 @@ namespace NewHorizons.Builder.Body
} }
else else
{ {
var blackHoleOneShot = Object.Instantiate(_blackHoleEmissionOneShot, singularity.transform); var blackHoleOneShot = GameObject.Instantiate(_blackHoleEmissionOneShot, singularity.transform);
blackHoleOneShot.name = "BlackHoleEmissionOneShot"; blackHoleOneShot.name = "BlackHoleEmissionOneShot";
blackHoleOneShot.SetActive(true); blackHoleOneShot.SetActive(true);
oneShotOWAudioSource = blackHoleOneShot.GetComponent<OWAudioSource>(); oneShotOWAudioSource = blackHoleOneShot.GetComponent<OWAudioSource>();
@ -235,7 +246,7 @@ namespace NewHorizons.Builder.Body
oneShotAudioSource.minDistance = horizon; oneShotAudioSource.minDistance = horizon;
if (sizeController != null) sizeController.oneShotAudioSource = oneShotAudioSource; if (sizeController != null) sizeController.oneShotAudioSource = oneShotAudioSource;
var blackHoleVolume = Object.Instantiate(_blackHoleVolume, singularity.transform); var blackHoleVolume = GameObject.Instantiate(_blackHoleVolume, singularity.transform);
blackHoleVolume.name = "BlackHoleVolume"; blackHoleVolume.name = "BlackHoleVolume";
// Scale vanish effect to black hole size // Scale vanish effect to black hole size
@ -261,7 +272,7 @@ namespace NewHorizons.Builder.Body
{ {
foreach (var renderer in blackHoleVolume.GetComponentsInChildren<ParticleSystemRenderer>(true)) foreach (var renderer in blackHoleVolume.GetComponentsInChildren<ParticleSystemRenderer>(true))
{ {
Object.Destroy(renderer); GameObject.Destroy(renderer);
} }
}); });
} }
@ -269,7 +280,7 @@ namespace NewHorizons.Builder.Body
} }
else else
{ {
GameObject whiteHoleVolumeGO = Object.Instantiate(_whiteHoleVolume); GameObject whiteHoleVolumeGO = GameObject.Instantiate(_whiteHoleVolume);
whiteHoleVolumeGO.transform.parent = singularity.transform; whiteHoleVolumeGO.transform.parent = singularity.transform;
whiteHoleVolumeGO.transform.localPosition = Vector3.zero; whiteHoleVolumeGO.transform.localPosition = Vector3.zero;
whiteHoleVolumeGO.transform.localScale = Vector3.one; whiteHoleVolumeGO.transform.localScale = Vector3.one;