This should make Mana Stone error message more useful, and game smoother.

3 files changed, 18 insertions, 16 deletions

diff --git a/npc/009-2/librarian.txt b/npc/009-2/librarian.txt
index 72389d9b2..19e43642e 100644
--- a/npc/009-2/librarian.txt
+++ b/npc/009-2/librarian.txt
@@ -25,7 +25,7 @@ L_Advance:
     if (!.@nt || .@n == 6)
         goto L_Prologue;
 
-    // If you wait 7 - instead of 3 - hours, you are abusing.
+    // If you wait 7 - instead of 2 - hours, you are abusing.
     // So now, you must wait an extra hour.
     if (.@nt > santime()+(60*60*7)) {
         setq2 General_Narrator, santime()+(60*60);
@@ -58,8 +58,9 @@ L_Prologue:
     mesq l("Ah... I see. You are a lost soul, without parents, lost on the world with only some basic stuff.");
     next;
     mesn;
-    mesq l("Alright, I'll look in the archives. I'll have an answer for you in three hours. Meanwhile, why don't you suppress the bandits on the cliff?");
-    setq General_Narrator, 7, santime()+(60*60*3);
+    mesq l("Alright, I'll look in the archives. I'll have an answer for you in two hours. Meanwhile, why don't you suppress the bandits on the cliff?");
+    // Please wait 2 hours
+    setq General_Narrator, 7, santime()+(60*60*2);
     next;
     mesn;
     mesq l("Also, Halinarzo is famous for the depleted mana mines in the town. You probably won't find a mana stone there, but it might be cool to look.");
diff --git a/npc/009-2/scholar.txt b/npc/009-2/scholar.txt
index cade0342b..138008b6b 100644
--- a/npc/009-2/scholar.txt
+++ b/npc/009-2/scholar.txt
@@ -3,7 +3,7 @@
 //    TMW-LoF Team
 //    Jesusalva
 // Description:
-//    Permanently repeatable quest, without any special limit
+//    Encourages players to get magic and keep the game interesting
 // HalinarzoQuest_MageEquipment
 //  0 - Haven't started
 //  1 - Listened to intro about mage equipments.
diff --git a/npc/011-1/manastone.txt b/npc/011-1/manastone.txt
index f468deedb..e4a2255e9 100644
--- a/npc/011-1/manastone.txt
+++ b/npc/011-1/manastone.txt
@@ -35,13 +35,14 @@
     close;
 
 
-L_NotWorthy:
-    if (readparam(Sp) != readparam(MaxSp))
-        dispbottom l("I must have full MP to touch it... Which I don't.");
-    else
-        dispbottom l("I should train my intelligence, and level up, both my base as my Job Level.");
+
+L_NotWorthy2:
+    if (is_gm()) movenpc .name$, 20+rand(150), 20+rand(150);
+    if (is_gm()) close;
     npctalk3 l("You are not worthy!");
-    percentheal min(-10, -70+BaseLevel), min(-10, -100+BaseLevel);
+    percentheal -20, -50;
+    if (!MAGIC_LVL)
+        dispbottom l("I should train my intelligence, have full MP, and don't neglect even Job Level.");
     end;
 
 L_Level:
@@ -57,13 +58,13 @@ L_Level:
     if (is_gm()) percentheal -20, -50;
     if (MAGIC_LVL >= 7 || is_gm()) close;
 
-L_NotWorthy2:
-    if (is_gm()) movenpc .name$, 20+rand(150), 20+rand(150);
-    if (is_gm()) close;
+L_NotWorthy:
+    if (readparam(Sp) != readparam(MaxSp))
+        dispbottom l("I must have full MP to touch it... Which I don't.");
+    else
+        dispbottom l("I should train my intelligence, and level up, both my base as my Job Level.");
     npctalk3 l("You are not worthy!");
-    percentheal -20, -50;
-    if (!MAGIC_LVL)
-        dispbottom l("I should train my intelligence, have full MP, and don't neglect even Job Level.");
+    percentheal min(-10, -70+BaseLevel), min(-10, -100+BaseLevel);
     end;
 
 L_LevelUp: