Fixes a problem in the waves of the cavebattles, add a direct warp to julia if you already defeated the boss and change some messages.

2 files changed, 35 insertions, 29 deletions

diff --git a/npc/025-3/barriers.txt b/npc/025-3/barriers.txt
index 11d2255c..68644eb4 100644
--- a/npc/025-3/barriers.txt
+++ b/npc/025-3/barriers.txt
@@ -124,6 +124,10 @@ L_Wait:
     message strcharinfo(0), "Someone just got out of the cave, but it is still blocked. I should try to enter again.";
     end;
 
+L_AlreadyDone:
+    message strcharinfo(0), "I already defeated the monsters in this cave.";
+    end;
+
 L_AlreadyHelped:
     if (@juliadone2 == 1) end;
     message strcharinfo(0), "There are nothing more than dead monster corpses in this cave.";
@@ -871,18 +875,18 @@ L_AlreadyClean:
 // ----------------------------- Warp to Boss Cave -------------------------------
 
 025-3.gat,77,170,0	script	#WarpBossCave	45,1,1,{
-
-    if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped;
-    set @barrier_force, 0;
-    if (cavefights & ~BATTLE_CAVE1) set @barrier_force, @barrier_force - 1;
-    if (cavefights & ~BATTLE_CAVE2) set @barrier_force, @barrier_force - 1;
-    if (cavefights & ~BATTLE_CAVE3) set @barrier_force, @barrier_force - 1;
-    if (cavefights & ~BATTLE_CAVE4) set @barrier_force, @barrier_force - 1;
-    if (cavefights & ~BATTLE_CAVE5) set @barrier_force, @barrier_force - 1;
-    if (cavefights & ~BATTLE_CAVE6) set @barrier_force, @barrier_force - 1;
-    if (cavefights & ~BATTLE_CAVE7) set @barrier_force, @barrier_force - 1;
-    if (cavefights & ~BATTLE_CAVE8) set @barrier_force, @barrier_force - 1;
-    if (cavefights & ~BATTLE_CAVE9) set @barrier_force, @barrier_force - 1;
+    if (Rossy_Quest > 16 || FLAGS & FLAG_ROSSI_COMPLETED) end; 
+    if (Rossy_Quest == 16) goto L_AlreadyHelped;
+    set @barrier_force, -9;
+    if (cavefights & BATTLE_CAVE1) set @barrier_force, @barrier_force + 1;
+    if (cavefights & BATTLE_CAVE2) set @barrier_force, @barrier_force + 1;
+    if (cavefights & BATTLE_CAVE3) set @barrier_force, @barrier_force + 1;
+    if (cavefights & BATTLE_CAVE4) set @barrier_force, @barrier_force + 1;
+    if (cavefights & BATTLE_CAVE5) set @barrier_force, @barrier_force + 1;
+    if (cavefights & BATTLE_CAVE6) set @barrier_force, @barrier_force + 1;
+    if (cavefights & BATTLE_CAVE7) set @barrier_force, @barrier_force + 1;
+    if (cavefights & BATTLE_CAVE8) set @barrier_force, @barrier_force + 1;
+    if (cavefights & BATTLE_CAVE9) set @barrier_force, @barrier_force + 1;
     if (@barrier_force != 0) goto L_Hurt;
     if (getareausers("025-4.gat", 142, 24, 172, 48) >= 1) goto L_SomeoneInside;
     if ($@timercontrol10 != 0) goto L_Wait;
@@ -901,7 +905,7 @@ L_Wait:
     end;
 
 L_StartFight:
-    message strcharinfo(0), "You insert the nine tiny keys you collected but as you enter, you hear screams that seem to be very close.";
+    message strcharinfo(0), "You go through the magic barrier without problems... you can hear screams that seem to be very close.";
     set $@battlebosscave, 1;
     warp "025-4.gat", 157, 46;
     set $@cave10fighter$, strcharinfo(0);
@@ -915,9 +919,8 @@ L_SomeoneInside:
     end;
 
 L_AlreadyHelped:
-    if (@juliadone10 == 1) end;
-    message strcharinfo(0), "There are nothing more than dead monster corpses in this cave.";
-    set @juliadone10, 1;
+    message strcharinfo(0), "There are nothing more than corpses in this cave. You close your eyes and go straight to the place where Julia is hidden.";
+    warp "025-4.gat", 93, 33;
     end;
 
 OnTimer5000:
