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!

2 files changed, 20 insertions, 13 deletions

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.");
         /////////////////////////////////////////////////////////////////////////