Numerous fixes. Magic level 0 should be fully operational now.

2 files changed, 11 insertions, 10 deletions

diff --git a/npc/009-3_Cave_beneath_Hurnscald/_import.txt b/npc/009-3_Cave_beneath_Hurnscald/_import.txt
index 0297260b..6a2a2a8e 100644
--- a/npc/009-3_Cave_beneath_Hurnscald/_import.txt
+++ b/npc/009-3_Cave_beneath_Hurnscald/_import.txt
@@ -2,3 +2,4 @@ map: 009-3.gat
 npc: npc/009-3_Cave_beneath_Hurnscald/_mobs.txt
 npc: npc/009-3_Cave_beneath_Hurnscald/_warps.txt
 npc: npc/009-3_Cave_beneath_Hurnscald/monsters.txt
+npc: npc/009-3_Cave_beneath_Hurnscald/sword.txt
diff --git a/npc/009-3_Cave_beneath_Hurnscald/sword.txt b/npc/009-3_Cave_beneath_Hurnscald/sword.txt
index a1f9949a..d60ac123 100644
--- a/npc/009-3_Cave_beneath_Hurnscald/sword.txt
+++ b/npc/009-3_Cave_beneath_Hurnscald/sword.txt
@@ -19,7 +19,7 @@ L_message:
 
         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_PostFlareDart_teach;
+        if (@Q_status == @STATUS_LEARNED_MAGICBLADE)  	goto L_PostFlareDart_teach2;
         if (@Q_status == @STATUS_LEVEL2)  	goto L_L2_W11;
         if (@Q_status == @STATUS_W12)	  	goto L_L2_W11;
         if (@Q_status == @STATUS_W11)	  	goto L_L2_almost_done;
@@ -46,7 +46,7 @@ L_Initial:
 
         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.\"";
+        mes "\"I know not what brought thee hither, but I kindly ask that thou leavest me alone in my sorrow.\"";
         next;
 
         menu
@@ -68,7 +68,7 @@ L_PostFlareDart:
         mes "\"Welcome, mortal!\"";
         next;
 
-        mes
+        menu
 		"Hi!  How are you?", L_PostFlareDart_hi,
                 "Can you teach me magic?", L_PostFlareDart_teach,
                 "Your sister sent me.", L_PostFlareDart_sister,
@@ -109,7 +109,7 @@ L_PostFlareDart_teach:
 
         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.\"";
+        mes "\"Hold a knife, sharp or regular, when thou speakest it.\"";
         set @Q_status, @STATUS_LEARNED_MAGICBLADE;
         callsub S_update_var;
         next;
@@ -119,7 +119,7 @@ L_PostFlareDart_teach:
         next;
         close;
 
-L_PostFlareDart_teach:
+L_PostFlareDart_teach2:
         mes "[Magic Sword]";
         mes "\"Seek out my sister, and leave me alone in my sorrows.\"";
         next;
@@ -129,7 +129,7 @@ L_Close:
 
 L_L2_W11:
         mes "[Magic Sword]";
-        mes "\"You have returned.  That must mean that thy wish to learn the magic of war is still alive?\"";
+        mes "\"Thou hast returned.  That must mean that thy wish to learn the magic of war is still alive?\"";
         next;
         menu
 		"No, I just wanted to say `hi'.", L_sayhi,
@@ -137,8 +137,8 @@ L_L2_W11:
 
         mes "[Magic Sword]";
         mes "\"If that is thy wish, I shall not stop thee.  But do not expect to find merriment down this road.\"";
-        mes "\"I must ask that you sacrifice a thousand monster points for this, however.\"";
-
+        mes "\"I must ask that thou sacrificest a thousand monster points for this, however.\"";
+        menu
 		"No, I don't want that.", L_farewell,
                 "I agree.", -;
 
@@ -165,13 +165,13 @@ L_L2_W11:
 
 L_L2_almost_done:
         mes "[Magic Sword]";
-        mes "\"Return to my sister now.  I expect that she shall teach you one more spell.\"";
+        mes "\"Return to my sister now.  I expect that she shall teach thee one more spell.\"";
         next;
         close;
 
 L_lacking_mobpoints:
         mes "[Magic Sword]";
-        mes "\"Thou lackest the monster points needed to prove thy worthiness.  I shall not reveal more to you until thou hast slain more monsters.\"";
+        mes "\"Thou lackest the monster points needed to prove thy worthiness.  I shall not reveal more to thee until thou hast slain more monsters.\"";
         next;
         close;