Clean up main scripts

14 files changed, 96 insertions, 40 deletions

diff --git a/world/map/npc/048-2/bluesageConfig.txt b/world/map/npc/048-2/bluesageConfig.txt
index cb237441..58c8e27b 100644
--- a/world/map/npc/048-2/bluesageConfig.txt
+++ b/world/map/npc/048-2/bluesageConfig.txt
@@ -53,6 +53,8 @@
 
 -|script|#bluesageconfig|-1,
 {
+    end;
+
 OnInit:
     set $@Q_BlueSageMinimumLevel, 60;
 
@@ -92,6 +94,7 @@ OnInit:
     set $@BlueSageSlime4_Amount, 3;
     set $@BlueSageSlime5_Amount, 2;
     set $@BlueSageSlime6_Amount, 1;
+    end;
 }
 
 function|script|updateBlueSageBookPages|,
diff --git a/world/map/npc/048-2/helperAccused.txt b/world/map/npc/048-2/helperAccused.txt
index 995aa998..96a6060b 100644
--- a/world/map/npc/048-2/helperAccused.txt
+++ b/world/map/npc/048-2/helperAccused.txt
@@ -25,7 +25,9 @@
     menu
         "I'm just having a look around.",L_Close,
         "Sorry, I didn't mean to bother you.",L_Close,
-        "Why aren't you downstairs, helping everyone to clean up?",-;
+        "Why aren't you downstairs, helping everyone to clean up?",L_Next;
+
+L_Next:
     mes "[Peetu]";
     mes "\"I would! But I'm ... under preliminary suspension.\"";
     mes "He looks close to tears.";
@@ -35,16 +37,20 @@
     next;
     mes "He seems to be having a nervous breakdown, as he latches onto you and starts sobbing on your shoulder.";
     menu
-        "(Try to console him)",-,
-        "(Shake him and tell him to pull himself together)",-,
+        "(Try to console him)",L_More,
+        "(Shake him and tell him to pull himself together)",L_More,
         "(Push him away from you and leave.)",L_Close;
+
+L_More:
     mes "He calms down a bit.";
     mes "[Peetu]";
     mes "\"Uh. You're probably right. I'm very sorry. I'm just... You know, I wanted to become a scholar of the sages, studying and... Oh, how could I mess that up? Did you see the library? It caused so much damage! What else should they do other than kick me out?\"";
     menu
-        "Maybe you should talk to your chief about that?",-,
-        "It doesn't make much sense to draw overhasty conclusions.",-,
-        "Do you have a clue about what went wrong?",-;
+        "Maybe you should talk to your chief about that?",L_Less,
+        "It doesn't make much sense to draw overhasty conclusions.",L_Less,
+        "Do you have a clue about what went wrong?",L_Less;
+
+L_Less:
     mes "[Peetu]";
     mes "\"Well... but... I mean... I don't know... ";
     mes "I have an idea! Would you... ahm, would you talk to Chief Oskari for me? And ask him what he plans to do about me? I... I just don't feel capable of doing that myself right now. I'll try to pull myself together in the meanwhile.\"";
@@ -62,14 +68,18 @@ L_Query:
     mes "[Peetu]";
     mes "\"Did you talk to Chief Oskari?\"";
     menu
-        "Yes, and he doesn't plan to fire you.",-,
+        "Yes, and he doesn't plan to fire you.",L_Continue,
         "Not yet.",L_Close;
+
+L_Continue:
     mes "You tell Peetu that Chief Oskari has a good opinion of him and explain your task to find out what exactly happened.";
     next;
     mes "[Peetu]";
     mes "\"Alright, I understand. You see, I'm very confused too, because I usually pay a lot of attention to my work. Especially when doing something as delicate as sealing away the slimes for the night.\"";
     menu
-        "Can you describe to me what exactly you did?",-;
+        "Can you describe to me what exactly you did?",L_TextWall;
+
+L_TextWall:
     mes "[Peetu]";
     mes "\"Well, ok, sure. So, as you know we're doing some research on the nature of slimes, their connection to minerals and gemstones, their breeding behaviour, and, well, ahm, doing some magical experiments to analyze their reactions to different kinds of magic.";
     mes "These experiments caused some ... mutations, and the Blue and White Slimes developed some behaviour different from the slimes of other colors, making them more dangerous.\"";
@@ -109,8 +119,10 @@ L_Investigate:
     if (@inventorylist_count == 100)
         goto L_TooMany;
     menu
-        "Yes, I have already talked with Chief Oskari.",-,
+        "Yes, I have already talked with Chief Oskari.",L_ReallyMore,
         "Not yet.",L_Close;
+
+L_ReallyMore:
     mes "You explain your gained insights to Peetu and what conclusions Chief Oskari drew.";
     mes "[Peetu]";
     mes "\"Oh, I'm so relieved!";
diff --git a/world/map/npc/048-2/helperBookpages1.txt b/world/map/npc/048-2/helperBookpages1.txt
index 1890be61..5d64ff5d 100644
--- a/world/map/npc/048-2/helperBookpages1.txt
+++ b/world/map/npc/048-2/helperBookpages1.txt
@@ -24,7 +24,9 @@
         goto L_Close;
     menu
         "Good luck with that. See you in ten years or something.",L_Investigate,
-        "Can I help somehow?",-;
+        "Can I help somehow?",L_Next;
+
+L_Next:
     mes "[Ensio]";
     mes "\"Oh, would you? That'd be great! You see, the slimes ate most of the books and it is difficult to retrieve the bookpages.";
     mes "If you feel capable of this task, you could go out to hunt the Blue and White Slimes, to get the bookpages back from them.\"";
@@ -57,9 +59,10 @@ L_Almost:
 L_Progress:
     mes "\"Did you get some bookpages from the slimes?\"";
     menu
-        "Yes, have a look.",-,
+        "Yes, have a look.",L_Continue,
         "No.",L_Investigate;
 
+L_Continue:
     if (countitem("BookPage") < 1)
         goto L_NoItem;
     delitem "BookPage", 1;
diff --git a/world/map/npc/048-2/helperBookpages2.txt b/world/map/npc/048-2/helperBookpages2.txt
index 4eb44feb..a337dfd7 100644
--- a/world/map/npc/048-2/helperBookpages2.txt
+++ b/world/map/npc/048-2/helperBookpages2.txt
@@ -17,14 +17,18 @@
     mes "\"Oh, hey. Welcome to the library, or what's left of it.\"";
     mes "She sighs.";
     menu
-        "What are you doing?",-,
+        "What are you doing?",L_Next,
         "You seem to be busy. See you.",L_Close;
+
+L_Next:
     mes "[Henriikka]";
     mes "\"We're trying to repair the books by collecting the ripped out bookpages and sorting them and copying them for new books. It's a lot to do, and after being eaten by a slime they stink!";
     mes "And a lot of pages are missing, since most of the slimes escaped. I suppose we'll have to go out and hunt them once we're done here.\"";
     menu
-        "Maybe I can help with that?",-,
+        "Maybe I can help with that?",L_Collect,
         "Good luck.",L_Close;
+
+L_Collect:
     if (BaseLevel < $@Q_BlueSageMinimumLevel)
         goto L_Careful;
     mes "[Henriikka]";
diff --git a/world/map/npc/048-2/helperChief.txt b/world/map/npc/048-2/helperChief.txt
index 1f8de65f..9705e937 100644
--- a/world/map/npc/048-2/helperChief.txt
+++ b/world/map/npc/048-2/helperChief.txt
@@ -17,9 +17,10 @@
     if (@investigate == 0)
         goto L_Close;
     menu
-        "Peetu asked me to talk to you about his mishap.",-,
+        "Peetu asked me to talk to you about his mishap.",L_Next,
         "Ok, see you.",L_Close;
 
+L_Next:
     mes "You tell him about your conversation with Peetu, how he's blaming himself and his worries about losing his job.";
     next;
     mes "Oskari keeps silent for a moment after you finish, pondering. Then he talks to you.";
@@ -64,8 +65,10 @@ L_Investigate:
     mes "[Oskari]";
     mes "\"I think you revealed some important connections. I need to notify Nikolai and the other Sages.\"";
     menu
-        "I'm confused now.",-,
-        "What are you talking about?",-;
+        "I'm confused now.",L_Continue,
+        "What are you talking about?",L_Continue;
+
+L_Continue:
     mes "[Oskari]";
     mes "\"I'm sorry. I think you deserve an explanation. You see, the Sages of Kaizei are a circle of wise wizards who work together for the prosperity of this continent.";
     mes "Recently there was some conflict among the Sages which caused one of the members to leave the circle. It's all very unfortunate.";
@@ -84,8 +87,9 @@ L_GoodJob:
     mes "\"Thanks again for your investigations.\"";
     menu
         "You're welcome.",L_Close,
-        "Can you tell me something about the Sages?",-;
+        "Can you tell me something about the Sages?",L_MoreText;
 
+L_MoreText:
     mes "[Oskari]";
     mes "\"Oh, sure. I'm a bit busy right now, but you were a great help, so I think I can take a few minutes for you. What do you want to know?\"";
     menu
diff --git a/world/map/npc/048-2/helperCleaning1.txt b/world/map/npc/048-2/helperCleaning1.txt
index 2257cf49..58a2f684 100644
--- a/world/map/npc/048-2/helperCleaning1.txt
+++ b/world/map/npc/048-2/helperCleaning1.txt
@@ -18,8 +18,10 @@
     if (BaseLevel < $@Q_BlueSageMinimumLevel)
         goto L_Close;
     menu
-        "I can fight them.",-,
+        "I can fight them.",L_Next,
         "Ok, thanks for the warning.",L_Investigate;
+
+L_Next:
     mes "Pyry seems surprised.";
     mes "[Pyry]";
     mes "\"That... I didn't think about this possibility. But it'd be a great help!";
diff --git a/world/map/npc/048-2/helperCleaning5.txt b/world/map/npc/048-2/helperCleaning5.txt
index 6114f1d0..92cc1923 100644
--- a/world/map/npc/048-2/helperCleaning5.txt
+++ b/world/map/npc/048-2/helperCleaning5.txt
@@ -14,7 +14,9 @@
     mes "[Mirjami]";
     mes "\"Where is it? Everything's upside down. These terrible slimes.\"";
     menu
-        "What are you doing?",-;
+        "What are you doing?",L_Next;
+
+L_Next:
     mes "[Mirjami]";
     mes "\"Oh? I'm just searching for some cleaning supplies. They must be somewhere around here, but everything went upside down when the slimes escaped.\"";
     goto L_Investigate;
diff --git a/world/map/npc/048-2/helperJanitor.txt b/world/map/npc/048-2/helperJanitor.txt
index 42141f86..68466dbb 100644
--- a/world/map/npc/048-2/helperJanitor.txt
+++ b/world/map/npc/048-2/helperJanitor.txt
@@ -36,7 +36,9 @@ L_ShortHello:
     if ((@investigate != 2) && (@investigate != 5) && (@investigate != 8))
         goto L_Close;
     menu
-        "Can you tell me if there were any unusual visitors before the accident?",-;
+        "Can you tell me if there were any unusual visitors before the accident?",L_Next;
+
+L_Next:
     mes "[Elias]";
     mes "\"Mh, let me think. There were quite a few visitors with different concerns, but that's usual at this time of the year.";
     mes "One of them was a bit odd, he was wearing a mask and had a strange way of talking. He said he comes from Thermin, which is a mining town in the west. I figured his face might have gotten deformed in some mining accident, but I didn't ask, that would've been rude.";
diff --git a/world/map/npc/048-2/helperMInk.txt b/world/map/npc/048-2/helperMInk.txt
index 6ab6b391..0b101fb3 100644
--- a/world/map/npc/048-2/helperMInk.txt
+++ b/world/map/npc/048-2/helperMInk.txt
@@ -22,17 +22,20 @@
     if (BaseLevel < $@Q_BlueSageMinimumLevel)
         goto L_Close;
     menu
-        "What do you need?",-,
+        "What do you need?",L_Need,
         "Not my problem.",L_Investigate;
+
+L_Need:
     mes "[Eevert]";
     mes "\"I'm doing the covers and illustrations for the new books we create from the pieces of the old ones. But due to all of the chaos from when the slimes escaped, most of the phials of colored ink were broken. How am I supposed to do the illustrations without color?\"";
     next;
     mes "\"I think I'll need at least " + @water_amount + " Bottles of Water, " + @spectre_amount + " Spectre Powders, " + @poltergeist_amount + " Poltergeist Powders, " + @wisp_amount + " Wisp Powders and " + @ironpowder_amount + " Iron Powders to create new ink.\"";
     menu
-        "I have those with me!",-,
+        "I have those with me!",L_TurnIn,
         "I'll try to get those.",L_Close,
         "Too bad.",L_Investigate;
 
+L_TurnIn:
     if ((countitem("BottleOfWater") < @water_amount) || (countitem("SpectrePowder") < @spectre_amount) || (countitem("PoltergeistPowder") < @poltergeist_amount) || (countitem("WispPowder") < @wisp_amount) || (countitem("IronPowder") < @ironpowder_amount))
         goto L_NoItem;
     delitem "BottleOfWater", @water_amount;
