Merge branch 'master' of the testing branch

Conflicts:
	conf/magic.conf
	db/item_db.txt
	npc/013-3_Cave/barrier.txt

Eliminated conf/magic.conf.  Re-build this file using conf/build-magic.sh;
otherwise marriage will be disabled and spells won't work.

7 files changed, 690 insertions, 26 deletions

diff --git a/npc/001-1_Tulimshar/bard.txt b/npc/001-1_Tulimshar/bard.txt
index 8d53fc72..8b416ec5 100644
--- a/npc/001-1_Tulimshar/bard.txt
+++ b/npc/001-1_Tulimshar/bard.txt
@@ -1,9 +1,112 @@
 //
 
-001-1.gat,50,44,0	script	Bard	152,{
+001-1.gat,37,73,0	script	Bard	152,{
 	setarray @songs$, "\"There once was a bard, who had it hard, because a man in dark green, was very mean.\"",
 			"\"At Hurnscald inn, there was a person of fairest skin, declining wedding bands from quite a many hands.\"",
 			"\"As the Sun sets down in the forest's brown, she whom the fragrance holds counts her gold.\"";
+        set @name$, "Bill Ballshaker the Bard";
+        mes "[" + @name$ + "]";
+        if (Sex)
+        	mes "\"Greetings, traveler!  Have you come to listen to my stories?\"";
+        if (!Sex)
+        	mes "\"Greetings, fair lady!  Well met, on such a lovely day!  Might I entertain you with a tale or two?\"";
+        next;
+
+L_Main:
+        menu "Sing me a song, lute man!", L_Song,
+             "Have you heard any news?", L_News,
+             "What do you know about...", L_Question,
+             "Farewell!", -;
+        close;
+
+L_News:
+        mes "[" + @name$ + "]";
+        mes "\"News I have for you indeed, lest you have already overheard (for then it would no longer be news to you!)\"";
+        next;
+        mes "[" + @name$ + "]";
+        mes "\"Rumor has it that an ancient source of magic, a Mana Seed, has been sighted in the west, beyond the fair town of Hurnscald.\"";
+        next;
+        set MAGIC_FLAGS, MAGIC_FLAGS | MFLAG_MANASEED_RUMOUR;
+        mes "[" + @name$ + "]";
+        mes "\"Whence it came, nobody knows... but they say that sometimes such Mana Seeds may choose a powerful individual to impart some of its mystic power to!\"";
+        next;
+        mes "[" + @name$ + "]";
+        mes "\"I wonder who might be qualified?\"";
+        next;
+        goto L_Main;
+
+L_Question:
+        callfunc "MagicTalkOptionsSetup";
+        set @ignore, 0;
+        callfunc "MagicTalkMenu";
+
+        if (@c == 0)		goto L_Main;
+        if (@c == @QQ_ELANORE)	goto L_Q_elanore;
+        if (@c == @QQ_MANASEED)	goto L_Q_manaseed;
+        if (@c == @QQ_WYARA)	goto L_Q_wyara;
+        if (@c == @QQ_SAGATHA)	goto L_Q_sagatha;
+        if (@c == @QQ_AULDSBEL)	goto L_Q_auldsbel;
+        if (@c == @QQ_OLDWIZ)	goto L_Q_oldwiz;
+
+        mes "[" + @name$ + "]";
+        mes "\"Alas, I know very little about this matter.\"";
+        next;
+        goto L_Main;
+
+L_Q_oldwiz:
+        mes "[" + @name$ + "]";
+        mes "\"The old wizard has been an old man for as long as I remember, living near the mountains in his magic hut-- a hut that is bigger on the inside, just like in the old tales of Gyer Filla the Wise....\"";
+        next;
+        mes "[" + @name$ + "]";
+        mes "\"I doubt that they are the same person, though.  For one, I have never seen his hut fly.  For another, Gyer never took apprentices.\"";
+        next;
+        goto L_Main;
+
+L_Q_elanore:
+        mes "[" + @name$ + "]";
+        mes "\"Elanore is this town's healer.  Rumor has it that she traveled far and wide when she was younger, to learn the deepest secrets of healing magic, after her brother caught a mysterious illness.\"";
+        next;
+        goto L_Main;
+
+L_Q_manaseed:
+        mes "[" + @name$ + "]";
+        mes "\"The Mana Seed is said to be a source of great magic.  Perhaps some witch or wizard might know more about it?\"";
+        next;
+        goto L_Main;
+
+L_Q_wyara:
+        mes "[" + @name$ + "]";
+        mes "\"Wyara is not actually from Hurnscald.  As a young witch, she decided to settle down there to help the people of Hurnscald.  She is kind and gentle, except towards the Doctor, who seems to have little respect for her potions.\"";
+        next;
+        goto L_Main;
+
+L_Q_sagatha:
+        mes "[" + @name$ + "]";
+        mes "\"Sagatha!  Ah, such a wonderful and mysterious being; the center of many a tale...\"";
+        next;
+        mes "[" + @name$ + "]";
+        mes "\"Some say that she is the most powerful witch in all of Argaes.  I don't know whether that is true, but I am quite certain that the is the most beautiful of all the witches!  Alas, she will let no man touch her...\"";
+        mes "He sighs.";
+        next;
+        mes "[" + @name$ + "]";
+        mes "\"I met her only twice, back in my traveling days, but there are two pieces of advice I can give you:\"";
+        next;
+        mes "[" + @name$ + "]";
+        mes "\"First, she will suffer no fool easily, particularly no man.\"";
+        next;
+        mes "[" + @name$ + "]";
+        mes "\"Second, the creatures of the forest mean everything to her.  Harm them, and you may find her an enemy-- and a powerful one at that...\"";
+        next;
+        goto L_Main;
+
+L_Q_auldsbel:
+        mes "[" + @name$ + "]";
+        mes "\"Auldsbel is some wizard from further north, from what I have gathered.  He bought a hut near Hurnscald some years back and often comes here to experiment on things, probably because he is not allowed to do these experiments where he comes from.\"";
+        next;
+        goto L_Main;
+
+L_Song:
+        mes "[" + @name$ + "]";
 	set @id, rand(3);
 	mes @songs$[@id];
 	close;
diff --git a/npc/001-1_Tulimshar/children.txt b/npc/001-1_Tulimshar/children.txt
index a3ab8e07..1b62953d 100644
--- a/npc/001-1_Tulimshar/children.txt
+++ b/npc/001-1_Tulimshar/children.txt
@@ -54,7 +54,8 @@ L_8:
 }
 
 001-1.gat,39,67,0	script	Nina	103,{
-	set @TEMP,rand(8);
+	mes "[Nina]";
+	set @TEMP,rand(10);
 	if(@TEMP == 0) goto L_1;
 	if(@TEMP == 1) goto L_1;
 	if(@TEMP == 2) goto L_2;
@@ -64,44 +65,72 @@ L_8:
 	if(@TEMP == 6) goto L_6;
 	if(@TEMP == 7) goto L_7;
 	if(@TEMP == 8) goto L_8;
+	goto L_9;
 
 L_1:
-	mes "[Nina]";
 	mes "\"If I learned anything from school, Grenxen founded Tulimshar.\"";
 	close;
 
 L_2:
-	mes "[Nina]";
 	mes "\"When I was picking rocks from the field, I saw a red scorpion.\"";
 	close;
 
 L_3:
-	mes "[Nina]";
 	mes "\"Its polite to state your name before talking to anyone.\"";
 	close;
 
 L_4:
-	mes "[Nina]";
+
 	mes "\"I have a Scorpion Doll!\"";
 	close;
 
 L_5:
-	mes "[Nina]";
 	mes "\"I always take some spare Cactus Juices with me on the field.  They are heavy, though.\"";
 	close;
 
 L_6:
-	mes "[Nina]";
 	mes "\"When you are feeling bad, eating something can usually help you heal faster.\"";
 	close;
 
 L_7:
-	mes "[Nina]";
 	mes "\"Grenxen is the Demon that founded Tulimshar.\"";
 	close;
 
 L_8:
+	mes "\"That volcano eruption was scary; much of Tulimshar was destroyed.  But the mayor had everything rebuilt quickly.\"";
+	close;
+
+L_9:
+	mes "\"I know a very bad word. But I must not say it, because monsters will come and get me if I do!\"";
+        next;
+	menu
+		"A bad word?", L_tell,
+		"Oh, you better keep it for yourself then.", -;
+	close;
+
+L_tell:
+	mes "[Nina]";
+	mes "\"Yes, I heard my mother say it once. And she made me promise her to never say it. Never.\"";
+	next;
+	menu	"If I promise to never tell anyone, can you tell me the word?", L_keepword,
+		"I understand, you do not need to tell...", L_giveword,
+		"Goodbye!", -;
+	close;
+
+L_keepword:
 	mes "[Nina]";
-	mes "That volcano eruption was terrifying; much of Tulimshar was destroyed.  Fortunately the mayor had everything rebuilt quickly.";
+	mes "\"No.\"";
 	close;
+
+L_giveword:
+	mes "[Nina]";
+	mes "Nina looks around as she hushes you to silence. After a few seconds she whispers to you.";
+	mes "\"I like you! So I will tell you the bad word.  But you can't tell anyone else about it! The bad word is '" + getspellinvocation("aggravate") + "'.\"";
+        next;
+
+	mes "[Nina]";
+        mes "Terrified, she looks around once more.";
+        mes "\"But you mustn't tell anyone!\"";
+        next;
+        close;
 }
diff --git a/npc/001-1_Tulimshar/elanore.txt b/npc/001-1_Tulimshar/elanore.txt
index 68f0676b..a2afb2d3 100644
--- a/npc/001-1_Tulimshar/elanore.txt
+++ b/npc/001-1_Tulimshar/elanore.txt
@@ -1,6 +1,25 @@
 //
 
-001-1.gat,58,68,0	script	Elanore	108,{
+001-1.gat,58,68,0	script	Elanore#_M	108,{
+
+	set @has_magic, getskilllv(SKILL_MAGIC);
+
+        set @Q_MASK, NIBBLE_1_MASK;
+        set @Q_SHIFT, NIBBLE_1_SHIFT;
+
+        set @Q_status, (QUEST_MAGIC2 & @Q_MASK) >> @Q_SHIFT;
+        set @Q_heal_exp, MAGIC_EXPERIENCE >> 24;
+
+        set @STATUS_INITIAL, 0;
+        set @STATUS_LEARNED_LIGHT_HEAL, 1;
+        set @STATUS_MASTERED_LIGHT_HEAL, 2;
+        set @STATUS_LEARNED_LAY_ON_HANDS, 3;
+        set @STATUS_WAITING_FOR_KADIYA, 4;
+        set @STATUS_READY_TO_LEARN_CURE_POISON, 5;
+        set @STATUS_LEARNED_CURE_POISON, 6;
+
+        if (sc_check(sc_poison))
+        	goto L_CurePoison;
 
 	if (baselevel > 10) goto L_NoHeal;
 
@@ -78,11 +97,524 @@ Heal_4:
 	close;
 	
 L_NoHeal:
+        if (MAGIC_FLAGS)
+        	goto L_Chat;
 
+L_NoHealMessage:
 	mes "[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 ten.";
 	mes "With so many people still injured from the earthquake, I really have no time to help.";
 	mes "You can get some rest in the inn near here.\"";
 	
 	close;
+
+L_Chat:
+	mes "[Elanore the Healer]";
+        mes "\"Hello!  Can I help you?\"";
+        next;
+L_Main:
+        if (@has_magic && (@Q_status == @STATUS_INITIAL))
+            menu
+        	"Can you heal me?", L_NoHealMessage,
+                "Can you teach me magic?", L_Teach,
+		"What do you know about...", L_Question,
+                "Goodbye!", L_bye;
+
+        if (@has_magic && (@Q_status > @STATUS_INITIAL))
+            menu
+        	"Can you heal me?", L_NoHealMessage,
+                "Can you teach me more?", L_Teach,
+                "Where can I get more lifestones?", L_Lifestones,
+		"What do you know about...", L_Question,
+                "Goodbye!", L_bye;
+
+        if (!@has_magic)
+            menu
+        	"Can you heal me?", L_NoHealMessage,
+		"What do you know about...", L_Question,
+                "Goodbye!", L_bye;
+        close;
+
+OnPCKillEvent:
+        attachrid(@killerrid);
+        set @Q_heal_exp, MAGIC_EXPERIENCE >> 24;
+        if (@Q_heal_exp < 8)
+		goto L_OnPcKillWipe;
+        set @Q_heal_exp, @Q_heal_exp - 8;
+        goto L_OnPcKillFinish;
+L_OnPcKillWipe:
+        set @Q_heal_exp, 0;
+L_OnPcKillFinish:
+        set MAGIC_EXPERIENCE, (MAGIC_EXPERIENCE & ~(255 << 24)) | (@Q_heal_exp << 24);
+        close;
+
+L_Lifestones:
+	mes "[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
+		"OK, I will get them.", -,
+                "No way!", -,
+		"Here you are!", L_Lifestones_Trade,
+		"Can I make them myself?", L_Lifestones_MakeSelf;
+        close;
+
+L_Lifestones_Trade:
+	if (countitem("MauveHerb") < 10) goto L_Lifestones_Trade_Missing;
+	if (countitem("GambogeHerb") < 10) goto L_Lifestones_Trade_Missing;
+	if (countitem("AlizarinHerb") < 10) goto L_Lifestones_Trade_Missing;
+	if (countitem("CobaltHerb") < 10) goto L_Lifestones_Trade_Missing;
+	getinventorylist;
+	if (@inventorylist_count == 100 && countitem("Lifestone") == 0
+            && countitem("MauveHerb") > 10
+            && countitem("GambogeHerb") > 10
+            && countitem("AlizarinHerb") > 10
+            && countitem("CobaltHerb") > 10) goto L_Lifestones_NoRoom;
+
+        delitem "MauveHerb", 10;
+        delitem "GambogeHerb", 10;
+        delitem "AlizarinHerb", 10;
+        delitem "CobaltHerb", 10;
+        getitem "LifeStone", 5;
+        getexp 200, 1;
+	mes "[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]";
+        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.";
+        mes "[200 experience points]";
+        next;
+        close;
+
+L_Lifestones_NoRoom:
+	mes "[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.\"";
+        next;
+        close;
+
+L_Lifestones_Trade_Missing:
+	mes "[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.\"";
+        next;
+        close;
+
+L_Lifestones_MakeSelf:
+	mes "[Elanore the Healer]";
+        if (@has_magic < 2)
+        	goto L_Lifestones_MakeSelf_no;
+
+L_Lifestones_MakeSelf_yes:
+        mes "\"Oh, but of course!  You are powerful enough to make your own lifestones, using the enchantment '" + getspellinvocation("enchant-lifestone") + "'.  This will consume a bug leg or a maggot slime or one of each of the four healing herbs, though.\"";
+        next;
+	mes "[Elanore the Healer]";
+        mes "\"You will have to make sure that your powers are pure, though, either by wearing a white robe or some other special magical item that does this for you.\"";
+        next;
+        close;
+
+L_Lifestones_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!\"";
+        next;
+        close;
+
+L_Teach:
+        if (@Q_status == @STATUS_INITIAL) goto L_Teach_Initial;
+        if (@Q_status == @STATUS_LEARNED_LIGHT_HEAL) goto L_Teach_CheckAdvanceTo2;
+        if (@Q_status == @STATUS_MASTERED_LIGHT_HEAL) goto L_Teach_CheckAdvanceToLOH;
+        if (@Q_status == @STATUS_LEARNED_LAY_ON_HANDS) goto L_Teach_Explain3;
+        if (@Q_status == @STATUS_WAITING_FOR_KADIYA) goto L_Teach_CheckAdvanceTo3;
+        if (@Q_status == @STATUS_READY_TO_LEARN_CURE_POISON) goto L_Teach_CurePosion;
+        if (@Q_status == @STATUS_LEARNED_CURE_POISON) goto L_Teach_dunno;
+
+	mes "[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.\"";
+        next;
+        close;
+
+L_Teach_Initial:
+	mes "[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]";
+        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, '" + getspellinvocation("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 now if you will hear them again!\"";
+        mes "\"The invocation was '" + getspellinvocation("lesser-heal") + "'.\"";
+        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 '" + getspellinvocation("lesser-heal") + "' by itself.\"";
+        next;
+	mes "[Elanore the Healer]";
+        mes "\"Let me give you a lifestone to get started with.\"";
+        next;
+
+	getinventorylist;
+	if ((@inventorylist_count == 100) && (countitem("LifeStone") == 0))
+        	goto L_Teach_Initial_Noroom;
+
+        getitem "LifeStone", 1;
+        set @Q_status, @STATUS_LEARNED_LIGHT_HEAL;
+        callsub S_update_var;
+
+	mes "[Elanore the Healer]";
+        mes "Elanore hands you the crystal.";
+        mes "\"Here you are.  I hope that it will allow you to do good!\"";
+        next;
+        close;
+
+L_Teach_Initial_Noroom:
+	mes "[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.\"";
+        close;
+
+L_Teach_CheckAdvanceTo2:
+	mes "[Elanore the Healer]";
+        if (@Q_heal_exp < 20)
+		goto L_Teach_CheckAdvanceTo2_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_Teach_AdvanceTo2_warn;
+
+        goto L_Teach_AdvanceTo2_skip;
+L_Teach_AdvanceTo2_warn:
+	mes "[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;
+L_Teach_AdvanceTo2_skip:
+
+	mes "[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]";
+        mes "Then, she rises up on her tiptoes and kisses you on your forehead.";
+        next;
+
+	mes "[Elanore the Healer]";
+        mes "You feel a strange, tingling kind of warmth spread through your body.";
+        mes "[5000 experience points]";
+        mes "[Level 2 in Life Magic]";
+
+        set @Q_status, @STATUS_MASTERED_LIGHT_HEAL;
+        callsub S_update_var;
+        getexp 5000, 0;
+        if (getskilllv(SKILL_MAGIC_LIFE) < 2)
+        	setskill SKILL_MAGIC_LIFE, 2;
+        close;
+
+L_Teach_CheckAdvanceTo2_fail:
+        mes "\"I think I would like to observe you for a little longer to see if you would make a good healer.\"";
+        if (@Q_heal_exp < 5)
+        	mes "\"You are still at the beginning of your path, but do keep practicing.\"";
+        if ((@Q_heal_exp >= 5) && (@Q_heal_exp < 15))
+        	mes "\"You are making progress, but you still need more practice.\"";
+        if (@Q_heal_exp >= 15)
+        	mes "\"You have made good progress, but please do continue in your efforts.\"";
+        close;
+
+L_Teach_CheckAdvanceToLOH:
+        if (getskilllv(SKILL_MAGIC) < 2)
+        	goto L_Teach_LOH_advance_abort0;
+        if (@Q_heal_exp < 30)
+		goto L_Teach_LOH_advance_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.\"";
+        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 '" + getspellinvocation("lay-on-hands") + "'\"";
+        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.\"";
+        mes "[1000 experience points]";
+        getexp 1000, 0;
+        set @Q_status, @STATUS_LEARNED_LAY_ON_HANDS;
+        callsub S_update_var;
+        next;
+        close;
+
+L_Teach_LOH_advance_abort0:
+	mes "[Elanore the Healer]";
+        mes "\"You don't have enough magical power to learn the next healing spell yet.\"";
+        close;
+
+L_Teach_LOH_advance_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.\"";
+        close;
+
+L_Teach_Explain3:
+        if (getskilllv(SKILL_MAGIC) < 3)
+        	goto L_Teach_Explain3_abort;
+        if (@Q_heal_exp < 50)
+		goto L_Teach_Explain3_fail;
+
+	mes "[Elanore the Healer]";
+        mes "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
+        set @Q_status, @STATUS_WAITING_FOR_KADIYA;
+        callsub S_update_var;
+        next;
+
+	mes "[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]";
+        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;
+
+L_3_menu:
+        menu
+        	"What should I do?", L_3_what_to_do,
+        	"Where can I find the sick girl?", L_3_where,
+        	"How did you mess up?", L_3_messup,
+                "I will get started right away.", -,
+                "Maybe later.", -;
+
+        goto L_Main;
+
+L_3_what_to_do:
+	mes "[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]";
+        mes "\"First, you will need a concentration potion and an iron potion-- toghether, 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]";
+        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]";
+        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]";
+        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]";
+        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]";
+        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]";
+        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_Teach_Explain3_abort:
+	mes "[Elanore the Healer]";
+        mes "\"I'm sorry, but you lack the magical power to advance.\"";
+        close;
+
+L_Teach_Explain3_fail:
+	mes "[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))
+        	mes "\"You still need more practice in the art of healing.\"";
+        if ((@Q_heal_exp >= 40))
+        	mes "\"You are doing well, but you need some more practice as a healer first.\"";
+        close;
+
+L_Teach_CheckAdvanceTo3:
+        callfunc "KadiyaSubquestConsts";
+
+        if (@Q_kadiya_status >= @Q_STATUS_COMPLETED)
+        	goto L_Teach_AdvanceTo3Ready;
+
+	mes "[Elanore the Healer]";
+	mes "\"Please help Kadiya.\"";
+        next;
+
+        goto L_3_menu;
+
+L_Teach_AdvanceTo3Ready:
+        mes "[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]";
+        mes "Elanor turns towards you, rises up on her toes and kisses you on the forehead.";
+        next;
+
+        set @xp, 30000;
+        if (@Q_kadiya_status == @Q_STATUS_COMPLETED_ELANORE)
+		set @xp, 50000;
+
+	mes "[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]";
+
+        set @Q_status, @STATUS_READY_TO_LEARN_CURE_POISON;
+        callsub S_update_var;
+        getexp @xp, 0;
+        if (getskilllv(SKILL_MAGIC_LIFE) < 3)
+        	setskill SKILL_MAGIC_LIFE, 3;
+        next;
+
+
+        if (@Q_kadiya_status != @Q_STATUS_COMPLETED_ELANORE)
+		goto L_Main;
+
+	mes "[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.\"";
+        next;
+        set MAGIC_FLAGS, MAGIC_FLAGS | MFLAG_ELANORE_OMAR;
+        getitem "LifeStone", 20;
+
+        goto L_Main;
+
+L_Teach_CurePosion:
+        mes "[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]";
+        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]";
+        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, `" + getspellinvocation("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]";
+        mes "\"Once again, the invocation is `" + getspellinvocation("cure-poison") + "'.\"";
+        mes "\"Come back again soon; there is another spell I would like to teach you.\"";
+        next;
+        set @Q_status, @STATUS_LEARNED_CURE_POISON;
+        callsub S_update_var;
+
+        goto L_Main;
+
+L_Teach_dunno:
+        mes "[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;
+
+L_NoMagicNoTeach:
+	mes "[Elanore the Healer]";
+        mes "Elanore shakes her head.";
+        mes "\"I am sorry, but you don't have any magical abilities.  I can only teach those who already have the power to do magic.\"";
+        next;
+        goto L_Main;
+
+L_Question:
+        callfunc "MagicTalkOptionsSetup";
+        set @ignore, @QQ_ELANORE;
+        callfunc "MagicTalkMenu";
+
+        if (@c == 0)		goto L_Main;
+        if (@c == @QQ_MANASEED)	goto L_Q_manaseed;
+        if (@c == @QQ_MANAPOTION)	goto L_Q_manapotion;
+        if (@c == @QQ_WYARA)	goto L_Q_wyara;
+        if (@c == @QQ_SAGATHA)	goto L_Q_sagatha;
+        if (@c == @QQ_AULDSBEL)	goto L_Q_auldsbel;
+        if (@c == @QQ_OLDWIZ)	goto L_Q_oldwiz;
+
+	mes "[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_oldwiz:
+	mes "[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.";
+        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]";
+        mes "\"I'm sorry, but I can't help you with that.\"";
+        next;
+        goto L_Main;
+
+L_Q_wyara:
+	mes "[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]";
+        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]";
+        mes "\"Oh, sorry-- I don't really know him very well.\"";
+        next;
+        goto L_Main;
+
+
+L_CurePoison:
+	mes "[Elanore the Healer]";
+        mes "\"Oh dear!  That looks like poison; hang on...\"";
+        mes "She performs a complicated gesture.";
+        sc_end(sc_poison);
+        next;
+
+	mes "[Elanore the Healer]";
+        mes "\"There you are, right as rain!  Now you take care, all right?\"";
+        close;
+
+L_bye:
+	mes "[Elanore the Healer]";
+        mes "\"Goodbye!\"";
+        close;
+
+S_update_var:
+	set QUEST_MAGIC2,
+		(QUEST_MAGIC2 & ~(@Q_MASK)
+		| (@Q_status << @Q_SHIFT));
+	return;
 }
