(To be honest, it looks a bit weird, but...)

1 files changed, 90 insertions, 11 deletions

diff --git a/npc/003-1/events.txt b/npc/003-1/events.txt
index a28007f9b..4cb31b4e8 100644
--- a/npc/003-1/events.txt
+++ b/npc/003-1/events.txt
@@ -18,7 +18,12 @@
     function handleEaster;
     function handleValentine;
     function handleStPatrick;
-    function handleAurora;
+
+    // Aurora Event functions
+    function auroraRankings;
+    function auroraCurrentRankings;
+    function auroraClaimRewards;
+    function auroraListRewards;
 
     // Handle annuals
     //.@v_stday = getvariableofnpc(.valentine_stday, "#EventCore");
@@ -50,14 +55,9 @@
 
     // Another event is going on, smoothly handle it
     if ($EVENT$ != "")
-        handleAurora();
+        goto L_Aurora;
     else
         mesc l("Currently, there is no event going on."), 1;
-
-    // We finished, possibly without speaking a single word D:
-    mes "";
-    mesn;
-    mesq l("Remember, you can talk to my friends in other towns as well!");
     close;
 
 
@@ -307,7 +307,7 @@ function handleStPatrick {
 
 
 /////////////////////////////////////////////////////////////////////////////////
-function handleAurora {
+L_Aurora:
     // Define script variables
     .@WHAT$=l("event");
 
@@ -323,21 +323,100 @@ function handleAurora {
     }
 
     mesn;
-    mesq l("Hello! I am Aurora, and I oversee the %s!");
+    mesq l("Hello! I am Aurora, and I oversee the %s!", .@WHAT$);
     next;
     mesn;
     mesq l("So, how can I help you today?");
+    do
+    {
     next;
     select
         l("Event Details"),
-        l("Event Rankings"),
-        rif(true, l("Current scoreboard")),
+        l("Event Ranking Rewards"),
+        l("Current Rankings"),
+        l("List rewards"),
         l("Claim rewards"),
         l("That's all, thanks!");
     mes "";
+    switch (@menu) {
+    case 1:
+        EventHelp();
+        mesc l("You must claim all rewards and use any event item BEFORE it ends."), 1;
+        mesc l("Left-overs will be deleted shortly after."), 1;
+        mesc l("Any eventual ranking reward will be sent by the banker's mail."), 1;
+        break;
+
+    case 2:
+        auroraRankings();
+        break;
+
+    case 3:
+        auroraCurrentRankings();
+        break;
+
+    case 4:
+        auroraListRewards();
+        break;
+
+    case 5:
+        auroraClaimRewards();
+        break;
+
+    default:
+        close;
+    }
+    // The code block is done
+    } while (true);
+close;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+/////////////////////////////////////////////////////////////////////////////////
+function auroraRankings {
+    setnpcdialogtitle l("Aurora Events")+" - "+$EVENT$;
+    setskin "aurora_"+$EVENT$;
+    mes "There is no ranking information available for this event.";
+    select("Ok");
+    setskin "";
+    clear;
+    auroraCurrentRankings(); // More to silence a bug than whatelse
     return;
 }
 
+function auroraCurrentRankings {
+    HallOfAurora();
+    return;
+}
+
+// TODO
+function auroraClaimRewards {
+    return;
+}
+
+function auroraListRewards {
+    return;
+}