All these new cool skills can be obtained! \o/

3 files changed, 56 insertions, 52 deletions

diff --git a/npc/002-1/elanore.txt b/npc/002-1/elanore.txt
index 84bbbf4d..046a7d5a 100644
--- a/npc/002-1/elanore.txt
+++ b/npc/002-1/elanore.txt
@@ -136,7 +136,7 @@ L_MakeSelf:
     goto L_MakeSelf_yes;
 
 L_MakeSelf_yes:
-    mes "\"Oh, but of course! You are powerful enough to make your own lifestones, using the enchantment '" + get(.invocation$, "enchant-lifestone") + "'. This will consume a bug leg or a maggot slime or one of each of the four healing herbs, though.\"";
+    mesq l("Oh, but of course! You are powerful enough to make your own lifestones, using the enchantment '%s'. This will consume a bug leg or a maggot slime or one of each of the four healing herbs, though.", b("Manpahil"));
     goto L_close;
 
 L_MakeSelf_no:
diff --git a/npc/009-2/misc.txt b/npc/009-2/misc.txt
index ca100163..d2bc3944 100644
--- a/npc/009-2/misc.txt
+++ b/npc/009-2/misc.txt
@@ -1,10 +1,10 @@
 
 009-2,54,49,0	script	Note#bar	NPC400,{
-    mes "[Note]";
-    mes "\"We refuse service to anyone who:\"";
-    mes "\"• Has a bubblehead\"";
-    mes "\"• Is not properly shaded\"";
-    mes "\"• Can't walk without stopping after every step\"";
+    mesn l("Note");
+    mes l("We refuse service to anyone who:");
+    mes l("• Has a bubblehead");
+    mes l("• Is not properly shaded");
+    mes l("• Can't walk without stopping after every step");
     close;
     // In case you don't get the joke, know that it's a parody on Illutia.
 }
@@ -12,40 +12,47 @@
 009-2,109,44,0	script	#Book	NPC400,{
     if (getskilllv(SKILL_MAGIC))
         goto L_Magic;
-    mes "[Bookshelf]";
+    mesn l("Bookshelf");
     mes "This bookshelf seems to have a selection of diaries and manuscripts, though you can't find anything that strikes you as being particularly interesting.";
     close;
 
 L_Magic:
-    mes "[Bookshelf]";
-    mes "Browsing through the books, you come across a manuscript entitled 'Notes of Potaffe, On Transmutation.'";
+    mesn l("Bookshelf");
+    mes l("Browsing through the books, you come across a manuscript entitled 'Notes of Potaffe, On Transmutation.'");
     next;
     if (getskilllv(SKILL_MAGIC_TRANSMUTE) < 2)
         goto L_Magic_boring;
-    mes "[Bookshelf]";
-    mes "Leafing through the manuscript, you find that you can read little of the tiny handwriting and understand only a fraction of what is said.";
+    mesn l("Bookshelf");
+    mes l("Leafing through the manuscript, you find that you can read little of the tiny handwriting and understand only a fraction of what is said.");
     next;
-    mes "[Bookshelf]";
-    mes "After a while, you stumble across a section that appears to be written somewhat legibly. The author notes that he (or perhaps she?) is describing a completely new transmutation.";
+    if (getskilllv(SKILL_MAGIC) < 2)
+        goto L_Magic_weak;
+    mesn l("Bookshelf");
+    mes l("After a while, you stumble across a section that appears to be written somewhat legibly. The author notes that he (or perhaps she?) is describing a completely new transmutation.");
     next;
-    mes "[Bookshelf]";
-    mes "Excitedly, you turn the page – only to find that it is stuck to the next and can't be freed!";
+    mesn l("Bookshelf");
+    mes l("Excitedly, you turn the page – only to find that it is stuck to the next and can't be freed!");
     next;
-    mes "[Bookshelf]";
-    mes "The page after that is once again hastily written, with many crossed out words and sections and side remarks such as 'it almost worked' or 'it worked fine yesterday.'";
+    mesn l("Bookshelf");
+    mes l("The page after that is once again hastily written, with many crossed out words and sections and side remarks such as 'it almost worked' or 'it worked fine yesterday.'");
     next;
-    mes "[Bookshelf]";
-    mes "The last word on that page is '" + get(.invocation$, "make-iron-powder") + ",' and it's underlined twice with a comment next to it saying 'finally got it right.'";
+    mesn l("Bookshelf");
+    mesq l("The last word on that page is '%s' and it's underlined twice with a comment next to it saying 'finally got it right.'", b("Zukminbirf"));
     next;
-    mes "[Bookshelf]";
-    mes "Unfortunately, you can't make out what the transmutation is for or even whether it requires any materials...";
+    mesn l("Bookshelf");
+    mes l("Unfortunately, you can't make out what the transmutation is for or even whether it requires any materials...");
     next;
