From 61c6393855cb76e1cd6b8b08d99ea911b6bf38b8 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Thu, 25 Oct 2018 22:59:26 -0300
Subject: Correct bugs reported by @demure

---
 npc/021-4/main.txt | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'npc/021-4/main.txt')

diff --git a/npc/021-4/main.txt b/npc/021-4/main.txt
index 75d6bff9e..eb146ca5a 100644
--- a/npc/021-4/main.txt
+++ b/npc/021-4/main.txt
@@ -42,8 +42,9 @@ function	script	CindySwitch_Check_214	{
         goto L_Cheat;
     if ($@CINDY_STATE > 150000) goto L_Reset;
     if ($@CINDY_STATE % 2 == 0) goto L_Start;
-    if (CindySwitch_Check_214() == 5) {
+    if (CindySwitch_Check_214() == 5 && !.canfinish) {
         // Gate is open, advance to stage 2
+        .canfinish=1;
         .lifetime+=3;
         .wtime=0;
         mapannounce "021-4", "*roaaaaar*",0;
@@ -52,8 +53,7 @@ function	script	CindySwitch_Check_214	{
         .@pl = getmapusers("021-4")+1;
         areamonster "021-4", 20, 20, 100, 80, "Yeti", Yeti, (.@pl/2)+rand(2,6), "Cindy#Outside::OnPetDeath";
         areamonster "021-4", 20, 20, 100, 80, "Moggun", Moggun, ($@CINDY_STATE/2)+1, "Cindy#Outside::OnPetDeath";
-        areamonster "021-4", 20, 20, 100, 80, "Slime Blast", SlimeBlast, $@CINDY_STATE+1, "Cindy#Outside::OnPetDeath";
-        .canfinish=1;
+        areamonster "021-4", 20, 20, 100, 80, "Slime Blast", SlimeBlast, $@CINDY_STATE+1;
     }
     hello; end;
 
@@ -153,6 +153,7 @@ OnReward:
     getexp 10000, JobLevel;
     end;
 
+OnCleanUp:
 L_CleanUp:
     .lifetime=0;
     .wtime=0;
@@ -177,14 +178,16 @@ OnTimer2500:
         goto L_CleanUp;
     }
     .wtime+=5;
-    if (.wtime >= rand(60,80)) {
+    if (.wtime >= rand(60,90)) {
         .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();
-        areamonster "021-4", 20, 20, 100, 80, "Yeti", Yeti, (.@pl/2)+($@CINDY_STATE/2)+(.lifetime/3), "Cindy#Outside::OnPetDeath";
+        .@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!",
-- 
cgit v1.2.3-60-g2f50