Clean up main scripts

1 files changed, 45 insertions, 16 deletions

diff --git a/world/map/npc/007-1/voltain.txt b/world/map/npc/007-1/voltain.txt
index 659e9d7c..c05be549 100644
--- a/world/map/npc/007-1/voltain.txt
+++ b/world/map/npc/007-1/voltain.txt
@@ -81,21 +81,25 @@
     if ($@VOLTAIN_state == 12) goto state12;
     if ($@VOLTAIN_state == 13) goto state13;
 //    default: trap through to state0!
+    goto state0;
 
 state0:
     mes "[Voltain]";
     mes "\"What are you doing bothering me? Can't you see I'm busy! Oh, I'm sorry, I thought you were my assistant. Never mind that... would you care to help me?\"";
     next;
     menu
-        "Sure I do!", -,
+        "Sure I do!", L_Next,
         "No, you creep me out.", L_NOHELP;
+
+L_Next:
     mes "[Voltain]";
     mes "\"I'm working on a very special potion. I need some empty bottles to keep the ingredients in. Care to go find me " + @BOTTLE_NEEDED + " empty bottles?!\"";
     next;
     menu
-        "I've got the bottles.", -,
+        "I've got the bottles.", L_Next1,
         "I don't feel like helping you get garbage...", L_Close;
 
+L_Next1:
     if (countitem("EmptyBottle") < @BOTTLE_NEEDED)
         goto L_NOT_ENOUGH;
     delitem "EmptyBottle", @BOTTLE_NEEDED;
@@ -111,8 +115,10 @@ mes "\"I'm making a potion that requires lots of venom. I'm in need of " + @BLAC
 next;
 
 menu
-    "I've got the stingers!", -,
+    "I've got the stingers!", L_Next2,
     "I'll go search for them.", L_Close;
+
+L_Next2:
     mes "[Voltain]";
     if (countitem("BlackScorpionStinger") < @BLACK_SC_ST_NEEDED)
         goto L_NOT_ENOUGH;
@@ -123,14 +129,15 @@ menu
     mes "\"Well, since you went to the trouble of getting me these here's a little something for your time...\"";
     goto L_Close;
 
-
 state2:
     mes "[Voltain]";
     mes "\"Care to to help me with my potion? I need " + @BUGLEG_NEEDED + " bug legs so that I can thicken the potion.\"";
     next;
     menu
-        "I've got the bug legs.", -,
+        "I've got the bug legs.", L_Next3,
         "I'd rather not carry around dead bugs for you.", L_NOHELP ;
+
+L_Next3:
     mes "[Voltain]";
     if (countitem("BugLeg") < @BUGLEG_NEEDED)
         goto L_NOT_ENOUGH;
@@ -146,8 +153,10 @@ state3:
     mes "\"I find myself in need of a black scorpion stinger... Damn mouboo are hard to kill...forget you heard that.\"";
     next;
     menu
-        "Here's the stinger.", -,
+        "Here's the stinger.", L_Next4,
         "I DID HEAR THAT! I will not help you KILL mouboo!", L_Close;
+
+L_Next4:
     mes "[Voltain]";
     if (countitem("BlackScorpionStinger") < 1)
         goto L_NOT_ENOUGH;
@@ -162,8 +171,10 @@ state4:
     mes "\"I need to thicken a veno.. Oh, a potion actually. I want to try mauve herbs for that, so can you bring me " + @HERBS_NEEDED + ", please?\"";
     next;
     menu
-        "Here are the herbs.", -,
+        "Here are the herbs.", L_Next5,
         "So you want to do a venom? I will not help you!", L_Close;
+
+L_Next5:
     mes "[Voltain]";
     if (countitem("MauveHerb") < @HERBS_NEEDED)
         goto L_NOT_ENOUGH;
@@ -179,8 +190,10 @@ state5:
     mes "\"Hello I am looking for " + @RAWLOG_NEEDED + " raw logs, maybe you could help me getting some? I want to try to build a mouboo trap.. Uhm actually no! I want to build a device to destroy these traps. So can you help me?\"";
     next;
     menu
-        "Here are the raw logs.", -,
+        "Here are the raw logs.", L_Next6,
         "So you want build traps for mouboos? NO WAY!", L_Close;
+
+L_Next6:
     mes "[Voltain]";
     if (countitem("RawLog") < @RAWLOG_NEEDED)
         goto L_NOT_ENOUGH;
