summaryrefslogtreecommitdiff
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
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
-rw-r--r--db/Changelog.txt4
-rw-r--r--db/mob_db.txt82
-rw-r--r--npc/Changelog.txt6
-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
54 files changed, 1897 insertions, 1697 deletions
diff --git a/db/Changelog.txt b/db/Changelog.txt
index 1595a790b..99134458c 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -17,6 +17,7 @@
13005 Angelic Wing Dagger: NO INFO. Item not implemented...
1308 Golden Axe: NO INFO. Item not implemented...
1971 Electric Wire: NO INFO. Item not implemented...
+ 13160, 13161 Destroyer: Can break target's armor when fired at close range.
-----
4296 Cramp Card: Temp Plug: 10z per mob-level on a 3% chance.
7458 Fortune Horn: It's a custom name ^^;
@@ -26,6 +27,9 @@
=========================
+03/30
+ * Fixed a lot of Jnames [Poki#3]
+
03/29
* Updated FULL BUSTER aftercast delays, thanks to Haplo [Lupus]
- Fixed Rose Nile bonus
diff --git a/db/mob_db.txt b/db/mob_db.txt
index bca9245e2..7d8a6c46c 100644
--- a/db/mob_db.txt
+++ b/db/mob_db.txt
@@ -14,12 +14,12 @@
1008,PUPA,Pupa,2,427,0,2,4,0,1,2,0,20,1,1,1,1,1,20,10,12,0,4,22,0,1000,1001,1,1,1010,80,915,5500,938,600,2102,2,935,1000,938,600,1002,200,0,0,0,0,4003,7,0,0,0,0,0,0,0,0
1009,CONDOR,Condor,5,92,0,6,5,1,11,14,0,0,1,13,5,1,13,10,10,12,1,2,24,137,150,1148,648,480,917,6500,1702,150,715,80,1750,5500,517,400,916,2000,582,50,0,0,0,0,4015,2,0,0,0,0,0,0,0,0
1010,WILOW,Willow,4,95,0,5,4,1,9,12,5,15,1,4,8,30,9,10,10,12,1,3,22,129,200,1672,672,432,902,6500,907,600,516,700,1019,100,1066,1000,1067,2000,1068,3500,0,0,0,0,4010,7,0,0,0,0,0,0,0,0
-1011,CHONCHON,ChonChon,4,67,0,5,4,1,10,13,10,0,1,10,4,5,12,2,10,12,0,4,24,129,200,1076,576,480,998,50,935,6500,909,1500,1205,55,601,100,742,5,1002,150,0,0,0,0,4009,5,0,0,0,0,0,0,0,0
+1011,CHONCHON,Chonchon,4,67,0,5,4,1,10,13,10,0,1,10,4,5,12,2,10,12,0,4,24,129,200,1076,576,480,998,50,935,6500,909,1500,1205,55,601,100,742,5,1002,150,0,0,0,0,4009,5,0,0,0,0,0,0,0,0
1012,RODA_FROG,Roda Frog,5,133,0,6,5,1,11,14,0,5,1,5,5,5,10,5,10,12,1,5,21,129,200,2016,816,288,918,5500,908,500,511,300,721,7,713,2000,0,0,0,0,0,0,0,0,4014,5,0,0,0,0,0,0,0,0
1013,WOLF,Wolf,12,405,0,45,32,1,37,46,0,0,1,12,24,15,30,20,10,12,1,2,22,137,200,1054,54,432,1011,20,920,5500,2308,10,517,650,528,1050,919,5500,578,200,0,0,0,0,4029,5,0,0,0,0,0,0,0,0
1014,SPORE,Spore,9,327,0,22,17,1,24,29,0,5,1,9,9,1,14,5,10,12,1,3,21,129,200,1872,672,288,921,5000,507,800,510,50,743,5,2220,40,921,5,578,100,0,0,0,0,4022,5,0,0,0,0,0,0,0,0
1015,ZOMBIE,Zombie,15,534,0,50,33,1,67,79,0,10,1,8,7,1,15,1,10,12,1,1,29,2181,400,2612,912,288,957,5500,724,5,938,1000,958,50,727,55,0,0,0,0,0,0,0,0,4038,1,0,0,0,0,0,0,0,0
-1016,ARCHER_SKELETON,Skeleton Archer,31,3040,0,483,283,9,128,153,0,0,1,8,14,5,90,5,10,12,1,1,29,133,300,2864,864,576,932,4500,756,70,2285,4,1708,35,1752,1000,507,800,1701,150,0,0,0,0,4094,1,0,0,0,0,0,0,0,0
+1016,ARCHER_SKELETON,Archer Skeleton,31,3040,0,483,283,9,128,153,0,0,1,8,14,5,90,5,10,12,1,1,29,133,300,2864,864,576,932,4500,756,70,2285,4,1708,35,1752,1000,507,800,1701,150,0,0,0,0,4094,1,0,0,0,0,0,0,0,0
1017,THIEF_BUG_FEMALE,Thief Bug Female,10,170,0,35,18,1,33,40,5,5,1,15,10,5,23,5,10,12,1,4,27,651,200,988,288,768,955,3500,910,250,1108,15,928,200,507,400,716,50,1002,400,0,0,0,0,4026,7,0,0,0,0,0,0,0,0
1018,CREAMY,Creamy,16,595,0,105,70,1,53,64,0,30,1,40,16,15,16,55,10,12,0,4,24,129,150,1136,720,840,924,5500,2322,10,518,150,602,100,2207,2,712,500,692,50,0,0,0,0,4040,3,0,0,0,0,0,0,0,0
1019,PECOPECO,Peco Peco,13,531,0,85,36,1,35,46,0,0,1,13,13,25,27,9,10,12,2,2,23,137,200,1564,864,576,925,5500,2402,20,508,50,507,900,1604,100,582,60,0,0,0,0,0,0,4031,3,0,0,0,0,0,0,0,0
@@ -27,11 +27,11 @@
1021,THIEF_BUG_MALE,Thief Bug Male,19,583,0,223,93,1,76,88,15,5,1,29,16,5,36,1,10,12,1,4,27,653,300,988,288,768,1011,40,928,5500,955,1500,1152,10,508,90,729,5,1116,50,0,0,0,0,4050,1,0,0,0,0,0,0,0,0
1022,WEREWOLF,Werewolf,80,28600,0,11813,7289,2,2560,3280,65,35,1,97,60,1,135,52,10,10,2,0,40,163,200,1500,768,652,999,500,1034,4000,984,500,985,500,7017,800,0,0,1912,300,0,0,0,0,4091,50,0,0,0,0,0,0,0,0
1023,ORK_WARRIOR,Orc Warrior,24,1400,0,261,160,1,104,126,10,5,1,24,48,25,34,10,10,12,1,7,22,2181,200,1864,864,288,998,210,931,5500,756,40,2267,3,1352,10,1304,5,1301,100,0,0,0,0,4066,1,0,0,0,0,0,0,0,0
-1024,WORM_TAIL,Worm Tail,14,426,0,59,40,2,42,51,5,10,1,14,28,5,46,5,10,12,1,3,22,145,200,1048,48,192,993,60,1011,25,906,5500,1408,30,508,70,721,5,10015,10,0,0,0,0,4034,5,0,0,0,0,0,0,0,0
-1025,SNAKE,Boa,15,471,0,72,48,1,46,55,0,0,1,15,15,10,35,5,10,12,1,2,22,129,200,1576,576,576,926,5500,1117,15,507,900,1011,35,937,800,954,1,578,250,0,0,0,0,4037,1,0,0,0,0,0,0,0,0
+1024,WORM_TAIL,Wormtail,14,426,0,59,40,2,42,51,5,10,1,14,28,5,46,5,10,12,1,3,22,145,200,1048,48,192,993,60,1011,25,906,5500,1408,30,508,70,721,5,10015,10,0,0,0,0,4034,5,0,0,0,0,0,0,0,0
+1025,SNAKE,Snake,15,471,0,72,48,1,46,55,0,0,1,15,15,10,35,5,10,12,1,2,22,129,200,1576,576,576,926,5500,1117,15,507,900,1011,35,937,800,954,1,578,250,0,0,0,0,4037,1,0,0,0,0,0,0,0,0
1026,MUNAK,Munak,30,2872,0,361,218,1,180,230,0,0,1,15,20,5,46,15,10,12,1,1,29,2181,200,2468,768,288,901,5500,2264,1,2404,15,609,20,2337,1,2305,100,1558,5,0,0,0,0,4090,3,0,0,0,0,0,0,0,0
1027,RAPTICE,Raptice,17,600,0,100,55,1,0,0,5,10,5,20,20,0,28,10,10,12,1,2,22,131,200,2000,1000,500,909,7000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1028,SOLDIER_SKELETON,Skeleton Soldier,29,2334,0,372,226,1,221,245,10,15,1,15,22,5,40,15,10,12,1,1,29,2181,200,2276,576,432,932,5500,756,60,1214,12,507,700,934,10,1201,150,1216,50,0,0,0,0,4086,1,0,0,0,0,0,0,0,0
+1028,SOLDIER_SKELETON,Soldier Skeleton,29,2334,0,372,226,1,221,245,10,15,1,15,22,5,40,15,10,12,1,1,29,2181,200,2276,576,432,932,5500,756,60,1214,12,507,700,934,10,1201,150,1216,50,0,0,0,0,4086,1,0,0,0,0,0,0,0,0
1029,ISIS,Isis,43,4828,0,2396,993,1,423,507,10,35,1,65,43,30,72,15,10,12,2,6,27,149,200,1384,768,336,936,5500,2233,5,2603,1,733,150,732,20,954,1000,731,5,0,0,0,0,4116,1,0,0,0,0,0,0,0,0
1030,ANACONDAQ,Anacondaq,23,1109,0,300,149,1,124,157,0,0,1,23,28,10,36,5,10,12,1,2,25,145,200,1576,576,576,1011,50,937,5500,1455,10,926,1500,936,200,508,150,756,38,0,0,0,0,4062,1,0,0,0,0,0,0,0,0
1031,POPORING,Poporing,14,344,0,81,44,1,59,72,0,10,1,14,14,1,19,15,10,12,1,3,25,131,300,1672,672,480,938,5500,910,1500,511,500,514,200,729,5,0,0,0,0,0,0,0,0,4033,5,0,0,0,0,0,0,0,0
@@ -40,12 +40,12 @@
1034,THARA_FROG,Thara Frog,22,2152,0,219,138,1,105,127,0,10,1,22,22,5,34,10,10,12,1,5,41,129,200,2016,816,288,1011,45,908,5500,911,600,509,30,725,5,918,2000,0,0,0,0,0,0,4058,1,0,0,0,0,0,0,0,0
1035,HUNTER_FLY,Hunter Fly,42,5242,0,1517,952,1,246,333,25,15,1,105,32,15,72,30,10,12,0,4,44,2181,150,676,576,480,996,30,999,100,943,5500,912,1300,756,129,2259,1,1226,2,0,0,0,0,4115,1,0,0,0,0,0,0,0,0
1036,GHOUL,Ghoul,39,5118,0,882,541,1,420,500,5,20,1,20,29,1,33,20,10,12,1,1,49,2181,250,2456,912,504,958,5500,756,110,509,670,511,800,2609,60,934,150,1260,1,0,0,0,0,4110,2,0,0,0,0,0,0,0,0
-1037,SIDE_WINDER,Sidewinder,43,4929,0,1996,993,1,240,320,5,10,1,43,40,15,115,20,10,12,1,2,25,149,200,1576,576,576,954,5500,912,1400,756,134,1120,2,937,2500,926,5000,509,1000,0,0,0,0,4117,1,0,0,0,0,0,0,0,0
+1037,SIDE_WINDER,Side Winder,43,4929,0,1996,993,1,240,320,5,10,1,43,40,15,115,20,10,12,1,2,25,149,200,1576,576,576,954,5500,912,1400,756,134,1120,2,937,2500,926,5000,509,1000,0,0,0,0,4117,1,0,0,0,0,0,0,0,0
1038,OSIRIS,Osiris,78,415400,0,71500,28600,1,780,2880,10,25,1,75,62,37,86,40,10,10,1,1,89,1205,100,1072,672,384,617,2000,1232,150,2235,200,1255,600,1009,1000,985,3500,984,3900,0,0,714,300,4144,1,7710,5000,603,4000,608,3000,751,500
1039,BAPHOMET,Baphomet,81,668000,0,107250,37895,2,3220,4040,35,45,1,152,96,85,120,95,10,10,2,6,67,1205,100,1068,768,576,1466,200,2256,200,2607,800,714,500,617,3000,984,4300,985,5600,0,0,0,0,4147,1,13000,5000,608,1000,750,400,923,3800
1040,GOLEM,Golem,25,3900,0,465,94,1,175,187,40,0,1,15,25,0,15,0,10,12,2,0,60,145,300,1608,816,396,999,150,953,5500,912,220,757,61,1003,120,715,200,998,350,0,0,0,0,4072,3,0,0,0,0,0,0,0,0
1041,MUMMY,Mummy,37,5176,0,488,314,1,305,360,0,10,1,19,32,0,63,20,10,12,1,1,49,2181,300,1772,72,384,930,5500,756,100,934,550,2604,1,2611,10,525,250,508,450,0,0,0,0,4106,1,0,0,0,0,0,0,0,0
-1042,STEEL_CHONCHON,Steel ChonChon,17,530,0,109,71,1,54,65,15,0,1,43,17,5,33,10,10,12,0,4,24,139,150,1076,576,480,992,70,999,30,910,2400,935,3500,943,30,998,200,1002,500,0,0,0,0,4042,1,0,0,0,0,0,0,0,0
+1042,STEEL_CHONCHON,Steel Chonchon,17,530,0,109,71,1,54,65,15,0,1,43,17,5,33,10,10,12,0,4,24,139,150,1076,576,480,992,70,999,30,910,2400,935,3500,943,30,998,200,1002,500,0,0,0,0,4042,1,0,0,0,0,0,0,0,0
1043,SEAHORES,Seahorse,18,1452,0,122,78,3,100,150,15,7,1,1,1,1,1,1,10,10,0,5,22,131,200,1500,800,600,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1044,OBEAUNE,Obeaune,31,3952,0,644,407,1,141,165,0,40,1,31,31,55,74,85,10,12,1,5,41,149,200,1872,672,288,995,13,950,5500,5014,1,2326,10,720,10,951,500,748,25,0,0,0,0,4093,2,0,0,0,0,0,0,0,0
1045,MARC,Marc,36,6900,0,988,625,1,220,280,5,10,1,36,36,20,56,30,10,12,1,5,41,2181,150,1272,72,480,995,18,956,5500,756,95,951,1000,720,10,717,200,509,600,0,0,0,0,4105,1,0,0,0,0,0,0,0,0
@@ -54,7 +54,7 @@
1048,THIEF_BUG_EGG,Thief Bug Egg,4,48,0,8,4,0,13,17,20,0,1,6,4,0,14,20,10,12,0,4,27,0,1000,701,1,1,1010,300,915,5000,2102,2,938,600,716,100,737,10,1002,350,0,0,0,0,4012,7,0,0,0,0,0,0,0,0
1049,PICKY,Picky,3,80,0,4,3,1,9,12,0,0,1,3,3,5,10,30,10,12,0,2,23,129,200,988,288,168,916,6500,949,700,2302,150,507,550,519,300,715,50,0,0,0,0,0,0,4008,10,0,0,0,0,0,0,0,0
1050,PICKY_,Shell Picky,4,83,0,5,4,1,8,11,20,0,1,3,3,10,11,20,10,12,0,2,23,129,200,988,288,168,916,6500,949,700,5015,10,507,600,519,300,715,50,10012,10,0,0,0,0,4011,10,0,0,0,0,0,0,0,0
-1051,THIEF_BUG,Thief Bug Larva,6,126,0,17,5,1,18,24,5,0,1,6,6,0,11,0,10,12,0,0,60,139,150,1288,288,768,955,2500,2304,80,507,350,909,2000,2303,120,1002,350,0,0,0,0,0,0,4016,10,0,0,0,0,0,0,0,0
+1051,THIEF_BUG,Thief Bug,6,126,0,17,5,1,18,24,5,0,1,6,6,0,11,0,10,12,0,0,60,139,150,1288,288,768,955,2500,2304,80,507,350,909,2000,2303,120,1002,350,0,0,0,0,0,0,4016,10,0,0,0,0,0,0,0,0
1052,ROCKER,Rocker,9,198,0,20,16,1,24,29,5,10,1,9,18,10,14,15,10,12,1,4,22,129,200,1864,864,540,940,5000,909,5500,2298,4,1402,80,520,10,752,5,703,3,0,0,0,0,4021,10,0,0,0,0,0,0,0,0
1053,THIEF_BUG_,Thief Bug Female,10,170,0,0,0,1,33,40,5,5,1,15,10,5,23,5,10,12,1,4,27,139,200,988,288,768,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1054,THIEF_BUG__,Thief Bug Male,19,583,0,0,0,1,76,88,15,5,1,29,16,5,36,1,10,12,1,4,27,141,300,988,288,768,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -158,8 +158,8 @@
1152,ORC_SKELETON,Orc Skeleton,28,2278,0,315,194,1,190,236,10,10,1,14,18,1,30,15,10,12,1,1,29,2181,200,2420,720,648,922,5500,932,3500,757,80,2299,2,1358,10,511,50,0,0,0,0,0,0,4085,1,0,0,0,0,0,0,0,0
1153,ORC_ZOMBIE,Orc Zombie,24,1568,0,196,120,1,151,184,5,10,1,12,24,1,24,5,10,12,1,1,29,2181,400,2852,1152,840,1043,5500,938,3000,714,1,0,0,0,0,0,0,0,0,0,0,0,0,4071,2,0,0,0,0,0,0,0,0
1154,PASANA,Pasana,61,8289,0,4087,2135,1,513,682,29,35,1,73,50,61,69,43,10,12,1,7,43,149,165,1700,1000,500,7110,4500,7121,2500,757,20,1105,500,1217,150,0,0,0,0,0,0,0,0,4099,1,0,0,0,0,0,0,0,0
-1155,PETIT,Earth Petite,44,6881,0,1677,1034,1,360,427,30,30,1,44,62,69,79,60,10,12,1,9,22,149,200,1624,620,384,1035,5500,1037,300,756,140,509,1000,1510,150,912,1500,606,15,0,0,0,0,4118,1,0,0,0,0,0,0,0,0
-1156,PETIT_,Sky Petite,45,5747,0,1758,1075,1,300,355,20,45,1,113,45,69,73,80,10,12,1,9,24,149,150,1420,1080,528,1036,5500,1037,300,985,61,509,1000,602,500,912,1500,606,15,0,0,0,0,4120,1,0,0,0,0,0,0,0,0
+1155,PETIT,Petite,44,6881,0,1677,1034,1,360,427,30,30,1,44,62,69,79,60,10,12,1,9,22,149,200,1624,620,384,1035,5500,1037,300,756,140,509,1000,1510,150,912,1500,606,15,0,0,0,0,4118,1,0,0,0,0,0,0,0,0
+1156,PETIT_,Petite,45,5747,0,1758,1075,1,300,355,20,45,1,113,45,69,73,80,10,12,1,9,24,149,150,1420,1080,528,1036,5500,1037,300,985,61,509,1000,602,500,912,1500,606,15,0,0,0,0,4120,1,0,0,0,0,0,0,0,0
1157,PHARAOH,Pharaoh,93,445997,0,114990,41899,1,2267,3015,67,70,1,93,100,104,89,112,10,12,2,7,67,1205,125,2000,1000,500,7113,6000,7114,2500,1136,100,2327,150,5002,500,1552,300,984,4500,1231,80,0,0,4148,1,4060,5000,607,6000,526,2000,732,1000
1158,PHEN,Phen,26,3347,0,357,226,1,138,150,0,15,1,26,26,1,88,75,10,12,1,5,41,145,150,2544,1344,1152,1023,5500,963,2000,720,5,517,1000,951,500,756,25,0,0,0,0,0,0,4077,1,0,0,0,0,0,0,0,0
1159,PHREEONI,Phreeoni,69,188000,0,32175,16445,1,880,1530,10,20,1,85,78,35,130,60,10,10,2,2,60,1205,200,1020,1020,288,1015,10000,1223,500,1236,150,1014,5000,2288,300,985,2900,984,2100,0,0,0,0,4121,1,2700,5000,1008,500,730,1000,1000,4000
@@ -183,15 +183,15 @@
1177,ZENORC,Zenorc,31,2585,0,967,407,1,188,223,0,15,1,77,15,1,76,10,10,12,1,7,27,131,150,1180,480,360,1044,5500,756,70,938,2500,1006,5,508,50,640,20,0,0,0,0,0,0,4096,1,0,0,0,0,0,0,0,0
1178,ZEROM,Zerom,23,1109,0,240,149,1,127,155,0,10,1,23,23,5,42,1,10,12,1,7,23,2181,200,1780,1080,432,1011,55,998,190,2339,200,2265,3,2408,10,1002,400,1002,400,0,0,0,0,4064,1,0,0,0,0,0,0,0,0
1179,WHISPER,Whisper,34,1796,0,591,599,1,180,221,0,45,1,51,14,1,60,1,10,12,0,6,68,149,150,1960,960,504,1001,150,1059,5500,2282,1,2333,10,0,0,0,0,0,0,0,0,0,0,4102,1,0,0,0,0,0,0,0,0
-1180,NINE_TAIL,Nine-Tail,51,9466,0,1650,825,1,610,734,10,25,1,80,46,1,89,85,10,12,1,2,63,1173,150,840,540,480,1022,5500,919,7000,603,100,604,100,526,250,525,350,756,100,746,200,0,0,4159,1,0,0,0,0,0,0,0,0
+1180,NINE_TAIL,Nine Tail,51,9466,0,1650,825,1,610,734,10,25,1,80,46,1,89,85,10,12,1,2,63,1173,150,840,540,480,1022,5500,919,7000,603,100,604,100,526,250,525,350,756,100,746,200,0,0,4159,1,0,0,0,0,0,0,0,0
1181,ZOMBIE_DRAGON,Zombie Dragon,1,1000,0,49500,1650,9,7900,9140,0,0,1,145,145,145,130,120,10,12,2,9,89,1205,400,2700,1000,500,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1182,THIEF_MUSHROOM,Thief Mushroom,1,15,0,0,0,1,1,2,100,99,1,1,1,1,1,1,7,12,0,3,22,64,2000,1,1,1,1069,1500,1070,3000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1183,CHONCHON_,Angry ChonChon,4,67,0,5,4,1,10,13,10,0,1,10,4,5,12,2,10,12,0,4,24,2181,200,1076,576,480,998,50,935,6500,909,1500,1205,55,601,100,742,5,1002,150,0,0,0,0,4009,5,0,0,0,0,0,0,0,0
+1183,CHONCHON_,Angry Chonchon,4,67,0,5,4,1,10,13,10,0,1,10,4,5,12,2,10,12,0,4,24,2181,200,1076,576,480,998,50,935,6500,909,1500,1205,55,601,100,742,5,1002,150,0,0,0,0,4009,5,0,0,0,0,0,0,0,0
1184,FABRE_,Angry Fabre,1,30,0,1,0,1,4,7,0,0,1,2,1,1,4,5,10,12,0,4,22,2181,400,1672,672,480,914,2000,949,250,1502,80,721,2,511,350,705,500,1501,200,0,0,0,0,4002,1,0,0,0,0,0,0,0,0
1185,WHISPER_,Whisper,34,1796,0,537,545,1,198,239,0,45,1,51,14,1,60,1,10,12,0,1,28,0,150,1960,960,504,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1186,WHISPER_BOSS,Giant Whisper,34,5040,0,537,545,1,198,239,0,45,1,51,14,1,60,1,10,12,0,6,48,1173,250,2536,1536,672,1001,150,1059,5500,2282,1,2333,10,0,0,0,0,0,0,0,0,0,0,4303,1,0,0,0,0,0,0,0,0
1187,SWITCH,Switch,1,2,0,1,1,1,1,2,0,0,1,1,1,1,1,1,1,12,1,0,20,0,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1188,BON_GUN,Bon Gun,32,3520,0,424,242,1,220,260,0,0,1,15,36,10,48,15,10,12,1,1,29,149,200,1720,500,420,1094,5500,7014,40,618,60,2337,2,609,15,508,1000,508,250,5046,1,0,0,4212,1,0,0,0,0,0,0,0,0
+1188,BON_GUN,Bongun,32,3520,0,424,242,1,220,260,0,0,1,15,36,10,48,15,10,12,1,1,29,149,200,1720,500,420,1094,5500,7014,40,618,60,2337,2,609,15,508,1000,508,250,5046,1,0,0,4212,1,0,0,0,0,0,0,0,0
1189,ORC_ARCHER,Orc Archer,49,7440,0,1729,1787,9,310,390,10,5,1,44,25,20,125,20,10,12,1,7,22,149,300,1960,620,480,1063,5500,1753,1000,1756,2500,1755,2500,1716,2,507,1400,509,900,2330,5,0,0,4256,1,0,0,0,0,0,0,0,0
1190,ORC_LORD,Orc Lord,74,393000,0,62205,8580,1,2700,3150,40,5,1,82,149,70,110,85,10,12,2,7,82,1205,100,1248,500,360,1363,200,2601,500,5007,150,2627,1000,0,0,985,4400,984,3100,0,0,714,250,4135,1,12800,5000,968,5500,617,900,0,0
1191,MIMIC,Mimic,51,6120,0,165,165,1,150,900,10,40,1,121,1,60,75,110,10,12,1,0,60,149,100,972,500,288,617,5,603,45,1065,1200,611,3000,0,0,2626,1,757,270,2205,120,0,0,4205,1,0,0,0,0,0,0,0,0
@@ -271,7 +271,7 @@
1267,CARAT,Carat,51,5200,0,1926,1353,1,330,417,0,25,1,41,45,5,85,155,10,12,1,6,44,1173,200,1078,768,384,7054,3200,536,1000,2409,5,5003,1,0,0,0,0,509,450,0,0,0,0,4288,1,0,0,0,0,0,0,0,0
1268,BLOODY_KNIGHT,Bloody Knight,82,57870,0,10120,6820,3,2150,3030,60,50,1,75,70,77,125,55,10,12,2,0,87,1173,250,828,528,192,7054,5500,2229,45,2317,5,2106,65,1170,1,984,304,985,433,1417,2,0,0,4320,1,0,0,0,0,0,0,0,0
1269,CLOCK,Clock,60,11050,0,3410,2904,2,720,909,15,10,1,70,50,25,90,50,10,12,1,0,42,145,200,1092,792,480,1095,5500,1019,800,509,900,568,220,7026,30,7027,30,985,163,0,0,0,0,4299,1,0,0,0,0,0,0,0,0
-1270,C_TOWER_MANAGER,Tower Keeper,63,18600,0,4378,2850,3,880,1180,35,30,1,75,20,64,75,60,10,12,2,0,80,145,200,1072,672,384,1095,5500,7054,5500,999,500,520,850,2109,1,7026,2000,7027,2000,0,0,0,0,4229,1,0,0,0,0,0,0,0,0
+1270,C_TOWER_MANAGER,Clock Tower Manager,63,18600,0,4378,2850,3,880,1180,35,30,1,75,20,64,75,60,10,12,2,0,80,145,200,1072,672,384,1095,5500,7054,5500,999,500,520,850,2109,1,7026,2000,7027,2000,0,0,0,0,4229,1,0,0,0,0,0,0,0,0
1271,ALLIGATOR,Alligator,42,6962,0,1379,866,1,315,360,2,5,1,45,50,10,82,65,10,12,1,2,21,145,200,1100,900,480,912,1000,1099,600,7003,2000,608,50,0,0,0,0,756,129,0,0,0,0,4252,1,0,0,0,0,0,0,0,0
1272,DARK_LORD,Dark Lord,80,360000,0,65780,45045,2,2800,3320,30,70,1,120,64,118,99,60,10,12,2,6,89,1205,100,868,768,480,1615,800,5017,500,1237,300,2334,300,2507,100,985,5300,984,4100,2609,140,0,0,4168,1,36500,5000,7005,6000,5093,1000,617,2000
1273,ORC_LADY,Orc Lady,31,2000,0,644,407,1,135,170,10,10,1,42,25,15,69,55,10,12,1,7,42,1173,200,1050,900,288,7053,5500,998,300,2602,1,756,40,1352,10,508,900,2338,1,2206,1,7477,6,4255,1,0,0,0,0,0,0,0,0
@@ -279,9 +279,9 @@
1275,ALICE,Alice,62,10000,0,3583,2400,1,550,700,5,5,1,64,42,85,100,130,10,12,1,7,60,145,200,1152,185,480,7047,2500,637,40,2407,3,739,30,5085,5,508,400,2215,5,12002,250,0,0,4253,1,0,0,0,0,0,0,0,0
1276,RAYDRIC_ARCHER,Raydric Archer,52,5250,0,3025,2125,9,415,500,35,5,1,25,22,5,145,35,10,12,1,6,47,133,200,1152,1152,480,7054,5500,0,0,2315,2,1701,150,1764,2000,1715,3,985,106,0,0,0,0,4187,1,0,0,0,0,0,0,0,0
1277,GREATEST_GENERAL,Greatest General,40,3632,0,1238,752,3,350,400,15,15,1,20,60,55,82,140,10,12,1,0,43,132,200,1152,1152,384,7054,2000,1019,2000,1501,100,0,0,2272,1,508,150,609,35,662,100,686,100,4283,1,0,0,0,0,0,0,0,0
-1278,STALACTIC_GOLEM,Stalactite Golem,60,18700,0,3872,2695,1,950,1130,50,5,1,45,85,5,75,25,10,12,2,0,80,145,200,1264,864,288,7004,2000,7054,5500,1000,250,997,30,0,0,757,250,985,163,0,0,0,0,4223,1,0,0,0,0,0,0,0,0
-1279,TRI_JOINT,Tri-Joint,32,2300,0,386,220,1,178,206,20,5,1,48,24,10,67,20,10,12,0,4,22,1173,200,860,660,624,7053,100,943,380,606,200,993,160,1001,140,0,0,757,106,0,0,0,0,4308,1,0,0,0,0,0,0,0,0
-1280,STEAM_GOBLIN,Steam Goblin,35,2490,0,864,495,1,234,269,20,5,1,59,32,15,75,25,10,12,1,7,44,145,200,1008,1008,528,911,2500,7053,4000,998,300,999,55,1003,320,0,0,757,124,744,2,0,0,4156,1,0,0,0,0,0,0,0,0
+1278,STALACTIC_GOLEM,Stalactic Golem,60,18700,0,3872,2695,1,950,1130,50,5,1,45,85,5,75,25,10,12,2,0,80,145,200,1264,864,288,7004,2000,7054,5500,1000,250,997,30,0,0,757,250,985,163,0,0,0,0,4223,1,0,0,0,0,0,0,0,0
+1279,TRI_JOINT,Tri Joint,32,2300,0,386,220,1,178,206,20,5,1,48,24,10,67,20,10,12,0,4,22,1173,200,860,660,624,7053,100,943,380,606,200,993,160,1001,140,0,0,757,106,0,0,0,0,4308,1,0,0,0,0,0,0,0,0
+1280,STEAM_GOBLIN,Goblin Steamrider,35,2490,0,864,495,1,234,269,20,5,1,59,32,15,75,25,10,12,1,7,44,145,200,1008,1008,528,911,2500,7053,4000,998,300,999,55,1003,320,0,0,757,124,744,2,0,0,4156,1,0,0,0,0,0,0,0,0
1281,SAGEWORM,Sage Worm,43,3850,0,1155,1320,1,120,280,0,50,1,52,24,88,79,55,10,12,0,2,60,145,200,936,936,288,912,1200,1097,1000,1055,3000,2241,5,505,40,512,1000,5012,1,1550,15,689,100,4219,1,0,0,0,0,0,0,0,0
1282,KOBOLD_ARCHER,Kobold Archer,33,2560,0,739,455,9,155,185,10,5,1,20,15,30,100,25,10,12,0,7,23,133,200,1008,1008,384,912,250,999,60,1034,5000,0,0,1763,2000,1711,5,756,79,5118,1,0,0,4292,1,0,0,0,0,0,0,0,0
1283,CHIMERA,Chimera,70,32600,0,4950,3000,1,1200,1320,30,10,1,72,110,88,75,85,10,12,2,2,63,1205,200,772,672,360,7054,5500,1048,2500,568,500,1306,1,509,560,1364,1,984,160,7295,2500,0,0,4300,1,0,0,0,0,0,0,0,0
@@ -308,14 +308,14 @@
1304,GIANT_SPIDER,Giant Spider,55,11628,0,6211,2146,1,625,802,41,28,1,36,43,5,73,69,10,12,2,4,25,1173,165,1468,468,768,1025,4550,1042,1200,757,140,525,450,943,1200,1096,680,7053,800,7054,800,0,0,4270,1,0,0,0,0,0,0,0,0
1305,ANCIENT_WORM,Ancient Worm,67,22598,0,8174,3782,1,947,1115,35,30,1,35,56,55,81,72,10,12,2,4,25,1173,165,1792,792,336,1042,4550,912,2500,2406,1,719,15,1096,680,938,3500,7054,2500,7053,2500,0,0,4249,1,0,0,0,0,0,0,0,0
1306,LEIB_OLMAI,Leib Olmai,58,24223,0,6011,2171,1,740,1390,27,31,1,35,95,5,64,85,10,12,2,2,22,1173,175,1260,230,192,948,4550,2289,8,740,120,518,500,526,1,969,5,7053,800,0,0,0,0,4188,1,0,0,0,0,0,0,0,0
-1307,CAT_O_NINE_TAIL,Cat'o'Nine Tails,76,64512,0,10869,4283,1,1112,1275,61,55,1,75,55,82,86,120,10,12,1,6,63,1205,155,1276,576,288,5008,1,638,150,10008,5,985,600,984,800,969,6,617,1,7054,5500,0,0,4290,1,0,0,0,0,0,0,0,0
+1307,CAT_O_NINE_TAIL,Cat o' Nine Tails,76,64512,0,10869,4283,1,1112,1275,61,55,1,75,55,82,86,120,10,12,1,6,63,1205,155,1276,576,288,5008,1,638,150,10008,5,985,600,984,800,969,6,617,1,7054,5500,0,0,4290,1,0,0,0,0,0,0,0,0
1308,PANZER_GOBLIN,Panzer Goblin,59,13838,0,7212,2697,1,682,877,41,28,1,60,40,20,81,160,10,12,1,7,44,1173,200,960,1008,840,7053,4550,7054,3500,999,180,998,360,1003,580,744,800,994,160,0,0,0,0,4310,1,0,0,0,0,0,0,0,0
1309,GAJOMART,Gajomart,63,13699,0,6625,2900,1,916,948,85,50,1,34,10,5,75,140,10,12,0,0,83,1173,300,1000,1152,828,953,6500,912,2300,508,870,2279,8,1752,10000,999,640,994,180,0,0,0,0,4151,1,0,0,0,0,0,0,0,0
1310,MAJORUROS,Majoruros,66,57991,0,8525,3799,1,781,1301,10,25,1,50,75,50,85,48,10,12,2,2,43,1173,250,1100,960,780,941,4550,1361,4,568,300,984,16,509,850,2611,160,2607,1,1000,250,0,0,4201,1,0,0,0,0,0,0,0,0
1311,GULLINBURSTI,Gullinbursti,62,21331,0,5814,2376,1,699,1431,10,15,1,25,60,5,70,45,10,12,2,2,42,1173,150,1960,960,384,1028,3500,514,290,702,6,2276,1,605,15,2627,1,912,160,0,0,0,0,4164,1,0,0,0,0,0,0,0,0
1312,TURTLE_GENERAL,Turtle General,97,320700,0,18202,9800,1,2438,3479,50,54,1,45,55,65,105,164,10,12,2,2,42,1205,200,900,1000,500,1529,8,1306,5,0,0,1417,9,7070,5500,0,0,912,5500,658,1,0,0,4305,1,39805,5000,967,5500,607,1500,617,2000
1313,MOBSTER,Mobster,61,11347,0,4424,1688,1,910,1128,41,37,1,46,20,35,76,55,10,12,1,7,20,1173,250,1100,560,580,1239,3,2601,2,2621,1,716,600,912,2500,525,450,505,60,726,4700,0,0,4317,1,0,0,0,0,0,0,0,0
-1314,PERMETER,Perimeter,63,8228,0,3756,1955,2,943,1212,46,45,1,59,60,5,69,100,10,12,1,2,40,145,250,1100,483,528,967,4550,7070,45,1019,1240,507,2450,912,1240,522,25,605,1,1519,1,0,0,4311,1,0,0,0,0,0,0,0,0
+1314,PERMETER,Permeter,63,8228,0,3756,1955,2,943,1212,46,45,1,59,60,5,69,100,10,12,1,2,40,145,250,1100,483,528,967,4550,7070,45,1019,1240,507,2450,912,1240,522,25,605,1,1519,1,0,0,4311,1,0,0,0,0,0,0,0,0
1315,ASSULTER,Assaulter,71,15861,0,4854,2654,2,764,1499,35,28,1,74,10,35,100,100,10,12,1,7,44,1173,155,1000,900,432,967,4550,7069,1200,7072,840,508,1280,912,1240,522,45,603,1,0,0,0,0,4246,1,0,0,0,0,0,0,0,0
1316,SOLIDER,Solider,70,12099,0,4458,1951,2,796,978,57,43,1,35,85,5,74,100,10,12,1,2,42,145,250,1452,483,528,967,4550,7070,64,7067,850,508,2100,912,1240,518,850,1519,1,0,0,0,0,4220,1,0,0,0,0,0,0,0,0
1317,FUR_SEAL,Seal,63,9114,0,3765,1824,1,845,1202,25,33,1,28,22,15,69,84,10,12,1,2,21,149,250,1612,622,583,912,4500,510,250,2310,5,7053,1200,1452,1,525,200,746,120,0,0,0,0,4312,1,0,0,0,0,0,0,0,0
@@ -379,17 +379,17 @@
1375,THE_PAPER,The Paper,56,18557,0,2849,1998,1,845,1124,25,24,1,66,52,76,71,79,10,12,1,0,60,2181,170,1564,864,576,7111,5500,7112,3200,508,800,511,2000,0,0,0,0,0,0,0,0,0,0,4172,1,0,0,0,0,0,0,0,0
1376,HARPY,Harpy,70,16599,0,3562,2133,1,956,1231,42,44,1,112,72,103,74,76,10,12,1,6,64,2181,155,1564,864,576,7115,5500,7116,2500,508,1500,508,800,0,0,0,0,0,0,0,0,0,0,4325,1,0,0,0,0,0,0,0,0
1377,ELDER,Elder,64,21592,0,4650,3408,3,421,560,45,68,1,76,68,108,72,86,10,12,2,7,80,2181,165,1564,864,576,7099,4500,7117,1500,7118,1500,1472,4,1473,1,603,100,7027,2000,691,500,616,1,4251,1,0,0,0,0,0,0,0,0
-1378,DEMON_PUNGUS,Demon Pungus,56,7259,0,3148,1817,1,360,479,48,31,1,83,55,59,63,34,10,12,0,6,65,2181,170,1564,864,576,7119,4200,7001,4700,715,4000,0,0,0,0,0,0,0,0,0,0,0,0,4173,1,0,0,0,0,0,0,0,0
+1378,DEMON_PUNGUS,Demon Fungus,56,7259,0,3148,1817,1,360,479,48,31,1,83,55,59,63,34,10,12,0,6,65,2181,170,1564,864,576,7119,4200,7001,4700,715,4000,0,0,0,0,0,0,0,0,0,0,0,0,4173,1,0,0,0,0,0,0,0,0
1379,NIGHTMARE_TERROR,Nightmare Terror,78,22605,0,6683,4359,1,757,1007,37,37,1,76,55,60,77,54,10,12,2,6,67,2181,165,1564,864,576,7120,5500,2626,1,2608,30,505,50,510,150,0,0,0,0,0,0,0,0,4166,1,0,0,0,0,0,0,0,0
1380,DRILLER,Driller,52,7452,0,3215,1860,1,666,886,48,31,1,66,58,50,60,47,10,12,1,2,22,2181,165,1564,864,576,1012,7500,715,4000,716,3500,0,0,0,0,0,0,0,0,0,0,0,0,4180,1,0,0,0,0,0,0,0,0
1381,GRIZZLY,Grizzly,68,11733,0,3341,2012,1,809,1076,44,32,1,54,68,58,70,61,10,12,2,2,63,2181,165,1564,864,576,948,7500,919,7500,549,2500,0,0,0,0,0,0,0,0,0,0,0,0,4162,1,0,0,0,0,0,0,0,0
1382,DIABOLIC,Diabolic,67,9642,0,3662,2223,1,796,1059,64,36,1,84,53,67,71,69,10,12,0,6,47,2181,150,1564,864,576,1038,6800,1039,5700,2605,3,984,20,0,0,0,0,0,0,0,0,0,0,4182,1,0,0,0,0,0,0,0,0
1383,EXPLOSION,Explosion,46,8054,0,2404,1642,1,336,447,35,27,1,61,56,50,66,38,10,12,0,2,63,2181,165,1564,864,576,7006,6500,7097,2500,7122,3500,756,1000,522,500,0,0,0,0,0,0,0,0,4267,1,0,0,0,0,0,0,0,0
-1384,DELETER,Sky Deleter,66,17292,0,3403,2066,1,446,593,45,53,1,105,40,65,72,54,10,12,1,9,44,141,175,1564,864,576,7123,4200,1035,5500,1037,4000,1036,3700,0,0,0,0,0,0,0,0,0,0,4158,1,0,0,0,0,0,0,0,0
-1385,DELETER_,Earth Deleter,65,15168,0,3403,2066,1,446,593,52,53,1,67,40,65,72,68,10,12,1,9,42,141,175,1564,864,576,7123,4200,1035,5500,1037,4000,1036,3700,0,0,0,0,0,0,0,0,0,0,4279,1,0,0,0,0,0,0,0,0
+1384,DELETER,Deleter,66,17292,0,3403,2066,1,446,593,45,53,1,105,40,65,72,54,10,12,1,9,44,141,175,1564,864,576,7123,4200,1035,5500,1037,4000,1036,3700,0,0,0,0,0,0,0,0,0,0,4158,1,0,0,0,0,0,0,0,0
+1385,DELETER_,Deleter,65,15168,0,3403,2066,1,446,593,52,53,1,67,40,65,72,68,10,12,1,9,42,141,175,1564,864,576,7123,4200,1035,5500,1037,4000,1036,3700,0,0,0,0,0,0,0,0,0,0,4279,1,0,0,0,0,0,0,0,0
1386,SLEEPER,Sleeper,67,8237,0,3603,2144,1,593,789,49,35,1,48,100,57,75,28,10,12,1,0,42,2181,195,1564,864,576,7124,5500,1056,5500,997,3500,756,300,1226,5,1222,20,7043,1400,1622,1,0,0,4228,1,0,0,0,0,0,0,0,0
1387,GIG,Gig,60,8409,0,3934,2039,1,360,479,60,28,1,61,80,53,59,46,10,12,0,2,41,2181,170,1564,864,576,7125,5000,904,7500,716,150,525,2500,994,850,0,0,0,0,0,0,0,0,4165,1,0,0,0,0,0,0,0,0
-1388,ARCHANGELING,Archangeling,60,79523,0,4152,2173,1,669,890,54,58,1,65,80,74,65,105,10,12,1,8,66,1205,180,1564,864,576,2254,5,610,1800,608,150,985,15,984,55,2317,3,7294,2500,7291,2500,0,0,4241,1,0,0,0,0,0,0,0,0
+1388,ARCHANGELING,Arc Angeling,60,79523,0,4152,2173,1,669,890,54,58,1,65,80,74,65,105,10,12,1,8,66,1205,180,1564,864,576,2254,5,610,1800,608,150,985,15,984,55,2317,3,7294,2500,7291,2500,0,0,4241,1,0,0,0,0,0,0,0,0
1389,DRACULA,Dracula,85,320096,0,120157,38870,3,1625,1891,45,76,1,95,90,87,85,100,10,12,2,6,87,1205,145,1564,864,576,607,4700,1473,5,1722,5,2507,15,2621,4,1557,4,0,0,0,0,0,0,4134,1,500,5000,607,5500,732,3000,522,1000
1390,VIOLY,Violy,75,18257,0,6353,3529,10,738,982,37,36,1,93,54,85,101,83,10,12,1,7,40,133,170,1564,864,576,1060,6500,1611,50,740,1200,2610,800,526,1400,12020,1000,0,0,0,0,1902,10,4209,1,0,0,0,0,0,0,0,0
1391,GALAPAGO,Galapago,63,9145,0,3204,1966,1,457,608,33,33,1,56,56,45,66,57,10,12,1,2,22,139,165,1564,864,576,7053,6700,610,1500,508,2500,606,100,605,100,5111,1,582,100,0,0,0,0,4152,1,0,0,0,0,0,0,0,0
@@ -421,11 +421,11 @@
1417,ZIPPER_BEAR,Zipper Bear,35,2901,0,370,255,1,248,289,10,5,1,25,55,15,28,25,10,13,1,2,27,145,200,976,576,288,7161,4700,7167,3200,518,800,512,100,526,500,0,0,0,0,0,0,0,0,4281,1,0,0,0,0,0,0,0,0
1418,DARK_SNAKE_LORD,Evil Snake Lord,73,254993,0,34288,17950,1,1433,2033,25,55,1,83,62,80,164,88,10,12,2,2,68,1205,200,976,500,400,1471,80,7169,6500,617,1500,5012,300,10020,6500,679,1500,661,500,0,0,0,0,4330,1,524,5000,985,3000,607,5500,608,1400
1419,G_FARMILIAR,Farmiliar,8,155,0,0,0,1,20,28,0,0,1,12,8,5,28,1,10,12,0,2,27,2181,150,1276,576,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1420,G_Skel_archer,Skeleton Archer,31,3040,0,0,0,9,128,153,0,0,1,8,14,5,90,5,10,12,1,1,29,2181,300,2864,864,576,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1420,G_ARCHER_SKELETON,Archer Skeleton,31,3040,0,0,0,9,128,153,0,0,1,8,14,5,90,5,10,12,1,1,29,2181,300,2864,864,576,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1421,G_ISIS,Isis,43,4828,0,0,0,1,423,507,10,35,1,65,43,30,72,15,10,12,2,6,27,2181,200,1384,768,336,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1422,G_HUNTER_FLY,Hunter Fly,42,5242,0,0,0,1,246,333,25,15,1,105,32,15,72,30,10,12,0,4,44,2181,150,676,576,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1423,G_GHOUL,Ghoul,39,5118,0,0,0,1,420,500,5,20,1,20,29,0,33,20,10,12,1,1,49,2181,250,2456,912,504,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1424,G_SIDE_WINDER,Sidewinder,43,4929,0,0,0,1,240,320,5,10,1,43,40,15,115,20,10,12,1,2,25,2693,200,1576,576,576,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1424,G_SIDE_WINDER,Side Winder,43,4929,0,0,0,1,240,320,5,10,1,43,40,15,115,20,10,12,1,2,25,2693,200,1576,576,576,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1425,G_OBEAUNE,Obeaune,31,3952,0,0,0,1,141,165,0,40,1,31,31,55,74,85,10,12,1,5,41,2181,200,1872,672,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1426,G_MARC,Marc,36,6900,0,0,0,1,220,280,5,10,1,36,36,20,56,30,10,12,1,5,41,2181,150,1272,72,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1427,G_NIGHTMARE,Nightmare,49,4437,0,0,0,1,447,529,0,40,1,74,25,15,64,10,10,12,2,6,68,2181,150,1816,816,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -466,14 +466,14 @@
1462,G_ORC_SKELETON,Orc Skeleton,28,2278,0,0,0,1,190,236,10,10,1,14,18,0,30,15,10,12,1,1,29,2181,200,2420,720,648,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1463,G_ORC_ZOMBIE,Orc Zombie,24,1568,0,0,0,1,151,184,5,10,1,12,24,0,24,5,10,12,1,1,29,2693,400,2852,1152,840,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1464,G_PASANA,Pasana,61,8289,0,0,0,1,513,682,29,35,1,73,50,61,69,43,10,12,1,7,43,2181,165,1700,1000,500,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1465,G_PETIT,Petit,44,6881,0,0,0,1,360,427,30,30,1,44,62,69,79,60,10,12,1,9,22,2181,200,1624,620,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1466,G_PETIT_,Petit,45,5747,0,0,0,1,300,355,20,45,1,113,45,69,73,80,10,12,1,9,24,2181,150,1420,1080,528,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1465,G_PETIT,Petite,44,6881,0,0,0,1,360,427,30,30,1,44,62,69,79,60,10,12,1,9,22,2181,200,1624,620,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1466,G_PETIT_,Petite,45,5747,0,0,0,1,300,355,20,45,1,113,45,69,73,80,10,12,1,9,24,2181,150,1420,1080,528,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1467,G_RAYDRIC,Raydric,52,8613,0,0,0,1,830,930,40,15,1,47,42,5,69,26,10,12,2,7,47,2693,150,824,780,420,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1468,G_REQUIEM,Requim,35,3089,0,0,0,1,220,272,0,15,1,53,35,5,57,2,10,12,1,7,27,2181,400,1516,816,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1469,G_SKEL_WORKER,Skeletom Worker,30,2872,0,0,0,1,242,288,0,15,1,15,30,5,42,10,10,12,1,1,29,2181,400,2420,720,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1469,G_SKEL_WORKER,Skeleton Worker,30,2872,0,0,0,1,242,288,0,15,1,15,30,5,42,10,10,12,1,1,29,2181,400,2420,720,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1470,G_ZEROM,Zerom,23,1109,0,0,0,1,127,155,0,10,1,23,23,5,42,1,10,12,1,7,23,2181,200,1780,1080,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1471,G_NINE_TAIL,Nine Tail,51,9466,0,0,0,1,610,734,10,25,1,80,46,1,89,85,10,12,1,2,63,2181,150,840,540,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1472,G_BON_GUN,Bon Gun,32,3520,0,0,0,1,220,260,0,0,1,15,36,10,48,15,10,12,1,1,29,2181,200,1720,500,420,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1472,G_BON_GUN,Bongun,32,3520,0,0,0,1,220,260,0,0,1,15,36,10,48,15,10,12,1,1,29,2181,200,1720,500,420,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1473,G_ORC_ARCHER,Orc Archer,49,7440,0,0,0,9,310,390,10,5,1,44,25,20,125,20,10,12,1,7,22,2181,300,1960,620,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1474,G_MIMIC,Mimic,51,6120,0,0,0,1,150,900,10,40,1,121,1,60,75,110,10,12,1,0,60,2181,100,972,500,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1475,G_WRAITH,Wraith,53,10999,0,0,0,1,580,760,5,30,1,95,30,75,95,35,10,12,2,1,89,2181,300,1816,576,240,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -491,7 +491,7 @@
1487,G_EXECUTIONER,Executioner,65,28980,0,0,0,2,570,950,35,35,1,85,40,25,88,60,10,12,2,0,47,2725,200,768,500,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1488,G_ANOLIAN,Anolian,63,18960,0,0,0,1,640,760,15,15,1,43,58,25,97,65,10,12,1,5,41,2181,200,900,500,864,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1489,G_STING,Sting,61,9500,0,0,0,1,850,1032,5,30,1,45,55,5,120,85,10,12,1,0,62,2181,300,528,500,240,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1490,G_WANDER_MAN,Wandering Man,74,8170,0,0,0,2,750,1000,5,5,1,192,38,45,127,85,10,12,1,6,24,2693,100,672,500,192,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1490,G_WANDER_MAN,Wanderer,74,8170,0,0,0,2,750,1000,5,5,1,192,38,45,127,85,10,12,1,6,24,2693,100,672,500,192,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1491,G_DOKEBI,Dokebi,33,2697,0,0,0,1,197,249,0,10,1,50,40,35,69,40,10,12,0,6,27,2181,250,1156,456,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
//Umbala
@@ -523,7 +523,7 @@
1512,HYEGUN,Hyegun,56,9981,0,2199,1032,1,710,1128,12,10,60,40,36,10,73,15,10,12,1,1,49,2181,200,1152,1152,384,7054,3200,609,50,985,200,7277,20,2406,1,0,0,0,0,0,0,0,0,4328,1,0,0,0,0,0,0,0,0
1513,CIVIL_SERVANT,Civil Servant,62,14390,0,4023,2750,1,650,1010,42,5,58,15,20,60,80,50,10,12,1,2,44,2181,200,1152,1152,384,7262,2100,7263,1700,606,100,1023,300,992,350,693,150,0,0,0,0,0,0,4202,1,0,0,0,0,0,0,0,0
1514,DANCING_DRAGON,Dancing Dragon,54,9136,0,3030,769,1,550,789,39,10,55,62,55,25,72,22,10,12,1,9,44,131,200,1152,1152,384,7265,2400,7266,2600,7268,600,1036,1300,7038,420,992,200,0,0,0,0,0,0,4272,1,0,0,0,0,0,0,0,0
-1515,GARM_BABY,Hatii Baby,61,20119,0,1022,2980,1,680,1179,34,13,45,30,56,55,85,30,10,12,1,2,41,2181,300,1152,1152,384,7269,1400,7270,1100,7066,3200,749,200,12000,500,0,0,0,0,0,0,0,0,4323,1,0,0,0,0,0,0,0,0
+1515,GARM_BABY,Garm Baby,61,20119,0,1022,2980,1,680,1179,34,13,45,30,56,55,85,30,10,12,1,2,41,2181,300,1152,1152,384,7269,1400,7270,1100,7066,3200,749,200,12000,500,0,0,0,0,0,0,0,0,4323,1,0,0,0,0,0,0,0,0
1516,INCREASE_SOIL,Increase Soil,51,8230,0,2760,2110,1,560,700,30,12,40,45,23,12,69,12,10,12,1,0,62,145,400,1152,1152,384,7264,6400,7004,2900,997,50,969,1,0,0,0,0,0,0,0,0,0,0,4231,1,0,0,0,0,0,0,0,0
1517,LI_ME_MANG_RYANG,Li Me Mang Ryang,48,5920,0,1643,1643,1,434,633,23,16,46,51,19,8,57,30,10,12,2,6,62,2181,175,1152,1152,384,7267,4220,7268,2100,1502,60,1523,5,0,0,0,0,0,0,0,0,0,0,4265,1,0,0,0,0,0,0,0,0
1518,BACSOJIN,Bacsojin,85,253221,0,45250,16445,1,1868,6124,20,55,1,65,44,112,152,35,10,12,2,7,67,2213,200,1152,1152,480,1164,2,1165,2,999,500,984,1000,985,1000,607,500,7151,2000,504,500,0,0,0,0,5000,1000,607,500,608,500,985,500
@@ -535,13 +535,13 @@
1524,G_BABY_LEOPARD,Baby Leopard,32,2590,0,0,0,2,155,207,0,5,1,44,20,4,49,10,10,13,0,2,28,2181,150,988,288,168,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1525,G_BATHORY,Bathory,44,5415,0,0,0,1,198,398,0,60,1,76,24,85,65,15,10,12,1,7,27,1173,100,1504,840,900,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1526,G_BLOOD_BUTTERFLY,Bloody Butterfly,57,8082,0,0,0,2,354,575,5,23,1,65,35,37,116,30,10,13,1,4,44,141,150,872,500,300,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1527,G_C_TOWER_MANAGER,Clock Tower Keeper,63,18600,0,0,0,3,880,1180,35,30,1,75,20,64,75,60,10,12,2,0,80,145,200,1072,672,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1527,G_C_TOWER_MANAGER,Clock Tower Manager,63,18600,0,0,0,3,880,1180,35,30,1,75,20,64,75,60,10,12,2,0,80,145,200,1072,672,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1528,G_CLOCK,Clock,60,11050,0,0,0,1,720,909,15,10,1,70,50,25,90,50,10,12,1,0,42,145,200,1092,792,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1529,G_DARK_SNAKE_LORD,Dark Snake Lord,73,254993,0,0,0,1,1433,2033,25,55,1,83,62,80,164,88,10,12,2,2,68,1205,200,976,500,400,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1530,G_DRACULA,Dracula,85,320096,0,0,0,3,1625,1891,45,76,1,95,90,87,85,100,10,12,2,6,87,1205,145,1564,864,576,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1531,G_EVIL_CLOUD_HERMIT,Taoist Hermit,57,15003,0,0,0,9,620,899,25,59,1,66,21,76,130,79,10,13,2,0,40,133,150,1754,544,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1532,G_EXPLOSION,Explosion,46,8054,0,0,0,1,336,447,35,27,1,61,56,78,66,38,10,12,0,2,63,2181,165,1564,864,576,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1533,G_FUR_SEAL,Fur Seal,63,9114,0,0,0,1,845,1202,25,33,1,28,22,15,69,84,10,12,1,2,21,149,250,1612,622,583,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1533,G_FUR_SEAL,Seal,63,9114,0,0,0,1,845,1202,25,33,1,28,22,15,69,84,10,12,1,2,21,149,250,1612,622,583,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1534,G_GOBLIN_1,Goblin,25,1176,0,0,0,1,118,140,10,5,1,53,25,20,38,10,10,12,1,7,24,1173,100,1120,620,240,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1535,G_GOBLIN_2,Goblin,24,1034,0,0,0,1,88,100,10,5,1,24,24,15,66,10,10,12,1,7,23,149,150,1320,620,240,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1536,G_GOBLIN_3,Goblin,24,1034,0,0,0,1,132,165,10,5,1,24,24,15,24,10,10,12,1,7,25,141,250,1624,624,240,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -550,8 +550,8 @@
1539,G_GOBLIN_LEADER,Goblin Leader,64,19735,0,0,0,1,663,753,48,16,1,55,37,30,69,58,10,12,1,7,24,1173,120,1120,620,240,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1540,G_GOLEM,Golem,25,3900,0,0,0,1,175,187,40,0,1,15,25,0,15,0,10,12,2,0,60,145,300,1608,816,396,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1541,G_GREATEST_GENERAL,Greatest General,40,3632,0,0,0,3,350,400,15,15,1,20,60,55,82,140,10,12,1,0,43,132,200,1152,1152,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1542,G_INCANTATION_SAMURAI,Samurai Specter,75,218652,0,0,0,1,1219,2169,10,51,1,85,78,85,150,60,10,12,2,7,67,1205,200,1152,1152,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1543,G_KAPHA,Kappa,41,7982,0,0,0,3,399,719,20,38,1,65,49,22,73,140,10,12,1,5,21,2181,200,1152,1152,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1542,G_INCANTATION_SAMURAI,Incantation Samurai,75,218652,0,0,0,1,1219,2169,10,51,1,85,78,85,150,60,10,12,2,7,67,1205,200,1152,1152,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1543,G_KAPHA,Kapha,41,7982,0,0,0,3,399,719,20,38,1,65,49,22,73,140,10,12,1,5,21,2181,200,1152,1152,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1544,G_KARAKASA,Karakasa,30,3092,0,0,0,1,140,183,1,20,1,40,12,5,52,45,10,12,1,0,60,129,300,1480,480,1056,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1545,G_KOBOLD_1,Kobold,36,3893,0,0,0,1,265,318,15,10,1,90,36,30,52,20,10,12,1,7,44,141,150,1028,528,360,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1546,G_KOBOLD_2,Kobold,31,2179,0,0,0,1,262,324,15,10,1,31,31,20,46,20,10,12,1,7,45,141,200,1528,528,360,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -573,7 +573,7 @@
1562,G_SOLDIER_SKELETON,Soldier Skeleton,29,2334,0,0,0,1,221,245,10,15,1,15,22,5,40,15,10,12,1,1,29,2181,200,2276,576,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1563,G_TENGU,Tengu,65,16940,0,0,0,2,660,980,12,82,1,45,69,45,75,25,10,12,2,6,42,2181,150,1056,1056,336,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1564,G_WICKED_NYMPH,Wicked Nymph,63,18029,0,0,0,1,691,1382,12,75,1,64,12,69,100,80,10,13,1,6,67,1173,200,1672,672,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1565,G_WILD_GINSENG,Wild Ginseng,46,6900,0,0,0,5,220,280,10,20,1,42,36,55,66,30,10,13,0,3,43,145,400,2208,1008,324,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1565,G_WILD_GINSENG,Hermit Plant,46,6900,0,0,0,5,220,280,10,20,1,42,36,55,66,30,10,13,0,3,43,145,400,2208,1008,324,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1566,G_WRAITH_DEAD,Wraith Dead,74,42131,0,0,0,2,1366,1626,25,30,1,99,55,95,115,45,10,12,2,1,89,1173,175,1816,576,240,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1567,G_ANCIENT_WORM,Ancient Worm,67,22598,0,0,0,1,947,1115,35,30,1,35,56,55,81,72,10,12,2,4,25,1173,165,1792,792,336,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1568,G_ANGELING,Angeling,20,55000,0,0,0,1,120,195,0,70,1,50,20,75,68,200,10,10,1,8,86,1205,200,1272,672,672,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -585,7 +585,7 @@
1574,G_ELDER_WILLOW,Elder Willow,20,693,0,0,0,1,58,70,10,30,1,20,25,35,38,30,10,12,1,3,43,149,200,1372,672,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1575,G_FLORA,Flora,26,2092,0,0,0,3,242,273,10,35,1,26,35,5,43,80,10,12,2,3,22,132,1000,1432,432,576,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1576,G_GHOSTRING,Ghostring,18,73300,0,0,0,1,82,122,0,60,1,27,18,45,72,30,10,12,1,6,88,1205,300,1220,1080,648,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1577,G_GOBLIN_ARCHER,Goblin,28,1750,0,0,0,9,89,113,0,0,1,15,20,15,72,20,10,12,0,7,25,133,200,1172,672,420,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1577,G_GOBLIN_ARCHER,Goblin Archer,28,1750,0,0,0,9,89,113,0,0,1,15,20,15,72,20,10,12,0,7,25,133,200,1172,672,420,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1578,G_HORONG,Horong,34,1939,0,0,0,1,275,327,99,50,1,34,10,0,50,0,10,12,0,0,83,141,400,1888,1152,828,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1579,G_HYDRA,Hydra,14,660,0,0,0,7,22,28,0,40,1,14,14,0,40,2,10,12,0,3,41,132,1000,800,432,600,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1580,G_INCUBUS,Incubus,75,17281,0,0,0,2,1408,1873,58,46,1,97,95,150,89,87,10,12,1,6,67,1173,165,1564,864,576,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -611,16 +611,16 @@
1596,G_TAMRUAN,Tamruan,52,10234,0,0,0,1,489,534,38,94,26,20,15,0,60,45,10,10,1,6,62,181,190,872,560,380,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1597,G_GARGOYLE,Gargoyle,48,3950,0,0,0,9,290,360,10,10,15,61,20,20,126,40,10,12,1,6,64,5,200,1020,720,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1598,G_BLAZZER,Blazzer,43,8252,0,0,0,2,533,709,50,40,1,52,50,64,69,40,10,12,0,6,43,5,200,1564,864,576,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1599,G_WHISPER_BOSS,Whisper Boss,34,5040,0,0,0,1,198,239,0,45,1,51,14,0,60,0,10,12,0,6,68,53,250,2536,1536,672,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1599,G_WHISPER_BOSS,Giant Whisper,34,5040,0,0,0,1,198,239,0,45,1,51,14,0,60,0,10,12,0,6,68,53,250,2536,1536,672,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1600,G_HEATER,Heater,68,15648,0,0,0,2,682,1007,40,42,69,47,25,5,71,100,10,12,1,2,43,53,250,1452,483,528,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1601,G_PERMETER,Permeter,63,11684,0,0,0,2,943,1212,46,45,69,59,60,5,69,100,10,12,1,2,40,17,250,1100,483,528,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1602,G_SOLIDER,Solider,70,17181,0,0,0,2,796,978,57,43,69,35,85,5,74,100,10,12,1,2,42,17,250,1452,483,528,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1603,G_BIGFOOT,Bigfoot,25,1619,0,0,0,1,198,220,10,0,1,25,55,15,20,25,10,12,2,2,22,145,300,1260,192,192,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1604,G_GIANT_HONET,Giant Hornet,56,12834,0,0,0,1,650,851,38,43,35,38,32,10,71,64,10,12,0,4,24,1173,155,1292,792,340,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1605,G_DARK_ILLUSION,Dark Illusion,77,101487,0,0,0,2,1300,1982,64,70,5,100,40,100,97,40,10,12,2,6,89,1205,145,1024,768,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1606,G_GARM_BABY,Hatii Baby,61,20119,0,0,0,3,680,1179,34,13,1,30,56,55,85,30,10,12,1,2,41,133,300,1152,1152,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1607,G_GOBLINE_XMAS,Xmas Goblin,28,2090,0,0,0,1,140,170,0,50,1,24,30,53,45,100,10,12,0,7,46,1173,400,1248,1248,240,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1608,G_THIEF_BUG__,Male Thief Bug,19,583,0,0,0,1,76,88,15,5,1,29,16,5,36,1,10,12,1,4,27,141,300,988,288,768,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1606,G_GARM_BABY,Garm Baby,61,20119,0,0,0,3,680,1179,34,13,1,30,56,55,85,30,10,12,1,2,41,133,300,1152,1152,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1607,G_GOBLINE_XMAS,Christmas Goblin,28,2090,0,0,0,1,140,170,0,50,1,24,30,53,45,100,10,12,0,7,46,1173,400,1248,1248,240,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1608,G_THIEF_BUG__,Thief Bug Male,19,583,0,0,0,1,76,88,15,5,1,29,16,5,36,1,10,12,1,4,27,141,300,988,288,768,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1609,G_DANCING_DRAGON,Dancing Dragon,54,9136,0,0,0,3,550,789,39,10,1,62,55,25,72,10,10,12,1,9,44,131,200,1152,1152,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1610,G_MUNAK,Munak,30,2872,0,0,0,1,180,230,0,0,1,15,20,5,46,15,10,12,1,1,29,133,200,2468,768,288,901,5500,2264,1,2404,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1611,G_BON_GUN_,Bongun,32,3520,0,0,0,1,220,260,0,0,45,15,36,10,48,15,10,12,1,1,29,149,200,1720,500,420,512,0,512,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index b2d561946..7ad8c6e49 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -26,6 +26,12 @@ Nexon
== Changelog ==
Date Added
+
+03/30
+ * Revised all the spawns based on Emperium.org. [Poki#3]
+ - 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.
+
03/27
* Fixed the infinite warp looping between Lutie and Lutie field 01 [Skotlex]
03/23
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