Keep polishing Elanore's dialog

1 files changed, 69 insertions, 71 deletions

diff --git a/npc/002-1/elanore.txt b/npc/002-1/elanore.txt
index 2a400994..84bbbf4d 100644
--- a/npc/002-1/elanore.txt
+++ b/npc/002-1/elanore.txt
@@ -53,7 +53,7 @@ L_NoHealMessage:
 
 L_Chat:
     mesn l("Elanore the Healer");
-    mesq l("Hello!  Can I help you?");
+    mesq l("Hello! Can I help you?");
     next;
     goto L_Main;
 
@@ -80,7 +80,7 @@ L_Main:
 
 L_Lifestones:
     mesn l("Elanore the Healer");
-    mes "\"I always need components for my own healing spells. If you bring me ten gamboge leaves, ten alizarin leaves, ten mauve leaves and ten cobalt leaves, I can make ten lifestones; I will give you half of them.\"";
+    mesq l("I always need components for my own healing spells. If you bring me ten gamboge leaves, ten alizarin leaves, ten mauve leaves and ten cobalt leaves, I can make ten lifestones; I will give you half of them.");
     next;
     menu
         "OK, I will get them.", L_close,
@@ -89,44 +89,45 @@ L_Lifestones:
         "Can I make them myself?", L_MakeSelf;
 
 L_Trade:
-    if (countitem("MauveHerb") < 10) goto L_Trade_Missing;
-    if (countitem("GambogeHerb") < 10) goto L_Trade_Missing;
-    if (countitem("AlizarinHerb") < 10) goto L_Trade_Missing;
-    if (countitem("CobaltHerb") < 10) goto L_Trade_Missing;
+    if (countitem(MauveHerb) < 10) goto L_Trade_Missing;
+    if (countitem(GambogeHerb) < 10) goto L_Trade_Missing;
+    if (countitem(AlizarinHerb) < 10) goto L_Trade_Missing;
+    if (countitem(CobaltHerb) < 10) goto L_Trade_Missing;
     getinventorylist;
-    if (@inventorylist_count == 100 && countitem("Lifestone") == 0
-        && countitem("MauveHerb") > 10
-        && countitem("GambogeHerb") > 10
-        && countitem("AlizarinHerb") > 10
-        && countitem("CobaltHerb") > 10) goto L_NoRoom;
-
-    delitem "MauveHerb", 10;
-    delitem "GambogeHerb", 10;
-    delitem "AlizarinHerb", 10;
-    delitem "CobaltHerb", 10;
-    getitem "Lifestone", 5;
+    if (@inventorylist_count == 100 && countitem(Lifestone) == 0
+        && countitem(MauveHerb) > 10
+        && countitem(GambogeHerb) > 10
+        && countitem(AlizarinHerb) > 10
+        && countitem(CobaltHerb) > 10) goto L_NoRoom;
+
+    delitem MauveHerb, 10;
+    delitem GambogeHerb, 10;
+    delitem AlizarinHerb, 10;
+    delitem CobaltHerb, 10;
+    getitem Lifestone, 5;
     getexp 200, 1;
     mesn l("Elanore the Healer");
-    mes "Elanore carefully goes over your leaves, then smiles.";
-    mes "\"These will do just fine.\"";
-    mes "She picks up all fourty and presses them together in her hands, then whispers something.";
+    mesc l("Elanore carefully goes over your leaves, then smiles.");
+    mesq l("These will do just fine.");
+    next;
+    mesc l("She picks up all forty and presses them together in her hands, then whispers something.");
     next;
     mesn l("Elanore the Healer");
-    mes "As she opens her hands again, the leaves have turned into ten golden crystals.";
-    mes "\"Five for you and five for me.\"";
-    mes "She smiles.";
+    mesc l("As she opens her hands again, the leaves have turned into ten golden crystals.");
+    mesq l("Five for you and five for me.");
+    mesc l("She smiles.");
     mes "[200 experience points]";
     goto L_close;
 
 L_NoRoom:
     mesn l("Elanore the Healer");
