mark/wirm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

game(scripts): standardise BedroomTask

Browse source
This commit is contained in:
Mark Joshwel 2025-02-14 21:56:25 +08:00
parent b292de5922
commit 810ca3d91d
1 changed files with 80 additions and 104 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

122
Game/Assets/Scripts/BedroomTask.cs
View file

@ -1,85 +1,79 @@
/* /*
Author: Reza * Author: Reza
Date: 3/2/25 * Date: 3/2/25
Description: To track if cleaning/exploring bedroom task is done before allowing player to open door * Description: To track if cleaning/exploring the bedroom task is done before allowing player to open the door
*/ */
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Diagnostics.CodeAnalysis;
using TMPro; using TMPro;
using UnityEngine; using UnityEngine;
using UnityEngine.ProBuilder.Shapes;
using UnityEngine.XR.Interaction.Toolkit.Interactables;
using UnityEngine.XR.Interaction.Toolkit; using UnityEngine.XR.Interaction.Toolkit;
using UnityEngine.XR.Interaction.Toolkit.Interactables;
[SuppressMessage("ReSharper", "GrammarMistakeInComment")]
public class BedroomTask : MonoBehaviour public class BedroomTask : MonoBehaviour
{ {
private GameManager gameManager;
private PostProcessingManager postProcessingManager;
[Header("Task Requirement Values")] [Header("Task Requirement Values")]
// To track how much trash has been collected so far // To track how much trash has been collected so far
public int trashCollected = 0; public int trashCollected;
// Defines how much trash is needed to collect in order to unlock the door // Defines how much trash is needed to collect in order to unlock the door
public int trashRequired = 10; public int trashRequired = 10;
// Defines the door // Defines the door
[Header("Door to Unlock")] [Header("Door to Unlock")] public GameObject door;
public GameObject door;
// Defines the grab interactable to know when the door is grabbed
private XRGrabInteractable grabInteractable;
// Defines door handle
private Collider doorCollider;
// Defines door's rigidbody to lock it
private Rigidbody doorRigidbody;
// Defines UI references // Defines UI references
[Header("UI References")] [Header("UI References")] public GameObject lockedDoorUI;
public GameObject lockedDoorUI;
public GameObject storyPanelUI; public GameObject storyPanelUI;
public TMP_Text storyText; public TMP_Text storyText;
// Defines Audio References // Defines Audio References
[Header("Audio References")] [Header("Audio References")] public AudioSource audioSource;
public AudioSource audioSource;
public AudioClip lockedSound; public AudioClip lockedSound;
public AudioClip unlockedSound; public AudioClip unlockedSound;
public AudioClip footstepsSound; public AudioClip footstepsSound;
public AudioClip doorSlamSound; public AudioClip doorSlamSound;
public AudioClip throwTrashSound; public AudioClip throwTrashSound;
void Start() // Defines the door handle
private Collider _doorCollider;
// Defines door's rigidbody to lock it
private Rigidbody _doorRigidbody;
private GameManager _gameManager;
// Defines the grab interactable to know when the door is grabbed
private XRGrabInteractable _grabInteractable;
private PostProcessingManager _postProcessingManager;
private void Start()
{ {
// Hide all UI prompts on start // Hide all UI prompts on start
lockedDoorUI.SetActive(false); lockedDoorUI.SetActive(false);
//unlockedDoorUI.SetActive(false); //unlockedDoorUI.SetActive(false);
// Ensure door is not null // Ensure the door is not null
if (door != null) if (door != null)
{ {
// Get the components of the door // Get the components of the door
grabInteractable = door.GetComponent<XRGrabInteractable>(); _grabInteractable = door.GetComponent<XRGrabInteractable>();
doorCollider = door.GetComponent<Collider>(); _doorCollider = door.GetComponent<Collider>();
doorRigidbody = door.GetComponent<Rigidbody>(); _doorRigidbody = door.GetComponent<Rigidbody>();
// Ensure grab interactable is not null // Ensure grab interactable is not null
if (grabInteractable != null) if (_grabInteractable != null)
{
// Detect when the door is grabbed // Detect when the door is grabbed
grabInteractable.selectEntered.AddListener(OnDoorGrabAttempt); _grabInteractable.selectEntered.AddListener(OnDoorGrabAttempt);
}
// Ensure rigidbody is not null // Ensure rigidbody is not null
if (doorRigidbody != null) if (_doorRigidbody != null)
{
// Lock the door on start // Lock the door on start
LockDoor(); LockDoor();
} }
}
// Hide the story panel at the start // Hide the story panel at the start
if (storyPanelUI != null) if (storyPanelUI != null)
@ -94,7 +88,6 @@ public class BedroomTask : MonoBehaviour
// storyText.text = "My parents are still home... I should clean up first."; // storyText.text = "My parents are still home... I should clean up first.";
// StartCoroutine(ClearMessageAfterSeconds(7f)); // StartCoroutine(ClearMessageAfterSeconds(7f));
// } // }
} }
private void OnDestroy() private void OnDestroy()
@ -111,7 +104,7 @@ public class BedroomTask : MonoBehaviour
private IEnumerator DelayedStoryText() private IEnumerator DelayedStoryText()
{ {
yield return new WaitForSeconds(0.5f); // Small delay to ensure smooth transition yield return new WaitForSeconds(0.5f); // Small delay to ensure a smooth transition
if (storyPanelUI != null && storyText != null) if (storyPanelUI != null && storyText != null)
{ {
@ -128,76 +121,62 @@ public class BedroomTask : MonoBehaviour
trashCollected++; trashCollected++;
// Play sound only if no other sound is currently playing // Play sound only if no other sound is currently playing
if (!audioSource.isPlaying) if (!audioSource.isPlaying) audioSource.PlayOneShot(throwTrashSound);
{
audioSource.PlayOneShot(throwTrashSound);
}
Debug.Log($"Trash collected: {trashCollected}/{trashRequired}"); Debug.Log($"Trash collected: {trashCollected}/{trashRequired}");
// If player has collected/thrown required amount of trash // If the player has collected/ thrown the required amount of trash
if (trashCollected >= trashRequired) if (trashCollected >= trashRequired)
{ {
if (GameManager.Instance == null) if (GameManager.Instance == null)
{
Debug.LogError("GameManager instance is null!"); Debug.LogError("GameManager instance is null!");
}
else else
{
GameManager.Instance.BedroomTaskComplete(); GameManager.Instance.BedroomTaskComplete();
}
// Call unlocking door function/sequence // Call unlocking door function/sequence
StartCoroutine(PlaySoundSequence()); StartCoroutine(PlaySoundSequence());
} }
} }
// Functions when door is locked // Functions when the door is locked
private void LockDoor() private void LockDoor()
{ {
// Ensure rigidbody is not null // Ensure rigidbody is not null
if (doorRigidbody != null) if (_doorRigidbody != null)
{ {
// Stops door movement // Stops door movement
doorRigidbody.isKinematic = true; _doorRigidbody.isKinematic = true;
// Freezes the door to ensure door doesn't open // Freezes the door to ensure the door doesn't open
doorRigidbody.constraints = RigidbodyConstraints.FreezeAll; _doorRigidbody.constraints = RigidbodyConstraints.FreezeAll;
} }
// Ensure collider is not null // Ensure collider is not null
if (doorCollider != null) if (_doorCollider != null)
{ // Prevents player from grabbing the door handle
// Prevents player from grabbing door handle _doorCollider.enabled = false;
doorCollider.enabled = false;
}
} }
// Functions when door is unlocked // Functions when door is unlocked
private void UnlockDoor() private void UnlockDoor()
{ {
// Ensure rigidbody is not null // Ensure rigidbody is not null
if (doorRigidbody != null) if (_doorRigidbody != null)
{ {
// Allows door movement // Allows door movement
doorRigidbody.isKinematic = false; _doorRigidbody.isKinematic = false;
// Unfreezes door to let it open // Unfreezes door to let it open
doorRigidbody.constraints = RigidbodyConstraints.None; _doorRigidbody.constraints = RigidbodyConstraints.None;
} }
// Ensure collider is not null // Ensure collider is not null
if (doorCollider != null) if (_doorCollider != null)
{
// Allows player to grab the door handle // Allows player to grab the door handle
doorCollider.enabled = true; _doorCollider.enabled = true;
}
// Play sound only if no other sound is currently playing // Play sound only if no other sound is currently playing
if (!audioSource.isPlaying) if (!audioSource.isPlaying) audioSource.PlayOneShot(unlockedSound);
{
audioSource.PlayOneShot(unlockedSound);
}
// Show the unlocked door UI // Show the unlocked door UI
// unlockedDoorUI.SetActive(true); // unlockedDoorUI.SetActive(true);
@ -217,10 +196,7 @@ public class BedroomTask : MonoBehaviour
lockedDoorUI.SetActive(true); lockedDoorUI.SetActive(true);
// Play sound only if no other sound is currently playing // Play sound only if no other sound is currently playing
if (!audioSource.isPlaying) if (!audioSource.isPlaying) audioSource.PlayOneShot(lockedSound);
{
audioSource.PlayOneShot(lockedSound);
}
// Call the function to hide the UI after delay // Call the function to hide the UI after delay
StartCoroutine(HidePanelAfterSeconds(lockedDoorUI, 5f)); StartCoroutine(HidePanelAfterSeconds(lockedDoorUI, 5f));