Some specification + Fishing event description (finally)

3 files changed, 27 insertions, 6 deletions

diff --git a/npc/functions/aurora.txt b/npc/functions/aurora.txt
index a88caa106..cab1be9c7 100644
--- a/npc/functions/aurora.txt
+++ b/npc/functions/aurora.txt
@@ -19,12 +19,27 @@
 //          pay special attention to them.
 //      $FYEVENT_CYCLE
 //          Current cycle. I thought in using gettimeparam(WEEK) but gave up.
+//      Q_AuroraEvent
+//          Quest Variable: DayCtrl, Score, ClaimedControl
+//
+// Event Specific Variables:
 //      $REGNUM_BLESSMAP$
 //          Map under Regnum's Blessing
 //      $REGNUM_BLESSMAP_H$
 //          Human-readable form of the map under Regnum's Blessing
-//      Q_AuroraEvent
-//          Quest Variable: DayCtrl, Score, ClaimedControl
+//
+//      $FYREWARD_PT
+//          Array with minimum points for rewards (primary key)
+//      $FYREWARD_ID
+//          Array with claimable reward IDs
+//      $FYREWARD_AM
+//          Array with the amount of the reward ID you'll receive
+//      $FYLOGIN_PTS
+//          How many event score boost you'll receive for daily login
+//
+//      $WORLDEXPO_ENEMY$
+//          Name of the enemy responsible for ruining the World's Expo
+
 
 // AEF: BEGIN
 function	script	FYNewEvent	{
diff --git a/npc/functions/event.txt b/npc/functions/event.txt
index 8f55bfb21..902f6e21b 100644
--- a/npc/functions/event.txt
+++ b/npc/functions/event.txt
@@ -300,6 +300,8 @@ OnClock0000:
         .@dofy=true;
         .@confname$=".conf_"+.@m;
 
+        // NOTE: Maybe make a single .annuals array and cycle it
+        // Gather the ST variable from interest...?
         for (.@i=0;.@i < getarraysize(getd(.@confname$)); .@i++) {
             .@val=getd(.@confname$+"["+.@i+"]");
             //debugmes "Looping, %d = %d", .@i, .@val;
@@ -313,6 +315,9 @@ OnClock0000:
             // So they might still overlap.
             // A possible solution is to, eventually, record start and end date.
             // And only inhibit FY event if the MONDAY is within the event...?
+            // XXX: Now it inhibits by itself; But it should NOT begin a FYE if
+            // another (annual) event is scheduled for the same week.
+            // Namely: TMW2 Day and Thanksgiving
             debugmes "%d >= %d && %d <= %d", .@val, .@d-6, .@val, .@d+6;
             // In this case there's already an event!
             // .@d == .@val <= .@d+6 AND
diff --git a/npc/functions/news.txt b/npc/functions/news.txt
index 400fc4564..79e6b0abb 100644
--- a/npc/functions/news.txt
+++ b/npc/functions/news.txt
@@ -487,11 +487,12 @@ function	script	EventHelp	{
     } else if ($EVENT$ == "Fishing") {
         mesc ".:: " + l("Catch the Golden Fish!") + " ::.", 2;
         mes "";
-        mes l("yadda yadda yadda");
-        mes l("While fishing you may randomly get a golden fish");
+        mes l("A few times during the year, the \"golden wave\" migrates from the north pole to the south pole.");
+        mes l("As a result, while fishing you may randomly get a golden fish.");
         mes "";
-        mes l("yadda yadda yadda");
-        mes l("Return them at the event NPC in Tulimshar");
+        mes l("These gold fishes multiply horribly and have no natural predator.");
+        mes l("If left unchecked for long, they will eventually become the only specie on the sea.");
+        mes l("Help controlling their population, and return those you fish to Aurora!");
         mes "";
         mes l("Catch the golden fish swarm!");
         mesc l("Location: Fishing spots in the water."), 3;