Advancing in life, transmutation, and war magic. Also added half a story to the Bard.

5 files changed, 389 insertions, 49 deletions

diff --git a/npc/001-1_Tulimshar/bard.txt b/npc/001-1_Tulimshar/bard.txt
index d361b860..924a9cfa 100644
--- a/npc/001-1_Tulimshar/bard.txt
+++ b/npc/001-1_Tulimshar/bard.txt
@@ -5,7 +5,8 @@
 			"\"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 @id, rand(3);
-        mes "[Bill Wobbleball the Bard]";
+        set @name, "Bill Ballshaker the Bard";
+        mes "[" + @name + "]";
         if (Sex)
         	mes "\"Greetings, traveler!  Have you come to listen to my stories?\"";
         if (!Sex)
@@ -16,21 +17,22 @@ 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,
+             "Can you tell me a story?", L_Tales,
              "Farewell!", -;
         close;
 
 L_News:
-        mes "[Bill Wobbleball the Bard]";
+        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 "[Bill Wobbleball the Bard]";
+        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 MFLAG, MFLAG | MFLAG_MANASEED_RUMOUR;
-        mes "[Bill Wobbleball the Bard]";
+        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 "[Bill Wobbleball the Bard]";
+        mes "[" + @name + "]";
         mes "\"I wonder who might be qualified?\"";
         next;
         goto L_Main;
@@ -104,49 +106,181 @@ L_Q_post_auldsbel:
         close;
 
 L_Q_elanore:
-        mes "[Bill Wobbleball the Bard]";
+        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 "[Bill Wobbleball the Bard]";
+        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 "[Bill Wobbleball the Bard]";
+        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 "[Bill Wobbleball the Bard]";
+        mes "[" + @name + "]";
         mes "\"Sagatha!  Ah, such a wonderful and mysterious being; the center of many a tale...\"";
         next;
-        mes "[Bill Wobbleball the Bard]";
+        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 "[Bill Wobbleball the Bard]";
+        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 "[Bill Wobbleball the Bard]";
+        mes "[" + @name + "]";
         mes "\"First, she will suffer no fool easily, particularly no man.\"";
         next;
