Fixes a bug that makes the script say you killed all the monsters in the beggining of the last wave

1 files changed, 20 insertions, 21 deletions

diff --git a/world/map/npc/025-4/battlecaves.txt b/world/map/npc/025-4/battlecaves.txt
index 456a92a2..8fffc869 100644
--- a/world/map/npc/025-4/battlecaves.txt
+++ b/world/map/npc/025-4/battlecaves.txt
@@ -27,13 +27,12 @@ L_Summon:
     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;
-    set $@wave_cave1, $@wave_cave1 + 1;
     end;
 
 L_Done:
+    set $@wave_cave1, $@wave_cave1 + 1;
     set $@cave1_kills, 0;
     attachrid(getcharid(3,$@cave1fighter$));
-
 // 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.
 
@@ -47,7 +46,7 @@ L_Done:
 
 OnMonsterDeath:
     set $@cave1_kills, $@cave1_kills + 1;
-    if ($@cave1_kills >= $@CAVE1_MONSTERS_QTY[1] + $@CAVE1_MONSTERS_QTY[2] + $@CAVE1_MONSTERS_QTY[3]) goto L_Done;
+    if ($@cave1_kills >= $@CAVE1_MONSTERS_QTY[1] + $@CAVE1_MONSTERS_QTY[2] + $@CAVE1_MONSTERS_QTY[3] + $@CAVE1_MONSTERS_QTY[4]) goto L_Done;
     end;
 
 L_Close:
@@ -172,10 +171,10 @@ L_Summon:
     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;
-    set $@wave_cave2, $@wave_cave2 + 1;
     end;
 
 L_Done:
+    set $@wave_cave2, $@wave_cave2 + 1;
     set $@cave2_kills, 0;
     attachrid(getcharid(3,$@cave2fighter$));
 
@@ -192,7 +191,7 @@ L_Done:
 
 OnMonsterDeath:
     set $@cave2_kills, $@cave2_kills + 1;
-    if ($@cave2_kills >= $@CAVE2_MONSTERS_QTY[1] + $@CAVE2_MONSTERS_QTY[2] + $@CAVE2_MONSTERS_QTY[3]) goto L_Done;
+    if ($@cave2_kills >= $@CAVE2_MONSTERS_QTY[1] + $@CAVE2_MONSTERS_QTY[2] + $@CAVE2_MONSTERS_QTY[3] + $@CAVE2_MONSTERS_QTY[4]) goto L_Done;
     end;
 
 L_Close:
@@ -242,10 +241,10 @@ L_Summon:
     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;
-    set $@wave_cave3, $@wave_cave3 + 1;
     end;
 
 L_Done:
+    set $@wave_cave3, $@wave_cave3 + 1;
     set $@cave3_kills, 0;
     attachrid(getcharid(3,$@cave3fighter$));
 
@@ -262,7 +261,7 @@ L_Done:
 
 OnMonsterDeath:
     set $@cave3_kills, $@cave3_kills + 1;
-    if ($@cave3_kills >= $@CAVE3_MONSTERS_QTY[1] + $@CAVE3_MONSTERS_QTY[2] + $@CAVE3_MONSTERS_QTY[3]) goto L_Done;
+    if ($@cave3_kills >= $@CAVE3_MONSTERS_QTY[1] + $@CAVE3_MONSTERS_QTY[2] + $@CAVE3_MONSTERS_QTY[3] + $@CAVE3_MONSTERS_QTY[4]) goto L_Done;
     end;
 
 L_Close:
@@ -312,10 +311,10 @@ L_Summon:
     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;
-    set $@wave_cave4, $@wave_cave4 + 1;
     end;
 
 L_Done:
+    set $@wave_cave4, $@wave_cave4 + 1;
     set $@cave4_kills, 0;
     attachrid(getcharid(3,$@cave4fighter$));
 
@@ -332,7 +331,7 @@ L_Done:
 
 OnMonsterDeath:
     set $@cave4_kills, $@cave4_kills + 1;
-    if ($@cave4_kills >= $@CAVE4_MONSTERS_QTY[1] + $@CAVE4_MONSTERS_QTY[2] + $@CAVE4_MONSTERS_QTY[3]) goto L_Done;
+    if ($@cave4_kills >= $@CAVE4_MONSTERS_QTY[1] + $@CAVE4_MONSTERS_QTY[2] + $@CAVE4_MONSTERS_QTY[3] + $@CAVE4_MONSTERS_QTY[4]) goto L_Done;
     end;
 
 L_Close:
@@ -383,10 +382,10 @@ L_Summon:
     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;
-    set $@wave_cave5, $@wave_cave5 + 1;
     end;
 
 L_Done:
+    set $@wave_cave5, $@wave_cave5 + 1;
     set $@cave5_kills, 0;
     attachrid(getcharid(3,$@cave5fighter$));
 
@@ -403,7 +402,7 @@ L_Done:
 
 OnMonsterDeath:
     set $@cave5_kills, $@cave5_kills + 1;
-    if ($@cave5_kills >= $@CAVE5_MONSTERS_QTY[1] + $@CAVE5_MONSTERS_QTY[2] + $@CAVE5_MONSTERS_QTY[3]) goto L_Done;
+    if ($@cave5_kills >= $@CAVE5_MONSTERS_QTY[1] + $@CAVE5_MONSTERS_QTY[2] + $@CAVE5_MONSTERS_QTY[3] + $@CAVE5_MONSTERS_QTY[4]) goto L_Done;
     end;
 
 L_Close:
