Fix spawn logic when recycling

Author: JohannesDeml

Assets/Scripts/ObjectSpawner.cs

@@ -11,6 +11,7 @@
 using System;
 using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.Assertions;
 using UnityEngine.SceneManagement;
 
 namespace Supyrb
@@ -41,6 +42,7 @@ public float SpawnCoolDownSeconds
 			get => spawnCoolDownSeconds;
 			set
 			{
+				Assert.IsTrue(value > 0, $"Spawn cooldown needs to be greater than 0, but was set to {value}");
 				spawnTimeBase += (spawnCoolDownSeconds - value) * totalSpawnCount;
 				spawnCoolDownSeconds = value;
 			}
@@ -79,7 +81,8 @@ private void Awake()
 		private void Update()
 		{
 			float relativeSpawnTime = Time.time - spawnTimeBase;
-			if (Mathf.FloorToInt(relativeSpawnTime / spawnCoolDownSeconds) > totalSpawnCount)
+			int itemsToSpawn = Mathf.FloorToInt(relativeSpawnTime / spawnCoolDownSeconds) - totalSpawnCount;
+			for(int i = 0; i < itemsToSpawn; i++)
 			{
 				SpawnObject();
 			}
@@ -102,13 +105,7 @@ private void SpawnObject()
 			if (spawnedObjects.Count >= maxInstances)
 			{
 				var recycleGo = spawnedObjects.Dequeue();
-				if(recycleGo == null)
-				{
-					// If the spawned object was destroyed, we create a new one
-					// Decrement spawn count since it will be incremented when created below
-					totalSpawnCount--;
-				}
-				else
+				if(recycleGo != null)
 				{
 #if UNITY_2021_3_OR_NEWER
 					recycleGo.transform.SetLocalPositionAndRotation(transform.position, transform.localRotation);
@@ -117,6 +114,7 @@ private void SpawnObject()
 					recycleGo.transform.localRotation = transform.localRotation;
 #endif
 					spawnedObjects.Enqueue(recycleGo);
+					totalSpawnCount++;
 					return;
 				}
 			}