summaryrefslogtreecommitdiff
path: root/npc/pre-re/mobs/dungeons
diff options
context:
space:
mode:
authordaegaladh <daegaladh@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-08-01 04:29:56 +0000
committerdaegaladh <daegaladh@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-08-01 04:29:56 +0000
commit8832adba3ec9df0f7f890154f69f0993b8d1d8e5 (patch)
tree0e73afe6a780abf29fe035301f1354f24762da7a /npc/pre-re/mobs/dungeons
parentfa533907d49c7e288be33efb55fcb094f8e48591 (diff)
downloadhercules-8832adba3ec9df0f7f890154f69f0993b8d1d8e5.tar.gz
hercules-8832adba3ec9df0f7f890154f69f0993b8d1d8e5.tar.bz2
hercules-8832adba3ec9df0f7f890154f69f0993b8d1d8e5.tar.xz
hercules-8832adba3ec9df0f7f890154f69f0993b8d1d8e5.zip
Full npc folder reorganization. (I hope I didn't break anything D:)
-Now common scripts goes to the main npc folder, and pre-re-only/re-only ones goes to their respective folders. -NPCs with practically the same script but little differences have been left in the main folder and uses the command checkre() for the differences. -For those NPCs with different coordinates but same script, the script has been left in the main folder but the NPCs splitted as duplicates. -All pre-renewal files has been reverted back to their pre-renewal behavior. TODO: -Correct pre-re quest rewards. -Check for pre-re/re differences in mapflags. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16545 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/pre-re/mobs/dungeons')
-rw-r--r--npc/pre-re/mobs/dungeons/abbey.txt143
-rw-r--r--npc/pre-re/mobs/dungeons/abyss.txt65
-rw-r--r--npc/pre-re/mobs/dungeons/alde_dun.txt55
-rw-r--r--npc/pre-re/mobs/dungeons/ama_dun.txt32
-rw-r--r--npc/pre-re/mobs/dungeons/anthell.txt161
-rw-r--r--npc/pre-re/mobs/dungeons/ayo_dun.txt14
-rw-r--r--npc/pre-re/mobs/dungeons/beach_dun.txt30
-rw-r--r--npc/pre-re/mobs/dungeons/c_tower.txt104
-rw-r--r--npc/pre-re/mobs/dungeons/ein_dun.txt26
-rw-r--r--npc/pre-re/mobs/dungeons/gef_dun.txt70
-rw-r--r--npc/pre-re/mobs/dungeons/gefenia.txt110
-rw-r--r--npc/pre-re/mobs/dungeons/glastheim.txt278
-rw-r--r--npc/pre-re/mobs/dungeons/gld_dun.txt38
-rw-r--r--npc/pre-re/mobs/dungeons/gld_dunSE.txt22
-rw-r--r--npc/pre-re/mobs/dungeons/gon_dun.txt36
-rw-r--r--npc/pre-re/mobs/dungeons/ice_dun.txt57
-rw-r--r--npc/pre-re/mobs/dungeons/in_sphinx.txt52
-rw-r--r--npc/pre-re/mobs/dungeons/iz_dun.txt137
-rw-r--r--npc/pre-re/mobs/dungeons/juperos.txt68
-rw-r--r--npc/pre-re/mobs/dungeons/kh_dun.txt69
-rw-r--r--npc/pre-re/mobs/dungeons/lhz_dun.txt328
-rw-r--r--npc/pre-re/mobs/dungeons/lou_dun.txt34
-rw-r--r--npc/pre-re/mobs/dungeons/mag_dun.txt37
-rw-r--r--npc/pre-re/mobs/dungeons/mjo_dun.txt31
-rw-r--r--npc/pre-re/mobs/dungeons/moc_pryd.txt62
-rw-r--r--npc/pre-re/mobs/dungeons/mosk_dun.txt42
-rw-r--r--npc/pre-re/mobs/dungeons/nyd_dun.txt19
-rw-r--r--npc/pre-re/mobs/dungeons/odin.txt64
-rw-r--r--npc/pre-re/mobs/dungeons/orcsdun.txt29
-rw-r--r--npc/pre-re/mobs/dungeons/pay_dun.txt170
-rw-r--r--npc/pre-re/mobs/dungeons/prt_maze.txt67
-rw-r--r--npc/pre-re/mobs/dungeons/prt_sew.txt56
-rw-r--r--npc/pre-re/mobs/dungeons/ra_san.txt82
-rw-r--r--npc/pre-re/mobs/dungeons/tha_t.txt240
-rw-r--r--npc/pre-re/mobs/dungeons/thor_v.txt81
-rw-r--r--npc/pre-re/mobs/dungeons/treasure.txt190
-rw-r--r--npc/pre-re/mobs/dungeons/tur_dun.txt62
-rw-r--r--npc/pre-re/mobs/dungeons/um_dun.txt2
-rw-r--r--npc/pre-re/mobs/dungeons/xmas_dun.txt23
39 files changed, 1956 insertions, 1230 deletions
diff --git a/npc/pre-re/mobs/dungeons/abbey.txt b/npc/pre-re/mobs/dungeons/abbey.txt
index c39adfe4e..922356452 100644
--- a/npc/pre-re/mobs/dungeons/abbey.txt
+++ b/npc/pre-re/mobs/dungeons/abbey.txt
@@ -12,39 +12,118 @@
//= 1.2 More official spawns [Playtester]
//============================================================
-//==================================================
-// nameless_n - Nameless Island
-//==================================================
-nameless_n,0,0,0,0 monster Ghoul 1036,40,5000,0,0
-nameless_n,0,0,0,0 monster Hellhound 1866,17,5000,0,0
-nameless_n,0,0,0,0 monster Banshee 1867,16,5000,0,0
-nameless_n,0,0,0,0 monster Ragged Zombie 1865,12,5000,0,0
-nameless_n,0,0,0,0 monster Zombie Slaughter 1864,12,5000,0,0
-nameless_n,0,0,0,0 monster Flame Skull 1869,3,5000,0,0
+// Nameless Island
+nameless_n,93,211,51,62 monster Zombie Slaughter 1864,3,15000,0,1
+nameless_n,93,211,51,62 monster Ragged Zombie 1865,3,15000,0,1
+nameless_n,93,211,51,62 monster Hell Poodle 1866,5,15000,0,1
+nameless_n,93,211,51,62 monster Banshee 1867,4,15000,0,1
+nameless_n,93,211,51,62 monster Flame Skull 1869,1,30000,0,1
+nameless_n,93,211,51,62 monster Ghoul 1036,10,30000,0,1
+nameless_n,204,225,57,70 monster Zombie Slaughter 1864,5,15000,0,1
+nameless_n,204,225,57,70 monster Ragged Zombie 1865,5,15000,0,1
+nameless_n,204,225,57,70 monster Hell Poodle 1866,5,15000,0,1
+nameless_n,204,225,57,70 monster Banshee 1867,4,15000,0,1
+nameless_n,204,225,57,70 monster Flame Skull 1869,1,30000,0,1
+nameless_n,204,225,57,70 monster Ghoul 1036,10,30000,0,1
+nameless_n,127,103,59,46 monster Zombie Slaughter 1864,2,15000,0,1
+nameless_n,127,103,59,46 monster Ragged Zombie 1865,2,15000,0,1
+nameless_n,127,103,59,46 monster Hell Poodle 1866,5,15000,0,1
+nameless_n,127,103,59,46 monster Banshee 1867,4,15000,0,1
+nameless_n,127,103,59,46 monster Flame Skull 1869,1,30000,0,1
+nameless_n,127,103,59,46 monster Ghoul 1036,10,30000,0,1
+nameless_n,234,95,40,58 monster Zombie Slaughter 1864,2,15000,0,1
+nameless_n,234,95,40,58 monster Ragged Zombie 1865,2,15000,0,1
+nameless_n,234,95,40,58 monster Hell Poodle 1866,2,15000,0,1
+nameless_n,234,95,40,58 monster Banshee 1867,4,15000,0,1
+nameless_n,234,95,40,58 monster Ghoul 1036,10,30000,0,1
-//==================================================
-// abbey01 - Cursed Monastery
-//==================================================
-abbey01,0,0,0,0 monster Banshee 1867,93,5000,0,0
-abbey01,0,0,0,0 monster Ghoul 1036,56,5000,0,0
-abbey01,0,0,0,0 monster Ragged Zombie 1865,33,5000,0,0
-abbey01,0,0,0,0 monster Zombie Slaughter 1864,30,5000,0,0
-abbey01,0,0,0,0 monster Hellhound 1866,25,5000,0,0
-abbey01,0,0,0,0 monster Flame Skull 1869,21,5000,0,0
+// Cursed Abbey Dungeon 1
+abbey01,0,0,0,0 monster Banshee 1867,30,0,0,1
+abbey01,97,270,87,87 monster Banshee 1867,30,0,0,1
+abbey01,97,270,87,87 monster Hell Poodle 1866,15,0,0,1
+abbey01,97,270,87,87 monster Zombie Slaughter 1864,10,0,0,1
+abbey01,97,270,87,87 monster Ragged Zombie 1865,10,0,0,1
+abbey01,97,270,87,87 monster Flame Skull 1869,9,0,0,1
+abbey01,97,270,87,87 monster Ghoul 1036,10,0,0,1
+abbey01,250,370,49,50 monster Banshee 1867,3,0,0,1
+abbey01,250,370,49,50 monster Hell Poodle 1866,2,0,0,1
+abbey01,250,370,49,50 monster Zombie Slaughter 1864,3,0,0,1
+abbey01,250,370,49,50 monster Ragged Zombie 1865,3,0,0,1
+abbey01,250,370,49,50 monster Flame Skull 1869,2,0,0,1
+abbey01,250,370,49,50 monster Ghoul 1036,4,0,0,1
+abbey01,374,207,39,100 monster Banshee 1867,3,0,0,1
+abbey01,374,207,39,100 monster Hell Poodle 1866,1,0,0,1
+abbey01,374,207,39,100 monster Zombie Slaughter 1864,1,0,0,1
+abbey01,374,207,39,100 monster Ragged Zombie 1865,2,0,0,1
+abbey01,374,207,39,100 monster Flame Skull 1869,1,0,0,1
+abbey01,374,207,39,100 monster Ghoul 1036,4,0,0,1
+abbey01,283,283,99,100 monster Banshee 1867,10,0,0,1
+abbey01,283,283,99,100 monster Hell Poodle 1866,5,0,0,1
+abbey01,283,283,99,100 monster Zombie Slaughter 1864,7,0,0,1
+abbey01,283,283,99,100 monster Ragged Zombie 1865,7,0,0,1
+abbey01,283,283,99,100 monster Flame Skull 1869,3,0,0,1
+abbey01,283,283,99,100 monster Ghoul 1036,10,0,0,1
+abbey01,71,67,64,58 monster Banshee 1867,3,0,0,1
+abbey01,71,67,64,58 monster Zombie Slaughter 1864,3,0,0,1
+abbey01,71,67,64,58 monster Ragged Zombie 1865,3,0,0,1
+abbey01,71,67,64,58 monster Flame Skull 1869,1,0,0,1
+abbey01,71,67,64,58 monster Ghoul 1036,10,0,0,1
+abbey01,71,67,64,58 monster Zombie Slaughter 1864,4,0,0,1
+abbey01,71,67,64,58 monster Ragged Zombie 1865,4,0,0,1
+abbey01,71,67,64,58 monster Flame Skull 1869,3,0,0,1
+abbey01,71,67,64,58 monster Ghoul 1036,10,0,0,1
+abbey01,260,70,35,30 monster Banshee 1867,7,0,0,1
+abbey01,260,70,35,30 monster Hell Poodle 1866,1,0,0,1
+abbey01,260,70,35,30 monster Zombie Slaughter 1864,1,0,0,1
+abbey01,260,70,35,30 monster Ragged Zombie 1865,2,0,0,1
+abbey01,260,70,35,30 monster Flame Skull 1869,1,0,0,1
+abbey01,260,70,35,30 monster Ghoul 1036,4,0,0,1
+abbey01,260,100,35,30 monster Banshee 1867,7,0,0,1
+abbey01,260,100,35,30 monster Hell Poodle 1866,1,0,0,1
+abbey01,260,100,35,30 monster Zombie Slaughter 1864,1,0,0,1
+abbey01,260,100,35,30 monster Ragged Zombie 1865,2,0,0,1
+abbey01,260,100,35,30 monster Flame Skull 1869,1,0,0,1
+abbey01,260,100,35,30 monster Ghoul 1036,4,0,0,1
-//==================================================
-// abbey02 - Cursed Monastery
-//==================================================
-abbey02,0,0,0,0 monster Zombie Slaughter 1864,210,5000,0,0
-abbey02,0,0,0,0 monster Ragged Zombie 1865,70,5000,0,0
-abbey02,0,0,0,0 monster Flame Skull 1869,21,5000,0,0
-abbey02,0,0,0,0 monster Necromancer 1870,7,5000,0,0
-abbey02,236,78,21,18 boss_monster Fallen Bishop 1871,1,7200000,600000,1
+// Cursed Abbey Dungeon 2
+abbey02,150,66,36,64 monster Zombie Slaughter 1864,30,60000,0,1
+abbey02,150,66,36,64 monster Ragged Zombie 1865,10,0,0,1
+abbey02,150,66,36,64 monster Flame Skull 1869,3,0,0,1
+abbey02,150,66,36,64 monster Necromancer 1870,1,0,0,1
+abbey02,67,75,46,54 monster Zombie Slaughter 1864,30,124000,0,1
+abbey02,67,75,46,54 monster Ragged Zombie 1865,10,0,0,1
+abbey02,67,75,46,54 monster Flame Skull 1869,3,0,0,1
+abbey02,67,75,46,54 monster Necromancer 1870,1,0,0,1
+abbey02,232,76,46,54 monster Zombie Slaughter 1864,30,63000,0,1
+abbey02,232,76,46,54 monster Ragged Zombie 1865,10,0,0,1
+abbey02,232,76,46,54 monster Flame Skull 1869,3,0,0,1
+abbey02,232,76,46,54 monster Necromancer 1870,1,0,0,1
+abbey02,236,78,21,18 boss_monster Fallen Bishop Hibram 1871,1,7200000,600000,1
+abbey02,150,153,142,23 monster Zombie Slaughter 1864,30,122000,0,1
+abbey02,150,153,142,23 monster Ragged Zombie 1865,10,0,0,1
+abbey02,150,153,142,23 monster Flame Skull 1869,3,0,0,1
+abbey02,150,153,142,23 monster Necromancer 1870,1,0,0,1
+abbey02,68,220,46,58 monster Zombie Slaughter 1864,30,6000,0,1
+abbey02,68,220,46,58 monster Ragged Zombie 1865,10,0,0,1
+abbey02,68,220,46,58 monster Flame Skull 1869,3,0,0,1
+abbey02,68,220,46,58 monster Necromancer 1870,1,0,0,1
+abbey02,150,240,35,44 monster Zombie Slaughter 1864,30,120000,0,1
+abbey02,150,240,35,44 monster Ragged Zombie 1865,10,0,0,1
+abbey02,150,240,35,44 monster Flame Skull 1869,3,0,0,1
+abbey02,150,240,35,44 monster Necromancer 1870,1,0,0,1
+abbey02,232,220,46,58 monster Zombie Slaughter 1864,30,60000,0,1
+abbey02,232,220,46,58 monster Ragged Zombie 1865,10,0,0,1
+abbey02,232,220,46,58 monster Flame Skull 1869,3,0,0,1
+abbey02,232,220,46,58 monster Necromancer 1870,1,0,0,1
-//==================================================
-// abbey03 - Cursed Monastery
-//==================================================
-abbey03,0,0,0,0 monster Necromancer 1870,60,5000,0,0
-abbey03,0,0,0,0 monster Banshee 1867,30,5000,0,0
-abbey03,0,0,0,0 monster Flame Skull 1869,25,5000,0,0
+// Cursed Abbey Dungeon 3
abbey03,0,0,0,0 boss_monster Beelzebub 1873,1,43200000,600000,1
+abbey03,120,212,116,24 monster Necromancer 1870,10,0,0,1
+abbey03,120,212,116,24 monster Banshee 1867,10,0,0,1
+abbey03,120,212,116,24 monster Flame Skull 1869,5,0,0,1
+abbey03,122,152,111,36 monster Necromancer 1870,20,0,0,1
+abbey03,122,152,111,36 monster Banshee 1867,10,0,0,1
+abbey03,122,152,111,36 monster Flame Skull 1869,10,0,0,1
+abbey03,120,64,117,53 monster Necromancer 1870,30,0,0,1
+abbey03,120,64,117,53 monster Banshee 1867,10,0,0,1
+abbey03,120,64,117,53 monster Flame Skull 1869,10,0,0,1
diff --git a/npc/pre-re/mobs/dungeons/abyss.txt b/npc/pre-re/mobs/dungeons/abyss.txt
index 1c1ee63b0..6bce6bcbc 100644
--- a/npc/pre-re/mobs/dungeons/abyss.txt
+++ b/npc/pre-re/mobs/dungeons/abyss.txt
@@ -14,38 +14,49 @@
//============================================================
//==================================================
-// abyss_01 - Abyss Lake Underground Cave
+// abyss_01 - Abyss Lakes Underground Cave F1
//==================================================
-abyss_01,0,0,0,0 monster Ferus 1717,55,5000,0,0
-abyss_01,0,0,0,0 monster Penomena 1216,30,5000,0,0
-abyss_01,0,0,0,0 monster Ferus 1714,30,5000,0,0
-abyss_01,0,0,0,0 monster Mimic 1191,10,5000,0,0
-abyss_01,0,0,0,0 monster Ancient Mimic 1699,10,5000,0,0
-abyss_01,0,0,0,0 monster Novus 1715,9,5000,0,0
-abyss_01,0,0,0,0 monster Novus 1718,9,5000,0,0
-abyss_01,0,0,0,0 monster Dragon Egg 1721,8,5000,0,0
+abyss_01,0,0,0,0 monster Mimic 1191,10,600000,0,0
+abyss_01,0,0,0,0 monster Ancient Mimic 1699,10,600000,0,0
+abyss_01,152,205,130,70 monster Ferus 1714,10,0,0,0
+abyss_01,152,205,130,70 monster Ferus 1717,25,300000,0,0
+abyss_01,152,205,130,70 monster Novus 1715,3,0,0,0
+abyss_01,152,205,130,70 monster Novus 1718,3,0,0,0
+abyss_01,103,93,85,70 monster Ferus 1714,10,0,0,0
+abyss_01,103,93,85,70 monster Ferus 1717,15,300000,0,0
+abyss_01,103,93,85,70 monster Novus 1715,3,0,0,0
+abyss_01,103,93,85,70 monster Novus 1718,3,0,0,0
+abyss_01,195,102,85,70 monster Ferus 1714,10,0,0,0
+abyss_01,195,102,85,70 monster Ferus 1717,15,300000,0,0
+abyss_01,195,102,85,70 monster Novus 1715,3,0,0,0
+abyss_01,195,102,85,70 monster Novus 1718,3,0,0,0
+abyss_01,110,170,15,15 monster Penomena 1216,15,660000,300000,0
+abyss_01,195,147,5,10 monster Penomena 1216,5,720000,300000,0
+abyss_01,140,100,15,5 monster Penomena 1216,10,780000,300000,0
+abyss_01,260,40,14,14 monster Dragon Egg 1721,3,1200000,600000,0
+abyss_01,150,160,50,50 monster Dragon Egg 1721,5,1800000,600000,0
//==================================================
-// abyss_02 - Abyss Lake Underground Cave
+// abyss_02 - Abyss Lakes Underground Cave F2
//==================================================
-abyss_02,0,0,0,0 monster Acidus 1716,60,5000,0,0
-abyss_02,0,0,0,0 monster Ferus 1714,50,5000,0,0
-abyss_02,0,0,0,0 monster Dragon Egg 1721,10,5000,0,0
-abyss_02,0,0,0,0 monster Mimic 1191,10,5000,0,0
-abyss_02,0,0,0,0 monster Acidus 1713,10,5000,0,0
-abyss_02,0,0,0,0 monster Ancient Mimic 1699,10,5000,0,0
-abyss_02,0,0,0,0 monster Novus 1715,5,5000,0,0
-abyss_02,0,0,0,0 monster Novus 1718,5,5000,0,0
+abyss_02,0,0,0,0 monster Mimic 1191,10,900000,0,0
+abyss_02,0,0,0,0 monster Ancient Mimic 1699,10,900000,0,0
+abyss_02,0,0,0,0 monster Ferus 1714,50,300000,0,0
+abyss_02,0,0,0,0 monster Acidus 1713,10,600000,0,0
+abyss_02,0,0,0,0 monster Acidus 1716,60,300000,0,0
+abyss_02,0,0,0,0 monster Novus 1715,5,0,0,0
+abyss_02,0,0,0,0 monster Novus 1718,5,0,0,0
+abyss_02,0,0,0,0 monster Dragon Egg 1721,10,1800000,600000,0
//==================================================
-// abyss_03 - Abyss Lake Underground Cave
+// abyss_03 - Abyss Lakes Underground Cave F3
//==================================================
-abyss_03,0,0,0,0 monster Acidus 1713,60,5000,0,0
-abyss_03,0,0,0,0 monster Dragon Egg 1721,10,5000,0,0
-abyss_03,0,0,0,0 monster Mimic 1191,10,5000,0,0
-abyss_03,0,0,0,0 monster Acidus 1716,10,5000,0,0
-abyss_03,0,0,0,0 monster Ancient Mimic 1699,10,5000,0,0
-abyss_03,0,0,0,0 monster Ferus 1714,10,5000,0,0
-abyss_03,0,0,0,0 monster Ferus 1717,10,5000,0,0
-abyss_03,0,0,0,0 monster Hydrolancer 1720,3,5000,0,0
+abyss_03,0,0,0,0 monster Mimic 1191,10,300000,0,0
+abyss_03,0,0,0,0 monster Ancient Mimic 1699,10,300000,0,0
+abyss_03,0,0,0,0 monster Acidus 1713,60,600000,0,0
+abyss_03,0,0,0,0 monster Acidus 1716,10,300000,0,0
+abyss_03,0,0,0,0 monster Ferus 1714,10,300000,0,0
+abyss_03,0,0,0,0 monster Ferus 1717,10,300000,0,0
+abyss_03,0,0,0,0 monster Dragon Egg 1721,10,1800000,600000,0
+abyss_03,0,0,0,0 monster Hydrolancer 1720,3,3000000,2400000,0
abyss_03,0,0,0,0 boss_monster Detardeurus 1719,1,10800000,600000,0
diff --git a/npc/pre-re/mobs/dungeons/alde_dun.txt b/npc/pre-re/mobs/dungeons/alde_dun.txt
index cc7dfb0e9..e78f2d6ff 100644
--- a/npc/pre-re/mobs/dungeons/alde_dun.txt
+++ b/npc/pre-re/mobs/dungeons/alde_dun.txt
@@ -13,29 +13,52 @@
//============================================================
//==================================================
-// alde_dun01 - Clock Tower B1f
+// alde_dun01 - Clock Tower B1
//==================================================
-alde_dun01,0,0,0,0 monster Arclouze 1194,50,5000,0,0
-alde_dun01,0,0,0,0 monster Drainliar 1111,40,5000,0,0
+alde_dun01,0,0,0,0 monster Arclouze 1194,50,0,0,0
+alde_dun01,0,0,0,0 monster Drainliar 1111,40,0,0,0
//==================================================
-// alde_dun02 - Clock Tower B2f
+// alde_dun02 - Clock Tower B2
//==================================================
-alde_dun02,0,0,0,0 monster High Orc 1213,50,5000,0,0
-alde_dun02,0,0,0,0 monster Brilight 1211,20,5000,0,0
-alde_dun02,0,0,0,0 monster Arclouze 1194,20,5000,0,0
-alde_dun02,0,0,0,0 monster Orc Archer 1189,20,5000,0,0
+alde_dun02,0,0,0,0 monster High Orc 1213,50,0,0,0
+alde_dun02,0,0,0,0 monster Orc Archer 1189,20,0,0,0
+alde_dun02,0,0,0,0 monster Brilight 1211,20,0,0,0
+alde_dun02,0,0,0,0 monster Arclouze 1194,20,0,0,0
//==================================================
-// alde_dun03 - Clock Tower B3f
+// alde_dun03 - Clock Tower B3
//==================================================
-alde_dun03,0,0,0,0 monster Penomena 1216,85,5000,0,0
-alde_dun03,0,0,0,0 monster Cramp 1209,56,5000,0,0
-alde_dun03,0,0,0,0 monster Drainliar 1111,55,5000,0,0
+alde_dun03,0,0,0,0 monster Cramp 1209,25,0,0,0
+alde_dun03,0,0,0,0 monster Drainliar 1111,20,0,0,0
+alde_dun03,77,28,5,5 monster Cramp 1209,3,40000,20000,0
+alde_dun03,0,0,0,0 monster Penomena 1216,45,180000,120000,0
+alde_dun03,184,61,30,30 monster Cramp 1209,10,300000,150000,0
+alde_dun03,184,61,30,30 monster Drainliar 1111,10,300000,150000,0
+alde_dun03,163,56,10,10 monster Penomena 1216,3,600000,300000,0
+alde_dun03,168,42,6,6 monster Penomena 1216,2,600000,300000,0
+alde_dun03,147,30,8,8 monster Penomena 1216,2,600000,300000,0
+alde_dun03,126,53,20,20 monster Cramp 1209,5,300000,150000,0
+alde_dun03,126,53,20,20 monster Drainliar 1111,5,300000,150000,0
+alde_dun03,102,40,10,10 monster Penomena 1216,4,600000,300000,0
+alde_dun03,130,220,40,40 monster Cramp 1209,10,300000,150000,0
+alde_dun03,130,220,40,40 monster Drainliar 1111,10,300000,150000,0
+alde_dun03,155,201,25,25 monster Penomena 1216,7,600000,300000,0
+alde_dun03,160,181,8,8 monster Penomena 1216,2,600000,300000,0
+alde_dun03,179,166,6,6 monster Penomena 1216,4,600000,300000,0
+alde_dun03,127,204,9,9 monster Penomena 1216,5,600000,300000,0
+alde_dun03,127,204,9,9 monster Cramp 1209,3,300000,150000,0
+alde_dun03,142,157,8,8 monster Penomena 1216,5,600000,300000,0
+alde_dun03,135,140,8,8 monster Penomena 1216,3,600000,300000,0
+alde_dun03,120,157,8,8 monster Penomena 1216,3,600000,300000,0
+alde_dun03,120,157,8,8 monster Drainliar 1111,10,300000,150000,0
//==================================================
-// alde_dun04 - Clock Tower B4f
+// alde_dun04 - Clock Tower B4
//==================================================
-alde_dun04,0,0,0,0 monster Bathory 1102,50,5000,0,0
-alde_dun04,0,0,0,0 monster Whisper 1179,10,5000,0,0
-alde_dun04,0,0,0,0 monster Joker 1131,10,5000,0,0
+alde_dun04,0,0,0,0 monster Bathory 1102,50,0,0,0
+alde_dun04,0,0,0,0 monster Joker 1131,10,0,0,0
+alde_dun04,0,0,0,0 monster Executioner 1205,1,3600000,1800000,1
+alde_dun04,0,0,0,0 monster Mysteltainn 1203,1,3600000,1800000,1
+alde_dun04,0,0,0,0 monster Ogretooth 1204,1,3600000,1800000,1
+alde_dun04,0,0,0,0 monster Whisper 1179,10,0,0,0
diff --git a/npc/pre-re/mobs/dungeons/ama_dun.txt b/npc/pre-re/mobs/dungeons/ama_dun.txt
index 039afd13b..7f3504d06 100644
--- a/npc/pre-re/mobs/dungeons/ama_dun.txt
+++ b/npc/pre-re/mobs/dungeons/ama_dun.txt
@@ -14,27 +14,29 @@
//==================================================
// ama_dun01 - Tatami Maze
//==================================================
-ama_dun01,0,0,0,0 monster Miyabi Doll 1404,65,5000,0,0
-ama_dun01,0,0,0,0 monster Firelock Soldier 1403,45,5000,0,0
-ama_dun01,0,0,0,0 monster Shinobi 1401,2,5000,0,0
+ama_dun01,0,0,0,0 monster Miyabi Doll 1404,65,0,0,0
+ama_dun01,0,0,0,0 monster Firelock Soldier 1403,45,0,0,0
+ama_dun01,0,0,0,0 monster Shinobi 1401,2,180000,90000,0
//==================================================
// ama_dun02 - Battle Field in the Underground Forest
//==================================================
-ama_dun02,0,0,0,0 monster Poison Toad 1402,35,5000,0,0
-ama_dun02,0,0,0,0 monster Firelock Soldier 1403,20,5000,0,0
-ama_dun02,0,0,0,0 monster Horong 1129,10,5000,0,0
-ama_dun02,0,0,0,0 monster Miyabi Doll 1404,5,5000,0,0
-ama_dun02,0,0,0,0 monster Shinobi 1401,2,5000,0,0
-ama_dun02,0,0,0,0 monster The Paper 1375,1,5000,0,0
+ama_dun02,0,0,0,0 monster Poison Toad 1402,35,180000,90000,0
+ama_dun02,0,0,0,0 monster Firelock Soldier 1403,20,60000,30000,0
+ama_dun02,0,0,0,0 monster Miyabi Doll 1404,5,120000,60000,0
+ama_dun02,0,0,0,0 monster Shinobi 1401,2,180000,90000,0
+ama_dun02,0,0,0,0 monster Horong 1129,10,0,0,0
+ama_dun02,0,0,0,0 monster The Paper 1375,1,180000,90000,0
//==================================================
// ama_dun03 - Amatsu Underground Shrine
//==================================================
-ama_dun03,0,0,0,0 monster Shinobi 1401,55,5000,0,0
-ama_dun03,0,0,0,0 monster Tengu 1405,55,5000,0,0
-ama_dun03,0,0,0,0 monster Firelock Soldier 1403,25,5000,0,0
-ama_dun03,0,0,0,0 monster The Paper 1375,20,5000,0,0
-ama_dun03,0,0,0,0 monster Mimic 1191,5,5000,0,0
-ama_dun03,0,0,0,0 monster Miyabi Doll 1404,1,5000,0,0
+ama_dun03,0,0,0,0 monster Shinobi 1401,35,600000,300000,0
+ama_dun03,0,0,0,0 monster Firelock Soldier 1403,25,0,0,0
+ama_dun03,0,0,0,0 monster Miyabi Doll 1404,1,0,0,0
+ama_dun03,0,0,0,0 monster Tengu 1405,40,600000,300000,0
+ama_dun03,0,0,0,0 monster Mimic 1191,5,0,0,0
+ama_dun03,0,0,0,0 monster The Paper 1375,20,600000,300000,0
ama_dun03,0,0,0,0 boss_monster Samurai Specter 1492,1,5460000,600000,0
+ama_dun03,0,0,0,0 monster Shinobi 1401,20,5450000,3600000,0
+ama_dun03,0,0,0,0 monster Tengu 1405,15,5440000,3600000,0
diff --git a/npc/pre-re/mobs/dungeons/anthell.txt b/npc/pre-re/mobs/dungeons/anthell.txt
index 9794f1e26..3df4faca1 100644
--- a/npc/pre-re/mobs/dungeons/anthell.txt
+++ b/npc/pre-re/mobs/dungeons/anthell.txt
@@ -12,68 +12,16 @@
//============================================================
//==================================================
-// anthell01 - Ant Hell
+// anthell01 - Ant Hell F1
//==================================================
-anthell01,0,0,0,0 monster Piere 1160,50,5000,0,0
-anthell01,0,0,0,0 monster Deniro 1105,40,5000,0,0
-anthell01,0,0,0,0 monster Familiar 1005,20,5000,0,0
-anthell01,0,0,0,0 monster Andre 1095,15,5000,0,0
-anthell01,0,0,0,0 monster Vitata 1176,10,5000,0,0
-anthell01,0,0,0,0 monster Giearth 1121,1,5000,0,0
-anthell01,43,166,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,30,187,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,29,186,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,38,186,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,37,186,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,36,186,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,35,186,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,36,187,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,44,166,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,45,165,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,40,168,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,41,168,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,42,168,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,42,167,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,42,166,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,42,165,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,41,165,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,43,165,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,44,165,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,38,184,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,38,183,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,37,183,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,102,121,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,104,123,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,104,122,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,104,120,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,103,120,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,103,121,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,102,121,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,105,124,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,101,121,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,100,121,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,99,127,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,97,123,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,97,127,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,97,126,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,97,125,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,97,124,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,98,121,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,99,121,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,98,127,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,0,0,0,0 monster Familiar 1005,20,0,0,0
+anthell01,0,0,0,0 monster Andre 1095,15,0,0,0
+anthell01,0,0,0,0 monster Piere 1160,50,0,0,0
+anthell01,0,0,0,0 monster Deniro 1105,40,0,0,0
+anthell01,0,0,0,0 monster Vitata 1176,10,0,0,0
+anthell01,0,0,0,0 monster Giearth 1121,1,0,0,0
+anthell01,0,0,0,0 monster Maya Purple 1289,1,7200000,3600000,1
anthell01,28,266,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,30,262,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,30,261,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,31,264,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,31,263,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,31,262,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,32,263,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,40,270,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,40,269,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,40,268,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,30,263,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,30,264,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,30,265,0,0 monster Ant Egg 1097,1,60000,30000,0
anthell01,29,266,0,0 monster Ant Egg 1097,1,60000,30000,0
anthell01,28,265,0,0 monster Ant Egg 1097,1,60000,30000,0
anthell01,28,264,0,0 monster Ant Egg 1097,1,60000,30000,0
@@ -83,20 +31,20 @@ anthell01,29,265,0,0 monster Ant Egg 1097,1,60000,30000,0
anthell01,29,264,0,0 monster Ant Egg 1097,1,60000,30000,0
anthell01,29,263,0,0 monster Ant Egg 1097,1,60000,30000,0
anthell01,29,262,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,30,265,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,30,264,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,30,263,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,30,262,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,30,261,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,31,264,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,31,263,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,31,262,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,32,263,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,40,270,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,40,269,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,40,268,0,0 monster Ant Egg 1097,1,60000,30000,0
anthell01,40,267,0,0 monster Ant Egg 1097,1,60000,30000,0
anthell01,40,266,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,31,194,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,33,195,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,33,196,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,30,190,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,31,190,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,32,189,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,32,198,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,32,187,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,32,186,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,30,195,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,31,195,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,32,196,0,0 monster Ant Egg 1097,1,60000,30000,0
anthell01,40,265,0,0 monster Ant Egg 1097,1,60000,30000,0
anthell01,41,269,0,0 monster Ant Egg 1097,1,60000,30000,0
anthell01,41,268,0,0 monster Ant Egg 1097,1,60000,30000,0
@@ -106,16 +54,69 @@ anthell01,41,265,0,0 monster Ant Egg 1097,1,60000,30000,0
anthell01,30,198,0,0 monster Ant Egg 1097,1,60000,30000,0
anthell01,31,198,0,0 monster Ant Egg 1097,1,60000,30000,0
anthell01,32,197,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,32,196,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,31,195,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,30,195,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,31,194,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,33,195,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,33,196,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,30,190,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,31,190,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,32,189,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,32,198,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,32,187,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,32,186,0,0 monster Ant Egg 1097,1,60000,30000,0
anthell01,31,186,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,40,168,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,41,168,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,42,168,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,42,167,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,42,166,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,42,165,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,41,165,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,43,165,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,44,165,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,45,165,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,44,166,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,43,166,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,30,187,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,29,186,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,38,186,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,37,186,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,36,186,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,35,186,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,36,187,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,38,184,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,38,183,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,37,183,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,99,127,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,98,127,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,97,127,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,97,126,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,97,125,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,97,124,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,97,123,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,98,121,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,99,121,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,100,121,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,101,121,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,102,121,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,104,123,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,104,122,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,104,120,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,103,120,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,103,121,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,102,121,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,105,124,0,0 monster Ant Egg 1097,1,60000,30000,0
//==================================================
-// anthell02 - Ant Hell
+// anthell02 - Ant Hell F2
//==================================================
-anthell02,0,0,0,0 monster Andre 1095,50,5000,0,0
-anthell02,0,0,0,0 monster Vitata 1176,30,5000,0,0
-anthell02,0,0,0,0 monster Familiar 1005,20,5000,0,0
-anthell02,0,0,0,0 monster Ant Egg 1097,15,5000,0,0
-anthell02,0,0,0,0 monster Deniro 1105,15,5000,0,0
-anthell02,0,0,0,0 monster Piere 1160,15,5000,0,0
-anthell02,0,0,0,0 monster Giearth 1121,3,5000,0,0
+anthell02,0,0,0,0 monster Ant Egg 1097,15,0,0,0
+anthell02,0,0,0,0 monster Familiar 1005,20,0,0,0
+anthell02,0,0,0,0 monster Andre 1095,50,0,0,0
+anthell02,0,0,0,0 monster Piere 1160,15,0,0,0
+anthell02,0,0,0,0 monster Deniro 1105,15,0,0,0
+anthell02,0,0,0,0 monster Vitata 1176,30,0,0,0
+anthell02,0,0,0,0 monster Giearth 1121,3,0,0,0
anthell02,0,0,0,0 boss_monster Maya 1147,1,7200000,600000,1
diff --git a/npc/pre-re/mobs/dungeons/ayo_dun.txt b/npc/pre-re/mobs/dungeons/ayo_dun.txt
index 2d82007f3..b3c9c7fa4 100644
--- a/npc/pre-re/mobs/dungeons/ayo_dun.txt
+++ b/npc/pre-re/mobs/dungeons/ayo_dun.txt
@@ -17,15 +17,15 @@
//==================================================
// ayo_dun01 - Ancient Shrine Maze
//==================================================
-ayo_dun01,0,0,0,0 monster Leaf Cat 1586,65,5000,0,0
-ayo_dun01,0,0,0,0 monster Ghoul 1036,30,5000,0,0
-ayo_dun01,0,0,0,0 monster Whisper 1179,10,5000,0,0
-ayo_dun01,0,0,0,0 monster Kraben 1587,5,5000,0,0
+ayo_dun01,0,0,0,0 monster Leaf Cat 1586,65,0,0,0
+ayo_dun01,0,0,0,0 monster Whisper 1179,10,0,0,0
+ayo_dun01,0,0,0,0 monster Kraben 1587,5,0,0,0
+ayo_dun01,0,0,0,0 monster Ghoul 1036,30,0,0,0
//==================================================
// ayo_dun02 - Inside Ancient Shrine
//==================================================
-ayo_dun02,0,0,0,0 monster Tamruan 1584,100,5000,0,0
-ayo_dun02,0,0,0,0 monster Whisper 1179,20,5000,0,0
-ayo_dun02,0,0,0,0 monster Kraben 1587,20,5000,0,0
+ayo_dun02,0,0,0,0 monster Tamruan 1584,100,0,0,0
+ayo_dun02,0,0,0,0 monster Whisper 1179,20,0,0,0
+ayo_dun02,0,0,0,0 monster Kraben 1587,20,0,0,0
ayo_dun02,150,90,15,30 boss_monster Lady Tanee 1688,1,25200000,600000,0
diff --git a/npc/pre-re/mobs/dungeons/beach_dun.txt b/npc/pre-re/mobs/dungeons/beach_dun.txt
index cbadc8e5e..5ecd025b1 100644
--- a/npc/pre-re/mobs/dungeons/beach_dun.txt
+++ b/npc/pre-re/mobs/dungeons/beach_dun.txt
@@ -14,27 +14,27 @@
//============================================================
//==================================================
-// beach_dun - Karu, the West cave
+// beach_dun - Karu, the West Cave
//==================================================
-beach_dun,0,0,0,0 monster Medusa 1148,60,5000,0,0
-beach_dun,0,0,0,0 monster Nereid 1255,20,5000,0,0
-beach_dun,0,0,0,0 monster Pest 1256,20,5000,0,0
-beach_dun,0,0,0,0 monster Merman 1264,3,5000,0,0
+beach_dun,0,0,0,0 monster Medusa 1148,60,0,0,0
+beach_dun,0,0,0,0 monster Merman 1264,3,10000,5000,0
+beach_dun,0,0,0,0 monster Nereid 1255,20,0,0,0
+beach_dun,0,0,0,0 monster Pest 1256,20,0,0,0
beach_dun,0,0,0,0 boss_monster Tao Gunka 1583,1,18000000,600000,0
//==================================================
-// beach_dun2 - Ruande the northern cave
+// beach_dun2 - Ruande, the North Cave
//==================================================
+beach_dun2,0,0,0,0 monster Megalith 1274,15,0,0,0
+beach_dun2,0,0,0,0 monster Nereid 1255,10,0,0,0
beach_dun2,0,0,0,0 monster Stalactic Golem 1278,65,5000,0,0
-beach_dun2,0,0,0,0 monster Tri Joint 1279,20,5000,0,0
-beach_dun2,0,0,0,0 monster Megalith 1274,15,5000,0,0
-beach_dun2,0,0,0,0 monster Hydra 1068,10,5000,0,0
-beach_dun2,0,0,0,0 monster Nereid 1255,3,5000,0,0
+beach_dun2,0,0,0,0 monster Tri Joint 1279,20,0,0,0
+beach_dun2,0,0,0,0 monster Hydra 1068,10,0,0,0
//==================================================
-// beach_dun3 - Mao, the East Cave
+// beach_dun3 - Mao, the East Cave
//==================================================
-beach_dun3,0,0,0,0 monster Thara Frog 1034,50,5000,0,0
-beach_dun3,0,0,0,0 monster Megalodon 1064,30,5000,0,0
-beach_dun3,0,0,0,0 monster Hydra 1068,30,5000,0,0
-beach_dun3,0,0,0,0 monster Nereid 1255,1,5000,0,0
+beach_dun3,0,0,0,0 monster Nereid 1255,1,200000,100000,0
+beach_dun3,0,0,0,0 monster Thara Frog 1034,50,0,0,0
+beach_dun3,0,0,0,0 monster Hydra 1068,30,0,0,0
+beach_dun3,0,0,0,0 monster Megalodon 1064,30,0,0,0
diff --git a/npc/pre-re/mobs/dungeons/c_tower.txt b/npc/pre-re/mobs/dungeons/c_tower.txt
index 752a2437a..a6bc486e2 100644
--- a/npc/pre-re/mobs/dungeons/c_tower.txt
+++ b/npc/pre-re/mobs/dungeons/c_tower.txt
@@ -11,39 +11,91 @@
//============================================================
//==================================================
-// c_tower1 - Clock Tower 1f
+// c_tower1 - Clock Tower F1
//==================================================
-c_tower1,0,0,0,0 monster Rideword 1195,70,5000,0,0
-c_tower1,0,0,0,0 monster Punk 1199,70,5000,0,0
-c_tower1,0,0,0,0 monster Bathory 1102,1,5000,0,0
-c_tower1,0,0,0,0 monster Clock Tower Manager 1270,1,5000,0,0
+c_tower1,0,0,0,0 monster Punk 1199,70,0,0,0
+c_tower1,0,0,0,0 monster Rideword 1195,70,0,0,0
+c_tower1,0,0,0,0 monster Clock Tower Manager 1270,1,0,0,0
+c_tower1,0,0,0,0 monster Bathory 1102,1,0,0,0
//==================================================
-// c_tower2 - Clock Tower 2f
+// c_tower2 - Clock Tower F2
//==================================================
-c_tower2,0,0,0,0 monster Clock 1269,40,5000,0,0
-c_tower2,0,0,0,0 monster Punk 1199,40,5000,0,0
-c_tower2,0,0,0,0 monster Rideword 1195,12,5000,0,0
-c_tower2,0,0,0,0 monster Mimic 1191,3,5000,0,0
-c_tower2,0,0,0,0 monster Elder 1377,2,5000,0,0
-c_tower2,0,0,0,0 monster Clock Tower Manager 1270,1,5000,0,0
+c_tower2,0,0,0,0 monster Punk 1199,40,0,0,0
+c_tower2,0,0,0,0 monster Clock 1269,40,0,0,0
+c_tower2,0,0,0,0 monster Rideword 1195,7,0,0,0
+c_tower2,128,100,10,10 monster Rideword 1195,1,60000,30000,0
+c_tower2,149,199,10,10 monster Rideword 1195,1,120000,60000,0
+c_tower2,149,199,10,10 monster Rideword 1195,1,300000,120000,0
+c_tower2,273,286,20,20 monster Rideword 1195,1,120000,60000,0
+c_tower2,273,286,20,20 monster Rideword 1195,1,300000,120000,0
+c_tower2,0,0,0,0 monster Mimic 1191,3,0,0,0
+c_tower2,0,0,0,0 monster Clock Tower Manager 1270,1,0,0,0
+c_tower2,0,0,0,0 monster Elder 1377,1,3600000,1800000,0
+c_tower2,0,0,0,0 monster Elder 1377,1,3600000,1800000,0
//==================================================
-// c_tower3 - Clock Tower 3f
+// c_tower3 - Clock Tower F3
//==================================================
-c_tower3,0,0,0,0 monster Alarm 1193,80,5000,0,0
-c_tower3,0,0,0,0 monster Mimic 1191,7,5000,0,0
-c_tower3,0,0,0,0 monster Rideword 1195,6,5000,0,0
-c_tower3,0,0,0,0 monster Clock Tower Manager 1270,3,5000,0,0
+c_tower3,0,0,0,0 monster Alarm 1193,80,0,0,0
+c_tower3,0,0,0,0 monster Rideword 1195,5,0,0,0
+c_tower3,153,220,10,10 monster Rideword 1195,1,126000,100000,0
+c_tower3,0,0,0,0 monster Mimic 1191,7,0,0,0
+c_tower3,0,0,0,0 monster Clock Tower Manager 1270,3,0,0,0
//==================================================
-// c_tower4 - Clock Tower 4f
+// c_tower4 - Clock Tower F4
//==================================================
-c_tower4,0,0,0,0 monster Clock 1269,35,5000,0,0
-c_tower4,0,0,0,0 monster Owl Duke 1320,30,5000,0,0
-c_tower4,0,0,0,0 monster Alarm 1193,30,5000,0,0
-c_tower4,0,0,0,0 monster Rideword 1195,15,5000,0,0
-c_tower4,0,0,0,0 monster Mimic 1191,12,5000,0,0
-c_tower4,0,0,0,0 monster Whisper 1179,5,5000,0,0
-c_tower4,0,0,0,0 monster Clock Tower Manager 1270,3,5000,0,0
-c_tower4,0,0,0,0 monster Elder 1377,2,5000,0,0
+c_tower4,0,0,0,0 monster Clock Tower Manager 1270,2,1800000,0,0
+c_tower4,0,0,0,0 monster Clock Tower Manager 1270,1,3600000,0,0
+c_tower4,0,0,0,0 monster Whisper 1179,5,0,0,0
+c_tower4,0,0,0,0 monster Elder 1377,1,3600000,1800000,0
+c_tower4,0,0,0,0 monster Elder 1377,1,1800000,600000,0
+c_tower4,108,198,100,10 monster Alarm 1193,6,0,0,0
+c_tower4,108,178,100,10 monster Alarm 1193,6,0,0,0
+c_tower4,108,158,100,10 monster Alarm 1193,6,0,0,0
+c_tower4,108,138,100,10 monster Alarm 1193,6,0,0,0
+c_tower4,108,118,100,10 monster Alarm 1193,6,0,0,0
+c_tower4,108,98,100,10 monster Clock 1269,7,0,0,0
+c_tower4,108,78,100,10 monster Clock 1269,7,0,0,0
+c_tower4,108,58,100,10 monster Clock 1269,7,0,0,0
+c_tower4,108,38,100,10 monster Clock 1269,7,0,0,0
+c_tower4,108,18,100,10 monster Clock 1269,7,0,0,0
+c_tower4,108,198,100,10 monster Owl Duke 1320,3,0,0,0
+c_tower4,108,178,100,10 monster Owl Duke 1320,3,0,0,0
+c_tower4,108,158,100,10 monster Owl Duke 1320,3,0,0,0
+c_tower4,108,138,100,10 monster Owl Duke 1320,3,0,0,0
+c_tower4,108,118,100,10 monster Owl Duke 1320,3,0,0,0
+c_tower4,108,98,100,10 monster Owl Duke 1320,3,0,0,0
+c_tower4,108,78,100,10 monster Owl Duke 1320,3,0,0,0
+c_tower4,108,58,100,10 monster Owl Duke 1320,3,0,0,0
+c_tower4,108,38,100,10 monster Owl Duke 1320,3,0,0,0
+c_tower4,108,18,100,10 monster Owl Duke 1320,3,0,0,0
+c_tower4,98,180,0,0 monster Rideword 1195,1,300000,150000,1
+c_tower4,97,180,0,0 monster Rideword 1195,1,240000,150000,1
+c_tower4,96,180,0,0 monster Rideword 1195,1,350000,150000,1
+c_tower4,95,180,0,0 monster Rideword 1195,1,410000,150000,1
+c_tower4,94,180,0,0 monster Rideword 1195,1,320000,150000,1
+c_tower4,93,180,0,0 monster Rideword 1195,1,260000,150000,1
+c_tower4,92,180,0,0 monster Rideword 1195,1,280000,150000,1
+c_tower4,91,180,0,0 monster Rideword 1195,1,330000,150000,1
+c_tower4,87,180,0,0 monster Rideword 1195,1,400000,150000,1
+c_tower4,86,180,0,0 monster Rideword 1195,1,380000,150000,1
+c_tower4,80,179,0,0 monster Rideword 1195,1,360000,150000,1
+c_tower4,80,180,0,0 monster Rideword 1195,1,350000,150000,1
+c_tower4,80,181,0,0 monster Rideword 1195,1,290000,150000,1
+c_tower4,80,182,0,0 monster Rideword 1195,1,300000,150000,1
+c_tower4,80,183,0,0 monster Rideword 1195,1,340000,150000,1
+c_tower4,128,194,0,0 monster Mimic 1191,1,1800000,900000,1
+c_tower4,38,193,0,0 monster Mimic 1191,1,1800000,900000,1
+c_tower4,37,159,0,0 monster Mimic 1191,1,1800000,900000,1
+c_tower4,31,139,0,0 monster Mimic 1191,1,1800000,900000,1
+c_tower4,104,14,0,0 monster Mimic 1191,1,1800000,900000,1
+c_tower4,104,27,0,0 monster Mimic 1191,1,900000,400000,1
+c_tower4,105,24,0,0 monster Mimic 1191,1,900000,400000,1
+c_tower4,205,105,0,0 monster Mimic 1191,1,1800000,900000,1
+c_tower4,0,0,0,0 monster Mimic 1191,1,1800000,900000,1
+c_tower4,148,85,0,0 monster Mimic 1191,1,1800000,900000,1
+c_tower4,189,51,0,0 monster Mimic 1191,1,1800000,900000,1
+c_tower4,170,34,0,0 monster Mimic 1191,1,1800000,900000,1
+c_tower4,42,41,0,0 monster Executioner 1205,1,7200000,3600000,1
diff --git a/npc/pre-re/mobs/dungeons/ein_dun.txt b/npc/pre-re/mobs/dungeons/ein_dun.txt
index 587e3df60..755e6d7ab 100644
--- a/npc/pre-re/mobs/dungeons/ein_dun.txt
+++ b/npc/pre-re/mobs/dungeons/ein_dun.txt
@@ -17,20 +17,24 @@
//============================================================
//==================================================
-// ein_dun01 - Mine Dungeon
+// ein_dun01 - Mine Dungeon F1
//==================================================
-ein_dun01,0,0,0,0 monster Pitman 1616,70,5000,0,0
-ein_dun01,0,0,0,0 monster Noxious 1620,30,5000,0,0
-ein_dun01,0,0,0,0 monster Porcellio 1619,30,5000,0,0
-ein_dun01,0,0,0,0 monster Venomous 1621,10,5000,0,0
-ein_dun01,0,0,0,0 monster Old Stove 1617,1,5000,0,0
+ein_dun01,0,0,0,0 monster Pitman 1616,70,0,0,0
+ein_dun01,0,0,0,0 monster Noxious 1620,30,300000,0,0
+ein_dun01,0,0,0,0 monster Porcellio 1619,30,0,0,0
+ein_dun01,0,0,0,0 monster Venomous 1621,10,300000,0,0
+ein_dun01,0,0,0,0 monster Old Stove 1617,1,1800000,600000,0
ein_dun01,0,0,0,0 monster Ungoliant 1618,1,3600000,3000000,0
//==================================================
-// ein_dun02 - Mine Dungeon
+// ein_dun02 - Mine Dungeon F2
//==================================================
-ein_dun02,0,0,0,0 monster Mineral 1614,50,5000,0,0
-ein_dun02,0,0,0,0 monster Obsidian 1615,40,5000,0,0
-ein_dun02,0,0,0,0 monster Old Stove 1617,30,5000,0,0
-ein_dun02,0,0,0,0 monster Teddy Bear 1622,30,5000,0,0
+ein_dun02,0,0,0,0 monster Obsidian 1615,10,0,0,0
+ein_dun02,0,0,0,0 monster Mineral 1614,15,0,0,0
+ein_dun02,75,151,60,133 monster Obsidian 1615,30,300000,0,0
+ein_dun02,230,155,63,140 monster Mineral 1614,35,300000,0,0
+ein_dun02,0,0,0,0 monster Teddy Bear 1622,10,0,0,0
+ein_dun02,155,230,140,55 monster Teddy Bear 1622,20,480000,0,0
+ein_dun02,0,0,0,0 monster Old Stove 1617,10,0,0,0
+ein_dun02,154,80,134,55 monster Old Stove 1617,20,480000,0,0
ein_dun02,0,0,0,0 boss_monster RSX-0806 1623,1,7500000,600000,0
diff --git a/npc/pre-re/mobs/dungeons/gef_dun.txt b/npc/pre-re/mobs/dungeons/gef_dun.txt
index babb96d55..70d0661e3 100644
--- a/npc/pre-re/mobs/dungeons/gef_dun.txt
+++ b/npc/pre-re/mobs/dungeons/gef_dun.txt
@@ -13,11 +13,11 @@
//============================================================
//==================================================
-// gef_dun00 - Geffen Dungeon
+// gef_dun00 - Geffen Dungeon F1
//==================================================
-gef_dun00,0,0,0,0 monster Hunter Fly 1035,30,5000,0,0
-gef_dun00,0,0,0,0 monster Poison Spore 1077,25,5000,0,0
-gef_dun00,0,0,0,0 monster Poporing 1031,15,5000,0,0
+gef_dun00,0,0,0,0 monster Hunter Fly 1035,30,60000,30000,0
+gef_dun00,0,0,0,0 monster Poporing 1031,15,0,0,0
+gef_dun00,0,0,0,0 monster Poison Spore 1077,25,0,0,0
gef_dun00,91,106,0,0 monster Red Plant 1078,1,300000,150000,0
gef_dun00,92,108,0,0 monster Yellow Plant 1081,1,300000,150000,0
gef_dun00,114,106,0,0 monster Green Plant 1080,1,300000,150000,0
@@ -28,15 +28,16 @@ gef_dun00,89,111,3,3 monster Black Mushroom 1084,3,180000,90000,1
gef_dun00,121,109,3,3 monster Black Mushroom 1084,3,180000,90000,1
//==================================================
-// gef_dun01 - Geffen Dungeon
+// gef_dun01 - Geffen Dungeon F2
//==================================================
-gef_dun01,0,0,0,0 monster Ghoul 1036,40,5000,0,0
-gef_dun01,0,0,0,0 monster Jakk 1130,40,5000,0,0
-gef_dun01,0,0,0,0 monster Nightmare 1061,30,5000,0,0
-gef_dun01,0,0,0,0 monster Zombie 1015,25,5000,0,0
-gef_dun01,0,0,0,0 monster Drainliar 1111,20,5000,0,0
-gef_dun01,0,0,0,0 boss_monster Dracula 1389,1,3600000,600000,1
+gef_dun01,0,0,0,0 monster Drainliar 1111,20,0,0,0
+gef_dun01,0,0,0,0 monster Nightmare 1061,30,0,0,0
+gef_dun01,0,0,0,0 monster Ogretooth 1204,1,1800000,1200000,0
+gef_dun01,0,0,0,0 monster Zombie 1015,25,0,0,0
+gef_dun01,0,0,0,0 monster Ghoul 1036,40,0,0,0
+gef_dun01,0,0,0,0 monster Jakk 1130,40,300000,100000,0
gef_dun01,234,121,0,0 monster Blue Plant 1079,1,300000,100000,0
+gef_dun01,0,0,0,0 boss_monster Dracula 1389,1,3600000,600000,1
gef_dun01,0,0,0,0 monster Black Mushroom 1084,5,180000,90000,1
gef_dun01,188,104,10,10 monster White Plant 1082,3,180000,90000,1
gef_dun01,263,115,10,10 monster White Plant 1082,3,180000,90000,1
@@ -46,12 +47,12 @@ gef_dun01,150,237,10,10 monster White Plant 1082,2,180000,90000,1
//==================================================
// gef_dun02 - Geffenia
//==================================================
-gef_dun02,0,0,0,0 monster Deviruchi 1109,45,5000,0,0
-gef_dun02,0,0,0,0 monster Marionette 1143,30,5000,0,0
-gef_dun02,0,0,0,0 monster Nightmare 1061,20,5000,0,0
-gef_dun02,0,0,0,0 monster Whisper 1179,20,5000,0,0
-gef_dun02,0,0,0,0 monster Ghoul 1036,10,5000,0,0
-gef_dun02,0,0,0,0 monster Hunter Fly 1035,10,5000,0,0
+gef_dun02,0,0,0,0 monster Ghoul 1036,10,0,0,0
+gef_dun02,0,0,0,0 monster Whisper 1179,20,0,0,0
+gef_dun02,0,0,0,0 monster Hunter Fly 1035,10,0,0,0
+gef_dun02,0,0,0,0 monster Marionette 1143,20,0,0,0
+gef_dun02,0,0,0,0 monster Deviruchi 1109,35,0,0,0
+gef_dun02,0,0,0,0 monster Nightmare 1061,40,60000,0,0
gef_dun02,0,0,0,0 boss_monster Doppelganger 1046,1,7200000,600000,1
gef_dun02,214,212,10,10 monster White Plant 1082,3,180000,90000,1
gef_dun02,215,67,10,10 monster White Plant 1082,3,180000,90000,1
@@ -61,12 +62,37 @@ gef_dun02,58,167,10,10 monster Shining Plant 1083,1,1800000,900000,1
gef_dun02,185,83,3,3 monster Shining Plant 1083,1,1800000,900000,1
//==================================================
-// gef_dun03 - Geffenia
+// gef_dun03 - Geffenia (Event Map)
//==================================================
-gef_dun03,0,0,0,0 monster Wraith 1192,8,5000,0,0
-gef_dun03,0,0,0,0 monster Wind Ghost 1263,3,5000,0,0
-gef_dun03,0,0,0,0 monster Wraith Dead 1291,2,5000,0,0
-gef_dun03,0,0,0,0 monster Wraith Dead 1291,2,60000,30000,0
gef_dun03,0,0,0,0 monster Hellion Revenant 1626,1,600000,300000,0
+gef_dun03,0,0,0,0 monster Wraith 1192,8,60000,30000,0
+gef_dun03,0,0,0,0 monster Wraith Dead 1291,2,60000,30000,0
+gef_dun03,0,0,0,0 monster Wind Ghost 1263,3,60000,30000,0
gef_dun03,0,0,0,0 monster Shining Plant 1083,3,1800000,900000,1
gef_dun03,0,0,0,0 monster White Plant 1082,10,180000,90000,1
+
+//==================================================
+// Old Event Spawn in case you want to use them
+//==================================================
+//gef_dun03,0,0,0,0 monster Baphomet 1039,1,7200000,7200000,1
+//gef_dun03,0,0,0,0 monster Doppelganger 1046,1,7200000,7200000,1
+//gef_dun03,0,0,0,0 monster Deviruchi 1109,8,0,0,0
+//gef_dun03,0,0,0,0 monster Joker 1131,5,300000,100000,0
+//gef_dun03,0,0,0,0 monster Khalitzburg 1132,2,0,0,0
+//gef_dun03,0,0,0,0 monster Knight of Abyss 1219,2,300000,0,0
+//gef_dun03,0,0,0,0 monster Gryphon 1259,1,7200000,3600000,1
+//gef_dun03,0,0,0,0 monster Blood Knight 1268,2,300000,0,0
+//gef_dun03,0,0,0,0 monster Dark Lord 1272,1,7200000,7200000,1
+//gef_dun03,0,0,0,0 monster Alice 1275,3,0,0,0
+//gef_dun03,0,0,0,0 monster Chimera 1283,1,7200000,7200000,1
+//gef_dun03,0,0,0,0 monster Mini Demon 1292,2,300000,0,0
+//gef_dun03,0,0,0,0 monster Dark Illusion 1302,2,300000,0,0
+//gef_dun03,0,0,0,0 monster Apocalypse 1365,2,300000,0,0
+//gef_dun03,0,0,0,0 monster Succubus 1370,10,0,0,0
+//gef_dun03,0,0,0,0 monster Fake Angel 1371,8,0,0,0
+//gef_dun03,0,0,0,0 monster Lord of Death 1373,1,7200000,7200000,1
+//gef_dun03,0,0,0,0 monster Incubus 1374,10,0,0,0
+//gef_dun03,0,0,0,0 monster Nightmare Terror 1379,3,0,0,0
+//gef_dun03,0,0,0,0 monster Violy 1390,10,0,0,0
+//gef_dun03,0,0,0,0 monster Shining Plant 1083,3,1800000,900000,1
+//gef_dun03,0,0,0,0 monster White Plant 1082,10,180000,90000,1
diff --git a/npc/pre-re/mobs/dungeons/gefenia.txt b/npc/pre-re/mobs/dungeons/gefenia.txt
index 890d0879b..a3b1214f6 100644
--- a/npc/pre-re/mobs/dungeons/gefenia.txt
+++ b/npc/pre-re/mobs/dungeons/gefenia.txt
@@ -17,12 +17,12 @@
//==================================================
// gefenia01 - Geffenia
//==================================================
-gefenia01,0,0,0,0 monster False Angel 1371,60,5000,0,0
-gefenia01,0,0,0,0 monster Violy 1390,30,5000,0,0
-gefenia01,0,0,0,0 monster Mini Demon 1292,20,5000,0,0
-gefenia01,0,0,0,0 monster Abysmal Knight 1219,10,5000,0,0
-gefenia01,0,0,0,0 monster Incubus 1374,10,5000,0,0
-gefenia01,0,0,0,0 monster Succubus 1370,10,5000,0,0
+gefenia01,0,0,0,0 monster False Angel 1371,60,0,0,0
+gefenia01,0,0,0,0 monster Succubus 1370,10,0,0,0
+gefenia01,0,0,0,0 monster Incubus 1374,10,0,0,0
+gefenia01,0,0,0,0 monster Violy 1390,30,0,0,0
+gefenia01,0,0,0,0 monster Mini Demon 1292,20,0,0,0
+gefenia01,0,0,0,0 monster Abysmal Knight 1219,10,0,0,0
gefenia01,0,0,0,0 monster Bloody Knight 1268,1,3600000,3000000,0
gefenia01,0,0,0,0 monster Mysteltainn 1203,1,10800000,7200000,0
gefenia01,0,0,0,0 monster Executioner 1205,1,18000000,14400000,0
@@ -31,41 +31,99 @@ gefenia01,0,0,0,0 monster Ogretooth 1204,1,18000000,14400000,0
//==================================================
// gefenia02 - Geffenia
//==================================================
-gefenia02,0,0,0,0 monster Violy 1390,40,5000,0,0
-gefenia02,0,0,0,0 monster Mini Demon 1292,30,5000,0,0
-gefenia02,0,0,0,0 monster False Angel 1371,30,5000,0,0
-gefenia02,0,0,0,0 monster Succubus 1370,20,5000,0,0
-gefenia02,0,0,0,0 monster Abysmal Knight 1219,10,5000,0,0
-gefenia02,0,0,0,0 monster Incubus 1374,10,5000,0,0
+gefenia02,0,0,0,0 monster False Angel 1371,30,0,0,0
+gefenia02,0,0,0,0 monster Succubus 1370,20,0,0,0
+gefenia02,0,0,0,0 monster Incubus 1374,10,0,0,0
+gefenia02,0,0,0,0 monster Violy 1390,40,0,0,0
+gefenia02,0,0,0,0 monster Mini Demon 1292,30,0,0,0
+gefenia02,0,0,0,0 monster Abysmal Knight 1219,10,0,0,0
gefenia02,0,0,0,0 monster Bloody Knight 1268,1,3600000,3000000,0
-gefenia02,0,0,0,0 monster Ogretooth 1204,1,10800000,7200000,0
gefenia02,0,0,0,0 monster Mysteltainn 1203,1,18000000,14400000,0
gefenia02,0,0,0,0 monster Executioner 1205,1,18000000,14400000,0
+gefenia02,0,0,0,0 monster Ogretooth 1204,1,10800000,7200000,0
//==================================================
// gefenia03 - Geffenia
//==================================================
-gefenia03,0,0,0,0 monster False Angel 1371,40,5000,0,0
-gefenia03,0,0,0,0 monster Violy 1390,40,5000,0,0
-gefenia03,0,0,0,0 monster Mini Demon 1292,30,5000,0,0
-gefenia03,0,0,0,0 monster Incubus 1374,20,5000,0,0
-gefenia03,0,0,0,0 monster Abysmal Knight 1219,10,5000,0,0
-gefenia03,0,0,0,0 monster Succubus 1370,10,5000,0,0
+gefenia03,0,0,0,0 monster False Angel 1371,40,0,0,0
+gefenia03,0,0,0,0 monster Succubus 1370,10,0,0,0
+gefenia03,0,0,0,0 monster Incubus 1374,20,0,0,0
+gefenia03,0,0,0,0 monster Violy 1390,40,0,0,0
+gefenia03,0,0,0,0 monster Mini Demon 1292,30,0,0,0
+gefenia03,0,0,0,0 monster Abysmal Knight 1219,10,0,0,0
gefenia03,0,0,0,0 monster Bloody Knight 1268,1,3600000,3000000,0
-gefenia03,0,0,0,0 monster Executioner 1205,1,10800000,7200000,0
gefenia03,0,0,0,0 monster Mysteltainn 1203,1,18000000,14400000,0
+gefenia03,0,0,0,0 monster Executioner 1205,1,10800000,7200000,0
gefenia03,0,0,0,0 monster Ogretooth 1204,1,18000000,14400000,0
//==================================================
// gefenia04 - Geffenia
//==================================================
-gefenia04,0,0,0,0 monster False Angel 1371,30,5000,0,0
-gefenia04,0,0,0,0 monster Violy 1390,30,5000,0,0
-gefenia04,0,0,0,0 monster Mini Demon 1292,20,5000,0,0
-gefenia04,0,0,0,0 monster Abysmal Knight 1219,10,5000,0,0
-gefenia04,0,0,0,0 monster Incubus 1374,10,5000,0,0
-gefenia04,0,0,0,0 monster Succubus 1370,10,5000,0,0
+gefenia04,0,0,0,0 monster False Angel 1371,30,0,0,0
+gefenia04,0,0,0,0 monster Succubus 1370,10,600000,300000,0
+gefenia04,0,0,0,0 monster Incubus 1374,10,600000,300000,0
+gefenia04,0,0,0,0 monster Violy 1390,30,0,0,0
+gefenia04,0,0,0,0 monster Mini Demon 1292,20,0,0,0
+gefenia04,0,0,0,0 monster Abysmal Knight 1219,10,0,0,0
gefenia04,0,0,0,0 monster Bloody Knight 1268,1,3600000,3000000,0
gefenia04,0,0,0,0 monster Mysteltainn 1203,1,18000000,14400000,0
gefenia04,0,0,0,0 monster Executioner 1205,1,18000000,14400000,0
gefenia04,0,0,0,0 monster Ogretooth 1204,1,18000000,14400000,0
+
+
+//The spawns bellow, are old ones that were used in events.
+//==================================================
+// gefenia01 - Geffenia (Old)
+//==================================================
+//gefenia01,0,0,0,0 monster Fake Angel 1371,10,0,0,0
+//gefenia01,0,0,0,0 monster Mini Demon 1292,6,300000,0,0
+//gefenia01,0,0,0,0 monster Apolcalips 1365,4,300000,0,0
+//gefenia01,0,0,0,0 monster Elder 1377,10,300000,0,1
+//gefenia01,0,0,0,0 monster Abyssmal Knight 1219,3,1800000,900000,1
+//gefenia01,0,0,0,0 monster Bloody Knight 1268,2,300000,0,0
+//gefenia01,0,0,0,0 monster Poring 1502,1,0,0,0
+//gefenia01,0,0,0,0 monster Executioner 1205,1,3600000,1800000,0
+//gefenia01,0,0,0,0 monster Mysteltainn 1203,1,7200000,3600000,1
+
+//==================================================
+// gefenia02 - Geffenia (Old)
+//==================================================
+//gefenia02,0,0,0,0 monster Fake Angel 1371,10,0,0,0
+//gefenia02,0,0,0,0 monster Succubus 1370,6,0,0,0
+//gefenia02,0,0,0,0 monster Incubus 1374,6,0,0,0
+//gefenia02,0,0,0,0 monster Mini Demon 1292,10,300000,0,0
+//gefenia02,0,0,0,0 monster Apolcalips 1365,8,300000,0,0
+//gefenia02,0,0,0,0 monster Abyssmal Knight 1219,2,1800000,900000,1
+//gefenia02,0,0,0,0 monster Bloody Knight 1268,5,300000,0,0
+//gefenia02,0,0,0,0 monster Poring 1502,1,0,0,0
+//gefenia02,0,0,0,0 monster Gryphon 1259,1,3600000,1800000,0
+//gefenia02,0,0,0,0 monster Chimera 1283,1,7200000,3600000,1
+
+//==================================================
+// gefenia03 - Geffenia (Old)
+//==================================================
+//gefenia03,0,0,0,0 monster Fake Angel 1371,4,0,0,0
+//gefenia03,0,0,0,0 monster Succubus 1370,5,0,0,0
+//gefenia03,0,0,0,0 monster Incubus 1374,5,0,0,0
+//gefenia03,0,0,0,0 monster Mini Demon 1292,10,300000,0,0
+//gefenia03,0,0,0,0 monster Apolcalips 1365,6,300000,0,0
+//gefenia03,0,0,0,0 monster Elder 1377,10,300000,0,1
+//gefenia03,0,0,0,0 monster Abyssmal Knight 1219,3,1800000,900000,1
+//gefenia03,0,0,0,0 monster Bloody Knight 1268,2,300000,0,0
+//gefenia03,0,0,0,0 monster Poring 1502,1,0,0,0
+//gefenia03,0,0,0,0 monster Dark Illusion 1302,1,300000,0,0
+//gefenia03,0,0,0,0 monster Owl Baron 1295,1,0,0,0
+
+//==================================================
+// gefenia04 - Geffenia (Old)
+//==================================================
+//gefenia04,0,0,0,0 monster Fake Angel 1371,10,0,0,0
+//gefenia04,0,0,0,0 monster Succubus 1370,5,0,0,0
+//gefenia04,0,0,0,0 monster Incubus 1374,3,0,0,0
+//gefenia04,0,0,0,0 monster Apolcalips 1365,4,300000,0,0
+//gefenia04,0,0,0,0 monster Abyssmal Knight 1219,5,1800000,900000,1
+//gefenia04,0,0,0,0 monster Bloody Knight 1268,2,300000,0,0
+//gefenia04,0,0,0,0 monster Poring 1502,1,0,0,0
+//gefenia04,0,0,0,0 monster Archangeling 1388,1,3600000,1800000,1
+//gefenia04,0,0,0,0 monster Maya Purple 1289,1,1200000,0,0
+//gefenia04,0,0,0,0 monster Cat O' Nine Tail 1307,1,0,0,0
diff --git a/npc/pre-re/mobs/dungeons/glastheim.txt b/npc/pre-re/mobs/dungeons/glastheim.txt
index cbe5a31b7..508de0239 100644
--- a/npc/pre-re/mobs/dungeons/glastheim.txt
+++ b/npc/pre-re/mobs/dungeons/glastheim.txt
@@ -15,96 +15,175 @@
//============================================================
//==================================================
+// gl_cas01 - Glast Heim F1
+//==================================================
+gl_cas01,0,0,0,0 monster Sage Worm 1281,10,0,0,0
+gl_cas01,0,0,0,0 monster Carat 1267,50,0,0,0
+gl_cas01,0,0,0,0 monster Rideword 1195,15,0,0,0
+gl_cas01,0,0,0,0 monster Dark Frame 1260,20,0,0,0
+gl_cas01,0,0,0,0 monster Whisper 1179,10,0,0,0
+gl_cas01,0,0,0,0 monster Alice 1275,1,0,0,0
+gl_cas01,0,0,0,0 monster Ogretooth 1204,1,7200000,3600000,1
+gl_cas01,0,0,0,0 monster Owl Baron 1295,6,0,0,1
+gl_cas01,0,0,0,0 monster Owl Duke 1320,20,0,0,1
+
+//==================================================
+// gl_cas02 - Glast Heim F2
+//==================================================
+gl_cas02,0,0,0,0 monster Wanderer 1208,40,0,0,0
+gl_cas02,0,0,0,0 monster Raydric 1163,30,0,0,0
+gl_cas02,0,0,0,0 monster Rideword 1195,10,0,0,0
+gl_cas02,0,0,0,0 monster Raydric Archer 1276,19,0,0,0
+gl_cas02,0,0,0,0 monster Chimera 1283,2,1800000,900000,1
+gl_cas02,0,0,0,0 monster Abysmal Knight 1219,3,1800000,900000,1
+gl_cas02,193,167,5,5 monster Raydric 1163,3,300000,120000,0
+gl_cas02,193,135,5,5 monster Raydric 1163,3,300000,120000,0
+gl_cas02,104,145,5,5 monster Mysteltainn 1203,1,7200000,3600000,1
+gl_cas02,102,180,0,0 monster Whisper 1185,1,1800000,900000,1
+gl_cas02,105,180,0,0 monster Whisper 1185,1,1800000,900000,1
+gl_cas02,182,12,3,3 monster Chimera 1283,1,3600000,1800000,1
+gl_cas02,185,11,8,8 monster Rideword 1195,4,120000,60000,1
+gl_cas02,174,11,8,8 monster Evil Druid 1117,4,120000,60000,1
+gl_cas02,104,38,4,4 monster Abysmal Knight 1219,1,1800000,900000,1
+gl_cas02,24,35,4,4 monster Abysmal Knight 1219,1,1800000,900000,1
+gl_cas02,46,124,15,15 monster Rideword 1195,15,360000,180000,1
+gl_cas02,16,186,10,10 monster Evil Druid 1117,5,360000,180000,1
+gl_cas02,133,83,3,3 monster Khalitzburg 1132,1,360000,180000,1
+gl_cas02,45,177,3,3 monster Khalitzburg 1132,1,360000,180000,1
+gl_cas02,182,65,3,3 monster Khalitzburg 1132,1,360000,180000,1
+gl_cas02,173,127,3,3 monster Khalitzburg 1132,1,360000,180000,1
+gl_cas02,173,167,3,3 monster Khalitzburg 1132,1,360000,180000,1
+gl_cas02,93,177,3,3 monster Abysmal Knight 1219,1,1800000,900000,1
+gl_cas02,115,177,3,3 monster Abysmal Knight 1219,1,1800000,900000,1
+gl_cas02,83,84,2,2 monster Mimic 1191,1,360000,180000,1
+gl_cas02,83,80,2,2 monster Mimic 1191,1,360000,180000,1
+gl_cas02,0,0,0,0 monster Ogretooth 1204,1,7200000,3600000,1
+gl_cas02,0,0,0,0 monster Alice 1275,1,0,0,0
+gl_cas02,189,20,1,1 monster Khalitzburg 1132,1,360000,180000,0
+gl_cas02,190,23,1,1 monster Wanderer 1208,1,360000,180000,0
+gl_cas02,190,38,1,1 monster Raydric Archer 1276,1,360000,180000,0
+
+//==================================================
+// gl_in01 - Inside Glast Heim
+//==================================================
+gl_in01,41,155,40,45 monster Marionette 1143,5,0,0,0
+gl_in01,156,147,34,42 monster Marionette 1143,5,0,0,0
+gl_in01,42,48,41,32 monster Marionette 1143,5,0,0,0
+gl_in01,154,44,36,33 monster Marionette 1143,5,0,0,0
+gl_in01,42,154,40,45 monster Rideword 1195,2,0,0,0
+gl_in01,155,143,34,42 monster Rideword 1195,1,0,0,0
+gl_in01,41,47,41,32 monster Rideword 1195,3,0,0,0
+gl_in01,152,44,36,33 monster Rideword 1195,2,0,0,0
+gl_in01,0,0,0,0 monster Wanderer 1208,1,0,0,0
+gl_in01,0,0,0,0 monster Alice 1275,1,0,0,0
+gl_in01,40,150,40,45 monster Dark Frame 1260,3,0,0,0
+gl_in01,153,146,34,42 monster Dark Frame 1260,2,0,0,0
+gl_in01,43,45,41,32 monster Dark Frame 1260,2,0,0,0
+gl_in01,153,44,36,33 monster Dark Frame 1260,3,0,0,0
+gl_in01,41,154,40,45 monster Sage Worm 1281,3,0,0,0
+gl_in01,155,147,34,42 monster Sage Worm 1281,5,0,0,0
+gl_in01,42,47,41,32 monster Sage Worm 1281,3,0,0,0
+gl_in01,153,44,36,33 monster Sage Worm 1281,3,0,0,0
+
+//==================================================
+// gl_prison - Glast Heim Underprison F1
+//==================================================
+gl_prison,0,0,0,0 monster Injustice 1257,20,0,0,0
+gl_prison,0,0,0,0 monster Hunter Fly 1035,10,0,0,0
+gl_prison,0,0,0,0 monster Zombie Prisoner 1197,30,0,0,0
+gl_prison,0,0,0,0 monster Rybio 1201,15,0,0,0
+
+//==================================================
+// gl_prison1 - Glast Heim Underprison F2
+//==================================================
+gl_prison1,0,0,0,0 monster Skeleton Prisoner 1196,30,0,0,0
+gl_prison1,0,0,0,0 monster Cramp 1209,5,0,0,0
+gl_prison1,0,0,0,0 monster Hunter Fly 1035,10,0,0,0
+gl_prison1,0,0,0,0 monster Injustice 1257,40,0,0,0
+gl_prison1,0,0,0,0 monster Zealotus 1200,1,3600000,1800000,1
+gl_prison1,0,0,0,0 monster Rybio 1201,10,0,0,0
+gl_prison1,0,0,0,0 monster Phendark 1202,10,0,0,0
+
+//==================================================
// glast_01 - Glast Heim
//==================================================
-glast_01,0,0,0,0 monster Gargoyle 1253,10,5000,0,0
-glast_01,0,0,0,0 monster Green Plant 1080,8,5000,0,0
-glast_01,0,0,0,0 monster Abysmal Knight 1219,2,5000,0,0
-glast_01,233,209,15,15 monster Shining Plant 1083,1,1800000,900000,1
+glast_01,0,0,0,0 monster Abysmal Knight 1219,2,600000,300000,1
+glast_01,0,0,0,0 monster Gargoyle 1253,10,0,0,1
glast_01,233,209,15,15 monster Green Plant 1080,8,360000,180000,1
glast_01,233,209,15,15 monster Blue Plant 1079,2,900000,450000,1
+glast_01,233,209,15,15 monster Shining Plant 1083,1,1800000,900000,1
//==================================================
-// gl_cas01 - Glast Heim 1f
+// gl_church - Glast Heim St. Abbey
//==================================================
-gl_cas01,0,0,0,0 monster Carat 1267,50,5000,0,0
-gl_cas01,0,0,0,0 monster Dark Frame 1260,20,5000,0,0
-gl_cas01,0,0,0,0 monster Owl Duke 1320,20,5000,0,0
-gl_cas01,0,0,0,0 monster Rideword 1195,15,5000,0,0
-gl_cas01,0,0,0,0 monster Sage Worm 1281,10,5000,0,0
-gl_cas01,0,0,0,0 monster Whisper 1179,10,5000,0,0
-gl_cas01,0,0,0,0 monster Owl Baron 1295,6,5000,0,0
-gl_cas01,0,0,0,0 monster Alice 1275,1,5000,0,0
+gl_church,0,0,0,0 monster Wraith 1192,5,0,0,0
+gl_church,0,0,0,0 monster Evil Druid 1117,60,0,0,0
+gl_church,0,0,0,0 monster Ghoul 1036,50,0,0,0
+gl_church,0,0,0,0 monster Dark Illusion 1302,1,3600000,1800000,0
+gl_church,0,0,0,0 monster Mimic 1191,5,0,0,0
+gl_church,155,92,10,10 monster Mimic 1191,1,30000,15000,0
+gl_church,155,75,10,10 monster Mimic 1191,2,60000,30000,0
+gl_church,155,54,10,10 monster Mimic 1191,1,30000,15000,0
//==================================================
-// gl_cas02 - Glast Heim 2f
+// gl_chyard - Glast Heim Churchyard
//==================================================
-gl_cas02,0,0,0,0 monster Wanderer 1208,41,5000,0,0
-gl_cas02,0,0,0,0 monster Raydric 1163,36,5000,0,0
-gl_cas02,0,0,0,0 monster Rideword 1195,29,5000,0,0
-gl_cas02,0,0,0,0 monster Raydric Archer 1276,20,5000,0,0
-gl_cas02,0,0,0,0 monster Evil Druid 1117,9,5000,0,0
-gl_cas02,0,0,0,0 monster Abysmal Knight 1219,7,5000,0,0
-gl_cas02,0,0,0,0 monster Khalitzburg 1132,6,5000,0,0
-gl_cas02,0,0,0,0 monster Chimera 1283,3,5000,0,0
-gl_cas02,0,0,0,0 monster Mimic 1191,2,5000,0,0
-gl_cas02,0,0,0,0 monster Alice 1275,1,5000,0,0
-gl_cas02,102,180,0,0 monster Whisper 1185,1,1800000,900000,1
-gl_cas02,104,145,5,5 monster Mysteltainn 1203,1,7200000,3600000,1
-gl_cas02,0,0,0,0 monster Ogretooth 1204,1,7200000,3600000,1
+gl_chyard,0,0,0,0 monster Ghoul 1036,35,0,0,0
+gl_chyard,0,0,0,0 monster Zombie 1015,20,0,0,0
+gl_chyard,0,0,0,0 monster Wraith 1192,45,0,0,0
+gl_chyard,0,0,0,0 monster Evil Druid 1117,10,0,0,0
+gl_chyard,0,0,0,0 monster Hunter Fly 1035,3,0,0,0
+gl_chyard,0,0,0,0 monster Mimic 1191,3,0,0,0
+gl_chyard,0,0,0,0 boss_monster Dark Lord 1272,1,3600000,600000,1
//==================================================
-// gl_church - Glast Heim St. Abbey
+// gl_sew01 - Glast Heim Culvert F1
//==================================================
-gl_church,0,0,0,0 monster Evil Druid 1117,60,5000,0,0
-gl_church,0,0,0,0 monster Wraith 1192,55,5000,0,0
-gl_church,0,0,0,0 monster Mimic 1191,9,5000,0,0
-gl_church,0,0,0,0 monster Evil Druid 1117,1,5000,0,0
-gl_church,0,0,0,0 monster Wraith Dead 1291,1,3600000,1800000,0
+gl_sew01,0,0,0,0 monster Gargoyle 1253,30,0,0,0
+gl_sew01,0,0,0,0 monster Arclouze 1194,10,0,0,0
+gl_sew01,0,0,0,0 monster Whisper 1179,40,0,0,0
//==================================================
-// gl_chyard - Glast Heim Churchyard
+// gl_sew02 - Glast Heim Culvert F2
//==================================================
-gl_chyard,0,0,0,0 monster Dark Priest 1198,60,5000,0,0
-gl_chyard,0,0,0,0 monster Wraith 1192,35,5000,0,0
-gl_chyard,0,0,0,0 monster Evil Druid 1117,10,5000,0,0
-gl_chyard,0,0,0,0 monster Mimic 1191,3,5000,0,0
-gl_chyard,0,0,0,0 monster Hunter Fly 1035,3,5000,0,0
-gl_chyard,0,0,0,0 boss_monster Dark Lord 1272,1,3600000,600000,1
-gl_chyard,0,0,0,0 monster Dark Illusion 1302,1,3600000,1800000,0
+gl_sew02,0,0,0,0 monster Gargoyle 1253,55,0,0,0
+gl_sew02,0,0,0,0 monster Cramp 1209,15,0,0,0
//==================================================
-// gl_dun01 - The Lowest Cave in Glast Heim
+// gl_sew03 - Glast Heim Culvert F3
//==================================================
-gl_dun01,0,0,0,0 monster Arclouze 1194,50,5000,0,0
-gl_dun01,0,0,0,0 monster Sting 1207,40,5000,0,0
+gl_sew03,0,0,0,0 monster Sting 1207,70,0,0,0
+gl_sew03,0,0,0,0 monster Gargoyle 1253,37,0,0,0
+gl_sew03,147,7,5,1 monster Gargoyle 1253,1,2400000,1800000,0
+gl_sew03,140,7,5,1 monster Gargoyle 1253,1,3600000,1800000,0
+gl_sew03,158,7,5,1 monster Gargoyle 1253,1,3600000,1800000,0
//==================================================
-// gl_dun02 - The Lowest Cave in Glast Heim
+// gl_sew04 - Glast Heim Culvert F4
//==================================================
-gl_dun02,0,0,0,0 monster Majoruros 1310,45,5000,0,0
-gl_dun02,0,0,0,0 monster Gargoyle 1253,15,5000,0,0
+gl_sew04,0,0,0,0 monster Anolian 1206,100,120000,0,0
+gl_sew04,0,0,0,0 monster Gargoyle 1253,20,0,0,0
+gl_sew04,0,0,0,0 monster Drainliar 1111,10,0,0,0
//==================================================
-// gl_in01 - Inside Glast Heim
+// gl_step - Glast Heim Staircase Dungeon
//==================================================
-gl_in01,0,0,0,0 monster Marionette 1143,20,5000,0,0
-gl_in01,0,0,0,0 monster Sage Worm 1281,14,5000,0,0
-gl_in01,0,0,0,0 monster Dark Frame 1260,10,5000,0,0
-gl_in01,0,0,0,0 monster Rideword 1195,8,5000,0,0
-gl_in01,0,0,0,0 monster Wanderer 1208,1,5000,0,0
-gl_in01,0,0,0,0 monster Alice 1275,1,5000,0,0
+gl_step,0,0,0,0 monster Mimic 1191,5,60000,30000,0
+gl_step,0,0,0,0 monster Raydric Archer 1276,10,0,0,0
+gl_step,0,0,0,0 monster Wind Ghost 1263,100,120000,0,0
//==================================================
-// gl_knt01 - Inside Glast Heim Chivalry
+// gl_knt01 - Inside Glast Heim Chivalry F1
//==================================================
-gl_knt01,0,0,0,0 monster Raydric 1163,90,5000,0,0
-gl_knt01,0,0,0,0 monster Rideword 1195,21,5000,0,0
-gl_knt01,0,0,0,0 monster Raydric Archer 1276,10,5000,0,0
-gl_knt01,0,0,0,0 monster Abysmal Knight 1219,10,5000,0,0
-gl_knt01,0,0,0,0 monster Khalitzburg 1132,10,5000,0,0
-gl_knt01,0,0,0,0 monster Alice 1275,1,5000,0,0
+gl_knt01,0,0,0,0 monster Raydric 1163,60,0,0,0
+gl_knt01,0,0,0,0 monster Raydric Archer 1276,20,0,0,0
+gl_knt01,0,0,0,0 monster Khalitzburg 1132,10,0,0,0
+gl_knt01,0,0,0,0 monster Abysmal Knight 1219,10,0,0,0
+gl_knt01,0,0,0,0 monster Alice 1275,1,0,0,0
gl_knt01,21,278,0,0 monster Giant Whisper 1186,1,3600000,1800000,1
+gl_knt01,122,266,0,0 monster Rideword 1195,1,120000,60000,1
+gl_knt01,33,120,30,30 monster Rideword 1195,10,120000,60000,1
+gl_knt01,26,223,20,20 monster Rideword 1195,10,120000,60000,1
gl_knt01,9,184,0,0 monster Black Mushroom 1084,1,3600000,1800000,1
gl_knt01,8,184,0,0 monster Black Mushroom 1084,1,3600000,1800000,1
gl_knt01,7,184,0,0 monster Black Mushroom 1084,1,3600000,1800000,1
@@ -119,64 +198,35 @@ gl_knt01,5,185,0,0 monster Black Mushroom 1084,1,3600000,1800000,1
gl_knt01,4,185,0,0 monster Black Mushroom 1084,1,3600000,1800000,1
//==================================================
-// gl_knt02 - Inside Glast Heim Chivalry
+// gl_knt02 - Inside Glast Heim Chivalry F2
//==================================================
-gl_knt02,0,0,0,0 monster Raydric 1163,80,5000,0,0
-gl_knt02,0,0,0,0 monster Khalitzburg 1132,40,5000,0,0
-gl_knt02,0,0,0,0 monster Raydric Archer 1276,30,5000,0,0
-gl_knt02,0,0,0,0 monster Abysmal Knight 1219,6,5000,0,0
-gl_knt02,0,0,0,0 monster Alice 1275,1,5000,0,0
-gl_knt02,0,0,0,0 monster Mysteltainn 1203,1,1800000,1200000,0
+gl_knt02,0,0,0,0 monster Raydric 1163,50,0,0,0
+gl_knt02,0,0,0,0 monster Raydric Archer 1276,20,0,0,0
+gl_knt02,0,0,0,0 monster Khalitzburg 1132,30,0,0,0
gl_knt02,0,0,0,0 monster Bloody Knight 1268,1,3600000,1800000,1
+gl_knt02,0,0,0,0 monster Alice 1275,1,0,0,0
+gl_knt02,0,0,0,0 monster Mysteltainn 1203,1,1800000,1200000,0
+gl_knt02,0,0,0,0 monster Abysmal Knight 1219,5,0,0,0
+gl_knt02,149,26,5,5 monster Abysmal Knight 1219,1,3600000,1800000,1
+gl_knt02,99,49,5,5 monster Khalitzburg 1132,1,1800000,900000,1
+gl_knt02,62,80,5,5 monster Khalitzburg 1132,1,1800000,900000,1
+gl_knt02,82,134,5,5 monster Khalitzburg 1132,1,1800000,900000,1
+gl_knt02,60,242,5,5 monster Khalitzburg 1132,1,1800000,900000,1
+gl_knt02,118,241,5,5 monster Khalitzburg 1132,1,1800000,900000,1
+gl_knt02,114,194,5,5 monster Khalitzburg 1132,1,1800000,900000,1
+gl_knt02,196,239,5,5 monster Khalitzburg 1132,1,1800000,900000,1
+gl_knt02,208,45,5,5 monster Khalitzburg 1132,1,1800000,900000,1
+gl_knt02,243,74,5,5 monster Khalitzburg 1132,1,1800000,900000,1
+gl_knt02,232,132,5,5 monster Khalitzburg 1132,1,1800000,900000,1
//==================================================
-// gl_prison - Glast Heim Underprison
-//==================================================
-gl_prison,0,0,0,0 monster Zombie Prisoner 1197,30,5000,0,0
-gl_prison,0,0,0,0 monster Injustice 1257,20,5000,0,0
-gl_prison,0,0,0,0 monster Rybio 1201,15,5000,0,0
-gl_prison,0,0,0,0 monster Hunter Fly 1035,10,5000,0,0
-
-//==================================================
-// gl_prison1 - Glast Heim Underprison
-//==================================================
-gl_prison1,0,0,0,0 monster Injustice 1257,40,5000,0,0
-gl_prison1,0,0,0,0 monster Skeleton Prisoner 1196,30,5000,0,0
-gl_prison1,0,0,0,0 monster Rybio 1201,10,5000,0,0
-gl_prison1,0,0,0,0 monster Phendark 1202,10,5000,0,0
-gl_prison1,0,0,0,0 monster Hunter Fly 1035,10,5000,0,0
-gl_prison1,0,0,0,0 monster Cramp 1209,5,5000,0,0
-gl_prison1,0,0,0,0 monster Zealotus 1200,1,3600000,1800000,1
-
-//==================================================
-// gl_sew01 - Glast Heim Culvert
-//==================================================
-gl_sew01,0,0,0,0 monster Whisper 1179,40,5000,0,0
-gl_sew01,0,0,0,0 monster Gargoyle 1253,30,5000,0,0
-gl_sew01,0,0,0,0 monster Arclouze 1194,10,5000,0,0
-
-//==================================================
-// gl_sew02 - Glast Heim Culvert
-//==================================================
-gl_sew02,0,0,0,0 monster Gargoyle 1253,55,5000,0,0
-gl_sew02,0,0,0,0 monster Cramp 1209,15,5000,0,0
-
-//==================================================
-// gl_sew03 - Glast Heim Culvert
-//==================================================
-gl_sew03,0,0,0,0 monster Sting 1207,70,5000,0,0
-gl_sew03,0,0,0,0 monster Gargoyle 1253,40,5000,0,0
-
-//==================================================
-// gl_sew04 - Glast Heim Culvert
+// gl_dun01 - The Lowest Cave in Glast Heim F1
//==================================================
-gl_sew04,0,0,0,0 monster Anolian 1206,100,5000,0,0
-gl_sew04,0,0,0,0 monster Gargoyle 1253,20,5000,0,0
-gl_sew04,0,0,0,0 monster Drainliar 1111,10,5000,0,0
+gl_dun01,0,0,0,0 monster Arclouze 1194,50,0,0,0
+gl_dun01,0,0,0,0 monster Sting 1207,40,0,0,0
//==================================================
-// gl_step - Glast Heim Staircase Dungeon
+// gl_dun02 - The Lowest Cave in Glast Heim F2
//==================================================
-gl_step,0,0,0,0 monster Wind Ghost 1263,100,5000,0,0
-gl_step,0,0,0,0 monster Raydric Archer 1276,10,5000,0,0
-gl_step,0,0,0,0 monster Mimic 1191,5,5000,0,0
+gl_dun02,0,0,0,0 monster Majoruros 1310,45,0,0,0
+gl_dun02,0,0,0,0 monster Gargoyle 1253,15,0,0,0
diff --git a/npc/pre-re/mobs/dungeons/gld_dun.txt b/npc/pre-re/mobs/dungeons/gld_dun.txt
index cb06564e2..048f43681 100644
--- a/npc/pre-re/mobs/dungeons/gld_dun.txt
+++ b/npc/pre-re/mobs/dungeons/gld_dun.txt
@@ -12,41 +12,41 @@
//============================================================
//==================================================
-// gld_dun01 - Guild Dungeon
+// gld_dun01 - Baldur Guild Dungeon
//==================================================
-gld_dun01,0,0,0,0 monster Am Mut 1301,20,5000,0,0
-gld_dun01,0,0,0,0 monster Skeleton General 1290,10,5000,0,0
-gld_dun01,0,0,0,0 monster Gajomart 1309,10,5000,0,0
+gld_dun01,0,0,0,0 monster Skeleton General 1290,10,0,0,0
+gld_dun01,0,0,0,0 monster Am Mut 1301,20,0,0,0
gld_dun01,0,0,0,0 monster Cat o' Nine Tails 1307,3,1200000,0,0
-gld_dun01,0,0,0,0 monster Vagabond Wolf 1092,1,14400000,7200000,1
+gld_dun01,0,0,0,0 monster Gajomart 1309,10,0,0,0
gld_dun01,0,0,0,0 boss_monster Eddga 1115,1,28800000,600000,1
+gld_dun01,0,0,0,0 monster Vagabond Wolf 1092,1,14400000,7200000,1
//==================================================
-// gld_dun02 - Guild Dungeon
+// gld_dun02 - Luina Guild Dungeon
//==================================================
-gld_dun02,0,0,0,0 monster Giant Hornet 1303,10,120000,60000,0
+gld_dun02,0,0,0,0 monster Owl Baron 1295,3,0,0,0
gld_dun02,0,0,0,0 monster Giant Spider 1304,10,240000,120000,0
-gld_dun02,0,0,0,0 monster Ancient Worm 1305,7,120000,60000,0
+gld_dun02,0,0,0,0 monster Ancient Worm 1305,5,120000,60000,0
gld_dun02,0,0,0,0 monster Killer Mantis 1294,5,120000,60000,0
-gld_dun02,0,0,0,0 monster Owl Baron 1295,1,5000,0,0
+gld_dun02,0,0,0,0 monster Giant Hornet 1303,10,120000,60000,0
gld_dun02,0,0,0,0 boss_monster Doppelganger 1046,1,28800000,600000,1
//==================================================
-// gld_dun03 - Guild Dungeon
+// gld_dun03 - Valkyrie Guild Dungeon
//==================================================
-gld_dun03,0,0,0,0 monster Caterpillar 1300,20,5000,0,0
-gld_dun03,0,0,0,0 monster Creamy Fear 1293,20,5000,0,0
-gld_dun03,0,0,0,0 monster Leib Olmai 1306,20,5000,0,0
-gld_dun03,0,0,0,0 monster Gullinbursti 1311,10,5000,0,0
gld_dun03,0,0,0,0 monster Maya Purple 1289,3,1200000,600000,0
+gld_dun03,0,0,0,0 monster Caterpillar 1300,20,0,0,0
+gld_dun03,0,0,0,0 monster Gullinbursti 1311,10,0,0,0
+gld_dun03,0,0,0,0 monster Creamy Fear 1293,20,0,0,0
+gld_dun03,0,0,0,0 monster Leib Olmai 1306,20,0,0,0
gld_dun03,0,0,0,0 boss_monster Maya 1147,1,28800000,600000,1
//==================================================
-// gld_dun04 - Guild Dungeon
+// gld_dun04 - Britoniah Guild Dungeon
//==================================================
-gld_dun04,0,0,0,0 monster Zombie Master 1298,29,5000,0,0
-gld_dun04,0,0,0,0 monster Wraith Dead 1291,27,5000,0,0
-gld_dun04,0,0,0,0 monster Mini Demon 1292,3,5000,0,0
+gld_dun04,0,0,0,0 monster Wraith Dead 1291,20,0,0,0
+gld_dun04,0,0,0,0 monster Mini Demon 1292,20,0,0,0
+gld_dun04,0,0,0,0 monster Zombie Master 1298,20,0,0,0
gld_dun04,0,0,0,0 monster Dark Illusion 1302,1,1200000,0,0
-gld_dun04,0,0,0,0 monster Ghostring 1120,1,14400000,7200000,1
gld_dun04,0,0,0,0 boss_monster Dark Lord 1272,1,28800000,600000,1
+gld_dun04,0,0,0,0 monster Ghostring 1120,1,14400000,7200000,1
diff --git a/npc/pre-re/mobs/dungeons/gld_dunSE.txt b/npc/pre-re/mobs/dungeons/gld_dunSE.txt
index 488875380..abff62d33 100644
--- a/npc/pre-re/mobs/dungeons/gld_dunSE.txt
+++ b/npc/pre-re/mobs/dungeons/gld_dunSE.txt
@@ -12,18 +12,18 @@
//============================================================
//==================================================
-// schg_dun01 - Subterranean Guild Dungeon
+// arug_dun01 - Arunafeltz Guild Dungeon
//==================================================
-schg_dun01,0,0,0,0 monster Hell Apocalypse 1978,20,0,0,0
-schg_dun01,0,0,0,0 monster Zakudam 1979,20,0,0,0
-schg_dun01,0,0,0,0 monster Heavy Metaling 1977,15,5000,0,0
-schg_dun01,0,0,0,0 monster Cobalt Mineral 1976,15,5000,0,0
+arug_dun01,0,0,0,0 monster Banshee Master 1974,22,0,0,0
+arug_dun01,0,0,0,0 monster Necromancer 1870,18,0,0,0
+arug_dun01,0,0,0,0 monster Beholder Master 1975,17,0,0,0
+arug_dun01,0,0,0,0 monster Fanat 1797,17,0,0,0
+arug_dun01,0,0,0,0 monster Aunoe 1796,17,0,0,0
//==================================================
-// arug_dun01 - Subterranean Guild Dungeon
+// schg_dun01 - Schwartzvald Guild Dungeon
//==================================================
-arug_dun01,0,0,0,0 monster Banshee Master 1974,22,0,0,0
-arug_dun01,0,0,0,0 monster Beholder master 1975,22,5000,0,0
-arug_dun01,0,0,0,0 monster Aunoe 1796,22,5000,0,0
-arug_dun01,0,0,0,0 monster Necromancer 1870,18,0,0,0
-arug_dun01,0,0,0,0 monster Fanat 1797,5,5000,0,0
+schg_dun01,0,0,0,0 monster Hell Apocalypse 1978,20,0,0,0
+schg_dun01,0,0,0,0 monster Zakudam 1979,20,0,0,0
+schg_dun01,0,0,0,0 monster Heavy Metaling 1977,15,0,0,0
+schg_dun01,0,0,0,0 monster Cobalt Mineral 1976,15,0,0,0
diff --git a/npc/pre-re/mobs/dungeons/gon_dun.txt b/npc/pre-re/mobs/dungeons/gon_dun.txt
index 98958a4dc..347ad6174 100644
--- a/npc/pre-re/mobs/dungeons/gon_dun.txt
+++ b/npc/pre-re/mobs/dungeons/gon_dun.txt
@@ -12,29 +12,33 @@
//============================================================
//==================================================
-// gon_dun01 - Shrine of Kunlun Queen
+// gon_dun01 - Shrine of Gonryun Queen
//==================================================
-gon_dun01,0,0,0,0 monster Bloody Butterfly 1408,55,5000,0,0
-gon_dun01,0,0,0,0 monster Enchanted Peach Tree 1410,35,5000,0,0
-gon_dun01,0,0,0,0 monster Zipper Bear 1417,30,5000,0,0
-gon_dun01,0,0,0,0 monster Yellow Plant 1081,10,5000,0,0
-gon_dun01,0,0,0,0 monster White Plant 1082,10,5000,0,0
-gon_dun01,0,0,0,0 monster Red Plant 1078,5,5000,0,0
+gon_dun01,0,0,0,0 monster Bloody Butterfly 1408,55,650000,350000,0
+gon_dun01,0,0,0,0 monster Enchanted Peach Tree 1410,35,0,0,0
+gon_dun01,0,0,0,0 monster Zipper Bear 1417,30,0,0,0
+gon_dun01,0,0,0,0 monster Red Plant 1078,5,0,0,0
+gon_dun01,0,0,0,0 monster Yellow Plant 1081,10,0,0,0
+gon_dun01,0,0,0,0 monster White Plant 1082,10,0,0,0
//==================================================
// gon_dun02 - Hermit's Checkers
//==================================================
-gon_dun02,0,0,0,0 monster Enchanted Peach Tree 1410,21,5000,0,0
-gon_dun02,0,0,0,0 monster Taoist Hermit 1412,20,5000,0,0
-gon_dun02,0,0,0,0 monster Bloody Butterfly 1408,20,5000,0,0
-gon_dun02,0,0,0,0 monster Baby Leopard 1415,6,5000,0,0
-gon_dun02,0,0,0,0 monster Yellow Plant 1081,10,5000,0,0
+gon_dun02,241,226,15,20 monster Enchanted Peach Tree 1410,2,300000,150000,0
+gon_dun02,241,226,15,20 monster Baby Leopard 1415,4,600000,300000,0
+gon_dun02,241,226,15,20 monster Enchanted Peach Tree 1410,3,120000,60000,0
+gon_dun02,33,115,10,15 monster Enchanted Peach Tree 1410,1,300000,150000,0
+gon_dun02,33,115,10,15 monster Baby Leopard 1415,2,600000,300000,0
+gon_dun02,0,0,0,0 monster Taoist Hermit 1412,20,690000,390000,0
+gon_dun02,0,0,0,0 monster Bloody Butterfly 1408,20,0,0,0
+gon_dun02,0,0,0,0 monster Enchanted Peach Tree 1410,15,0,0,0
+gon_dun02,0,0,0,0 monster Yellow Plant 1081,10,0,0,0
//==================================================
// gon_dun03 - Arcadia
//==================================================
-gon_dun03,0,0,0,0 monster Evil Nymph 1416,50,5000,0,0
-gon_dun03,0,0,0,0 monster Taoist Hermit 1412,30,5000,0,0
-gon_dun03,0,0,0,0 monster Hermit Plant 1413,20,5000,0,0
+gon_dun03,0,0,0,0 monster White Plant 1082,10,0,0,0
+gon_dun03,0,0,0,0 monster Hermit Plant 1413,20,600000,300000,0
+gon_dun03,0,0,0,0 monster Evil Nymph 1416,50,600000,300000,0
+gon_dun03,0,0,0,0 monster Taoist Hermit 1412,30,0,0,0
gon_dun03,0,0,0,0 boss_monster Evil Snake Lord 1418,1,5650000,600000,0
-gon_dun03,0,0,0,0 monster White Plant 1082,10,5000,0,0
diff --git a/npc/pre-re/mobs/dungeons/ice_dun.txt b/npc/pre-re/mobs/dungeons/ice_dun.txt
index 418006267..35a5090f8 100644
--- a/npc/pre-re/mobs/dungeons/ice_dun.txt
+++ b/npc/pre-re/mobs/dungeons/ice_dun.txt
@@ -15,24 +15,55 @@
//==================================================
// ice_dun01 - Ice Cave
//==================================================
-ice_dun01,0,0,0,0 monster Siroma 1776,75,5000,0,0
-ice_dun01,0,0,0,0 monster Roween 1782,5,5000,0,0
-ice_dun01,0,0,0,0 monster Muscipular 1780,5,5000,0,0
-ice_dun01,0,0,0,0 monster Gazeti 1778,2,5000,0,0
+ice_dun01,0,0,0,0 monster Siroma 1776,75,0,0,0
+ice_dun01,0,0,0,0 monster Roween 1782,5,0,0,0
+ice_dun01,0,0,0,0 monster Gazeti 1778,2,0,0,0
+ice_dun01,0,0,0,0 monster Muscipular 1780,5,0,0,0
//==================================================
// ice_dun02 - Ice Cave
//==================================================
-ice_dun02,0,0,0,0 monster Snowier 1775,70,5000,0,0
-ice_dun02,0,0,0,0 monster Siroma 1776,30,5000,0,0
-ice_dun02,0,0,0,0 monster Iceicle 1789,19,5000,0,0
-ice_dun02,0,0,0,0 monster Gazeti 1778,15,5000,0,0
-ice_dun02,0,0,0,0 monster Ice Titan 1777,7,5000,0,0
+ice_dun02,0,0,0,0 monster Snowier 1775,70,0,0,0
+ice_dun02,0,0,0,0 monster Siroma 1776,30,0,0,0
+ice_dun02,0,0,0,0 monster Gazeti 1778,15,240000,0,0
+ice_dun02,0,0,0,0 monster Ice Titan 1777,7,0,0,0
+ice_dun02,33,271,4,4 monster Iceicle 1789,1,1320000,300000,0
+ice_dun02,110,242,5,5 monster Iceicle 1789,2,1020000,300000,0
+ice_dun02,150,280,4,4 monster Iceicle 1789,1,900000,300000,0
+ice_dun02,270,268,4,4 monster Iceicle 1789,1,1020000,300000,0
+ice_dun02,46,207,3,3 monster Iceicle 1789,1,1080000,300000,0
+ice_dun02,134,214,4,4 monster Iceicle 1789,1,840000,300000,0
+ice_dun02,102,178,4,4 monster Iceicle 1789,1,1020000,300000,0
+ice_dun02,207,165,5,5 monster Iceicle 1789,2,1080000,300000,0
+ice_dun02,206,222,4,4 monster Iceicle 1789,1,1020000,300000,0
+ice_dun02,270,136,3,3 monster Iceicle 1789,1,960000,300000,0
+ice_dun02,20,150,4,4 monster Iceicle 1789,1,960000,300000,0
+ice_dun02,46,103,5,5 monster Iceicle 1789,2,1320000,300000,0
+ice_dun02,172,90,3,3 monster Iceicle 1789,1,840000,300000,0
+ice_dun02,20,20,5,5 monster Iceicle 1789,1,960000,300000,0
+ice_dun02,143,28,3,3 monster Iceicle 1789,1,1020000,300000,0
+ice_dun02,280,20,5,5 monster Iceicle 1789,1,960000,300000,0
//==================================================
// ice_dun03 - Ice Cave
//==================================================
-ice_dun03,0,0,0,0 monster Ice Titan 1777,70,5000,0,0
-ice_dun03,0,0,0,0 monster Gazeti 1778,42,5000,0,0
-ice_dun03,0,0,0,0 monster Iceicle 1789,32,5000,0,0
-ice_dun03,0,0,0,0 monster Snowier 1775,15,5000,0,0
+ice_dun03,0,0,0,0 monster Ice Titan 1777,12,0,0,0
+ice_dun03,0,0,0,0 monster Ice Titan 1777,10,7200000,3600000,0
+ice_dun03,0,0,0,0 monster Gazeti 1778,10,120000,0,0
+ice_dun03,0,0,0,0 monster Snowier 1775,15,0,0,0
+ice_dun03,113,239,85,50 monster Ice Titan 1777,12,180000,0,0
+ice_dun03,113,239,85,50 monster Gazeti 1778,8,300000,0,0
+ice_dun03,63,110,50,82 monster Ice Titan 1777,12,180000,0,0
+ice_dun03,63,110,50,82 monster Gazeti 1778,8,300000,0,0
+ice_dun03,189,66,80,40 monster Ice Titan 1777,12,180000,0,0
+ice_dun03,189,66,80,40 monster Gazeti 1778,8,300000,0,0
+ice_dun03,235,185,44,80 monster Ice Titan 1777,12,180000,0,0
+ice_dun03,235,185,44,80 monster Gazeti 1778,8,300000,0,0
+ice_dun03,50,243,10,10 monster Iceicle 1789,2,720000,300000,0
+ice_dun03,149,247,10,43 monster Iceicle 1789,5,1080000,300000,0
+ice_dun03,247,241,24,24 monster Iceicle 1789,3,960000,300000,0
+ice_dun03,255,150,25,20 monster Iceicle 1789,3,840000,300000,0
+ice_dun03,45,150,25,20 monster Iceicle 1789,3,960000,300000,0
+ice_dun03,61,59,33,33 monster Iceicle 1789,7,1080000,300000,0
+ice_dun03,150,55,24,36 monster Iceicle 1789,6,1080000,300000,0
+ice_dun03,247,54,24,28 monster Iceicle 1789,3,840000,300000,0
diff --git a/npc/pre-re/mobs/dungeons/in_sphinx.txt b/npc/pre-re/mobs/dungeons/in_sphinx.txt
index 7263f38d9..1d3a4ad32 100644
--- a/npc/pre-re/mobs/dungeons/in_sphinx.txt
+++ b/npc/pre-re/mobs/dungeons/in_sphinx.txt
@@ -14,43 +14,43 @@
//============================================================
//==================================================
-// in_sphinx1 - Sphinx
+// In_sphinx1 - Sphinx F1
//==================================================
-in_sphinx1,0,0,0,0 monster Drainliar 1111,40,5000,0,0
-in_sphinx1,0,0,0,0 monster Requiem 1164,20,5000,0,0
-in_sphinx1,0,0,0,0 monster Zerom 1178,20,5000,0,0
-in_sphinx1,0,0,0,0 monster Matyr 1146,10,5000,0,0
+in_sphinx1,0,0,0,0 monster Drainliar 1111,40,0,0,0
+in_sphinx1,0,0,0,0 monster Requiem 1164,20,0,0,0
+in_sphinx1,0,0,0,0 monster Zerom 1178,20,0,0,0
+in_sphinx1,0,0,0,0 monster Matyr 1146,10,0,0,0
//==================================================
-// in_sphinx2 - Sphinx
+// In_sphinx2 - Sphinx F2
//==================================================
-in_sphinx2,0,0,0,0 monster Requiem 1164,50,5000,0,0
-in_sphinx2,0,0,0,0 monster Zerom 1178,50,5000,0,0
-in_sphinx2,0,0,0,0 monster Matyr 1146,20,5000,0,0
-in_sphinx2,0,0,0,0 monster Drainliar 1111,15,5000,0,0
+in_sphinx2,0,0,0,0 monster Drainliar 1111,15,0,0,0
+in_sphinx2,0,0,0,0 monster Requiem 1164,50,0,0,0
+in_sphinx2,0,0,0,0 monster Zerom 1178,50,0,0,0
+in_sphinx2,0,0,0,0 monster Matyr 1146,20,0,0,0
//==================================================
-// in_sphinx3 - Sphinx
+// In_sphinx3 - Sphinx F3
//==================================================
-in_sphinx3,0,0,0,0 monster Marduk 1140,65,5000,0,0
-in_sphinx3,0,0,0,0 monster Matyr 1146,15,5000,0,0
-in_sphinx3,0,0,0,0 monster Mimic 1191,5,5000,0,0
-in_sphinx3,0,0,0,0 monster Pasana 1154,5,5000,0,0
+in_sphinx3,0,0,0,0 monster Matyr 1146,15,0,0,0
+in_sphinx3,0,0,0,0 monster Pasana 1154,5,0,0,0
+in_sphinx3,0,0,0,0 monster Marduk 1140,65,0,0,0
+in_sphinx3,0,0,0,0 monster Mimic 1191,5,600000,300000,1
//==================================================
-// in_sphinx4 - Sphinx
+// In_sphinx4 - Sphinx F4
//==================================================
-in_sphinx4,0,0,0,0 monster Minorous 1149,50,5000,0,0
-in_sphinx4,0,0,0,0 monster Pasana 1154,20,5000,0,0
-in_sphinx4,0,0,0,0 monster Anubis 1098,15,5000,0,0
-in_sphinx4,0,0,0,0 monster Mimic 1191,4,5000,0,0
+in_sphinx4,0,0,0,0 monster Minorous 1149,50,0,0,0
+in_sphinx4,0,0,0,0 monster Anubis 1098,15,0,0,0
+in_sphinx4,0,0,0,0 monster Mimic 1191,4,600000,300000,1
+in_sphinx4,0,0,0,0 monster Pasana 1154,20,0,0,0
//==================================================
-// in_sphinx5 - Sphinx
+// In_sphinx5 - Sphinx F5
//==================================================
-in_sphinx5,0,0,0,0 monster Pasana 1154,70,5000,0,0
-in_sphinx5,0,0,0,0 monster Side Winder 1037,20,5000,0,0
-in_sphinx5,0,0,0,0 monster Matyr 1146,10,5000,0,0
-in_sphinx5,0,0,0,0 monster Anubis 1098,10,5000,0,0
-in_sphinx5,0,0,0,0 monster Mimic 1191,7,5000,0,0
+in_sphinx5,0,0,0,0 monster Pasana 1154,70,0,0,0
+in_sphinx5,0,0,0,0 monster Matyr 1146,10,0,0,0
+in_sphinx5,0,0,0,0 monster Side Winder 1037,20,0,0,0
+in_sphinx5,0,0,0,0 monster Anubis 1098,10,0,0,0
+in_sphinx5,0,0,0,0 monster Mimic 1191,7,600000,300000,1
in_sphinx5,0,0,0,0 boss_monster Pharaoh 1157,1,3600000,600000,1
diff --git a/npc/pre-re/mobs/dungeons/iz_dun.txt b/npc/pre-re/mobs/dungeons/iz_dun.txt
index b56f8eed3..fc1b282bb 100644
--- a/npc/pre-re/mobs/dungeons/iz_dun.txt
+++ b/npc/pre-re/mobs/dungeons/iz_dun.txt
@@ -3,57 +3,71 @@
//===== By: ==================================================
//= Athena (1.0)
//===== Current Version: =====================================
-//= 1.3a
+//= 1.2
//===== Compatible With: =====================================
//= Any Athena Version
//===== Additional Comments: =================================
//= 1.1 Official kRO 10.1 spawns for 1-4 [Playtester]
//= 1.2 More accurate spawns [Playtester]
-//= 1.3 Added Izlude Dungeon F6 spawns [Chilly]
-//= 1.3a Moved Izlude Dungeon F6 spawns to separate file. [Kenpachi]
//============================================================
//==================================================
-// iz_dun00 - Undersea Tunnel
+// iz_dun00 - Undersea Tunnel F1
//==================================================
-iz_dun00,0,0,0,0 monster Plankton 1161,65,5000,0,0
-iz_dun00,0,0,0,0 monster Marina 1141,45,5000,0,0
-iz_dun00,0,0,0,0 monster Vadon 1066,15,5000,0,0
-iz_dun00,0,0,0,0 monster Kukre 1070,15,5000,0,0
-iz_dun00,0,0,0,0 monster Hydra 1068,15,5000,0,0
+iz_dun00,0,0,0,0 monster Plankton 1161,65,0,0,0
+iz_dun00,0,0,0,0 monster Marina 1141,45,0,0,0
+iz_dun00,0,0,0,0 monster Kukre 1070,15,0,0,0
+iz_dun00,0,0,0,0 monster Hydra 1068,15,0,0,0
+iz_dun00,0,0,0,0 monster Vadon 1066,15,0,0,0
iz_dun00,0,0,0,0 monster Black Mushroom 1084,5,180000,90000,1
//==================================================
-// iz_dun01 - Undersea Tunnel
+// iz_dun01 - Undersea Tunnel F2
//==================================================
-iz_dun01,0,0,0,0 monster Vadon 1066,60,5000,0,0
-iz_dun01,0,0,0,0 monster Kukre 1070,50,5000,0,0
-iz_dun01,0,0,0,0 monster Hydra 1068,30,5000,0,0
-iz_dun01,0,0,0,0 monster Marina 1141,15,5000,0,0
-iz_dun01,0,0,0,0 monster Cornutus 1067,15,5000,0,0
-iz_dun01,0,0,0,0 monster Plankton 1161,10,5000,0,0
+iz_dun01,0,0,0,0 monster Plankton 1161,10,0,0,0
+iz_dun01,0,0,0,0 monster Marina 1141,15,0,0,0
+iz_dun01,0,0,0,0 monster Kukre 1070,50,0,0,0
+iz_dun01,0,0,0,0 monster Hydra 1068,30,0,0,0
+iz_dun01,0,0,0,0 monster Vadon 1066,60,0,0,0
+iz_dun01,0,0,0,0 monster Cornutus 1067,15,300000,150000,1
iz_dun01,0,0,0,0 monster Black Mushroom 1084,10,180000,90000,1
//==================================================
-// iz_dun02 - Undersea Tunnel
+// iz_dun02 - Undersea Tunnel F3
//==================================================
-iz_dun02,0,0,0,0 monster Cornutus 1067,60,5000,0,0
-iz_dun02,0,0,0,0 monster Marse 1144,40,5000,0,0
-iz_dun02,0,0,0,0 monster Obeaune 1044,40,5000,0,0
-iz_dun02,0,0,0,0 monster Hydra 1068,40,5000,0,0
-iz_dun02,0,0,0,0 monster Merman 1264,1,5000,0,0
+iz_dun02,0,0,0,0 monster Hydra 1068,40,0,0,0
+iz_dun02,0,0,0,0 monster Cornutus 1067,60,0,0,0
+iz_dun02,0,0,0,0 monster Marse 1144,40,0,0,0
+iz_dun02,0,0,0,0 monster Obeaune 1044,40,0,0,0
+iz_dun02,0,0,0,0 monster Merman 1264,1,1800000,1200000,0
iz_dun02,0,0,0,0 monster Black Mushroom 1084,15,180000,90000,1
//==================================================
-// iz_dun03 - Undersea Tunnel
+// iz_dun03 - Undersea Tunnel F4
//==================================================
-iz_dun03,0,0,0,0 monster Phen 1158,45,5000,0,0
-iz_dun03,0,0,0,0 monster Marc 1045,40,5000,0,0
-iz_dun03,0,0,0,0 monster Swordfish 1069,40,5000,0,0
-iz_dun03,0,0,0,0 monster Marine Sphere 1142,20,5000,0,0
-iz_dun03,0,0,0,0 monster Merman 1264,3,5000,0,0
+iz_dun03,0,0,0,0 monster Hydra 1068,10,0,0,0
+iz_dun03,0,0,0,0 monster Phen 1158,45,0,0,0
+iz_dun03,0,0,0,0 monster Marine Sphere 1142,20,0,0,0
+iz_dun03,0,0,0,0 monster Swordfish 1069,40,0,0,0
+iz_dun03,0,0,0,0 monster Marc 1045,40,0,0,0
+iz_dun03,203,59,0,0 monster Hydra 1068,1,312000,150000,0
+iz_dun03,203,56,0,0 monster Hydra 1068,1,323000,150000,0
+iz_dun03,203,53,0,0 monster Hydra 1068,1,317000,150000,0
+iz_dun03,203,50,0,0 monster Hydra 1068,1,323000,150000,0
+iz_dun03,203,47,0,0 monster Hydra 1068,1,305000,150000,0
+iz_dun03,204,60,0,0 monster Hydra 1068,1,304000,150000,0
+iz_dun03,204,57,0,0 monster Hydra 1068,1,302000,150000,0
+iz_dun03,204,54,0,0 monster Hydra 1068,1,310000,150000,0
+iz_dun03,204,51,0,0 monster Hydra 1068,1,309000,150000,0
+iz_dun03,204,48,0,0 monster Hydra 1068,1,313000,150000,0
+iz_dun03,191,144,0,0 monster Hydra 1068,1,321000,150000,0
+iz_dun03,194,144,0,0 monster Hydra 1068,1,316000,150000,0
+iz_dun03,197,144,0,0 monster Hydra 1068,1,296000,150000,0
iz_dun03,200,144,0,0 monster Hydra 1068,1,282000,150000,0
-iz_dun03,178,253,0,0 monster Hydra 1068,1,300000,150000,0
+iz_dun03,203,144,0,0 monster Hydra 1068,1,310000,150000,0
+iz_dun03,206,144,0,0 monster Hydra 1068,1,305000,150000,0
+iz_dun03,209,144,0,0 monster Hydra 1068,1,308000,150000,0
+iz_dun03,212,144,0,0 monster Hydra 1068,1,321000,150000,0
iz_dun03,193,143,0,0 monster Hydra 1068,1,300000,150000,0
iz_dun03,196,143,0,0 monster Hydra 1068,1,300000,150000,0
iz_dun03,199,143,0,0 monster Hydra 1068,1,300000,150000,0
@@ -61,51 +75,40 @@ iz_dun03,202,143,0,0 monster Hydra 1068,1,300000,150000,0
iz_dun03,205,143,0,0 monster Hydra 1068,1,300000,150000,0
iz_dun03,208,143,0,0 monster Hydra 1068,1,300000,150000,0
iz_dun03,211,143,0,0 monster Hydra 1068,1,300000,150000,0
-iz_dun03,108,249,0,0 monster Hydra 1068,1,300000,150000,0
-iz_dun03,180,251,0,0 monster Hydra 1068,1,300000,150000,0
iz_dun03,176,260,0,0 monster Hydra 1068,1,300000,150000,0
+iz_dun03,180,251,0,0 monster Hydra 1068,1,300000,150000,0
+iz_dun03,178,253,0,0 monster Hydra 1068,1,300000,150000,0
+iz_dun03,108,249,0,0 monster Hydra 1068,1,300000,150000,0
iz_dun03,80,163,0,0 monster Hydra 1068,1,300000,150000,0
-iz_dun03,204,57,0,0 monster Hydra 1068,1,302000,150000,0
-iz_dun03,204,60,0,0 monster Hydra 1068,1,304000,150000,0
-iz_dun03,203,47,0,0 monster Hydra 1068,1,305000,150000,0
-iz_dun03,206,144,0,0 monster Hydra 1068,1,305000,150000,0
-iz_dun03,209,144,0,0 monster Hydra 1068,1,308000,150000,0
-iz_dun03,204,51,0,0 monster Hydra 1068,1,309000,150000,0
-iz_dun03,203,144,0,0 monster Hydra 1068,1,310000,150000,0
-iz_dun03,204,54,0,0 monster Hydra 1068,1,310000,150000,0
-iz_dun03,203,59,0,0 monster Hydra 1068,1,312000,150000,0
-iz_dun03,204,48,0,0 monster Hydra 1068,1,313000,150000,0
-iz_dun03,194,144,0,0 monster Hydra 1068,1,316000,150000,0
-iz_dun03,203,53,0,0 monster Hydra 1068,1,317000,150000,0
-iz_dun03,191,144,0,0 monster Hydra 1068,1,321000,150000,0
-iz_dun03,212,144,0,0 monster Hydra 1068,1,321000,150000,0
-iz_dun03,203,50,0,0 monster Hydra 1068,1,323000,150000,0
-iz_dun03,203,56,0,0 monster Hydra 1068,1,323000,150000,0
-iz_dun03,197,144,0,0 monster Hydra 1068,1,2960000,150000,0
+iz_dun03,0,0,0,0 monster Merman 1264,3,1800000,1200000,0
//==================================================
-// iz_dun04 - Undersea Tunnel
+// iz_dun04 - Undersea Tunnel F5
//==================================================
-iz_dun04,0,0,0,0 monster Merman 1264,52,5000,0,0
-iz_dun04,0,0,0,0 monster Strouf 1065,50,5000,0,0
-iz_dun04,0,0,0,0 monster Marine Sphere 1142,10,5000,0,0
-iz_dun04,0,0,0,0 monster Swordfish 1069,10,5000,0,0
-iz_dun04,0,0,0,0 monster Deviace 1108,3,5000,0,0
-iz_dun04,80,246,0,0 monster Hydra 1068,1,294000,150000,0
-iz_dun04,79,246,0,0 monster Hydra 1068,1,300000,150000,0
-iz_dun04,111,41,0,0 monster Hydra 1068,1,300000,150000,0
-iz_dun04,111,35,0,0 monster Hydra 1068,1,300000,150000,0
-iz_dun04,124,233,0,0 monster Hydra 1068,1,300000,150000,0
-iz_dun04,38,115,0,0 monster Hydra 1068,1,300000,150000,0
-iz_dun04,38,129,0,0 monster Hydra 1068,1,300000,150000,0
-iz_dun04,61,135,0,0 monster Hydra 1068,1,300000,150000,0
-iz_dun04,79,234,0,0 monster Hydra 1068,1,302000,150000,0
-iz_dun04,111,38,0,0 monster Hydra 1068,1,303000,150000,0
-iz_dun04,134,233,0,0 monster Hydra 1068,1,305000,150000,0
+iz_dun04,0,0,0,0 monster Marine Sphere 1142,10,0,0,0
+iz_dun04,0,0,0,0 monster Swordfish 1069,10,0,0,0
+iz_dun04,0,0,0,0 monster Merman 1264,40,0,0,0
+iz_dun04,0,0,0,0 monster Strouf 1065,50,600000,300000,1
iz_dun04,58,135,0,0 monster Hydra 1068,1,305000,150000,0
+iz_dun04,61,135,0,0 monster Hydra 1068,1,300000,150000,0
+iz_dun04,42,129,0,0 monster Hydra 1068,1,312000,150000,0
iz_dun04,42,116,0,0 monster Hydra 1068,1,306000,150000,0
+iz_dun04,38,129,0,0 monster Hydra 1068,1,300000,150000,0
iz_dun04,33,129,0,0 monster Hydra 1068,1,308000,150000,0
-iz_dun04,42,129,0,0 monster Hydra 1068,1,312000,150000,0
+iz_dun04,38,115,0,0 monster Hydra 1068,1,300000,150000,0
+iz_dun04,33,115,0,0 monster Hydra 1068,1,321000,150000,0
+iz_dun04,79,246,0,0 monster Hydra 1068,1,300000,150000,0
+iz_dun04,80,246,0,0 monster Hydra 1068,1,294000,150000,0
+iz_dun04,79,234,0,0 monster Hydra 1068,1,302000,150000,0
iz_dun04,80,233,0,0 monster Hydra 1068,1,318000,150000,0
+iz_dun04,111,41,0,0 monster Hydra 1068,1,300000,150000,0
+iz_dun04,111,38,0,0 monster Hydra 1068,1,303000,150000,0
+iz_dun04,111,35,0,0 monster Hydra 1068,1,300000,150000,0
iz_dun04,69,243,0,0 monster Hydra 1068,1,321000,150000,0
-iz_dun04,33,115,0,0 monster Hydra 1068,1,321000,150000,0
+iz_dun04,124,233,0,0 monster Hydra 1068,1,300000,150000,0
+iz_dun04,134,233,0,0 monster Hydra 1068,1,305000,150000,0
+iz_dun04,0,0,0,0 monster Deviace 1108,3,0,0,0
+iz_dun04,103,231,10,10 monster Merman 1264,3,150000,0,0
+iz_dun04,160,231,10,10 monster Merman 1264,3,170000,0,0
+iz_dun04,95,147,10,10 monster Merman 1264,3,150000,0,0
+iz_dun04,130,216,15,15 monster Merman 1264,3,160000,0,0
diff --git a/npc/pre-re/mobs/dungeons/juperos.txt b/npc/pre-re/mobs/dungeons/juperos.txt
index d3db3aefe..67c9f4395 100644
--- a/npc/pre-re/mobs/dungeons/juperos.txt
+++ b/npc/pre-re/mobs/dungeons/juperos.txt
@@ -17,36 +17,44 @@
//= 1.4 Corrected MVP spawn variance. [L0ne_W0lf]
//============================================================
-//==================================================
-// juperos_01 - Ruins of Juperos
-//==================================================
-juperos_01,0,0,0,0 monster Venatu 1676,70,5000,0,0
-juperos_01,0,0,0,0 monster Venatu 1677,70,5000,0,0
-juperos_01,0,0,0,0 monster Venatu 1678,70,5000,0,0
-juperos_01,0,0,0,0 monster Venatu 1679,50,5000,0,0
-juperos_01,0,0,0,0 monster Dimik 1670,10,5000,0,0
-juperos_01,0,0,0,0 monster Dimik 1671,5,5000,0,0
-juperos_01,0,0,0,0 monster Dimik 1672,5,5000,0,0
-juperos_01,0,0,0,0 monster Dimik 1673,5,5000,0,0
+//========================================================================================
+// - Juperos 01
+//========================================================================================
-//==================================================
-// juperos_02 - Ruins of Juperos
-//==================================================
-juperos_02,0,0,0,0 monster Apocalypse 1365,70,5000,0,0
-juperos_02,0,0,0,0 monster Venatu 1676,65,5000,0,0
-juperos_02,0,0,0,0 monster Venatu 1677,65,5000,0,0
-juperos_02,0,0,0,0 monster Venatu 1678,65,5000,0,0
-juperos_02,0,0,0,0 monster Venatu 1679,50,5000,0,0
+juperos_01,100,180,60,70 monster Venatu 1679,15,300000,0,1
+juperos_01,100,180,60,70 monster Venatu 1676,25,300000,0,1
+juperos_01,100,180,60,70 monster Venatu 1677,20,300000,0,1
+juperos_01,100,180,60,70 monster Venatu 1678,25,300000,0,1
+juperos_01,192,132,60,80 monster Venatu 1679,35,300000,0,1
+juperos_01,192,132,60,80 monster Venatu 1676,45,300000,0,1
+juperos_01,192,132,60,80 monster Venatu 1677,50,300000,0,1
+juperos_01,192,132,60,80 monster Venatu 1678,45,300000,0,1
+juperos_01,0,0,0,0 monster Dimik 1670,5,0,0,1
+juperos_01,0,0,0,0 monster Dimik 1671,5,0,0,1
+juperos_01,0,0,0,0 monster Dimik 1672,5,0,0,1
+juperos_01,0,0,0,0 monster Dimik 1673,5,0,0,1
+juperos_01,232,202,25,25 monster Dimik 1670,5,420000,0,0
-//==================================================
-// jupe_core - Center of Juperos
-//==================================================
-jupe_core,0,0,0,0 monster Dimik 1670,40,5000,0,0
-jupe_core,0,0,0,0 monster Dimik 1671,40,5000,0,0
-jupe_core,0,0,0,0 monster Dimik 1672,40,5000,0,0
-jupe_core,0,0,0,0 monster Dimik 1673,40,5000,0,0
-jupe_core,0,0,0,0 monster Archdam 1668,40,5000,0,0
-jupe_core,0,0,0,0 monster Venatu 1676,25,5000,0,0
-jupe_core,0,0,0,0 monster Venatu 1677,25,5000,0,0
-jupe_core,0,0,0,0 monster Venatu 1678,25,5000,0,0
+//========================================================================================
+// - Juperos 02
+//========================================================================================
+
+juperos_02,0,0,0,0 monster Venatu 1679,50,0,0,1
+juperos_02,0,0,0,0 monster Venatu 1676,65,0,0,1
+juperos_02,0,0,0,0 monster Venatu 1677,65,0,0,1
+juperos_02,0,0,0,0 monster Venatu 1678,65,0,0,1
+juperos_02,0,0,0,0 monster Apocalypse 1365,70,0,0,1
+
+//========================================================================================
+// - Juperos Core
+//========================================================================================
+
+jupe_core,0,0,0,0 monster Venatu 1676,25,0,0,1
+jupe_core,0,0,0,0 monster Venatu 1677,25,0,0,1
+jupe_core,0,0,0,0 monster Venatu 1678,25,0,0,1
+jupe_core,0,0,0,0 monster Dimik 1670,40,0,0,1
+jupe_core,0,0,0,0 monster Dimik 1671,40,0,0,1
+jupe_core,0,0,0,0 monster Dimik 1672,40,0,0,1
+jupe_core,0,0,0,0 monster Dimik 1673,40,0,0,1
+jupe_core,0,0,0,0 monster Archdam 1668,40,0,0,1
jupe_core,0,0,0,0 boss_monster Vesper 1685,1,7200000,600000,1
diff --git a/npc/pre-re/mobs/dungeons/kh_dun.txt b/npc/pre-re/mobs/dungeons/kh_dun.txt
index 9965585dd..1960a958a 100644
--- a/npc/pre-re/mobs/dungeons/kh_dun.txt
+++ b/npc/pre-re/mobs/dungeons/kh_dun.txt
@@ -14,40 +14,9 @@
//============================================================
//==================================================
-// kh_dun01 - Robot Factory level 1
+// kh_kiehl01
//==================================================
-kh_dun01,0,0,0,0 monster Aliza 1737,45,5000,0,0
-kh_dun01,0,0,0,0 monster Alice 1275,25,5000,0,0
-kh_dun01,0,0,0,0 monster Constant 1738,8,5000,0,0
-kh_dun01,0,0,0,0 monster Constant 1745,5,5000,0,0
-kh_dun01,0,0,0,0 monster Alicel 1735,3,5000,0,0
-kh_dun01,0,0,0,0 monster Aliot 1736,3,5000,0,0
-
-//==================================================
-// kh_dun02 - Robot Factory level 2
-//==================================================
-kh_dun02,0,0,0,0 monster Alicel 1735,30,5000,0,0
-kh_dun02,0,0,0,0 monster Aliot 1736,25,5000,0,0
-kh_dun02,0,0,0,0 monster Constant 1738,15,5000,0,0
-kh_dun02,0,0,0,0 monster Aliza 1737,10,5000,0,0
-kh_dun02,0,0,0,0 monster Constant 1745,5,5000,0,0
-kh_dun02,0,0,0,0 boss_monster Kiel D-01 1734,1,7200000,600000,0
-
-//==================================================
-// kh_kiehl01 - Kiehl's Room
-//==================================================
-kh_kiehl01,0,0,0,0 monster Constant 1745,10,5000,0,0
-kh_kiehl01,67,171,5,5 monster Aliot 1740,1,180000,120000,0
-kh_kiehl01,67,171,5,5 monster Aliot 1736,1,180000,120000,0
-kh_kiehl01,85,154,3,3 monster Alicel 1739,1,180000,120000,0
-kh_kiehl01,85,154,3,3 monster Aliot 1740,1,180000,120000,0
-kh_kiehl01,106,154,3,3 monster Aliza 1746,1,180000,120000,0
-kh_kiehl01,122,155,3,3 monster Aliot 1740,1,180000,120000,0
-kh_kiehl01,122,155,3,3 monster Aliot 1736,1,180000,120000,0
-kh_kiehl01,122,155,3,3 monster Alicel 1739,1,180000,120000,0
-kh_kiehl01,32,124,3,3 monster Aliot 1740,1,180000,120000,0
-kh_kiehl01,37,110,3,3 monster Alicel 1735,1,180000,120000,0
-kh_kiehl01,37,110,3,3 monster Alicel 1739,1,180000,120000,0
+kh_kiehl01,0,0,0,0 monster Constant 1745,10,0,0,0
kh_kiehl01,80,22,3,3 monster Aliot 1740,1,180000,120000,0
kh_kiehl01,105,40,3,3 monster Aliza 1746,1,180000,120000,0
kh_kiehl01,105,40,3,3 monster Aliza 1737,1,180000,120000,0
@@ -56,4 +25,38 @@ kh_kiehl01,173,90,3,3 monster Aliot 1740,1,180000,120000,0
kh_kiehl01,156,101,3,3 monster Aliza 1746,1,180000,120000,0
kh_kiehl01,128,102,3,3 monster Alicel 1739,1,180000,120000,0
kh_kiehl01,128,102,3,3 monster Aliot 1740,1,180000,120000,0
+kh_kiehl01,37,110,3,3 monster Alicel 1739,1,180000,120000,0
+kh_kiehl01,37,110,3,3 monster Alicel 1735,1,180000,120000,0
+kh_kiehl01,32,124,3,3 monster Aliot 1740,1,180000,120000,0
+kh_kiehl01,67,171,5,5 monster Aliot 1740,1,180000,120000,0
+kh_kiehl01,67,171,5,5 monster Aliot 1736,1,180000,120000,0
+kh_kiehl01,85,154,3,3 monster Alicel 1739,1,180000,120000,0
+kh_kiehl01,85,154,3,3 monster Aliot 1740,1,180000,120000,0
+kh_kiehl01,106,154,3,3 monster Aliza 1746,1,180000,120000,0
+kh_kiehl01,122,155,3,3 monster Aliot 1740,1,180000,120000,0
+kh_kiehl01,122,155,3,3 monster Aliot 1736,1,180000,120000,0
+kh_kiehl01,122,155,3,3 monster Alicel 1739,1,180000,120000,0
kh_kiehl01,122,155,3,3 monster Aliza 1746,1,180000,120000,0
+
+//==================================================
+// kh_dun01 - Machine doll factory, 1st floor
+//==================================================
+kh_dun01,83,179,70,40 monster Alice 1275,9,1800000,1200000,0
+kh_dun01,83,179,30,20 monster Aliza 1737,15,300000,240000,0
+kh_dun01,83,179,70,40 monster Constant 1738,3,0,0,0
+kh_dun01,120,104,105,80 monster Alice 1275,16,1800000,1200000,0
+kh_dun01,120,104,105,80 monster Aliza 1737,30,300000,240000,0
+kh_dun01,120,104,105,80 monster Constant 1738,5,0,0,0
+kh_dun01,0,0,0,0 monster Constant 1745,5,0,0,0
+kh_dun01,0,0,0,0 monster Aliot 1736,3,600000,300000,0
+kh_dun01,0,0,0,0 monster Alicel 1735,3,600000,300000,0
+
+//==================================================
+// kh_dun02 - Machine doll factory, 2nd floor
+//==================================================
+kh_dun02,0,0,0,0 monster Aliot 1736,25,0,0,0
+kh_dun02,0,0,0,0 monster Alicel 1735,30,0,0,0
+kh_dun02,0,0,0,0 monster Aliza 1737,10,0,0,0
+kh_dun02,0,0,0,0 monster Constant 1738,15,1800000,1200000,0
+kh_dun02,0,0,0,0 monster Constant 1745,5,0,0,0
+kh_dun02,0,0,0,0 boss_monster Kiel D-01 1734,1,7200000,3600000,0
diff --git a/npc/pre-re/mobs/dungeons/lhz_dun.txt b/npc/pre-re/mobs/dungeons/lhz_dun.txt
index cc0a53f16..58e079138 100644
--- a/npc/pre-re/mobs/dungeons/lhz_dun.txt
+++ b/npc/pre-re/mobs/dungeons/lhz_dun.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
// The Prometheus Project, rAthena dev team
//===== Current Version: =====================================
-//= 1.9a
+//= 1.8
//===== Compatible With: =====================================
//= Any Athena
//===== Additional Comments: =================================
@@ -21,87 +21,291 @@
//= - Expandeded timer to allow for varying spawn times.
//= 1.7a Added dummy event to keep from causnig warnings. [L0ne_W0lf]
//= 1.8 Corrected MVP spawn variance (Labs2 MVP). [L0ne_W0lf]
-//= 1.9 Added Bio4 spawns. [Chilly]
-//= 1.9a Moved Bio4 spawns to separate file. [Kenpachi]
//============================================================
-//==================================================
-// lhz_dun01 - Somatology Laboratory
-//==================================================
-lhz_dun01,0,0,0,0 monster Remover 1682,100,5000,0,0
-lhz_dun01,0,0,0,0 monster Anopheles 1627,70,5000,0,0
-lhz_dun01,0,0,0,0 monster Metaling 1613,50,5000,0,0
-lhz_dun01,0,0,0,0 monster Kavach Icarus 1656,13,5000,0,0
-lhz_dun01,0,0,0,0 monster Errende Ebecee 1655,13,5000,0,0
-lhz_dun01,0,0,0,0 monster Laurell Weinder 1657,11,5000,0,0
-lhz_dun01,0,0,0,0 monster Wickebine Tres 1653,11,5000,0,0
-lhz_dun01,0,0,0,0 monster Armeyer Dinze 1654,8,5000,0,0
-lhz_dun01,0,0,0,0 monster Egnigem Cenia 1652,8,5000,0,0
-lhz_dun01,0,0,0,0 monster Gemini-S58 1681,1,5000,0,0
-
-//==================================================
-// lhz_dun02 - Somatology Laboratory
-//==================================================
-lhz_dun02,0,0,0,0 monster Laurell Weinder 1657,50,5000,0,0
-lhz_dun02,0,0,0,0 monster Wickebine Tres 1653,50,5000,0,0
-lhz_dun02,0,0,0,0 monster Kavach Icarus 1656,50,5000,0,0
-lhz_dun02,0,0,0,0 monster Errende Ebecee 1655,50,5000,0,0
-lhz_dun02,0,0,0,0 monster Egnigem Cenia 1652,50,5000,0,0
-lhz_dun02,0,0,0,0 monster Armeyer Dinze 1654,50,5000,0,0
-lhz_dun02,0,0,0,0 monster Remover 1682,20,5000,0,0
-lhz_dun02,0,0,0,0 monster Gemini-S58 1681,10,5000,0,0
-lhz_dun02,0,0,0,0 monster Eremes Guile 1635,1,5000,0,0
+
+//========================================================================================
+// lhz_dun01 - Bio-life Labs 1F
+//========================================================================================
+
+lhz_dun01,0,0,0,0 monster Metaling 1613,50,0,0,0
+lhz_dun01,0,0,0,0 monster Anopheles 1627,70,0,0,0
+lhz_dun01,0,0,0,0 monster Remover 1682,100,0,0,0
+lhz_dun01,0,0,0,0 monster Egnigem Cenia 1652,1,0,0,0
+lhz_dun01,0,0,0,0 monster Wickebine Tres 1653,1,0,0,0
+lhz_dun01,0,0,0,0 monster Armeyer Dinze 1654,1,0,0,0
+lhz_dun01,0,0,0,0 monster Errende Ebecee 1655,1,0,0,0
+lhz_dun01,0,0,0,0 monster Kavach Icarus 1656,1,0,0,0
+lhz_dun01,0,0,0,0 monster Laurell Weinder 1657,1,0,0,0
+lhz_dun01,150,50,16,18 monster Egnigem Cenia 1652,1,900000,800000,1
+lhz_dun01,150,50,16,18 monster Wickebine Tres 1653,1,900000,800000,1
+lhz_dun01,150,50,16,18 monster Armeyer Dinze 1654,1,900000,800000,1
+lhz_dun01,150,50,16,18 monster Errende Ebecee 1655,5,900000,800000,1
+lhz_dun01,150,50,16,18 monster Kavach Icarus 1656,5,600000,300000,1
+lhz_dun01,150,50,16,18 monster Laurell Weinder 1657,5,600000,300000,1
+lhz_dun01,250,150,18,30 monster Egnigem Cenia 1652,4,900000,800000,1
+lhz_dun01,250,150,18,30 monster Wickebine Tres 1653,4,600000,300000,1
+lhz_dun01,250,150,18,30 monster Armeyer Dinze 1654,4,900000,800000,1
+lhz_dun01,250,150,18,30 monster Errende Ebecee 1655,2,900000,800000,1
+lhz_dun01,250,150,18,30 monster Kavach Icarus 1656,2,900000,800000,1
+lhz_dun01,250,150,18,30 monster Laurell Weinder 1657,2,600000,300000,1
+lhz_dun01,50,150,11,35 monster Egnigem Cenia 1652,1,600000,300000,1
+lhz_dun01,50,150,11,35 monster Wickebine Tres 1653,4,900000,800000,1
+lhz_dun01,50,150,11,35 monster Armeyer Dinze 1654,1,900000,800000,1
+lhz_dun01,50,150,11,35 monster Errende Ebecee 1655,4,900000,800000,1
+lhz_dun01,50,150,11,35 monster Kavach Icarus 1656,4,900000,800000,1
+lhz_dun01,50,150,11,35 monster Laurell Weinder 1657,2,600000,300000,1
+lhz_dun01,192,61,18,30 monster Egnigem Cenia 1652,1,900000,800000,1
+lhz_dun01,192,61,18,30 monster Wickebine Tres 1653,1,900000,800000,1
+lhz_dun01,192,61,18,30 monster Armeyer Dinze 1654,1,900000,800000,1
+lhz_dun01,192,61,18,30 monster Errende Ebecee 1655,1,900000,800000,1
+lhz_dun01,192,61,18,30 monster Kavach Icarus 1656,1,900000,800000,1
+lhz_dun01,192,61,18,30 monster Laurell Weinder 1657,1,900000,800000,1
+lhz_dun01,0,0,0,0 monster Gemini-S58 1681,1,7200000,5400000,0
+
+//========================================================================================
+// lhz_dun02 - Bio-life Labs 2F
+//========================================================================================
+
+lhz_dun02,0,0,0,0 monster Egnigem Cenia 1652,26,0,0,0
+lhz_dun02,0,0,0,0 monster Wickebine Tres 1653,26,0,0,0
+lhz_dun02,0,0,0,0 monster Armeyer Dinze 1654,26,0,0,0
+lhz_dun02,0,0,0,0 monster Errende Ebecee 1655,26,0,0,0
+lhz_dun02,0,0,0,0 monster Kavach Icarus 1656,26,0,0,0
+lhz_dun02,0,0,0,0 monster Laurell Weinder 1657,26,0,0,0
+lhz_dun02,150,150,56,54 monster Egnigem Cenia 1652,4,120000,60000,1
+lhz_dun02,150,150,56,54 monster Wickebine Tres 1653,4,120000,60000,1
+lhz_dun02,150,150,56,54 monster Armeyer Dinze 1654,4,120000,60000,1
+lhz_dun02,150,150,56,54 monster Errende Ebecee 1655,4,120000,60000,1
+lhz_dun02,150,150,56,54 monster Kavach Icarus 1656,4,120000,60000,1
+lhz_dun02,150,150,56,54 monster Laurell Weinder 1657,4,120000,60000,1
+lhz_dun02,150,150,105,90 monster Egnigem Cenia 1652,10,120000,60000,1
+lhz_dun02,150,150,105,90 monster Wickebine Tres 1653,10,120000,60000,1
+lhz_dun02,150,150,105,90 monster Armeyer Dinze 1654,10,120000,60000,1
+lhz_dun02,150,150,105,90 monster Errende Ebecee 1655,10,120000,60000,1
+lhz_dun02,150,150,105,90 monster Kavach Icarus 1656,10,120000,60000,1
+lhz_dun02,150,150,105,90 monster Laurell Weinder 1657,10,120000,60000,1
+lhz_dun02,0,0,0,0 monster Egnigem Cenia 1652,10,300000,150000,1
+lhz_dun02,0,0,0,0 monster Wickebine Tres 1653,10,300000,150000,1
+lhz_dun02,0,0,0,0 monster Armeyer Dinze 1654,10,300000,150000,1
+lhz_dun02,0,0,0,0 monster Errende Ebecee 1655,10,300000,150000,1
+lhz_dun02,0,0,0,0 monster Kavach Icarus 1656,10,300000,150000,1
+lhz_dun02,0,0,0,0 monster Laurell Weinder 1657,10,300000,150000,1
+lhz_dun02,0,0,0,0 monster Remover 1682,20,300000,150000,1
+lhz_dun02,0,0,0,0 monster Eremes Guile 1635,1,180000,120000,0
+lhz_dun02,0,0,0,0 monster Gemini-S58 1681,10,5400000,180000,0
lhz_dun02,0,0,0,0 boss_monster Egnigem Cenia 1658,1,7200000,600000,1
-//==================================================
-// lhz_dun03 - Somatology Laboratory
-//==================================================
-lhz_dun03,0,0,0,0 monster Cecil Damon 1638,81,5000,0,0
-lhz_dun03,0,0,0,0 monster Kathryne Keyron 1639,57,5000,0,0
-lhz_dun03,0,0,0,0 monster Margaretha Sorin 1637,42,5000,0,0
-lhz_dun03,0,0,0,0 monster Howard Alt-Eisen 1636,42,5000,0,0
-lhz_dun03,0,0,0,0 monster Eremes Guile 1635,42,5000,0,0
-lhz_dun03,0,0,0,0 monster Seyren Windsor 1634,42,5000,0,0
-lhz_dun03,139,158,20,11 monster Assassin Cross Eremes 1641,1,2580000,2340000,1
-lhz_dun03,138,138,36,34 monster High Wizard Kathryne 1645,1,2580000,2460000,1
+//========================================================================================
+// lhz_dun03 - Bio-life Labs 3F
+//========================================================================================
+
+lhz_dun03,140,235,116,30 monster Seyren Windsor 1634,4,180000,120000,0
+lhz_dun03,140,235,116,30 monster Eremes Guile 1635,4,180000,120000,0
+lhz_dun03,140,235,116,30 monster Howard Alt-Eisen 1636,4,180000,120000,0
+lhz_dun03,140,235,116,30 monster Margaretha Sorin 1637,4,180000,120000,0
+lhz_dun03,140,235,116,30 monster Cecil Damon 1638,4,180000,120000,0
+lhz_dun03,140,235,116,30 monster Kathryne Keyron 1639,4,180000,120000,0
+
+lhz_dun03,40,214,16,16 monster Seyren Windsor 1634,1,120000,60000,0
+lhz_dun03,40,214,16,16 monster Eremes Guile 1635,1,120000,60000,0
+lhz_dun03,40,214,16,16 monster Howard Alt-Eisen 1636,1,120000,60000,0
+lhz_dun03,40,214,16,16 monster Margaretha Sorin 1637,1,120000,60000,0
+lhz_dun03,40,214,16,16 monster Cecil Damon 1638,1,120000,60000,0
+lhz_dun03,40,214,16,16 monster Kathryne Keyron 1639,1,120000,60000,0
+
+lhz_dun03,240,213,16,17 monster Seyren Windsor 1634,1,120000,60000,0
+lhz_dun03,240,213,16,17 monster Eremes Guile 1635,1,120000,60000,0
+lhz_dun03,240,213,16,17 monster Howard Alt-Eisen 1636,1,120000,60000,0
+lhz_dun03,240,213,16,17 monster Margaretha Sorin 1637,1,120000,60000,0
+lhz_dun03,240,213,16,17 monster Cecil Damon 1638,1,120000,60000,0
+lhz_dun03,240,213,16,17 monster Kathryne Keyron 1639,1,120000,60000,0
+
+lhz_dun03,140,65,108,38 monster Seyren Windsor 1634,7,120000,160000,0
+lhz_dun03,140,65,108,38 monster Eremes Guile 1635,7,120000,160000,0
+lhz_dun03,140,65,108,38 monster Howard Alt-Eisen 1636,7,120000,160000,0
+lhz_dun03,140,65,108,38 monster Margaretha Sorin 1637,7,120000,160000,0
+lhz_dun03,140,65,108,38 monster Cecil Damon 1638,7,120000,60000,0
+lhz_dun03,140,65,108,38 monster Kathryne Keyron 1639,7,120000,60000,0
+
+lhz_dun03,140,31,8,15 monster Seyren Windsor 1634,1,600000,540000,0
+lhz_dun03,140,31,8,15 monster Eremes Guile 1635,1,540000,480000,0
+lhz_dun03,140,31,8,15 monster Howard Alt-Eisen 1636,1,600000,540000,0
+lhz_dun03,140,31,8,15 monster Margaretha Sorin 1637,1,540000,480000,0
+lhz_dun03,140,31,8,15 monster Cecil Damon 1638,1,600000,540000,0
+lhz_dun03,140,31,8,15 monster Kathryne Keyron 1639,1,540000,480000,0
+
+lhz_dun03,40,66,16,16 monster Seyren Windsor 1634,1,120000,60000,0
+lhz_dun03,40,66,16,16 monster Eremes Guile 1635,1,120000,60000,0
+lhz_dun03,40,66,16,16 monster Howard Alt-Eisen 1636,1,120000,60000,0
+lhz_dun03,40,66,16,16 monster Margaretha Sorin 1637,1,120000,60000,0
+lhz_dun03,40,66,16,16 monster Cecil Damon 1638,1,120000,60000,0
+lhz_dun03,40,66,16,16 monster Kathryne Keyron 1639,1,120000,60000,0
+
+lhz_dun03,240,66,16,16 monster Seyren Windsor 1634,1,120000,60000,0
+lhz_dun03,240,66,16,16 monster Eremes Guile 1635,1,120000,60000,0
+lhz_dun03,240,66,16,16 monster Howard Alt-Eisen 1636,1,120000,60000,0
+lhz_dun03,240,66,16,16 monster Margaretha Sorin 1637,1,120000,60000,0
+lhz_dun03,240,66,16,16 monster Cecil Damon 1638,1,120000,60000,0
+lhz_dun03,240,66,16,16 monster Kathryne Keyron 1639,1,120000,60000,0
+
+lhz_dun03,54,131,35,39 monster Seyren Windsor 1634,5,180000,120000,0
+lhz_dun03,54,131,35,39 monster Eremes Guile 1635,5,180000,120000,0
+lhz_dun03,54,131,35,39 monster Howard Alt-Eisen 1636,5,180000,120000,0
+lhz_dun03,54,131,35,39 monster Margaretha Sorin 1637,5,180000,120000,0
+lhz_dun03,54,131,35,39 monster Cecil Damon 1638,5,120000,60000,0
+lhz_dun03,54,131,35,39 monster Kathryne Keyron 1639,5,120000,60000,0
+
+lhz_dun03,228,137,35,39 monster Seyren Windsor 1634,5,180000,120000,0
+lhz_dun03,228,137,35,39 monster Eremes Guile 1635,5,180000,120000,0
+lhz_dun03,228,137,35,39 monster Howard Alt-Eisen 1636,5,180000,120000,0
+lhz_dun03,228,137,35,39 monster Margaretha Sorin 1637,5,180000,120000,0
+lhz_dun03,228,137,35,39 monster Cecil Damon 1638,5,120000,60000,0
+lhz_dun03,228,137,35,39 monster Kathryne Keyron 1639,5,120000,60000,0
+
+lhz_dun03,138,138,36,34 monster Seyren Windsor 1634,3,120000,60000,0
+lhz_dun03,138,138,36,34 monster Eremes Guile 1635,3,120000,60000,0
+lhz_dun03,138,138,36,34 monster Howard Alt-Eisen 1636,3,120000,60000,0
+lhz_dun03,138,138,36,34 monster Margaretha Sorin 1637,3,180000,120000,0
+lhz_dun03,138,138,36,34 monster Cecil Damon 1638,4,0,0,0
+lhz_dun03,138,138,36,34 monster Kathryne Keyron 1639,4,0,0,0
+
+lhz_dun03,140,192,66,21 monster Seyren Windsor 1634,7,120000,60000,0
+lhz_dun03,140,192,66,21 monster Eremes Guile 1635,7,180000,120000,0
+lhz_dun03,140,192,66,21 monster Howard Alt-Eisen 1636,7,120000,60000,0
+lhz_dun03,140,192,66,21 monster Margaretha Sorin 1637,7,180000,120000,0
+lhz_dun03,140,192,66,21 monster Cecil Damon 1638,7,120000,60000,0
+lhz_dun03,140,192,66,21 monster Kathryne Keyron 1639,7,120000,60000,0
+
+lhz_dun03,89,164,4,8 monster Kathryne Keyron 1639,1,120000,60000,0
+lhz_dun03,89,164,4,8 monster Cecil Damon 1638,3,120000,60000,0
+lhz_dun03,107,167,4,5 monster Kathryne Keyron 1639,1,120000,60000,0
+lhz_dun03,107,167,4,5 monster Cecil Damon 1638,3,120000,60000,0
+lhz_dun03,171,167,4,5 monster Kathryne Keyron 1639,1,120000,60000,0
+lhz_dun03,171,167,4,5 monster Cecil Damon 1638,3,120000,60000,0
+lhz_dun03,189,164,4,8 monster Kathryne Keyron 1639,1,120000,60000,0
+lhz_dun03,189,164,4,8 monster Cecil Damon 1638,3,120000,60000,0
+lhz_dun03,89,113,4,9 monster Kathryne Keyron 1639,1,120000,60000,0
+lhz_dun03,89,113,4,9 monster Cecil Damon 1638,3,120000,60000,0
+lhz_dun03,107,109,4,5 monster Kathryne Keyron 1639,1,120000,60000,0
+lhz_dun03,107,109,4,5 monster Cecil Damon 1638,3,120000,60000,0
+lhz_dun03,171,109,4,5 monster Kathryne Keyron 1639,1,120000,60000,0
+lhz_dun03,171,109,4,5 monster Cecil Damon 1638,3,120000,60000,0
+lhz_dun03,189,113,4,9 monster Kathryne Keyron 1639,1,120000,60000,0
+lhz_dun03,189,113,4,9 monster Cecil Damon 1638,3,120000,60000,0
+
+lhz_dun03,96,164,13,8 monster Seyren Windsor 1634,2,300000,120000,0
+lhz_dun03,96,164,13,8 monster Eremes Guile 1635,2,300000,120000,0
+lhz_dun03,96,164,13,8 monster Margaretha Sorin 1637,2,300000,120000,0
+lhz_dun03,96,164,13,8 monster Cecil Damon 1638,5,0,0,0
+lhz_dun03,96,164,13,8 monster Kathryne Keyron 1639,3,0,0,0
+lhz_dun03,180,164,13,8 monster Seyren Windsor 1634,2,300000,120000,0
+lhz_dun03,180,164,13,8 monster Howard Alt-Eisen 1636,2,300000,120000,0
+lhz_dun03,180,164,13,8 monster Margaretha Sorin 1637,2,300000,120000,0
+lhz_dun03,180,164,13,8 monster Cecil Damon 1638,5,0,0,0
+lhz_dun03,180,164,13,8 monster Kathryne Keyron 1639,3,0,0,0
+lhz_dun03,98,113,13,9 monster Seyren Windsor 1634,2,300000,120000,0
+lhz_dun03,98,113,13,9 monster Eremes Guile 1635,2,300000,120000,0
+lhz_dun03,98,113,13,9 monster Howard Alt-Eisen 1636,2,300000,120000,0
+lhz_dun03,98,113,13,9 monster Cecil Damon 1638,5,0,0,0
+lhz_dun03,98,113,13,9 monster Kathryne Keyron 1639,3,0,0,0
+lhz_dun03,180,113,13,9 monster Eremes Guile 1635,2,300000,120000,0
+lhz_dun03,180,113,13,9 monster Howard Alt-Eisen 1636,2,300000,120000,0
+lhz_dun03,180,113,13,9 monster Margaretha Sorin 1637,2,300000,120000,0
+lhz_dun03,180,113,13,9 monster Cecil Damon 1638,5,0,0,0
+lhz_dun03,180,113,13,9 monster Kathryne Keyron 1639,3,0,0,0
+
lhz_dun03,114,138,12,16 monster Lord Knight Seyren 1640,1,2700000,2400000,1
-lhz_dun03,139,117,20,11 monster Sniper Cecil 1644,1,2700000,2500000,1
lhz_dun03,163,138,12,16 monster Whitesmith Howard 1642,1,3000000,2700000,1
+lhz_dun03,139,158,20,11 monster Assassin Cross Eremes 1641,1,2580000,2340000,1
+lhz_dun03,139,117,20,11 monster Sniper Cecil 1644,1,2700000,2500000,1
lhz_dun03,138,138,36,34 monster High Priest Margaretha 1643,1,3300000,3000000,1
+lhz_dun03,138,138,36,34 monster High Wizard Kathryne 1645,1,2580000,2460000,1
-lhz_dun03,0,0,0 script mvp_lhz_dun03 -1,{
-OnTimer6000000: // delay1 = 6000000 ms (100 min)
- stopnpctimer;
- sleep rand(0,30)*60000; // 0 to 30 minutes
+lhz_dun03,2,2,0 script summon_boss_lt -1,{
OnInit:
+ initnpctimer;
+ end;
+
+OnTimer6000000:
+ if (rand(1,6) == 1) {
+ donpcevent "summon_boss_lt::Onsummon";
+ stopnpctimer;
+ }
+ end;
+
+OnTimer6300000:
+ if (rand(1,6) == 2) {
+ donpcevent "summon_boss_lt::Onsummon";
+ stopnpctimer;
+ }
+ end;
+
+OnTimer6600000:
+ if (rand(1,6) == 3) {
+ donpcevent "summon_boss_lt::Onsummon";
+ stopnpctimer;
+ }
+ end;
+
+OnTimer6900000:
+ if (rand(1,6) == 4) {
+ donpcevent "summon_boss_lt::Onsummon";
+ stopnpctimer;
+ }
+ end;
+
+OnTimer7200000:
+ if (rand(1,6) == 5) {
+ donpcevent "summon_boss_lt::Onsummon";
+ stopnpctimer;
+ }
+ end;
+
+OnTimer7500000:
+ if (rand(1,6) == 6) {
+ donpcevent "summon_boss_lt::Onsummon";
+ stopnpctimer;
+ }
+ end;
+
+OnTimer7800000:
+ donpcevent "summon_boss_lt::Onsummon";
+ stopnpctimer;
+ end;
+
+Onsummon:
// Select Coordinates to summon a random MVP on
switch(rand(1,6)) {
- case 1: set .@x,140; set .@y,232; break;
- case 2: set .@x,75; set .@y,138; break;
- case 3: set .@x,140; set .@y,87; break;
- case 4: set .@x,205; set .@y,140; break;
- case 5: set .@x,123; set .@y,137; break;
- case 6: set .@x,175; set .@y,137; break;
+ case 1: set .@x,140; set .@y,232; break;
+ case 2: set .@x,75; set .@y,138; break;
+ case 3: set .@x,140; set .@y,87; break;
+ case 4: set .@x,205; set .@y,140; break;
+ case 5: set .@x,123; set .@y,137; break;
+ case 6: set .@x,175; set .@y,137; break;
}
set .@mob,rand(1646,1651);
- monster "lhz_dun03",.@x,.@y,strmobinfo(1,.@mob),.@mob,1,strnpcinfo(3)+"::OnMyMVPDead";
+ monster "lhz_dun03",.@x,.@y,strmobinfo(1,.@mob),.@mob,1,"summon_boss_lt::OnMyMvPDead";
// Select Coordinates to summon a random 99 on
switch(rand(1,6)) {
- case 1: set .@x2,183; set .@y2,97; break;
- case 2: set .@x2,97; set .@y2,96; break;
- case 3: set .@x2,47; set .@y2,139; break;
- case 4: set .@x2,231; set .@y2,140; break;
- case 5: set .@x2,139; set .@y2,211; break;
- case 6: set .@x2,139; set .@y2,259; break;
+ case 1: set .@x2,183; set .@y2,97; break;
+ case 2: set .@x2,97; set .@y2,96; break;
+ case 3: set .@x2,47; set .@y2,139; break;
+ case 4: set .@x2,231; set .@y2,140; break;
+ case 5: set .@x2,139; set .@y2,211; break;
+ case 6: set .@x2,139; set .@y2,259; break;
}
set .@mob2,rand(1640,1645);
- monster "lhz_dun03",.@x2,.@y2,strmobinfo(1,.@mob2),.@mob2,1,strnpcinfo(3)+"::OnMy99Dead";
+ monster "lhz_dun03",.@x2,.@y2,strmobinfo(1,.@mob2),.@mob2,1,"summon_boss_lt::OnMVP";
end;
-OnMyMVPDead:
- killmonster "lhz_dun03",strnpcinfo(3)+"::OnMy99Dead";
+OnMyMvPDead:
+ killmonster "lhz_dun03","summon_boss_lt::OnMVP";
initnpctimer;
-OnMy99Dead:
+ end;
+
+//Required to keep from erroring
+OnMVP:
end;
}
diff --git a/npc/pre-re/mobs/dungeons/lou_dun.txt b/npc/pre-re/mobs/dungeons/lou_dun.txt
index 46c40fa30..bc4a264dd 100644
--- a/npc/pre-re/mobs/dungeons/lou_dun.txt
+++ b/npc/pre-re/mobs/dungeons/lou_dun.txt
@@ -13,31 +13,31 @@
//============================================================
//==================================================
-// lou_dun01 - The Royal Tomb
+// lou_dun01 - The Royal Tomb
//==================================================
-lou_dun01,0,0,0,0 monster Jing Guai 1517,45,5000,0,0
-lou_dun01,0,0,0,0 monster Grizzly 1381,15,5000,0,0
-lou_dun01,0,0,0,0 monster Mi Gao 1516,15,5000,0,0
-lou_dun01,0,0,0,0 monster Horong 1129,15,5000,0,0
-lou_dun01,0,0,0,0 monster Side Winder 1037,10,5000,0,0
+lou_dun01,0,0,0,0 monster Horong 1129,15,0,0,0
+lou_dun01,0,0,0,0 monster Mi Gao 1516,15,0,0,0
+lou_dun01,215,159,40,80 monster Side Winder 1037,10,300000,120000,0
+lou_dun01,215,159,40,80 monster Jing Guai 1517,25,300000,120000,0
+lou_dun01,0,0,0,0 monster Jing Guai 1517,20,0,0,0
+lou_dun01,0,0,0,0 monster Grizzly 1381,15,0,0,0
lou_dun01,0,0,0,0 monster Leib Olmai 1306,1,300000,120000,0
-lou_dun01,197,77,10,10 monster Black Mushroom 1084,5,5000,0,0
-lou_dun01,0,0,0,0 monster Shining Plant 1083,5,5000,0,0
+lou_dun01,197,77,10,10 monster Black Mushroom 1084,5,0,0,0
+lou_dun01,0,0,0,0 monster Shining Plant 1083,5,0,0,0
//==================================================
// lou_dun02 - Inside the Royal Tomb
//==================================================
-lou_dun02,0,0,0,0 monster Yao Jun 1512,40,5000,0,0
-lou_dun02,0,0,0,0 monster Munak 1026,25,5000,0,0
-lou_dun02,0,0,0,0 monster Mimic 1191,5,5000,0,0
-lou_dun02,0,0,0,0 monster Zhu Po Long 1514,5,5000,0,0
+lou_dun02,0,0,0,0 monster Yao Jun 1512,40,300000,120000,0
+lou_dun02,0,0,0,0 monster Munak 1026,25,0,0,0
+lou_dun02,0,0,0,0 monster Zhu Po Long 1514,5,0,0,0
+lou_dun02,0,0,0,0 monster Mimic 1191,5,0,0,0
//==================================================
-// lou_dun03 - Suei Long Gon
+// lou_dun03 - Suei Long Gon
//==================================================
-lou_dun03,0,0,0,0 monster Zhu Po Long 1514,25,5000,0,0
-lou_dun03,0,0,0,0 monster Yao Jun 1512,25,5000,0,0
-lou_dun03,0,0,0,0 monster Mao Guai 1513,15,5000,0,0
-lou_dun03,0,0,0,0 monster Green Maiden 1631,5,5000,0,0
+lou_dun03,0,0,0,0 monster Yao Jun 1512,25,120000,60000,0
+lou_dun03,0,0,0,0 monster Zhu Po Long 1514,25,120000,60000,0
+lou_dun03,0,0,0,0 monster Mao Guai 1513,15,0,0,0
lou_dun03,0,0,0,0 monster Green Maiden 1631,5,3000000,1800000,1
lou_dun03,0,0,0,0 boss_monster White Lady 1630,1,7000000,600000,1
diff --git a/npc/pre-re/mobs/dungeons/mag_dun.txt b/npc/pre-re/mobs/dungeons/mag_dun.txt
index 7fce2de53..e568a0f54 100644
--- a/npc/pre-re/mobs/dungeons/mag_dun.txt
+++ b/npc/pre-re/mobs/dungeons/mag_dun.txt
@@ -13,20 +13,31 @@
//============================================================
//==================================================
-// mag_dun01 - Nogg Road
+// mag_dun01 - Nogg Road F1
//==================================================
-mag_dun01,0,0,0,0 monster Explosion 1383,30,5000,0,0
-mag_dun01,0,0,0,0 monster Lava Golem 1366,20,5000,0,0
-mag_dun01,0,0,0,0 monster Blazer 1367,20,5000,0,0
-mag_dun01,0,0,0,0 monster Kaho 1072,20,5000,0,0
-mag_dun01,0,0,0,0 monster Grizzly 1381,10,5000,0,0
+mag_dun01,0,0,0,0 monster Blazer 1367,20,0,0,0
+mag_dun01,0,0,0,0 monster Lava Golem 1366,20,600000,300000,0
+mag_dun01,0,0,0,0 monster Kaho 1072,20,0,0,0
+mag_dun01,0,0,0,0 monster Explosion 1383,30,0,0,0
+mag_dun01,0,0,0,0 monster Grizzly 1381,10,0,0,0
//==================================================
-// mag_dun02 - Nogg Road
+// mag_dun02 - Nogg Road F2
//==================================================
-mag_dun02,0,0,0,0 monster Nightmare Terror 1379,46,5000,0,0
-mag_dun02,0,0,0,0 monster Deleter 1385,40,5000,0,0
-mag_dun02,0,0,0,0 monster Deleter 1384,38,5000,0,0
-mag_dun02,0,0,0,0 monster Blazer 1367,20,5000,0,0
-mag_dun02,0,0,0,0 monster Diabolic 1382,15,5000,0,0
-mag_dun02,0,0,0,0 monster Gig 1387,10,5000,0,0
+mag_dun02,0,0,0,0 monster Gig 1387,10,0,0,0
+mag_dun02,0,0,0,0 monster Deleter 1384,25,0,0,0
+mag_dun02,0,0,0,0 monster Deleter 1385,25,0,0,0
+mag_dun02,0,0,0,0 monster Diabolic 1382,10,120000,30000,0
+mag_dun02,0,0,0,0 monster Nightmare Terror 1379,15,0,0,0
+mag_dun02,0,0,0,0 monster Nightmare Terror 1379,10,60000,30000,0
+mag_dun02,110,190,50,20 monster Blazer 1367,5,300000,150000,0
+mag_dun02,110,190,50,20 monster Nightmare Terror 1379,4,180000,150000,0
+mag_dun02,200,120,40,40 monster Blazer 1367,15,300000,150000,0
+mag_dun02,103,102,58,59 monster Nightmare Terror 1379,10,300000,150000,0
+mag_dun02,120,202,20,20 monster Deleter 1384,3,300000,150000,0
+mag_dun02,184,170,43,55 monster Deleter 1384,7,300000,150000,0
+mag_dun02,184,170,43,55 monster Deleter 1385,10,300000,150000,0
+mag_dun02,184,170,43,55 monster Nightmare Terror 1379,7,300000,150000,0
+mag_dun02,197,59,50,37 monster Deleter 1384,3,300000,150000,0
+mag_dun02,197,59,50,37 monster Deleter 1385,5,300000,150000,0
+mag_dun02,197,59,50,37 monster Diabolic 1382,5,300000,30000,0
diff --git a/npc/pre-re/mobs/dungeons/mjo_dun.txt b/npc/pre-re/mobs/dungeons/mjo_dun.txt
index 435678446..12a0e9dee 100644
--- a/npc/pre-re/mobs/dungeons/mjo_dun.txt
+++ b/npc/pre-re/mobs/dungeons/mjo_dun.txt
@@ -11,25 +11,26 @@
//============================================================
//==================================================
-// mjo_dun01 - Mjolnir Dead Pit
+// mjo_dun01 - Mjolnir Dead Pit F1
//==================================================
-mjo_dun01,0,0,0,0 monster Tarou 1175,60,5000,0,0
-mjo_dun01,0,0,0,0 monster Familiar 1005,30,5000,0,0
-mjo_dun01,0,0,0,0 monster Martin 1145,20,5000,0,0
+mjo_dun01,0,0,0,0 monster Familiar 1005,30,0,0,0
+mjo_dun01,0,0,0,0 monster Tarou 1175,60,0,0,0
+mjo_dun01,0,0,0,0 monster Martin 1145,20,0,0,0
//==================================================
-// mjo_dun02 - Mjolnir Dead Pit
+// mjo_dun02 - Mjolnir Dead Pit F2
//==================================================
-mjo_dun02,0,0,0,0 monster Martin 1145,60,5000,0,0
-mjo_dun02,0,0,0,0 monster Giearth 1121,35,5000,0,0
-mjo_dun02,0,0,0,0 monster Drainliar 1111,20,5000,0,0
-mjo_dun02,0,0,0,0 monster Skeleton Worker 1169,20,5000,0,0
+mjo_dun02,0,0,0,0 monster Martin 1145,60,0,0,0
+mjo_dun02,0,0,0,0 monster Drainliar 1111,20,0,0,0
+mjo_dun02,0,0,0,0 monster Skeleton Worker 1169,20,0,0,0
+mjo_dun02,0,0,0,0 monster Giearth 1121,35,30000,10000,0
//==================================================
-// mjo_dun03 - Mjolnir Dead Pit
+// mjo_dun03 - Mjolnir Dead Pit F3
//==================================================
-mjo_dun03,0,0,0,0 monster Skeleton Worker 1169,70,5000,0,0
-mjo_dun03,0,0,0,0 monster Myst 1151,35,5000,0,0
-mjo_dun03,0,0,0,0 monster Giearth 1121,5,5000,0,0
-mjo_dun03,0,0,0,0 monster Martin 1145,5,5000,0,0
-mjo_dun03,0,0,0,0 monster Cramp 1209,3,5000,0,0
+mjo_dun03,0,0,0,0 monster Martin 1145,5,0,0,0
+mjo_dun03,0,0,0,0 monster Skeleton Worker 1169,70,0,0,0
+mjo_dun03,0,0,0,0 monster Giearth 1121,5,0,0,0
+mjo_dun03,0,0,0,0 monster Myst 1151,35,0,0,0
+mjo_dun03,0,0,0,0 monster Cramp 1209,2,300000,150000,0
+mjo_dun03,0,0,0,0 monster Cramp 1209,1,50000,25000,0
diff --git a/npc/pre-re/mobs/dungeons/moc_pryd.txt b/npc/pre-re/mobs/dungeons/moc_pryd.txt
index e082fec52..4a8bf8e0b 100644
--- a/npc/pre-re/mobs/dungeons/moc_pryd.txt
+++ b/npc/pre-re/mobs/dungeons/moc_pryd.txt
@@ -13,52 +13,52 @@
//============================================================
//==================================================
-// moc_pryd01 - Inside Pyramid
+// moc_pryd01 - Inside Pyramid F1
//==================================================
-moc_pryd01,0,0,0,0 monster Familiar 1005,50,5000,0,0
-moc_pryd01,0,0,0,0 monster Poporing 1031,20,5000,0,0
+moc_pryd01,0,0,0,0 monster Familiar 1005,50,0,0,0
+moc_pryd01,0,0,0,0 monster Poporing 1031,20,0,0,0
//==================================================
-// moc_pryd02 - Inside Pyramid
+// moc_pryd02 - Inside Pyramid F2
//==================================================
-moc_pryd02,0,0,0,0 monster Mummy 1041,30,5000,0,0
-moc_pryd02,0,0,0,0 monster Soldier Skeleton 1028,30,5000,0,0
-moc_pryd02,0,0,0,0 monster Archer Skeleton 1016,30,5000,0,0
-moc_pryd02,0,0,0,0 monster Drainliar 1111,20,5000,0,0
-moc_pryd02,0,0,0,0 monster Poporing 1031,20,5000,0,0
-moc_pryd02,0,0,0,0 monster Isis 1029,5,5000,0,0
+moc_pryd02,0,0,0,0 monster Poporing 1031,20,0,0,0
+moc_pryd02,0,0,0,0 monster Drainliar 1111,20,0,0,0
+moc_pryd02,0,0,0,0 monster Mummy 1041,30,0,0,0
+moc_pryd02,0,0,0,0 monster Isis 1029,5,0,0,0
+moc_pryd02,0,0,0,0 monster Soldier Skeleton 1028,30,0,0,0
+moc_pryd02,0,0,0,0 monster Archer Skeleton 1016,30,0,0,0
//==================================================
-// moc_pryd03 - Inside Pyramid
+// moc_pryd03 - Inside Pyramid F3
//==================================================
-moc_pryd03,0,0,0,0 monster Mummy 1041,70,5000,0,0
-moc_pryd03,0,0,0,0 monster Verit 1032,20,5000,0,0
-moc_pryd03,0,0,0,0 monster Matyr 1146,10,5000,0,0
-moc_pryd03,0,0,0,0 monster Drainliar 1111,5,5000,0,0
-moc_pryd03,0,0,0,0 monster Mimic 1191,5,5000,0,0
+moc_pryd03,0,0,0,0 monster Drainliar 1111,5,0,0,0
+moc_pryd03,0,0,0,0 monster Mimic 1191,5,0,0,0
+moc_pryd03,0,0,0,0 monster Matyr 1146,10,0,0,0
+moc_pryd03,0,0,0,0 monster Mummy 1041,70,0,0,0
+moc_pryd03,0,0,0,0 monster Verit 1032,20,600000,300000,1
//==================================================
-// moc_pryd04 - Inside Pyramid
+// moc_pryd04 - Inside Pyramid F4
//==================================================
-moc_pryd04,0,0,0,0 monster Isis 1029,50,5000,0,0
-moc_pryd04,0,0,0,0 monster Mummy 1041,25,5000,0,0
-moc_pryd04,0,0,0,0 monster Matyr 1146,20,5000,0,0
-moc_pryd04,0,0,0,0 monster Mimic 1191,15,5000,0,0
-moc_pryd04,0,0,0,0 monster Ancient Mummy 1297,3,5000,0,0
+moc_pryd04,0,0,0,0 monster Mummy 1041,25,0,0,0
+moc_pryd04,0,0,0,0 monster Ancient Mummy 1297,3,0,0,0
+moc_pryd04,0,0,0,0 monster Isis 1029,50,150000,75000,0
+moc_pryd04,0,0,0,0 monster Mimic 1191,15,600000,300000,1
moc_pryd04,0,0,0,0 boss_monster Osiris 1038,1,3600000,600000,0
+moc_pryd04,0,0,0,0 monster Matyr 1146,20,0,0,0
//==================================================
-// moc_pryd05 - Inside Pyramid
+// moc_pryd05 - Inside Pyramid B1
//==================================================
-moc_pryd05,0,0,0,0 monster Minorous 1149,60,5000,0,0
-moc_pryd05,0,0,0,0 monster Verit 1032,50,5000,0,0
-moc_pryd05,0,0,0,0 monster Mummy 1041,10,5000,0,0
+moc_pryd05,0,0,0,0 monster Minorous 1149,60,0,0,0
+moc_pryd05,0,0,0,0 monster Mummy 1041,10,0,0,0
+moc_pryd05,0,0,0,0 monster Verit 1032,50,0,0,0
//==================================================
-// moc_pryd06 - Inside Pyramid
+// moc_pryd06 - Inside Pyramid B2
//==================================================
-moc_pryd06,0,0,0,0 monster Mimic 1191,30,5000,0,0
-moc_pryd06,0,0,0,0 monster Verit 1032,30,5000,0,0
-moc_pryd06,0,0,0,0 monster Arclouze 1194,20,5000,0,0
-moc_pryd06,0,0,0,0 monster Ancient Mummy 1297,20,5000,0,0
+moc_pryd06,0,0,0,0 monster Verit 1032,10,0,0,0
+moc_pryd06,0,0,0,0 monster Arclouze 1194,20,0,0,0
+moc_pryd06,100,90,80,50 monster Ancient Mummy 1297,20,0,0,0
+moc_pryd06,100,90,80,50 monster Mimic 1191,20,0,0,0
moc_pryd06,102,85,1,1 boss_monster Amon Ra 1511,1,3600000,600000,0
diff --git a/npc/pre-re/mobs/dungeons/mosk_dun.txt b/npc/pre-re/mobs/dungeons/mosk_dun.txt
index b340ccb12..d3c416948 100644
--- a/npc/pre-re/mobs/dungeons/mosk_dun.txt
+++ b/npc/pre-re/mobs/dungeons/mosk_dun.txt
@@ -14,28 +14,36 @@
//============================================================
//==================================================
-// mosk_dun01 - Les Forest
+// mosk_dun01 - Moscovia Dungeon 1
//==================================================
-mosk_dun01,0,0,0,0 monster Wood Goblin 1880,66,5000,0,0
-mosk_dun01,0,0,0,0 monster Les 1881,33,5000,0,0
-mosk_dun01,0,0,0,0 monster Poporing 1031,20,5000,0,0
-mosk_dun01,0,0,0,0 monster Mantis 1139,10,5000,0,0
+mosk_dun01,64,236,100,100 monster Wood Goblin 1880,15,10000,0,1
+mosk_dun01,64,236,100,100 monster Les 1881,7,10000,0,1
+mosk_dun01,99,162,100,100 monster Wood Goblin 1880,15,10000,0,1
+mosk_dun01,99,162,100,100 monster Les 1881,7,10000,0,1
+mosk_dun01,150,80,100,5 monster Wood Goblin 1880,30,10000,0,1
+mosk_dun01,150,80,100,5 monster Les 1881,15,10000,0,1
+mosk_dun01,241,177,10,10 monster Wood Goblin 1880,3,10000,0,1
+mosk_dun01,241,177,10,10 monster Les 1881,2,10000,0,1
+mosk_dun01,198,223,10,10 monster Wood Goblin 1880,3,10000,0,1
+mosk_dun01,198,223,10,10 monster Les 1881,2,10000,0,1
+mosk_dun01,0,0,0,0 monster Poporing 1031,20,10000,0,1
+mosk_dun01,0,0,0,0 monster Mantis 1139,10,20000,0,0
//==================================================
-// mosk_dun02 - Temny Forest
+// mosk_dun02 - Moscovia Dungeon 2
//==================================================
-mosk_dun02,0,0,0,0 monster Les 1881,40,5000,0,0
-mosk_dun02,0,0,0,0 monster Wood Goblin 1880,30,5000,0,0
-mosk_dun02,0,0,0,0 monster Baba Yaga 1882,20,5000,0,0
-mosk_dun02,0,0,0,0 monster Uzhas 1883,5,5000,0,0
+mosk_dun02,0,0,0,0 monster Wood Goblin 1880,30,10000,10000,1
+mosk_dun02,0,0,0,0 monster Les 1881,40,10000,10000,1
+mosk_dun02,0,0,0,0 monster Baba Yaga 1882,20,20000,10000,1
+mosk_dun02,0,0,0,0 monster Uzhas 1883,5,20000,10000,1
//==================================================
-// mosk_dun03 - Dremuci Forest
+// mosk_dun03 - Moscovia Dungeon 3
//==================================================
-mosk_dun03,0,0,0,0 monster Baba Yaga 1882,60,5000,0,0
-mosk_dun03,0,0,0,0 monster Uzhas 1883,35,5000,0,0
-mosk_dun03,0,0,0,0 monster Mavka 1884,15,5000,0,0
-mosk_dun03,207,221,5,5 boss_monster Gopinich 1885,1,7200000,600000,1
-mosk_dun03,0,0,0,0 monster Yellow Plant 1081,10,5000,0,0
-mosk_dun03,0,0,0,0 monster White Plant 1082,10,5000,0,0
+mosk_dun03,0,0,0,0 monster Baba Yaga 1882,60,10000,10000,1
+mosk_dun03,0,0,0,0 monster Uzhas 1883,35,20000,10000,1
+mosk_dun03,0,0,0,0 monster Mavka 1884,15,20000,10000,1
+mosk_dun03,0,0,0,0 monster Yellow Plant 1081,10,0,0,0
+mosk_dun03,0,0,0,0 monster White Plant 1082,10,0,0,0
mosk_dun03,0,0,0,0 monster Shining Plant 1083,5,10000,0,0
+mosk_dun03,207,221,5,5 boss_monster Gopinich 1885,1,7200000,600000,1
diff --git a/npc/pre-re/mobs/dungeons/nyd_dun.txt b/npc/pre-re/mobs/dungeons/nyd_dun.txt
index 8d10e2631..19a7e783e 100644
--- a/npc/pre-re/mobs/dungeons/nyd_dun.txt
+++ b/npc/pre-re/mobs/dungeons/nyd_dun.txt
@@ -11,20 +11,11 @@
//============================================================
//==================================================
-// nyd_dun01 - Yggdrasil Root
+// nyd_dun01 - Yggdrasil Root Dungeon
//==================================================
-nyd_dun01,0,0,0,0 monster Draco 2013,40,5000,0,0
-nyd_dun01,0,0,0,0 monster Aqua Elemental 2016,20,5000,0,0
-nyd_dun01,0,0,0,0 monster Dark Pinguicula 2015,10,5000,0,0
+nyd_dun01,0,0,0,0 monster Draco 2013,40,0,0,0
+nyd_dun01,0,0,0,0 monster Draco's Egg 2014,10,0,0,0
+nyd_dun01,0,0,0,0 monster Aqua Elemental 2016,20,0,0,0
+nyd_dun01,0,0,0,0 monster Dark Pinguicula 2015,10,0,0,0
nyd_dun01,0,0,0,0 monster Rata 2017,2,900000,0,0
nyd_dun01,0,0,0,0 monster Duneyrr 2018,2,900000,0,0
-nyd_dun01,47,219,0,0 monster Draco Egg 2014,1,60000,30000,0
-nyd_dun01,57,220,0,0 monster Draco Egg 2014,1,60000,30000,0
-nyd_dun01,57,226,0,0 monster Draco Egg 2014,1,60000,30000,0
-nyd_dun01,56,226,0,0 monster Draco Egg 2014,1,60000,30000,0
-nyd_dun01,64,219,0,0 monster Draco Egg 2014,1,60000,30000,0
-nyd_dun01,53,221,0,0 monster Draco Egg 2014,1,60000,30000,0
-nyd_dun01,58,216,0,0 monster Draco Egg 2014,1,60000,30000,0
-nyd_dun01,60,226,0,0 monster Draco Egg 2014,1,60000,30000,0
-nyd_dun01,53,228,0,0 monster Draco Egg 2014,1,60000,30000,0
-nyd_dun01,47,218,0,0 monster Draco Egg 2014,1,60000,30000,0
diff --git a/npc/pre-re/mobs/dungeons/odin.txt b/npc/pre-re/mobs/dungeons/odin.txt
index b7a9038ca..48f7f465f 100644
--- a/npc/pre-re/mobs/dungeons/odin.txt
+++ b/npc/pre-re/mobs/dungeons/odin.txt
@@ -13,43 +13,55 @@
//============================================================
//==================================================
-// odin_tem01 - Odin Shrine
+// odin_tem01 - Odin Temple F1
//==================================================
-odin_tem01,0,0,0,0 monster Plasma 1693,10,5000,0,0
-odin_tem01,0,0,0,0 monster Breeze 1692,10,5000,0,0
-odin_tem01,0,0,0,0 monster Frus 1753,5,5000,0,0
-odin_tem01,0,0,0,0 monster Skogul 1752,5,5000,0,0
-odin_tem01,0,0,0,0 monster Plasma 1697,3,5000,0,0
-odin_tem01,0,0,0,0 monster Plasma 1695,3,5000,0,0
-odin_tem01,0,0,0,0 monster Plasma 1696,3,5000,0,0
-odin_tem01,0,0,0,0 monster Plasma 1694,3,5000,0,0
+odin_tem01,0,0,0,0 monster Breeze 1692,10,300000,240000,0
+odin_tem01,0,0,0,0 monster Plasma 1697,3,900000,300000,0
+odin_tem01,0,0,0,0 monster Plasma 1695,3,900000,300000,0
+odin_tem01,0,0,0,0 monster Plasma 1696,3,900000,300000,0
+odin_tem01,0,0,0,0 monster Plasma 1694,3,900000,300000,0
+odin_tem01,0,0,0,0 monster Plasma 1693,10,900000,300000,0
+odin_tem01,0,0,0,0 monster Frus 1753,5,0,0,0
+odin_tem01,0,0,0,0 monster Skogul 1752,5,0,0,0
odin_tem01,0,0,0,0 monster Green Plant 1080,5,60000,30000,1
odin_tem01,0,0,0,0 monster Yellow Plant 1081,5,60000,30000,1
odin_tem01,0,0,0,0 monster Blue Plant 1079,5,600000,300000,1
//==================================================
-// odin_tem02 - Odin Shrine
+// odin_tem02 - Odin Temple F2
//==================================================
-odin_tem02,0,0,0,0 monster Skogul 1752,30,5000,0,0
-odin_tem02,0,0,0,0 monster Frus 1753,30,5000,0,0
-odin_tem02,0,0,0,0 monster Plasma 1693,15,5000,0,0
-odin_tem02,0,0,0,0 monster Frus 1762,3,5000,0,0
-odin_tem02,0,0,0,0 monster Skogul 1761,2,5000,0,0
-odin_tem02,0,0,0,0 monster Skeggiold 1754,1,5000,0,0
-odin_tem02,0,0,0,0 monster Skeggiold 1755,1,5000,0,0
+odin_tem02,0,0,0,0 monster Plasma 1693,15,900000,300000,0
+odin_tem02,0,0,0,0 monster Skeggiold 1754,1,1800000,0,0
+odin_tem02,0,0,0,0 monster Skeggiold 1755,1,1800000,0,0
+odin_tem02,0,0,0,0 monster Frus 1753,30,0,0,0
+odin_tem02,0,0,0,0 monster Skogul 1752,30,0,0,0
+odin_tem02,160,330,3,3 monster Frus 1762,1,30000,15000,0
+odin_tem02,172,292,3,3 monster Skogul 1761,1,30000,15000,0
+odin_tem02,182,263,3,3 monster Frus 1762,1,30000,15000,0
+odin_tem02,190,236,3,3 monster Skogul 1761,1,30000,15000,0
+odin_tem02,205,198,3,3 monster Frus 1762,1,30000,15000,0
+odin_tem02,0,0,0,0 monster Valkyrie 1765,1,5400000,1800000,0
odin_tem02,0,0,0,0 monster Blue Plant 1079,10,1800000,900000,1
//==================================================
-// odin_tem03 - Odin Shrine
+// odin_tem03 - Odin Temple F3
//==================================================
-odin_tem03,0,0,0,0 monster Plasma 1693,20,5000,0,0
-odin_tem03,0,0,0,0 monster Skeggiold 1754,16,5000,0,0
-odin_tem03,0,0,0,0 monster Skeggiold 1755,16,5000,0,0
-odin_tem03,0,0,0,0 monster Skogul 1761,5,5000,0,0
-odin_tem03,0,0,0,0 monster Frus 1762,5,5000,0,0
-odin_tem03,0,0,0,0 monster Skogul 1752,4,5000,0,0
-odin_tem03,0,0,0,0 monster Frus 1753,4,5000,0,0
-odin_tem03,0,0,0,0 monster Valkyrie 1765,2,5400000,1800000,0
+odin_tem03,0,0,0,0 monster Plasma 1693,20,900000,300000,0
+odin_tem03,0,0,0,0 monster Skeggiold 1754,16,0,0,0
+odin_tem03,0,0,0,0 monster Skeggiold 1755,16,0,0,0
+odin_tem03,0,0,0,0 monster Frus 1753,4,0,0,0
+odin_tem03,0,0,0,0 monster Skogul 1752,4,0,0,0
+odin_tem03,116,65,3,3 monster Frus 1762,1,30000,15000,0
+odin_tem03,100,110,3,3 monster Skogul 1761,1,30000,15000,0
+odin_tem03,94,132,3,3 monster Frus 1762,1,30000,15000,0
+odin_tem03,90,173,3,3 monster Frus 1762,1,30000,15000,0
+odin_tem03,111,188,3,3 monster Skogul 1761,1,30000,15000,0
+odin_tem03,151,210,3,3 monster Skogul 1761,1,30000,15000,0
+odin_tem03,178,224,3,3 monster Skogul 1761,1,30000,15000,0
+odin_tem03,205,240,3,3 monster Frus 1762,1,30000,15000,0
+odin_tem03,238,265,3,3 monster Skogul 1761,1,30000,15000,0
+odin_tem03,256,271,3,3 monster Frus 1762,1,30000,15000,0
+odin_tem03,0,0,0,0 monster Valkyrie 1765,2,1800000,1200000,0
odin_tem03,0,0,0,0 boss_monster Valkyrie Randgris 1751,1,28800000,600000,1
odin_tem03,0,0,0,0 monster Blue Plant 1079,15,1800000,900000,1
odin_tem03,0,0,0,0 monster Shining Plant 1083,15,1800000,900000,1
diff --git a/npc/pre-re/mobs/dungeons/orcsdun.txt b/npc/pre-re/mobs/dungeons/orcsdun.txt
index 3a011ec5d..be6e7bfc1 100644
--- a/npc/pre-re/mobs/dungeons/orcsdun.txt
+++ b/npc/pre-re/mobs/dungeons/orcsdun.txt
@@ -11,26 +11,31 @@
//============================================================
//==================================================
-// orcsdun01 - Orc Dungeon
+// orcsdun01 - Orc Dungeon F1
//==================================================
-orcsdun01,0,0,0,0 monster Orc Zombie 1153,80,5000,0,0
-orcsdun01,0,0,0,0 monster Familiar 1005,15,5000,0,0
-orcsdun01,0,0,0,0 monster Steel Chonchon 1042,10,5000,0,0
-orcsdun01,0,0,0,0 monster Orc Skeleton 1152,10,5000,0,0
-orcsdun01,0,0,0,0 monster Drainliar 1111,5,5000,0,0
+orcsdun01,0,0,0,0 monster Steel Chonchon 1042,10,0,0,0
+orcsdun01,0,0,0,0 monster Familiar 1005,15,0,0,0
+orcsdun01,0,0,0,0 monster Drainliar 1111,5,0,0,0
+orcsdun01,0,0,0,0 monster Orc Zombie 1153,10,3000,5000,0
+orcsdun01,0,0,0,0 monster Orc Zombie 1153,30,60000,30000,0
+orcsdun01,0,0,0,0 monster Orc Zombie 1153,40,120000,60000,0
+orcsdun01,0,0,0,0 monster Orc Skeleton 1152,10,180000,60000,0
orcsdun01,167,133,5,5 monster Black Mushroom 1084,5,900000,450000,1
orcsdun01,67,34,5,5 monster Black Mushroom 1084,5,900000,450000,1
orcsdun01,83,50,5,5 monster White Plant 1082,2,180000,90000,1
orcsdun01,58,67,10,10 monster White Plant 1082,3,180000,90000,1
//==================================================
-// orcsdun02 - Orc Dungeon
+// orcsdun02 - Orc Dungeon F2
//==================================================
-orcsdun02,0,0,0,0 monster Orc Skeleton 1152,50,5000,0,0
-orcsdun02,0,0,0,0 monster Zenorc 1177,50,5000,0,0
-orcsdun02,0,0,0,0 monster Drainliar 1111,20,5000,0,0
-orcsdun02,0,0,0,0 monster Steel Chonchon 1042,20,5000,0,0
-orcsdun02,0,0,0,0 monster Orc Archer 1189,5,5000,0,0
+orcsdun02,0,0,0,0 monster Steel Chonchon 1042,20,0,0,0
+orcsdun02,0,0,0,0 monster Drainliar 1111,20,0,0,0
+orcsdun02,0,0,0,0 monster Orc Skeleton 1152,10,3000,5000,0
+orcsdun02,0,0,0,0 monster Orc Skeleton 1152,20,60000,30000,0
+orcsdun02,0,0,0,0 monster Orc Skeleton 1152,20,120000,60000,0
+orcsdun02,0,0,0,0 monster Zenorc 1177,30,3000,5000,0
+orcsdun02,0,0,0,0 monster Zenorc 1177,20,60000,30000,0
+orcsdun02,0,0,0,0 monster Orc Archer 1189,5,1800000,900000,1
orcsdun02,0,0,0,0 monster Black Mushroom 1084,5,180000,90000,1
orcsdun02,105,37,10,10 monster White Plant 1082,2,180000,90000,1
orcsdun02,37,44,10,10 monster White Plant 1082,3,180000,90000,1
diff --git a/npc/pre-re/mobs/dungeons/pay_dun.txt b/npc/pre-re/mobs/dungeons/pay_dun.txt
index eade9ece2..481edea80 100644
--- a/npc/pre-re/mobs/dungeons/pay_dun.txt
+++ b/npc/pre-re/mobs/dungeons/pay_dun.txt
@@ -13,69 +13,70 @@
//============================================================
//==================================================
-/// pay_dun00 - Payon Cave
+// pay_dun00 - Payon Cave F1
//==================================================
-pay_dun00,0,0,0,0 monster Zombie 1015,40,5000,0,0
-pay_dun00,0,0,0,0 monster Skeleton 1076,35,5000,0,0
-pay_dun00,0,0,0,0 monster Familiar 1005,15,5000,0,0
-pay_dun00,0,0,0,0 monster Poporing 1031,15,5000,0,0
+pay_dun00,0,0,0,0 monster Familiar 1005,15,0,0,0
+pay_dun00,0,0,0,0 monster Zombie 1015,20,0,0,0
+pay_dun00,0,0,0,0 monster Skeleton 1076,35,0,0,0
+pay_dun00,0,0,0,0 monster Poporing 1031,15,0,0,0
pay_dun00,0,0,0,0 monster Red Plant 1078,15,180000,90000,1
pay_dun00,140,140,5,5 monster Black Mushroom 1084,3,360000,180000,1
//==================================================
-// pay_dun01 - Payon Cave
+// pay_dun01 - Payon Cave F2
//==================================================
-pay_dun01,0,0,0,0 monster Soldier Skeleton 1028,50,5000,0,0
-pay_dun01,0,0,0,0 monster Archer Skeleton 1016,30,5000,0,0
-pay_dun01,0,0,0,0 monster Eggyra 1116,15,5000,0,0
-pay_dun01,0,0,0,0 monster Drainliar 1111,5,5000,0,0
+pay_dun01,0,0,0,0 monster Drainliar 1111,5,0,0,0
+pay_dun01,0,0,0,0 monster Eggyra 1116,15,0,0,0
+pay_dun01,0,0,0,0 monster Soldier Skeleton 1028,50,300000,150000,1
+pay_dun01,0,0,0,0 monster Archer Skeleton 1016,30,300000,150000,1
pay_dun01,235,54,10,10 monster Black Mushroom 1084,7,900000,450000,1
pay_dun01,0,0,0,0 monster Red Plant 1078,10,180000,90000,1
//==================================================
-// pay_dun02 - Payon Cave
+// pay_dun02 - Payon Cave F3
//==================================================
-pay_dun02,0,0,0,0 monster Soldier Skeleton 1028,45,5000,0,0
-pay_dun02,0,0,0,0 monster Munak 1026,40,5000,0,0
-pay_dun02,0,0,0,0 monster Bongun 1188,30,5000,0,0
-pay_dun02,0,0,0,0 monster Archer Skeleton 1016,20,5000,0,0
-pay_dun02,0,0,0,0 monster Poporing 1031,10,5000,0,0
-pay_dun02,0,0,0,0 monster Nine Tail 1180,1,5000,0,0
+pay_dun02,0,0,0,0 monster Soldier Skeleton 1028,15,180000,90000,1
+pay_dun02,0,0,0,0 monster Munak 1026,40,0,0,0
+pay_dun02,0,0,0,0 monster Bongun 1188,30,0,0,0
+pay_dun02,0,0,0,0 monster Poporing 1031,10,0,0,0
+pay_dun02,0,0,0,0 monster Archer Skeleton 1016,20,180000,90000,1
+pay_dun02,116,205,0,0 monster Hydra 1068,1,345000,100000,1
+pay_dun02,116,199,0,0 monster Hydra 1068,1,306000,100000,1
+pay_dun02,116,196,0,0 monster Hydra 1068,1,300000,100000,1
+pay_dun02,116,190,0,0 monster Hydra 1068,1,326000,100000,1
+pay_dun02,117,206,0,0 monster Hydra 1068,1,302000,100000,1
pay_dun02,117,200,0,0 monster Hydra 1068,1,275000,100000,1
+pay_dun02,117,197,0,0 monster Hydra 1068,1,314000,100000,1
+pay_dun02,117,191,0,0 monster Hydra 1068,1,300000,100000,1
+pay_dun02,118,207,0,0 monster Hydra 1068,1,332000,100000,1
+pay_dun02,118,201,0,0 monster Hydra 1068,1,300000,100000,1
+pay_dun02,118,198,0,0 monster Hydra 1068,1,312000,100000,1
pay_dun02,118,192,0,0 monster Hydra 1068,1,285000,100000,1
+pay_dun02,119,205,0,0 monster Hydra 1068,1,324000,100000,1
pay_dun02,119,199,0,0 monster Hydra 1068,1,300000,100000,1
+pay_dun02,119,196,0,0 monster Hydra 1068,1,315000,100000,1
+pay_dun02,120,203,0,0 monster Hydra 1068,1,300000,100000,1
+pay_dun02,120,200,0,0 monster Hydra 1068,1,303000,100000,1
pay_dun02,120,194,0,0 monster Hydra 1068,1,300000,100000,1
+pay_dun02,121,200,0,0 monster Hydra 1068,1,333000,100000,1
pay_dun02,122,200,0,0 monster Hydra 1068,1,300000,100000,1
-pay_dun02,110,190,0,0 monster Hydra 1068,1,300000,100000,1
+pay_dun02,122,197,0,0 monster Hydra 1068,1,321000,100000,1
pay_dun02,110,194,0,0 monster Hydra 1068,1,300000,100000,1
-pay_dun02,117,191,0,0 monster Hydra 1068,1,300000,100000,1
+pay_dun02,113,194,0,0 monster Hydra 1068,1,319000,100000,1
pay_dun02,109,193,0,0 monster Hydra 1068,1,300000,100000,1
-pay_dun02,118,201,0,0 monster Hydra 1068,1,300000,100000,1
pay_dun02,113,193,0,0 monster Hydra 1068,1,300000,100000,1
-pay_dun02,116,196,0,0 monster Hydra 1068,1,300000,100000,1
+pay_dun02,109,192,0,0 monster Hydra 1068,1,374000,100000,1
pay_dun02,112,192,0,0 monster Hydra 1068,1,300000,100000,1
+pay_dun02,108,191,0,0 monster Hydra 1068,1,332000,100000,1
pay_dun02,111,191,0,0 monster Hydra 1068,1,300000,100000,1
-pay_dun02,229,183,0,0 monster Mandragora 1020,1,300000,100000,1
-pay_dun02,227,184,0,0 monster Mandragora 1020,1,300000,100000,1
-pay_dun02,227,185,0,0 monster Mandragora 1020,1,300000,100000,1
-pay_dun02,120,203,0,0 monster Hydra 1068,1,300000,100000,1
-pay_dun02,117,206,0,0 monster Hydra 1068,1,302000,100000,1
-pay_dun02,120,200,0,0 monster Hydra 1068,1,303000,100000,1
-pay_dun02,116,199,0,0 monster Hydra 1068,1,306000,100000,1
-pay_dun02,118,198,0,0 monster Hydra 1068,1,312000,100000,1
-pay_dun02,117,197,0,0 monster Hydra 1068,1,314000,100000,1
-pay_dun02,119,196,0,0 monster Hydra 1068,1,315000,100000,1
-pay_dun02,113,194,0,0 monster Hydra 1068,1,319000,100000,1
pay_dun02,107,190,0,0 monster Hydra 1068,1,320000,100000,1
-pay_dun02,122,197,0,0 monster Hydra 1068,1,321000,100000,1
-pay_dun02,119,205,0,0 monster Hydra 1068,1,324000,100000,1
-pay_dun02,116,190,0,0 monster Hydra 1068,1,326000,100000,1
-pay_dun02,108,191,0,0 monster Hydra 1068,1,332000,100000,1
-pay_dun02,118,207,0,0 monster Hydra 1068,1,332000,100000,1
-pay_dun02,121,200,0,0 monster Hydra 1068,1,333000,100000,1
-pay_dun02,116,205,0,0 monster Hydra 1068,1,345000,100000,1
-pay_dun02,109,192,0,0 monster Hydra 1068,1,374000,100000,1
+pay_dun02,110,190,0,0 monster Hydra 1068,1,300000,100000,1
+pay_dun02,227,185,0,0 monster Mandragora 1020,1,300000,100000,1
+pay_dun02,227,184,0,0 monster Mandragora 1020,1,300000,100000,1
+pay_dun02,229,183,0,0 monster Mandragora 1020,1,300000,100000,1
+pay_dun02,214,266,0,0 monster Red Plant 1078,1,600000,300000,1
pay_dun02,37,243,0,0 monster Black Mushroom 1084,1,600000,300000,1
+pay_dun02,37,243,0,0 monster Nine Tail 1180,1,3600000,1800000,1
pay_dun02,111,199,10,10 monster Black Mushroom 1084,7,900000,450000,1
pay_dun02,110,216,20,10 monster White Plant 1082,3,180000,90000,1
pay_dun02,132,84,10,10 monster White Plant 1082,3,180000,90000,1
@@ -83,64 +84,75 @@ pay_dun02,197,113,10,10 monster Red Plant 1078,4,180000,90000,1
pay_dun02,55,254,10,10 monster Red Plant 1078,4,180000,90000,1
//==================================================
-// pay_dun03 - Payon Cave
+// pay_dun03 - Payon Cave F4
//==================================================
-pay_dun03,0,0,0,0 monster Sohee 1170,70,5000,0,0
-pay_dun03,0,0,0,0 monster Greatest General 1277,3,5000,0,0
-pay_dun03,0,0,0,0 monster Bongun 1188,3,5000,0,0
-pay_dun03,0,0,0,0 monster Munak 1026,3,5000,0,0
-pay_dun03,0,0,0,0 monster Nine Tail 1180,2,5000,0,0
-pay_dun03,126,135,0,0 monster Mandragora 1020,1,300000,100000,1
-pay_dun03,126,134,0,0 monster Mandragora 1020,1,300000,100000,1
-pay_dun03,126,133,0,0 monster Mandragora 1020,1,300000,100000,1
-pay_dun03,126,132,0,0 monster Mandragora 1020,1,300000,100000,1
-pay_dun03,126,131,0,0 monster Mandragora 1020,1,300000,100000,1
-pay_dun03,179,133,0,0 monster Mandragora 1020,1,300000,100000,1
-pay_dun03,179,132,0,0 monster Mandragora 1020,1,300000,100000,1
-pay_dun03,179,134,0,0 monster Mandragora 1020,1,300000,100000,1
-pay_dun03,179,131,0,0 monster Mandragora 1020,1,300000,100000,1
-pay_dun03,179,130,0,0 monster Mandragora 1020,1,300000,100000,1
-pay_dun03,71,67,0,0 monster Hydra 1068,1,600000,300000,1
+pay_dun03,0,0,0,0 monster Sohee 1170,50,0,0,0
+pay_dun03,0,0,0,0 monster Munak 1026,3,0,0,0
+pay_dun03,0,0,0,0 monster Bongun 1188,3,0,0,0
+pay_dun03,0,0,0,0 monster Nine Tail 1180,1,0,0,0
+pay_dun03,0,0,0,0 monster Nine Tail 1180,1,3600000,1800000,0
+pay_dun03,154,112,0,0 monster Whisper 1185,1,1800000,0,1
+pay_dun03,161,117,0,0 monster Whisper 1185,1,1800000,0,1
+pay_dun03,81,61,0,0 monster Whisper 1185,1,1800000,0,1
+pay_dun03,84,63,0,0 monster Whisper 1185,1,1800000,0,1
+pay_dun03,89,147,0,0 monster Giant Whisper 1186,1,14400000,0,1
+pay_dun03,66,73,0,0 monster Hydra 1068,1,600000,300000,1
+pay_dun03,68,72,0,0 monster Hydra 1068,1,600000,300000,1
+pay_dun03,67,71,0,0 monster Hydra 1068,1,600000,300000,1
+pay_dun03,63,70,0,0 monster Hydra 1068,1,600000,300000,1
+pay_dun03,58,69,0,0 monster Hydra 1068,1,600000,300000,1
+pay_dun03,67,69,0,0 monster Hydra 1068,1,600000,300000,1
+pay_dun03,60,68,0,0 monster Hydra 1068,1,600000,300000,1
+pay_dun03,69,68,0,0 monster Hydra 1068,1,600000,300000,1
pay_dun03,62,67,0,0 monster Hydra 1068,1,600000,300000,1
-pay_dun03,57,65,0,0 monster Hydra 1068,1,600000,300000,1
+pay_dun03,71,67,0,0 monster Hydra 1068,1,600000,300000,1
pay_dun03,64,66,0,0 monster Hydra 1068,1,600000,300000,1
+pay_dun03,57,65,0,0 monster Hydra 1068,1,600000,300000,1
pay_dun03,66,65,0,0 monster Hydra 1068,1,600000,300000,1
pay_dun03,59,64,0,0 monster Hydra 1068,1,600000,300000,1
pay_dun03,68,64,0,0 monster Hydra 1068,1,600000,300000,1
pay_dun03,71,64,0,0 monster Hydra 1068,1,600000,300000,1
pay_dun03,66,63,0,0 monster Hydra 1068,1,600000,300000,1
-pay_dun03,69,68,0,0 monster Hydra 1068,1,600000,300000,1
-pay_dun03,60,68,0,0 monster Hydra 1068,1,600000,300000,1
-pay_dun03,67,69,0,0 monster Hydra 1068,1,600000,300000,1
-pay_dun03,67,71,0,0 monster Hydra 1068,1,600000,300000,1
-pay_dun03,66,73,0,0 monster Hydra 1068,1,600000,300000,1
-pay_dun03,68,72,0,0 monster Hydra 1068,1,600000,300000,1
-pay_dun03,63,70,0,0 monster Hydra 1068,1,600000,300000,1
-pay_dun03,58,69,0,0 monster Hydra 1068,1,600000,300000,1
-pay_dun03,154,112,0,0 monster Whisper 1185,1,1800000,0,1
-pay_dun03,84,63,0,0 monster Whisper 1185,1,1800000,0,1
-pay_dun03,81,61,0,0 monster Whisper 1185,1,1800000,0,1
-pay_dun03,161,117,0,0 monster Whisper 1185,1,1800000,0,1
-pay_dun03,89,147,0,0 monster Giant Whisper 1186,1,14400000,0,1
+pay_dun03,71,243,0,0 monster Sohee 1170,2,300000,100000,1
+pay_dun03,86,248,0,0 monster Sohee 1170,2,300000,100000,1
+pay_dun03,85,178,0,0 monster Sohee 1170,2,300000,100000,1
+pay_dun03,115,190,0,0 monster Sohee 1170,2,300000,100000,1
+pay_dun03,230,244,0,0 monster Sohee 1170,2,300000,100000,1
+pay_dun03,240,244,0,0 monster Sohee 1170,2,300000,100000,1
+pay_dun03,219,244,0,0 monster Sohee 1170,2,300000,100000,1
+pay_dun03,243,220,0,0 monster Sohee 1170,2,300000,100000,1
+pay_dun03,219,185,0,0 monster Sohee 1170,2,300000,100000,1
+pay_dun03,228,185,0,0 monster Sohee 1170,2,300000,100000,1
pay_dun03,228,61,0,0 monster Red Plant 1078,1,600000,300000,1
pay_dun03,138,42,0,0 monster Blue Plant 1079,1,600000,300000,1
pay_dun03,120,186,0,0 monster Green Plant 1080,1,600000,300000,1
pay_dun03,88,35,0,0 monster Yellow Plant 1081,1,600000,300000,1
+pay_dun03,126,135,0,0 monster Mandragora 1020,1,300000,100000,1
+pay_dun03,126,134,0,0 monster Mandragora 1020,1,300000,100000,1
+pay_dun03,126,133,0,0 monster Mandragora 1020,1,300000,100000,1
+pay_dun03,126,132,0,0 monster Mandragora 1020,1,300000,100000,1
+pay_dun03,126,131,0,0 monster Mandragora 1020,1,300000,100000,1
+pay_dun03,179,134,0,0 monster Mandragora 1020,1,300000,100000,1
+pay_dun03,179,133,0,0 monster Mandragora 1020,1,300000,100000,1
+pay_dun03,179,132,0,0 monster Mandragora 1020,1,300000,100000,1
+pay_dun03,179,131,0,0 monster Mandragora 1020,1,300000,100000,1
+pay_dun03,179,130,0,0 monster Mandragora 1020,1,300000,100000,1
+pay_dun03,0,0,0,0 monster Greatest General 1277,3,0,0,0
pay_dun03,0,0,0,0 monster Red Plant 1078,15,180000,90000,1
pay_dun03,246,56,20,20 monster White Plant 1082,3,180000,90000,1
pay_dun03,52,262,10,4 monster White Plant 1082,2,180000,90000,1
//==================================================
-// pay_dun04 - Payon Cave
+// pay_dun04 - Payon Cave F5
//==================================================
-pay_dun04,0,0,0,0 monster Dokebi 1110,40,5000,0,0
-pay_dun04,0,0,0,0 monster Nine Tail 1180,30,5000,0,0
-pay_dun04,0,0,0,0 monster Horong 1129,30,5000,0,0
-pay_dun04,0,0,0,0 monster Archer Skeleton 1016,15,5000,0,0
-pay_dun04,0,0,0,0 monster Greatest General 1277,15,5000,0,0
-pay_dun04,0,0,0,0 monster Am Mut 1301,1,5000,0,0
-pay_dun04,0,0,0,0 monster Skeleton General 1290,1,5000,0,0
+pay_dun04,0,0,0,0 monster Dokebi 1110,40,0,0,0
+pay_dun04,0,0,0,0 monster Horong 1129,30,0,0,0
pay_dun04,120,115,0,0 boss_monster Moonlight Flower 1150,1,3600000,600000,1
+pay_dun04,0,0,0,0 monster Greatest General 1277,15,0,0,0
+pay_dun04,0,0,0,0 monster Archer Skeleton 1016,15,0,0,0
+pay_dun04,0,0,0,0 monster Nine Tail 1180,30,60000,30000,0
+pay_dun04,0,0,0,0 monster Skeleton General 1290,1,0,0,0
+pay_dun04,0,0,0,0 monster Am Mut 1301,1,0,0,0
pay_dun04,120,115,0,0 monster Cat o' Nine Tails 1307,1,3600000,7200000,1
pay_dun04,120,120,10,10 monster Shining Plant 1083,1,1800000,900000,1
pay_dun04,28,110,5,5 monster Shining Plant 1083,1,1800000,900000,1
diff --git a/npc/pre-re/mobs/dungeons/prt_maze.txt b/npc/pre-re/mobs/dungeons/prt_maze.txt
index 169127050..47d79efac 100644
--- a/npc/pre-re/mobs/dungeons/prt_maze.txt
+++ b/npc/pre-re/mobs/dungeons/prt_maze.txt
@@ -13,37 +13,38 @@
//============================================================
//==================================================
-// prt_maze01 - Labyrinth Forest
+// prt_maze01 - Labyrinth Forest F1
//==================================================
+
prt_maze01,179,20,21,21 monster Poring 1002,5,120000,40000,1
-prt_maze01,179,180,21,21 monster Coco 1104,5,120000,40000,1
-prt_maze01,139,140,21,21 monster Stainer 1174,5,120000,40000,1
-prt_maze01,139,180,21,21 monster Caramel 1103,5,120000,40000,1
-prt_maze01,99,180,21,21 monster Dustiness 1114,5,120000,40000,1
-prt_maze01,59,100,21,21 monster Horn 1128,5,120000,40000,1
-prt_maze01,99,100,21,21 monster Chonchon 1011,5,120000,40000,1
-prt_maze01,59,180,21,21 monster Martin 1145,5,120000,40000,1
-prt_maze01,19,60,21,21 monster Wolf 1013,5,120000,40000,1
-prt_maze01,59,60,21,21 monster Boa 1025,5,120000,40000,1
-prt_maze01,99,60,21,21 monster Smokie 1056,5,120000,40000,1
prt_maze01,139,20,21,21 monster Lunatic 1063,5,120000,40000,1
prt_maze01,99,20,21,21 monster Fabre 1007,5,120000,40000,1
-prt_maze01,19,180,21,21 monster Savage 1166,5,120000,40000,1
+prt_maze01,99,20,21,21 monster Creamy 1018,1,120000,40000,1
prt_maze01,59,20,21,21 monster Pupa 1008,5,120000,40000,1
prt_maze01,19,20,21,21 monster Poporing 1031,5,120000,40000,1
prt_maze01,179,60,21,21 monster Rocker 1052,5,120000,40000,1
prt_maze01,139,60,21,21 monster Bigfoot 1060,5,120000,40000,1
-prt_maze01,19,140,21,21 monster Steel Chonchon 1042,5,120000,40000,1
-prt_maze01,59,140,21,21 monster Yoyo 1057,4,120000,40000,1
-prt_maze01,19,180,21,21 monster Savage 1166,3,120000,40000,1
+prt_maze01,99,60,21,21 monster Smokie 1056,5,120000,40000,1
+prt_maze01,59,60,21,21 monster Boa 1025,5,120000,40000,1
+prt_maze01,19,60,21,21 monster Wolf 1013,5,120000,40000,1
prt_maze01,179,100,21,21 monster Argiope 1099,3,120000,40000,1
-prt_maze01,99,140,21,21 monster Side Winder 1037,3,120000,40000,1
-prt_maze01,179,140,21,21 monster Mantis 1139,3,120000,40000,1
-prt_maze01,19,100,21,21 monster Hunter Fly 1035,3,120000,40000,1
prt_maze01,139,100,21,21 monster Argos 1100,3,120000,40000,1
+prt_maze01,99,100,21,21 monster Chonchon 1011,5,120000,40000,1
+prt_maze01,59,100,21,21 monster Horn 1128,5,120000,40000,1
+prt_maze01,19,100,21,21 monster Hunter Fly 1035,3,120000,40000,1
+prt_maze01,179,140,21,21 monster Mantis 1139,3,120000,40000,1
+prt_maze01,139,140,21,21 monster Stainer 1174,5,120000,40000,1
+prt_maze01,99,140,21,21 monster Side Winder 1037,3,120000,40000,1
+prt_maze01,59,140,21,21 monster Yoyo 1057,4,120000,40000,1
prt_maze01,59,140,21,21 monster Choco 1214,2,120000,40000,1
-prt_maze01,0,0,0,0 monster Hunter Fly 1035,1,5000,0,0
-prt_maze01,99,20,21,21 monster Creamy 1018,1,120000,40000,1
+prt_maze01,19,140,21,21 monster Steel Chonchon 1042,5,120000,40000,1
+prt_maze01,179,180,21,21 monster Coco 1104,5,120000,40000,1
+prt_maze01,139,180,21,21 monster Caramel 1103,5,120000,40000,1
+prt_maze01,99,180,21,21 monster Dustiness 1114,5,120000,40000,1
+prt_maze01,59,180,21,21 monster Martin 1145,5,120000,40000,1
+prt_maze01,19,180,21,21 monster Savage 1166,3,120000,40000,1
+prt_maze01,19,180,21,21 monster Savage 1166,5,120000,40000,1
+prt_maze01,0,0,0,0 monster Hunter Fly 1035,1,0,0,0
prt_maze01,0,0,0,0 monster Vagabond Wolf 1092,1,3600000,1800000,0
prt_maze01,101,138,5,5 monster Shining Plant 1083,1,1800000,900000,1
prt_maze01,101,138,5,5 monster White Plant 1082,1,1800000,900000,1
@@ -61,29 +62,29 @@ prt_maze01,178,60,10,10 monster Red Mushroom 1085,3,180000,90000,1
prt_maze01,168,60,3,3 monster Red Mushroom 1085,2,180000,90000,1
//==================================================
-// prt_maze02 - Labyrinth Forest
+// prt_maze02 - Labyrinth Forest F2
//==================================================
-prt_maze02,0,0,0,0 monster Poporing 1031,25,5000,0,0
-prt_maze02,0,0,0,0 monster Bigfoot 1060,5,5000,0,0
+prt_maze02,0,0,0,0 monster Poporing 1031,25,0,0,0
+prt_maze02,0,0,0,0 monster Bigfoot 1060,5,0,0,0
prt_maze02,0,0,0,0 monster Sasquatch 1243,1,900000,40000,0
prt_maze02,0,0,0,0 monster Leib Olmai 1306,1,1800000,900000,0
//==================================================
-// prt_maze03 - Labyrinth Forest
+// prt_maze03 - Labyrinth Forest F3
//==================================================
-prt_maze03,0,0,0,0 monster Poporing 1031,45,5000,0,0
-prt_maze03,0,0,0,0 monster Hunter Fly 1035,30,5000,0,0
-prt_maze03,170,170,70,70 monster Mantis 1139,30,60000,30000,0
-prt_maze03,100,100,80,80 monster Baphomet Jr. 1101,25,5000,0,0
+prt_maze03,0,0,0,0 monster Poporing 1031,45,0,0,0
+prt_maze03,0,0,0,0 monster Side Winder 1037,10,0,0,0
+prt_maze03,0,0,0,0 monster Hunter Fly 1035,30,0,0,0
+prt_maze03,0,0,0,0 monster Ghostring 1120,1,6800000,3400000,1
+prt_maze03,0,0,0,0 monster Killer Mantis 1294,1,0,0,0
prt_maze03,150,50,70,70 monster Side Winder 1037,20,300000,150000,0
+prt_maze03,150,50,70,70 monster Vocal 1088,1,1920000,1500000,1
prt_maze03,50,150,70,70 monster Stem Worm 1215,20,300000,150000,0
-prt_maze03,0,0,0,0 monster Side Winder 1037,10,5000,0,0
-prt_maze03,0,0,0,0 monster Killer Mantis 1294,1,5000,0,0
+prt_maze03,50,150,70,70 monster Vagabond Wolf 1092,1,1920000,150000,1
+prt_maze03,170,170,70,70 monster Mantis 1139,30,60000,30000,0
prt_maze03,170,170,70,70 monster Eclipse 1093,1,1920000,150000,1
prt_maze03,23,23,70,70 monster Mastering 1090,1,1920000,150000,1
-prt_maze03,50,150,70,70 monster Vagabond Wolf 1092,1,1920000,150000,1
-prt_maze03,150,50,70,70 monster Vocal 1088,1,1920000,1500000,1
-prt_maze03,0,0,0,0 monster Ghostring 1120,1,6800000,3400000,1
+prt_maze03,100,100,80,80 monster Baphomet Jr. 1101,25,0,0,0
prt_maze03,0,0,0,0 boss_monster Baphomet 1039,1,7200000,600000,1
prt_maze03,61,98,10,10 monster Shining Plant 1083,1,1800000,900000,1
prt_maze03,61,98,10,10 monster Blue Plant 1079,1,1800000,900000,1
diff --git a/npc/pre-re/mobs/dungeons/prt_sew.txt b/npc/pre-re/mobs/dungeons/prt_sew.txt
index 23a10de97..f907feb38 100644
--- a/npc/pre-re/mobs/dungeons/prt_sew.txt
+++ b/npc/pre-re/mobs/dungeons/prt_sew.txt
@@ -12,42 +12,42 @@
//============================================================
//==================================================
-// prt_sewb1 - Prontera Culvert
+// prt_sewb1 - Prontera Culvert F1
//==================================================
-prt_sewb1,0,0,0,0 monster Thief Bug 1051,30,5000,0,0
-prt_sewb1,0,0,0,0 monster Thief Bug Egg 1048,80,5000,0,0
-prt_sewb1,0,0,0,0 monster Tarou 1175,10,5000,0,0
-prt_sewb1,0,0,0,0 monster Familiar 1005,10,5000,0,0
+prt_sewb1,0,0,0,0 monster Thief Bug Egg 1048,80,0,0,0
+prt_sewb1,0,0,0,0 monster Thief Bug 1051,30,0,0,0
+prt_sewb1,0,0,0,0 monster Familiar 1005,10,0,0,0
+prt_sewb1,0,0,0,0 monster Tarou 1175,10,0,0,0
//==================================================
-// prt_sewb2 - Prontera Culvert
+// prt_sewb2 - Prontera Culvert F2
//==================================================
-prt_sewb2,0,0,0,0 monster Thief Bug 1051,70,5000,0,0
-prt_sewb2,0,0,0,0 monster Tarou 1175,60,5000,0,0
-prt_sewb2,0,0,0,0 monster Plankton 1161,30,5000,0,0
-prt_sewb2,0,0,0,0 monster Thief Bug Egg 1048,20,5000,0,0
-prt_sewb2,0,0,0,0 monster Spore 1014,20,5000,0,0
-prt_sewb2,0,0,0,0 monster Thief Bug Female 1053,10,5000,0,0
-prt_sewb2,0,0,0,0 monster Familiar 1005,10,5000,0,0
+prt_sewb2,0,0,0,0 monster Thief Bug Egg 1048,20,0,0,0
+prt_sewb2,0,0,0,0 monster Thief Bug 1051,70,0,0,0
+prt_sewb2,0,0,0,0 monster Familiar 1005,10,0,0,0
+prt_sewb2,0,0,0,0 monster Spore 1014,20,0,0,0
+prt_sewb2,0,0,0,0 monster Plankton 1161,30,0,0,0
+prt_sewb2,0,0,0,0 monster Thief Bug Female 1053,10,0,0,0
+prt_sewb2,0,0,0,0 monster Tarou 1175,60,0,0,0
//==================================================
-// prt_sewb3 - Prontera Culvert
+// prt_sewb3 - Prontera Culvert F3
//==================================================
-prt_sewb3,0,0,0,0 monster Thief Bug Female 1053,65,5000,0,0
-prt_sewb3,0,0,0,0 monster Thief Bug Male 1054,65,5000,0,0
-prt_sewb3,0,0,0,0 monster Thief Bug 1051,20,5000,0,0
-prt_sewb3,0,0,0,0 monster Familiar 1005,20,5000,0,0
-prt_sewb3,0,0,0,0 monster Tarou 1175,15,5000,0,0
-prt_sewb3,0,0,0,0 monster Poison Spore 1077,15,5000,0,0
-prt_sewb3,0,0,0,0 monster Thief Bug Egg 1048,10,5000,0,0
+prt_sewb3,0,0,0,0 monster Thief Bug Egg 1048,10,0,0,0
+prt_sewb3,0,0,0,0 monster Thief Bug 1051,20,0,0,0
+prt_sewb3,0,0,0,0 monster Thief Bug Female 1053,65,0,0,0
+prt_sewb3,0,0,0,0 monster Thief Bug Male 1054,65,0,0,0
+prt_sewb3,0,0,0,0 monster Tarou 1175,15,0,0,0
+prt_sewb3,0,0,0,0 monster Poison Spore 1077,15,0,0,0
+prt_sewb3,0,0,0,0 monster Familiar 1005,20,0,0,0
//==================================================
-// prt_sewb4 - Prontera Culvert
+// prt_sewb4 - Prontera Culvert F4
//==================================================
-prt_sewb4,0,0,0,0 monster Thief Bug Male 1054,70,5000,0,0
-prt_sewb4,0,0,0,0 monster Thief Bug 1051,20,5000,0,0
-prt_sewb4,0,0,0,0 monster Thief Bug Female 1053,20,5000,0,0
-prt_sewb4,0,0,0,0 monster Drainliar 1111,20,5000,0,0
-prt_sewb4,0,0,0,0 monster Thief Bug Egg 1048,10,5000,0,0
-prt_sewb4,0,0,0,0 monster Cramp 1209,5,5000,0,0
+prt_sewb4,0,0,0,0 monster Thief Bug Egg 1048,10,0,0,0
+prt_sewb4,0,0,0,0 monster Thief Bug 1051,20,0,0,0
+prt_sewb4,0,0,0,0 monster Thief Bug Female 1053,20,0,0,0
+prt_sewb4,0,0,0,0 monster Thief Bug Male 1054,70,0,0,0
+prt_sewb4,0,0,0,0 monster Drainliar 1111,20,0,0,0
+prt_sewb4,0,0,0,0 monster Cramp 1209,5,0,0,0
prt_sewb4,0,0,0,0 boss_monster Golden Thief Bug 1086,1,3600000,600000,1
diff --git a/npc/pre-re/mobs/dungeons/ra_san.txt b/npc/pre-re/mobs/dungeons/ra_san.txt
index 46b4f255b..ffb79459e 100644
--- a/npc/pre-re/mobs/dungeons/ra_san.txt
+++ b/npc/pre-re/mobs/dungeons/ra_san.txt
@@ -13,46 +13,70 @@
//============================================================
//==================================================
-// ra_san01 - Holy Ground
+// ra_san01
//==================================================
-ra_san01,0,0,0,0 monster Vanberk 1771,82,5000,0,0
-ra_san01,0,0,0,0 monster Isilla 1772,36,5000,0,0
-ra_san01,0,0,0,0 monster Gremlin 1632,10,5000,0,0
-ra_san01,0,0,0,0 monster Beholder 1633,6,5000,0,0
-ra_san01,0,0,0,0 monster Hodremlin 1773,6,5000,0,0
+ra_san01,0,0,0,0 monster Vanberk 1771,20,180000,0,1
+ra_san01,0,0,0,0 monster Isilla 1772,10,0,0,1
+ra_san01,61,141,58,98 monster Vanberk 1771,20,300000,0,1
+ra_san01,61,141,58,98 monster Isilla 1772,10,180000,0,1
+ra_san01,61,141,58,98 monster Gremlin 1632,5,60000,0,1
+ra_san01,61,141,58,98 monster Hodremlin 1773,2,60000,0,1
+ra_san01,218,141,58,98 monster Vanberk 1771,20,300000,0,1
+ra_san01,218,141,58,98 monster Isilla 1772,10,180000,0,1
+ra_san01,218,141,58,98 monster Gremlin 1632,5,60000,0,1
+ra_san01,218,141,58,98 monster Hodremlin 1773,2,60000,0,1
+ra_san01,140,63,38,59 monster Vanberk 1771,7,180000,0,1
+ra_san01,140,63,38,59 monster Isilla 1772,3,180000,0,1
+ra_san01,140,63,38,59 monster Beholder 1633,3,60000,0,1
+ra_san01,140,63,38,59 monster Hodremlin 1773,1,60000,0,1
+ra_san01,140,226,50,51 monster Vanberk 1771,7,180000,0,1
+ra_san01,140,226,50,51 monster Isilla 1772,3,180000,0,1
+ra_san01,140,226,50,51 monster Beholder 1633,3,60000,0,1
+ra_san01,140,226,50,51 monster Hodremlin 1773,1,60000,0,1
+ra_san01,64,215,23,23 monster Vanberk 1771,2,420000,0,1
+ra_san01,215,215,23,23 monster Vanberk 1771,2,420000,0,1
+ra_san01,64,65,23,23 monster Vanberk 1771,2,420000,0,1
+ra_san01,215,65,23,23 monster Vanberk 1771,2,420000,0,1
//==================================================
-// ra_san02 - Holy Ground
+// ra_san02
//==================================================
-ra_san02,0,0,0,0 monster Isilla 1772,85,5000,0,0
-ra_san02,0,0,0,0 monster Vanberk 1771,30,5000,0,0
-ra_san02,0,0,0,0 monster Gremlin 1632,10,5000,0,0
-ra_san02,0,0,0,0 monster Beholder 1633,10,5000,0,0
-ra_san02,0,0,0,0 monster Hodremlin 1773,3,5000,0,0
-ra_san02,0,0,0,0 monster Seeker 1774,2,5000,0,0
+ra_san02,0,0,0,0 monster Isilla 1772,35,0,0,0
+ra_san02,100,150,92,140 monster Isilla 1772,25,0,0,0
+ra_san02,240,147,50,145 monster Isilla 1772,25,0,0,0
+ra_san02,0,0,0,0 monster Vanberk 1771,10,0,0,0
+ra_san02,100,150,92,140 monster Vanberk 1771,10,0,0,0
+ra_san02,240,147,50,145 monster Vanberk 1771,10,0,0,0
+ra_san02,0,0,0,0 monster Gremlin 1632,10,0,0,0
+ra_san02,0,0,0,0 monster Hodremlin 1773,3,0,0,0
+ra_san02,0,0,0,0 monster Beholder 1633,10,0,0,0
+ra_san02,0,0,0,0 monster Seeker 1774,2,0,0,0
//==================================================
-// ra_san03 - Holy Ground
+// ra_san03
//==================================================
-ra_san03,0,0,0,0 monster Hodremlin 1773,60,5000,0,0
-ra_san03,0,0,0,0 monster Seeker 1774,40,5000,0,0
-ra_san03,0,0,0,0 monster Gremlin 1632,5,5000,0,0
-ra_san03,0,0,0,0 monster Beholder 1633,5,5000,0,0
+ra_san03,0,0,0,0 monster Beholder 1633,5,0,0,0
+ra_san03,0,0,0,0 monster Gremlin 1632,5,0,0,0
+ra_san03,148,221,145,71 monster Seeker 1774,40,0,0,0
+ra_san03,0,0,0,0 monster Hodremlin 1773,20,0,0,0
+ra_san03,148,79,146,71 monster Hodremlin 1773,40,0,0,0
//==================================================
-// ra_san04 - Holy Ground
+// ra_san04
//==================================================
-ra_san04,0,0,0,0 monster Echio 1770,60,5000,0,0
-ra_san04,0,0,0,0 monster Agav 1769,20,5000,0,0
-ra_san04,0,0,0,0 monster Seeker 1774,10,5000,0,0
-ra_san04,0,0,0,0 monster Hodremlin 1773,10,5000,0,0
+ra_san04,0,0,0,0 monster Echio 1770,60,0,0,0
+ra_san04,0,0,0,0 monster Agav 1769,20,0,0,0
+ra_san04,0,0,0,0 monster Seeker 1774,10,0,0,0
+ra_san04,0,0,0,0 monster Hodremlin 1773,10,0,0,0
//==================================================
-// ra_san05 - Holy Ground
+// ra_san05
//==================================================
-ra_san05,0,0,0,0 monster Agav 1769,80,5000,0,0
-ra_san05,0,0,0,0 monster Echio 1770,30,5000,0,0
-ra_san05,0,0,0,0 monster Seeker 1774,20,5000,0,0
-ra_san05,0,0,0,0 monster Hodremlin 1773,20,5000,0,0
-ra_san05,0,0,0,0 monster Isilla 1772,10,5000,0,0
+ra_san05,0,0,0,0 monster Agav 1769,70,0,0,0
+ra_san05,0,0,0,0 monster Echio 1770,20,0,0,0
+ra_san05,0,0,0,0 monster Isilla 1772,10,0,0,0
+ra_san05,0,0,0,0 monster Seeker 1774,20,0,0,0
+ra_san05,0,0,0,0 monster Hodremlin 1773,20,0,0,0
+ra_san05,0,0,0,0 monster Agav 1769,10,18000000,14400000,0
+ra_san05,0,0,0,0 monster Echio 1770,10,18000000,14400000,0
ra_san05,0,0,0,0 boss_monster Gloom Under Night 1768,1,18000000,600000,0
diff --git a/npc/pre-re/mobs/dungeons/tha_t.txt b/npc/pre-re/mobs/dungeons/tha_t.txt
index 681f086d8..c42f0e59b 100644
--- a/npc/pre-re/mobs/dungeons/tha_t.txt
+++ b/npc/pre-re/mobs/dungeons/tha_t.txt
@@ -14,139 +14,169 @@
//============================================================
//==================================================
-// tha_t01 - Thanatos Tower - Lower Level
+// tha_t01 - Thanatos Tower F1
//==================================================
-tha_t01,0,0,0,0 monster Rideword 1195,20,5000,0,0
-tha_t01,0,0,0,0 monster Mimic 1191,20,5000,0,0
-tha_t01,0,0,0,0 monster Plasma 1695,20,5000,0,0
-tha_t01,0,0,0,0 monster Alice 1275,5,5000,0,0
-tha_t01,0,0,0,0 monster Lady Solace 1703,4,5000,0,0
+tha_t01,0,0,0,0 monster Alice 1275,5,0,0,0
+tha_t01,0,0,0,0 monster Plasma 1695,20,0,0,0
+tha_t01,0,0,0,0 monster Rideword 1195,20,0,0,0
+tha_t01,0,0,0,0 monster Mimic 1191,20,0,0,0
+tha_t01,0,0,0,0 monster Lady Solace 1703,4,1800000,1200000,0
//==================================================
-// tha_t02 - Thanatos Tower - Lower Level
+// tha_t02 - Thanatos Tower F2
//==================================================
-tha_t02,0,0,0,0 monster Ancient Mimic 1699,80,5000,0,0
-tha_t02,0,0,0,0 monster Mimic 1191,30,5000,0,0
-tha_t02,0,0,0,0 monster Plasma 1697,20,5000,0,0
-tha_t02,0,0,0,0 monster Death Word 1698,10,5000,0,0
-tha_t02,0,0,0,0 monster Rideword 1195,10,5000,0,0
-tha_t02,0,0,0,0 monster Elder 1377,10,5000,0,0
-tha_t02,0,0,0,0 monster Alice 1275,10,5000,0,0
-tha_t02,0,0,0,0 monster Baroness of Retribution 1702,4,5000,0,0
+tha_t02,0,0,0,0 monster Alice 1275,10,0,0,0
+tha_t02,0,0,0,0 monster Plasma 1697,20,0,0,0
+tha_t02,0,0,0,0 monster Mimic 1191,30,0,0,0
+tha_t02,0,0,0,0 monster Ancient Mimic 1699,80,0,0,0
+tha_t02,0,0,0,0 monster Rideword 1195,10,0,0,0
+tha_t02,0,0,0,0 monster Death Word 1698,10,0,0,0
+tha_t02,0,0,0,0 monster Elder 1377,10,0,0,0
+tha_t02,0,0,0,0 monster Baroness of Retribution 1702,4,1800000,1200000,0
//==================================================
-// tha_t03 - Thanatos Tower - Lower Level
+// tha_t03 - Thanatos Tower F3
//==================================================
-tha_t03,0,0,0,0 monster Death Word 1698,80,5000,0,0
-tha_t03,0,0,0,0 monster Rideword 1195,30,5000,0,0
-tha_t03,0,0,0,0 monster Plasma 1696,20,5000,0,0
-tha_t03,0,0,0,0 monster Mimic 1191,10,5000,0,0
-tha_t03,0,0,0,0 monster Ancient Mimic 1699,10,5000,0,0
-tha_t03,0,0,0,0 monster Elder 1377,10,5000,0,0
-tha_t03,0,0,0,0 monster Mistress of Shelter 1701,4,5000,0,0
+tha_t03,0,0,0,0 monster Plasma 1696,20,0,0,0
+tha_t03,0,0,0,0 monster Rideword 1195,30,0,0,0
+tha_t03,0,0,0,0 monster Death Word 1698,80,0,0,0
+tha_t03,0,0,0,0 monster Mimic 1191,10,0,0,0
+tha_t03,0,0,0,0 monster Ancient Mimic 1699,10,0,0,0
+tha_t03,0,0,0,0 monster Elder 1377,10,0,0,0
+tha_t03,0,0,0,0 monster Mistress of Shelter 1701,4,1800000,1200000,0
//==================================================
-// tha_t04 - Thanatos Tower - Lower Level
-//==================================================
-tha_t04,0,0,0,0 monster Death Word 1698,20,5000,0,0
-tha_t04,0,0,0,0 monster Rideword 1195,20,5000,0,0
-tha_t04,0,0,0,0 monster Mimic 1191,20,5000,0,0
-tha_t04,0,0,0,0 monster Ancient Mimic 1699,20,5000,0,0
-tha_t04,0,0,0,0 monster Elder 1377,20,5000,0,0
-tha_t04,0,0,0,0 monster Plasma 1694,20,5000,0,0
-tha_t04,0,0,0,0 monster Owl Duke 1320,10,5000,0,0
-tha_t04,0,0,0,0 monster Owl Baron 1295,10,5000,0,0
-tha_t04,0,0,0,0 monster Dame of Sentinel 1700,4,5000,0,0
+// tha_t04 - Thanatos Tower F4
+//==================================================
+tha_t04,0,0,0,0 monster Plasma 1694,20,0,0,0
+tha_t04,0,0,0,0 monster Rideword 1195,20,0,0,0
+tha_t04,0,0,0,0 monster Death Word 1698,20,0,0,0
+tha_t04,0,0,0,0 monster Mimic 1191,20,0,0,0
+tha_t04,0,0,0,0 monster Ancient Mimic 1699,20,0,0,0
+tha_t04,0,0,0,0 monster Elder 1377,20,0,0,0
+tha_t04,0,0,0,0 monster Owl Baron 1295,10,0,0,0
+tha_t04,0,0,0,0 monster Owl Duke 1320,10,0,0,0
+tha_t04,0,0,0,0 monster Dame of Sentinel 1700,4,1800000,1200000,0
//==================================================
-// tha_t05 - Thanatos Tower - Upper Level
-//==================================================
-tha_t05,0,0,0,0 monster Owl Duke 1320,80,5000,0,0
-tha_t05,0,0,0,0 monster Death Word 1698,40,5000,0,0
-tha_t05,0,0,0,0 monster Ancient Mimic 1699,40,5000,0,0
-tha_t05,0,0,0,0 monster Owl Baron 1295,20,5000,0,0
-tha_t05,0,0,0,0 monster Elder 1377,20,5000,0,0
-tha_t05,0,0,0,0 monster Plasma 1696,10,5000,0,0
-tha_t05,0,0,0,0 monster Plasma 1695,10,5000,0,0
-tha_t05,0,0,0,0 monster Plasma 1697,10,5000,0,0
-tha_t05,0,0,0,0 monster Plasma 1694,10,5000,0,0
-tha_t05,0,0,0,0 monster Dolor of Thanatos 1707,2,5000,0,0
+// tha_t05 - Thanatos Tower F5
+//==================================================
+tha_t05,61,179,55,55 monster Elder 1377,5,0,0,0
+tha_t05,61,179,55,55 monster Plasma 1697,10,0,0,0
+tha_t05,61,179,55,55 monster Death Word 1698,10,0,0,0
+tha_t05,61,179,55,55 monster Ancient Mimic 1699,10,0,0,0
+tha_t05,61,179,55,55 monster Owl Duke 1320,20,300000,120000,0
+tha_t05,61,179,55,55 monster Owl Baron 1295,5,300000,120000,0
+tha_t05,178,178,55,55 monster Elder 1377,5,0,0,0
+tha_t05,178,178,55,55 monster Plasma 1695,10,0,0,0
+tha_t05,178,178,55,55 monster Death Word 1698,10,0,0,0
+tha_t05,178,178,55,55 monster Ancient Mimic 1699,10,0,0,0
+tha_t05,178,178,55,55 monster Owl Duke 1320,20,300000,120000,0
+tha_t05,178,178,55,55 monster Owl Baron 1295,5,300000,120000,0
+tha_t05,178,63,55,5 monster Elder 1377,5,0,0,0
+tha_t05,178,63,55,55 monster Plasma 1696,10,0,0,0
+tha_t05,178,63,55,55 monster Death Word 1698,10,0,0,0
+tha_t05,178,63,55,55 monster Ancient Mimic 1699,10,0,0,0
+tha_t05,178,63,55,55 monster Owl Duke 1320,20,300000,120000,0
+tha_t05,178,63,55,55 monster Owl Baron 1295,5,300000,120000,0
+tha_t05,62,63,55,55 monster Elder 1377,5,0,0,0
+tha_t05,62,63,55,55 monster Plasma 1694,10,0,0,0
+tha_t05,62,63,55,55 monster Death Word 1698,10,0,0,0
+tha_t05,62,63,55,55 monster Ancient Mimic 1699,10,0,0,0
+tha_t05,62,63,55,55 monster Owl Duke 1320,20,300000,120000,0
+tha_t05,62,63,55,55 monster Owl Baron 1295,5,300000,120000,0
+tha_t05,0,0,0,0 monster Dolor of Thanatos 1707,2,1800000,1200000,0
//==================================================
-// tha_t06 - Thanatos Tower - Upper Level
-//==================================================
-tha_t06,0,0,0,0 monster Death Word 1698,40,5000,0,0
-tha_t06,0,0,0,0 monster Owl Duke 1320,40,5000,0,0
-tha_t06,0,0,0,0 monster Owl Baron 1295,40,5000,0,0
-tha_t06,0,0,0,0 monster Ancient Mimic 1699,40,5000,0,0
-tha_t06,0,0,0,0 monster Elder 1377,20,5000,0,0
-tha_t06,0,0,0,0 monster Plasma 1696,10,5000,0,0
-tha_t06,0,0,0,0 monster Plasma 1695,10,5000,0,0
-tha_t06,0,0,0,0 monster Plasma 1697,10,5000,0,0
-tha_t06,0,0,0,0 monster Plasma 1694,10,5000,0,0
-tha_t06,0,0,0,0 monster Maero of Thanatos 1706,2,5000,0,0
+// tha_t06 - Thanatos Tower F6
+//==================================================
+tha_t06,61,179,55,55 monster Elder 1377,5,0,0,0
+tha_t06,61,179,55,55 monster Plasma 1697,10,0,0,0
+tha_t06,61,179,55,55 monster Death Word 1698,10,0,0,0
+tha_t06,61,179,55,55 monster Ancient Mimic 1699,10,0,0,0
+tha_t06,61,179,55,55 monster Owl Baron 1295,10,300000,120000,0
+tha_t06,61,179,55,55 monster Owl Duke 1320,10,300000,120000,0
+tha_t06,178,178,55,55 monster Elder 1377,5,0,0,0
+tha_t06,178,178,55,55 monster Plasma 1695,10,0,0,0
+tha_t06,178,178,55,55 monster Death Word 1698,10,0,0,0
+tha_t06,178,178,55,55 monster Ancient Mimic 1699,10,0,0,0
+tha_t06,178,178,55,55 monster Owl Baron 1295,10,300000,120000,0
+tha_t06,178,178,55,55 monster Owl Duke 1320,10,300000,120000,0
+tha_t06,178,63,55,55 monster Elder 1377,5,0,0,0
+tha_t06,178,63,55,55 monster Plasma 1696,10,0,0,0
+tha_t06,178,63,55,55 monster Death Word 1698,10,0,0,0
+tha_t06,178,63,55,55 monster Ancient Mimic 1699,10,0,0,0
+tha_t06,178,63,55,55 monster Owl Baron 1295,10,300000,120000,0
+tha_t06,178,63,55,55 monster Owl Duke 1320,10,300000,120000,0
+tha_t06,62,63,55,55 monster Elder 1377,5,0,0,0
+tha_t06,62,63,55,55 monster Plasma 1694,10,0,0,0
+tha_t06,62,63,55,55 monster Death Word 1698,10,0,0,0
+tha_t06,62,63,55,55 monster Ancient Mimic 1699,10,0,0,0
+tha_t06,62,63,55,55 monster Owl Baron 1295,10,300000,120000,0
+tha_t06,62,63,55,55 monster Owl Duke 1320,10,300000,120000,0
+tha_t06,0,0,0,0 monster Maero of Thanatos 1706,2,1800000,1200000,0
//==================================================
-// tha_t07 - Thanatos Tower - Upper Level
+// tha_t07 - Thanatos Tower F7
//==================================================
-tha_t07,0,0,0,0 monster Baroness of Retribution 1702,15,5000,0,0
-tha_t07,0,0,0,0 monster Death Word 1698,10,5000,0,0
-tha_t07,0,0,0,0 monster Ancient Mimic 1699,10,5000,0,0
-tha_t07,0,0,0,0 monster Dame of Sentinel 1700,7,5000,0,0
-tha_t07,0,0,0,0 monster Mistress of Shelter 1701,7,5000,0,0
-tha_t07,0,0,0,0 monster Lady Solace 1703,7,5000,0,0
-tha_t07,0,0,0,0 monster Despero of Thanatos 1705,2,5000,0,0
+tha_t07,70,105,40,75 monster Death Word 1698,10,300000,120000,0
+tha_t07,70,105,40,75 monster Ancient Mimic 1699,10,300000,120000,0
+tha_t07,70,105,40,75 monster Lady Solace 1703,7,300000,120000,0
+tha_t07,70,105,40,75 monster Mistress of Shelter 1701,7,300000,120000,0
+tha_t07,70,105,40,75 monster Baroness of Retribution 1702,15,0,0,0
+tha_t07,70,105,40,75 monster Dame of Sentinel 1700,7,300000,120000,0
+tha_t07,70,105,40,75 monster Despero of Thanatos 1705,2,1800000,1200000,0
//==================================================
-// tha_t08 - Thanatos Tower - Upper Level
+// tha_t08 - Thanatos Tower F8
//==================================================
-tha_t08,0,0,0,0 monster Baroness of Retribution 1702,20,5000,0,0
-tha_t08,0,0,0,0 monster Death Word 1698,10,5000,0,0
-tha_t08,0,0,0,0 monster Ancient Mimic 1699,10,5000,0,0
-tha_t08,0,0,0,0 monster Dame of Sentinel 1700,5,5000,0,0
-tha_t08,0,0,0,0 monster Mistress of Shelter 1701,5,5000,0,0
-tha_t08,0,0,0,0 monster Lady Solace 1703,5,5000,0,0
-tha_t08,0,0,0,0 monster Odium of Thanatos 1704,2,5000,0,0
+tha_t08,70,105,40,80 monster Death Word 1698,10,300000,120000,0
+tha_t08,70,105,40,80 monster Ancient Mimic 1699,10,300000,120000,0
+tha_t08,70,105,40,80 monster Lady Solace 1703,5,0,0,0
+tha_t08,70,105,40,80 monster Mistress of Shelter 1701,5,0,0,0
+tha_t08,70,105,40,80 monster Baroness of Retribution 1702,20,300000,120000,0
+tha_t08,70,105,40,80 monster Dame of Sentinel 1700,5,0,0,0
+tha_t08,70,105,40,80 monster Odium of Thanatos 1704,2,1800000,1200000,0
//==================================================
-// tha_t09 - Thanatos Tower - Upper Level
+// tha_t09 - Thanatos Tower F9
//==================================================
-tha_t09,0,0,0,0 monster Lady Solace 1703,20,5000,0,0
-tha_t09,0,0,0,0 monster Dame of Sentinel 1700,5,5000,0,0
-tha_t09,0,0,0,0 monster Baroness of Retribution 1702,5,5000,0,0
-tha_t09,0,0,0,0 monster Mistress of Shelter 1701,5,5000,0,0
-tha_t09,0,0,0,0 monster Plasma 1694,5,5000,0,0
-tha_t09,0,0,0,0 monster Dolor of Thanatos 1712,3,5000,0,0
-tha_t09,0,0,0,0 monster Dolor of Thanatos 1707,1,5000,0,0
+tha_t09,50,129,35,35 monster Plasma 1694,5,0,0,0
+tha_t09,50,129,35,35 monster Lady Solace 1703,20,600000,0,0
+tha_t09,50,129,35,35 monster Baroness of Retribution 1702,5,420000,0,0
+tha_t09,50,129,35,35 monster Mistress of Shelter 1701,5,420000,0,0
+tha_t09,50,129,35,35 monster Dame of Sentinel 1700,5,420000,0,0
+tha_t09,50,129,35,35 monster Dolor of Thanatos 1707,1,1800000,1200000,0
+tha_t09,50,129,35,35 monster Dolor of Thanatos 1712,3,1800000,1200000,0
//==================================================
-// tha_t10 - Thanatos Tower - Upper Level
+// tha_t10 - Thanatos Tower F10
//==================================================
-tha_t10,0,0,0,0 monster Baroness of Retribution 1702,20,5000,0,0
-tha_t10,0,0,0,0 monster Dame of Sentinel 1700,5,5000,0,0
-tha_t10,0,0,0,0 monster Mistress of Shelter 1701,5,5000,0,0
-tha_t10,0,0,0,0 monster Lady Solace 1703,5,5000,0,0
-tha_t10,0,0,0,0 monster Plasma 1697,5,5000,0,0
-tha_t10,0,0,0,0 monster Maero of Thanatos 1711,3,5000,0,0
-tha_t10,0,0,0,0 monster Maero of Thanatos 1706,1,5000,0,0
+tha_t10,129,129,35,35 monster Plasma 1697,5,0,0,0
+tha_t10,129,129,35,35 monster Baroness of Retribution 1702,20,600000,0,0
+tha_t10,129,129,35,35 monster Lady Solace 1703,5,420000,0,0
+tha_t10,129,129,35,35 monster Mistress of Shelter 1701,5,420000,0,0
+tha_t10,129,129,35,35 monster Dame of Sentinel 1700,5,420000,0,0
+tha_t10,129,129,35,35 monster Maero of Thanatos 1706,1,1800000,1200000,0
+tha_t10,129,129,35,35 monster Maero of Thanatos 1711,3,1800000,1200000,0
//==================================================
-// tha_t11 - Thanatos Tower - Upper Level
+// tha_t11 - Thanatos Tower F11
//==================================================
-tha_t11,0,0,0,0 monster Mistress of Shelter 1701,20,5000,0,0
-tha_t11,0,0,0,0 monster Dame of Sentinel 1700,5,5000,0,0
-tha_t11,0,0,0,0 monster Baroness of Retribution 1702,5,5000,0,0
-tha_t11,0,0,0,0 monster Lady Solace 1703,5,5000,0,0
-tha_t11,0,0,0,0 monster Plasma 1695,5,5000,0,0
-tha_t11,0,0,0,0 monster Despero of Thanatos 1710,3,5000,0,0
-tha_t11,0,0,0,0 monster Despero of Thanatos 1705,1,5000,0,0
+tha_t11,50,51,35,35 monster Plasma 1695,5,0,0,0
+tha_t11,50,51,35,35 monster Mistress of Shelter 1701,20,600000,0,0
+tha_t11,50,51,35,35 monster Lady Solace 1703,5,420000,0,0
+tha_t11,50,51,35,35 monster Baroness of Retribution 1702,5,420000,0,0
+tha_t11,50,51,35,35 monster Dame of Sentinel 1700,5,420000,0,0
+tha_t11,50,51,35,35 monster Despero of Thanatos 1705,1,1800000,1200000,0
+tha_t11,50,51,35,35 monster Despero of Thanatos 1710,3,1800000,1200000,0
//==================================================
-// tha_t12 - Thanatos Tower - Upper Level
+// tha_t12 - Thanatos Tower F12
//==================================================
-tha_t12,0,0,0,0 monster Dame of Sentinel 1700,13,5000,0,0
-tha_t12,0,0,0,0 monster Baroness of Retribution 1702,5,5000,0,0
-tha_t12,0,0,0,0 monster Mistress of Shelter 1701,5,5000,0,0
-tha_t12,0,0,0,0 monster Lady Solace 1703,5,5000,0,0
-tha_t12,0,0,0,0 monster Plasma 1693,5,5000,0,0
-tha_t12,0,0,0,0 monster Odium of Thanatos 1709,4,5000,0,0
+tha_t12,129,51,35,35 monster Plasma 1693,5,0,0,0
+tha_t12,129,51,35,35 monster Dame of Sentinel 1700,13,600000,0,0
+tha_t12,129,51,35,35 monster Lady Solace 1703,5,420000,0,0
+tha_t12,129,51,35,35 monster Mistress of Shelter 1701,5,420000,0,0
+tha_t12,129,51,35,35 monster Baroness of Retribution 1702,5,420000,0,0
+tha_t12,129,51,35,35 monster Odium of Thanatos 1709,4,1800000,1200000,0
diff --git a/npc/pre-re/mobs/dungeons/thor_v.txt b/npc/pre-re/mobs/dungeons/thor_v.txt
index 077ada870..f72abc90c 100644
--- a/npc/pre-re/mobs/dungeons/thor_v.txt
+++ b/npc/pre-re/mobs/dungeons/thor_v.txt
@@ -16,40 +16,53 @@
//= 1.4 Corrected MVP spawn variance. [L0ne_W0lf]
//============================================================
-//==================================================
-// thor_v01 - Thor Volcano Dungeon
-//==================================================
-thor_v01,0,0,0,0 monster Kasa 1833,45,5000,0,0
-thor_v01,0,0,0,0 monster Imp 1837,25,5000,0,0
-thor_v01,0,0,0,0 monster Magmaring 1836,10,5000,0,0
-thor_v01,0,0,0,0 monster Salamander 1831,7,5000,0,0
-thor_v01,0,0,0,0 monster Bow Guardian 1830,5,5000,0,0
-thor_v01,0,0,0,0 monster Sword Guardian 1829,5,5000,0,0
-thor_v01,0,0,0,0 monster Bow Guardian 1830,5,420000,0,0
-thor_v01,0,0,0,0 monster Sword Guardian 1829,5,420000,0,0
-thor_v01,0,0,0,0 monster Byrogue 1839,1,5000,0,0
+// ================= [Thor Volcano - 01] =====================
+thor_v01,0,0,0,0 monster Magmaring 1836,10,0,0,0
+thor_v01,0,0,0,0 monster Fire Imp 1837,5,0,0,0
+thor_v01,0,0,0,0 monster Fire Imp 1837,12,1800000,0,0
+thor_v01,80,255,65,35 monster Fire Imp 1837,2,0,0,0
+thor_v01,240,250,50,30 monster Fire Imp 1837,2,0,0,0
+thor_v01,90,100,50,50 monster Fire Imp 1837,2,0,0,0
+thor_v01,210,110,50,30 monster Fire Imp 1837,2,0,0,0
+thor_v01,0,0,0,0 monster Kasa 1833,25,0,0,0
+thor_v01,80,255,65,35 monster Kasa 1833,5,0,0,0
+thor_v01,240,250,50,30 monster Kasa 1833,5,0,0,0
+thor_v01,90,100,50,50 monster Kasa 1833,5,0,0,0
+thor_v01,210,110,50,30 monster Kasa 1833,5,0,0,0
+thor_v01,0,0,0,0 monster Sword Master 1829,5,420000,0,0
+thor_v01,0,0,0,0 monster Bow Master 1830,5,420000,0,0
+thor_v01,0,0,0,0 monster Salamander 1831,5,3600000,0,0
+thor_v01,0,0,0,0 monster Byorgue 1839,1,3600000,0,0
-//==================================================
-// thor_v02 - Thor Volcano Dungeon
-//==================================================
-thor_v02,0,0,0,0 monster Knocker 1838,55,5000,0,0
-thor_v02,0,0,0,0 monster Magmaring 1836,10,5000,0,0
-thor_v02,0,0,0,0 monster Imp 1837,10,5000,0,0
-thor_v02,0,0,0,0 monster Kaho 1072,10,5000,0,0
-thor_v02,0,0,0,0 monster Salamander 1831,1,5000,0,0
-thor_v02,0,0,0,0 monster Bow Guardian 1830,1,7200000,0,0
-thor_v02,0,0,0,0 monster Sword Guardian 1829,1,7200000,0,0
+// ================= [Thor Volcano - 02] =====================
+thor_v02,0,0,0,0 monster Magmaring 1836,10,0,0,0
+thor_v02,0,0,0,0 monster Fire Imp 1837,5,0,0,0
+thor_v02,75,125,50,85 monster Fire Imp 1837,3,0,0,0
+thor_v02,168,162,50,50 monster Fire Imp 1837,2,0,0,0
+thor_v02,0,0,0,0 monster Kaho 1072,5,0,0,0
+thor_v02,75,125,50,85 monster Kaho 1072,3,0,0,0
+thor_v02,168,162,50,50 monster Kaho 1072,2,0,0,0
+thor_v02,0,0,0,0 monster Knocker 1838,20,0,0,0
+thor_v02,75,125,50,85 monster Knocker 1838,20,0,0,0
+thor_v02,168,162,50,50 monster Knocker 1838,15,0,0,0
+thor_v02,0,0,0,0 monster Salamander 1831,1,18000000,0,0
+thor_v02,0,0,0,0 monster Sword Master 1829,1,7200000,0,0
+thor_v02,0,0,0,0 monster Bow Master 1830,1,7200000,0,0
-//==================================================
-// thor_v03 - Thor Volcano Dungeon
-//==================================================
-thor_v03,0,0,0,0 monster Salamander 1831,60,5000,0,0
-thor_v03,0,0,0,0 monster Kasa 1833,40,5000,0,0
-thor_v03,0,0,0,0 monster Bow Guardian 1830,10,5000,0,0
-thor_v03,0,0,0,0 monster Sword Guardian 1829,10,5000,0,0
-thor_v03,0,0,0,0 monster Byrogue 1839,5,5000,0,0
-thor_v03,0,0,0,0 monster Sword Guardian 1829,5,5000,0,0
-thor_v03,0,0,0,0 monster Bow Guardian 1830,5,5000,0,0
-thor_v03,0,0,0,0 monster Bow Guardian 1830,5,1800000,0,0
-thor_v03,0,0,0,0 monster Sword Guardian 1829,5,1800000,0,0
+// ================= [Thor Volcano - 03] =====================
+thor_v03,0,0,0,0 monster Kasa 1833,16,0,0,0
+thor_v03,95,220,64,55 monster Kasa 1833,6,0,0,0
+thor_v03,223,224,65,60 monster Kasa 1833,6,0,0,0
+thor_v03,80,90,60,60 monster Kasa 1833,6,0,0,0
+thor_v03,218,81,60,60 monster Kasa 1833,6,0,0,0
+thor_v03,0,0,0,0 monster Salamander 1831,20,0,0,0
+thor_v03,95,220,64,55 monster Salamander 1831,10,0,0,0
+thor_v03,223,224,65,60 monster Salamander 1831,10,0,0,0
+thor_v03,80,90,60,60 monster Salamander 1831,10,0,0,0
+thor_v03,218,81,60,60 monster Salamander 1831,10,0,0,0
+thor_v03,0,0,0,0 monster Sword Master 1829,5,0,0,0
+thor_v03,0,0,0,0 monster Sword Master 1829,5,1800000,0,0
+thor_v03,0,0,0,0 monster Bow Master 1830,5,0,0,0
+thor_v03,0,0,0,0 monster Bow Master 1830,5,1800000,0,0
+thor_v03,0,0,0,0 monster Byorgue 1839,5,1800000,0,0
thor_v03,0,0,0,0 boss_monster Ifrit 1832,1,39600000,600000,0
diff --git a/npc/pre-re/mobs/dungeons/treasure.txt b/npc/pre-re/mobs/dungeons/treasure.txt
index e4073cfba..7cc99c9a1 100644
--- a/npc/pre-re/mobs/dungeons/treasure.txt
+++ b/npc/pre-re/mobs/dungeons/treasure.txt
@@ -13,108 +13,146 @@
//============================================================
//==================================================
-// treasure01 - Sunken Ship
+// treasure01 - Sunken Ship F1
//==================================================
-treasure01,0,0,0,0 monster Pirate Skeleton 1071,43,5000,0,0
-treasure01,0,0,0,0 monster Kukre 1070,20,5000,0,0
-treasure01,0,0,0,0 monster Whisper 1179,15,5000,0,0
-treasure01,0,0,0,0 monster Poison Spore 1077,12,5000,0,0
-treasure01,68,66,13,11 monster Hydra 1068,4,180000,90000,1
+treasure01,0,0,0,0 monster Kukre 1070,20,0,0,1
+treasure01,0,0,0,0 monster Whisper 1179,5,0,0,1
+treasure01,0,0,0,0 monster Whisper 1179,5,120000,60000,1
+treasure01,107,39,15,15 monster Poison Spore 1077,3,180000,90000,1
treasure01,107,39,15,15 monster Hydra 1068,1,180000,90000,1
+treasure01,29,38,15,15 monster Poison Spore 1077,3,180000,90000,1
+treasure01,68,66,13,11 monster Hydra 1068,4,180000,90000,1
+treasure01,34,112,17,11 monster Pirate Skeleton 1071,5,180000,90000,1
+treasure01,106,111,9,9 monster Pirate Skeleton 1071,5,180000,90000,1
+treasure01,106,111,9,9 monster Pirate Skeleton 1071,5,180000,90000,1
treasure01,67,161,0,0 monster Hydra 1068,1,263000,100000,1
-treasure01,87,160,0,0 monster Hydra 1068,1,268000,100000,1
-treasure01,76,182,0,0 monster Hydra 1068,1,269000,100000,1
-treasure01,51,160,0,0 monster Hydra 1068,1,270000,100000,1
-treasure01,162,71,0,0 monster Hydra 1068,1,273000,100000,1
-treasure01,88,161,0,0 monster Hydra 1068,1,281000,100000,1
-treasure01,86,161,0,0 monster Hydra 1068,1,285000,100000,1
-treasure01,159,45,0,0 monster Hydra 1068,1,285000,100000,1
-treasure01,69,160,0,0 monster Hydra 1068,1,290000,100000,1
-treasure01,159,40,0,0 monster Hydra 1068,1,290000,100000,1
-treasure01,168,41,0,0 monster Hydra 1068,1,290000,100000,1
treasure01,67,160,0,0 monster Hydra 1068,1,293000,100000,1
-treasure01,165,70,0,0 monster Hydra 1068,1,293000,100000,1
-treasure01,88,160,0,0 monster Hydra 1068,1,296000,100000,1
-treasure01,158,62,0,0 monster Hydra 1068,1,300000,100000,1
-treasure01,159,63,0,0 monster Hydra 1068,1,300000,100000,1
-treasure01,158,63,0,0 monster Hydra 1068,1,300000,100000,1
-treasure01,164,70,0,0 monster Hydra 1068,1,300000,100000,1
-treasure01,163,70,0,0 monster Hydra 1068,1,300000,100000,1
-treasure01,159,62,0,0 monster Hydra 1068,1,300000,100000,1
-treasure01,169,42,0,0 monster Hydra 1068,1,300000,100000,1
-treasure01,169,45,0,0 monster Hydra 1068,1,300000,100000,1
-treasure01,168,43,0,0 monster Hydra 1068,1,300000,100000,1
-treasure01,168,45,0,0 monster Hydra 1068,1,300000,100000,1
-treasure01,159,42,0,0 monster Hydra 1068,1,300000,100000,1
-treasure01,169,40,0,0 monster Hydra 1068,1,300000,100000,1
-treasure01,158,41,0,0 monster Hydra 1068,1,300000,100000,1
-treasure01,158,42,0,0 monster Hydra 1068,1,300000,100000,1
-treasure01,158,44,0,0 monster Hydra 1068,1,300000,100000,1
-treasure01,163,71,0,0 monster Hydra 1068,1,300000,100000,1
+treasure01,68,161,0,0 monster Hydra 1068,1,317000,100000,1
treasure01,68,160,0,0 monster Hydra 1068,1,300000,100000,1
-treasure01,49,160,0,0 monster Hydra 1068,1,300000,100000,1
+treasure01,69,161,0,0 monster Hydra 1068,1,305000,100000,1
+treasure01,69,160,0,0 monster Hydra 1068,1,290000,100000,1
+treasure01,70,161,0,0 monster Hydra 1068,1,302000,100000,1
+treasure01,70,160,0,0 monster Hydra 1068,1,306000,100000,1
+treasure01,48,161,0,0 monster Hydra 1068,1,316000,100000,1
treasure01,48,160,0,0 monster Hydra 1068,1,300000,100000,1
+treasure01,49,161,0,0 monster Hydra 1068,1,310000,100000,1
+treasure01,49,160,0,0 monster Hydra 1068,1,300000,100000,1
+treasure01,50,161,0,0 monster Hydra 1068,1,308000,100000,1
+treasure01,50,160,0,0 monster Hydra 1068,1,301000,100000,1
+treasure01,51,161,0,0 monster Hydra 1068,1,314000,100000,1
+treasure01,51,160,0,0 monster Hydra 1068,1,270000,100000,1
+treasure01,86,161,0,0 monster Hydra 1068,1,285000,100000,1
+treasure01,86,160,0,0 monster Hydra 1068,1,310000,100000,1
treasure01,87,161,0,0 monster Hydra 1068,1,300000,100000,1
+treasure01,87,160,0,0 monster Hydra 1068,1,268000,100000,1
+treasure01,88,161,0,0 monster Hydra 1068,1,281000,100000,1
+treasure01,88,160,0,0 monster Hydra 1068,1,296000,100000,1
treasure01,89,161,0,0 monster Hydra 1068,1,300000,100000,1
+treasure01,89,160,0,0 monster Hydra 1068,1,305000,100000,1
+treasure01,60,182,0,0 monster Hydra 1068,1,313000,100000,1
+treasure01,76,182,0,0 monster Hydra 1068,1,269000,100000,1
+treasure01,82,154,11,9 monster Poison Spore 1077,3,100000,100000,1
+treasure01,54,154,11,9 monster Poison Spore 1077,3,100000,100000,1
+treasure01,58,165,5,5 monster Pirate Skeleton 1071,2,300000,100000,1
+treasure01,69,165,5,5 monster Pirate Skeleton 1071,2,300000,100000,1
+treasure01,79,165,5,5 monster Pirate Skeleton 1071,2,300000,100000,1
+treasure01,150,162,5,5 monster Pirate Skeleton 1071,3,300000,100000,1
treasure01,150,162,5,5 monster Hydra 1068,1,300000,100000,1
+treasure01,163,161,5,5 monster Pirate Skeleton 1071,3,300000,100000,1
treasure01,163,161,5,5 monster Hydra 1068,1,300000,100000,1
-treasure01,163,141,5,5 monster Hydra 1068,1,300000,100000,1
+treasure01,163,151,5,5 monster Pirate Skeleton 1071,3,300000,100000,1
treasure01,163,151,5,5 monster Hydra 1068,1,300000,100000,1
-treasure01,50,160,0,0 monster Hydra 1068,1,301000,100000,1
-treasure01,169,44,0,0 monster Hydra 1068,1,302000,100000,1
-treasure01,158,45,0,0 monster Hydra 1068,1,302000,100000,1
-treasure01,70,161,0,0 monster Hydra 1068,1,302000,100000,1
-treasure01,169,43,0,0 monster Hydra 1068,1,305000,100000,1
-treasure01,158,43,0,0 monster Hydra 1068,1,305000,100000,1
-treasure01,69,161,0,0 monster Hydra 1068,1,305000,100000,1
+treasure01,163,141,5,5 monster Pirate Skeleton 1071,3,300000,100000,1
+treasure01,163,141,5,5 monster Hydra 1068,1,300000,100000,1
+treasure01,162,71,0,0 monster Hydra 1068,1,273000,100000,1
+treasure01,162,70,0,0 monster Hydra 1068,1,314000,100000,1
+treasure01,163,71,0,0 monster Hydra 1068,1,300000,100000,1
+treasure01,163,70,0,0 monster Hydra 1068,1,300000,100000,1
treasure01,164,71,0,0 monster Hydra 1068,1,305000,100000,1
-treasure01,89,160,0,0 monster Hydra 1068,1,305000,100000,1
-treasure01,168,42,0,0 monster Hydra 1068,1,306000,100000,1
-treasure01,70,160,0,0 monster Hydra 1068,1,306000,100000,1
-treasure01,159,41,0,0 monster Hydra 1068,1,306000,100000,1
+treasure01,164,70,0,0 monster Hydra 1068,1,300000,100000,1
treasure01,165,71,0,0 monster Hydra 1068,1,307000,100000,1
+treasure01,165,70,0,0 monster Hydra 1068,1,293000,100000,1
+treasure01,164,59,12,10 monster Whisper 1179,5,300000,100000,1
+treasure01,158,63,0,0 monster Hydra 1068,1,300000,100000,1
+treasure01,159,63,0,0 monster Hydra 1068,1,300000,100000,1
+treasure01,158,62,0,0 monster Hydra 1068,1,300000,100000,1
+treasure01,159,62,0,0 monster Hydra 1068,1,300000,100000,1
+treasure01,160,60,27,19 monster Pirate Skeleton 1071,10,300000,100000,1
+treasure01,158,45,0,0 monster Hydra 1068,1,302000,100000,1
+treasure01,158,44,0,0 monster Hydra 1068,1,300000,100000,1
+treasure01,158,43,0,0 monster Hydra 1068,1,305000,100000,1
+treasure01,158,42,0,0 monster Hydra 1068,1,300000,100000,1
+treasure01,158,41,0,0 monster Hydra 1068,1,300000,100000,1
treasure01,158,40,0,0 monster Hydra 1068,1,307000,100000,1
-treasure01,50,161,0,0 monster Hydra 1068,1,308000,100000,1
-treasure01,49,161,0,0 monster Hydra 1068,1,310000,100000,1
-treasure01,86,160,0,0 monster Hydra 1068,1,310000,100000,1
+treasure01,159,45,0,0 monster Hydra 1068,1,285000,100000,1
treasure01,159,44,0,0 monster Hydra 1068,1,312000,100000,1
-treasure01,169,41,0,0 monster Hydra 1068,1,313000,100000,1
-treasure01,60,182,0,0 monster Hydra 1068,1,313000,100000,1
-treasure01,51,161,0,0 monster Hydra 1068,1,314000,100000,1
-treasure01,168,44,0,0 monster Hydra 1068,1,314000,100000,1
-treasure01,162,70,0,0 monster Hydra 1068,1,314000,100000,1
-treasure01,48,161,0,0 monster Hydra 1068,1,316000,100000,1
-treasure01,68,161,0,0 monster Hydra 1068,1,317000,100000,1
treasure01,159,43,0,0 monster Hydra 1068,1,318000,100000,1
+treasure01,159,42,0,0 monster Hydra 1068,1,300000,100000,1
+treasure01,159,41,0,0 monster Hydra 1068,1,306000,100000,1
+treasure01,159,40,0,0 monster Hydra 1068,1,290000,100000,1
+treasure01,168,45,0,0 monster Hydra 1068,1,300000,100000,1
+treasure01,168,44,0,0 monster Hydra 1068,1,314000,100000,1
+treasure01,168,43,0,0 monster Hydra 1068,1,300000,100000,1
+treasure01,168,42,0,0 monster Hydra 1068,1,306000,100000,1
+treasure01,168,41,0,0 monster Hydra 1068,1,290000,100000,1
treasure01,168,40,0,0 monster Hydra 1068,1,322000,100000,1
+treasure01,169,45,0,0 monster Hydra 1068,1,300000,100000,1
+treasure01,169,44,0,0 monster Hydra 1068,1,302000,100000,1
+treasure01,169,43,0,0 monster Hydra 1068,1,305000,100000,1
+treasure01,169,42,0,0 monster Hydra 1068,1,300000,100000,1
+treasure01,169,41,0,0 monster Hydra 1068,1,313000,100000,1
+treasure01,169,40,0,0 monster Hydra 1068,1,300000,100000,1
//==================================================
-// treasure02 - Sunken Ship
+// treasure02 - Sunken Ship F2
//==================================================
-treasure02,0,0,0,0 monster Penomena 1216,38,5000,0,0
-treasure02,0,0,0,0 monster Pirate Skeleton 1071,20,5000,0,0
-treasure02,0,0,0,0 monster Kukre 1070,20,5000,0,0
-treasure02,0,0,0,0 monster Whisper 1179,14,5000,0,0
-treasure02,0,0,0,0 monster Mimic 1191,8,5000,0,0
-treasure02,0,0,0,0 monster Marionette 1143,1,5000,0,0
-treasure02,0,0,0,0 monster Wanderer 1208,1,5000,0,0
-treasure02,100,136,0,0 monster Hydra 1068,1,300000,100000,1
-treasure02,101,136,0,0 monster Hydra 1068,1,300000,100000,1
-treasure02,102,136,0,0 monster Hydra 1068,1,300000,100000,1
-treasure02,103,136,0,0 monster Hydra 1068,1,300000,100000,1
-treasure02,100,143,0,0 monster Hydra 1068,1,300000,100000,1
-treasure02,101,143,0,0 monster Hydra 1068,1,300000,100000,1
-treasure02,102,143,0,0 monster Hydra 1068,1,300000,100000,1
-treasure02,103,143,0,0 monster Hydra 1068,1,300000,100000,1
-treasure02,103,85,0,0 monster Hydra 1068,1,300000,100000,1
-treasure02,102,85,0,0 monster Hydra 1068,1,300000,100000,1
+treasure02,0,0,0,0 monster Ghostring 1120,1,1980000,1200000,1
+treasure02,0,0,0,0 monster Whisper 1179,5,0,0,0
+treasure02,0,0,0,0 monster Wanderer 1208,1,600000,300000,1
+treasure02,0,0,0,0 monster Penomena 1216,22,300000,120000,1
+treasure02,0,0,0,0 monster Kukre 1070,20,0,0,1
+treasure02,0,0,0,0 monster Pirate Skeleton 1071,5,0,0,1
+treasure02,0,0,0,0 monster Mimic 1191,3,0,0,1
treasure02,95,57,0,0 monster Hydra 1068,1,300000,100000,1
treasure02,96,57,0,0 monster Hydra 1068,1,300000,100000,1
treasure02,101,57,0,0 monster Hydra 1068,1,300000,100000,1
treasure02,102,57,0,0 monster Hydra 1068,1,300000,100000,1
treasure02,107,57,0,0 monster Hydra 1068,1,300000,100000,1
treasure02,108,57,0,0 monster Hydra 1068,1,300000,100000,1
+treasure02,101,50,10,10 monster Penomena 1216,5,300000,100000,1
+treasure02,102,68,13,13 monster Whisper 1179,1,300000,100000,1
+treasure02,102,80,5,5 monster Whisper 1179,1,300000,100000,1
+treasure02,102,88,5,5 monster Whisper 1179,1,300000,100000,1
treasure02,100,85,0,0 monster Hydra 1068,1,300000,100000,1
treasure02,101,85,0,0 monster Hydra 1068,1,300000,100000,1
-treasure02,0,0,0,0 monster Ghostring 1120,1,1980000,1200000,1
+treasure02,102,85,0,0 monster Hydra 1068,1,300000,100000,1
+treasure02,103,85,0,0 monster Hydra 1068,1,300000,100000,1
+treasure02,100,136,0,0 monster Hydra 1068,1,300000,100000,1
+treasure02,101,136,0,0 monster Hydra 1068,1,300000,100000,1
+treasure02,102,136,0,0 monster Hydra 1068,1,300000,100000,1
+treasure02,103,136,0,0 monster Hydra 1068,1,300000,100000,1
+treasure02,100,143,0,0 monster Hydra 1068,1,300000,100000,1
+treasure02,101,143,0,0 monster Hydra 1068,1,300000,100000,1
+treasure02,102,143,0,0 monster Hydra 1068,1,300000,100000,1
+treasure02,103,143,0,0 monster Hydra 1068,1,300000,100000,1
+treasure02,101,150,15,10 monster Whisper 1179,2,200000,100000,1
treasure02,101,151,8,8 boss_monster Drake 1112,1,7200000,600000,1
+treasure02,101,151,10,10 monster Mimic 1191,3,500000,200000,1
+treasure02,101,151,10,10 monster Mimic 1191,2,100000,100000,1
+treasure02,101,151,10,10 monster Penomena 1216,4,100000,100000,1
+treasure02,101,126,2,2 monster Penomena 1216,1,1200000,600000,1
+treasure02,101,135,2,2 monster Penomena 1216,1,60000,200000,1
+treasure02,38,74,9,9 monster Pirate Skeleton 1071,3,300000,100000,1
+treasure02,38,74,9,9 monster Penomena 1216,5,300000,100000,1
+treasure02,170,71,1,1 monster Pirate Skeleton 1071,1,100000,100000,1
+treasure02,168,77,1,1 monster Pirate Skeleton 1071,1,100000,100000,1
+treasure02,164,67,1,1 monster Pirate Skeleton 1071,1,100000,100000,1
+treasure02,155,43,21,13 monster Pirate Skeleton 1071,6,300000,100000,1
+treasure02,178,143,1,1 monster Pirate Skeleton 1071,1,300000,100000,1
+treasure02,178,140,1,1 monster Pirate Skeleton 1071,1,300000,100000,1
+treasure02,184,143,1,1 monster Pirate Skeleton 1071,1,300000,100000,1
+treasure02,157,143,1,1 monster Whisper 1179,1,100000,100000,1
+treasure02,151,138,1,1 monster Whisper 1179,1,100000,100000,1
+treasure02,45,144,1,1 monster Whisper 1179,1,200000,100000,1
+treasure02,52,139,1,1 monster Whisper 1179,1,200000,100000,1
+treasure02,23,142,1,1 monster Marionette 1143,1,200000,100000,1
diff --git a/npc/pre-re/mobs/dungeons/tur_dun.txt b/npc/pre-re/mobs/dungeons/tur_dun.txt
index 467bee819..3905c4616 100644
--- a/npc/pre-re/mobs/dungeons/tur_dun.txt
+++ b/npc/pre-re/mobs/dungeons/tur_dun.txt
@@ -13,40 +13,60 @@
//==================================================
// tur_dun01 - Turtle Island
//==================================================
-tur_dun01,0,0,0,0 monster Dragon Tail 1321,25,5000,0,0
-tur_dun01,0,0,0,0 monster Spring Rabbit 1322,25,5000,0,0
-tur_dun01,0,0,0,0 monster Pest 1256,15,5000,0,0
-tur_dun01,0,0,0,0 monster Thara Frog 1034,10,5000,0,0
-tur_dun01,0,0,0,0 monster Permeter 1314,10,5000,0,0
+tur_dun01,0,0,0,0 monster Dragon Tail 1321,25,0,0,0
+tur_dun01,0,0,0,0 monster Spring Rabbit 1322,25,0,0,0
+tur_dun01,0,0,0,0 monster Thara Frog 1034,10,0,0,0
+tur_dun01,0,0,0,0 monster Permeter 1314,10,0,0,0
+tur_dun01,0,0,0,0 monster Pest 1256,15,0,0,0
//==================================================
// tur_dun02 - Turtle Island Dungeon
//==================================================
-tur_dun02,0,0,0,0 monster Solider 1316,40,5000,0,0
-tur_dun02,0,0,0,0 monster Permeter 1314,40,5000,0,0
-tur_dun02,0,0,0,0 monster Freezer 1319,20,5000,0,0
-tur_dun02,0,0,0,0 monster Pest 1256,15,5000,0,0
+tur_dun02,0,0,0,0 monster Permeter 1314,40,0,0,0
+tur_dun02,0,0,0,0 monster Solider 1316,40,0,0,0
+tur_dun02,0,0,0,0 monster Freezer 1319,20,0,0,0
+tur_dun02,0,0,0,0 monster Pest 1256,15,0,0,0
//==================================================
// tur_dun03 - Good Turtles Village
//==================================================
-tur_dun03,0,0,0,0 monster Freezer 1319,40,5000,0,0
-tur_dun03,0,0,0,0 monster Assaulter 1315,35,5000,0,0
-tur_dun03,0,0,0,0 monster Permeter 1314,15,5000,0,0
-tur_dun03,0,0,0,0 monster Heater 1318,10,5000,0,0
+tur_dun03,0,0,0,0 monster Permeter 1314,15,0,0,0
+tur_dun03,0,0,0,0 monster Freezer 1319,40,0,0,0
+tur_dun03,0,0,0,0 monster Assaulter 1315,35,0,0,0
+tur_dun03,0,0,0,0 monster Heater 1318,10,50000,0,0
//==================================================
// tur_dun04 - Turtle Palace
//==================================================
-tur_dun04,0,0,0,0 monster Assaulter 1315,41,5000,0,0
-tur_dun04,0,0,0,0 monster Heater 1318,33,5000,0,0
-tur_dun04,0,0,0,0 monster Freezer 1319,15,5000,0,0
-tur_dun04,0,0,0,0 monster Permeter 1314,4,5000,0,0
+tur_dun04,99,92,10,10 monster Wanderer 1208,1,60000,30000,0
tur_dun04,99,93,20,20 boss_monster Turtle General 1312,1,3600000,600000,0
+tur_dun04,100,93,20,20 monster Heater 1318,3,120000,60000,0
+tur_dun04,100,93,20,20 monster Assaulter 1315,10,120000,60000,0
+tur_dun04,100,93,20,20 monster Freezer 1319,5,120000,60000,0
+tur_dun04,171,159,3,3 monster Wanderer 1208,1,300000,150000,0
+tur_dun04,171,155,3,3 monster Assaulter 1315,1,310000,160000,0
+tur_dun04,171,149,3,3 monster Assaulter 1315,1,320000,170000,0
+tur_dun04,28,159,3,3 monster Wanderer 1208,1,300000,150000,0
+tur_dun04,28,155,3,3 monster Assaulter 1315,1,310000,160000,0
+tur_dun04,28,149,3,3 monster Assaulter 1315,1,320000,170000,0
+tur_dun04,174,26,3,3 monster Wanderer 1208,1,300000,150000,0
+tur_dun04,174,29,3,3 monster Assaulter 1315,1,310000,160000,0
+tur_dun04,174,32,3,3 monster Assaulter 1315,1,320000,170000,0
+tur_dun04,26,26,3,3 monster Wanderer 1208,1,300000,150000,0
+tur_dun04,26,29,3,3 monster Assaulter 1315,1,310000,160000,0
+tur_dun04,26,32,3,3 monster Assaulter 1315,1,320000,170000,0
+tur_dun04,0,0,0,0 monster Wanderer 1208,2,0,0,0
+tur_dun04,0,0,0,0 monster Heater 1318,10,300000,150000,0
+tur_dun04,0,0,0,0 monster Heater 1318,20,620000,310000,0
+tur_dun04,0,0,0,0 monster Assaulter 1315,23,0,0,0
+tur_dun04,0,0,0,0 monster Freezer 1319,5,300000,150000,0
+tur_dun04,0,0,0,0 monster Freezer 1319,5,600000,300000,0
+tur_dun04,0,0,0,0 monster Permeter 1314,2,300000,150000,0
+tur_dun04,0,0,0,0 monster Permeter 1314,2,640000,320000,0
//==================================================
-// tur_dun05 - Underground Swamp Zone
+// tur_dun05 - Underground swamp zone
//==================================================
-tur_dun05,0,0,0,0 monster Freezer 1319,5,5000,0,0
-tur_dun05,0,0,0,0 monster Permeter 1314,3,5000,0,0
-tur_dun05,0,0,0,0 monster Assaulter 1315,1,5000,0,0
+tur_dun05,0,0,0,0 monster Permeter 1314,3,20000,0,0
+tur_dun05,0,0,0,0 monster Freezer 1319,5,30000,0,0
+tur_dun05,0,0,0,0 monster Assaulter 1315,1,20000,0,0
diff --git a/npc/pre-re/mobs/dungeons/um_dun.txt b/npc/pre-re/mobs/dungeons/um_dun.txt
index 1d9488eea..e245c6d88 100644
--- a/npc/pre-re/mobs/dungeons/um_dun.txt
+++ b/npc/pre-re/mobs/dungeons/um_dun.txt
@@ -5,7 +5,7 @@
//===== Current Version: =====================================
//= 1.4
//===== Compatible With: =====================================
-//= Any rAthena Version; RO Ep6+
+//= Any Athena Version
//===== Additional Comments: =================================
//= 1.2 Official kRO 10.1 spawns [Playtester]
//= 1.3 Some 11.1 spawn updates [Playtester]
diff --git a/npc/pre-re/mobs/dungeons/xmas_dun.txt b/npc/pre-re/mobs/dungeons/xmas_dun.txt
index eeca02eef..420efcdf9 100644
--- a/npc/pre-re/mobs/dungeons/xmas_dun.txt
+++ b/npc/pre-re/mobs/dungeons/xmas_dun.txt
@@ -16,13 +16,13 @@
//==================================================
// xmas_dun01 - Toy Factory Warehouse
//==================================================
-xmas_dun01,0,0,0,0 monster Cookie 1265,40,5000,0,0
-xmas_dun01,0,0,0,0 monster Christmas Cookie 1246,40,5000,0,0
-xmas_dun01,0,0,0,0 monster Marin 1242,20,5000,0,0
-xmas_dun01,0,0,0,0 monster Poporing 1031,20,5000,0,0
-xmas_dun01,0,0,0,0 monster Drops 1113,10,5000,0,0
-xmas_dun01,0,0,0,0 monster Poring 1002,10,5000,0,0
-xmas_dun01,0,0,0,0 monster Myst Case 1249,5,5000,0,0
+xmas_dun01,0,0,0,0 monster Marin 1242,20,0,0,0
+xmas_dun01,0,0,0,0 monster Poring 1002,10,0,0,0
+xmas_dun01,0,0,0,0 monster Drops 1113,10,0,0,0
+xmas_dun01,0,0,0,0 monster Poporing 1031,20,0,0,0
+xmas_dun01,0,0,0,0 monster Cookie 1265,40,0,0,0
+xmas_dun01,0,0,0,0 monster Christmas Cookie 1246,40,0,0,0
+xmas_dun01,0,0,0,0 monster Myst Case 1249,5,0,0,0
xmas_dun01,0,0,0,0 monster Chepet 1250,1,1200000,900000,0
xmas_dun01,0,0,0,0 monster Mastering 1090,1,1800000,900000,0
xmas_dun01,0,0,0,0 monster Angeling 1096,1,3600000,1800000,0
@@ -30,8 +30,9 @@ xmas_dun01,0,0,0,0 monster Angeling 1096,1,3600000,1800000,0
//==================================================
// xmas_dun02 - Toy Monitoring Room
//==================================================
-xmas_dun02,0,0,0,0 monster Myst Case 1249,50,5000,0,0
-xmas_dun02,0,0,0,0 monster Cruiser 1248,35,5000,0,0
-xmas_dun02,0,0,0,0 monster Cookie 1265,20,5000,0,0
-xmas_dun02,0,0,0,0 monster Christmas Cookie 1246,20,5000,0,0
+xmas_dun02,0,0,0,0 monster Christmas Cookie 1246,20,0,0,0
+xmas_dun02,0,0,0,0 monster Cookie 1265,20,0,0,0
+xmas_dun02,0,0,0,0 monster Cruiser 1248,35,0,0,0
+xmas_dun02,0,0,0,0 monster Myst Case 1249,50,0,0,0
+xmas_dun02,0,0,0,0 monster Garm Baby 1515,1,1800000,0,0
xmas_dun02,0,0,0,0 boss_monster Stormy Knight 1251,1,3600000,600000,0