Game/Assets/Scripts/GameManager.cs

@@ -146,7 +146,7 @@ public class GameManager : MonoBehaviour
             QueueMessage("I think I did everything... I think I can leave for school now");
     }
 
-    // for mark (backend): u can track whether they want to do their tasks, some people may be unmotivated to 
+    // mark: u can track whether they want to do their tasks, some people may be unmotivated to 
     // do the tasks in game, then we can ask them irl why they didn't do the task
 
     // Tracks if the bedroom is cleaned or not

Game/Assets/Scripts/InfoCollector.cs

@@ -1,12 +1,13 @@
 /*
- * Author: Reza
+Author: Reza
- * Date: 7/2/25
+Date: 7/2/25
- * Description: Collects information when a player looks at objects long enough
+Description: Collects information when a player looks at objects long enough
- */
+*/
 
+using System.Collections;
 using System.Collections.Generic;
-using TMPro;
 using UnityEngine;
+using TMPro;
 
 public class InfoCollector : MonoBehaviour
 {
@@ -22,129 +23,149 @@ public class InfoCollector : MonoBehaviour
     // Defines the UI text to display
     public TMP_Text infoText;
 
+    // Defines the camera
+    private Camera vrCamera;
+
+    // Defines whether UI is displaying to prevent spamming 
+    private bool isDisplaying = false;
+
+    // Defines the object the player is currently looking at
+    private GameObject currentObject = null;
+
+    // Tracks how long the player has been looking at the object
+    private float gazeTimer = 0f;
+    
     // Defines Audio References
     public AudioSource audioSource;
     public AudioClip scribbleSound;
-
+    
     // Store objects that have already been collected
-    private readonly HashSet<GameObject> _collectedObjects = new();
+    private HashSet<GameObject> collectedObjects = new HashSet<GameObject>();
 
-    // Defines the object the player is currently looking at
+    void Start()
-    private GameObject _currentObject;
-
-    // Tracks how long the player has been looking at the object
-    private float _gazeTimer;
-
-    // Defines whether UI is displaying to prevent spamming 
-    private bool _isDisplaying;
-
-    // Defines the camera
-    private Camera _vrCamera;
-
-    private void Start()
     {
         // Assigns to player's camera
-        _vrCamera = Camera.main;
+        vrCamera = Camera.main;
 
         // Clear UI text initially
         infoText.text = "";
     }
 
-    private void Update()
+    void Update()
     {
         // Detects the direction the player is looking at
-        var ray = new Ray(_vrCamera.transform.position, _vrCamera.transform.forward);
+        Ray ray = new Ray(vrCamera.transform.position, vrCamera.transform.forward);
+        RaycastHit hit;
 
         // Stores data of object hit in the detection range
-        if (Physics.Raycast(ray, out var hit, detectionRange))
+        if (Physics.Raycast(ray, out hit, detectionRange))
         {
             // Ensures that relevant info objects are detected
-            if (!hit.collider.CompareTag("InfoObject")) return;
+            if (hit.collider.CompareTag("InfoObject"))
-
-            var targetObject = hit.collider.gameObject;
-
-            // **Fix: Stop gaze timer if an object has been collected**
-            if (_collectedObjects.Contains(targetObject)) return; // Exit without increasing gaze time
-
-            // If the player is still looking at the same object, increase gaze time
-            if (_currentObject == targetObject)
             {
-                _gazeTimer += Time.deltaTime;
+                GameObject targetObject = hit.collider.gameObject;
 
-                // If gaze time reaches the required time and info is not displayed yet
+                // **Fix: Stop gaze timer if object has been collected**
-                if (_gazeTimer >= gazeTimeRequired && !_isDisplaying) CollectInfo(targetObject);
+                if (collectedObjects.Contains(targetObject))
-            }
+                {
-            else
+                    return;  // Exit without increasing gaze time
-            {
+                }
-                // Reset timer when looking at a new object
+
-                _currentObject = targetObject;
+                // If the player is still looking at the same object, increase gaze time
-                _gazeTimer = 0f;
+                if (currentObject == targetObject)
+                {
+                    gazeTimer += Time.deltaTime;
+
+                    // If gaze time reaches required time and info is not displayed yet
+                    if (gazeTimer >= gazeTimeRequired && !isDisplaying)
+                    {
+                        CollectInfo(targetObject);
+                    }
+                }
+                else
+                {
+                    // Reset timer when looking at a new object
+                    currentObject = targetObject;
+                    gazeTimer = 0f;
+                }
             }
         }
         else
         {
             // Reset if no valid object is in view
-            _currentObject = null;
+            currentObject = null;
-            _gazeTimer = 0f;
+            gazeTimer = 0f;
         }
     }
 
     // Function to display object information
-    private void CollectInfo(GameObject obj)
+    void CollectInfo(GameObject obj)
     {
         // Prevents spamming of display
-        _isDisplaying = true;
+        isDisplaying = true;
 
         // **Fix: Mark object as collected**
-        _collectedObjects.Add(obj);
+        collectedObjects.Add(obj);
 
-        // Display information
+        // Displays information
-        infoText.text = "<size=15>Info Collected:</size>\n\n" +
+        infoText.text = "<size=15>Info Collected:</size>\n\n" + 
-                        "<size=20>" + obj.name + "</size>\n" +
+                        "<size=20>" + obj.name + "</size>\n" + 
                         "<size=16>" + GetObjectInfo(obj) + "</size>";
         Debug.Log("Collected information from: " + obj.name);
-
+        
         // Play sound only if no other sound is currently playing
-        if (!audioSource.isPlaying) audioSource.PlayOneShot(scribbleSound);
+        if (!audioSource.isPlaying)
+        {
+            audioSource.PlayOneShot(scribbleSound);
+        }
 
         // Clears text after displayed time
         Invoke(nameof(ClearText), displayTime);
     }
 
     // Function to clear text after a delay
-    private void ClearText()
+    void ClearText()
     {
         // Removes text
         infoText.text = "";
 
         // Allows new information to be displayed
-        _isDisplaying = false;
+        isDisplaying = false;
     }
-
+    
-    // for mark (backend): this info collecting mechanism is more of easter eggs and if the players are 
+    // mark : this info collecting mechanism is more of easter eggs and if the players are 
     // observant enough to look around the room / find out what the character is going through
-
+    
     // can use this as statistics of what players tend to focus on 
-
+    
-    private static string GetObjectInfo(GameObject obj)
+    string GetObjectInfo(GameObject obj)
     {
-        return obj.name switch
+        // Check if the object's name is the same
-        {
+        if (obj.name == "Needles")
-            // Check if the object's name is the same
             // Returns predefined information
-            "Needles" => "A used needle. If my parents finds out they would murder me.",
+            return "A used needle. If my parents finds out they would murder me.";
+        
+        if (obj.name == "Bottles")
             // Returns predefined information
-            "Bottles" => "Saw dad drink this... I like how it numbs the pain",
+            return "Saw dad drink this... I like how it numbs the pain";
+        
+        if (obj.name == "Cigarettes")
             // Returns predefined information
-            "Cigarettes" => "Stole this from mom. I hope she doesn't find out.",
+            return "Stole this from mom. I hope she doesn't find out.";
+        
+        if (obj.name == "Penknife")
             // Returns predefined information
-            "Penknife" => "Sometimes I use this to feel something.",
+            return "Sometimes I use this to feel something.";
+        
+        if (obj.name == "Blood")
             // Returns predefined information
-            "Blood" => "I don't remember if daddy or I did this.",
+            return "I don't remember if daddy or I did this.";
+        
+        if (obj.name == "ParentsDoor")
             // Returns predefined information
-            "ParentsDoor" => "My parents room. It's locked",
+            return "My parents room. It's locked";
-            // Default information if there is no specific case
+        
-            _ => "There's nothing to look at."
+        // Default information if there is no specific case
-        };
+        return "There's nothing to look at.";
     }
 }

