From 00aea936b19e79440df571a735e80494c11c159b Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Mon, 10 Jun 2019 11:31:05 -0300
Subject: Okay, Cindy Cleanup is harder than I thought, and this script is out
 of order.

---
 npc/021-4/main.txt | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

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

diff --git a/npc/021-4/main.txt b/npc/021-4/main.txt
index fefadf7e5..a2bee72eb 100644
--- a/npc/021-4/main.txt
+++ b/npc/021-4/main.txt
@@ -43,14 +43,14 @@ function	script	CindySwitch_Check_214	{
             l("Leave it");
         if (@menu == 1) {
             getexp rand(55, 110), rand(5, 11);
-            .lifetime=gettimetick(2)+rand(110, 150); // Something between 1m50s and 2m30s
+            .lifetime=gettimetick(2)+rand(110, 150)+60; // Something between 1m50s and 2m30s + 1 minute
             specialeffect(FX_SUCCESS);
             setnpcdisplay .name$, NPC_SWITCH_ONLINE;
             initnpctimer;
             .@r=rand(0,100);
             getmapxy(.@m$, .@x, .@y,0);
             if (.@r < 90)
-                monster .@m$, .@x, .@y, "Yeti", Yeti, 6;
+                monster .@m$, .@x, .@y, "Yeti", Yeti, rand2(4,6);
             else
                 monster .@m$, .@x, .@y, "Yeti", Yeti, 2;
             npctalk l("Automatic disarm in: @@", FuzzyTime(.lifetime));
@@ -99,9 +99,12 @@ OnInit:
         mapannounce "021-4", "*roaaaaar*",0;
         npctalk "Take care! More Yetis! And they have friends!!";
         setnpcdisplay .name$, NPC_CINDY_UNCAGE;
-        .@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";
+        .@pl = getmapusers("021-4");
+        if (.@pl == 1)
+            .@pl+=1
+        .@pl+=3;
+        areamonster "021-4", 20, 20, 100, 80, "Yeti", Yeti, .@pl, "Cindy#Outside::OnPetDeath";
+        areamonster "021-4", 20, 20, 100, 80, "Moggun", Moggun, .@pl, "Cindy#Outside::OnPetDeath";
         areamonster "021-4", 20, 20, 100, 80, "Slime Blast", SlimeBlast, $@CINDY_STATE+1;
     }
     hello; end;
@@ -242,7 +245,7 @@ L_CleanUp:
     disablenpc "#CindySwitch_08";
     disablenpc "#CindySwitch_09";
     disablenpc "#CindySwitch_10";
-    setnpcdisplay .name$, NPC_CINDY_CAGE;
+    setnpcdisplay .name$, NPC_CINDY_CAGE; // We need NPC_CINDY for complete
     changemusic "021-4", "water_prelude.ogg";
     stopnpctimer;
     end;
-- 
cgit v1.2.3-60-g2f50