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 conditional object activation making everything viewable when loading

Browse Source
This commit is contained in:
Nick 2024-06-04 02:03:43 -04:00
parent 0f56b59d63
commit c998a92cec
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
NewHorizons/Components/Props/ConditionalObjectActivation.cs
View File

@ -6,6 +6,8 @@ namespace NewHorizons.Components.Props
{ {
public class ConditionalObjectActivation : MonoBehaviour public class ConditionalObjectActivation : MonoBehaviour
{ {
private bool _playerAwake, _playerDoneAwake;
public GameObject GameObject; public GameObject GameObject;
public string DialogueCondition; public string DialogueCondition;
public bool CloseEyes; public bool CloseEyes;
@ -47,6 +49,7 @@ namespace NewHorizons.Components.Props
GlobalMessenger<string, bool>.AddListener("DialogueConditionChanged", OnDialogueConditionChanged); GlobalMessenger<string, bool>.AddListener("DialogueConditionChanged", OnDialogueConditionChanged);
GlobalMessenger.AddListener("ExitConversation", OnExitConversation); GlobalMessenger.AddListener("ExitConversation", OnExitConversation);
GlobalMessenger.AddListener("EnterConversation", OnEnterConversation); GlobalMessenger.AddListener("EnterConversation", OnEnterConversation);
GlobalMessenger.AddListener("WakeUp", OnWakeUp);
} }
public void OnDestroy() public void OnDestroy()
@ -54,6 +57,23 @@ namespace NewHorizons.Components.Props
GlobalMessenger<string, bool>.RemoveListener("DialogueConditionChanged", OnDialogueConditionChanged); GlobalMessenger<string, bool>.RemoveListener("DialogueConditionChanged", OnDialogueConditionChanged);
GlobalMessenger.RemoveListener("ExitConversation", OnExitConversation); GlobalMessenger.RemoveListener("ExitConversation", OnExitConversation);
GlobalMessenger.RemoveListener("EnterConversation", OnEnterConversation); GlobalMessenger.RemoveListener("EnterConversation", OnEnterConversation);
GlobalMessenger.RemoveListener("WakeUp", OnWakeUp);
}
private void OnWakeUp()
{
_playerAwake = true;
}
public void Update()
{
if (!_playerDoneAwake && _playerAwake)
{
if (!_playerCameraEffectController._isOpeningEyes)
{
_playerDoneAwake = true;
}
}
} }
public void OnExitConversation() public void OnExitConversation()
@ -88,7 +108,7 @@ namespace NewHorizons.Components.Props
public void SetActive(bool active) public void SetActive(bool active)
{ {
if (CloseEyes) if (CloseEyes && _playerDoneAwake)
{ {
Delay.StartCoroutine(Coroutine(active)); Delay.StartCoroutine(Coroutine(active));
} }