Changes Rossy quest according to jenalya's suggestions and other fixes.

1 files changed, 46 insertions, 121 deletions

diff --git a/world/map/npc/025-4/battlecaves.txt b/world/map/npc/025-4/battlecaves.txt
index 68efd60e..238977b4 100644
--- a/world/map/npc/025-4/battlecaves.txt
+++ b/world/map/npc/025-4/battlecaves.txt
@@ -2,7 +2,7 @@
 
 // ---------------------------------    Cave 1    -----------------------------------
 
-025-4.gat,42,80,0	script	#StartCaveFight1	324,{
+025-4.gat,41,85,0	script	#StartCaveFight1	324,{
     if ($@wave_cave1 != 0 && $@cave1fighter$ == strcharinfo(0)) end;
     if ($@wave_cave1 != 0 && $@cave1fighter$ != strcharinfo(0)) goto L_Cheat;
     if (Rossy_Quest < 15) goto L_Cheat;
@@ -39,12 +39,10 @@ L_Done:
 
     if ($@wave_cave1 == 1) message strcharinfo(0), "Oh no, more monsters?!";
     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 are being lifted from the ground... When you open your eyes, you are outside of the cave.";
+    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... Maybe it is not healthy to stay in this cave.";
 
     if ($@wave_cave1 < $@CAVE1_WAVES) goto L_Summon;
     set cavefights, (cavefights ^ BATTLE_CAVE1);
-    warp "025-3.gat", 78, 129;
-    goto L_Cleaning;
     end;
     
 L_Cleaning:
@@ -85,17 +83,12 @@ onInit:
 // ---------------------  Cave 1 Checker  ----------------------------
 
 025-4.gat,41,97,0	script	#CheckCaveFight1	45,1,1,{
-    if ($@wave_cave1 != 0) message strcharinfo(0), "You can't get out! Seems like a barrier was created when the energy transmuted itself into monsters.";
-    if ($@wave_cave1 == 0) goto L_Done;
+    if (cavefights & BATTLE_CAVE1 || $@wave_cave1 == 0) goto L_Done;
+    message strcharinfo(0), "You can't get out! Seems like a barrier was created when the energy transmuted itself into monsters.";
     end;
 
 L_Done:
-    warp "025-3.gat", 78, 130;
-    set $@battlecave1, 0;
-    set $@cave1fighter$, "";
-    set $@cave1fighterdeaths, 0;
-    set $@cave1start, 0;
-    set $@timercontrol1, 1;
+    donpcevent "#WarpBattleCave1::OnGetout";
     end;
 }
 
@@ -140,12 +133,10 @@ L_Done:
 
     if ($@wave_cave2 == 1) message strcharinfo(0), "Oh no, more monsters?!";
     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 are being lifted from the ground... When you open your eyes, you are outside of the cave.";
+    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... Maybe it is not healthy to stay in this cave.";
 
     if ($@wave_cave2 < $@CAVE2_WAVES) goto L_Summon;
     set cavefights, (cavefights ^ BATTLE_CAVE2);
-    warp "025-3.gat", 53, 109;
-    goto L_Cleaning;
     end;
 
 L_Cleaning:
@@ -186,17 +177,12 @@ onInit:
 // ---------------------  Cave 2 Checker  ----------------------------
 
 025-4.gat,110,96,0	script	#CheckCaveFight2	45,1,1,{
-    if ($@wave_cave2 != 0) message strcharinfo(0), "You can't get out! Seems like a barrier was created when the energy transmuted itself into monsters.";
-    if ($@wave_cave2 == 0) goto L_Done;
+    if (cavefights & BATTLE_CAVE2 || $@wave_cave2 == 0) goto L_Done;
+    message strcharinfo(0), "You can't get out! Seems like a barrier was created when the energy transmuted itself into monsters.";
     end;
 
 L_Done:
-    warp "025-3.gat", 53, 110;
-    set $@battlecave2, 0;
-    set $@cave2fighter$, "";
-    set $@cave2fighterdeaths, 0;
-    set $@cave2start, 0;
-    set $@timercontrol2, 1;
+    donpcevent "#WarpBattleCave2::OnGetout";
     end;
 }
 
@@ -239,12 +225,10 @@ L_Done:
 
     if ($@wave_cave3 == 1) message strcharinfo(0), "Oh no, more monsters?!";
     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 are being lifted from the ground... When you open your eyes, you are outside of the cave.";
+    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... Maybe it is not healthy to stay in this cave.";
 
     if ($@wave_cave3 < $@CAVE3_WAVES) goto L_Summon;
     set cavefights, (cavefights ^ BATTLE_CAVE3);
