Tab converting and reformating scripts related to the battlecaves in rossy quest.

1 files changed, 304 insertions, 170 deletions

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;