diff --git a/SCHIZO/Tweaks/Content/ContentVisibilityHelper.cs b/SCHIZO/Tweaks/Content/ContentVisibilityHelper.cs index 2009fb4d..ece9f37f 100644 --- a/SCHIZO/Tweaks/Content/ContentVisibilityHelper.cs +++ b/SCHIZO/Tweaks/Content/ContentVisibilityHelper.cs @@ -10,6 +10,7 @@ partial class ContentVisibilityHelper { private float _blinkTimer; private List _renderers; + private bool _dead; private void Start() { @@ -19,7 +20,12 @@ private void Start() transform.parent.GetComponentsInChildren(true, _renderers); _renderers.RemoveAll(r => r.transform.IsChildOf(transform)); - if (_renderers.Count < 1) Destroy(gameObject); + if (_renderers.Count < 1 || !_renderers[0]) + { + _dead = true; + gameObject.SetActive(false); + return; + } // scale self with parent's mesh bounds Vector3 origScale = transform.localScale; @@ -63,6 +69,7 @@ private void Changed() } private void LateUpdate() { + if (_dead) return; if (!ContentAlertManager.AlertsEnabled) return; Vector3 pos = Camera.main.transform.position; diff --git a/Unity/Assets/Mod/Anneel/Egg Spawns.asset b/Unity/Assets/Mod/Anneel/Egg Spawns.asset index b680de8f..007bd5d8 100644 --- a/Unity/Assets/Mod/Anneel/Egg Spawns.asset +++ b/Unity/Assets/Mod/Anneel/Egg Spawns.asset @@ -20,7 +20,7 @@ MonoBehaviour: spawn: 1 spawnLocation: 2 biomeFilters: - - ShipWreck_Wall + - ShipWreck_ rules: - count: 1 - probability: 1 + probability: 0.02 diff --git a/Unity/Assets/Mod/Anneel/Materials/Star 1.mat b/Unity/Assets/Mod/Anneel/Materials/Star 1.mat index 04cd155f..d73550ee 100644 --- a/Unity/Assets/Mod/Anneel/Materials/Star 1.mat +++ b/Unity/Assets/Mod/Anneel/Materials/Star 1.mat @@ -78,5 +78,5 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 0.99228066, g: 1, b: 0.56, a: 1} - - _EmissionColor: {r: 2.9803922, g: 2.9960785, b: 1.6941177, a: 1} + - _EmissionColor: {r: 0.9173233, g: 0.9221513, b: 0.5214259, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} diff --git a/Unity/Assets/Mod/Ermshark/Egg Spawns.asset b/Unity/Assets/Mod/Ermshark/Egg Spawns.asset index 142f314c..26d19d2f 100644 --- a/Unity/Assets/Mod/Ermshark/Egg Spawns.asset +++ b/Unity/Assets/Mod/Ermshark/Egg Spawns.asset @@ -20,7 +20,7 @@ MonoBehaviour: spawn: 1 spawnLocation: 2 biomeFilters: - - LilyPads_Deep_Grass + - LilyPads_MegaTrench rules: - count: 1 - probability: 1 + probability: 0.1 diff --git a/Unity/Assets/Mod/Ermshark/Ermshark Egg.asset b/Unity/Assets/Mod/Ermshark/Ermshark Egg.asset index 801a77ff..54459906 100644 --- a/Unity/Assets/Mod/Ermshark/Ermshark Egg.asset +++ b/Unity/Assets/Mod/Ermshark/Ermshark Egg.asset @@ -51,7 +51,7 @@ MonoBehaviour: craftingTime: 2.5 pdaEncyInfo: {fileID: 0} knownTechInfo: {fileID: 0} - spawnData: {fileID: 0} + spawnData: {fileID: 11400000, guid: 35a911b79bbe1f9459216187bea1ce21, type: 2} unlockAtStart: 1 registerInSN: 1 recipeSN: {fileID: 0}