Fix style (split for more readable diff)

3 files changed, 50 insertions, 54 deletions

diff --git a/world/map/npc/011-1/alchemist.txt b/world/map/npc/011-1/alchemist.txt
index 9b0dc795..de66be6a 100644
--- a/world/map/npc/011-1/alchemist.txt
+++ b/world/map/npc/011-1/alchemist.txt
@@ -1022,7 +1022,6 @@ L_Next3:
 L_abort:
     close;
 
-
 L_Update_Var:
     set QUEST_Forestbow_state,
         (QUEST_Forestbow_state & ~(@Q_MASK)
diff --git a/world/map/npc/011-1/auldsbel.txt b/world/map/npc/011-1/auldsbel.txt
index 5b300e71..b5ea7f1d 100644
--- a/world/map/npc/011-1/auldsbel.txt
+++ b/world/map/npc/011-1/auldsbel.txt
@@ -166,14 +166,13 @@ L_main_menu_magic:
             "What do you know about...", L_question,
             "Can you make sulphur powder?", L_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.", L_Close;
+    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.", L_Close;
 
 L_ironpowder:
     mes "[Auldsbel the Wizard]";
@@ -195,11 +194,10 @@ L_sulphur:
             "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;
-    //else
-        menu
-            "No, thank you.", L_Close,
-            "I will see what I can find.", L_Close,
-            "Here you are.", L_sulphur_buy;
+    menu
+        "No, thank you.", L_Close,
+        "I will see what I can find.", L_Close,
+        "Here you are.", L_sulphur_buy;
 
 L_sulphur_buy:
     if (Zeny < @cost)
@@ -968,23 +966,23 @@ L_component_quest_missing:
 
 L_learn_spell:
     if (@Q_main_status == @Q_STATUS_INITIATION)
-        goto LL_initiation;
+        goto L_initiation;
     if (@Q_main_status == @Q_STATUS_STUDENT)
-        goto LL_student_start;
+        goto L_student_start;
     if (@Q_main_status == @Q_STATUS_STUDENT0)
-        goto LL_student_0;
+        goto L_student_0;
     if (@Q_main_status == @Q_STATUS_STUDENT1)
-        goto LL_student_1;
+        goto L_student_1;
     if (@Q_main_status == @Q_STATUS_STUDENT2)
-        goto LL_student_2;
+        goto L_student_2;
     if (@Q_main_status == @Q_STATUS_STUDENT3)
-        goto LL_student_3;
+        goto L_student_3;
     if (@Q_main_status == @Q_STATUS_STUDENT4)
-        goto LL_student_4;
+        goto L_student_4;
     if (@Q_main_status == @Q_STATUS_STUDENT5)
-        goto LL_student_5;
+        goto L_student_5;
     if (@Q_main_status == @Q_STATUS_STUDENT6)
-        goto LL_student_6;
+        goto L_student_6;
 
     mes "[Auldsbel the Wizard]";
     mes "\"Wellll.... you do seem to have some magical abilities.  But do you possess the talent and diligence needed for a true wizard?\"";
@@ -1010,7 +1008,7 @@ L_learn_spell:
     callsub S_update_var;
     goto L_main_menu;
 
-LL_repeat_spell:
+L_repeat_spell:
     mes "[Auldsbel the Wizard]";
     mes "\"The invocation is `" + getspellinvocation("transmute-wood-to-figurine") + ",' followed by the last syllable of the name of the creature you want to shape the log into.  So `" + getspellinvocation("transmute-wood-to-figurine") + " lurk' for a Skrytlurk figurine.\"";
     next;
@@ -1022,20 +1020,19 @@ LL_repeat_spell:
     next;
     goto L_main_menu;
 
-LL_initiation:
+L_initiation:
     mes "[Auldsbel the Wizard]";
     mes "\"So, have you managed to transmute something?\"";
     next;
     if (countitem("MoubooFigurine"))
         menu
             "Not yet.", L_main_menu,
-            "How about this mouboo figurine?", LL_initiation_check;
-    //else
-        menu
-            "Not yet.", L_main_menu,
-            "What was the spell again?", LL_repeat_spell;
+            "How about this mouboo figurine?", L_initiation_check;
+    menu
+        "Not yet.", L_main_menu,
+        "What was the spell again?", L_repeat_spell;
 
-LL_initiation_fail:
+L_initiation_fail:
     mes "[Auldsbel the Wizard]";
     mes "\"No, no, no.  This is no good-- too many imperfections.\"";
     mes "He throws it away.";
@@ -1043,7 +1040,7 @@ LL_initiation_fail:
     next;
     goto L_main_menu;
 
-LL_initiation_check:
+L_initiation_check:
     if (!(countitem("MoubooFigurine")))
         goto L_main_menu;
     delitem "MoubooFigurine", 1;
@@ -1051,7 +1048,7 @@ LL_initiation_check:
     mes "Auldsbel inspects your figurine.";
     next;
     if (@mexp < 40)
-        goto LL_initiation_fail;
+        goto L_initiation_fail;
     mes "[Auldsbel the Wizard]";
     mes "Auldsbel nods.";
     mes "\"This looks good.\"";
@@ -1076,8 +1073,8 @@ LL_initiation_check:
     next;
     goto L_main_menu;
 
-LL_student_start:
-    if (@mexp < 200) goto LL_notready;
+L_student_start:
+    if (@mexp < 200) goto L_notready;
         mes "[Auldsbel the Wizard]";
     mes "\"Next, I shall teach you a higher-level transmutation spell.\"";
     if (getskilllv(SKILL_MAGIC) < 2)
@@ -1111,15 +1108,15 @@ L_Next9:
     next;
     goto L_main_menu;
 
-LL_notready:
+L_notready:
     mes "[Auldsbel the Wizard]";
     mes "\"You still need more practice with spellcasting; I won't give you another spell until you are ready.\"";
     next;
     goto L_main_menu;
 
-LL_student_0:
+L_student_0:
     if (@mexp < 350)
-        goto LL_notready;
+        goto L_notready;
     mes "[Auldsbel the Wizard]";
     mes "\"The next transmutation spell is a little harder than the last one I taught you, but you should be able to manage.\"";
     next;
@@ -1147,9 +1144,9 @@ L_Next10:
     next;
     goto L_main_menu;
 
-LL_student_1:
+L_student_1:
     if (@mexp < 425)
-        goto LL_notready;
+        goto L_notready;
     mes "[Auldsbel the Wizard]";
     mes "\"Up next is the transmutation spell for regular shirts.\"";
     next;
@@ -1177,9 +1174,9 @@ L_Next11:
     next;
     goto L_main_menu;
 
-LL_student_2:
+L_student_2:
     if (@mexp < 500)
-        goto LL_notready;
+        goto L_notready;
     mes "[Auldsbel the Wizard]";
     mes "\"You may find the next spell particularly useful.\"";
     next;
@@ -1207,14 +1204,15 @@ L_Next12:
     next;
     goto L_main_menu;
 
-LL_student_3:
+L_student_3:
     if (getskilllv(SKILL_MAGIC) < 3)
-        goto LL_magic_skill_insufficient;
+        goto L_magic_skill_insufficient;
     mes "[Auldsbel the Wizard]";
     mes "\"I believe that you may be ready for the next level of transmutation magic!  Let me teach you one last spell that you can handle before your promotion, and if you can cast this one, I will advance you.\"";
     next;
+    goto L_student_3_repeat;
 
-LL_student_3_repeat:
+L_student_3_repeat:
     mes "[Auldsbel the Wizard]";
     mes "\"This one has the invocation `" + getspellinvocation("make-concentration-potion") + "'.  Put two cobalt leaves and two pink flower petals into a bottle of water, hold it up, and speak that phrase.\"";
     next;
@@ -1228,20 +1226,20 @@ LL_student_3_repeat:
     callsub S_update_var;
     goto L_main_menu;
 
-LL_student_4:
+L_student_4:
     mes "[Auldsbel the Wizard]";
     mes "\"Did you manage to transmute a concentration potion?\"";
     next;
     menu
-        "What was the invocation again?", LL_student_3_repeat,
+        "What was the invocation again?", L_student_3_repeat,
         "No, still working on it...", L_main_menu,
         "Yes.", L_Next13;
 
 L_Next13:
     if (countitem("ConcentrationPotion") < 1)
-        goto LL_student_4_no_potion;
+        goto L_student_4_no_potion;
     if (!(MAGIC_FLAGS & MFLAG_MADE_CONC_POTION))
-        goto LL_student_4_wrong_potion;
+        goto L_student_4_wrong_potion;
     mes "[Auldsbel the Wizard]";
     mes "Auldsbel examines your potion and nods.";
     mes "\"Good work!  You are ready for a promotion!\"";
@@ -1262,25 +1260,25 @@ L_Next13:
     next;
     goto L_main_menu;
 
-LL_student_4_wrong_potion:
+L_student_4_wrong_potion:
     mes "[Auldsbel the Wizard]";
     mes "Auldsbell examines your potion, then shakes his head.";
     mes "\"This doesn't look quite right, though I can't quite point at what the problem is.  You will have to continue trying.\"";
     next;
     goto L_main_menu;
 
-LL_student_4_no_potion:
+L_student_4_no_potion:
     mes "[Auldsbel the Wizard]";
     mes "\"You seem to be rather lacking the concentration potion you need to justify your claim, my dear fellow.\"";
     next;
     goto L_main_menu;
 
-LL_student_5:
+L_student_5:
     mes "[Auldsbel the Wizard]";
     mes "\"Hmm.  Come back some other time, please; I still haven't figured out what to teach you next.\"";
     close;
 
-LL_magic_skill_insufficient:
+L_magic_skill_insufficient:
     mes "[Auldsbel the Wizard]";
     mes "\"No, not at this time.  You will have to advance in your overall magic skill before I can teach you more.\"";
     next;
diff --git a/world/map/npc/011-1/oscar.txt b/world/map/npc/011-1/oscar.txt
index e3901a12..2927c5e8 100644
--- a/world/map/npc/011-1/oscar.txt
+++ b/world/map/npc/011-1/oscar.txt
@@ -508,5 +508,4 @@ L_InventoryFull:
     mes "\"Ah, but you cannot carry anything else!";
     mes "Make some room first.\"";
     goto L_End;
-
 }