Fix Elanore's dialog, Lum, and Inma so they are consistent. Changes Legacy behavior.

3 files changed, 129 insertions, 103 deletions

diff --git a/db/pre-re/skill_db.conf b/db/pre-re/skill_db.conf
index 639777c4..c43c8593 100644
--- a/db/pre-re/skill_db.conf
+++ b/db/pre-re/skill_db.conf
@@ -38752,7 +38752,18 @@ skill_db: (
 	Name: "SKILL_LUM"
 	Description: "Lum"
 	MaxLevel: 9
-	Range: 14
+	Range: {
+		Lv1: 6
+		Lv2: 7
+		Lv3: 8
+		Lv4: 9
+		Lv5: 10
+		Lv6: 11
+		Lv7: 12
+		Lv8: 13
+		Lv9: 14
+		Lv10: 15
+	}
 	SkillType: {
 		Friend: true
 	}
@@ -38777,7 +38788,18 @@ skill_db: (
 	Name: "SKILL_INMA"
 	Description: "Inma"
 	MaxLevel: 9
-	Range: 6
+	Range: {
+		Lv1: 3
+		Lv2: 4
+		Lv3: 5
+		Lv4: 6
+		Lv5: 7
+		Lv6: 8
+		Lv7: 9
+		Lv8: 10
+		Lv9: 11
+		Lv10: 12
+	}
 	SkillType: {
 		Friend: true
 	}
@@ -38794,6 +38816,6 @@ skill_db: (
 		SPCost: 10
 	}
 },
-// Lum MagicBlade Sulphur Kalmurk Parum ArrowHail Barrier(OK?) EnchantLifestone FlyingBackpack(?) Joyplim Hide(?) LayOnHands Ingrav Knuclkes MakeArrow MakeIronPowder MakeShirt MakeTanktop MakeSTanktop Protect Rain Shear SFluffy SMouboo SPinkie SSnake SSPiky SWicked ToxicDart Necro
+// MagicBlade Sulphur Kalmurk Parum ArrowHail Barrier(OK?) EnchantLifestone FlyingBackpack(?) Joyplim Hide(?) Ingrav Knuclkes MakeArrow MakeIronPowder MakeShirt MakeTanktop MakeSTanktop Protect Rain Shear SFluffy SMouboo SPinkie SSnake SSPiky SWicked ToxicDart Necro
 )
 
diff --git a/npc/002-1/elanore.txt b/npc/002-1/elanore.txt
index 8a9a5da2..b60e6085 100644
--- a/npc/002-1/elanore.txt
+++ b/npc/002-1/elanore.txt
@@ -60,73 +60,68 @@ L_Return:
     if (@Q_status > @Q_STATUS_MAX)
     @Q_status = @STATUS_INITIAL;
     callsub S_Update_Var;
-    if (sc_check(SC_POISON)) goto L_CurePoison;
+    if (sc_check(SC_POISON) || sc_check(SC_DPOISON)) goto L_CurePoison;
     if (BaseLevel > 20) goto L_NoHeal;
-    @temp = rand(4);
+    @temp = rand2(4);
     if(@temp == 1) goto L_Heal2;
     if(@temp == 2) goto L_Heal3;
     if(@temp == 3) goto L_Heal4;
     goto L_Heal1;
 
 L_Heal1:
-
-    mes "[Elanore the Healer]";
+    mesn l("Elanore the Healer");
     mes "\"You don't look too well; let me treat your wounds.\"";
     next;
     goto L_Heal_L;
 
 L_Heal2:
-
-    mes "[Elanore the Healer]";
+    mesn l("Elanore the Healer");
     mes "\"I will make quick work of your wounds.\"";
     next;
     goto L_Heal_L;
 
 L_Heal3:
-
-    mes "[Elanore the Healer]";
+    mesn l("Elanore the Healer");
     mes "\"Need a healing?\"";
     next;
     goto L_Heal_L;
 
 L_Heal4:
-
-    mes "[Elanore the Healer]";
+    mesn l("Elanore the Healer");
     mes "\"Sometimes you just need to run from battle.\"";
     next;
     goto L_Heal_L;
 
 L_Heal_L:
