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

1 files changed, 37 insertions, 20 deletions

diff --git a/npc/011-1_Woodland/auldsbel.txt b/npc/011-1_Woodland/auldsbel.txt
index 688fd690..f6d9c8a8 100644
--- a/npc/011-1_Woodland/auldsbel.txt
+++ b/npc/011-1_Woodland/auldsbel.txt
@@ -58,7 +58,7 @@
         if (Sex == 0)
         	set @address$, "girl";
 
-        if (@Q_status >= @Q_STATUS_POSTINTRO)
+        if (@Q_main_status >= @Q_STATUS_POSTINTRO)
         	goto L_short_intro;
 
         mes "[Robed Man]";
@@ -105,7 +105,7 @@ L_intro_identity:
 
         set @xmsg$, "Right... my name is " + strcharinfo(0) + ".";
         if (strcharinfo(0) == "Padric")
-           set @xmsg$, "Actually, I am, but I don't know you..?";
+           set @xmsg$, "Actually, I am, but I don't know you...?";
 
         menu @xmsg$, L_intro_wrongperson,
              "You're not very good with faces, are you?", L_intro_nogood,
@@ -213,16 +213,16 @@ L_ironpowder:
 
 L_sulphur:
         mes "[Auldsbel the Wizard]";
-        set @cost, 400 - (@component_quest * 30);
-        mes "\"Sulphur powder?  Ah, so we have picked up a little offensive magic, haven't we?  Good thinking, good thinking.  And yes, of course I can transmute volcanic ashes into sulphur powder at a ratio of 1:5, for a mere " + @cost + " GP.\"";
+        set @cost, 400 - (@Q_component_quest * 30);
+        mes "\"Sulphur powder?  Ah, so we have picked up a little offensive magic, haven't we?  Good thinking, good thinking.  And yes, of course I can transmute volcanic ashes into sulphur powder at a ratio of 1:5, for " + @cost + " GP.\"";
         next;
-        if (@Q_status >= @Q_STATUS_STUDENT)
+        if (@Q_main_status >= @Q_STATUS_STUDENT)
             menu
 		"No, thank you.", -,
 		"I will see what I can find.", -,
                 "Can you teach me how to make it myself?", L_sulphur_teach_spell,
 		"Here you are.", L_sulphur_buy;
-        if (@Q_status < @Q_STATUS_STUDENT)
+        if (@Q_main_status < @Q_STATUS_STUDENT)
             menu
 		"No, thank you.", -,
 		"I will see what I can find.", -,
@@ -242,7 +242,7 @@ L_sulphur_buy:
 
         set zeny, zeny - @cost;
         delitem @ASH, 1;
-        getitem @SULPHUR, 1;
+        getitem @SULPHUR, 5;
         mes "[Auldsbel the Wizard]";
         mes "\"I shall transmute it later.  Here, have five half-ounces from my own stock.\"";
         next;
@@ -521,6 +521,7 @@ L_question:
         if (@c == 0)		goto L_main_menu;
         if (@c == @QQ_ELANORE)	goto L_Q_elanore;
         if (@c == @QQ_MANASEED)	goto L_Q_manaseed;
+        if (@c == @QQ_MANAPOTION)	goto L_make_mana_potion;
         if (@c == @QQ_WYARA)	goto L_Q_wyara;
         if (@c == @QQ_SAGATHA)	goto L_Q_sagatha;
         if (@c == @QQ_IMP)	goto L_Q_imp;
@@ -531,7 +532,7 @@ L_question:
         next;
         goto L_main_menu;
 
-L_Q_oldwiz:
+L_Q_old_wizard:
         mes "[Auldsbel the Wizard]";
         mes "\"I'm still not sure what exactly to make of him.  At first appearance, he seems like a senile old man, but there can be no doubt that he has-- or at least had, at some point-- a very deep understanding of magic.\"";
         next;
@@ -586,7 +587,7 @@ L_Q_manaseed:
         mes "\"You have found an acual Mana Seed?  That's impossible!  Well, very unlikely...  Then again, some others have told me similar rumours.  I find it hard to believe that...\"";
         next;
         mes "[Auldsbel the Wizard]";
-        mes "\"Well, if it's true, then try touching it.  It should do you no harm, but if you are very, very lucky, it just might grant you some minuscle magical power.\"";
+        mes "\"Well, if it's true, then try touching it.  That should do you no harm, but if you are very, very lucky, it just might grant you some minuscule amount of magical power.\"";
         next;
         goto L_main_menu;
 
@@ -600,7 +601,7 @@ L_Q_manaseed_touched:
 		goto L_Q_manaseed_touched_short;
 
         mes "[Auldsbel the Wizard]";
-        mes "\"Legend has it that you can substitute for such control by imbibing a Mana Potion.  I am not sure whether that legend is true, but it might be worth trying out for you.\"";
+        mes "\"Legend has it that you can substitute for such control by imbibing a Mana Potion.  I am not sure whether that legend is true, but for you it might be worth trying it out.\"";
         next;
 
         set MAGIC_FLAGS, MAGIC_FLAGS | MFLAG_KNOWS_MANAPOTION;
@@ -619,7 +620,7 @@ L_where_mana_potion:
 
 L_make_mana_potion:
         mes "[Auldsbel the Wizard]";
