1 files changed, 49 insertions, 10 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;