-    @temp = rand(3);
+    @temp = rand2(3);
     if(@temp == 1) goto L_Heal_2;
     if(@temp == 2) goto L_Heal_3;
     if(@temp == 3) goto L_Heal_4;
     goto L_Heal_1;
 
 L_Heal_1:
-
-    mes "[Elanore the Healer]";
-    mes "\"Here you go!\"";
-    heal 10000,10000;
+    mesn l("Elanore the Healer");
+    mesq l("Here you go!");
+    percentheal 100, 100;
     goto L_close;
 
 L_Heal_2:
 
-    mes "[Elanore the Healer]";
-    mes "\"Painless, wasn't it?";
-    heal 10000,10000;
+    mesn l("Elanore the Healer");
+    mesq l("Painless, wasn't it?");
+    percentheal 100, 100;
     goto L_close;
 
 L_Heal_3:
 
-    mes "[Elanore the Healer]";
-    mes "\"You should be more careful.\"";
-    heal 10000,10000;
+    mesn l("Elanore the Healer");
+    mesq l("You should be more careful.");
+    percentheal 100, 100;
     goto L_close;
 
 L_Heal_4:
 
-    mes "[Elanore the Healer]";
+    mesn l("Elanore the Healer");
     mes "\"Much better, right?!\"";
     heal 10000,10000;
     goto L_close;
@@ -137,14 +132,14 @@ L_NoHeal:
     goto L_NoHealMessage;
 
 L_NoHealMessage:
-    mes "[Elanore the Healer]";
+    mesn l("Elanore the Healer");
     mes "\"I'm sorry but unless you are young and in need, I can't help you, and your level is already higher than twenty.";
     mes "With so many gaurds still injured, I really have no time to help.";
     mes "You can get some rest in the inn near here.\"";
     goto L_close;
 
 L_Chat:
-    mes "[Elanore the Healer]";
+    mesn l("Elanore the Healer");
     mes "\"Hello!  Can I help you?\"";
     next;
     goto L_Main;
@@ -171,7 +166,7 @@ L_Main:
     goto L_close;
 
 L_Lifestones:
-    mes "[Elanore the Healer]";
+    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.\"";
     next;
     menu
@@ -198,12 +193,12 @@ L_Trade:
     delitem "CobaltHerb", 10;
     getitem "Lifestone", 5;
     getexp 200, 1;
-    mes "[Elanore the Healer]";
+    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.";
     next;
-    mes "[Elanore the Healer]";
+    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.";
@@ -211,18 +206,18 @@ L_Trade:
     goto L_close;
 
 L_NoRoom:
-    mes "[Elanore the Healer]";
+    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.\"";
     goto L_close;
 
 L_Trade_Missing:
-    mes "[Elanore the Healer]";
+    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.\"";
     goto L_close;
 
 L_MakeSelf:
-    mes "[Elanore the Healer]";
+    mesn l("Elanore the Healer");
     if (@has_magic < 2) goto L_MakeSelf_no;
     goto L_MakeSelf_yes;
 
@@ -243,53 +238,50 @@ L_Teach:
     if (@Q_status == @STATUS_READY_TO_LEARN_CURE_POISON) goto L_T_CurePosion;
     if (@Q_status == @STATUS_LEARNED_CURE_POISON) goto L_T_dunno;
 
-    mes "[Elanore the Healer]";
+    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.\"";
     goto L_close;
 
 L_T_Initial:
-    mes "[Elanore the Healer]";
+    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.";
     next;
-    mes "[Elanore the Healer]";
+    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.\"";
     mes "She reaches inside her satchel and pulls out a piece of crystal, glittering in the sun.";
     mes "\"This here is a lifestone, life energy encased in a crystal shell. You will need it for most healing magic.\"";
     next;
-    mes "[Elanore the Healer]";
-    mes "\"To heal someone, first locate the injury. As a beginner, you have to touch the wound; with practice, it will be enough to think about it. Hold the lifestone in one hand, touching the wound with the other.\"";
-    mes "\"Then say, '" + get(.invocation$, "lesser-heal") + "', followed by the name of the one you wish to heal.\"";
-    next;
-    mes "[Elanore the Healer]";
-    mes "\"You might want to write that down, actually. In fact, you might want to make sure to keep notes of all spells you hear, for you never know if you will hear them again!\"";
-    mes "\"The invocation was '" + get(.invocation$, "lesser-heal") + "'.\"";
+    mesn l("Elanore the Healer");
+    mesq l("To heal someone, first locate the injury. As a beginner, you have to touch the wound; with practice, it will be enough to think about it. Hold the lifestone in one hand, touching the wound with the other.");
+    mesq l("Then chant the lesser healing spell, '%s', with whoever you wish to heal targeted.", b("lum"));
     next;
