More accurate spawn amounts on various maps

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10476 54d463be-8e91-2dee-dedb-b68131a5f0ec

22 files changed, 237 insertions, 228 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 442ee9d89..1482d2369 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -2,7 +2,7 @@ Date		Added
 ======
 2007/05/06
 	* Updated Comodo Gambling Prizes to official. [Paradox924X]
-	* More accurate spawn amounts on some maps [Playtester]
+	* More accurate spawn amounts on various maps [Playtester]
 	- thanks to Doddler and Vicious_Pucca
 	* Updated Facing of NPCs from Crusader Quest [Samuray22]
 	* Updated Food Seller to official [Playtester]
diff --git a/npc/mobs/dungeons/ayodun.txt b/npc/mobs/dungeons/ayodun.txt
index 3f9c2b6c5..9b317a188 100644
--- a/npc/mobs/dungeons/ayodun.txt
+++ b/npc/mobs/dungeons/ayodun.txt
@@ -3,13 +3,14 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.3
+//= 1.4
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Additional Comments: =================================
 //= Currently using euRO data provided by Ishizu
 //= 1.2 Moved Tao Gunka to west cave of Comodo [Lupus]
 //= 1.3 Official jRO 10.3 spawns [Playtester]
+//= 1.4 More accurate spawns [Playtester]
 //============================================================
 
 //==================================================
@@ -23,7 +24,7 @@ ayo_dun01,0,0,0,0	monster	Ghoul	1036,30,0,0,0
 //==================================================
 // ayo_dun02 - Inside Ancient Shrine
 //==================================================
-ayo_dun02,0,0,0,0	monster	Tamruan	1584,70,0,0,0
+ayo_dun02,0,0,0,0	monster	Tamruan	1584,100,0,0,0
 ayo_dun02,0,0,0,0	monster	Whisper	1179,20,0,0,0
 ayo_dun02,0,0,0,0	monster	Kraben	1587,20,0,0,0
 ayo_dun02,150,90,15,30	monster	Lady Tanee	1688,1,25200000,18000000,0
diff --git a/npc/mobs/dungeons/beachdun.txt b/npc/mobs/dungeons/beachdun.txt
index 0536d189e..53b4deae3 100644
--- a/npc/mobs/dungeons/beachdun.txt
+++ b/npc/mobs/dungeons/beachdun.txt
@@ -3,32 +3,32 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.2
+//= 1.3
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.1 Official kRO 10.1 spawns [Playtester]
 //= 1.2 Small 11.1 spawn update [Playtester]
+//= 1.3 More accurate spawns [Playtester]
 //============================================================
 
 //==================================================
 // beach_dun - Karu, the West Cave
 //==================================================
-beach_dun,0,0,0,0	monster	Medusa	1148,30,0,0,0
+beach_dun,0,0,0,0	monster	Medusa	1148,60,0,0,0
 beach_dun,0,0,0,0	monster	Merman	1264,3,10000,5000,0
-beach_dun,0,0,0,0	monster	Nereid	1255,15,0,0,0
-beach_dun,0,0,0,0	monster	Pest	1256,15,0,0,0
-beach_dun,0,0,0,0	monster	Penomena	1216,5,30000,0,0
-beach_dun,0,0,0,0	monster	Tao Gunka	1583,1,7380000,3600000,0
+beach_dun,0,0,0,0	monster	Nereid	1255,20,0,0,0
+beach_dun,0,0,0,0	monster	Pest	1256,20,0,0,0
+beach_dun,0,0,0,0	monster	Tao Gunka	1583,1,18000000,14400000,0
 
 //==================================================
 // beach_dun2 - Ruande, the North Cave
 //==================================================
-beach_dun2,0,0,0,0	monster	Megalith	1274,30,0,0,0
-beach_dun2,0,0,0,0	monster	Nereid	1255,5,0,0,0
-beach_dun2,0,0,0,0	monster	Stalactic Golem	1278,40,5000,0,0
+beach_dun2,0,0,0,0	monster	Megalith	1274,15,0,0,0
+beach_dun2,0,0,0,0	monster	Nereid	1255,10,0,0,0
+beach_dun2,0,0,0,0	monster	Stalactic Golem	1278,65,5000,0,0
 beach_dun2,0,0,0,0	monster	Tri Joint	1279,20,0,0,0
-beach_dun2,0,0,0,0	monster	Hydra	1068,15,0,0,0
+beach_dun2,0,0,0,0	monster	Hydra	1068,10,0,0,0
 
 //==================================================
 // beach_dun3 - Mao, the East Cave
diff --git a/npc/mobs/dungeons/byalan.txt b/npc/mobs/dungeons/byalan.txt
index 453000d6f..8a19b2862 100644
--- a/npc/mobs/dungeons/byalan.txt
+++ b/npc/mobs/dungeons/byalan.txt
@@ -3,11 +3,12 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.1
+//= 1.2
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.1 Official kRO 10.1 spawns for 1-4 [Playtester]
+//= 1.2 More accurate spawns [Playtester]
 //============================================================
 
 //==================================================
@@ -38,7 +39,7 @@ iz_dun02,0,0,0,0	monster	Hydra	1068,40,0,0,0
 iz_dun02,0,0,0,0	monster	Cornutus	1067,60,0,0,0
 iz_dun02,0,0,0,0	monster	Marse	1144,40,0,0,0
 iz_dun02,0,0,0,0	monster	Obeaune	1044,40,0,0,0
-iz_dun02,0,0,0,0	monster	Merman	1264,1,0,0,0
+iz_dun02,0,0,0,0	monster	Merman	1264,1,1800000,1200000,0
 iz_dun02,0,0,0,0	monster	Black Mushroom	1084,15,180000,90000,1
 
 //==================================================
@@ -79,15 +80,15 @@ iz_dun03,180,251,0,0	monster	Hydra	1068,1,300000,150000,0
 iz_dun03,178,253,0,0	monster	Hydra	1068,1,300000,150000,0
 iz_dun03,108,249,0,0	monster	Hydra	1068,1,300000,150000,0
 iz_dun03,80,163,0,0	monster	Hydra	1068,1,300000,150000,0
-iz_dun03,0,0,0,0	monster	Merman	1264,3,0,0,0
+iz_dun03,0,0,0,0	monster	Merman	1264,3,1800000,1200000,0
 
 //==================================================
 // iz_dun04 - Undersea Tunnel F5
 //==================================================
-iz_dun04,0,0,0,0	monster	Marine Sphere	1142,10,0,0,0
+iz_dun04,0,0,0,0	monster	Marine Sphere	1142,30,0,0,0
 iz_dun04,0,0,0,0	monster	Swordfish	1069,10,0,0,0
-iz_dun04,0,0,0,0	monster	Merman	1264,50,0,0,0
-iz_dun04,0,0,0,0	monster	Strouf	1065,50,0,0,0
+iz_dun04,0,0,0,0	monster	Merman	1264,40,0,0,0
+iz_dun04,0,0,0,0	monster	Strouf	1065,50,600000,300000,1
 iz_dun04,58,135,0,0	monster	Hydra	1068,1,305000,150000,0
 iz_dun04,61,135,0,0	monster	Hydra	1068,1,300000,150000,0
 iz_dun04,42,129,0,0	monster	Hydra	1068,1,312000,150000,0
@@ -106,4 +107,8 @@ iz_dun04,111,35,0,0	monster	Hydra	1068,1,300000,150000,0
 iz_dun04,69,243,0,0	monster	Hydra	1068,1,321000,150000,0
 iz_dun04,124,233,0,0	monster	Hydra	1068,1,300000,150000,0
 iz_dun04,134,233,0,0	monster	Hydra	1068,1,305000,150000,0
-iz_dun04,95,147,0,0	monster	Deviace	1108,3,600000,300000,0
+iz_dun04,0,0,0,0	monster	Deviace	1108,3,0,0,0
+iz_dun04,103,231,10,10	monster	Merman	1264,3,150000,0,0
+iz_dun04,160,231,10,10	monster	Merman	1264,3,170000,0,0
+iz_dun04,95,147,10,10	monster	Merman	1264,3,150000,0,0
+iz_dun04,130,216,15,15	monster	Merman	1264,3,160000,0,0
diff --git a/npc/mobs/dungeons/clocktower.txt b/npc/mobs/dungeons/clocktower.txt
index 374d41927..1284ee2ea 100644
--- a/npc/mobs/dungeons/clocktower.txt
+++ b/npc/mobs/dungeons/clocktower.txt
@@ -3,11 +3,12 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.1
+//= 1.2
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.1 Official kRO 10.1 spawns [Playtester]
+//= 1.2 More accurate spawns [Playtester]
 //============================================================
 
 //==================================================
@@ -19,10 +20,9 @@ alde_dun01,0,0,0,0	monster	Drainliar	1111,40,0,0,0
 //==================================================
 // alde_dun02 - Clock Tower B2
 //==================================================
-alde_dun02,0,0,0,0	monster	High Orc	1213,40,0,0,0
+alde_dun02,0,0,0,0	monster	High Orc	1213,50,0,0,0
 alde_dun02,0,0,0,0	monster	Orc Archer	1189,20,0,0,0
 alde_dun02,0,0,0,0	monster	Brilight	1211,20,0,0,0
-alde_dun02,0,0,0,0	monster	Drainliar	1111,10,0,0,0
 alde_dun02,0,0,0,0	monster	Arclouze	1194,20,0,0,0
 
 //==================================================
@@ -31,18 +31,15 @@ alde_dun02,0,0,0,0	monster	Arclouze	1194,20,0,0,0
 alde_dun03,0,0,0,0	monster	Cramp	1209,25,0,0,0
 alde_dun03,0,0,0,0	monster	Drainliar	1111,20,0,0,0
 alde_dun03,77,28,5,5	monster	Cramp	1209,3,40000,20000,0
-alde_dun03,0,0,0,0	monster	Penomena	1216,15,300000,150000,0
+alde_dun03,0,0,0,0	monster	Penomena	1216,45,180000,120000,0
 alde_dun03,184,61,30,30	monster	Cramp	1209,10,300000,150000,0
 alde_dun03,184,61,30,30	monster	Drainliar	1111,10,300000,150000,0
-alde_dun03,0,0,0,0	monster	Penomena	1216,5,300000,150000,0
 alde_dun03,163,56,10,10	monster	Penomena	1216,3,600000,300000,0
 alde_dun03,168,42,6,6	monster	Penomena	1216,2,600000,300000,0
 alde_dun03,147,30,8,8	monster	Penomena	1216,2,600000,300000,0