diff --git a/npc/025-4/battlecaves.txt b/npc/025-4/battlecaves.txt
index dbe1dac3..3f169743 100644
--- a/npc/025-4/battlecaves.txt
+++ b/npc/025-4/battlecaves.txt
@@ -38,7 +38,7 @@ L_Done:
     if ($@wave_cave1 == 2) message strcharinfo(0), "I can't give up now!";
     if ($@wave_cave1 == 3) message strcharinfo(0), "As soon as you kill the last monster, your vision blacks out and you feel a strange sensation, as if you were being lifted from the ground... When you open your eyes, you are outside of the cave.";
 
-    if ($@wave_cave1 != $@CAVE1_WAVES) goto L_Summon;
+    if ($@wave_cave1 < $@CAVE1_WAVES) goto L_Summon;
     set cavefights, (cavefights ^ BATTLE_CAVE1);
     warp "025-3.gat", 78, 129;
     goto L_Cleaning;
@@ -138,7 +138,7 @@ L_Done:
     if ($@wave_cave2 == 2) message strcharinfo(0), "I can't give up now!";
     if ($@wave_cave2 == 3) message strcharinfo(0), "As soon as you kill the last monster, your vision blacks out and you feel a strange sensation, as if you were being lifted from the ground... When you open your eyes, you are outside of the cave.";
 
-    if ($@wave_cave2 != $@CAVE2_WAVES) goto L_Summon;
+    if ($@wave_cave2 < $@CAVE2_WAVES) goto L_Summon;
     set cavefights, (cavefights ^ BATTLE_CAVE2);
     warp "025-3.gat", 53, 109;
     goto L_Cleaning;
@@ -236,7 +236,7 @@ L_Done:
     if ($@wave_cave3 == 2) message strcharinfo(0), "I can't give up now!";
     if ($@wave_cave3 == 3) message strcharinfo(0), "As soon as you kill the last monster, your vision blacks out and you feel a strange sensation, as if you were being lifted from the ground... When you open your eyes, you are outside of the cave.";
 
-    if ($@wave_cave3 != $@CAVE3_WAVES) goto L_Summon;
+    if ($@wave_cave3 < $@CAVE3_WAVES) goto L_Summon;
     set cavefights, (cavefights ^ BATTLE_CAVE3);
     warp "025-3.gat", 71, 85;
     goto L_Cleaning;
@@ -333,7 +333,7 @@ L_Done:
     if ($@wave_cave4 == 2) message strcharinfo(0), "I can't give up now!";
     if ($@wave_cave4 == 3) message strcharinfo(0), "As soon as you kill the last monster, your vision blacks out and you feel a strange sensation, as if you were being lifted from the ground... When you open your eyes, you are outside of the cave.";
 
-    if ($@wave_cave4 != $@CAVE4_WAVES) goto L_Summon;
+    if ($@wave_cave4 < $@CAVE4_WAVES) goto L_Summon;
     set cavefights, (cavefights ^ BATTLE_CAVE4);
     warp "025-3.gat", 80, 85;
     goto L_Cleaning;
@@ -431,7 +431,7 @@ L_Done:
     if ($@wave_cave5 == 2) message strcharinfo(0), "I can't give up now!";
     if ($@wave_cave5 == 3) message strcharinfo(0), "As soon as you kill the last monster, your vision blacks out and you feel a strange sensation, as if you were being lifted from the ground... When you open your eyes, you are outside of the cave.";
 
-    if ($@wave_cave5 != $@CAVE5_WAVES) goto L_Summon;
+    if ($@wave_cave5 < $@CAVE5_WAVES) goto L_Summon;
     set cavefights, (cavefights ^ BATTLE_CAVE5);
     warp "025-3.gat", 71, 32;
     goto L_Cleaning;
@@ -529,7 +529,7 @@ L_Done:
     if ($@wave_cave6 == 2) message strcharinfo(0), "I can't give up now!";
     if ($@wave_cave6 == 3) message strcharinfo(0), "As soon as you kill the last monster, your vision blacks out and you feel a strange sensation, as if you were being lifted from the ground... When you open your eyes, you are outside of the cave.";
 
-    if ($@wave_cave6 != $@CAVE6_WAVES) goto L_Summon;
+    if ($@wave_cave6 < $@CAVE6_WAVES) goto L_Summon;
     set cavefights, (cavefights ^ BATTLE_CAVE6);
     warp "025-3.gat", 128, 37;
     goto L_Cleaning;
@@ -628,7 +628,7 @@ L_Done:
     if ($@wave_cave7 == 2) message strcharinfo(0), "I can't give up now!";
     if ($@wave_cave7 == 3) message strcharinfo(0), "As soon as you kill the last monster, your vision blacks out and you feel a strange sensation, as if you were being lifted from the ground... When you open your eyes, you are outside of the cave.";
 
-    if ($@wave_cave7 != $@CAVE7_WAVES) goto L_Summon;
+    if ($@wave_cave7 < $@CAVE7_WAVES) goto L_Summon;
     set cavefights, (cavefights ^ BATTLE_CAVE7);
     warp "025-3.gat", 70, 59;
     goto L_Cleaning;
@@ -727,7 +727,7 @@ L_Done:
     if ($@wave_cave8 == 2) message strcharinfo(0), "I can't give up now!";
     if ($@wave_cave8 == 3) message strcharinfo(0), "As soon as you kill the last monster, your vision blacks out and you feel a strange sensation, as if you were being lifted from the ground... When you open your eyes, you are outside of the cave.";
 
-    if ($@wave_cave8 != $@CAVE8_WAVES) goto L_Summon;
+    if ($@wave_cave8 < $@CAVE8_WAVES) goto L_Summon;
     set cavefights, (cavefights ^ BATTLE_CAVE8);
     warp "025-3.gat", 138, 94;
     goto L_Cleaning;
@@ -825,7 +825,7 @@ L_Done:
     if ($@wave_cave9 == 2) message strcharinfo(0), "I can't give up now!";
     if ($@wave_cave9 == 3) message strcharinfo(0), "As soon as you kill the last monster, your vision blacks out and you feel a strange sensation, as if you were being lifted from the ground... When you open your eyes, you are outside of the cave.";
 
-    if ($@wave_cave9 != $@CAVE9_WAVES) goto L_Summon;
+    if ($@wave_cave9 < $@CAVE9_WAVES) goto L_Summon;
     set cavefights, (cavefights ^ BATTLE_CAVE9);
     warp "025-3.gat", 138, 158;
     goto L_Cleaning;
@@ -886,7 +886,7 @@ L_Done:
 // ---------------------  Boss Cave  ----------------------------
 
 025-4.gat,157,42,0	script	#StartBossCaveFight	324,{
-    if (Rossy_Quest == 16) goto L_Found;
+    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.";
     percentheal -100, 0;
@@ -897,6 +897,7 @@ L_Start:
         "Place a root at the center of the energy source.", -,
         "I am not prepared yet!", L_Close;
     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.";    
 
@@ -927,7 +928,7 @@ L_Done:
     if ($@wave_cave10 == 3) message strcharinfo(0), "What? This is harder than I imagined!";
     if ($@wave_cave10 == 4) message strcharinfo(0), "Finally! It seems I have defeated all of them!";
 
-    if ($@wave_cave10 != $@CAVE10_WAVES) goto L_Summon;
+    if ($@wave_cave10 < $@CAVE10_WAVES) goto L_Summon;
     set $@wave_cave10, 5;
     startnpctimer;
     end;
@@ -1011,6 +1012,7 @@ L_Out:
     set $@cave10fighterdeaths, 0;
     set $@cave10start, 0;
     set $@timercontrol10, 1;
+    warp "025-3.gat", 77, 168;
     end;
 }
 
@@ -1019,7 +1021,7 @@ L_Out:
 025-4.gat,157,24,0	script	#CheckJuliaCaveOutside	45,1,1,{
     if (Rossy_Quest > 15) goto L_Done;
     message strcharinfo(0), "As you try to walk through, you bump into a strong magical barrier.";
-    percentheal 10, 0;
+    percentheal -10, 0;
     end;
 
 L_Done:
@@ -1041,7 +1043,8 @@ L_Cheat:
     end;
 
 L_Done:
-    warp "025-4.gat", 157, 26;
+    message strcharinfo(0), "As you go back to the cave you close your eyes, terrified of the bloody battle you just fought in this place, and go straight to the entrance of the cave.";
+    warp "025-3.gat", 77, 168;
     end;
 
 L_Save: