Improvements to quest, I'll finish this tomorrow

2 files changed, 13 insertions, 8 deletions

diff --git a/npc/014-3/fountain.txt b/npc/014-3/fountain.txt
index bfe9b6507..9078d1e14 100644
--- a/npc/014-3/fountain.txt
+++ b/npc/014-3/fountain.txt
@@ -90,7 +90,7 @@ L_Tier2Ok:
     mes col("Your body starts to glow. You're not sure why, the fountain did that!", 9);
     next;
     mesn;
-    mes l("I am the Magic Fountain of Hurnscald. You are qualified.");
+    mes l("I am the Magic Fountain of Hurnscald. You look qualified.");
     next;
     mesn;
     mes l("Your next step is to get the book of the Second Sage Of Fate.");
@@ -104,13 +104,16 @@ L_Tier2Ok:
     // 4~6 minutes to finish in average. Each level grants 4~6 extra seconds.
     QUEST_ELEVARTEMPO=gettimetick(2)+rand((BaseLevel*4),(BaseLevel*6));
     ST_TIER=6;
+    // Ref. 240 xp. You will be penalized with 1 xp for over-level. (waw...)
+    if (BaseLevel < 300)
+        getexp 300-BaseLevel, 0;
     mesn;
     mesq l("Run like the wind, @@! For you shall have only @@ to finish the ritual!", strcharinfo(0), FuzzyTime(QUEST_ELEVARTEMPO,2,2));
     close;
 
 OnInit:
     .COST_PER_BOTTLE = 0;
-    .sex = G_MALE;
+    .sex = G_OTHER;
     .distance = 7;
 
     .@npcId = getnpcid(0, .name$);
diff --git a/npc/functions/class.txt b/npc/functions/class.txt
index b1e404a24..2ff9b684d 100644
--- a/npc/functions/class.txt
+++ b/npc/functions/class.txt
@@ -139,7 +139,7 @@ L_Tier2Ok:
     mesq l("Now, the real challenge will start. You have a lot of raw power, but that doesn't gives you a lot of skills to learn.");
     next;
     mesn;
-    mesq l("I can make a nice, simple potion for you. Once you drink it, the raw mana will settle on your body.");
+    mesq l("I can make a nice, simple potion for you. That will help the raw mana to settle on your body.");
     next;
     mesn;
     mesq l("However, beware! That potion is short-lived, you'll be running against time. Get ready to travel a lot.");
@@ -206,13 +206,13 @@ L_T2_S1:
     .@OTHER=getarg(2);
     mes "";
     mesn;
-    mesq l("So, young disciple! I wish I could just chant some gibberish words and that automatically granted you more skills, but allas, that won't work.");
+    mesq l("So, young disciple! I wish I could just chant some gibberish words and that automatically granted you more skills, but alas, that won't work.");
     next;
     mesn;
-    mesq l("I can, however, prepare you a potion. But beware, that potion will only last 30 minutes once baked.");
+    mesq l("I can, however, prepare you a potion. But beware, that potion will only last 35 minutes once baked.");
     next;
     mesn; // PiberriesInfusion
-    mesq l("If it expires, you'll need to do another. To bake it I need 1 @@, 10 @@ and a @@. Have Mauve, lots of it.", getitemlink(EverburnPowder), getitemlink(MaggotSlime), getitemlink(EmptyBottle));
+    mesq l("If it expires, you'll need to do another. To bake it I need 1 @@, 10 @@ and a @@. Have Mauve and Money, lots of it.", getitemlink(EverburnPowder), getitemlink(MaggotSlime), getitemlink(EmptyBottle));
     next;
     select
         rif(countitem(MaggotSlime) >= 10 && countitem(EverburnPowder) && countitem(EmptyBottle), l("I have everything.")),
@@ -228,14 +228,16 @@ L_T2_S1:
     delitem EmptyBottle, 1;
     delitem EverburnPowder, 1;
     delitem MaggotSlime, 10;
-    getexp 500, 0;
+    ST_TIER=2;
+    set QUEST_ELEVARTEMPO, gettimetick(2) + (60 * 35);
+    getexp 400, 0;
     mesn;
     mes col("The class master mix the powder with the slime inside the bottle, and makes some weird mixture.", 9);
     next;
     mesn;
     mes col("He pours something on it, you're not sure what. He then utters some magic words.", 9);
     next;
-    ST_TIER=2;
+    // Reset timer, this is the place where it should really happen.
     set QUEST_ELEVARTEMPO, gettimetick(2) + (60 * 35);
     mesn;
     mesq l("The potion is baked, you have thirty five minutes! Read as fast as you can, don't miss details!");