From 70adc42c045cc081185f0ddb256d2f4896ad7b50 Mon Sep 17 00:00:00 2001
From: coffee <coffee@coffee-EP45-UD3L.(none)>
Date: Sat, 3 Sep 2011 08:59:32 -0300
Subject: Tab converting and reformating scripts related to the battlecaves in
 rossy quest.

---
 world/map/npc/025-3/barriers.txt | 474 +++++++++++++++++++++++++--------------
 1 file changed, 304 insertions(+), 170 deletions(-)

(limited to 'world/map/npc/025-3/barriers.txt')

diff --git a/world/map/npc/025-3/barriers.txt b/world/map/npc/025-3/barriers.txt
index 8377c5f3..28148ab0 100644
--- a/world/map/npc/025-3/barriers.txt
+++ b/world/map/npc/025-3/barriers.txt
@@ -2,21 +2,24 @@
 
 // -----------------------------------Warp to Cave 1 ---------------------------------------
 
-025-3.gat,78,127,0	script	#WarpBattleCave1	45,1,1,{
-
-    if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped;
-    if (getareausers("025-4.gat", 26, 63, 60, 97) >= 1 || $@battlecave1 > 0) goto L_SomeoneInside;
-    if (cavefights & BATTLE_CAVE1) goto L_AlreadyDone;
-    if (Rossy_Quest < 15) goto L_Block;
+025-3.gat,78,127,0|script|#WarpBattleCave1|45,1,1,{
+    if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED)
+        goto L_AlreadyHelped;
+    if (getareausers("025-4.gat", 26, 63, 60, 97) >= 1 || $@battlecave1 > 0)
+        goto L_SomeoneInside;
+    if (cavefights & BATTLE_CAVE1)
+        goto L_AlreadyDone;
+    if (Rossy_Quest < 15)
+        goto L_Block;
 
 L_StartFight:
     set $@battlecave1, 1;
     warp "025-4.gat", 41, 95;
     set $@cave1fighter$, strcharinfo(0);
     set $@cave1fighterdeaths, PC_DIE_COUNTER;
-    startnpctimer;
     set $@cave1start, gettimetick(2);
     message strcharinfo(0), "As you enter, you feel an evil force filling up the cave.";
+    startnpctimer;
     end;
 
 L_SomeoneInside:
@@ -36,24 +39,33 @@ L_Block:
     end;
 
 OnTimer5000:
-    if ($@battlecave1 == 0) goto L_AlreadyClean;
-    if (isloggedin(getcharid(3,$@cave1fighter$))==0) goto L_CleaningNorid;
+    if ($@battlecave1 == 0)
+        goto L_AlreadyClean;
+    if (isloggedin(getcharid(3,$@cave1fighter$))==0)
+        goto L_CleaningNorid;
     attachrid(getcharid(3,$@cave1fighter$));
-    if (getareausers("025-4.gat", 26, 63, 60, 97) < 1) goto L_Ranaway;
-    if (PC_DIE_COUNTER > $@cave1fighterdeaths) goto L_CleaningDead;
-    if (cavefights & BATTLE_CAVE1) goto L_Win;
-    if (gettimetick(2) - $@cave1start >= $@CAVE1_TIME) goto L_Cleaning;
+    if (getareausers("025-4.gat", 26, 63, 60, 97) < 1)
+        goto L_Ranaway;
+    if (PC_DIE_COUNTER > $@cave1fighterdeaths)
+        goto L_CleaningDead;
+    if (cavefights & BATTLE_CAVE1)
+        goto L_Win;
+    if (gettimetick(2) - $@cave1start >= $@CAVE1_TIME)
+        goto L_Cleaning;
     setnpctimer 0;
     end;
 
 L_Win:
     attachrid(getcharid(3,$@cave1fighter$));
     message strcharinfo(0), "It is getting harder to breathe inside this cave... You feel like you are almost passing out.";
-    if ((gettimetick(2) - $@cave1start) < 60) set $@cave1start, $@cave1start + 60;
-    if (Hp - (MaxHp*5)/100 <= 0) goto L_BadAir;
+    if ((gettimetick(2) - $@cave1start) < 60)
+        set $@cave1start, $@cave1start + 60;
+    if (Hp - (MaxHp*5)/100 <= 0)
+        goto L_BadAir;
     percentheal -5, 0;
     set $@cave1_timer, $@cave1_timer + 5;
-    if ($@cave1_timer >= 60) goto L_BadAir;
+    if ($@cave1_timer >= 60)
+        goto L_BadAir;
     setnpctimer 0;
     end;
 
@@ -113,21 +125,24 @@ L_AlreadyClean:
 
 // ---------------------------- Warp to Cave 2 ----------------------------
 
-025-3.gat,53,107,0	script	#WarpBattleCave2	45,1,1,{
-
-    if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped;
-    if (getareausers("025-4.gat", 97, 62, 126, 96) >= 1 || $@battlecave2 > 0) goto L_SomeoneInside;
-    if (cavefights & BATTLE_CAVE2) goto L_AlreadyDone;
-    if (Rossy_Quest < 15) goto L_Block;
+025-3.gat,53,107,0|script|#WarpBattleCave2|45,1,1,{
+    if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED)
+        goto L_AlreadyHelped;
+    if (getareausers("025-4.gat", 97, 62, 126, 96) >= 1 || $@battlecave2 > 0)
+        goto L_SomeoneInside;
+    if (cavefights & BATTLE_CAVE2)
+        goto L_AlreadyDone;
+    if (Rossy_Quest < 15)
+        goto L_Block;
 
 L_StartFight:
     set $@battlecave2, 1;
     warp "025-4.gat", 110, 94;
     set $@cave2fighter$, strcharinfo(0);
     set $@cave2fighterdeaths, PC_DIE_COUNTER;
-    startnpctimer;
     set $@cave2start, gettimetick(2);
     message strcharinfo(0), "As you enter, you feel an evil force filling up the cave.";
+    startnpctimer;
     end;
 
 L_SomeoneInside:
@@ -147,24 +162,33 @@ L_Block:
     end;
 
 OnTimer5000:
-    if ($@battlecave2 == 0) goto L_AlreadyClean;
-    if (isloggedin(getcharid(3,$@cave2fighter$))==0) goto L_CleaningNorid;
+    if ($@battlecave2 == 0)
+        goto L_AlreadyClean;
+    if (isloggedin(getcharid(3,$@cave2fighter$))==0)
+        goto L_CleaningNorid;
     attachrid(getcharid(3,$@cave2fighter$));
-    if (getareausers("025-4.gat", 97, 62, 126, 96) < 1) goto L_Ranaway;
-    if (PC_DIE_COUNTER > $@cave2fighterdeaths) goto L_CleaningDead;
-    if (cavefights & BATTLE_CAVE2) goto L_Win;
-    if (gettimetick(2) - $@cave2start >= $@CAVE2_TIME) goto L_Cleaning;
+    if (getareausers("025-4.gat", 97, 62, 126, 96) < 1)
+        goto L_Ranaway;
+    if (PC_DIE_COUNTER > $@cave2fighterdeaths)
+        goto L_CleaningDead;
+    if (cavefights & BATTLE_CAVE2)
+        goto L_Win;
+    if (gettimetick(2) - $@cave2start >= $@CAVE2_TIME)
+        goto L_Cleaning;
     setnpctimer 0;
     end;
 
 L_Win:
     attachrid(getcharid(3,$@cave2fighter$));
     message strcharinfo(0), "It is getting harder to breathe inside this cave... You feel like you are almost passing out.";
-    if ((gettimetick(2) - $@cave2start) < 60) set $@cave2start, $@cave2start + 60;
-    if (Hp - (MaxHp*5)/100 <= 0) goto L_BadAir;
+    if ((gettimetick(2) - $@cave2start) < 60)
+        set $@cave2start, $@cave2start + 60;
+    if (Hp - (MaxHp*5)/100 <= 0)
+        goto L_BadAir;
     percentheal -5, 0;
     set $@cave2_timer, $@cave2_timer + 5;
-    if ($@cave2_timer >= 60) goto L_BadAir;
+    if ($@cave2_timer >= 60)
+        goto L_BadAir;
     setnpctimer 0;
     end;
 
@@ -223,21 +247,24 @@ L_AlreadyClean:
 
 // --------------------------------- Warp to Cave 3 ----------------------------------------
 
-025-3.gat,71,83,0	script	#WarpBattleCave3	45,1,1,{
-
-    if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped;
-    if (getareausers("025-4.gat", 150, 84, 177, 117) >= 1 || $@battlecave3 > 0) goto L_SomeoneInside;
-    if (cavefights & BATTLE_CAVE3) goto L_AlreadyDone;
-    if (Rossy_Quest < 15) goto L_Block;
+025-3.gat,71,83,0|script|#WarpBattleCave3|45,1,1,{
+    if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED)
+        goto L_AlreadyHelped;
+    if (getareausers("025-4.gat", 150, 84, 177, 117) >= 1 || $@battlecave3 > 0)
+        goto L_SomeoneInside;
+    if (cavefights & BATTLE_CAVE3)
+        goto L_AlreadyDone;
+    if (Rossy_Quest < 15)
+        goto L_Block;
 
 L_StartFight:
     set $@battlecave3, 1;
     warp "025-4.gat", 168, 115;
     set $@cave3fighter$, strcharinfo(0);
     set $@cave3fighterdeaths, PC_DIE_COUNTER;
-    startnpctimer;
     set $@cave3start, gettimetick(2);
     message strcharinfo(0), "As you enter, you feel an evil force filling up the cave.";
+    startnpctimer;
     end;
 
 L_SomeoneInside:
@@ -257,24 +284,33 @@ L_Block:
     end;
 
 OnTimer5000:
-    if ($@battlecave3 == 0) goto L_AlreadyClean;
-    if (isloggedin(getcharid(3,$@cave3fighter$))==0) goto L_CleaningNorid;
+    if ($@battlecave3 == 0)
+        goto L_AlreadyClean;
+    if (isloggedin(getcharid(3,$@cave3fighter$))==0)
+        goto L_CleaningNorid;
     attachrid(getcharid(3,$@cave3fighter$));
-    if (getareausers("025-4.gat", 150, 84, 177, 117) < 1) goto L_Ranaway;
-    if (cavefights & BATTLE_CAVE3) goto L_Win;
-    if (PC_DIE_COUNTER > $@cave3fighterdeaths) goto L_CleaningDead;
-    if (gettimetick(2) - $@cave3start >= $@CAVE3_TIME) goto L_Cleaning;
+    if (getareausers("025-4.gat", 150, 84, 177, 117) < 1)
+        goto L_Ranaway;
+    if (cavefights & BATTLE_CAVE3)
+        goto L_Win;
+    if (PC_DIE_COUNTER > $@cave3fighterdeaths)
+        goto L_CleaningDead;
+    if (gettimetick(2) - $@cave3start >= $@CAVE3_TIME)
+        goto L_Cleaning;
     setnpctimer 0;
     end;
 
 L_Win:
     attachrid(getcharid(3,$@cave3fighter$));
     message strcharinfo(0), "It is getting harder to breathe inside this cave... You feel like you are almost passing out.";
-    if ((gettimetick(2) - $@cave3start) < 60) set $@cave3start, $@cave3start + 60;
-    if (Hp - (MaxHp*5)/100 <= 0) goto L_BadAir;
+    if ((gettimetick(2) - $@cave3start) < 60)
+        set $@cave3start, $@cave3start + 60;
+    if (Hp - (MaxHp*5)/100 <= 0)
+        goto L_BadAir;
     percentheal -5, 0;
     set $@cave3_timer, $@cave3_timer + 5;
-    if ($@cave3_timer >= 60) goto L_BadAir;
+    if ($@cave3_timer >= 60)
+        goto L_BadAir;
     setnpctimer 0;
     end;
 
@@ -333,21 +369,24 @@ L_AlreadyClean:
 
 // --------------------------- Warp to Cave 4 --------------------------------------
 
-025-3.gat,80,83,0	script	#WarpBattleCave4	45,1,1,{
-
-    if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped;
-    if (getareausers("025-4.gat", 28, 124, 57, 156) >= 1 || $@battlecave4 > 0) goto L_SomeoneInside;
-    if (cavefights & BATTLE_CAVE4) goto L_AlreadyDone;
-    if (Rossy_Quest < 15) goto L_Block;
+025-3.gat,80,83,0|script|#WarpBattleCave4|45,1,1,{
+    if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED)
+        goto L_AlreadyHelped;
+    if (getareausers("025-4.gat", 28, 124, 57, 156) >= 1 || $@battlecave4 > 0)
+        goto L_SomeoneInside;
+    if (cavefights & BATTLE_CAVE4)
+        goto L_AlreadyDone;
+    if (Rossy_Quest < 15)
+        goto L_Block;
 
 L_StartFight:
     set $@battlecave4, 1;
     warp "025-4.gat", 32, 154;
     set $@cave4fighter$, strcharinfo(0);
     set $@cave4fighterdeaths, PC_DIE_COUNTER;
-    startnpctimer;
     set $@cave4start, gettimetick(2);
     message strcharinfo(0), "As you enter, you feel an evil force filling up the cave.";
+    startnpctimer;
     end;
 
 L_SomeoneInside:
@@ -367,24 +406,33 @@ L_Block:
     end;
 
 OnTimer5000:
-    if ($@battlecave4 == 0) goto L_AlreadyClean;
-    if (isloggedin(getcharid(3,$@cave4fighter$))==0) goto L_CleaningNorid;
+    if ($@battlecave4 == 0)
+        goto L_AlreadyClean;
+    if (isloggedin(getcharid(3,$@cave4fighter$))==0)
+        goto L_CleaningNorid;
     attachrid(getcharid(3,$@cave4fighter$));
-    if (getareausers("025-4.gat", 28, 124, 57, 156) < 1) goto L_Ranaway;
-    if (PC_DIE_COUNTER > $@cave4fighterdeaths) goto L_CleaningDead;
-    if (cavefights & BATTLE_CAVE4) goto L_Win;
-    if (gettimetick(2) - $@cave4start >= $@CAVE4_TIME) goto L_Cleaning;
+    if (getareausers("025-4.gat", 28, 124, 57, 156) < 1)
+        goto L_Ranaway;
+    if (PC_DIE_COUNTER > $@cave4fighterdeaths)
+        goto L_CleaningDead;
+    if (cavefights & BATTLE_CAVE4)
+        goto L_Win;
+    if (gettimetick(2) - $@cave4start >= $@CAVE4_TIME)
+        goto L_Cleaning;
     setnpctimer 0;
     end;
 
 L_Win:
     attachrid(getcharid(3,$@cave4fighter$));
     message strcharinfo(0), "It is getting harder to breathe inside this cave... You feel like you are almost passing out.";
-    if ((gettimetick(2) - $@cave4start) < 60) set $@cave4start, $@cave4start + 60;
-    if (Hp - (MaxHp*5)/100 <= 0) goto L_BadAir;
+    if ((gettimetick(2) - $@cave4start) < 60)
+        set $@cave4start, $@cave4start + 60;
+    if (Hp - (MaxHp*5)/100 <= 0)
+        goto L_BadAir;
     percentheal -5, 0;
     set $@cave4_timer, $@cave4_timer + 5;
-    if ($@cave4_timer >= 60) goto L_BadAir;
+    if ($@cave4_timer >= 60)
+        goto L_BadAir;
     setnpctimer 0;
     end;
 
@@ -443,21 +491,24 @@ L_AlreadyClean:
 
 // --------------------------- Warp to Cave 5 ----------------------------------------
 
-025-3.gat,71,30,0	script	#WarpBattleCave5	45,1,1,{
-
-    if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped;
-    if (getareausers("025-4.gat", 91, 131, 124, 160) >= 1 || $@battlecave5 > 0) goto L_SomeoneInside;
-    if (cavefights & BATTLE_CAVE5) goto L_AlreadyDone;
-    if (Rossy_Quest < 15) goto L_Block;
+025-3.gat,71,30,0|script|#WarpBattleCave5|45,1,1,{
+    if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED)
+        goto L_AlreadyHelped;
+    if (getareausers("025-4.gat", 91, 131, 124, 160) >= 1 || $@battlecave5 > 0)
+        goto L_SomeoneInside;
+    if (cavefights & BATTLE_CAVE5)
+        goto L_AlreadyDone;
+    if (Rossy_Quest < 15)
+        goto L_Block;
 
 L_StartFight:
     set $@battlecave5, 1;
     warp "025-4.gat", 100, 158;
     set $@cave5fighter$, strcharinfo(0);
     set $@cave5fighterdeaths, PC_DIE_COUNTER;
-    startnpctimer;
     set $@cave5start, gettimetick(2);
     message strcharinfo(0), "As you enter, you feel an evil force filling up the cave.";
+    startnpctimer;
     end;
 
 L_SomeoneInside:
@@ -477,24 +528,33 @@ L_Block:
     end;
 
 OnTimer5000:
-    if ($@battlecave5 == 0) goto L_AlreadyClean;
-    if (isloggedin(getcharid(3,$@cave5fighter$))==0) goto L_CleaningNorid;
+    if ($@battlecave5 == 0)
+        goto L_AlreadyClean;
+    if (isloggedin(getcharid(3,$@cave5fighter$))==0)
+        goto L_CleaningNorid;
     attachrid(getcharid(3,$@cave5fighter$));
-    if (getareausers("025-4.gat", 91, 131, 124, 160) < 1) goto L_Ranaway;
-    if (PC_DIE_COUNTER > $@cave5fighterdeaths) goto L_CleaningDead;
-    if (cavefights & BATTLE_CAVE5) goto L_Win;
-    if (gettimetick(2) - $@cave5start >= $@CAVE5_TIME) goto L_Cleaning;
+    if (getareausers("025-4.gat", 91, 131, 124, 160) < 1)
+        goto L_Ranaway;
+    if (PC_DIE_COUNTER > $@cave5fighterdeaths)
+        goto L_CleaningDead;
+    if (cavefights & BATTLE_CAVE5)
+        goto L_Win;
+    if (gettimetick(2) - $@cave5start >= $@CAVE5_TIME)
+        goto L_Cleaning;
     setnpctimer 0;
     end;
 
 L_Win:
     attachrid(getcharid(3,$@cave5fighter$));
     message strcharinfo(0), "It is getting harder to breathe inside this cave... You feel like you are almost passing out.";
-    if ((gettimetick(2) - $@cave5start) < 60) set $@cave5start, $@cave5start + 60;
-    if (Hp - (MaxHp*5)/100 <= 0) goto L_BadAir;
+    if ((gettimetick(2) - $@cave5start) < 60)
+        set $@cave5start, $@cave5start + 60;
+    if (Hp - (MaxHp*5)/100 <= 0)
+        goto L_BadAir;
     percentheal -5, 0;
     set $@cave5_timer, $@cave5_timer + 5;
-    if ($@cave5_timer >= 60) goto L_BadAir;
+    if ($@cave5_timer >= 60)
+        goto L_BadAir;
     setnpctimer 0;
     end;
 
@@ -553,21 +613,24 @@ L_AlreadyClean:
 
 // -------------------------------- Warp to Cave 6 -----------------------------------------
 
-025-3.gat,128,35,0	script	#WarpBattleCave6	45,1,1,{
-
-    if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped;
-    if (getareausers("025-4.gat", 153, 143, 178, 174) >= 1 || $@battlecave6 > 0) goto L_SomeoneInside;
-    if (cavefights & BATTLE_CAVE6) goto L_AlreadyDone;
-    if (Rossy_Quest < 15) goto L_Block;
+025-3.gat,128,35,0|script|#WarpBattleCave6|45,1,1,{
+    if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED)
+        goto L_AlreadyHelped;
+    if (getareausers("025-4.gat", 153, 143, 178, 174) >= 1 || $@battlecave6 > 0)
+        goto L_SomeoneInside;
+    if (cavefights & BATTLE_CAVE6)
+        goto L_AlreadyDone;
+    if (Rossy_Quest < 15)
+        goto L_Block;
 
 L_StartFight:
     set $@battlecave6, 1;
     warp "025-4.gat", 159, 172;
     set $@cave6fighter$, strcharinfo(0);
     set $@cave6fighterdeaths, PC_DIE_COUNTER;
-    startnpctimer;
     set $@cave6start, gettimetick(2);
     message strcharinfo(0), "As you enter, you feel an evil force filling up the cave.";
+    startnpctimer;
     end;
 
 L_SomeoneInside:
@@ -587,24 +650,33 @@ L_Block:
     end;
 
 OnTimer5000:
-    if ($@battlecave6 == 0) goto L_AlreadyClean;
-    if (isloggedin(getcharid(3,$@cave6fighter$))==0) goto L_CleaningNorid;
+    if ($@battlecave6 == 0)
+        goto L_AlreadyClean;
+    if (isloggedin(getcharid(3,$@cave6fighter$))==0)
+        goto L_CleaningNorid;
     attachrid(getcharid(3,$@cave6fighter$));
-    if (getareausers("025-4.gat", 153, 143, 178, 174) < 1) goto L_Ranaway;
-    if (PC_DIE_COUNTER > $@cave6fighterdeaths) goto L_CleaningDead;
-    if (cavefights & BATTLE_CAVE6) goto L_Win;
-    if (gettimetick(2) - $@cave6start >= $@CAVE6_TIME) goto L_Cleaning;
+    if (getareausers("025-4.gat", 153, 143, 178, 174) < 1)
+        goto L_Ranaway;
+    if (PC_DIE_COUNTER > $@cave6fighterdeaths)
+        goto L_CleaningDead;
+    if (cavefights & BATTLE_CAVE6)
+        goto L_Win;
+    if (gettimetick(2) - $@cave6start >= $@CAVE6_TIME)
+        goto L_Cleaning;
     setnpctimer 0;
     end;
 
 L_Win:
     attachrid(getcharid(3,$@cave6fighter$));
     message strcharinfo(0), "It is getting harder to breathe inside this cave... You feel like you are almost passing out.";
-    if ((gettimetick(2) - $@cave6start) < 60) set $@cave6start, $@cave6start + 60;
-    if (Hp - (MaxHp*5)/100 <= 0) goto L_BadAir;
+    if ((gettimetick(2) - $@cave6start) < 60)
+        set $@cave6start, $@cave6start + 60;
+    if (Hp - (MaxHp*5)/100 <= 0)
+        goto L_BadAir;
     percentheal -5, 0;
     set $@cave6_timer, $@cave6_timer + 5;
-    if ($@cave6_timer >= 60) goto L_BadAir;
+    if ($@cave6_timer >= 60)
+        goto L_BadAir;
     setnpctimer 0;
     end;
 
@@ -663,21 +735,24 @@ L_AlreadyClean:
 
 // ---------------------------- Warp to Cave 7 ------------------------------------------
 
-025-3.gat,70,57,0	script	#WarpBattleCave7	45,1,1,{
-
-    if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped;
-    if (getareausers("025-4.gat", 27, 185, 61, 219) >= 1 || $@battlecave7 > 0) goto L_SomeoneInside;
-    if (cavefights & BATTLE_CAVE7) goto L_AlreadyDone;
-    if (Rossy_Quest < 15) goto L_Block;
+025-3.gat,70,57,0|script|#WarpBattleCave7|45,1,1,{
+    if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED)
+        goto L_AlreadyHelped;
+    if (getareausers("025-4.gat", 27, 185, 61, 219) >= 1 || $@battlecave7 > 0)
+        goto L_SomeoneInside;
+    if (cavefights & BATTLE_CAVE7)
+        goto L_AlreadyDone;
+    if (Rossy_Quest < 15)
+        goto L_Block;
 
 L_StartFight:
     set $@battlecave7, 1;
     warp "025-4.gat", 42, 217;
     set $@cave7fighter$, strcharinfo(0);
     set $@cave7fighterdeaths, PC_DIE_COUNTER;
-    startnpctimer;
     set $@cave7start, gettimetick(2);
     message strcharinfo(0), "As you enter, you feel an evil force filling up the cave.";
+    startnpctimer;
     end;
 
 L_SomeoneInside:
@@ -697,24 +772,33 @@ L_Block:
     end;
 
 OnTimer5000:
-    if ($@battlecave7 == 0) goto L_AlreadyClean;
-    if (isloggedin(getcharid(3,$@cave7fighter$))==0) goto L_CleaningNorid;
+    if ($@battlecave7 == 0)
+        goto L_AlreadyClean;
+    if (isloggedin(getcharid(3,$@cave7fighter$))==0)
+        goto L_CleaningNorid;
     attachrid(getcharid(3,$@cave7fighter$));
-    if (getareausers("025-4.gat", 27, 185, 61, 219) < 1) goto L_Ranaway;
-    if (PC_DIE_COUNTER > $@cave7fighterdeaths) goto L_CleaningDead;
-    if (cavefights & BATTLE_CAVE7) goto L_Win;
-    if (gettimetick(2) - $@cave7start >= $@CAVE7_TIME) goto L_Cleaning;
+    if (getareausers("025-4.gat", 27, 185, 61, 219) < 1)
+        goto L_Ranaway;
+    if (PC_DIE_COUNTER > $@cave7fighterdeaths)
+        goto L_CleaningDead;
+    if (cavefights & BATTLE_CAVE7)
+        goto L_Win;
+    if (gettimetick(2) - $@cave7start >= $@CAVE7_TIME)
+        goto L_Cleaning;
     setnpctimer 0;
     end;
 
 L_Win:
     attachrid(getcharid(3,$@cave7fighter$));
     message strcharinfo(0), "It is getting harder to breathe inside this cave... You feel like you are almost passing out.";
-    if ((gettimetick(2) - $@cave7start) < 60) set $@cave7start, $@cave7start + 60;
-    if (Hp - (MaxHp*5)/100 <= 0) goto L_BadAir;
+    if ((gettimetick(2) - $@cave7start) < 60)
+        set $@cave7start, $@cave7start + 60;
+    if (Hp - (MaxHp*5)/100 <= 0)
+        goto L_BadAir;
     percentheal -5, 0;
     set $@cave7_timer, $@cave7_timer + 5;
-    if ($@cave7_timer >= 60) goto L_BadAir;
+    if ($@cave7_timer >= 60)
+        goto L_BadAir;
     setnpctimer 0;
     end;
 
@@ -773,21 +857,24 @@ L_AlreadyClean:
 
 // -----------------------------------------------Warp to Cave 8-------------------------------------------------------------
 
-025-3.gat,138,92,0	script	#WarpBattleCave8	45,1,1,{
-
-    if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped;
-    if (getareausers("025-4.gat", 90, 193, 119, 216) >= 1 || $@battlecave8 > 0) goto L_SomeoneInside;
-    if (cavefights & BATTLE_CAVE8) goto L_AlreadyDone;
-    if (Rossy_Quest < 15) goto L_Block;
+025-3.gat,138,92,0|script|#WarpBattleCave8|45,1,1,{
+    if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED)
+        goto L_AlreadyHelped;
+    if (getareausers("025-4.gat", 90, 193, 119, 216) >= 1 || $@battlecave8 > 0)
+        goto L_SomeoneInside;
+    if (cavefights & BATTLE_CAVE8)
+        goto L_AlreadyDone;
+    if (Rossy_Quest < 15)
+        goto L_Block;
 
 L_StartFight:
     set $@battlecave8, 1;
     warp "025-4.gat", 105, 214;
     set $@cave8fighter$, strcharinfo(0);
     set $@cave8fighterdeaths, PC_DIE_COUNTER;
