Merge branch 'main' of https://github.com/RochesterX/Sophomore-Project

Assets/Scripts/Game/AudioManager.cs

@@ -0,0 +1,71 @@
+using System.Collections.Generic;
+using UnityEngine; using Game; using Music; using Player;
+
+namespace Music
+{
+
+public class AudioManager : MonoBehaviour
+{
+    public List<SoundEffect> soundEffects = new List<SoundEffect>();
+
+    public static AudioManager Instance;
+
+    private void Awake()
+    {
+        if (Instance == null)
+        {
+            Instance = this;
+            DontDestroyOnLoad(gameObject);
+        }
+        else
+        {
+            Destroy(gameObject);
+        }
+
+        foreach (Transform child in transform)
+        {
+            var soundEffect = new SoundEffect(child.name, child.GetComponent<AudioSource>());
+            if (soundEffect != null)
+            {
+                soundEffects.Add(soundEffect);
+            }
+        }
+
+        print(soundEffects);
+    }
+
+    public void PlaySound(string soundName)
+    {
+        if (soundName == "Punch")
+        {
+            soundEffects.Find(x => x.name == "Punch").audioSource.Play();
+            soundEffects.Find(x => x.name == "Punch 2").audioSource.Play();
+            soundEffects.Find(x => x.name == "Punch 3").audioSource.Play();
+
+            return;
+        }
+
+        foreach (var soundEffect in soundEffects)
+        {
+            if (soundEffect.name == soundName)
+            {
+                soundEffect.audioSource.Play();
+                return;
+            }
+        }
+        Debug.LogWarning($"Sound '{soundName}' not found!");
+    }
+}
+
+public class SoundEffect
+{
+    public string name;
+    public AudioSource audioSource;
+
+    public SoundEffect(string name, AudioSource audioSource)
+    {
+        this.name = name;
+        this.audioSource = audioSource;
+    }
+}
+}

Assets/Scripts/Game/AudioManager.cs.meta

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: ab3338b5eb5fc46caac119dfaba50ae3

Assets/Scripts/Game/HealthBarManager.cs

@@ -38,21 +38,58 @@ public class HealthBarManager : MonoBehaviour
         {
             if (!playerHealthBars.ContainsKey(player))
             {
-                GameObject healthBar = Instantiate(healthBarPrefab);
-                healthBar.transform.localScale *= 1.5f;
-                healthBar.GetComponent<TerribleHealthBarScript>().SetPlayer(player);
-                playerHealthBars[player] = healthBar;
+                CreateHealthBar(player);
+
+                // Subscribe to the player's death and respawn events
+                var damageable = player.GetComponent<Damageable>();
+                damageable.OnPlayerDeath += HandlePlayerDeath;
+                damageable.OnPlayerRespawn += HandlePlayerRespawn;
             }
         }
     }
 
-    private void OnGameEnd() // Destroys the health bars when the game ends
+    private void HandlePlayerRespawn(GameObject player)
+    {
+        if (!playerHealthBars.ContainsKey(player))
+        {
+            CreateHealthBar(player);
+        }
+    }
+
+    private void CreateHealthBar(GameObject player)
+    {
+        GameObject healthBar = Instantiate(healthBarPrefab);
+        healthBar.transform.localScale *= 1.5f;
+        healthBar.GetComponent<TerribleHealthBarScript>().SetPlayer(player);
+        playerHealthBars[player] = healthBar;
+    }
+
+    private void HandlePlayerDeath(GameObject player)
+    {
+        if (playerHealthBars.TryGetValue(player, out GameObject healthBar))
+        {
+            Destroy(healthBar);
+            playerHealthBars.Remove(player);
+        }
+    }
+
+    private void OnGameEnd()
     {
         foreach (var kvp in playerHealthBars)
         {
             Destroy(kvp.Value);
         }
         playerHealthBars.Clear();
+
+        // Unsubscribe from all player events
+        foreach (GameObject player in GameManager.players)
+        {
+            if (player != null && player.TryGetComponent<Damageable>(out var damageable))
+            {
+                damageable.OnPlayerDeath -= HandlePlayerDeath;
+                damageable.OnPlayerRespawn -= HandlePlayerRespawn;
+            }
+        }
     }
 }
 }

Assets/Scripts/Game/ObstacleCourse.cs

@@ -0,0 +1,19 @@
+using UnityEngine; using Game; using Music; using Player;
+
+namespace Game
+{
+
+public class ObstacleCourse : MonoBehaviour
+{
+    public static GameObject playerWon;
+
+    void OnTriggerEnter2D(Collider2D collision)
+    {
+        if (collision.gameObject.CompareTag("Player"))
+        {
+            playerWon = collision.gameObject;
+            GameManager.Instance.GameOver();
+        }
+    }
+}
+}

Assets/Scripts/Game/ObstacleCourse.cs.meta

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 746e2bd0f68be467eb1b2b19c7c513af

Assets/Scripts/Game/ObstacleEnd.cs

@@ -0,0 +1,27 @@
+using Game;
+using UnityEngine;
+
+public class ObstacleEnd : MonoBehaviour
+{
+    void Start()
+    {
+        UpdateVisibility();
+    }
+
+    void Update()
+    {
+        UpdateVisibility();
+    }
+
+    private void UpdateVisibility() // Sets object active if playing obstacle course
+    {
+        if (GameManager.gameMode == GameManager.GameMode.obstacleCourse)
+        {
+            gameObject.SetActive(true);
+        }
+        else
+        {
+            gameObject.SetActive(false);
+        }
+    }
+}

Assets/Scripts/Game/ObstacleEnd.cs.meta

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 69fc903d39ac3d24aab4ce7a68dba447