diff --git a/npc/001-1_Tulimshar/guide.txt b/npc/001-1_Tulimshar/guide.txt
index 75b4dcc3..16be310b 100644
--- a/npc/001-1_Tulimshar/guide.txt
+++ b/npc/001-1_Tulimshar/guide.txt
@@ -128,7 +128,7 @@ L_Stats:
 L_Magic:
 	mes "[Ian the Guide]";
         mes "\"In decades past, there was a Mana Seed south of Tulimshar, from which people could draw magical energies.  Unfortunately, the seed is gone.";
-        mes "Until we find a new Mana Seed, there will be no magic, except for those who already possess magical powers.\"";
+        mes "However, I've overheard the bard mentioning something about this recently... if you are interested in magic, try talking to him!\"";
         next;
         goto L_Menu_A;
 
@@ -153,7 +153,7 @@ S_Grad:
 	mes "[Ian the Guide]";
 	mes "\"Hey, you've been doing good, let me give you this.\"";
 
-	getitem 675, 1;
+	getitem "GraduationCap", 1;
 	set TUT_var, TUT_var | 2;
 	next;
 
diff --git a/npc/001-1_Tulimshar/rewards_master.txt b/npc/001-1_Tulimshar/rewards_master.txt
index 657b82f4..cc64da8c 100644
--- a/npc/001-1_Tulimshar/rewards_master.txt
+++ b/npc/001-1_Tulimshar/rewards_master.txt
@@ -5,7 +5,7 @@
 	if (tvis == 0) set tvis, 1;
 	if (Mobpt < tvis) goto L_NotEnough;
 
