Merge branch 'master' into 'main'

Bug fix

See merge request !64

MrBigsock/Assets/Code/Character.cs

@@ -18,7 +18,7 @@ namespace BigSock {
 		public float AttackSpeed => Stats.AttackSpeed;
 		public float baseAttackSpeed = 1;
 
-		public AudioSource[] source;
+		public List<AudioSource> source = new List<AudioSource>();
 		public AudioClip TakeDamageAudio;
 
 		/*
@@ -101,8 +101,7 @@ namespace BigSock {
 		*/
 		public ICharacterStats Stats { get; protected set; } = new CharacterStats();
 
-		public Character()
-        {
+		public Character() {
 			Inventory = new Inventory(this);
 			Inventory.BackpackCap = 5;
 		}
@@ -131,8 +130,14 @@ namespace BigSock {
 				Accuracy = 1,
 			};
 
-			source = Camera.main.gameObject.GetComponents<AudioSource>();
-		
+			// Add audio sources.
+			foreach(var s in Camera.main.gameObject.GetComponents<AudioSource>())
+				if(s != null) 
+					source.Add(s);
+
+			var src = GetComponent<AudioSource>();
+			if(src != null) source.Add(src);
+
 			
 			UpdateModifiers();
 

MrBigsock/Assets/Code/Core/Abilities/BasicProjectile1.cs

 using System.Collections;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 
 using UnityEngine;
 using UnityEngine.InputSystem;
@@ -60,7 +61,7 @@ namespace BigSock {
 			bulletScript.Direction = (target.Value - (Vector2) actor.transform.position).normalized;
 
 			// Play sound effect
-			var source = actor.source[0];
+			var source = actor.source.FirstOrDefault();
 			var audioClip = AudioService.SINGLETON.Get(AUDIO_PATH);
 			if (source != null && audioClip != null) {
 				source.clip = audioClip;

MrBigsock/Assets/Code/Core/Abilities/BasicProjectile2.cs

 using System.Collections;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 
 using UnityEngine;
 using UnityEngine.InputSystem;
@@ -74,7 +75,7 @@ namespace BigSock {
 			bulletScript.Direction = (target.Value - (Vector2) actor.transform.position).normalized;
 
 			// Play sound effect
-			var source = actor.source;
+			var source = actor.source.FirstOrDefault();
 			var audioClip = AudioService.SINGLETON.Get(AUDIO_PATH);
 			if (source != null && audioClip != null) {
 				source.clip = audioClip;