Added new mobs, balanced the 4 battle mobs, set up the timers, fixed some maps issues.

3 files changed, 32 insertions, 33 deletions

diff --git a/npc/025-4/_import.txt b/npc/025-4/_import.txt
index d4c5c8e4..a8b01ca1 100644
--- a/npc/025-4/_import.txt
+++ b/npc/025-4/_import.txt
@@ -1,9 +1,9 @@
 // Map 025-4: 
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 025-4.gat
-npc: npc/025-4/battlecaves.txt
 npc: npc/025-4/_mobs.txt
 npc: npc/025-4/_warps.txt
+npc: npc/025-4/battlecaves.txt
 npc: npc/025-4/clauquer.txt
 npc: npc/025-4/julia.txt
 npc: npc/025-4/mapflags.txt
diff --git a/npc/025-4/_mobs.txt b/npc/025-4/_mobs.txt
index 81cd1cf4..6ee5b1d1 100644
--- a/npc/025-4/_mobs.txt
+++ b/npc/025-4/_mobs.txt
@@ -3,7 +3,6 @@
 
 025-4.gat,29,31,20,14	monster	CaveMaggot	1056,3,0,0,Mob025-4::On1056
 025-4.gat,94,24,20,21	monster	CaveMaggot	1056,5,0,0,Mob025-4::On1056
-025-4.gat,157,36,30,24	monster	CaveMaggot	1056,15,0,0,Mob025-4::On1056
 
 
 025-4.gat,0,0,0	script	Mob025-4	-1,{
diff --git a/npc/025-4/battlecaves.txt b/npc/025-4/battlecaves.txt
index eb87011e..c6d7d43f 100644
--- a/npc/025-4/battlecaves.txt
+++ b/npc/025-4/battlecaves.txt
@@ -54,13 +54,13 @@ OnMonsterDeath:
 onInit:
 // Here you can define the specifics of each battle cave.
 // Monsters IDs to be spawned.
-    setarray $@CAVE1_MONSTERS_IDS[1], 1002, 1003, 1004;
+    setarray $@CAVE1_MONSTERS_IDS[1], 1050, 1051, 1083, 1084;
 // Number of monsters of each ID.
-    setarray $@CAVE1_MONSTERS_QTY[1], 3, 2, 1;
+    setarray $@CAVE1_MONSTERS_QTY[1], 4, 2, 3, 2;
 // Number of waves.
     set $@CAVE1_WAVES, 3;
 // Maximum time (in seconds) for the player to finish the fight.
-    set $@CAVE1_TIME, 30;
+    set $@CAVE1_TIME, 900;
 }
 
 // ---------------------  Cave 1 Checker  ----------------------------
@@ -132,13 +132,13 @@ OnMonsterDeath:
 onInit:
 // Here you can define the specifics of each battle cave.
 // Monsters IDs to be spawned.
-    setarray $@CAVE2_MONSTERS_IDS[1], 1002, 1003, 1004;
+    setarray $@CAVE2_MONSTERS_IDS[1], 1050, 1051, 1083, 1084;
 // Number of monsters of each ID.
-    setarray $@CAVE2_MONSTERS_QTY[1], 5, 3, 2;
+    setarray $@CAVE2_MONSTERS_QTY[1], 4, 2, 3, 2;
 // Number of waves.
     set $@CAVE2_WAVES, 3;
 // Maximum time (in seconds) for the player to finish the fight.
-    set $@CAVE2_TIME, 30;
+    set $@CAVE2_TIME, 900;
 }
 
 // ---------------------  Cave 2 Checker  ----------------------------
@@ -208,13 +208,13 @@ OnMonsterDeath:
 onInit:
 // Here you can define the specifics of each battle cave.
 // Monsters IDs to be spawned.
-    setarray $@CAVE3_MONSTERS_IDS[1], 1002, 1003, 1004;
+    setarray $@CAVE3_MONSTERS_IDS[1], 1050, 1051, 1083, 1084;
 // Number of monsters of each ID.
-    setarray $@CAVE3_MONSTERS_QTY[1], 5, 3, 2;
+    setarray $@CAVE3_MONSTERS_QTY[1], 4, 2, 3, 2;
 // Number of waves.
     set $@CAVE3_WAVES, 3;
 // Maximum time (in seconds) for the player to finish the fight.
-    set $@CAVE3_TIME, 30;
+    set $@CAVE3_TIME, 900;
 }
 
 // ---------------------  Cave 3 Checker  ----------------------------
@@ -284,13 +284,13 @@ OnMonsterDeath:
 onInit:
 // Here you can define the specifics of each battle cave.
 // Monsters IDs to be spawned.
-    setarray $@CAVE4_MONSTERS_IDS[1], 1002, 1003, 1004;
+    setarray $@CAVE4_MONSTERS_IDS[1], 1050, 1051, 1083, 1084;
 // Number of monsters of each ID.
-    setarray $@CAVE4_MONSTERS_QTY[1], 5, 3, 2;
+    setarray $@CAVE4_MONSTERS_QTY[1], 4, 2, 3, 2;
 // Number of waves.
     set $@CAVE4_WAVES, 3;
 // Maximum time (in seconds) for the player to finish the fight.
-    set $@CAVE4_TIME, 30;
+    set $@CAVE4_TIME, 900;
 }
 
 // ---------------------  Cave 4 Checker  ----------------------------
@@ -361,13 +361,13 @@ OnMonsterDeath:
 onInit:
 // Here you can define the specifics of each battle cave.
 // Monsters IDs to be spawned.
