New Passive Aurora Event: Candor Battle Season

Loops happen every 6 weeks (ie. 1 month and half)
This is how long it takes before an event repeat itself. Improvement!

4 files changed, 46 insertions, 26 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$);
diff --git a/npc/commands/event.txt b/npc/commands/event.txt
index af1081391..dbfa779ac 100644
--- a/npc/commands/event.txt
+++ b/npc/commands/event.txt
@@ -322,6 +322,7 @@ function	script	GlobalEventMenu	{
             ("Enable Demure's Birthday"),
             ("[FY] Enable Kamelot"),
             ("[FY] Enable Regnum Blessing"),
+            ("[FY] Enable Candor Season"),
             ("Reset Kill Saulc Event (Monthly)");
 
         switch (@menu) {
@@ -374,7 +375,11 @@ function	script	GlobalEventMenu	{
                 dispbottom l("Blessing applied at: %s", $REGNUM_BLESSMAP_H$);
                 logmes "Enabled REGNUM event.", LOGMES_ATCOMMAND;
                 break;
-            case 12: DelItemFromEveryPlayer(MurdererCrown); break;
+            case 12:
+                $EVENT$="Candor";
+                logmes "Enabled CANDOR event.", LOGMES_ATCOMMAND;
+                break;
+            case 13: DelItemFromEveryPlayer(MurdererCrown); break;
         }
 
         return;
diff --git a/npc/functions/aurora.txt b/npc/functions/aurora.txt
index 08e325a9e..fa07d4964 100644
--- a/npc/functions/aurora.txt
+++ b/npc/functions/aurora.txt
@@ -79,9 +79,8 @@ function	script	FYNewEvent	{
         kamibroadcast("Catch the Golden Fish is now open!", "Aurora Events");
         break;
     case 5:
-        // FIXME: PLACEHOLDER
-        $EVENT$="Kamelot";
-        kamibroadcast("Kamelot Season is now open!", "Aurora Events");
+        $EVENT$="Candor";
+        kamibroadcast("Candor Battle Season is now open!", "Aurora Events");
         break;
     case 6:
         $EVENT$="Mining";
@@ -90,9 +89,8 @@ function	script	FYNewEvent	{
         break;
     case 7:
         // FIXME: PLACEHOLDER
-        $EVENT$="Regnum";
-        callfunc("FYE_Regnum");
-        kamibroadcast("Regnum's Blessing: "+$REGNUM_BLESSMAP_H$+" is now blessed!", "Aurora Events");
+        $EVENT$="Kamelot";
+        kamibroadcast("Kamelot Season is now open!", "Aurora Events");
         break;
     case 8:
         // FIXME: PLACEHOLDER
@@ -102,8 +100,9 @@ function	script	FYNewEvent	{
         break;
     case 9:
         // FIXME: PLACEHOLDER
-        $EVENT$="Kamelot";
-        kamibroadcast("Kamelot Season is now open!", "Aurora Events");
+        $EVENT$="Regnum";
+        callfunc("FYE_Regnum");
+        kamibroadcast("Regnum's Blessing: "+$REGNUM_BLESSMAP_H$+" is now blessed!", "Aurora Events");
         break;
     case 10:
         // FIXME: PLACEHOLDER
@@ -113,9 +112,8 @@ function	script	FYNewEvent	{
         break;
     case 11:
         // FIXME: PLACEHOLDER
-        $EVENT$="Regnum";
-        callfunc("FYE_Regnum");
-        kamibroadcast("Regnum's Blessing: "+$REGNUM_BLESSMAP_H$+" is now blessed!", "Aurora Events");
+        $EVENT$="Candor";
+        kamibroadcast("Candor Battle Season is now open!", "Aurora Events");
         break;
     case 12:
         // FIXME: PLACEHOLDER
@@ -471,7 +469,7 @@ function	script	FYE_Submit	{
 
 // Stops any Aurora Event
 function	script	FYStopEvent	{
-    setarray .@av$, "Kamelot", "Regnum", "Expo", "Fishing", "Mining";
+    setarray .@av$, "Kamelot", "Regnum", "Expo", "Fishing", "Candor", "Mining";
     if (array_find(.@av$, $EVENT$) >= 0) {
         sClear();
         $EVENT$="";
diff --git a/npc/functions/news.txt b/npc/functions/news.txt
index 0cb559239..e5df9ac40 100644
--- a/npc/functions/news.txt
+++ b/npc/functions/news.txt
@@ -79,7 +79,7 @@ function	script	EventHelp	{
         /////////////////////////////////////////////////////////////////////////
         mesc ".:: " + l("Kamelot Raid") + " ::.", 2;
         mes "";
-        mes l("Group togheter your guild and challenge the evil power,");
+        mes l("Group together your guild and challenge the evil power,");
         mes l("which creeps over Kamelot! During this event, the ancient");
         mes l("evil will return every day to curse King Arthur the Micksha.");
         mes "";
@@ -221,6 +221,15 @@ function	script	EventHelp	{
         mes l("Mysterious Powder expires after some time!");
         mesc l("Location: All bifs in the world."), 3;
         /////////////////////////////////////////////////////////////////////////
+    } else if ($EVENT$ == "Candor") {
+        mesc ".:: " + l("Candor Battle Season") + " ::.", 2;
+        mes "";
+        mes l("During this season, challenges to Crazyfefe will be free.");
+        mes l("Will you accept his challenge?!");
+        mes "";
+        mes l("Raise to the highest top score!");
+        mesc l("Location: Candor B1F"), 3;
+        /////////////////////////////////////////////////////////////////////////
     } else {
         mesc l("There's no help available for this event.");
         /////////////////////////////////////////////////////////////////////////