Minor improvements to Nard and Crazyfefe

2 files changed, 15 insertions, 11 deletions

diff --git a/npc/002-3/nard.txt b/npc/002-3/nard.txt
index 6db8c51c1..931a5b587 100644
--- a/npc/002-3/nard.txt
+++ b/npc/002-3/nard.txt
@@ -215,8 +215,8 @@ L_NotYet:
 
     } else {
         mesq l("You still haven't completed your tasks.");
-        next;
-        mesq l("You still need @@ GP for the trip to Tulimshar.", (.@price-Zeny));
+        mes "";
+        mesc l("You still need @@ GP for the trip to Tulimshar.", (.@price-Zeny));
     }
     close;
 
diff --git a/npc/006-1/crazyfefe.txt b/npc/006-1/crazyfefe.txt
index 6348d5d24..17c3ec00f 100644
--- a/npc/006-1/crazyfefe.txt
+++ b/npc/006-1/crazyfefe.txt
@@ -138,6 +138,7 @@ function Challenge {
 
     // We must begin at once, so ignore normal procedure
     if (!@menuret) {
+        logmes "candor fight - start without announce", LOGMES_ATCOMMAND;
         closeclientdialog;
         StartFight();
     }
@@ -145,7 +146,9 @@ function Challenge {
     // Give you a bonus for starting the fight, and announce the fight.
     @crazypoints=1;
     initnpctimer;
-    announce $@FEFE_CAVE_HERO$+" invites everyone to a challenge against Candor Cave. It'll start in "+FuzzyTime($@FEFE_DELAY,2,2)+". Prepare yourselves!", bc_all|bc_npc;
+    .@msg$=$@FEFE_CAVE_HERO$+" invites everyone to a challenge against Candor Cave. It'll start in "+FuzzyTime($@FEFE_DELAY,2,2)+". Prepare yourselves!";
+    announce .@msg$, bc_all|bc_npc;
+    channelmes("#world", .@msg$);
     mesn;
     mesq l("Please wait, the fight will start in @@, as requested.", FuzzyTime($@FEFE_DELAY,2,2));
     close;
@@ -185,14 +188,10 @@ function CaveLogic {
     .wtime+=5; // This is looped every 5 s
     $@FEFE_CAVE_PLAYER_COUNT = getmapusers("006-1");
 
-    // New wave condition: All mobs dead, or 5 minutes have passed
-    if (mobcount("006-1", "Crazyfefe::OnPetDeath") <= 0 || .wtime >= 240)
-        NextRound();
-
     // Victory conditions: Too few players are alive OR twenty minutes went on.
     // WARNING, dead players still in cave are counted, we might never finish the fight.
     // And a GM might be called to ban everyone inside.
-    if ($@FEFE_CAVE_PLAYER_COUNT <= 1 && !$@GM_OVERRIDE || gettimetick(2) >= $@FEFE_DELAY - (60*20)) {
+    if ($@FEFE_CAVE_PLAYER_COUNT <= 1 && !$@GM_OVERRIDE || $@FEFE_DELAY < gettimetick(2) - (60*20)) {
         CleanUp();
     }
 
@@ -200,6 +199,10 @@ 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)
+        NextRound();
+
     // reset timer
     initnpctimer;
     end;
@@ -270,8 +273,7 @@ function NextRound {
         $@FEFE_DIFFICULTY=$@FEFE_DIFFICULTY-max(1, min(25, .@lv)*6);
     }
     freeloop(false);
-    initnpctimer;
-    end;
+    return;
 }
 
 function CleanUp {
@@ -330,7 +332,9 @@ OnTimer5000:
 OnTimer300000:
     if ($@FEFE_CAVE_LEVEL > 0) end;
     if ($@FEFE_DELAY <= gettimetick(2)) StartFight();
-    announce $@FEFE_CAVE_HERO$+" invites everyone to a challenge against Candor Cave. It'll start in "+FuzzyTime($@FEFE_DELAY,2,2)+". Prepare yourselves!", bc_all|bc_npc;
+    .@msg$=$@FEFE_CAVE_HERO$+" invites everyone to a challenge against Candor Cave. It'll start in "+FuzzyTime($@FEFE_DELAY,2,2)+". Prepare yourselves!";
+    announce .@msg$, bc_all|bc_npc;
+    //channelmes("#world", .@msg$);
     initnpctimer;
     end;