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

1 files changed, 102 insertions, 10 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;