-    startnpctimer;
     set $@cave8start, gettimetick(2);
     message strcharinfo(0), "As you enter, you feel an evil force filling up the cave.";
+    startnpctimer;
     end;
 
 L_SomeoneInside:
@@ -807,24 +894,33 @@ L_Block:
     end;
 
 OnTimer5000:
-    if ($@battlecave8 == 0) goto L_AlreadyClean;
-    if (isloggedin(getcharid(3,$@cave8fighter$))==0) goto L_CleaningNorid;
+    if ($@battlecave8 == 0)
+        goto L_AlreadyClean;
+    if (isloggedin(getcharid(3,$@cave8fighter$))==0)
+        goto L_CleaningNorid;
     attachrid(getcharid(3,$@cave8fighter$));
-    if (getareausers("025-4.gat", 90, 193, 119, 216) < 1) goto L_Ranaway;
-    if (PC_DIE_COUNTER > $@cave8fighterdeaths) goto L_CleaningDead;
-    if (cavefights & BATTLE_CAVE8) goto L_Win;
-    if (gettimetick(2) - $@cave8start >= $@CAVE8_TIME) goto L_Cleaning;
+    if (getareausers("025-4.gat", 90, 193, 119, 216) < 1)
+        goto L_Ranaway;
+    if (PC_DIE_COUNTER > $@cave8fighterdeaths)
+        goto L_CleaningDead;
+    if (cavefights & BATTLE_CAVE8)
+        goto L_Win;
+    if (gettimetick(2) - $@cave8start >= $@CAVE8_TIME)
+        goto L_Cleaning;
     setnpctimer 0;
     end;
 
 L_Win:
     attachrid(getcharid(3,$@cave8fighter$));
     message strcharinfo(0), "It is getting harder to breathe inside this cave... You feel like you are almost passing out.";
-    if ((gettimetick(2) - $@cave8start) < 60) set $@cave8start, $@cave8start + 60;
-    if (Hp - (MaxHp*5)/100 <= 0) goto L_BadAir;
+    if ((gettimetick(2) - $@cave8start) < 60)
+        set $@cave8start, $@cave8start + 60;
+    if (Hp - (MaxHp*5)/100 <= 0)
+        goto L_BadAir;
     percentheal -5, 0;
     set $@cave8_timer, $@cave8_timer + 5;
-    if ($@cave8_timer >= 60) goto L_BadAir;
+    if ($@cave8_timer >= 60)
+        goto L_BadAir;
     setnpctimer 0;
     end;
 
@@ -883,21 +979,25 @@ L_AlreadyClean:
 
 // ------------------------------ Warp to Cave 9 ----------------------------------------
 
-025-3.gat,138,160,0	script	#WarpBattleCave9	45,1,1,{
+025-3.gat,138,160,0|script|#WarpBattleCave9|45,1,1,{
 
-    if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped;
-    if (getareausers("025-4.gat", 144, 192, 173, 226) >= 1 || $@battlecave9 > 0) goto L_SomeoneInside;
-    if (cavefights & BATTLE_CAVE9) goto L_AlreadyDone;
-    if (Rossy_Quest < 15) goto L_Block;
+    if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED)
+        goto L_AlreadyHelped;
+    if (getareausers("025-4.gat", 144, 192, 173, 226) >= 1 || $@battlecave9 > 0)
+        goto L_SomeoneInside;
+    if (cavefights & BATTLE_CAVE9)
+        goto L_AlreadyDone;
+    if (Rossy_Quest < 15)
+        goto L_Block;
 
 L_StartFight:
     set $@battlecave9, 1;
     warp "025-4.gat", 157, 222;
     set $@cave9fighter$, strcharinfo(0);
     set $@cave9fighterdeaths, PC_DIE_COUNTER;
-    startnpctimer;
     set $@cave9start, gettimetick(2);
     message strcharinfo(0), "As you enter, you feel an evil force filling up the cave.";
+    startnpctimer;
     end;
 
 L_SomeoneInside:
@@ -917,24 +1017,33 @@ L_Block:
     end;
 
 OnTimer5000:
-    if ($@battlecave9 == 0) goto L_AlreadyClean;
-    if (isloggedin(getcharid(3,$@cave9fighter$))==0) goto L_CleaningNorid;
+    if ($@battlecave9 == 0)
+        goto L_AlreadyClean;
+    if (isloggedin(getcharid(3,$@cave9fighter$))==0)
+        goto L_CleaningNorid;
     attachrid(getcharid(3,$@cave9fighter$));
-    if (getareausers("025-4.gat", 144, 192, 173, 226) < 1) goto L_Ranaway;
-    if (PC_DIE_COUNTER > $@cave9fighterdeaths) goto L_CleaningDead;
-    if (cavefights & BATTLE_CAVE9) goto L_Win;
-    if (gettimetick(2) - $@cave9start >= $@CAVE9_TIME) goto L_Cleaning;
+    if (getareausers("025-4.gat", 144, 192, 173, 226) < 1)
+        goto L_Ranaway;
+    if (PC_DIE_COUNTER > $@cave9fighterdeaths)
+        goto L_CleaningDead;
+    if (cavefights & BATTLE_CAVE9)
+        goto L_Win;
+    if (gettimetick(2) - $@cave9start >= $@CAVE9_TIME)
+        goto L_Cleaning;
     setnpctimer 0;
     end;
 
 L_Win:
     attachrid(getcharid(3,$@cave9fighter$));
     message strcharinfo(0), "It is getting harder to breathe inside this cave... You feel like you are almost passing out.";
-    if ((gettimetick(2) - $@cave9start) < 60) set $@cave9start, $@cave9start + 60;
-    if (Hp - (MaxHp*5)/100 <= 0) goto L_BadAir;
+    if ((gettimetick(2) - $@cave9start) < 60)
+        set $@cave9start, $@cave9start + 60;
+    if (Hp - (MaxHp*5)/100 <= 0)
+        goto L_BadAir;
     percentheal -5, 0;
     set $@cave9_timer, $@cave9_timer + 5;
-    if ($@cave9_timer >= 60) goto L_BadAir;
+    if ($@cave9_timer >= 60)
+        goto L_BadAir;
     setnpctimer 0;
     end;
 
@@ -993,22 +1102,36 @@ 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) end; 
-    if (Rossy_Quest == 16) goto L_AlreadyHelped;
+025-3.gat,77,170,0|script|#WarpBossCave|45,1,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 || $@battlecave10 > 0) goto L_SomeoneInside;
-    if (@barrier_force == 0) goto L_StartFight;
+    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 || $@battlecave10 > 0)
+        goto L_SomeoneInside;
+    if (@barrier_force == 0)
+        goto L_StartFight;
     end;
 
 L_Hurt:
@@ -1023,8 +1146,8 @@ L_StartFight:
     warp "025-4.gat", 157, 44;
     set $@cave10fighter$, strcharinfo(0);
     set $@cave10fighterdeaths, PC_DIE_COUNTER;
-    startnpctimer;
     set $@cave10start, gettimetick(2);
+    startnpctimer;
     end;
 
 L_SomeoneInside:
@@ -1037,24 +1160,33 @@ L_AlreadyHelped:
     end;
 
 OnTimer5000:
-    if ($@battlecave10 == 0) goto L_AlreadyClean;
-    if (isloggedin(getcharid(3,$@cave10fighter$))==0) goto L_CleaningNorid;
+    if ($@battlecave10 == 0)
+        goto L_AlreadyClean;
+    if (isloggedin(getcharid(3,$@cave10fighter$))==0)
+        goto L_CleaningNorid;
     attachrid(getcharid(3,$@cave10fighter$));
-    if (getareausers("025-4.gat", 142, 24, 172, 48) < 1) goto L_Ranaway;
-    if (PC_DIE_COUNTER > $@cave10fighterdeaths) goto L_CleaningDead;
-    if (Rossy_Quest == 16) goto L_Win;
-    if (gettimetick(2) - $@cave10start >= $@CAVE10_TIME) goto L_Cleaning;
+    if (getareausers("025-4.gat", 142, 24, 172, 48) < 1)
+        goto L_Ranaway;
+    if (PC_DIE_COUNTER > $@cave10fighterdeaths)
+        goto L_CleaningDead;
+    if (Rossy_Quest == 16)
+        goto L_Win;
+    if (gettimetick(2) - $@cave10start >= $@CAVE10_TIME)
+        goto L_Cleaning;
     setnpctimer 0;
     end;
 
 L_Win:
     attachrid(getcharid(3,$@cave10fighter$));
     message strcharinfo(0), "It is getting harder to breathe inside this cave... You feel like you are almost passing out.";
-    if ((gettimetick(2) - $@cave10start) < 60) set $@cave10start, $@cave10start + 60;
-    if (Hp - (MaxHp*5)/100 <= 0) goto L_BadAir;
+    if ((gettimetick(2) - $@cave10start) < 60)
+        set $@cave10start, $@cave10start + 60;
+    if (Hp - (MaxHp*5)/100 <= 0)
+        goto L_BadAir;
     percentheal -5, 0;
     set $@cave10_timer, $@cave10_timer + 5;
-    if ($@cave10_timer >= 60) goto L_BadAir;
+    if ($@cave10_timer >= 60)
+        goto L_BadAir;
     setnpctimer 0;
     end;
 
@@ -1092,8 +1224,10 @@ L_Cleaning:
 L_CleaningDead:
     attachrid(getcharid(3,$@cave10fighter$));
     warp "025-3.gat", 77, 168;
-    if ($@wave_cave10 < 5) message strcharinfo(0), "You were not strong enough to eliminate this power source.";
-    if ($@wave_cave10 == 5) message strcharinfo(0), "This horrible monster is probably too powerful for you right now.";
+    if ($@wave_cave10 < 5)
+        message strcharinfo(0), "You were not strong enough to eliminate this power source.";
+    if ($@wave_cave10 == 5)
+        message strcharinfo(0), "This horrible monster is probably too powerful for you right now.";
     callsub S_Cleaning;
     end;
 
-- 
cgit v1.2.3-70-g09d2


From 5362f0739c124be81a8724a8759e20ef4d07e1aa Mon Sep 17 00:00:00 2001
From: coffee <coffee@coffee-EP45-UD3L.(none)>
Date: Sat, 3 Sep 2011 10:03:13 -0300
Subject: Reviews the way the script checks for a rid attached.

---
 world/map/npc/025-3/barriers.txt    | 182 ++++++++++--------------------------
 world/map/npc/025-4/battlecaves.txt |  68 +++++++++++---
 2 files changed, 104 insertions(+), 146 deletions(-)

(limited to 'world/map/npc/025-3/barriers.txt')

diff --git a/world/map/npc/025-3/barriers.txt b/world/map/npc/025-3/barriers.txt
index 28148ab0..7c13d7c0 100644
--- a/world/map/npc/025-3/barriers.txt
+++ b/world/map/npc/025-3/barriers.txt
@@ -41,11 +41,10 @@ L_Block:
 OnTimer5000:
     if ($@battlecave1 == 0)
         goto L_AlreadyClean;
-    if (isloggedin(getcharid(3,$@cave1fighter$))==0)
-        goto L_CleaningNorid;
-    attachrid(getcharid(3,$@cave1fighter$));
+    if (attachrid(getcharid(3,$@cave1fighter$))==0)
+        goto OnNoRid;
     if (getareausers("025-4.gat", 26, 63, 60, 97) < 1)
-        goto L_Ranaway;
+        goto OnNoRid;
     if (PC_DIE_COUNTER > $@cave1fighterdeaths)
         goto L_CleaningDead;
     if (cavefights & BATTLE_CAVE1)
@@ -56,7 +55,6 @@ OnTimer5000:
     end;
 
 L_Win:
-    attachrid(getcharid(3,$@cave1fighter$));
     message strcharinfo(0), "It is getting harder to breathe inside this cave... You feel like you are almost passing out.";
     if ((gettimetick(2) - $@cave1start) < 60)
         set $@cave1start, $@cave1start + 60;
@@ -82,10 +80,6 @@ S_Cleaning:
     setnpctimer 0;
     return;
 
-L_Ranaway:
-    callsub S_Cleaning;
-    end;
-
 L_BadAir:
     warp "025-3.gat", 78, 129;
     message strcharinfo(0), "You can't stand the foul air inside the cave and run away!";
@@ -93,25 +87,23 @@ L_BadAir:
     end;
 
 L_Cleaning:
-    attachrid(getcharid(3,$@cave1fighter$));
     warp "025-3.gat", 78, 129;
     message strcharinfo(0), "You took too much time to eliminate this source of energy... If you stay one more second in this cave you won't be able to breathe....";
     callsub S_Cleaning;
     end;
 
 L_CleaningDead:
-    attachrid(getcharid(3,$@cave1fighter$));
     warp "025-3.gat", 78, 129;
     message strcharinfo(0), "You were not strong enough to eliminate this power source.";
     callsub S_Cleaning;
     end;
 
-L_CleaningNorid:
+OnNoRid:
     callsub S_Cleaning;
     end;
 
 OnGetout:
