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

Fix proxies restarting

Browse Source
This commit is contained in:
Noah Pilarski 2022-08-22 00:11:29 -04:00
parent 22f34612fc
commit 5656126815
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NewHorizons/Builder/Body/StarBuilder.cs
View File

@ -223,7 +223,9 @@ namespace NewHorizons.Builder.Body
controller.enabled = true;
starGO.SetActive(true);
planet.GetComponentInChildren<StarEvolutionController>(true).SetProxy(controller);
var main = planet.GetComponentInChildren<StarEvolutionController>(true);
main.SetProxy(controller);
supernova._main = main.supernova;
}
return starGO;

4
NewHorizons/Components/SizeControllers/StarEvolutionController.cs
View File

@ -334,7 +334,7 @@ namespace NewHorizons.Components.SizeControllers
Logger.LogVerbose($"{gameObject.transform.root.name} started supernova");
SupernovaStart.Invoke();
supernova.enabled = true;
supernova.Activate();
_isSupernova = true;
_supernovaStartTime = Time.time;
if (atmosphere != null) atmosphere.SetActive(false);
@ -352,7 +352,7 @@ namespace NewHorizons.Components.SizeControllers
Logger.LogVerbose($"{gameObject.transform.root.name} stopped supernova");
SupernovaStop.Invoke();
supernova.enabled = false;
supernova.Deactivate();
_isSupernova = false;
if (atmosphere != null) atmosphere.SetActive(true);
if (_destructionVolume != null)

10
NewHorizons/Components/StellarDeathController.cs
View File

@ -19,6 +19,7 @@ namespace NewHorizons.Components
public AnimationCurve _supernovaAlpha = new AnimationCurve(new Keyframe(5, 1, 0, 0, 1f / 3f, 1f / 3f), new Keyframe(15, 1.0002f, 0, 0, 1f / 3f, 1f / 3f), new Keyframe(50, 0, -0.0578f, 1 / 3f, -0.0578f, 1 / 3f));
[Space]
public OWAudioSource _audioSource;
public StellarDeathController _main;
private float _time;
private float _currentSupernovaScale;
private Material _localSupernovaMat;
@ -32,8 +33,9 @@ namespace NewHorizons.Components
_cachedParticleRenderers[index] = _explosionParticles[index].GetComponent<ParticleSystemRenderer>();
}
public void OnEnable()
public void Activate()
{
enabled = true;
_shockwave.enabled = true;
foreach (var particle in _explosionParticles) particle.Play();
_time = 0.0f;
@ -48,8 +50,9 @@ namespace NewHorizons.Components
_audioSource.Play();
}
public void OnDisable()
public void Deactivate()
{
enabled = false;
_shockwave.enabled = false;
if (_audioSource == null) return;
@ -60,7 +63,8 @@ namespace NewHorizons.Components
public void FixedUpdate()
{
_time += Time.deltaTime;
if (_main != null) _time = _main._time;
else _time += Time.deltaTime;
float shockwaveTime = Mathf.Clamp01(_time / _shockwaveLength);
_shockwave.transform.localScale = Vector3.one * _shockwaveScale.Evaluate(shockwaveTime);
_shockwave.material.color = Color.Lerp(Color.black, _shockwave.sharedMaterial.color, _shockwaveAlpha.Evaluate(shockwaveTime));