-	setarray @Items, 502, 502, 503, 504, 505, 506, 507, 508, 509, 510, 586, 512, 513, 514, 515, 516, 517, 518, 519, 520;
+	setarray @Items$, "CactusPotion", "CactusPotion", "CasinoCoins", "DecorCandy", "MaggotSlime", "CandyCane", "ScorpionStinger", "XmasCake", "ChocolateBar", "Candy", "GingerBreadMan", "Cake", "XmasCandyCane", "PurplePresentBox", "BluePresentBox", "RedScorpionStinger", "BugLeg", "CherryCake", "EasterEgg", "CottonShirt", "CottonShorts";
 
 	mes "[Ishi the Rewards Master]";
 	mes "\"Welcome! I see you have " + Mobpt + " Monster Points. Would you like to exchange some of those for items?\"";
@@ -79,11 +79,11 @@ L_Menu_Done:
 SUB_give_item:
 	set Mobpt, Mobpt - tvis;
 	set tvis, tvis + 1;
-	set @ID, @Items[rand(getarraysize(@Items))];
+	set @item$, @Items$[rand(getarraysize(@Items$))];
 	
-	getitem @ID, 1;
+	getitem @item$, 1;
 	
-	mes "You received one " + getitemname(@ID) + "!";
+	mes "You received one " + getitemname(@item$) + "!";
 	
 	return;
 }
