Fix InitialSync for >1 Cyclops (#1096)

Author: dartasen

NitroxClient/GameLogic/InitialSync/CyclopsInitialAsyncProcessor.cs

@@ -1,6 +1,9 @@
 using System.Collections;
+using System.Linq;
 using NitroxClient.GameLogic.InitialSync.Base;
+using NitroxClient.MonoBehaviours;
 using NitroxModel.DataStructures.GameLogic;
+using NitroxModel.Logger;
 using NitroxModel.Packets;
 using NitroxModel_Subnautica.Helper;
 using UnityEngine;
@@ -10,7 +13,7 @@ namespace NitroxClient.GameLogic.InitialSync
     class CyclopsInitialAsyncProcessor : InitialSyncProcessor
     {
         private readonly Vehicles vehicles;
-        private int cyclopsStillLoading = 0;
+        private int cyclopsLoaded = 0;
         private int totalCyclopsToLoad = 0;
         private WaitScreen.ManualWaitItem waitScreenItem;
 
@@ -22,34 +25,35 @@ public CyclopsInitialAsyncProcessor(Vehicles vehicles)
         public override IEnumerator Process(InitialPlayerSync packet, WaitScreen.ManualWaitItem waitScreenItem)
         {
             this.waitScreenItem = waitScreenItem;
-
             vehicles.VehicleCreated += OnVehicleCreated;
 
+            totalCyclopsToLoad = packet.Vehicles.Where(v => v.TechType.Enum() == TechType.Cyclops).Count();
+
             foreach (VehicleModel vehicle in packet.Vehicles)
             {
                 if (vehicle.TechType.Enum() == TechType.Cyclops)
                 {
-                    cyclopsStillLoading++;
+                    Log.Debug($"Trying to spawn {vehicle}");
                     vehicles.CreateVehicle(vehicle);
                 }
             }
 
-            totalCyclopsToLoad = cyclopsStillLoading;
-
-            yield return new WaitUntil(() => cyclopsStillLoading == 0);
+            yield return new WaitUntil(() => cyclopsLoaded == totalCyclopsToLoad);
         }
 
         private void OnVehicleCreated(GameObject gameObject)
         {
-            waitScreenItem.SetProgress((totalCyclopsToLoad - cyclopsStillLoading), totalCyclopsToLoad);
-            
-            cyclopsStillLoading--;
+            cyclopsLoaded++;
+            waitScreenItem.SetProgress(cyclopsLoaded, totalCyclopsToLoad);
 
             // After all cyclops are created
-            if (cyclopsStillLoading == 0)
+            if (cyclopsLoaded == totalCyclopsToLoad)
             {
                 vehicles.VehicleCreated -= OnVehicleCreated;
-            }            
+                Log.Debug($"Spawned cyclops {NitroxEntity.GetId(gameObject)}");
+            }
+
+            Log.Debug($"We still need to load {totalCyclopsToLoad - cyclopsLoaded} cyclops");
         }
     }
 }