-    setarray $@CAVE5_MONSTERS_IDS[1], 1002, 1003, 1004;
+    setarray $@CAVE5_MONSTERS_IDS[1], 1050, 1051, 1083, 1084;
 // Number of monsters of each ID.
-    setarray $@CAVE5_MONSTERS_QTY[1], 5, 3, 2;
+    setarray $@CAVE5_MONSTERS_QTY[1], 4, 2, 3, 2;
 // Number of waves.
     set $@CAVE5_WAVES, 3;
 // Maximum time (in seconds) for the player to finish the fight.
-    set $@CAVE5_TIME, 30;
+    set $@CAVE5_TIME, 900;
 }
 
 // ---------------------  Cave 5 Checker  ----------------------------
@@ -438,13 +438,13 @@ OnMonsterDeath:
 onInit:
 // Here you can define the specifics of each battle cave.
 // Monsters IDs to be spawned.
-    setarray $@CAVE6_MONSTERS_IDS[1], 1002, 1003, 1004;
+    setarray $@CAVE6_MONSTERS_IDS[1], 1050, 1051, 1083, 1084;
 // Number of monsters of each ID.
-    setarray $@CAVE6_MONSTERS_QTY[1], 5, 3, 2;
+    setarray $@CAVE6_MONSTERS_QTY[1], 4, 2, 3, 2;
 // Number of waves.
     set $@CAVE6_WAVES, 3;
 // Maximum time (in seconds) for the player to finish the fight.
-    set $@CAVE6_TIME, 30;
+    set $@CAVE6_TIME, 900;
 }
 
 // ---------------------  Cave 6 Checker  ----------------------------
@@ -515,13 +515,13 @@ OnMonsterDeath:
 onInit:
 // Here you can define the specifics of each battle cave.
 // Monsters IDs to be spawned.
-    setarray $@CAVE7_MONSTERS_IDS[1], 1002, 1003, 1004;
+    setarray $@CAVE7_MONSTERS_IDS[1], 1050, 1051, 1083, 1084;
 // Number of monsters of each ID.
-    setarray $@CAVE7_MONSTERS_QTY[1], 5, 3, 2;
+    setarray $@CAVE7_MONSTERS_QTY[1], 4, 2, 3, 2;
 // Number of waves.
     set $@CAVE7_WAVES, 3;
 // Maximum time (in seconds) for the player to finish the fight.
-    set $@CAVE7_TIME, 30;
+    set $@CAVE7_TIME, 900;
 }
 
 // ---------------------  Cave 7 Checker  ----------------------------
@@ -592,13 +592,13 @@ OnMonsterDeath:
 onInit:
 // Here you can define the specifics of each battle cave.
 // Monsters IDs to be spawned.
-    setarray $@CAVE8_MONSTERS_IDS[1], 1002, 1003, 1004;
+    setarray $@CAVE8_MONSTERS_IDS[1], 1050, 1051, 1083, 1084;
 // Number of monsters of each ID.
-    setarray $@CAVE8_MONSTERS_QTY[1], 5, 3, 2;
+    setarray $@CAVE8_MONSTERS_QTY[1], 4, 2, 3, 2;
 // Number of waves.
     set $@CAVE8_WAVES, 3;
 // Maximum time (in seconds) for the player to finish the fight.
-    set $@CAVE8_TIME, 30;
+    set $@CAVE8_TIME, 900;
 }
 
 // ---------------------  Cave 8 Checker  ----------------------------
@@ -669,13 +669,13 @@ OnMonsterDeath:
 onInit:
 // Here you can define the specifics of each battle cave.
 // Monsters IDs to be spawned.
-    setarray $@CAVE9_MONSTERS_IDS[1], 1002, 1003, 1004;
+    setarray $@CAVE9_MONSTERS_IDS[1], 1050, 1051, 1083, 1084;
 // Number of monsters of each ID.
-    setarray $@CAVE9_MONSTERS_QTY[1], 5, 3, 2;
+    setarray $@CAVE9_MONSTERS_QTY[1], 4, 2, 3, 2;
 // Number of waves.
     set $@CAVE9_WAVES, 3;
 // Maximum time (in seconds) for the player to finish the fight.
-    set $@CAVE9_TIME, 30;
+    set $@CAVE9_TIME, 900;
 }
 
 // ---------------------  Cave 9 Checker  ----------------------------
@@ -776,15 +776,15 @@ OnBossDeath:
 onInit:
 // Here you can define the specifics of each battle cave.
 // Monsters IDs to be spawned. before the boss.
-    setarray $@CAVE10_MONSTERS_IDS[1], 1002, 1003, 1004, 1036;
+    setarray $@CAVE10_MONSTERS_IDS[1], 1050, 1051, 1083, 1084;
 // Number of monsters of each ID.
-    setarray $@CAVE10_MONSTERS_QTY[1], 5, 3, 2, 1;
+    setarray $@CAVE10_MONSTERS_QTY[1], 4, 2, 3, 2;
 // ID of the boss monster.
-    set $@BOSS, 1067;
+    set $@BOSS, 1085;
 // Number of waves. before the boss.
     set $@CAVE10_WAVES, 4;
 // Maximum time (in seconds) for the player to finish the fight.
-    set $@CAVE10_TIME, 120;
+    set $@CAVE10_TIME, 1500;
 }
 
 // ---------------------  Boss Cave Checker  ----------------------------