-        mes "[Bill Wobbleball the Bard]";
+        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 "[Bill Wobbleball the Bard]";
+        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_Tales:
+        mes "[" + @name + "]";
+        mes "\"With pleasure!  What would you like to hear about?  Would you like to hear about the founding of Tulimshar, or about the fall of Grenxen?\"";
+        next;
+
+        menu
+		"Founding of Tulimshar", L_Tale_0,
+		"Fall of Grenxen", L_Tale_1,
+                "Nothing, really.", -;
+        close;
+
+L_Tale_0:
+        mes "[" + @name + "]";
+        mes "\"Many centuries ago, this here was a barren wasteland-- rocks and water, devoid of any life.  Only the occasional scorpion would pass by, perhaps in vain hope of finding a forgotten insect or half-dead snake to prey on.\"";
+        next;
+
+        mes "[" + @name + "]";
+        mes "\"But somewhere south of here there was a great oasis, the only source of water and life far and wide.  So large was this oasis that even a heard of mouboos lived there, among pinkies and fluffies.\"";
+        next;
+
+        mes "[" + @name + "]";
+        mes "\"Palm trees grew there, more than twice as big as the ones we have here, and mananas grew on those trees.  Wild bushes with berries, too-- greenberries and hayberries and manaberries.  It was a haven not only for animals, but also for human travelers: for both the nomads and the brigands that roamed the land.\"";
+        next;
+
+        mes "[" + @name + "]";
+        mes "\"In the south, much further south than that, there stood a citadel and a city around it, ruled by Sesmar the Silver, son of Sesmar the Golden, Pecarch of Potamia, for his realm was the empire of Potamia, the greatest empire of this age.\"";
+        next;
+
+        mes "[" + @name + "]";
+        mes "\"Sesmar ruled with an iron fist.  He built statues and temples and walls and armies, and a reputation for successful and ruthless warfare.  Unlike his father, whose time had been a time of peace, Sesmar the Silver yearned for conquest: he wanted no less than to be ruler of the entire world.\"";
+        next;
+
+        mes "[" + @name + "]";
+        mes "\"So Sesmar built a great fleet, and catapults, and siege machines; he raised an army the likes of which the world had never seen before.\"";
+        next;
+
+        mes "[" + @name + "]";
+        mes "\"Then he built a chariot for himself, plated with silver and flaring in the sun, so as to blind his enemies.  So large and heavy was the chariot that it had to be pulled by a dozen trained war mouboos, each mouboo shielded by a polished steel harness.\"";
+        next;
+
+        mes "[" + @name + "]";
+        mes "\"In this chariot he let his troops into battle.  'Zergamur', they called it, after the legendary silver dragon, for where it had plowed, no man was left standing.\"";
+        next;
+
+        mes "[" + @name + "]";
+        mes "\"And into battle he rode, over and over, and one kingdom after another fell before his force.\"";
+        next;
+
+        mes "[" + @name + "]";
+        mes "\"But not far north of his capital, resistance formed.  Troops loyal to defeated leaders, monarchs wary of Sesmar, merchants and priests who had been driven out by Sesmar, but also some of Sesmar's former most trusted allies\"";
+        next;
+
+        mes "[" + @name + "]";
+        mes "\"Hurn the marksman was one of them, but that is another story, to be told another time.\"";
+        next;
+
+        mes "[" + @name + "]";
+        mes "\"But their leader was Bekel, once one of Sesmar's generals.  He had seen his master the Pecarch's true intentions and intended to have no part his goals.\"";
+        next;
+
+        mes "[" + @name + "]";
+        mes "\"Bekel led the alliance south from here.  With their combined force, they took the capital of Potamia with ease, for Sesmar had withdrawn most of his troops to fight or as garrison for newly conquered areas.\"";
+        next;
+
+        mes "[" + @name + "]";
+        mes "\"The Pecarch's revenge was swift and cruel.  When his armies returned, he retook the city in a single night, and anyone who had been found not loyal to him was put to death.\"";
+        next;
+
+        mes "[" + @name + "]";
+        mes "\"The alliance troops fled north, Sesmar on their heels.  \"";
+        next;
+
+        mes "[" + @name + "]";
+        mes "\"\"";
+        next;
+
+        mes "[" + @name + "]";
+        mes "\"\"";
+        next;
+
+        mes "[" + @name + "]";
+        mes "\"\"";
+        next;
+
+        mes "[" + @name + "]";
+        mes "\"\"";
+        next;
+
+        mes "[" + @name + "]";
+        mes "\"\"";
+        next;
+
+        mes "[" + @name + "]";
+        mes "\"\"";
+        next;
+
+        mes "[" + @name + "]";
+        mes "\"\"";
+        next;
+        close;
+
+L_Tale_1:
+        mes "[" + @name + "]";
+        mes "\"\"";
+        next;
+
+        mes "[" + @name + "]";
+        mes "\"\"";
+        next;
+
+        mes "[" + @name + "]";
+        mes "\"\"";
+        next;
+
+        mes "[" + @name + "]";
+        mes "\"\"";
+        next;
+
+        mes "[" + @name + "]";
+        mes "\"\"";
+        next;
+
+        mes "[" + @name + "]";
+        mes "\"\"";
+        next;
+
+        mes "[" + @name + "]";
+        mes "\"\"";
+        next;
+
+        close;
+
 L_Song:
 	mes @songs$[@id];
 	close;
diff --git a/npc/001-1_Tulimshar/elanore.txt b/npc/001-1_Tulimshar/elanore.txt
index fabb0e24..9fa5f7cb 100644
--- a/npc/001-1_Tulimshar/elanore.txt
+++ b/npc/001-1_Tulimshar/elanore.txt
@@ -270,7 +270,54 @@ L_Teach_Initial_Noroom:
         close;
 
 L_Teach_CheckAdvanceTo2:
+	mes "[Elanore the Healer]";
+        if (@Q_heal_exp < 30)
+		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)
+        	skill 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 < 20)
+        	mes "\"You are making progress, but you still need more practice.\"";
+        if (@Q_heal_exp >= 20)
+        	mes "\"You have made good progress, but please do continue in your efforts.\"";
         close;
+
 L_Teach_CheckAdvanceToLOH:
         close;
 
diff --git a/npc/009-3_Cave_beneath_Hurnscald/sword.txt b/npc/009-3_Cave_beneath_Hurnscald/sword.txt
index a99c4a6b..b042bce7 100644
--- a/npc/009-3_Cave_beneath_Hurnscald/sword.txt
+++ b/npc/009-3_Cave_beneath_Hurnscald/sword.txt
@@ -11,31 +11,32 @@ L_message:
         set @STATUS_INITIAL, 0;
         set @STATUS_LEARNED_FLAREDART, 1;
         set @STATUS_LEARNED_MAGICBLADE, 2;
+        set @STATUS_LEVEL2, 3;
 
         if (@Q_status == @STATUS_INITIAL)  	goto L_Initial;
         if (@Q_status == @STATUS_LEARNED_FLAREDART)  	goto L_PostFlareDart;
-        if (@Q_status == @STATUS_LEARNED_MAGICBLADE)  	goto L_PostMagicBlade;
+        if (@Q_status == @STATUS_LEARNED_MAGICBLADE)  	goto L_PostFlareDart_teach;
 
-        mes "[Mystic Sword]";
+        mes "[Magic Sword]";
         mes "Come back when thou art stronger.";
         next;
         close;
 
 L_Initial:
-        mes "[Mystic Sword]";
+        mes "[Magic Sword]";
         mes "As you look at the sword, you suddenly hear a voice in your head!";
         mes "\"Welcome to my prison, mortal!\"";
         next;
 
-        mes "[Mystic Sword]";
+        mes "[Magic Sword]";
         mes "Well, either you are going mad, or that sword in the stone is talking to you.";
         next;
 
-        mes "[Mystic Sword]";
+        mes "[Magic Sword]";
         mes "Or, well, both.";
         next;
 
-        mes "[Mystic Sword]";
+        mes "[Magic Sword]";
         mes "The deep basso voice continues.";
         mes "\"I know not what brought thee hither, but I kindly ask that you leave me alone in my sorrow.\"";
         next;
@@ -48,13 +49,13 @@ L_Initial:
                 "Can I help?", -,
                 "Can you teach me magic?", -;
 
-        mes "[Mystic Sword]";
+        mes "[Magic Sword]";
         mes "There is no answer.";
         next;
         close;
 
 L_PostFlareDart:
-        mes "[Mystic Sword]";
+        mes "[Magic Sword]";
         mes "As you look at the sword, you hear a deep voice resounding in your head.";
         mes "\"Welcome, mortal!\"";
         next;
@@ -67,13 +68,13 @@ L_PostFlareDart:
 	close;
 
 L_PostFlareDart_hi:
-        mes "[Mystic Sword]";
+        mes "[Magic Sword]";
         mes "\"Mortal... I have seen pain and death beyond thine reckoning!  Mock me not with thine idle questions!\"";
         next;
         close;
 
 L_PostFlareDart_sister:
-        mes "[Mystic Sword]";
+        mes "[Magic Sword]";
         mes "\"My sister...?  Alas!  I remember now; abandoned she was, just as I; buried in stone, never to be wielded again.\"";
         mes "\"Wherefore did she send thee?\"";
         next;