-    attachrid(getcharid(3,$@cave1fighter$));
+    if (attachrid(getcharid(3,$@cave1fighter$)) == 0) goto OnNoRid;
     warp "025-3.gat", 78, 129;
     callsub S_Cleaning;
     end;
@@ -164,11 +156,10 @@ L_Block:
 OnTimer5000:
     if ($@battlecave2 == 0)
         goto L_AlreadyClean;
-    if (isloggedin(getcharid(3,$@cave2fighter$))==0)
-        goto L_CleaningNorid;
-    attachrid(getcharid(3,$@cave2fighter$));
+    if (attachrid(getcharid(3,$@cave2fighter$))==0)
+        goto OnNoRid;
     if (getareausers("025-4.gat", 97, 62, 126, 96) < 1)
-        goto L_Ranaway;
+        goto OnNoRid;
     if (PC_DIE_COUNTER > $@cave2fighterdeaths)
         goto L_CleaningDead;
     if (cavefights & BATTLE_CAVE2)
@@ -179,7 +170,6 @@ OnTimer5000:
     end;
 
 L_Win:
-    attachrid(getcharid(3,$@cave2fighter$));
     message strcharinfo(0), "It is getting harder to breathe inside this cave... You feel like you are almost passing out.";
     if ((gettimetick(2) - $@cave2start) < 60)
         set $@cave2start, $@cave2start + 60;
@@ -205,10 +195,6 @@ S_Cleaning:
     setnpctimer 0;
     return;
 
-L_Ranaway:
-    callsub S_Cleaning;
-    end;
-
 L_BadAir:
     warp "025-3.gat", 53, 109;
     message strcharinfo(0), "You can't stand the foul air inside the cave and run away!";
@@ -216,25 +202,23 @@ L_BadAir:
     end;
 
 L_Cleaning:
-    attachrid(getcharid(3,$@cave2fighter$));
     warp "025-3.gat", 53, 109;
     message strcharinfo(0), "You took too much time to eliminate this source of energy... If you stay one more second in this cave you won't be able to breathe....";
     callsub S_Cleaning;
     end;
 
 L_CleaningDead:
-    attachrid(getcharid(3,$@cave2fighter$));
     warp "025-3.gat", 53, 109;
     message strcharinfo(0), "You were not strong enough to eliminate this power source.";
     callsub S_Cleaning;
     end;
 
-L_CleaningNorid:
+OnNoRid:
     callsub S_Cleaning;
     end;
 
 OnGetout:
-    attachrid(getcharid(3,$@cave2fighter$));
+    if (attachrid(getcharid(3,$@cave2fighter$)) == 0) goto OnNoRid;
     warp "025-3.gat", 53, 109;
     callsub S_Cleaning;
     end;
@@ -286,11 +270,10 @@ L_Block:
 OnTimer5000:
     if ($@battlecave3 == 0)
         goto L_AlreadyClean;
-    if (isloggedin(getcharid(3,$@cave3fighter$))==0)
-        goto L_CleaningNorid;
-    attachrid(getcharid(3,$@cave3fighter$));
+    if (attachrid(getcharid(3,$@cave3fighter$))==0)
+        goto OnNoRid;
     if (getareausers("025-4.gat", 150, 84, 177, 117) < 1)
-        goto L_Ranaway;
+        goto OnNoRid;
     if (cavefights & BATTLE_CAVE3)
         goto L_Win;
     if (PC_DIE_COUNTER > $@cave3fighterdeaths)
@@ -301,7 +284,6 @@ OnTimer5000:
     end;
 
 L_Win:
-    attachrid(getcharid(3,$@cave3fighter$));
     message strcharinfo(0), "It is getting harder to breathe inside this cave... You feel like you are almost passing out.";
     if ((gettimetick(2) - $@cave3start) < 60)
         set $@cave3start, $@cave3start + 60;
@@ -327,10 +309,6 @@ S_Cleaning:
     setnpctimer 0;
     return;
 
-L_Ranaway:
-    callsub S_Cleaning;
-    end;
-
 L_BadAir:
     warp "025-3.gat", 71, 85;
     message strcharinfo(0), "You can't stand the foul air inside the cave and run away!";
@@ -338,25 +316,23 @@ L_BadAir:
     end;
 
 L_Cleaning:
-    attachrid(getcharid(3,$@cave3fighter$));
     warp "025-3.gat", 71, 85;
     message strcharinfo(0), "You took too much time to eliminate this source of energy... If you stay one more second in this cave you won't be able to breathe....";
     callsub S_Cleaning;
     end;
 
 L_CleaningDead:
-    attachrid(getcharid(3,$@cave3fighter$));
     warp "025-3.gat", 71, 85;
     message strcharinfo(0), "You were not strong enough to eliminate this power source.";
     callsub S_Cleaning;
     end;
 
-L_CleaningNorid:
+OnNoRid:
     callsub S_Cleaning;
     end;
 
 OnGetout:
-    attachrid(getcharid(3,$@cave3fighter$));
+    if (attachrid(getcharid(3,$@cave3fighter$)) == 0) goto OnNoRid;
     warp "025-3.gat", 71, 85;
     callsub S_Cleaning;
     end;
@@ -408,11 +384,10 @@ L_Block:
 OnTimer5000:
     if ($@battlecave4 == 0)
         goto L_AlreadyClean;
-    if (isloggedin(getcharid(3,$@cave4fighter$))==0)
-        goto L_CleaningNorid;
-    attachrid(getcharid(3,$@cave4fighter$));
+    if (attachrid(getcharid(3,$@cave4fighter$))==0)
+        goto OnNoRid;
     if (getareausers("025-4.gat", 28, 124, 57, 156) < 1)
-        goto L_Ranaway;
+        goto OnNoRid;
     if (PC_DIE_COUNTER > $@cave4fighterdeaths)
         goto L_CleaningDead;
     if (cavefights & BATTLE_CAVE4)
@@ -423,7 +398,6 @@ OnTimer5000:
     end;
 
 L_Win:
-    attachrid(getcharid(3,$@cave4fighter$));
     message strcharinfo(0), "It is getting harder to breathe inside this cave... You feel like you are almost passing out.";
     if ((gettimetick(2) - $@cave4start) < 60)
         set $@cave4start, $@cave4start + 60;
@@ -449,10 +423,6 @@ S_Cleaning:
     setnpctimer 0;
     return;
 
-L_Ranaway:
-    callsub S_Cleaning;
-    end;
-
 L_BadAir:
     warp "025-3.gat", 80, 85;
     message strcharinfo(0), "You can't stand the foul air inside the cave and run away!";
@@ -460,25 +430,23 @@ L_BadAir:
     end;
 
 L_Cleaning:
-    attachrid(getcharid(3,$@cave4fighter$));
     warp "025-3.gat", 80, 85;
     message strcharinfo(0), "You took too much time to eliminate this source of energy... If you stay one more second in this cave you won't be able to breathe....";
     callsub S_Cleaning;
     end;
 
 L_CleaningDead:
-    attachrid(getcharid(3,$@cave4fighter$));
     warp "025-3.gat", 80, 85;
     message strcharinfo(0), "You were not strong enough to eliminate this power source.";
     callsub S_Cleaning;
     end;
 
-L_CleaningNorid:
+OnNoRid:
     callsub S_Cleaning;
     end;
 
 OnGetout:
-    attachrid(getcharid(3,$@cave4fighter$));
+    if (attachrid(getcharid(3,$@cave4fighter$)) == 0) goto OnNoRid;
     warp "025-3.gat", 80, 85;
     callsub S_Cleaning;
     end;
@@ -530,11 +498,10 @@ L_Block:
 OnTimer5000:
     if ($@battlecave5 == 0)
         goto L_AlreadyClean;
-    if (isloggedin(getcharid(3,$@cave5fighter$))==0)
-        goto L_CleaningNorid;
-    attachrid(getcharid(3,$@cave5fighter$));
+    if (attachrid(getcharid(3,$@cave5fighter$))==0)
+        goto OnNoRid;
     if (getareausers("025-4.gat", 91, 131, 124, 160) < 1)
-        goto L_Ranaway;
+        goto OnNoRid;
     if (PC_DIE_COUNTER > $@cave5fighterdeaths)
         goto L_CleaningDead;
     if (cavefights & BATTLE_CAVE5)
@@ -545,7 +512,6 @@ OnTimer5000:
     end;
 
 L_Win:
-    attachrid(getcharid(3,$@cave5fighter$));
     message strcharinfo(0), "It is getting harder to breathe inside this cave... You feel like you are almost passing out.";
     if ((gettimetick(2) - $@cave5start) < 60)
         set $@cave5start, $@cave5start + 60;
@@ -571,10 +537,6 @@ S_Cleaning:
     setnpctimer 0;
     return;
 
-L_Ranaway:
-    callsub S_Cleaning;
-    end;
-
 L_BadAir:
     warp "025-3.gat", 71, 32;
     message strcharinfo(0), "You can't stand the foul air inside the cave and run away!";
@@ -582,25 +544,23 @@ L_BadAir:
     end;
 
 L_Cleaning:
-    attachrid(getcharid(3,$@cave5fighter$));
     warp "025-3.gat", 71, 32;
     message strcharinfo(0), "You took too much time to eliminate this source of energy... If you stay one more second in this cave you won't be able to breathe....";
     callsub S_Cleaning;
     end;
 
 L_CleaningDead:
-    attachrid(getcharid(3,$@cave5fighter$));
     warp "025-3.gat", 71, 32;
     message strcharinfo(0), "You were not strong enough to eliminate this power source.";
     callsub S_Cleaning;
     end;
 
-L_CleaningNorid:
+OnNoRid:
     callsub S_Cleaning;
     end;
 
 OnGetout:
-    attachrid(getcharid(3,$@cave5fighter$));
+    if (attachrid(getcharid(3,$@cave5fighter$)) == 0) goto OnNoRid;
     warp "025-3.gat", 71, 32;
     callsub S_Cleaning;
     end;
@@ -652,11 +612,10 @@ L_Block:
 OnTimer5000:
     if ($@battlecave6 == 0)
         goto L_AlreadyClean;
-    if (isloggedin(getcharid(3,$@cave6fighter$))==0)
-        goto L_CleaningNorid;
-    attachrid(getcharid(3,$@cave6fighter$));
+    if (attachrid(getcharid(3,$@cave6fighter$))==0)
+        goto OnNoRid;
     if (getareausers("025-4.gat", 153, 143, 178, 174) < 1)
-        goto L_Ranaway;
+        goto OnNoRid;
     if (PC_DIE_COUNTER > $@cave6fighterdeaths)
         goto L_CleaningDead;
     if (cavefights & BATTLE_CAVE6)
@@ -667,7 +626,6 @@ OnTimer5000:
     end;
 
 L_Win:
-    attachrid(getcharid(3,$@cave6fighter$));
     message strcharinfo(0), "It is getting harder to breathe inside this cave... You feel like you are almost passing out.";
     if ((gettimetick(2) - $@cave6start) < 60)
         set $@cave6start, $@cave6start + 60;
@@ -693,10 +651,6 @@ S_Cleaning:
     setnpctimer 0;
     return;
 
-L_Ranaway:
-    callsub S_Cleaning;
-    end;
-
 L_BadAir:
     warp "025-3.gat", 128, 37;
     message strcharinfo(0), "You can't stand the foul air inside the cave and run away!";
@@ -704,25 +658,23 @@ L_BadAir:
     end;
 
 L_Cleaning:
-    attachrid(getcharid(3,$@cave6fighter$));
     warp "025-3.gat", 128, 37;
     message strcharinfo(0), "You took too much time to eliminate this source of energy... If you stay one more second in this cave you won't be able to breathe....";
     callsub S_Cleaning;
     end;
 
 L_CleaningDead:
-    attachrid(getcharid(3,$@cave6fighter$));
     warp "025-3.gat", 128, 37;
     message strcharinfo(0), "You were not strong enough to eliminate this power source.";
     callsub S_Cleaning;
     end;
 
-L_CleaningNorid:
+OnNoRid:
     callsub S_Cleaning;
     end;
 
 OnGetout:
-    attachrid(getcharid(3,$@cave6fighter$));
+    if (attachrid(getcharid(3,$@cave6fighter$)) == 0) goto OnNoRid;
     warp "025-3.gat", 128, 37;
     callsub S_Cleaning;
     end;
@@ -774,11 +726,10 @@ L_Block:
 OnTimer5000:
     if ($@battlecave7 == 0)
         goto L_AlreadyClean;
-    if (isloggedin(getcharid(3,$@cave7fighter$))==0)
-        goto L_CleaningNorid;
-    attachrid(getcharid(3,$@cave7fighter$));
+    if (attachrid(getcharid(3,$@cave7fighter$))==0)
+        goto OnNoRid;
     if (getareausers("025-4.gat", 27, 185, 61, 219) < 1)
-        goto L_Ranaway;
+        goto OnNoRid;
     if (PC_DIE_COUNTER > $@cave7fighterdeaths)
         goto L_CleaningDead;
     if (cavefights & BATTLE_CAVE7)
@@ -789,7 +740,6 @@ OnTimer5000:
     end;
 
 L_Win:
-    attachrid(getcharid(3,$@cave7fighter$));
     message strcharinfo(0), "It is getting harder to breathe inside this cave... You feel like you are almost passing out.";
     if ((gettimetick(2) - $@cave7start) < 60)
         set $@cave7start, $@cave7start + 60;
@@ -815,10 +765,6 @@ S_Cleaning:
     setnpctimer 0;
     return;
 
-L_Ranaway:
-    callsub S_Cleaning;
-    end;
-
 L_BadAir:
     warp "025-3.gat", 70, 59;
     message strcharinfo(0), "You can't stand the foul air inside the cave and run away!";
@@ -826,25 +772,23 @@ L_BadAir:
     end;
 
 L_Cleaning:
-    attachrid(getcharid(3,$@cave7fighter$));
     warp "025-3.gat", 70, 59;
     message strcharinfo(0), "You took too much time to eliminate this source of energy... If you stay one more second in this cave you won't be able to breathe....";
     callsub S_Cleaning;
     end;
 
 L_CleaningDead:
-    attachrid(getcharid(3,$@cave7fighter$));
     warp "025-3.gat", 70, 59;
     message strcharinfo(0), "You were not strong enough to eliminate this power source.";
     callsub S_Cleaning;
     end;
 
-L_CleaningNorid:
+OnNoRid:
     callsub S_Cleaning;
     end;
 
 OnGetout:
-    attachrid(getcharid(3,$@cave7fighter$));
+    if (attachrid(getcharid(3,$@cave7fighter$)) == 0) goto OnNoRid;
     warp "025-3.gat", 70, 59;
     callsub S_Cleaning;
     end;
@@ -896,11 +840,10 @@ L_Block:
 OnTimer5000:
     if ($@battlecave8 == 0)
         goto L_AlreadyClean;
-    if (isloggedin(getcharid(3,$@cave8fighter$))==0)
-        goto L_CleaningNorid;
-    attachrid(getcharid(3,$@cave8fighter$));
+    if (attachrid(getcharid(3,$@cave8fighter$))==0)
+        goto OnNoRid;
     if (getareausers("025-4.gat", 90, 193, 119, 216) < 1)
-        goto L_Ranaway;
+        goto OnNoRid;
     if (PC_DIE_COUNTER > $@cave8fighterdeaths)
         goto L_CleaningDead;
     if (cavefights & BATTLE_CAVE8)
@@ -911,7 +854,6 @@ OnTimer5000:
     end;
 
 L_Win:
-    attachrid(getcharid(3,$@cave8fighter$));
     message strcharinfo(0), "It is getting harder to breathe inside this cave... You feel like you are almost passing out.";
     if ((gettimetick(2) - $@cave8start) < 60)
         set $@cave8start, $@cave8start + 60;
@@ -937,10 +879,6 @@ S_Cleaning:
     setnpctimer 0;
     return;
 
-L_Ranaway:
-    callsub S_Cleaning;
-    end;
-
 L_BadAir:
     warp "025-3.gat", 138, 94;
     message strcharinfo(0), "You can't stand the foul air inside the cave and run away!";
@@ -948,25 +886,23 @@ L_BadAir:
     end;
 
 L_Cleaning:
-    attachrid(getcharid(3,$@cave8fighter$));
     warp "025-3.gat", 138, 94;
     message strcharinfo(0), "You took too much time to eliminate this source of energy... If you stay one more second in this cave you won't be able to breathe....";
     callsub S_Cleaning;
     end;
 
 L_CleaningDead:
-    attachrid(getcharid(3,$@cave8fighter$));
     warp "025-3.gat", 138, 94;
     message strcharinfo(0), "You were not strong enough to eliminate this power source.";
     callsub S_Cleaning;
     end;
 
-L_CleaningNorid:
+OnNoRid:
     callsub S_Cleaning;
     end;
 
 OnGetout:
-    attachrid(getcharid(3,$@cave8fighter$));
+    if (attachrid(getcharid(3,$@cave8fighter$)) == 0) goto OnNoRid;
     warp "025-3.gat", 138, 94;
     callsub S_Cleaning;
     end;
@@ -1019,11 +955,10 @@ L_Block:
 OnTimer5000:
     if ($@battlecave9 == 0)
         goto L_AlreadyClean;
-    if (isloggedin(getcharid(3,$@cave9fighter$))==0)
-        goto L_CleaningNorid;
-    attachrid(getcharid(3,$@cave9fighter$));
+    if (attachrid(getcharid(3,$@cave9fighter$))==0)
+        goto OnNoRid;
     if (getareausers("025-4.gat", 144, 192, 173, 226) < 1)
-        goto L_Ranaway;
+        goto OnNoRid;
     if (PC_DIE_COUNTER > $@cave9fighterdeaths)
         goto L_CleaningDead;
     if (cavefights & BATTLE_CAVE9)
@@ -1034,7 +969,6 @@ OnTimer5000:
     end;
 
 L_Win:
-    attachrid(getcharid(3,$@cave9fighter$));
     message strcharinfo(0), "It is getting harder to breathe inside this cave... You feel like you are almost passing out.";
     if ((gettimetick(2) - $@cave9start) < 60)
         set $@cave9start, $@cave9start + 60;
@@ -1060,10 +994,6 @@ S_Cleaning:
     setnpctimer 0;
     return;
 
-L_Ranaway:
-    callsub S_Cleaning;
-    end;
-
 L_BadAir:
     warp "025-3.gat", 138, 158;
     message strcharinfo(0), "You can't stand the foul air inside the cave and run away!";
@@ -1071,25 +1001,23 @@ L_BadAir:
     end;
 
 L_Cleaning:
-    attachrid(getcharid(3,$@cave9fighter$));
     warp "025-3.gat", 138, 158;
     message strcharinfo(0), "You took too much time to eliminate this source of energy... If you stay one more second in this cave you won't be able to breathe....";
     callsub S_Cleaning;
     end;
 
 L_CleaningDead:
-    attachrid(getcharid(3,$@cave9fighter$));
     warp "025-3.gat", 138, 158;
     message strcharinfo(0), "You were not strong enough to eliminate this power source.";
     callsub S_Cleaning;
     end;
 
-L_CleaningNorid:
+OnNoRid:
     callsub S_Cleaning;
     end;
 
 OnGetout:
-    attachrid(getcharid(3,$@cave9fighter$));
+    if (attachrid(getcharid(3,$@cave9fighter$)) == 0) goto OnNoRid;
     warp "025-3.gat", 138, 158;
     callsub S_Cleaning;
     end;
@@ -1162,11 +1090,10 @@ L_AlreadyHelped:
 OnTimer5000:
     if ($@battlecave10 == 0)
         goto L_AlreadyClean;
-    if (isloggedin(getcharid(3,$@cave10fighter$))==0)
-        goto L_CleaningNorid;
-    attachrid(getcharid(3,$@cave10fighter$));
+    if (attachrid(getcharid(3,$@cave10fighter$))==0)
+        goto OnNoRid;
     if (getareausers("025-4.gat", 142, 24, 172, 48) < 1)
-        goto L_Ranaway;
+        goto OnNoRid;
     if (PC_DIE_COUNTER > $@cave10fighterdeaths)
         goto L_CleaningDead;
     if (Rossy_Quest == 16)
@@ -1177,7 +1104,6 @@ OnTimer5000:
     end;
 
 L_Win:
-    attachrid(getcharid(3,$@cave10fighter$));
     message strcharinfo(0), "It is getting harder to breathe inside this cave... You feel like you are almost passing out.";
     if ((gettimetick(2) - $@cave10start) < 60)
         set $@cave10start, $@cave10start + 60;
@@ -1204,10 +1130,6 @@ S_Cleaning:
     setnpctimer 0;
     return;
 
-L_Ranaway:
-    callsub S_Cleaning;
-    end;
-
 L_BadAir:
     warp "025-4.gat", 93, 33;
     message strcharinfo(0), "You can't stand the foul air inside the cave and run as fast as you can to save Julia!";
@@ -1215,14 +1137,12 @@ L_BadAir:
     end;
 
 L_Cleaning:
-    attachrid(getcharid(3,$@cave10fighter$));
     warp "025-3.gat", 77, 168;
     message strcharinfo(0), "You took too much time to eliminate this source of energy... If you stay one more second in this cave you won't be able to breathe....";
     callsub S_Cleaning;
     end;
 
 L_CleaningDead:
-    attachrid(getcharid(3,$@cave10fighter$));
     warp "025-3.gat", 77, 168;
     if ($@wave_cave10 < 5)
         message strcharinfo(0), "You were not strong enough to eliminate this power source.";
@@ -1231,18 +1151,18 @@ L_CleaningDead:
     callsub S_Cleaning;
     end;
 
-L_CleaningNorid:
+OnNoRid:
     callsub S_Cleaning;
     end;
 
 OnGetout:
-    attachrid(getcharid(3,$@cave10fighter$));
+    if (attachrid(getcharid(3,$@cave10fighter$)) == 0) goto OnNoRid;
     warp "025-3.gat", 77, 168;
     callsub S_Cleaning;
     end;
 
 OnWin:
-    attachrid(getcharid(3,$@cave10fighter$));
+    if (attachrid(getcharid(3,$@cave10fighter$)) == 0) goto OnNoRid;
     warp "025-4.gat", 93, 33;
     callsub S_Cleaning;
     end;
diff --git a/world/map/npc/025-4/battlecaves.txt b/world/map/npc/025-4/battlecaves.txt
index 89a16305..5b6d50fd 100644
--- a/world/map/npc/025-4/battlecaves.txt
+++ b/world/map/npc/025-4/battlecaves.txt
@@ -36,10 +36,14 @@ L_Summon:
     set $@cave1_loop, 0;
     end;
 
+L_Abort:
+    donpcevent "#WarpBattleCave1::OnNoRid";
+    end;
+
 L_Done:
     set $@wave_cave1, $@wave_cave1 + 1;
     set $@cave1_kills, 0;
-    attachrid(getcharid(3,$@cave1fighter$));
+    if (attachrid(getcharid(3,$@cave1fighter$)) == 0) goto L_Abort;
 // Here you can define the messages to be shown for the players on the beginning of each wave.
 // Remember to adjust the number of conditionals according to the number of waves.
 
@@ -188,10 +192,14 @@ L_Summon:
     set $@cave2_loop, 0;
     end;
 
+L_Abort:
+    donpcevent "#WarpBattleCave2::OnNoRid";
+    end;
+
 L_Done:
     set $@wave_cave2, $@wave_cave2 + 1;
     set $@cave2_kills, 0;
-    attachrid(getcharid(3,$@cave2fighter$));
+    if (attachrid(getcharid(3,$@cave2fighter$)) == 0) goto L_Abort;
 
 // Here you can define the messages to be shown for the players on the beginning of each wave.
 // Remember to adjust the number of conditionals according to the number of waves.
@@ -266,10 +274,14 @@ L_Summon:
     set $@cave3_loop, 0;
     end;
 
+L_Abort:
+    donpcevent "#WarpBattleCave3::OnNoRid";
+    end;
+
 L_Done:
     set $@wave_cave3, $@wave_cave3 + 1;
     set $@cave3_kills, 0;
-    attachrid(getcharid(3,$@cave3fighter$));
+    if (attachrid(getcharid(3,$@cave3fighter$)) == 0) goto L_Abort;
 
 // Here you can define the messages to be shown for the players on the beginning of each wave.
 // Remember to adjust the number of conditionals according to the number of waves.
@@ -345,10 +357,14 @@ L_Summon:
     set $@cave4_loop, 0;
     end;
 
+L_Abort:
+    donpcevent "#WarpBattleCave4::OnNoRid";
+    end;
+
 L_Done:
     set $@wave_cave4, $@wave_cave4 + 1;
     set $@cave4_kills, 0;
-    attachrid(getcharid(3,$@cave4fighter$));
+    if (attachrid(getcharid(3,$@cave4fighter$)) == 0) goto L_Abort;
 
 // Here you can define the messages to be shown for the players on the beginning of each wave.
 // Remember to adjust the number of conditionals according to the number of waves.
@@ -427,10 +443,14 @@ L_Summon:
     set $@cave5_loop, 0;
     end;
 
+L_Abort:
+    donpcevent "#WarpBattleCave5::OnNoRid";
+    end;
+
 L_Done:
     set $@wave_cave5, $@wave_cave5 + 1;
     set $@cave5_kills, 0;
-    attachrid(getcharid(3,$@cave5fighter$));
+    if (attachrid(getcharid(3,$@cave5fighter$)) == 0) goto L_Abort;
 
 // Here you can define the messages to be shown for the players on the beginning of each wave.
 // Remember to adjust the number of conditionals according to the number of waves.
@@ -509,10 +529,14 @@ L_Summon:
     set $@cave6_loop, 0;
     end;
 
+L_Abort:
+    donpcevent "#WarpBattleCave6::OnNoRid";
+    end;
+
 L_Done:
     set $@wave_cave6, $@wave_cave6 + 1;
     set $@cave6_kills, 0;
-    attachrid(getcharid(3,$@cave6fighter$));
+    if (attachrid(getcharid(3,$@cave6fighter$)) == 0) goto L_Abort;
 
 // Here you can define the messages to be shown for the players on the beginning of each wave.
 // Remember to adjust the number of conditionals according to the number of waves.
@@ -591,10 +615,14 @@ L_Summon:
     set $@cave7_loop, 0;
     end;
 
+L_Abort:
+    donpcevent "#WarpBattleCave7::OnNoRid";
+    end;
+
 L_Done:
     set $@wave_cave7, $@wave_cave7 + 1;
     set $@cave7_kills, 0;
-    attachrid(getcharid(3,$@cave7fighter$));
+    if (attachrid(getcharid(3,$@cave7fighter$)) == 0) goto L_Abort;
 
 // Here you can define the messages to be shown for the players on the beginning of each wave.
 // Remember to adjust the number of conditionals according to the number of waves.
@@ -675,10 +703,14 @@ L_Summon:
     set $@cave8_loop, 0;
     end;
 