-alde_dun03,0,0,0,0	monster	Penomena	1216,10,300000,150000,0
 alde_dun03,126,53,20,20	monster	Cramp	1209,5,300000,150000,0
 alde_dun03,126,53,20,20	monster	Drainliar	1111,5,300000,150000,0
 alde_dun03,102,40,10,10	monster	Penomena	1216,4,600000,300000,0
-alde_dun03,0,0,0,0	monster	Penomena	1216,15,300000,150000,0
 alde_dun03,130,220,40,40	monster	Cramp	1209,10,300000,150000,0
 alde_dun03,130,220,40,40	monster	Drainliar	1111,10,300000,150000,0
 alde_dun03,155,201,25,25	monster	Penomena	1216,7,600000,300000,0
@@ -92,11 +89,11 @@ c_tower2,0,0,0,0	monster	Elder	1377,1,3600000,1800000,0
 //==================================================
 // c_tower3 - Clock Tower F3
 //==================================================
-c_tower3,0,0,0,0	monster	Alarm	1193,60,0,0,0
-c_tower3,0,0,0,0	monster	Rideword	1195,10,0,0,0
+c_tower3,0,0,0,0	monster	Alarm	1193,80,0,0,0
+c_tower3,0,0,0,0	monster	Rideword	1195,5,0,0,0
 c_tower3,153,220,10,10	monster	Rideword	1195,1,126000,100000,0
-c_tower3,0,0,0,0	monster	Mimic	1191,15,0,0,0
-c_tower3,0,0,0,0	monster	Clock Tower Manager	1270,1,0,0,0
+c_tower3,0,0,0,0	monster	Mimic	1191,7,0,0,0
+c_tower3,0,0,0,0	monster	Clock Tower Manager	1270,3,0,0,0
 
 //==================================================
 // c_tower4 - Clock Tower F4
diff --git a/npc/mobs/dungeons/geftower.txt b/npc/mobs/dungeons/geftower.txt
index fbbeee467..0368fe5f7 100644
--- a/npc/mobs/dungeons/geftower.txt
+++ b/npc/mobs/dungeons/geftower.txt
@@ -3,11 +3,12 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.2
+//= 1.3
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.2 Official kRO 10.1 spawns [Playtester]
+//= 1.3 More accurate spawns [Playtester]
 //============================================================
 
 //==================================================
@@ -28,12 +29,12 @@ gef_dun00,121,109,3,3	monster	Black Mushroom	1084,3,180000,90000,1
 //==================================================
 // gef_dun01 - Geffen Dungeon F2
 //==================================================
-gef_dun01,0,0,0,0	monster	Drainliar	1111,30,0,0,0
+gef_dun01,0,0,0,0	monster	Drainliar	1111,20,0,0,0
 gef_dun01,0,0,0,0	monster	Nightmare	1061,30,0,0,0
 gef_dun01,0,0,0,0	monster	Ogretooth	1204,1,1800000,1200000,0
 gef_dun01,0,0,0,0	monster	Zombie	1015,25,0,0,0
 gef_dun01,0,0,0,0	monster	Ghoul	1036,40,0,0,0
-gef_dun01,0,0,0,0	monster	Jakk	1130,30,300000,100000,0
+gef_dun01,0,0,0,0	monster	Jakk	1130,40,300000,100000,0
 gef_dun01,234,121,0,0	monster	Blue Plant	1079,1,300000,100000,0
 gef_dun01,0,0,0,0	monster	Dracula	1389,1,3600000,1800000,1
 gef_dun01,0,0,0,0	monster	Black Mushroom	1084,5,180000,90000,1
@@ -45,12 +46,12 @@ gef_dun01,150,237,10,10	monster	White Plant	1082,2,180000,90000,1
 //==================================================
 // gef_dun02 - Geffenia
 //==================================================
-gef_dun02,0,0,0,0	monster	Ghoul	1036,20,0,0,0
+gef_dun02,0,0,0,0	monster	Ghoul	1036,10,0,0,0
 gef_dun02,0,0,0,0	monster	Whisper	1179,20,0,0,0
 gef_dun02,0,0,0,0	monster	Hunter Fly	1035,10,0,0,0
 gef_dun02,0,0,0,0	monster	Marionette	1143,20,0,0,0
-gef_dun02,0,0,0,0	monster	Deviruchi	1109,25,0,0,0
-gef_dun02,0,0,0,0	monster	Nightmare	1061,40,300000,100000,0
+gef_dun02,0,0,0,0	monster	Deviruchi	1109,35,0,0,0
+gef_dun02,0,0,0,0	monster	Nightmare	1061,40,60000,0,0
 gef_dun02,0,0,0,0	monster	Doppelganger	1046,1,7200000,3600000,1
 gef_dun02,214,212,10,10	monster	White Plant	1082,3,180000,90000,1
 gef_dun02,215,67,10,10	monster	White Plant	1082,3,180000,90000,1
@@ -62,10 +63,10 @@ gef_dun02,185,83,3,3	monster	Shining Plant	1083,1,1800000,900000,1
 //==================================================
 // gef_dun03 - Geffenia (Event Map)
 //==================================================
+gef_dun03,0,0,0,0	monster	Hellion Revenant	1626,1,600000,300000,0
 gef_dun03,0,0,0,0	monster	Wraith	1192,8,60000,30000,0
 gef_dun03,0,0,0,0	monster	Wraith Dead	1291,2,60000,30000,0
 gef_dun03,0,0,0,0	monster	Wind Ghost	1263,3,60000,30000,0
-gef_dun03,0,0,0,0	monster	Hellion Revenant	1626,1,600000,300000,1
 gef_dun03,0,0,0,0	monster	Shining Plant	1083,3,1800000,900000,1
 gef_dun03,0,0,0,0	monster	White Plant	1082,10,180000,90000,1
 
diff --git a/npc/mobs/dungeons/glastheim.txt b/npc/mobs/dungeons/glastheim.txt
index 341da4966..f77887c2b 100644
--- a/npc/mobs/dungeons/glastheim.txt
+++ b/npc/mobs/dungeons/glastheim.txt
@@ -3,34 +3,38 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.3
+//= 1.4
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.1 [Lupus]
 //= 1.2 Updated to ep 8.5 aegis spawns [MasterOfMuppets]
 //= 1.3 Official 10.1 kRO spawns [Playtester]
+//= 1.4 More accurate spawns [Playtester]
 //============================================================
 
 //==================================================
 // gl_cas01 - Glast Heim F1
 //==================================================
-gl_cas01,0,0,0,0	monster	Sage Worm	1281,40,0,0,0
-gl_cas01,0,0,0,0	monster	Carat	1267,40,0,0,0
+gl_cas01,0,0,0,0	monster	Sage Worm	1281,10,0,0,0
+gl_cas01,0,0,0,0	monster	Carat	1267,50,0,0,0
 gl_cas01,0,0,0,0	monster	Rideword	1195,15,0,0,0
 gl_cas01,0,0,0,0	monster	Dark Frame	1260,20,0,0,0
-gl_cas01,0,0,0,0	monster	Whisper	1179,20,0,0,0
+gl_cas01,0,0,0,0	monster	Whisper	1179,10,0,0,0
 gl_cas01,0,0,0,0	monster	Alice	1275,1,0,0,0
 gl_cas01,0,0,0,0	monster	Ogretooth	1204,1,7200000,3600000,1
-gl_cas01,0,0,0,0	monster	Owl Baron	1295,3,0,0,1
+gl_cas01,0,0,0,0	monster	Owl Baron	1295,6,0,0,1
+gl_cas01,0,0,0,0	monster	Owl Duke	1320,20,0,0,1
 
 //==================================================
 // gl_cas02 - Glast Heim F2
 //==================================================
-gl_cas02,0,0,0,0	monster	Wanderer	1208,20,0,0,0
-gl_cas02,0,0,0,0	monster	Raydric	1163,40,0,0,0
+gl_cas02,0,0,0,0	monster	Wanderer	1208,40,0,0,0
+gl_cas02,0,0,0,0	monster	Raydric	1163,30,0,0,0
 gl_cas02,0,0,0,0	monster	Rideword	1195,10,0,0,0
 gl_cas02,0,0,0,0	monster	Raydric Archer	1276,19,0,0,0
+gl_cas02,0,0,0,0	monster	Chimera	1283,2,1800000,900000,1
+gl_cas02,0,0,0,0	monster	Abysmal Knight	1219,3,1800000,900000,1
 gl_cas02,193,167,5,5	monster	Raydric	1163,3,300000,120000,0
 gl_cas02,193,135,5,5	monster	Raydric	1163,3,300000,120000,0
 gl_cas02,104,145,5,5	monster	Mysteltainn	1203,1,7200000,3600000,1
@@ -112,10 +116,10 @@ glast_01,233,209,15,15	monster	Shining Plant	1083,1,1800000,900000,1
 // gl_church - Glast Heim St. Abbey
 //==================================================
 gl_church,0,0,0,0	monster	Wraith	1192,5,0,0,0
-gl_church,0,0,0,0	monster	Evil Druid	1117,30,0,0,0
-gl_church,0,0,0,0	monster	Ghoul	1036,60,0,0,0
+gl_church,0,0,0,0	monster	Evil Druid	1117,60,0,0,0
+gl_church,0,0,0,0	monster	Ghoul	1036,50,0,0,0
 gl_church,0,0,0,0	monster	Dark Illusion	1302,1,3600000,1800000,0
-gl_church,0,0,0,0	monster	Mimic	1191,20,0,0,0
+gl_church,0,0,0,0	monster	Mimic	1191,5,0,0,0
 gl_church,155,92,10,10	monster	Mimic	1191,1,30000,15000,0
 gl_church,155,75,10,10	monster	Mimic	1191,2,60000,30000,0
 gl_church,155,54,10,10	monster	Mimic	1191,1,30000,15000,0
@@ -124,10 +128,10 @@ gl_church,155,54,10,10	monster	Mimic	1191,1,30000,15000,0
 // gl_chyard - Glast Heim Churchyard
 //==================================================
 gl_chyard,0,0,0,0	monster	Ghoul	1036,35,0,0,0
-gl_chyard,0,0,0,0	monster	Zombie	1015,30,0,0,0
-gl_chyard,0,0,0,0	monster	Wraith	1192,25,0,0,0
+gl_chyard,0,0,0,0	monster	Zombie	1015,20,0,0,0
+gl_chyard,0,0,0,0	monster	Wraith	1192,45,0,0,0
 gl_chyard,0,0,0,0	monster	Evil Druid	1117,10,0,0,0