-    warp "025-3.gat", 71, 85;
-    goto L_Cleaning;
     end;
 
 L_Cleaning:
@@ -285,17 +269,12 @@ onInit:
 // ---------------------  Cave 3 Checker  ----------------------------
 
 025-4.gat,168,117,0	script	#CheckCaveFight3	45,1,1,{
-    if ($@wave_cave3 != 0) message strcharinfo(0), "You can't get out! Seems like a barrier was created when the energy transmuted itself into monsters.";
-    if ($@wave_cave3 == 0) goto L_Done;
+    if (cavefights & BATTLE_CAVE3 || $@wave_cave3 == 0) goto L_Done;
+    message strcharinfo(0), "You can't get out! Seems like a barrier was created when the energy transmuted itself into monsters.";
     end;
 
 L_Done:
-    warp "025-3.gat", 71, 85;
-    set $@battlecave3, 0;
-    set $@cave3fighter$, "";
-    set $@cave3fighterdeaths, 0;
-    set $@cave3start, 0;
-    set $@timercontrol3, 1;
+    donpcevent "#WarpBattleCave3::OnGetout";
     end;
 }
 
@@ -337,12 +316,10 @@ L_Done:
 
     if ($@wave_cave4 == 1) message strcharinfo(0), "Oh no, more monsters?!";
     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 are being lifted from the ground... When you open your eyes, you are outside of the cave.";
+    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... Maybe it is not healthy to stay in this cave.";
 
     if ($@wave_cave4 < $@CAVE4_WAVES) goto L_Summon;
     set cavefights, (cavefights ^ BATTLE_CAVE4);
-    warp "025-3.gat", 80, 85;
-    goto L_Cleaning;
     end;
 
 L_Cleaning:
@@ -383,17 +360,12 @@ onInit:
 // ---------------------  Cave 4 Checker  ----------------------------
 
 025-4.gat,32,156,0	script	#CheckCaveFight4	45,1,1,{
-    if ($@wave_cave4 != 0) message strcharinfo(0), "You can't get out! Seems like a barrier was created when the energy transmuted itself into monsters.";
-    if ($@wave_cave4 == 0) goto L_Done;
+    if (cavefights & BATTLE_CAVE4 || $@wave_cave4 == 0) goto L_Done;
+    message strcharinfo(0), "You can't get out! Seems like a barrier was created when the energy transmuted itself into monsters.";
     end;
 
 L_Done:
-    warp "025-3.gat", 80, 85;
-    set $@battlecave4, 0;
-    set $@cave4fighter$, "";
-    set $@cave4fighterdeaths, 0;
-    set $@cave4start, 0;
-    set $@timercontrol4, 1;
+    donpcevent "#WarpBattleCave4::OnGetout";
     end;
 }
 
@@ -436,12 +408,10 @@ L_Done:
 
     if ($@wave_cave5 == 1) message strcharinfo(0), "Oh no, more monsters?!";
     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 are being lifted from the ground... When you open your eyes, you are outside of the cave.";
+    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... Maybe it is not healthy to stay in this cave.";
 
     if ($@wave_cave5 < $@CAVE5_WAVES) goto L_Summon;
     set cavefights, (cavefights ^ BATTLE_CAVE5);
-    warp "025-3.gat", 71, 32;
-    goto L_Cleaning;
     end;
 
 L_Cleaning:
@@ -482,17 +452,12 @@ onInit:
 // ---------------------  Cave 5 Checker  ----------------------------
 
 025-4.gat,100,160,0	script	#CheckCaveFight5	45,1,1,{
-    if ($@wave_cave5 != 0) message strcharinfo(0), "You can't get out! Seems like a barrier was created when the energy transmuted itself into monsters.";
-    if ($@wave_cave5 == 0) goto L_Done;
+    if (cavefights & BATTLE_CAVE5 || $@wave_cave5 == 0) goto L_Done;
+    message strcharinfo(0), "You can't get out! Seems like a barrier was created when the energy transmuted itself into monsters.";
     end;
 
 L_Done:
-    warp "025-3.gat", 71, 33;
-    set $@battlecave5, 0;
-    set $@cave5fighter$, "";
-    set $@cave5fighterdeaths, 0;
-    set $@cave5start, 0;
-    set $@timercontrol5, 1;
+    donpcevent "#WarpBattleCave5::OnGetout";
     end;
 }
 
@@ -535,12 +500,10 @@ L_Done:
 
     if ($@wave_cave6 == 1) message strcharinfo(0), "Oh no, more monsters?!";
     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 are being lifted from the ground... When you open your eyes, you are outside of the cave.";
+    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... Maybe it is not healthy to stay in this cave.";
 
     if ($@wave_cave6 < $@CAVE6_WAVES) goto L_Summon;
     set cavefights, (cavefights ^ BATTLE_CAVE6);
