From 69a6202cea85715ee8bd3183744b9f89f3e2c28e Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Sat, 16 May 2020 22:34:26 -0300
Subject: Allow World Expo and Catch the Golden Fish events to start Prepare
 their scoreboard function - HallOfAurora()

---
 npc/functions/aurora.txt | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'npc/functions/aurora.txt')

diff --git a/npc/functions/aurora.txt b/npc/functions/aurora.txt
index 7ebd4c616..5b84bf7b5 100644
--- a/npc/functions/aurora.txt
+++ b/npc/functions/aurora.txt
@@ -36,6 +36,11 @@ function	script	FYNewEvent	{
     $FYEVENT_CYCLE+=1;
     // Overrides standard event system
     $EVENT$="";
+    // Delayed cleanup (Just in case)
+    DelItemFromEveryPlayer(EventTreasure1);
+    DelItemFromEveryPlayer(EventTreasure2);
+    DelItemFromEveryPlayer(EventTreasure3);
+    DelItemFromEveryPlayer(EventFish);
     // Select the event
     switch ($FYEVENT_CYCLE % 12) {
     case 1:
@@ -43,6 +48,8 @@ function	script	FYNewEvent	{
         kamibroadcast("Kamelot Season is now open!", "Aurora Events");
         break;
     case 2:
+        $EVENT$="Expo";
+        kamibroadcast("World Expo is now open!", "Aurora Events");
         break;
     case 3:
         $EVENT$="Regnum";
@@ -50,6 +57,8 @@ function	script	FYNewEvent	{
         kamibroadcast("Regnum's Blessing: "+$@REGNUM_BLESSMAP_H$+" is now blessed!", "Aurora Events");
         break;
     case 4:
+        $EVENT$="Fishing";
+        kamibroadcast("Catch the Golden Fish is now open!", "Aurora Events");
         break;
     case 5:
         // FIXME: PLACEHOLDER
@@ -58,6 +67,8 @@ function	script	FYNewEvent	{
         break;
     case 6:
         // FIXME: PLACEHOLDER
+        $EVENT$="Expo";
+        kamibroadcast("World Expo is now open!", "Aurora Events");
         break;
     case 7:
         // FIXME: PLACEHOLDER
@@ -67,6 +78,8 @@ function	script	FYNewEvent	{
         break;
     case 8:
         // FIXME: PLACEHOLDER
+        $EVENT$="Fishing";
+        kamibroadcast("Catch the Golden Fish is now open!", "Aurora Events");
         break;
     case 9:
         // FIXME: PLACEHOLDER
@@ -75,6 +88,8 @@ function	script	FYNewEvent	{
         break;
     case 10:
         // FIXME: PLACEHOLDER
+        $EVENT$="Expo";
+        kamibroadcast("World Expo is now open!", "Aurora Events");
         break;
     case 11:
         // FIXME: PLACEHOLDER
@@ -84,6 +99,8 @@ function	script	FYNewEvent	{
         break;
     case 12:
         // FIXME: PLACEHOLDER
+        $EVENT$="Fishing";
+        kamibroadcast("Catch the Golden Fish is now open!", "Aurora Events");
         break;
     }
     return;
@@ -177,9 +194,14 @@ function	script	FYRewardEvent	{
         debugmes("Rewards are due");
         // This code absolutely can't fail:
 	    .@nb = query_sql("SELECT c.name, i.count2, c.char_id FROM `quest` AS i, `char` AS c WHERE i.quest_id="+Q_AuroraEvent+" AND i.char_id=c.char_id ORDER BY i.count2 DESC LIMIT 10", $@aurora_name$, $@aurora_value, $@aurora_charid);
+        $MOST_HEROIC$=$@aurora_name$[0];
         // rodex_sendmail($@aurora_charid, "Aurora Events", "Event Reward!", "Message", gp, item, $@aurora_value);
         // Destroy the quest
         DelQuestFromEveryPlayer(Q_AuroraEvent);
+        DelItemFromEveryPlayer(EventTreasure1);
+        DelItemFromEveryPlayer(EventTreasure2);
+        DelItemFromEveryPlayer(EventTreasure3);
+        DelItemFromEveryPlayer(EventFish);
     }
     return;
 }
-- 
cgit v1.2.3-70-g09d2