+L_Abort:
+    donpcevent "#WarpBattleCave8::OnNoRid";
+    end;
+
 L_Done:
     set $@wave_cave8, $@wave_cave8 + 1;
     set $@cave8_kills, 0;
-    attachrid(getcharid(3,$@cave8fighter$));
+    if (attachrid(getcharid(3,$@cave8fighter$)) == 0) goto L_Abort;
 
 // Here you can define the messages to be shown for the players on the beginning of each wave.
 // Remember to adjust the number of conditionals according to the number of waves.
@@ -759,10 +791,14 @@ L_Summon:
     set $@cave9_loop, 0;
     end;
 
+L_Abort:
+    donpcevent "#WarpBattleCave9::OnNoRid";
+    end;
+
 L_Done:
     set $@wave_cave9, $@wave_cave9 + 1;
     set $@cave9_kills, 0;
-    attachrid(getcharid(3,$@cave9fighter$));
+    if (attachrid(getcharid(3,$@cave9fighter$)) == 0) goto L_Abort;
 
 // Here you can define the messages to be shown for the players on the beginning of each wave.
 // Remember to adjust the number of conditionals according to the number of waves.
@@ -840,16 +876,20 @@ L_Summon:
     end;
 
 L_SummonBoss:
-    attachrid(getcharid(3,$@cave10fighter$));
+    if (attachrid(getcharid(3,$@cave10fighter$)) == 0) goto L_Abort;
     areamonster "025-4.gat",142, 24, 172, 48,"",$@BOSS,1,"#StartBossCaveFight::OnBossDeath";
     stopnpctimer;
     setnpctimer 0;
     end;
 
+L_Abort:
+    donpcevent "#WarpBattleCave10::OnNoRid";
+    end;
+
 L_Done:
     set $@wave_cave10, $@wave_cave10 + 1;
     set $@cave10_kills, 0;
-    attachrid(getcharid(3,$@cave10fighter$));
+    if (attachrid(getcharid(3,$@cave10fighter$)) == 0) goto L_Abort;
 
 // Here you can define the messages to be shown for the players on the beginning of each wave.
 // Remember to adjust the number of conditionals according to the number of waves.
@@ -884,9 +924,7 @@ L_CleaningNorid:
     end;
 
 OnTimer4000:
-    if (isloggedin(getcharid(3,$@cave10fighter$))==0)
-        goto L_CleaningNorid;
-    attachrid(getcharid(3,$@cave10fighter$));
+    if (attachrid(getcharid(3,$@cave10fighter$)) == 0) goto L_Abort;
     set @boss, @boss + 1;
     if (@boss == 1)
         message strcharinfo(0), "You feel something strange... Looks like something terrible is about to show up in this cave.";
@@ -902,7 +940,7 @@ OnMonsterDeath:
     end;
 
 OnBossDeath:
-    attachrid(getcharid(3,$@cave10fighter$));
+    if (attachrid(getcharid(3,$@cave10fighter$)) == 0) goto L_Abort;
     message strcharinfo(0), "What a harsh battle... You should hurry and save Julia!";
     set Rossy_Quest, 16;
     getexp 100000, 0;
-- 
cgit v1.2.3-70-g09d2


From 5d6648783880c02170d70cf8d3758141d93229a2 Mon Sep 17 00:00:00 2001
From: coffee <coffee@coffee-EP45-UD3L.(none)>
Date: Wed, 7 Sep 2011 09:06:04 -0300
Subject: In Rossy quest, sets values when you enter the caves and clean them
 when you get out. Changes some temporary variable names.

---
 world/map/npc/025-3/barriers.txt    | 112 +++++++++++++++++++++++---
 world/map/npc/025-4/battlecaves.txt | 154 ++++++++++--------------------------
 2 files changed, 143 insertions(+), 123 deletions(-)

(limited to 'world/map/npc/025-3/barriers.txt')

diff --git a/world/map/npc/025-3/barriers.txt b/world/map/npc/025-3/barriers.txt
index 7c13d7c0..0d5236d2 100644
--- a/world/map/npc/025-3/barriers.txt
+++ b/world/map/npc/025-3/barriers.txt
@@ -19,6 +19,11 @@ L_StartFight:
     set $@cave1fighterdeaths, PC_DIE_COUNTER;
     set $@cave1start, gettimetick(2);
     message strcharinfo(0), "As you enter, you feel an evil force filling up the cave.";
+    // Cave 1 Configuration.
+    setarray $@cave1_monsters_IDS[1], 1087, 1084;
+    setarray $@cave1_monsters_QTY[1], 3, 3;
+    set $@cave1_waves, 1;
+    set $@cave1_time, 180;
     startnpctimer;
     end;
 
@@ -49,7 +54,7 @@ OnTimer5000:
         goto L_CleaningDead;
     if (cavefights & BATTLE_CAVE1)
         goto L_Win;
-    if (gettimetick(2) - $@cave1start >= $@CAVE1_TIME)
+    if (gettimetick(2) - $@cave1start >= $@cave1_time)
         goto L_Cleaning;
     setnpctimer 0;
     end;
@@ -75,6 +80,10 @@ S_Cleaning:
     set $@cave1fighter$, "";
     set $@cave1fighterdeaths$, 0;
     set $@battlecave1, 0;
+    cleararray $@cave1_monsters_IDS[0], 0, 2;
+    cleararray $@cave1_monsters_QTY[0], 0, 2;
+    set $@cave1_waves, 0;
+    set $@cave1_time, 0;
     killmonster "025-4.gat", "#StartCaveFight1::OnMonsterDeath";
     stopnpctimer;
     setnpctimer 0;
@@ -134,6 +143,11 @@ L_StartFight:
     set $@cave2fighterdeaths, PC_DIE_COUNTER;
     set $@cave2start, gettimetick(2);
     message strcharinfo(0), "As you enter, you feel an evil force filling up the cave.";
+    // Cave 2 Configuration.
+    setarray $@cave2_monsters_IDS[1], 1083, 1084;
+    setarray $@cave2_monsters_QTY[1], 3, 4;
+    set $@cave2_waves, 1;
+    set $@cave2_time, 210;
     startnpctimer;
     end;
 
@@ -164,7 +178,7 @@ OnTimer5000:
         goto L_CleaningDead;
     if (cavefights & BATTLE_CAVE2)
         goto L_Win;
-    if (gettimetick(2) - $@cave2start >= $@CAVE2_TIME)
+    if (gettimetick(2) - $@cave2start >= $@cave2_time)
         goto L_Cleaning;
     setnpctimer 0;
     end;
@@ -190,6 +204,10 @@ S_Cleaning:
     set $@cave2fighter$, "";
     set $@cave2fighterdeaths$, 0;
     set $@battlecave2, 0;
+    cleararray $@cave2_monsters_IDS[0], 0, 2;
+    cleararray $@cave2_monsters_QTY[0], 0, 2;
+    set $@cave2_waves, 0;
+    set $@cave2_time, 0;
     killmonster "025-4.gat", "#StartCaveFight2::OnMonsterDeath";
     stopnpctimer;
     setnpctimer 0;
@@ -248,6 +266,11 @@ L_StartFight:
     set $@cave3fighterdeaths, PC_DIE_COUNTER;
     set $@cave3start, gettimetick(2);
     message strcharinfo(0), "As you enter, you feel an evil force filling up the cave.";
+    // Cave 3 Configuration.
+    setarray $@cave3_monsters_IDS[1], 1088, 1083;
+    setarray $@cave3_monsters_QTY[1], 4, 4;
+    set $@cave3_waves, 1;
+    set $@cave3_time, 240;
     startnpctimer;
     end;
 
@@ -278,7 +301,7 @@ OnTimer5000:
         goto L_Win;
     if (PC_DIE_COUNTER > $@cave3fighterdeaths)
         goto L_CleaningDead;
-    if (gettimetick(2) - $@cave3start >= $@CAVE3_TIME)
+    if (gettimetick(2) - $@cave3start >= $@cave3_time)
         goto L_Cleaning;
     setnpctimer 0;
     end;
@@ -304,6 +327,10 @@ S_Cleaning:
     set $@cave3fighter$, "";
     set $@cave3fighterdeaths$, 0;
     set $@battlecave3, 0;
+    cleararray $@cave3_monsters_IDS[0], 0, 2;
+    cleararray $@cave3_monsters_QTY[0], 0, 2;
+    set $@cave3_waves, 0;
+    set $@cave3_time, 0;
     killmonster "025-4.gat", "#StartCaveFight3::OnMonsterDeath";
     stopnpctimer;
     setnpctimer 0;
@@ -362,6 +389,11 @@ L_StartFight:
     set $@cave4fighterdeaths, PC_DIE_COUNTER;
     set $@cave4start, gettimetick(2);
     message strcharinfo(0), "As you enter, you feel an evil force filling up the cave.";
+    // Cave 4 Configuration.
+    setarray $@cave4_monsters_IDS[1], 1087, 1083, 1084;
+    setarray $@cave4_monsters_QTY[1], 2, 2, 4;
+    set $@cave4_waves, 2;
+    set $@cave4_time, 360;
     startnpctimer;
     end;
 
@@ -392,7 +424,7 @@ OnTimer5000:
         goto L_CleaningDead;
     if (cavefights & BATTLE_CAVE4)
         goto L_Win;
-    if (gettimetick(2) - $@cave4start >= $@CAVE4_TIME)
+    if (gettimetick(2) - $@cave4start >= $@cave4_time)
         goto L_Cleaning;
     setnpctimer 0;
     end;
@@ -418,6 +450,10 @@ S_Cleaning:
     set $@cave4fighter$, "";
     set $@cave4fighterdeaths$, 0;
     set $@battlecave4, 0;
+    cleararray $@cave4_monsters_IDS[0], 0, 3;
+    cleararray $@cave4_monsters_QTY[0], 0, 3;
+    set $@cave4_waves, 0;
+    set $@cave4_time, 0;
     killmonster "025-4.gat", "#StartCaveFight4::OnMonsterDeath";
     stopnpctimer;
     setnpctimer 0;
@@ -476,6 +512,11 @@ L_StartFight:
     set $@cave5fighterdeaths, PC_DIE_COUNTER;
     set $@cave5start, gettimetick(2);
     message strcharinfo(0), "As you enter, you feel an evil force filling up the cave.";
+    // Cave 5 Configuration.
+    setarray $@cave5_monsters_IDS[1], 1088, 1083, 1084;
+    setarray $@cave5_monsters_QTY[1], 3, 3, 3;
+    set $@cave5_waves, 2;
+    set $@cave5_time, 390;
     startnpctimer;
     end;
 
@@ -506,7 +547,7 @@ OnTimer5000:
         goto L_CleaningDead;
     if (cavefights & BATTLE_CAVE5)
         goto L_Win;
-    if (gettimetick(2) - $@cave5start >= $@CAVE5_TIME)
+    if (gettimetick(2) - $@cave5start >= $@cave5_time)
         goto L_Cleaning;
     setnpctimer 0;
     end;
@@ -532,6 +573,10 @@ S_Cleaning:
     set $@cave5fighter$, "";
     set $@cave5fighterdeaths$, 0;
     set $@battlecave5, 0;
+    cleararray $@cave5_monsters_IDS[0], 0, 3;
+    cleararray $@cave5_monsters_QTY[0], 0, 3;
+    set $@cave5_waves, 0;
+    set $@cave5_time, 0;
     killmonster "025-4.gat", "#StartCaveFight5::OnMonsterDeath";
     stopnpctimer;
     setnpctimer 0;
@@ -590,6 +635,11 @@ L_StartFight:
     set $@cave6fighterdeaths, PC_DIE_COUNTER;
     set $@cave6start, gettimetick(2);
     message strcharinfo(0), "As you enter, you feel an evil force filling up the cave.";
+    // Cave 6 Configuration.
+    setarray $@cave6_monsters_IDS[1], 1087, 1088, 1083;
+    setarray $@cave6_monsters_QTY[1], 3, 4, 4;
+    set $@cave6_waves, 2;
+    set $@cave6_time, 450;
     startnpctimer;
     end;
 
@@ -620,7 +670,7 @@ OnTimer5000:
         goto L_CleaningDead;
     if (cavefights & BATTLE_CAVE6)
         goto L_Win;
-    if (gettimetick(2) - $@cave6start >= $@CAVE6_TIME)
+    if (gettimetick(2) - $@cave6start >= $@cave6_time)
         goto L_Cleaning;
     setnpctimer 0;
     end;
@@ -646,6 +696,10 @@ S_Cleaning:
     set $@cave6fighter$, "";
     set $@cave6fighterdeaths$, 0;
     set $@battlecave6, 0;
+    cleararray $@cave6_monsters_IDS[0], 0, 3;
+    cleararray $@cave6_monsters_QTY[0], 0, 3;
+    set $@cave6_waves, 0;
+    set $@cave6_time, 0;
     killmonster "025-4.gat", "#StartCaveFight6::OnMonsterDeath";
     stopnpctimer;
     setnpctimer 0;
@@ -704,6 +758,11 @@ L_StartFight:
     set $@cave7fighterdeaths, PC_DIE_COUNTER;
     set $@cave7start, gettimetick(2);
     message strcharinfo(0), "As you enter, you feel an evil force filling up the cave.";
+    // Cave 7 Configuration.
+    setarray $@cave7_monsters_IDS[1], 1087, 1088, 1083, 1084;
+    setarray $@cave7_monsters_QTY[1], 2, 2, 2, 2;
+    set $@cave7_waves, 3;
+    set $@cave7_time, 540;
     startnpctimer;
     end;
 