@@ -81,11 +82,11 @@ L_PostFlareDart_sister:
         menu "She asked me to ask you to teach me a spell.", -;
 
 L_PostFlareDart_teach:
-        mes "[Mystic Sword]";
+        mes "[Magic Sword]";
         mes "\"Beware, mortal... the only spells I can teach thee are those of the school of war.  Dark and dreary spells, that lot!  Pain and misery is all they bring...\"";
         next;
 
-        mes "[Mystic Sword]";
+        mes "[Magic Sword]";
         mes "The sword's voice is growing apprehensive.";
         mes "\"Once a spell has been learned, it cannot be taken back, no more than a death can be undone.  So be careful, mortal... dost thou truly wish to know the secrets of thus destructive power?\"";
         next;
@@ -94,30 +95,31 @@ L_PostFlareDart_teach:
 		"Yes.", -,
 		"No.", L_Close;
 
-        mes "[Mystic Sword]";
+        mes "[Magic Sword]";
         mes "\"So thou art bound to the path of War, as am I, as is my sister...\"";
         next;
 
-        mes "[Mystic Sword]";
+        mes "[Magic Sword]";
         mes "\"So be it, fellow warrior.  Hear the incantation for the blade spell: '" + getspellinvocation("magic-blade") + "'\"";
         mes "\"Hold a knife, sharp or regular, when you speak it.\"";
         set @Q_status, @STATUS_LEARNED_MAGICBLADE;
         callsub S_update_var;
         next;
 
-        mes "[Mystic Sword]";
+        mes "[Magic Sword]";
         mes "\"But beware... the path of war that thou hast embarked upon is one from which few return.  May luck be on your side...\"";
         next;
         close;
 
 L_PostFlareDart_teach:
-        mes "[Mystic Sword]";
+        mes "[Magic Sword]";
         mes "\"Seek out my sister, and leave me alone in my sorrows.\"";
         next;
 
 L_Close:
         close;
 