diff --git a/world/map/npc/048-2/helperMReed.txt b/world/map/npc/048-2/helperMReed.txt
index 724bd463..7988d97a 100644
--- a/world/map/npc/048-2/helperMReed.txt
+++ b/world/map/npc/048-2/helperMReed.txt
@@ -15,15 +15,18 @@
     mes "[Kullervo]";
     mes "\"Oh no! What should we do now?\"";
     menu
-        "What's wrong?",-;
+        "What's wrong?",L_Foo;
+L_Foo:
     mes "[Kullervo]";
     mes "\"We're nearly out of paper. The new books require so much material... And it's not easy to get Reed Bundles to create new paper.\"";
     if (BaseLevel < $@Q_BlueSageMinimumLevel)
         goto L_Close;
     menu
-        "I have some.",-,
+        "I have some.",L_TurnIn,
         "I'll try to get some.",L_Close,
         "Too bad.",L_Investigate;
+
+L_TurnIn:
     if(countitem("ReedBundle") < @reed_amount)
         goto L_NoItem;
     delitem "ReedBundle", @reed_amount;
diff --git a/world/map/npc/048-2/helperMSilk.txt b/world/map/npc/048-2/helperMSilk.txt
index 67df87cb..cda5054c 100644
--- a/world/map/npc/048-2/helperMSilk.txt
+++ b/world/map/npc/048-2/helperMSilk.txt
@@ -22,9 +22,11 @@ L_Quest:
     mes "\"This is going to be difficult...";
     mes "Oh, hello. You don't have " + @silk_amount + " Silk Cocoons with you, do you? I need them for the book covers and binding of some of the more valuable books we're trying to recreate.\"";
     menu
-        "I have!",-,
+        "I have!",L_TurnIn,
         "I haven't, but I can try to get some.",L_Investigate,
         "No.",L_Investigate;
+
+L_TurnIn:
     if(countitem("SilkCocoon") < @silk_amount)
         goto L_NoItem;
     delitem "SilkCocoon", @silk_amount;
diff --git a/world/map/npc/048-2/helperMYetiClaw.txt b/world/map/npc/048-2/helperMYetiClaw.txt
index 59a86436..90b583a4 100644
--- a/world/map/npc/048-2/helperMYetiClaw.txt
+++ b/world/map/npc/048-2/helperMYetiClaw.txt
@@ -21,16 +21,20 @@ L_Quest:
     mes "[Santeri]";
     mes "\"Welcome. Are you an adventurer? I could use some help.\"";
     menu
-        "I am. What heroic action is needed?",-,
-        "How can I help?",-,
+        "I am. What heroic action is needed?",L_HeroicAction,
+        "How can I help?",L_HeroicAction,
         "I'm not interested.",L_Close;
+
+L_HeroicAction:
     mes "[Santeri]";
     mes "\"You see, we're working on repairing all of the damaged books and creating new ones for those that were lost.";
     mes "Therefore we need a lot of glue, but our supplies are nearly used up. I need " + @claw_amount + " Yeti Claws as ingredient to make new glue. Do you have that?\"";
     menu
-        "Yes, here you go.",-,
+        "Yes, here you go.",L_TurnIn,
         "I need to look in my storage.",L_Close,
         "No, sorry.",L_Investigate;
+
+L_TurnIn:
     if(countitem("YetiClaw") < @claw_amount)
         goto L_NoItem;
     delitem "YetiClaw", @claw_amount;
diff --git a/world/map/npc/048-2/sageNikolai.txt b/world/map/npc/048-2/sageNikolai.txt
index ed167bc1..9ce3e719 100644
--- a/world/map/npc/048-2/sageNikolai.txt
+++ b/world/map/npc/048-2/sageNikolai.txt
@@ -66,6 +66,7 @@ L_Hints:
     set @choice_idx[@choices_nr], @C_startBookpages;
     set @choice$[@choices_nr], "I heard the slimes ate most of the books...";
     set @choices_nr, @choices_nr + 1;
+    goto L_NoStartBookpages;
 
 L_NoStartBookpages:
     if ((@bookpages == 0) || (@bookpages == 31))
@@ -73,6 +74,7 @@ L_NoStartBookpages:
     set @choice_idx[@choices_nr], @C_bookpages;
     set @choice$[@choices_nr], "I'm collecting lost bookpages.";
     set @choices_nr, @choices_nr + 1;
+    goto L_NoBookpages;
 
 L_NoBookpages:
     if (@material > 0)
@@ -80,6 +82,7 @@ L_NoBookpages:
     set @choice_idx[@choices_nr], @C_startMaterials;
     set @choice$[@choices_nr], "There were many valuable books in your library, right?";
     set @choices_nr, @choices_nr + 1;
+    goto L_NoStartMaterials;
 
 L_NoStartMaterials:
     if ((@material == 0) || (@material == 15))
@@ -87,6 +90,7 @@ L_NoStartMaterials:
     set @choice_idx[@choices_nr], @C_materials;
     set @choice$[@choices_nr], "I brought some material to repair the books.";
     set @choices_nr, @choices_nr + 1;
+    goto L_NoMaterials;
 
 L_NoMaterials:
     if (@slimes > 0)
@@ -94,6 +98,7 @@ L_NoMaterials:
     set @choice_idx[@choices_nr], @C_startSlimes;
     set @choice$[@choices_nr], "Those slimes really caused a mess!";
     set @choices_nr, @choices_nr + 1;
+    goto L_NoStartSlimes;
 
 L_NoStartSlimes:
     if ((@slimes == 0) || (@slimes == 255))
@@ -101,6 +106,7 @@ L_NoStartSlimes:
     set @choice_idx[@choices_nr], @C_slimes;
     set @choice$[@choices_nr], "I'm hunting the remaining slimes in the library.";
     set @choices_nr, @choices_nr + 1;
+    goto L_NoSlimes;
 
 L_NoSlimes:
     if (@investigate > 0)
@@ -108,6 +114,7 @@ L_NoSlimes:
     set @choice_idx[@choices_nr], @C_startInvestigate;
     set @choice$[@choices_nr], "How did this all happen?";
     set @choices_nr, @choices_nr + 1;
+    goto L_NoStartInvestigate;
 
 L_NoStartInvestigate:
     if ((@investigate < 2) || (@investigate > 11))
@@ -115,6 +122,7 @@ L_NoStartInvestigate:
     set @choice_idx[@choices_nr], @C_investigate;
     set @choice$[@choices_nr], "I'm trying to find out how that accident could've happened.";
     set @choices_nr, @choices_nr + 1;
+    goto L_NoInvestigate;
 
 L_NoInvestigate:
     if (@investigate != 11)
@@ -122,23 +130,25 @@ L_NoInvestigate:
     set @choice_idx[@choices_nr], @C_investigate2;
     set @choice$[@choices_nr], "I told Chief Oskari what I found out about the accident.";
     set @choices_nr, @choices_nr + 1;
+    goto L_NoInvestigate2;
 
 L_NoInvestigate2:
     set @choice_idx[@choices_nr], @C_nevermind;
     set @choice$[@choices_nr], "Nevermind.";
 
     menu
-        @choice$[0],-,
-        @choice$[1],-,
-        @choice$[2],-,
-        @choice$[3],-,
-        @choice$[4],-,
-        @choice$[5],-,
-        @choice$[6],-,
-        @choice$[7],-,
-        @choice$[8],-,
-        @choice$[9],-;
-
+        @choice$[0],L_MenuChoice,
+        @choice$[1],L_MenuChoice,
+        @choice$[2],L_MenuChoice,
+        @choice$[3],L_MenuChoice,
+        @choice$[4],L_MenuChoice,
+        @choice$[5],L_MenuChoice,
+        @choice$[6],L_MenuChoice,
+        @choice$[7],L_MenuChoice,
+        @choice$[8],L_MenuChoice,
+        @choice$[9],L_MenuChoice;
+
+L_MenuChoice:
     set @menu, @menu - 1;
     if (@choice_idx[@menu] == 0)
         goto L_Close;
diff --git a/world/map/npc/048-2/visitors.txt b/world/map/npc/048-2/visitors.txt
index 1f0721c9..b4f69e0d 100644
--- a/world/map/npc/048-2/visitors.txt
+++ b/world/map/npc/048-2/visitors.txt
@@ -23,7 +23,9 @@ L_Close:
     mes "\"Hello young one. Did you also come here to see the library?\"";
     menu
         "Nah, I'm just having a look around.",L_Close,
-        "Yes!",-;
+        "Yes!", L_More;
+
+L_More:
     mes "[Parcival]";
     mes "\"That's very commendable. But you'll be disappointed, there is a huge problem and the library is all upside down.";
     mes "This is very annoying! I was planning this trip for months and now this!\"";