Swap the inactivated meteor with the last activated one

dylanlangston · Jan 4, 2024 · c6751ad · c6751ad
1 parent 1c326a6
commit c6751ad
Showing 1 changed file with 30 additions and 0 deletions.
diff --git a/src/ViewModels/AsteroidsViewModel.zig b/src/ViewModels/AsteroidsViewModel.zig
@@ -232,6 +232,11 @@ pub const AsteroidsViewModel = Shared.View.ViewModel.Create(
                                 midMeteorsCount += 1;
                             }
 
+                            // Swap the inactive meteor with the last active one
+                            const temp = bigMeteors[i];
+                            bigMeteors[i] = bigMeteors[bigMeteorsCount];
+                            bigMeteors[bigMeteorsCount] = bigMeteors[i];
+
                             NewAlien();
                         },
                         .collide => {
@@ -268,6 +273,11 @@ pub const AsteroidsViewModel = Shared.View.ViewModel.Create(
                                     );
                                 }
 
+                                // Swap the inactive meteor with the last active one
+                                const temp = bigMeteors[i];
+                                bigMeteors[i] = bigMeteors[bigMeteorsCount];
+                                bigMeteors[bigMeteorsCount] = bigMeteors[i];
+
                                 mediumMeteors[@intCast(midMeteorsCount)].active = true;
                                 midMeteorsCount += 1;
                             }
@@ -305,6 +315,11 @@ pub const AsteroidsViewModel = Shared.View.ViewModel.Create(
                                     );
                                 }
 
+                                // Swap the inactive meteor with the last active one
+                                const temp = mediumMeteors[i];
+                                mediumMeteors[i] = mediumMeteors[midMeteorsCount];
+                                mediumMeteors[midMeteorsCount] = mediumMeteors[i];
+
                                 smallMeteors[@intCast(smallMeteorsCount)].active = true;
                                 smallMeteorsCount += 1;
                             }
@@ -349,6 +364,11 @@ pub const AsteroidsViewModel = Shared.View.ViewModel.Create(
                                 smallMeteorsCount += 1;
                             }
 
+                            // Swap the inactive meteor with the last active one
+                            const temp = mediumMeteors[i];
+                            mediumMeteors[i] = mediumMeteors[midMeteorsCount];
+                            mediumMeteors[midMeteorsCount] = mediumMeteors[i];
+
                             NewAlien();
 
                             nextShieldLevel -= 8;
@@ -375,6 +395,11 @@ pub const AsteroidsViewModel = Shared.View.ViewModel.Create(
                             }
                         }
 
+                        // Swap the inactive meteor with the last active one
+                        const temp = smallMeteors[i];
+                        smallMeteors[i] = smallMeteors[smallMeteorsCount];
+                        smallMeteors[smallMeteorsCount] = smallMeteors[i];
+
                         NewAlien();
                     },
                     .collide => {
@@ -405,6 +430,11 @@ pub const AsteroidsViewModel = Shared.View.ViewModel.Create(
                             }
                         }
 
+                        // Swap the inactive meteor with the last active one
+                        const temp = smallMeteors[i];
+                        smallMeteors[i] = smallMeteors[smallMeteorsCount];
+                        smallMeteors[smallMeteorsCount] = smallMeteors[i];
+
                         NewAlien();
 
                         nextShieldLevel -= 6;