Fixes a bug that allows the player to access the battle menu after starting it.

3 files changed, 11 insertions, 2 deletions

diff --git a/npc/025-1/barrier.txt b/npc/025-1/barrier.txt
index 61a9bc5f..df5ffc2a 100644
--- a/npc/025-1/barrier.txt
+++ b/npc/025-1/barrier.txt
@@ -1,5 +1,5 @@
 //
-025-1.gat,42,79,0	script	#JuliaBarrier	127,1,1,{
+025-1.gat,42,79,0	script	#JuliaBarrier	45,1,1,{
   if (Rossy_Quest <= 13) goto L_Block;
   if (@Alrd_Been != 1 && Rossy_Quest == 14) message strcharinfo(0), "You hear distant screams of fear.";
   set @Alrd_Been, 1;
diff --git a/npc/025-3/barriers.txt b/npc/025-3/barriers.txt
index 68644eb4..46048298 100644
--- a/npc/025-3/barriers.txt
+++ b/npc/025-3/barriers.txt
@@ -895,7 +895,6 @@ L_AlreadyClean:
 
 L_Hurt:
     message strcharinfo(0), "As you try to enter, you bump into a magic barrier. Its force pushes you back, hurting you badly.";
-    message strcharinfo(0), @barrier_force;
     percentheal @barrier_force * 10, 0;
     warp "025-3.gat", 77, 164;
     end;
diff --git a/npc/025-4/battlecaves.txt b/npc/025-4/battlecaves.txt
index 3f169743..e92d0012 100644
--- a/npc/025-4/battlecaves.txt
+++ b/npc/025-4/battlecaves.txt
@@ -1,6 +1,7 @@
 // ---------------------------------    Cave 1    -----------------------------------
 
 025-4.gat,41,91,0	script	#StartCaveFight1	324,{
+    if ($@wave_cave1 != 0) end;
     if (Rossy_Quest < 15) goto L_Cheat;
     if ($@battlecave1 == 1) goto L_Start;
     end;
@@ -100,6 +101,7 @@ L_Done:
 
 
 025-4.gat,110,90,0	script	#StartCaveFight2	324,{
+    if ($@wave_cave2 != 0) end;
     if (Rossy_Quest < 15) goto L_Cheat;
     if ($@battlecave2 == 1) goto L_Start;
     end;
@@ -198,6 +200,7 @@ L_Done:
 
 // ------------------------------------    Cave 3    --------------------------------------
 025-4.gat,168,111,0	script	#StartCaveFight3	324,{
+    if ($@wave_cave3 != 0) end;
     if (Rossy_Quest < 15) goto L_Cheat;
     if ($@battlecave3 == 1) goto L_Start;
     end;
@@ -296,6 +299,7 @@ L_Done:
 
 // ---------------------------    Cave 4    --------------------------------
 025-4.gat,32,150,0	script	#StartCaveFight4	324,{
+    if ($@wave_cave4 != 0) end;
     if (Rossy_Quest < 15) goto L_Cheat;
     if ($@battlecave4 == 1) goto L_Start;
     end;
@@ -394,6 +398,7 @@ L_Done:
 // ----------------------------    Cave 5    ------------------------------
 
 025-4.gat,100,154,0	script	#StartCaveFight5	324,{
+    if ($@wave_cave5 != 0) end;
     if (Rossy_Quest < 15) goto L_Cheat;
     if ($@battlecave5 == 1) goto L_Start;
     end;
@@ -492,6 +497,7 @@ L_Done:
 // --------------------------------    Cave 6    -----------------------------------------
 
 025-4.gat,159,168,0	script	#StartCaveFight6	324,{
+    if ($@wave_cave6 != 0) end;
     if (Rossy_Quest < 15) goto L_Cheat;
     if ($@battlecave6 == 1) goto L_Start;
     end;
@@ -590,6 +596,7 @@ L_Done:
 // --------------------------------    Cave 7    -----------------------------------
 
 025-4.gat,39,215,0	script	#StartCaveFight7	324,{
+    if ($@wave_cave7 != 0) end;
     if (Rossy_Quest < 15) goto L_Cheat;
     if ($@battlecave7 == 1) goto L_Start;
     end;
@@ -689,6 +696,7 @@ L_Done:
 // ---------------------------    Cave 8    -------------------------------
 
 025-4.gat,105,210,0	script	#StartCaveFight8	324,{
+    if ($@wave_cave8 != 0) end;
     if (Rossy_Quest < 15) goto L_Cheat;
     if ($@battlecave8 == 1) goto L_Start;
     end;
@@ -788,6 +796,7 @@ L_Done:
 // ---------------------------    Cave 9    -------------------------------
 
 025-4.gat,157,220,0	script	#StartCaveFight9	324,{
+    if ($@wave_cave9 != 0) end;
     if (Rossy_Quest < 15) goto L_Cheat;
     if ($@battlecave9 == 1) goto L_Start;
     end;
@@ -886,6 +895,7 @@ L_Done:
 // ---------------------  Boss Cave  ----------------------------
 
 025-4.gat,157,42,0	script	#StartBossCaveFight	324,{
+    if ($@wave_cave10 != 0) end;
     if (Rossy_Quest >= 16) end;
     if ($@battlebosscave == 1 && cavefights & BATTLE_CAVE1 && cavefights & BATTLE_CAVE2 && cavefights & BATTLE_CAVE3 && cavefights & BATTLE_CAVE4 && cavefights & BATTLE_CAVE5 && cavefights & BATTLE_CAVE6 && cavefights & BATTLE_CAVE7 && cavefights & BATTLE_CAVE8 && cavefights & BATTLE_CAVE9 && Rossy_Quest == 15) goto L_Start;
     message strcharinfo(0), "You shouldn't be here, you cheater.";