-    mes "[Elanore the Healer]";
-    mes "\"This will only cure cuts and bruises, though, and it will take some time to take effect. It will be useless to mend broken bones or more severe injuries!\"";
-    mes "\"To heal yourself, it's enough to just say '" + get(.invocation$, "lesser-heal") + "' by itself.\"";
+    mesn l("Elanore the Healer");
+    mesq l("This will only cure cuts and bruises, though, and it will take some time to take effect. It will be useless to mend broken bones or more severe injuries!");
+    mesq l("To heal yourself, it's enough to just cast by itself, without a target selected.");
     next;
-    mes "[Elanore the Healer]";
-    mes "\"Let me give you a lifestone to get started with.\"";
+    mesn l("Elanore the Healer");
+    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;
+    learnskill SKILL_LUM;
     @Q_status = @STATUS_LEARNED_LIGHT_HEAL;
     callsub S_Update_Var;
 
-    mes "[Elanore the Healer]";
+    mesn l("Elanore the Healer");
     mes "Elanore hands you the crystal.";
     mes "\"Here you are. I hope that it will allow you to do good!\"";
     goto L_close;
 
 L_T_Initial_Noroom:
-    mes "[Elanore the Healer]";
+    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.\"";
     goto L_close;
 
 L_T_ChkAdvTo2:
