Fill in some of the Hocus NPC, and fix a bad rule

2 files changed, 50 insertions, 16 deletions

diff --git a/npc/001-14/ctrl.txt b/npc/001-14/ctrl.txt
index 05644c1e4..dbccadf92 100644
--- a/npc/001-14/ctrl.txt
+++ b/npc/001-14/ctrl.txt
@@ -33,10 +33,13 @@ OnInit:
     end;
 }
 
-// FIXME
 001-14,135,61,0	script	Hocus#MOLY0200	NPC_BLACKWIZARD,{
-    npctalk l("Intensive Mage Challenge");
-    end;
+    mes ".:: " + l("Intensive Mage Challenge") + ":: .";
+    mes l("Description: Use a lot of magic spells, regardless of type or raw strength. Points earned by skill level.");
+    mesc l("Note: Passives and some skills (e.g. Resync) doesn't count."), 1;
+    mes "";
+    mesc l("Your progress thus far: %s skills casted", fnum(FYMOLY_SPAMMY)), 3;
+    close;
 
 OnInit:
     .distance=7;
@@ -53,20 +56,39 @@ OnInit:
     end;
 }
 
-// FIXME
+// Note: Do player knows any chants?
 001-14,135,117,0	script	Hocus#MOLY0400	NPC_BLACKWIZARD,{
-    npctalk l("Chanting Challenge");
-    end;
+    mes ".:: " + l("Chanting Challenge") + ":: .";
+    mes l("Description: Use chant-based magic. All chants score equally.");
+    mes "";
+    mesc l("Your progress thus far: %s chants casted", fnum(FYMOLY_CHANTI)), 3;
+    close;
 
 OnInit:
     .distance=7;
     end;
 }
 
-// FIXME
 001-14,119,135,0	script	Hocus#MOLY0500	NPC_NICHOLAS,{
-    npctalk l("Alchemy Master Challenge");
-    end;
+    mes ".:: " + l("Alchemy Master Challenge") + ":: .";
+    mes l("Description: Whoever crafts more potions, regardless of type, wins this event.");
+    mes "";
+    mesc l("Your progress thus far: %s potions baked", fnum(FYMOLY_ALCHMY)), 3;
+    next;
+    // FREE brewing during event
+    do {
+        mesc l("What will you brew today?");
+        mes "";
+
+        if (AlchemySystem(CRAFT_PLAYER)) {
+            mesc l("Success!"), 3;
+        } else {
+            mesc l("That didn't work!"), 1;
+        }
+        next;
+        mesc l("Try again?");
+    } while (askyesno() == ASK_YES);
+    close;
 
 OnInit:
     .distance=7;
@@ -83,10 +105,12 @@ OnInit:
     end;
 }
 
-// FIXME
 001-14,54,133,0	script	Hocus#MOLY0700	NPC_BLACKWIZARD,{
-    npctalk l("Experience Challenge");
-    end;
+    mes ".:: " + l("Mana Experience Challenge") + ":: .";
+    mes l("Description: Similar to Intensive Mage, but measures mana experience - meaning even less skills will count, and swapping skills give a better effect.");
+    mes "";
+    mesc l("Your progress thus far: %s exp earned", fnum(FYMOLY_MANAXP)), 3;
+    close;
 
 OnInit:
     .distance=7;
@@ -123,10 +147,13 @@ OnInit:
     end;
 }
 
-// FIXME
 001-14,62,37,0	script	Hocus#MOLY1100	NPC_BLACKWIZARD,{
-    npctalk l("Friendship's Strength Challenge");
-    end;
+    mes ".:: " + l("Friendship's Strength Challenge") + ":: .";
+    mes l("Description: Use support skills and win the event with the power of FRIENDSHIP!");
+    mesc l("Note: Support skills used on self does not count."), 1;
+    mes "";
+    mesc l("Your progress thus far: %s friends supported", fnum(FYMOLY_FRIEND)), 3;
+    close;
 
 OnInit:
     .distance=7;
diff --git a/npc/functions/aurora.txt b/npc/functions/aurora.txt
index 246821e4c..8e9c45800 100644
--- a/npc/functions/aurora.txt
+++ b/npc/functions/aurora.txt
@@ -587,7 +587,14 @@ function	script	FYE_Olympics_SK	{
             FMOLY_FRIEND += 1;
 
     // Generic
-    FYMOLY_SPAMMY += .@sl;
+    if (.@sk != TMW2_FAKESKILL &&
+        .@sk != TMW2_FAKESKILL2 &&
+        .@sk != AM_CALLHOMUN &&
+        .@sk != AM_REST &&
+        .@sk != AM_RESURRECTHOMUN &&
+        .@sk != TMW2_TRANSMIGRATION &&
+        .@sk != TMW2_OVHFIRE)
+            FYMOLY_SPAMMY += .@sl;
     setq Q_AuroraEvent, getq2(Q_AuroraEvent) + rand2(.@sl + 1);
     return;
 }