Game/Assets/Scripts/LeaveHouseTrigger.cs

@@ -1,65 +1,69 @@
 /*
- * Author: Reza, Wai Lam, Mark
+Author: Reza, Wai Lam, Mark
- * Date: 10/2/25
+Date: 10/2/25
- * Description: Verifies whether tasks in the house are completed before going to the next scene
+Description: Verifies whether tasks in the house are completed before going to the next scene
- */
+*/
 
 using System.Collections;
-using TMPro;
+using System.Collections.Generic;
 using UnityEngine;
-using UnityEngine.SceneManagement;
+using UnityEngine.SceneManagement; 
+using TMPro;
 
 public class LeaveHouseTrigger : MonoBehaviour
 {
     // Name of the next scene
     public string nextSceneName;
-    public string day3;
+    public string Day3;
-    public GameObject confirmationPanel;
+    public GameObject confirmationPanel; 
     public TMP_Text warningText;
     public GameObject warningPanel;
-
+    
     // Start is called before the first frame update
-    private void Start()
+    void Start()
     {
         confirmationPanel.SetActive(false);
         warningText.text = "";
     }
-
+    
     private void OnTriggerEnter(Collider other)
     {
-        if (other.CompareTag("Player")) ShowConfirmationButtons();
+        if (other.CompareTag("Player"))
+        {
+            ShowConfirmationButtons();
+        }
     }
 
-    private void ShowConfirmationButtons()
+    void ShowConfirmationButtons()
     {
         // FIXED: possibly refer to purely GameManager.Instance instead of any
-        // early bound reference to GameManager because the game manager might
+        // early-bound reference to GameManager because the game manager might
         // not have died fast enough for other scripts to refer to the new
         // GameManager instance
-
+        
         // keeping this here for future ref
         // --mark
-
+        
-        Debug.Log("Current Day in ShowConfirmationButtons: " + GameManager.Instance.CurrentDay);
+        Debug.Log("Current Day in ShowConfirmationButtons: " + GameManager.Instance.currentDay);
         confirmationPanel.SetActive(true);
-        warningPanel.SetActive(true);
+        warningPanel.SetActive(true);  
-        Debug.Log("Current Day is: " + GameManager.Instance.CurrentDay);
+        Debug.Log("Current Day is: " + GameManager.Instance.currentDay);
-        switch (GameManager.Instance.CurrentDay)
+        if (GameManager.Instance.currentDay == 1)
         {
-            case 1:
+            Debug.Log("Setting text for Day 1");
-                Debug.Log("Setting text for Day 1");
+            warningText.text = "Should I leave the house? I might not have completed everything...";
-                warningText.text = "Should I leave the house? I might not have completed everything...";
-                break;
-            case 2:
-                Debug.Log("Setting text for Day 2");
-                warningText.text = "Do I even want to go to school...";
-                break;
         }
-        // can change how long you want the text to show for
+
-        StartCoroutine(HideWarningPanelAfterDelay(7f));
+        else if (GameManager.Instance.currentDay == 2)
+        {
+            Debug.Log("Setting text for Day 2");
+            warningText.text = "Do I even want to go to school...";
+          
+        }
+        StartCoroutine(HideWarningPanelAfterDelay(7f)); // can change how long you want the text to show for
     }
 
-    private IEnumerator HideWarningPanelAfterDelay(float delay)
+    IEnumerator HideWarningPanelAfterDelay(float delay)
     {
         yield return new WaitForSeconds(delay);
         warningPanel.SetActive(false);
@@ -68,20 +72,19 @@ public class LeaveHouseTrigger : MonoBehaviour
     public void ConfirmLeave()
     {
         // Log player choices
-        GameManager.Instance.LogPlayerChoices();
+        GameManager.Instance.LogPlayerChoices(); 
-
+        
         // Load the next scene directly without needing to set the last scene
         SceneManager.LoadScene(nextSceneName);
     }
 
     public void CancelLeave()
     {
-        if (GameManager.Instance.CurrentDay == 2)
+        if (GameManager.Instance.currentDay == 2)
         {
             GameManager.Instance.IncrementDay();
-            SceneManager.LoadScene(day3);
+            SceneManager.LoadScene(Day3);
         }
-
         confirmationPanel.SetActive(false);
         warningPanel.SetActive(true);
     }

Game/Assets/Scripts/Letter.cs

@@ -1,19 +1,22 @@
 /*
- * Author: Reza
+Author: Reza
- * Date: 3/2/25
+Date: 3/2/25
- * Description: To show letter UI when the letter is picked up or dropped
+Description: To show letter UI when letter is picked up or dropped
- */
+*/
 
+using System.Collections;
+using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.UIElements;
 
 public class Letter : MonoBehaviour
 {
     public GameObject letterUI;
     public AudioClip scribble;
-
+    
     private void Start()
     {
-        letterUI.SetActive(false);
+        letterUI.SetActive(false); 
     }
 
     public void ShowLetterUI()
@@ -27,4 +30,4 @@ public class Letter : MonoBehaviour
         letterUI.SetActive(false);
         Debug.Log("Dropped letter - UI should hide");
     }
-}
+}

Game/Assets/Scripts/MessageTrigger.cs

@@ -1,48 +1,49 @@
 /*
- * Author: Reza
+Author: Reza
- * Date: 7/2/25
+Date: 7/2/25
- * Description: General script for any message triggering areas
+Description: General script for any message triggering areas
- */
+*/
 
 using System.Collections;
-using TMPro;
+using System.Collections.Generic;
 using UnityEngine;
+using TMPro;
 
 public class MessageTrigger : MonoBehaviour
 {
     // Defines UI references
-    [Header("UI References")] public GameObject storyPanelUI;
+    [Header("UI References")]
-
+    public GameObject storyPanelUI;
     public TMP_Text storyText;
-
+    
     [Header("Message Settings")]
     // Custom message for this trigger
-    [TextArea(3, 5)]
+    [TextArea(3, 5)] public string message;
-    public string message;
+    
-
     // How long the message stays on screen
-    public float displayDuration = 5f;
+    public float displayDuration = 5f; 
-
+    
-    // Has the message been triggered already or not?
+    // Has message been triggered already or not
-    private bool _messageTriggered;
+    private bool messageTriggered = false;
-
+    
     private void OnTriggerEnter(Collider other)
     {
-        // Shows up only if the message has not been triggered and ensures only player triggers it
+        // Shows up only if message has not been triggered and ensures only player triggers it
-        if (_messageTriggered || !other.CompareTag("Player")) return;
+        if (!messageTriggered && other.CompareTag("Player"))
-
+        {
-        storyPanelUI.SetActive(true);
+            storyPanelUI.SetActive(true);
-        storyText.text = message;
+            storyText.text = message;
-        StartCoroutine(HideMessageAfterSeconds(displayDuration));
+            StartCoroutine(HideMessageAfterSeconds(displayDuration));
-
+            
-        // Prevents a message triggering again
+            // Prevents message triggering again
-        _messageTriggered = true;
+            messageTriggered = true;
+        }
     }
-
+    
     private IEnumerator HideMessageAfterSeconds(float delay)
     {
         // Waits for delay to end and hides the UI
         yield return new WaitForSeconds(delay);
         storyPanelUI.SetActive(false);
     }
-}
+}

