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

1 files changed, 18 insertions, 16 deletions

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)