Fix style (split for more readable diff)

2 files changed, 37 insertions, 39 deletions

diff --git a/world/map/npc/007-1/voltain.txt b/world/map/npc/007-1/voltain.txt
index c05be549..b164ef45 100644
--- a/world/map/npc/007-1/voltain.txt
+++ b/world/map/npc/007-1/voltain.txt
@@ -67,23 +67,23 @@
     set @CHOCOLATECAKE_REWARD_XP,  330;
     set @CHOCOLATECAKE_REWARD_GOLD,  180;
 
-    if ($@VOLTAIN_state == 1) goto state1;
-    if ($@VOLTAIN_state == 2) goto state2;
-    if ($@VOLTAIN_state == 3) goto state3;
-    if ($@VOLTAIN_state == 4) goto state4;
-    if ($@VOLTAIN_state == 5) goto state5;
-    if ($@VOLTAIN_state == 6) goto state6;
-    if ($@VOLTAIN_state == 7) goto state7;
-    if ($@VOLTAIN_state == 8) goto state8;
-    if ($@VOLTAIN_state == 9) goto state9;
-    if ($@VOLTAIN_state == 10) goto state10;
-    if ($@VOLTAIN_state == 11) goto state11;
-    if ($@VOLTAIN_state == 12) goto state12;
-    if ($@VOLTAIN_state == 13) goto state13;
-//    default: trap through to state0!
-    goto state0;
-
-state0:
+    if ($@VOLTAIN_state == 1) goto L_state1;
+    if ($@VOLTAIN_state == 2) goto L_state2;
+    if ($@VOLTAIN_state == 3) goto L_state3;
+    if ($@VOLTAIN_state == 4) goto L_state4;
+    if ($@VOLTAIN_state == 5) goto L_state5;
+    if ($@VOLTAIN_state == 6) goto L_state6;
+    if ($@VOLTAIN_state == 7) goto L_state7;
+    if ($@VOLTAIN_state == 8) goto L_state8;
+    if ($@VOLTAIN_state == 9) goto L_state9;
+    if ($@VOLTAIN_state == 10) goto L_state10;
+    if ($@VOLTAIN_state == 11) goto L_state11;
+    if ($@VOLTAIN_state == 12) goto L_state12;
+    if ($@VOLTAIN_state == 13) goto L_state13;
+//    default: trap through to L_state0!
+    goto L_state0;
+
+L_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;
@@ -109,14 +109,14 @@ L_Next1:
     mes "\"Thanks for the bottles. Much easier to carry liquid in them.\"";
     goto L_Close;
 
-state1:
-mes "[Voltain]";
-mes "\"I'm making a potion that requires lots of venom. I'm in need of " + @BLACK_SC_ST_NEEDED + " black scorpion stingers.\"";
-next;
+L_state1:
+    mes "[Voltain]";
+    mes "\"I'm making a potion that requires lots of venom. I'm in need of " + @BLACK_SC_ST_NEEDED + " black scorpion stingers.\"";
+    next;
 
-menu
-    "I've got the stingers!", L_Next2,
-    "I'll go search for them.", L_Close;
+    menu
+        "I've got the stingers!", L_Next2,
+        "I'll go search for them.", L_Close;
 
 L_Next2:
     mes "[Voltain]";
@@ -129,7 +129,7 @@ L_Next2:
     mes "\"Well, since you went to the trouble of getting me these here's a little something for your time...\"";
     goto L_Close;
 
-state2:
+L_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;
@@ -148,7 +148,7 @@ L_Next3:
     mes "\"Great! My potion is ready to poison the moub...I mean cure scorpion stings. \"";
     goto L_Close;
 
-state3:
+L_state3:
     mes "[Voltain]";
     mes "\"I find myself in need of a black scorpion stinger... Damn mouboo are hard to kill...forget you heard that.\"";
     next;
@@ -166,7 +166,7 @@ L_Next4:
     mes "\"Great! Now I can really kill that monster!\"";
     goto L_Close;
 
-state4:
+L_state4:
     mes "[Voltain]";
     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;
@@ -185,7 +185,7 @@ L_Next5:
     mes "\"Great! Now I can thicken the potion! I will try directly.\"";
     goto L_Close;
 
-state5:
+L_state5:
     mes "[Voltain]";
     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;
@@ -204,7 +204,7 @@ L_Next6:
     mes "\"Great! Now I can thicken the potion! I will try directly.\"";
     goto L_Close;
 
-state6:
+L_state6:
     mes "[Voltain]";
     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;
@@ -223,7 +223,7 @@ L_Next7:
     mes "\"Very well, this will be useful.\"";
     goto L_Close;
 
-state7:
+L_state7:
     mes "[Voltain]";
     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;
@@ -242,7 +242,7 @@ L_Next8:
     mes "\"Great! Now I can go on with the ven-  the experiments for the welfare of humanity, I mean.\"";
     goto L_Close;
 
-state8:
+L_state8:
     mes "[Voltain]";
     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;
@@ -261,7 +261,7 @@ L_Next9:
     mes "\"Excellent, now I can extract the venom to- uhm, nevermind. Thanks for your help.\"";
     goto L_Close;
 
-state9:
+L_state9:
     mes "[Voltain]";
     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;
@@ -280,7 +280,7 @@ L_Next10:
     mes "\"Great! Now I can thicken the potion! I will try directly.\"";
     goto L_Close;
 
-state10:
+L_state10:
     mes "[Voltain]";
     mes "\"Oh I am hungry. Maybe I can eat some steaks. Could you bring me a steak,  please?\"";
     next;
@@ -301,7 +301,7 @@ L_Next11:
     mes "\"Thanks a lot. I will really enjoy my meal.\"";
     goto L_Close;
 
-state11:
+L_state11:
     mes "[Voltain]";
     mes "\"Could I have some arrows please? I have lost my hunting equipment when I was in the caves. Some dark creatures were chasing me!\"";
     next;
@@ -321,7 +321,7 @@ L_Next12:
     mes "\"Thanks a lot. Now I feel more secure here in the outdoors.\"";
     goto L_Close;
 
-state12:
+L_state12:
     mes "[Voltain]";
     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;
@@ -340,7 +340,7 @@ L_Next13:
     mes "\"Great! Now I can thicken the potion! I will try directly.\"";
     goto L_Close;
 
-state13:
+L_state13:
     mes "[Voltain]";
     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;
diff --git a/world/map/npc/007-1/witch.txt b/world/map/npc/007-1/witch.txt
index f65bafb1..b98b27e2 100644
--- a/world/map/npc/007-1/witch.txt
+++ b/world/map/npc/007-1/witch.txt
@@ -942,9 +942,7 @@ L_Torch2:
 
 L_Torch1:
     enablenpc "#IlliaTorch1";
-
-return;
-
+    return;
 }
 
 007-1.gat,72,88,0|script|#IlliaTorch1|374,