-    mes "[Bookshelf]";
-    mes "You can't make out anything else of value, so you place the manuscript back in the bookshelf.";
+    mesn l("Bookshelf");
+    mes l("You can't make out anything else of value, so you place the manuscript back in the bookshelf.");
     close;
 
 L_Magic_boring:
-    mes "[Bookshelf]";
-    mes "Leafing through the manuscript, you find that you understand too little of what is written to make any sense of it.";
+    mesn l("Bookshelf");
+    mes l("Leafing through the manuscript, you find that you understand too little of what is written to make any sense of it.");
+    close;
+
+L_Magic_weak:
+    mesn l("Bookshelf");
+    mes l("Unfortunately, that seems to require more magical power than you can use right now. If only the Mana Seed granted you more power...");
     close;
 }
diff --git a/npc/011-1/auldsbel.txt b/npc/011-1/auldsbel.txt
index e20dd8ab..d0f9a58d 100644
--- a/npc/011-1/auldsbel.txt
+++ b/npc/011-1/auldsbel.txt
@@ -230,19 +230,19 @@ L_Sul_t_s:
     if (@Q_component_quest <= 4)
         goto L_Sul_t_s_no;
     mesn l("Auldsbel the Wizard");
-    mes "\"Very well, then. You have been quite helpful with my experiments, after all. As you may have noticed, the spell takes a pile of volcanic ashes. Close your hands around it, then whisper the invocation.\"";
+    mesq l("Very well, then. You have been quite helpful with my experiments, after all. As you may have noticed, the spell takes a pile of volcanic ashes. Close your hands around it, then whisper the invocation.");
     next;
     mesn l("Auldsbel the Wizard");
-    mes "\"That invocation is '" + get(.invocation$, "make-sulphur") + "'.\"";
+    mesq l("That invocation is '%s'.", b("Gole"));
     next;
     mesn l("Auldsbel the Wizard");
-    mes "\"You may find that you can transmute the powder more effectively after a while; that is perfectly natural.\"";
+    mesq l("You may find that you can transmute the powder more effectively after a while; that is perfectly natural.");
     next;
     goto L_Main_menu;
 
 L_Sul_t_s_no:
     mesn l("Auldsbel the Wizard");
-    mes "\"Hmm... how about this:  you help me with a few of my experiments, and I tell you?\"";
+    mesq l("Hmm... how about this:  you help me with a few of my experiments, and I tell you?");
     next;
     menu
         "Very well, I will help you.", L_Quest,
@@ -250,7 +250,7 @@ L_Sul_t_s_no:
 
 L_Next:
     mesn l("Auldsbel the Wizard");
-    mes "\"Then I fear that I shall not reveal the spell to you either.\"";
+    mesq l("Then I fear that I shall not reveal the spell to you either.");
     next;
     goto L_Main_menu;
 
@@ -983,10 +983,7 @@ L_learn_spell:
     mes "\"This spell is a simple transmutation invocation. All it takes is a clean wooden log. Hold it in your hand, focus your powers, and say the magic invocation.\"";
     next;
     mesn l("Auldsbel the Wizard");
-    mes "\"You can turn the log into a wooden figurine by imagining the creature whose shape you want in your head and saying `" + get(.invocation$, "spell-transmute-wood") + ",' followed by the last syllable of the name of the creature you want to shape it into.\"";
-    next;
-    mesn l("Auldsbel the Wizard");
-    mes "\"So `" + get(.invocation$, "spell-transmute-wood") +  " lurk' for a Skytlurk figurine, for example. If you know what a Skytlurk is, I mean, otherwise you will have a hard time imagining it. You may want to try some others instead, though.\"";
+    mes l("You can turn the log into a wooden figurine by imagining the creature whose shape you want in your head and saying `%s' followed by the last syllable of the name of the creature you want to shape it into.", b("Parum"));
     next;
     mesn l("Auldsbel the Wizard");
     mes "\"Oh... and it has to be the old Tritan name. Most creatures nowadays have very different names, but some old Tritan names have survived. Just try some, until you find one that fits.\"";
@@ -1000,21 +997,21 @@ L_learn_spell:
 
 L_repeat_spell:
     mesn l("Auldsbel the Wizard");
-    mes "\"The invocation is `" + get(.invocation$, "spell-transmute-wood") + ",' followed by the last syllable of the name of the creature you want to shape the log into. So `" + get(.invocation$, "spell-transmute-wood") + " lurk' for a Skytlurk figurine.\"";
+    mesq l("The invocation is `%s' followed by the last syllable of the name of the creature you want to shape the log into.", b("Parum"));
     next;
     mesn l("Auldsbel the Wizard");
-    mes "\"But keep two things in mind:  First, you must KNOW what the creature looks like – so a Skytlurk probably won't work – and second, you must use the old Tritan name of it. `Fluffy' and `Scorpion' are modern names, so those won't work, you should try some others.\"";
+    mes "\"But keep two things in mind:  First, you must KNOW what the creature looks like – so a Skrytlurk probably won't work – and second, you must use the old Tritan name of it. `Fluffy' and `Scorpion' are modern names, so those won't work, you should try some others.\"";
     next;
     mesn l("Auldsbel the Wizard");
-    mes "\"And make sure to keep notes of your spells!  In the future, I will only tell you once.\"";
+    mesq l("And make sure to keep notes of your spells! Don't rely only on your skill tab (F5).");
     next;
     goto L_Main_menu;
 
 L_initiation:
     mesn l("Auldsbel the Wizard");
-    mes "\"So, have you managed to transmute something?\"";
+    mesq l("So, have you managed to transmute something?");
     next;
-    if (countitem("MoubooFigurine"))
+    if (countitem(MoubooFigurine))
         menu
             "Not yet.", L_Main_menu,
             "How about this mouboo figurine?", L_initiation_check;
@@ -1066,23 +1063,23 @@ L_initiation_check:
 L_stu_start:
     if (@mexp < 200) goto L_Notready;
         mesn l("Auldsbel the Wizard");
-    mes "\"Next, I shall teach you a higher-level transmutation spell.\"";
+    mesq l("Next, I shall teach you a higher-level transmutation spell.");
     if (getskilllv(SKILL_MAGIC) < 2) {
-        mes "\"Thinking well, you will not be able to use it yet; you will first have to gain a greater understanding of magic overall.\"";
+        mesq l("Thinking well, you will not be able to use it yet; you will first have to gain a greater understanding of magic overall.");
         close;
     }
     next;
     mesn l("Auldsbel the Wizard");
-    mes "\"Bring me ten bug legs, and I will reveal its invocation to you.\"";
+    mesq l("Bring me ten bug legs, and I will reveal its invocation to you.");
     next;
     menu
         "Here you are.", L_Next9,
         "I'll be back with them.", L_Main_menu;
 
 L_Next9:
-    if (countitem("BugLeg") < 10)
+    if (countitem(BugLeg) < 10)
         goto L_c_quest_missing;
-    delitem "BugLeg", 10;
+    delitem BugLeg, 10;
     getexp 1000, 0;
     @Q_main_status = @Q_STATUS_STUDENT0;
     callsub S_Update_Var;
@@ -1093,7 +1090,7 @@ L_Next9:
     mes "[1000 experience points]";
     next;
     mesn l("Auldsbel the Wizard");
-    mes "\"Now, listen carefully:  to make a short tank top out of three pieces of cloth, you must use the invocation '" + get(.invocation$, "make-short-tanktop") + "'.\"";
+    mesq l("Now, listen carefully:  to make a short tank top out of three pieces of cloth, you must use the invocation '%s'.", b("Patviloree"));
     next;
     mesn l("Auldsbel the Wizard");
     mes "\"But be careful; transmutations can go wrong, and that can injure you. When you have more overall spellcasting practice, come back to me.\"";
@@ -1132,7 +1129,7 @@ L_Next10:
     mes "[1000 experience points]";
     next;
     mesn l("Auldsbel the Wizard");
-    mes "\"The next spell I have will make a normal tank top out of four pieces of cloth. The invocation is '" + get(.invocation$, "make-tanktop") + "', make sure to write this down.\"";
+    mesq l("The next spell I have will make a normal tank top out of four pieces of cloth. The invocation is '%s', make sure to write this down.", b("Patloree"));
     next;
     goto L_Main_menu;
 
@@ -1162,7 +1159,7 @@ L_Next11:
     mes "[1000 experience points]";
     next;
     mesn l("Auldsbel the Wizard");
-    mes "\"To make a shirt, use the invocation '" + get(.invocation$, "make-shirt") + "'. This will require five pieces of cloth.\"";
+    mesq l("To make a shirt, use the invocation '%s'. This will require five pieces of cloth.", b("Patmuploo"));
     next;
     goto L_Main_menu;
 
@@ -1180,19 +1177,19 @@ L_stu_2:
         "I'll be back with them.", L_Main_menu;
 
 L_Next12:
-    if (countitem("RawLog") < 20)
+    if (countitem(RawLog) < 20)
             goto L_c_quest_missing;
-    delitem "RawLog", 20;
+    delitem RawLog, 20;
     getexp 1000, 0;
     @Q_main_status = @Q_STATUS_STUDENT3;
     callsub S_Update_Var;
     mesn l("Auldsbel the Wizard");
-    mes "Auldsbel places the logs next to his hut.";
-    mes "\"I'm hoping to animate them into the shape of one of those odd log heads.\"";
+    mesc l("Auldsbel places the logs next to his hut.");
+    mesq l("I'm hoping to animate them into the shape of one of those odd log heads.");
     mes "[1000 experience points]";
     next;
     mesn l("Auldsbel the Wizard");
-    mes "\"This spell makes arrows out of a single wooden log. Its invocation is '" + get(.invocation$, "make-arrows") + "'.\"";
+    mesq l("This spell makes arrows out of a single wooden log. Its invocation is '%s'.", b("Kularzufrill"));
     next;
     goto L_Main_menu;