-    warp "025-3.gat", 128, 37;
-    goto L_Cleaning;
     end;
 
 L_Cleaning:
@@ -581,17 +544,12 @@ onInit:
 // ---------------------  Cave 6 Checker  ----------------------------
 
 025-4.gat,159,174,0	script	#CheckCaveFight6	45,1,1,{
-    if ($@wave_cave6 != 0) message strcharinfo(0), "You can't get out! Seems like a barrier was created when the energy transmuted itself into monsters.";
-    if ($@wave_cave6 == 0) goto L_Done;
+    if (cavefights & BATTLE_CAVE6 || $@wave_cave6 == 0) goto L_Done;
+    message strcharinfo(0), "You can't get out! Seems like a barrier was created when the energy transmuted itself into monsters.";
     end;
 
 L_Done:
-    warp "025-3.gat", 128, 38;
-    set $@battlecave6, 0;
-    set $@cave6fighter$, "";
-    set $@cave6fighterdeaths, 0;
-    set $@cave6start, 0;
-    set $@timercontrol6, 1;
+    donpcevent "#WarpBattleCave6::OnGetout";
     end;
 }
 
@@ -635,12 +593,10 @@ L_Done:
 
     if ($@wave_cave7 == 1) message strcharinfo(0), "Oh no, more monsters?!";
     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 are being lifted from the ground... When you open your eyes, you are outside of the cave.";
+    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... Maybe it is not healthy to stay in this cave.";
 
     if ($@wave_cave7 < $@CAVE7_WAVES) goto L_Summon;
     set cavefights, (cavefights ^ BATTLE_CAVE7);
-    warp "025-3.gat", 70, 59;
-    goto L_Cleaning;
     end;
 
 L_Cleaning:
@@ -681,17 +637,12 @@ onInit:
 // ---------------------  Cave 7 Checker  ----------------------------
 
 025-4.gat,42,219,0	script	#CheckCaveFight7	45,1,1,{
-    if ($@wave_cave7 != 0) message strcharinfo(0), "You can't get out! Seems like a barrier was created when the energy transmuted itself into monsters.";
-    if ($@wave_cave7 == 0) goto L_Done;
+    if (cavefights & BATTLE_CAVE7 || $@wave_cave7 == 0) goto L_Done;
+    message strcharinfo(0), "You can't get out! Seems like a barrier was created when the energy transmuted itself into monsters.";
     end;
 
 L_Done:
-    warp "025-3.gat", 70, 60;
-    set $@battlecave7, 0;
-    set $@cave7fighter$, "";
-    set $@cave7fighterdeaths, 0;
-    set $@cave7start, 0;
-    set $@timercontrol7, 1;
+    donpcevent "#WarpBattleCave7::OnGetout";
     end;
 }
 
@@ -735,12 +686,10 @@ L_Done:
 
     if ($@wave_cave8 == 1) message strcharinfo(0), "Oh no, more monsters?!";
     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 are being lifted from the ground... When you open your eyes, you are outside of the cave.";
+    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... Maybe it is not healthy to stay in this cave.";
 
     if ($@wave_cave8 < $@CAVE8_WAVES) goto L_Summon;
     set cavefights, (cavefights ^ BATTLE_CAVE8);
-    warp "025-3.gat", 138, 94;
-    goto L_Cleaning;
     end;
 
 L_Cleaning:
@@ -781,17 +730,12 @@ onInit:
 // ---------------------  Cave 8 Checker  ----------------------------
 
 025-4.gat,105,216,0	script	#CheckCaveFight8	45,1,1,{
-    if ($@wave_cave8 != 0) message strcharinfo(0), "You can't get out! Seems like a barrier was created when the energy transmuted itself into monsters.";
-    if ($@wave_cave8 == 0) goto L_Done;
+    if (cavefights & BATTLE_CAVE8 || $@wave_cave8 == 0) goto L_Done;
+    message strcharinfo(0), "You can't get out! Seems like a barrier was created when the energy transmuted itself into monsters.";
     end;
 
 L_Done:
-    warp "025-3.gat", 138, 95;
-    set $@battlecave8, 0;
-    set $@cave8fighter$, "";
-    set $@cave8fighterdeaths, 0;
-    set $@cave8start, 0;
-    set $@timercontrol8, 1;
+    donpcevent "#WarpBattleCave8::OnGetout";
     end;
 }
 
@@ -834,12 +778,10 @@ L_Done:
 
     if ($@wave_cave9 == 1) message strcharinfo(0), "Oh no, more monsters?!";
     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 are being lifted from the ground... When you open your eyes, you are outside of the cave.";
