Clean up main scripts

1 files changed, 71 insertions, 52 deletions

diff --git a/world/map/npc/011-1/auldsbel.txt b/world/map/npc/011-1/auldsbel.txt
index 8fb16e2c..5b300e71 100644
--- a/world/map/npc/011-1/auldsbel.txt
+++ b/world/map/npc/011-1/auldsbel.txt
@@ -53,10 +53,7 @@
         "What are you talking about?", L_intro_explain,
         "I don't have any obsidian salt.", L_intro_nopowder,
         "Do I know you?", L_intro_identity,
-        "Goodbye.", -;
-    close;
-
-    set @name_complaint, 0;
+        "Goodbye.", L_Close;
 
 L_intro_explain:
     mes "[Robed Man]";
@@ -85,20 +82,19 @@ L_intro_identity:
         @xmsg$, L_intro_wrongperson,
         "You're not very good with faces, are you?", L_intro_nogood,
         "Who are you?", L_intro_who_are_you,
-        "Goodbye.", -;
-    close;
+        "Goodbye.", L_Close;
 
 L_intro_wrongperson:
     mes "[Robed Man]";
     mes "He laughs.";
     mes "\"Ah, I knew it... you're not the first one today, either.  I should apologize, I am horrible with faces.  Well, if you don't mind, please hurry along, I should go back to my experiments.\"";
     next;
+    goto L_intro_primary_menu;
 
 L_intro_primary_menu:
     menu
         "Who are you?", L_intro_who_are_you,
-        "Goodbye.", -;
-    close;
+        "Goodbye.", L_Close;
 
 L_intro_nogood:
     mes "[Robed Man]";
@@ -108,8 +104,7 @@ L_intro_nogood:
     menu
         "Who are you?", L_intro_who_are_you,
         "What is obsidian salt, anyway?", L_intro_obsidian_salt,
-        "Goodbye.", -;
-    close;
+        "Goodbye.", L_Close;
 
 L_intro_obsidian_salt:
     mes "[Robed Man]";
@@ -149,8 +144,7 @@ L_main_menu:
         "Where are you from?", L_about_auldsbel,
         "Do you need help with your experiments?", L_quest,
         "What do you know about...", L_question,
-        "Goodbye.", -;
-    close;
+        "Goodbye.", L_Close;
 
 L_main_menu_magic:
     if (@wants_sulphur && @wants_ironpowder)
@@ -162,7 +156,7 @@ L_main_menu_magic:
              "What do you know about...", L_question,
              "Can you make sulphur powder?", L_sulphur,
              "Can you make iron powder?", L_ironpowder,
-             "Goodbye.", -;
+             "Goodbye.", L_Close;
     if (@wants_sulphur && !@wants_ironpowder)
         menu
             "How does magic work?", L_about_magic,
@@ -171,16 +165,15 @@ L_main_menu_magic:
             "Do you need help with your experiments?", L_quest,
             "What do you know about...", L_question,
             "Can you make sulphur powder?", L_sulphur,
-            "Goodbye.", -;
-    if (!@wants_sulphur)
+            "Goodbye.", L_Close;
+    //else
         menu
             "How does magic work?", L_about_magic,
             "Can you teach me a spell?", L_learn_spell,
             "Where are you from?", L_about_auldsbel,
             "Do you need help with your experiments?", L_quest,
             "What do you know about...", L_question,
-            "Goodbye.", -;
-    close;
+            "Goodbye.", L_Close;
 
 L_ironpowder:
     mes "[Auldsbel the Wizard]";
@@ -198,16 +191,15 @@ L_sulphur:
     next;
     if (@Q_main_status >= @Q_STATUS_STUDENT)
         menu
-            "No, thank you.", -,
-            "I will see what I can find.", -,
+            "No, thank you.", L_Close,
+            "I will see what I can find.", L_Close,
             "Can you teach me how to make it myself?", L_sulphur_teach_spell,
             "Here you are.", L_sulphur_buy;
-    if (@Q_main_status < @Q_STATUS_STUDENT)
+    //else
         menu
-            "No, thank you.", -,
-            "I will see what I can find.", -,
+            "No, thank you.", L_Close,
+            "I will see what I can find.", L_Close,
             "Here you are.", L_sulphur_buy;
-    close;
 
 L_sulphur_buy:
     if (Zeny < @cost)
@@ -266,7 +258,9 @@ L_sulphur_teach_spell_no:
     next;
     menu
         "Very well, I will help you.", L_quest,
-        "No.", -;
+        "No.", L_Next;
+
+L_Next:
     mes "[Auldsbel the Wizard]";
     mes "\"Then I fear that I shall not reveal the spell to you either.\"";
     next;
@@ -279,6 +273,7 @@ L_about_magic:
     mes "[Auldsbel the Wizard]";
     mes "\"Most spells are claimed by one of the five schools of magic.  To properly use them, a magic user need not only have sufficient prowess in magic overall, but also in the specifics of that particular school.\"";
     next;
+    goto L_about_magic_minimenu;
 
 L_about_magic_minimenu:
     menu