-gl_chyard,0,0,0,0	monster	Hunter Fly	1035,20,0,0,0
+gl_chyard,0,0,0,0	monster	Hunter Fly	1035,3,0,0,0
 gl_chyard,0,0,0,0	monster	Mimic	1191,3,0,0,0
 gl_chyard,0,0,0,0	monster	Dark Lord	1272,1,3600000,1800000,1
 
@@ -156,16 +160,16 @@ gl_sew03,158,7,5,1	monster	Gargoyle	1253,1,3600000,1800000,0
 //==================================================
 // gl_sew04 - Glast Heim Culvert F4
 //==================================================
-gl_sew04,0,0,0,0	monster	Anolian	1206,50,0,0,0
-gl_sew04,0,0,0,0	monster	Gargoyle	1253,30,0,0,0
+gl_sew04,0,0,0,0	monster	Anolian	1206,100,120000,0,0
+gl_sew04,0,0,0,0	monster	Gargoyle	1253,20,0,0,0
 gl_sew04,0,0,0,0	monster	Drainliar	1111,10,0,0,0
 
 //==================================================
 // gl_step - Glast Heim Staircase Dungeon
 //==================================================
-gl_step,0,0,0,0	monster	Mimic	1191,20,60000,30000,0
-gl_step,0,0,0,0	monster	Raydric Archer	1276,20,0,0,0
-gl_step,0,0,0,0	monster	Wind Ghost	1263,50,0,0,0
+gl_step,0,0,0,0	monster	Mimic	1191,5,60000,30000,0
+gl_step,0,0,0,0	monster	Raydric Archer	1276,10,0,0,0
+gl_step,0,0,0,0	monster	Wind Ghost	1263,100,120000,0,0
 
 //==================================================
 // gl_knt01 - Inside Glast Heim Chivalry F1
@@ -223,5 +227,5 @@ gl_dun01,0,0,0,0	monster	Sting	1207,40,0,0,0
 //==================================================
 // gl_dun02 - The Lowest Cave in Glast Heim F2
 //==================================================
-gl_dun02,0,0,0,0	monster	Majoruros	1310,40,0,0,0
-gl_dun02,0,0,0,0	monster	Gargoyle	1253,20,0,0,0
+gl_dun02,0,0,0,0	monster	Majoruros	1310,45,0,0,0
+gl_dun02,0,0,0,0	monster	Gargoyle	1253,15,0,0,0
diff --git a/npc/mobs/dungeons/magmadun.txt b/npc/mobs/dungeons/magmadun.txt
index 0bc6743de..0be0d79d5 100644
--- a/npc/mobs/dungeons/magmadun.txt
+++ b/npc/mobs/dungeons/magmadun.txt
@@ -3,12 +3,13 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.2
+//= 1.3
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.1 fixed 2,3,4 tabs instead of 1... and wrong mob names [Lupus]
 //= 1.2 Official jRO 10.3 spawns [Playtester]
+//= 1.3 More accurate spawns [Playtester]
 //============================================================
 
 //==================================================
@@ -23,16 +24,20 @@ mag_dun01,0,0,0,0	monster	Grizzly	1381,10,0,0,0
 //==================================================
 // mag_dun02 - Nogg Road F2
 //==================================================
-mag_dun02,70,190,20,20	monster	Blazer	1367,5,300000,150000,0
-mag_dun02,200,120,40,40	monster	Blazer	1367,15,300000,150000,0
-mag_dun02,70,87,50,50	monster	Nightmare Terror	1379,10,300000,150000,0
-mag_dun02,210,156,15,15	monster	Nightmare Terror	1379,3,60000,30000,0
-mag_dun02,135,153,15,15	monster	Nightmare Terror	1379,3,60000,30000,0
-mag_dun02,0,0,0,0	monster	Nightmare Terror	1379,12,60000,30000,0
-mag_dun02,120,202,20,20	monster	Deleter	1384,5,60000,30000,0
-mag_dun02,185,185,50,50	monster	Deleter	1385,10,300000,150000,0
-mag_dun02,200,77,30,30	monster	Deleter	1384,5,300000,150000,0
 mag_dun02,0,0,0,0	monster	Gig	1387,10,0,0,0
-mag_dun02,200,77,30,30	monster	Diabolic	1382,10,300000,150000,0
-mag_dun02,135,68,15,15	monster	Diabolic	1382,5,300000,30000,0
-mag_dun02,0,0,0,0	monster	Diabolic	1382,5,60000,30000,0
+mag_dun02,0,0,0,0	monster	Deleter	1384,25,0,0,0
+mag_dun02,0,0,0,0	monster	Deleter	1385,25,0,0,0
+mag_dun02,0,0,0,0	monster	Diabolic	1382,10,120000,30000,0
+mag_dun02,0,0,0,0	monster	Nightmare Terror	1379,15,0,0,0
+mag_dun02,0,0,0,0	monster	Nightmare Terror	1379,10,60000,30000,0
+mag_dun02,110,190,50,20	monster	Blazer	1367,5,300000,150000,0
+mag_dun02,110,190,50,20	monster	Nightmare Terror	1379,4,180000,150000,0
+mag_dun02,200,120,40,40	monster	Blazer	1367,15,300000,150000,0
+mag_dun02,103,102,58,59	monster	Nightmare Terror	1379,10,300000,150000,0
+mag_dun02,120,202,20,20	monster	Deleter	1384,3,300000,150000,0
+mag_dun02,184,170,43,55	monster	Deleter	1384,7,300000,150000,0
+mag_dun02,184,170,43,55	monster	Deleter	1385,10,300000,150000,0
+mag_dun02,184,170,43,55	monster	Nightmare Terror	1379,7,300000,150000,0
+mag_dun02,197,59,50,37	monster	Deleter	1384,3,300000,150000,0
+mag_dun02,197,59,50,37	monster	Deleter	1385,5,300000,150000,0
+mag_dun02,197,59,50,37	monster	Diabolic	1382,5,300000,30000,0
diff --git a/npc/mobs/dungeons/moc_pyramid.txt b/npc/mobs/dungeons/moc_pyramid.txt
index ac95400ad..6c0922b7f 100644
--- a/npc/mobs/dungeons/moc_pyramid.txt
+++ b/npc/mobs/dungeons/moc_pyramid.txt
@@ -3,11 +3,12 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.1
+//= 1.2
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.1 Official kRO 10.1 spawns [Playtester]
+//= 1.2 More accurate spawns [Playtester]
 //============================================================
 
 //==================================================
@@ -22,17 +23,17 @@ moc_pryd01,0,0,0,0	monster	Poporing	1031,20,0,0,0
 moc_pryd02,0,0,0,0	monster	Poporing	1031,20,0,0,0
 moc_pryd02,0,0,0,0	monster	Drainliar	1111,20,0,0,0
 moc_pryd02,0,0,0,0	monster	Mummy	1041,30,0,0,0
-moc_pryd02,0,0,0,0	monster	Isis	1029,25,0,0,0
-moc_pryd02,0,0,0,0	monster	Soldier Skeleton	1028,20,0,0,0
-moc_pryd02,0,0,0,0	monster	Archer Skeleton	1016,20,0,0,0
+moc_pryd02,0,0,0,0	monster	Isis	1029,5,0,0,0
+moc_pryd02,0,0,0,0	monster	Soldier Skeleton	1028,30,0,0,0
+moc_pryd02,0,0,0,0	monster	Archer Skeleton	1016,30,0,0,0
 
 //==================================================
 // moc_pryd03 - Inside Pyramid F3
 //==================================================
-moc_pryd03,0,0,0,0	monster	Drainliar	1111,15,0,0,0
-moc_pryd03,0,0,0,0	monster	Mimic	1191,10,0,0,0
-moc_pryd03,0,0,0,0	monster	Matyr	1146,15,0,0,0
-moc_pryd03,0,0,0,0	monster	Mummy	1041,45,0,0,0
+moc_pryd03,0,0,0,0	monster	Drainliar	1111,5,0,0,0
+moc_pryd03,0,0,0,0	monster	Mimic	1191,5,0,0,0
+moc_pryd03,0,0,0,0	monster	Matyr	1146,10,0,0,0
+moc_pryd03,0,0,0,0	monster	Mummy	1041,70,0,0,0
 moc_pryd03,0,0,0,0	monster	Verit	1032,20,600000,300000,1
 
 //==================================================
diff --git a/npc/mobs/dungeons/moc_sphinx.txt b/npc/mobs/dungeons/moc_sphinx.txt
index 844690c53..8d704195c 100644
--- a/npc/mobs/dungeons/moc_sphinx.txt
+++ b/npc/mobs/dungeons/moc_sphinx.txt
@@ -3,12 +3,13 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.2
+//= 1.3
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.1 Official kRO 10.1 spawns [Playtester]
 //= 1.2 Replaced Marduk with Anubis on F4 and F5 [Playtester]
+//= 1.3 More accurate spawns [Playtester]
 //============================================================
 
 //==================================================
@@ -30,10 +31,10 @@ in_sphinx2,0,0,0,0	monster	Matyr	1146,20,0,0,0
 //==================================================
 // In_sphinx3 - Sphinx F3
 //==================================================
-in_sphinx3,0,0,0,0	monster	Matyr	1146,30,0,0,0
-in_sphinx3,0,0,0,0	monster	Pasana	1154,10,0,0,0
-in_sphinx3,0,0,0,0	monster	Marduk	1140,30,0,0,0
-in_sphinx3,0,0,0,0	monster	Mimic	1191,10,600000,300000,1
+in_sphinx3,0,0,0,0	monster	Matyr	1146,15,0,0,0
+in_sphinx3,0,0,0,0	monster	Pasana	1154,5,0,0,0
+in_sphinx3,0,0,0,0	monster	Marduk	1140,65,0,0,0
+in_sphinx3,0,0,0,0	monster	Mimic	1191,5,600000,300000,1
 
 //==================================================
 // In_sphinx4 - Sphinx F4
@@ -46,9 +47,9 @@ in_sphinx4,0,0,0,0	monster	Pasana	1154,20,0,0,0
 //==================================================
 // In_sphinx5 - Sphinx F5
 //==================================================
-in_sphinx5,0,0,0,0	monster	Pasana	1154,50,0,0,0
+in_sphinx5,0,0,0,0	monster	Pasana	1154,70,0,0,0
 in_sphinx5,0,0,0,0	monster	Matyr	1146,10,0,0,0
 in_sphinx5,0,0,0,0	monster	Side Winder	1037,20,0,0,0
-in_sphinx5,0,0,0,0	monster	Anubis	1098,30,0,0,0
+in_sphinx5,0,0,0,0	monster	Anubis	1098,10,0,0,0
 in_sphinx5,0,0,0,0	monster	Mimic	1191,7,600000,300000,1
 in_sphinx5,0,0,0,0	monster	Pharaoh	1157,1,3600000,1800000,1
diff --git a/npc/mobs/dungeons/payoncave.txt b/npc/mobs/dungeons/payoncave.txt
index adf9a3493..d3549ffe8 100644
--- a/npc/mobs/dungeons/payoncave.txt
+++ b/npc/mobs/dungeons/payoncave.txt
@@ -3,11 +3,12 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.1
+//= 1.2
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.1 Official kRO 10.1 spawns [Playtester]
+//= 1.2 Small spawn update [Playtester]
 //============================================================
 
 //==================================================
@@ -144,16 +145,14 @@ pay_dun03,52,262,10,4	monster	White Plant	1082,2,180000,90000,1
 // pay_dun04 - Payon Cave F5
 //==================================================
 pay_dun04,0,0,0,0	monster	Dokebi	1110,40,0,0,0
-pay_dun04,0,0,0,0	monster	Sohee	1170,5,0,0,0
 pay_dun04,0,0,0,0	monster	Horong	1129,30,0,0,0
 pay_dun04,120,115,0,0	monster	Moonlight Flower	1150,1,3600000,7200000,1
 pay_dun04,0,0,0,0	monster	Greatest General	1277,15,0,0,0
 pay_dun04,0,0,0,0	monster	Archer Skeleton	1016,15,0,0,0
-pay_dun04,0,0,0,0	monster	Nine Tail	1180,20,800000,400000,0
-pay_dun04,120,115,5,5	monster	Skeleton General	1290,1,1800000,1200000,0
-pay_dun04,120,115,5,5	monster	Am Mut	1301,1,1800000,1200000,0
+pay_dun04,0,0,0,0	monster	Nine Tail	1180,30,60000,30000,0
+pay_dun04,0,0,0,0	monster	Skeleton General	1290,1,0,0,0
+pay_dun04,0,0,0,0	monster	Am Mut	1301,1,0,0,0
 pay_dun04,120,115,0,0	monster	Cat o' Nine Tails	1307,1,3600000,7200000,1
-pay_dun04,0,0,0,0	monster	Soldier Skeleton	1028,10,0,0,0
 pay_dun04,120,120,10,10	monster	Shining Plant	1083,1,1800000,900000,1
 pay_dun04,28,110,5,5	monster	Shining Plant	1083,1,1800000,900000,1
 pay_dun04,0,0,0,0	monster	Red Plant	1078,10,180000,90000,1
diff --git a/npc/mobs/dungeons/pront_maze.txt b/npc/mobs/dungeons/pront_maze.txt
index f95b1d074..ed21ec0e4 100644
--- a/npc/mobs/dungeons/pront_maze.txt
+++ b/npc/mobs/dungeons/pront_maze.txt
@@ -3,19 +3,18 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.2
+//= 1.3
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.2 Official kRO 10.1 spawns [Playtester]
+//= 1.3 Some small fixes [Playtester]
 //============================================================
 
 //==================================================
 // prt_maze01 - Labyrinth Forest F1
 //==================================================
-prt_maze01,0,0,0,0	monster	Shining Plant	1083,5,1800000,900000,1
-prt_maze01,0,0,0,0	monster	Red Plant	1078,5,180000,90000,1
-prt_maze01,0,0,0,0	monster	Blue Plant	1079,5,180000,90000,1
+
 prt_maze01,179,20,21,21	monster	Poring	1002,5,120000,40000,1
 prt_maze01,139,20,21,21	monster	Lunatic	1063,5,120000,40000,1
 prt_maze01,99,20,21,21	monster	Fabre	1007,5,120000,40000,1
@@ -46,6 +45,11 @@ prt_maze01,19,180,21,21	monster	Savage	1166,3,120000,40000,1
 prt_maze01,19,180,21,21	monster	Savage	1166,5,120000,40000,1
 prt_maze01,0,0,0,0	monster	Hunter Fly	1035,1,0,0,0
 prt_maze01,0,0,0,0	monster	Vagabond Wolf	1092,1,3600000,1800000,0
+prt_maze01,0,0,0,0	monster	Shining Plant	1083,5,1800000,900000,1
+prt_maze01,0,0,0,0	monster	Red Plant	1078,5,180000,90000,1
+prt_maze01,0,0,0,0	monster	Blue Plant	1079,5,180000,90000,1
+prt_maze01,0,0,0,0	monster	Black Mushroom	1084,5,180000,90000,1
+prt_maze01,0,0,0,0	monster	Red Mushroom	1085,5,180000,90000,1
 prt_maze01,101,138,5,5	monster	Shining Plant	1083,1,1800000,900000,1
 prt_maze01,101,138,5,5	monster	White Plant	1082,1,1800000,900000,1
 prt_maze01,99,181,5,5	monster	White Plant	1082,2,1800000,900000,1
@@ -86,6 +90,11 @@ prt_maze03,170,170,70,70	monster	Eclipse	1093,1,1920000,150000,1
 prt_maze03,23,23,70,70	monster	Mastering	1090,1,1920000,150000,1
 prt_maze03,100,100,80,80	monster	Baphomet Jr.	1101,25,0,0,0
 prt_maze03,0,0,0,0	monster	Baphomet	1039,1,7200000,3600000,1
+prt_maze03,0,0,0,0	monster	Shining Plant	1083,5,1800000,900000,1
+prt_maze03,0,0,0,0	monster	Red Plant	1078,5,180000,90000,1
+prt_maze03,0,0,0,0	monster	Blue Plant	1079,5,180000,90000,1
+prt_maze03,0,0,0,0	monster	Black Mushroom	1084,5,180000,90000,1
+prt_maze03,0,0,0,0	monster	Red Mushroom	1085,5,180000,90000,1
 prt_maze03,61,98,10,10	monster	Shining Plant	1083,1,1800000,900000,1
 prt_maze03,61,98,10,10	monster	Blue Plant	1079,1,1800000,900000,1
 prt_maze03,61,98,10,10	monster	Yellow Plant	1081,1,1800000,900000,1
diff --git a/npc/mobs/dungeons/sunkenship.txt b/npc/mobs/dungeons/sunkenship.txt
index a42665b72..79e32458d 100644
--- a/npc/mobs/dungeons/sunkenship.txt
+++ b/npc/mobs/dungeons/sunkenship.txt
@@ -3,18 +3,19 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.1
+//= 1.2
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.1 Official kRO 10.1 spawns [Playtester]
+//= 1.2 More accurate spawns [Playtester]
 //============================================================
 
 //==================================================
 // treasure01 - Sunken Ship F1
 //==================================================
 treasure01,0,0,0,0	monster	Kukre	1070,20,0,0,1
-treasure01,0,0,0,0	monster	Whisper	1179,5,0,0,1
+treasure01,0,0,0,0	monster	Whisper	1179,7,0,0,1
 treasure01,0,0,0,0	monster	Whisper	1179,5,120000,60000,1
 treasure01,107,39,15,15	monster	Poison Spore	1077,3,180000,90000,1
 treasure01,107,39,15,15	monster	Hydra	1068,1,180000,90000,1
@@ -22,7 +23,6 @@ treasure01,29,38,15,15	monster	Poison Spore	1077,3,180000,90000,1
 treasure01,68,66,13,11	monster	Hydra	1068,4,180000,90000,1
 treasure01,34,112,17,11	monster	Pirate Skeleton	1071,5,180000,90000,1
 treasure01,106,111,9,9	monster	Pirate Skeleton	1071,5,180000,90000,1
-treasure01,106,111,9,9	monster	Pirate Skeleton	1071,5,180000,90000,1
 treasure01,106,111,9,9	monster	Thara Frog	1034,5,180000,90000,1
 treasure01,67,161,0,0	monster	Hydra	1068,1,263000,100000,1
 treasure01,67,160,0,0	monster	Hydra	1068,1,293000,100000,1
@@ -71,8 +71,6 @@ treasure01,164,71,0,0	monster	Hydra	1068,1,305000,100000,1
 treasure01,164,70,0,0	monster	Hydra	1068,1,300000,100000,1
 treasure01,165,71,0,0	monster	Hydra	1068,1,307000,100000,1
 treasure01,165,70,0,0	monster	Hydra	1068,1,293000,100000,1
-treasure01,164,59,12,10	monster	Wanderer	1208,1,1800000,200000,1
-treasure01,164,59,12,10	monster	Penomena	1216,1,900000,450000,1
 treasure01,164,59,12,10	monster	Whisper	1179,5,300000,100000,1
 treasure01,158,63,0,0	monster	Hydra	1068,1,300000,100000,1
 treasure01,159,63,0,0	monster	Hydra	1068,1,300000,100000,1
diff --git a/npc/mobs/dungeons/toyfactory.txt b/npc/mobs/dungeons/toyfactory.txt
index 061d144c8..0577a516d 100644
--- a/npc/mobs/dungeons/toyfactory.txt
+++ b/npc/mobs/dungeons/toyfactory.txt
@@ -3,18 +3,20 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.2
+//= 1.3
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.1 added Garm Baby according to May 10 patch
 //= 1.2 Official kRO 10.1 spawns [Playtester]
+//= 1.3 Small spawn update [Playtester]
 //============================================================
 
 //==================================================
 // xmas_dun01 - Toy Factory Warehouse
 //==================================================
 xmas_dun01,0,0,0,0	monster	Marin	1242,20,0,0,0
+xmas_dun01,0,0,0,0	monster	Poring	1002,10,0,0,0
 xmas_dun01,0,0,0,0	monster	Drops	1113,10,0,0,0
 xmas_dun01,0,0,0,0	monster	Poporing	1031,20,0,0,0
 xmas_dun01,0,0,0,0	monster	Cookie	1265,40,0,0,0
@@ -27,8 +29,8 @@ xmas_dun01,0,0,0,0	monster	Angeling	1096,1,3600000,1800000,0
 //==================================================
 // xmas_dun02 - Toy Monitoring Room
 //==================================================
-xmas_dun02,0,0,0,0	monster	Cookie	1265,20,0,0,0
 xmas_dun02,0,0,0,0	monster	Christmas Cookie	1246,20,0,0,0
+xmas_dun02,0,0,0,0	monster	Cookie	1265,20,0,0,0
 xmas_dun02,0,0,0,0	monster	Cruiser	1248,35,0,0,0
 xmas_dun02,0,0,0,0	monster	Myst Case	1249,50,0,0,0
 xmas_dun02,0,0,0,0	monster	Garm Baby	1515,1,1800000,0,0
diff --git a/npc/mobs/dungeons/umbaladun.txt b/npc/mobs/dungeons/umbaladun.txt
index 45cfb35ba..147a0d69e 100644
--- a/npc/mobs/dungeons/umbaladun.txt
+++ b/npc/mobs/dungeons/umbaladun.txt
@@ -3,12 +3,13 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.3
+//= 1.4
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.2 Official kRO 10.1 spawns [Playtester]
 //= 1.3 Some 11.1 spawn updates [Playtester]
+//= 1.4 More accurate spawns [Playtester]
 //============================================================
 
 //==================================================
@@ -16,36 +17,40 @@
 //==================================================
 um_dun01,0,0,0,0	monster	Stone Shooter	1495,70,0,0,0
 um_dun01,0,0,0,0	monster	Wootan Fighter	1499,10,0,0,0
-um_dun01,0,0,0,0	monster	Stainer	1174,10,0,0,0
-um_dun01,0,0,0,0	monster	Dustiness	1114,10,0,0,0
+um_dun01,0,0,0,0	monster	Wootan Shooter	1498,10,0,0,0
 um_dun01,0,0,0,0	monster	Yellow Plant	1081,5,180000,90000,1
 um_dun01,0,0,0,0	monster	Green Plant	1080,5,180000,90000,1
 
 //==================================================
 // um_dun02 - Passage to a Foreign World
 //==================================================
-um_dun02,0,0,0,0	monster	Wooden Golem	1497,15,0,0,0
-um_dun02,79,227,5,5	monster	Wooden Golem	1497,5,120000,60000,0
-um_dun02,87,189,5,5	monster	Wooden Golem	1497,2,120000,60000,0
-um_dun02,170,145,5,5	monster	Wooden Golem	1497,3,120000,60000,0
-um_dun02,196,131,7,7	monster	Wooden Golem	1497,5,120000,60000,0
-um_dun02,244,129,10,10	monster	Wooden Golem	1497,5,120000,60000,0
-um_dun02,0,0,0,0	monster	Wooden Golem	1497,10,0,0,0
-um_dun02,90,97,10,10	monster	Wooden Golem	1497,3,120000,60000,0
-um_dun02,32,83,10,10	monster	Wooden Golem	1497,2,120000,60000,0
-um_dun02,180,238,10,10	monster	Wooden Golem	1497,3,120000,60000,0
-um_dun02,144,277,10,10	monster	Wooden Golem	1497,2,120000,60000,0
-um_dun02,272,163,10,10	monster	Wooden Golem	1497,2,120000,60000,0
-um_dun02,232,156,10,10	monster	Wooden Golem	1497,3,120000,60000,0
-um_dun02,0,0,0,0	monster	Wootan Shooter	1498,20,0,0,0
-um_dun02,213,217,10,10	monster	Wootan Shooter	1498,2,120000,60000,0
-um_dun02,72,258,10,10	monster	Wootan Shooter	1498,3,120000,60000,0
-um_dun02,79,227,5,5	monster	Wootan Shooter	1498,1,120000,60000,0
-um_dun02,170,145,5,5	monster	Wootan Shooter	1498,1,120000,60000,0
-um_dun02,209,34,10,10	monster	Wootan Shooter	1498,1,120000,60000,0
-um_dun02,272,163,10,10	monster	Wootan Shooter	1498,1,120000,60000,0
-um_dun02,232,156,10,10	monster	Wootan Shooter	1498,1,120000,60000,0
-um_dun02,0,0,0,0	monster	Dryad	1493,10,0,0,0
+um_dun02,0,0,0,0	monster	Wooden Golem	1497,50,0,0,0
+um_dun02,79,227,10,10	monster	Wooden Golem	1497,2,240000,60000,0
+um_dun02,87,189,10,10	monster	Wooden Golem	1497,2,240000,60000,0
+um_dun02,170,145,10,10	monster	Wooden Golem	1497,2,240000,60000,0
+um_dun02,196,131,14,14	monster	Wooden Golem	1497,2,240000,60000,0
+um_dun02,244,129,15,15	monster	Wooden Golem	1497,2,360000,60000,0
+um_dun02,90,97,10,15	monster	Wooden Golem	1497,2,360000,60000,0
+um_dun02,90,97,10,15	monster	Wooden Golem	1497,2,240000,60000,0
+um_dun02,32,83,10,15	monster	Wooden Golem	1497,2,360000,60000,0
+um_dun02,32,83,10,15	monster	Wooden Golem	1497,2,240000,60000,0
+um_dun02,180,238,15,15	monster	Wooden Golem	1497,2,180000,60000,0
+um_dun02,144,277,15,15	monster	Wooden Golem	1497,2,360000,60000,0
+um_dun02,144,277,15,15	monster	Wooden Golem	1497,2,180000,60000,0
+um_dun02,272,163,15,15	monster	Wooden Golem	1497,2,360000,60000,0
+um_dun02,272,163,15,15	monster	Wooden Golem	1497,2,180000,60000,0
+um_dun02,232,156,15,15	monster	Wooden Golem	1497,2,300000,60000,0
+um_dun02,232,156,15,15	monster	Wooden Golem	1497,2,180000,60000,0
+um_dun02,0,0,0,0	monster	Driller	1380,5,0,0,0
+um_dun02,0,0,0,0	monster	Wootan Shooter	1498,10,0,0,0
+um_dun02,213,217,15,15	monster	Wootan Shooter	1498,2,120000,60000,0
+um_dun02,72,258,15,15	monster	Wootan Shooter	1498,3,120000,60000,0
+um_dun02,79,227,10,10	monster	Wootan Shooter	1498,1,120000,60000,0
+um_dun02,170,145,10,10	monster	Wootan Shooter	1498,1,120000,60000,0
+um_dun02,209,34,15,15	monster	Wootan Shooter	1498,1,120000,60000,0
+um_dun02,272,163,15,15	monster	Wootan Shooter	1498,1,120000,60000,0
+um_dun02,232,156,15,15	monster	Wootan Shooter	1498,1,120000,60000,0
+um_dun02,0,0,0,0	monster	Dryad	1493,25,0,0,0
 um_dun02,0,0,0,0	monster	Yellow Plant	1081,5,180000,90000,1
 um_dun02,0,0,0,0	monster	Red Plant	1078,5,180000,90000,1
 um_dun02,0,0,0,0	monster	Shining Plant	1083,6,180000,90000,1
diff --git a/npc/mobs/fields/amatsu.txt b/npc/mobs/fields/amatsu.txt
index fab810a17..7b8984a25 100644
--- a/npc/mobs/fields/amatsu.txt
+++ b/npc/mobs/fields/amatsu.txt
@@ -3,13 +3,13 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.2
+//= 1.3
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.1 replaced Hydra -> G_Hydra (to fix drops exploit) [Lupus]
 //= 1.2 Official kRO 10.1 spawns [Playtester]
-//= Note: Please don't change spawns without official info
+//= 1.3 Small update [Playtester]
 //============================================================
 
 //==================================================
@@ -33,11 +33,6 @@ ama_fild01,169,314,0,0	monster	Hydra	1068,1,63000,31500,0
 ama_fild01,171,313,0,0	monster	Hydra	1068,1,66000,33000,0
 ama_fild01,173,313,0,0	monster	Hydra	1068,1,60000,30000,0
 ama_fild01,175,313,0,0	monster	Hydra	1068,1,66000,33000,0
-ama_fild01,175,312,0,0	monster	Hydra	1068,1,63000,31500,0
-ama_fild01,173,312,0,0	monster	Hydra	1068,1,60000,30000,0
-ama_fild01,171,312,0,0	monster	Hydra	1068,1,63000,31500,0
-ama_fild01,174,311,0,0	monster	Hydra	1068,1,63000,31500,0
-ama_fild01,172,311,0,0	monster	Hydra	1068,1,69000,36000,0
 ama_fild01,173,310,0,0	monster	Hydra	1068,1,60000,30000,0
 ama_fild01,0,0,0,0	monster	Kapha	1406,20,60000,30000,0
 ama_fild01,174,306,20,20	monster	Kapha	1406,10,300000,150000,0
diff --git a/npc/mobs/fields/comodo.txt b/npc/mobs/fields/comodo.txt
index a2fa6a8ba..c7609aa30 100644
--- a/npc/mobs/fields/comodo.txt
+++ b/npc/mobs/fields/comodo.txt
@@ -3,11 +3,12 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.2
+//= 1.3
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.2 Official kRO 10.1 spawns [Playtester]
+//= 1.3 More accurate spawns [Playtester]
 //============================================================
 
 //==================================================
@@ -45,12 +46,11 @@ cmd_fild02,0,0,0,0	monster	Galapago	1391,20,0,0,0
 //==================================================
 // cmd_fild03 - Zenhai Marsh
 //==================================================
-cmd_fild03,0,0,0,0	monster	Mutant Dragonoid	1262,1,3600000,1800000,1
+cmd_fild03,0,0,0,0	monster	Mutant Dragonoid	1262,1,0,0,1
 cmd_fild03,0,0,0,0	monster	Pest	1256,30,0,0,0
 cmd_fild03,0,0,0,0	monster	Poporing	1031,10,0,0,0
-cmd_fild03,0,0,0,0	monster	Anolian	1206,60,0,0,0
+cmd_fild03,0,0,0,0	monster	Anolian	1206,90,0,0,0
 cmd_fild03,0,0,0,0	monster	Toad	1089,1,3600000,1800000,1
-cmd_fild03,0,0,0,0	monster	Rotar Zairo	1392,30,0,0,0
 cmd_fild03,356,232,3,3	monster	Shining Plant	1083,1,1800000,900000,1
 cmd_fild03,262,289,3,3	monster	Shining Plant	1083,1,1800000,900000,1
 cmd_fild03,145,191,3,3	monster	Shining Plant	1083,1,1800000,900000,1
@@ -68,11 +68,11 @@ cmd_fild04,221,120,120,40	monster	Sea Otter	1323,20,0,0,0
 //==================================================
 // cmd_fild05 - Border of Papuchica Forest
 //==================================================
-cmd_fild05,0,0,0,0	monster	Frilldora	1119,15,0,0,0
-cmd_fild05,0,0,0,0	monster	Anolian	1206,20,0,0,0
-cmd_fild05,0,0,0,0	monster	Stem Worm	1215,30,0,0,0
+cmd_fild05,0,0,0,0	monster	Frilldora	1119,45,0,0,0
+cmd_fild05,0,0,0,0	monster	Alligator	1271,20,0,0,0
+cmd_fild05,0,0,0,0	monster	Stem Worm	1215,5,0,0,0
 cmd_fild05,0,0,0,0	monster	Poporing	1031,10,0,0,0
-cmd_fild05,0,0,0,0	monster	Pest	1256,20,0,0,0
+cmd_fild05,0,0,0,0	monster	Pest	1256,5,0,0,0
 cmd_fild05,63,158,10,10	monster	Shining Plant	1083,1,1800000,900000,1
 cmd_fild05,318,277,10,10	monster	Yellow Plant	1081,3,1800000,900000,1
 cmd_fild05,282,49,20,20	monster	Yellow Plant	1081,3,1800000,900000,1
@@ -81,15 +81,23 @@ cmd_fild05,0,0,0,0	monster	Green Plant	1080,5,1800000,900000,1
 //==================================================
 // cmd_fild06 - Fortress Saint Darmain (West)
 //==================================================
-cmd_fild06,357,299,80,70	monster	Kobold Archer	1282,5,0,0,0
-cmd_fild06,318,146,120,80	monster	Kobold Archer	1282,7,0,0,0
+cmd_fild06,0,0,0,0	monster	Kobold Archer	1282,5,0,0,0
+cmd_fild06,0,0,0,0	monster	Kobold Archer	1282,5,300000,0,0
+cmd_fild06,357,299,80,70	monster	Kobold Archer	1282,2,0,0,0
+cmd_fild06,357,299,80,70	monster	Kobold Archer	1282,2,120000,0,0
+cmd_fild06,318,146,120,80	monster	Kobold Archer	1282,4,0,0,0
+cmd_fild06,318,146,120,80	monster	Kobold Archer	1282,4,120000,0,0
 cmd_fild06,244,113,0,0	monster	Kobold Archer	1282,1,180000,0,0
 cmd_fild06,290,164,0,0	monster	Kobold Archer	1282,1,190000,0,0
 cmd_fild06,284,197,0,0	monster	Kobold Archer	1282,1,180000,0,0
 cmd_fild06,286,289,0,0	monster	Kobold Archer	1282,1,180000,0,0
 cmd_fild06,314,267,0,0	monster	Kobold Archer	1282,1,180000,0,0
-cmd_fild06,355,294,80,70	monster	Goblin Archer	1258,7,0,0,0
-cmd_fild06,307,97,70,200	monster	Goblin Archer	1258,7,0,0,0
+cmd_fild06,0,0,0,0	monster	Goblin Archer	1258,10,0,0,0
+cmd_fild06,0,0,0,0	monster	Goblin Archer	1258,10,30000,0,0
+cmd_fild06,355,294,80,70	monster	Goblin Archer	1258,3,0,0,0
+cmd_fild06,355,294,80,70	monster	Goblin Archer	1258,3,120000,0,0
+cmd_fild06,307,97,70,200	monster	Goblin Archer	1258,4,0,0,0
+cmd_fild06,307,97,70,200	monster	Goblin Archer	1258,4,120000,0,0
 cmd_fild06,100,265,10,40	monster	Goblin Archer	1258,3,130000,0,0
 cmd_fild06,244,110,0,0	monster	Goblin Archer	1258,1,180000,0,0
 cmd_fild06,292,169,0,0	monster	Goblin Archer	1258,1,180000,0,0
@@ -101,11 +109,6 @@ cmd_fild06,284,186,0,0	monster	Goblin Archer	1258,1,180000,0,0
 cmd_fild06,354,342,0,0	monster	Goblin Archer	1258,1,180000,0,0
 cmd_fild06,365,342,0,0	monster	Goblin Archer	1258,1,180000,0,0
 cmd_fild06,340,334,0,0	monster	Goblin Archer	1258,1,180000,0,0
-cmd_fild06,305,95,70,180	monster	Stem Worm	1215,30,0,0,0
-cmd_fild06,102,268,10,40	monster	Stem Worm	1215,3,0,0,0
-cmd_fild06,359,156,30,50	monster	Stem Worm	1215,1,0,0,0
-cmd_fild06,360,155,30,50	monster	Stem Worm	1215,1,0,0,0
-cmd_fild06,357,298,80,70	monster	Stem Worm	1215,20,0,0,0
 cmd_fild06,0,0,0,0	monster	Drops	1113,20,0,0,0
 cmd_fild06,0,0,0,0	monster	Harpy	1376,1,1500000,1000000,0
 cmd_fild06,293,235,5,5	monster	Yellow Plant	1081,2,1800000,900000,1
@@ -191,7 +194,7 @@ cmd_fild08,130,201,10,10	monster	Yellow Plant	1081,4,1800000,900000,1
 //==================================================
 cmd_fild09,0,0,0,0	monster	Steel Chonchon	1042,20,0,0,0
 cmd_fild09,0,0,0,0	monster	Drops	1113,20,0,0,0
-cmd_fild09,0,0,0,0	monster	Anacondaq	1030,20,0,0,0
-cmd_fild09,0,0,0,0	monster	Condor	1009,60,0,0,0
+cmd_fild09,0,0,0,0	monster	Anacondaq	1030,60,0,0,0
+cmd_fild09,0,0,0,0	monster	Condor	1009,20,0,0,0
 cmd_fild09,142,325,40,50	monster	Hode	1127,3,150000,0,0
 cmd_fild09,140,323,40,50	monster	Gargoyle	1253,2,150000,0,0
diff --git a/npc/mobs/fields/geffen.txt b/npc/mobs/fields/geffen.txt
index 696f5d355..ff7f3307f 100644
--- a/npc/mobs/fields/geffen.txt
+++ b/npc/mobs/fields/geffen.txt
@@ -3,12 +3,13 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.3
+//= 1.4
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.2 Map names typos fix [Lupus]
 //= 1.3 Official kRO 10.1 spawns + future changes [Playtester]
+//= 1.4 More accurate spawns [Playtester]
 //============================================================
 
 //==================================================
@@ -35,10 +36,11 @@ gef_fild01,215,225,10,10	monster	Green Plant	1080,5,360000,180000,1
 // gef_fild02 - Geffen Field
 //==================================================
 gef_fild02,0,0,0,0	monster	Yoyo	1057,10,0,0,0
-gef_fild02,0,0,0,0	monster	Orc Warrior	1023,40,0,0,0
-gef_fild02,0,0,0,0	monster	Coco	1104,20,0,0,0
-gef_fild02,0,0,0,0	monster	Smokie	1056,20,0,0,0
+gef_fild02,0,0,0,0	monster	Orc Warrior	1023,60,0,0,0
+gef_fild02,0,0,0,0	monster	Coco	1104,10,0,0,0
+gef_fild02,0,0,0,0	monster	Smokie	1056,10,0,0,0
 gef_fild02,0,0,0,0	monster	Choco	1214,1,0,0,0
+gef_fild02,0,0,0,0	monster	Orc Hero	1087,1,86400000,43200000,1
 gef_fild02,227,316,6,6	monster	Green Plant	1080,8,360000,180000,1
 gef_fild02,87,48,6,6	monster	Red Mushroom	1085,5,360000,180000,1
 gef_fild02,215,209,2,1	monster	Blue Plant	1079,2,360000,180000,1
@@ -49,9 +51,9 @@ gef_fild02,164,194,1,1	monster	Shining Plant	1083,1,1800000,900000,1
 //==================================================
 // gef_fild03 - Geffen Field
 //==================================================
-gef_fild03,0,0,0,0	monster	Orc Warrior	1023,30,0,0,0
-gef_fild03,0,0,0,0	monster	High Orc	1213,10,0,0,0
-gef_fild03,0,0,0,0	monster	Savage	1166,30,0,0,0
+gef_fild03,0,0,0,0	monster	Orc Warrior	1023,60,0,0,0
+gef_fild03,0,0,0,0	monster	High Orc	1213,1,0,0,0
+gef_fild03,0,0,0,0	monster	Savage	1166,40,0,0,0
 gef_fild03,0,0,0,0	monster	Poporing	1031,20,0,0,0
 gef_fild03,45,350,3,3	monster	Green Plant	1080,1,180000,90000,1
 gef_fild03,66,300,3,3	monster	Green Plant	1080,1,180000,90000,1
@@ -175,7 +177,7 @@ gef_fild10,0,0,0,0	monster	Orc Lord	1190,1,7200000,3600000,0
 gef_fild10,0,0,0,0	monster	Orc Warrior	1023,20,0,0,0
 gef_fild10,0,0,0,0	monster	Orc Lady	1273,70,0,0,0
 gef_fild10,0,0,0,0	monster	Poporing	1031,15,0,0,0
-gef_fild10,0,0,0,0	monster	Orc Baby	1686,5,120000,0,0
+gef_fild10,0,0,0,0	monster	Orc Baby	1686,5,0,0,0
 gef_fild10,46,350,5,5	monster	Blue Plant	1079,3,900000,450000,1
 gef_fild10,287,61,5,5	monster	Blue Plant	1079,3,900000,450000,1
 gef_fild10,300,253,5,5	monster	Green Plant	1080,3,360000,180000,1
@@ -208,7 +210,6 @@ gef_fild12,0,0,0,0	monster	Kobold	1134,30,0,0,0
 gef_fild12,0,0,0,0	monster	Kobold	1135,30,0,0,0
 gef_fild12,0,0,0,0	monster	Kobold Archer	1282,40,0,0,0
 gef_fild12,0,0,0,0	monster	Poporing	1031,20,0,0,0
-gef_fild12,0,0,0,0	monster	Kobold Leader	1296,1,1800000,1200000,0
 
 //==================================================
 // gef_fild13 - Britoniah
@@ -220,8 +221,8 @@ gef_fild13,0,0,0,0	monster	Ambernite	1094,30,0,0,0
 //==================================================
 // gef_fild14 - West Orc Village
 //==================================================
-gef_fild14,0,0,0,0	monster	Orc Lady	1273,40,0,0,0
+gef_fild14,0,0,0,0	monster	Orc Lady	1273,20,0,0,0
 gef_fild14,0,0,0,0	monster	Orc Hero	1087,1,3600000,1800000,1
-gef_fild14,0,0,0,0	monster	Orc Warrior	1023,20,0,0,0
+gef_fild14,0,0,0,0	monster	Orc Warrior	1023,10,0,0,0
 gef_fild14,0,0,0,0	monster	Orc Archer	1189,30,0,0,0
