1 files changed, 20 insertions, 12 deletions

diff --git a/npc/006-1/crazyfefe.txt b/npc/006-1/crazyfefe.txt
index 9b32a6ffd..3530d29b5 100644
--- a/npc/006-1/crazyfefe.txt
+++ b/npc/006-1/crazyfefe.txt
@@ -105,18 +105,25 @@ function aboutCandor {
 
 function Challenge {
     pleaseWait();
-    mesn;
-    mesq l("Very well, but for a fee of @@ GP. There's no free lunch, after all!", .price);
-    mesc l("A minimum of 3 players at the time of start is required!"), 1;
-
-    // Not enough money? We end here.
-    if (Zeny < .price)
-        close;
-    next;
+    if ($EVENT$ != "Candor") {
+        mesn;
+        mesq l("Very well, but for a fee of @@ GP. There's no free lunch, after all!", .price);
+        mesc l("A minimum of %d players at the time of start is required!", 2), 1;
+
+        // Not enough money? We end here.
+        if (Zeny < .price)
+            close;
+        next;
+    } else {
+        mesn;
+        mesq l("Very well, let's see what you are made of!");
+        mesc l("A minimum of %d players at the time of start is required!", 2), 1;
+        next;
+    }
 
     menuint
          l("Sorry, I misclicked the first button. Have a nice nap, great Crazyfefe!"), -1,
-         rif(is_gm(), l("I'm GM and got the money. START THIS CRAP ALREADY!")), 0,
+         rif(is_gm() || $EVENT$ == "Candor", l("WHAT ARE WE WAITING FOR?! START ALREADY!")), 0,
          l("Yeah, I have the money. Give me FIVE minutes, and Bring it on!"), 5,
          l("Yeah, I have the money. Give me TEN minutes, and Bring it on!"), 10,
          l("Yeah, I have the money. Give me FIFTEEN minutes, and Bring it on!"), 15,
@@ -135,7 +142,8 @@ function Challenge {
     }
 
     // Use the money
-    Zeny = Zeny - .price;
+    if ($EVENT$ != "Candor")
+        Zeny -= .price;
     // Time delay
     $@FEFE_DELAY = gettimetick(2)+60*@menuret;
     $@FEFE_CAVE_HERO$ = strcharinfo(0);
@@ -325,7 +333,7 @@ OnReward:
     .@prize=rand($@FEFE_WAVE/2,$@FEFE_WAVE)*2;
     // $@FEFE_DIFFICULTY might not be available anymore
     if ($@FEFE_WAVE % 5 == 0)
-        Zeny=Zeny+.@prize;
+        Zeny+=.@prize;
     getexp .@prize, rand(1,3);
     @crazypoints+=1;
     end;
@@ -340,7 +348,7 @@ OnTimer5000:
 OnTimer300000:
     if ($@FEFE_CAVE_LEVEL > 0) end;
     if ($@FEFE_DELAY <= gettimetick(2)) StartFight();
-    .@msg$=$@FEFE_CAVE_HERO$+" invites everyone to a challenge against Candor Cave. It'll start in "+FuzzyTime($@FEFE_DELAY,2,2)+". Prepare yourselves!";
+    .@msg$=$@FEFE_CAVE_HERO$+" invites everyone to a challenge against Candor Cave. It'll start in "+FuzzyTime($@FEFE_DELAY)+". Prepare yourselves!";
     announce .@msg$, bc_all|bc_npc;
     //channelmes("#world", .@msg$);
     //kamibroadcast(.@msg$);