-    mes "[Elanore the Healer]";
+    mesn l("Elanore the Healer");
     if (@Q_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.\"";
@@ -298,20 +290,20 @@ L_T_ChkAdvTo2:
     goto L_T_AdvTo2_skip;
 
 L_T_AdvTo2_warn:
-    mes "[Elanore the Healer]";
+    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;
 
 L_T_AdvTo2_skip:
-    mes "[Elanore the Healer]";
+    mesn l("Elanore the Healer");
     mes "\"Please stand still.\"";
     mes "She walks up to you, holds your shoulders, and smiles at you.";
     next;
-    mes "[Elanore the Healer]";
+    mesn l("Elanore the Healer");
     mes "Then, she rises up on her tiptoes and kisses you on your forehead.";
     next;
-    mes "[Elanore the Healer]";
+    mesn l("Elanore the Healer");
     mes "You feel a strange, tingling kind of warmth spread through your body.";
     @Q_status = @STATUS_MASTERED_LIGHT_HEAL;
     callsub S_Update_Var;
@@ -334,48 +326,52 @@ L_T_ChkAdvToLOH:
     if (getskilllv(SKILL_MAGIC) < 2) goto L_T_LOH_adv_abort0;
     if (@Q_heal_exp < 30) goto L_T_LOH_adv_abort1;
 
-    mes "[Elanore the Healer]";
-    mes "\"I will now teach you how to heal by laying on your hands. The technique is similar to the spell I taught you at the beginning, but this time you transfer your own health instead of drawing health from a lifestone.\"";
+    mesn l("Elanore the Healer");
+    mesq l("I will now teach you how to heal by laying on your hands. The technique is similar to the spell I taught you at the beginning, but this time you transfer your own health instead of drawing health from a lifestone.");
     next;
-    mes "[Elanore the Healer]";
-    mes "\"First, lay your hand on the person you wish to heal. You needn't touch the injury itself, though you have to touch the skin until you are a little more experienced. Then, medidate on the word '" + get(.invocation$, "lay-on-hands") + "'\"";
+    mesn l("Elanore the Healer");
+    mesq l("\"First, lay your hand on the person you wish to heal. You needn't touch the injury itself, though you have to touch the skin until you are a little more experienced. Then, medidate on the word '%s', which is the lay on hands magic.\"", b("inma"));
     next;
-    mes "[Elanore the Healer]";
-    mes "\"This will let your own life force flow into the person you are healing. If you are badly injured yourself, you will not be able to do this.\"";
+    mesn l("Elanore the Healer");
+    mesq l("This will let your own life force flow into the person you are healing. If you are badly injured yourself, you will not be able to do this and may even injure yourself further.");
+    next;
+    mesn l("Elanore the Healer");
+    mesq l("Unlike lesser heal, it'll heal instantly, however it still cannot help if the person has a serious injury or has been inflicted with an ailment.");
     mes "[1000 experience points]";
     getexp 1000, 0;
+    learnskill SKILL_INMA;
     @Q_status = @STATUS_LEARNED_LAY_ON_HANDS;
     callsub S_Update_Var;
     goto L_close;
 
 L_T_LOH_adv_abort0:
-    mes "[Elanore the Healer]";
-    mes "\"You don't have enough magical power to learn the next healing spell yet.\"";
+    mesn l("Elanore the Healer");
+    mesq l("You don't have enough magical power to learn the next healing spell yet.");
     goto L_close;
 
 L_T_LOH_adv_abort1:
-    mes "[Elanore the Healer]";
-    mes "\"I'm sorry, but I am not yet convinced that you are a good enough healer. Please continue in your endeavours.\"";
+    mesn l("Elanore the Healer");
+    mesq l("I'm sorry, but I am not yet convinced that you are a good enough healer. Please continue in your endeavors.");
     goto L_close;
 
 L_T_Explain3:
     if (getskilllv(SKILL_MAGIC) < 3) goto L_T_Explain3_abort;
     if (@Q_heal_exp < 50) goto L_T_Explain3_fail;
 
-    mes "[Elanore the Healer]";
-    mes "Elanore smiles.";
+    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.\"";
     set QUEST_MAGIC2, (QUEST_MAGIC2 & ~(NIBBLE_3_MASK)); // Initialise Kadiya quest
     @Q_status = @STATUS_WAITING_FOR_KADIYA;
     callsub S_Update_Var;
     next;
 
-    mes "[Elanore the Healer]";
+    mesn l("Elanore the Healer");
     mes "\"There is a man here in Tulimshar with a beautiful young daughter; his name is Omar, and his daughter's name is Kadiya.\"";
     mes "\"Once, when I was a young apprentice, I made a mistake treating Omar. Ever since, he no longer trusts me.\"";
     next;
 
-    mes "[Elanore the Healer]";
+    mesn l("Elanore the Healer");
     mes "\"But his daugher has contracted Mopox, so she needs help. He doesn't trust me, but perhaps he will trust you; you have been helping quite a few people, after all.\"";
     next;
     goto L_3_menu;
@@ -389,46 +385,46 @@ L_3_menu:
         "Maybe later.", L_Main;
 
 L_3_what_to_do:
-    mes "[Elanore the Healer]";
+    mesn l("Elanore the Healer");
     mes "\"You will have to brew a Mopox cure potion and give it to her. You should ask Caul to help you, he knows the recipe.\"";
     next;
-    mes "[Elanore the Healer]";
+    mesn l("Elanore the Healer");
     mes "\"First, you will need a concentration potion and an iron potion – together, they will give her her strength back. You also need a lifestone, and a gamboge leaf against the toxins in her body.\"";
     next;
-    mes "[Elanore the Healer]";
+    mesn l("Elanore the Healer");
     mes "\"You then have to add in roots, water, mauve leaves and sulphur powder until the brew is gooey and neither light nor dark. Caul will explain the details to you.\"";
     next;
-    mes "[Elanore the Healer]";
+    mesn l("Elanore the Healer");
     mes "\"There is a transmutation spell to make sulphur powder. If you don't know the magic, perhaps you can ask a transmutation mage to help you with this part.\"";
     next;
     goto L_3_menu;
 
 L_3_messup:
-    mes "[Elanore the Healer]";
+    mesn l("Elanore the Healer");
     mes "\"Ah... well, Omar is a trader, and a frequent traveler. One day he came back from a journey with fleas in his beard and asked me to get rid of them.\"";
     next;
-    mes "[Elanore the Healer]";
+    mesn l("Elanore the Healer");
     mes "\"Unfortunately I used the wrong lotion on the fleas, so instead of being scared away, they grew to enormous proportions and ate up all of his beard.\"";
     next;
-    mes "[Elanore the Healer]";
+    mesn l("Elanore the Healer");
     mes "Elanore blushes.";
     mes "\"Ever since then he hasn't been very trusting towards my skills, and I suppose that I can't blame him. But I don't want poor Kadiya to suffer because of that.\"";
     next;
     goto L_3_menu;
 
 L_3_where:
-    mes "[Elanore the Healer]";
+    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.\"";
     next;
     goto L_3_menu;
 
 L_T_Explain3_abort:
-    mes "[Elanore the Healer]";
+    mesn l("Elanore the Healer");
     mes "\"I'm sorry, but you lack the magical power to advance.\"";
     goto L_close;
 
 L_T_Explain3_fail:
-    mes "[Elanore the Healer]";
+    mesn l("Elanore the Healer");
     if (@Q_heal_exp < 30)
         mes "\"You seem to have regressed as a healer. This is worrisome; please mend your ways or I will not teach you any further.\"";
     if ((@Q_heal_exp >= 30) && (@Q_heal_exp < 40))
@@ -442,24 +438,24 @@ L_T_ChkAdvTo3:
 
     if (@Q_kadiya_status >= @Q_STATUS_COMPLETED) goto L_T_AdvTo3Ready;
 
-    mes "[Elanore the Healer]";
+    mesn l("Elanore the Healer");
     mes "\"Please help Kadiya.\"";
     next;
     goto L_3_menu;
 
 L_T_AdvTo3Ready:
-    mes "[Elanore the Healer]";
+    mesn l("Elanore the Healer");
     mes "\"I have heard of what you did. Hiding the potion in her favorite food – that was clever.\"";
     mes "She smiles at you.";
     mes "\"Omar let me have a look at her earlier, and she seems to be recovering. You did very well.";
     next;
-    mes "[Elanore the Healer]";
+    mesn l("Elanore the Healer");
     mes "Elanor turns towards you, rises up on her toes and kisses you on the forehead.";
     next;
     @xp = 30000;
     if (@Q_kadiya_status == @Q_STATUS_COMPLETED_ELANORE)
         @xp = 50000;
-    mes "[Elanore the Healer]";
+    mesn l("Elanore the Healer");
     mes "You feel a strange, tingling kind of warmth spread through your body.";
     mes "[" + @xp + " experience points]";
     mes "[Level 3 in Life Magic]";
@@ -473,7 +469,7 @@ L_T_AdvTo3Ready:
 
     if (@Q_kadiya_status != @Q_STATUS_COMPLETED_ELANORE) goto L_Main;
 
-    mes "[Elanore the Healer]";
+    mesn l("Elanore the Healer");
     mes "\"Overall I am impressed by your progress. If you continue as you are doing now, you might become a great healer.\"";
     mes "She hands you a handful of lifestones.";
     mes "\"Please come back soon; there is more that I would like to teach you.\"";
@@ -484,20 +480,20 @@ L_T_AdvTo3Ready:
     goto L_Main;
 
 L_T_CurePosion:
-    mes "[Elanore the Healer]";
+    mesn l("Elanore the Healer");
     mes "\"Thank you again for your help with Kadiya!\"";
     mes "\"Curing sicknesses is often quite difficult; most of them require complicated potions to be brewed.\"";
     next;
-    mes "[Elanore the Healer]";
+    mesn l("Elanore the Healer");
     mes "\"Fortunately, things are much easier with most poisons. For those we have a simple spell that only requires a Gamboge leaf.\"";
     mes "\"This is the next spell that I would like to teach you.\"";
     next;
-    mes "[Elanore the Healer]";
+    mesn l("Elanore the Healer");
     mes "\"If you would like to cure someone who is poisoned, first rub a Gamboge leaf between your hands. Your hands must be covered in Gamboge liquid for this to work.\"";
     mes "\"Speak the invocation, `" + get(.invocation$, "cure-poison") + "'.\"";
     mes "\"Next, you either touch the poisoned person with your hands, or speak their name. You have to be close for this to work, though.\"";
     next;
-    mes "[Elanore the Healer]";
+    mesn l("Elanore the Healer");
     mes "\"Once again, the invocation is `" + get(.invocation$, "cure-poison") + "'.\"";
     mes "\"Come back again soon; there is another spell I would like to teach you.\"";
     next;
@@ -506,7 +502,7 @@ L_T_CurePosion:
     goto L_Main;
 
 L_T_dunno:
-    mes "[Elanore the Healer]";
+    mesn l("Elanore the Healer");
     mes "\"Hmm. I wanted to teach you something, but I've forgotten what it was... please come back later.\"";
     next;
     goto L_Main;
@@ -525,57 +521,57 @@ L_Question:
     if (@c == @QQ_OLDWIZ) goto L_Q_oldwiz;
     if (@c == @QQ_ASTRALSOUL) goto L_Q_astralsoul;
 
-    mes "[Elanore the Healer]";
+    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.\"";
     next;
     goto L_Main;
 
 L_Q_astralsoul:
-    mes "[Elanore the Healer]";
+    mesn l("Elanore the Healer");
     mes "\"The astral soul skill is one of the most important skills for mages. I learned this focus long time ago. Without that skill your magic is quite useless, isn't it? If the rumors are really true, there is an experienced mage in the Woodlands around Hurnscald.\"";
     next;
     goto L_Main;
 
 L_Q_oldwiz:
-    mes "[Elanore the Healer]";
+    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.\"";
     next;
     goto L_Main;
 
 L_Q_manaseed:
-    mes "[Elanore the Healer]";
-    mes "She smiles.";
+    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!\"";
     next;
     goto L_Main;
 
 L_Q_manapotion:
-    mes "[Elanore the Healer]";
+    mesn l("Elanore the Healer");
     mes "\"I'm sorry, but I can't help you with that.\"";
     next;
     goto L_Main;
 
 L_Q_wyara:
-    mes "[Elanore the Healer]";
+    mesn l("Elanore the Healer");
     mes "\"Wyara is the Hurnscald town witch. She was also the town healer before the Doctor moved there.\"";
     next;
     goto L_Main;
 
 L_Q_sagatha:
-    mes "[Elanore the Healer]";
+    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.\"";
     next;
     goto L_Main;
 
 L_Q_auldsbel:
-    mes "[Elanore the Healer]";
+    mesn l("Elanore the Healer");
     mes "\"Oh, sorry – I don't really know him very well.\"";
     next;
     goto L_Main;
 
 L_CurePoison:
-    mes "[Elanore the Healer]";
+    mesn l("Elanore the Healer");
     mes "\"Oh dear!  That looks like poison; hang on...\"";
     mes "She performs a complicated gesture.";
         sc_end(SC_POISON);
@@ -583,13 +579,13 @@ L_CurePoison:
     misceffect sfx_magic_life, strcharinfo(0);
     misceffect sfx_magic_life;
     next;
-    mes "[Elanore the Healer]";
+    mesn l("Elanore the Healer");
     mes "\"There you are, right as rain!  Now you take care, all right?\"";
     goto L_close;
 
 L_Bye:
-    mes "[Elanore the Healer]";
-    mes "\"Goodbye!\"";
+    mesn l("Elanore the Healer");
+    mesq l("Goodbye!");
     goto L_close;
 
 L_close:
diff --git a/npc/magic/level1-lesser-heal.txt b/npc/magic/level1-lesser-heal.txt
index bf515062..805b79ec 100644
--- a/npc/magic/level1-lesser-heal.txt
+++ b/npc/magic/level1-lesser-heal.txt
@@ -13,7 +13,15 @@ function	script	SK_Lum	{
         // Kill the GM Event
         if (isequipped(MagicGMTopHat))
             .@ok=false;
-        // Ailments cannot prevent this one because the Lifestione, so...
+        // Ailments cannot be bypassed nor healed until Lv 3 Life Magic
+        if (getstatus(SC_BLOODING))
+            .@ok=false;
+        if (getstatus(SC_CURSE))
+            .@ok=false;
+        if (getstatus(SC_POISON) && !getstatus(SC_SLOWPOISON))
+            .@ok=false;
+        if (getstatus(SC_DPOISON) && !getstatus(SC_SLOWPOISON))
+            .@ok=false;
         // Already dead
         if (Hp < 1)
             .@ok=false;