@@ -454,10 +453,10 @@ L_Summon:
     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;
-    set $@wave_cave6, $@wave_cave6 + 1;
     end;
 
 L_Done:
+    set $@wave_cave6, $@wave_cave6 + 1;
     set $@cave6_kills, 0;
     attachrid(getcharid(3,$@cave6fighter$));
 
@@ -474,7 +473,7 @@ L_Done:
 
 OnMonsterDeath:
     set $@cave6_kills, $@cave6_kills + 1;
-    if ($@cave6_kills >= $@CAVE6_MONSTERS_QTY[1] + $@CAVE6_MONSTERS_QTY[2] + $@CAVE6_MONSTERS_QTY[3]) goto L_Done;
+    if ($@cave6_kills >= $@CAVE6_MONSTERS_QTY[1] + $@CAVE6_MONSTERS_QTY[2] + $@CAVE6_MONSTERS_QTY[3] + $@CAVE6_MONSTERS_QTY[4]) goto L_Done;
     end;
 
 L_Close:
@@ -526,10 +525,10 @@ L_Summon:
     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;
-    set $@wave_cave7, $@wave_cave7 + 1;
     end;
 
 L_Done:
+    set $@wave_cave7, $@wave_cave7 + 1;
     set $@cave7_kills, 0;
     attachrid(getcharid(3,$@cave7fighter$));
 
@@ -546,7 +545,7 @@ L_Done:
 
 OnMonsterDeath:
     set $@cave7_kills, $@cave7_kills + 1;
-    if ($@cave7_kills >= $@CAVE7_MONSTERS_QTY[1] + $@CAVE7_MONSTERS_QTY[2] + $@CAVE7_MONSTERS_QTY[3]) goto L_Done;
+    if ($@cave7_kills >= $@CAVE7_MONSTERS_QTY[1] + $@CAVE7_MONSTERS_QTY[2] + $@CAVE7_MONSTERS_QTY[3] + $@CAVE7_MONSTERS_QTY[4]) goto L_Done;
     end;
 
 L_Close:
@@ -598,10 +597,10 @@ L_Summon:
     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;
-    set $@wave_cave8, $@wave_cave8 + 1;
     end;
 
 L_Done:
+    set $@wave_cave8, $@wave_cave8 + 1;
     set $@cave8_kills, 0;
     attachrid(getcharid(3,$@cave8fighter$));
 
@@ -618,7 +617,7 @@ L_Done:
 
 OnMonsterDeath:
     set $@cave8_kills, $@cave8_kills + 1;
-    if ($@cave8_kills >= $@CAVE8_MONSTERS_QTY[1] + $@CAVE8_MONSTERS_QTY[2] + $@CAVE8_MONSTERS_QTY[3]) goto L_Done;
+    if ($@cave8_kills >= $@CAVE8_MONSTERS_QTY[1] + $@CAVE8_MONSTERS_QTY[2] + $@CAVE8_MONSTERS_QTY[3] + $@CAVE8_MONSTERS_QTY[4]) goto L_Done;
     end;
 
 L_Close:
@@ -669,10 +668,10 @@ L_Summon:
     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;
-    set $@wave_cave9, $@wave_cave9 + 1;
     end;
 
 L_Done:
+    set $@wave_cave9, $@wave_cave9 + 1;
     set $@cave9_kills, 0;
     attachrid(getcharid(3,$@cave9fighter$));
 
@@ -689,7 +688,7 @@ L_Done:
 
 OnMonsterDeath:
     set $@cave9_kills, $@cave9_kills + 1;
-    if ($@cave9_kills >= $@CAVE9_MONSTERS_QTY[1] + $@CAVE9_MONSTERS_QTY[2] + $@CAVE9_MONSTERS_QTY[3]) goto L_Done;
+    if ($@cave9_kills >= $@CAVE9_MONSTERS_QTY[1] + $@CAVE9_MONSTERS_QTY[2] + $@CAVE9_MONSTERS_QTY[3] + $@CAVE9_MONSTERS_QTY[4]) goto L_Done;
     end;
 
 L_Close:
@@ -737,7 +736,6 @@ L_Summon:
     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;
-    set $@wave_cave10, $@wave_cave10 + 1;
     end;
 
 L_SummonBoss:
@@ -748,6 +746,7 @@ L_SummonBoss:
     end;
 
 L_Done:
+    set $@wave_cave10, $@wave_cave10 + 1;
     set $@cave10_kills, 0;
     attachrid(getcharid(3,$@cave10fighter$));
 
@@ -789,7 +788,7 @@ OnTimer4000:
 
 OnMonsterDeath:
     set $@cave10_kills, $@cave10_kills + 1;
-    if ($@cave10_kills >= $@CAVE10_MONSTERS_QTY[1] + $@CAVE10_MONSTERS_QTY[2] + $@CAVE10_MONSTERS_QTY[3]) goto L_Done;
+    if ($@cave10_kills >= $@CAVE10_MONSTERS_QTY[1] + $@CAVE10_MONSTERS_QTY[2] + $@CAVE10_MONSTERS_QTY[3] + $@CAVE10_MONSTERS_QTY[4]) goto L_Done;
     end;
 
 OnBossDeath: