Allow skills to be obtained

1 files changed, 48 insertions, 46 deletions

diff --git a/npc/015-1/sword.txt b/npc/015-1/sword.txt
index f4be43b3..3c9594aa 100644
--- a/npc/015-1/sword.txt
+++ b/npc/015-1/sword.txt
@@ -30,20 +30,20 @@ L_message:
     if (@Q_status == @STATUS_W12) goto L_L2_almost_done;
     if (@Q_status == @STATUS_W11_12) goto L_L2_W10;
 
-    mes "[Mystic Sword]";
+    mesn l("Mystic Sword");
     mes "\"I have taught thee all I can teach for now.\"";
     close;
 
 L_Initial:
-    mes "[Mystic Sword]";
+    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.";
     next;
-    mes "[Mystic Sword]";
+    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!\"";
     next;
-    mes "[Mystic Sword]";
+    mesn l("Mystic Sword");
     mes "\"What is it is that brings thee to this place?\"";
     next;
     menu
@@ -53,21 +53,21 @@ L_Initial:
         "I am trying to learn magic!", L_Initial_learn;
 
 L_Noq:
-    mes "[Mystic Sword]";
+    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.\"";
     close;
 
 L_Initial_nothing:
-    mes "[Mystic Sword]";
+    mesn l("Mystic Sword");
     mes "\"Then I wish thee well in thy travels, wanderer!\"";
     close;
 
 L_Initial_learn:
-    mes "[Mystic Sword]";
+    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?\"";
     next;
-    mes "[Mystic Sword]";
+    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.\"";
     next;
     menu
@@ -76,7 +76,7 @@ L_Initial_learn:
         "I am quite interested.", L_Next;
 
 L_Next:
-    mes "[Mystic Sword]";
+    mesn l("Mystic Sword");
     mes "\"Why is it that thou seekest this power?\"";
     next;
     menu
@@ -87,36 +87,36 @@ L_Next:
         "To protect the ones I love!", L_Initial_protect;
 
 L_Initial_selfish:
-    mes "[Mystic Sword]";
+    mesn l("Mystic Sword");
     mes "\"Please return when thou art taking thy quest for magic a little more seriously.\"";
     close;
 
 L_Initial_dontknow:
-    mes "[Mystic Sword]";
+    mesn l("Mystic Sword");
     mes "\"A fair and honest thought at so early a point in thine quest.\"";
     goto L_Initial_ok;
 
 L_Initial_protect:
-    mes "[Mystic Sword]";
+    mesn l("Mystic Sword");
     mes "\"Quite a high and laundable goal thou hast chosen for thyself!  I do hope that thou canst live up to it.\"";
     goto L_Initial_ok;
 
 L_Initial_ok:
     mes "\"Hark, then, mortal!  For I shall bestow upon thee the secret of the flare dart spell!\"";
     next;
-    mes "[Mystic Sword]";
+    mesn l("Mystic Sword");
     mes "\"Oh, my apologies – that was a little overly dramatic. But I do not get to talk to thy kin anymore all that often.\"";
     next;
-    mes "[Mystic Sword]";
+    mesn l("Mystic Sword");
     mes "\"For the flare dart spell throw a handful of sulphur powder up into the air, and say, '" + b("flar") + "'.\"";
     learnskill SKILL_FLAR;
     @Q_status = @STATUS_LEARNED_FLAREDART;
     callsub S_Update_Var;
     next;
-    mes "[Mystic Sword]";
+    mesn l("Mystic Sword");
     mes "\"From then on, thou canst shoot fiery missiles from thy fingers, for a limited time.\"";
     next;
-    mes "[Mystic Sword]";
+    mesn l("Mystic Sword");
     mes "\"Use it wisely, mortal!.\"";
     next;
     goto L_Farewell;
@@ -128,13 +128,13 @@ L_FlareStage:
         "Where can I get sulphur powder?", L_FlareStage_impolite;
 
 L_FlareStage_impolite:
-    mes "[Mystic Sword]";
+    mesn l("Mystic Sword");
     mes "You hear a metallic chime in your head. After a second, you come to the conclusion that it was probably the sword sighing.";
     mes "\"Greetings to thee, too, mortal, and farewell until thou hast learned some proper manners.\"";
     close;
 
 L_FlareStage_hello:
-    mes "[Mystic Sword]";
+    mesn l("Mystic Sword");
     mes "\"Well met once more, mortal!  What brings thee here?\"";
     next;
     menu
@@ -143,22 +143,22 @@ L_FlareStage_hello:
         "Farewell!", L_Farewell;
 
 L_FlareStage_moremagic:
-    mes "[Mystic Sword]";
+    mesn l("Mystic Sword");
     mes "\"I can indeed!  But first I must see if thou art worthy. Find my brother, and talk to him!  If thou canst find him, he shall teach thee another spell.\"";
     next;
     goto L_Farewell;
 
 L_FlareStage_sulphur:
-    mes "[Mystic Sword]";
+    mesn l("Mystic Sword");
     mes "\"I do not know, though I suggest to seek out a local alchemist, if there is any.\"";
     next;
     goto L_Farewell;
 
 L_MagicBladeStage:
-    mes "[Mystic Sword]";
+    mesn l("Mystic Sword");
     mes "\"Welcome back!  Thou hast now learned two basic spells of War magic.\"";
     next;
-    mes "[Mystic Sword]";
+    mesn l("Mystic Sword");
     mes "\"Dost thou wish to continue thy pursuits of this school of magic?\"";
     next;
     menu
@@ -166,7 +166,7 @@ L_MagicBladeStage:
         "Yes.", L_Levelup2_yes;
 
 L_Levelup2_yes:
-    mes "[Mystic Sword]";
+    mesn l("Mystic Sword");
     mes "\"Beware of what thou wishest for, mortal...\"";
     next;
 
@@ -175,7 +175,7 @@ L_Levelup2_yes:
     if (MPQUEST && (Mobpt < 1000))
         goto L_Lvl2_must_practice;
 
-    mes "[Mystic Sword]";
+    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.\"";
     next;
     menu
@@ -185,18 +185,18 @@ L_Levelup2_yes:
 L_Next1:
     Mobpt = Mobpt - 1000;
 
-    mes "[Mystic Sword]";
+    mesn l("Mystic Sword");
     mes "The sword begins to chant in your head!";
     mes "\"Lords of Thunder, Fire, Rage!\"";
     mes "\"Grant thy powers to this mage,\"";
     mes "\"Rising with thy dreadful roar,\"";
     mes "\"Answer to their call to War!\"";
     next;
-    mes "[Mystic Sword]";
+    mesn l("Mystic Sword");
     mes "Your heart starts pounding, and suddenly you can hear the sound of drums in your head.";
     mes "You smell something metallic...";
     next;
-    mes "[Mystic Sword]";
+    mesn l("Mystic Sword");
     mes "The sensation and the noises vanish as quickly as they came.";
 
     @Q_status = @STATUS_LEVEL2;
@@ -207,7 +207,7 @@ L_Next1:
     callfunc "SkillUp";
     next;
 
-    mes "[Mystic Sword]";
+    mesn l("Mystic Sword");
     mes "\"Thou hast now taken thy first true step down the path of war magic.\"";
     if (getskilllv(SKILL_MAGIC) < 2)
         mes "\"When thou returnest, I shall teach thee another spell, but beware:  thou must increase thy overall grasp of magic before thou canst wield it!\"";
@@ -215,22 +215,22 @@ L_Next1:
     goto L_Farewell;
 
 L_Lvl2_must_reg:
-    mes "[Mystic Sword]";
+    mesn l("Mystic Sword");
     mes "\"To learn further magic, thou must advance in the school of war magic. I shall grant thee this advance if thou provest thy worthiness as a warrior.\"";
     next;
-    mes "[Mystic Sword]";
+    mesn l("Mystic Sword");
     mes "\"Travel to the city of Tulimshar, and talk to Aidan. Then, collect one thousand Monster Points and return to me.\"";
     next;
     goto L_Farewell;
 
 L_Lvl2_must_practice:
-    mes "[Mystic Sword]";
+    mesn l("Mystic Sword");
     mes "\"To advance thy magical powers, I must admit thee to the school of war magic. Prove to me that thou art a worthy warrior by collecting one thousand Monster Points, and return.\"";
     next;
     goto L_Farewell;
 
 L_L2_W12:
-    mes "[Mystic Sword]";
+    mesn l("Mystic Sword");
     mes "\"Welcome back, traveler!  Hast thou returned to advance in thy quest for magic?\"";
     next;
     menu
@@ -238,7 +238,7 @@ L_L2_W12:
         "Yes.", L_Next2;
 
 L_Next2:
-    mes "[Mystic Sword]";
+    mesn l("Mystic Sword");
     mes "\"Very well. I shall teach thee another spell, if thou provest thy progress by sacrificing another five thousand monster points.\"";
     next;
     menu
@@ -248,7 +248,7 @@ L_Next2:
 L_Next3:
     if (Mobpt < 5000)
         goto L_lacking_mobpoints;
-    mes "[Mystic Sword]";
+    mesn l("Mystic Sword");
     mes "\"Indeed thou art worthy. The next spell I shall teach thee will enchant thy knuckles to turn them into powerful weapons; the component is a mere beer.\"";
     mes "[1000 experience points]";
     Mobpt = Mobpt - 5000;
@@ -256,23 +256,24 @@ L_Next3:
     @Q_status = @Q_status + 2;
     callsub S_Update_Var;
     next;
-    mes "[Mystic Sword]";
-    mes "\"Speak '" + get(.invocation$, "magic-knuckles") + "' and take a glass of beer and drink it, without ever taking it off thy lips. This will harden and enchant thy fists, turning them into powerful weapons.\"";
+    mesn l("Mystic Sword");
+    mesq l("Speak '%s' and take a glass of beer and drink it, without ever taking it off thy lips. This will harden and enchant thy fists, turning them into powerful weapons.", b("Upmarmu"));
+    learnskill SKILL_UPMARMU;
     close;
 
 L_L2_almost_done:
-    mes "[Mystic Sword]";
+    mesn l("Mystic Sword");
     mes "\"Greetings once more, traveler!  I have another spell I wish to teach thee, but first thou must learn my brother's arrow spell.\"";
     close;
 
 L_L2_W10:
-    mes "[Mystic Sword]";
+    mesn l("Mystic Sword");
     mes "\"Welcome back!\"";
     next;
-    mes "[Mystic Sword]";
+    mesn l("Mystic Sword");
     mes "\"I shall now teach thee the final spell of this level of war magic. For further spells thou wilt have to increase thy magical powers more.\"";
     next;
-    mes "[Mystic Sword]";
+    mesn l("Mystic Sword");
     mes "\"For this spell, I ask that thou bringest a lump of iron ore. Thou must also sacrifice ten thousand monster points.\"";
     next;
     menu
@@ -285,7 +286,7 @@ L_Next4:
     if (MPQUEST && (Mobpt < 10000))
         goto L_lacking_mobpoints;
 
-    mes "[Mystic Sword]";
+    mesn l("Mystic Sword");
     mes "\"Raise up the ore, mortal!\"";
     mes "As you do so, the ore begins to crumble, leaving only iron powder behind.";
     mes "[1000 experience points]";
@@ -296,23 +297,24 @@ L_Next4:
     @Q_status = @STATUS_L2_ALLSPELLS;
     callsub S_Update_Var;
     next;
-    mes "[Mystic Sword]";
-    mes "\"This powder thou shalst need to cast the lightning spell. Throw it up into the air and shout '" + get(.invocation$, "lightning-strike") +  "', and smite thine enemies with lightning.\"";
+    mesn l("Mystic Sword");
+    mesq l("This powder thou shalst need to cast the lightning spell. Throw it up into the air and shout '%s', and smite thine enemies with lightning.", b("Ingrav"));
+    learnskill SKILL_INGRAV;
     next;
     goto L_Farewell;
 
 L_No_ore:
-    mes "[Mystic Sword]";
+    mesn l("Mystic Sword");
     mes "\"Thou dost appear to lack ore. We cannot continue; please fare well and return swiftly!\"";
     close;
 
 L_Farewell:
-    mes "[Mystic Sword]";
+    mesn l("Mystic Sword");
     mes "\"Then I bid thee farewell for now!\"";
     close;
 
 L_lacking_mobpoints:
-    mes "[Mystic Sword]";
+    mesn l("Mystic Sword");
     mes "\"Thou dost not have enough monster points to prove thy worthiness. Return when thou hast slain more monsters!\"";
     close;