-        mes "\"Certainly, I can transmute some components into a Mana Potion for you.  Let's see... I will need one pearl, 10,000 GP, about twenty Mauve leaves, and some Gamboge ones... ten should do, I think.  Oh, and a bottle of water, of course.\"";
+        mes "\"Well, I can transmute some components into a Mana Potion for you.  Let's see... I will need one pearl, 10,000 GP, about twenty Mauve leaves, and some Gamboge ones... ten should do, I think.  Oh, and a bottle of water, of course.\"";
         next;
         menu
 		"Here you are.", -,
@@ -636,6 +637,14 @@ L_make_mana_potion:
 		goto L_make_mana_potion_missing;
         if (countitem(@BOTTLE_WATER) < 1)
 		goto L_make_mana_potion_missing;
+	getinventorylist;
+	if (@inventorylist_count == 100
+            && countitem(@YELLOW) > 10
+            && countitem(@MAUVE) > 20
+            && countitem(@PEARL) > 1
+            && countitem(@BOTTLE_WATER) > 1
+            && countitem(@MANA_POTION) < 1)
+        	goto L_mana_potion_toomuch;
 
         set zeny, zeny - 10000;
         delitem @YELLOW, 10;
@@ -664,11 +673,17 @@ L_make_mana_potion:
 
         goto L_main_menu;
 
+L_mana_potion_toomuch:
+        mes "[Auldsbel the Wizard]";
+        mes "\"Burndened as you are, I doubt you could carry it.  Get rid of some of your old things first, will you?\"";
+        next;
+        goto L_main_menu;
+
 L_make_mana_potion_missing:
         mes "[Auldsbel the Wizard]";
         mes "\"No, I need one pearl, 10,000 GP, 20 Mauve leaves, 10 Gamboge leaves, and one bottle of water.\"";
         next;
-        goto L_Q_manaseed_touched_short;
+        goto L_main_menu;
 
 L_Q_manaseed_prepared:
         mes "\"So you found a Mana Seed and preprared yourself by drinking a mana potion?  I recommend that you visit the seed again and see if that actually works...\"";
@@ -972,7 +987,8 @@ LL_initiation:
         	menu
 			"Not yet.", -,
                         "How about this mouboo figurine?", LL_initiation_check;
-        if (!countitem(@MOUBOO_FIGURINE))
+
+        if (!(countitem(@MOUBOO_FIGURINE)))
         	menu
 			"Not yet.", -,
                         "What was the spell again?", LL_repeat_spell;
@@ -988,7 +1004,7 @@ LL_initiation_fail:
         goto L_main_menu;
 
 LL_initiation_check:
-        if (!countitem (@MOUBOO_FIGURINE))
+        if (!(countitem(@MOUBOO_FIGURINE)))
 		goto L_main_menu;
         delitem @MOUBOO_FIGURINE, 1;
         set @mexp, MAGIC_EXPERIENCE & 65535;
@@ -1020,18 +1036,19 @@ LL_initiation_check:
         mes "[5000 experience points]";
         mes "[Level 2 in Transmutation Magic]";
 
-        set @Q_status, @Q_STATUS_STUDENT;
+        set @Q_main_status, @Q_STATUS_STUDENT;
         callsub S_update_var;
         getexp 5000, 0;
         if (getskilllv(SKILL_MAGIC_TRANSMUTE) < 2)
         	skill SKILL_MAGIC_TRANSMUTE, 2;
+        next;
         goto L_main_menu;
 
 LL_student_start:
         mes "[Auldsbel the Wizard]";
         mes "\"Next, I shall teach you a higher-level transmutation spell.\"";
         if (getskilllv(SKILL_MAGIC) < 2)
-		msg "\"Beware, for you will not be able to use it yet.\"";
+		mes "\"Beware, for you will not be able to use it yet.\"";
         next;
 
         mes "[Auldsbel the Wizard]";
@@ -1047,7 +1064,7 @@ LL_student_start:
 
         delitem @BUGLEG, 10;
         getexp 1000, 0;
-        set @Q_status, @Q_STATUS_STUDENT0;
+        set @Q_main_status, @Q_STATUS_STUDENT0;
         callsub S_update_var;
 
         mes "[Auldsbel the Wizard]";
@@ -1092,7 +1109,7 @@ LL_student_0:
 
         delitem @MAUVE, 20;
         getexp 1000, 0;
-        set @Q_status, @Q_STATUS_STUDENT1;
+        set @Q_main_status, @Q_STATUS_STUDENT1;
         callsub S_update_var;
 
         mes "[Auldsbel the Wizard]";
@@ -1127,7 +1144,7 @@ LL_student_1:
 
         delitem @STINGER, 10;
         getexp 1000, 0;
-        set @Q_status, @Q_STATUS_STUDENT2;
+        set @Q_main_status, @Q_STATUS_STUDENT2;
         callsub S_update_var;
 
         mes "[Auldsbel the Wizard]";
@@ -1162,7 +1179,7 @@ LL_student_2:
 
         delitem @WOOD, 20;
         getexp 1000, 0;
-        set @Q_status, @Q_STATUS_STUDENT3;
+        set @Q_main_status, @Q_STATUS_STUDENT3;
         callsub S_update_var;
 
         mes "[Auldsbel the Wizard]";