@@ -734,7 +793,7 @@ OnTimer5000:
         goto L_CleaningDead;
     if (cavefights & BATTLE_CAVE7)
         goto L_Win;
-    if (gettimetick(2) - $@cave7start >= $@CAVE7_TIME)
+    if (gettimetick(2) - $@cave7start >= $@cave7_time)
         goto L_Cleaning;
     setnpctimer 0;
     end;
@@ -760,6 +819,10 @@ S_Cleaning:
     set $@cave7fighter$, "";
     set $@cave7fighterdeaths$, 0;
     set $@battlecave7, 0;
+    cleararray $@cave7_monsters_IDS[0], 0, 4;
+    cleararray $@cave7_monsters_QTY[0], 0, 4;
+    set $@cave7_waves, 0;
+    set $@cave7_time, 0;
     killmonster "025-4.gat", "#StartCaveFight7::OnMonsterDeath";
     stopnpctimer;
     setnpctimer 0;
@@ -818,6 +881,11 @@ L_StartFight:
     set $@cave8fighterdeaths, PC_DIE_COUNTER;
     set $@cave8start, gettimetick(2);
     message strcharinfo(0), "As you enter, you feel an evil force filling up the cave.";
+    // Cave 8 Configuration.
+    setarray $@cave8_monsters_IDS[1], 1087, 1088, 1083, 1084;
+    setarray $@cave8_monsters_QTY[1], 2, 2, 3, 3;
+    set $@cave8_waves, 3;
+    set $@cave8_time, 570;
     startnpctimer;
     end;
 
@@ -848,7 +916,7 @@ OnTimer5000:
         goto L_CleaningDead;
     if (cavefights & BATTLE_CAVE8)
         goto L_Win;
-    if (gettimetick(2) - $@cave8start >= $@CAVE8_TIME)
+    if (gettimetick(2) - $@cave8start >= $@cave8_time)
         goto L_Cleaning;
     setnpctimer 0;
     end;
@@ -874,6 +942,10 @@ S_Cleaning:
     set $@cave8fighter$, "";
     set $@cave8fighterdeaths$, 0;
     set $@battlecave8, 0;
+    cleararray $@cave8_monsters_IDS[0], 0, 4;
+    cleararray $@cave8_monsters_QTY[0], 0, 4;
+    set $@cave8_waves, 0;
+    set $@cave8_time, 0;
     killmonster "025-4.gat", "#StartCaveFight8::OnMonsterDeath";
     stopnpctimer;
     setnpctimer 0;
@@ -933,6 +1005,11 @@ L_StartFight:
     set $@cave9fighterdeaths, PC_DIE_COUNTER;
     set $@cave9start, gettimetick(2);
     message strcharinfo(0), "As you enter, you feel an evil force filling up the cave.";
+    // Cave 9 Configuration.
+    setarray $@cave9_monsters_IDS[1], 1087, 1088, 1083, 1084;
+    setarray $@cave9_monsters_QTY[1], 3, 3, 3, 3;
+    set $@cave9_waves, 3;
+    set $@cave9_time, 630;
     startnpctimer;
     end;
 
@@ -963,7 +1040,7 @@ OnTimer5000:
         goto L_CleaningDead;
     if (cavefights & BATTLE_CAVE9)
         goto L_Win;
-    if (gettimetick(2) - $@cave9start >= $@CAVE9_TIME)
+    if (gettimetick(2) - $@cave9start >= $@cave9_time)
         goto L_Cleaning;
     setnpctimer 0;
     end;
@@ -989,6 +1066,10 @@ S_Cleaning:
     set $@cave9fighter$, "";
     set $@cave9fighterdeaths$, 0;
     set $@battlecave9, 0;
+    cleararray $@cave9_monsters_IDS[0], 0, 4;
+    cleararray $@cave9_monsters_QTY[0], 0, 4;
+    set $@cave9_waves, 0;
+    set $@cave9_time, 0;
     killmonster "025-4.gat", "#StartCaveFight9::OnMonsterDeath";
     stopnpctimer;
     setnpctimer 0;
@@ -1075,6 +1156,12 @@ L_StartFight:
     set $@cave10fighter$, strcharinfo(0);
     set $@cave10fighterdeaths, PC_DIE_COUNTER;
     set $@cave10start, gettimetick(2);
+    // Cave 10 Configuration.
+    setarray $@cave10_monsters_IDS[1], 1087, 1088, 1083, 1084;
+    setarray $@cave10_monsters_QTY[1], 3, 3, 3, 3;
+    set $@cave10_boss_ID, 1086;
+    set $@cave10_waves, 4;
+    set $@cave10_time, 1080;
     startnpctimer;
     end;
 
@@ -1098,7 +1185,7 @@ OnTimer5000:
         goto L_CleaningDead;
     if (Rossy_Quest == 16)
         goto L_Win;
-    if (gettimetick(2) - $@cave10start >= $@CAVE10_TIME)
+    if (gettimetick(2) - $@cave10start >= $@cave10_time)
         goto L_Cleaning;
     setnpctimer 0;
     end;
@@ -1124,6 +1211,11 @@ S_Cleaning:
     set $@cave10fighter$, "";
     set $@cave10fighterdeaths$, 0;
     set $@battlecave10, 0;
+    cleararray $@cave10_monsters_IDS[0], 0, 4;
+    cleararray $@cave10_monsters_QTY[0], 0, 4;
+    set $@cave10_boss_ID, 0;
+    set $@cave10_waves, 0;
+    set $@cave10_time, 0;
     killmonster "025-4.gat", "#StartBossCaveFight::OnMonsterDeath";
     killmonster "025-4.gat", "#StartBossCaveFight::OnBossDeath";
     stopnpctimer;
diff --git a/world/map/npc/025-4/battlecaves.txt b/world/map/npc/025-4/battlecaves.txt
index ccc54c40..86924518 100644
--- a/world/map/npc/025-4/battlecaves.txt
+++ b/world/map/npc/025-4/battlecaves.txt
@@ -30,8 +30,8 @@ L_Start:
 
 L_Summon:
     set $@cave1_loop, $@cave1_loop + 1;
-    areamonster "025-4.gat",26,63,60,97,"",$@CAVE1_MONSTERS_IDS[$@cave1_loop],$@CAVE1_MONSTERS_QTY[$@cave1_loop],"#StartCaveFight1::OnMonsterDeath";
-    if ($@cave1_loop <= getarraysize($@CAVE1_MONSTERS_IDS))
+    areamonster "025-4.gat",26,63,60,97,"",$@cave1_monsters_IDS[$@cave1_loop],$@cave1_monsters_QTY[$@cave1_loop],"#StartCaveFight1::OnMonsterDeath";
+    if ($@cave1_loop <= getarraysize($@cave1_monsters_IDS))
         goto L_Summon;
     set $@cave1_loop, 0;
     end;
@@ -50,14 +50,14 @@ L_Done:
     if ($@wave_cave1 == 1)
         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)
+    if ($@wave_cave1 < $@cave1_waves)
         goto L_Summon;
     set cavefights, (cavefights | BATTLE_CAVE1);
     end;
 
 OnMonsterDeath:
     set $@cave1_kills, $@cave1_kills + 1;
-    if ($@cave1_kills >= $@CAVE1_MONSTERS_QTY[1] + $@CAVE1_MONSTERS_QTY[2] + $@CAVE1_MONSTERS_QTY[3] + $@CAVE1_MONSTERS_QTY[4])
+    if ($@cave1_kills >= $@cave1_monsters_QTY[1] + $@cave1_monsters_QTY[2] + $@cave1_monsters_QTY[3] + $@cave1_monsters_QTY[4])
         goto L_Done;
     end;
 
@@ -68,78 +68,6 @@ L_no_root:
     mes "I don't have any roots in my inventory!";
     close;
 
-onInit:
-// Cave 1 Configuration.
-
-    setarray $@CAVE1_MONSTERS_IDS[1], 1087, 1084;
-    setarray $@CAVE1_MONSTERS_QTY[1], 3, 3;
-    set $@CAVE1_WAVES, 1;
-    set $@CAVE1_TIME, 180;
-
-// Cave 2 Configuration.
-
-    setarray $@CAVE2_MONSTERS_IDS[1], 1083, 1084;
-    setarray $@CAVE2_MONSTERS_QTY[1], 3, 4;
-    set $@CAVE2_WAVES, 1;
-    set $@CAVE2_TIME, 210;
-
-// Cave 3 Configuration.
-
-    setarray $@CAVE3_MONSTERS_IDS[1], 1088, 1083;
-    setarray $@CAVE3_MONSTERS_QTY[1], 4, 4;
-    set $@CAVE3_WAVES, 1;
-    set $@CAVE3_TIME, 240;
-
-// Cave 4 Configuration.
-
-    setarray $@CAVE4_MONSTERS_IDS[1], 1087, 1083, 1084;
-    setarray $@CAVE4_MONSTERS_QTY[1], 2, 2, 4;
-    set $@CAVE4_WAVES, 2;
-    set $@CAVE4_TIME, 360;
-
-// Cave 5 Configuration.
-
-    setarray $@CAVE5_MONSTERS_IDS[1], 1088, 1083, 1084;
-    setarray $@CAVE5_MONSTERS_QTY[1], 3, 3, 3;
-    set $@CAVE5_WAVES, 2;
-    set $@CAVE5_TIME, 390;
-
-// Cave 6 Configuration.
-
-    setarray $@CAVE6_MONSTERS_IDS[1], 1087, 1088, 1083;
-    setarray $@CAVE6_MONSTERS_QTY[1], 3, 4, 4;
-    set $@CAVE6_WAVES, 2;
-    set $@CAVE6_TIME, 450;
-
-// Cave 7 Configuration.
-
-    setarray $@CAVE7_MONSTERS_IDS[1], 1087, 1088, 1083, 1084;
-    setarray $@CAVE7_MONSTERS_QTY[1], 2, 2, 2, 2;
-    set $@CAVE7_WAVES, 3;
-    set $@CAVE7_TIME, 540;
-
-// Cave 8 Configuration.
-
-    setarray $@CAVE8_MONSTERS_IDS[1], 1087, 1088, 1083, 1084;
-    setarray $@CAVE8_MONSTERS_QTY[1], 2, 2, 3, 3;
-    set $@CAVE8_WAVES, 3;
-    set $@CAVE8_TIME, 570;
-
-// Cave 9 Configuration.
-
-    setarray $@CAVE9_MONSTERS_IDS[1], 1087, 1088, 1083, 1084;
-    setarray $@CAVE9_MONSTERS_QTY[1], 3, 3, 3, 3;
-    set $@CAVE9_WAVES, 3;
-    set $@CAVE9_TIME, 630;
-
-// Cave 10 Configuration.
-
-    setarray $@CAVE10_MONSTERS_IDS[1], 1087, 1088, 1083, 1084;
-    setarray $@CAVE10_MONSTERS_QTY[1], 3, 3, 3, 3;
-    set $@BOSS, 1086;
-    set $@CAVE10_WAVES, 4;
-    set $@CAVE10_TIME, 1080;
-
 }
 
 // ---------------------  Cave 1 Checker  ----------------------------
@@ -186,8 +114,8 @@ L_Start:
 
 L_Summon:
     set $@cave2_loop, $@cave2_loop + 1;
-    areamonster "025-4.gat",97, 62, 126, 96,"",$@CAVE2_MONSTERS_IDS[$@cave2_loop],$@CAVE2_MONSTERS_QTY[$@cave2_loop],"#StartCaveFight2::OnMonsterDeath";
-    if ($@cave2_loop <= getarraysize($@CAVE2_MONSTERS_IDS))
+    areamonster "025-4.gat",97, 62, 126, 96,"",$@cave2_monsters_IDS[$@cave2_loop],$@cave2_monsters_QTY[$@cave2_loop],"#StartCaveFight2::OnMonsterDeath";
+    if ($@cave2_loop <= getarraysize($@cave2_monsters_IDS))
         goto L_Summon;
     set $@cave2_loop, 0;
     end;
@@ -207,14 +135,14 @@ L_Done:
     if ($@wave_cave2 == 1)
         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)
+    if ($@wave_cave2 < $@cave2_waves)
         goto L_Summon;
     set cavefights, (cavefights | BATTLE_CAVE2);
     end;
 
 OnMonsterDeath:
     set $@cave2_kills, $@cave2_kills + 1;
-    if ($@cave2_kills >= $@CAVE2_MONSTERS_QTY[1] + $@CAVE2_MONSTERS_QTY[2] + $@CAVE2_MONSTERS_QTY[3] + $@CAVE2_MONSTERS_QTY[4])
+    if ($@cave2_kills >= $@cave2_monsters_QTY[1] + $@cave2_monsters_QTY[2] + $@cave2_monsters_QTY[3] + $@cave2_monsters_QTY[4])
         goto L_Done;
     end;
 
@@ -268,8 +196,8 @@ L_Start:
 
 L_Summon:
     set $@cave3_loop, $@cave3_loop + 1;
-    areamonster "025-4.gat",150, 84, 177, 117,"",$@CAVE3_MONSTERS_IDS[$@cave3_loop],$@CAVE3_MONSTERS_QTY[$@cave3_loop],"#StartCaveFight3::OnMonsterDeath";
-    if ($@cave3_loop <= getarraysize($@CAVE3_MONSTERS_IDS))
+    areamonster "025-4.gat",150, 84, 177, 117,"",$@cave3_monsters_IDS[$@cave3_loop],$@cave3_monsters_QTY[$@cave3_loop],"#StartCaveFight3::OnMonsterDeath";
+    if ($@cave3_loop <= getarraysize($@cave3_monsters_IDS))
         goto L_Summon;
     set $@cave3_loop, 0;
     end;