@@ -286,13 +281,13 @@ L_about_magic_minimenu:
         "How can I advance in magic?", L_about_magic_advance,
         "How do spells work?", L_about_magic_spells,
         "Where can I learn spells?", L_about_magic_learn,
-        "Never mind.", -;
-    goto L_main_menu;
+        "Never mind.", L_main_menu;
 
 L_about_magic_schools:
     mes "[Auldsbel the Wizard]";
     mes "\"With few exceptions, all spells belong to one of the five schools of magic:  Transmutation, War, Astral, Life, and Nature.\"";
     next;
+    goto L_about_schools_minimenu;
 
 L_about_schools_minimenu:
     menu
@@ -302,8 +297,7 @@ L_about_schools_minimenu:
         "What's Life magic?", L_about_life,
         "What's Nature magic?", L_about_nature,
         "Are there other spells?", L_about_other_spells,
-        "Thank you.", -;
-    goto L_about_magic_minimenu;
+        "Thank you.", L_about_magic_minimenu;
 
 L_about_transmutation:
     mes "[Auldsbel the Wizard]";
@@ -397,6 +391,7 @@ L_about_magic_spells:
     mes "[Auldsbel the Wizard]";
     mes "\"Some spells require catalysts on top of components, others vary in power depending on whom they are cast on or under what conditions.  However, all spells are affected by the caster's astral power.\"";
     next;
+    goto L_about_spells_minimenu;
 
 L_about_spells_minimenu:
     menu
@@ -407,7 +402,6 @@ L_about_spells_minimenu:
         "Where can I learn spells?", L_about_magic_learn,
         "How often can I cast spells?", L_about_speed,
         "Never mind.", L_about_magic_minimenu;
-    close;
 
 L_about_astral_power:
     mes "[Auldsbel the Wizard]";
@@ -469,8 +463,7 @@ L_about_auldsbel:
     next;
     menu
         "All right, but what about you?.", L_about_auldsbel_2,
-        "Never mind.", -;
-    goto L_main_menu;
+        "Never mind.", L_main_menu;
 
 L_about_auldsbel_2:
     mes "[Auldsbel the Wizard]";
@@ -540,8 +533,7 @@ L_Q_astralsoul_L:
     mes "\"It is about... erm, 11300 GP. Do you have so much money?\"";
     menu
         "Here you are", L_Q_astralsoul_L1,
-        "I will get it.", -;
-    goto L_main_menu;
+        "I will get it.", L_main_menu;
 
 L_Q_astralsoul_L1:
     if (Zeny < 11300)
@@ -645,13 +637,13 @@ L_Q_manaseed_touched:
     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;
+    goto L_Q_manaseed_touched_short;
 
 L_Q_manaseed_touched_short:
     menu
         "Where can I get a Mana Potion?", L_where_mana_potion,
         "Can you make a Mana Potion?", L_make_mana_potion,
-        "Thank you.", -;
-    goto L_main_menu;
+        "Thank you.", L_main_menu;
 
 L_where_mana_potion:
     mes "[Auldsbel the Wizard]";
@@ -664,9 +656,11 @@ L_make_mana_potion:
     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.", -,
+        "Here you are.", L_Next1,
         "I will look for those items.", L_main_menu,
         "I'm not interested.", L_Q_manaseed_touched_short;
+
+L_Next1:
     if (Zeny < 10000)
         goto L_make_mana_potion_missing;
     if (countitem("GambogeHerb") < 10)
@@ -701,7 +695,9 @@ L_make_mana_potion:
     next;
     menu
         "Thank you!", L_main_menu,
-        "What about the pearl and GP?", -;
+        "What about the pearl and GP?", L_Next2;
+
+L_Next2:
     mes "[Auldsbel the Wizard]";
     mes "Auldsbel raises his eyebrows in surprise.";
     mes "\"Those were payment.  You don't expect me to work for free, now do you?\"";
@@ -768,8 +764,10 @@ L_component_quest_0:
     mes "\"There are plenty of Mauve plants around, so I'm sure that you won't have a hard time finding the leaves.\"";
     next;
     menu
-        "I have them here.", -,
+        "I have them here.", L_Next3,
         "Sure, I will look for them.", L_main_menu;
+
+L_Next3:
     if (countitem ("MauveHerb") < 20)
         goto L_component_quest_missing;
     delitem "MauveHerb", 20;
@@ -791,9 +789,11 @@ L_component_quest_1:
     mes "\"Please be a good " + @address$ + " and get me an iron potion, a concentration potion, and three small and three medium healing potions.\"";
     next;
     menu
-        "Here you are.", -,
+        "Here you are.", L_Next4,
         "I'm not your 'good " + @address$ + "'!", L_main_menu,
         "I'll see what I can do.", L_main_menu;
+
+L_Next4:
     if (countitem ("SmallHealingPotion") < 3)
         goto L_component_quest_missing;
     if (countitem ("MediumHealingPotion") < 3)
@@ -824,8 +824,10 @@ L_component_quest_2:
     mes "\"I would like to run the next batch of experiments on a larger scale, though.  Would you be so kind as to fetch me one hundred silk cocoons, please?\"";
     next;
     menu
