Clean up main scripts

1 files changed, 21 insertions, 11 deletions

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;