Clean up main scripts

6 files changed, 82 insertions, 46 deletions

diff --git a/world/map/npc/021-2/bakery.txt b/world/map/npc/021-2/bakery.txt
index 738c90c2..89fbc38d 100644
--- a/world/map/npc/021-2/bakery.txt
+++ b/world/map/npc/021-2/bakery.txt
@@ -11,6 +11,7 @@
 //    if (gettime(6) == @month && gettime(5) >= @start_day && gettime(5) <= @end_day && QUEST_Easter11 == 10) goto L_ChocMouboo;
 //    if (gettime(6) == @month && gettime(5) >= @start_day && gettime(5) <= @end_day && QUEST_Easter11 == 11) goto L_MakeChocMouboo;
 //    if (gettime(6) == @month && gettime(5) >= @start_day && gettime(5) <= @end_day && QUEST_Easter11 == 12) goto L_SeeBunny;
+    goto L_Begin;
 
 L_Begin:
     mes "[Riskim]";
@@ -50,8 +51,10 @@ L_lace_chococake:
     next;
     menu
         "Thanks!  Let me have a look around...", L_end,
-        "Can you put this potion into a Chocolate Cake?", -,
+        "Can you put this potion into a Chocolate Cake?", L_Next,
         "Goodbye!", L_end;
+
+L_Next:
     mes "[Riskim]";
     mes "";
     mes "As you show Riskim the potion, he leans back, away from it.";
@@ -66,8 +69,10 @@ L_lace_chococake:
     next;
     menu
         "I will get them for you.", L_end,
-        "Here you are!", -,
+        "Here you are!", L_Continue,
         "Maybe later.", L_end;
+
+L_Continue:
     if (countitem("ChocolateBar") < 10)
         goto L_lacking_ingredients;
     if (countitem("MopoxCurePotion") < 1)
@@ -107,8 +112,10 @@ L_lace_cupcake:
     next;
     menu
         "Thanks!  Let me have a look around...", L_end,
-        "Can you put this potion into an Orange Cupcake?", -,
+        "Can you put this potion into an Orange Cupcake?", L_More,
         "Goodbye!", L_end;
+
+L_More:
     mes "[Riskim]";
     mes "";
     mes "\"Orange Cupcakes?  Oh dear... I'm sorry, but I have a very bad orange allergy.\"";
@@ -117,6 +124,7 @@ L_lace_cupcake:
     mes "";
     mes "\"Perhaps the Chef at Dimond's Cove can help you?  We get all our cupcakes from him.\"";
     next;
+    goto L_End;
 
 L_End:
     close;
@@ -127,16 +135,23 @@ L_ChocMouboo:
     mes "\"Welcome to our bakery! Here you will find the best cakes in Tulimshar. And don't leave before you try one of our delicious Chocolate Pinkies!\"";
     next;
     menu
-        "Excuse me, sir? Did you say Chocolate Pinkies?", -;
+        "Excuse me, sir? Did you say Chocolate Pinkies?", L_Next1;
+
+L_Next1:
     mes "\"Yes! But there is no need to be alarmed, it is just plain chocolate molded in the shape of a small pinkie...\"";
     next;
     menu
-        "Do you have one in the shape of a mouboo? The Easter Bunny needs one.", -;
+        "Do you have one in the shape of a mouboo? The Easter Bunny needs one.", L_Next2;
+
+L_Next2:
     mes "\"The Easter Bunny? Interesting... I think I can help you make a Chocolate Mouboo.\"";
     menu
         "Nah, I decided not to do that stupid quest.", L_End,
-        "I would really appreciate that!", -;
+        "I would really appreciate that!", L_SetEasterBit;
+
+L_SetEasterBit:
     set QUEST_Easter11, 11;
+    goto L_MakeChocMouboo;
 
 L_MakeChocMouboo:
     mes "[Riskim]";
@@ -147,13 +162,15 @@ L_MakeChocMouboo:
     mes "\"I will also need a Mouboo Figurine to hollow out and use as a mold.\"";
     mes "\"Any mage should be able to make you one out of a log, if you ask.\"";
     menu
-        "I have everything you need.", -,
+        "I have everything you need.", L_HaveEverything,
         "Ok, I will be back soon.", L_End,
         "I changed my mind, forget about it.", L_End;
 
+L_HaveEverything:
     if(countitem("ChocolateBar") < 5
         || countitem("MoubooFigurine") < 1)
             goto L_EasterNotEnough;
+    goto L_EasterEnough;
 
 L_EasterEnough:
     getinventorylist;
