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

2 files changed, 29 insertions, 11 deletions

diff --git a/npc/015-1_Woodland/_import.txt b/npc/015-1_Woodland/_import.txt
index d92e0749..fcefd199 100644
--- a/npc/015-1_Woodland/_import.txt
+++ b/npc/015-1_Woodland/_import.txt
@@ -3,3 +3,4 @@ npc: npc/015-1_Woodland/_mobs.txt
 npc: npc/015-1_Woodland/_warps.txt
 npc: npc/015-1_Woodland/alice.txt
 npc: npc/015-1_Woodland/monsters.txt
+npc: npc/015-1_Woodland/sword.txt
diff --git a/npc/015-1_Woodland/sword.txt b/npc/015-1_Woodland/sword.txt
index d666777e..5713656b 100644
--- a/npc/015-1_Woodland/sword.txt
+++ b/npc/015-1_Woodland/sword.txt
@@ -74,11 +74,19 @@ L_Initial_learn:
 
         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;
 
-        mes
-		"Never mind.", L_Farewell;
+        menu
+		"I am not interested in that.", L_Farewell,
+                "It might be good for me to learn that.", -,
+                "I am quite interested.", -;
+
+        mes "[Mystic Sword]";
+        mes "\"Why is it that thou seekest this power?\"";
+        next;
+
+        menu
+		"Never mind.", L_Farewell,
                 "To become stronger!", L_Initial_selfish,
                 "To kill!", L_Initial_selfish,
                 "I don't know yet...", L_Initial_dontknow,
@@ -113,10 +121,19 @@ L_Initial_ok:
         set @Q_status, @STATUS_LEARNED_FLAREDART;
         callsub S_update_var;
         next;
-        close;
+
+        mes "[Mystic Sword]";
+        mes "\"From then on, thou canst shoot fiery missiles from thy fingers, for a limited time.\"";
+        next;
+
+        mes "[Mystic Sword]";
+        mes "\"Use it wisely, mortal!.\"";
+        next;
+
+        goto L_Farewell;
 
 L_FlareStage:
-        menu;
+        menu
 		"Uhm... Hello, Sword?", L_FlareStage_hello,
                 "Can you teach me more magic?", L_FlareStage_impolite,
                 "Where can I get sulphur powder?", L_FlareStage_impolite;
@@ -142,7 +159,7 @@ L_FlareStage_hello:
 
 L_FlareStage_moremagic:
         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.\"";
+        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, he shall teach thee another spell.\"";
         next;
         goto L_Farewell;
 
@@ -188,8 +205,8 @@ L_Levelup2_yes:
         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,\"";
+        mes "  \"Grant thy powers to this mage,\"";
+        mes "  \"Rising with thy dreadful roar,\"";
         if (Sex)
         	mes "  \"Answer to his call to War!\"";
         if (!Sex)
@@ -214,7 +231,7 @@ L_Levelup2_yes:
         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!\"";
+        mes "\"Thou hast now taken thy first true step down the path of war magic.  Seek out my brother for thy next spell!\"";
         next;
         goto L_Farewell;
 
@@ -267,7 +284,7 @@ L_L2_W12:
         next;
 
         mes "[Mystic Sword]";
-        mes "\"Speak '" + getspellinvocation("magic-knuckles") + "' and take a glass of beer and drink it, without ever taking it off your lips.  This will harden and enchant thy fists, turning them into powerful weapons.\"";
+        mes "\"Speak '" + getspellinvocation("magic-knuckles") + "' and take a glass of beer and drink it, without ever taking it off thy lips.  This will harden and enchant thy fists, turning them into powerful weapons.\"";
         next;
         close;
 
@@ -291,7 +308,7 @@ L_L2_W10:
         next;
 
         menu
-		"OK.", -;
+		"OK.", -,
 		"No way.", L_farewell;
 
         if (countitem(@ORE) < 1)