1 files changed, 25 insertions, 24 deletions
diff --git a/npc/009-3/sword.txt b/npc/009-3/sword.txt
index b026b023..0cfd0d93 100644
--- a/npc/009-3/sword.txt
+++ b/npc/009-3/sword.txt
@@ -29,22 +29,22 @@ L_message:
     if (@Q_status == @STATUS_W11) goto L_L2_almost_done;
     if (@Q_status == @STATUS_W11_12) goto L_L2_almost_done;
 
-    mes "[Magic Sword]";
+    mesn l("Magic Sword");
     mes "\"Come back when thou art stronger.\"";
     close;
 
 L_Initial:
-    mes "[Magic Sword]";
+    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!\"";
     next;
-    mes "[Magic Sword]";
+    mesn l("Magic Sword");
     mes "Well, either you are going mad, or that sword in the stone is talking to you.";
     next;
-    mes "[Magic Sword]";
+    mesn l("Magic Sword");
     mes "Or, well, both.";
     next;
-    mes "[Magic Sword]";
+    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.\"";
     next;
@@ -57,12 +57,12 @@ L_Initial:
         "Can you teach me magic?", L_Next;
 
 L_Next:
-    mes "[Magic Sword]";
+    mesn l("Magic Sword");
     mes "There is no answer.";
     close;
 
 L_PostFlareDart:
-    mes "[Magic Sword]";
+    mesn l("Magic Sword");
     mes "As you look at the sword, you hear a deep voice resounding in your head.";
     mes "\"Welcome, mortal!\"";
     next;
@@ -73,12 +73,12 @@ L_PostFlareDart:
         "Bye!", L_close;
 
 L_PostFlareDart_hi:
-    mes "[Magic Sword]";
+    mesn l("Magic Sword");
     mes "\"Mortal... I have seen pain and death beyond thine reckoning!  Mock me not with thine idle questions!\"";
     close;
 
 L_PostFlareDart_sister:
-    mes "[Magic Sword]";
+    mesn l("Magic Sword");
     mes "\"My sister...?  Alas!  I remember now; abandoned she was, just as I; buried in stone, never to be wielded again.\"";
     mes "\"Wherefore did she send thee?\"";
     next;
@@ -86,10 +86,10 @@ L_PostFlareDart_sister:
         "She asked me to ask you to teach me a spell.", L_PostFlareDart_teach;
 
 L_PostFlareDart_teach:
-    mes "[Magic Sword]";
+    mesn l("Magic Sword");
     mes "\"Beware, mortal... the only spells I can teach thee are those of the school of war. Dark and dreary spells, that lot!  Pain and misery is all they bring...\"";
     next;
-    mes "[Magic Sword]";
+    mesn l("Magic Sword");
     mes "The sword's voice is growing apprehensive.";
     mes "\"Once a spell has been learned, it cannot be taken back, no more than a death can be undone. So be careful, mortal... dost thou truly wish to know the secrets of thus destructive power?\"";
     next;
@@ -98,21 +98,22 @@ L_PostFlareDart_teach:
         "No.", L_close;
 
 L_Next1:
-    mes "[Magic Sword]";
+    mesn l("Magic Sword");
     mes "\"So thou art bound to the path of War, as am I, as is my sister...\"";
     next;
-    mes "[Magic Sword]";
-    mes "\"So be it, fellow warrior. Hear the incantation for the blade spell: '" + get(.invocation$, "magic-blade") + "'\"";
+    mesn l("Magic Sword");
+    mesq l("So be it, fellow warrior. Hear the incantation for the blade spell: '%s'", b("Chiza"));
     mes "\"Hold a knife, sharp or regular, when thou speakest it.\"";
+    learnskill SKILL_CHIZA;
     @Q_status = @STATUS_LEARNED_MAGICBLADE;
     callsub S_Update_Var;
     next;
-    mes "[Magic Sword]";
+    mesn l("Magic Sword");
     mes "\"But beware... the path of war that thou hast embarked upon is one from which few return. May luck be on thy side...\"";
     close;
 
 L_PostFlareDart_teach2:
-    mes "[Magic Sword]";
+    mesn l("Magic Sword");
     mes "\"Seek out my sister, and leave me alone in my sorrows.\"";
     next;
     goto L_close;
@@ -121,7 +122,7 @@ L_close:
     close;
 
 L_L2_W11:
-    mes "[Magic Sword]";
+    mesn l("Magic Sword");
     mes "\"Thou hast returned. That must mean that thy wish to learn the magic of war is still alive?\"";
     next;
     menu
@@ -129,7 +130,7 @@ L_L2_W11:
         "Yes, teach me more!", L_Next2;
 
 L_Next2:
-    mes "[Magic Sword]";
+    mesn l("Magic Sword");
     mes "\"If that is thou wishest, I shall not stop thee. But do not expect to find merriment down this road.\"";
     mes "\"I must ask that thou sacrificest five thousand monster points for this, however.\"";
     menu
@@ -139,7 +140,7 @@ L_Next2:
 L_Next3:
     if (Mobpt < 5000)
         goto L_lacking_mobpoints;
-    mes "[Magic Sword]";
+    mesn l("Magic Sword");
     mes "\"So be it, then.\"";
     mes "[1000 experience points]";
     Mobpt = Mobpt - 5000;
@@ -147,25 +148,25 @@ L_Next3:
     @Q_status = @Q_status + 1;
     callsub S_Update_Var;
     next;
-    mes "[Magic Sword]";
+    mesn l("Magic Sword");
     mes "\"The spell I shall teach thee is the hail of arrows spell. It will make arrows fall down from the heavens unto thy enemies.\"";
     next;
-    mes "[Magic Sword]";
+    mesn l("Magic Sword");
     mes "\"Take twenty arrows, sprinkle sulphur powder over them, and then speak '" + get(.invocation$, "arrow-hail") + "'. Throw them high up in the air, and watch the hail unfold before thy feet.\"";
     close;
 
 L_L2_almost_done:
-    mes "[Magic Sword]";
+    mesn l("Magic Sword");
     mes "\"Return to my sister now. I expect that she shall teach thee one more spell.\"";
     close;
 
 L_lacking_mobpoints:
-    mes "[Magic Sword]";
+    mesn l("Magic Sword");
     mes "\"Thou lackest the monster points needed to prove thy worthiness. I shall not reveal more to thee until thou hast slain more monsters.\"";
     close;
 
 L_Farewell2:
-    mes "[Magic Sword]";
+    mesn l("Magic Sword");
     mes "\"Please leave me in peace.\"";
     close;