summaryrefslogtreecommitdiff
path: root/npc/omobs
diff options
context:
space:
mode:
authorPoki#3 <Poki#3@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-03-30 13:07:16 +0000
committerPoki#3 <Poki#3@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-03-30 13:07:16 +0000
commit345763fe7f6c48f4e79a65c9dafb7fea9b1c6224 (patch)
tree7d58614220248c15b5adc9645e1316e727c2b724 /npc/omobs
parent4ddab529a7876ffb76f6d3aee0a3945aa11cec29 (diff)
downloadhercules-345763fe7f6c48f4e79a65c9dafb7fea9b1c6224.tar.gz
hercules-345763fe7f6c48f4e79a65c9dafb7fea9b1c6224.tar.bz2
hercules-345763fe7f6c48f4e79a65c9dafb7fea9b1c6224.tar.xz
hercules-345763fe7f6c48f4e79a65c9dafb7fea9b1c6224.zip
* Fixed a lot of Jnames
* Revised all the spawns based on Emperium.org. - Only omobs got changed. eamobs is like it was. - I unified the formatting used for the map names. Please use that in future field expansions. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5808 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/omobs')
-rw-r--r--npc/omobs/dungeons/abyss.txt14
-rw-r--r--npc/omobs/dungeons/amatdun.txt42
-rw-r--r--npc/omobs/dungeons/anthell.txt26
-rw-r--r--npc/omobs/dungeons/ayodun.txt16
-rw-r--r--npc/omobs/dungeons/beachdun.txt38
-rw-r--r--npc/omobs/dungeons/byalan.txt68
-rw-r--r--npc/omobs/dungeons/clocktower.txt167
-rw-r--r--npc/omobs/dungeons/coalmine.txt32
-rw-r--r--npc/omobs/dungeons/eindun.txt28
-rw-r--r--npc/omobs/dungeons/gefenia.txt89
-rw-r--r--npc/omobs/dungeons/geftower.txt109
-rw-r--r--npc/omobs/dungeons/glastheim.txt277
-rw-r--r--npc/omobs/dungeons/gondun.txt43
-rw-r--r--npc/omobs/dungeons/guilddun.txt52
-rw-r--r--npc/omobs/dungeons/jupedun.txt21
-rw-r--r--npc/omobs/dungeons/kiel.txt18
-rw-r--r--npc/omobs/dungeons/lhzdun.txt28
-rw-r--r--npc/omobs/dungeons/louydun.txt34
-rw-r--r--npc/omobs/dungeons/magmadun.txt30
-rw-r--r--npc/omobs/dungeons/moc_pyramid.txt63
-rw-r--r--npc/omobs/dungeons/moc_sphinx.txt51
-rw-r--r--npc/omobs/dungeons/orcdun.txt35
-rw-r--r--npc/omobs/dungeons/payoncave.txt139
-rw-r--r--npc/omobs/dungeons/pront_maze.txt122
-rw-r--r--npc/omobs/dungeons/pront_sewers.txt50
-rw-r--r--npc/omobs/dungeons/sunkenship.txt95
-rw-r--r--npc/omobs/dungeons/thanatos.txt55
-rw-r--r--npc/omobs/dungeons/toyfactory.txt32
-rw-r--r--npc/omobs/dungeons/turtleisland.txt72
-rw-r--r--npc/omobs/dungeons/umbaladun.txt53
-rw-r--r--npc/omobs/dungeons/yggdrasil.txt10
-rw-r--r--npc/omobs/fields/amatsu.txt24
-rw-r--r--npc/omobs/fields/ayothaya.txt20
-rw-r--r--npc/omobs/fields/comodo.txt162
-rw-r--r--npc/omobs/fields/einbroch.txt98
-rw-r--r--npc/omobs/fields/geffen.txt167
-rw-r--r--npc/omobs/fields/gonryun.txt13
-rw-r--r--npc/omobs/fields/hugel.txt61
-rw-r--r--npc/omobs/fields/jawaii.txt10
-rw-r--r--npc/omobs/fields/lighthalzen.txt28
-rw-r--r--npc/omobs/fields/louyang.txt21
-rw-r--r--npc/omobs/fields/lutie.txt10
-rw-r--r--npc/omobs/fields/mjolnir.txt179
-rw-r--r--npc/omobs/fields/morocc.txt264
-rw-r--r--npc/omobs/fields/niflheim.txt54
-rw-r--r--npc/omobs/fields/odin.txt21
-rw-r--r--npc/omobs/fields/payon.txt135
-rw-r--r--npc/omobs/fields/prontera.txt133
-rw-r--r--npc/omobs/fields/umbala.txt85
-rw-r--r--npc/omobs/fields/yuno.txt85
-rw-r--r--npc/omobs/pvp.txt23
51 files changed, 1846 insertions, 1656 deletions
diff --git a/npc/omobs/dungeons/abyss.txt b/npc/omobs/dungeons/abyss.txt
index 2510c9738..1c045bd5f 100644
--- a/npc/omobs/dungeons/abyss.txt
+++ b/npc/omobs/dungeons/abyss.txt
@@ -7,10 +7,12 @@
//===== Compatible With: =====================================
//= Any Athena Version
//===== Additional Comments: =================================
-//= 1.0 Real spawns by Poki#3 [Nexon]
+//= 1.0 Real spawns by Poki#3 [Nexon]
//============================================================
-//Abyss Lakes Underground Cave Flor 1
+//==================================================
+// abyss_01 - Abyss Lakes Underground Cave F1
+//==================================================
abyss_01.gat,0,0,0,0 monster Penomena 1216,20,30000,0,0
abyss_01.gat,0,0,0,0 monster Mimic 1191,20,0,0,0
abyss_01.gat,0,0,0,0 monster Ancient Mimic 1699,1,0,0,0
@@ -18,7 +20,9 @@ abyss_01.gat,0,0,0,0 monster Novus 1715,10,0,0,0
abyss_01.gat,0,0,0,0 monster Ferus 1717,20,0,0,0
abyss_01.gat,0,0,0,0 monster Hydro 1720,1,1800000,0,0
-//Abyss Lakes Underground Cave Flor 2
+//==================================================
+// abyss_02 - Abyss Lakes Underground Cave F2
+//==================================================
abyss_02.gat,0,0,0,0 monster Ancient Mimic 1699,10,0,0,0
abyss_02.gat,0,0,0,0 monster Dragon Egg 1721,5,0,0,0
abyss_02.gat,0,0,0,0 monster Acidus 1713,30,0,0,0
@@ -28,7 +32,9 @@ abyss_02.gat,0,0,0,0 monster Novus 1718,10,0,0,0
abyss_02.gat,0,0,0,0 monster Ferus 1717,30,0,0,0
abyss_02.gat,0,0,0,0 monster Hydro 1720,1,1800000,0,0
-//Abyss Lakes Underground Cave Flor 3
+//==================================================
+// abyss_03 - Abyss Lakes Underground Cave F3
+//==================================================
abyss_03.gat,0,0,0,0 monster Ancient Mimic 1699,20,0,0,0
abyss_03.gat,0,0,0,0 monster Dragon Egg 1721,5,0,0,0
abyss_03.gat,0,0,0,0 monster Spring Rabbit 1690,10,0,0,0
diff --git a/npc/omobs/dungeons/amatdun.txt b/npc/omobs/dungeons/amatdun.txt
index 6303ede4b..1ec841b08 100644
--- a/npc/omobs/dungeons/amatdun.txt
+++ b/npc/omobs/dungeons/amatdun.txt
@@ -10,30 +10,30 @@
//=
//============================================================
-// ama_dun01
-
+//==================================================
+// ama_dun01 - Tatami Maze
+//==================================================
ama_dun01.gat,0,0,0,0 monster Miyabi Doll 1404,65,0,0,0
-ama_dun01.gat,0,0,0,0 monster Antique Firelock 1403,45,0,0,0
-ama_dun01.gat,0,0,0,0 monster Shinobi 1401,2,180000,90000,0
-
-// ama_dun02
+ama_dun01.gat,0,0,0,0 monster Firelock Soldier 1403,45,0,0,0
+ama_dun01.gat,0,0,0,0 monster Shinobi 1401,2,0,0,0
-ama_dun02.gat,0,0,0,0 monster Poison Toad 1402,35,180000,90000,0
-ama_dun02.gat,0,0,0,0 monster Antique Firelock 1403,20,60000,30000,0
-ama_dun02.gat,0,0,0,0 monster Miyabi Doll 1404,5,120000,60000,0
-ama_dun02.gat,0,0,0,0 monster Shinobi 1401,2,180000,90000,0
+//==================================================
+// ama_dun02 - Battle Field in the Underground Forest
+//==================================================
+ama_dun02.gat,0,0,0,0 monster Poison Toad 1402,35,0,0,0
ama_dun02.gat,0,0,0,0 monster Horong 1129,10,0,0,0
+ama_dun02.gat,0,0,0,0 monster Miyabi Doll 1404,5,0,0,0
+ama_dun02.gat,0,0,0,0 monster Firelock Soldier 1403,20,60000,30000,0
+ama_dun02.gat,0,0,0,0 monster Shinobi 1401,2,180000,90000,0
ama_dun02.gat,0,0,0,0 monster The Paper 1375,1,180000,90000,0
-// ama_dun03
-
-ama_dun03.gat,0,0,0,0 monster Shinobi 1401,35,600000,300000,0
-ama_dun03.gat,0,0,0,0 monster Antique Firelock 1403,25,0,0,0
-ama_dun03.gat,0,0,0,0 monster Miyabi Doll 1404,1,0,0,0
-ama_dun03.gat,0,0,0,0 monster Tengu 1405,40,600000,300000,0
+//==================================================
+// ama_dun03 - Amatsu Underground Shrine
+//==================================================
+ama_dun03.gat,0,0,0,0 monster Shinobi 1401,55,0,0,0
+ama_dun03.gat,0,0,0,0 monster Tengu 1405,55,0,0,0
+ama_dun03.gat,0,0,0,0 monster Firelock Soldier 1403,25,0,0,0
+ama_dun03.gat,0,0,0,0 monster The Paper 1375,20,0,0,0
ama_dun03.gat,0,0,0,0 monster Mimic 1191,5,0,0,0
-ama_dun03.gat,0,0,0,0 monster The Paper 1375,20,600000,300000,0
-
-ama_dun03.gat,0,0,0,0 monster Incantation Samurai 1492,1,5460000,3600000,0
-ama_dun03.gat,0,0,0,0 monster Shinobi 1401,20,5450000,3600000,0
-ama_dun03.gat,0,0,0,0 monster Tengu 1405,15,5440000,3600000,0
+ama_dun03.gat,0,0,0,0 monster Miyabi Doll 1404,1,0,0,0
+ama_dun03.gat,0,0,0,0 monster Incantation Samurai 1492,1,5400000,2700000,0
diff --git a/npc/omobs/dungeons/anthell.txt b/npc/omobs/dungeons/anthell.txt
index 03dcf0705..ad9c1864b 100644
--- a/npc/omobs/dungeons/anthell.txt
+++ b/npc/omobs/dungeons/anthell.txt
@@ -10,15 +10,15 @@
//=
//============================================================
-// Anthell01
-
-anthell01.gat,0,0,0,0 monster Familiar 1005,20,0,0,0
-anthell01.gat,0,0,0,0 monster Andre 1095,15,0,0,0
-anthell01.gat,0,0,0,0 monster Piere 1160,50,0,0,0
+//==================================================
+// anthell01 - Ant Hell F1
+//==================================================
+anthell01.gat,0,0,0,0 monster Piere 1160,45,0,0,0
+anthell01.gat,0,0,0,0 monster Andre 1095,45,0,0,0
anthell01.gat,0,0,0,0 monster Deniro 1105,40,0,0,0
anthell01.gat,0,0,0,0 monster Vitata 1176,10,0,0,0
+anthell01.gat,0,0,0,0 monster Familiar 1005,10,0,0,0
anthell01.gat,0,0,0,0 monster Giearth 1121,1,0,0,0
-anthell01.gat,0,0,0,0 monster Maya Purple 1289,1,7200000,3600000,1
anthell01.gat,28,266,0,0 monster Ant Egg 1097,1,60000,30000,0
anthell01.gat,29,266,0,0 monster Ant Egg 1097,1,60000,30000,0
anthell01.gat,28,265,0,0 monster Ant Egg 1097,1,60000,30000,0
@@ -106,14 +106,16 @@ anthell01.gat,103,120,0,0 monster Ant Egg 1097,1,60000,30000,0
anthell01.gat,103,121,0,0 monster Ant Egg 1097,1,60000,30000,0
anthell01.gat,102,121,0,0 monster Ant Egg 1097,1,60000,30000,0
anthell01.gat,105,124,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01.gat,0,0,0,0 monster Maya Purple 1289,1,7200000,3600000,1
-// Anthell02
-
-anthell02.gat,0,0,0,0 monster Ant Egg 1097,15,0,0,0
+//==================================================
+// anthell02 - Ant Hell F2
+//==================================================
+anthell02.gat,0,0,0,0 monster Andre 1095,40,0,0,0
+anthell02.gat,0,0,0,0 monster Vitata 1176,30,0,0,0
anthell02.gat,0,0,0,0 monster Familiar 1005,20,0,0,0
-anthell02.gat,0,0,0,0 monster Andre 1095,50,0,0,0
-anthell02.gat,0,0,0,0 monster Piere 1160,15,0,0,0
anthell02.gat,0,0,0,0 monster Deniro 1105,15,0,0,0
-anthell02.gat,0,0,0,0 monster Vitata 1176,30,0,0,0
+anthell02.gat,0,0,0,0 monster Piere 1160,15,0,0,0
anthell02.gat,0,0,0,0 monster Giearth 1121,3,0,0,0
+anthell02.gat,0,0,0,0 monster Ant Egg 1097,15,60000,30000,0
anthell02.gat,0,0,0,0 monster Maya 1147,1,7200000,3600000,1
diff --git a/npc/omobs/dungeons/ayodun.txt b/npc/omobs/dungeons/ayodun.txt
index 620fada1b..e0fdaa3e7 100644
--- a/npc/omobs/dungeons/ayodun.txt
+++ b/npc/omobs/dungeons/ayodun.txt
@@ -11,14 +11,18 @@
//= 1.2 Moved Tao Gunka to west cave of Comodo [Lupus]
//============================================================
-//=== Ayothana Dungeon #1 ===
-ayo_dun01.gat,0,0,0,0 monster Whisper 1179,10,0,0,0
+//==================================================
+// ayo_dun01 - Ancient Shrine Maze
+//==================================================
+ayo_dun01.gat,0,0,0,0 monster Leaf Cat 1586,65,0,0,0
ayo_dun01.gat,0,0,0,0 monster Ghoul 1036,30,0,0,0
+ayo_dun01.gat,0,0,0,0 monster Whisper 1179,10,0,0,0
ayo_dun01.gat,0,0,0,0 monster Kraben 1587,5,0,0,0
-ayo_dun01.gat,0,0,0,0 monster Leaf Cat 1586,60,0,0,0
-//=== Ayothana Dungeon #2 ===
+//==================================================
+// ayo_dun02 - Inside Ancient Shrine
+//==================================================
+ayo_dun02.gat,0,0,0,0 monster Tamruan 1584,70,0,0,0
ayo_dun02.gat,0,0,0,0 monster Whisper 1179,20,0,0,0
ayo_dun02.gat,0,0,0,0 monster Kraben 1587,20,0,0,0
-ayo_dun02.gat,0,0,0,0 monster Tamruan 1584,70,0,0,0
-ayo_dun02.gat,0,0,0,0 monster Lady Tany 1688,1,3600000,1800000,1
+ayo_dun02.gat,150,245,0,0 monster Lady Tany 1688,1,7200000,3600000,1
diff --git a/npc/omobs/dungeons/beachdun.txt b/npc/omobs/dungeons/beachdun.txt
index a97694b4a..7682d10f8 100644
--- a/npc/omobs/dungeons/beachdun.txt
+++ b/npc/omobs/dungeons/beachdun.txt
@@ -10,28 +10,30 @@
//=
//============================================================
-//beach_dun
-
+//==================================================
+// beach_dun - Karu, the West Cave
+//==================================================
beach_dun.gat,0,0,0,0 monster Medusa 1148,20,0,0,0
-beach_dun.gat,0,0,0,0 monster Merman 1264,3,10000,5000,0
-beach_dun.gat,0,0,0,0 monster Neraid 1255,15,0,0,0
beach_dun.gat,0,0,0,0 monster Pest 1256,15,0,0,0
-beach_dun.gat,0,0,0,0 monster Penomena 1216,5,30000,0,0
-beach_dun.gat,0,0,0,0 monster Tao Gunka 1583,1,3600000,1800000,1
-
-//beach_dun2
+beach_dun.gat,0,0,0,0 monster Neraid 1255,15,0,0,0
+beach_dun.gat,0,0,0,0 monster Penomena 1216,5,0,0,0
+beach_dun.gat,0,0,0,0 monster Merman 1264,3,0,0,0
+beach_dun.gat,0,0,0,0 monster Tao Gunka 1583,1,7200000,3600000,1
+//==================================================
+// beach_dun2 - Ruande, the North Cave
+//==================================================
+beach_dun2.gat,0,0,0,0 monster Stalactic Golem 1278,40,0,0,0
beach_dun2.gat,0,0,0,0 monster Megalith 1274,30,0,0,0
-beach_dun2.gat,0,0,0,0 monster Neraid 1255,5,0,0,0
-beach_dun2.gat,0,0,0,0 monster Stalactite Golem 1278,40,5000,0,0
-beach_dun2.gat,0,0,0,0 monster Tri-Joint 1279,20,0,0,0
+beach_dun2.gat,0,0,0,0 monster Tri Joint 1279,20,0,0,0
beach_dun2.gat,0,0,0,0 monster Hydra 1068,15,0,0,0
+beach_dun2.gat,0,0,0,0 monster Neraid 1255,5,0,0,0
-//beach_dun3
-
-beach_dun3.gat,0,0,0,0 monster Neraid 1255,1,200000,100000,0
-//putmob "beach_dun3" 0 0 0 0 1 PEST 60000 0 0
-beach_dun3.gat,0,0,0,0 monster Thara Frog 1034,50,0,0,0
-//putmob "beach_dun3" 0 0 0 0 3 TRI_JOINT 0 0 0
-beach_dun3.gat,0,0,0,0 monster Hydra 1068,30,0,0,0
+//==================================================
+// beach_dun3 - Mao, the East Cave
+//==================================================
+beach_dun3.gat,0,0,0,0 monster Thara Frog 1034,55,0,0,0
beach_dun3.gat,0,0,0,0 monster Megalodon 1064,30,0,0,0
+beach_dun3.gat,0,0,0,0 monster Hydra 1068,30,0,0,0
+beach_dun3.gat,0,0,0,0 monster Penomena 1216,1,0,0,0
+beach_dun3.gat,0,0,0,0 monster Neraid 1255,1,0,0,0
diff --git a/npc/omobs/dungeons/byalan.txt b/npc/omobs/dungeons/byalan.txt
index 565b40a68..05238254b 100644
--- a/npc/omobs/dungeons/byalan.txt
+++ b/npc/omobs/dungeons/byalan.txt
@@ -10,42 +10,44 @@
//=
//============================================================
-// Iz_dun00
-
+//==================================================
+// iz_dun00 - Undersea Tunnel F1
+//==================================================
iz_dun00.gat,0,0,0,0 monster Plankton 1161,65,0,0,0
iz_dun00.gat,0,0,0,0 monster Marina 1141,45,0,0,0
-iz_dun00.gat,0,0,0,0 monster Kukre 1070,15,0,0,0
+iz_dun00.gat,0,0,0,0 monster Kukre 1070,30,0,0,0
+iz_dun00.gat,0,0,0,0 monster Vadon 1066,30,0,0,0
iz_dun00.gat,0,0,0,0 monster Hydra 1068,15,0,0,0
-iz_dun00.gat,0,0,0,0 monster Vadon 1066,15,0,0,0
-iz_dun00.gat,0,0,0,0 monster Black Mushroom 1084,5,180000,90000,1
-
+iz_dun00.gat,0,0,0,0 monster Black Mushroom 1084,5,360000,180000,1
-// Iz_dun01
-
-iz_dun01.gat,0,0,0,0 monster Plankton 1161,10,0,0,0
-iz_dun01.gat,0,0,0,0 monster Marina 1141,15,0,0,0
+//==================================================
+// iz_dun01 - Undersea Tunnel F2
+//==================================================
+iz_dun01.gat,0,0,0,0 monster Vadon 1066,60,0,0,0
iz_dun01.gat,0,0,0,0 monster Kukre 1070,50,0,0,0
+iz_dun01.gat,0,0,0,0 monster Marina 1141,40,0,0,0
+iz_dun01.gat,0,0,0,0 monster Cornutus 1067,30,0,0,0
iz_dun01.gat,0,0,0,0 monster Hydra 1068,30,0,0,0
-iz_dun01.gat,0,0,0,0 monster Vadon 1066,60,0,0,0
-iz_dun01.gat,0,0,0,0 monster Cornutus 1067,15,300000,150000,1
-iz_dun01.gat,0,0,0,0 monster Black Mushroom 1084,10,180000,90000,1
-
-// Iz_dun02
+iz_dun01.gat,0,0,0,0 monster Plankton 1161,10,0,0,0
+iz_dun01.gat,0,0,0,0 monster Black Mushroom 1084,10,360000,180000,1
-iz_dun02.gat,0,0,0,0 monster Hydra 1068,40,0,0,0
+//==================================================
+// iz_dun02 - Undersea Tunnel F3
+//==================================================
iz_dun02.gat,0,0,0,0 monster Cornutus 1067,60,0,0,0
iz_dun02.gat,0,0,0,0 monster Marse 1144,40,0,0,0
iz_dun02.gat,0,0,0,0 monster Obeaune 1044,40,0,0,0
+iz_dun02.gat,0,0,0,0 monster Hydra 1068,40,0,0,0
iz_dun02.gat,0,0,0,0 monster Merman 1264,1,0,0,0
-iz_dun02.gat,0,0,0,0 monster Black Mushroom 1084,15,180000,90000,1
-
-// Iz_dun03
+iz_dun02.gat,0,0,0,0 monster Black Mushroom 1084,15,360000,180000,1
-iz_dun03.gat,0,0,0,0 monster Hydra 1068,10,0,0,0
+//==================================================
+// iz_dun03 - Undersea Tunnel F4
+//==================================================
iz_dun03.gat,0,0,0,0 monster Phen 1158,45,0,0,0
-iz_dun03.gat,0,0,0,0 monster Marine Sphere 1142,20,0,0,0
-iz_dun03.gat,0,0,0,0 monster Swordfish 1069,40,0,0,0
iz_dun03.gat,0,0,0,0 monster Marc 1045,40,0,0,0
+iz_dun03.gat,0,0,0,0 monster Swordfish 1069,40,0,0,0
+iz_dun03.gat,0,0,0,0 monster Hydra 1068,10,0,0,0
iz_dun03.gat,203,59,0,0 monster Hydra 1068,1,312000,150000,0
iz_dun03.gat,203,56,0,0 monster Hydra 1068,1,323000,150000,0
iz_dun03.gat,203,53,0,0 monster Hydra 1068,1,317000,150000,0
@@ -76,14 +78,19 @@ iz_dun03.gat,180,251,0,0 monster Hydra 1068,1,300000,150000,0
iz_dun03.gat,178,253,0,0 monster Hydra 1068,1,300000,150000,0
iz_dun03.gat,108,249,0,0 monster Hydra 1068,1,300000,150000,0
iz_dun03.gat,80,163,0,0 monster Hydra 1068,1,300000,150000,0
+iz_dun03.gat,0,0,0,0 monster Marine Sphere 1142,20,0,0,0
iz_dun03.gat,0,0,0,0 monster Merman 1264,3,0,0,0
-// Iz_dun04
-
-iz_dun04.gat,0,0,0,0 monster Marine Sphere 1142,10,0,0,0
-iz_dun04.gat,0,0,0,0 monster Swordfish 1069,10,0,0,0
+//==================================================
+// iz_dun04 - Undersea Tunnel F5
+//==================================================
iz_dun04.gat,0,0,0,0 monster Merman 1264,50,0,0,0
-iz_dun04.gat,0,0,0,0 monster Strouf 1065,3,0,0,0
+iz_dun04.gat,103,231,10,10 monster Merman 1264,2,150000,0,0
+iz_dun04.gat,160,231,10,10 monster Merman 1264,2,170000,0,0
+iz_dun04.gat,95,147,10,10 monster Merman 1264,2,150000,0,0
+iz_dun04.gat,130,216,15,15 monster Merman 1264,2,160000,0,0
+iz_dun04.gat,0,0,0,0 monster Marine Sphere 1142,20,0,0,0
+iz_dun04.gat,0,0,0,0 monster Swordfish 1069,20,0,0,0
iz_dun04.gat,58,135,0,0 monster Hydra 1068,1,305000,150000,0
iz_dun04.gat,61,135,0,0 monster Hydra 1068,1,300000,150000,0
iz_dun04.gat,42,129,0,0 monster Hydra 1068,1,312000,150000,0
@@ -102,9 +109,6 @@ iz_dun04.gat,111,35,0,0 monster Hydra 1068,1,300000,150000,0
iz_dun04.gat,69,243,0,0 monster Hydra 1068,1,321000,150000,0
iz_dun04.gat,124,233,0,0 monster Hydra 1068,1,300000,150000,0
iz_dun04.gat,134,233,0,0 monster Hydra 1068,1,305000,150000,0
-iz_dun04.gat,0,0,0,0 monster Penomena 1216,10,300000,150000,1
+iz_dun04.gat,0,0,0,0 monster Penomena 1216,10,0,0,0
+iz_dun04.gat,0,0,0,0 monster Strouf 1065,3,0,0,0
iz_dun04.gat,95,147,0,0 monster Deviace 1108,3,600000,300000,0
-iz_dun04.gat,103,231,10,10 monster Merman 1264,2,150000,0,0
-iz_dun04.gat,160,231,10,10 monster Merman 1264,2,170000,0,0
-iz_dun04.gat,95,147,10,10 monster Merman 1264,2,150000,0,0
-iz_dun04.gat,130,216,15,15 monster Merman 1264,2,160000,0,0
diff --git a/npc/omobs/dungeons/clocktower.txt b/npc/omobs/dungeons/clocktower.txt
index 519f12a75..6acbf2546 100644
--- a/npc/omobs/dungeons/clocktower.txt
+++ b/npc/omobs/dungeons/clocktower.txt
@@ -10,67 +10,74 @@
//=
//============================================================
-// alde_dun01
-
+//==================================================
+// alde_dun01 - Clock Tower B1
+//==================================================
alde_dun01.gat,0,0,0,0 monster Arclouse 1194,50,0,0,0
alde_dun01.gat,0,0,0,0 monster Drainliar 1111,40,0,0,0
-// alde_dun02
-
+//==================================================
+// alde_dun02 - Clock Tower B2
+//==================================================
alde_dun02.gat,0,0,0,0 monster High Orc 1213,40,0,0,0
-alde_dun02.gat,0,0,0,0 monster Orc Archer 1189,20,0,0,0
+alde_dun02.gat,0,0,0,0 monster Arclouse 1194,20,0,0,0
alde_dun02.gat,0,0,0,0 monster Brilight 1211,20,0,0,0
+alde_dun02.gat,0,0,0,0 monster Orc Archer 1189,20,0,0,0
alde_dun02.gat,0,0,0,0 monster Drainliar 1111,10,0,0,0
-alde_dun02.gat,0,0,0,0 monster Arclouse 1194,20,0,0,0
-
-// alde_dun03
-alde_dun03.gat,0,0,0,0 monster Cramp 1209,25,0,0,0
-alde_dun03.gat,0,0,0,0 monster Drainliar 1111,20,0,0,0
+//==================================================
+// alde_dun03 - Clock Tower B3
+//==================================================
+alde_dun03.gat,0,0,0,0 monster Cramp 1209,15,0,0,0
alde_dun03.gat,77,28,5,5 monster Cramp 1209,3,40000,20000,0
-alde_dun03.gat,0,0,0,0 monster Penomena 1216,15,300000,150000,0
alde_dun03.gat,184,61,30,30 monster Cramp 1209,10,300000,150000,0
+alde_dun03.gat,126,53,20,20 monster Cramp 1209,5,300000,150000,0
+alde_dun03.gat,130,220,40,40 monster Cramp 1209,10,300000,150000,0
+alde_dun03.gat,127,204,9,9 monster Cramp 1209,3,300000,150000,0
+alde_dun03.gat,0,0,0,0 monster Drainliar 1111,20,0,0,0
alde_dun03.gat,184,61,30,30 monster Drainliar 1111,10,300000,150000,0
+alde_dun03.gat,126,53,20,20 monster Drainliar 1111,5,300000,150000,0
+alde_dun03.gat,130,220,40,40 monster Drainliar 1111,10,300000,150000,0
+alde_dun03.gat,120,157,8,8 monster Drainliar 1111,10,300000,150000,0
+alde_dun03.gat,0,0,0,0 monster Penomena 1216,35,600000,300000,0
+alde_dun03.gat,0,0,0,0 monster Penomena 1216,15,300000,150000,0
alde_dun03.gat,0,0,0,0 monster Penomena 1216,5,300000,150000,0
alde_dun03.gat,163,56,10,10 monster Penomena 1216,3,600000,300000,0
alde_dun03.gat,168,42,6,6 monster Penomena 1216,2,600000,300000,0
alde_dun03.gat,147,30,8,8 monster Penomena 1216,2,600000,300000,0
alde_dun03.gat,0,0,0,0 monster Penomena 1216,10,300000,150000,0
-alde_dun03.gat,126,53,20,20 monster Cramp 1209,5,300000,150000,0
-alde_dun03.gat,126,53,20,20 monster Drainliar 1111,5,300000,150000,0
alde_dun03.gat,102,40,10,10 monster Penomena 1216,4,600000,300000,0
alde_dun03.gat,0,0,0,0 monster Penomena 1216,15,300000,150000,0
-alde_dun03.gat,130,220,40,40 monster Cramp 1209,10,300000,150000,0
-alde_dun03.gat,130,220,40,40 monster Drainliar 1111,10,300000,150000,0
alde_dun03.gat,155,201,25,25 monster Penomena 1216,7,600000,300000,0
alde_dun03.gat,160,181,8,8 monster Penomena 1216,2,600000,300000,0
alde_dun03.gat,179,166,6,6 monster Penomena 1216,4,600000,300000,0
alde_dun03.gat,127,204,9,9 monster Penomena 1216,5,600000,300000,0
-alde_dun03.gat,127,204,9,9 monster Cramp 1209,3,300000,150000,0
alde_dun03.gat,142,157,8,8 monster Penomena 1216,5,600000,300000,0
alde_dun03.gat,135,140,8,8 monster Penomena 1216,3,600000,300000,0
alde_dun03.gat,120,157,8,8 monster Penomena 1216,3,600000,300000,0
-alde_dun03.gat,120,157,8,8 monster Drainliar 1111,10,300000,150000,0
-
-// alde_dun04
+//==================================================
+// alde_dun04 - Clock Tower B4
+//==================================================
alde_dun04.gat,0,0,0,0 monster Bathory 1102,50,0,0,0
+alde_dun04.gat,0,0,0,0 monster Whisper 1179,10,0,0,0
alde_dun04.gat,0,0,0,0 monster Joker 1131,10,0,0,0
-alde_dun04.gat,0,0,0,0 monster Executioner 1205,1,3600000,1800000,1
-alde_dun04.gat,0,0,0,0 monster Mysteltainn 1203,1,3600000,1800000,1
alde_dun04.gat,0,0,0,0 monster Tyrfing 1204,1,3600000,1800000,1
-alde_dun04.gat,0,0,0,0 monster Whisper 1179,10,0,0,0
-
-// c_tower1
+alde_dun04.gat,0,0,0,0 monster Mysteltainn 1203,1,3600000,1800000,1
+alde_dun04.gat,0,0,0,0 monster Executioner 1205,1,3600000,1800000,1
-c_tower1.gat,0,0,0,0 monster Punk 1199,70,0,0,0
-c_tower1.gat,0,0,0,0 monster Rideword 1195,70,0,0,0
-c_tower1.gat,0,0,0,0 monster Tower Keeper 1270,1,0,0,0
+//==================================================
+// c_tower1 - Clock Tower F1
+//==================================================
+c_tower1.gat,0,0,0,0 monster Punk 1199,100,0,0,0
+c_tower1.gat,0,0,0,0 monster Rideword 1195,30,0,0,0
+c_tower1.gat,0,0,0,0 monster Clock Tower Manager 1270,1,0,0,0
c_tower1.gat,0,0,0,0 monster Bathory 1102,1,0,0,0
-// c_tower2
-
-c_tower2.gat,0,0,0,0 monster Punk 1199,40,0,0,0
+//==================================================
+// c_tower2 - Clock Tower F2
+//==================================================
+c_tower2.gat,0,0,0,0 monster Punk 1199,45,0,0,0
c_tower2.gat,0,0,0,0 monster Clock 1269,40,0,0,0
c_tower2.gat,0,0,0,0 monster Rideword 1195,7,0,0,0
c_tower2.gat,128,100,10,10 monster Rideword 1195,1,60000,30000,0
@@ -79,30 +86,25 @@ c_tower2.gat,149,199,10,10 monster Rideword 1195,1,300000,120000,0
c_tower2.gat,273,286,20,20 monster Rideword 1195,1,120000,60000,0
c_tower2.gat,273,286,20,20 monster Rideword 1195,1,300000,120000,0
c_tower2.gat,0,0,0,0 monster Mimic 1191,3,0,0,0
-c_tower2.gat,0,0,0,0 monster Tower Keeper 1270,1,0,0,0
-c_tower2.gat,0,0,0,0 monster Elder 1377,1,3600000,1800000,0
-c_tower2.gat,0,0,0,0 monster Elder 1377,1,3600000,1800000,0
-
-// c_tower3
-
-c_tower3.gat,0,0,0,0 monster Alarm 1193,60,0,0,0
-c_tower3.gat,0,0,0,0 monster Rideword 1195,10,0,0,0
-c_tower3.gat,153,220,10,10 monster Rideword 1195,1,126000,100000,0
-c_tower3.gat,0,0,0,0 monster Mimic 1191,15,0,0,0
-c_tower3.gat,0,0,0,0 monster Tower Keeper 1270,1,0,0,0
-
-// c_tower4
-
-c_tower4.gat,0,0,0,0 monster Tower Keeper 1270,2,1800000,0,0
-c_tower4.gat,0,0,0,0 monster Tower Keeper 1270,1,3600000,0,0
-c_tower4.gat,0,0,0,0 monster Whisper 1179,5,0,0,0
-c_tower4.gat,0,0,0,0 monster Elder 1377,1,3600000,1800000,0
-c_tower4.gat,0,0,0,0 monster Elder 1377,1,1800000,600000,0
-c_tower4.gat,108,198,100,10 monster Alarm 1193,6,0,0,0
-c_tower4.gat,108,178,100,10 monster Alarm 1193,6,0,0,0
-c_tower4.gat,108,158,100,10 monster Alarm 1193,6,0,0,0
-c_tower4.gat,108,138,100,10 monster Alarm 1193,6,0,0,0
-c_tower4.gat,108,118,100,10 monster Alarm 1193,6,0,0,0
+c_tower2.gat,0,0,0,0 monster Clock Tower Manager 1270,1,0,0,0
+c_tower2.gat,0,0,0,0 monster Elder 1377,2,3600000,1800000,0
+
+//==================================================
+// c_tower3 - Clock Tower F3
+//==================================================
+c_tower3.gat,0,0,0,0 monster Alarm 1193,80,0,0,0
+c_tower3.gat,0,0,0,0 monster Rideword 1195,15,0,0,0
+c_tower3.gat,0,0,0,0 monster Mimic 1191,10,0,0,0
+c_tower3.gat,0,0,0,0 monster Clock Tower Manager 1270,1,0,0,0
+
+//==================================================
+// c_tower4 - Clock Tower F4
+//==================================================
+c_tower4.gat,108,198,100,10 monster Alarm 1193,7,0,0,0
+c_tower4.gat,108,178,100,10 monster Alarm 1193,7,0,0,0
+c_tower4.gat,108,158,100,10 monster Alarm 1193,7,0,0,0
+c_tower4.gat,108,138,100,10 monster Alarm 1193,7,0,0,0
+c_tower4.gat,108,118,100,10 monster Alarm 1193,7,0,0,0
c_tower4.gat,108,98,100,10 monster Clock 1269,7,0,0,0
c_tower4.gat,108,78,100,10 monster Clock 1269,7,0,0,0
c_tower4.gat,108,58,100,10 monster Clock 1269,7,0,0,0
@@ -118,31 +120,34 @@ c_tower4.gat,108,78,100,10 monster Owl Duke 1320,3,0,0,0
c_tower4.gat,108,58,100,10 monster Owl Duke 1320,3,0,0,0
c_tower4.gat,108,38,100,10 monster Owl Duke 1320,3,0,0,0
c_tower4.gat,108,18,100,10 monster Owl Duke 1320,3,0,0,0
-c_tower4.gat,98,180,0,0 monster Rideword 1195,1,300000,150000,1
-c_tower4.gat,97,180,0,0 monster Rideword 1195,1,240000,150000,1
-c_tower4.gat,96,180,0,0 monster Rideword 1195,1,350000,150000,1
-c_tower4.gat,95,180,0,0 monster Rideword 1195,1,410000,150000,1
-c_tower4.gat,94,180,0,0 monster Rideword 1195,1,320000,150000,1
-c_tower4.gat,93,180,0,0 monster Rideword 1195,1,260000,150000,1
-c_tower4.gat,92,180,0,0 monster Rideword 1195,1,280000,150000,1
-c_tower4.gat,91,180,0,0 monster Rideword 1195,1,330000,150000,1
-c_tower4.gat,87,180,0,0 monster Rideword 1195,1,400000,150000,1
-c_tower4.gat,86,180,0,0 monster Rideword 1195,1,380000,150000,1
-c_tower4.gat,80,179,0,0 monster Rideword 1195,1,360000,150000,1
-c_tower4.gat,80,180,0,0 monster Rideword 1195,1,350000,150000,1
-c_tower4.gat,80,181,0,0 monster Rideword 1195,1,290000,150000,1
-c_tower4.gat,80,182,0,0 monster Rideword 1195,1,300000,150000,1
-c_tower4.gat,80,183,0,0 monster Rideword 1195,1,340000,150000,1
-c_tower4.gat,128,194,0,0 monster Mimic 1191,1,1800000,900000,1
-c_tower4.gat,38,193,0,0 monster Mimic 1191,1,1800000,900000,1
-c_tower4.gat,37,159,0,0 monster Mimic 1191,1,1800000,900000,1
-c_tower4.gat,31,139,0,0 monster Mimic 1191,1,1800000,900000,1
-c_tower4.gat,104,14,0,0 monster Mimic 1191,1,1800000,900000,1
-c_tower4.gat,104,27,0,0 monster Mimic 1191,1,900000,400000,1
-c_tower4.gat,105,24,0,0 monster Mimic 1191,1,900000,400000,1
-c_tower4.gat,205,105,0,0 monster Mimic 1191,1,1800000,900000,1
-c_tower4.gat,257,109,0,0 monster Mimic 1191,1,1800000,900000,1
-c_tower4.gat,148,85,0,0 monster Mimic 1191,1,1800000,900000,1
-c_tower4.gat,189,51,0,0 monster Mimic 1191,1,1800000,900000,1
-c_tower4.gat,170,34,0,0 monster Mimic 1191,1,1800000,900000,1
+c_tower4.gat,0,0,0,0 monster Whisper 1179,5,0,0,0
+c_tower4.gat,0,0,0,0 monster Clock Tower Manager 1270,3,0,0,0
+c_tower4.gat,98,180,0,0 monster Rideword 1195,1,240000,120000,1
+c_tower4.gat,97,180,0,0 monster Rideword 1195,1,240000,120000,1
+c_tower4.gat,96,180,0,0 monster Rideword 1195,1,240000,120000,1
+c_tower4.gat,95,180,0,0 monster Rideword 1195,1,240000,120000,1
+c_tower4.gat,94,180,0,0 monster Rideword 1195,1,240000,120000,1
+c_tower4.gat,93,180,0,0 monster Rideword 1195,1,240000,120000,1
+c_tower4.gat,92,180,0,0 monster Rideword 1195,1,240000,120000,1
+c_tower4.gat,91,180,0,0 monster Rideword 1195,1,240000,120000,1
+c_tower4.gat,87,180,0,0 monster Rideword 1195,1,240000,120000,1
+c_tower4.gat,86,180,0,0 monster Rideword 1195,1,240000,120000,1
+c_tower4.gat,80,179,0,0 monster Rideword 1195,1,240000,120000,1
+c_tower4.gat,80,180,0,0 monster Rideword 1195,1,240000,120000,1
+c_tower4.gat,80,181,0,0 monster Rideword 1195,1,240000,120000,1
+c_tower4.gat,80,182,0,0 monster Rideword 1195,1,240000,120000,1
+c_tower4.gat,80,183,0,0 monster Rideword 1195,1,240000,120000,1
+c_tower4.gat,128,194,0,0 monster Mimic 1191,1,300000,150000,1
+c_tower4.gat,38,193,0,0 monster Mimic 1191,1,300000,150000,1
+c_tower4.gat,37,159,0,0 monster Mimic 1191,1,300000,150000,1
+c_tower4.gat,31,139,0,0 monster Mimic 1191,1,300000,150000,1
+c_tower4.gat,104,14,0,0 monster Mimic 1191,1,300000,150000,1
+c_tower4.gat,104,27,0,0 monster Mimic 1191,1,300000,150000,1
+c_tower4.gat,105,24,0,0 monster Mimic 1191,1,300000,150000,1
+c_tower4.gat,205,105,0,0 monster Mimic 1191,1,300000,150000,1
+c_tower4.gat,257,109,0,0 monster Mimic 1191,1,300000,150000,1
+c_tower4.gat,148,85,0,0 monster Mimic 1191,1,300000,150000,1
+c_tower4.gat,189,51,0,0 monster Mimic 1191,1,300000,150000,1
+c_tower4.gat,170,34,0,0 monster Mimic 1191,1,300000,150000,1
+c_tower4.gat,0,0,0,0 monster Elder 1377,2,3600000,1800000,1
c_tower4.gat,42,41,0,0 monster Executioner 1205,1,7200000,3600000,1
diff --git a/npc/omobs/dungeons/coalmine.txt b/npc/omobs/dungeons/coalmine.txt
index b22e36365..27ac91821 100644
--- a/npc/omobs/dungeons/coalmine.txt
+++ b/npc/omobs/dungeons/coalmine.txt
@@ -10,24 +10,26 @@
//=
//============================================================
-// mjo_dun01
-
-mjo_dun01.gat,0,0,0,0 monster Familiar 1005,30,0,0,0
-mjo_dun01.gat,0,0,0,0 monster Tarou 1175,60,0,0,0
-mjo_dun01.gat,0,0,0,0 monster Martin 1145,20,0,0,0
+//==================================================
+// mjo_dun01 - Mjolnir Dead Pit F1
+//==================================================
+mjo_dun01.gat,0,0,0,0 monster Tarou 1175,80,0,0,0
+mjo_dun01.gat,0,0,0,0 monster Martin 1145,40,0,0,0
+mjo_dun01.gat,0,0,0,0 monster Familiar 1005,20,0,0,0
-// mjo_dun02
-
+//==================================================
+// mjo_dun02 - Mjolnir Dead Pit F2
+//==================================================
mjo_dun02.gat,0,0,0,0 monster Martin 1145,60,0,0,0
-mjo_dun02.gat,0,0,0,0 monster Drainliar 1111,20,0,0,0
+mjo_dun02.gat,0,0,0,0 monster Giearth 1121,35,0,0,0
mjo_dun02.gat,0,0,0,0 monster Skeleton Worker 1169,20,0,0,0
-mjo_dun02.gat,0,0,0,0 monster Giearth 1121,35,30000,10000,0
+mjo_dun02.gat,0,0,0,0 monster Drainliar 1111,20,0,0,0
-// mjo_dun03
-
-mjo_dun03.gat,0,0,0,0 monster Martin 1145,5,0,0,0
+//==================================================
+// mjo_dun03 - Mjolnir Dead Pit F3
+//==================================================
mjo_dun03.gat,0,0,0,0 monster Skeleton Worker 1169,70,0,0,0
-mjo_dun03.gat,0,0,0,0 monster Giearth 1121,5,0,0,0
mjo_dun03.gat,0,0,0,0 monster Myst 1151,35,0,0,0
-mjo_dun03.gat,0,0,0,0 monster Cramp 1209,2,300000,150000,0
-mjo_dun03.gat,0,0,0,0 monster Cramp 1209,1,50000,25000,0
+mjo_dun03.gat,0,0,0,0 monster Martin 1145,5,0,0,0
+mjo_dun03.gat,0,0,0,0 monster Giearth 1121,5,0,0,0
+mjo_dun03.gat,0,0,0,0 monster Cramp 1209,3,0,0,0
diff --git a/npc/omobs/dungeons/eindun.txt b/npc/omobs/dungeons/eindun.txt
index e62512a74..94a216e83 100644
--- a/npc/omobs/dungeons/eindun.txt
+++ b/npc/omobs/dungeons/eindun.txt
@@ -10,23 +10,25 @@
//= 1.0 spawn N and spawn delays aren't yet correct, so I set
//= respawn delays quite big for now [Lupus]
//= 1.1 Fixed monsters spawn places
-//= 1.1a Reduced RSX's respawn delay value []
-//= 1.2 Update monster spawn numbers according to info on [MasterOfMuppets]
-//= emperium.org
+//= 1.2 Update monster spawn numbers according to info on emperium.org [MasterOfMuppets]
//============================================================
-//(ein_dun01.gat)*
-ein_dun01.gat,0,0,0,0 monster Noxious 1620,40,10000,10000,0
-ein_dun01.gat,0,0,0,0 monster Venomous 1621,20,10000,10000,0
-ein_dun01.gat,0,0,0,0 monster Waste Stove 1617,5,60000,120000,0
-ein_dun01.gat,0,0,0,0 monster Porcellio 1619,30,0,0,0
+//==================================================
+// ein_dun01 - Mine Dungeon F1
+//==================================================
ein_dun01.gat,0,0,0,0 monster Pitman 1616,55,0,0,0
-ein_dun01.gat,0,0,0,0 monster Ungoliant 1618,1,3600000,3600000,0
+ein_dun01.gat,0,0,0,0 monster Noxious 1620,40,0,0,0
+ein_dun01.gat,0,0,0,0 monster Porcellio 1619,30,0,0,0
+ein_dun01.gat,0,0,0,0 monster Venomous 1621,20,0,0,0
+ein_dun01.gat,0,0,0,0 monster Waste Stove 1617,5,60000,30000,0
+ein_dun01.gat,0,0,0,0 monster Ungoliant 1618,1,3600000,1800000,0
-//(ein_dun02.gat)*
-ein_dun02.gat,0,0,0,0 monster Teddy Bear 1622,30,0,0
-ein_dun02.gat,0,0,0,0 monster Obsidian 1615,40,0,0,0
+//==================================================
+// ein_dun02 - Mine Dungeon F2
+//==================================================
ein_dun02.gat,0,0,0,0 monster Mineral 1614,50,0,0,0
+ein_dun02.gat,0,0,0,0 monster Obsidian 1615,40,0,0,0
ein_dun02.gat,0,0,0,0 monster Waste Stove 1617,30,0,0,0
+ein_dun02.gat,0,0,0,0 monster Teddy Bear 1622,30,0,0
ein_dun02.gat,0,0,0,0 monster Venomous 1621,20,0,0,0
-ein_dun02.gat,163,137,50,50 monster RSX 0806 1623,1,14400000,14400000,0
+ein_dun02.gat,163,137,50,50 monster RSX 0806 1623,1,7200000,3600000,0
diff --git a/npc/omobs/dungeons/gefenia.txt b/npc/omobs/dungeons/gefenia.txt
index 113091429..3289dec7e 100644
--- a/npc/omobs/dungeons/gefenia.txt
+++ b/npc/omobs/dungeons/gefenia.txt
@@ -13,71 +13,69 @@
//= Kept the old spawns incase someone would want them.
//============================================================
-//========================================================================================
-// - Gefenia Dungeon 01
-//========================================================================================
+//==================================================
+// gefenia01 - Geffenia
+//==================================================
gefenia01.gat,0,0,0,0 monster Fake Angel 1371,60,0,0,0
gefenia01.gat,0,0,0,0 monster Violy 1390,30,0,0,0
gefenia01.gat,0,0,0,0 monster Mini Demon 1292,20,0,0,0
gefenia01.gat,0,0,0,0 monster Abyssmal Knight 1219,10,0,0,0
-gefenia01.gat,0,0,0,0 monster Succubus 1370,10,0,0,0
gefenia01.gat,0,0,0,0 monster Incubus 1374,10,0,0,0
-gefenia01.gat,0,0,0,0 monster Bloody Knight 1268,1,3600000,1800000,0
-gefenia01.gat,0,0,0,0 monster Mysteltainn 1203,1,3600000,1800000,0
-gefenia01.gat,0,0,0,0 monster Tyrfing 1204,1,3600000,1800000,0
-gefenia01.gat,0,0,0,0 monster Executioner 1205,1,3600000,1800000,0
+gefenia01.gat,0,0,0,0 monster Succubus 1370,10,0,0,0
+gefenia01.gat,0,0,0,0 monster Bloody Knight 1268,1,3600000,1800000,1
+gefenia01.gat,0,0,0,0 monster Tyrfing 1204,1,7200000,3600000,1
+gefenia01.gat,0,0,0,0 monster Mysteltainn 1203,1,7200000,3600000,1
+gefenia01.gat,0,0,0,0 monster Executioner 1205,1,7200000,3600000,1
-//========================================================================================
-// - Gefenia Dungeon 02
-//========================================================================================
-gefenia02.gat,0,0,0,0 monster Fake Angel 1371,30,0,0,0
+//==================================================
+// gefenia02 - Geffenia
+//==================================================
gefenia02.gat,0,0,0,0 monster Violy 1390,40,0,0,0
gefenia02.gat,0,0,0,0 monster Mini Demon 1292,30,0,0,0
-gefenia02.gat,0,0,0,0 monster Abyssmal Knight 1219,10,0,0,0
+gefenia02.gat,0,0,0,0 monster Fake Angel 1371,30,0,0,0
gefenia02.gat,0,0,0,0 monster Succubus 1370,20,0,0,0
+gefenia02.gat,0,0,0,0 monster Abyssmal Knight 1219,10,0,0,0
gefenia02.gat,0,0,0,0 monster Incubus 1374,10,0,0,0
-gefenia02.gat,0,0,0,0 monster Bloody Knight 1268,1,3600000,1800000,0
-gefenia02.gat,0,0,0,0 monster Mysteltainn 1203,1,3600000,1800000,0
-gefenia02.gat,0,0,0,0 monster Tyrfing 1204,1,3600000,1800000,0
-gefenia02.gat,0,0,0,0 monster Executioner 1205,1,3600000,1800000,0
-
+gefenia02.gat,0,0,0,0 monster Bloody Knight 1268,1,3600000,1800000,1
+gefenia02.gat,0,0,0,0 monster Tyrfing 1204,1,7200000,3600000,1
+gefenia02.gat,0,0,0,0 monster Mysteltainn 1203,1,7200000,3600000,1
+gefenia02.gat,0,0,0,0 monster Executioner 1205,1,7200000,3600000,1
-//========================================================================================
-// - Gefenia Dungeon 03
-//========================================================================================
+//==================================================
+// gefenia03 - Geffenia
+//==================================================
gefenia03.gat,0,0,0,0 monster Fake Angel 1371,40,0,0,0
gefenia03.gat,0,0,0,0 monster Violy 1390,40,0,0,0
gefenia03.gat,0,0,0,0 monster Mini Demon 1292,30,0,0,0
+gefenia03.gat,0,0,0,0 monster Incubus 1374,20,0,0,0
gefenia03.gat,0,0,0,0 monster Abyssmal Knight 1219,10,0,0,0
gefenia03.gat,0,0,0,0 monster Succubus 1370,10,0,0,0
-gefenia03.gat,0,0,0,0 monster Incubus 1374,20,0,0,0
gefenia03.gat,0,0,0,0 monster Bloody Knight 1268,1,3600000,1800000,0
-gefenia03.gat,0,0,0,0 monster Mysteltainn 1203,1,3600000,1800000,0
-gefenia03.gat,0,0,0,0 monster Tyrfing 1204,1,3600000,1800000,0
-gefenia03.gat,0,0,0,0 monster Executioner 1205,1,3600000,1800000,0
-
+gefenia03.gat,0,0,0,0 monster Tyrfing 1204,1,7200000,3600000,0
+gefenia03.gat,0,0,0,0 monster Mysteltainn 1203,1,7200000,3600000,0
+gefenia03.gat,0,0,0,0 monster Executioner 1205,1,7200000,3600000,0
-//========================================================================================
-// - Gefenia Dungeon 04
-//========================================================================================
+//==================================================
+// gefenia04 - Geffenia
+//==================================================
gefenia04.gat,0,0,0,0 monster Fake Angel 1371,30,0,0,0
gefenia04.gat,0,0,0,0 monster Violy 1390,30,0,0,0
gefenia04.gat,0,0,0,0 monster Mini Demon 1292,20,0,0,0
gefenia04.gat,0,0,0,0 monster Abyssmal Knight 1219,10,0,0,0
-gefenia04.gat,0,0,0,0 monster Succubus 1370,10,0,0,0
gefenia04.gat,0,0,0,0 monster Incubus 1374,10,0,0,0
+gefenia04.gat,0,0,0,0 monster Succubus 1370,10,0,0,0
gefenia04.gat,0,0,0,0 monster Bloody Knight 1268,1,3600000,1800000,0
-gefenia04.gat,0,0,0,0 monster Mysteltainn 1203,1,3600000,1800000,0
-gefenia04.gat,0,0,0,0 monster Tyrfing 1204,1,3600000,1800000,0
-gefenia04.gat,0,0,0,0 monster Executioner 1205,1,3600000,1800000,0
+gefenia04.gat,0,0,0,0 monster Tyrfing 1204,1,7200000,3600000,0
+gefenia04.gat,0,0,0,0 monster Mysteltainn 1203,1,7200000,3600000,0
+gefenia04.gat,0,0,0,0 monster Executioner 1205,1,7200000,3600000,0
//The spawns bellow, are old ones used in events.
-//========================================================================================
-// - Gefenia Dungeon 01(old)
-//========================================================================================
+//==================================================
+// gefenia01 - Geffenia (Old)
+//==================================================
//gefenia01.gat,0,0,0,0 monster Fake Angel 1371,10,0,0,0
//gefenia01.gat,0,0,0,0 monster Mini Demon 1292,6,300000,0,0
//gefenia01.gat,0,0,0,0 monster Apolcalips 1365,4,300000,0,0
@@ -88,9 +86,9 @@ gefenia04.gat,0,0,0,0 monster Executioner 1205,1,3600000,1800000,0
//gefenia01.gat,0,0,0,0 monster Executioner 1205,1,3600000,1800000,0
//gefenia01.gat,0,0,0,0 monster Mysteltainn 1203,1,7200000,3600000,1
-//========================================================================================
-// - Gefenia Dungeon 02(old)
-//========================================================================================
+//==================================================
+// gefenia02 - Geffenia (Old)
+//==================================================
//gefenia02.gat,0,0,0,0 monster Fake Angel 1371,10,0,0,0
//gefenia02.gat,0,0,0,0 monster Succubus 1370,6,0,0,0
//gefenia02.gat,0,0,0,0 monster Incubus 1374,6,0,0,0
@@ -102,9 +100,9 @@ gefenia04.gat,0,0,0,0 monster Executioner 1205,1,3600000,1800000,0
//gefenia02.gat,0,0,0,0 monster Gryphon 1259,1,3600000,1800000,0
//gefenia02.gat,0,0,0,0 monster Chimera 1283,1,7200000,3600000,1
-//========================================================================================
-// - Gefenia Dungeon 03(old)
-//========================================================================================
+//==================================================
+// gefenia03 - Geffenia (Old)
+//==================================================
//gefenia03.gat,0,0,0,0 monster Fake Angel 1371,4,0,0,0
//gefenia03.gat,0,0,0,0 monster Succubus 1370,5,0,0,0
//gefenia03.gat,0,0,0,0 monster Incubus 1374,5,0,0,0
@@ -117,10 +115,9 @@ gefenia04.gat,0,0,0,0 monster Executioner 1205,1,3600000,1800000,0
//gefenia03.gat,0,0,0,0 monster Dark Illusion 1302,1,300000,0,0
//gefenia03.gat,0,0,0,0 monster Owl Baron 1295,1,0,0,0
-//========================================================================================
-// - Gefenia Dungeon 04(old)
-//========================================================================================
-
+//==================================================
+// gefenia04 - Geffenia (Old)
+//==================================================
//gefenia04.gat,0,0,0,0 monster Fake Angel 1371,10,0,0,0
//gefenia04.gat,0,0,0,0 monster Succubus 1370,5,0,0,0
//gefenia04.gat,0,0,0,0 monster Incubus 1374,3,0,0,0
diff --git a/npc/omobs/dungeons/geftower.txt b/npc/omobs/dungeons/geftower.txt
index a6dee18bb..5a8da85de 100644
--- a/npc/omobs/dungeons/geftower.txt
+++ b/npc/omobs/dungeons/geftower.txt
@@ -10,72 +10,75 @@
//=
//============================================================
-// Gef_dun00
-
-gef_dun00.gat,0,0,0,0 monster Hunter Fly 1035,30,60000,30000,0
-gef_dun00.gat,0,0,0,0 monster Poporing 1031,15,0,0,0
-gef_dun00.gat,0,0,0,0 monster Poison Spore 1077,25,0,0,0
-gef_dun00.gat,91,106,0,0 monster Red Plant 1078,1,300000,150000,0
-gef_dun00.gat,92,108,0,0 monster Yellow Plant 1081,1,300000,150000,0
-gef_dun00.gat,114,106,0,0 monster Green Plant 1080,1,300000,150000,0
-gef_dun00.gat,0,0,0,0 monster Red Plant 1078,1,300000,150000,0
-gef_dun00.gat,0,0,0,0 monster Shining Plant 1083,1,3000000,1500000,0
-gef_dun00.gat,0,0,0,0 monster Red Plant 1078,10,180000,90000,1
-gef_dun00.gat,89,111,3,3 monster Black Mushroom 1084,3,180000,90000,1
-gef_dun00.gat,121,109,3,3 monster Black Mushroom 1084,3,180000,90000,1
+//==================================================
+// gef_dun00 - Geffen Dungeon F1
+//==================================================
+gef_dun00.gat,0,0,0,0 monster Poison Spore 1077,40,0,0,0
+gef_dun00.gat,0,0,0,0 monster Poporing 1031,20,0,0,0
+gef_dun00.gat,0,0,0,0 monster Hunter Fly 1035,5,0,0,0
+gef_dun00.gat,89,111,3,3 monster Black Mushroom 1084,3,360000,180000,1
+gef_dun00.gat,121,109,3,3 monster Black Mushroom 1084,3,360000,180000,1
+gef_dun00.gat,114,106,0,0 monster Green Plant 1080,1,360000,180000,1
+gef_dun00.gat,92,108,0,0 monster Yellow Plant 1081,1,360000,180000,1
+gef_dun00.gat,0,0,0,0 monster Red Plant 1078,12,1800000,900000,1
+gef_dun00.gat,0,0,0,0 monster Shining Plant 1083,1,1800000,900000,1
-// Gef_dun01
-
-gef_dun01.gat,0,0,0,0 monster Drainliar 1111,30,0,0,0
-gef_dun01.gat,0,0,0,0 monster Nightmare 1061,30,0,0,0
-gef_dun01.gat,0,0,0,0 monster Tyrfing 1204,1,1800000,1200000,0
-gef_dun01.gat,0,0,0,0 monster Zombie 1015,25,0,0,0
+//==================================================
+// gef_dun01 - Geffen Dungeon F2
+//==================================================
gef_dun01.gat,0,0,0,0 monster Ghoul 1036,40,0,0,0
-gef_dun01.gat,0,0,0,0 monster Jakk 1130,30,300000,100000,0
-gef_dun01.gat,234,121,0,0 monster Blue Plant 1079,1,300000,100000,0
-gef_dun01.gat,0,0,0,0 monster Dracula 1389,1,3600000,1800000,1
-gef_dun01.gat,0,0,0,0 monster Black Mushroom 1084,5,180000,90000,1
+gef_dun01.gat,0,0,0,0 monster Nightmare 1061,35,0,0,0
+gef_dun01.gat,0,0,0,0 monster Drainliar 1111,30,0,0,0
+gef_dun01.gat,0,0,0,0 monster Zombie 1015,20,0,0,0
gef_dun01.gat,188,104,10,10 monster White Plant 1082,3,180000,90000,1
gef_dun01.gat,263,115,10,10 monster White Plant 1082,3,180000,90000,1
gef_dun01.gat,48,67,10,10 monster White Plant 1082,2,180000,90000,1
gef_dun01.gat,150,237,10,10 monster White Plant 1082,2,180000,90000,1
+gef_dun01.gat,0,0,0,0 monster Jakk 1130,30,300000,150000,0
+gef_dun01.gat,0,0,0,0 monster Black Mushroom 1084,5,360000,180000,1
+gef_dun01.gat,234,121,0,0 monster Blue Plant 1079,1,900000,450000,1
+gef_dun01.gat,0,0,0,0 monster Tyrfing 1204,1,1800000,900000,1
+gef_dun01.gat,0,0,0,0 monster Dracula 1389,1,3600000,1800000,1
-// Gef_dun02
-
-gef_dun02.gat,0,0,0,0 monster Ghoul 1036,20,0,0,0
+//==================================================
+// gef_dun02 - Geffenia
+//==================================================
+gef_dun02.gat,0,0,0,0 monster Marionette 1143,20,0,0,0
gef_dun02.gat,0,0,0,0 monster Whisper 1179,20,0,0,0
+gef_dun02.gat,0,0,0,0 monster Ghoul 1036,20,0,0,0
+gef_dun02.gat,0,0,0,0 monster Deviruchi 1109,20,0,0,0
gef_dun02.gat,0,0,0,0 monster Hunter Fly 1035,10,0,0,0
-gef_dun02.gat,0,0,0,0 monster Marionette 1143,20,0,0,0
-gef_dun02.gat,0,0,0,0 monster Deviruchi 1109,25,0,0,0
-gef_dun02.gat,0,0,0,0 monster Nightmare 1061,40,300000,100000,0
-gef_dun02.gat,0,0,0,0 monster Doppelganger 1046,1,7200000,3600000,1
gef_dun02.gat,214,212,10,10 monster White Plant 1082,3,180000,90000,1
gef_dun02.gat,215,67,10,10 monster White Plant 1082,3,180000,90000,1
gef_dun02.gat,72,210,20,20 monster White Plant 1082,3,180000,90000,1
gef_dun02.gat,106,151,20,7 monster White Plant 1082,3,180000,90000,1
+gef_dun02.gat,0,0,0,0 monster Nightmare 1061,50,300000,150000,0
gef_dun02.gat,58,167,10,10 monster Shining Plant 1083,1,1800000,900000,1
gef_dun02.gat,185,83,3,3 monster Shining Plant 1083,1,1800000,900000,1
+gef_dun02.gat,0,0,0,0 monster Doppelganger 1046,1,7200000,3600000,1
-//(gef_dun03.gat)?
-gef_dun03.gat,0,0,0,0 monster Baphomet 1039,1,7200000,7200000,1
-gef_dun03.gat,0,0,0,0 monster Doppelganger 1046,1,7200000,7200000,1
-gef_dun03.gat,0,0,0,0 monster Deviruchi 1109,8,0,0,0
-gef_dun03.gat,0,0,0,0 monster Joker 1131,5,300000,100000,0
-gef_dun03.gat,0,0,0,0 monster Khalitzburg 1132,2,0,0,0
-gef_dun03.gat,0,0,0,0 monster Knight of Abyss 1219,2,300000,0,0
-gef_dun03.gat,0,0,0,0 monster Gryphon 1259,1,7200000,3600000,1
-gef_dun03.gat,0,0,0,0 monster Blood Knight 1268,2,300000,0,0
-gef_dun03.gat,0,0,0,0 monster Dark Lord 1272,1,7200000,7200000,1
-gef_dun03.gat,0,0,0,0 monster Alice 1275,3,0,0,0
-gef_dun03.gat,0,0,0,0 monster Chimera 1283,1,7200000,7200000,1
-gef_dun03.gat,0,0,0,0 monster Mini Demon 1292,2,300000,0,0
-gef_dun03.gat,0,0,0,0 monster Dark Illusion 1302,2,300000,0,0
-gef_dun03.gat,0,0,0,0 monster Apocalypse 1365,2,300000,0,0
-gef_dun03.gat,0,0,0,0 monster Succubus 1370,10,0,0,0
-gef_dun03.gat,0,0,0,0 monster Fake Angel 1371,8,0,0,0
-gef_dun03.gat,0,0,0,0 monster Lord of Death 1373,1,7200000,7200000,1
-gef_dun03.gat,0,0,0,0 monster Incubus 1374,10,0,0,0
-gef_dun03.gat,0,0,0,0 monster Nightmare Terror 1379,3,0,0,0
-gef_dun03.gat,0,0,0,0 monster Violy 1390,10,0,0,0
-gef_dun03.gat,0,0,0,0 monster Shining Plant 1083,3,1800000,900000,1
-gef_dun03.gat,0,0,0,0 monster White Plant 1082,10,180000,90000,1
+//==================================================
+// gef_dun03 - Geffenia (Event Map)
+//==================================================
+//gef_dun03.gat,0,0,0,0 monster Baphomet 1039,1,7200000,7200000,1
+//gef_dun03.gat,0,0,0,0 monster Doppelganger 1046,1,7200000,7200000,1
+//gef_dun03.gat,0,0,0,0 monster Deviruchi 1109,8,0,0,0
+//gef_dun03.gat,0,0,0,0 monster Joker 1131,5,300000,100000,0
+//gef_dun03.gat,0,0,0,0 monster Khalitzburg 1132,2,0,0,0
+//gef_dun03.gat,0,0,0,0 monster Knight of Abyss 1219,2,300000,0,0
+//gef_dun03.gat,0,0,0,0 monster Gryphon 1259,1,7200000,3600000,1
+//gef_dun03.gat,0,0,0,0 monster Blood Knight 1268,2,300000,0,0
+//gef_dun03.gat,0,0,0,0 monster Dark Lord 1272,1,7200000,7200000,1
+//gef_dun03.gat,0,0,0,0 monster Alice 1275,3,0,0,0
+//gef_dun03.gat,0,0,0,0 monster Chimera 1283,1,7200000,7200000,1
+//gef_dun03.gat,0,0,0,0 monster Mini Demon 1292,2,300000,0,0
+//gef_dun03.gat,0,0,0,0 monster Dark Illusion 1302,2,300000,0,0
+//gef_dun03.gat,0,0,0,0 monster Apocalypse 1365,2,300000,0,0
+//gef_dun03.gat,0,0,0,0 monster Succubus 1370,10,0,0,0
+//gef_dun03.gat,0,0,0,0 monster Fake Angel 1371,8,0,0,0
+//gef_dun03.gat,0,0,0,0 monster Lord of Death 1373,1,7200000,7200000,1
+//gef_dun03.gat,0,0,0,0 monster Incubus 1374,10,0,0,0
+//gef_dun03.gat,0,0,0,0 monster Nightmare Terror 1379,3,0,0,0
+//gef_dun03.gat,0,0,0,0 monster Violy 1390,10,0,0,0
+//gef_dun03.gat,0,0,0,0 monster Shining Plant 1083,3,1800000,900000,1
+//gef_dun03.gat,0,0,0,0 monster White Plant 1082,10,180000,90000,1
diff --git a/npc/omobs/dungeons/glastheim.txt b/npc/omobs/dungeons/glastheim.txt
index a202723c0..0914b0c9e 100644
--- a/npc/omobs/dungeons/glastheim.txt
+++ b/npc/omobs/dungeons/glastheim.txt
@@ -11,202 +11,217 @@
//= 1.2 Updated to ep 8.5 aegis spawns [MasterOfMuppets]
//============================================================
-// Glast Heim ( gl_cas01.gat )
-
+//==================================================
+// gl_cas01 - Glast Heim F1
+//==================================================
gl_cas01.gat,0,0,0,0 monster Sage Worm 1281,40,0,0,0
gl_cas01.gat,0,0,0,0 monster Carat 1267,40,0,0,0
-gl_cas01.gat,0,0,0,0 monster Rideword 1195,15,0,0,0
-gl_cas01.gat,0,0,0,0 monster Dark Frame 1260,20,0,0,0
gl_cas01.gat,0,0,0,0 monster Whisper 1179,20,0,0,0
+gl_cas01.gat,0,0,0,0 monster Dark Frame 1260,20,0,0,0
+gl_cas01.gat,0,0,0,0 monster Rideword 1195,15,0,0,0
gl_cas01.gat,0,0,0,0 monster Alice 1275,1,0,0,0
+gl_cas01.gat,0,0,0,0 monster Owl Baron 1295,3,600000,300000,1
gl_cas01.gat,0,0,0,0 monster Tyrfing 1204,1,7200000,3600000,1
-gl_cas01.gat,0,0,0,0 monster Owl Baron 1295,3,0,0,1
-
-// Glast Heim ( gl_cas02.gat )
-gl_cas02.gat,0,0,0,0 monster Wanderer 1208,20,0,0,0
-gl_cas02.gat,0,0,0,0 monster Raydric 1163,40,0,0,0
-gl_cas02.gat,0,0,0,0 monster Rideword 1195,10,0,0,0
-gl_cas02.gat,0,0,0,0 monster Raydric Archer 1276,19,0,0,0
+//==================================================
+// gl_cas02 - Glast Heim F2
+//==================================================
+gl_cas02.gat,0,0,0,0 monster Raydric 1163,44,0,0,0
gl_cas02.gat,193,167,5,5 monster Raydric 1163,3,300000,120000,0
gl_cas02.gat,193,135,5,5 monster Raydric 1163,3,300000,120000,0
-gl_cas02.gat,104,145,5,5 monster Mysteltainn 1203,1,7200000,3600000,1
-gl_cas02.gat,102,180,0,0 monster Whisper 1185,1,1800000,900000,1
-gl_cas02.gat,105,180,0,0 monster Whisper 1185,1,1800000,900000,1
-gl_cas02.gat,182,12,3,3 monster Chimera 1283,1,3600000,1800000,1
+gl_cas02.gat,0,0,0,0 monster Rideword 1195,10,0,0,0
gl_cas02.gat,185,11,8,8 monster Rideword 1195,4,120000,60000,1
-gl_cas02.gat,174,11,8,8 monster Evil Druid 1117,4,120000,60000,1
-gl_cas02.gat,104,38,4,4 monster Knight of Abyss 1219,1,1800000,900000,1
-gl_cas02.gat,24,35,4,4 monster Knight of Abyss 1219,1,1800000,900000,1
gl_cas02.gat,46,124,15,15 monster Rideword 1195,15,360000,180000,1
+gl_cas02.gat,0,0,0,0 monster Wanderer 1208,20,0,0,0
+gl_cas02.gat,190,23,1,1 monster Wanderer 1208,1,360000,180000,0
+gl_cas02.gat,0,0,0,0 monster Raydric Archer 1276,19,0,0,0
+gl_cas02.gat,190,38,1,1 monster Raydric Archer 1276,1,360000,180000,0
+gl_cas02.gat,174,11,8,8 monster Evil Druid 1117,4,120000,60000,1
gl_cas02.gat,16,186,10,10 monster Evil Druid 1117,5,360000,180000,1
gl_cas02.gat,133,83,3,3 monster Khalitzburg 1132,1,360000,180000,1
gl_cas02.gat,45,177,3,3 monster Khalitzburg 1132,1,360000,180000,1
gl_cas02.gat,182,65,3,3 monster Khalitzburg 1132,1,360000,180000,1
+gl_cas02.gat,189,20,1,1 monster Khalitzburg 1132,1,360000,180000,0
gl_cas02.gat,173,127,3,3 monster Khalitzburg 1132,1,360000,180000,1
gl_cas02.gat,173,167,3,3 monster Khalitzburg 1132,1,360000,180000,1
-gl_cas02.gat,93,177,3,3 monster Knight of Abyss 1219,1,1800000,900000,1
-gl_cas02.gat,115,177,3,3 monster Knight of Abyss 1219,1,1800000,900000,1
gl_cas02.gat,83,84,2,2 monster Mimic 1191,1,360000,180000,1
gl_cas02.gat,83,80,2,2 monster Mimic 1191,1,360000,180000,1
-gl_cas02.gat,0,0,0,0 monster Tyrfing 1204,1,7200000,3600000,1
gl_cas02.gat,0,0,0,0 monster Alice 1275,1,0,0,0
-gl_cas02.gat,189,20,1,1 monster Khalitzburg 1132,1,360000,180000,0
-gl_cas02.gat,190,23,1,1 monster Wanderer 1208,1,360000,180000,0
-gl_cas02.gat,190,38,1,1 monster Raydric Archer 1276,1,360000,180000,0
-
-// Glast Heim ( gl_in01.gat )
+gl_cas02.gat,104,38,4,4 monster Abysmal Knight 1219,1,900000,450000,1
+gl_cas02.gat,24,35,4,4 monster Abysmal Knight 1219,1,900000,450000,1
+gl_cas02.gat,102,180,0,0 monster Whisper 1185,1,1800000,900000,1
+gl_cas02.gat,105,180,0,0 monster Whisper 1185,1,1800000,900000,1
+gl_cas02.gat,93,177,3,3 monster Abysmal Knight 1219,1,1800000,900000,1
+gl_cas02.gat,115,177,3,3 monster Abysmal Knight 1219,1,1800000,900000,1
+gl_cas02.gat,0,0,0,0 monster Tyrfing 1204,1,7200000,3600000,1
+gl_cas02.gat,104,145,5,5 monster Mysteltainn 1203,1,7200000,3600000,1
+gl_cas02.gat,182,12,3,3 monster Chimera 1283,1,7200000,3600000,1
+//==================================================
+// gl_in01 - Inside Glast Heim
+//==================================================
gl_in01.gat,41,155,40,45 monster Marionette 1143,5,0,0,0
gl_in01.gat,156,147,34,42 monster Marionette 1143,5,0,0,0
gl_in01.gat,42,48,41,32 monster Marionette 1143,5,0,0,0
gl_in01.gat,154,44,36,33 monster Marionette 1143,5,0,0,0
+gl_in01.gat,41,154,40,45 monster Sage Worm 1281,3,0,0,0
+gl_in01.gat,155,147,34,42 monster Sage Worm 1281,5,0,0,0
+gl_in01.gat,42,47,41,32 monster Sage Worm 1281,3,0,0,0
+gl_in01.gat,153,44,36,33 monster Sage Worm 1281,3,0,0,0
+gl_in01.gat,40,150,40,45 monster Dark Frame 1260,3,0,0,0
+gl_in01.gat,153,146,34,42 monster Dark Frame 1260,2,0,0,0
+gl_in01.gat,43,45,41,32 monster Dark Frame 1260,2,0,0,0
+gl_in01.gat,153,44,36,33 monster Dark Frame 1260,3,0,0,0
gl_in01.gat,42,154,40,45 monster Rideword 1195,2,0,0,0
gl_in01.gat,155,143,34,42 monster Rideword 1195,1,0,0,0
gl_in01.gat,41,47,41,32 monster Rideword 1195,3,0,0,0
gl_in01.gat,152,44,36,33 monster Rideword 1195,2,0,0,0
gl_in01.gat,0,0,0,0 monster Wanderer 1208,1,0,0,0
gl_in01.gat,0,0,0,0 monster Alice 1275,1,0,0,0
-gl_in01.gat,40,150,40,45 monster Dark Frame 1260,3,0,0,0
-gl_in01.gat,153,146,34,42 monster Dark Frame 1260,2,0,0,0
-gl_in01.gat,43,45,41,32 monster Dark Frame 1260,2,0,0,0
-gl_in01.gat,153,44,36,33 monster Dark Frame 1260,3,0,0,0
-gl_in01.gat,41,154,40,45 monster Sage Worm 1281,3,0,0,0
-gl_in01.gat,155,147,34,42 monster Sage Worm 1281,5,0,0,0
-gl_in01.gat,42,47,41,32 monster Sage Worm 1281,3,0,0,0
-gl_in01.gat,153,44,36,33 monster Sage Worm 1281,3,0,0,0
-
-// Glast Heim ( gl_prison.gat )
+//==================================================
+// gl_prison - Glast Heim Underprison F1
+//==================================================
+gl_prison.gat,0,0,0,0 monster Zombie Prisoner 1197,50,0,0,0
gl_prison.gat,0,0,0,0 monster Injustice 1257,20,0,0,0
-gl_prison.gat,0,0,0,0 monster Hunter Fly 1035,10,0,0,0
-gl_prison.gat,0,0,0,0 monster Zombie Prisoner 1197,30,0,0,0
gl_prison.gat,0,0,0,0 monster Rybio 1201,15,0,0,0
+gl_prison.gat,0,0,0,0 monster Hunter Fly 1035,10,0,0,0
-// Glast Heim ( gl_prison1.gat )
-
-gl_prison1.gat,0,0,0,0 monster Skeleton Prisoner 1196,30,0,0,0
-gl_prison1.gat,0,0,0,0 monster Cramp 1209,20,0,0,0
-gl_prison1.gat,0,0,0,0 monster Hunter Fly 1035,10,0,0,0
+//==================================================
+// gl_prison1 - Glast Heim Underprison F2
+//==================================================
+gl_prison1.gat,0,0,0,0 monster Skeleton Prisoner 1196,40,0,0,0
gl_prison1.gat,0,0,0,0 monster Injustice 1257,40,0,0,0
-gl_prison1.gat,0,0,0,0 monster Zealotus 1200,1,3600000,1800000,1
-gl_prison1.gat,0,0,0,0 monster Rybio 1201,10,0,0,0
+gl_prison1.gat,0,0,0,0 monster Cramp 1209,20,0,0,0
gl_prison1.gat,0,0,0,0 monster Phendark 1202,10,0,0,0
+gl_prison1.gat,0,0,0,0 monster Rybio 1201,10,0,0,0
+gl_prison1.gat,0,0,0,0 monster Hunter Fly 1035,10,0,0,0
+gl_prison1.gat,0,0,0,0 monster Zherlthsh 1200,1,3600000,1800000,1
-// Glastheim
-
-glast_01.gat,0,0,0,0 monster Knight of Abyss 1219,2,600000,300000,1
-glast_01.gat,0,0,0,0 monster Gargoyle 1253,10,0,0,1
-
-// Glast Heim ( gl_church.gat )
+//==================================================
+// glast_01 - Glast Heim
+//==================================================
+glast_01.gat,0,0,0,0 monster Gargoyle 1253,10,0,0,0
+glast_01.gat,0,0,0,0 monster Abysmal Knight 1219,2,0,0,0
+glast_01.gat,233,209,15,15 monster Green Plant 1080,8,360000,180000,1
+glast_01.gat,233,209,15,15 monster Blue Plant 1079,2,900000,450000,1
+glast_01.gat,233,209,15,15 monster Shining Plant 1083,1,1800000,900000,1
-gl_church.gat,0,0,0,0 monster Wraith 1192,5,0,0,0
-gl_church.gat,0,0,0,0 monster Evil Druid 1117,30,0,0,0
+//==================================================
+// gl_church - Glast Heim St. Abbey
+//==================================================
gl_church.gat,0,0,0,0 monster Ghoul 1036,60,0,0,0
-gl_church.gat,0,0,0,0 monster Dark Illusion 1302,1,3600000,1800000,0
-gl_church.gat,0,0,0,0 monster Mimic 1191,20,0,0,0
+gl_church.gat,0,0,0,0 monster Evil Druid 1117,35,0,0,0
+gl_church.gat,0,0,0,0 monster Mimic 1191,10,0,0,0
gl_church.gat,155,92,10,10 monster Mimic 1191,1,30000,15000,0
gl_church.gat,155,75,10,10 monster Mimic 1191,2,60000,30000,0
gl_church.gat,155,54,10,10 monster Mimic 1191,1,30000,15000,0
+gl_church.gat,0,0,0,0 monster Wraith 1192,10,0,0,0
+gl_church.gat,0,0,0,0 monster Dark Illusion 1302,1,3600000,1800000,0
-// Glast Heim ( gl_chyard.gat )
-
+//==================================================
+// gl_chyard - Glast Heim Churchyard
+//==================================================
gl_chyard.gat,0,0,0,0 monster Ghoul 1036,35,0,0,0
gl_chyard.gat,0,0,0,0 monster Zombie 1015,30,0,0,0
gl_chyard.gat,0,0,0,0 monster Wraith 1192,25,0,0,0
-gl_chyard.gat,0,0,0,0 monster Evil Druid 1117,10,0,0,0
gl_chyard.gat,0,0,0,0 monster Hunter Fly 1035,20,0,0,0
+gl_chyard.gat,0,0,0,0 monster Evil Druid 1117,10,0,0,0
gl_chyard.gat,0,0,0,0 monster Mimic 1191,3,0,0,0
gl_chyard.gat,0,0,0,0 monster Dark Lord 1272,1,3600000,1800000,1
-// Glast Heim down 1 ( gl_sew01.gat )
-
+//==================================================
+// gl_sew01 - Glast Heim Culvert F1
+//==================================================
+gl_sew01.gat,0,0,0,0 monster Whisper 1179,50,0,0,0
gl_sew01.gat,0,0,0,0 monster Gargoyle 1253,30,0,0,0
gl_sew01.gat,0,0,0,0 monster Arclouse 1194,10,0,0,0
-//putmob "gl_sew01" 0 0 0 0 50 DRAINLIAR 0 0 0
-gl_sew01.gat,0,0,0,0 monster Whisper 1179,40,0,0,0
-
-// Glast Heim down 2 ( gl_sew02.gat )
-
-gl_sew02.gat,0,0,0,0 monster Gargoyle 1253,55,0,0,0
-gl_sew02.gat,0,0,0,0 monster Cramp 1209,15,0,0,0
-
-// Glast Heim down 3 ( gl_sew03.gat )
-gl_sew03.gat,0,0,0,0 monster Sting 1207,70,0,0,0
-gl_sew03.gat,0,0,0,0 monster Gargoyle 1253,37,0,0,0
+//==================================================
+// gl_sew02 - Glast Heim Culvert F2
+//==================================================
+gl_sew02.gat,0,0,0,0 monster Gargoyle 1253,60,0,0,0
+gl_sew02.gat,0,0,0,0 monster Cramp 1209,40,0,0,0
+
+//==================================================
+// gl_sew03 - Glast Heim Culvert F3
+//==================================================
+gl_sew03.gat,0,0,0,0 monster Sting 1207,78,0,0,0
+gl_sew03.gat,0,0,0,0 monster Gargoyle 1253,22,0,0,0
gl_sew03.gat,147,7,5,1 monster Gargoyle 1253,1,2400000,1800000,0
gl_sew03.gat,140,7,5,1 monster Gargoyle 1253,1,3600000,1800000,0
gl_sew03.gat,158,7,5,1 monster Gargoyle 1253,1,3600000,1800000,0
-// Glast Heim down 4 ( gl_sew04.gat )
-
-gl_sew04.gat,0,0,0,0 monster Anolian 1206,50,0,0,0
+//==================================================
+// gl_sew04 - Glast Heim Culvert F4
+//==================================================
+gl_sew04.gat,0,0,0,0 monster Anolian 1206,60,0,0,0
gl_sew04.gat,0,0,0,0 monster Gargoyle 1253,30,0,0,0
gl_sew04.gat,0,0,0,0 monster Drainliar 1111,10,0,0,0
-// Glast Heim ( gl_step.gat )
-
-gl_step.gat,0,0,0,0 monster Mimic 1191,20,60000,30000,0
-gl_step.gat,0,0,0,0 monster Raydric Archer 1276,20,0,0,0
-gl_step.gat,0,0,0,0 monster Wind Ghost 1263,50,0,0,0
-
-// Glast Heim ( gl_knt01.gat )
-
-gl_knt01.gat,0,0,0,0 monster Raydric 1163,60,0,0,0
-gl_knt01.gat,0,0,0,0 monster Raydric Archer 1276,20,0,0,0
-gl_knt01.gat,0,0,0,0 monster Khalitzburg 1132,10,0,0,0
-gl_knt01.gat,0,0,0,0 monster Knight of Abyss 1219,10,0,0,0
-gl_knt01.gat,0,0,0,0 monster Alice 1275,1,0,0,0
-gl_knt01.gat,21,278,0,0 monster Giant Whisper 1186,1,3600000,1800000,1
-gl_knt01.gat,122,266,0,0 monster Rideword 1195,1,120000,60000,1
+//==================================================
+// gl_step - Glast Heim Staircase Dungeon
+//==================================================
+gl_step.gat,0,0,0,0 monster Wind Ghost 1263,30,0,0,0
+gl_step.gat,0,0,0,0 monster Raydric Archer 1276,30,0,0,0
+gl_step.gat,0,0,0,0 monster Mimic 1191,20,0,0,0
+
+//==================================================
+// gl_knt01 - Inside Glast Heim Chivalry F1
+//==================================================
+gl_knt01.gat,0,0,0,0 monster Raydric 1163,65,0,0,0
+gl_knt01.gat,0,0,0,0 monster Rideword 1195,10,0,0,0
gl_knt01.gat,33,120,30,30 monster Rideword 1195,10,120000,60000,1
gl_knt01.gat,26,223,20,20 monster Rideword 1195,10,120000,60000,1
-gl_knt01.gat,9,184,0,0 monster Black Mushroom 1084,1,3600000,1800000,1
-gl_knt01.gat,8,184,0,0 monster Black Mushroom 1084,1,3600000,1800000,1
-gl_knt01.gat,7,184,0,0 monster Black Mushroom 1084,1,3600000,1800000,1
-gl_knt01.gat,6,184,0,0 monster Black Mushroom 1084,1,3600000,1800000,1
-gl_knt01.gat,5,184,0,0 monster Black Mushroom 1084,1,3600000,1800000,1
-gl_knt01.gat,4,184,0,0 monster Black Mushroom 1084,1,3600000,1800000,1
-gl_knt01.gat,9,185,0,0 monster Black Mushroom 1084,1,3600000,1800000,1
-gl_knt01.gat,8,185,0,0 monster Black Mushroom 1084,1,3600000,1800000,1
-gl_knt01.gat,7,185,0,0 monster Black Mushroom 1084,1,3600000,1800000,1
-gl_knt01.gat,6,185,0,0 monster Black Mushroom 1084,1,3600000,1800000,1
-gl_knt01.gat,5,185,0,0 monster Black Mushroom 1084,1,3600000,1800000,1
-gl_knt01.gat,4,185,0,0 monster Black Mushroom 1084,1,3600000,1800000,1
-
-// Glast Heim ( gl_knt02.gat )
-
-gl_knt02.gat,0,0,0,0 monster Raydric 1163,50,0,0,0
-gl_knt02.gat,0,0,0,0 monster Raydric Archer 1276,20,0,0,0
-gl_knt02.gat,0,0,0,0 monster Khalitzburg 1132,30,0,0,0
-gl_knt02.gat,0,0,0,0 monster Bloody Knight 1268,1,3600000,1800000,1
+gl_knt01.gat,122,266,0,0 monster Rideword 1195,1,120000,60000,1
+gl_knt01.gat,0,0,0,0 monster Raydric Archer 1276,25,0,0,0
+gl_knt01.gat,0,0,0,0 monster Khalitzburg 1132,20,0,0,0
+gl_knt01.gat,0,0,0,0 monster Abysmal Knight 1219,10,0,0,0
+gl_knt01.gat,0,0,0,0 monster Alice 1275,1,0,0,0
+gl_knt01.gat,9,184,0,0 monster Black Mushroom 1084,1,360000,180000,1
+gl_knt01.gat,8,184,0,0 monster Black Mushroom 1084,1,360000,180000,1
+gl_knt01.gat,7,184,0,0 monster Black Mushroom 1084,1,360000,180000,1
+gl_knt01.gat,6,184,0,0 monster Black Mushroom 1084,1,360000,180000,1
+gl_knt01.gat,5,184,0,0 monster Black Mushroom 1084,1,360000,180000,1
+gl_knt01.gat,4,184,0,0 monster Black Mushroom 1084,1,360000,180000,1
+gl_knt01.gat,9,185,0,0 monster Black Mushroom 1084,1,360000,180000,1
+gl_knt01.gat,8,185,0,0 monster Black Mushroom 1084,1,360000,180000,1
+gl_knt01.gat,7,185,0,0 monster Black Mushroom 1084,1,360000,180000,1
+gl_knt01.gat,6,185,0,0 monster Black Mushroom 1084,1,360000,180000,1
+gl_knt01.gat,5,185,0,0 monster Black Mushroom 1084,1,360000,180000,1
+gl_knt01.gat,4,185,0,0 monster Black Mushroom 1084,1,360000,180000,1
+gl_knt01.gat,21,278,0,0 monster Giant Whisper 1186,1,1800000,900000,1
+
+//==================================================
+// gl_knt02 - Inside Glast Heim Chivalry F2
+//==================================================
+gl_knt02.gat,0,0,0,0 monster Raydric 1163,55,0,0,0
+gl_knt02.gat,0,0,0,0 monster Raydric Archer 1276,25,0,0,0
+gl_knt02.gat,0,0,0,0 monster Khalitzburg 1132,20,0,0,0
gl_knt02.gat,0,0,0,0 monster Alice 1275,1,0,0,0
-gl_knt02.gat,0,0,0,0 monster Mysteltainn 1203,1,1800000,1200000,0
-gl_knt02.gat,0,0,0,0 monster Knight of Abyss 1219,5,0,0,0
-gl_knt02.gat,149,26,5,5 monster Knight of Abyss 1219,1,3600000,1800000,1
-gl_knt02.gat,99,49,5,5 monster Khalitzburg 1132,1,1800000,900000,1
-gl_knt02.gat,62,80,5,5 monster Khalitzburg 1132,1,1800000,900000,1
-gl_knt02.gat,82,134,5,5 monster Khalitzburg 1132,1,1800000,900000,1
-gl_knt02.gat,60,242,5,5 monster Khalitzburg 1132,1,1800000,900000,1
-gl_knt02.gat,118,241,5,5 monster Khalitzburg 1132,1,1800000,900000,1
-gl_knt02.gat,114,194,5,5 monster Khalitzburg 1132,1,1800000,900000,1
-gl_knt02.gat,196,239,5,5 monster Khalitzburg 1132,1,1800000,900000,1
-gl_knt02.gat,208,45,5,5 monster Khalitzburg 1132,1,1800000,900000,1
-gl_knt02.gat,243,74,5,5 monster Khalitzburg 1132,1,1800000,900000,1
-gl_knt02.gat,232,132,5,5 monster Khalitzburg 1132,1,1800000,900000,1
-
-// ( gl_dun01.gat )
+gl_knt02.gat,99,49,5,5 monster Khalitzburg 1132,1,600000,300000,1
+gl_knt02.gat,62,80,5,5 monster Khalitzburg 1132,1,600000,300000,1
+gl_knt02.gat,82,134,5,5 monster Khalitzburg 1132,1,600000,300000,1
+gl_knt02.gat,60,242,5,5 monster Khalitzburg 1132,1,600000,300000,1
+gl_knt02.gat,118,241,5,5 monster Khalitzburg 1132,1,600000,300000,1
+gl_knt02.gat,114,194,5,5 monster Khalitzburg 1132,1,600000,300000,1
+gl_knt02.gat,196,239,5,5 monster Khalitzburg 1132,1,600000,300000,1
+gl_knt02.gat,208,45,5,5 monster Khalitzburg 1132,1,600000,300000,1
+gl_knt02.gat,243,74,5,5 monster Khalitzburg 1132,1,600000,300000,1
+gl_knt02.gat,232,132,5,5 monster Khalitzburg 1132,1,600000,300000,1
+gl_knt02.gat,0,0,0,0 monster Abysmal Knight 1219,5,600000,300000,1
+gl_knt02.gat,149,26,5,5 monster Abysmal Knight 1219,1,600000,300000,1
+gl_knt02.gat,0,0,0,0 monster Bloody Knight 1268,1,3600000,1800000,1
+gl_knt02.gat,0,0,0,0 monster Mysteltainn 1203,1,7200000,3600000,0
+//==================================================
+// gl_dun01 - The Lowest Cave in Glast Heim F1
+//==================================================
gl_dun01.gat,0,0,0,0 monster Arclouse 1194,50,0,0,0
-gl_dun01.gat,0,0,0,0 monster Sting 1207,40,0,0,0
-
-// ( gl_dun02.gat )
+gl_dun01.gat,0,0,0,0 monster Sting 1207,50,0,0,0
+//==================================================
+// gl_dun02 - The Lowest Cave in Glast Heim F2
+//==================================================
gl_dun02.gat,0,0,0,0 monster Majoruros 1310,40,0,0,0
gl_dun02.gat,0,0,0,0 monster Gargoyle 1253,20,0,0,0
-
-// Glastheim
-glast_01.gat,233,209,15,15 monster Shining Plant 1083,1,1800000,900000,1
-glast_01.gat,233,209,15,15 monster Green Plant 1080,8,360000,180000,1
-glast_01.gat,233,209,15,15 monster Blue Plant 1079,2,900000,450000,1
diff --git a/npc/omobs/dungeons/gondun.txt b/npc/omobs/dungeons/gondun.txt
index c462654ce..796f38884 100644
--- a/npc/omobs/dungeons/gondun.txt
+++ b/npc/omobs/dungeons/gondun.txt
@@ -10,31 +10,34 @@
//=
//============================================================
-//gon_dun01
-
-gon_dun01.gat,0,0,0,0 monster Bloody Butterfly 1408,55,650000,350000,0
+//==================================================
+// gon_dun01 - Shrine of Gonryun Queen
+//==================================================
gon_dun01.gat,0,0,0,0 monster Enchanted Peach Tree 1410,35,0,0,0
gon_dun01.gat,0,0,0,0 monster Zipper Bear 1417,30,0,0,0
-gon_dun01.gat,0,0,0,0 monster Red Plant 1078,5,0,0,0
-gon_dun01.gat,0,0,0,0 monster Yellow Plant 1081,10,0,0,0
gon_dun01.gat,0,0,0,0 monster White Plant 1082,10,0,0,0
+gon_dun01.gat,0,0,0,0 monster Yellow Plant 1081,10,0,0,0
+gon_dun01.gat,0,0,0,0 monster Red Plant 1078,5,0,0,0
+gon_dun01.gat,0,0,0,0 monster Bloody Butterfly 1408,55,900000,450000,0
-//gon_dun02
-
-gon_dun02.gat,241,226,15,20 monster Enchanted Peach Tree 1410,2,300000,150000,0
+//==================================================
+// gon_dun02 - Hermit's Checkers
+//==================================================
+gon_dun02.gat,0,0,0,0 monster Bloody Butterfly 1408,20,0,0,0
+gon_dun02.gat,0,0,0,0 monster Taoist Hermit 1412,20,0,0,0
+gon_dun02.gat,0,0,0,0 monster Enchanted Peach Tree 1410,15,600000,300000,0
+gon_dun02.gat,241,226,15,20 monster Enchanted Peach Tree 1410,2,600000,300000,0
+gon_dun02.gat,241,226,15,20 monster Enchanted Peach Tree 1410,3,600000,300000,0
+gon_dun02.gat,33,115,10,15 monster Enchanted Peach Tree 1410,1,600000,300000,0
+gon_dun02.gat,0,0,0,0 monster Yellow Plant 1081,10,600000,300000,0
gon_dun02.gat,241,226,15,20 monster Baby Leopard 1415,4,600000,300000,0
-gon_dun02.gat,241,226,15,20 monster Enchanted Peach Tree 1410,3,120000,60000,0
-gon_dun02.gat,33,115,10,15 monster Enchanted Peach Tree 1410,1,300000,150000,0
gon_dun02.gat,33,115,10,15 monster Baby Leopard 1415,2,600000,300000,0
-gon_dun02.gat,0,0,0,0 monster Taoist Hermit 1412,20,690000,390000,0
-gon_dun02.gat,0,0,0,0 monster Bloody Butterfly 1408,20,0,0,0
-gon_dun02.gat,0,0,0,0 monster Enchanted Peach Tree 1410,15,0,0,0
-gon_dun02.gat,0,0,0,0 monster Yellow Plant 1081,10,0,0,0
-
-//gon_dun03
-gon_dun03.gat,0,0,0,0 monster White Plant 1082,10,0,0,0
-gon_dun03.gat,0,0,0,0 monster Hermit Plant 1413,20,600000,300000,0
-gon_dun03.gat,0,0,0,0 monster Evil Nymph 1416,50,600000,300000,0
+//==================================================
+// gon_dun03 - Arcadia
+//==================================================
+gon_dun03.gat,0,0,0,0 monster Evil Nymph 1416,50,0,0,0
gon_dun03.gat,0,0,0,0 monster Taoist Hermit 1412,30,0,0,0
-gon_dun03.gat,0,0,0,0 monster Evil Snake Lord 1418,1,5650000,3650000,0
+gon_dun03.gat,0,0,0,0 monster Hermit Plant 1413,20,0,0,0
+gon_dun03.gat,0,0,0,0 monster White Plant 1082,10,600000,300000,0
+gon_dun03.gat,0,0,0,0 monster Evil Snake Lord 1418,1,5400000,2700000,0
diff --git a/npc/omobs/dungeons/guilddun.txt b/npc/omobs/dungeons/guilddun.txt
index 91a189328..eefcdc4cb 100644
--- a/npc/omobs/dungeons/guilddun.txt
+++ b/npc/omobs/dungeons/guilddun.txt
@@ -10,38 +10,42 @@
//=
//============================================================
-//gld_dun01
-
-gld_dun01.gat,0,0,0,0 monster Skeleton General 1290,10,0,0,0
+//==================================================
+// gld_dun01 - Baldur Guild Dungeon
+//==================================================
gld_dun01.gat,0,0,0,0 monster Am Mut 1301,20,0,0,0
-gld_dun01.gat,0,0,0,0 monster Cat'o'Nine Tails 1307,3,1200000,0,0
gld_dun01.gat,0,0,0,0 monster Gajomart 1309,10,0,0,0
-gld_dun01.gat,0,0,0,0 monster Eddga 1115,1,28800000,7200000,1
+gld_dun01.gat,0,0,0,0 monster Skeleton General 1290,10,0,0,0
+gld_dun01.gat,0,0,0,0 monster Cat o' Nine Tails 1307,3,1200000,600000,1
gld_dun01.gat,0,0,0,0 monster Vagabond Wolf 1092,1,14400000,7200000,1
-
-//gld_dun02
-
+gld_dun01.gat,0,0,0,0 monster Eddga 1115,1,28800000,14400000,1
+
+//==================================================
+// gld_dun02 - Luina Guild Dungeon
+//==================================================
+gld_dun02.gat,0,0,0,0 monster Giant Hornet 1303,10,0,0,0
+gld_dun02.gat,0,0,0,0 monster Giant Spider 1304,10,0,0,0
+gld_dun02.gat,0,0,0,0 monster Ancient Worm 1305,5,0,0,0
+gld_dun02.gat,0,0,0,0 monster Killer Mantis 1294,5,0,0,0
gld_dun02.gat,0,0,0,0 monster Owl Baron 1295,3,0,0,0
-gld_dun02.gat,0,0,0,0 monster Giant Spider 1304,10,240000,120000,0
-gld_dun02.gat,0,0,0,0 monster Ancient Worm 1305,5,120000,60000,0
-gld_dun02.gat,0,0,0,0 monster Killer Mantis 1294,5,120000,60000,0
-gld_dun02.gat,0,0,0,0 monster Giant Hornet 1303,10,120000,60000,0
-gld_dun02.gat,0,0,0,0 monster Doppelganger 1046,1,28800000,7200000,1
-
-//gld_dun03
+gld_dun02.gat,0,0,0,0 monster Doppelganger 1046,1,28800000,14400000,1
-gld_dun03.gat,0,0,0,0 monster Maya Purple 1289,3,1200000,600000,0
+//==================================================
+// gld_dun03 - Valkyrie Guild Dungeon
+//==================================================
gld_dun03.gat,0,0,0,0 monster Caterpillar 1300,20,0,0,0
-gld_dun03.gat,0,0,0,0 monster Gullinbursti 1311,10,0,0,0
gld_dun03.gat,0,0,0,0 monster Creamy Fear 1293,20,0,0,0
gld_dun03.gat,0,0,0,0 monster Leib Olmai 1306,20,0,0,0
-gld_dun03.gat,0,0,0,0 monster Maya 1147,1,28800000,7200000,1
-
-//gld_dun04
+gld_dun03.gat,0,0,0,0 monster Gullinbursti 1311,10,0,0,0
+gld_dun03.gat,0,0,0,0 monster Maya Purple 1289,3,1200000,600000,1
+gld_dun03.gat,0,0,0,0 monster Maya 1147,1,28800000,14400000,1
-gld_dun04.gat,0,0,0,0 monster Wraith Dead 1291,20,0,0,0
+//==================================================
+// gld_dun04 - Britoniah Guild Dungeon
+//==================================================
gld_dun04.gat,0,0,0,0 monster Mini Demon 1292,20,0,0,0
+gld_dun04.gat,0,0,0,0 monster Wraith Dead 1291,20,0,0,0
gld_dun04.gat,0,0,0,0 monster Zombie Master 1298,20,0,0,0
-gld_dun04.gat,0,0,0,0 monster Dark Illusion 1302,1,1200000,0,0
-gld_dun04.gat,0,0,0,0 monster Dark Lord 1272,1,28800000,7200000,1
-gld_dun04.gat,0,0,0,0 monster Ghostring 1120,1,14400000,7200000,1
+gld_dun04.gat,0,0,0,0 monster Dark Illusion 1302,1,1200000,600000,1
+gld_dun04.gat,0,0,0,0 monster Ghostring 1120,1,10800000,5400000,1
+gld_dun04.gat,0,0,0,0 monster Dark Lord 1272,1,28800000,14400000,1
diff --git a/npc/omobs/dungeons/jupedun.txt b/npc/omobs/dungeons/jupedun.txt
index 08b3053d0..5a1087789 100644
--- a/npc/omobs/dungeons/jupedun.txt
+++ b/npc/omobs/dungeons/jupedun.txt
@@ -14,29 +14,26 @@
//= 01/29/05 : Updated the spawns according to current info [MasterOfMuppets]
//============================================================
-//========================================================================================
-// - Juperos 01
-//========================================================================================
-
+//==================================================
+// juperos_01 - The Ruins of Juperos F1
+//==================================================
juperos_01.gat,0,0,0,0 monster Venatu 1676,35,0,0,0
juperos_01.gat,0,0,0,0 monster Venatu 1677,35,0,0,0
juperos_01.gat,0,0,0,0 monster Venatu 1678,35,0,0,0
juperos_01.gat,0,0,0,0 monster Venatu 1679,35,0,0,0
-//========================================================================================
-// - Juperos 02
-//========================================================================================
-
+//==================================================
+// juperos_02 - The Ruins of Juperos F2
+//==================================================
juperos_02.gat,0,0,0,0 monster Venatu 1676,20,0,0,0
juperos_02.gat,0,0,0,0 monster Venatu 1677,20,0,0,0
juperos_02.gat,0,0,0,0 monster Venatu 1678,20,0,0,0
juperos_02.gat,0,0,0,0 monster Venatu 1679,20,0,0,0
juperos_02.gat,0,0,0,0 monster Apocalypse 1365,40,0,0,0
-//========================================================================================
-// - Juperos Core
-//========================================================================================
-
+//==================================================
+// juperos_core - Juperos Dungeon Entrance
+//==================================================
jupe_core.gat,0,0,0,0 monster Archdam 1668,20,0,0,0
jupe_core.gat,0,0,0,0 monster Dimik 1670,12,0,0,0
jupe_core.gat,0,0,0,0 monster Dimik 1671,12,0,0,0
diff --git a/npc/omobs/dungeons/kiel.txt b/npc/omobs/dungeons/kiel.txt
index d638d05cc..e847f4c88 100644
--- a/npc/omobs/dungeons/kiel.txt
+++ b/npc/omobs/dungeons/kiel.txt
@@ -10,24 +10,22 @@
//= 1.0 First version [MasterOfMuppets]
//============================================================
-//============================================================
-//= Kiel Dungeon lvl 1 (kh_dun01.gat)
-//============================================================
-
+//==================================================
+// kh_dun01 - Machine doll factory, 1st floor
+//==================================================
kh_dun01.gat,0,0,0,0 monster Alice 1275,10,900000,450000,0
kh_dun01.gat,0,0,0,0 monster Alicel 1735,15,300000,150000,0
kh_dun01.gat,0,0,0,0 monster Aliot 1736,10,600000,300000,0
kh_dun01.gat,0,0,0,0 monster Aliza 1737,35,0,0,0
kh_dun01.gat,0,0,0,0 monster Constant 1738,15,0,0,0
-//============================================================
-//= Kiel Dungeon lvl 2 (kh_dun02.gat)
-//============================================================
-
+//==================================================
+// kh_dun02 - Machine doll factory, 2nd floor
+//==================================================
kh_dun02.gat,0,0,0,0 monster Alicel 1735,30,600000,300000,0
kh_dun02.gat,0,0,0,0 monster Aliot 1736,20,300000,150000,0
kh_dun02.gat,0,0,0,0 monster Aliza 1737,15,0,0,0
kh_dun02.gat,0,0,0,0 monster Constant 1738,20,0,0,0
-//We have to little info about these
+// We have to little info about these
//kh_dun02.gat,0,0,0,0 monster Kiel 1733,1,1800000,900000,1
-//kh_dun02.gat,0,0,0,0 monster Kiel D-01 1734,1,7200000,3600000,1 \ No newline at end of file
+//kh_dun02.gat,0,0,0,0 monster Kiel D-01 1734,1,7200000,3600000,1
diff --git a/npc/omobs/dungeons/lhzdun.txt b/npc/omobs/dungeons/lhzdun.txt
index 0decd1a61..e60fa71fe 100644
--- a/npc/omobs/dungeons/lhzdun.txt
+++ b/npc/omobs/dungeons/lhzdun.txt
@@ -17,11 +17,9 @@
//= I also made the place more Moby ^^
//============================================================
-
-//========================================================================================
-// - Bio-life Labs 1F
-//========================================================================================
-
+//==================================================
+// lhz_dun01 - Somatology Laboratory F1
+//==================================================
lhz_dun01.gat,0,0,0,0 monster Metaling 1613,50,0,0,0
lhz_dun01.gat,0,0,0,0 monster Anopheles 1627,25,0,0,0
lhz_dun01.gat,0,0,0,0 monster Removal 1682,35,0,0,0
@@ -30,13 +28,12 @@ lhz_dun01.gat,0,0,0,0 monster Whikebain 1653,5,0,0,0
lhz_dun01.gat,0,0,0,0 monster Armaia 1654,5,0,0,0
lhz_dun01.gat,0,0,0,0 monster Erend 1655,5,0,0,0
lhz_dun01.gat,0,0,0,0 monster Kavac 1656,5,0,0,0
-lhz_dun01.gat,0,0,0,0 monster Rawrell 1657,5,0,0,0
+lhz_dun01.gat,0,0,0,0 monster Rawrel 1657,5,0,0,0
lhz_dun01.gat,0,0,0,0 monster Gemini S58 1681,1,1800000,900000,1
-//========================================================================================
-// - Bio-life Labs 2F
-//========================================================================================
-
+//==================================================
+// lhz_dun02 - Somatology Laboratory F2
+//==================================================
lhz_dun02.gat,0,0,0,0 monster Removal 1682,25,0,0,0
lhz_dun02.gat,0,0,0,0 monster Anopheles 1627,10,0,0,0
lhz_dun02.gat,0,0,0,0 monster Ygnizem 1652,15,0,0,0
@@ -44,14 +41,13 @@ lhz_dun02.gat,0,0,0,0 monster Whikebain 1653,15,0,0,0
lhz_dun02.gat,0,0,0,0 monster Armaia 1654,15,0,0,0
lhz_dun02.gat,0,0,0,0 monster Erend 1655,15,0,0,0
lhz_dun02.gat,0,0,0,0 monster Kavac 1656,15,0,0,0
-lhz_dun02.gat,0,0,0,0 monster Rawrell 1657,15,0,0,0
-lhz_dun01.gat,0,0,0,0 monster Gemini S58 1681,1,1800000,900000,1
+lhz_dun02.gat,0,0,0,0 monster Rawrel 1657,15,0,0,0
+lhz_dun02.gat,0,0,0,0 monster Gemini S58 1681,1,1800000,900000,1
lhz_dun02.gat,0,0,0,0 monster General Ygnizem 1658,1,7200000,3600000,1
-//========================================================================================
-// - Bio-life Labs 3F
-//========================================================================================
-
+//==================================================
+// lhz_dun03 - Somatology Laboratory F3
+//==================================================
lhz_dun03.gat,0,0,0,0 monster Seyren 1634,25,0,0,0
lhz_dun03.gat,0,0,0,0 monster Eremes 1635,25,0,0,0
lhz_dun03.gat,0,0,0,0 monster Harword 1636,25,0,0,0
diff --git a/npc/omobs/dungeons/louydun.txt b/npc/omobs/dungeons/louydun.txt
index f90540fb4..6ce5067d4 100644
--- a/npc/omobs/dungeons/louydun.txt
+++ b/npc/omobs/dungeons/louydun.txt
@@ -11,27 +11,33 @@
//= 1.2 Added Bacsojin and Chung E [MasterOfMuppets]
//============================================================
-//lou_dun01
-lou_dun01.gat,0,0,0,0 monster Horong 1129,15,0,0,0
-lou_dun01.gat,0,0,0,0 monster Increase Soil 1516,15,0,0,0
-lou_dun01.gat,215,159,40,80 monster Sidewinder 1037,10,300000,120000,0
-lou_dun01.gat,215,159,40,80 monster Li Me Mang Ryang 1517,25,300000,120000,0
+//==================================================
+// lou_dun01 - The Royal Tomb
+//==================================================
+lou_dun01.gat,215,159,40,80 monster Li Me Mang Ryang 1517,25,300000,150000,0
lou_dun01.gat,0,0,0,0 monster Li Me Mang Ryang 1517,20,0,0,0
+lou_dun01.gat,0,0,0,0 monster Horong 1129,15,0,0,0
lou_dun01.gat,0,0,0,0 monster Grizzly 1381,15,0,0,0
-lou_dun01.gat,0,0,0,0 monster Leib Olmai 1306,1,300000,120000,0
+lou_dun01.gat,0,0,0,0 monster Increase Soil 1516,15,0,0,0
+lou_dun01.gat,215,159,40,80 monster Side Winder 1037,10,300000,150000,0
lou_dun01.gat,197,77,10,10 monster Black Mushroom 1084,5,0,0,0
lou_dun01.gat,0,0,0,0 monster Shining Plant 1083,5,0,0,0
+lou_dun01.gat,0,0,0,0 monster Leib Olmai 1306,1,300000,150000,0
-//lou_dun02
-lou_dun02.gat,0,0,0,0 monster Hyegun 1512,40,300000,120000,0
+//==================================================
+// lou_dun02 - Inside the Royal Tomb
+//==================================================
+lou_dun02.gat,0,0,0,0 monster Hyegun 1512,40,0,0,0
lou_dun02.gat,0,0,0,0 monster Munak 1026,25,0,0,0
-lou_dun02.gat,0,0,0,0 monster Dancing Dragon 1514,5,0,0,0
lou_dun02.gat,0,0,0,0 monster Mimic 1191,5,0,0,0
+lou_dun02.gat,0,0,0,0 monster Dancing Dragon 1514,5,0,0,0
-//lou_dun03
-lou_dun03.gat,0,0,0,0 monster Hyegun 1512,25,120000,60000,0
-lou_dun03.gat,0,0,0,0 monster Dancing Dragon 1514,25,120000,60000,0
+//==================================================
+// lou_dun03 - Suei Long Gon
+//==================================================
+lou_dun03.gat,0,0,0,0 monster Dancing Dragon 1514,25,0,0,0
+lou_dun03.gat,0,0,0,0 monster Hyegun 1512,25,0,0,0
lou_dun03.gat,0,0,0,0 monster Civil Servant 1513,15,0,0,0
-lou_dun03.gat,0,0,0,0 monster Gajomart 1309,1,300000,120000,0
-lou_dun03.gat,0,0,0,0 monster Green Maiden 1519,10,0,0,0
+lou_dun03.gat,0,0,0,0 monster Gajomart 1309,1,300000,150000,0
+lou_dun03.gat,0,0,0,0 monster Chung E 1519,1,0,0,0
lou_dun03.gat,0,0,0,0 monster Bacsojin 1518,1,3600000,1800000,1
diff --git a/npc/omobs/dungeons/magmadun.txt b/npc/omobs/dungeons/magmadun.txt
index 6c594b776..5d14cc4f0 100644
--- a/npc/omobs/dungeons/magmadun.txt
+++ b/npc/omobs/dungeons/magmadun.txt
@@ -8,23 +8,23 @@
//= Any Athena Version
//===== Additional Comments: =================================
//= 1.1 fixed 2,3,4 tabs instead of 1... and wrong mob names [Lupus]
-//= 1.2 Removed blazers from mag_dun01 and added kahos due to
-//= the Louyang patch [MasterOfMuppets]
//============================================================
-// mag_dun01
-
-//putmob "mag_dun01" 0 0 0 0 20 BLAZZER 0 0 0
-mag_dun01.gat,0,0,0,0 monster Lava Golem 1366,20,600000,30000,0
-mag_dun01.gat,0,0,0,0 monster Kaho 1072,20,0,0,0
+//==================================================
+// mag_dun01 - Nogg Road F1
+//==================================================
mag_dun01.gat,0,0,0,0 monster Explosion 1383,30,0,0,0
+mag_dun01.gat,0,0,0,0 monster Kaho 1072,20,0,0,0
+mag_dun01.gat,0,0,0,0 monster Blazer 1367,20,0,0,0
mag_dun01.gat,0,0,0,0 monster Grizzly 1381,10,0,0,0
+mag_dun01.gat,0,0,0,0 monster Lava Golem 1366,20,600000,30000,0
-// mag_dun02
-
-mag_dun02.gat,0,0,0,0 monster Blazer 1367,20,0,0,0
-mag_dun02.gat,0,0,0,0 monster Nightmare Terror 1379,30,0,0,0
-mag_dun02.gat,0,0,0,0 monster Sky Deleter 1384,10,0,0,0
-mag_dun02.gat,0,0,0,0 monster Earth Deleter 1385,10,0,0,0
-mag_dun02.gat,0,0,0,0 monster Gig 1387,20,0,0,0
-mag_dun02.gat,0,0,0,0 monster Diabolic 1382,10,0,0,0
+//==================================================
+// mag_dun02 - Nogg Road F2
+//==================================================
+mag_dun02.gat,0,0,0,0 monster Nightmare Terror 1379,28,600000,30000,0
+mag_dun02.gat,0,0,0,0 monster Blazer 1367,20,600000,30000,0
+mag_dun02.gat,0,0,0,0 monster Diabolic 1382,20,600000,30000,0
+mag_dun02.gat,0,0,0,0 monster Deleter 1384,10,600000,30000,0
+mag_dun02.gat,0,0,0,0 monster Deleter 1385,10,600000,30000,0
+mag_dun02.gat,0,0,0,0 monster Gig 1387,10,600000,30000,0
diff --git a/npc/omobs/dungeons/moc_pyramid.txt b/npc/omobs/dungeons/moc_pyramid.txt
index 606f87227..533f4a090 100644
--- a/npc/omobs/dungeons/moc_pyramid.txt
+++ b/npc/omobs/dungeons/moc_pyramid.txt
@@ -10,48 +10,53 @@
//=
//============================================================
-// moc_pryd01
-
+//==================================================
+// moc_pryd01 - Inside Pyramid F1
+//==================================================
+moc_pryd01.gat,0,0,0,0 monster Poporing 1031,50,0,0,0
moc_pryd01.gat,0,0,0,0 monster Familiar 1005,50,0,0,0
-moc_pryd01.gat,0,0,0,0 monster Poporing 1031,20,0,0,0
-
-// moc_pryd02
-
-moc_pryd02.gat,0,0,0,0 monster Poporing 1031,20,0,0,0
-moc_pryd02.gat,0,0,0,0 monster Drainliar 1111,20,0,0,0
+//==================================================
+// moc_pryd02 - Inside Pyramid F2
+//==================================================
moc_pryd02.gat,0,0,0,0 monster Mummy 1041,30,0,0,0
moc_pryd02.gat,0,0,0,0 monster Isis 1029,25,0,0,0
-moc_pryd02.gat,0,0,0,0 monster Skeleton Soldier 1028,20,0,0,0
+moc_pryd02.gat,0,0,0,0 monster Poporing 1031,20,0,0,0
moc_pryd02.gat,0,0,0,0 monster Skeleton Archer 1016,20,0,0,0
+moc_pryd02.gat,0,0,0,0 monster Skeleton Soldier 1028,20,0,0,0
+moc_pryd02.gat,0,0,0,0 monster Drainliar 1111,20,0,0,0
-// moc_pryd03
-
+//==================================================
+// moc_pryd03 - Inside Pyramid F3
+//==================================================
+moc_pryd03.gat,0,0,0,0 monster Mummy 1041,50,0,0,0
+moc_pryd03.gat,0,0,0,0 monster Verit 1032,40,0,0,0
+moc_pryd03.gat,0,0,0,0 monster Matyr 1146,15,0,0,0
moc_pryd03.gat,0,0,0,0 monster Drainliar 1111,15,0,0,0
moc_pryd03.gat,0,0,0,0 monster Mimic 1191,10,0,0,0
-moc_pryd03.gat,0,0,0,0 monster Matyr 1146,15,0,0,0
-moc_pryd03.gat,0,0,0,0 monster Mummy 1041,45,0,0,0
-moc_pryd03.gat,0,0,0,0 monster Verit 1032,20,600000,300000,1
-// moc_pryd04
-
-moc_pryd04.gat,0,0,0,0 monster Mummy 1041,25,0,0,0
-moc_pryd04.gat,0,0,0,0 monster Ancient Mummy 1297,3,0,0,0
-moc_pryd04.gat,0,0,0,0 monster Isis 1029,50,150000,75000,0
-moc_pryd04.gat,0,0,0,0 monster Mimic 1191,15,600000,300000,1
-moc_pryd04.gat,0,0,0,0 monster Osiris 1038,1,3600000,7200000,0
+//==================================================
+// moc_pryd04 - Inside Pyramid F4
+//==================================================
+moc_pryd04.gat,0,0,0,0 monster Isis 1029,50,0,0,0
+moc_pryd04.gat,0,0,0,0 monster Mummy 1041,40,0,0,0
moc_pryd04.gat,0,0,0,0 monster Matyr 1146,20,0,0,0
+moc_pryd04.gat,0,0,0,0 monster Ancient Mummy 1297,3,0,0,0
+moc_pryd04.gat,0,0,0,0 monster Mimic 1191,15,600000,300000,0
+moc_pryd04.gat,0,0,0,0 monster Osiris 1038,1,3600000,1800000,1
-// moc_pryd05
-
+//==================================================
+// moc_pryd05 - Inside Pyramid B1
+//==================================================
moc_pryd05.gat,0,0,0,0 monster Minorous 1149,60,0,0,0
-moc_pryd05.gat,0,0,0,0 monster Mummy 1041,10,0,0,0
moc_pryd05.gat,0,0,0,0 monster Verit 1032,50,0,0,0
+moc_pryd05.gat,0,0,0,0 monster Mummy 1041,10,0,0,0
-// moc_pryd06
-
-moc_pryd06.gat,0,0,0,0 monster Verit 1032,10,0,0,0
+//==================================================
+// moc_pryd06 - Inside Pyramid B2
+//==================================================
moc_pryd06.gat,0,0,0,0 monster Arclouse 1194,20,0,0,0
-moc_pryd06.gat,100,90,80,50 monster Ancient Mummy 1297,20,0,0,0
moc_pryd06.gat,100,90,80,50 monster Mimic 1191,20,0,0,0
-moc_pryd06.gat,102,166,1,1 monster Amon Ra 1511,1,3600000,1600000,0
+moc_pryd06.gat,100,90,80,50 monster Ancient Mummy 1297,20,0,0,0
+moc_pryd06.gat,0,0,0,0 monster Verit 1032,10,0,0,0
+moc_pryd06.gat,102,166,0,0 monster Amon Ra 1511,1,3600000,1800000,1
diff --git a/npc/omobs/dungeons/moc_sphinx.txt b/npc/omobs/dungeons/moc_sphinx.txt
index e7b2cadc4..d49a16426 100644
--- a/npc/omobs/dungeons/moc_sphinx.txt
+++ b/npc/omobs/dungeons/moc_sphinx.txt
@@ -10,40 +10,45 @@
//=
//============================================================
-// In_sphinx1
-
-in_sphinx1.gat,0,0,0,0 monster Drainliar 1111,40,0,0,0
+//==================================================
+// In_sphinx1 - Sphinx F1
+//==================================================
+in_sphinx1.gat,0,0,0,0 monster Zerom 1178,30,0,0,0
+in_sphinx1.gat,0,0,0,0 monster Drainliar 1111,30,0,0,0
+in_sphinx1.gat,0,0,0,0 monster Matyr 1146,20,0,0,0
in_sphinx1.gat,0,0,0,0 monster Requiem 1164,20,0,0,0
-in_sphinx1.gat,0,0,0,0 monster Zerom 1178,20,0,0,0
-in_sphinx1.gat,0,0,0,0 monster Matyr 1146,10,0,0,0
-// In_sphinx2
-
-in_sphinx2.gat,0,0,0,0 monster Drainliar 1111,15,0,0,0
+//==================================================
+// In_sphinx2 - Sphinx F2
+//==================================================
in_sphinx2.gat,0,0,0,0 monster Requiem 1164,50,0,0,0
in_sphinx2.gat,0,0,0,0 monster Zerom 1178,50,0,0,0
in_sphinx2.gat,0,0,0,0 monster Matyr 1146,20,0,0,0
+in_sphinx2.gat,0,0,0,0 monster Drainliar 1111,15,0,0,0
-// In_sphinx3
-
-in_sphinx3.gat,0,0,0,0 monster Matyr 1146,30,0,0,0
-in_sphinx3.gat,0,0,0,0 monster Pasana 1154,10,0,0,0
+//==================================================
+// In_sphinx3 - Sphinx F3
+//==================================================
in_sphinx3.gat,0,0,0,0 monster Marduk 1140,30,0,0,0
-in_sphinx3.gat,0,0,0,0 monster Mimic 1191,10,600000,300000,1
+in_sphinx3.gat,0,0,0,0 monster Matyr 1146,25,0,0,0
+in_sphinx3.gat,0,0,0,0 monster Requiem 1164,22,0,0,0
+in_sphinx3.gat,0,0,0,0 monster Pasana 1154,15,0,0,0
+in_sphinx3.gat,0,0,0,0 monster Mimic 1191,10,300000,150000,0
-// In_sphinx4
-
+//==================================================
+// In_sphinx4 - Sphinx F4
+//==================================================
in_sphinx4.gat,0,0,0,0 monster Minorous 1149,50,0,0,0
-//putmob "in_sphinx4" 0 0 0 0 30 SIDE_WINDER 0 0 0
-in_sphinx4.gat,0,0,0,0 monster Marduk 1140,15,0,0,0
-in_sphinx4.gat,0,0,0,0 monster Mimic 1191,4,600000,300000,1
in_sphinx4.gat,0,0,0,0 monster Pasana 1154,20,0,0,0
+in_sphinx4.gat,0,0,0,0 monster Marduk 1140,15,0,0,0
+in_sphinx4.gat,0,0,0,0 monster Mimic 1191,4,300000,150000,0
-// In_sphinx5
-
-in_sphinx5.gat,0,0,0,0 monster Pasana 1154,30,0,0,0
+//==================================================
+// In_sphinx5 - Sphinx F5
+//==================================================
in_sphinx5.gat,0,0,0,0 monster Matyr 1146,30,0,0,0
-in_sphinx5.gat,0,0,0,0 monster Sidewinder 1037,20,0,0,0
in_sphinx5.gat,0,0,0,0 monster Marduk 1140,30,0,0,0
-in_sphinx5.gat,0,0,0,0 monster Mimic 1191,7,600000,300000,1
+in_sphinx5.gat,0,0,0,0 monster Pasana 1154,30,0,0,0
+in_sphinx5.gat,0,0,0,0 monster Side Winder 1037,20,0,0,0
+in_sphinx5.gat,0,0,0,0 monster Mimic 1191,7,0,0,0
in_sphinx5.gat,0,0,0,0 monster Pharaoh 1157,1,3600000,1800000,1
diff --git a/npc/omobs/dungeons/orcdun.txt b/npc/omobs/dungeons/orcdun.txt
index 0450a11c6..ce5dc7a14 100644
--- a/npc/omobs/dungeons/orcdun.txt
+++ b/npc/omobs/dungeons/orcdun.txt
@@ -10,30 +10,27 @@
//=
//============================================================
-// Orcsdun01
-
-orcsdun01.gat,0,0,0,0 monster Steel ChonChon 1042,10,0,0,0
+//==================================================
+// orcsdun01 - Orc Dungeon F1
+//==================================================
+orcsdun01.gat,0,0,0,0 monster Orc Zombie 1153,70,0,0,0
orcsdun01.gat,0,0,0,0 monster Familiar 1005,15,0,0,0
+orcsdun01.gat,0,0,0,0 monster Orc Skeleton 1152,10,0,0,0
+orcsdun01.gat,0,0,0,0 monster Steel Chonchon 1042,10,0,0,0
orcsdun01.gat,0,0,0,0 monster Drainliar 1111,5,0,0,0
-orcsdun01.gat,0,0,0,0 monster Orc Zombie 1153,10,3000,5000,0
-orcsdun01.gat,0,0,0,0 monster Orc Zombie 1153,30,60000,30000,0
-orcsdun01.gat,0,0,0,0 monster Orc Zombie 1153,40,120000,60000,0
-orcsdun01.gat,0,0,0,0 monster Orc Skeleton 1152,10,180000,60000,0
-orcsdun01.gat,167,133,5,5 monster Black Mushroom 1084,5,900000,450000,1
-orcsdun01.gat,67,34,5,5 monster Black Mushroom 1084,5,900000,450000,1
orcsdun01.gat,83,50,5,5 monster White Plant 1082,2,180000,90000,1
orcsdun01.gat,58,67,10,10 monster White Plant 1082,3,180000,90000,1
+orcsdun01.gat,167,133,5,5 monster Black Mushroom 1084,5,
+orcsdun01.gat,67,34,5,5 monster Black Mushroom 1084,5,360000,180000,1
-// Orcsdun02
-
-orcsdun02.gat,0,0,0,0 monster Steel ChonChon 1042,20,0,0,0
+//==================================================
+// orcsdun02 - Orc Dungeon F2
+//==================================================
+orcsdun02.gat,0,0,0,0 monster Orc Skeleton 1152,50,0,0,0
+orcsdun02.gat,0,0,0,0 monster Zenorc 1177,50,0,0,0
+orcsdun02.gat,0,0,0,0 monster Steel Chonchon 1042,20,0,0,0
orcsdun02.gat,0,0,0,0 monster Drainliar 1111,20,0,0,0
-orcsdun02.gat,0,0,0,0 monster Orc Skeleton 1152,10,3000,5000,0
-orcsdun02.gat,0,0,0,0 monster Orc Skeleton 1152,20,60000,30000,0
-orcsdun02.gat,0,0,0,0 monster Orc Skeleton 1152,20,120000,60000,0
-orcsdun02.gat,0,0,0,0 monster Zenorc 1177,30,3000,5000,0
-orcsdun02.gat,0,0,0,0 monster Zenorc 1177,20,60000,30000,0
-orcsdun02.gat,0,0,0,0 monster Orc Archer 1189,5,1800000,900000,1
-orcsdun02.gat,0,0,0,0 monster Black Mushroom 1084,5,180000,90000,1
orcsdun02.gat,105,37,10,10 monster White Plant 1082,2,180000,90000,1
orcsdun02.gat,37,44,10,10 monster White Plant 1082,3,180000,90000,1
+orcsdun02.gat,0,0,0,0 monster Black Mushroom 1084,5,360000,180000,1
+orcsdun02.gat,0,0,0,0 monster Orc Archer 1189,5,1800000,900000,1
diff --git a/npc/omobs/dungeons/payoncave.txt b/npc/omobs/dungeons/payoncave.txt
index 2ab3f7b9b..3d47ef050 100644
--- a/npc/omobs/dungeons/payoncave.txt
+++ b/npc/omobs/dungeons/payoncave.txt
@@ -10,32 +10,34 @@
//=
//============================================================
-// pay_dun00
-
-pay_dun00.gat,0,0,0,0 monster Familiar 1005,15,0,0,0
-pay_dun00.gat,0,0,0,0 monster Zombie 1015,20,0,0,0
+//==================================================
+// pay_dun00 - Payon Cave F1
+//==================================================
pay_dun00.gat,0,0,0,0 monster Skeleton 1076,35,0,0,0
+pay_dun00.gat,0,0,0,0 monster Zombie 1015,20,0,0,0
pay_dun00.gat,0,0,0,0 monster Poporing 1031,15,0,0,0
-pay_dun00.gat,0,0,0,0 monster Red Plant 1078,15,180000,90000,1
+pay_dun00.gat,0,0,0,0 monster Familiar 1005,15,0,0,0
pay_dun00.gat,140,140,5,5 monster Black Mushroom 1084,3,360000,180000,1
+pay_dun00.gat,0,0,0,0 monster Red Plant 1078,15,180000,90000,1
-// pay_dun01
-
-pay_dun01.gat,0,0,0,0 monster Drainliar 1111,5,0,0,0
-pay_dun01.gat,0,0,0,0 monster Eggyra 1116,15,0,0,0
-pay_dun01.gat,0,0,0,0 monster Skeleton Soldier 1028,50,300000,150000,1
-pay_dun01.gat,0,0,0,0 monster Skeleton Archer 1016,30,300000,150000,1
-pay_dun01.gat,235,54,10,10 monster Black Mushroom 1084,7,900000,450000,1
+//==================================================
+// pay_dun01 - Payon Cave F2
+//==================================================
+pay_dun01.gat,0,0,0,0 monster Soldier Skeleton 1028,60,0,0,0
+pay_dun01.gat,0,0,0,0 monster Archer Skeleton 1016,30,0,0,0
+pay_dun01.gat,0,0,0,0 monster Eggyra 1116,20,0,0,0
+pay_dun01.gat,0,0,0,0 monster Drainliar 1111,10,0,0,0
+pay_dun01.gat,235,54,10,10 monster Black Mushroom 1084,5,360000,180000,1
pay_dun01.gat,0,0,0,0 monster Red Plant 1078,10,180000,90000,1
-
-// pay_dun02
-
-pay_dun02.gat,0,0,0,0 monster Skeleton Soldier 1028,15,180000,90000,1
+//==================================================
+// pay_dun02 - Payon Cave F3
+//==================================================
pay_dun02.gat,0,0,0,0 monster Munak 1026,40,0,0,0
-pay_dun02.gat,0,0,0,0 monster Bon Gun 1188,30,0,0,0
+pay_dun02.gat,0,0,0,0 monster Bongun 1188,30,0,0,0
+pay_dun02.gat,0,0,0,0 monster Archer Skeleton 1016,20,0,0,0
+pay_dun02.gat,0,0,0,0 monster Soldier Skeleton 1028,15,0,0,0
pay_dun02.gat,0,0,0,0 monster Poporing 1031,10,0,0,0
-pay_dun02.gat,0,0,0,0 monster Skeleton Archer 1016,20,180000,90000,1
pay_dun02.gat,116,205,0,0 monster Hydra 1068,1,345000,100000,1
pay_dun02.gat,116,199,0,0 monster Hydra 1068,1,306000,100000,1
pay_dun02.gat,116,196,0,0 monster Hydra 1068,1,300000,100000,1
@@ -67,47 +69,22 @@ pay_dun02.gat,108,191,0,0 monster Hydra 1068,1,332000,100000,1
pay_dun02.gat,111,191,0,0 monster Hydra 1068,1,300000,100000,1
pay_dun02.gat,107,190,0,0 monster Hydra 1068,1,320000,100000,1
pay_dun02.gat,110,190,0,0 monster Hydra 1068,1,300000,100000,1
+pay_dun02.gat,110,216,20,10 monster White Plant 1082,3,180000,90000,1
+pay_dun02.gat,132,84,10,10 monster White Plant 1082,3,180000,90000,1
pay_dun02.gat,227,185,0,0 monster Mandragora 1020,1,300000,100000,1
pay_dun02.gat,227,184,0,0 monster Mandragora 1020,1,300000,100000,1
pay_dun02.gat,229,183,0,0 monster Mandragora 1020,1,300000,100000,1
-pay_dun02.gat,214,266,0,0 monster Red Plant 1078,1,600000,300000,1
pay_dun02.gat,37,243,0,0 monster Black Mushroom 1084,1,600000,300000,1
-pay_dun02.gat,37,243,0,0 monster Nine-Tail 1180,1,3600000,1800000,1
pay_dun02.gat,111,199,10,10 monster Black Mushroom 1084,7,900000,450000,1
-pay_dun02.gat,110,216,20,10 monster White Plant 1082,3,180000,90000,1
-pay_dun02.gat,132,84,10,10 monster White Plant 1082,3,180000,90000,1
+pay_dun02.gat,214,266,0,0 monster Red Plant 1078,1,600000,300000,1
pay_dun02.gat,197,113,10,10 monster Red Plant 1078,4,180000,90000,1
pay_dun02.gat,55,254,10,10 monster Red Plant 1078,4,180000,90000,1
+pay_dun02.gat,37,243,0,0 monster Nine Tail 1180,1,3600000,1800000,1
-// pay_dun03
-
+//==================================================
+// pay_dun03 - Payon Cave F4
+//==================================================
pay_dun03.gat,0,0,0,0 monster Sohee 1170,50,0,0,0
-pay_dun03.gat,0,0,0,0 monster Munak 1026,3,0,0,0
-pay_dun03.gat,0,0,0,0 monster Bon Gun 1188,3,0,0,0
-pay_dun03.gat,0,0,0,0 monster Nine-Tail 1180,1,0,0,0
-pay_dun03.gat,0,0,0,0 monster Nine-Tail 1180,1,3600000,1800000,0
-pay_dun03.gat,154,112,0,0 monster Whisper 1185,1,1800000,0,1
-pay_dun03.gat,161,117,0,0 monster Whisper 1185,1,1800000,0,1
-pay_dun03.gat,81,61,0,0 monster Whisper 1185,1,1800000,0,1
-pay_dun03.gat,84,63,0,0 monster Whisper 1185,1,1800000,0,1
-pay_dun03.gat,89,147,0,0 monster Giant Whisper 1186,1,14400000,0,1
-pay_dun03.gat,66,73,0,0 monster Hydra 1068,1,600000,300000,1
-pay_dun03.gat,68,72,0,0 monster Hydra 1068,1,600000,300000,1
-pay_dun03.gat,67,71,0,0 monster Hydra 1068,1,600000,300000,1
-pay_dun03.gat,63,70,0,0 monster Hydra 1068,1,600000,300000,1
-pay_dun03.gat,58,69,0,0 monster Hydra 1068,1,600000,300000,1
-pay_dun03.gat,67,69,0,0 monster Hydra 1068,1,600000,300000,1
-pay_dun03.gat,60,68,0,0 monster Hydra 1068,1,600000,300000,1
-pay_dun03.gat,69,68,0,0 monster Hydra 1068,1,600000,300000,1
-pay_dun03.gat,62,67,0,0 monster Hydra 1068,1,600000,300000,1
-pay_dun03.gat,71,67,0,0 monster Hydra 1068,1,600000,300000,1
-pay_dun03.gat,64,66,0,0 monster Hydra 1068,1,600000,300000,1
-pay_dun03.gat,57,65,0,0 monster Hydra 1068,1,600000,300000,1
-pay_dun03.gat,66,65,0,0 monster Hydra 1068,1,600000,300000,1
-pay_dun03.gat,59,64,0,0 monster Hydra 1068,1,600000,300000,1
-pay_dun03.gat,68,64,0,0 monster Hydra 1068,1,600000,300000,1
-pay_dun03.gat,71,64,0,0 monster Hydra 1068,1,600000,300000,1
-pay_dun03.gat,66,63,0,0 monster Hydra 1068,1,600000,300000,1
pay_dun03.gat,71,243,0,0 monster Sohee 1170,2,300000,100000,1
pay_dun03.gat,86,248,0,0 monster Sohee 1170,2,300000,100000,1
pay_dun03.gat,85,178,0,0 monster Sohee 1170,2,300000,100000,1
@@ -118,10 +95,6 @@ pay_dun03.gat,219,244,0,0 monster Sohee 1170,2,300000,100000,1
pay_dun03.gat,243,220,0,0 monster Sohee 1170,2,300000,100000,1
pay_dun03.gat,219,185,0,0 monster Sohee 1170,2,300000,100000,1
pay_dun03.gat,228,185,0,0 monster Sohee 1170,2,300000,100000,1
-pay_dun03.gat,228,61,0,0 monster Red Plant 1078,1,600000,300000,1
-pay_dun03.gat,138,42,0,0 monster Blue Plant 1079,1,600000,300000,1
-pay_dun03.gat,120,186,0,0 monster Green Plant 1080,1,600000,300000,1
-pay_dun03.gat,88,35,0,0 monster Yellow Plant 1081,1,600000,300000,1
pay_dun03.gat,126,135,0,0 monster Mandragora 1020,1,300000,100000,1
pay_dun03.gat,126,134,0,0 monster Mandragora 1020,1,300000,100000,1
pay_dun03.gat,126,133,0,0 monster Mandragora 1020,1,300000,100000,1
@@ -132,26 +105,56 @@ pay_dun03.gat,179,133,0,0 monster Mandragora 1020,1,300000,100000,1
pay_dun03.gat,179,132,0,0 monster Mandragora 1020,1,300000,100000,1
pay_dun03.gat,179,131,0,0 monster Mandragora 1020,1,300000,100000,1
pay_dun03.gat,179,130,0,0 monster Mandragora 1020,1,300000,100000,1
+pay_dun03.gat,0,0,0,0 monster Munak 1026,3,0,0,0
+pay_dun03.gat,0,0,0,0 monster Bongun 1188,3,0,0,0
pay_dun03.gat,0,0,0,0 monster Greatest General 1277,3,0,0,0
-pay_dun03.gat,0,0,0,0 monster Red Plant 1078,15,180000,90000,1
+pay_dun03.gat,0,0,0,0 monster Nine Tail 1180,2,0,0,0
+pay_dun03.gat,66,73,0,0 monster Hydra 1068,1,180000,90000,1
+pay_dun03.gat,68,72,0,0 monster Hydra 1068,1,180000,90000,1
+pay_dun03.gat,67,71,0,0 monster Hydra 1068,1,180000,90000,1
+pay_dun03.gat,63,70,0,0 monster Hydra 1068,1,180000,90000,1
+pay_dun03.gat,58,69,0,0 monster Hydra 1068,1,180000,90000,1
+pay_dun03.gat,67,69,0,0 monster Hydra 1068,1,180000,90000,1
+pay_dun03.gat,60,68,0,0 monster Hydra 1068,1,180000,90000,1
+pay_dun03.gat,69,68,0,0 monster Hydra 1068,1,180000,90000,1
+pay_dun03.gat,62,67,0,0 monster Hydra 1068,1,180000,90000,1
+pay_dun03.gat,71,67,0,0 monster Hydra 1068,1,180000,90000,1
+pay_dun03.gat,64,66,0,0 monster Hydra 1068,1,180000,90000,1
+pay_dun03.gat,57,65,0,0 monster Hydra 1068,1,180000,90000,1
+pay_dun03.gat,66,65,0,0 monster Hydra 1068,1,180000,90000,1
+pay_dun03.gat,59,64,0,0 monster Hydra 1068,1,180000,90000,1
+pay_dun03.gat,68,64,0,0 monster Hydra 1068,1,180000,90000,1
+pay_dun03.gat,71,64,0,0 monster Hydra 1068,1,180000,90000,1
+pay_dun03.gat,66,63,0,0 monster Hydra 1068,1,180000,90000,1
pay_dun03.gat,246,56,20,20 monster White Plant 1082,3,180000,90000,1
pay_dun03.gat,52,262,10,4 monster White Plant 1082,2,180000,90000,1
+pay_dun03.gat,120,186,0,0 monster Green Plant 1080,1,360000,180000,1
+pay_dun03.gat,138,42,0,0 monster Blue Plant 1079,1,600000,300000,1
+pay_dun03.gat,88,35,0,0 monster Yellow Plant 1081,1,600000,300000,1
+pay_dun03.gat,228,61,0,0 monster Red Plant 1078,1,1800000,900000,1
+pay_dun03.gat,0,0,0,0 monster Red Plant 1078,15,1800000,900000,1
+pay_dun03.gat,154,112,0,0 monster Whisper 1185,1,1800000,900000,1
+pay_dun03.gat,161,117,0,0 monster Whisper 1185,1,1800000,900000,1
+pay_dun03.gat,81,61,0,0 monster Whisper 1185,1,1800000,900000,1
+pay_dun03.gat,84,63,0,0 monster Whisper 1185,1,1800000,900000,1
+pay_dun03.gat,89,147,0,0 monster Giant Whisper 1186,1,3600000,1800000,1
-// pay_dun04
-
+//==================================================
+// pay_dun04 - Payon Cave F5
+//==================================================
pay_dun04.gat,0,0,0,0 monster Dokebi 1110,40,0,0,0
-pay_dun04.gat,0,0,0,0 monster Sohee 1170,5,0,0,0
pay_dun04.gat,0,0,0,0 monster Horong 1129,30,0,0,0
-pay_dun04.gat,120,115,0,0 monster Moonlight Flower 1150,1,3600000,7200000,1
-pay_dun04.gat,0,0,0,0 monster Greatest General 1277,15,0,0,0
-pay_dun04.gat,0,0,0,0 monster Skeleton Archer 1016,15,0,0,0
-pay_dun04.gat,0,0,0,0 monster Nine-Tail 1180,20,60000,30000,0
-pay_dun04.gat,120,115,5,5 monster Skeleton General 1290,1,1800000,1200000,0
-pay_dun04.gat,120,115,5,5 monster Am Mut 1301,1,1800000,1200000,0
-pay_dun04.gat,120,115,0,0 monster Cat'o'Nine Tails 1307,1,3600000,7200000,1
-pay_dun04.gat,120,120,10,10 monster Shining Plant 1083,1,1800000,900000,1
-pay_dun04.gat,28,110,5,5 monster Shining Plant 1083,1,1800000,900000,1
-pay_dun04.gat,0,0,0,0 monster Red Plant 1078,10,180000,90000,1
+pay_dun04.gat,0,0,0,0 monster Nine Tail 1180,20,0,0,0
+pay_dun04.gat,0,0,0,0 monster Greatest General 1277,20,0,0,0
+pay_dun04.gat,0,0,0,0 monster Archer Skeleton 1016,20,0,0,0
+pay_dun04.gat,0,0,0,0 monster Sohee 1170,20,0,0,0
pay_dun04.gat,107,206,5,5 monster White Plant 1082,2,180000,90000,1
pay_dun04.gat,28,110,10,10 monster White Plant 1082,2,180000,90000,1
pay_dun04.gat,190,207,5,5 monster White Plant 1082,2,180000,90000,1
+pay_dun04.gat,0,0,0,0 monster Red Plant 1078,10,1800000,900000,1
+pay_dun04.gat,120,120,10,10 monster Shining Plant 1083,1,1800000,900000,1
+pay_dun04.gat,28,110,5,5 monster Shining Plant 1083,1,1800000,900000,1
+pay_dun04.gat,120,115,5,5 monster Am Mut 1301,1,1800000,900000,0
+pay_dun04.gat,120,115,5,5 monster Skeleton General 1290,1,1800000,900000,0
+pay_dun04.gat,120,115,0,0 monster Moonlight Flower 1150,1,3600000,1800000,1
+pay_dun04.gat,120,115,0,0 monster Cat o' Nine Tails 1307,1,3600000,1800000,1
diff --git a/npc/omobs/dungeons/pront_maze.txt b/npc/omobs/dungeons/pront_maze.txt
index aa257ccda..18ffd4efe 100644
--- a/npc/omobs/dungeons/pront_maze.txt
+++ b/npc/omobs/dungeons/pront_maze.txt
@@ -10,83 +10,83 @@
//=
//============================================================
-// prt_maze01
+//==================================================
+// prt_maze01 - Labyrinth Forest F1
+//==================================================
+prt_maze01.gat,59,100,21,21 monster Horn 1128,5,120000,40000,1
+prt_maze01.gat,19,20,21,21 monster Poporing 1031,5,120000,40000,1
prt_maze01.gat,179,20,21,21 monster Poring 1002,5,120000,40000,1
+prt_maze01.gat,59,180,21,21 monster Martin 1145,5,120000,40000,1
prt_maze01.gat,139,20,21,21 monster Lunatic 1063,5,120000,40000,1
-prt_maze01.gat,99,20,21,21 monster Fabre 1007,5,120000,40000,1
-prt_maze01.gat,99,20,21,21 monster Creamy 1018,1,120000,40000,1
-prt_maze01.gat,59,20,21,21 monster Pupa 1008,5,120000,40000,1
-prt_maze01.gat,19,20,21,21 monster Poporing 1031,5,120000,40000,1
prt_maze01.gat,179,60,21,21 monster Rocker 1052,5,120000,40000,1
-prt_maze01.gat,139,60,21,21 monster Bigfoot 1060,5,120000,40000,1
-prt_maze01.gat,99,60,21,21 monster Smokie 1056,5,120000,40000,1
-prt_maze01.gat,59,60,21,21 monster Boa 1025,5,120000,40000,1
prt_maze01.gat,19,60,21,21 monster Wolf 1013,5,120000,40000,1
-prt_maze01.gat,179,100,21,21 monster Argiope 1099,3,120000,40000,1
-prt_maze01.gat,139,100,21,21 monster Argos 1100,3,120000,40000,1
-prt_maze01.gat,99,100,21,21 monster ChonChon 1011,5,120000,40000,1
-prt_maze01.gat,59,100,21,21 monster Horn 1128,5,120000,40000,1
-prt_maze01.gat,19,100,21,21 monster Hunter Fly 1035,3,120000,40000,1
-prt_maze01.gat,179,140,21,21 monster Mantis 1139,3,120000,40000,1
-prt_maze01.gat,139,140,21,21 monster Stainer 1174,5,120000,40000,1
-prt_maze01.gat,99,140,21,21 monster Sidewinder 1037,3,120000,40000,1
-prt_maze01.gat,59,140,21,21 monster Yoyo 1057,4,120000,40000,1
-prt_maze01.gat,59,140,21,21 monster Choco 1214,2,120000,40000,1
-prt_maze01.gat,19,140,21,21 monster Steel ChonChon 1042,5,120000,40000,1
-prt_maze01.gat,179,180,21,21 monster Coco 1104,5,120000,40000,1
prt_maze01.gat,139,180,21,21 monster Caramel 1103,5,120000,40000,1
-prt_maze01.gat,99,180,21,21 monster Dustiness 1114,5,120000,40000,1
-prt_maze01.gat,59,180,21,21 monster Martin 1145,5,120000,40000,1
-prt_maze01.gat,19,180,21,21 monster Savage 1166,3,120000,40000,1
+prt_maze01.gat,179,180,21,21 monster Coco 1104,5,120000,40000,1
+prt_maze01.gat,139,140,21,21 monster Stainer 1174,5,120000,40000,1
+prt_maze01.gat,19,140,21,21 monster Steel Chonchon 1042,5,120000,40000,1
+prt_maze01.gat,59,60,21,21 monster Snake 1025,5,120000,40000,1
+prt_maze01.gat,99,60,21,21 monster Smokie 1056,5,120000,40000,1
prt_maze01.gat,19,180,21,21 monster Savage 1166,5,120000,40000,1
+prt_maze01.gat,99,100,21,21 monster Chonchon 1011,5,120000,40000,1
+prt_maze01.gat,99,180,21,21 monster Dustiness 1114,5,120000,40000,1
+prt_maze01.gat,139,60,21,21 monster Bigfoot 1060,5,120000,40000,1
+prt_maze01.gat,99,20,21,21 monster Fabre 1007,5,120000,40000,1
+prt_maze01.gat,59,20,21,21 monster Pupa 1008,5,120000,40000,1
+prt_maze01.gat,59,140,21,21 monster Yoyo 1057,4,120000,40000,1
prt_maze01.gat,0,0,0,0 monster Hunter Fly 1035,1,0,0,0
-prt_maze01.gat,0,0,0,0 monster Vagabond Wolf 1092,1,3600000,1800000,0
-prt_maze01.gat,0,0,0,0 monster Shining Plant 1083,5,1800000,900000,1
-prt_maze01.gat,0,0,0,0 monster Red Plant 1078,5,180000,90000,1
-prt_maze01.gat,0,0,0,0 monster Blue Plant 1079,5,180000,90000,1
-prt_maze01.gat,0,0,0,0 monster Black Mushroom 1084,5,180000,90000,1
-prt_maze01.gat,0,0,0,0 monster Red Mushroom 1085,5,180000,90000,1
-
-// prt_maze02
+prt_maze01.gat,19,100,21,21 monster Hunter Fly 1035,4,120000,40000,1
+prt_maze01.gat,179,140,21,21 monster Mantis 1139,3,120000,40000,1
+prt_maze01.gat,99,140,21,21 monster Side Winder 1037,3,120000,40000,1
+prt_maze01.gat,139,100,21,21 monster Argos 1100,3,120000,40000,1
+prt_maze01.gat,179,100,21,21 monster Argiope 1099,3,120000,40000,1
+prt_maze01.gat,19,180,21,21 monster Savage Babe 1067,3,120000,40000,1
+prt_maze01.gat,59,140,21,21 monster Choco 1214,2,120000,40000,1
+prt_maze01.gat,99,20,21,21 monster Creamy 1018,1,120000,40000,1
+prt_maze01.gat,0,0,0,0 monster White Plant 1082,5,180000,90000,1
+prt_maze01.gat,0,0,0,0 monster Red Mushroom 1085,5,360000,180000,1
+prt_maze01.gat,0,0,0,0 monster Black Mushroom 1084,5,360000,180000,1
+prt_maze01.gat,0,0,0,0 monster Yellow Plant 1081,2,600000,300000,1
+prt_maze01.gat,0,0,0,0 monster Blue Plant 1079,3,900000,450000,1
+prt_maze01.gat,0,0,0,0 monster Red Plant 1078,5,1800000,900000,1
+prt_maze01.gat,0,0,0,0 monster Shining Plant 1083,2,1800000,900000,1
+prt_maze01.gat,0,0,0,0 monster Vagabond Wolf 1092,1,3600000,1800000,1
+//==================================================
+// prt_maze02 - Labyrinth Forest F2
+//==================================================
prt_maze02.gat,0,0,0,0 monster Poporing 1031,25,0,0,0
prt_maze02.gat,0,0,0,0 monster Bigfoot 1060,5,0,0,0
-prt_maze02.gat,0,0,0,0 monster Sasquatch 1243,1,900000,40000,0
+prt_maze02.gat,0,0,0,0 monster Sasquatch 1243,1,600000,300000,0
prt_maze02.gat,0,0,0,0 monster Leib Olmai 1306,1,1800000,900000,0
-// prt_maze03
-
-prt_maze03.gat,0,0,0,0 monster Poporing 1031,45,0,0,0
-prt_maze03.gat,0,0,0,0 monster Sidewinder 1037,10,0,0,0
-prt_maze03.gat,0,0,0,0 monster Hunter Fly 1035,30,0,0,0
-prt_maze03.gat,0,0,0,0 monster Ghostring 1120,1,6800000,3400000,1
-prt_maze03.gat,0,0,0,0 monster Killer Mantis 1294,1,0,0,0
-prt_maze03.gat,150,50,70,70 monster Sidewinder 1037,20,300000,150000,0
-prt_maze03.gat,150,50,70,70 monster Vocal 1088,1,1920000,1500000,1
-prt_maze03.gat,50,150,70,70 monster Stem Worm 1215,20,300000,150000,0
-prt_maze03.gat,50,150,70,70 monster Vagabond Wolf 1092,1,1920000,150000,1
+//==================================================
+// prt_maze03 - Labyrinth Forest F3
+//==================================================
prt_maze03.gat,170,170,70,70 monster Mantis 1139,30,60000,30000,0
-prt_maze03.gat,170,170,70,70 monster Eclipse 1093,1,1920000,150000,1
-prt_maze03.gat,23,23,70,70 monster Mastering 1090,1,19200000,150000,1
+prt_maze03.gat,0,0,0,0 monster Side Winder 1037,10,0,0,0
+prt_maze03.gat,150,50,70,70 monster Side Winder 1037,20,300000,150000,0
+prt_maze03.gat,0,0,0,0 monster Hunter Fly 1035,30,0,0,0
prt_maze03.gat,100,100,80,80 monster Baphomet Jr. 1101,25,0,0,0
-prt_maze03.gat,0,0,0,0 monster Baphomet 1039,1,7200000,3600000,1
-prt_maze03.gat,0,0,0,0 monster Shining Plant 1083,5,1800000,900000,1
-prt_maze03.gat,0,0,0,0 monster Red Plant 1078,5,180000,90000,1
-prt_maze03.gat,0,0,0,0 monster Blue Plant 1079,5,180000,90000,1
-prt_maze03.gat,0,0,0,0 monster Black Mushroom 1084,5,180000,90000,1
-prt_maze03.gat,0,0,0,0 monster Red Mushroom 1085,5,180000,90000,1
+prt_maze03.gat,50,150,70,70 monster Stem Worm 1215,20,300000,150000,0
+prt_maze03.gat,0,0,0,0 monster Killer Mantis 1294,1,0,0,0
+prt_maze03.gat,99,21,10,10 monster Black Mushroom 1084,3,360000,180000,1
+prt_maze03.gat,54,15,10,10 monster Black Mushroom 1084,3,360000,180000,1
+prt_maze03.gat,171,180,3,3 monster Red Mushroom 1085,2,360000,180000,1
+prt_maze03.gat,174,187,3,3 monster Red Mushroom 1085,3,360000,180000,1
+prt_maze03.gat,61,98,10,10 monster Yellow Plant 1081,1,600000,300000,1
+prt_maze03.gat,61,98,10,10 monster Blue Plant 1079,1,900000,450000,1
+prt_maze03.gat,17,58,10,10 monster Blue Plant 1079,1,900000,450000,1
+prt_maze03.gat,99,141,10,10 monster Blue Plant 1079,2,900000,450000,1
+prt_maze03.gat,99,21,10,10 monster Blue Plant 1079,1,900000,450000,1
+prt_maze03.gat,0,0,0,0 monster Red Plant 1078,5,1800000,900000,1
prt_maze03.gat,61,98,10,10 monster Shining Plant 1083,1,1800000,900000,1
-prt_maze03.gat,61,98,10,10 monster Blue Plant 1079,1,1800000,900000,1
-prt_maze03.gat,61,98,10,10 monster Yellow Plant 1081,1,1800000,900000,1
prt_maze03.gat,57,56,10,10 monster Shining Plant 1083,1,1800000,900000,1
prt_maze03.gat,15,15,10,10 monster Shining Plant 1083,1,1800000,900000,1
prt_maze03.gat,137,140,3,3 monster Shining Plant 1083,1,1800000,900000,1
prt_maze03.gat,17,58,10,10 monster Shining Plant 1083,1,1800000,900000,1
-prt_maze03.gat,17,58,10,10 monster Blue Plant 1079,1,1800000,900000,1
-prt_maze03.gat,99,141,10,10 monster Blue Plant 1079,2,1800000,900000,1
-prt_maze03.gat,99,21,10,10 monster Blue Plant 1079,1,1800000,900000,1
-prt_maze03.gat,0,0,0,0 monster Red Plant 1078,5,180000,90000,1
-prt_maze03.gat,99,21,10,10 monster Black Mushroom 1084,3,180000,90000,1
-prt_maze03.gat,54,15,10,10 monster Black Mushroom 1084,3,180000,90000,1
-prt_maze03.gat,171,180,3,3 monster Red Mushroom 1085,2,180000,90000,1
-prt_maze03.gat,174,187,3,3 monster Red Mushroom 1085,3,180000,90000,1
+prt_maze03.gat,170,170,70,70 monster Eclipse 1093,1,1800000,900000,1
+prt_maze03.gat,150,50,70,70 monster Vocal 1088,1,1800000,900000,1
+prt_maze03.gat,23,23,70,70 monster Mastering 1090,1,1800000,900000,1
+prt_maze03.gat,50,150,70,70 monster Vagabond Wolf 1092,1,1800000,900000,1
+prt_maze03.gat,0,0,0,0 monster Ghostring 1120,1,7200000,3600000,1
+prt_maze03.gat,0,0,0,0 monster Baphomet 1039,1,7200000,3600000,1
diff --git a/npc/omobs/dungeons/pront_sewers.txt b/npc/omobs/dungeons/pront_sewers.txt
index cc41e9cc6..df5ff2fff 100644
--- a/npc/omobs/dungeons/pront_sewers.txt
+++ b/npc/omobs/dungeons/pront_sewers.txt
@@ -10,39 +10,43 @@
//=
//============================================================
-// prt_sewb1
-
-prt_sewb1.gat,0,0,0,0 monster Thief Bug Egg 1048,80,0,0,0
-prt_sewb1.gat,0,0,0,0 monster Thief Bug Larva 1051,30,0,0,0
-prt_sewb1.gat,0,0,0,0 monster Familiar 1005,10,0,0,0
-prt_sewb1.gat,0,0,0,0 monster Tarou 1175,10,0,0,0
+//==================================================
+// prt_sewb1 - Prontera Culvert F1
+//==================================================
+prt_sewb1.gat,0,0,0,0 monster Thief Bug Egg 1048,90,0,0,0
+prt_sewb1.gat,0,0,0,0 monster Thief Bug 1051,40,0,0,0
+prt_sewb1.gat,0,0,0,0 monster Tarou 1175,20,0,0,0
+prt_sewb1.gat,0,0,0,0 monster Familiar 1005,20,0,0,0
-// prt_sewb2
-
+//==================================================
+// prt_sewb2 - Prontera Culvert F2
+//==================================================
+prt_sewb2.gat,0,0,0,0 monster Thief Bug 1051,70,0,0,0
+prt_sewb2.gat,0,0,0,0 monster Tarou 1175,60,0,0,0
+prt_sewb2.gat,0,0,0,0 monster Plankton 1161,30,0,0,0
prt_sewb2.gat,0,0,0,0 monster Thief Bug Egg 1048,20,0,0,0
-prt_sewb2.gat,0,0,0,0 monster Thief Bug Larva 1051,70,0,0,0
-prt_sewb2.gat,0,0,0,0 monster Familiar 1005,10,0,0,0
prt_sewb2.gat,0,0,0,0 monster Spore 1014,20,0,0,0
-prt_sewb2.gat,0,0,0,0 monster Plankton 1161,30,0,0,0
prt_sewb2.gat,0,0,0,0 monster Thief Bug Female 1017,10,0,0,0
-prt_sewb2.gat,0,0,0,0 monster Tarou 1175,60,0,0,0
+prt_sewb2.gat,0,0,0,0 monster Familiar 1005,10,0,0,0
-// prt_sewb3
-
-prt_sewb3.gat,0,0,0,0 monster Thief Bug Egg 1048,10,0,0,0
-prt_sewb3.gat,0,0,0,0 monster Thief Bug Larva 1051,20,0,0,0
+//==================================================
+// prt_sewb3 - Prontera Culvert F3
+//==================================================
prt_sewb3.gat,0,0,0,0 monster Thief Bug Female 1017,65,0,0,0
prt_sewb3.gat,0,0,0,0 monster Thief Bug Male 1021,65,0,0,0
-prt_sewb3.gat,0,0,0,0 monster Tarou 1175,15,0,0,0
-prt_sewb3.gat,0,0,0,0 monster Poison Spore 1077,15,0,0,0
+prt_sewb3.gat,0,0,0,0 monster Thief Bug 1051,20,0,0,0
prt_sewb3.gat,0,0,0,0 monster Familiar 1005,20,0,0,0
+prt_sewb3.gat,0,0,0,0 monster Poison Spore 1077,15,0,0,0
+prt_sewb3.gat,0,0,0,0 monster Tarou 1175,15,0,0,0
+prt_sewb3.gat,0,0,0,0 monster Thief Bug Egg 1048,10,0,0,0
-// prt_sewb4
-
-prt_sewb4.gat,0,0,0,0 monster Thief Bug Egg 1048,10,0,0,0
-prt_sewb4.gat,0,0,0,0 monster Thief Bug Larva 1051,20,0,0,0
-prt_sewb4.gat,0,0,0,0 monster Thief Bug Female 1017,20,0,0,0
+//==================================================
+// prt_sewb4 - Prontera Culvert F4
+//==================================================
prt_sewb4.gat,0,0,0,0 monster Thief Bug Male 1021,70,0,0,0
+prt_sewb4.gat,0,0,0,0 monster Thief Bug 1051,20,0,0,0
+prt_sewb4.gat,0,0,0,0 monster Thief Bug Female 1017,20,0,0,0
prt_sewb4.gat,0,0,0,0 monster Drainliar 1111,20,0,0,0
+prt_sewb4.gat,0,0,0,0 monster Thief Bug Egg 1048,10,0,0,0
prt_sewb4.gat,0,0,0,0 monster Cramp 1209,5,0,0,0
prt_sewb4.gat,0,0,0,0 monster Golden Thief Bug 1086,1,3600000,1800000,1
diff --git a/npc/omobs/dungeons/sunkenship.txt b/npc/omobs/dungeons/sunkenship.txt
index a501e7351..c5f90843d 100644
--- a/npc/omobs/dungeons/sunkenship.txt
+++ b/npc/omobs/dungeons/sunkenship.txt
@@ -10,18 +10,11 @@
//=
//============================================================
-// treasure01
-
-treasure01.gat,0,0,0,0 monster Kukre 1070,20,0,0,1
-treasure01.gat,0,0,0,0 monster Whisper 1179,7,0,0,1
-treasure01.gat,0,0,0,0 monster Whisper 1179,5,120000,60000,1
-treasure01.gat,107,39,15,15 monster Poison Spore 1077,3,180000,90000,1
+//==================================================
+// treasure01 - Sunken Ship F1
+//==================================================
treasure01.gat,107,39,15,15 monster Hydra 1068,1,180000,90000,1
-treasure01.gat,29,38,15,15 monster Poison Spore 1077,3,180000,90000,1
treasure01.gat,68,66,13,11 monster Hydra 1068,4,180000,90000,1
-treasure01.gat,34,112,17,11 monster Pirate Skeleton 1071,5,180000,90000,1
-treasure01.gat,106,111,9,9 monster Pirate Skeleton 1071,5,180000,90000,1
-treasure01.gat,106,111,9,9 monster Thara Frog 1034,5,180000,90000,1
treasure01.gat,67,161,0,0 monster Hydra 1068,1,263000,100000,1
treasure01.gat,67,160,0,0 monster Hydra 1068,1,293000,100000,1
treasure01.gat,68,161,0,0 monster Hydra 1068,1,317000,100000,1
@@ -48,18 +41,9 @@ treasure01.gat,89,161,0,0 monster Hydra 1068,1,300000,100000,1
treasure01.gat,89,160,0,0 monster Hydra 1068,1,305000,100000,1
treasure01.gat,60,182,0,0 monster Hydra 1068,1,313000,100000,1
treasure01.gat,76,182,0,0 monster Hydra 1068,1,269000,100000,1
-treasure01.gat,82,154,11,9 monster Poison Spore 1077,3,100000,100000,1
-treasure01.gat,54,154,11,9 monster Poison Spore 1077,3,100000,100000,1
-treasure01.gat,58,165,5,5 monster Pirate Skeleton 1071,2,300000,100000,1
-treasure01.gat,69,165,5,5 monster Pirate Skeleton 1071,2,300000,100000,1
-treasure01.gat,79,165,5,5 monster Pirate Skeleton 1071,2,300000,100000,1
-treasure01.gat,150,162,5,5 monster Pirate Skeleton 1071,3,300000,100000,1
treasure01.gat,150,162,5,5 monster Hydra 1068,1,300000,100000,1
-treasure01.gat,163,161,5,5 monster Pirate Skeleton 1071,3,300000,100000,1
treasure01.gat,163,161,5,5 monster Hydra 1068,1,300000,100000,1
-treasure01.gat,163,151,5,5 monster Pirate Skeleton 1071,3,300000,100000,1
treasure01.gat,163,151,5,5 monster Hydra 1068,1,300000,100000,1
-treasure01.gat,163,141,5,5 monster Pirate Skeleton 1071,3,300000,100000,1
treasure01.gat,163,141,5,5 monster Hydra 1068,1,300000,100000,1
treasure01.gat,162,71,0,0 monster Hydra 1068,1,273000,100000,1
treasure01.gat,162,70,0,0 monster Hydra 1068,1,314000,100000,1
@@ -69,12 +53,10 @@ treasure01.gat,164,71,0,0 monster Hydra 1068,1,305000,100000,1
treasure01.gat,164,70,0,0 monster Hydra 1068,1,300000,100000,1
treasure01.gat,165,71,0,0 monster Hydra 1068,1,307000,100000,1
treasure01.gat,165,70,0,0 monster Hydra 1068,1,293000,100000,1
-treasure01.gat,164,59,12,10 monster Whisper 1179,5,300000,100000,1
treasure01.gat,158,63,0,0 monster Hydra 1068,1,300000,100000,1
treasure01.gat,159,63,0,0 monster Hydra 1068,1,300000,100000,1
treasure01.gat,158,62,0,0 monster Hydra 1068,1,300000,100000,1
treasure01.gat,159,62,0,0 monster Hydra 1068,1,300000,100000,1
-treasure01.gat,160,60,27,19 monster Pirate Skeleton 1071,10,300000,100000,1
treasure01.gat,158,45,0,0 monster Hydra 1068,1,302000,100000,1
treasure01.gat,158,44,0,0 monster Hydra 1068,1,300000,100000,1
treasure01.gat,158,43,0,0 monster Hydra 1068,1,305000,100000,1
@@ -99,25 +81,55 @@ treasure01.gat,169,43,0,0 monster Hydra 1068,1,305000,100000,1
treasure01.gat,169,42,0,0 monster Hydra 1068,1,300000,100000,1
treasure01.gat,169,41,0,0 monster Hydra 1068,1,313000,100000,1
treasure01.gat,169,40,0,0 monster Hydra 1068,1,300000,100000,1
+treasure01.gat,0,0,0,0 monster Pirate Skeleton 1071,5,0,0,0
+treasure01.gat,34,112,17,11 monster Pirate Skeleton 1071,5,180000,90000,1
+treasure01.gat,106,111,9,9 monster Pirate Skeleton 1071,5,180000,90000,1
+treasure01.gat,58,165,5,5 monster Pirate Skeleton 1071,2,300000,100000,1
+treasure01.gat,69,165,5,5 monster Pirate Skeleton 1071,2,300000,100000,1
+treasure01.gat,79,165,5,5 monster Pirate Skeleton 1071,2,300000,100000,1
+treasure01.gat,150,162,5,5 monster Pirate Skeleton 1071,3,300000,100000,1
+treasure01.gat,163,161,5,5 monster Pirate Skeleton 1071,3,300000,100000,1
+treasure01.gat,163,151,5,5 monster Pirate Skeleton 1071,3,300000,100000,1
+treasure01.gat,163,141,5,5 monster Pirate Skeleton 1071,3,300000,100000,1
+treasure01.gat,160,60,27,19 monster Pirate Skeleton 1071,10,300000,100000,1
+treasure01.gat,0,0,0,0 monster Kukre 1070,20,0,0,0
+treasure01.gat,107,39,15,15 monster Poison Spore 1077,3,180000,90000,1
+treasure01.gat,29,38,15,15 monster Poison Spore 1077,3,180000,90000,1
+treasure01.gat,82,154,11,9 monster Poison Spore 1077,3,100000,100000,1
+treasure01.gat,54,154,11,9 monster Poison Spore 1077,3,100000,100000,1
+treasure01.gat,0,0,0,0 monster Whisper 1179,5,120000,60000,1
+treasure01.gat,164,59,12,10 monster Whisper 1179,5,300000,100000,1
+treasure02.gat,0,0,0,0 monster Penomena 1216,1,900000,450000,1
+treasure02.gat,0,0,0,0 monster Wanderer 1208,1,1800000,900000,1
-// treasure02
-
-treasure02.gat,0,0,0,0 monster Ghostring 1120,1,1980000,1200000,1
+//==================================================
+// treasure02 - Sunken Ship F2
+//==================================================
+treasure02.gat,0,0,0,0 monster Pirate Skeleton 1071,10,0,0,0
+treasure02.gat,38,74,9,9 monster Pirate Skeleton 1071,3,300000,100000,1
+treasure02.gat,170,71,1,1 monster Pirate Skeleton 1071,1,100000,100000,1
+treasure02.gat,168,77,1,1 monster Pirate Skeleton 1071,1,100000,100000,1
+treasure02.gat,164,67,1,1 monster Pirate Skeleton 1071,1,100000,100000,1
+treasure02.gat,155,43,21,13 monster Pirate Skeleton 1071,6,300000,100000,1
+treasure02.gat,178,143,1,1 monster Pirate Skeleton 1071,1,300000,100000,1
+treasure02.gat,178,140,1,1 monster Pirate Skeleton 1071,1,300000,100000,1
+treasure02.gat,184,143,1,1 monster Pirate Skeleton 1071,1,300000,100000,1
treasure02.gat,0,0,0,0 monster Whisper 1179,8,0,0,0
-treasure02.gat,0,0,0,0 monster Wanderer 1208,1,600000,300000,1
-treasure02.gat,0,0,0,0 monster Penomena 1216,19,300000,120000,1
-treasure02.gat,0,0,0,0 monster Kukre 1070,20,0,0,1
-treasure02.gat,0,0,0,0 monster Pirate Skeleton 1071,5,0,0,1
-treasure02.gat,0,0,0,0 monster Mimic 1191,3,0,0,1
+treasure02.gat,102,68,13,13 monster Whisper 1179,2,300000,100000,1
+treasure02.gat,102,80,5,5 monster Whisper 1179,1,300000,100000,1
+treasure02.gat,102,88,5,5 monster Whisper 1179,1,300000,100000,1
+treasure02.gat,101,150,15,10 monster Whisper 1179,4,200000,100000,1
+treasure02.gat,157,143,1,1 monster Whisper 1179,1,100000,100000,1
+treasure02.gat,151,138,1,1 monster Whisper 1179,1,100000,100000,1
+treasure02.gat,45,144,1,1 monster Whisper 1179,1,200000,100000,1
+treasure02.gat,52,139,1,1 monster Whisper 1179,1,200000,100000,1
+treasure02.gat,0,0,0,0 monster Kukre 1070,20,0,0,0
treasure02.gat,95,57,0,0 monster Hydra 1068,1,300000,100000,1
treasure02.gat,96,57,0,0 monster Hydra 1068,1,300000,100000,1
treasure02.gat,101,57,0,0 monster Hydra 1068,1,300000,100000,1
treasure02.gat,102,57,0,0 monster Hydra 1068,1,300000,100000,1
treasure02.gat,107,57,0,0 monster Hydra 1068,1,300000,100000,1
treasure02.gat,108,57,0,0 monster Hydra 1068,1,300000,100000,1
-treasure02.gat,102,68,13,13 monster Whisper 1179,2,300000,100000,1
-treasure02.gat,102,80,5,5 monster Whisper 1179,1,300000,100000,1
-treasure02.gat,102,88,5,5 monster Whisper 1179,1,300000,100000,1
treasure02.gat,100,85,0,0 monster Hydra 1068,1,300000,100000,1
treasure02.gat,101,85,0,0 monster Hydra 1068,1,300000,100000,1
treasure02.gat,102,85,0,0 monster Hydra 1068,1,300000,100000,1
@@ -130,23 +142,14 @@ treasure02.gat,100,143,0,0 monster Hydra 1068,1,300000,100000,1
treasure02.gat,101,143,0,0 monster Hydra 1068,1,300000,100000,1
treasure02.gat,102,143,0,0 monster Hydra 1068,1,300000,100000,1
treasure02.gat,103,143,0,0 monster Hydra 1068,1,300000,100000,1
-treasure02.gat,101,150,15,10 monster Whisper 1179,4,200000,100000,1
-treasure02.gat,101,151,8,8 monster Drake 1112,1,7200000,3600000,1
+treasure02.gat,0,0,0,0 monster Mimic 1191,5,0,0,1
treasure02.gat,101,151,10,10 monster Mimic 1191,3,500000,200000,1
treasure02.gat,101,151,10,10 monster Mimic 1191,2,100000,100000,1
+treasure02.gat,0,0,0,0 monster Penomena 1216,2,300000,120000,1
treasure02.gat,101,151,10,10 monster Penomena 1216,4,100000,100000,1
treasure02.gat,101,126,2,2 monster Penomena 1216,1,1200000,600000,1
treasure02.gat,101,135,2,2 monster Penomena 1216,1,60000,200000,1
-treasure02.gat,38,74,9,9 monster Pirate Skeleton 1071,3,300000,100000,1
-treasure02.gat,170,71,1,1 monster Pirate Skeleton 1071,1,100000,100000,1
-treasure02.gat,168,77,1,1 monster Pirate Skeleton 1071,1,100000,100000,1
-treasure02.gat,164,67,1,1 monster Pirate Skeleton 1071,1,100000,100000,1
-treasure02.gat,155,43,21,13 monster Pirate Skeleton 1071,6,300000,100000,1
-treasure02.gat,178,143,1,1 monster Pirate Skeleton 1071,1,300000,100000,1
-treasure02.gat,178,140,1,1 monster Pirate Skeleton 1071,1,300000,100000,1
-treasure02.gat,184,143,1,1 monster Pirate Skeleton 1071,1,300000,100000,1
-treasure02.gat,157,143,1,1 monster Whisper 1179,1,100000,100000,1
-treasure02.gat,151,138,1,1 monster Whisper 1179,1,100000,100000,1
-treasure02.gat,45,144,1,1 monster Whisper 1179,1,200000,100000,1
-treasure02.gat,52,139,1,1 monster Whisper 1179,1,200000,100000,1
treasure02.gat,23,142,1,1 monster Marionette 1143,1,200000,100000,1
+treasure02.gat,0,0,0,0 monster Wanderer 1208,1,600000,300000,1
+treasure02.gat,0,0,0,0 monster Ghostring 1120,1,3600000,1800000,1
+treasure02.gat,101,151,8,8 monster Drake 1112,1,7200000,3600000,1
diff --git a/npc/omobs/dungeons/thanatos.txt b/npc/omobs/dungeons/thanatos.txt
index b2e7402c1..dbd62d127 100644
--- a/npc/omobs/dungeons/thanatos.txt
+++ b/npc/omobs/dungeons/thanatos.txt
@@ -10,14 +10,18 @@
//= 1.0 Real spawns by Poki#3 [Nexon]
//============================================================
-//Thanatos Tower Floor 1
+//==================================================
+// tha_t01 - Thanatos Tower F1
+//==================================================
tha_t01.gat,0,0,0,0 monster Mimic 1191,30,0,0,0
tha_t01.gat,0,0,0,0 monster Rideword 1195,20,0,0,0
tha_t01.gat,0,0,0,0 monster Plasma 1695,10,0,0,0
tha_t01.gat,0,0,0,0 monster Solace 1703,10,0,0,0
tha_t01.gat,0,0,0,0 monster Alice 1275,1,0,0,0
-//Thanatos Tower Floor 2
+//==================================================
+// tha_t02 - Thanatos Tower F2
+//==================================================
tha_t02.gat,0,0,0,0 monster Rideword 1195,20,0,0,0
tha_t02.gat,0,0,0,0 monster Deathword 1698,20,0,0,0
tha_t02.gat,0,0,0,0 monster Mimic 1191,30,0,0,0
@@ -26,7 +30,9 @@ tha_t02.gat,0,0,0,0 monster Plasma 1697,10,0,0,0
tha_t02.gat,0,0,0,0 monster Retribution 1702,10,0,0,0
tha_t02.gat,0,0,0,0 monster Alice 1275,1,0,0,0
-//Thanatos Tower Floor 3
+//==================================================
+// tha_t03 - Thanatos Tower F3
+//==================================================
tha_t03.gat,0,0,0,0 monster Rideword 1195,20,0,0,0
tha_t03.gat,0,0,0,0 monster Deathword 1698,20,0,0,0
tha_t03.gat,0,0,0,0 monster Mimic 1191,30,0,0,0
@@ -36,7 +42,9 @@ tha_t03.gat,0,0,0,0 monster Ancient Mimic 1699,20,0,0,0
tha_t03.gat,0,0,0,0 monster Owl Duke 1320,10,0,0,0
tha_t03.gat,0,0,0,0 monster Elder 1377,10,0,0,0
-//Thanatos Tower Floor 4
+//==================================================
+// tha_t04 - Thanatos Tower F4
+//==================================================
tha_t04.gat,0,0,0,0 monster Rideword 1195,20,0,0,0
tha_t04.gat,0,0,0,0 monster Deathword 1698,20,0,0,0
tha_t04.gat,0,0,0,0 monster Mimic 1191,30,0,0,0
@@ -47,7 +55,9 @@ tha_t04.gat,0,0,0,0 monster Owl Baron 1295,10,0,0,0
tha_t04.gat,0,0,0,0 monster Elder 1377,10,0,0,0
tha_t04.gat,0,0,0,0 monster Observation 1700,10,0,0,0
-//Thanatos Tower Floor 5
+//==================================================
+// tha_t05 - Thanatos Tower F5
+//==================================================
tha_t05.gat,0,0,0,0 monster Rideword 1195,20,0,0,0
tha_t05.gat,0,0,0,0 monster Deathword 1698,20,0,0,0
tha_t05.gat,0,0,0,0 monster Mimic 1191,20,0,0,0
@@ -60,7 +70,9 @@ tha_t05.gat,0,0,0,0 monster Owl Duke 1320,10,0,0,0
tha_t05.gat,0,0,0,0 monster Elder 1377,10,0,0,0
tha_t05.gat,0,0,0,0 monster Thanatos Dolor 1707,10,0,0,0
-//Thanatos Tower Floor 6
+//==================================================
+// tha_t06 - Thanatos Tower F6
+//==================================================
tha_t06.gat,0,0,0,0 monster Rideword 1195,20,0,0,0
tha_t06.gat,0,0,0,0 monster Deathword 1698,20,0,0,0
tha_t06.gat,0,0,0,0 monster Mimic 1191,20,0,0,0
@@ -74,7 +86,9 @@ tha_t06.gat,0,0,0,0 monster Elder 1377,15,0,0,0
tha_t06.gat,0,0,0,0 monster Thanatos Maero 1706,2,0,0,0
tha_t06.gat,0,0,0,0 monster Thanatos Dolor 1707,10,0,0,0
-//Thanatos Tower Floor 7
+//==================================================
+// tha_t07 - Thanatos Tower F7
+//==================================================
tha_t07.gat,0,0,0,0 monster Rideword 1195,10,0,0,0
tha_t07.gat,0,0,0,0 monster Deathword 1698,20,0,0,0
tha_t07.gat,0,0,0,0 monster Mimic 1191,10,0,0,0
@@ -85,7 +99,9 @@ tha_t07.gat,0,0,0,0 monster Elder 1377,20,0,0,0
tha_t07.gat,0,0,0,0 monster Shelter 1701,10,0,0,0
tha_t07.gat,0,0,0,0 monster Thanatos Odium 1704,2,0,0,0
-//Thanatos Tower Floor 8
+//==================================================
+// tha_t08 - Thanatos Tower F8
+//==================================================
tha_t08.gat,0,0,0,0 monster Rideword 1195,20,0,0,0
tha_t08.gat,0,0,0,0 monster Deathword 1698,20,0,0,0
tha_t08.gat,0,0,0,0 monster Mimic 1191,20,0,0,0
@@ -96,7 +112,9 @@ tha_t08.gat,0,0,0,0 monster Elder 1377,10,0,0,0
tha_t08.gat,0,0,0,0 monster Shelter 1701,10,0,0,0
tha_t08.gat,0,0,0,0 monster Thanatos Odium 1704,5,1800000,0,0
-//Thanatos Tower Floor 9
+//==================================================
+// tha_t09 - Thanatos Tower F9
+//==================================================
tha_t09.gat,0,0,0,0 monster Observation 1700,10,0,0,0
tha_t09.gat,0,0,0,0 monster Retribution 1702,20,0,0,0
tha_t09.gat,0,0,0,0 monster Plasma 1694,10,0,0,0
@@ -104,7 +122,9 @@ tha_t09.gat,0,0,0,0 monster Elder 1377,20,0,0,0
tha_t09.gat,0,0,0,0 monster Shelter 1701,10,0,0,0
tha_t09.gat,0,0,0,0 monster Thanatos Dolor 1707,5,0,0,0
-//Thanatos Tower Floor 10
+//==================================================
+// tha_t10 - Thanatos Tower F10
+//==================================================
tha_t10.gat,0,0,0,0 monster Observation 1700,10,0,0,0
tha_t10.gat,0,0,0,0 monster Retribution 1702,10,0,0,0
tha_t10.gat,0,0,0,0 monster Plasma 1697,5,0,0,0
@@ -112,7 +132,9 @@ tha_t10.gat,0,0,0,0 monster Elder 1377,20,0,0,0
tha_t10.gat,0,0,0,0 monster Shelter 1701,10,0,0,0
tha_t10.gat,0,0,0,0 monster Thanatos Dolor 1707,5,0,0,0
-//Thanatos Tower Floor 11
+//==================================================
+// tha_t11 - Thanatos Tower F11
+//==================================================
tha_t11.gat,0,0,0,0 monster Observation 1700,20,0,0,0
tha_t11.gat,0,0,0,0 monster Retribution 1702,20,0,0,0
tha_t11.gat,0,0,0,0 monster Plasma 1695,10,0,0,0
@@ -121,7 +143,9 @@ tha_t11.gat,0,0,0,0 monster Shelter 1701,20,0,0,0
tha_t11.gat,0,0,0,0 monster Thanatos Odium 1704,2,0,0,0
tha_t11.gat,0,0,0,0 monster Thanatos Despero 1705,5,1800000,0,0
-//Thanatos Tower Floor 12
+//==================================================
+// tha_t12 - Thanatos Tower F12
+//==================================================
tha_t12.gat,0,0,0,0 monster Observation 1700,10,0,0,0
tha_t12.gat,0,0,0,0 monster Retribution 1702,30,0,0,0
tha_t12.gat,0,0,0,0 monster Shelter 1701,10,0,0,0
@@ -132,6 +156,9 @@ tha_t12.gat,0,0,0,0 monster Thanatos Despero 1705,2,0,0,0
tha_t12.gat,0,0,0,0 monster Thanatos Maero 1706,2,0,0,0
tha_t12.gat,0,0,0,0 monster Thanatos Dolor 1707,5,0,0,0
-//The top of The Thanatos Tower
+//==================================================
+// thana_boss - Top of Thanatos Tower
+//==================================================
+// Note - Thanatos spawn should be removed later.
+// He should be summoned by finishing the Thanatos Tower Quest (At least from the info I have ^^; )
thana_boss.gat,135,119,0,0 monster Thanatos 1708,1,3600000,7200000,0
-// Note - Thanatos spawn should be removed later. He should be summoned by finishing the Thanatos Tower Quest (At least from the info I have ^^; )
diff --git a/npc/omobs/dungeons/toyfactory.txt b/npc/omobs/dungeons/toyfactory.txt
index a7e2741a0..5073b6876 100644
--- a/npc/omobs/dungeons/toyfactory.txt
+++ b/npc/omobs/dungeons/toyfactory.txt
@@ -7,27 +7,29 @@
//===== Compatible With: =====================================
//= Any Athena Version
//===== Additional Comments: =================================
-//= 1.1 added Hatii Baby according to May 10 patch
+//= 1.1 added Garm Baby according to May 10 patch
//============================================================
-// Christmas Dungeon 1F
-
+//==================================================
+// xmas_dun01 - Toy Factory Warehouse
+//==================================================
+xmas_dun01.gat,0,0,0,0 monster Christmas Cookie 1246,40,0,0,0
+xmas_dun01.gat,0,0,0,0 monster Cookie 1265,40,0,0,0
+xmas_dun01.gat,0,0,0,0 monster Poporing 1031,20,0,0,0
xmas_dun01.gat,0,0,0,0 monster Marin 1242,20,0,0,0
xmas_dun01.gat,0,0,0,0 monster Poring 1002,10,0,0,0
xmas_dun01.gat,0,0,0,0 monster Drops 1113,10,0,0,0
-xmas_dun01.gat,0,0,0,0 monster Poporing 1031,20,0,0,0
-xmas_dun01.gat,0,0,0,0 monster Cookie 1265,40,0,0,0
-xmas_dun01.gat,0,0,0,0 monster Christmas Cookie 1246,40,0,0,0
xmas_dun01.gat,0,0,0,0 monster Myst Case 1249,5,0,0,0
-xmas_dun01.gat,0,0,0,0 monster Chepet 1250,1,1200000,900000,0
-xmas_dun01.gat,0,0,0,0 monster Mastering 1090,1,1800000,900000,0
-xmas_dun01.gat,0,0,0,0 monster Angeling 1096,1,3600000,1800000,0
-
-// Christmas Dungeon 2F
+xmas_dun01.gat,0,0,0,0 monster Chepet 1250,1,1200000,900000,1
+xmas_dun01.gat,0,0,0,0 monster Mastering 1090,1,1800000,900000,1
+xmas_dun01.gat,0,0,0,0 monster Angeling 1096,1,3600000,1800000,1
+//==================================================
+// xmas_dun02 - Toy Monitoring Room
+//==================================================
+xmas_dun02.gat,0,0,0,0 monster Myst Case 1249,50,0,0,0
+xmas_dun02.gat,0,0,0,0 monster Cruiser 1248,35,0,0,0
xmas_dun02.gat,0,0,0,0 monster Christmas Cookie 1246,20,0,0,0
xmas_dun02.gat,0,0,0,0 monster Cookie 1265,20,0,0,0
-xmas_dun02.gat,0,0,0,0 monster Cruiser 1248,35,0,0,0
-xmas_dun02.gat,0,0,0,0 monster Myst Case 1249,50,0,0,0
-xmas_dun02.gat,0,0,0,0 monster Hatii Baby 1515,1,1800000,0,0
-xmas_dun02.gat,0,0,0,0 monster Stormy Knight 1251,1,3600000,7200000,0
+xmas_dun02.gat,0,0,0,0 monster Garm Baby 1515,1,1800000,900000,1
+xmas_dun02.gat,0,0,0,0 monster Stormy Knight 1251,1,3600000,1800000,1
diff --git a/npc/omobs/dungeons/turtleisland.txt b/npc/omobs/dungeons/turtleisland.txt
index bf7041e86..f63cfe403 100644
--- a/npc/omobs/dungeons/turtleisland.txt
+++ b/npc/omobs/dungeons/turtleisland.txt
@@ -10,58 +10,70 @@
//=
//============================================================
-//tur_dun01
-
+//==================================================
+// tur_dun01 - Turtle Island
+//==================================================
tur_dun01.gat,0,0,0,0 monster Dragon Tail 1321,25,0,0,0
tur_dun01.gat,0,0,0,0 monster Spring Rabbit 1322,25,0,0,0
-tur_dun01.gat,0,0,0,0 monster Thara Frog 1034,10,0,0,0
-tur_dun01.gat,0,0,0,0 monster Perimeter 1314,10,0,0,0
tur_dun01.gat,0,0,0,0 monster Pest 1256,15,0,0,0
+tur_dun01.gat,0,0,0,0 monster Permeter 1314,10,0,0,0
+tur_dun01.gat,0,0,0,0 monster Thara Frog 1034,10,0,0,0
-//tur_dun02
-
-tur_dun02.gat,0,0,0,0 monster Perimeter 1314,40,0,0,0
+//==================================================
+// tur_dun02 - Turtle Island Dungeon
+//==================================================
+tur_dun02.gat,0,0,0,0 monster Permeter 1314,40,0,0,0
tur_dun02.gat,0,0,0,0 monster Solider 1316,40,0,0,0
tur_dun02.gat,0,0,0,0 monster Freezer 1319,20,0,0,0
tur_dun02.gat,0,0,0,0 monster Pest 1256,15,0,0,0
-//tur_dun03
-
-tur_dun03.gat,0,0,0,0 monster Perimeter 1314,15,0,0,0
+//==================================================
+// tur_dun03 - Good Turtles Village
+//==================================================
tur_dun03.gat,0,0,0,0 monster Freezer 1319,40,0,0,0
tur_dun03.gat,0,0,0,0 monster Assaulter 1315,35,0,0,0
-tur_dun03.gat,0,0,0,0 monster Heater 1318,10,50000,0,0
-
-//tur_dun04
+tur_dun03.gat,0,0,0,0 monster Permeter 1314,15,0,0,0
+tur_dun03.gat,0,0,0,0 monster Heater 1318,10,0,0,0
-tur_dun04.gat,99,92,10,10 monster Wanderer 1208,1,60000,30000,0
-tur_dun04.gat,99,93,20,20 monster Turtle General 1312,1,3600000,7200000,0
-tur_dun04.gat,100,93,20,20 monster Heater 1318,3,120000,60000,0
+//==================================================
+// tur_dun04 - Turtle Palace
+//==================================================
+tur_dun04.gat,0,0,0,0 monster Assaulter 1315,23,0,0,0
tur_dun04.gat,100,93,20,20 monster Assaulter 1315,10,120000,60000,0
-tur_dun04.gat,100,93,20,20 monster Freezer 1319,5,120000,60000,0
-tur_dun04.gat,171,159,3,3 monster Wanderer 1208,1,300000,150000,0
tur_dun04.gat,171,155,3,3 monster Assaulter 1315,1,310000,160000,0
tur_dun04.gat,171,149,3,3 monster Assaulter 1315,1,320000,170000,0
-tur_dun04.gat,28,159,3,3 monster Wanderer 1208,1,300000,150000,0
tur_dun04.gat,28,155,3,3 monster Assaulter 1315,1,310000,160000,0
-tur_dun04.gat,28,149,3,3 monster Assaulter 1315,1,320000,170000,0
-tur_dun04.gat,174,26,3,3 monster Wanderer 1208,1,300000,150000,0
tur_dun04.gat,174,29,3,3 monster Assaulter 1315,1,310000,160000,0
tur_dun04.gat,174,32,3,3 monster Assaulter 1315,1,320000,170000,0
-tur_dun04.gat,26,26,3,3 monster Wanderer 1208,1,300000,150000,0
+tur_dun04.gat,28,149,3,3 monster Assaulter 1315,1,320000,170000,0
tur_dun04.gat,26,29,3,3 monster Assaulter 1315,1,310000,160000,0
tur_dun04.gat,26,32,3,3 monster Assaulter 1315,1,320000,170000,0
-tur_dun04.gat,0,0,0,0 monster Wanderer 1208,2,0,0,0
+tur_dun04.gat,100,93,20,20 monster Heater 1318,3,120000,60000,0
tur_dun04.gat,0,0,0,0 monster Heater 1318,10,300000,150000,0
tur_dun04.gat,0,0,0,0 monster Heater 1318,20,620000,310000,0
-tur_dun04.gat,0,0,0,0 monster Assaulter 1315,23,0,0,0
+tur_dun04.gat,100,93,20,20 monster Freezer 1319,5,120000,60000,0
tur_dun04.gat,0,0,0,0 monster Freezer 1319,5,300000,150000,0
tur_dun04.gat,0,0,0,0 monster Freezer 1319,5,600000,300000,0
-tur_dun04.gat,0,0,0,0 monster Perimeter 1314,2,300000,150000,0
-tur_dun04.gat,0,0,0,0 monster Perimeter 1314,2,640000,320000,0
+tur_dun04.gat,0,0,0,0 monster Wanderer 1208,2,0,0,0
+tur_dun04.gat,99,92,10,10 monster Wanderer 1208,1,60000,30000,0
+tur_dun04.gat,171,159,3,3 monster Wanderer 1208,1,300000,150000,0
+tur_dun04.gat,28,159,3,3 monster Wanderer 1208,1,300000,150000,0
+tur_dun04.gat,174,26,3,3 monster Wanderer 1208,1,300000,150000,0
+tur_dun04.gat,26,26,3,3 monster Wanderer 1208,1,300000,150000,0
+tur_dun04.gat,0,0,0,0 monster Permeter 1314,2,300000,150000,0
+tur_dun04.gat,0,0,0,0 monster Permeter 1314,2,640000,320000,0
+tur_dun04.gat,99,93,20,20 monster Turtle General 1312,1,3600000,1800000,1
-//tur_dun05
+//==================================================
+// tur_dun05 - Underground swamp zone
+//==================================================
+///tur_dun05.gat,0,0,0,0 monster Permeter 1314,3,20000,0,0
+///tur_dun05.gat,0,0,0,0 monster Freezer 1319,5,30000,0,0
+///tur_dun05.gat,0,0,0,0 monster Assaulter 1315,1,20000,0,0
-tur_dun05.gat,0,0,0,0 monster Perimeter 1314,3,20000,0,0
-tur_dun05.gat,0,0,0,0 monster Freezer 1319,5,30000,0,0
-tur_dun05.gat,0,0,0,0 monster Assaulter 1315,1,20000,0,0
+//==================================================
+// tur_dun06 - Underground swamp zone
+//==================================================
+///tur_dun06.gat,0,0,0,0 monster Permeter 1314,3,20000,0,0
+///tur_dun06.gat,0,0,0,0 monster Freezer 1319,5,30000,0,0
+///tur_dun06.gat,0,0,0,0 monster Assaulter 1315,1,20000,0,0
diff --git a/npc/omobs/dungeons/umbaladun.txt b/npc/omobs/dungeons/umbaladun.txt
index 7fcc87e07..68644df4e 100644
--- a/npc/omobs/dungeons/umbaladun.txt
+++ b/npc/omobs/dungeons/umbaladun.txt
@@ -10,42 +10,38 @@
//=
//============================================================
-//um_dun01
-
-um_dun01.gat,0,0,0,0 monster Stainer 1174,10,0,0,0
-um_dun01.gat,0,0,0,0 monster Dustiness 1114,10,0,0,0
+//==================================================
+// um_dun01 - Carpenter's Shop in the Tree
+//==================================================
um_dun01.gat,0,0,0,0 monster Stone Shooter 1495,70,0,0,0
-um_dun01.gat,0,0,0,0 monster Wootan Fighter 1499,10,0,0,0
-um_dun01.gat,0,0,0,0 monster Wootan Shooter 1498,10,0,0,0
um_dun01.gat,0,0,0,0 monster Beetle King 1494,10,0,0,0
-um_dun01.gat,0,0,0,0 monster Yellow Plant 1081,5,180000,90000,1
+um_dun01.gat,0,0,0,0 monster Wootan Shooter 1498,10,0,0,0
+um_dun01.gat,0,0,0,0 monster Wootan Fighter 1499,10,0,0,0
+um_dun01.gat,0,0,0,0 monster Stainer 1174,10,0,0,0
+um_dun01.gat,0,0,0,0 monster Dustiness 1114,10,0,0,0
um_dun01.gat,0,0,0,0 monster Green Plant 1080,5,180000,90000,1
+um_dun01.gat,0,0,0,0 monster Yellow Plant 1081,5,180000,90000,1
-
-//um_dun02
-
+//==================================================
+// um_dun02 - Passage to a Foreign World
+//==================================================
um_dun02.gat,0,0,0,0 monster Wooden Golem 1497,15,0,0,0
+um_dun02.gat,0,0,0,0 monster Wooden Golem 1497,10,0,0,0
um_dun02.gat,79,227,5,5 monster Wooden Golem 1497,5,120000,60000,0
-um_dun02.gat,87,189,5,5 monster Wooden Golem 1497,2,120000,60000,0
-um_dun02.gat,170,145,5,5 monster Wooden Golem 1497,3,120000,60000,0
um_dun02.gat,196,131,7,7 monster Wooden Golem 1497,5,120000,60000,0
um_dun02.gat,244,129,10,10 monster Wooden Golem 1497,5,120000,60000,0
-um_dun02.gat,0,0,0,0 monster Beetle King 1494,30,0,0,0
-um_dun02.gat,117,43,10,10 monster Beetle King 1494,3,120000,60000,0
-um_dun02.gat,209,34,10,10 monster Beetle King 1494,3,120000,60000,0
-um_dun02.gat,205,265,10,10 monster Beetle King 1494,4,120000,60000,0
-um_dun02.gat,0,0,0,0 monster Wooden Golem 1497,10,0,0,0
+um_dun02.gat,170,145,5,5 monster Wooden Golem 1497,3,120000,60000,0
um_dun02.gat,90,97,10,10 monster Wooden Golem 1497,3,120000,60000,0
-um_dun02.gat,32,83,10,10 monster Wooden Golem 1497,2,120000,60000,0
um_dun02.gat,180,238,10,10 monster Wooden Golem 1497,3,120000,60000,0
+um_dun02.gat,232,156,10,10 monster Wooden Golem 1497,3,120000,60000,0
+um_dun02.gat,87,189,5,5 monster Wooden Golem 1497,2,120000,60000,0
+um_dun02.gat,32,83,10,10 monster Wooden Golem 1497,2,120000,60000,0
um_dun02.gat,144,277,10,10 monster Wooden Golem 1497,2,120000,60000,0
um_dun02.gat,272,163,10,10 monster Wooden Golem 1497,2,120000,60000,0
-um_dun02.gat,232,156,10,10 monster Wooden Golem 1497,3,120000,60000,0
-um_dun02.gat,0,0,0,0 monster Driller 1380,5,0,0,0
-um_dun02.gat,197,138,10,10 monster Driller 1380,2,120000,60000,0
-um_dun02.gat,164,203,10,10 monster Driller 1380,1,120000,60000,0
-um_dun02.gat,32,83,10,10 monster Driller 1380,1,120000,60000,0
-um_dun02.gat,244,129,10,10 monster Driller 1380,2,120000,60000,0
+um_dun02.gat,0,0,0,0 monster Beetle King 1494,30,0,0,0
+um_dun02.gat,117,43,10,10 monster Beetle King 1494,3,120000,60000,0
+um_dun02.gat,209,34,10,10 monster Beetle King 1494,3,120000,60000,0
+um_dun02.gat,205,265,10,10 monster Beetle King 1494,4,120000,60000,0
um_dun02.gat,0,0,0,0 monster Wootan Shooter 1498,10,0,0,0
um_dun02.gat,213,217,10,10 monster Wootan Shooter 1498,2,120000,60000,0
um_dun02.gat,72,258,10,10 monster Wootan Shooter 1498,3,120000,60000,0
@@ -54,7 +50,12 @@ um_dun02.gat,170,145,5,5 monster Wootan Shooter 1498,1,120000,60000,0
um_dun02.gat,209,34,10,10 monster Wootan Shooter 1498,1,120000,60000,0
um_dun02.gat,272,163,10,10 monster Wootan Shooter 1498,1,120000,60000,0
um_dun02.gat,232,156,10,10 monster Wootan Shooter 1498,1,120000,60000,0
+um_dun02.gat,0,0,0,0 monster Driller 1380,5,0,0,0
+um_dun02.gat,197,138,10,10 monster Driller 1380,2,120000,60000,0
+um_dun02.gat,164,203,10,10 monster Driller 1380,1,120000,60000,0
+um_dun02.gat,32,83,10,10 monster Driller 1380,1,120000,60000,0
+um_dun02.gat,244,129,10,10 monster Driller 1380,2,120000,60000,0
um_dun02.gat,0,0,0,0 monster Dryad 1493,10,0,0,0
-um_dun02.gat,0,0,0,0 monster Yellow Plant 1081,5,180000,90000,1
-um_dun02.gat,0,0,0,0 monster Red Plant 1078,5,180000,90000,1
um_dun02.gat,0,0,0,0 monster Shining Plant 1083,6,180000,90000,1
+um_dun02.gat,0,0,0,0 monster Red Plant 1078,5,180000,90000,1
+um_dun02.gat,0,0,0,0 monster Yellow Plant 1081,5,180000,90000,1
diff --git a/npc/omobs/dungeons/yggdrasil.txt b/npc/omobs/dungeons/yggdrasil.txt
index cd0f01cb3..6a83f30ed 100644
--- a/npc/omobs/dungeons/yggdrasil.txt
+++ b/npc/omobs/dungeons/yggdrasil.txt
@@ -10,7 +10,12 @@
//= 1.0 Splitted from Nifflheim fields [DracoRPG]
//============================================================
-//yggdrasil01
+//==================================================
+// yggdrasil01 - Hvergelmir's Fountain (Trunk of Yggdrasil)
+//==================================================
+yggdrasil01.gat,0,0,0,0 monster Shining Plant 1083,10,3600000,2300000,0
+yggdrasil01.gat,0,0,0,0 monster Green Plant 1080,25,60000,30000,0
+yggdrasil01.gat,0,0,0,0 monster Red Plant 1078,15,60000,30000,0
yggdrasil01.gat,234,256,10,10 monster Blue Plant 1079,5,1800000,600000,0
yggdrasil01.gat,273,234,3,3 monster Shining Plant 1083,1,1800000,600000,0
yggdrasil01.gat,143,257,20,10 monster Shining Plant 1083,5,1200000,600000,0
@@ -27,6 +32,3 @@ yggdrasil01.gat,94,111,5,2 monster Shining Plant 1083,1,1200000,600000,0
yggdrasil01.gat,51,118,10,3 monster Shining Plant 1083,1,1200000,600000,0
yggdrasil01.gat,133,54,3,3 monster Shining Plant 1083,1,1200000,600000,0
yggdrasil01.gat,257,63,10,10 monster Shining Plant 1083,3,1800000,1200000,0
-yggdrasil01.gat,0,0,0,0 monster Shining Plant 1083,10,3600000,2300000,0
-yggdrasil01.gat,0,0,0,0 monster Green Plant 1080,25,60000,30000,0
-yggdrasil01.gat,0,0,0,0 monster Red Plant 1078,15,60000,30000,0
diff --git a/npc/omobs/fields/amatsu.txt b/npc/omobs/fields/amatsu.txt
index ef907b9b1..5d2a9894a 100644
--- a/npc/omobs/fields/amatsu.txt
+++ b/npc/omobs/fields/amatsu.txt
@@ -7,17 +7,25 @@
//===== Compatible With: =====================================
//= Any Athena Version
//===== Additional Comments: =================================
-//= 1.1 replaced Hydra -> G_Hydra (2fix frops e[ploit) [Lupus]
+//= 1.1 replaced Hydra -> G_Hydra (to fix drops exploit) [Lupus]
//============================================================
-// ama_fild01
-
-ama_fild01.gat,0,0,0,0 monster Karakasa 1400,50,0,0,0
+//==================================================
+// ama_fild01 - Amatsu Field
+//==================================================
+ama_fild01.gat,0,0,0,0 monster Kapha 1406,20,60000,30000,0
+ama_fild01.gat,174,306,20,20 monster Kapha 1406,10,300000,150000,0
ama_fild01.gat,174,207,20,20 monster Kapha 1406,5,1200000,600000,0
ama_fild01.gat,241,310,10,10 monster Kapha 1406,5,600000,300000,0
ama_fild01.gat,114,230,10,10 monster Kapha 1406,5,600000,300000,0
ama_fild01.gat,174,253,10,10 monster Kapha 1406,5,600000,300000,0
-ama_fild01.gat,177,315,0,0 monster Hydra 1579,1,60000,30000,0
+ama_fild01.gat,0,0,0,0 monster Karakasa 1400,50,0,0,0
+ama_fild01.gat,0,0,0,0 monster Poporing 1031,15,0,0,0
+ama_fild01.gat,0,0,0,0 monster Bigfoot 1060,15,0,0,0
+ama_fild01.gat,0,0,0,0 monster Miyabi Doll 1404,2,0,0,0
+ama_fild01.gat,0,0,0,0 monster Poison Toad 1402,1,0,0,0
+ama_fild01.gat,0,0,0,0 monster Hydra 1579,5,0,0,0
+ama_fild01.gat,177,315,0,0 monster Hydra 1068,1,60000,30000,0
ama_fild01.gat,175,315,0,0 monster Hydra 1579,1,63000,31500,0
ama_fild01.gat,173,315,0,0 monster Hydra 1579,1,66000,33000,0
ama_fild01.gat,171,315,0,0 monster Hydra 1579,1,69000,34500,0
@@ -31,9 +39,3 @@ ama_fild01.gat,171,313,0,0 monster Hydra 1579,1,66000,33000,0
ama_fild01.gat,173,313,0,0 monster Hydra 1579,1,60000,30000,0
ama_fild01.gat,175,313,0,0 monster Hydra 1579,1,66000,33000,0
ama_fild01.gat,173,310,0,0 monster Hydra 1579,1,60000,30000,0
-ama_fild01.gat,0,0,0,0 monster Kapha 1406,20,60000,30000,0
-ama_fild01.gat,174,306,20,20 monster Kapha 1406,10,300000,150000,0
-ama_fild01.gat,0,0,0,0 monster Miyabi Doll 1404,2,180000,90000,0
-ama_fild01.gat,0,0,0,0 monster Poison Toad 1402,1,180000,90000,0
-ama_fild01.gat,0,0,0,0 monster Poporing 1031,15,0,0,0
-ama_fild01.gat,0,0,0,0 monster Bigfoot 1060,15,60000,30000,0
diff --git a/npc/omobs/fields/ayothaya.txt b/npc/omobs/fields/ayothaya.txt
index 99ce118e5..e466d8ece 100644
--- a/npc/omobs/fields/ayothaya.txt
+++ b/npc/omobs/fields/ayothaya.txt
@@ -11,15 +11,19 @@
//= 1.3 Removed Choco
//============================================================
-//=== Ayothana Field #1 ===
-ayo_fild01.gat,0,0,0,0 monster Green Plant 1080,10,0,0,0
+//==================================================
+// ayo_fild01 - Ayothaya Field
+//==================================================
+ayo_fild01.gat,0,0,0,0 monster Yoyo 1057,30,0,0,0
ayo_fild01.gat,0,0,0,0 monster Coco 1104,30,0,0,0
ayo_fild01.gat,0,0,0,0 monster Smokie 1056,30,0,0,0
-ayo_fild01.gat,0,0,0,0 monster Yoyo 1057,30,0,0,0
-ayo_fild01.gat,0,0,0,0 monster Leaf Cat 1586,5,0,0,0
+ayo_fild01.gat,0,0,0,0 monster Green Plant 1080,10,0,0,0
+ayo_fild01.gat,0,0,0,0 monster Leaf Cat 1586,3,600000,300000,0
-//=== Ayothana Field #2 ===
-ayo_fild02.gat,0,0,0,0 monster Yellow Plant 1081,10,0,0,0
-ayo_fild02.gat,0,0,0,0 monster Beetle 1494,10,0,0,0
-ayo_fild02.gat,0,0,0,0 monster Wootan Fighter 1499,20,0,0,0
+//==================================================
+// ayo_fild02 - Ayothaya Field
+//==================================================
ayo_fild02.gat,0,0,0,0 monster Leaf Cat 1586,50,0,0,0
+ayo_fild02.gat,0,0,0,0 monster Beetle King 1494,30,0,0,0
+ayo_fild02.gat,0,0,0,0 monster Wootan Fighter 1499,20,0,0,0
+ayo_fild02.gat,0,0,0,0 monster Yellow Plant 1081,10,0,0,0
diff --git a/npc/omobs/fields/comodo.txt b/npc/omobs/fields/comodo.txt
index fcbb8de34..e80319733 100644
--- a/npc/omobs/fields/comodo.txt
+++ b/npc/omobs/fields/comodo.txt
@@ -10,64 +10,76 @@
//=
//============================================================
-// cmd_fild01 (lv3)
-
+//==================================================
+// cmd_fild01 - Papuchicha Forest
+//==================================================
cmd_fild01.gat,0,0,0,0 monster Alligator 1271,60,0,0,0
-cmd_fild01.gat,0,0,0,0 monster Savage 1166,30,0,0,0
cmd_fild01.gat,0,0,0,0 monster Poporing 1031,30,0,0,0
+cmd_fild01.gat,0,0,0,0 monster Savage 1166,30,0,0,0
cmd_fild01.gat,0,0,0,0 monster Poison Spore 1077,20,0,0,0
+cmd_fild01.gat,0,0,0,0 monster Blue Plant 1079,6,1800000,900000,1
+cmd_fild01.gat,0,0,0,0 monster Green Plant 1080,5,1800000,900000,1
+cmd_fild01.gat,0,0,0,0 monster Shining Plant 1083,1,1800000,900000,1
-// cmd_fild02 (lv3)
-
-cmd_fild02.gat,73,100,40,100 monster Aster 1266,5,0,0,0
-cmd_fild02.gat,200,130,150,50 monster Aster 1266,5,0,0,0
-cmd_fild02.gat,0,0,0,0 monster Crab 1073,20,0,0,0
-cmd_fild02.gat,0,0,0,0 monster Alligator 1271,10,0,0,0
-cmd_fild02.gat,0,0,0,0 monster Raggler 1254,30,0,0,0
-cmd_fild02.gat,94,85,40,80 monster Raggler 1254,2,60000,0,0
-cmd_fild02.gat,95,89,40,80 monster Cornutus 1067,5,180000,0,0
-cmd_fild02.gat,279,78,100,20 monster Cornutus 1067,10,60000,0,0
+//==================================================
+// cmd_fild02 - Kokomo Beach
+//==================================================
cmd_fild02.gat,0,0,0,0 monster Shellfish 1074,35,0,0,0
cmd_fild02.gat,93,82,40,80 monster Shellfish 1074,5,180000,0,0
-cmd_fild02.gat,0,0,0,0 monster Mobster 1313,1,0,0,0
-cmd_fild02.gat,200,130,150,40 monster Seal 1317,18,0,0,0
+cmd_fild02.gat,0,0,0,0 monster Raggler 1254,30,0,0,0
+cmd_fild02.gat,94,85,40,80 monster Raggler 1254,2,60000,0,0
+cmd_fild02.gat,200,130,150,40 monster Seal 1317,25,0,0,0
cmd_fild02.gat,93,82,40,80 monster Seal 1317,2,180000,0,0
+cmd_fild02.gat,0,0,0,0 monster Crab 1073,20,0,0,0
cmd_fild02.gat,0,0,0,0 monster Galapago 1391,20,0,0,0
+cmd_fild02.gat,279,78,100,20 monster Cornutus 1067,10,60000,0,0
+cmd_fild02.gat,95,89,40,80 monster Cornutus 1067,5,180000,0,0
+cmd_fild02.gat,73,100,40,100 monster Aster 1266,5,0,0,0
+cmd_fild02.gat,200,130,150,50 monster Aster 1266,5,0,0,0
+cmd_fild02.gat,0,0,0,0 monster Alligator 1271,10,0,0,0
+cmd_fild02.gat,0,0,0,0 monster Mobster 1313,1,0,0,0
-// cmd_fild03 (lv4)
-
-cmd_fild03.gat,0,0,0,0 monster Mutant Dragonoid 1262,1,3600000,1800000,1
-cmd_fild03.gat,0,0,0,0 monster Pest 1256,30,0,0,0
+//==================================================
+// cmd_fild03 - Zenhai Marsh
+//==================================================
+cmd_fild03.gat,0,0,0,0 monster Anolian 1206,70,0,0,0
+cmd_fild03.gat,0,0,0,0 monster Pest 1256,20,0,0,0
+cmd_fild03.gat,0,0,0,0 monster Rotar Zairo 1392,20,0,0,0
cmd_fild03.gat,0,0,0,0 monster Poporing 1031,10,0,0,0
-cmd_fild03.gat,0,0,0,0 monster Anolian 1206,60,0,0,0
-cmd_fild03.gat,0,0,0,0 monster Toad 1089,1,3600000,1800000,1
-cmd_fild03.gat,0,0,0,0 monster Rotar Zairo 1392,30,0,0,0
+cmd_fild03.gat,0,0,0,0 monster Shining Plant 1083,3,1800000,900000,1
+cmd_fild03.gat,0,0,0,0 monster Toad 1089,1,1800000,900000,1
+cmd_fild03.gat,0,0,0,0 monster Mutant Dragonoid 1262,1,3600000,1800000,1
-// cmd_fild04 (lv3)
+//==================================================
+// cmd_fild04 - Kokomo Beach
+//==================================================
cmd_fild04.gat,221,120,120,40 monster Aster 1266,45,0,0,0
cmd_fild04.gat,0,0,0,0 monster Alligator 1271,40,0,0,0
+cmd_fild04.gat,0,0,0,0 monster Shellfish 1074,20,0,0,0
cmd_fild04.gat,0,0,0,0 monster Crab 1073,20,0,0,0
cmd_fild04.gat,0,0,0,0 monster Raggler 1254,20,0,0,0
-cmd_fild04.gat,0,0,0,0 monster Shellfish 1074,20,0,0,0
cmd_fild04.gat,221,120,120,40 monster Sea Otter 1323,20,0,0,0
-// cmd_fild05 (lv3)
-
-cmd_fild05.gat,0,0,0,0 monster Frilldora 1119,15,0,0,0
-cmd_fild05.gat,0,0,0,0 monster Anolian 1206,20,0,0,0
+//==================================================
+// cmd_fild05 - Border of Papuchica Forest
+//==================================================
cmd_fild05.gat,0,0,0,0 monster Stem Worm 1215,30,0,0,0
-cmd_fild05.gat,0,0,0,0 monster Poporing 1031,10,0,0,0
+cmd_fild05.gat,0,0,0,0 monster Anolian 1206,20,0,0,0
cmd_fild05.gat,0,0,0,0 monster Pest 1256,20,0,0,0
+cmd_fild05.gat,0,0,0,0 monster Frilldora 1119,15,0,0,0
+cmd_fild05.gat,0,0,0,0 monster Poporing 1031,10,0,0,0
+cmd_fild05.gat,0,0,0,0 monster Yellow Plant 1081,6,1800000,900000,1
+cmd_fild05.gat,0,0,0,0 monster Green Plant 1080,5,1800000,900000,1
+cmd_fild05.gat,0,0,0,0 monster Shining Plant 1083,1,1800000,900000,1
-// cmd_fild06 (lv3)
-
-cmd_fild06.gat,357,299,80,70 monster Kobold Archer 1282,5,0,0,0
-cmd_fild06.gat,318,146,120,80 monster Kobold Archer 1282,7,0,0,0
-cmd_fild06.gat,244,113,0,0 monster Kobold Archer 1282,1,180000,0,0
-cmd_fild06.gat,290,164,0,0 monster Kobold Archer 1282,1,190000,0,0
-cmd_fild06.gat,284,197,0,0 monster Kobold Archer 1282,1,180000,0,0
-cmd_fild06.gat,286,289,0,0 monster Kobold Archer 1282,1,180000,0,0
-cmd_fild06.gat,314,267,0,0 monster Kobold Archer 1282,1,180000,0,0
+//==================================================
+// cmd_fild06 - Fortress Saint Darmain (West)
+//==================================================
+cmd_fild06.gat,305,95,70,180 monster Stem Worm 1215,30,0,0,0
+cmd_fild06.gat,102,268,10,40 monster Stem Worm 1215,3,0,0,0
+cmd_fild06.gat,359,156,30,50 monster Stem Worm 1215,1,0,0,0
+cmd_fild06.gat,360,155,30,50 monster Stem Worm 1215,1,0,0,0
+cmd_fild06.gat,357,298,80,70 monster Stem Worm 1215,20,0,0,0
cmd_fild06.gat,355,294,80,70 monster Goblin Archer 1258,7,0,0,0
cmd_fild06.gat,307,97,70,200 monster Goblin Archer 1258,7,0,0,0
cmd_fild06.gat,100,265,10,40 monster Goblin Archer 1258,3,130000,0,0
@@ -81,15 +93,23 @@ cmd_fild06.gat,284,186,0,0 monster Goblin Archer 1258,1,180000,0,0
cmd_fild06.gat,354,342,0,0 monster Goblin Archer 1258,1,180000,0,0
cmd_fild06.gat,365,342,0,0 monster Goblin Archer 1258,1,180000,0,0
cmd_fild06.gat,340,334,0,0 monster Goblin Archer 1258,1,180000,0,0
-cmd_fild06.gat,305,95,70,180 monster Stem Worm 1215,30,0,0,0
-cmd_fild06.gat,102,268,10,40 monster Stem Worm 1215,3,0,0,0
-cmd_fild06.gat,359,156,30,50 monster Stem Worm 1215,1,0,0,0
-cmd_fild06.gat,360,155,30,50 monster Stem Worm 1215,1,0,0,0
-cmd_fild06.gat,357,298,80,70 monster Stem Worm 1215,20,0,0,0
cmd_fild06.gat,0,0,0,0 monster Drops 1113,20,0,0,0
-cmd_fild06.gat,0,0,0,0 monster Harpy 1376,1,1500000,1000000,0
+cmd_fild06.gat,357,299,80,70 monster Kobold Archer 1282,5,0,0,0
+cmd_fild06.gat,318,146,120,80 monster Kobold Archer 1282,7,0,0,0
+cmd_fild06.gat,244,113,0,0 monster Kobold Archer 1282,1,180000,0,0
+cmd_fild06.gat,290,164,0,0 monster Kobold Archer 1282,1,190000,0,0
+cmd_fild06.gat,284,197,0,0 monster Kobold Archer 1282,1,180000,0,0
+cmd_fild06.gat,286,289,0,0 monster Kobold Archer 1282,1,180000,0,0
+cmd_fild06.gat,314,267,0,0 monster Kobold Archer 1282,1,180000,0,0
+cmd_fild06.gat,0,0,0,0 monster Yellow Plant 1081,5,1800000,900000,1
+cmd_fild06.gat,0,0,0,0 monster Harpy 1376,1,1800000,900000,1
-//cmd_fild07
+//==================================================
+// cmd_fild07 - Beacon Island, Pharos
+//==================================================
+cmd_fild07.gat,0,0,0,0 monster Drops 1113,20,0,0,0
+cmd_fild07.gat,239,105,40,90 monster Shellfish 1074,2,60000,0,0
+cmd_fild07.gat,104,180,40,90 monster Shellfish 1074,3,60000,0,0
cmd_fild07.gat,242,108,40,90 monster Aster 1266,2,60000,0,0
cmd_fild07.gat,102,177,60,90 monster Aster 1266,3,60000,0,0
cmd_fild07.gat,240,107,40,90 monster Crab 1073,3,60000,0,0
@@ -98,12 +118,23 @@ cmd_fild07.gat,101,176,60,90 monster Raggler 1254,1,180000,0,0
cmd_fild07.gat,241,106,40,90 monster Raggler 1254,1,180000,0,0
cmd_fild07.gat,204,317,60,60 monster Raggler 1254,1,60000,0,0
cmd_fild07.gat,323,310,60,60 monster Raggler 1254,1,60000,0,0
-cmd_fild07.gat,0,0,0,0 monster Drops 1113,20,0,0,0
-cmd_fild07.gat,239,105,40,90 monster Shellfish 1074,2,60000,0,0
-cmd_fild07.gat,104,180,40,90 monster Shellfish 1074,3,60000,0,0
-
-// cmd_fild08 (lv4)
+//==================================================
+// cmd_fild08 - Fortress Saint Darmain (East)
+//==================================================
+cmd_fild08.gat,190,115,100,80 monster Kobold Archer 1282,10,0,0,0
+cmd_fild08.gat,130,192,110,150 monster Kobold Archer 1282,7,0,0,0
+cmd_fild08.gat,72,131,40,100 monster Kobold Archer 1282,8,0,0,0
+cmd_fild08.gat,319,177,0,0 monster Kobold Archer 1282,1,180000,0,0
+cmd_fild08.gat,319,172,0,0 monster Kobold Archer 1282,1,180000,0,0
+cmd_fild08.gat,139,71,0,0 monster Kobold Archer 1282,1,180000,0,0
+cmd_fild08.gat,136,64,0,0 monster Kobold Archer 1282,1,180000,0,0
+cmd_fild08.gat,67,80,0,0 monster Kobold Archer 1282,1,180000,0,0
+cmd_fild08.gat,132,149,0,0 monster Kobold Archer 1282,1,180000,0,0
+cmd_fild08.gat,97,144,0,0 monster Kobold Archer 1282,1,180000,0,0
+cmd_fild08.gat,79,140,0,0 monster Kobold Archer 1282,1,180000,0,0
+cmd_fild08.gat,28,102,0,0 monster Kobold Archer 1282,1,180000,0,0
+cmd_fild08.gat,326,258,50,110 monster Kobold Archer 1282,10,0,0,0
cmd_fild08.gat,127,279,30,50 monster Kobold Archer 1282,5,60000,0,0
cmd_fild08.gat,130,192,110,150 monster Kobold Archer 1282,5,0,0,0
cmd_fild08.gat,146,136,30,80 monster Kobold Archer 1282,5,0,0,0
@@ -118,18 +149,6 @@ cmd_fild08.gat,175,367,0,0 monster Kobold Archer 1282,1,190000,0,0
cmd_fild08.gat,53,248,0,0 monster Kobold Archer 1282,1,190000,0,0
cmd_fild08.gat,52,238,0,0 monster Kobold Archer 1282,1,190000,0,0
cmd_fild08.gat,272,175,40,2 monster Kobold Archer 1282,2,60000,0,0
-cmd_fild08.gat,190,115,100,80 monster Gargoyle 1253,10,0,0,0
-cmd_fild08.gat,130,192,110,150 monster Gargoyle 1253,7,0,0,0
-cmd_fild08.gat,72,131,40,100 monster Gargoyle 1253,8,0,0,0
-cmd_fild08.gat,319,177,0,0 monster Gargoyle 1253,1,180000,0,0
-cmd_fild08.gat,319,172,0,0 monster Gargoyle 1253,1,180000,0,0
-cmd_fild08.gat,139,71,0,0 monster Gargoyle 1253,1,180000,0,0
-cmd_fild08.gat,136,64,0,0 monster Gargoyle 1253,1,180000,0,0
-cmd_fild08.gat,67,80,0,0 monster Gargoyle 1253,1,180000,0,0
-cmd_fild08.gat,132,149,0,0 monster Gargoyle 1253,1,180000,0,0
-cmd_fild08.gat,97,144,0,0 monster Gargoyle 1253,1,180000,0,0
-cmd_fild08.gat,79,140,0,0 monster Gargoyle 1253,1,180000,0,0
-cmd_fild08.gat,28,102,0,0 monster Gargoyle 1253,1,180000,0,0
cmd_fild08.gat,80,348,60,40 monster Goblin Archer 1258,5,0,0,0
cmd_fild08.gat,130,192,110,150 monster Goblin Archer 1258,5,0,0,0
cmd_fild08.gat,194,291,25,40 monster Goblin Archer 1258,5,0,0,0
@@ -151,19 +170,20 @@ cmd_fild08.gat,266,175,0,0 monster Stem Worm 1215,1,180000,0,0
cmd_fild08.gat,127,273,0,0 monster Stem Worm 1215,1,180000,0,0
cmd_fild08.gat,92,141,0,0 monster Stem Worm 1215,1,180000,0,0
cmd_fild08.gat,85,135,0,0 monster Stem Worm 1215,1,180000,0,0
-cmd_fild08.gat,0,0,0,0 monster Drops 1113,10,0,0,0
+cmd_fild08.gat,0,0,0,0 monster Side Winder 1037,3,0,0,0
+cmd_fild08.gat,326,258,50,110 monster Side Winder 1037,2,0,0,0
+cmd_fild08.gat,130,192,110,150 monster Side Winder 1037,15,0,0,0
cmd_fild08.gat,326,258,50,110 monster Sandman 1165,15,0,0,0
-cmd_fild08.gat,326,258,50,110 monster Kobold Archer 1282,10,0,0,0
-cmd_fild08.gat,326,258,50,110 monster Sidewinder 1037,2,0,0,0
-cmd_fild08.gat,0,0,0,0 monster Sidewinder 1037,3,0,0,0
-cmd_fild08.gat,130,192,110,150 monster Sidewinder 1037,15,0,0,0
+cmd_fild08.gat,0,0,0,0 monster Drops 1113,10,0,0,0
+cmd_fild08.gat,0,0,0,0 monster Yellow Plant 1081,8,1800000,900000,1
cmd_fild08.gat,0,0,0,0 monster Gryphon 1259,1,3600000,1800000,1
-//cmd_fild09 (lv2)
-
+//==================================================
+// cmd_fild09 - Fortress Saint Darmain (South)
+//==================================================
+cmd_fild09.gat,0,0,0,0 monster Condor 1009,40,0,0,0
+cmd_fild09.gat,0,0,0,0 monster Anacondaq 1030,20,0,0,0
cmd_fild09.gat,0,0,0,0 monster Steel ChonChon 1042,20,0,0,0
cmd_fild09.gat,0,0,0,0 monster Drops 1113,20,0,0,0
-cmd_fild09.gat,0,0,0,0 monster Anacondaq 1030,20,0,0,0
-cmd_fild09.gat,0,0,0,0 monster Condor 1009,60,0,0,0
cmd_fild09.gat,142,325,40,50 monster Hode 1127,3,150000,0,0
cmd_fild09.gat,140,323,40,50 monster Gargoyle 1253,2,150000,0,0
diff --git a/npc/omobs/fields/einbroch.txt b/npc/omobs/fields/einbroch.txt
index 90f312f5c..1c7db0d55 100644
--- a/npc/omobs/fields/einbroch.txt
+++ b/npc/omobs/fields/einbroch.txt
@@ -19,31 +19,27 @@
//= Thanks to Playtester and Emperium.org
//============================================================
-//========================================================================================
-// - Einbech Town
-//========================================================================================
-
+//==================================================
+// einbech - Einbech, The Mining Village
+//==================================================
einbech.gat,0,0,0,0 monster Tarou 1175,5,3600000,1800000,0
-//========================================================================================
-// - Einbroch Field 01
-//========================================================================================
-
+//==================================================
+// ein_fild01 - Einbroch Field
+//==================================================
ein_fild01.gat,0,0,0,0 monster Punk 1199,40,0,0,0
ein_fild01.gat,0,0,0,0 monster Demon Fungus 1378,40,0,0,0
-//========================================================================================
-// - Einbroch Field 02
-//========================================================================================
-
+//==================================================
+// ein_fild02 - Einbroch Field
+//==================================================
ein_fild02.gat,0,0,0,0 monster Driller 1380,40,0,0,0
ein_fild02.gat,0,0,0,0 monster Demon Fungus 1378,40,0,0,0
ein_fild02.gat,0,0,0,0 monster Ungoliant 1618,1,3600000,1800000,0
-//========================================================================================
-// - Einbroch Field 03
-//========================================================================================
-
+//==================================================
+// ein_fild03 - Einbroch Field
+//==================================================
ein_fild03.gat,0,0,0,0 monster Metaling 1613,30,0,0,0
ein_fild03.gat,0,0,0,0 monster Geographer 1368,5,0,0,0
ein_fild03.gat,0,0,0,0 monster Caramel 1103,20,0,0,0
@@ -52,10 +48,9 @@ ein_fild03.gat,0,0,0,0 monster Mole 1628,10,0,0,0
ein_fild03.gat,0,0,0,0 monster Yellow Plant 1081,5,180000,90000,1
ein_fild03.gat,0,0,0,0 monster Green Plant 1080,5,180000,90000,1
-//========================================================================================
-// - Einbroch Field 04
-//========================================================================================
-
+//==================================================
+// ein_fild04 - Einbroch Field
+//==================================================
ein_fild04.gat,0,0,0,0 monster Metaling 1613,15,0,0,0
ein_fild04.gat,0,0,0,0 monster Mineral 1614,30,0,0,0
ein_fild04.gat,0,0,0,0 monster Geographer 1368,10,0,0,0
@@ -65,10 +60,9 @@ ein_fild04.gat,0,0,0,0 monster Yellow Plant 1081,5,180000,90000,1
ein_fild04.gat,0,0,0,0 monster Red Plant 1078,5,180000,90000,1
ein_fild04.gat,0,0,0,0 monster Green Plant 1080,5,180000,90000,1
-//========================================================================================
-// - Einbroch Field 05
-//========================================================================================
-
+//==================================================
+// ein_fild05 - Einbroch Field
+//==================================================
ein_fild05.gat,0,0,0,0 monster Goat 1372,20,0,0,0
ein_fild05.gat,0,0,0,0 monster Martin 1145,30,0,0
ein_fild05.gat,0,0,0,0 monster Pupa 1008,10,0,0,0
@@ -77,72 +71,66 @@ ein_fild05.gat,0,0,0,0 monster Black Mushroom 1084,5,180000,90000,1
ein_fild05.gat,0,0,0,0 monster Yellow Plant 1081,5,180000,90000,1
ein_fild05.gat,0,0,0,0 monster Red Plant 1078,5,180000,90000,1
-//========================================================================================
-// - Einbroch Field 06
-//========================================================================================
-
+//==================================================
+// ein_fild06 - Einbroch Field
+//==================================================
ein_fild06.gat,0,0,0,0 monster Martin 1145,30,0,0
ein_fild06.gat,0,0,0,0 monster Goat 1372,20,0,0,0
ein_fild06.gat,0,0,0,0 monster Pupa 1008,10,0,0,0
-ein_fild06.gat,0,0,0,0 monster Giearth 1121,1,180000,90000,0
ein_fild06.gat,0,0,0,0 monster Black Mushroom 1084,10,180000,90000,1
-ein_fild06.gat,0,0,0,0 monster Yellow Plant 1081,10,180000,90000,1
ein_fild06.gat,0,0,0,0 monster Red Plant 1078,10,180000,90000,1
+ein_fild06.gat,0,0,0,0 monster Yellow Plant 1081,10,180000,90000,1
+ein_fild06.gat,0,0,0,0 monster Giearth 1121,1,180000,90000,0
-//========================================================================================
-// - Einbroch Field 07
-//========================================================================================
-
+//==================================================
+// ein_fild07 - Einbroch Field
+//==================================================
ein_fild07.gat,0,0,0,0 monster Metaling 1613,60,0,0
ein_fild07.gat,0,0,0,0 monster Poring 1002,40,0,0,0
ein_fild07.gat,0,0,0,0 monster Poporing 1031,20,0,0,0
ein_fild07.gat,0,0,0,0 monster Flora 1118,20,0,0,0
ein_fild07.gat,0,0,0,0 monster Geographer 1368,20,0,0,0
ein_fild07.gat,0,0,0,0 monster Red Mushroom 1085,10,180000,90000,1
-ein_fild07.gat,0,0,0,0 monster Yellow Plant 1081,10,180000,90000,1
ein_fild07.gat,0,0,0,0 monster Red Plant 1078,10,180000,90000,1
-ein_fild07.gat,0,0,0,0 monster Ungoliant 1618,1,3600000,1800000,0
-
-//========================================================================================
-// - Einbroch Field 08
-//========================================================================================
+ein_fild07.gat,0,0,0,0 monster Yellow Plant 1081,10,180000,90000,1
+ein_fild07.gat,0,0,0,0 monster Ungoliant 1618,1,3600000,1800000,1
+//==================================================
+// ein_fild08 - Einbroch Field
+//==================================================
ein_fild08.gat,0,0,0,0 monster Metaling 1613,70,0,0,0
-ein_fild08.gat,0,0,0,0 monster Thief Bug Larva 1051,30,0,0,0
+ein_fild08.gat,0,0,0,0 monster Thief Bug 1051,30,0,0,0
ein_fild08.gat,0,0,0,0 monster Porcellio 1619,30,0,0,0
ein_fild08.gat,0,0,0,0 monster Poporing 1031,20,0,0,0
ein_fild08.gat,0,0,0,0 monster Poring 1002,20,0,0,0
ein_fild08.gat,0,0,0,0 monster Drops 1113,20,0,0,0
ein_fild08.gat,0,0,0,0 monster Red Mushroom 1085,10,180000,90000,1
-ein_fild08.gat,221,80,250,100 monster Yellow Plant 1081,10,180000,90000,1
ein_fild08.gat,0,0,0,0 monster Red Plant 1078,10,180000,90000,1
+ein_fild08.gat,221,80,250,100 monster Yellow Plant 1081,10,180000,90000,1
-//========================================================================================
-// - Einbroch Field 09
-//========================================================================================
-
-ein_fild09.gat,0,0,0,0 monster Thief Bug Larva 1051,40,0,0,0
+//==================================================
+// ein_fild09 - Einbroch Field
+//==================================================
+ein_fild09.gat,0,0,0,0 monster Thief Bug 1051,40,0,0,0
ein_fild09.gat,0,0,0,0 monster Metaling 1613,25,0,0
ein_fild09.gat,224,280,200,200 monster Metaling 1613,5,0,0
ein_fild09.gat,0,0,0,0 monster Poring 1002,20,0,0,0
ein_fild09.gat,0,0,0,0 monster Porcellio 1619,10,0,0,0
ein_fild09.gat,0,0,0,0 monster Drops 1113,10,0,0,0
ein_fild09.gat,265,79,100,100 monster Thief Bug Egg 1048,3,0,0,0
-ein_fild09.gat,265,79,150,80 monster Flora 1118,5,300000,150000,1
ein_fild09.gat,265,79,150,80 monster Red Mushroom 1085,10,180000,90000,1
-ein_fild09.gat,0,0,0,0 monster Yellow Plant 1081,10,180000,90000,1
ein_fild09.gat,0,0,0,0 monster Red Plant 1078,10,180000,90000,1
+ein_fild09.gat,0,0,0,0 monster Yellow Plant 1081,10,180000,90000,1
+ein_fild09.gat,265,79,150,80 monster Flora 1118,5,300000,150000,1
-//========================================================================================
-// - Einbroch Field 10
-//========================================================================================
-
+//==================================================
+// ein_fild10 - Einbroch Field
+//==================================================
ein_fild10.gat,193,340,200,100 monster Porcellio 1619,30,0,0,0
ein_fild10.gat,0,0,0,0 monster Poporing 1031,20,0,0,0
ein_fild10.gat,257,107,90,90 monster Yoyo 1057,10,0,0,0
ein_fild10.gat,193,340,200,100 monster Geographer 1368,5,0,0,0
-ein_fild10.gat,257,107,90,90 monster Flora 1118,20,300000,150000,0
ein_fild10.gat,257,107,90,90 monster Red Mushroom 1085,10,180000,90000,1
ein_fild10.gat,0,0,0,0 monster Red Plant 1078,10,180000,90000,1
ein_fild10.gat,0,0,0,0 monster Yellow Plant 1081,10,180000,90000,1
-
+ein_fild10.gat,257,107,90,90 monster Flora 1118,20,300000,150000,0
diff --git a/npc/omobs/fields/geffen.txt b/npc/omobs/fields/geffen.txt
index 3bd0716b8..8d4d3d6e5 100644
--- a/npc/omobs/fields/geffen.txt
+++ b/npc/omobs/fields/geffen.txt
@@ -10,30 +10,33 @@
//= 1.2 Map names typos fix [Lupus]
//============================================================
-// gef_fild00 (lv1)
-
-gef_fild00.gat,0,0,0,0 monster Poring 1002,50,0,0,0
-gef_fild00.gat,0,0,0,0 monster Fabre 1007,50,0,0,0
+//==================================================
+// gef_fild00 - Geffen Field
+//==================================================
+gef_fild00.gat,0,0,0,0 monster Poring 1002,80,0,0,0
+gef_fild00.gat,0,0,0,0 monster Fabre 1007,80,0,0,0
+gef_fild00.gat,0,0,0,0 monster Poporing 1031,20,0,0,0
gef_fild00.gat,0,0,0,0 monster Pupa 1008,20,0,0,0
-gef_fild00.gat,0,0,0,0 monster Poporing 1031,10,0,0,0
-gef_fild00.gat,215,225,10,10 monster Green Plant 1080,5,360000,180000,1
-gef_fild00.gat,95,128,0,0 monster Blue Plant 1079,1,900000,450000,1
-gef_fild00.gat,124,321,0,0 monster Blue Plant 1079,1,900000,450000,1
gef_fild00.gat,54,212,5,5 monster Green Plant 1080,3,360000,180000,1
gef_fild00.gat,54,186,5,5 monster Green Plant 1080,3,360000,180000,1
+gef_fild00.gat,95,128,0,0 monster Blue Plant 1079,1,900000,450000,1
+gef_fild00.gat,124,321,0,0 monster Blue Plant 1079,1,900000,450000,1
-// gef_fild01 (lv1)
-
+//==================================================
+// gef_fild01 - Geffen Field
+//==================================================
gef_fild01.gat,0,0,0,0 monster Roda Frog 1012,50,0,0,0
gef_fild01.gat,0,0,0,0 monster Poporing 1031,20,0,0,0
-gef_fild01.gat,0,0,0,0 monster Toad 1089,1,3600000,1800000,1
+gef_fild01.gat,0,0,0,0 monster Green Plant 1080,5,360000,180000,1
+gef_fild01.gat,0,0,0,0 monster Toad 1089,1,1800000,900000,1
-// gef_fild02 (lv2)
-
-gef_fild02.gat,0,0,0,0 monster Yoyo 1057,10,0,0,0
-gef_fild02.gat,0,0,0,0 monster Orc Warrior 1023,40,0,0,0
+//==================================================
+// gef_fild02 - Geffen Field
+//==================================================
+gef_fild02.gat,0,0,0,0 monster Orc Warrior 1023,50,0,0,0
gef_fild02.gat,0,0,0,0 monster Coco 1104,20,0,0,0
gef_fild02.gat,0,0,0,0 monster Smokie 1056,20,0,0,0
+gef_fild02.gat,0,0,0,0 monster Yoyo 1057,10,0,0,0
gef_fild02.gat,0,0,0,0 monster Choco 1214,1,0,0,0
gef_fild02.gat,227,316,6,6 monster Green Plant 1080,8,360000,180000,1
gef_fild02.gat,87,48,6,6 monster Red Mushroom 1085,5,360000,180000,1
@@ -42,12 +45,13 @@ gef_fild02.gat,207,214,1,1 monster Blue Plant 1079,1,360000,180000,1
gef_fild02.gat,220,214,1,1 monster Blue Plant 1079,1,360000,180000,1
gef_fild02.gat,164,194,1,1 monster Shining Plant 1083,1,1800000,900000,1
-// gef_fild03 (lv3)
-
+//==================================================
+// gef_fild03 - Geffen Field
+//==================================================
+gef_fild03.gat,0,0,0,0 monster Savage 1166,40,0,0,0
+gef_fild03.gat,0,0,0,0 monster Poporing 1031,30,0,0,0
gef_fild03.gat,0,0,0,0 monster Orc Warrior 1023,30,0,0,0
gef_fild03.gat,0,0,0,0 monster High Orc 1213,10,0,0,0
-gef_fild03.gat,0,0,0,0 monster Savage 1166,30,0,0,0
-gef_fild03.gat,0,0,0,0 monster Poporing 1031,20,0,0,0
gef_fild03.gat,45,350,3,3 monster Green Plant 1080,1,180000,90000,1
gef_fild03.gat,66,300,3,3 monster Green Plant 1080,1,180000,90000,1
gef_fild03.gat,80,252,3,3 monster Green Plant 1080,1,180000,90000,1
@@ -70,22 +74,24 @@ gef_fild03.gat,169,92,3,3 monster Green Plant 1080,1,180000,90000,1
gef_fild03.gat,45,93,3,3 monster Green Plant 1080,1,180000,90000,1
gef_fild03.gat,44,133,3,3 monster Green Plant 1080,1,180000,90000,1
-// gef_fild04 (lv1)
-
-gef_fild04.gat,0,0,0,0 monster Poring 1002,30,0,0,0
-gef_fild04.gat,0,0,0,0 monster ChonChon 1011,30,0,0,0
+//==================================================
+// gef_fild04 - Geffen Field
+//==================================================
gef_fild04.gat,0,0,0,0 monster Pupa 1008,60,0,0,0
-gef_fild04.gat,0,0,0,0 monster Fabre 1007,20,0,0,0
-gef_fild04.gat,0,0,0,0 monster Roda Frog 1012,20,0,0,0
+gef_fild04.gat,0,0,0,0 monster Poring 1002,40,0,0,0
+gef_fild04.gat,0,0,0,0 monster Chonchon 1011,40,0,0,0
+gef_fild04.gat,0,0,0,0 monster Roda Frog 1012,30,0,0,0
+gef_fild04.gat,0,0,0,0 monster Fabre 1007,30,0,0,0
gef_fild04.gat,224,82,5,2 monster Green Plant 1080,3,360000,180000,1
gef_fild04.gat,152,82,5,2 monster Green Plant 1080,3,360000,180000,1
-// gef_fild05 (lv3)
-
-gef_fild05.gat,0,0,0,0 monster Poring 1002,30,0,0,0
-gef_fild05.gat,0,0,0,0 monster Kobold Archer 1282,10,0,0,0
+//==================================================
+// gef_fild05 - Geffen Field
+//==================================================
gef_fild05.gat,0,0,0,0 monster Wild Rose 1261,50,0,0,0
+gef_fild05.gat,0,0,0,0 monster Poring 1002,30,0,0,0
gef_fild05.gat,0,0,0,0 monster Dustiness 1114,30,0,0,0
+gef_fild05.gat,0,0,0,0 monster Kobold Archer 1282,15,0,0,0
gef_fild05.gat,235,322,0,0 monster Red Plant 1078,1,180000,90000,1
gef_fild05.gat,238,326,0,0 monster Red Plant 1078,1,180000,90000,1
gef_fild05.gat,170,337,0,0 monster Red Plant 1078,1,180000,90000,1
@@ -102,35 +108,38 @@ gef_fild05.gat,187,249,0,0 monster Red Plant 1078,1,180000,90000,1
gef_fild05.gat,187,265,0,0 monster Red Plant 1078,1,180000,90000,1
gef_fild05.gat,130,293,0,0 monster Red Plant 1078,1,180000,90000,1
-// gef_fild06 (lv4)
-
+//==================================================
+// gef_fild06 - Geffen Field
+//==================================================
+gef_fild06.gat,0,0,0,0 monster Poporing 1031,30,0,0,0
+gef_fild06.gat,0,0,0,0 monster Petite 1156,30,0,0,0
+gef_fild06.gat,0,0,0,0 monster Mantis 1139,20,0,0,0
gef_fild06.gat,0,0,0,0 monster Kobold 1133,20,0,0,0
gef_fild06.gat,0,0,0,0 monster Kobold 1134,10,0,0,0
gef_fild06.gat,0,0,0,0 monster Kobold 1135,10,0,0,0
-gef_fild06.gat,0,0,0,0 monster Sky Petite 1156,50,0,0,0
-gef_fild06.gat,0,0,0,0 monster Poporing 1031,10,0,0,0
-gef_fild06.gat,0,0,0,0 monster Mantis 1139,20,0,0,0
gef_fild06.gat,0,0,0,0 monster Shining Plant 1083,4,1800000,900000,1
-// gef_fild07 (lv1)
-
-gef_fild07.gat,0,0,0,0 monster Poring 1002,20,0,0,0
-gef_fild07.gat,0,0,0,0 monster ChonChon 1011,30,0,0,0
+//==================================================
+// gef_fild07 - Geffen Field
+//==================================================
+gef_fild07.gat,0,0,0,0 monster Poring 1002,70,0,0,0
+gef_fild07.gat,0,0,0,0 monster Fabre 1007,70,0,0,0
+gef_fild07.gat,0,0,0,0 monster Chonchon 1011,50,0,0,0
gef_fild07.gat,0,0,0,0 monster Pupa 1008,10,0,0,0
-gef_fild07.gat,0,0,0,0 monster Fabre 1007,60,0,0,0
gef_fild07.gat,122,221,0,0 monster Green Plant 1080,3,360000,180000,1
-gef_fild07.gat,185,247,0,0 monster Shining Plant 1083,1,1800000,900000,1
-gef_fild07.gat,269,289,0,0 monster Blue Plant 1079,1,900000,450000,1
gef_fild07.gat,269,289,3,3 monster Green Plant 1080,3,360000,180000,1
+gef_fild07.gat,269,289,0,0 monster Blue Plant 1079,1,900000,450000,1
+gef_fild07.gat,185,247,0,0 monster Shining Plant 1083,1,1800000,900000,1
-// gef_fild08 (lv3)
-
-gef_fild08.gat,0,0,0,0 monster Kobold 1133,20,0,0,0
+//==================================================
+// gef_fild08 - Geffen Field
+//==================================================
gef_fild08.gat,0,0,0,0 monster Kobold 1134,40,0,0,0
-gef_fild08.gat,0,0,0,0 monster Kobold 1135,20,0,0,0
gef_fild08.gat,0,0,0,0 monster Golem 1040,40,0,0,0
-gef_fild08.gat,0,0,0,0 monster Steel ChonChon 1042,20,0,0,0
gef_fild08.gat,0,0,0,0 monster Poison Spore 1077,20,0,0,0
+gef_fild08.gat,0,0,0,0 monster Kobold 1133,20,0,0,0
+gef_fild08.gat,0,0,0,0 monster Kobold 1135,20,0,0,0
+gef_fild08.gat,0,0,0,0 monster Steel Chonchon 1042,20,0,0,0
gef_fild08.gat,65,341,0,0 monster Blue Plant 1079,1,900000,450000,1
gef_fild08.gat,111,319,0,0 monster Blue Plant 1079,1,900000,450000,1
gef_fild08.gat,59,91,0,0 monster Blue Plant 1079,1,900000,450000,1
@@ -140,12 +149,12 @@ gef_fild08.gat,344,78,0,0 monster Blue Plant 1079,1,900000,450000,1
gef_fild08.gat,325,311,0,0 monster Blue Plant 1079,1,900000,450000,1
gef_fild08.gat,162,247,0,0 monster Blue Plant 1079,1,900000,450000,1
-// gef_fild09 (lv3)
-
-//putmob "gef_fild09" 0 0 0 0 5 ORC_ARCHER 0 0 0
-gef_fild09.gat,0,0,0,0 monster Ambernite 1094,60,0,0,0
+//==================================================
+// gef_fild09 - Geffen Field
+//==================================================
+gef_fild09.gat,0,0,0,0 monster Ambernite 1094,70,0,0,0
+gef_fild09.gat,0,0,0,0 monster Poison Spore 1077,20,0,0,0
gef_fild09.gat,0,0,0,0 monster Poporing 1031,10,0,0,0
-gef_fild09.gat,0,0,0,0 monster Poison Spore 1077,10,0,0,0
gef_fild09.gat,51,43,0,0 monster Red Mushroom 1085,1,180000,90000,1
gef_fild09.gat,125,53,0,0 monster Red Mushroom 1085,1,180000,90000,1
gef_fild09.gat,148,74,0,0 monster Red Mushroom 1085,1,180000,90000,1
@@ -158,27 +167,30 @@ gef_fild09.gat,325,36,0,0 monster Red Mushroom 1085,1,180000,90000,1
gef_fild09.gat,344,51,0,0 monster Red Mushroom 1085,1,180000,90000,1
gef_fild09.gat,277,201,5,5 monster Blue Plant 1079,3,900000,450000,1
-// gef_fild10 (lv3)
-gef_fild10.gat,0,0,0,0 monster Orc Baby 1686,15,0,0,0
-gef_fild10.gat,0,0,0,0 monster Orc Lord 1190,1,7200000,3600000,0
+//==================================================
+// gef_fild10 - Geffen Field
+//==================================================
gef_fild10.gat,0,0,0,0 monster Orc Warrior 1023,50,0,0,0
gef_fild10.gat,0,0,0,0 monster Orc Lady 1273,40,0,0,0
+gef_fild10.gat,0,0,0,0 monster Orc Baby 1686,15,0,0,0
gef_fild10.gat,0,0,0,0 monster Poporing 1031,15,0,0,0
+gef_fild10.gat,300,253,5,5 monster Green Plant 1080,3,360000,180000,1
gef_fild10.gat,46,350,5,5 monster Blue Plant 1079,3,900000,450000,1
gef_fild10.gat,287,61,5,5 monster Blue Plant 1079,3,900000,450000,1
-gef_fild10.gat,300,253,5,5 monster Green Plant 1080,3,360000,180000,1
-
-// gef_fild11 (lv4)
+gef_fild10.gat,0,0,0,0 monster Orc Lord 1190,1,7200000,3600000,0
-gef_fild11.gat,0,0,0,0 monster Goblin Leader 1299,1,1800000,1200000,0
+//==================================================
+// gef_fild11 - Geffen Field
+//==================================================
gef_fild11.gat,0,0,0,0 monster Goblin 1122,30,0,0,0
-gef_fild11.gat,0,0,0,0 monster Goblin 1123,20,0,0,0
-gef_fild11.gat,0,0,0,0 monster Goblin 1124,20,0,0,0
-gef_fild11.gat,0,0,0,0 monster Goblin 1125,20,0,0,0
-gef_fild11.gat,0,0,0,0 monster Goblin 1126,20,0,0,0
+gef_fild11.gat,0,0,0,0 monster Goblin 1123,25,0,0,0
+gef_fild11.gat,0,0,0,0 monster Goblin 1124,25,0,0,0
+gef_fild11.gat,0,0,0,0 monster Goblin 1125,25,0,0,0
+gef_fild11.gat,0,0,0,0 monster Goblin 1126,25,0,0,0
gef_fild11.gat,0,0,0,0 monster Goblin Archer 1258,20,0,0,0
gef_fild11.gat,0,0,0,0 monster Poporing 1031,15,0,0,0
gef_fild11.gat,0,0,0,0 monster Rotar Zairo 1392,10,0,0,0
+gef_fild11.gat,0,0,0,0 monster Goblin Leader 1299,1,0,0,0
gef_fild11.gat,101,277,4,1 monster Black Mushroom 1084,3,360000,180000,1
gef_fild11.gat,176,288,1,4 monster Black Mushroom 1084,3,360000,180000,1
gef_fild11.gat,253,357,1,4 monster Black Mushroom 1084,3,360000,180000,1
@@ -187,25 +199,28 @@ gef_fild11.gat,257,209,1,4 monster Black Mushroom 1084,3,360000,180000,1
gef_fild11.gat,174,240,1,3 monster Black Mushroom 1084,3,360000,180000,1
gef_fild11.gat,283,100,4,1 monster Black Mushroom 1084,3,360000,180000,1
-// gef_fild12 (lv4)
-
-gef_fild12.gat,0,0,0,0 monster Kobold Leader 1296,1,1800000,1200000,0
-gef_fild12.gat,0,0,0,0 monster Kobold 1133,20,0,0,0
+//==================================================
+// gef_fild12 - Kordt Forest
+//==================================================
+gef_fild12.gat,0,0,0,0 monster Kobold Archer 1282,40,0,0,0
+gef_fild12.gat,0,0,0,0 monster Kobold 1133,30,0,0,0
gef_fild12.gat,0,0,0,0 monster Kobold 1134,30,0,0,0
gef_fild12.gat,0,0,0,0 monster Kobold 1135,30,0,0,0
-gef_fild12.gat,0,0,0,0 monster Kobold Archer 1282,40,0,0,0
gef_fild12.gat,0,0,0,0 monster Poporing 1031,20,0,0,0
+gef_fild12.gat,0,0,0,0 monster Kobold Leader 1296,1,0,0,0
-// gef_fild13 (lv2)
-
+//==================================================
+// gef_fild13 - Britoniah
+//==================================================
+gef_fild13.gat,0,0,0,0 monster Creamy 1018,30,0,0,0
gef_fild13.gat,0,0,0,0 monster Poporing 1031,20,0,0,0
-gef_fild13.gat,0,0,0,0 monster Creamy 1018,40,0,0,0
-gef_fild13.gat,0,0,0,0 monster Ambernite 1094,30,0,0,0
-
-// gef_fild14 (lv4)
+gef_fild13.gat,0,0,0,0 monster Ambernite 1094,15,0,0,0
+//==================================================
+// gef_fild14 - West Orc Village
+//==================================================
+gef_fild14.gat,0,0,0,0 monster High Orc 1213,60,0,0,0
gef_fild14.gat,0,0,0,0 monster Orc Lady 1273,40,0,0,0
-gef_fild14.gat,0,0,0,0 monster Orc Hero 1087,1,3600000,1800000,1
-gef_fild14.gat,0,0,0,0 monster Orc Warrior 1023,20,0,0,0
gef_fild14.gat,0,0,0,0 monster Orc Archer 1189,30,0,0,0
-gef_fild14.gat,0,0,0,0 monster High Orc 1213,40,0,0,0
+gef_fild14.gat,0,0,0,0 monster Orc Warrior 1023,20,0,0,0
+gef_fild14.gat,0,0,0,0 monster Orc Hero 1087,1,3600000,1800000,1
diff --git a/npc/omobs/fields/gonryun.txt b/npc/omobs/fields/gonryun.txt
index d811c6fbd..12a1c807c 100644
--- a/npc/omobs/fields/gonryun.txt
+++ b/npc/omobs/fields/gonryun.txt
@@ -10,12 +10,13 @@
//=
//============================================================
-//gon_fild01
-
-gon_fild01.gat,0,0,0,0 monster Baby Leopard 1415,40,600000,300000,0
-gon_fild01.gat,0,0,0,0 monster Zipper Bear 1417,20,0,0,0
-gon_fild01.gat,0,0,0,0 monster Poporing 1031,20,0,0,0
+//==================================================
+// gon_fild01 - Gonryun Field
+//==================================================
gon_fild01.gat,0,0,0,0 monster Dumpling Child 1409,30,0,0,0
-gon_fild01.gat,0,0,0,0 monster Hermit Plant 1413,2,630000,330000,0
+gon_fild01.gat,0,0,0,0 monster Poporing 1031,20,0,0,0
+gon_fild01.gat,0,0,0,0 monster Zipper Bear 1417,20,0,0,0
gon_fild01.gat,0,0,0,0 monster Green Plant 1080,5,0,0,0
gon_fild01.gat,0,0,0,0 monster Shining Plant 1083,1,0,0,0
+gon_fild01.gat,0,0,0,0 monster Baby Leopard 1415,40,600000,300000,0
+gon_fild01.gat,0,0,0,0 monster Hermit Plant 1413,2,600000,300000,0
diff --git a/npc/omobs/fields/hugel.txt b/npc/omobs/fields/hugel.txt
index ec72b3e85..8bfe34773 100644
--- a/npc/omobs/fields/hugel.txt
+++ b/npc/omobs/fields/hugel.txt
@@ -15,22 +15,20 @@
//= Mob quantity is custom.
//============================================================
-//========================================================================================
-// - Hugel Field 01
-//========================================================================================
-
+//==================================================
+// hu_fild01 - Hugel Field
+//==================================================
hu_fild01.gat,0,0,0,0 monster Plasma 1694,15,0,0,0
hu_fild01.gat,0,0,0,0 monster Plasma 1697,15,0,0,0
hu_fild01.gat,0,0,0,0 monster Plasma 1695,15,0,0,0
hu_fild01.gat,0,0,0,0 monster Plasma 1696,15,0,0,0
-hu_fild01.gat,0,0,0,0 monster Demon Pungus 1378,20,0,0,0
+hu_fild01.gat,0,0,0,0 monster Demon Fungus 1378,20,0,0,0
hu_fild01.gat,0,0,0,0 monster Geographer 1368,20,0,0,0
hu_fild01.gat,0,0,0,0 monster Breeze 1692,20,0,0,0
-//========================================================================================
-// - Hugel Field 02
-//========================================================================================
-
+//==================================================
+// hu_fild02 - Hugel Field
+//==================================================
hu_fild02.gat,0,0,0,0 monster Green Iguana 1687,15,0,0,0
hu_fild02.gat,0,0,0,0 monster Novus 1715,5,0,0,0
hu_fild02.gat,0,0,0,0 monster Novus 1718,5,0,0,0
@@ -42,37 +40,34 @@ hu_fild02.gat,0,0,0,0 monster Savage Babe 1167,30,0,0,0
hu_fild02.gat,0,0,0,0 monster Anopheles 1627,15,0,0,0
hu_fild02.gat,0,0,0,0 monster Geographer 1368,15,0,0,0
-//========================================================================================
-// - Hugel Field 03
-//========================================================================================
-
+//==================================================
+// hu_fild03 - Hugel Field
+//==================================================
hu_fild03.gat,0,0,0,0 monster Green Iguana 1687,15,0,0,0
hu_fild03.gat,0,0,0,0 monster Metaling 1613,20,0,0,0
hu_fild03.gat,0,0,0,0 monster Poporing 1031,20,0,0,0
-hu_fild03.gat,0,0,0,0 monster Thief Bug Larva 1051,35,0,0,0
+hu_fild03.gat,0,0,0,0 monster Thief Bug 1051,35,0,0,0
hu_fild03.gat,0,0,0,0 monster Black Mushroom 1084,15,180000,90000,1
hu_fild03.gat,0,0,0,0 monster Red Mushroom 1085,15,180000,90000,1
-//========================================================================================
-// - Hugel Field 04
-//========================================================================================
-
+//==================================================
+// hu_fild04 - Hugel Field
+//==================================================
hu_fild04.gat,0,0,0,0 monster Green Iguana 1687,15,0,0,0
hu_fild04.gat,0,0,0,0 monster Breeze 1692,20,0,0,0
hu_fild04.gat,0,0,0,0 monster Sleeper 1386,25,0,0,0
hu_fild04.gat,0,0,0,0 monster Anopheles 1627,25,0,0,0
hu_fild04.gat,0,0,0,0 monster Novus 1715,15,0,0,0
hu_fild04.gat,0,0,0,0 monster Novus 1718,15,0,0,0
-hu_fild04.gat,0,0,0,0 monster Sky Deleter 1384,10,0,0,0
-hu_fild04.gat,0,0,0,0 monster Earth Deleter 1385,10,0,0,0
+hu_fild04.gat,0,0,0,0 monster Deleter 1384,10,0,0,0
+hu_fild04.gat,0,0,0,0 monster Deleter 1385,10,0,0,0
hu_fild04.gat,0,0,0,0 monster Yellow Plant 1081,5,180000,90000,1
hu_fild04.gat,0,0,0,0 monster Green Plant 1080,5,180000,90000,1
hu_fild04.gat,0,0,0,0 monster Blue Plant 1079,5,180000,90000,1
-//========================================================================================
-// - Hugel Field 05
-//========================================================================================
-
+//==================================================
+// hu_fild05 - Hugel Field
+//==================================================
hu_fild05.gat,0,0,0,0 monster Green Iguana 1687,35,0,0,0
hu_fild05.gat,0,0,0,0 monster Novus 1715,5,0,0,0
hu_fild05.gat,0,0,0,0 monster Novus 1718,5,0,0,0
@@ -80,10 +75,9 @@ hu_fild05.gat,0,0,0,0 monster Anopheles 1627,25,0,0,0
hu_fild05.gat,0,0,0,0 monster Dragon Egg 1721,10,0,0,0
hu_fild05.gat,0,0,0,0 monster Mutant Dragonoid 1262,1,7200000,3600000,0
-//========================================================================================
-// - Hugel Field 06
-//========================================================================================
-
+//==================================================
+// hu_fild06 - Hugel Field
+//==================================================
hu_fild06.gat,0,0,0,0 monster Poring 1002,30,0,0,0
hu_fild06.gat,0,0,0,0 monster Poporing 1031,20,0,0,0
hu_fild06.gat,0,0,0,0 monster Metaling 1613,20,0,0,0
@@ -92,10 +86,9 @@ hu_fild06.gat,0,0,0,0 monster Mole 1628,15,0,0,0
hu_fild06.gat,0,0,0,0 monster Green Plant 1080,5,180000,90000,1
hu_fild06.gat,0,0,0,0 monster Yellow Plant 1081,5,180000,90000,1
-//========================================================================================
-// - Hugel Field 07
-//========================================================================================
-
+//==================================================
+// hu_fild07 - Hugel Field
+//==================================================
hu_fild07.gat,0,0,0,0 monster Green Iguana 1687,35,0,0,0
hu_fild07.gat,0,0,0,0 monster Novus 1715,15,0,0,0
hu_fild07.gat,0,0,0,0 monster Novus 1718,15,0,0,0
@@ -103,6 +96,6 @@ hu_fild07.gat,0,0,0,0 monster Anopheles 1627,15,0,0,0
hu_fild07.gat,0,0,0,0 monster Breeze 1692,20,0,0,0
hu_fild07.gat,0,0,0,0 monster Geographer 1368,20,0,0,0
hu_fild07.gat,0,0,0,0 monster Demon Fungus 1378,20,0,0,0
-hu_fild07.gat,0,0,0,0 monster Sky Petite 1156,20,0,0,0
-hu_fild07.gat,0,0,0,0 monster Earth Petite 1155,20,0,0,0
+hu_fild07.gat,0,0,0,0 monster Petite 1156,20,0,0,0
+hu_fild07.gat,0,0,0,0 monster Petite 1155,20,0,0,0
hu_fild07.gat,0,0,0,0 monster Yellow Plant 1081,10,360000,180000,1
diff --git a/npc/omobs/fields/jawaii.txt b/npc/omobs/fields/jawaii.txt
index 3705e92f3..f7fa27875 100644
--- a/npc/omobs/fields/jawaii.txt
+++ b/npc/omobs/fields/jawaii.txt
@@ -10,14 +10,20 @@
//= 1.0 First version [MasterOfMuppets]
//============================================================
+//==================================================
+// jawaii - Jawaii, the Honeymoon Island
+//==================================================
jawaii.gat,207,290,10,10 monster Phen 1158,3,3600000,1800000,0
jawaii.gat,221,220,30,30 monster Aster 1266,2,3600000,2400000,0
jawaii.gat,276,163,20,20 monster Aster 1266,1,7200000,3600000,0
jawaii.gat,221,220,30,30 monster Shellfish 1074,1,4800000,3000000,0
jawaii.gat,276,163,20,30 monster Shellfish 1074,2,4200000,2400000,0
+//==================================================
+// jawaii_in - Inside Jawaii
+//==================================================
jawaii_in.gat,128,121,1,4 monster Red Mushroom 1085,1,3000000,1200000,0
jawaii_in.gat,124,76,1,1 monster Black Mushroom 1084,1,3600000,1200000,0
jawaii_in.gat,72,74,5,1 monster Black Mushroom 1084,2,3000000,1200000,0
-jawaii_in.gat,73,117,4,4 monster Thief Bug Larva 1051,1,5400000,3000000,0
-jawaii_in.gat,83,117,5,5 monster Thief Bug Larva 1051,1,4800000,2400000,0
+jawaii_in.gat,73,117,4,4 monster Thief Bug 1051,1,5400000,3000000,0
+jawaii_in.gat,83,117,5,5 monster Thief Bug 1051,1,4800000,2400000,0
diff --git a/npc/omobs/fields/lighthalzen.txt b/npc/omobs/fields/lighthalzen.txt
index 5dbbdc08e..a1043a998 100644
--- a/npc/omobs/fields/lighthalzen.txt
+++ b/npc/omobs/fields/lighthalzen.txt
@@ -1,25 +1,23 @@
//===== eAthena Script =======================================
//= Lighthalzen Fields - Monster Spawn Locations
//===== By: ==================================================
-//= Athena (1.0)
+//= Muad_Dib (1.0)
//===== Current Version: =====================================
-//= 1.2
+//= 1.3
//===== Compatible With: =====================================
//= Any Athena Version
//===== Additional Comments: =================================
//= 1.0 by Muad_Dib (Prometheus Project)
//= 1.1 Added Porcellio by MasterOfMuppets
//= 1.2 Corrected monsters. Many thanks to vicious_pucca for
-//= the information [MasterOfMuppets]
+//= the information [MasterOfMuppets]
//= 1.3 Updated acordingly to Episode 10.4 [Poki#3]
//= Mob quantity is custom.
//============================================================
-
-//========================================================================================
-// - Lighthalzen Field 01
-//========================================================================================
-
+//==================================================
+// lhz_fild01 - Lighthalzen Field
+//==================================================
lhz_fild01.gat,0,0,0,0 monster Metaling 1613,35,0,0,0
lhz_fild01.gat,0,0,0,0 monster Mole 1628,20,0,0,0
lhz_fild01.gat,0,0,0,0 monster Caramel 1103,30,0,0,0
@@ -27,10 +25,9 @@ lhz_fild01.gat,0,0,0,0 monster Yellow Plant 1081,15,0,0,0
lhz_fild01.gat,0,0,0,0 monster Red Plant 1078,15,0,0,0
lhz_fild01.gat,0,0,0,0 monster Green Plant 1080,15,0,0,0
-//========================================================================================
-// - Lighthalzen Field 02
-//========================================================================================
-
+//==================================================
+// lhz_fild02 - Lighthalzen Field (Grim Ripper's Valley)
+//==================================================
lhz_fild02.gat,0,0,0,0 monster Metaling 1613,25,0,0,0
lhz_fild02.gat,0,0,0,0 monster Horn 1128,15,0,0,0
lhz_fild02.gat,0,0,0,0 monster Caramel 1103,10,0,0,0
@@ -39,10 +36,9 @@ lhz_fild02.gat,0,0,0,0 monster Anopheles 1627,30,0,0,0
lhz_fild02.gat,0,0,0,0 monster Yellow Plant 1081,15,0,0,0
lhz_fild02.gat,0,0,0,0 monster Green Plant 1080,15,0,0,0
-//========================================================================================
-// - Lighthalzen Field 03
-//========================================================================================
-
+//==================================================
+// lhz_fild03 - Lighthalzen Field
+//==================================================
lhz_fild03.gat,0,0,0,0 monster Metaling 1613,10,0,0,0
lhz_fild03.gat,0,0,0,0 monster Hill Wind 1680,15,0,0,0
lhz_fild03.gat,0,0,0,0 monster Horn 1128,15,0,0,0
diff --git a/npc/omobs/fields/louyang.txt b/npc/omobs/fields/louyang.txt
index f1d156cba..bbcf10a78 100644
--- a/npc/omobs/fields/louyang.txt
+++ b/npc/omobs/fields/louyang.txt
@@ -10,22 +10,23 @@
//= 1.1 updated by MasterOfMuppets
//============================================================
-
-//lou_fild01
-lou_fild01.gat,224,315,100,50 monster Bigfoot 1060,7,0,0,0
-lou_fild01.gat,203,225,110,35 monster Bigfoot 1060,4,60000,30000,1
-lou_fild01.gat,273,128,75,50 monster Bigfoot 1060,4,0,0,0
-lou_fild01.gat,224,315,100,50 monster Caramel 1103,7,0,0,0
-lou_fild01.gat,203,225,110,35 monster Caramel 1103,7,0,0,0
-lou_fild01.gat,273,128,75,50 monster Caramel 1103,7,0,0,0
+//==================================================
+// lou_fild01 - Louyang Field
+//==================================================
lou_fild01.gat,224,315,100,50 monster Mantis 1139,10,0,0,0
lou_fild01.gat,203,225,110,35 monster Mantis 1139,10,0,0,0
lou_fild01.gat,273,128,75,50 monster Mantis 1139,10,0,0,0
lou_fild01.gat,224,315,100,50 monster Increase Soil 1516,8,0,0,0
lou_fild01.gat,203,225,110,35 monster Increase Soil 1516,15,60000,30000,1
lou_fild01.gat,273,128,75,500 monster Increase Soil 1516,7,0,0,0
+lou_fild01.gat,224,315,100,50 monster Caramel 1103,7,0,0,0
+lou_fild01.gat,203,225,110,35 monster Caramel 1103,7,0,0,0
+lou_fild01.gat,273,128,75,50 monster Caramel 1103,7,0,0,0
+lou_fild01.gat,224,315,100,50 monster Bigfoot 1060,7,0,0,0
+lou_fild01.gat,203,225,110,35 monster Bigfoot 1060,4,60000,30000,1
+lou_fild01.gat,273,128,75,50 monster Bigfoot 1060,4,0,0,0
+lou_fild01.gat,0,0,0,0 monster Yellow Plant 1081,10,0,0,0
+lou_fild01.gat,0,0,0,0 monster Black Mushroom 1084,5,0,0,0
lou_fild01.gat,224,315,100,50 monster Anacondaq 1030,2,0,0,0
lou_fild01.gat,203,225,110,35 monster Anacondaq 1030,1,0,0,0
lou_fild01.gat,273,128,75,50 monster Anacondaq 1030,2,0,0,0
-lou_fild01.gat,0,0,0,0 monster Black Mushroom 1084,5,0,0,0
-lou_fild01.gat,0,0,0,0 monster Yellow Plant 1081,10,0,0,0
diff --git a/npc/omobs/fields/lutie.txt b/npc/omobs/fields/lutie.txt
index 3b057653e..af5e8c205 100644
--- a/npc/omobs/fields/lutie.txt
+++ b/npc/omobs/fields/lutie.txt
@@ -7,13 +7,13 @@
//===== Compatible With: =====================================
//= Any Athena Version
//===== Additional Comments: =================================
-//= 1.1 added Hatii Baby according to May 10 patch
+//= 1.1 added Garm Baby according to May 10 patch
//============================================================
-
-// Lutie Field
-
+//==================================================
+// xmas_fild01 - Lutie Field
+//==================================================
xmas_fild01.gat,0,0,0,0 monster Marin 1242,35,0,0,0
xmas_fild01.gat,0,0,0,0 monster Sasquatch 1243,20,0,0,0
+xmas_fild01.gat,0,0,0,0 monster Garm Baby 1515,1,1800000,900000,1
xmas_fild01.gat,0,0,0,0 monster Garm 1252,1,7200000,3600000,1
-xmas_fild01.gat,0,0,0,0 monster Hatii Baby 1515,1,1800000,0,0
diff --git a/npc/omobs/fields/mjolnir.txt b/npc/omobs/fields/mjolnir.txt
index 29dc83d29..a8e0a6f9b 100644
--- a/npc/omobs/fields/mjolnir.txt
+++ b/npc/omobs/fields/mjolnir.txt
@@ -10,41 +10,39 @@
//=
//============================================================
-// mjolnir_01 (lv2)
-
+//==================================================
+// mjolnir_01 - Mt.Mjolnir
+//==================================================
+mjolnir_01.gat,0,0,0,0 monster Coco 1104,70,0,0,0
+mjolnir_01.gat,0,0,0,0 monster Caramel 1103,40,0,0,0
mjolnir_01.gat,0,0,0,0 monster Horn 1128,20,0,0,0
mjolnir_01.gat,0,0,0,0 monster Creamy 1018,20,0,0,0
-mjolnir_01.gat,0,0,0,0 monster Coco 1104,70,0,0,0
mjolnir_01.gat,0,0,0,0 monster Stainer 1174,20,0,0,0
-mjolnir_01.gat,0,0,0,0 monster Caramel 1103,40,0,0,0
-mjolnir_01.gat,75,85,25,25 monster Shining Plant 1083,1,1800000,900000,1
-mjolnir_01.gat,78,219,25,25 monster Shining Plant 1083,1,1800000,900000,1
mjolnir_01.gat,75,85,25,25 monster Green Plant 1080,5,180000,90000,1
mjolnir_01.gat,78,219,25,25 monster Green Plant 1080,5,180000,90000,1
-mjolnir_01.gat,311,271,25,25 monster Blue Plant 1079,5,360000,180000,1
-
-// mjolnir_02 (lv3)
+mjolnir_01.gat,311,271,25,25 monster Blue Plant 1079,5,90000,45000,1
+mjolnir_01.gat,75,85,25,25 monster Shining Plant 1083,1,1800000,900000,1
+mjolnir_01.gat,78,219,25,25 monster Shining Plant 1083,1,1800000,900000,1
+//==================================================
+// mjolnir_02 - Mt.Mjolnir
+//==================================================
+mjolnir_02.gat,0,0,0,0 monster Petite 1155,35,0,0,0
mjolnir_02.gat,0,0,0,0 monster Hornet 1004,30,0,0,0
+mjolnir_02.gat,0,0,0,0 monster Flora 1118,30,0,0,0
mjolnir_02.gat,0,0,0,0 monster Creamy 1018,20,0,0,0
-mjolnir_02.gat,0,0,0,0 monster Earth Petite 1155,50,0,0,0
mjolnir_02.gat,0,0,0,0 monster Poporing 1031,10,0,0,0
-mjolnir_02.gat,0,0,0,0 monster Flora 1118,30,0,0,0
mjolnir_02.gat,86,270,0,0 monster Green Plant 1080,1,180000,90000,1
mjolnir_02.gat,80,211,0,0 monster Green Plant 1080,1,180000,90000,1
mjolnir_02.gat,86,270,0,0 monster Green Plant 1080,1,180000,90000,1
mjolnir_02.gat,86,180,0,0 monster Green Plant 1080,1,180000,90000,1
mjolnir_02.gat,107,128,0,0 monster Green Plant 1080,1,180000,90000,1
-mjolnir_02.gat,79,49,0,0 monster Blue Plant 1079,1,360000,180000,1
-mjolnir_02.gat,133,80,0,0 monster Red Plant 1078,1,180000,90000,1
mjolnir_02.gat,191,71,0,0 monster Green Plant 1080,1,180000,90000,1
mjolnir_02.gat,237,55,0,0 monster Green Plant 1080,1,180000,90000,1
mjolnir_02.gat,292,49,0,0 monster Green Plant 1080,1,180000,90000,1
mjolnir_02.gat,349,45,0,0 monster Green Plant 1080,1,180000,90000,1
mjolnir_02.gat,282,101,0,0 monster Green Plant 1080,1,180000,90000,1
mjolnir_02.gat,325,146,0,0 monster Green Plant 1080,1,180000,90000,1
-mjolnir_02.gat,318,205,0,0 monster Red Plant 1078,1,180000,90000,1
-mjolnir_02.gat,275,199,0,0 monster Blue Plant 1079,1,360000,180000,1
mjolnir_02.gat,335,301,0,0 monster Green Plant 1080,1,180000,90000,1
mjolnir_02.gat,312,342,0,0 monster Green Plant 1080,1,180000,90000,1
mjolnir_02.gat,325,146,0,0 monster Green Plant 1080,1,180000,90000,1
@@ -52,29 +50,32 @@ mjolnir_02.gat,257,292,0,0 monster Green Plant 1080,1,180000,90000,1
mjolnir_02.gat,204,263,0,0 monster Green Plant 1080,1,180000,90000,1
mjolnir_02.gat,193,304,0,0 monster Green Plant 1080,1,180000,90000,1
mjolnir_02.gat,145,282,0,0 monster Green Plant 1080,1,180000,90000,1
-mjolnir_02.gat,156,254,0,0 monster Red Plant 1078,1,180000,90000,1
-mjolnir_02.gat,112,268,0,0 monster Blue Plant 1079,1,360000,180000,1
-mjolnir_02.gat,122,195,0,0 monster Red Plant 1078,1,180000,90000,1
mjolnir_02.gat,167,160,0,0 monster Green Plant 1080,1,180000,90000,1
mjolnir_02.gat,325,146,0,0 monster Green Plant 1080,1,180000,90000,1
-mjolnir_02.gat,223,110,0,0 monster Red Plant 1078,1,180000,90000,1
-mjolnir_02.gat,273,74,0,0 monster Blue Plant 1079,1,360000,180000,1
-mjolnir_02.gat,254,155,0,0 monster Red Plant 1078,1,180000,90000,1
mjolnir_02.gat,243,208,0,0 monster Green Plant 1080,1,180000,90000,1
mjolnir_02.gat,273,240,0,0 monster Green Plant 1080,1,180000,90000,1
mjolnir_02.gat,289,276,0,0 monster Green Plant 1080,1,180000,90000,1
+mjolnir_02.gat,133,80,0,0 monster Red Plant 1078,1,180000,90000,1
+mjolnir_02.gat,318,205,0,0 monster Red Plant 1078,1,180000,90000,1
+mjolnir_02.gat,156,254,0,0 monster Red Plant 1078,1,180000,90000,1
+mjolnir_02.gat,122,195,0,0 monster Red Plant 1078,1,180000,90000,1
+mjolnir_02.gat,223,110,0,0 monster Red Plant 1078,1,180000,90000,1
+mjolnir_02.gat,254,155,0,0 monster Red Plant 1078,1,180000,90000,1
+mjolnir_02.gat,275,199,0,0 monster Blue Plant 1079,1,360000,180000,1
+mjolnir_02.gat,79,49,0,0 monster Blue Plant 1079,1,360000,180000,1
+mjolnir_02.gat,112,268,0,0 monster Blue Plant 1079,1,360000,180000,1
+mjolnir_02.gat,273,74,0,0 monster Blue Plant 1079,1,360000,180000,1
mjolnir_02.gat,188,192,10,10 monster Blue Plant 1079,2,360000,180000,1
-// mjolnir_03 (lv4)
-
+//==================================================
+// mjolnir_03 - Mt.Mjolnir
+//==================================================
+mjolnir_03.gat,0,0,0,0 monster Petite 1156,60,0,0,0
mjolnir_03.gat,0,0,0,0 monster Mantis 1139,30,0,0,0
-mjolnir_03.gat,0,0,0,0 monster Creamy 1018,10,0,0,0
-mjolnir_03.gat,0,0,0,0 monster Sky Petite 1156,70,0,0,0
+mjolnir_03.gat,0,0,0,0 monster Argos 1100,20,0,0,0
mjolnir_03.gat,0,0,0,0 monster Poporing 1031,10,0,0,0
mjolnir_03.gat,0,0,0,0 monster Flora 1118,10,0,0,0
-mjolnir_03.gat,0,0,0,0 monster Argos 1100,20,0,0,0
-mjolnir_03.gat,211,216,10,10 monster Shining Plant 1083,1,1800000,900000,1
-mjolnir_03.gat,280,252,10,10 monster Shining Plant 1083,1,1800000,900000,1
+mjolnir_03.gat,0,0,0,0 monster Creamy 1018,10,0,0,0
mjolnir_03.gat,135,94,0,0 monster Green Plant 1080,1,180000,90000,1
mjolnir_03.gat,199,97,0,0 monster Green Plant 1080,1,180000,90000,1
mjolnir_03.gat,262,98,0,0 monster Green Plant 1080,1,180000,90000,1
@@ -88,16 +89,17 @@ mjolnir_03.gat,128,319,0,0 monster Green Plant 1080,1,180000,90000,1
mjolnir_03.gat,77,271,0,0 monster Green Plant 1080,1,180000,90000,1
mjolnir_03.gat,66,219,0,0 monster Green Plant 1080,1,180000,90000,1
mjolnir_03.gat,91,161,0,0 monster Green Plant 1080,1,180000,90000,1
+mjolnir_03.gat,211,216,10,10 monster Shining Plant 1083,1,1800000,900000,1
+mjolnir_03.gat,280,252,10,10 monster Shining Plant 1083,1,1800000,900000,1
-// mjolnir_04 (lv4)
-
-mjolnir_04.gat,0,0,0,0 monster Mantis 1139,20,0,0,0
+//==================================================
+// mjolnir_04 - Mt.Mjolnir
+//==================================================
mjolnir_04.gat,0,0,0,0 monster Hornet 1004,70,0,0,0
-mjolnir_04.gat,0,0,0,0 monster Poporing 1031,10,0,0,0
-mjolnir_04.gat,0,0,0,0 monster Poporing 1031,30,0,0,0
+mjolnir_04.gat,0,0,0,0 monster Flora 1118,30,0,0,0
+mjolnir_04.gat,0,0,0,0 monster Mantis 1139,20,0,0,0
mjolnir_04.gat,0,0,0,0 monster Argiope 1099,20,0,0,0
-mjolnir_04.gat,0,0,0,0 monster Mistress 1059,1,7200000,3600000,1
-mjolnir_04.gat,200,200,30,30 monster Shining Plant 1083,3,1800000,900000,1
+mjolnir_04.gat,0,0,0,0 monster Poporing 1031,10,0,0,0
mjolnir_04.gat,177,34,0,0 monster Green Plant 1080,1,180000,90000,1
mjolnir_04.gat,122,28,0,0 monster Green Plant 1080,1,180000,90000,1
mjolnir_04.gat,76,53,0,0 monster Green Plant 1080,1,180000,90000,1
@@ -115,29 +117,31 @@ mjolnir_04.gat,362,201,0,0 monster Green Plant 1080,1,180000,90000,1
mjolnir_04.gat,332,122,0,0 monster Green Plant 1080,1,180000,90000,1
mjolnir_04.gat,269,39,0,0 monster Green Plant 1080,1,180000,90000,1
mjolnir_04.gat,205,33,0,0 monster Green Plant 1080,1,180000,90000,1
+mjolnir_04.gat,200,200,30,30 monster Shining Plant 1083,3,1800000,900000,1
+mjolnir_04.gat,0,0,0,0 monster Mistress 1059,1,7200000,3600000,1
-// mjolnir_05 (lv4)
-
+//==================================================
+// mjolnir_05 - Mt.Mjolnir
+//==================================================
+mjolnir_05.gat,0,0,0,0 monster Argiope 1099,70,0,0,0
mjolnir_05.gat,0,0,0,0 monster Mantis 1139,40,0,0,0
-mjolnir_05.gat,0,0,0,0 monster Poporing 1031,10,0,0,0
mjolnir_05.gat,0,0,0,0 monster Flora 1118,20,0,0,0
-mjolnir_05.gat,0,0,0,0 monster Argiope 1099,70,0,0,0
mjolnir_05.gat,0,0,0,0 monster Argos 1100,20,0,0,0
+mjolnir_05.gat,0,0,0,0 monster Poporing 1031,10,0,0,0
+mjolnir_05.gat,0,0,0,0 monster Red Plant 1078,10,180000,90000,1
mjolnir_05.gat,200,240,40,40 monster Blue Plant 1079,3,360000,180000,1
-mjolnir_05.gat,200,240,40,40 monster Shining Plant 1083,1,1800000,900000,1
mjolnir_05.gat,134,103,20,20 monster Blue Plant 1079,3,360000,180000,1
mjolnir_05.gat,261,100,20,10 monster Blue Plant 1079,3,360000,180000,1
-mjolnir_05.gat,0,0,0,0 monster Red Plant 1078,10,180000,90000,1
-
-// mjolnir_06 (lv2)
+mjolnir_05.gat,200,240,40,40 monster Shining Plant 1083,1,1800000,900000,1
-mjolnir_06.gat,0,0,0,0 monster Stainer 1174,70,0,0,0
-mjolnir_06.gat,0,0,0,0 monster Horn 1128,20,0,0,0
-mjolnir_06.gat,0,0,0,0 monster Coco 1104,20,0,0,0
+//==================================================
+// mjolnir_06 - Mt.Mjolnir
+//==================================================
+mjolnir_06.gat,0,0,0,0 monster Stainer 1174,50,0,0,0
+mjolnir_06.gat,0,0,0,0 monster Caramel 1103,40,0,0,0
+mjolnir_06.gat,0,0,0,0 monster Horn 1128,30,0,0,0
mjolnir_06.gat,0,0,0,0 monster Poporing 1031,20,0,0,0
-mjolnir_06.gat,0,0,0,0 monster Caramel 1103,30,0,0,0
-mjolnir_06.gat,162,285,0,0 monster Blue Plant 1079,1,360000,180000,1
-mjolnir_06.gat,162,255,0,0 monster Blue Plant 1079,1,360000,180000,1
+mjolnir_06.gat,0,0,0,0 monster Coco 1104,20,0,0,0
mjolnir_06.gat,304,98,0,0 monster Red Mushroom 1085,1,180000,90000,1
mjolnir_06.gat,279,174,0,0 monster Red Mushroom 1085,1,180000,90000,1
mjolnir_06.gat,339,168,0,0 monster Red Mushroom 1085,1,180000,90000,1
@@ -146,48 +150,53 @@ mjolnir_06.gat,45,345,0,0 monster Red Mushroom 1085,1,180000,90000,1
mjolnir_06.gat,73,339,0,0 monster Red Mushroom 1085,1,180000,90000,1
mjolnir_06.gat,69,225,0,0 monster Red Mushroom 1085,1,180000,90000,1
mjolnir_06.gat,55,276,0,0 monster Red Mushroom 1085,1,180000,90000,1
+mjolnir_06.gat,162,285,0,0 monster Blue Plant 1079,1,360000,180000,1
+mjolnir_06.gat,162,255,0,0 monster Blue Plant 1079,1,360000,180000,1
-// mjolnir_07 (lv3)
-
+//==================================================
+// mjolnir_07 - Mt.Mjolnir
+//==================================================
mjolnir_07.gat,0,0,0,0 monster Poison Spore 1077,60,0,0,0
mjolnir_07.gat,0,0,0,0 monster Ambernite 1094,30,0,0,0
-mjolnir_07.gat,0,0,0,0 monster Coco 1104,20,0,0,0
+mjolnir_07.gat,0,0,0,0 monster Hornet 1004,20,0,0,0
mjolnir_07.gat,0,0,0,0 monster Horn 1128,20,0,0,0
mjolnir_07.gat,0,0,0,0 monster Poporing 1031,20,0,0,0
-mjolnir_07.gat,0,0,0,0 monster Hornet 1004,20,0,0,0
+mjolnir_07.gat,0,0,0,0 monster Coco 1104,20,0,0,0
mjolnir_07.gat,314,133,0,0 monster Green Plant 1080,1,180000,90000,1
mjolnir_07.gat,299,145,0,0 monster Green Plant 1080,1,180000,90000,1
mjolnir_07.gat,272,152,0,0 monster Green Plant 1080,1,180000,90000,1
mjolnir_07.gat,273,181,0,0 monster Green Plant 1080,1,180000,90000,1
-mjolnir_07.gat,245,168,0,0 monster Red Mushroom 1085,1,180000,90000,1
-mjolnir_07.gat,217,185,0,0 monster Red Mushroom 1085,1,180000,90000,1
mjolnir_07.gat,181,173,0,0 monster Green Plant 1080,1,180000,90000,1
mjolnir_07.gat,140,179,0,0 monster Green Plant 1080,1,180000,90000,1
mjolnir_07.gat,97,210,0,0 monster Green Plant 1080,1,180000,90000,1
+mjolnir_07.gat,245,168,0,0 monster Red Mushroom 1085,1,180000,90000,1
+mjolnir_07.gat,217,185,0,0 monster Red Mushroom 1085,1,180000,90000,1
mjolnir_07.gat,249,214,0,0 monster Blue Plant 1079,2,360000,180000,1
-// mjolnir_08 (lv4)
-
-mjolnir_08.gat,0,0,0,0 monster Mantis 1139,60,0,0,0
+//==================================================
+// mjolnir_08 - Mt.Mjolnir
+//==================================================
+mjolnir_08.gat,0,0,0,0 monster Mantis 1139,50,0,0,0
+mjolnir_08.gat,0,0,0,0 monster Argos 1100,30,0,0,0
mjolnir_08.gat,0,0,0,0 monster Argiope 1099,30,0,0,0
-mjolnir_08.gat,0,0,0,0 monster Argos 1100,20,0,0,0
mjolnir_08.gat,0,0,0,0 monster Poporing 1031,20,0,0,0
mjolnir_08.gat,0,0,0,0 monster Poring 1002,10,0,0,0
-mjolnir_08.gat,280,280,20,40 monster Blue Plant 1079,2,360000,180000,1
mjolnir_08.gat,207,83,0,0 monster Green Plant 1080,1,180000,90000,1
mjolnir_08.gat,176,153,0,0 monster Green Plant 1080,1,180000,90000,1
mjolnir_08.gat,169,204,0,0 monster Green Plant 1080,1,180000,90000,1
mjolnir_08.gat,207,232,0,0 monster Green Plant 1080,1,180000,90000,1
mjolnir_08.gat,180,282,0,0 monster Green Plant 1080,1,180000,90000,1
mjolnir_08.gat,149,328,0,0 monster Green Plant 1080,1,180000,90000,1
+mjolnir_08.gat,280,280,20,40 monster Blue Plant 1079,2,360000,180000,1
-// mjolnir_09 (lv2)
-
+//==================================================
+// mjolnir_09 - Mt.Mjolnir
+//==================================================
+mjolnir_09.gat,0,0,0,0 monster Horn 1128,100,0,0,0
+mjolnir_09.gat,0,0,0,0 monster Wolf 1013,40,0,0,0
+mjolnir_09.gat,0,0,0,0 monster Poporing 1031,30,0,0,0
+mjolnir_09.gat,0,0,0,0 monster Stainer 1174,30,0,0,0
mjolnir_09.gat,0,0,0,0 monster Coco 1104,10,0,0,0
-mjolnir_09.gat,0,0,0,0 monster Stainer 1174,20,0,0,0
-mjolnir_09.gat,0,0,0,0 monster Horn 1128,70,0,0,0
-mjolnir_09.gat,0,0,0,0 monster Poporing 1031,20,0,0,0
-mjolnir_09.gat,0,0,0,0 monster Wolf 1013,30,0,0,0
mjolnir_09.gat,205,352,0,0 monster Red Mushroom 1085,1,180000,90000,1
mjolnir_09.gat,199,344,0,0 monster Red Mushroom 1085,1,180000,90000,1
mjolnir_09.gat,210,331,0,0 monster Red Mushroom 1085,1,180000,90000,1
@@ -200,40 +209,42 @@ mjolnir_09.gat,120,126,0,0 monster Red Mushroom 1085,1,180000,90000,1
mjolnir_09.gat,139,84,0,0 monster Red Mushroom 1085,1,180000,90000,1
mjolnir_09.gat,125,82,0,0 monster Red Mushroom 1085,1,180000,90000,1
-// mjolnir_10 (lv3)
-
+//==================================================
+// mjolnir_10 - Mt.Mjolnir
+//==================================================
+mjolnir_10.gat,0,0,0,0 monster Argos 1100,50,0,0,0
+mjolnir_10.gat,0,0,0,0 monster Poporing 1031,30,0,0,0
mjolnir_10.gat,0,0,0,0 monster Mantis 1139,20,0,0,0
-mjolnir_10.gat,0,0,0,0 monster Flora 1118,30,0,0,0
-mjolnir_10.gat,0,0,0,0 monster Argos 1100,60,0,0,0
-mjolnir_10.gat,0,0,0,0 monster Poporing 1031,20,0,0,0
-mjolnir_10.gat,0,0,0,0 monster Earth Petite 1155,10,0,0,0
-mjolnir_10.gat,123,331,10,10 monster Shining Plant 1083,1,1800000,900000,1
+mjolnir_10.gat,0,0,0,0 monster Flora 1118,15,0,0,0
+mjolnir_10.gat,0,0,0,0 monster Petite 1155,5,0,0,0
mjolnir_10.gat,0,0,0,0 monster Green Plant 1080,10,180000,90000,1
+mjolnir_10.gat,123,331,10,10 monster Shining Plant 1083,1,1800000,900000,1
-
-// mjolnir_11 (lv4)
-
-mjolnir_11.gat,0,0,0,0 monster Argiope 1099,10,0,0,0
-mjolnir_11.gat,0,0,0,0 monster Mandragora 1020,50,0,0,0
+//==================================================
+// mjolnir_11 - Mt.Mjolnir
+//==================================================
mjolnir_11.gat,0,0,0,0 monster Flora 1118,60,0,0,0
-mjolnir_11.gat,0,0,0,0 monster Poporing 1031,10,0,0,0
+mjolnir_11.gat,0,0,0,0 monster Mandragora 1020,50,0,0,0
mjolnir_11.gat,0,0,0,0 monster Thief Bug Male 1021,30,0,0,0
+mjolnir_11.gat,0,0,0,0 monster Poporing 1031,10,0,0,0
+mjolnir_11.gat,0,0,0,0 monster Argiope 1099,10,0,0,0
mjolnir_11.gat,112,276,0,0 monster Green Plant 1080,1,180000,90000,1
mjolnir_11.gat,159,283,0,0 monster Green Plant 1080,1,180000,90000,1
mjolnir_11.gat,116,240,0,0 monster Green Plant 1080,1,180000,90000,1
mjolnir_11.gat,146,215,0,0 monster Green Plant 1080,1,180000,90000,1
mjolnir_11.gat,145,177,0,0 monster Green Plant 1080,1,180000,90000,1
mjolnir_11.gat,129,135,0,0 monster Green Plant 1080,1,180000,90000,1
-mjolnir_11.gat,126,93,0,0 monster Blue Plant 1079,1,360000,180000,1
mjolnir_11.gat,197,123,0,0 monster Green Plant 1080,1,180000,90000,1
mjolnir_11.gat,198,210,0,0 monster Green Plant 1080,1,180000,90000,1
mjolnir_11.gat,231,277,0,0 monster Green Plant 1080,1,180000,90000,1
-mjolnir_11.gat,332,327,0,0 monster Blue Plant 1079,1,360000,180000,1
mjolnir_11.gat,282,300,0,0 monster Green Plant 1080,1,180000,90000,1
mjolnir_11.gat,295,271,0,0 monster Green Plant 1080,1,180000,90000,1
+mjolnir_11.gat,126,93,0,0 monster Blue Plant 1079,1,360000,180000,1
+mjolnir_11.gat,332,327,0,0 monster Blue Plant 1079,1,360000,180000,1
-// mjolnir_12 (lv3)
-
-mjolnir_12.gat,0,0,0,0 monster Stem Worm 1215,20,0,0,0
+//==================================================
+// mjolnir_12 - Mt.Mjolnir
+//==================================================
mjolnir_12.gat,0,0,0,0 monster Dustiness 1114,50,0,0,0
mjolnir_12.gat,0,0,0,0 monster Thief Bug Female 1053,20,0,0,0
+mjolnir_12.gat,0,0,0,0 monster Stem Worm 1215,20,0,0,0
diff --git a/npc/omobs/fields/morocc.txt b/npc/omobs/fields/morocc.txt
index 2e0507d18..5e5395ab8 100644
--- a/npc/omobs/fields/morocc.txt
+++ b/npc/omobs/fields/morocc.txt
@@ -10,30 +10,25 @@
//=
//============================================================
-// moc_fild01 (lv2)
-
+//==================================================
+// moc_fild01 - Sograt Desert
+//==================================================
moc_fild01.gat,0,0,0,0 monster Baby Desert Wolf 1107,70,0,0,0
+moc_fild01.gat,0,0,0,0 monster Peco Peco Egg 1047,40,0,0,0
+moc_fild01.gat,0,0,0,0 monster Drops 1113,30,0,0,0
moc_fild01.gat,0,0,0,0 monster Ant Egg 1097,20,0,0,0
-moc_fild01.gat,0,0,0,0 monster PecoPeco Egg 1047,20,0,0,0
moc_fild01.gat,0,0,0,0 monster Picky 1049,10,0,0,0
-moc_fild01.gat,0,0,0,0 monster Drops 1113,30,0,0,0
moc_fild01.gat,0,0,0,0 monster Poring 1002,10,0,0,0
moc_fild01.gat,194,51,10,10 monster Yellow Plant 1081,10,900000,450000,1
-// moc_fild02 (lv2)
-
-moc_fild02.gat,0,0,0,0 monster PecoPeco 1019,70,0,0,0
-moc_fild02.gat,0,0,0,0 monster Ant Egg 1097,10,0,0,0
-moc_fild02.gat,0,0,0,0 monster PecoPeco Egg 1047,40,0,0,0
-moc_fild02.gat,0,0,0,0 monster Picky 1049,10,0,0,0
+//==================================================
+// moc_fild02 - Sograt Desert
+//==================================================
+moc_fild02.gat,0,0,0,0 monster Peco Peco 1019,70,0,0,0
+moc_fild02.gat,0,0,0,0 monster Peco Peco Egg 1047,40,0,0,0
moc_fild02.gat,0,0,0,0 monster Drops 1113,30,0,0,0
-moc_fild02.gat,89,315,0,0 monster Yellow Plant 1081,1,180000,90000,1
-moc_fild02.gat,99,261,0,0 monster Yellow Plant 1081,1,180000,90000,1
-moc_fild02.gat,94,195,0,0 monster Yellow Plant 1081,1,180000,90000,1
-moc_fild02.gat,139,222,0,0 monster Yellow Plant 1081,1,180000,90000,1
-moc_fild02.gat,132,307,0,0 monster Yellow Plant 1081,1,180000,90000,1
-moc_fild02.gat,194,294,0,0 monster Yellow Plant 1081,1,180000,90000,1
-moc_fild02.gat,275,241,0,0 monster Yellow Plant 1081,1,180000,90000,1
+moc_fild02.gat,0,0,0,0 monster Picky 1049,10,0,0,0
+moc_fild02.gat,0,0,0,0 monster Ant Egg 1097,10,0,0,0
moc_fild02.gat,342,267,0,0 monster Green Plant 1080,1,180000,90000,1
moc_fild02.gat,359,215,0,0 monster Green Plant 1080,1,180000,90000,1
moc_fild02.gat,313,149,0,0 monster Green Plant 1080,1,180000,90000,1
@@ -41,15 +36,22 @@ moc_fild02.gat,230,62,0,0 monster Green Plant 1080,1,180000,90000,1
moc_fild02.gat,299,61,0,0 monster Green Plant 1080,1,180000,90000,1
moc_fild02.gat,353,103,0,0 monster Green Plant 1080,1,180000,90000,1
moc_fild02.gat,337,35,0,0 monster Green Plant 1080,1,180000,90000,1
+moc_fild02.gat,89,315,0,0 monster Yellow Plant 1081,1,180000,90000,1
+moc_fild02.gat,99,261,0,0 monster Yellow Plant 1081,1,180000,90000,1
+moc_fild02.gat,94,195,0,0 monster Yellow Plant 1081,1,180000,90000,1
+moc_fild02.gat,139,222,0,0 monster Yellow Plant 1081,1,180000,90000,1
+moc_fild02.gat,132,307,0,0 monster Yellow Plant 1081,1,180000,90000,1
+moc_fild02.gat,194,294,0,0 monster Yellow Plant 1081,1,180000,90000,1
+moc_fild02.gat,275,241,0,0 monster Yellow Plant 1081,1,180000,90000,1
-// moc_fild03 (lv3)
-
+//==================================================
+// moc_fild03 - Sograt Desert
+//==================================================
moc_fild03.gat,0,0,0,0 monster Elder Willow 1033,70,0,0,0
-moc_fild03.gat,0,0,0,0 monster Greatest General 1277,30,0,0,0
-moc_fild03.gat,0,0,0,0 monster Poporing 1031,20,0,0,0
-moc_fild03.gat,0,0,0,0 monster Eggyra 1116,10,0,0,0
-moc_fild03.gat,0,0,0,0 monster Willow 1010,20,0,0,0
-moc_fild03.gat,0,0,0,0 monster Vagabond Wolf 1092,1,1800000,1200000,0
+moc_fild03.gat,0,0,0,0 monster Greatest General 1277,40,0,0,0
+moc_fild03.gat,0,0,0,0 monster Poporing 1031,30,0,0,0
+moc_fild03.gat,0,0,0,0 monster Willow 1010,30,0,0,0
+moc_fild03.gat,0,0,0,0 monster Eggyra 1116,20,0,0,0
moc_fild03.gat,77,311,5,5 monster Green Plant 1080,2,180000,90000,1
moc_fild03.gat,108,199,5,5 monster Green Plant 1080,2,180000,90000,1
moc_fild03.gat,96,65,5,5 monster Green Plant 1080,2,180000,90000,1
@@ -57,116 +59,134 @@ moc_fild03.gat,216,69,5,5 monster Green Plant 1080,2,180000,90000,1
moc_fild03.gat,261,161,5,5 monster Green Plant 1080,2,180000,90000,1
moc_fild03.gat,213,201,5,5 monster Green Plant 1080,2,180000,90000,1
moc_fild03.gat,200,263,5,5 monster Green Plant 1080,2,180000,90000,1
+moc_fild03.gat,0,0,0,0 monster Vagabond Wolf 1092,1,1800000,1200000,0
-// moc_fild04 (lv3)
-
-moc_fild04.gat,0,0,0,0 monster Desert Wolf 1106,20,0,0,0
+//==================================================
+// moc_fild04 - Sograt Desert
+//==================================================
+moc_fild04.gat,0,0,0,0 monster Magnolia 1138,40,0,0,0
moc_fild04.gat,0,0,0,0 monster Scorpion 1001,30,0,0,0
moc_fild04.gat,0,0,0,0 monster Metaller 1058,20,0,0,0
-moc_fild04.gat,0,0,0,0 monster Magnolia 1138,40,0,0,0
-moc_fild04.gat,0,0,0,0 monster Ant Egg 1097,10,0,0,0
-moc_fild04.gat,0,0,0,0 monster Andre 1095,20,0,0,0
moc_fild04.gat,0,0,0,0 monster Deniro 1105,20,0,0,0
moc_fild04.gat,0,0,0,0 monster Piere 1160,20,0,0,0
+moc_fild04.gat,0,0,0,0 monster Andre 1095,20,0,0,0
+moc_fild04.gat,0,0,0,0 monster Ant Egg 1097,10,0,0,0
+moc_fild04.gat,0,0,0,0 monster Desert Wolf 1106,10,0,0,0
moc_fild04.gat,313,84,10,10 monster Yellow Plant 1081,10,900000,450000,1
-// moc_fild05 (lv2)
-
-moc_fild05.gat,0,0,0,0 monster Magnolia 1138,30,0,0,0
-moc_fild05.gat,0,0,0,0 monster Metaller 1058,20,0,0,0
+//==================================================
+// moc_fild05 - Sograt Desert
+//==================================================
moc_fild05.gat,0,0,0,0 monster Golem 1040,70,0,0,0
+moc_fild05.gat,0,0,0,0 monster Magnolia 1138,50,0,0,0
+moc_fild05.gat,0,0,0,0 monster Metaller 1058,40,0,0,0
moc_fild05.gat,0,0,0,0 monster Ant Egg 1097,10,0,0,0
-moc_fild05.gat,0,0,0,0 monster Andre 1095,10,0,0,0
moc_fild05.gat,0,0,0,0 monster Deniro 1105,10,0,0,0
moc_fild05.gat,0,0,0,0 monster Piere 1160,10,0,0,0
+moc_fild05.gat,0,0,0,0 monster Andre 1095,10,0,0,0
moc_fild05.gat,208,233,10,10 monster Yellow Plant 1081,5,360000,180000,1
-// moc_fild06 (lv2)
-
-moc_fild06.gat,0,0,0,0 monster PecoPeco 1019,70,0,0,0
-moc_fild06.gat,0,0,0,0 monster Muka 1055,30,0,0,0
+//==================================================
+// moc_fild06 - Sograt Desert
+//==================================================
+moc_fild06.gat,0,0,0,0 monster Peco Peco 1019,70,0,0,0
moc_fild06.gat,0,0,0,0 monster Condor 1009,50,0,0,0
+moc_fild06.gat,0,0,0,0 monster Muka 1055,30,0,0,0
+moc_fild06.gat,0,0,0,0 monster Ant Egg 1097,10,0,0,0
moc_fild06.gat,0,0,0,0 monster Magnolia 1138,10,0,0,0
-moc_fild06.gat,0,0,0,0 monster Andre 1095,5,0,0,0
moc_fild06.gat,0,0,0,0 monster Deniro 1105,5,0,0,0
moc_fild06.gat,0,0,0,0 monster Piere 1160,5,0,0,0
-moc_fild06.gat,0,0,0,0 monster Ant Egg 1097,10,0,0,0
+moc_fild06.gat,0,0,0,0 monster Andre 1095,5,0,0,0
moc_fild06.gat,193,203,10,10 monster Yellow Plant 1081,10,900000,450000,1
-// moc_fild07 (lv1)
-
+//==================================================
+// moc_fild07 - Sograt Desert
+//==================================================
moc_fild07.gat,0,0,0,0 monster Drops 1113,70,0,0,0
-moc_fild07.gat,0,0,0,0 monster PecoPeco Egg 1047,50,0,0,0
-moc_fild07.gat,0,0,0,0 monster Shell Picky 1050,30,0,0,0
+moc_fild07.gat,0,0,0,0 monster Peco Peco Egg 1047,50,0,0,0
moc_fild07.gat,0,0,0,0 monster Picky 1049,30,0,0,0
+moc_fild07.gat,0,0,0,0 monster Picky 1050,30,0,0,0
moc_fild07.gat,162,333,12,12 monster Yellow Plant 1081,5,360000,180000,1
-
-// moc_fild08 (lv4)
-
-moc_fild08.gat,0,0,0,0 monster Magnolia 1138,30,0,0,0
+//==================================================
+// moc_fild08 - Sograt Desert
+//==================================================
moc_fild08.gat,0,0,0,0 monster Scorpion 1001,80,0,0,0
-moc_fild08.gat,0,0,0,0 monster Desert Wolf 1106,30,0,0,0
+moc_fild08.gat,0,0,0,0 monster Desert Wolf 1106,40,0,0,0
+moc_fild08.gat,0,0,0,0 monster Magnolia 1138,30,0,0,0
moc_fild08.gat,0,0,0,0 monster Anacondaq 1030,30,0,0,0
-moc_fild08.gat,0,0,0,0 monster Baby Desert Wolf 1107,10,0,0,0
-moc_fild08.gat,0,0,0,0 monster Drops 1113,10,0,0,0
-
-// moc_fild09 (lv3)
+moc_fild08.gat,0,0,0,0 monster Baby Desert Wolf 1107,20,0,0,0
+moc_fild08.gat,0,0,0,0 monster Drops 1113,20,0,0,0
-moc_fild09.gat,0,0,0,0 monster Desert Wolf 1106,10,0,0,0
+//==================================================
+// moc_fild09 - Sograt Desert
+//==================================================
moc_fild09.gat,0,0,0,0 monster Metaller 1058,70,0,0,0
moc_fild09.gat,0,0,0,0 monster Magnolia 1138,50,0,0,0
-moc_fild09.gat,0,0,0,0 monster Ant Egg 1097,10,0,0,0
-moc_fild09.gat,0,0,0,0 monster Andre 1095,5,0,0,0
+moc_fild09.gat,0,0,0,0 monster Ant Egg 1097,20,0,0,0
+moc_fild09.gat,0,0,0,0 monster Desert Wolf 1106,10,0,0,0
+moc_fild09.gat,0,0,0,0 monster Frilldora 1119,6,0,0,0
moc_fild09.gat,0,0,0,0 monster Deniro 1105,5,0,0,0
moc_fild09.gat,0,0,0,0 monster Piere 1160,5,0,0,0
-moc_fild09.gat,0,0,0,0 monster Ant Egg 1097,10,0,0,0
-moc_fild09.gat,0,0,0,0 monster Frilldora 1119,6,0,0,0
+moc_fild09.gat,0,0,0,0 monster Andre 1095,5,0,0,0
moc_fild09.gat,332,341,5,5 monster Yellow Plant 1081,2,180000,90000,1
moc_fild09.gat,240,313,5,5 monster Yellow Plant 1081,2,180000,90000,1
moc_fild09.gat,305,62,5,5 monster Yellow Plant 1081,2,180000,90000,1
moc_fild09.gat,64,78,5,5 monster Yellow Plant 1081,2,180000,90000,1
moc_fild09.gat,54,325,5,5 monster Yellow Plant 1081,2,180000,90000,1
-// moc_fild10 (lv1)
-
-moc_fild10.gat,0,0,0,0 monster Drops 1113,30,0,0,0
-moc_fild10.gat,0,0,0,0 monster PecoPeco Egg 1047,70,0,0,0
+//==================================================
+// moc_fild10 - Sograt Desert
+//==================================================
+moc_fild10.gat,0,0,0,0 monster Peco Peco Egg 1047,70,0,0,0
moc_fild10.gat,0,0,0,0 monster Picky 1049,50,0,0,0
-moc_fild10.gat,0,0,0,0 monster Shell Picky 1050,50,0,0,0
-moc_fild10.gat,0,0,0,0 monster Magnolia 1138,1,0,0,0
+moc_fild10.gat,0,0,0,0 monster Picky 1050,50,0,0,0
+moc_fild10.gat,0,0,0,0 monster Drops 1113,30,0,0,0
moc_fild10.gat,0,0,0,0 monster Ant Egg 1097,10,0,0,0
+moc_fild10.gat,0,0,0,0 monster Magnolia 1138,1,0,0,0
moc_fild10.gat,198,150,40,30 monster Yellow Plant 1081,10,180000,90000,1
moc_fild10.gat,198,150,40,30 monster Green Plant 1080,5,180000,90000,1
-// moc_fild11 (lv2)
-
-moc_fild11.gat,0,0,0,0 monster Hode 1127,10,0,0,0
+//==================================================
+// moc_fild11 - Sograt Desert
+//==================================================
moc_fild11.gat,0,0,0,0 monster Golem 1040,70,0,0,0
-moc_fild11.gat,0,0,0,0 monster Andre 1095,10,0,0,0
+moc_fild11.gat,0,0,0,0 monster Muka 1055,20,0,0,0
+moc_fild11.gat,0,0,0,0 monster Magnolia 1138,20,0,0,0
+moc_fild11.gat,0,0,0,0 monster Ant Egg 1097,10,0,0,0
+moc_fild11.gat,0,0,0,0 monster Hode 1127,10,0,0,0
moc_fild11.gat,0,0,0,0 monster Deniro 1105,10,0,0,0
moc_fild11.gat,0,0,0,0 monster Piere 1160,10,0,0,0
-moc_fild11.gat,0,0,0,0 monster Ant Egg 1097,10,0,0,0
-moc_fild11.gat,0,0,0,0 monster Magnolia 1138,20,0,0,0
-moc_fild11.gat,0,0,0,0 monster Muka 1055,20,0,0,0
+moc_fild11.gat,0,0,0,0 monster Andre 1095,10,0,0,0
moc_fild11.gat,197,216,0,0 monster Shining Plant 1083,1,1800000,900000,1
-// moc_fild12 (lv1)
-
-moc_fild12.gat,0,0,0,0 monster Shell Picky 1050,50,0,0,0
+//==================================================
+// moc_fild12 - Sograt Desert
+//==================================================
moc_fild12.gat,0,0,0,0 monster Picky 1049,50,0,0,0
-moc_fild12.gat,0,0,0,0 monster PecoPeco Egg 1047,35,0,0,0
+moc_fild12.gat,0,0,0,0 monster Picky 1050,50,0,0,0
+moc_fild12.gat,0,0,0,0 monster Peco Peco Egg 1047,35,0,0,0
moc_fild12.gat,0,0,0,0 monster Drops 1113,35,0,0,0
moc_fild12.gat,181,336,40,20 monster Yellow Plant 1081,10,180000,90000,1
-// moc_fild13 (lv3)
-
-moc_fild13.gat,0,0,0,0 monster Desert Wolf 1106,30,0,0,0
-moc_fild13.gat,0,0,0,0 monster Anacondaq 1030,70,0,0,0
-moc_fild13.gat,0,0,0,0 monster Boa 1025,25,0,0,0
-moc_fild13.gat,0,0,0,0 monster Sidewinder 1037,35,0,0,0
+//==================================================
+// moc_fild13 - Sograt Desert
+//==================================================
+moc_fild13.gat,0,0,0,0 monster Anacondaq 1030,60,0,0,0
+moc_fild13.gat,0,0,0,0 monster Side Winder 1037,40,0,0,0
+moc_fild13.gat,0,0,0,0 monster Snake 1025,25,0,0,0
moc_fild13.gat,0,0,0,0 monster Poporing 1031,20,0,0,0
-moc_fild13.gat,0,0,0,0 monster Drops 1113,10,0,0,0
+moc_fild13.gat,0,0,0,0 monster Drops 1113,20,0,0,0
+moc_fild13.gat,0,0,0,0 monster Desert Wolf 1106,15,0,0,0
+moc_fild13.gat,84,329,0,0 monster Yellow Plant 1081,1,180000,90000,1
+moc_fild13.gat,93,301,0,0 monster Yellow Plant 1081,1,180000,90000,1
+moc_fild13.gat,101,297,0,0 monster Yellow Plant 1081,1,180000,90000,1
+moc_fild13.gat,89,92,0,0 monster Yellow Plant 1081,1,180000,90000,1
+moc_fild13.gat,108,150,0,0 monster Yellow Plant 1081,1,180000,90000,1
+moc_fild13.gat,109,168,0,0 monster Yellow Plant 1081,1,180000,90000,1
+moc_fild13.gat,101,185,5,5 monster Yellow Plant 1081,3,180000,90000,1
+moc_fild13.gat,106,258,5,5 monster Yellow Plant 1081,3,180000,90000,1
+moc_fild13.gat,161,273,5,5 monster Yellow Plant 1081,3,180000,90000,1
moc_fild13.gat,280,99,0,0 monster Red Mushroom 1085,1,180000,90000,1
moc_fild13.gat,264,64,0,0 monster Red Mushroom 1085,1,180000,90000,1
moc_fild13.gat,305,91,0,0 monster Red Mushroom 1085,1,180000,90000,1
@@ -180,38 +200,30 @@ moc_fild13.gat,307,307,0,0 monster Red Mushroom 1085,1,180000,90000,1
moc_fild13.gat,281,333,0,0 monster Red Mushroom 1085,1,180000,90000,1
moc_fild13.gat,304,333,0,0 monster Red Mushroom 1085,1,180000,90000,1
moc_fild13.gat,295,358,0,0 monster Red Mushroom 1085,1,180000,90000,1
-moc_fild13.gat,84,329,0,0 monster Yellow Plant 1081,1,180000,90000,1
-moc_fild13.gat,93,301,0,0 monster Yellow Plant 1081,1,180000,90000,1
-moc_fild13.gat,101,297,0,0 monster Yellow Plant 1081,1,180000,90000,1
-moc_fild13.gat,89,92,0,0 monster Yellow Plant 1081,1,180000,90000,1
-moc_fild13.gat,108,150,0,0 monster Yellow Plant 1081,1,180000,90000,1
-moc_fild13.gat,109,168,0,0 monster Yellow Plant 1081,1,180000,90000,1
-moc_fild13.gat,101,185,5,5 monster Yellow Plant 1081,3,180000,90000,1
-moc_fild13.gat,106,258,5,5 monster Yellow Plant 1081,3,180000,90000,1
-moc_fild13.gat,161,273,5,5 monster Yellow Plant 1081,3,180000,90000,1
-
-// moc_fild14 (lv4)
+//==================================================
+// moc_fild14 - Sograt Desert
+//==================================================
moc_fild14.gat,0,0,0,0 monster Desert Wolf 1106,80,0,0,0
-moc_fild14.gat,0,0,0,0 monster Sidewinder 1037,20,0,0,0
-moc_fild14.gat,0,0,0,0 monster Baby Desert Wolf 1107,40,0,0,0
+moc_fild14.gat,0,0,0,0 monster Side Winder 1037,40,0,0,0
moc_fild14.gat,0,0,0,0 monster Magnolia 1138,25,0,0,0
-moc_fild14.gat,124,93,5,5 monster Shining Plant 1083,1,1800000,900000,1
+moc_fild14.gat,0,0,0,0 monster Baby Desert Wolf 1107,10,0,0,0
moc_fild14.gat,85,271,0,0 monster Yellow Plant 1081,1,180000,90000,1
moc_fild14.gat,165,282,0,0 monster Yellow Plant 1081,1,180000,90000,1
moc_fild14.gat,149,333,0,0 monster Yellow Plant 1081,1,180000,90000,1
moc_fild14.gat,64,342,0,0 monster Yellow Plant 1081,1,180000,90000,1
moc_fild14.gat,160,366,0,0 monster Yellow Plant 1081,1,180000,90000,1
+moc_fild14.gat,124,93,5,5 monster Shining Plant 1083,1,1800000,900000,1
-// moc_fild15 (lv3)
-
+//==================================================
+// moc_fild15 - Sograt Desert
+//==================================================
+moc_fild15.gat,0,0,0,0 monster Andre 1095,40,0,0,0
moc_fild15.gat,0,0,0,0 monster Hode 1127,30,0,0,0
-moc_fild15.gat,0,0,0,0 monster Scorpion 1001,10,0,0,0
-moc_fild15.gat,0,0,0,0 monster Desert Wolf 1106,10,0,0,0
moc_fild15.gat,0,0,0,0 monster Magnolia 1138,25,0,0,0
-moc_fild15.gat,0,0,0,0 monster Andre 1095,40,0,0,0
moc_fild15.gat,0,0,0,0 monster Ant Egg 1097,10,0,0,0
-moc_fild15.gat,0,0,0,0 monster Phreeoni 1159,1,7200000,3600000,1
+moc_fild15.gat,0,0,0,0 monster Scorpion 1001,10,0,0,0
+moc_fild15.gat,0,0,0,0 monster Desert Wolf 1106,10,0,0,0
moc_fild15.gat,40,126,0,0 monster Yellow Plant 1081,1,180000,90000,1
moc_fild15.gat,57,39,0,0 monster Yellow Plant 1081,1,180000,90000,1
moc_fild15.gat,46,250,0,0 monster Yellow Plant 1081,1,180000,90000,1
@@ -224,50 +236,50 @@ moc_fild15.gat,370,85,0,0 monster Yellow Plant 1081,1,180000,90000,1
moc_fild15.gat,158,144,0,0 monster Yellow Plant 1081,1,180000,90000,1
moc_fild15.gat,232,126,0,0 monster Yellow Plant 1081,1,180000,90000,1
moc_fild15.gat,294,74,0,0 monster Yellow Plant 1081,1,180000,90000,1
+moc_fild15.gat,0,0,0,0 monster Phreeoni 1159,1,7200000,3600000,1
-// moc_fild16 (lv4)
-
+//==================================================
+// moc_fild16 - Sograt Desert
+//==================================================
moc_fild16.gat,0,0,0,0 monster Sandman 1165,70,0,0,0
moc_fild16.gat,0,0,0,0 monster Hode 1127,30,0,0,0
moc_fild16.gat,0,0,0,0 monster Magnolia 1138,25,0,0,0
-moc_fild16.gat,0,0,0,0 monster Andre 1095,10,0,0,0
moc_fild16.gat,0,0,0,0 monster Deniro 1105,20,0,0,0
moc_fild16.gat,0,0,0,0 monster Ant Egg 1097,10,0,0,0
+moc_fild16.gat,0,0,0,0 monster Andre 1095,10,0,0,0
-
-// moc_fild17 (lv3)
-
-moc_fild17.gat,0,0,0,0 monster Hode 1127,50,0,0,0
-moc_fild17.gat,0,0,0,0 monster Steel ChonChon 1042,40,0,0,0
-moc_fild17.gat,0,0,0,0 monster Magnolia 1138,15,0,0,0
-moc_fild17.gat,0,0,0,0 monster Frilldora 1119,15,0,0,0
-moc_fild17.gat,0,0,0,0 monster Andre 1095,10,0,0,0
+//==================================================
+// moc_fild17 - Sograt Desert
+//==================================================
+moc_fild17.gat,0,0,0,0 monster Hode 1127,70,0,0,0
+moc_fild17.gat,0,0,0,0 monster Steel Chonchon 1042,30,0,0,0
moc_fild17.gat,0,0,0,0 monster Deniro 1105,20,0,0,0
moc_fild17.gat,0,0,0,0 monster Piere 1160,20,0,0,0
+moc_fild17.gat,0,0,0,0 monster Frilldora 1119,15,0,0,0
moc_fild17.gat,0,0,0,0 monster Ant Egg 1097,10,0,0,0
-moc_fild17.gat,0,0,0,0 monster Scorpion 1001,5,0,0,0
+moc_fild17.gat,0,0,0,0 monster Magnolia 1138,10,0,0,0
+moc_fild17.gat,0,0,0,0 monster Andre 1095,10,0,0,0
moc_fild17.gat,0,0,0,0 monster Sandman 1165,5,0,0,0
moc_fild17.gat,40,258,0,0 monster Yellow Plant 1081,1,180000,90000,1
moc_fild17.gat,144,151,0,0 monster Yellow Plant 1081,1,180000,90000,1
moc_fild17.gat,243,138,0,0 monster Yellow Plant 1081,1,180000,90000,1
-moc_fild17.gat,270,106,0,0 monster Blue Plant 1079,1,180000,90000,1
moc_fild17.gat,335,191,0,0 monster Yellow Plant 1081,1,180000,90000,1
moc_fild17.gat,347,224,0,0 monster Yellow Plant 1081,1,180000,90000,1
moc_fild17.gat,359,258,0,0 monster Yellow Plant 1081,1,180000,90000,1
+moc_fild17.gat,270,106,0,0 monster Blue Plant 1079,1,180000,90000,1
-// moc_fild18 (lv2)
-
-moc_fild18.gat,0,0,0,0 monster Steel ChonChon 1042,70,0,0,0
-moc_fild18.gat,0,0,0,0 monster ChonChon 1011,40,0,0,0
+//==================================================
+// moc_fild18 - Sograt Desert
+//==================================================
+moc_fild18.gat,0,0,0,0 monster Steel Chonchon 1042,70,0,0,0
moc_fild18.gat,0,0,0,0 monster Muka 1055,40,0,0,0
-moc_fild18.gat,0,0,0,0 monster Metaller 1058,10,0,0,0
+moc_fild18.gat,0,0,0,0 monster Chonchon 1011,40,0,0,0
moc_fild18.gat,0,0,0,0 monster Magnolia 1138,25,0,0,0
-moc_fild18.gat,0,0,0,0 monster Andre 1095,5,0,0,0
+moc_fild18.gat,0,0,0,0 monster Metaller 1058,10,0,0,0
+moc_fild18.gat,0,0,0,0 monster Ant Egg 1097,5,0,0,0
moc_fild18.gat,0,0,0,0 monster Deniro 1105,5,0,0,0
moc_fild18.gat,0,0,0,0 monster Piere 1160,5,0,0,0
-moc_fild18.gat,0,0,0,0 monster Ant Egg 1097,5,0,0,0
-moc_fild18.gat,0,0,0,0 monster Dragon Fly 1091,1,3600000,1800000,1
-moc_fild18.gat,0,0,0,0 monster Hunter Fly 1035,1,7200000,3600000,1
+moc_fild18.gat,0,0,0,0 monster Andre 1095,5,0,0,0
moc_fild18.gat,143,352,0,0 monster Yellow Plant 1081,1,180000,90000,1
moc_fild18.gat,72,333,0,0 monster Yellow Plant 1081,1,180000,90000,1
moc_fild18.gat,119,285,0,0 monster Yellow Plant 1081,1,180000,90000,1
@@ -276,3 +288,5 @@ moc_fild18.gat,135,119,0,0 monster Yellow Plant 1081,1,180000,90000,1
moc_fild18.gat,230,144,0,0 monster Yellow Plant 1081,1,180000,90000,1
moc_fild18.gat,325,207,0,0 monster Yellow Plant 1081,1,180000,90000,1
moc_fild18.gat,325,272,0,0 monster Yellow Plant 1081,1,180000,90000,1
+moc_fild18.gat,0,0,0,0 monster Dragon Fly 1091,1,3600000,1800000,1
+moc_fild18.gat,0,0,0,0 monster Hunter Fly 1035,1,3600000,1800000,1
diff --git a/npc/omobs/fields/niflheim.txt b/npc/omobs/fields/niflheim.txt
index d15b434c0..245ed9b1d 100644
--- a/npc/omobs/fields/niflheim.txt
+++ b/npc/omobs/fields/niflheim.txt
@@ -13,36 +13,42 @@
//= 1.4a Readded Lord of Death, why was it removed anyway? [MasterOfMuppets]
//============================================================
-//niflheim
-niflheim.gat,0,0,0,0 monster Dullahan 1504,5,1800000,1200000,0
-niflheim.gat,0,0,0,0 monster Gibbet 1503,10,1200000,600000,0
-niflheim.gat,0,0,0,0 monster Hylozoist 1510,10,1200000,600000,0
-niflheim.gat,0,0,0,0 monster Quve 1508,20,300000,150000,0
-niflheim.gat,0,0,0,0 monster Lude 1509,20,300000,150000,0
-niflheim.gat,0,0,0,0 monster Lord of Death 1373,1,7200000,3600000,1
-
-//nif_fild01
+//==================================================
+// nif_fild01 - Skellington, a Solitary Village in Niflheim
+//==================================================
+nif_fild01.gat,0,0,0,0 monster Quve 1508,30,0,0,0
nif_fild01.gat,0,0,0,0 monster Disguise 1506,20,0,0,0
+nif_fild01.gat,0,0,0,0 monster Dullahan 1504,18,0,0,0
+nif_fild01.gat,0,0,0,0 monster Hylozoist 1510,15,0,0,0
+nif_fild01.gat,0,0,0,0 monster Gibbet 1503,15,0,0,0
nif_fild01.gat,0,0,0,0 monster Disguise 1506,30,300000,120000,0
nif_fild01.gat,227,253,20,20 monster Dullahan 1504,7,1800000,1200000,0
-nif_fild01.gat,0,0,0,0 monster Dullahan 1504,13,0,0,0
-nif_fild01.gat,0,0,0,0 monster Gibbet 1503,10,0,0,0
-nif_fild01.gat,0,0,0,0 monster Hylozoist 1510,10,0,0,0
-nif_fild01.gat,0,0,0,0 monster Quve 1508,30,0,0,0
-//nif_fild02
+//==================================================
+// nif_fild02 - Valley of Gyoll
+//==================================================
+nif_fild02.gat,0,0,0,0 monster Gibbet 1503,10,0,0,0
+nif_fild02.gat,0,0,0,0 monster Bloody Murderer 1507,7,0,0,0
+nif_fild02.gat,0,0,0,0 monster Hylozoist 1510,6,0,0,0
+nif_fild02.gat,0,0,0,0 monster Dullahan 1504,5,0,0,0
+nif_fild02.gat,0,0,0,0 monster Loli Ruri 1505,19,120000,60000,0
+nif_fild02.gat,352,273,15,15 monster Gibbet 1503,5,300000,150000,0
nif_fild02.gat,366,236,15,15 monster Lude 1509,10,360000,150000,0
+nif_fild02.gat,352,273,15,15 monster Dullahan 1504,5,600000,300000,0
+nif_fild02.gat,84,276,15,15 monster Gibbet 1503,5,1200000,600000,0
+nif_fild02.gat,52,115,10,10 monster Hylozoist 1510,4,1200000,600000,0
+nif_fild02.gat,114,136,15,15 monster Loli Ruri 1505,2,1200000,600000,0
nif_fild02.gat,356,139,10,10 monster Bloody Murderer 1507,1,1200000,600000,0
nif_fild02.gat,144,232,10,10 monster Bloody Murderer 1507,1,1200000,600000,0
nif_fild02.gat,118,282,15,15 monster Bloody Murderer 1507,1,1200000,600000,0
nif_fild02.gat,62,327,15,15 monster Bloody Murderer 1507,1,1200000,600000,0
-nif_fild02.gat,0,0,0,0 monster Bloody Murderer 1507,7,0,0,0
-nif_fild02.gat,114,136,15,15 monster Loli Ruri 1505,2,1200000,600000,0
-nif_fild02.gat,52,115,10,10 monster Hylozoist 1510,4,1200000,600000,0
-nif_fild02.gat,84,276,15,15 monster Gibbet 1503,5,1200000,600000,0
-nif_fild02.gat,352,273,15,15 monster Gibbet 1503,5,300000,150000,0
-nif_fild02.gat,0,0,0,0 monster Loli Ruri 1505,19,120000,60000,0
-nif_fild02.gat,352,273,15,15 monster Dullahan 1504,5,600000,300000,0
-nif_fild02.gat,0,0,0,0 monster Dullahan 1504,5,0,0,0
-nif_fild02.gat,0,0,0,0 monster Hylozoist 1510,6,0,0,0
-nif_fild02.gat,0,0,0,0 monster Gibbet 1503,10,0,0,0
+
+//==================================================
+// niflheim - Niflheim, Realm of the Dead
+//==================================================
+niflheim.gat,0,0,0,0 monster Quve 1508,20,300000,150000,0
+//niflheim.gat,0,0,0,0 monster Lude 1509,20,300000,150000,0
+niflheim.gat,0,0,0,0 monster Hylozoist 1510,10,1200000,600000,0
+niflheim.gat,0,0,0,0 monster Gibbet 1503,10,1200000,600000,0
+niflheim.gat,0,0,0,0 monster Dullahan 1504,5,1800000,1200000,0
+niflheim.gat,0,0,0,0 monster Lord of Death 1373,1,7980000,3990000,1
diff --git a/npc/omobs/fields/odin.txt b/npc/omobs/fields/odin.txt
index dea09f865..acf08c163 100644
--- a/npc/omobs/fields/odin.txt
+++ b/npc/omobs/fields/odin.txt
@@ -10,10 +10,9 @@
//= Quantity is incorrect.
//============================================================
-//========================================================================================
-// - Odin Temple 01
-//========================================================================================
-
+//==================================================
+// odin_tem01 - Odin Temple F1
+//==================================================
odin_tem01.gat,0,0,0,0 monster Skeggiold 1754,10,0,0,0
odin_tem01.gat,0,0,0,0 monster Skeggiold 1755,10,0,0,0
odin_tem01.gat,0,0,0,0 monster Breeze 1692,25,0,0,0
@@ -26,10 +25,9 @@ odin_tem01.gat,0,0,0,0 monster Plasma 1697,5,0,0,0
odin_tem01.gat,0,0,0,0 monster Blue Plant 1079,10,180000,90000,1
odin_tem01.gat,0,0,0,0 monster Yellow Plant 1081,10,180000,90000,1
-//========================================================================================
-// - Odin Temple 02
-//========================================================================================
-
+//==================================================
+// odin_tem02 - Odin Temple F2
+//==================================================
odin_tem02.gat,0,0,0,0 monster Skogul 1752,10,0,0,0
odin_tem02.gat,0,0,0,0 monster Frus 1753,10,0,0,0
odin_tem02.gat,0,0,0,0 monster Skeggiold 1754,10,0,0,0
@@ -38,10 +36,9 @@ odin_tem02.gat,0,0,0,0 monster Plasma 1693,30,0,0,0
odin_tem02.gat,0,0,0,0 monster Retribution 1702,10,0,0,0
odin_tem02.gat,0,0,0,0 monster Blue Plant 1079,10,180000,90000,1
-//========================================================================================
-// - Odin Temple 03
-//========================================================================================
-
+//==================================================
+// odin_tem03 - Odin Temple F3
+//==================================================
odin_tem03.gat,0,0,0,0 monster Plasma 1693,15,0,0,0
odin_tem03.gat,0,0,0,0 monster Observation 1700,10,0,0,0
odin_tem03.gat,0,0,0,0 monster Retribution 1702,10,0,0,0
diff --git a/npc/omobs/fields/payon.txt b/npc/omobs/fields/payon.txt
index 24a3d4541..e56efe5dd 100644
--- a/npc/omobs/fields/payon.txt
+++ b/npc/omobs/fields/payon.txt
@@ -10,12 +10,13 @@
//=
//============================================================
-// Pay_fild01 (lv2)
-
-pay_fild01.gat,0,0,0,0 monster Willow 1010,50,0,0,0
-pay_fild01.gat,0,0,0,0 monster Poporing 1031,10,0,0,0
+//==================================================
+// pay_fild01 - Payon Forest
+//==================================================
pay_fild01.gat,0,0,0,0 monster Poring 1002,60,0,0,0
+pay_fild01.gat,0,0,0,0 monster Willow 1010,50,0,0,0
pay_fild01.gat,0,0,0,0 monster Spore 1014,20,0,0,0
+pay_fild01.gat,0,0,0,0 monster Poporing 1031,10,0,0,0
pay_fild01.gat,340,89,0,0 monster Black Mushroom 1084,1,180000,90000,1
pay_fild01.gat,336,116,0,0 monster Black Mushroom 1084,1,180000,90000,1
pay_fild01.gat,231,258,0,0 monster Black Mushroom 1084,1,180000,90000,1
@@ -33,109 +34,119 @@ pay_fild01.gat,64,190,0,0 monster Black Mushroom 1084,1,180000,90000,1
pay_fild01.gat,70,246,0,0 monster Black Mushroom 1084,1,180000,90000,1
pay_fild01.gat,0,0,0,0 monster Green Plant 1080,5,180000,90000,1
-// Pay_fild02 (lv2)
-
-pay_fild02.gat,0,0,0,0 monster Boa 1025,30,0,0,0
+//==================================================
+// pay_fild02 - Payon Forest
+//==================================================
pay_fild02.gat,0,0,0,0 monster Wolf 1013,70,0,0,0
-pay_fild02.gat,0,0,0,0 monster Spore 1014,10,0,0,0
-pay_fild02.gat,0,0,0,0 monster Poporing 1031,20,0,0,0
+pay_fild02.gat,0,0,0,0 monster Snake 1025,50,0,0,0
+pay_fild02.gat,0,0,0,0 monster Poporing 1031,30,0,0,0
+pay_fild02.gat,0,0,0,0 monster Spore 1014,20,0,0,0
pay_fild02.gat,105,256,10,10 monster Green Plant 1080,4,360000,180000,1
pay_fild02.gat,105,256,10,10 monster Red Mushroom 1085,4,360000,180000,1
-// Pay_fild03 (lv1)
-
+//==================================================
+// pay_fild03 - Payon Forest
+//==================================================
+pay_fild03.gat,0,0,0,0 monster Lunatic 1063,50,0,0,0
+pay_fild03.gat,0,0,0,0 monster Pupa 1008,50,0,0,0
pay_fild03.gat,0,0,0,0 monster Poring 1002,30,0,0,0
pay_fild03.gat,0,0,0,0 monster Willow 1010,30,0,0,0
-pay_fild03.gat,0,0,0,0 monster Pupa 1008,50,0,0,0
-pay_fild03.gat,0,0,0,0 monster Lunatic 1063,50,0,0,0
-pay_fild03.gat,153,216,10,10 monster Red Mushroom 1085,6,900000,450000,1
pay_fild03.gat,372,64,15,15 monster Green Plant 1080,4,180000,90000,1
+pay_fild03.gat,153,216,10,10 monster Red Mushroom 1085,6,900000,450000,1
-// pay_fild04 (lv2)
-
-pay_fild04.gat,0,0,0,0 monster Poring 1002,40,0,0,0
-pay_fild04.gat,0,0,0,0 monster Drops 1113,40,0,0,0
-pay_fild04.gat,0,0,0,0 monster Poporing 1031,40,0,0,0
+//==================================================
+// pay_fild04 - Sograt Desert
+//==================================================
+pay_fild04.gat,0,0,0,0 monster Poporing 1031,50,0,0,0
+pay_fild04.gat,0,0,0,0 monster Poring 1002,50,0,0,0
+pay_fild04.gat,0,0,0,0 monster Drops 1113,50,0,0,0
pay_fild04.gat,0,0,0,0 monster Marin 1242,10,0,0,0
-pay_fild04.gat,0,0,0,0 monster Ghostring 1120,1,3600000,1800000,1
-pay_fild04.gat,0,0,0,0 monster Mastering 1090,1,3600000,1800000,1
-pay_fild04.gat,0,0,0,0 monster Angeling 1096,1,3600000,1800000,1
-pay_fild04.gat,0,0,0,0 monster Deviling 1582,1,7200000,3600000,1
-pay_fild04.gat,346,335,5,5 monster Shining Plant 1083,1,1800000,900000,1
pay_fild04.gat,254,193,10,10 monster Green Plant 1080,5,360000,180000,1
-
-// Pay_fild05 (lv4)
-
-pay_fild05.gat,0,0,0,0 monster Dragon Tail 1321,5,0,0,0
-pay_fild05.gat,0,0,0,0 monster Poporing 1031,20,0,0,0
-pay_fild05.gat,0,0,0,0 monster Poison Spore 1077,65,0,0,0
+pay_fild04.gat,0,0,0,0 monster Mastering 1090,1,1800000,900000,1
+pay_fild04.gat,0,0,0,0 monster Angeling 1096,1,1800000,900000,1
+pay_fild04.gat,346,335,5,5 monster Shining Plant 1083,1,1800000,900000,1
+pay_fild04.gat,0,0,0,0 monster Ghostring 1120,1,1800000,900000,1
+pay_fild04.gat,0,0,0,0 monster Deviling 1582,1,3600000,1800000,1
+
+//==================================================
+// pay_fild05 - Payon Forest
+//==================================================
+pay_fild05.gat,0,0,0,0 monster Poison Spore 1077,70,0,0,0
+pay_fild05.gat,0,0,0,0 monster Poporing 1031,50,0,0,0
+pay_fild05.gat,0,0,0,0 monster Dragon Tail 1321,1,0,0,0
pay_fild05.gat,95,147,5,5 monster Green Plant 1080,4,900000,450000,1
pay_fild05.gat,86,90,5,5 monster Green Plant 1080,4,900000,450000,1
-// Pay_fild06 (lv2)
-
-pay_fild06.gat,0,0,0,0 monster Worm Tail 1024,70,0,0,0
-pay_fild06.gat,0,0,0,0 monster Spore 1014,20,0,0,0
-pay_fild06.gat,0,0,0,0 monster Poporing 1031,20,0,0,0
+//==================================================
+// pay_fild06 - Payon Forest
+//==================================================
+pay_fild06.gat,0,0,0,0 monster Wormtail 1024,100,0,0,0
pay_fild06.gat,0,0,0,0 monster Thief Bug Female 1053,40,0,0,0
+pay_fild06.gat,0,0,0,0 monster Spore 1014,40,0,0,0
+pay_fild06.gat,0,0,0,0 monster Poporing 1031,20,0,0,0
pay_fild06.gat,211,191,2,10 monster Red Mushroom 1085,8,180000,90000,1
pay_fild06.gat,268,155,20,20 monster Green Plant 1080,10,360000,180000,1
pay_fild06.gat,268,155,20,20 monster Shining Plant 1083,1,1800000,900000,1
-// pay_fild07 (lv3)
-
+//==================================================
+// pay_fild07 - Payon Forest
+//==================================================
pay_fild07.gat,0,0,0,0 monster Elder Willow 1033,70,0,0,0
pay_fild07.gat,0,0,0,0 monster Eggyra 1116,40,0,0,0
+pay_fild07.gat,0,0,0,0 monster Bigfoot 1060,30,0,0,0
pay_fild07.gat,0,0,0,0 monster Poporing 1031,20,0,0,0
pay_fild07.gat,0,0,0,0 monster Willow 1010,20,0,0,0
-pay_fild07.gat,0,0,0,0 monster Bigfoot 1060,30,0,0,0
pay_fild07.gat,171,331,20,20 monster Green Plant 1080,8,900000,450000,1
-// pay_fild08 (lv1)
-
-pay_fild08.gat,0,0,0,0 monster Poring 1002,30,0,0,0
+//==================================================
+// pay_fild08 - Payon Forest
+//==================================================
pay_fild08.gat,0,0,0,0 monster Willow 1010,70,0,0,0
-pay_fild08.gat,0,0,0,0 monster Pupa 1008,20,0,0,0
pay_fild08.gat,0,0,0,0 monster Spore 1014,50,0,0,0
+pay_fild08.gat,0,0,0,0 monster Poring 1002,30,0,0,0
+pay_fild08.gat,0,0,0,0 monster Pupa 1008,20,0,0,0
pay_fild08.gat,0,0,0,0 monster Green Plant 1080,10,60000,30000,1
pay_fild08.gat,143,156,40,40 monster Shining Plant 1083,1,3600000,1800000,1
-// pay_fild09 (lv2)
-
-pay_fild09.gat,0,0,0,0 monster Spore 1014,20,0,0,0
-pay_fild09.gat,0,0,0,0 monster Worm Tail 1024,20,0,0,0
-pay_fild09.gat,0,0,0,0 monster Poporing 1031,20,0,0,0
-pay_fild09.gat,0,0,0,0 monster Boa 1025,30,0,0,0
-pay_fild09.gat,0,0,0,0 monster Sohee 1170,3,0,0,0
+//==================================================
+// pay_fild09 - Payon Forest
+//==================================================
+pay_fild09.gat,0,0,0,0 monster Bigfoot 1060,65,0,0,0
pay_fild09.gat,0,0,0,0 monster Smokie 1056,50,0,0,0
-pay_fild09.gat,0,0,0,0 monster Bigfoot 1060,50,0,0,0
+pay_fild09.gat,0,0,0,0 monster Snake 1025,30,0,0,0
+pay_fild09.gat,0,0,0,0 monster Poporing 1031,20,0,0,0
+pay_fild09.gat,0,0,0,0 monster Wormtail 1024,20,0,0,0
+pay_fild09.gat,0,0,0,0 monster Spore 1014,20,0,0,0
+pay_fild09.gat,0,0,0,0 monster Sohee 1170,5,0,0,0
pay_fild09.gat,198,217,30,30 monster Green Plant 1080,10,360000,180000,0
pay_fild09.gat,198,217,30,30 monster Shining Plant 1083,1,1800000,900000,1
+pay_fild09.gat,0,0,0,0 monster Wanderer 1208,1,3600000,1800000,1
-// pay_fild10 (lv4)
-
+//==================================================
+// pay_fild10 - Payon Forest
+//==================================================
pay_fild10.gat,0,0,0,0 monster Greatest General 1277,65,0,0,0
pay_fild10.gat,0,0,0,0 monster Horong 1129,40,0,0,0
-pay_fild10.gat,0,0,0,0 monster Poison Spore 1077,20,0,0,0
pay_fild10.gat,0,0,0,0 monster Poporing 1031,30,0,0,0
-pay_fild10.gat,0,0,0,0 monster Nine-Tail 1180,3,0,0,0
-pay_fild10.gat,0,0,0,0 monster Nine-Tail 1180,1,1800000,900000,1
-pay_fild10.gat,0,0,0,0 monster Nine-Tail 1180,1,900000,450000,1
+pay_fild10.gat,0,0,0,0 monster Poison Spore 1077,20,0,0,0
+pay_fild10.gat,0,0,0,0 monster Nine Tail 1180,1,0,0,0
pay_fild10.gat,213,157,10,10 monster Green Plant 1080,5,360000,180000,1
pay_fild10.gat,281,307,10,10 monster Green Plant 1080,5,360000,180000,1
pay_fild10.gat,66,332,10,10 monster Green Plant 1080,5,360000,180000,1
pay_fild10.gat,213,157,10,10 monster Blue Plant 1079,1,360000,180000,1
pay_fild10.gat,281,307,10,10 monster Blue Plant 1079,1,360000,180000,1
pay_fild10.gat,66,332,10,10 monster Blue Plant 1079,1,360000,180000,1
+pay_fild10.gat,0,0,0,0 monster Nine Tail 1180,2,600000,300000,1
-// Pay_fild11 (lv4)
-
+//==================================================
+// pay_fild11 - Payon Forest
+//==================================================
pay_fild11.gat,0,0,0,0 monster Horong 1129,50,0,0,0
+pay_fild11.gat,0,0,0,0 monster Poison Spore 1077,40,0,0,0
pay_fild11.gat,0,0,0,0 monster Greatest General 1277,30,0,0,0
-pay_fild11.gat,0,0,0,0 monster Elder Willow 1033,10,0,0,0
pay_fild11.gat,0,0,0,0 monster Poporing 1031,20,0,0,0
-pay_fild11.gat,0,0,0,0 monster Poison Spore 1077,40,0,0,0
-pay_fild11.gat,0,0,0,0 monster Dragon Tail 1321,10,0,0,0
-pay_fild11.gat,0,0,0,0 monster Eddga 1115,1,7200000,3600000,1
+pay_fild11.gat,0,0,0,0 monster Elder Willow 1033,10,0,0,0
+pay_fild11.gat,0,0,0,0 monster Dragon Tail 1321,10,0,0,0x
pay_fild11.gat,241,162,5,5 monster Red Mushroom 1085,3,360000,180000,1
pay_fild11.gat,66,293,5,5 monster Red Mushroom 1085,3,360000,180000,1
+pay_fild11.gat,0,0,0,0 monster Eddga 1115,1,7200000,3600000,1
diff --git a/npc/omobs/fields/prontera.txt b/npc/omobs/fields/prontera.txt
index b6fa83014..74d8acb27 100644
--- a/npc/omobs/fields/prontera.txt
+++ b/npc/omobs/fields/prontera.txt
@@ -10,117 +10,128 @@
//= 1.2 fixed some map name typos [Lupus]
//============================================================
-// prt_fild00 (lv2)
-
-prt_fild00.gat,0,0,0,0 monster Creamy 1018,10,0,0,0
-prt_fild00.gat,0,0,0,0 monster Fabre 1007,20,0,0,0
+//==================================================
+// prt_fild00 - Prontera Field
+//==================================================
prt_fild00.gat,0,0,0,0 monster Pupa 1008,50,0,0,0
-prt_fild00.gat,0,0,0,0 monster Lunatic 1063,30,0,0,0
-prt_fild00.gat,0,0,0,0 monster Poring 1002,40,0,0,0
prt_fild00.gat,0,0,0,0 monster Hornet 1004,40,0,0,0
-prt_fild00.gat,227,212,0,0 monster Shining Plant 1083,1,1800000,900000,1
+prt_fild00.gat,0,0,0,0 monster Poring 1002,40,0,0,0
+prt_fild00.gat,0,0,0,0 monster Lunatic 1063,30,0,0,0
+prt_fild00.gat,0,0,0,0 monster Fabre 1007,20,0,0,0
+prt_fild00.gat,0,0,0,0 monster Creamy 1018,10,0,0,0
prt_fild00.gat,285,138,10,10 monster Green Plant 1080,5,360000,180000,1
+prt_fild00.gat,227,212,0,0 monster Shining Plant 1083,1,1800000,900000,1
-
-// prt_fild01 (lv1)
-
-prt_fild01.gat,0,0,0,0 monster Thief Bug Larva 1051,30,0,0,0
-prt_fild01.gat,0,0,0,0 monster Fabre 1007,20,0,0,0
-prt_fild01.gat,0,0,0,0 monster Pupa 1008,10,0,0,0
+//==================================================
+// prt_fild01 - Prontera Field
+//==================================================
prt_fild01.gat,0,0,0,0 monster Lunatic 1063,80,0,0,0
prt_fild01.gat,0,0,0,0 monster Poring 1002,30,0,0,0
+prt_fild01.gat,0,0,0,0 monster Thief Bug 1051,30,0,0,0
+prt_fild01.gat,0,0,0,0 monster Fabre 1007,20,0,0,0
+prt_fild01.gat,0,0,0,0 monster Pupa 1008,10,0,0,0
prt_fild01.gat,199,266,3,3 monster Green Plant 1080,3,360000,180000,1
prt_fild01.gat,199,266,3,3 monster Blue Plant 1079,1,900000,450000,1
-// prt_fild02 (lv2)
-
-prt_fild02.gat,0,0,0,0 monster Mandragora 1020,70,0,0,0
+//==================================================
+// prt_fild02 - Prontera Field
+//==================================================
+prt_fild02.gat,0,0,0,0 monster Mandragora 1020,75,0,0,0
+prt_fild02.gat,0,0,0,0 monster Lunatic 1063,60,0,0,0
prt_fild02.gat,0,0,0,0 monster Fabre 1007,50,0,0,0
-prt_fild02.gat,0,0,0,0 monster Pupa 1008,20,0,0,0
-prt_fild02.gat,0,0,0,0 monster Lunatic 1063,10,0,0,0
prt_fild02.gat,0,0,0,0 monster Poring 1002,30,0,0,0
-prt_fild02.gat,0,0,0,0 monster Eclipse 1093,1,1800000,1200000,0
-prt_fild02.gat,339,309,3,3 monster Shining Plant 1083,1,1800000,900000,1
+prt_fild02.gat,0,0,0,0 monster Pupa 1008,20,0,0,0
prt_fild02.gat,0,0,0,0 monster Shining Plant 1083,2,1800000,900000,1
+prt_fild02.gat,339,309,3,3 monster Shining Plant 1083,1,1800000,900000,1
+prt_fild02.gat,0,0,0,0 monster Eclipse 1093,1,3600000,1800000,0
-// prt_fild03 (lv2)
-
+//==================================================
+// prt_fild03 - Prontera Field
+//==================================================
prt_fild03.gat,0,0,0,0 monster Yoyo 1057,70,0,0,0
-prt_fild03.gat,0,0,0,0 monster Smokie 1056,40,0,0,0
-prt_fild03.gat,0,0,0,0 monster Choco 1214,3,1800000,900000,0
+prt_fild03.gat,0,0,0,0 monster Smokie 1056,50,0,0,0
+prt_fild03.gat,0,0,0,0 monster Poring 1002,30,0,0,0
prt_fild03.gat,0,0,0,0 monster Fabre 1007,10,0,0,0
-prt_fild03.gat,0,0,0,0 monster Poporing 1031,30,0,0,0
-prt_fild03.gat,296,58,15,15 monster Green Plant 1080,5,180000,90000,1
+prt_fild03.gat,0,0,0,0 monster Green Plant 1080,15,360000,180000,1
+prt_fild03.gat,296,58,15,15 monster Green Plant 1080,5,360000,180000,1
prt_fild03.gat,296,58,15,15 monster Blue Plant 1079,2,900000,450000,1
+prt_fild03.gat,0,0,0,0 monster Choco 1214,3,1800000,900000,0
-// prt_fild04 (lv2)
-
+//==================================================
+// prt_fild04 - Prontera Field
+//==================================================
prt_fild04.gat,0,0,0,0 monster Rocker 1052,70,0,0,0
prt_fild04.gat,0,0,0,0 monster Creamy 1018,40,0,0,0
-prt_fild04.gat,0,0,0,0 monster Pupa 1008,10,0,0,0
prt_fild04.gat,0,0,0,0 monster Poring 1002,30,0,0,0
-prt_fild04.gat,0,0,0,0 monster Vocal 1088,1,1800000,1200000,0
-prt_fild04.gat,350,114,10,10 monster Green Plant 1080,5,900000,450000,1
-prt_fild04.gat,307,75,5,5 monster Green Plant 1080,5,360000,180000,1
-prt_fild04.gat,147,319,5,5 monster Green Plant 1080,5,360000,180000,1
-prt_fild04.gat,148,107,5,5 monster Green Plant 1080,5,360000,180000,1
+prt_fild04.gat,0,0,0,0 monster Pupa 1008,10,0,0,0
+prt_fild04.gat,0,0,0,0 monster Green Plant 1080,5,360000,180000,1
+prt_fild04.gat,0,0,0,0 monster Vocal 1088,1,3600000,1800000,1
-// prt_fild05 (lv1)
+//==================================================
+// prt_fild05 - Prontera Field
+//==================================================
prt_fild05.gat,0,0,0,0 monster Poring 1002,70,0,0,0
-prt_fild05.gat,0,0,0,0 monster Thief Bug Egg 1048,20,0,0,0
prt_fild05.gat,0,0,0,0 monster Lunatic 1063,30,0,0,0
prt_fild05.gat,0,0,0,0 monster Pupa 1008,30,0,0,0
-prt_fild05.gat,0,0,0,0 monster Thief Bug Larva 1051,10,0,0,0
+prt_fild05.gat,0,0,0,0 monster Thief Bug Egg 1048,20,0,0,0
+prt_fild05.gat,0,0,0,0 monster Thief Bug 1051,10,0,0,0
prt_fild05.gat,208,37,10,10 monster Green Plant 1080,6,900000,450000,1
prt_fild05.gat,208,37,10,10 monster Blue Plant 1079,1,900000,450000,1
-// prt_fild06 (lv2)
-
+//==================================================
+// prt_fild06 - Prontera Field
+//==================================================
+prt_fild06.gat,0,0,0,0 monster Poring 1002,60,0,0,0
prt_fild06.gat,0,0,0,0 monster Lunatic 1063,60,0,0,0
prt_fild06.gat,0,0,0,0 monster Thief Bug Egg 1048,20,0,0,0
-prt_fild06.gat,0,0,0,0 monster Thief Bug Larva 1051,10,0,0,0
prt_fild06.gat,0,0,0,0 monster Pupa 1008,20,0,0,0
-prt_fild06.gat,0,0,0,0 monster Poring 1002,60,0,0,0
+prt_fild06.gat,0,0,0,0 monster Thief Bug 1051,10,0,0,0
prt_fild06.gat,222,30,40,10 monster Green Plant 1080,15,900000,450000,1
-// prt_fild07 (lv2)
-
-prt_fild07.gat,0,0,0,0 monster Rocker 1052,70,0,0,0
+//==================================================
+// prt_fild07 - Prontera Field
+//==================================================
+prt_fild07.gat,0,0,0,0 monster Rocker 1052,120,0,0,0
prt_fild07.gat,0,0,0,0 monster Poporing 1031,30,0,0,0
prt_fild07.gat,225,110,5,5 monster Black Mushroom 1084,3,360000,180000,1
-// prt_fild08 (lv1)
-
+//==================================================
+// prt_fild08 - Prontera Field
+//==================================================
+prt_fild08.gat,0,0,0,0 monster Poring 1002,100,0,0,0
prt_fild08.gat,0,0,0,0 monster Lunatic 1063,40,0,0,0
prt_fild08.gat,0,0,0,0 monster Pupa 1008,20,0,0,0
-prt_fild08.gat,0,0,0,0 monster Poring 1002,70,0,0,0
prt_fild08.gat,0,0,0,0 monster Drops 1113,10,0,0,0
-// prt_fild09 (lv2)
-
+//==================================================
+// prt_fild09 - Prontera Field
+//==================================================
prt_fild09.gat,0,0,0,0 monster Savage Babe 1167,70,0,0,0
-prt_fild09.gat,0,0,0,0 monster Baby Desert Wolf 1107,20,0,0,0
-prt_fild09.gat,0,0,0,0 monster PecoPeco Egg 1047,20,0,0,0
prt_fild09.gat,0,0,0,0 monster Picky 1049,20,0,0,0
+prt_fild09.gat,0,0,0,0 monster Baby Desert Wolf 1107,20,0,0,0
+prt_fild09.gat,0,0,0,0 monster Peco Peco Egg 1047,20,0,0,0
prt_fild09.gat,0,0,0,0 monster Condor 1009,10,0,0,0
prt_fild09.gat,237,115,5,5 monster Yellow Plant 1081,3,360000,180000,1
-// prt_fild10 (lv3)
+//==================================================
+// prt_fild10 - Prontera Field
+//==================================================
prt_fild10.gat,0,0,0,0 monster Savage 1166,70,0,0,0
prt_fild10.gat,0,0,0,0 monster Savage Babe 1167,40,0,0,0
prt_fild10.gat,0,0,0,0 monster Poporing 1031,20,0,0,0
-prt_fild10.gat,0,0,0,0 monster Thief Bug Larva 1051,10,0,0,0
+prt_fild10.gat,0,0,0,0 monster Thief Bug 1051,10,0,0,0
prt_fild10.gat,99,114,20,5 monster Red Mushroom 1085,15,360000,180000,1
prt_fild10.gat,155,179,10,10 monster Shining Plant 1083,1,1800000,900000,1
-// prt_fild11 (lv4)
-
-prt_fild11.gat,0,0,0,0 monster Goblin 1122,10,0,0,0
-prt_fild11.gat,0,0,0,0 monster Goblin 1123,20,0,0,0
-prt_fild11.gat,0,0,0,0 monster Goblin 1124,20,0,0,0
+//==================================================
+// prt_fild11 - Prontera Field
+//==================================================
+prt_fild11.gat,0,0,0,0 monster Goblin Steamrider 1280,30,0,0,0
+prt_fild11.gat,0,0,0,0 monster Goblin 1122,30,0,0,0
+prt_fild11.gat,0,0,0,0 monster Goblin 1123,30,0,0,0
prt_fild11.gat,0,0,0,0 monster Goblin 1125,30,0,0,0
prt_fild11.gat,0,0,0,0 monster Goblin 1126,30,0,0,0
-prt_fild11.gat,0,0,0,0 monster Goblin Archer 1258,10,0,0,0
-prt_fild11.gat,0,0,0,0 monster Panzer Goblin 1308,1,1800000,1200000,0
-prt_fild11.gat,0,0,0,0 monster Steam Goblin 1280,30,0,0,0
+prt_fild11.gat,0,0,0,0 monster Goblin Archer 1258,20,0,0,0
+prt_fild11.gat,0,0,0,0 monster Goblin 1124,20,0,0,0
+prt_fild11.gat,0,0,0,0 monster Panzer Goblin 1308,1,0,0,0
prt_fild11.gat,0,0,0,0 monster Red Mushroom 1085,10,180000,90000,1
diff --git a/npc/omobs/fields/umbala.txt b/npc/omobs/fields/umbala.txt
index 6754af0e2..ed214249d 100644
--- a/npc/omobs/fields/umbala.txt
+++ b/npc/omobs/fields/umbala.txt
@@ -10,79 +10,90 @@
//=
//============================================================
-
-//um_fild01
-
-um_fild01.gat,0,0,0,0 monster Wootan Fighter 1499,10,0,0,0
-um_fild01.gat,0,0,0,0 monster Stem Worm 1215,30,0,0,0
-um_fild01.gat,0,0,0,0 monster Harpy 1376,2,0,0,0
+//==================================================
+// um_fild01 - Luluka Forest
+//==================================================
um_fild01.gat,0,0,0,0 monster Dryad 1493,40,0,0,0
+um_fild01.gat,0,0,0,0 monster Stem Worm 1215,30,0,0,0
um_fild01.gat,0,0,0,0 monster Dustiness 1114,20,0,0,0
+um_fild01.gat,0,0,0,0 monster Wootan Fighter 1499,10,0,0,0
+um_fild01.gat,0,0,0,0 monster Harpy 1376,2,0,0,0
+um_fild01.gat,0,0,0,0 monster Green Plant 1080,10,1800000,900000,1
+um_fild01.gat,0,0,0,0 monster Yellow Plant 1081,10,1800000,900000,1
+um_fild01.gat,0,0,0,0 monster Shining Plant 1083,6,1800000,900000,1
-
-//um_fild02
-
-um_fild02.gat,0,0,0,0 monster Beetle King 1494,30,0,0,0
-um_fild02.gat,0,0,0,0 monster Dustiness 1114,20,0,0,0
+//==================================================
+// um_fild02 - Hoomga Forest
+//==================================================
um_fild02.gat,0,0,0,0 monster Wootan Fighter 1499,26,0,0,0
+um_fild02.gat,169,215,10,10 monster Wootan Fighter 1499,2,120000,60000,0
+um_fild02.gat,159,285,10,10 monster Wootan Fighter 1499,2,120000,60000,0
+um_fild02.gat,99,303,10,10 monster Wootan Fighter 1499,2,120000,60000,0
+um_fild02.gat,122,242,10,10 monster Wootan Fighter 1499,2,120000,60000,0
+um_fild02.gat,124,198,10,10 monster Wootan Fighter 1499,2,120000,60000,0
+um_fild02.gat,126,133,10,10 monster Wootan Fighter 1499,2,120000,60000,0
+um_fild02.gat,159,171,10,10 monster Wootan Fighter 1499,2,120000,60000,0
+um_fild02.gat,284,247,10,10 monster Wootan Fighter 1499,2,120000,60000,0
+um_fild02.gat,330,262,10,10 monster Wootan Fighter 1499,2,120000,60000,0
+um_fild02.gat,296,187,10,10 monster Wootan Fighter 1499,2,120000,60000,0
+um_fild02.gat,285,105,10,10 monster Wootan Fighter 1499,2,120000,60000,0
+um_fild02.gat,257,137,10,10 monster Wootan Fighter 1499,2,120000,60000,0
+um_fild02.gat,0,0,0,0 monster Beetle King 1494,30,0,0,0
um_fild02.gat,0,0,0,0 monster Stone Shooter 1495,13,0,0,0
um_fild02.gat,169,215,10,10 monster Stone Shooter 1495,1,120000,60000,0
-um_fild02.gat,169,215,10,10 monster Wootan Fighter 1499,2,120000,60000,0
um_fild02.gat,159,285,10,10 monster Stone Shooter 1495,1,120000,60000,0
-um_fild02.gat,159,285,10,10 monster Wootan Fighter 1499,2,120000,60000,0
um_fild02.gat,99,303,10,10 monster Stone Shooter 1495,1,120000,60000,0
-um_fild02.gat,99,303,10,10 monster Wootan Fighter 1499,2,120000,60000,0
um_fild02.gat,122,242,10,10 monster Stone Shooter 1495,1,120000,60000,0
-um_fild02.gat,122,242,10,10 monster Wootan Fighter 1499,2,120000,60000,0
um_fild02.gat,124,198,10,10 monster Stone Shooter 1495,1,120000,60000,0
-um_fild02.gat,124,198,10,10 monster Wootan Fighter 1499,2,120000,60000,0
um_fild02.gat,126,133,10,10 monster Stone Shooter 1495,1,120000,60000,0
-um_fild02.gat,126,133,10,10 monster Wootan Fighter 1499,2,120000,60000,0
um_fild02.gat,159,171,10,10 monster Stone Shooter 1495,1,120000,60000,0
-um_fild02.gat,159,171,10,10 monster Wootan Fighter 1499,2,120000,60000,0
um_fild02.gat,284,247,10,10 monster Stone Shooter 1495,1,120000,60000,0
-um_fild02.gat,284,247,10,10 monster Wootan Fighter 1499,2,120000,60000,0
um_fild02.gat,330,262,10,10 monster Stone Shooter 1495,1,120000,60000,0
-um_fild02.gat,330,262,10,10 monster Wootan Fighter 1499,2,120000,60000,0
um_fild02.gat,296,187,10,10 monster Stone Shooter 1495,1,120000,60000,0
-um_fild02.gat,296,187,10,10 monster Wootan Fighter 1499,2,120000,60000,0
um_fild02.gat,285,105,10,10 monster Stone Shooter 1495,1,120000,60000,0
-um_fild02.gat,285,105,10,10 monster Wootan Fighter 1499,2,120000,60000,0
um_fild02.gat,257,137,10,10 monster Stone Shooter 1495,1,120000,60000,0
-um_fild02.gat,257,137,10,10 monster Wootan Fighter 1499,2,120000,60000,0
-um_fild02.gat,360,320,20,30 monster Flora 1118,3,180000,120000,0
+um_fild02.gat,0,0,0,0 monster Dustiness 1114,20,0,0,0
um_fild02.gat,0,0,0,0 monster Coco 1104,10,0,0,0
um_fild02.gat,0,0,0,0 monster Choco 1214,3,0,0,0
+um_fild02.gat,360,320,20,30 monster Flora 1118,3,180000,90000,0
+um_fild02.gat,0,0,0,0 monster Red Plant 1078,5,1800000,900000,1
+um_fild02.gat,0,0,0,0 monster Yellow Plant 1081,5,1800000,900000,1
-
-//um_fild03
-
+//==================================================
+// um_fild03 - Kalala Swamp
+//==================================================
um_fild03.gat,0,0,0,0 monster Parasite 1500,60,0,0,0
um_fild03.gat,0,0,0,0 monster Dragon Tail 1321,45,0,0,0
um_fild03.gat,0,0,0,0 monster Alligator 1271,15,0,0,0
um_fild03.gat,0,0,0,0 monster Stainer 1174,10,0,0,0
-um_fild03.gat,0,0,0,0 monster Gryphon 1259,1,3500000,1900000,0
-
-//um_fild04
+um_fild03.gat,0,0,0,0 monster Green Plant 1080,10,1800000,900000,1
+um_fild03.gat,0,0,0,0 monster Shining Plant 1083,6,1800000,900000,1
+um_fild03.gat,0,0,0,0 monster Blue Plant 1079,2,1800000,900000,1
+um_fild03.gat,0,0,0,0 monster Gryphon 1259,1,3600000,1800000,0
+//==================================================
+// um_fild04 - Hoomga Jungle
+//==================================================
um_fild04.gat,0,0,0,0 monster Beetle King 1494,30,0,0,0
-um_fild04.gat,0,0,0,0 monster Horn 1128,15,0,0,0
-um_fild04.gat,0,0,0,0 monster Choco 1214,2,0,0,0
-um_fild04.gat,0,0,0,0 monster Wootan Shooter 1498,7,0,0,0
-um_fild04.gat,264,293,10,10 monster Horn 1128,2,1200000,60000,0
um_fild04.gat,264,293,10,10 monster Beetle King 1494,4,120000,60000,0
um_fild04.gat,121,239,10,10 monster Beetle King 1494,2,120000,60000,0
um_fild04.gat,91,79,10,10 monster Beetle King 1494,2,120000,60000,0
um_fild04.gat,244,339,10,10 monster Beetle King 1494,2,120000,60000,0
um_fild04.gat,295,93,10,10 monster Beetle King 1494,2,120000,60000,0
um_fild04.gat,118,237,10,10 monster Beetle King 1494,2,120000,60000,0
-um_fild04.gat,118,237,10,10 monster Horn 1128,1,120000,60000,0
um_fild04.gat,311,285,10,10 monster Beetle King 1494,2,120000,60000,0
-um_fild04.gat,311,285,10,10 monster Horn 1128,1,120000,60000,0
um_fild04.gat,206,188,10,10 monster Beetle King 1494,2,120000,60000,0
-um_fild04.gat,206,188,10,10 monster Horn 1128,1,120000,60000,0
um_fild04.gat,239,245,10,10 monster Beetle King 1494,2,120000,60000,0
+um_fild04.gat,0,0,0,0 monster Horn 1128,15,0,0,0
+um_fild04.gat,264,293,10,10 monster Horn 1128,2,1200000,60000,0
+um_fild04.gat,118,237,10,10 monster Horn 1128,1,120000,60000,0
+um_fild04.gat,311,285,10,10 monster Horn 1128,1,120000,60000,0
+um_fild04.gat,206,188,10,10 monster Horn 1128,1,120000,60000,0
um_fild04.gat,239,245,10,10 monster Horn 1128,1,120000,60000,0
+um_fild04.gat,0,0,0,0 monster Wootan Shooter 1498,7,0,0,0
um_fild04.gat,239,245,10,10 monster Wootan Shooter 1498,1,300000,60000,0
um_fild04.gat,91,79,10,10 monster Wootan Shooter 1498,1,300000,60000,0
um_fild04.gat,295,93,10,10 monster Wootan Shooter 1498,1,300000,60000,0
+um_fild04.gat,0,0,0,0 monster Choco 1214,2,0,0,0
+um_fild04.gat,0,0,0,0 monster Red Plant 1078,5,1800000,900000,1
+um_fild04.gat,0,0,0,0 monster Yellow Plant 1081,5,1800000,900000,1
diff --git a/npc/omobs/fields/yuno.txt b/npc/omobs/fields/yuno.txt
index a96888e99..57562d6c7 100644
--- a/npc/omobs/fields/yuno.txt
+++ b/npc/omobs/fields/yuno.txt
@@ -19,10 +19,9 @@
//= 1.6 Fixed Yuno Field 10. Mob amount sugested by Playtester [Poki#3]
//============================================================
-//========================================================================================
-// - Yuno Field 01
-//========================================================================================
-
+//==================================================
+// yuno_fild01 - Border Posts
+//==================================================
yuno_fild01.gat,0,0,0,0 monster Dustiness 1114,50,0,0,0
yuno_fild01.gat,0,0,0,0 monster Poporing 1031,20,0,0,0
yuno_fild01.gat,0,0,0,0 monster Poring 1002,20,0,0,0
@@ -33,10 +32,9 @@ yuno_fild01.gat,0,0,0,0 monster Red Plant 1078,15,1800000,900000,1
yuno_fild01.gat,0,0,0,0 monster Shining Plant 1083,3,1800000,900000,1
yuno_fild01.gat,0,0,0,0 monster Blue Plant 1079,2,1800000,900000,1
-//========================================================================================
-// - Yuno Field 02
-//========================================================================================
-
+//==================================================
+// yuno_fild02 - Kiel Khayr's Cottage
+//==================================================
yuno_fild02.gat,0,0,0,0 monster Grand Peco 1369,70,0,0,0
yuno_fild02.gat,0,0,0,0 monster Driller 1380,40,0,0,0
yuno_fild02.gat,0,0,0,0 monster Geographer 1368,30,0,0,0
@@ -50,10 +48,9 @@ yuno_fild02.gat,0,0,0,0 monster Yellow Plant 1081,20,180000,90000,1
yuno_fild02.gat,0,0,0,0 monster Blue Plant 1079,3,180000,90000,1
yuno_fild02.gat,0,0,0,0 monster Shining Plant 1083,1,180000,90000,1
-//========================================================================================
-// - Yuno Field 03
-//========================================================================================
-
+//==================================================
+// yuno_fild03 - El Mes Plateau
+//==================================================
yuno_fild03.gat,0,0,0,0 monster Goat 1372,60,0,0,0
yuno_fild03.gat,0,0,0,0 monster Demon Fungus 1378,40,0,0,0
yuno_fild03.gat,0,0,0,0 monster Geographer 1368,20,0,0,0
@@ -65,10 +62,9 @@ yuno_fild03.gat,0,0,0,0 monster Red Plant 1078,15,1800000,900000,1
yuno_fild03.gat,0,0,0,0 monster Blue Plant 1079,4,1800000,900000,1
yuno_fild03.gat,0,0,0,0 monster Shining Plant 1083,2,1800000,900000,1
-//========================================================================================
-// - Yuno Field 04
-//========================================================================================
-
+//==================================================
+// yuno_fild04 - El Mes Plateau
+//==================================================
yuno_fild04.gat,0,0,0,0 monster Goat 1372,40,0,0,0
yuno_fild04.gat,0,0,0,0 monster Poring 1002,20,0,0,0
yuno_fild04.gat,0,0,0,0 monster Geographer 1368,20,0,0,0
@@ -80,10 +76,9 @@ yuno_fild04.gat,0,0,0,0 monster Green Plant 1080,10,1800000,900000,1
yuno_fild04.gat,0,0,0,0 monster Red Plant 1078,10,1800000,900000,1
yuno_fild04.gat,0,0,0,0 monster Yellow Plant 1081,10,1800000,900000,1
-//========================================================================================
-// - Yuno Field 05
-//========================================================================================
-
+//==================================================
+// yuno_fild05 - El Mes Plateau
+//==================================================
yuno_fild05.gat,0,0,0,0 monster Sleeper 1386,60,0,0,0
yuno_fild05.gat,0,0,0,0 monster Demon Fungus 1378,30,0,0,0
yuno_fild05.gat,0,0,0,0 monster Goat 1372,30,0,0,0
@@ -95,10 +90,9 @@ yuno_fild05.gat,0,0,0,0 monster Red Plant 1078,10,180000,90000,1
yuno_fild05.gat,0,0,0,0 monster Yellow Plant 1081,10,180000,90000,1
yuno_fild05.gat,0,0,0,0 monster Blue Plant 1079,4,180000,90000,1
-//========================================================================================
-// - Yuno Field 06
-//========================================================================================
-
+//==================================================
+// yuno_fild06 - Yuno Field
+//==================================================
yuno_fild06.gat,0,0,0,0 monster Sleeper 1386,55,0,0,0
yuno_fild06.gat,0,0,0,0 monster Goat 1372,30,0,0,0
yuno_fild06.gat,0,0,0,0 monster Demon Fungus 1378,20,0,0,0
@@ -106,10 +100,9 @@ yuno_fild06.gat,0,0,0,0 monster Green Plant 1080,10,180000,90000,1
yuno_fild06.gat,0,0,0,0 monster Red Plant 1078,10,180000,90000,1
yuno_fild06.gat,0,0,0,0 monster Yellow Plant 1081,10,180000,90000,1
-//========================================================================================
-// - Yuno Field 07
-//========================================================================================
-
+//==================================================
+// yuno_fild07 - El Mes Gorge (Valley of Abyss)
+//==================================================
yuno_fild07.gat,0,0,0,0 monster Goat 1372,50,0,0,0
yuno_fild07.gat,0,0,0,0 monster Driller 1380,10,0,0,0
yuno_fild07.gat,0,0,0,0 monster Geographer 1368,10,0,0,0
@@ -119,10 +112,9 @@ yuno_fild07.gat,0,0,0,0 monster Green Plant 1080,10,180000,90000,1
yuno_fild07.gat,0,0,0,0 monster Red Plant 1078,10,180000,90000,1
yuno_fild07.gat,0,0,0,0 monster Yellow Plant 1081,10,180000,90000,1
-//========================================================================================
-// - Yuno Field 08
-//========================================================================================
-
+//==================================================
+// yuno_fild08 - Kiel Khayr's Academy
+//==================================================
yuno_fild08.gat,0,0,0,0 monster Grand Peco 1369,30,0,0,0
yuno_fild08.gat,0,0,0,0 monster Geographer 1368,30,0,0,0
yuno_fild08.gat,0,0,0,0 monster Dustiness 1114,30,0,0,0
@@ -131,10 +123,9 @@ yuno_fild08.gat,0,0,0,0 monster Red Plant 1078,10,180000,90000,1
yuno_fild08.gat,0,0,0,0 monster Yellow Plant 1081,10,180000,90000,1
yuno_fild08.gat,0,0,0,0 monster Green Plant 1080,10,180000,90000,1
-//========================================================================================
-// - Yuno Field 09
-//========================================================================================
-
+//==================================================
+// yuno_fild09 - Schwaltzwald Guards Camp
+//==================================================
yuno_fild09.gat,0,0,0,0 monster Dustiness 1114,50,0,0,0
yuno_fild09.gat,0,0,0,0 monster Horn 1128,40,0,0,0
yuno_fild09.gat,0,0,0,0 monster Gargoyle 1253,20,0,0,0
@@ -147,34 +138,30 @@ yuno_fild09.gat,0,0,0,0 monster Green Plant 1080,10,180000,90000,1
yuno_fild09.gat,0,0,0,0 monster Red Plant 1078,10,180000,90000,1
yuno_fild09.gat,0,0,0,0 monster Yellow Plant 1081,10,180000,90000,1
-//========================================================================================
-// - Yuno Field 10
-//========================================================================================
-
+//==================================================
+// yuno_fild10 - Yuno Field
+//==================================================
yuno_fild10.gat,0,0,0,0 monster Dustiness 1114,20,0,0,0
yuno_fild10.gat,0,0,0,0 monster Stainer 1174,20,0,0,0
yuno_fild10.gat,0,0,0,0 monster Geographer 1368,20,0,0,0
yuno_fild10.gat,0,0,0,0 monster Beetle King 1494,20,0,0,0
yuno_fild10.gat,0,0,0,0 monster Hunter Fly 1035,10,0,0,0
-//========================================================================================
-// - Yuno Field 11
-//========================================================================================
-
+//==================================================
+// yuno_fild11 - Yuno Field
+//==================================================
yuno_fild11.gat,0,0,0,0 monster Sleeper 1386,50,0,0,0
yuno_fild11.gat,0,0,0,0 monster Geographer 1368,20,0,0,0
yuno_fild11.gat,0,0,0,0 monster Green Plant 1080,10,180000,90000,1
yuno_fild11.gat,0,0,0,0 monster Red Plant 1078,10,180000,90000,1
yuno_fild11.gat,0,0,0,0 monster Yellow Plant 1081,15,180000,90000,1
-//========================================================================================
-// - Yuno Field 12
-//========================================================================================
-
+//==================================================
+// yuno_fild12 - Border Checkpoint
+//==================================================
yuno_fild12.gat,0,0,0,0 monster Punk 1199,30,0,0,0
yuno_fild12.gat,0,0,0,0 monster Poporing 1031,15,0,0,0
yuno_fild12.gat,0,0,0,0 monster Geographer 1368,5,0,0,0
yuno_fild12.gat,0,0,0,0 monster Green Plant 1080,10,180000,90000,1
yuno_fild12.gat,0,0,0,0 monster Red Plant 1078,10,180000,90000,1
yuno_fild12.gat,0,0,0,0 monster Yellow Plant 1081,10,180000,90000,1
-
diff --git a/npc/omobs/pvp.txt b/npc/omobs/pvp.txt
index a63f4f7ae..2d29bf574 100644
--- a/npc/omobs/pvp.txt
+++ b/npc/omobs/pvp.txt
@@ -10,22 +10,31 @@
//=
//============================================================
-
-//PvP : 南北戦争(pvp_n_8-1)?
-pvp_n_8-1.gat,0,0,0,0 monster Sidewinder 1037,2,360000,180000,1
+//==================================================
+// pvp_n_8-1 - PvP : Room Sandwich
+//==================================================
+pvp_n_8-1.gat,0,0,0,0 monster Side Winder 1037,2,360000,180000,1
pvp_n_8-1.gat,0,0,0,0 monster Bigfoot 1060,2,360000,180000,1
-//PvP : ロックオン(pvp_n_8-2)?
+//==================================================
+// pvp_n_8-2 - PvP : Room Rock On
+//==================================================
pvp_n_8-2.gat,0,0,0,0 monster Cramp 1209,4,360000,180000,1
-//PvP : フォールーム(pvp_n_8-3)?
+//==================================================
+// pvp_n_8-3 - PvP : Four Room
+//==================================================
pvp_n_8-3.gat,0,0,0,0 monster Whisper 1179,3,360000,180000,1
pvp_n_8-3.gat,0,0,0,0 monster Giant Whisper 1186,2,360000,180000,1
-//PvP : アンダークロス(pvp_n_8-4)?
+//==================================================
+// pvp_n_8-4 - PvP : Room Undercross
+//==================================================
pvp_n_8-4.gat,0,0,0,0 monster Zombie 1015,4,360000,180000,1
pvp_n_8-4.gat,0,0,0,0 monster Ghoul 1036,3,360000,180000,1
-//PvP : ザナクルーム(pvp_n_8-5)?
+//==================================================
+// pvp_n_8-5 - PvP : Room Copass
+//==================================================
pvp_n_8-5.gat,0,0,0,0 monster Khalitzburg 1132,1,360000,180000,1
pvp_n_8-5.gat,0,0,0,0 monster Raydric 1163,2,360000,180000,1