Finished enemySpawner

Assets/Scripts/Controller/EnemySpawner/EnemyList.cs

@@ -12,6 +12,6 @@ public class EnemyList : ScriptableObject
 [Serializable]
 public struct EnemyPrefabInfo
 {
-    public GameObject prefab;
+    public GameObject[] prefabs;
     public float Difficulty;
 }

Assets/Scripts/Controller/EnemySpawner/EnemySpawner.cs

@@ -2,51 +2,125 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 using Unity.VisualScripting;
 using UnityEngine;
+using UnityEngine.UIElements;
 
 public class NewBehaviourScript : MonoBehaviour
 {
     // Shared
     public int Wave = 0;
-    public float difficulty = 0;
+    public float difficulty = 1;
 
     // Inspector
     [SerializeField] private float difficultyIncreasePerWave = 0.1f;
-    [SerializeField] private float WaveTime;
+    [SerializeField] private float WaveTime = 20f;
-    [SerializeField] private EnemyList enemyList;
+    [SerializeField] private List<float> enemyDifficulties;
+    [SerializeField] private float SpawnRadius = 10;
+    [SerializeField] private int NumEnemies = 6;
 
     // Private
     private bool nextWaveRequested = false;
     private float timer = 0f;
+    private Camera mainCam;
+    private GameObject SpawnedEnenmyHolder;
+    [SerializeField] private List<EnemyPrefabInfo> enemyList;
 
-    public void StartSpawning() => StartCoroutine(SpawnLoop());
+    private bool SpawnerStarted = false;
-    public void StartNextWave() => nextWaveRequested = true;
 
-    private IEnumerator SpawnLoop()
+    private void Start()
     {
-        while (true)
+        mainCam = Camera.main;
+        SpawnedEnenmyHolder = new GameObject("SpawnedEnenmyHolder");
+
+        for (int i = 0; i < 6; i++)
         {
-            yield return new WaitUntil(() => timer > WaveTime || nextWaveRequested);
+            enemyList.Add(new EnemyPrefabInfo() { Difficulty = i+1, prefabs = Resources.LoadAll<GameObject>("Enemies/" + (i+1)) });
+        }
+
+        StartSpawning();
+    }
+
+    public void Update()
+    {
+        if (SpawnerStarted)
+            timer += Time.deltaTime;
+
+        if (timer > WaveTime || nextWaveRequested)
+        {
+            Task.Factory.StartNew(() => { Task.Delay(100); timer = 0; });
 
             SpawnWave(difficulty);
 
             Wave++;
             difficulty *= difficultyIncreasePerWave + 1;
+            nextWaveRequested = false;
+            timer = 0;
         }
-
+        
     }
 
+    public void StartSpawning() => SpawnerStarted = true;
+    public void StartNextWave() => nextWaveRequested = true;
+
     void SpawnWave(float difficulty)
     {
-        var decendingList = enemyList.List.OrderByDescending(x => x.Difficulty).ToArray();
+        SpawnStrongestFirst(difficulty);
+
+        //if (Wave != 0 && Wave % 10 == 0)
+        //    SpawnStrongestFirst(difficulty);
+        //else
+        //    SpawnRandom(difficulty);
+    }
+
+    void SpawnStrongestFirst(float difficulty)
+    {
+        var decendingList = enemyList.Where(x => x.Difficulty < difficulty).OrderByDescending(x => x.Difficulty).ToArray();
         for (int i = 0; i < decendingList.Length; i++)
         {
             while (difficulty > decendingList[i].Difficulty)
             {
-                Instantiate(decendingList[i].prefab);
+                GameObject enemy = Instantiate(decendingList[i].prefabs[UnityEngine.Random.Range(0, decendingList[i].prefabs.Length)], GetRandomPointOnCircle(mainCam.transform.position, SpawnRadius), Quaternion.identity, SpawnedEnenmyHolder.transform);
                 difficulty -= decendingList[i].Difficulty;
             }
         }
     }
+
+    void SpawnRandom(float difficulty)
+    {
+        while (difficulty > 0.5f) // Spawn until difficulty is less than 0.5f
+        {
+            var validEnemies = enemyList.Where(x => x.Difficulty <= difficulty).ToArray();
+            var enemyToSpawn = validEnemies[UnityEngine.Random.Range(0, validEnemies.Length)];
+            difficulty -= enemyToSpawn.Difficulty;
+            GameObject enemy = Instantiate(enemyToSpawn.prefabs[UnityEngine.Random.Range(0, enemyToSpawn.prefabs.Length)], GetRandomPointOnCircle(mainCam.transform.position, SpawnRadius), Quaternion.identity, SpawnedEnenmyHolder.transform);
+        }
+    }
+
+    public Vector3 GetRandomPointOnCircle(Vector3 location, float radius)
+    {
+        float angle = UnityEngine.Random.Range(0f, 360f);
+        float radians = Mathf.Deg2Rad * angle;
+
+        Vector3 position = transform.position;
+        float x = position.x + radius * Mathf.Cos(radians);
+        float y = position.y + radius * Mathf.Sin(radians);
+
+        return new Vector3(x, y, position.z);
+    }
+
+#if UNITY_EDITOR
+    private void OnDrawGizmosSelected()
+    {
+        Gizmos.color = Color.green;
+        Gizmos.DrawWireSphere(transform.position, SpawnRadius);
+
+        for (int i = 0; i < 10; i++)
+        {
+            Gizmos.DrawWireSphere(GetRandomPointOnCircle(transform.position, SpawnRadius), 0.25f);
+        }
+    }
+#endif
 }