@@ -196,8 +209,10 @@ state6:
     mes "\"Hello I am looking for " + @REDAPPLE_NEEDED + " red apples, maybe I can inject some venoms.. DOH not this again! Of course I meant a strength potion. Did you hear about the new potions from Caul? He is a pretty good alchimist. He can do strength potions, can't he?\"";
     next;
     menu
-        "Here are the red apples.", -,
+        "Here are the red apples.", L_Next7,
         "I am not sure...", L_Close;
+
+L_Next7:
     mes "[Voltain]";
     if (countitem("RedApple") < @REDAPPLE_NEEDED)
         goto L_NOT_ENOUGH;
@@ -213,8 +228,10 @@ state7:
     mes "\"I need to thicken a veno.. Oh, a potion actually. Cobalt herbs might be good for that, so can you bring me " + @HERBS_NEEDED + ", please?\"";
     next;
     menu
-        "Here are the herbs.", -,
+        "Here are the herbs.", L_Next8,
         "So you want to do a venom? I will not help you!", L_Close;
+
+L_Next8:
     mes "[Voltain]";
     if (countitem("CobaltHerb") < @HERBS_NEEDED)
         goto L_NOT_ENOUGH;
@@ -230,8 +247,10 @@ state8:
     mes "\"I am in need of snake tongues. They can help me getting very strong venom extracts. So I would like you to bring me " + @SNAKETONGUE_NEEDED + " snake tongues.\"";
     next;
     menu
-        "Sure, here you go!", -,
+        "Sure, here you go!", L_Next9,
         "Maybe you will find someone else, I got stuff to do on my own!", L_Close;
+
+L_Next9:
     mes "[Voltain]";
     if (countitem("SnakeTongue") < @SNAKETONGUE_NEEDED)
         goto L_NOT_ENOUGH;
@@ -247,8 +266,10 @@ state9:
     mes "\"I need to thicken a veno.. Oh, a potion actually. I want to try alizarin herbs for that, so can you bring me " + @HERBS_NEEDED + ", please?\"";
     next;
     menu
-        "Here are the herbs.", -,
+        "Here are the herbs.", L_Next10,
         "So you want to do a venom? I will not help you!", L_Close;
+
+L_Next10:
     mes "[Voltain]";
     if (countitem("AlizarinHerb") < @HERBS_NEEDED)
         goto L_NOT_ENOUGH;
@@ -266,8 +287,10 @@ state10:
     mes "\"Oh, I just wonder if I can inject some ven... Forget about that! Bring me " + @STEAK_NEEDED + " steaks!\"";
     next;
     menu
-        "Here you go.", -,
+        "Here you go.", L_Next11,
         "Help yourself! In the Hurnscald Inn you can get some meals for sure!", L_Close;
+
+L_Next11:
     mes "[Voltain]";
     if (countitem("Steak") < @STEAK_NEEDED)
         goto L_NOT_ENOUGH;
@@ -284,8 +307,10 @@ state11:
     next;
     mes "\"Acually I wonder if I can use these arrows for building a mouboo trap.... Oh wait! I need some " + @ARROW_NEEDED + " arrows for my self defence right? So do not talk about it!\"";
     menu
-        "Here you go.", -,
+        "Here you go.", L_Next12,
         "Sorry I don't have arrows here!", L_Close;
+
+L_Next12:
     mes "[Voltain]";
     if (countitem("Arrow") < @ARROW_NEEDED)
         goto L_NOT_ENOUGH;
@@ -301,8 +326,10 @@ state12:
     mes "\"I need to thicken a veno.. Oh, a potion actually. I want to try gamboge herbs for that, so can you bring me " + @HERBS_NEEDED + ", please?\"";
     next;
     menu
-        "Here are the herbs.", -,
+        "Here are the herbs.", L_Next13,
         "So you want to do a venom? I will not help you!", L_Close;
+
+L_Next13:
     mes "[Voltain]";
     if (countitem("GambogeHerb") < @HERBS_NEEDED)
         goto L_NOT_ENOUGH;
@@ -318,8 +345,10 @@ state13:
     mes "\"Doing so many ev- good things makes me hungry. I feel in the mood for a Chocolate Cake. Can you bring me " + @CHOCOLATECAKE_NEEDED + ",  please? \"";
     next;
     menu
-        "Here it is.", -,
+        "Here it is.", L_Next14,
         "I don't feel in the mood to bring you a cake.", L_Close;
+
+L_Next14:
     mes "[Voltain]";
     if (countitem("ChocolateCake") < @CHOCOLATECAKE_NEEDED)
         goto L_NOT_ENOUGH;