diff --git a/world/map/npc/021-2/government_building.txt b/world/map/npc/021-2/government_building.txt
index 8dd0c240..7b39a821 100644
--- a/world/map/npc/021-2/government_building.txt
+++ b/world/map/npc/021-2/government_building.txt
@@ -6,6 +6,7 @@
     mes "[Estard]";
     mes "\"Hello what can I do for you?\"";
     next;
+    goto L_main;
 
 L_main:
     if (getpartnerid2())
@@ -13,14 +14,12 @@ L_main:
 
     menu
         "I'm looking at getting married.", L_marry,
-        "Nothing, I guess.", -;
-    close;
+        "Nothing, I guess.", L_Close;
 
 L_main_married:
     menu
         "I'd like a divorce.", L_divorce,
-        "Nothing, I guess.", -;
-    close;
+        "Nothing, I guess.", L_Close;
 
 L_marry:
     if (BaseLevel < WEDDING_MIN_LEVEL)
@@ -32,8 +31,7 @@ L_marry:
     mes "\"Are you sure you want to get married? It'll cost " + WEDDING_FEE + " GP.\"";
     menu
         "Yes", L_marry_do,
-        "No", -;
-    close;
+        "No", L_Close;
 
 L_marry_do:
     callsub S_give_rings;
@@ -49,8 +47,7 @@ L_marry_too_young:
 
     menu
         "Can I at least get wedding rings?", L_get_rings,
-        "Thanks anyways.", -;
-    close;
+        "Thanks anyways.", L_Close;
 
 L_marry_too_poor:
     mes "[Estard]";
@@ -63,12 +60,11 @@ L_get_rings:
 
     if (Zeny < WEDDING_FEE)
         menu
-            "Thanks anyways. I don't have enough with me.", -;
-    if (Zeny >= WEDDING_FEE)
+            "Thanks anyways. I don't have enough with me.", L_Close;
+    //else
         menu
             "I'll buy a pair.", L_get_rings_pay,
-            "Thanks anyways.", -;
-    close;
+            "Thanks anyways.", L_Close;
 
 L_get_rings_pay:
     callsub S_give_rings;
@@ -88,8 +84,7 @@ L_divorce:
     next;
     menu
         "I am sure I want it.", L_do_divorce,
-        "I don't want it.", -;
-    close;
+        "I don't want it.", L_Close;
 
 L_do_divorce:
     if (Zeny < @divorce_cost)
@@ -126,6 +121,9 @@ L_no_room_for_rings:
     mes "\"You don't have enough room to carry these rings.\"";
     close;
 
+L_Close:
+    close;
+
 S_give_rings:
     if (Zeny < WEDDING_FEE)
         goto L_not_enough_money;
@@ -154,23 +152,21 @@ S_give_rings:
         goto L_Base_Menu;
     if (BaseLevel >= 10)
         goto L_Can_Party;
+    goto L_Base_Menu;
 
 L_Base_Menu:
     menu
-        "Nothing, I guess.", -;
-    close;
+        "Nothing, I guess.", L_Close;
 
 L_Can_Party:
     menu
         "I'd like to get a party permit.", L_Get_Party,
-        "Nothing, I guess.", -;
-    close;
+        "Nothing, I guess.", L_Close;
 
 L_Can_Make_Party:
     menu
         "I'd like to get a party creator permit.", L_Get_Make_Party,
-        "Nothing, I guess.", -;
-    close;
+        "Nothing, I guess.", L_Close;
 
 L_Get_Party:
     mes "[Tathin]";
@@ -178,8 +174,7 @@ L_Get_Party:
     next;
     menu
         "OK", L_Give_Party,
-        "No thank you", -;
-    close;
+        "No thank you", L_Close;
 
 L_Give_Party:
     if (Zeny < 10)
@@ -199,8 +194,7 @@ L_Get_Make_Party:
     next;
     menu
         "OK", L_Give_Make_Party,
-        "No thank you", -;
-    close;
+        "No thank you", L_Close;
 
 L_Give_Make_Party:
     if (Zeny < 50)
@@ -215,6 +209,9 @@ L_NotEnoughMoney:
     mes "[Tathin]";
     mes "\"You don't have enough GP\"";
     close;
+
+L_Close:
+    close;
 }
 
 // Guard
diff --git a/world/map/npc/021-2/heathin.txt b/world/map/npc/021-2/heathin.txt
index c01d2fd4..07ec1c6a 100644
--- a/world/map/npc/021-2/heathin.txt
+++ b/world/map/npc/021-2/heathin.txt
@@ -65,7 +65,6 @@ L_Heathin_Interested:
         "Sure, I'll help!", L_Heathin_Help,
         "I'd rather keep my gold.", L_Heathin_No,
         "Can you repeat that again?", L_Heathin_Interested;