@@ -289,14 +217,14 @@ L_Done:
     if ($@wave_cave3 == 1)
         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)
+    if ($@wave_cave3 < $@cave3_waves)
         goto L_Summon;
     set cavefights, (cavefights | BATTLE_CAVE3);
     end;
 
 OnMonsterDeath:
     set $@cave3_kills, $@cave3_kills + 1;
-    if ($@cave3_kills >= $@CAVE3_MONSTERS_QTY[1] + $@CAVE3_MONSTERS_QTY[2] + $@CAVE3_MONSTERS_QTY[3] + $@CAVE3_MONSTERS_QTY[4])
+    if ($@cave3_kills >= $@cave3_monsters_QTY[1] + $@cave3_monsters_QTY[2] + $@cave3_monsters_QTY[3] + $@cave3_monsters_QTY[4])
         goto L_Done;
     end;
 
@@ -351,8 +279,8 @@ L_Start:
 
 L_Summon:
     set $@cave4_loop, $@cave4_loop + 1;
-    areamonster "025-4.gat",28, 124, 57, 156,"",$@CAVE4_MONSTERS_IDS[$@cave4_loop],$@CAVE4_MONSTERS_QTY[$@cave4_loop],"#StartCaveFight4::OnMonsterDeath";
-    if ($@cave4_loop <= getarraysize($@CAVE4_MONSTERS_IDS))
+    areamonster "025-4.gat",28, 124, 57, 156,"",$@cave4_monsters_IDS[$@cave4_loop],$@cave4_monsters_QTY[$@cave4_loop],"#StartCaveFight4::OnMonsterDeath";
+    if ($@cave4_loop <= getarraysize($@cave4_monsters_IDS))
         goto L_Summon;
     set $@cave4_loop, 0;
     end;
@@ -374,14 +302,14 @@ L_Done:
     if ($@wave_cave4 == 2)
         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)
+    if ($@wave_cave4 < $@cave4_waves)
         goto L_Summon;
     set cavefights, (cavefights | BATTLE_CAVE4);
     end;
 
 OnMonsterDeath:
     set $@cave4_kills, $@cave4_kills + 1;
-    if ($@cave4_kills >= $@CAVE4_MONSTERS_QTY[1] + $@CAVE4_MONSTERS_QTY[2] + $@CAVE4_MONSTERS_QTY[3] + $@CAVE4_MONSTERS_QTY[4])
+    if ($@cave4_kills >= $@cave4_monsters_QTY[1] + $@cave4_monsters_QTY[2] + $@cave4_monsters_QTY[3] + $@cave4_monsters_QTY[4])
         goto L_Done;
     end;
 
@@ -437,8 +365,8 @@ L_Start:
 
 L_Summon:
     set $@cave5_loop, $@cave5_loop + 1;
-    areamonster "025-4.gat",91, 131, 124, 160,"",$@CAVE5_MONSTERS_IDS[$@cave5_loop],$@CAVE5_MONSTERS_QTY[$@cave5_loop],"#StartCaveFight5::OnMonsterDeath";
-    if ($@cave5_loop <= getarraysize($@CAVE5_MONSTERS_IDS))
+    areamonster "025-4.gat",91, 131, 124, 160,"",$@cave5_monsters_IDS[$@cave5_loop],$@cave5_monsters_QTY[$@cave5_loop],"#StartCaveFight5::OnMonsterDeath";
+    if ($@cave5_loop <= getarraysize($@cave5_monsters_IDS))
         goto L_Summon;
     set $@cave5_loop, 0;
     end;
@@ -460,14 +388,14 @@ L_Done:
     if ($@wave_cave5 == 2)
         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)
+    if ($@wave_cave5 < $@cave5_waves)
         goto L_Summon;
     set cavefights, (cavefights | BATTLE_CAVE5);
     end;
 
 OnMonsterDeath:
     set $@cave5_kills, $@cave5_kills + 1;
-    if ($@cave5_kills >= $@CAVE5_MONSTERS_QTY[1] + $@CAVE5_MONSTERS_QTY[2] + $@CAVE5_MONSTERS_QTY[3] + $@CAVE5_MONSTERS_QTY[4])
+    if ($@cave5_kills >= $@cave5_monsters_QTY[1] + $@cave5_monsters_QTY[2] + $@cave5_monsters_QTY[3] + $@cave5_monsters_QTY[4])
         goto L_Done;
     end;
 
@@ -523,8 +451,8 @@ L_Start:
 
 L_Summon:
     set $@cave6_loop, $@cave6_loop + 1;
-    areamonster "025-4.gat",153, 143, 178, 174,"",$@CAVE6_MONSTERS_IDS[$@cave6_loop],$@CAVE6_MONSTERS_QTY[$@cave6_loop],"#StartCaveFight6::OnMonsterDeath";
-    if ($@cave6_loop <= getarraysize($@CAVE6_MONSTERS_IDS))
+    areamonster "025-4.gat",153, 143, 178, 174,"",$@cave6_monsters_IDS[$@cave6_loop],$@cave6_monsters_QTY[$@cave6_loop],"#StartCaveFight6::OnMonsterDeath";
+    if ($@cave6_loop <= getarraysize($@cave6_monsters_IDS))
         goto L_Summon;
     set $@cave6_loop, 0;
     end;
@@ -546,14 +474,14 @@ L_Done:
     if ($@wave_cave6 == 2)
         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)
+    if ($@wave_cave6 < $@cave6_waves)
         goto L_Summon;
     set cavefights, (cavefights | BATTLE_CAVE6);
     end;
 
 OnMonsterDeath:
     set $@cave6_kills, $@cave6_kills + 1;
-    if ($@cave6_kills >= $@CAVE6_MONSTERS_QTY[1] + $@CAVE6_MONSTERS_QTY[2] + $@CAVE6_MONSTERS_QTY[3] + $@CAVE6_MONSTERS_QTY[4])
+    if ($@cave6_kills >= $@cave6_monsters_QTY[1] + $@cave6_monsters_QTY[2] + $@cave6_monsters_QTY[3] + $@cave6_monsters_QTY[4])
         goto L_Done;
     end;
 
@@ -609,8 +537,8 @@ L_Start:
 
 L_Summon:
     set $@cave7_loop, $@cave7_loop + 1;
-    areamonster "025-4.gat",27, 185, 61, 219,"",$@CAVE7_MONSTERS_IDS[$@cave7_loop],$@CAVE7_MONSTERS_QTY[$@cave7_loop],"#StartCaveFight7::OnMonsterDeath";
-    if ($@cave7_loop <= getarraysize($@CAVE7_MONSTERS_IDS))
+    areamonster "025-4.gat",27, 185, 61, 219,"",$@cave7_monsters_IDS[$@cave7_loop],$@cave7_monsters_QTY[$@cave7_loop],"#StartCaveFight7::OnMonsterDeath";
+    if ($@cave7_loop <= getarraysize($@cave7_monsters_IDS))
         goto L_Summon;
     set $@cave7_loop, 0;
     end;
@@ -634,14 +562,14 @@ L_Done:
     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)
+    if ($@wave_cave7 < $@cave7_waves)
         goto L_Summon;
     set cavefights, (cavefights | BATTLE_CAVE7);
     end;
 
 OnMonsterDeath:
     set $@cave7_kills, $@cave7_kills + 1;
-    if ($@cave7_kills >= $@CAVE7_MONSTERS_QTY[1] + $@CAVE7_MONSTERS_QTY[2] + $@CAVE7_MONSTERS_QTY[3] + $@CAVE7_MONSTERS_QTY[4])
+    if ($@cave7_kills >= $@cave7_monsters_QTY[1] + $@cave7_monsters_QTY[2] + $@cave7_monsters_QTY[3] + $@cave7_monsters_QTY[4])
         goto L_Done;
     end;
 
@@ -697,8 +625,8 @@ L_Start:
 
 L_Summon:
     set $@cave8_loop, $@cave8_loop + 1;
-    areamonster "025-4.gat",90, 193, 119, 216,"",$@CAVE8_MONSTERS_IDS[$@cave8_loop],$@CAVE8_MONSTERS_QTY[$@cave8_loop],"#StartCaveFight8::OnMonsterDeath";
-    if ($@cave8_loop <= getarraysize($@CAVE8_MONSTERS_IDS))
+    areamonster "025-4.gat",90, 193, 119, 216,"",$@cave8_monsters_IDS[$@cave8_loop],$@cave8_monsters_QTY[$@cave8_loop],"#StartCaveFight8::OnMonsterDeath";
+    if ($@cave8_loop <= getarraysize($@cave8_monsters_IDS))
         goto L_Summon;
     set $@cave8_loop, 0;
     end;
@@ -722,14 +650,14 @@ L_Done:
     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)
+    if ($@wave_cave8 < $@cave8_waves)
         goto L_Summon;
     set cavefights, (cavefights | BATTLE_CAVE8);
     end;
 
 OnMonsterDeath:
     set $@cave8_kills, $@cave8_kills + 1;
-    if ($@cave8_kills >= $@CAVE8_MONSTERS_QTY[1] + $@CAVE8_MONSTERS_QTY[2] + $@CAVE8_MONSTERS_QTY[3] + $@CAVE8_MONSTERS_QTY[4])
+    if ($@cave8_kills >= $@cave8_monsters_QTY[1] + $@cave8_monsters_QTY[2] + $@cave8_monsters_QTY[3] + $@cave8_monsters_QTY[4])
         goto L_Done;
     end;
 
@@ -785,8 +713,8 @@ L_Start:
 
 L_Summon:
     set $@cave9_loop, $@cave9_loop + 1;
-    areamonster "025-4.gat",144, 192, 173, 226,"",$@CAVE9_MONSTERS_IDS[$@cave9_loop],$@CAVE9_MONSTERS_QTY[$@cave9_loop],"#StartCaveFight9::OnMonsterDeath";
-    if ($@cave9_loop <= getarraysize($@CAVE9_MONSTERS_IDS))
+    areamonster "025-4.gat",144, 192, 173, 226,"",$@cave9_monsters_IDS[$@cave9_loop],$@cave9_monsters_QTY[$@cave9_loop],"#StartCaveFight9::OnMonsterDeath";
+    if ($@cave9_loop <= getarraysize($@cave9_monsters_IDS))
         goto L_Summon;
     set $@cave9_loop, 0;
     end;
@@ -810,14 +738,14 @@ L_Done:
     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)
+    if ($@wave_cave9 < $@cave9_waves)
         goto L_Summon;
     set cavefights, (cavefights | BATTLE_CAVE9);
     end;
 
 OnMonsterDeath:
     set $@cave9_kills, $@cave9_kills + 1;
-    if ($@cave9_kills >= $@CAVE9_MONSTERS_QTY[1] + $@CAVE9_MONSTERS_QTY[2] + $@CAVE9_MONSTERS_QTY[3] + $@CAVE9_MONSTERS_QTY[4])
+    if ($@cave9_kills >= $@cave9_monsters_QTY[1] + $@cave9_monsters_QTY[2] + $@cave9_monsters_QTY[3] + $@cave9_monsters_QTY[4])
         goto L_Done;
     end;
 
@@ -869,15 +797,15 @@ L_Start:
 
 L_Summon:
     set $@cave10_loop, $@cave10_loop + 1;
-    areamonster "025-4.gat",142, 24, 172, 48,"",$@CAVE10_MONSTERS_IDS[$@cave10_loop],$@CAVE10_MONSTERS_QTY[$@cave10_loop],"#StartBossCaveFight::OnMonsterDeath";
-    if ($@cave10_loop <= getarraysize($@CAVE10_MONSTERS_IDS))
+    areamonster "025-4.gat",142, 24, 172, 48,"",$@cave10_monsters_IDS[$@cave10_loop],$@cave10_monsters_QTY[$@cave10_loop],"#StartBossCaveFight::OnMonsterDeath";
+    if ($@cave10_loop <= getarraysize($@cave10_monsters_IDS))
         goto L_Summon;
     set $@cave10_loop, 0;
     end;
 
 L_SummonBoss:
     if (attachrid(getcharid(3,$@cave10fighter$)) == 0) goto L_Abort;
-    areamonster "025-4.gat",142, 24, 172, 48,"",$@BOSS,1,"#StartBossCaveFight::OnBossDeath";
+    areamonster "025-4.gat",142, 24, 172, 48,"",$@cave10_boss_ID,1,"#StartBossCaveFight::OnBossDeath";
     stopnpctimer;
     setnpctimer 0;
     end;
@@ -903,7 +831,7 @@ L_Done:
     if ($@wave_cave10 == 4)
         message strcharinfo(0), "Finally! It seems I have defeated all of them!";
 
-    if ($@wave_cave10 < $@CAVE10_WAVES)
+    if ($@wave_cave10 < $@cave10_waves)
         goto L_Summon;
     set $@wave_cave10, 5;
     set @boss, 0;
@@ -922,7 +850,7 @@ OnTimer4000:
 
 OnMonsterDeath:
     set $@cave10_kills, $@cave10_kills + 1;
-    if ($@cave10_kills >= $@CAVE10_MONSTERS_QTY[1] + $@CAVE10_MONSTERS_QTY[2] + $@CAVE10_MONSTERS_QTY[3] + $@CAVE10_MONSTERS_QTY[4])
+    if ($@cave10_kills >= $@cave10_monsters_QTY[1] + $@cave10_monsters_QTY[2] + $@cave10_monsters_QTY[3] + $@cave10_monsters_QTY[4])
         goto L_Done;
     end;
 
-- 
cgit v1.2.3-70-g09d2