-    mes "\"Oh... it seems that you have no room for the lifestones. But please do come back later when you have made a little space.\"";
+    mesq l("Oh... it seems that you have no room for the lifestones. But please do come back later when you have made a little space.");
     goto L_close;
 
 L_Trade_Missing:
     mesn l("Elanore the Healer");
-    mes "Elanore counts the leaves you show her.";
-    mes "\"No, I am sorry. Please bring me ten leaves each of gamboge, alizarin, mauve, and cobalt.\"";
+    mesc l("Elanore counts the leaves you show her.");
+    mesq l("No, I am sorry. Please bring me ten leaves each of gamboge, alizarin, mauve, and cobalt.");
     goto L_close;
 
 L_MakeSelf:
@@ -135,11 +136,11 @@ 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.\"";
+    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.\"";
     goto L_close;
 
 L_MakeSelf_no:
-    mes "\"No, you are not powerful enough yet. Please come back and ask me again when you have learned to control more powerful magic, though!\"";
+    mesq l("No, you are not powerful enough yet. Please come back and ask me again when you have learned to control more powerful magic, though!");
     goto L_close;
 
 L_Teach:
@@ -152,13 +153,13 @@ L_Teach:
     if (@Q_status == .ST_LEARNED_CURE_POISON) goto L_T_dunno;
 
     mesn l("Elanore the Healer");
-    mes "\"You have made good progress, but you lack the magical power to advance further. Also, I would like to observe you some more to be certain that you will make a good healer.\"";
+    mesq l("You have made good progress, but you lack the magical power to advance further. Also, I would like to observe you some more to be certain that you will make a good healer.");
     goto L_close;
 
 L_T_Initial:
     mesn l("Elanore the Healer");
-    mes "\"I will only teach you magic of the school of Life, and that only if you prove yourself to be a good healer – that is, if you use your powers to help others.\"";
-    mes "She hesistates.";
+    mesq l("I will only teach you magic of the school of Life, and that only if you prove yourself to be a good healer – that is, if you use your powers to help others.");
+    mesc l("She hesistates.");
     next;
     mesn l("Elanore the Healer");
     mes "\"I don't know you very well, but I don't think that there is any harm in teaching you a simple spell.\"";
@@ -177,8 +178,8 @@ L_T_Initial:
     mesq l("Let me give you a lifestone to get started with.");
     next;
     getinventorylist;
-    if ((@inventorylist_count == 100) && (countitem("Lifestone") == 0)) goto L_T_Initial_Noroom;
-    getitem "Lifestone", 1;
+    if ((@inventorylist_count == 100) && (countitem(Lifestone) == 0)) goto L_T_Initial_Noroom;
+    getitem Lifestone, 1;
     learnskill SKILL_LUM;
     setq1(MagicQuest_Healing, .ST_LEARNED_LIGHT_HEAL);
 
@@ -189,34 +190,30 @@ L_T_Initial:
 
 L_T_Initial_Noroom:
     mesn l("Elanore the Healer");
-    mes "\"Oh... you managed to put things into every little nook and pocket, haven't you?  Well, come back later, I will give it to you then.\"";
+    mesq l("Oh... you managed to put things into every little nook and pocket, haven't you? Well, come back later, I will give it to you then.");
     goto L_close;
 
 L_T_ChkAdvTo2:
     mesn l("Elanore the Healer");
     if (.@heal_exp < 20) goto L_T_ChkAdvTo2_fail;
-    mes "Elanore smiles at you.";
-    mes "\"From what I have been hearing, you seem to be doing well on your way to becoming a healer. I have decided to accept you as a student of the School of Life Magic.\"";
-    next;
-    if (getskilllv(SKILL_MAGIC) < 2) goto L_T_AdvTo2_warn;
-    goto L_T_AdvTo2_skip;
-
-L_T_AdvTo2_warn:
-    mesn l("Elanore the Healer");
-    mes "\"But be warned:  you won't be able to use advanced healing magic until you are more capable in your regular magic usage.\"";
-    next;
-    goto L_T_AdvTo2_skip;
-
+    mesc l("Elanore smiles at you.");
+    mesq l("From what I have been hearing, you seem to be doing well on your way to becoming a healer. I have decided to accept you as a student of the School of Life Magic.");
+    next;
+    if (getskilllv(SKILL_MAGIC) < 2) {
+        mesn l("Elanore the Healer");
+        mesq l("But be warned: you won't be able to use advanced healing magic until you are more capable in your regular magic usage.");
+        next;
+    }
 L_T_AdvTo2_skip:
     mesn l("Elanore the Healer");
-    mes "\"Please stand still.\"";
-    mes "She walks up to you, holds your shoulders, and smiles at you.";
+    mesq l("Please stand still.");
+    mesc l("She walks up to you, holds your shoulders, and smiles at you.");
     next;
     mesn l("Elanore the Healer");
-    mes "Then, she rises up on her tiptoes and kisses you on your forehead.";
+    mesc l("Then, she rises up on her tiptoes and kisses you on your forehead.");
     next;
     mesn l("Elanore the Healer");
-    mes "You feel a strange, tingling kind of warmth spread through your body.";
+    mesc l("You feel a strange, tingling kind of warmth spread through your body.");
     setq1(MagicQuest_Healing, .ST_MASTERED_LIGHT_HEAL);
     @SUP_xp = 5000;
     @SUP_lvl = 2;
@@ -224,13 +221,13 @@ L_T_AdvTo2_skip:
     goto L_close;
 
 L_T_ChkAdvTo2_fail:
-    mes "\"I think I would like to observe you for a little longer to see if you would make a good healer.\"";
+    mesq l("I think I would like to observe you for a little longer to see if you would make a good healer.");
     if (.@heal_exp < 5)
-        mes "\"You are still at the beginning of your path, but do keep practicing.\"";
+        mesq l("You are still at the beginning of your path, but do keep practicing.");
     if ((.@heal_exp >= 5) && (.@heal_exp < 15))
-        mes "\"You are making progress, but you still need more practice.\"";
+        mesq l("You are making progress, but you still need more practice.");
     if (.@heal_exp >= 15)
-        mes "\"You have made good progress, but please do continue in your efforts.\"";
+        mesq l("You have made good progress, but please do continue in your efforts.");
     goto L_close;
 
 L_T_ChkAdvToLOH:
@@ -270,7 +267,7 @@ L_T_Explain3:
 
     mesn l("Elanore the Healer");
     mesc l("Elanore smiles.");
-    mes "\"You seem to be ready to advance as a healer. There is one favour I must ask of you first, though.\"";
+    mesq l("You seem to be ready to advance as a healer. There is one favor I must ask of you first, though.");
     set QUEST_MAGIC2, (QUEST_MAGIC2 & ~(NIBBLE_3_MASK)); // Initialise Kadiya quest
     setq1(MagicQuest_Healing, .ST_WAITING_FOR_KADIYA);
     @Q_status = getq(MagicQuest_Healing);
@@ -324,7 +321,7 @@ L_3_messup:
 
 L_3_where:
     mesn l("Elanore the Healer");
-    mes "\"Kadiya and Omar live relatively close by. See this corner in the inner city wall east of here?  Turn past it, then go north. It's the second house.\"";
+    mes "\"Kadiya and Omar live relatively close by. See this corner in the inner city wall east of here? Turn past it, then go north. It's the second house.\"";
     next;
     goto L_3_menu;
 
@@ -385,7 +382,7 @@ L_T_AdvTo3Ready:
     mes "\"Please come back soon; there is more that I would like to teach you.\"";
     next;
     MAGIC_FLAGS = MAGIC_FLAGS | MFLAG_ELANORE_OMAR;