-gef_fild14,0,0,0,0	monster	High Orc	1213,40,0,0,0
+gef_fild14,0,0,0,0	monster	High Orc	1213,70,0,0,0
diff --git a/npc/mobs/fields/morocc.txt b/npc/mobs/fields/morocc.txt
index c5266c897..6f6c88589 100644
--- a/npc/mobs/fields/morocc.txt
+++ b/npc/mobs/fields/morocc.txt
@@ -3,11 +3,12 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.1
+//= 1.2
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.1 Official kRO 10.1 spawns [Playtester]
+//= 1.2 More accurate spawns [Playtester]
 //============================================================
 
 //==================================================
@@ -81,21 +82,15 @@ moc_fild05,0,0,0,0	monster	Magnolia	1138,30,0,0,0
 moc_fild05,0,0,0,0	monster	Metaller	1058,20,0,0,0
 moc_fild05,0,0,0,0	monster	Golem	1040,70,0,0,0
 moc_fild05,0,0,0,0	monster	Ant Egg	1097,10,0,0,0
-moc_fild05,0,0,0,0	monster	Andre	1095,10,0,0,0
-moc_fild05,0,0,0,0	monster	Deniro	1105,10,0,0,0
-moc_fild05,0,0,0,0	monster	Piere	1160,10,0,0,0
 moc_fild05,208,233,10,10	monster	Yellow Plant	1081,5,360000,180000,1
 
 //==================================================
 // moc_fild06 - Sograt Desert
 //==================================================
-moc_fild06,0,0,0,0	monster	Peco Peco	1019,70,0,0,0
+moc_fild06,0,0,0,0	monster	Peco Peco	1019,85,0,0,0
 moc_fild06,0,0,0,0	monster	Muka	1055,30,0,0,0
 moc_fild06,0,0,0,0	monster	Condor	1009,50,0,0,0
 moc_fild06,0,0,0,0	monster	Magnolia	1138,10,0,0,0
-moc_fild06,0,0,0,0	monster	Andre	1095,5,0,0,0
-moc_fild06,0,0,0,0	monster	Deniro	1105,5,0,0,0
-moc_fild06,0,0,0,0	monster	Piere	1160,5,0,0,0
 moc_fild06,0,0,0,0	monster	Ant Egg	1097,10,0,0,0
 moc_fild06,193,203,10,10	monster	Yellow Plant	1081,10,900000,450000,1
 
@@ -174,9 +169,9 @@ moc_fild12,181,336,40,20	monster	Yellow Plant	1081,10,180000,90000,1
 // moc_fild13 - Sograt Desert
 //==================================================
 moc_fild13,0,0,0,0	monster	Desert Wolf	1106,30,0,0,0
-moc_fild13,0,0,0,0	monster	Anacondaq	1030,70,0,0,0
-moc_fild13,0,0,0,0	monster	Boa	1025,25,0,0,0
-moc_fild13,0,0,0,0	monster	Side Winder	1037,35,0,0,0
+moc_fild13,0,0,0,0	monster	Anacondaq	1030,75,0,0,0
+moc_fild13,0,0,0,0	monster	Boa	1025,30,0,0,0
+moc_fild13,0,0,0,0	monster	Side Winder	1037,5,0,0,0
 moc_fild13,0,0,0,0	monster	Poporing	1031,20,0,0,0
 moc_fild13,0,0,0,0	monster	Drops	1113,10,0,0,0
 moc_fild13,280,99,0,0	monster	Red Mushroom	1085,1,180000,90000,1
@@ -252,16 +247,12 @@ moc_fild16,0,0,0,0	monster	Ant Egg	1097,10,0,0,0
 //==================================================
 // moc_fild17 - Sograt Desert
 //==================================================
-moc_fild17,0,0,0,0	monster	Hode	1127,50,0,0,0
-moc_fild17,0,0,0,0	monster	Steel Chonchon	1042,40,0,0,0
+moc_fild17,0,0,0,0	monster	Hode	1127,100,0,0,0
+moc_fild17,0,0,0,0	monster	Steel Chonchon	1042,30,0,0,0
 moc_fild17,0,0,0,0	monster	Magnolia	1138,15,0,0,0
-moc_fild17,0,0,0,0	monster	Frilldora	1119,15,0,0,0
-moc_fild17,0,0,0,0	monster	Andre	1095,10,0,0,0
-moc_fild17,0,0,0,0	monster	Deniro	1105,20,0,0,0
-moc_fild17,0,0,0,0	monster	Piere	1160,20,0,0,0
+moc_fild17,0,0,0,0	monster	Frilldora	1119,25,0,0,0
 moc_fild17,0,0,0,0	monster	Ant Egg	1097,10,0,0,0
 moc_fild17,0,0,0,0	monster	Scorpion	1001,5,0,0,0
-moc_fild17,0,0,0,0	monster	Sandman	1165,5,0,0,0
 moc_fild17,40,258,0,0	monster	Yellow Plant	1081,1,180000,90000,1
 moc_fild17,144,151,0,0	monster	Yellow Plant	1081,1,180000,90000,1
 moc_fild17,243,138,0,0	monster	Yellow Plant	1081,1,180000,90000,1
@@ -277,10 +268,6 @@ moc_fild18,0,0,0,0	monster	Steel Chonchon	1042,70,0,0,0
 moc_fild18,0,0,0,0	monster	Chonchon	1011,40,0,0,0
 moc_fild18,0,0,0,0	monster	Muka	1055,40,0,0,0
 moc_fild18,0,0,0,0	monster	Metaller	1058,10,0,0,0
-moc_fild18,0,0,0,0	monster	Magnolia	1138,25,0,0,0
-moc_fild18,0,0,0,0	monster	Andre	1095,5,0,0,0
-moc_fild18,0,0,0,0	monster	Deniro	1105,5,0,0,0
-moc_fild18,0,0,0,0	monster	Piere	1160,5,0,0,0
 moc_fild18,0,0,0,0	monster	Ant Egg	1097,5,0,0,0
 moc_fild18,0,0,0,0	monster	Dragon Fly	1091,1,3600000,1800000,1
 moc_fild18,0,0,0,0	monster	Hunter Fly	1035,1,7200000,3600000,1
diff --git a/npc/mobs/fields/payon.txt b/npc/mobs/fields/payon.txt
index 13d626459..0903a79d1 100644
--- a/npc/mobs/fields/payon.txt
+++ b/npc/mobs/fields/payon.txt
@@ -3,21 +3,22 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.2
+//= 1.3
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.1 Official kRO 10.1 spawns [Playtester]
-//= 1.2 Some 11.1 and 11.2 spawn changes [Playtester]
+//= 1.2 Some 11.1 spawn changes [Playtester]
+//= 1.3 More accurate spawns [Playtester]
 //============================================================
 
 //==================================================
 // pay_fild01 - Payon Forest
 //==================================================
-pay_fild01,0,0,0,0	monster	Willow	1010,50,0,0,0
+pay_fild01,0,0,0,0	monster	Willow	1010,10,0,0,0
 pay_fild01,0,0,0,0	monster	Poporing	1031,10,0,0,0
-pay_fild01,0,0,0,0	monster	Poring	1002,60,0,0,0
-pay_fild01,0,0,0,0	monster	Spore	1014,20,0,0,0
+pay_fild01,0,0,0,0	monster	Poring	1002,10,0,0,0
+pay_fild01,0,0,0,0	monster	Spore	1014,100,0,0,0
 pay_fild01,340,89,0,0	monster	Black Mushroom	1084,1,180000,90000,1
 pay_fild01,336,116,0,0	monster	Black Mushroom	1084,1,180000,90000,1
 pay_fild01,231,258,0,0	monster	Black Mushroom	1084,1,180000,90000,1
@@ -81,7 +82,7 @@ pay_fild05,86,90,5,5	monster	Green Plant	1080,4,900000,450000,1
 //==================================================
 // pay_fild06 - Payon Forest
 //==================================================
-pay_fild06,0,0,0,0	monster	Wormtail	1024,70,0,0,0
+pay_fild06,0,0,0,0	monster	Wormtail	1024,90,0,0,0
 pay_fild06,0,0,0,0	monster	Spore	1014,20,0,0,0
 pay_fild06,0,0,0,0	monster	Poporing	1031,20,0,0,0
 pay_fild06,0,0,0,0	monster	Thief Bug Female	1053,40,0,0,0
@@ -112,13 +113,9 @@ pay_fild08,143,156,40,40	monster	Shining Plant	1083,1,3600000,1800000,1
 //==================================================
 // pay_fild09 - Payon Forest
 //==================================================
-pay_fild09,0,0,0,0	monster	Spore	1014,20,0,0,0
-pay_fild09,0,0,0,0	monster	Wormtail	1024,20,0,0,0
 pay_fild09,0,0,0,0	monster	Poporing	1031,20,0,0,0
-pay_fild09,0,0,0,0	monster	Boa	1025,30,0,0,0
-pay_fild09,0,0,0,0	monster	Sohee	1170,3,0,0,0
-pay_fild09,0,0,0,0	monster	Smokie	1056,50,0,0,0
-pay_fild09,0,0,0,0	monster	Bigfoot	1060,50,0,0,0
+pay_fild09,0,0,0,0	monster	Smokie	1056,80,0,0,0
+pay_fild09,0,0,0,0	monster	Bigfoot	1060,70,0,0,0
 pay_fild09,198,217,30,30	monster	Green Plant	1080,10,360000,180000,0
 pay_fild09,198,217,30,30	monster	Shining Plant	1083,1,1800000,900000,1
 
@@ -126,10 +123,9 @@ pay_fild09,198,217,30,30	monster	Shining Plant	1083,1,1800000,900000,1
 // pay_fild10 - Payon Forest
 //==================================================
 pay_fild10,0,0,0,0	monster	Greatest General	1277,65,0,0,0
-pay_fild10,0,0,0,0	monster	Dokebi	1110,40,0,0,0
+pay_fild10,0,0,0,0	monster	Dokebi	1110,70,0,0,0
 pay_fild10,0,0,0,0	monster	Poison Spore	1077,20,0,0,0
-pay_fild10,0,0,0,0	monster	Poporing	1031,30,0,0,0
-pay_fild10,0,0,0,0	monster	Nine Tail	1180,3,0,0,0
+pay_fild10,0,0,0,0	monster	Nine Tail	1180,2,0,0,0
 pay_fild10,0,0,0,0	monster	Nine Tail	1180,1,1800000,900000,1
 pay_fild10,0,0,0,0	monster	Nine Tail	1180,1,900000,450000,1
 pay_fild10,213,157,10,10	monster	Green Plant	1080,5,360000,180000,1
@@ -142,10 +138,9 @@ pay_fild10,66,332,10,10	monster	Blue Plant	1079,1,360000,180000,1
 //==================================================
 // pay_fild11 - Payon Forest
 //==================================================
-pay_fild11,0,0,0,0	monster	Nine Tail	1180,50,0,0,0
 pay_fild11,0,0,0,0	monster	Greatest General	1277,30,0,0,0
-pay_fild11,0,0,0,0	monster	Dragon Tail	1321,30,0,0,0
-pay_fild11,0,0,0,0	monster	Poporing	1031,20,0,0,0
+pay_fild11,0,0,0,0	monster	Nine Tail	1180,60,180000,0,0
+pay_fild11,0,0,0,0	monster	Dragon Tail	1321,50,180000,0,0
 pay_fild11,0,0,0,0	monster	Eddga	1115,1,7200000,3600000,1
 pay_fild11,241,162,5,5	monster	Red Mushroom	1085,3,360000,180000,1
 pay_fild11,66,293,5,5	monster	Red Mushroom	1085,3,360000,180000,1
diff --git a/npc/mobs/fields/prontera.txt b/npc/mobs/fields/prontera.txt
index 83ea66404..6a44259aa 100644
--- a/npc/mobs/fields/prontera.txt
+++ b/npc/mobs/fields/prontera.txt
@@ -3,12 +3,13 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.3
+//= 1.4
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.2 fixed some map name typos [Lupus]
 //= 1.3 Official kRO 10.1 spawns [Playtester]
+//= 1.4 More accurate spawns [Playtester]
 //============================================================
 
 //==================================================
@@ -16,10 +17,10 @@
 //==================================================
 prt_fild00,0,0,0,0	monster	Creamy	1018,10,0,0,0
 prt_fild00,0,0,0,0	monster	Fabre	1007,20,0,0,0
-prt_fild00,0,0,0,0	monster	Pupa	1008,50,0,0,0
+prt_fild00,0,0,0,0	monster	Pupa	1008,30,0,0,0
 prt_fild00,0,0,0,0	monster	Lunatic	1063,30,0,0,0
 prt_fild00,0,0,0,0	monster	Poring	1002,40,0,0,0
-prt_fild00,0,0,0,0	monster	Hornet	1004,40,0,0,0
+prt_fild00,0,0,0,0	monster	Hornet	1004,70,0,0,0
 prt_fild00,227,212,0,0	monster	Shining Plant	1083,1,1800000,900000,1
 prt_fild00,285,138,10,10	monster	Green Plant	1080,5,360000,180000,1
 
@@ -49,11 +50,10 @@ prt_fild02,0,0,0,0	monster	Shining Plant	1083,2,1800000,900000,1
 //==================================================
 // prt_fild03 - Prontera Field
 //==================================================
-prt_fild03,0,0,0,0	monster	Yoyo	1057,70,0,0,0
+prt_fild03,0,0,0,0	monster	Yoyo	1057,80,0,0,0
 prt_fild03,0,0,0,0	monster	Smokie	1056,40,0,0,0
-prt_fild03,0,0,0,0	monster	Choco	1214,3,1800000,900000,0
-prt_fild03,0,0,0,0	monster	Fabre	1007,10,0,0,0
-prt_fild03,0,0,0,0	monster	Poporing	1031,30,0,0,0
+prt_fild03,0,0,0,0	monster	Choco	1214,1,0,0,0
+prt_fild03,0,0,0,0	monster	Poporing	1031,10,0,0,0
 prt_fild03,296,58,15,15	monster	Green Plant	1080,5,180000,90000,1
 prt_fild03,296,58,15,15	monster	Blue Plant	1079,2,900000,450000,1
 prt_fild03,307,75,5,5	monster	Green Plant	1080,5,360000,180000,1
@@ -94,8 +94,9 @@ prt_fild06,222,30,40,10	monster	Green Plant	1080,15,900000,450000,1
 //==================================================
 // prt_fild07 - Prontera Field
 //==================================================
-prt_fild07,0,0,0,0	monster	Rocker	1052,70,0,0,0
+prt_fild07,0,0,0,0	monster	Rocker	1052,80,0,0,0
 prt_fild07,0,0,0,0	monster	Poporing	1031,30,0,0,0
+prt_fild07,0,0,0,0	monster	Vocal	1088,1,1800000,1200000,0
 prt_fild07,225,110,5,5	monster	Black Mushroom	1084,3,360000,180000,1
 
 //==================================================
diff --git a/npc/mobs/fields/umbala.txt b/npc/mobs/fields/umbala.txt
index 83f353b06..24a611f6c 100644
--- a/npc/mobs/fields/umbala.txt
+++ b/npc/mobs/fields/umbala.txt
@@ -3,21 +3,22 @@
 //===== By: ================================================== 
 //= Darkchild (1.0)
 //===== Current Version: ===================================== 
-//= 1.3
+//= 1.4
 //===== Compatible With: ===================================== 
 //= Any eAthena Version; RO Ep6+
 //===== Additional Comments: ================================= 
 //= 1.3 Official kRO 10.1 spawns [Playtester]
+//= 1.4 More accurate spawns [Playtester]
 //============================================================ 
 
 //==================================================
 // um_fild01 - Luluka Forest
 //==================================================
-um_fild01,0,0,0,0	monster	Dryad	1493,40,0,0,0
-um_fild01,0,0,0,0	monster	Stem Worm	1215,30,0,0,0
-um_fild01,0,0,0,0	monster	Harpy	1376,2,0,0,0
-um_fild01,0,0,0,0	monster	Dustiness	1114,20,0,0,0
 um_fild01,0,0,0,0	monster	Wootan Fighter	1499,10,0,0,0
+um_fild01,0,0,0,0	monster	Stem Worm	1215,15,0,0,0
+um_fild01,0,0,0,0	monster	Harpy	1376,2,0,0,0
+um_fild01,0,0,0,0	monster	Dryad	1493,65,0,0,0
+um_fild01,0,0,0,0	monster	Dustiness	1114,10,0,0,0
 um_fild01,0,0,0,0	monster	Green Plant	1080,10,180000,90000,1
 um_fild01,0,0,0,0	monster	Yellow Plant	1081,10,180000,90000,1
 um_fild01,0,0,0,0	monster	Shining Plant	1083,6,180000,90000,1
@@ -26,7 +27,7 @@ um_fild01,0,0,0,0	monster	Shining Plant	1083,6,180000,90000,1
 // um_fild02 - Hoomga Forest
 //==================================================
 um_fild02,0,0,0,0	monster	Coco	1104,10,0,0,0
-um_fild02,0,0,0,0	monster	Choco	1214,3,0,0,0
+um_fild02,0,0,0,0	monster	Choco	1214,5,0,0,0
 um_fild02,0,0,0,0	monster	Beetle King	1494,30,0,0,0
 um_fild02,0,0,0,0	monster	Dustiness	1114,20,0,0,0
 um_fild02,0,0,0,0	monster	Wootan Fighter	1499,26,0,0,0
@@ -62,12 +63,10 @@ um_fild02,0,0,0,0	monster	Yellow Plant	1081,5,180000,90000,1
 //==================================================
 // um_fild03 - Kalala Swamp
 //==================================================
-um_fild03,0,0,0,0	monster	Parasite	1500,60,0,0,0
-um_fild03,0,0,0,0	monster	Dragon Tail	1321,45,0,0,0
-um_fild03,0,0,0,0	monster	Alligator	1271,15,0,0,0
-um_fild03,0,0,0,0	monster	Stainer	1174,10,0,0,0
+um_fild03,0,0,0,0	monster	Parasite	1500,95,0,0,0
+um_fild03,0,0,0,0	monster	Dragon Tail	1321,20,0,0,0
+um_fild03,0,0,0,0	monster	Alligator	1271,10,0,0,0
 um_fild03,0,0,0,0	monster	Gryphon	1259,1,3500000,1900000,0
-um_fild03,0,0,0,0	monster	Pest	1256,2,0,0,0
 um_fild03,0,0,0,0	monster	Blue Plant	1079,5,180000,90000,1
 um_fild03,0,0,0,0	monster	Green Plant	1080,10,180000,90000,1
 um_fild03,0,0,0,0	monster	Shining Plant	1083,2,180000,90000,1
@@ -79,14 +78,12 @@ um_fild04,0,0,0,0	monster	Beetle King	1494,30,0,0,0
 um_fild04,0,0,0,0	monster	Horn	1128,15,0,0,0
 um_fild04,0,0,0,0	monster	Choco	1214,2,0,0,0
 um_fild04,0,0,0,0	monster	Wootan Shooter	1498,7,0,0,0
-um_fild04,264,293,10,10	monster	Beetle King	1494,4,120000,60000,0
 um_fild04,264,293,10,10	monster	Horn	1128,2,1200000,60000,0
+um_fild04,264,293,10,10	monster	Beetle King	1494,4,120000,60000,0
 um_fild04,121,239,10,10	monster	Beetle King	1494,2,120000,60000,0
 um_fild04,91,79,10,10	monster	Beetle King	1494,2,120000,60000,0
-um_fild04,91,79,10,10	monster	Wootan Shooter	1498,1,300000,60000,0
 um_fild04,244,339,10,10	monster	Beetle King	1494,2,120000,60000,0
 um_fild04,295,93,10,10	monster	Beetle King	1494,2,120000,60000,0
-um_fild04,295,93,10,10	monster	Wootan Shooter	1498,1,300000,60000,0
 um_fild04,118,237,10,10	monster	Beetle King	1494,2,120000,60000,0
 um_fild04,118,237,10,10	monster	Horn	1128,1,120000,60000,0
 um_fild04,311,285,10,10	monster	Beetle King	1494,2,120000,60000,0
@@ -96,5 +93,7 @@ um_fild04,206,188,10,10	monster	Horn	1128,1,120000,60000,0
 um_fild04,239,245,10,10	monster	Beetle King	1494,2,120000,60000,0
 um_fild04,239,245,10,10	monster	Horn	1128,1,120000,60000,0
 um_fild04,239,245,10,10	monster	Wootan Shooter	1498,1,300000,60000,0
+um_fild04,91,79,10,10	monster	Wootan Shooter	1498,1,300000,60000,0
+um_fild04,295,93,10,10	monster	Wootan Shooter	1498,1,300000,60000,0
 um_fild04,0,0,0,0	monster	Red Plant	1078,5,180000,90000,1
 um_fild04,0,0,0,0	monster	Yellow Plant	1081,5,180000,90000,1