Wave counter keeps going, but Cindy Cave is now limited

1 files changed, 22 insertions, 18 deletions

diff --git a/npc/021-4/main.txt b/npc/021-4/main.txt
index 32823f3cb..62d12bcf0 100644
--- a/npc/021-4/main.txt
+++ b/npc/021-4/main.txt
@@ -197,28 +197,31 @@ OnTimer2500:
         goto L_CleanUp;
     }
     .wtime+=5;
-    .@bonus=(.lifetime/10)*10; // After the 10th round, it starts to spawn slower
+    .@bonus=(.lifetime/5)*5; // After every 5 rounds, spawn slower
     if (.wtime >= rand(90,120)+.@bonus+(.lifetime*rand(11,12))) {
         .wtime=0;
         .lifetime+=1;
         .@pl = getmapusers("021-4")+1;
-        // If gate was unlocked, more Yetis will appear depending on switches state.
-        if (.canfinish)
-            .@pl+=5-CindySwitch_Check_214();
-        .@value=(.@pl/2)+($@CINDY_STATE/2)+(.lifetime/3);
-        areamonster "021-4", 20, 20, 100, 80, "Yeti", Yeti, (.@value+1)/2, "Cindy#Outside::OnPetDeath";
-        areamonster "021-4", 20, 20, 100, 80, "Moggun", Moggun, (.@value+1)/2, "Cindy#Outside::OnPetDeath";
-        npctalk any("Yetis!",
-                    "Watch out!",
-                    "More of them are coming!",
-                    "Be careful! There's more!",
-                    "More Yetis! Will this never end?",
-                    "AAAAH! YETIS!",
-                    "*shierks*",
-                    "There are coming more and more!",
-                    "More Yetis! We are hopeless!",
-                    "Keep your guard up!",
-                    "Hit and run, hit and run! More of them!");
+        // Wave Limit: After limit, monsters stop spawning, but wave counter keeps going
+        if (.lifetime <= .wavelimit) {
+            // If gate was unlocked, more Yetis will appear depending on switches state.
+            if (.canfinish)
+                .@pl+=5-CindySwitch_Check_214();
+            .@value=(.@pl/2)+($@CINDY_STATE/2)+(.lifetime/3);
+            areamonster "021-4", 20, 20, 100, 80, "Yeti", Yeti, (.@value+1)/2, "Cindy#Outside::OnPetDeath";
+            areamonster "021-4", 20, 20, 100, 80, "Moggun", Moggun, (.@value+1)/2, "Cindy#Outside::OnPetDeath";
+            npctalk any("Yetis!",
+                        "Watch out!",
+                        "More of them are coming!",
+                        "Be careful! There's more!",
+                        "More Yetis! Will this never end?",
+                        "AAAAH! YETIS!",
+                        "*shierks*",
+                        "There are coming more and more!",
+                        "More Yetis! We are hopeless!",
+                        "Keep your guard up!",
+                        "Hit and run, hit and run! More of them!");
+        }
     }
     areamonster "021-4", 20, 20, 100, 80, "Slime Blast", SlimeBlast, $@CINDY_STATE;
     if (.lifetime >= 63)
@@ -231,6 +234,7 @@ OnInit:
     .lifetime=0; // Controls Yeti Wave
     .wtime=0;    // Timer runs sort of often. WTime controls automatic Yeti advance
     .canfinish=0;// Can finish or must talk to cage first?
+    .wavelimit=30; // max number of waves
     $@CINDY_HERO$="";
     disablenpc "#CindySwitch_06";
     disablenpc "#CindySwitch_07";