+
 S_update_var:
 	set QUEST_MAGIC,
 		(QUEST_MAGIC & ~(@Q_MASK)
diff --git a/npc/011-1_Woodland/auldsbel.txt b/npc/011-1_Woodland/auldsbel.txt
index 30124d79..31bd7811 100644
--- a/npc/011-1_Woodland/auldsbel.txt
+++ b/npc/011-1_Woodland/auldsbel.txt
@@ -27,10 +27,12 @@
 	set @ASH, 701;
         set @SULPHUR, 703;
         set @IRONPOWDER, 704;
+        set @MOUBOO_FIGURINE, 728;
 
         set @Q_STATUS_INITIAL, 0;
         set @Q_STATUS_POSTINTRO, 1;
         set @Q_STATUS_INITIATION, 2; // quest for being able to cast `create mouboo figurine'
+        set @Q_STATUS_STUDENT, 3; // accepted as student
 
         set @Q_wants_sulphur, (QUEST_MAGIC & NIBBLE_6_MASK);
 
@@ -895,6 +897,7 @@ L_component_quest_missing:
 
 L_learn_spell:
         if (@Q_main_status == @Q_STATUS_INITIATION) goto LL_initiation;
+        if (@Q_main_status == @Q_STATUS_STUDENT) goto LL_student_start;
 
         mes "[Auldsbel the Wizard]";
         mes "\"Wellll.... you do seem to have some magical abilities.  But do you possess the talent and diligence needed for a true wizard?\"";
@@ -914,12 +917,83 @@ L_learn_spell:
         callsub S_update_var;        
         goto L_main_menu;
 
+LL_repeat_spell:
+        mes "[Auldsbel the Wizard]";
+        mes "\"The invocation is 'kular', followed by the last syllable of the name of the creature you want to shape the log into.  But this only works if you know the old Tritan name of the creature.\"";
+        next;
+
+        mes "[Auldsbel the Wizard]";
+        mes "\"And make sure to keep notes of your spells!  In the future, I will only tell you once.\"";
+        next;
+
+        goto L_main_menu;
+
 LL_initiation:
         mes "[Auldsbel the Wizard]";
         mes "\"So, have you managed to transmute something?\"";
         next;
+
+        if (countitem(@MOUBOO_FIGURINE))
+        	menu
+			"Not yet.", -,
+                        "How about this mouboo figurine?", LL_initiation_check;
+        if (!countitem(@MOUBOO_FIGURINE))
+        	menu
+			"Not yet.", -,
+                        "What was the spell again?", LL_repeat_spell;
+
+        goto L_main_menu;
+
+LL_initiation_fail;
+        mes "[Auldsbel the Wizard]";
+        mes "\"No, no, no.  This is no good-- too many imperfections.\"";
+        mes "He throws it away.";
+        mes "\"Keep practicing-- and make sure to vary the spells you cast a little; that will make it easier to learn.\"";
+        next;
+        goto L_main_menu;
+
+LL_initiation_check:
+        if (!countitem (@MOUBOO_FIGURINE))
+		goto L_main_menu;
+        delitem (@MOUBOO_FIGURINE);
+        set @mexp, MAGIC_EXPERIENCE & 65535;
+
+        mes "[Auldsbel the Wizard]";
+        mes "Auldsbel inspects your figurine.";
+        next;
+
+        if (@mexp < 40)
+        	goto LL_initiation_fail;
+
+        mes "[Auldsbel the Wizard]";
+        mes "Auldsbel nods.";
+        mes "\"This looks good.\"";
+        next;
+
+        mes "[Auldsbel the Wizard]";
+        mes "He pockets the figurine.";
+        mes "\"Very well, then.  I shall accept you as my student.\"";
+        next;
+
+        mes "[Auldsbel the Wizard]";
+        mes "Auldsbel presses his index and middle finger against your forehead.";
+        mes "\"Accept my blessing!\"";
+        next;
+
+        mes "[Auldsbel the Wizard]";
+        mes "You feel new powers curse flowing into your body!";
+        mes "[5000 experience points]";
+        mes "[Level 2 in Transmutation Magic]";
+
+        set @Q_status, @Q_STATUS_STUDENT;
+        callsub S_update_var;
+        getexp 5000, 0;
+        if (getskilllv(SKILL_MAGIC_TRANSMUTE) < 2)
+        	skill SKILL_MAGIC_TRANSMUTE, 2;
         goto L_main_menu;
 
+LL_student_start:
+
 S_update_var:
         set @Q_status, @Q_main_status | (@Q_component_quest << 5);
 	set QUEST_MAGIC,
diff --git a/npc/015-1_Woodland/sword.txt b/npc/015-1_Woodland/sword.txt
index 07b2d9b6..a32b3b13 100644
--- a/npc/015-1_Woodland/sword.txt
+++ b/npc/015-1_Woodland/sword.txt
@@ -11,28 +11,29 @@ L_message:
         set @STATUS_INITIAL, 0;
         set @STATUS_LEARNED_FLAREDART, 1;
         set @STATUS_LEARNED_MAGICBLADE, 2;
+        set @STATUS_LEVEL2, 3;
 
         if (@Q_status == @STATUS_INITIAL)  		goto L_Initial;
         if (@Q_status == @STATUS_LEARNED_FLAREDART)  	goto L_FlareStage;
-        if (@Q_status == @STATUS_LEARNED_FLAREDART)  	goto L_MagicBladeStage;
+        if (@Q_status == @STATUS_LEARNED_MAGICBLADE)  	goto L_MagicBladeStage;
 
-        mes "[Magic Sword]";
+        mes "[Mystic Sword]";
         mes "\"I have taught thee all I can teach for now.\"";
         next;
         close;
 
 L_Initial:
-        mes "[Magic Sword]";
+        mes "[Mystic Sword]";
         mes "At this point, the river deepens, slowing down to a leisurely pace.  In its center you notice an unusual stone, waves breaking around it.";
         mes "Sticking out of the rock is a sword hilt.";
         next;
 
-        mes "[Magic Sword]";
+        mes "[Mystic Sword]";
         mes "Suddenly, you hear a strange, metallic voice in your head, the voice of a woman.";
         mes "\"A blissful day to thee, mortal!\"";
         next;
 
-        mes "[Magic Sword]";
+        mes "[Mystic Sword]";
         mes "\"What is it is that brings thee to this place?\"";
         next;
 
@@ -44,24 +45,24 @@ L_Initial:
         close;
 
 L_noq:
-        mes "[Magic Sword]";
+        mes "[Mystic Sword]";
         mes "The voice sounds slightly amused.";
         mes "\"How sad to hear how manners have degenerated in recent centuries.  Farewell for now, dear mortal.\"";
         next;
         close;
 
 L_Initial_nothing:
-        mes "[Magic Sword]";
+        mes "[Mystic Sword]";
         mes "\"Then I wish thee well in thy travels, wanderer!\"";
         next;
         close;
 
 L_Initial_learn:
-        mes "[Magic Sword]";
+        mes "[Mystic Sword]";
         mes "\"Magic?  Unless I am very mistaken thou already possessest some magic.  Yet perhaps I can grant thee some slight aid by providing a magical invocation?\"";
         next;
 
-        mes "[Magic Sword]";
+        mes "[Mystic Sword]";
         mes "\"Alas, my nature is not quite conductive for spells of healing or protection, though I can bestow upon thee the powers for a rather more martial kind of power.\"";
         mes "\"But first... why is it that thou seekest this power?\"";
         next;
@@ -75,29 +76,29 @@ L_Initial_learn:
 	close;
 
 L_Initial_selfish:
-        mes "[Magic Sword]";
+        mes "[Mystic Sword]";
         mes "\"Please return when thou art taking thy quest for magic a little more seriously.\"";
         next;
         close;
 
 L_Initial_dontknow:
-        mes "[Magic Sword]";
+        mes "[Mystic Sword]";
         mes "\"A fair and honest thought at so early a point in thine quest.\"";
         goto L_Initial_ok;
 
 L_Initial_protect:
-        mes "[Magic Sword]";
+        mes "[Mystic Sword]";
         mes "\"Quite a high and laundable goal thou hast chosen for thyself!  I do hope that thou canst live up to it.\"";
 
 L_Initial_ok:
         mes "\"Hark, then, mortal!  For I shall bestow upon thee the secret of the flare dart spell!\"";
         next;
 
-        mes "[Magic Sword]";
+        mes "[Mystic Sword]";
         mes "\"Oh, my apologies-- that was a little overly dramatic.  But I do not get to talk to thy kin anymore all that often.\"";
         next;
 
-        mes "[Magic Sword]";
+        mes "[Mystic Sword]";
         mes "\"For the flare dart spell throw a handful of sulphur powder up into the air, and say, '" + getspellinvocation("flare-dart") + "'.\"";
         set @Q_status, @STATUS_LEARNED_FLAREDART;
         callsub S_update_var;
@@ -112,14 +113,14 @@ L_FlareStage:
         close;
 
 L_FlareStage_impolite:
-        mes "[Magic Sword]";
+        mes "[Mystic Sword]";
         mes "You hear a metallic chime in your head.  After a second, you come to the conclusion that it was probably the sword sighing.";
         mes "\"Greetings to thee, too, mortal, and farewell until thou hast learned some proper manners.\"";
         next;
         close;
 
 L_FlareStage_hello:
-        mes "[Magic Sword]";
+        mes "[Mystic Sword]";
         mes "\"Well met once more, mortal!  What brings thee here?\"";
         next;
 
@@ -130,19 +131,101 @@ L_FlareStage_hello:
         close;
 
 L_FlareStage_moremagic:
-        mes "[Magic Sword]";
+        mes "[Mystic Sword]";
         mes "\"I can indeed!  But first I must see if thou art worthy.  Find my brother, and talk to him!  If thou canst find him, she shall teach thee another spell.\"";
         next;
         goto L_Farewell;
 
 L_FlareStage_sulphur:
-        mes "[Magic Sword]";
+        mes "[Mystic Sword]";
         mes "\"I do not know, though I suggest to seek out a local alchemist, if there is any.\"";
         next;
         goto L_Farewell;
 
+L_MagicBladeStage:
+        mes "[Mystic Sword]";
+        mes "\"Welcome back!  Thou hast now learned two basic spells of War magic.\"";
+        next;
+
+        mes "[Mystic Sword]";
+        mes "\"Dost thou wish to continue thy pursuits of this school of magic?\"";
+        next;
+
+        menu
+		"No.", -,
+                "Yes.", L_Levelup2_yes;
+
+        goto L_Farewell;
+
+L_Levelup2_yes:
+        mes "[Mystic Sword]";
+        mes "\"Beware of what thou wishest for, mortal...\"";
+        next;
+
+        if (!MPQUEST) goto L_Levelup2_must_reg;
+        if (MPQUEST && (Mobpt < 1000)) goto L_Levelup2_must_practice;
+
+        mes "[Mystic Sword]";
+        mes "\"Thou hast collected " + Mobpt + " Monster Points.  For one thousand of them, I shall admit thee to the school of war magic.\"";
+        next;
+
+        menu
+		"OK!", -,
+                "No... never mind.", L_Farewell;
+
+        set Mobpt, Mobpt - 1000;
+
+        mes "[Mystic Sword]";
+        mes "The sword begins to chant in your head!";
+        mes "  \"Lords of Thunder, Fire, Rage!\"";
+        mes "  \"Grant your powers to this mage,\"";
+        mes "  \"Rising with your dreadful roar,\"";
+        if (Sex)
+        	mes "  \"Answer to his call to War!\"";
+        if (!Sex)
+        	mes "  \"Answer to her call to War!\"";
+        next;
+
+        mes "[Mystic Sword]";
+        mes "Your heart starts pounding, and suddenly you can hear the sound of drums in your head.";
+        mes "You smell something metallic...";
+        next;
+
+        mes "[Mystic Sword]";
+        mes "The sensation and the noises vanish as quickly as they came.";
+        mes "[5000 experience points]";
+        mes "[Level 2 in War Magic]";
+
+        set @Q_status, @STATUS_LEVEL2;
+        callsub S_update_var;
+        getexp 5000, 0;
+        if (getskilllv(SKILL_MAGIC_WAR) < 2)
+        	skill SKILL_MAGIC_WAR, 2;
+        next;
+
+        mes "[Mystic Sword]";
+        mes "\"You have now taken your first true step down the path of war magic.  Seek out my brother for thy next spell!\"";
+        next;
+        goto L_Farewell;
+
+
+L_Levelup2_must_reg:
+        mes "[Mystic Sword]";
+        mes "\"To learn further magic, thou must advance in the school of war magic.  I shall grant thee this advance if thou provest thy worthiness as a warrior.\"";
+        next;
+        mes "[Mystic Sword]";
+        mes "\"Travel to the city of Tulimshar, and talk to Aidan.  Then, collect one thousand Monster Points and return to me.\"";
+        next;
+        goto L_Farewell;
+
+L_Levelup2_must_practice:
+        mes "[Mystic Sword]";
+        mes "\"To advance thy magical powers, I must admit thee to the school of war magic.  Prove to me that thou art a worthy warrior by collecting one thousand Monster Points, and return.\"";
+        next;
+        goto L_Farewell;
+
 L_Farewell:
-        mes "[Magic Sword]";
+        mes "[Mystic Sword]";
         mes "\"Farewell for now!\"";
         next;
         close;