Polish a bit the Magic Sword

2 files changed, 27 insertions, 22 deletions

diff --git a/npc/009-3/sword.txt b/npc/009-3/sword.txt
index 0cfd0d93..a22fba60 100644
--- a/npc/009-3/sword.txt
+++ b/npc/009-3/sword.txt
@@ -30,23 +30,23 @@ L_message:
     if (@Q_status == @STATUS_W11_12) goto L_L2_almost_done;
 
     mesn l("Magic Sword");
-    mes "\"Come back when thou art stronger.\"";
+    mesq l("Come back when thou art stronger.");
     close;
 
 L_Initial:
     mesn l("Magic Sword");
-    mes "As you look at the sword, you suddenly hear a voice in your head!";
-    mes "\"Welcome to my prison, mortal!\"";
+    mesc l("As you look at the sword, you suddenly hear a voice in your head!");
+    mesq l("Welcome to my prison, mortal!");
     next;
     mesn l("Magic Sword");
-    mes "Well, either you are going mad, or that sword in the stone is talking to you.";
+    mesc l("Well, either you are going mad, or that sword in the stone is talking to you.");
     next;
     mesn l("Magic Sword");
-    mes "Or, well, both.";
+    mesc l("Or, well, both.");
     next;
     mesn l("Magic Sword");
-    mes "The deep basso voice continues.";
-    mes "\"I know not what brought thee hither, but I kindly ask that thou leavest me alone in my sorrow.\"";
+    mesc l("The deep basso voice continues.");
+    mesq l("I know not what brought thee hither, but I kindly ask that thou leavest me alone in my sorrow.");
     next;
     menu
         "Leave", L_close,
@@ -58,7 +58,7 @@ L_Initial:
 
 L_Next:
     mesn l("Magic Sword");
-    mes "There is no answer.";
+    mesc l("There is no answer.");
     close;
 
 L_PostFlareDart:
diff --git a/npc/015-1/sword.txt b/npc/015-1/sword.txt
index 3c9594aa..d829793a 100644
--- a/npc/015-1/sword.txt
+++ b/npc/015-1/sword.txt
@@ -1,7 +1,7 @@
 015-1,97,97,0	script	#MagicSword#_M	NPC400,{
     if (getskilllv(SKILL_MAGIC))
         goto L_message;
-    mes "It appears to be an ordinary sword.";
+    mes l("It appears to be an ordinary sword.");
     close;
 
 L_message:
@@ -31,20 +31,20 @@ L_message:
     if (@Q_status == @STATUS_W11_12) goto L_L2_W10;
 
     mesn l("Mystic Sword");
-    mes "\"I have taught thee all I can teach for now.\"";
+    mesq l("I have taught thee all I can teach for now.");
     close;
 
 L_Initial:
     mesn l("Mystic Sword");
-    mes "At this point, the river deepens, slowing down to a leisurely pace. In its center you notice an unusual stone, waves breaking around it.";
-    mes "Sticking out of the rock is a sword hilt.";
+    mes l("At this point, the river deepens, slowing down to a leisurely pace. In its center you notice an unusual stone, waves breaking around it.");
+    mes l("Sticking out of the rock is a sword hilt.");
     next;
     mesn l("Mystic Sword");
-    mes "Suddenly, you hear a strange, metallic voice in your head, the voice of a woman.";
-    mes "\"A blissful day to thee, mortal!\"";
+    mesc l("Suddenly, you hear a strange, metallic voice in your head, the voice of a woman.");
+    mesq l("A blissful day to thee, mortal!");
     next;
     mesn l("Mystic Sword");
-    mes "\"What is it is that brings thee to this place?\"";
+    mesq l("What is it is that brings thee to this place?");
     next;
     menu
         "Who are you?", L_Noq,
@@ -54,18 +54,18 @@ L_Initial:
 
 L_Noq:
     mesn l("Mystic Sword");
-    mes "The voice sounds slightly amused.";
-    mes "\"How sad to hear how manners have degenerated in recent centuries. Farewell for now, dear mortal.\"";
+    mesc l("The voice sounds slightly amused.");
+    mesq l("How sad to hear how manners have degenerated in recent centuries. Farewell for now, dear mortal.");
     close;
 
 L_Initial_nothing:
     mesn l("Mystic Sword");
-    mes "\"Then I wish thee well in thy travels, wanderer!\"";
+    mesq l("Then I wish thee well in thy travels, wanderer!");
     close;
 
 L_Initial_learn:
     mesn l("Mystic Sword");
-    mes "\"Magic?  Unless I am very mistaken thou already possessest some magic. Yet perhaps I can grant thee some slight aid by providing a magical invocation?\"";
+    mes "\"Magic? Unless I am very mistaken thou already possessest some magic. Yet perhaps I can grant thee some slight aid by providing a magical invocation?\"";
     next;
     mesn l("Mystic Sword");
     mes "\"Alas, my nature is not quite conductive for spells of healing or protection, though I can bestow upon thee the powers for a rather more martial kind of power.\"";
@@ -150,7 +150,7 @@ L_FlareStage_moremagic:
 
 L_FlareStage_sulphur:
     mesn l("Mystic Sword");
-    mes "\"I do not know, though I suggest to seek out a local alchemist, if there is any.\"";
+    mesq l("I do not know, though I suggest to seek out a local alchemist, if there is any.");
     next;
     goto L_Farewell;
 
@@ -167,7 +167,7 @@ L_MagicBladeStage:
 
 L_Levelup2_yes:
     mesn l("Mystic Sword");
-    mes "\"Beware of what thou wishest for, mortal...\"";
+    mesq l("Beware of what thou wishest for, mortal...");
     next;
 
     if (!MPQUEST)
@@ -176,7 +176,7 @@ L_Levelup2_yes:
         goto L_Lvl2_must_practice;
 
     mesn l("Mystic Sword");
-    mes "\"Thou hast collected " + Mobpt + " Monster Points. For one thousand of them, I shall admit thee to the school of war magic.\"";
+    mesq l("Thou hast collected %s Monster Points. For one thousand of them, I shall admit thee to the school of war magic.", fnum(Mobpt));
     next;
     menu
         "OK!", L_Next1,
@@ -239,6 +239,11 @@ L_L2_W12:
 
 L_Next2:
     mesn l("Mystic Sword");
+    if (getskilllv(SKILL_MAGIC) < 2) {
+        mesq l("But alas, thou need more magical power for that.");
+        next;
+        goto L_Farewell;
+    }
     mes "\"Very well. I shall teach thee another spell, if thou provest thy progress by sacrificing another five thousand monster points.\"";
     next;
     menu