Candor Cave "improvements"

1 files changed, 7 insertions, 5 deletions

diff --git a/npc/006-1/crazyfefe.txt b/npc/006-1/crazyfefe.txt
index b51086f11..a26cbe5a0 100644
--- a/npc/006-1/crazyfefe.txt
+++ b/npc/006-1/crazyfefe.txt
@@ -35,8 +35,10 @@
         dispbottom l("Round @@", $@FEFE_WAVE);
         end;
     }
-    if ($@FEFE_CAVE_HERO$ != "")
+    if ($@FEFE_CAVE_HERO$ != "") {
         pleaseWait();
+        close;
+    }
 
     // Main Loop
     mesn;
@@ -199,8 +201,8 @@ function CaveLogic {
     $@FEFE_DIFFICULTY=0;
     areatimer "006-1", 20, 20, 70, 60, 10, "Crazyfefe::OnSumLevel";
 
-    // New wave condition: All mobs dead, or 5 minutes have passed
-    if (mobcount("006-1", "Crazyfefe::OnPetDeath") <= 0 || .wtime >= 240)
+    // New wave condition: All mobs dead, or 2 minutes have passed
+    if (mobcount("006-1", "Crazyfefe::OnPetDeath") <= 0 || .wtime >= 120)
         NextRound();
 
     // reset timer
@@ -231,14 +233,13 @@ function NextRound {
         //debugmes("[Candor] Difficulty is %d, pool is %d", .@lv, $@FEFE_DIFFICULTY);
         .@lv=rand(0, .@lv);
 
-        switch (rand(.@lv*4/5,.@lv)) {
+        switch (.@lv) {
             case 0:
             case 1:
             case 2:
                 //.@monsterId = any(HouseMaggot, HouseMaggot, SlimeBlast, HouseMaggot) ; break;
             case 3:
             case 4:
-                //.@monsterId = Wolvern ; break;
                 .@monsterId = any(AngryScorpion, CaveMaggot, MagicGoblin, ViciousSquirrel, AngryBat, HouseMaggot, SlimeBlast) ; break;
             case 5:
             case 6:
@@ -317,6 +318,7 @@ OnReward:
     }
     // Player reward is a random number based on current wave
     .@prize=rand($@FEFE_WAVE/2,$@FEFE_WAVE)*2;
+    // $@FEFE_DIFFICULTY might not be available anymore
     if ($@FEFE_WAVE % 5 == 0)
         Zeny=Zeny+.@prize;
     getexp .@prize, rand(1,3);