In Rossy quest, sets values when you enter the caves and clean them when you get out. Changes some temporary variable names.

2 files changed, 143 insertions, 123 deletions

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;