Game/Assets/Scripts/NextScene.cs

@@ -1,32 +1,37 @@
 /*
- * Author: Reza
+Author: Reza
- * Date: 13/2/25
+Date: 13/2/25
- * Description: Day 3 script that goes to the last scene after a certain amount of time
+Description: Day 3 script that goes to the last scene after a certain amount of time
- */
+*/
 
+using System.Collections;
+using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.SceneManagement;
 
 public class Day3 : MonoBehaviour
 {
     // Time in seconds to wait before transitioning to the next scene
     public float timeToWait = 60f; // Change this to the desired wait time
-    public string nextScene;
+    private float timer;
-    private float _timer;
+    public string NextScene;
 
-    private void Start()
+    void Start()
     {
         // Initialize timer
-        _timer = 0f;
+        timer = 0f;
     }
 
-    private void Update()
+    void Update()
     {
         // Increment timer
-        _timer += Time.deltaTime;
+        timer += Time.deltaTime;
 
         // Check if the time has passed
-        if (_timer >= timeToWait)
+        if (timer >= timeToWait)
+        {
             // Call method to change the scene
-            GameManager.Instance.IncrementDay();
+           GameManager.Instance.IncrementDay();
+        }
     }
 }

Game/Assets/Scripts/PhoneInteraction.cs

@@ -1,10 +1,5 @@
-/*
- * Author: Isaac
- * Date: 11/2/25
- * Description: Post-processing camera effects emulating various conditions
- */
-
 using UnityEngine;
+using UnityEngine.XR.Interaction.Toolkit;
 using UnityEngine.SceneManagement;
 
 public class PhoneInteraction : MonoBehaviour
@@ -13,53 +8,70 @@ public class PhoneInteraction : MonoBehaviour
     public GameObject choiceUI; // Assign your UI Panel in Inspector
     public Transform attachTransform; // Drag XR Controller's Attach Transform here
 
-    private AudioSource _audioSource;
+    private AudioSource audioSource;
-    private bool _choiceMade;
+    private bool phonePickedUp = false;
-    private bool _phonePickedUp;
+    private bool choiceMade = false;
 
-    private void Start()
+    void Start()
     {
         // Ensure AudioSource is available
-        if (!TryGetComponent(out _audioSource)) _audioSource = gameObject.AddComponent<AudioSource>();
+        if (!TryGetComponent(out audioSource))
+        {
+            audioSource = gameObject.AddComponent<AudioSource>();
+        }
 
-        if (phoneCallAudio != null) _audioSource.clip = phoneCallAudio;
+        if (phoneCallAudio != null)
+        {
+            audioSource.clip = phoneCallAudio;
+        }
 
         choiceUI.SetActive(false); // Hide UI initially
     }
 
-    private void Update()
+    // Public method to be used in XR Grab Interactable's On Select Entered event
-    {
-        if (!_phonePickedUp || _choiceMade) return;
-        if (Input.GetKeyDown(KeyCode.A))
-            AnswerCall();
-        else if (Input.GetKeyDown(KeyCode.B)) DeclineCall();
-    }
-
-    // Public method to be used in XR Grab interactable OnSelectEntered event
     public void PickUpPhone()
     {
-        if (_phonePickedUp) return;
+        if (!phonePickedUp)
-        _phonePickedUp = true;
+        {
-        Debug.Log("Phone Picked Up! Showing UI.");
+            phonePickedUp = true;
-        choiceUI.SetActive(true); // Show the UI panel
+            Debug.Log("Phone Picked Up! Showing UI.");
+            choiceUI.SetActive(true); // Show UI panel
 
-        // Ensure the phone attaches properly
+            // Ensure phone attaches properly
-        if (attachTransform == null) return;
+            if (attachTransform != null)
-        transform.position = attachTransform.position;
+            {
-        transform.rotation = attachTransform.rotation;
+                transform.position = attachTransform.position;
+                transform.rotation = attachTransform.rotation;
+            }
+        }
     }
 
-    // for mark (backend): this is whether the player chooses between seeking help/not seeking help
+    private void Update()
-    // maybe because they were scared or something? 
+    {
-
+        if (phonePickedUp && !choiceMade)
-    // we can save this to ask them why they chose this and gather info on this because
+        {
-    // that time I pitched this to a teacher they were happy
+            if (Input.GetKeyDown(KeyCode.A))
-
+            {
-    // something like the MSF wanting to know how to improve and get people to reach out???
+                AnswerCall();
+            }
+            else if (Input.GetKeyDown(KeyCode.B))
+            {
+                DeclineCall();
+            }
+        }
+    }
+    
+    // mark : this is whether the player chooses between seeking help/not seeking help
+    // maybe because they were scared or smtg? 
+    
+    // we can save this to ask them why they chose this and gather info on this bcos
+    // that time i pitched this to a teacher they were happy
+    
+    // smtg along the lines of the MSF wanting to know how to improve and get people to reach out???
 
     private void AnswerCall()
     {
-        _choiceMade = true;
+        choiceMade = true;
         Debug.Log("Phone Answered! Loading GoodEnding...");
         choiceUI.SetActive(false);
         SceneManager.LoadScene("GoodEnding");
@@ -67,9 +79,10 @@ public class PhoneInteraction : MonoBehaviour
 
     private void DeclineCall()
     {
-        _choiceMade = true;
+        choiceMade = true;
         Debug.Log("Call Declined! Loading BadEnding...");
         choiceUI.SetActive(false);
         SceneManager.LoadScene("BadEnding");
     }
-}
+}
+

Game/Assets/Scripts/PostProcessingManager.cs

@@ -1,10 +1,11 @@
 /*
- * Author: Reza
+Author: Reza
- * Date: 7/2/25
+Date: 7/2/25
- * Description: Post-processing camera effects emulating various conditions
+Description: Has all the post processing camera effects that replicate real symptoms like dizziness, fainting, panic, etc
- */
+*/
 
 using System.Collections;
+using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.Rendering;
 using UnityEngine.Rendering.Universal;
@@ -16,6 +17,13 @@ public class PostProcessingManager : MonoBehaviour
     // Defines the Global Volume
     public Volume volume;
 
+    // All the effect overrides
+    private Vignette vignette;
+    private ChromaticAberration chromaticAberration;
+    private MotionBlur motionBlur;
+    private LensDistortion lensDistortion;
+    private ColorAdjustments colorAdjustments;
+
     [Header("Effect Intensities")]
     // Editable override values in inspector
     [SerializeField]
@@ -29,56 +37,56 @@ public class PostProcessingManager : MonoBehaviour
 
     [SerializeField] public AnimationCurve colorAdjustmentsIntensity;
 
-    // Defines Audio References
+    // Checks if effect is active or not
-    [Header("Audio References")] public AudioSource audioSource;
+    private bool isEffectActive = false;
 
+    // Defines Audio References
+    [Header("Audio References")] 
+    public AudioSource audioSource;
     public AudioClip heartbeatSound;
     public AudioClip whisperSound;
     public AudioClip distortedWhisperSound;
-    private ChromaticAberration _chromaticAberration;
-    private ColorAdjustments _colorAdjustments;
 
     // Holds the current effect name to manage stopping and starting dynamically
-    private string _currentEffectName = "";
+    private string currentEffectName = "";
 
-    // Checks if effect is active or not
+    void Awake()
-    private bool _isEffectActive;
-    private LensDistortion _lensDistortion;
-    private MotionBlur _motionBlur;
-
-    // All the effect overrides
-    private Vignette _vignette;
-
-    private void Awake()
     {
         if (Instance == null)
+        {
             Instance = this;
+        }
         else
+        {
             Destroy(gameObject);
+        }
     }
 
     // Start is called before the first frame update
-    private void Start()
+    void Start()
     {
         // Get references for effects
-        volume.profile.TryGet(out _vignette);
+        volume.profile.TryGet(out vignette);
-        volume.profile.TryGet(out _chromaticAberration);
+        volume.profile.TryGet(out chromaticAberration);
-        volume.profile.TryGet(out _motionBlur);
+        volume.profile.TryGet(out motionBlur);
-        volume.profile.TryGet(out _lensDistortion);
+        volume.profile.TryGet(out lensDistortion);
-        volume.profile.TryGet(out _colorAdjustments);
+        volume.profile.TryGet(out colorAdjustments);
     }
 
     // Checks if an effect is currently active
     public bool IsEffectActive()
     {
-        return _isEffectActive;
+        return isEffectActive;
     }
 
     // Function to trigger effects dynamically based on the effect name passed
     public void TriggerEffect(string effectName)
     {
         // If an effect is already active, stop the current one
-        if (_isEffectActive) StopEffect(_currentEffectName);
+        if (isEffectActive)
+        {
+            StopEffect(currentEffectName);
+        }
 
         // Start the new effect
         StartEffect(effectName);
@@ -87,8 +95,8 @@ public class PostProcessingManager : MonoBehaviour
     // Start a specific effect
     public void StartEffect(string effectName)
     {
-        _isEffectActive = true;
+        isEffectActive = true;
-        _currentEffectName = effectName;
+        currentEffectName = effectName;
 
         StartCoroutine(ApplyEffect(effectName));
     }
@@ -96,83 +104,96 @@ public class PostProcessingManager : MonoBehaviour
     // Stop the active effect
     public void StopEffect()
     {
-        if (_isEffectActive) StopEffect(_currentEffectName);
+        if (isEffectActive)
+        {
+            StopEffect(currentEffectName);
+        }
     }
 
     // Stop a specific effect
     private void StopEffect(string effectName)
     {
-        _isEffectActive = false;
+        isEffectActive = false;
-        _currentEffectName = "";
+        currentEffectName = "";
 
         // Reset effects to default
-        if (_vignette) _vignette.intensity.Override(0f);
+        if (vignette != null) vignette.intensity.Override(0f);
-        if (_chromaticAberration) _chromaticAberration.intensity.Override(0f);
+        if (chromaticAberration != null) chromaticAberration.intensity.Override(0f);
-        if (_motionBlur) _motionBlur.intensity.Override(0f);
+        if (motionBlur != null) motionBlur.intensity.Override(0f);
-        if (_lensDistortion) _lensDistortion.intensity.Override(0f);
+        if (lensDistortion != null) lensDistortion.intensity.Override(0f);
-        if (_colorAdjustments) _colorAdjustments.postExposure.Override(0f);
+        if (colorAdjustments != null) colorAdjustments.postExposure.Override(0f);
 
         // Stop the audio
-        if (audioSource) audioSource.Stop();
+        if (audioSource != null)
+        {
+            audioSource.Stop();
+        }
     }
 
     // Applies effects over time based on the effect name
     private IEnumerator ApplyEffect(string effectName)
     {
-        switch (effectName)
+        // Handle audio for the effect
+        if (effectName == "Panic")
         {
-            // Handle audio for the effect
+            audioSource.clip = heartbeatSound;
-            case "Panic":
+            audioSource.loop = true;
-                audioSource.clip = heartbeatSound;
+            audioSource.Play();
-                audioSource.loop = true;
+        }
-                audioSource.Play();
+        else if (effectName == "Headache")
-                break;
+        {
-            case "Headache":
+            audioSource.clip = whisperSound;
-                audioSource.clip = whisperSound;
+            audioSource.loop = true;
-                audioSource.loop = true;
+            audioSource.Play();
-                audioSource.Play();
+        }
-                break;
+        else if (effectName == "Dizziness")
-            case "Dizziness":
+        {
-                audioSource.clip = distortedWhisperSound;
+            audioSource.clip = distortedWhisperSound;
-                audioSource.loop = true;
+            audioSource.loop = true;
-                audioSource.Play();
+            audioSource.Play();
-                break;
         }
 
         // Apply effects while the effect is active
-        while (_isEffectActive)
+        while (isEffectActive)
         {
-            switch (effectName)
+            // Visual effects for headache
+            if (effectName == "Headache")
             {
-                // Visual effects for headache
+                vignette.intensity.Override(vignetteIntensity.Evaluate(Time.time));
-                case "Headache":
+                chromaticAberration.intensity.Override(chromaticAberrationIntensity.Evaluate(Time.time));
-                    _vignette.intensity.Override(vignetteIntensity.Evaluate(Time.time));
+            }
-                    _chromaticAberration.intensity.Override(chromaticAberrationIntensity.Evaluate(Time.time));
+
-                    break;
+            // Visual effects for dizziness
-                // Visual effects for dizziness
+            if (effectName == "Dizziness")
-                case "Dizziness":
+            {
-                    _motionBlur.intensity.Override(motionBlurIntensity.Evaluate(Time.time));
+                motionBlur.intensity.Override(motionBlurIntensity.Evaluate(Time.time));
-                    _lensDistortion.intensity.Override(lensDistortionIntensity.Evaluate(Time.time));
+                lensDistortion.intensity.Override(lensDistortionIntensity.Evaluate(Time.time));
-                    break;
+            }
-                // Visual effects for panic
+
-                case "Panic":
+            // Visual effects for panic
-                    _motionBlur.intensity.Override(motionBlurIntensity.Evaluate(Time.time));
+            if (effectName == "Panic")
-                    _lensDistortion.intensity.Override(lensDistortionIntensity.Evaluate(Time.time));
+            {
-                    _chromaticAberration.intensity.Override(chromaticAberrationIntensity.Evaluate(Time.time));
+                motionBlur.intensity.Override(motionBlurIntensity.Evaluate(Time.time));
-                    break;
+                lensDistortion.intensity.Override(lensDistortionIntensity.Evaluate(Time.time));
-                case "Worst":
+                chromaticAberration.intensity.Override(chromaticAberrationIntensity.Evaluate(Time.time));
-                    _vignette.intensity.Override(vignetteIntensity.Evaluate(Time.time));
+            }
-                    _motionBlur.intensity.Override(motionBlurIntensity.Evaluate(Time.time));
+            
-                    _lensDistortion.intensity.Override(lensDistortionIntensity.Evaluate(Time.time));
+            if (effectName == "Worst")
-                    _chromaticAberration.intensity.Override(chromaticAberrationIntensity.Evaluate(Time.time));
+            {
-                    _colorAdjustments.postExposure.Override(colorAdjustmentsIntensity.Evaluate(Time.time * 0.8f));
+                vignette.intensity.Override(vignetteIntensity.Evaluate(Time.time));
-                    break;
+                motionBlur.intensity.Override(motionBlurIntensity.Evaluate(Time.time));
+                lensDistortion.intensity.Override(lensDistortionIntensity.Evaluate(Time.time));
+                chromaticAberration.intensity.Override(chromaticAberrationIntensity.Evaluate(Time.time));
+                colorAdjustments.postExposure.Override(colorAdjustmentsIntensity.Evaluate(Time.time * 0.8f)); 
             }
 
             yield return 0;
         }
 
         // Stop audio after the effect ends
-        if (audioSource && audioSource.isPlaying) audioSource.Stop();
+        if (audioSource != null && audioSource.isPlaying)
+        {
+            audioSource.Stop();
+        }
     }
-}
+}

Game/Assets/Scripts/SceneTransition.cs

@@ -1,10 +1,10 @@
+
 using System.Collections;
+using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.SceneManagement;
 using UnityEngine.UI;
 
-// NOTE: / FIXME: no asset usages, and school is not a tag; is this script dead?
-
 public class SceneTransition : MonoBehaviour
 {
     public Image fadeImage; // Assign the black image here
@@ -12,21 +12,24 @@ public class SceneTransition : MonoBehaviour
 
     private void OnTriggerEnter(Collider other)
     {
-        if (other.CompareTag("School")) StartCoroutine(FadeOutAndLoadScene());
+        if (other.CompareTag("School"))
+        {
+            StartCoroutine(FadeOutAndLoadScene());
+        }
     }
 
     private IEnumerator FadeOutAndLoadScene()
     {
-        var elapsed = 0f;
+        float elapsed = 0f;
 
         while (elapsed < fadeDuration)
         {
             elapsed += Time.deltaTime;
-            var alpha = Mathf.Clamp01(elapsed / fadeDuration);
+            float alpha = Mathf.Clamp01(elapsed / fadeDuration);
             fadeImage.color = new Color(0, 0, 0, alpha);
             yield return null;
         }
 
         SceneManager.LoadScene("NextScene");
     }
-}
+}

Game/Assets/Scripts/StoryTyping.cs

@@ -1,65 +1,68 @@
 /*
- * Author: Reza and Wai Lam
+Author: Reza and Wailam
- * Date: 14/2/25
+Date: 14/2/25
- * Description: For texts to appear themselves for storytelling
+Description: For text to appear itself for storytelling
- */
+*/
 
 using System.Collections;
-using TMPro;
+using System.Collections.Generic;
 using UnityEngine;
+using TMPro;
 using UnityEngine.SceneManagement;
 
 public class StoryTyping : MonoBehaviour
 {
     [Header("Message Settings")]
     // Custom message for this trigger
-    [TextArea(3, 5)]
+    [TextArea(3, 5)] public string[] storyLines;
-    public string[] storyLines;
 
     public TMP_Text storyText;
 
     // Speed at which text appears
-    public float typingSpeed = 0.05f;
+    public float typingSpeed = 0.05f; 
 
-    public string nextSceneName = "NextScene";
+    public string nextSceneName = "NextScene"; 
+
+    private int currentLine = 0;  
 
     public CanvasGroup fadeCanvasGroup; // Assign in Inspector
-    public float fadeDuration = 1f; // Duration for fade in/out
+    public float fadeDuration = 1f;     // Duration for fade in/out
-    public float displayDuration = 5f;
+    public float displayDuration = 5f; 
-
-    private int _currentLine;
 
     private void Start()
     {
         // Start typing the first line if there are any lines
-        if (storyLines.Length > 0) StartCoroutine(TypeText());
+        if (storyLines.Length > 0)
+        {
+            StartCoroutine(TypeText());
+        }
     }
 
-    private IEnumerator TypeText()
+    IEnumerator TypeText()
     {
         // Loop through each line of text
-        while (_currentLine < storyLines.Length)
+        while (currentLine < storyLines.Length)
         {
-            var fullText = storyLines[_currentLine];
+            string fullText = storyLines[currentLine];
-            var currentText = "";
+            string currentText = "";
 
             // Type out the current line character by character
-            foreach (var t in fullText)
+            for (int i = 0; i < fullText.Length; i++)
             {
-                currentText += t;
+                currentText += fullText[i];
                 storyText.text = currentText;
                 yield return new WaitForSeconds(typingSpeed);
             }
 
-            _currentLine++; // Move to the next line
+            currentLine++;  // Move to the next line
-            yield return new WaitForSeconds(displayDuration); // Wait briefly before displaying the next line
+            yield return new WaitForSeconds(displayDuration);  // Wait briefly before displaying the next line
         }
 
         // After all lines are typed, trigger fade and load the next scene
         StartCoroutine(FadeToBlack());
     }
 
-    private IEnumerator FadeToBlack()
+    IEnumerator FadeToBlack()
     {
         // Fade to black
         yield return StartCoroutine(Fade(0f, 1f, fadeDuration));
@@ -68,16 +71,16 @@ public class StoryTyping : MonoBehaviour
         SceneManager.LoadScene(nextSceneName);
     }
 
-    private IEnumerator Fade(float startAlpha, float endAlpha, float duration)
+    IEnumerator Fade(float startAlpha, float endAlpha, float duration)
     {
-        var elapsed = 0f;
+        float elapsed = 0f;
         fadeCanvasGroup.alpha = startAlpha;
 
         // Fade over the specified duration
         while (elapsed < duration)
         {
             elapsed += Time.deltaTime;
-            var t = elapsed / duration;
+            float t = elapsed / duration;
 
             fadeCanvasGroup.alpha = Mathf.Lerp(startAlpha, endAlpha, t);
             yield return null;

Game/Assets/Scripts/TrashBinTracker.cs

@@ -8,29 +8,30 @@ using UnityEngine;
 
 public class TrashBinTracker : MonoBehaviour
 {
-    private BedroomTask _bedroomTask;
+    private BedroomTask bedroomTask;
 
     private void Start()
     {
         // Find the BedroomTask script in the scene
-        _bedroomTask = FindObjectOfType<BedroomTask>();
+        bedroomTask = FindObjectOfType<BedroomTask>();
 
-        if (_bedroomTask == null) Debug.LogWarning("BedroomTask script not found in the scene!");
+        if (bedroomTask == null) Debug.LogWarning("BedroomTask script not found in the scene!");
     }
 
     private void OnTriggerEnter(Collider other)
     {
-        if (!other.CompareTag("TrashBin")) return;
+        if (other.CompareTag("TrashBin"))
-
-        if (_bedroomTask != null)
         {
-            _bedroomTask.CollectTrash();
+            if (bedroomTask != null)
-            Debug.Log("🗑️ Trash thrown in the bin! Count: " + _bedroomTask.trashCollected);
+            {
-            Destroy(gameObject);
+                bedroomTask.CollectTrash();
-        }
+                Debug.Log("🗑️ Trash thrown in the bin! Count: " + bedroomTask.trashCollected);
-        else
+                Destroy(gameObject);
-        {
+            }
-            Debug.LogError("BedroomTask reference is missing!");
+            else
+            {
+                Debug.LogError("BedroomTask reference is missing!");
+            }
         }
     }
 }

Game/Assets/Scripts/VignetteBreathing.cs

@@ -1,33 +1,34 @@
-/*
+using System.Collections;
- * Author: Reza
+using System.Collections.Generic;
- * Date: 7/2/25
- * Description: Vignette breathing effect
- */
-
 using UnityEngine;
 using UnityEngine.Rendering;
 using UnityEngine.Rendering.Universal;
 
 public class VignetteBreathing : MonoBehaviour
 {
-    [SerializeField] public Volume postProcessingVolume;
+    [SerializeField]
-
+    public Volume postProcessingVolume;
-    [SerializeField] public AnimationCurve intensityCurve; // Assign in Inspector
+    
+    private Vignette vignette;
 
+    [SerializeField]
+    public AnimationCurve intensityCurve; // Assign in Inspector
     public float cycleDuration = 3f; // Time for one full cycle
 
-    private Vignette _vignette;
+    void Start()
-
-    private void Start()
     {
-        if (postProcessingVolume.profile.TryGet(out _vignette)) Debug.Log("Vignette found!");
+        if (postProcessingVolume.profile.TryGet(out vignette))
+        {
+            Debug.Log("Vignette found!");
+        }
     }
 
-    private void Update()
+    void Update()
     {
-        if (!_vignette) return;
+        if (vignette != null)
-
+        {
-        var t = Time.time % cycleDuration / cycleDuration; // Loop 0-1 over time
+            float t = (Time.time % cycleDuration) / cycleDuration; // Loop 0-1 over time
-        _vignette.intensity.Override(intensityCurve.Evaluate(t));
+            vignette.intensity.Override(intensityCurve.Evaluate(t));
+        }
     }
 }

Game/ProjectSettings/EditorBuildSettings.asset

@@ -35,12 +35,6 @@ EditorBuildSettings:
   - enabled: 0
     path: Assets/Scenes/Testing Scenes/Day Increment Playground After.unity
     guid: 065e518bf23235d4298388363e3f16f8
-  - enabled: 1
-    path: Assets/Scenes/GoodEnding.unity
-    guid: de004170c210b114fa72b28853c704b7
-  - enabled: 1
-    path: Assets/Scenes/BadEnding.unity
-    guid: 0b49410f1606e7c4494b9bdd0df77c9f
   m_configObjects:
     Unity.XR.Oculus.Settings: {fileID: 11400000, guid: bfa1182bd221b4ca89619141f66f1260, type: 2}
     Unity.XR.WindowsMR.Settings: {fileID: 11400000, guid: dc5a169419fa04987b057f65238cf3ba, type: 2}