-        "One hundred cocoons, here you are.", -,
+        "One hundred cocoons, here you are.", L_Next5,
         "That's a lot; I'll see what I can do.", L_main_menu;
+
+L_Next5:
     if (countitem ("SilkCocoon") < 100)
         goto L_component_quest_missing;
     delitem "SilkCocoon", 100;
@@ -848,8 +850,10 @@ L_component_quest_3:
     mes "\"I'm still not sure how to integrate it into the spell...  but leave that to me.  Can you get me twenty-five red scorpion stingers and twenty-five lumps of maggot slime?  Those should be just what I need.\"";
     next;
     menu
-        "Here are your stingers and slimes.", -,
+        "Here are your stingers and slimes.", L_Next6,
         "I will get back to you once I have them.", L_main_menu;
+
+L_Next6:
     if (countitem ("RedScorpionStinger") < 25)
         goto L_component_quest_missing;
     if (countitem ("MaggotSlime") < 25)
@@ -881,8 +885,10 @@ L_component_quest_4:
     mes "\"Could you get me twenty regular, cave, and mountain snake tongues, please?  So a total of sixty tongues.  This is where most of their life force is concentrated, incidentally.\"";
     next;
     menu
-        "Here are your tongues.", -,
+        "Here are your tongues.", L_Next7,
         "I will hunt some snakes for you.", L_main_menu;
+
+L_Next7:
     if (countitem ("SnakeTongue") < 20)
         goto L_component_quest_missing;
     if (countitem ("CaveSnakeTongue") < 20)
@@ -920,8 +926,10 @@ L_component_quest_5:
     mes "\"I do have another assignment for you, but this one will be tricky.  I will need fifty grass snake tongues.  I believe that this may be just enough life force to return the silkworm back to its original shape.\"";
     next;
     menu
-        "Here they are.", -,
+        "Here they are.", L_Next8,
         "That's quite a challenge.", L_main_menu;
+
+L_Next8:
     if (countitem ("GrassSnakeTongue") < 50)
         goto L_component_quest_missing;
     delitem "GrassSnakeTongue", 50;
@@ -1020,13 +1028,12 @@ LL_initiation:
     next;
     if (countitem("MoubooFigurine"))
         menu
-            "Not yet.", -,
+            "Not yet.", L_main_menu,
             "How about this mouboo figurine?", LL_initiation_check;
-    if (!(countitem("MoubooFigurine")))
+    //else
         menu
-            "Not yet.", -,
+            "Not yet.", L_main_menu,
             "What was the spell again?", LL_repeat_spell;
-    goto L_main_menu;
 
 LL_initiation_fail:
     mes "[Auldsbel the Wizard]";
@@ -1080,8 +1087,10 @@ LL_student_start:
     mes "\"Bring me ten bug legs, and I will reveal its invocation to you.\"";
     next;
     menu
-        "Here you are.", -,
+        "Here you are.", L_Next9,
         "I'll be back with them.", L_main_menu;
+
+L_Next9:
     if (countitem("BugLeg") < 10)
         goto L_component_quest_missing;
     delitem "BugLeg", 10;
@@ -1118,8 +1127,10 @@ LL_student_0:
     mes "\"Bring me twenty mauve leaves, and I will reveal its invocation.\"";
     next;
     menu
-        "Here you are.", -,
+        "Here you are.", L_Next10,
         "I'll be back with them.", L_main_menu;
+
+L_Next10:
     if (countitem("MauveHerb") < 20)
         goto L_component_quest_missing;
     delitem "MauveHerb", 20;
@@ -1146,8 +1157,10 @@ LL_student_1:
     mes "\"For this, I would like ten scorpion stingers.\"";
     next;
     menu
-        "Here you are.", -,
+        "Here you are.", L_Next11,
         "I'll be back with them.", L_main_menu;
+
+L_Next11:
     if (countitem("ScorpionStinger") < 10)
             goto L_component_quest_missing;
     delitem "ScorpionStinger", 10;
@@ -1174,8 +1187,10 @@ LL_student_2:
     mes "\"Bring me twenty wooden logs, and I will teach you.\"";
     next;
     menu
-        "Here you are.", -,
+        "Here you are.", L_Next12,
         "I'll be back with them.", L_main_menu;
+
+L_Next12:
     if (countitem("RawLog") < 20)
             goto L_component_quest_missing;
     delitem "RawLog", 20;
@@ -1220,7 +1235,9 @@ LL_student_4:
     menu
         "What was the invocation again?", LL_student_3_repeat,
         "No, still working on it...", L_main_menu,
-        "Yes.", -;
+        "Yes.", L_Next13;
+
+L_Next13:
     if (countitem("ConcentrationPotion") < 1)
         goto LL_student_4_no_potion;
     if (!(MAGIC_FLAGS & MFLAG_MADE_CONC_POTION))
@@ -1269,6 +1286,8 @@ LL_magic_skill_insufficient:
     next;
     goto L_main_menu;
 
+L_Close:
+    close;
 
 S_update_var:
     set @Q_status, @Q_main_status | (@Q_component_quest << 5);