+    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... Maybe it is not healthy to stay in this cave.";
 
     if ($@wave_cave9 < $@CAVE9_WAVES) goto L_Summon;
     set cavefights, (cavefights ^ BATTLE_CAVE9);
-    warp "025-3.gat", 138, 158;
-    goto L_Cleaning;
     end;
 
 L_Cleaning:
@@ -880,17 +822,12 @@ onInit:
 // ---------------------  Cave 9 Checker  ----------------------------
 
 025-4.gat,157,226,0	script	#CheckCaveFight9	45,1,1,{
-    if ($@wave_cave9 != 0) message strcharinfo(0), "You can't get out! Seems like a barrier was created when the energy transmuted itself into monsters.";
-    if ($@wave_cave9 == 0) goto L_Done;
+    if (cavefights & BATTLE_CAVE9 || $@wave_cave9 == 0) goto L_Done;
+    message strcharinfo(0), "You can't get out! Seems like a barrier was created when the energy transmuted itself into monsters.";
     end;
 
 L_Done:
-    warp "025-3.gat", 138, 158;
-    set $@battlecave9, 0;
-    set $@cave9fighter$, "";
-    set $@cave9fighterdeaths, 0;
-    set $@cave9start, 0;
-    set $@timercontrol9, 1;
+    donpcevent "#WarpBattleCave9::OnGetout";
     end;
 }
 
@@ -899,7 +836,7 @@ L_Done:
 025-4.gat,157,30,0	script	#StartBossCaveFight	325,{
     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;
+    if ($@battlecave10 == 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;
     end;
@@ -952,7 +889,7 @@ L_Cleaning:
     set $@cave10start, 0;
     set $@cave10fighter$, "";
     set $@cave10fighterdeaths$, 0;
-    set $@battlebosscave, 0;
+    set $@battlecave10, 0;
     killmonster "025-4.gat", "#StartBossCaveFight::OnMonsterDeath";
     killmonster "025-4.gat", "#StartBossCaveFight::OnBossDeath";
     end;
@@ -965,7 +902,7 @@ L_CleaningNorid:
     set $@cave10start, 0;
     set $@cave10fighter$, "";
     set $@cave10fighterdeaths$, 0;
-    set $@battlebosscave, 0;
+    set $@battlecave10, 0;
     killmonster "025-4.gat", "#StartBossCaveFight::OnMonsterDeath";
     killmonster "025-4.gat", "#StartBossCaveFight::OnBossDeath";
     end;
@@ -986,15 +923,8 @@ OnMonsterDeath:
 
 OnBossDeath:
     attachrid(getcharid(3,$@cave10fighter$));
-    set $@wave_cave10, 0;
-    set $@cave10_kills, 0;
-    set $@cave10start, 0;
-    set $@cave10fighter$, "";
-    set $@cave10fighterdeaths$, 0;
-    set $@battlebosscave, 0;
-    message strcharinfo(0), "What a harsh battle! You lose no time and run to the door before more monsters start to appear.";
+    message strcharinfo(0), "What a harsh battle... You should hurry and save Julia!";
     set Rossy_Quest, 16;
-    warp "025-4.gat", 93, 33;
     end;
 
 L_Close:
@@ -1023,7 +953,8 @@ onInit:
 025-4.gat,157,48,0	script	#CheckCaveFightBoss	45,1,1,{
     if (Rossy_Quest >= 17) goto L_Done;
     if (Rossy_Quest == 16) goto L_Julia;
-    if (Rossy_Quest < 16) goto L_Out;
+    if (Rossy_Quest < 16 && $@wave_cave10 == 0) goto L_Out;
+    if (Rossy_Quest < 16 && $@wave_cave10 != 0) goto L_Julia;
     end;
 
 L_Julia:
@@ -1035,13 +966,7 @@ L_Done:
     end;
 
 L_Out:
-    if ($@wave_cave10 != 0) goto L_Julia;
-    set $@battlebosscave, 0;
-    set $@cave10fighter$, "";
-    set $@cave10fighterdeaths, 0;
-    set $@cave10start, 0;
-    set $@timercontrol10, 1;
-    warp "025-3.gat", 77, 168;
+    donpcevent "#WarpBossCave::OnGetout";
     end;
 }
 
@@ -1054,7 +979,7 @@ L_Out:
     end;
 
 L_Done:
-    warp "025-4.gat", 93, 33;
+    donpcevent "#WarpBossCave::OnWin";
     end;
 }
 
@@ -1072,7 +997,7 @@ L_Cheat:
     end;
 
 L_Done:
-    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 feel your way to the entrance of the cave.";
+    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 feel your way back to the entrance of the cave.";
     warp "025-3.gat", 77, 168;
     end;