Timedown safety

1 files changed, 27 insertions, 3 deletions

diff --git a/npc/021-4/main.txt b/npc/021-4/main.txt
index 1252c3fd6..7921e0f5b 100644
--- a/npc/021-4/main.txt
+++ b/npc/021-4/main.txt
@@ -42,7 +42,6 @@ function	script	CindySwitch_Check_214	{
         goto L_Cheat;
     if ($@CINDY_STATE > 150000) goto L_Reset;
     if ($@CINDY_STATE % 2 == 0) goto L_Start;
-    // Victory check missing
     if (CindySwitch_Check_214() == 5) {
         // Gate is open, advance to stage 2
         .lifetime+=3;
@@ -73,6 +72,11 @@ L_Reset:
     }
     end;
 
+L_Reckless:
+    announce("People failed to rescue Cindy!"), bc_all|bc_npc;
+    areatimer "021-4", 20, 20, 100, 80, 10, "Cindy#Outside::OnFail";
+    goto L_CleanUp;
+
 // Start
 L_Start:
     mesn;
@@ -130,6 +134,11 @@ L_Winner:
 OnPetDeath:
     end;
 
+OnFail:
+    percentheal -100, -100;
+    heal -1, -1;
+    end;
+
 OnReward:
     if (ispcdead()) {
         recovery();
@@ -148,7 +157,8 @@ L_CleanUp:
     .lifetime=0;
     .wtime=0;
     .canfinish=0;
-    $@CINDY_STATE=gettimetick(2)+60*rand(55,65)*rand(1,36); // It is way too random to I say how long it takes
+    $@CINDY_STATE+=1;
+    killmonsterall("021-4");
     disablenpc "#CindySwitch_06";
     disablenpc "#CindySwitch_07";
     disablenpc "#CindySwitch_08";
@@ -161,7 +171,8 @@ OnTimer2500:
     .@y=mobcount("021-4", "Cindy#Outside::OnPetDeath");
     .@v=CindySwitch_Check_214();
     if (.@y == 0 && .@v >= 5 && .canfinish) {
-        mapannounce "021-4", "You won.",0;
+        $@CINDY_STATE=gettimetick(2)+60*rand(55,65)*rand(1,36); // It is way too random to I say how long it takes
+        announce "021-4", "Nivalis: Cindy is now safe!",bc_all|bc_npc;
         areatimer "021-4", 20, 20, 100, 80, 10, "Cindy#Outside::OnReward";
         goto L_CleanUp;
     }
@@ -174,8 +185,21 @@ OnTimer2500:
         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";
+        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)
+        goto L_Reckless;
     initnpctimer;
     end;