-    getitem "Lifestone", 20;
+    getitem Lifestone, 20;
 
     goto L_Main;
 
@@ -413,7 +410,7 @@ L_T_CurePosion:
 
 L_T_dunno:
     mesn l("Elanore the Healer");
-    mes "\"Hmm. I wanted to teach you something, but I've forgotten what it was... please come back later.\"";
+    mesq l("Hmm. I wanted to teach you something, but I've forgotten what it was... please come back later.");
     next;
     goto L_Main;
 
@@ -432,8 +429,8 @@ L_Question:
     if (@c == @QQ_ASTRALSOUL) goto L_Q_astralsoul;
 
     mesn l("Elanore the Healer");
-    mes "Elanore shakes her head.";
-    mes "\"I am sorry, but I don't think that I know anything that would help you.\"";
+    mesc l("Elanore shakes her head.");
+    mesq l("I am sorry, but I don't think that I know anything that would help you.");
     next;
     goto L_Main;
 
@@ -445,52 +442,53 @@ L_Q_astralsoul:
 
 L_Q_oldwiz:
     mesn l("Elanore the Healer");
-    mes "\"He is a kind old man. He stays mostly with his books and his apprentice, though we have chatted a few times.\"";
+    mesq l("He is a kind old man. He stays mostly with his books and his apprentice, though we have chatted a few times.");
     next;
     goto L_Main;
 
 L_Q_manaseed:
     mesn l("Elanore the Healer");
     mesc l("She smiles.");
-    mes "\"If the rumors are true and there really is a Mana Seed, then that would be wonderful news – perhaps we will have a few more healers soon!\"";
+    mesq l("If the rumors are true and there really is a Mana Seed, then that would be wonderful news – perhaps we will have a few more healers soon!");
     next;
     goto L_Main;
 
 L_Q_manapotion:
     mesn l("Elanore the Healer");
-    mes "\"I'm sorry, but I can't help you with that.\"";
+    mesq l("I'm sorry, but I can't help you with that.");
     next;
     goto L_Main;
 
 L_Q_wyara:
     mesn l("Elanore the Healer");
-    mes "\"Wyara is the Hurnscald town witch. She was also the town healer before the Doctor moved there.\"";
+    mesq l("Wyara is the Hurnscald town witch. She was also the town healer before the Doctor moved there.");
     next;
     goto L_Main;
 
 L_Q_sagatha:
     mesn l("Elanore the Healer");
-    mes "\"Oh, I have only met Sagatha once or twice, while collecting herbs. She is a warm and gentle person, but she tries to hide it.\"";
+    mesq l("Oh, I have only met Sagatha once or twice, while collecting herbs. She is a warm and gentle person, but she tries to hide it.");
     next;
     goto L_Main;
 
 L_Q_auldsbel:
     mesn l("Elanore the Healer");
-    mes "\"Oh, sorry – I don't really know him very well.\"";
+    mesq l("Oh, sorry – I don't really know him very well.");
     next;
     goto L_Main;
 
 L_CurePoison:
     mesn l("Elanore the Healer");
-    mes "\"Oh dear!  That looks like poison; hang on...\"";
-    mes "She performs a complicated gesture.";
-        sc_end(SC_POISON);
-        sc_end(SC_SLOWPOISON);
+    mesq l("Oh dear! That looks like poison; hang on...");
+    mesc l("She performs a complicated gesture.");
+    sc_end(SC_POISON);
+    sc_end(SC_DPOISON);
+    sc_end(SC_SLOWPOISON);
     misceffect sfx_magic_life, strcharinfo(0);
     misceffect sfx_magic_life;
     next;
     mesn l("Elanore the Healer");
-    mes "\"There you are, right as rain!  Now you take care, all right?\"";
+    mesq l("There you are, right as rain! Now you take care, all right?");
     goto L_close;
 
 L_Bye: