Clean up main scripts

3 files changed, 67 insertions, 17 deletions

diff --git a/world/map/npc/025-4/battlecaves.txt b/world/map/npc/025-4/battlecaves.txt
index b3d69f3b..18f32602 100644
--- a/world/map/npc/025-4/battlecaves.txt
+++ b/world/map/npc/025-4/battlecaves.txt
@@ -12,6 +12,7 @@
         goto L_Cheat;
     if ($@battlecave1 == 1)
         goto L_Start;
+    goto L_Cheat;
 
 L_Cheat:
     message strcharinfo(0), "You shouldn't be here, you cheater.";
@@ -20,14 +21,17 @@ L_Cheat:
 
 L_Start:
     menu
-        "Place a root at the center of the energy source.", -,
+        "Place a root at the center of the energy source.", L_PlaceCenter,
         "I am not prepared yet!", L_Close;
+
+L_PlaceCenter:
     if ((countitem("Root")<1))
         goto L_no_root;
     close2;
     delitem "Root", 1;
     message strcharinfo(0), "As you place the root on the energy source, earth monsters seem to emerge from the ground.";
     set $@battlecave1, 2;
+    goto L_Summon;
 
 L_Summon:
     set $@cave1_loop, $@cave1_loop + 1;
@@ -100,6 +104,7 @@ L_Done:
         goto L_Cheat;
     if ($@battlecave2 == 1)
         goto L_Start;
+    goto L_Cheat;
 
 L_Cheat:
     message strcharinfo(0), "You shouldn't be here, you cheater.";
@@ -108,14 +113,17 @@ L_Cheat:
 
 L_Start:
     menu
-        "Place a root at the center of the energy source.", -,
+        "Place a root at the center of the energy source.", L_PlaceCenter,
         "I am not prepared yet!", L_Close;
+
+L_PlaceCenter:
     if ((countitem("Root")<1))
         goto L_no_root;
     close2;
     delitem "Root", 1;
     message strcharinfo(0), "As you place the root on the energy source, earth monsters seem to emerge from the ground.";
     set $@battlecave2, 2;
+    goto L_Summon;
 
 L_Summon:
     set $@cave2_loop, $@cave2_loop + 1;
@@ -186,6 +194,7 @@ L_Done:
         goto L_Cheat;
     if ($@battlecave3 == 1)
         goto L_Start;
+    goto L_Cheat;
 
 L_Cheat:
     message strcharinfo(0), "You shouldn't be here, you cheater.";
@@ -194,14 +203,17 @@ L_Cheat:
 
 L_Start:
     menu
-        "Place a root at the center of the energy source.", -,
+        "Place a root at the center of the energy source.", L_PlaceCenter,
         "I am not prepared yet!", L_Close;
+
+L_PlaceCenter:
     if ((countitem("Root")<1))
         goto L_no_root;
     close2;
     delitem "Root", 1;
     message strcharinfo(0), "As you place the root on the energy source, earth monsters seem to emerge from the ground.";
     set $@battlecave3, 2;
+    goto L_Summon;
 
 L_Summon:
     set $@cave3_loop, $@cave3_loop + 1;
@@ -273,6 +285,7 @@ L_Done:
         goto L_Cheat;
     if ($@battlecave4 == 1)
         goto L_Start;
+    goto L_Cheat;
 
 L_Cheat:
     message strcharinfo(0), "You shouldn't be here, you cheater.";
@@ -281,14 +294,17 @@ L_Cheat:
 
 L_Start:
     menu
-        "Place a root at the center of the energy source.", -,
+        "Place a root at the center of the energy source.", L_PlaceCenter,
         "I am not prepared yet!", L_Close;
+
+L_PlaceCenter:
     if ((countitem("Root")<1))
         goto L_no_root;
     close2;
     delitem "Root", 1;
     message strcharinfo(0), "As you place the root on the energy source, earth monsters seem to emerge from the ground.";
     set $@battlecave4, 2;
+    goto L_Summon;
 
 L_Summon:
     set $@cave4_loop, $@cave4_loop + 1;
@@ -363,6 +379,7 @@ L_Done:
         goto L_Cheat;
     if ($@battlecave5 == 1)
         goto L_Start;
+    goto L_Cheat;
 
 L_Cheat:
     message strcharinfo(0), "You shouldn't be here, you cheater.";
@@ -371,14 +388,17 @@ L_Cheat:
 
 L_Start:
     menu
-        "Place a root at the center of the energy source.", -,
+        "Place a root at the center of the energy source.", L_PlaceCenter,
         "I am not prepared yet!", L_Close;
+
+L_PlaceCenter:
     if ((countitem("Root")<1))
         goto L_no_root;
     close2;
     delitem "Root", 1;
     message strcharinfo(0), "As you place the root on the energy source, earth monsters seem to emerge from the ground.";
     set $@battlecave5, 2;
+    goto L_Summon;
 
 L_Summon:
     set $@cave5_loop, $@cave5_loop + 1;
@@ -453,6 +473,7 @@ L_Done:
         goto L_Cheat;
     if ($@battlecave6 == 1)
         goto L_Start;
+    goto L_Cheat;
 
 L_Cheat:
     message strcharinfo(0), "You shouldn't be here, you cheater.";
@@ -461,14 +482,17 @@ L_Cheat:
 
 L_Start:
     menu
-        "Place a root at the center of the energy source.", -,
+        "Place a root at the center of the energy source.", L_PlaceCenter,
         "I am not prepared yet!", L_Close;
+
+L_PlaceCenter:
     if ((countitem("Root")<1))
         goto L_no_root;
     close2;
     delitem "Root", 1;
     message strcharinfo(0), "As you place the root on the energy source, earth monsters seem to emerge from the ground.";
     set $@battlecave6, 2;
+    goto L_Summon;
 
 L_Summon:
     set $@cave6_loop, $@cave6_loop + 1;
@@ -543,6 +567,7 @@ L_Done:
         goto L_Cheat;
     if ($@battlecave7 == 1)
         goto L_Start;
+    goto L_Cheat;
 
 L_Cheat:
     message strcharinfo(0), "You shouldn't be here, you cheater.";
@@ -551,14 +576,17 @@ L_Cheat:
 
 L_Start:
     menu
-        "Place a root at the center of the energy source.", -,
+        "Place a root at the center of the energy source.", L_PlaceCenter,
         "I am not prepared yet!", L_Close;
+
+L_PlaceCenter:
     if ((countitem("Root")<1))
         goto L_no_root;
     close2;
     delitem "Root", 1;
     message strcharinfo(0), "As you place the root on the energy source, earth monsters seem to emerge from the ground.";
     set $@battlecave7, 2;
+    goto L_Summon;
 
 L_Summon:
     set $@cave7_loop, $@cave7_loop + 1;
@@ -635,6 +663,7 @@ L_Done:
         goto L_Cheat;
     if ($@battlecave8 == 1)
         goto L_Start;
+    goto L_Cheat;
 
 L_Cheat:
     message strcharinfo(0), "You shouldn't be here, you cheater.";
@@ -643,14 +672,17 @@ L_Cheat:
 
 L_Start:
     menu
-        "Place a root at the center of the energy source.", -,
+        "Place a root at the center of the energy source.", L_PlaceCenter,
         "I am not prepared yet!", L_Close;
+
+L_PlaceCenter:
     if ((countitem("Root")<1))
         goto L_no_root;
     close2;
     delitem "Root", 1;
     message strcharinfo(0), "As you place the root on the energy source, earth monsters seem to emerge from the ground.";
     set $@battlecave8, 2;
+    goto L_Summon;
 
 L_Summon:
     set $@cave8_loop, $@cave8_loop + 1;
@@ -727,6 +759,7 @@ L_Done:
         goto L_Cheat;
     if ($@battlecave9 == 1)
         goto L_Start;
+    goto L_Cheat;
 
 L_Cheat:
     message strcharinfo(0), "You shouldn't be here, you cheater.";
@@ -735,14 +768,17 @@ L_Cheat:
 
 L_Start:
     menu
-        "Place a root at the center of the energy source.", -,
+        "Place a root at the center of the energy source.", L_PlaceCenter,
         "I am not prepared yet!", L_Close;
+
+L_PlaceCenter:
     if ((countitem("Root")<1))
         goto L_no_root;
     close2;
     delitem "Root", 1;
     message strcharinfo(0), "As you place the root on the energy source, earth monsters seem to emerge from the ground.";
     set $@battlecave9, 2;
+    goto L_Summon;
 
 L_Summon:
     set $@cave9_loop, $@cave9_loop + 1;
@@ -823,14 +859,17 @@ L_Done:
 
 L_Start:
     menu
-        "Place a root at the center of the energy source.", -,
+        "Place a root at the center of the energy source.", L_PlaceCenter,
         "I am not prepared yet!", L_Close;
+
+L_PlaceCenter:
     if ((countitem("Root")<1))
         goto L_no_root;
     close2;
     delitem "Root", 1;
     message strcharinfo(0), "As you place the root on the energy source, earth monsters seem to emerge from the ground.";
     set $@battlecave10, 2;
+    goto L_Summon;
 
 L_Summon:
     set $@cave10_loop, $@cave10_loop + 1;
diff --git a/world/map/npc/025-4/clauquer.txt b/world/map/npc/025-4/clauquer.txt
index 71a3dd4f..24861f4e 100644
--- a/world/map/npc/025-4/clauquer.txt
+++ b/world/map/npc/025-4/clauquer.txt
@@ -6,6 +6,7 @@
     if (Rossy_Quest == 15) goto L_Hmmm;
     if (Rossy_Quest == 14) goto L_Help;
     if (Rossy_Quest <= 13) goto L_Huh;
+    goto L_Help;
 
 L_Help:
     mes "[Clauquer]";
@@ -14,18 +15,24 @@ L_Help:
     mes "\"Don't answer, I know you are looking for someone... A little girl, is that right?\"";
     next;
     menu
-        "I must admit you're right, but how come you...", -,
+        "I must admit you're right, but how come you...", L_LittleGirl,
         "I'm not lost and I don't need help, bye.", L_No;
+
+L_LittleGirl:
     mes "[Clauquer]";
     mes "\"How do I know you're looking for her? Well, because I am a very good observer. I know you were helping her family. Besides, I saw the little girl. I also heard her. She screamed, and probably still screams like hell. Moreover, I don't think you would enter these caves just for fun!\"";
     next;
     menu
-        "Of course not.", -;
+        "Of course not.", L_Next;
+
+L_Next:
     mes "[Clauquer]";
     mes "\"I can see that you really want to save the little girl. She is trapped in a place inside one of these caves, protected by a magic barrier created by a fey spirit. To save her, you have to annulate the energy sources of this barrier. They are located in 10 different spots, each one in a different cave.\"";
     next;
     menu
-        "But how can I annulate this barrier?", -;
+        "But how can I annulate this barrier?", L_ButBarrier;
+
+L_ButBarrier:
     mes "\"It is simple, you just have to place a root on the exact center of the energy source. Once you do this, its entire power will transmute into some terrible earth monsters. If you defeat them, this source of energy will be close to nothing and the barrier will be weaker.\"";
     next;
     mes "\"If my observations are correct, the girl is trapped in a cave protected by a barrier fed by 9 different power sources. And inside this cave, there is another barrier, fed by a single, but very strong, power source. The girl is inside that cave, protected by that strong barrier.\"";
@@ -35,7 +42,7 @@ L_Help:
     mes "\"Now I should tell you more about how that little girl got into that cave and warn you about what you are going to face there...\"";
     next;
     menu
-        "Please go on.", -;
+        "Please go on.", L_Advice;
 
 L_Advice:
     mes "[Clauquer]";
@@ -81,10 +88,11 @@ L_Hmmm:
     mes "\"You already know everything about these caves. You don't need me anymore to find the little girl.\"";
     next;
     menu
-        "But please, I really need your help!", -,
+        "But please, I really need your help!", L_NeedYourHelp,
         "Oh, so many caves! Do you know how many are still left?", L_Feedback,
         "You're right, I don't need your help!", L_No;
-    next;
+
+L_NeedYourHelp:
     mes "\"Ok, if you insist... But I can only repeat what I already said.\"";
     goto L_Advice;
 
diff --git a/world/map/npc/025-4/julia.txt b/world/map/npc/025-4/julia.txt
index 1f8671b1..6a93285b 100644
--- a/world/map/npc/025-4/julia.txt
+++ b/world/map/npc/025-4/julia.txt
@@ -7,13 +7,16 @@
     if (Rossy_Quest > 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_End;
     if (Rossy_Quest == 16) goto L_Done;
     if (Rossy_Quest <= 15) goto L_Hmmm;
+    goto L_Done;
 
 L_Done:
     mes "[Julia]";
     mes "\"I heard some battle noises a few minutes ago. Are you here to save me?\"";
     next;
     menu
-        "Of course I'm here to save you, Rossy sent me here!", -;
+        "Of course I'm here to save you, Rossy sent me here!", L_Next;
+
+L_Next:
     mes "\"Rossy? My twin sister? I knew she was going to look for me. Thank you so much, here is a present for you.\"";
     getinventorylist;
     if (@inventorylist_count == 100)