Implement the second tier summoning magic (Astral and Dark)

Kalakarenk, Kalboo, Kalgina, Kalrenk, Halhiss and Helorp.
Update Sagatha, Pauline and Waric on the way.

1 files changed, 70 insertions, 68 deletions

diff --git a/npc/017-4/waric.txt b/npc/017-4/waric.txt
index 637f4526..1f7db840 100644
--- a/npc/017-4/waric.txt
+++ b/npc/017-4/waric.txt
@@ -27,17 +27,17 @@
     if (OrumQuest > 17) goto L_Flower1;
     if (OrumQuest > 15) goto L_Mistrust;
 
-    mes "[Waric]";
+    mesn;
     mes "\"You! You really are far too persistent to know what is good for you!\"";
     mes "He turns towards Orum.";
     next;
-    mes "[Waric]";
+    mesn;
     mes "\"It seems your ridiculous Guarding Spirit has failed at his task.";
     mes "Deal with this. We cannot afford any more of these distractions.\"";
     goto L_close;
 
 L_Mistrust:
-    mes "[Waric]";
+    mesn;
     mes "\"So, you say you want to help us? You do not look very competent.";
     mes "Also, I do not see what motivation you have to help.\"";
     next;
@@ -45,7 +45,7 @@ L_Mistrust:
     goto L_close;
 
 L_Flower1:
-    mes "[Waric]";
+    mesn;
     mes "\"You placed the first flower. Why, I am surprised! I did not expect you to actually stay and become useful.\"";
     if (!(getskilllv(SKILL_MAGIC)))
         goto L_close;
@@ -58,34 +58,34 @@ L_Next:
         goto L_Sagatha;
     if (!@killed_mouboo && !@cut_tree)
         goto L_Undecided;
-    mes "[Waric]";
+    mesn;
     mes "\"Hmm. I suppose I could do that. You seem to have some potential.";
     mes "First, proceed with the task given by Orum.\"";
     goto L_close;
 
 L_Flower2:
-    mes "[Waric]";
+    mesn;
     mes "\"You placed the second flower? It seems Orum's choice of tools is better than expected.\"";
     goto L_close;
 
 L_Flower3:
-    mes "[Waric]";
+    mesn;
     mes "\"I saw that you helped to create and place the third flower. Good.\"";
     goto L_close;
 
 L_Flower4:
-    mes "[Waric]";
+    mesn;
     mes "\"Now that you have placed the fourth flower, we are very close to reaching our goal. Keep it up.\"";
     goto L_close;
 
 L_Flower5:
-    mes "[Waric]";
+    mesn;
     mes "\"Hahaha, excellent. You handled the creation of our pentagram very well. I will be keeping that in mind.";
     mes "I have advised Orum to give you a reward. Go now and speak with him.\"";
     goto L_close;
 
 L_DarkMagic:
-    mes "[Waric]";
+    mesn;
     mes "\"So, you have gotten your reward and finished the task Orum had for you. Very good.\"";
     menu
         "Can you teach me some magic?", L_Next1,
@@ -96,18 +96,18 @@ L_Next1:
         goto L_Sagatha;
     if (!@killed_mouboo && !@cut_tree)
         goto L_Undecided;
-    mes "[Waric]";
+    mesn;
     mes "\"You appear to be trustworthy. I will allow you to become my apprentice.\"";
     mes "\"I will teach you the basics of the branch of magic I practice. It is called Dark Magic. Very few people know of its existence these days, and hardly anyone is capable of teaching it.\"";
     mes "\"You are very lucky that fate has brought us together.\"";
     next;
-    mes "[Waric]";
+    mesn;
     mes "\"You cut the tree to please the Earth Spirit. You chose the Dark Side of magic, and this cannot be undone.\"";
     mes "\"Dark Magic draws its power from hate and anger. Your magic will be stronger against good creatures, and weaker against the undead and the corrupt.\"";
     next;
     mes "\"Once you start practicing Dark Magic, using certain spells will be painful. Everything comes with a price.\"";
     next;
-    mes "[Waric]";
+    mesn;
     mes "\"So, now that you know more about Dark Magic, are you still willing to become my apprentice?\"";
     mes "\"Once you cross this line, there is no going back. Keep this in mind!\"";
     OrumQuest = 33;
@@ -117,7 +117,7 @@ L_Next1:
 
 L_DarkTalkAgain:
     mes "The old wizard seems to be annoyed.";
-    mes "[Waric]";
+    mesn;
     mes "\"Very well. Once you start practicing Dark Magic, certain spells will be painful to cast. Your magic will be stronger against good creatures, and weaker against the undead and the corrupt.\"";
     next;
     mes "\"When you cross this line, there is no going back. Remember that!\"";
@@ -128,7 +128,7 @@ L_DarkTalkAgain:
         "Yes. I want to be your apprentice.", L_Oath;
 
 L_BackforOath:
-    mes "[Waric]";
+    mesn;
     mes "\"Ah, you're back. Have you decided yet if you want to become my apprentice?\"";
     menu
         "No." , L_ComeBackLater,
@@ -138,7 +138,7 @@ L_BackforOath:
 L_LastChance:
     mes "Waric looks at you, with despise evident on his face.";
     next;
-    mes "[Waric]";
+    mesn;
     mes "\"I knew you were a coward.\"";
     mes "\"I will give you one last chance to take the oath. If you refuse this time as well, I will no longer teach you.\"";
     next;
@@ -149,7 +149,7 @@ L_LastChance:
         "I have to reconsider.", L_ComeBackLater;
 
 L_Next2:
-    mes "[Waric]";
+    mesn;
     mes "\"If you stop during the oath again, I will not teach you anything. If you are not sure whether you want to become my apprentice or not, take more time to reconsider. However, this is your last chance to do so.\"";
     next;
     menu
@@ -157,13 +157,13 @@ L_Next2:
         "I am ready to take the oath. [last chance!]", L_Oath;
 
 L_Oath:
-    mes "[Waric]";
+    mesn;
     mes "\"Now say the oath of the Dark.\"";
     next;
     mes "Suddenly the room turns darker and writing penned in flames appears in front of you. You feel yourself shaking and shivering.";
     next;
     mes "As Waric yells, the walls tremble.";
-    mes "[Waric]";
+    mesn;
     mes "\"Read it!\"";
     mes "The sound of his voice echoes in the cave.";
     next;
@@ -179,7 +179,7 @@ L_Oath:
     mes "I shall prevail, other shall perish.";
     next;
     mes "Warric screams at your silence.";
-    mes "[Waric]";
+    mesn;
     mes "\"Say it! Say it now!\"";
     next;
     menu
@@ -209,26 +209,27 @@ L_NoOath:
     goto L_close;
 
 L_Mushroom:
-    mes "[Waric]";
-    mes "\"Now that you are a student of mine, I will teach you some spells.\"";
+    mesn;
+    mesq l("Now that you are a student of mine, I will teach you some spells.");
     next;
-    mes "\"We will start with an easy one. I will teach you how to summon a wicked mushroom.\"";
-    mes "\"The spell consumes a Small Mushroom and a Dark Crystal. Shove the Dark Crystal into the Small Mushroom and yell " + get(.invocation$, "smwmushroom") +".\"";
+    mesq l("We will start with an easy one. I will teach you how to summon a wicked mushroom.");
+    mesq l("The spell consumes a Small Mushroom and a Dark Crystal. Shove the Dark Crystal into the Small Mushroom and yell %s.");
     next;
-    mes "\"A wicked mushroom will appear to fight for you.\"";
+    mesq l("A wicked mushroom will appear to fight for you. Usually.");
     OrumQuest = 37;
+    learnskill SKILL_HELORP;
     goto L_close;
 
 L_ToxicDart:
-    mes "[Waric]";
-    mes "\"Welcome back, apprentice.\"";
-    mes "\"Are you read for another spell?\"";
+    mesn;
+    mesq l("Welcome back, apprentice.");
+    mesq l("Are you read for another spell?");
     menu
         "No, I still have to practice the first one.", L_close,
         "Yes. Show me some more!", L_Next4;
 
 L_Next4:
-    mes "[Waric]";
+    mesn;
     mes "\"Very well. This spell is more complex than the last one. It is called toxic dart. Only your peers are susceptible to the dart's poison. If you hit an animal the dart will injure it, but the poison will not work.\"";
     next;
     mes "\"You have to use two roots for this spell. First you have to take one root and break off all the root hair. Shape it into  a stick, if you will. Then put it on top of the other root and form an arrow-like structure.\"";
@@ -241,14 +242,14 @@ L_Next4:
 
 L_Snakes:
     mes "Waric nods at you.";
-    mes "[Waric]";
+    mesn;
     mes "\"Have you practiced enough?\"";
     menu
         "Yes, I'm an outstanding Dark Mage!", L_Next5,
         "No. I'm too lazy.", L_ComeBackLater;
 
 L_Next5:
-    mes "[Waric]";
+    mesn;
     mes "\"Very well. I shall teach you another spell.\"";
     mes "\"This one is so complex that I have to show it to you before explaining it further. Bring me a snake egg and a root.\"";
     next;
@@ -258,58 +259,59 @@ L_Next5:
 
 L_SnakesIngredients:
     OrumQuest = 39;
-    mes "[Waric]";
+    mesn;
     mes "\"Did you bring one Dark Crystal and a Snake Egg?\"";
     menu
         "Yes, I have what you want.", L_Next6,
         "No, I need more time.", L_NoItem;
 
 L_Next6:
-    if ((countitem("DarkCrystal") < 0)
-        || (countitem("SnakeEgg") < 0))
+    if ((countitem(DarkCrystal) < 0)
+        || (countitem(SnakeEgg) < 0))
         goto L_NoItem;