-    close;
 
 L_Heathin_Ring_Award:
     if ( (Zeny < 100000)
@@ -114,7 +113,6 @@ L_Heathin_Terranite_Hood:
     menu
         "No, thank you.  Maybe later.", L_Heathin_Terranite_No,
         "Armor, you say?  Definitely!", L_Heathin_Terranite_Yes;
-    close;
 
 L_Heathin_Terranite_No:
     mes "[Heathin]";
@@ -241,7 +239,6 @@ L_Heathin_Terranite_Arrows:
     menu
         "No, thank you.", L_Heathin_Terranite_Arrows_No,
         "Sure, I could use some arrows.", L_Heathin_Terranite_Arrows_Yes;
-    close;
 
 L_Heathin_Terranite_Arrows_No:
     mes "[Heathin]";
@@ -290,7 +287,6 @@ L_Heathin_Terranite_Arrows_Trade:
     menu
         "No.", L_Heathin_Terranite_Arrows_Trade_No,
         "Yes.", L_Heathin_Terranite_Arrows_Trade_Yes;
-    close;
 
 L_Heathin_Terranite_Arrows_Trade_No:
     mes "[Heathin]";
diff --git a/world/map/npc/021-2/inya.txt b/world/map/npc/021-2/inya.txt
index 97424592..c448681d 100644
--- a/world/map/npc/021-2/inya.txt
+++ b/world/map/npc/021-2/inya.txt
@@ -14,7 +14,6 @@
         "I'd like to remove a gem (500000 GP).", L_Inya_Remove_RingGem,
         "I'd like to add a gem (1000000 GP).", L_Inya_Add_RingGem,
         "Not interested.", L_Inya_NotInterested;
-    close;
 
 L_Inya_Wedding_Ring:
     mes "[Inya]";
@@ -32,7 +31,6 @@ L_Inya_Remove_RingGem:
         "Topaz.", L_Inya_Remove_Topaz,
         "Amethyst.", L_Inya_Remove_Amethyst,
         "I've changed my mind.", L_Inya_NotInterested;
-    close;
 
 L_Inya_Add_RingGem:
     mes "[Inya]";
@@ -45,7 +43,6 @@ L_Inya_Add_RingGem:
         "Topaz.", L_Inya_Add_Topaz,
         "Amethyst.", L_Inya_Add_Amethyst,
         "I've changed my mind.", L_Inya_NotInterested;
-    close;
 
 L_Inya_Remove_Diamond:
     if ( (Zeny < 500000)
diff --git a/world/map/npc/021-2/kylian.txt b/world/map/npc/021-2/kylian.txt
index 5406f6c7..4e26b6dd 100644
--- a/world/map/npc/021-2/kylian.txt
+++ b/world/map/npc/021-2/kylian.txt
@@ -34,6 +34,8 @@
 
 -|script|#businessmanNTconfig|-1,
 {
+    end;
+
 OnInit:
     // Nibble 4
     set $@knowYanisNT,   0x10000;
@@ -92,7 +94,9 @@ OnInit:
     mes "\"Ah, are you the room service? I've some requests.\"";
     menu
         "Sure, what can I do for you?",L_Luggage,
-        "No, I'm not!",-;
+        "No, I'm not!",L_Next;
+
+L_Next:
     mes "[Kylian]";
     mes "\"Too bad. Would you be interested in earning some quick money with some errands regardless?\"";
     menu
@@ -113,8 +117,10 @@ L_Suitcase: // @state >= 1, but below 3
     if (@state != 2)
         goto L_Close;
     menu
-        "Here it is.",-,
+        "Here it is.",L_Continue,
         "I'm on my way, don't worry.",L_Close;
+
+L_Continue:
     if (countitem("LeatherSuitcase") < 1)
         goto L_NoItem;
     delitem "LeatherSuitcase", 1;
@@ -131,14 +137,18 @@ L_Suitcase: // @state >= 1, but below 3
     mes "In case you don't like them, you could also bring them to the Tulimshar bakery. I heard they use them to make some special flour.\"";
     getitem "Acorn", @acorn_amount;
     next;
+    goto L_ShopLicense;
+
 L_ShopLicense: // @state == 3
     mes "[Kylian]";
     mes "\"I'm a salesman and came to Tulimshar because I'm thinking about establishing a shop here. While I'm going through my papers, could you find out who I have to talk to about opening a shop in this city?\"";
     if (!(QUEST_NorthTulimshar & $@knowYanisNT))
         goto L_Close;
     menu
-        "You need to talk to Yanis in the government building.",-,
+        "You need to talk to Yanis in the government building.",L_GovBuild,
         "I'll see what I can do.",L_Close;
+
+L_GovBuild:
     set Zeny, Zeny + @license_money;
     getexp @license_exp, 0;
     set @state, 4;
@@ -148,6 +158,8 @@ L_ShopLicense: // @state == 3
     mes "\"Ah, excellent. That's very helpful. Could you tell me how to get to that building?\"";
     mes "You explain the way to the building.";
     next;
+    goto L_LicenseDone;
+
 L_LicenseDone: // the player didn't log out yet after telling about Yanis
     mes "[Kylian]";
     mes "\"I need to prepare my papers now. I might have some more questions later.\"";
@@ -159,8 +171,10 @@ L_SightSeeing: // @state == 4 and logged out sometime between getting to that st
     if (!(QUEST_NorthTulimshar & $@knowWeellosNT))
         goto L_Close;
     menu
-        "There is a very old historic building not far from here.",-,
+        "There is a very old historic building not far from here.",L_HistBuild,
         "I don't know, but will have a look around.",L_Close;
+
+L_HistBuild:
     set Zeny, Zeny + @sightseeing_money;
     getexp @sightseeing_exp, 0;
     set @state, 5;
@@ -169,19 +183,25 @@ L_SightSeeing: // @state == 4 and logged out sometime between getting to that st
     mes "\"This sounds interesting. Please tell me the way.\"";
     mes "You tell him how to get to the historic building.";
     next;
+    goto L_Food;
+
 L_Food: // @state == 5
     mes "[Kylian]";
     mes "\"While I'm out, I could also get something to eat. Maybe some typical dish for this region. Do you have a good suggestion for that?\"";
     if (@bernard < 4) // didn't yet help Bernard to make his soup
         goto L_Close;
     menu
-        "Bernard on the bazaar makes a great soup.",-,
+        "Bernard on the bazaar makes a great soup.",L_SoupBer,
         "No idea, I'll try to find out.",L_Close;
+
+L_SoupBer:
     set Zeny, Zeny + @food_money;
     getexp @food_exp, 0;
     set @state, 6;
     callsub S_Update_Mask;
     set @KylianNTSightSeeing, 1;
+    goto L_SightSeeingDone;
+
 L_SightSeeingDone:
     mes "[Kylian]";
     mes "\"I'm going to see the historic building you told me about and try this local soup on the bazaar. Thank you for the suggestions.\"";
@@ -195,8 +215,10 @@ L_Casino: // @state == 6 and logged out sometime between getting to that state a
     if (!(QUEST_NorthTulimshar & $@knowCasinoNT))
         goto L_Close;
     menu
-        "Of course! The casino!",-,
+        "Of course! The casino!",L_CasinoFound,
         "Not really.",L_Close;
+
+L_CasineFound:
     set Zeny, Zeny + @casino_money;
     getexp @casino_exp, 0;
     set @state, 7;
@@ -205,14 +227,18 @@ L_Casino: // @state == 6 and logged out sometime between getting to that state a
     mes "\"Oh, there's a casino in this city? That's a wonderful thing. Where can I find it?\"";
     mes "You explain how to get to the casino.";
     next;
+    goto L_Clothes;
+
 L_Clothes: // @state == 7
     mes "[Kylian]";
     mes "\"I should get proper clothing before I go to the casino tonight. Do you know a reputable shop where clothing of high quality is sold?\"";
     if (!(QUEST_NorthTulimshar & $@knowLatoyNT))
         goto L_Close;
     menu
-        "At the market near the harbor district...",-,
+        "At the market near the harbor district...",L_HarborDistrict,
         "Mh, I don't know.",L_Close;
+
+L_HarborDistrict:
     set Zeny, Zeny + @clothes_money;
     getexp @clothes_exp, 0;
     set @state, 8;
@@ -241,6 +267,7 @@ L_DesertHat: // @state == 8
     set @state, 9;
     callsub S_Update_Mask;
     next;
+    goto L_Done;
 
 L_Done:
     mes "[Kylian]";
diff --git a/world/map/npc/021-2/yanis.txt b/world/map/npc/021-2/yanis.txt
index 384c6d92..bde24ec3 100644
--- a/world/map/npc/021-2/yanis.txt
+++ b/world/map/npc/021-2/yanis.txt
@@ -13,8 +13,10 @@
         menu
             "Nothing right now.",L_BeforeClose;
     menu
-        "Imec asked me to bring this petition.",-,
+        "Imec asked me to bring this petition.",L_Next,
         "Nothing right now.",L_BeforeClose;
+
+L_Next:
     mes "[Yanis]";
     mes "\"Imec? I see. Give it to me.\"";
     mes "Yanis has a disapproving look on his face. He takes the letter and writes something on another paper.";