diff --git a/npc/001-1_Tulimshar/sandra.txt b/npc/001-1_Tulimshar/sandra.txt
index 28a44d23..bbaca563 100644
--- a/npc/001-1_Tulimshar/sandra.txt
+++ b/npc/001-1_Tulimshar/sandra.txt
@@ -70,17 +70,17 @@ L_Set:
 	close;
 
 L_Progress:
-	if (countitem(507) < 5) goto L_NotEnough;
-	if (countitem(517) < 1) goto L_NotEnough;
+	if (countitem("ScorpionStinger") < 5) goto L_NotEnough;
+	if (countitem("RedScorpionStinger") < 1) goto L_NotEnough;
 	mes "[Sandra]";
 	mes "\"Excellent!";
 	mes "You brought me 5 [Scorpion Stinger]s and 1 [Red Scorpion Stinger]!\"";
 	getinventorylist;
-	if ((@inventorylist_count - (countitem(507) == 5) - (countitem(517) == 1)) > 99 - (countitem(1199) == 0)) goto L_TooMany;
-	delitem 507, 5;
-	delitem 517, 1;
-	getitem 1200, 1;
-	getitem 1199, 100;
+	if ((@inventorylist_count - (countitem("ScorpionStinger") == 5) - (countitem("RedScorpionStinger") == 1)) > 99 - (countitem("Arrow") == 0)) goto L_TooMany;
+	delitem "ScorpionStinger", 5;
+	delitem "RedScorpionStinger", 1;
+	getitem "Bow", 1;
+	getitem "Arrow", 100;
 	set Scorp, 2;
 	close;
 
diff --git a/npc/001-1_Tulimshar/vincent.txt b/npc/001-1_Tulimshar/vincent.txt
index e0572407..ec803827 100644
--- a/npc/001-1_Tulimshar/vincent.txt
+++ b/npc/001-1_Tulimshar/vincent.txt
@@ -80,13 +80,13 @@ L_Wait:
 	close;
 
 L_Progress:
-	if(countitem(518) >= 30) goto L_Have;
+	if(countitem("BugLeg") >= 30) goto L_Have;
 	mes "[Vincent]";
 	mes "\"Please help me collect 30 [Bug Leg]s!\"";
 	close;
 
 L_Have:
-	delitem 518, 30;
+	delitem "BugLeg", 30;
 	mes "[Vincent]";
 	mes "\"Excellent! Finally I can complete the model!!\"";
 	next;