-    delitem "DarkCrystal", 1;
-    delitem "SnakeEgg", 1;
-    mes "[Waric]";
-    mes "\"Observe!\"";
+    mesn;
+    mesq l("Observe!");
     next;
-    mes "The wizard takes the crystal and the egg, mumbling something you don't understand. Suddenly, he throws the egg into the air and throws the crystal right through it midair.";
+    mesc l("The wizard takes the crystal and the egg, mumbling something you don't understand. Suddenly, he throws the egg into the air and throws the crystal right through it midair.");
     next;
-    mes "The Egg cracks open and a living snake comes out of the egg.";
+    mesc l("The Egg cracks open and a living snake comes out of the egg.");
     next;
-    monster "017-4", 217,36, "Evil", 1010, 1;
-    mes "The wizard looks at you, his eyes flashing, and laughs diabolically.";
+    delitem DarkCrystal, 1;
+    delitem SnakeEgg, 1;
     OrumQuest = 40;
+    monster "017-4", 217,36, "Evil", Snake, 1;
+    mesc l("The wizard looks at you, his eyes flashing, and laughs diabolically.");
     goto L_close;
 
 L_SnakesSpell:
-    mes "[Waric]";
-    mes "\"Did you see how this spell is cast?\"";
+    mesn;
+    mesq l("Did you see how this spell is cast?");
     menu
         "Yes. What did you mumble?", L_Next7,
         "No. Could you show me again?", L_SnakesAgain;
 
 L_Next7:
-    mes "[Waric]";
-    mes "\"I said " + get(.invocation$, "summon-snakes") + ".\"";
-    mes "\"Have fun with those spells and use them to cause hate, anger and death.\"";
+    mesn;
+    mesq l("I said %s.", b("Halhiss"));
+    mesq l("Have fun with those spells and use them to cause hate, anger and death.");
     OrumQuest = 41;
+    learnskill SKILL_HALHISS;
     goto L_close;
 
 L_SnakesAgain:
-    mes "[Waric]";
-    mes "\"Do you really want me to show you the spell again? You will have to bring new ingredients.\"";
+    mesn;
+    mesq l("Do you really want me to show you the spell again? You will have to bring new ingredients.");
     menu
         "No.", L_SnakesSpell,
         "Yes.", L_SnakesIngredients;
 
 L_ComeBackLater:
-    mes "[Waric]";
-    mes "\"Then come back later.\"";
+    mesn;
+    mesq l("Then come back later.");
     goto L_close;
 
 L_MoreMagic:
-    mes "[Waric]";
+    mesn;
     mes "\"Hello, apprentice.\"";
     mes "\"You must practice more! I will teach you more spells once you have mastered the ones I have already demonstrated.\"";
     next;
@@ -318,37 +320,37 @@ L_MoreMagic:
         "Thanks, master. I will come back later", L_close;
 
 L_Next8:
-    mes "[Waric]";
-    mes "\"Yes, of course.\"";
-    mes "\"To summon the snakes use " + get(.invocation$, "summon-snakes") + ".\"";
-    mes "\"Say " + get(.invocation$, "toxic-dart") + " to make your roots into toxic darts.\"";
-    mes "\"And the first spell, to summon wicked mushrooms, is " + get(.invocation$, "summon-wickedmushroom") + ".\"";
+    mesn;
+    mesq l("Yes, of course.");
+    mesq l("To summon the snakes use %s.", b("Halhiss"));
+    mesq l("Say %s to make your roots into toxic darts.", b("Phlex"));
+    mesq l("And the first spell, to summon wicked mushrooms, is %s.", b("Helorp"));
     next;
-    mes "\"Now leave. Spread chaos with the spells I have taught you!\"";
+    mesq l("Now leave. Spread chaos with the spells I have taught you!");
     goto L_close;
 
 L_Undecided:
-    mes "[Waric]";
-    mes "\"Well, I could. However, I am not sure you are trustworthy.\"";
+    mesn;
+    mesq l("Well, I could. However, I am not sure you are trustworthy.");
     next;
-    mes "\"How do I know you will not run off to Sagatha with what I would be teaching you?\"";
+    mesq l("How do I know you will not run off to Sagatha with what I would be teaching you?");
     goto L_close;
 
 L_Sagatha:
-    mes "[Waric]";
-    mes "\"You are already a student of Sagatha. I will not teach you anything!\"";
+    mesn;
+    mesq l("You are already a student of Sagatha. I will not teach you anything!");
     goto L_close;
 
 L_Banished:
-    mes "The wizard looks at you with despise.";
-    mes "[Waric]";
-    mes "\"How did you...\"";
+    mesc l("The wizard looks at you with despise.");
+    mesn;
+    mesq l("How did you...");
     heal -Hp, 0;
     goto L_close;
 
 L_NoItem:
-    mes "[Waric]";
-    mes "\"Why are you wasting my time? Come back when you got everything I need.\"";
+    mesn;
+    mesq l("Why are you wasting my time? Come back when you got everything I need.");
     goto L_close;
 
 L_close: