summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKisuka <Kisuka@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-03-22 09:45:13 +0000
committerKisuka <Kisuka@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-03-22 09:45:13 +0000
commit2f9dc9aed3864bafe2743c3da9282692ba713dbf (patch)
tree9fe7317d921df5091506927f42ee264c4bd537e8
parent168677929dc43930a81a49a54d748a3b2298a811 (diff)
downloadhercules-2f9dc9aed3864bafe2743c3da9282692ba713dbf.tar.gz
hercules-2f9dc9aed3864bafe2743c3da9282692ba713dbf.tar.bz2
hercules-2f9dc9aed3864bafe2743c3da9282692ba713dbf.tar.xz
hercules-2f9dc9aed3864bafe2743c3da9282692ba713dbf.zip
- AEGIS Conversion of Mob Spawns.
- Added 3rd class blanks / skeletons. - Added Brasilis and Dicastes mob spawns (disabled until episode is added). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14755 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--conf/msg_athena.conf28
-rw-r--r--db/const.txt77
-rw-r--r--db/exp.txt4
-rw-r--r--db/mob_db.txt4
-rw-r--r--npc/mobs/citycleaners.txt14
-rw-r--r--npc/mobs/dungeons/abbey.txt143
-rw-r--r--npc/mobs/dungeons/abyss.txt67
-rw-r--r--npc/mobs/dungeons/alde_dun.txt55
-rw-r--r--npc/mobs/dungeons/ama_dun.txt32
-rw-r--r--npc/mobs/dungeons/anthell.txt163
-rw-r--r--npc/mobs/dungeons/ayo_dun.txt16
-rw-r--r--npc/mobs/dungeons/beach_dun.txt30
-rw-r--r--npc/mobs/dungeons/bra_dun.txt34
-rw-r--r--npc/mobs/dungeons/c_tower.txt104
-rw-r--r--npc/mobs/dungeons/dic_dun.txt30
-rw-r--r--npc/mobs/dungeons/ein_dun.txt28
-rw-r--r--npc/mobs/dungeons/gef_dun.txt72
-rw-r--r--npc/mobs/dungeons/gefenia.txt112
-rw-r--r--npc/mobs/dungeons/glastheim.txt278
-rw-r--r--npc/mobs/dungeons/gld_dun.txt38
-rw-r--r--npc/mobs/dungeons/gld_dunSE.txt22
-rw-r--r--npc/mobs/dungeons/gon_dun.txt36
-rw-r--r--npc/mobs/dungeons/ice_dun.txt57
-rw-r--r--npc/mobs/dungeons/in_sphinx.txt54
-rw-r--r--npc/mobs/dungeons/iz_dun.txt133
-rw-r--r--npc/mobs/dungeons/juperos.txt70
-rw-r--r--npc/mobs/dungeons/kh_dun.txt71
-rw-r--r--npc/mobs/dungeons/lhz_dun.txt319
-rw-r--r--npc/mobs/dungeons/lou_dun.txt36
-rw-r--r--npc/mobs/dungeons/mag_dun.txt37
-rw-r--r--npc/mobs/dungeons/mjo_dun.txt31
-rw-r--r--npc/mobs/dungeons/moc_pryd.txt64
-rw-r--r--npc/mobs/dungeons/mosk_dun.txt42
-rw-r--r--npc/mobs/dungeons/nyd_dun.txt19
-rw-r--r--npc/mobs/dungeons/odin.txt66
-rw-r--r--npc/mobs/dungeons/orcsdun.txt31
-rw-r--r--npc/mobs/dungeons/pay_dun.txt172
-rw-r--r--npc/mobs/dungeons/prt_maze.txt69
-rw-r--r--npc/mobs/dungeons/prt_sew.txt58
-rw-r--r--npc/mobs/dungeons/ra_san.txt84
-rw-r--r--npc/mobs/dungeons/tha_t.txt240
-rw-r--r--npc/mobs/dungeons/thor_v.txt77
-rw-r--r--npc/mobs/dungeons/treasure.txt192
-rw-r--r--npc/mobs/dungeons/tur_dun.txt62
-rw-r--r--npc/mobs/dungeons/um_dun.txt56
-rw-r--r--npc/mobs/dungeons/xmas_dun.txt25
-rw-r--r--npc/mobs/fields/amatsu.txt28
-rw-r--r--npc/mobs/fields/ayothaya.txt14
-rw-r--r--npc/mobs/fields/brasilis.txt22
-rw-r--r--npc/mobs/fields/comodo.txt84
-rw-r--r--npc/mobs/fields/dicastes.txt28
-rw-r--r--npc/mobs/fields/einbroch.txt73
-rw-r--r--npc/mobs/fields/geffen.txt173
-rw-r--r--npc/mobs/fields/gonryun.txt10
-rw-r--r--npc/mobs/fields/hugel.txt50
-rw-r--r--npc/mobs/fields/jawaii.txt16
-rw-r--r--npc/mobs/fields/lighthalzen.txt35
-rw-r--r--npc/mobs/fields/louyang.txt8
-rw-r--r--npc/mobs/fields/lutie.txt8
-rw-r--r--npc/mobs/fields/manuk.txt34
-rw-r--r--npc/mobs/fields/mjolnir.txt82
-rw-r--r--npc/mobs/fields/morocc.txt147
-rw-r--r--npc/mobs/fields/moscovia.txt12
-rw-r--r--npc/mobs/fields/niflheim.txt179
-rw-r--r--npc/mobs/fields/payon.txt73
-rw-r--r--npc/mobs/fields/prontera.txt124
-rw-r--r--npc/mobs/fields/rachel.txt84
-rw-r--r--npc/mobs/fields/splendide.txt23
-rw-r--r--npc/mobs/fields/umbala.txt49
-rw-r--r--npc/mobs/fields/veins.txt53
-rw-r--r--npc/mobs/fields/yuno.txt88
-rw-r--r--npc/scripts_monsters.conf5
-rw-r--r--src/common/mmo.h59
-rw-r--r--src/map/atcommand.c179
-rw-r--r--src/map/map.h66
-rw-r--r--src/map/pc.c337
76 files changed, 2684 insertions, 2911 deletions
diff --git a/conf/msg_athena.conf b/conf/msg_athena.conf
index 1d88c076a..973c3b885 100644
--- a/conf/msg_athena.conf
+++ b/conf/msg_athena.conf
@@ -530,7 +530,33 @@
620: Ninja
621: Summer
//...
-650: Unknown Job
+625: Rune Knight
+626: Warlock
+627: Ranger
+628: Arch Bishop
+629: Mechanic
+630: Guillotine Cross
+631: Royal Guard
+632: Sorcerer
+633: Minstrel
+634: Wanderer
+635: Sura
+636: Genetic
+637: Shadow Chaser
+638: Baby Rune Knight
+639: Baby Warlock
+640: Baby Ranger
+641: Baby Arch Bishop
+642: Baby Mechanic
+643: Baby Guillotine Cross
+644: Baby Royal Guard
+645: Baby Sorcerer
+646: Baby Minstrel
+647: Baby Wanderer
+648: Baby Sura
+649: Baby Genetic
+650: Baby Shadow Chaser
+651: Unknown Job
//Custom translations
import: conf/import/msg_conf.txt
diff --git a/db/const.txt b/db/const.txt
index 6594c0391..32c2b5fab 100644
--- a/db/const.txt
+++ b/db/const.txt
@@ -86,45 +86,64 @@ Job_Ranger 4056
Job_Archbishop 4057
Job_Mechanic 4058
Job_Guillotine_Cross 4059
+
Job_Rune_Knight_H 4060
Job_Warlock_H 4061
-Job_RANGER_H 4062
+Job_Ranger_H 4062
Job_Archbishop_H 4063
Job_Mechanic_H 4064
Job_Guillotine_Cross_H 4065
+
Job_Royal_Guard 4066
Job_Sorcerer 4067
Job_Minstrel 4068
-Job_Wandrer 4069
+Job_Wanderer 4069
Job_Sura 4070
Job_Genetic 4071
Job_Shadow_Chaser 4072
+
Job_Royal_Guard_H 4073
Job_Sorcerer_H 4074
Job_Minstrel_H 4075
-Job_Wandrer_H 4076
+Job_Wanderer_H 4076
Job_Sura_H 4077
Job_Genetic_H 4078
Job_Shadow_Chaser_H 4079
-Job_Rune_Knight_B 4096
-Job_Warlock_B 4097
-Job_RANGER_B 4098
-Job_Archbishop_B 4099
-Job_Mechanic_B 4100
-Job_Guillotine_Cross_B 4101
-Job_Royal_Guard_B 4102
-Job_Sorcerer_B 4103
-Job_Minstrel_B 4104
-Job_Wandrer_B 4105
-Job_Sura_B 4106
-Job_Genetic_B 4107
-Job_Shadow_Chaser_B 4108
+
+Job_Rune_Knight2 4080
+Job_Rune_Knight_H2 4081
+Job_Royal_Guard2 4082
+Job_Royal_Guard_H2 4083
+Job_Ranger2 4084
+Job_Ranger_H2 4085
+Job_Mechanic2 4086
+Job_Mechanic_H2 4087
+
+Job_Baby_Rune 4096
+Job_Baby_Warlock 4097
+Job_Baby_Ranger 4098
+Job_Baby_Bishop 4099
+Job_Baby_Mechanic 4100
+Job_Baby_Cross 4101
+Job_Baby_Guard 4102
+Job_Baby_Sorcerer 4103
+Job_Baby_Minstrel 4104
+Job_Baby_Wanderer 4105
+Job_Baby_Sura 4106
+Job_Baby_Genetic 4107
+Job_Baby_Chaser 4108
+
+Job_Baby_Rune2 4109
+Job_Baby_Guard2 4110
+Job_Baby_Ranger2 4111
+Job_Baby_Mechanic2 4112
EAJL_2_1 0x100
EAJL_2_2 0x200
EAJL_2 0x300
EAJL_UPPER 0x1000
EAJL_BABY 0x2000
+EAJL_3 0x4000
EAJ_UPPERMASK 0x0fff
EAJ_BASEMASK 0x00ff
@@ -156,6 +175,32 @@ EAJ_ALCHEMIST 0x205
EAJ_ROGUE 0x206
EAJ_SOUL_LINKER 0x207
+EAJ_RUNE_KNIGHT 0x4101
+EAJ_WARLOCK 0x4102
+EAJ_RANGER 0x4103
+EAJ_ARCHBISHOP 0x4104
+EAJ_MECHANIC 0x4105
+EAJ_GUILLOTINE_CROSS 0x4106
+EAJ_ROYAL_GUARD 0x4201
+EAJ_SORCERER 0x4202
+EAJ_MINSTRELWANDERER 0x4203
+EAJ_SURA 0x4204
+EAJ_GENETIC 0x4205
+EAJ_SHADOW_CHASER 0x4206
+
+EAJ_RUNE_KNIGHT_H 0x5101
+EAJ_WARLOCK_H 0x5102
+EAJ_RANGER_H 0x5103
+EAJ_ARCHBISHOP_H 0x5104
+EAJ_MECHANIC_H 0x5105
+EAJ_GUILLOTINE_CROSS_H 0x5106
+EAJ_ROYAL_GUARD_H 0x5201
+EAJ_SORCERER_H 0x5202
+EAJ_MINSTRELWANDERER_H 0x5203
+EAJ_SURA_H 0x5204
+EAJ_GENETIC_H 0x5205
+EAJ_SHADOW_CHASER_H 0x5206
+
EAJ_NOVICE_HIGH 0x1000
EAJ_SWORDMAN_HIGH 0x1001
EAJ_MAGE_HIGH 0x1002
diff --git a/db/exp.txt b/db/exp.txt
index dfa3586d7..c8add8ad0 100644
--- a/db/exp.txt
+++ b/db/exp.txt
@@ -5,7 +5,7 @@
//Base - Adv Jobs
99,4001:4002:4003:4004:4005:4006:4007:4008:4009:4010:4011:4012:4013:4014:4015:4016:4017:4018:4019:4020:4021:4022,0,660,1080,1800,2640,3840,4560,5040,5460,6000,6600,7200,7320,4620,8040,8820,9600,10080,10560,11040,12610,13390,14300,15340,16900,18460,19500,20800,22100,23400,24700,26000,27300,28600,30160,31200,33800,35750,37700,39000,44100,46200,47600,50400,52500,53200,56000,58800,62300,65800,68600,71400,74200,77000,79800,82600,86100,88200,91000,96800,103500,105000,109500,115500,120000,126000,132000,136500,142500,165000,192000,210000,232500,244500,255000,270000,282000,292500,300000,345000,416000,480000,560000,640000,768000,880000,960000,1088000,1200000,1440000,1700000,2040000,2550000,3060000,3570000,4080000,4760000,5610000,6800000
//Base - 3rd Jobs
-//150,4054:4055:4056:4057:4058:4059:4060:4061:4062:4063:4064:4065:4066:4067:4068:4069:4070:4071:4072:4073:4074:4075:4076:4077:4078:4079:4096:4097:4098:4099:4100:4101:4102:4103:4104:4105:4106:4107:4108,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7070000,7400000,7770000,8150000,8550000,9100000,9610000,10150000,10570000,11180000,12000000,12930000,13150000,14030000,14420000,15420000,15420000,15670000,16870000,17140000,18720000,19020000,20590000,20930000,22690000,23310000,25290000,26020000,27860000,28535000,30990000,31680000,33560000,34942000,36372000,38350000,39890000,41545000,43330000,45400000,48100000,50410000,53370000,56250000,59230000,62590000,66120000,70200000,75330000,81100000,95000000
+150,4054:4055:4056:4057:4058:4059:4060:4061:4062:4063:4064:4065:4066:4067:4068:4069:4070:4071:4072:4073:4074:4075:4076:4077:4078:4079:4080:4081:4082:4083:4084:4085:4086:4087:4096:4097:4098:4099:4100:4101:4102:4103:4104:4105:4106:4107:4108:4109:4110:4111:4112,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7070000,7400000,7770000,8150000,8550000,9100000,9610000,10150000,10570000,11180000,12000000,12930000,13150000,14030000,14420000,15420000,15420000,15670000,16870000,17140000,18720000,19020000,20590000,20930000,22690000,23310000,25290000,26020000,27860000,28535000,30990000,31680000,33560000,34942000,36372000,38350000,39890000,41545000,43330000,45400000,48100000,50410000,53370000,56250000,59230000,62590000,66120000,70200000,75330000,81100000,95000000
//Job - Novice
10,0:4023,1,10,18,28,40,91,151,205,268,340
//Job - 1st Classes
@@ -25,4 +25,4 @@
//Job - Ninja/Gunslinger
70,24:25,1,200,300,400,600,700,1000,1200,1400,1700,1900,2400,2700,3200,3600,4200,4900,5500,6100,6900,7700,8400,9300,10100,11100,12100,13000,14600,16100,17500,18600,21500,23300,24700,27000,29000,30000,32400,35000,38100,41100,44000,46700,49600,52500,55600,58900,62700,65500,69200,72300,81200,84100,89300,95500,100900,107800,114900,120700,128600,150500,176900,196100,219600,234200,247900,266400,281300,296600,308000
//Job - 3rd Classes
-//50,4054:4055:4056:4057:4058:4059:4060:4061:4062:4063:4064:4065:4066:4067:4068:4069:4070:4071:4072:4073:4074:4075:4076:4077:4078:4079:4096:4097:4098:4099:4100:4101:4102:4103:4104:4105:4106:4107:4108,1,112000,355000,15000,917000,1253000,1595000,2007000,2430000,2868000,3420000,3863000,4504000,4998000,5769000,6321000,7254000,7870000,9015000,9530000,11072000,11848000,13467000,14337000,16243000,17216000,19446000,20781000,23070000,24453000,27568000,29118000,31820000,34125000,37048000,40204000,42972000,45937000,49110000,52696000,57158000,61305000,67167000,72285000,77646000,83624000,91113000,98548000,107630000,119077000
+50,4054:4055:4056:4057:4058:4059:4060:4061:4062:4063:4064:4065:4066:4067:4068:4069:4070:4071:4072:4073:4074:4075:4076:4077:4078:4079:4080:4081:4082:4083:4084:4085:4086:4087:4096:4097:4098:4099:4100:4101:4102:4103:4104:4105:4106:4107:4108:4109:4110:4111:4112,1,112000,355000,15000,917000,1253000,1595000,2007000,2430000,2868000,3420000,3863000,4504000,4998000,5769000,6321000,7254000,7870000,9015000,9530000,11072000,11848000,13467000,14337000,16243000,17216000,19446000,20781000,23070000,24453000,27568000,29118000,31820000,34125000,37048000,40204000,42972000,45937000,49110000,52696000,57158000,61305000,67167000,72285000,77646000,83624000,91113000,98548000,107630000,119077000
diff --git a/db/mob_db.txt b/db/mob_db.txt
index 63c94fff6..6cf017e93 100644
--- a/db/mob_db.txt
+++ b/db/mob_db.txt
@@ -1100,9 +1100,9 @@
//2044,MAGICDECOY_WATER,Magic Decoy,Magic Decoy,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
//2045,MAGICDECOY_EARTH,Magic Decoy,Magic Decoy,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
//2046,MAGICDECOY_WIND,Magic Decoy,Magic Decoy,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-//2047,W_NAGA,Naga,Naga,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+2047,W_NAGA,Naga,Naga,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
//2048,W_PINGUICULA_D,Dark Pinguicula,Dark Pinguicula,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-//2049,W_BRADIUM_GOLEM,Bradium Golem,Bradium Golem,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+2049,W_BRADIUM_GOLEM,Bradium Golem,Bradium Golem,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
//2050,W_AQUA_ELEMENTAL,Aqua Elemental,Aqua Elemental,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
//2051,E_BAPHOMET,Baphomet,Baphomet,1,1,0,0,0,1,1,2,1,0,1,1,1,1,1,1,10,12,2,6,20,0x120,100,768,768,576,0,0,0,0,0,0,0,0,12396,5000,12397,5000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
//2052,E_DARK_LORD,Dark Lord,Dark Lord,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
diff --git a/npc/mobs/citycleaners.txt b/npc/mobs/citycleaners.txt
index 62c0d723b..b479fdae7 100644
--- a/npc/mobs/citycleaners.txt
+++ b/npc/mobs/citycleaners.txt
@@ -15,6 +15,9 @@
//= 1.1 Added other city spawns [Playtester]
//============================================================
+//==================================================
+// Wild Rose City Spawns
+//==================================================
prontera,0,0,0,0 monster Wild Rose 1261,1,7200000,3600000,0
morocc,0,0,0,0 monster Wild Rose 1261,1,7200000,3600000,0
alberta,0,0,0,0 monster Wild Rose 1261,1,7200000,3600000,0
@@ -24,12 +27,19 @@ payon,0,0,0,0 monster Wild Rose 1261,1,7200000,3600000,0
comodo,0,0,0,0 monster Wild Rose 1261,1,7200000,3600000,0
izlude,0,0,0,0 monster Wild Rose 1261,1,7200000,3600000,0
yuno,0,0,0,0 monster Wild Rose 1261,1,7200000,3600000,0
+einbroch,0,0,0,0 monster Wild Rose 1261,1,7200000,3600000,0
+lighthalzen,0,0,0,0 monster Wild Rose 1261,1,7200000,3600000,0
+hugel,0,0,0,0 monster Wild Rose 1261,1,7200000,3600000,0
umbala,0,0,0,0 monster Wild Rose 1261,1,7200000,3600000,0
amatsu,0,0,0,0 monster Wild Rose 1261,1,7200000,3600000,0
gonryun,0,0,0,0 monster Wild Rose 1261,1,7200000,3600000,0
+louyang,0,0,0,0 monster Wild Rose 1261,1,7200000,3600000,0
+ayothaya,0,0,0,0 monster Wild Rose 1261,1,7200000,3600000,0
+moscovia,0,0,0,0 monster Wild Rose 1261,1,7200000,3600000,0
+brasilis,0,0,0,0 monster Wild Rose 1261,1,7200000,3600000,0
//==================================================
-// einbech - Einbech, The Mining Village
+// einbech - Einbech, the Mining Village
//==================================================
einbech,0,0,0,0 monster Wild Rose 1261,1,3600000,3000000,0
einbech,0,0,0,0 monster Tarou 1175,5,1800000,1500000,0
@@ -37,4 +47,4 @@ einbech,0,0,0,0 monster Tarou 1175,5,1800000,1500000,0
//==================================================
// payon_in02 - Inside Payon
//==================================================
-payon_in02,23,68,5,5 monster Thief Bug 1051,7,1200000,600000,0
+payon_in02,23,68,5,5 monster Thief Bug Egg 1048,7,1200000,600000,0 \ No newline at end of file
diff --git a/npc/mobs/dungeons/abbey.txt b/npc/mobs/dungeons/abbey.txt
index 837c47d6b..b9214b5a7 100644
--- a/npc/mobs/dungeons/abbey.txt
+++ b/npc/mobs/dungeons/abbey.txt
@@ -12,118 +12,39 @@
//= 1.2 More official spawns [Playtester]
//============================================================
-// 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
+//==================================================
+// nameless_n - Nameless Island
+//==================================================
+nameless_n,0,0,0,0 monster Ghoul 1036,40,5000,0,0
+nameless_n,0,0,0,0 monster Hell Poodle 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
-// 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
+//==================================================
+// 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 Hell Poodle 1866,25,5000,0,0
+abbey01,0,0,0,0 monster Flame Skull 1869,21,5000,0,0
-// 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 - 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 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
-// 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
+//==================================================
+// 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
+abbey03,0,0,0,0 boss_monster Hell Fly 1872,1,43200000,600000,1 \ No newline at end of file
diff --git a/npc/mobs/dungeons/abyss.txt b/npc/mobs/dungeons/abyss.txt
index d33b81993..3640748dc 100644
--- a/npc/mobs/dungeons/abyss.txt
+++ b/npc/mobs/dungeons/abyss.txt
@@ -14,49 +14,38 @@
//============================================================
//==================================================
-// abyss_01 - Abyss Lakes Underground Cave F1
+// abyss_01 - Abyss Lake Underground Cave
//==================================================
-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_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_02 - Abyss Lakes Underground Cave F2
+// abyss_02 - Abyss Lake Underground Cave
//==================================================
-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_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_03 - Abyss Lakes Underground Cave F3
+// abyss_03 - Abyss Lake Underground Cave
//==================================================
-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
+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 boss_monster Detardeurus 1719,1,10800000,600000,0 \ No newline at end of file
diff --git a/npc/mobs/dungeons/alde_dun.txt b/npc/mobs/dungeons/alde_dun.txt
index de548fb7f..b03082382 100644
--- a/npc/mobs/dungeons/alde_dun.txt
+++ b/npc/mobs/dungeons/alde_dun.txt
@@ -13,52 +13,29 @@
//============================================================
//==================================================
-// alde_dun01 - Clock Tower B1
+// alde_dun01 - Clock Tower B1f
//==================================================
-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_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_dun02 - Clock Tower B2
+// alde_dun02 - Clock Tower B2f
//==================================================
-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_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_dun03 - Clock Tower B3
+// alde_dun03 - Clock Tower B3f
//==================================================
-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_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_dun04 - Clock Tower B4
+// alde_dun04 - Clock Tower B4f
//==================================================
-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
+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 \ No newline at end of file
diff --git a/npc/mobs/dungeons/ama_dun.txt b/npc/mobs/dungeons/ama_dun.txt
index 9918aed86..cea4905d3 100644
--- a/npc/mobs/dungeons/ama_dun.txt
+++ b/npc/mobs/dungeons/ama_dun.txt
@@ -14,29 +14,27 @@
//==================================================
// ama_dun01 - Tatami Maze
//==================================================
-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_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_dun02 - Battle Field in the Underground Forest
//==================================================
-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_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_dun03 - Amatsu Underground Shrine
//==================================================
-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 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 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/mobs/dungeons/anthell.txt b/npc/mobs/dungeons/anthell.txt
index ea010dd81..72655ca3f 100644
--- a/npc/mobs/dungeons/anthell.txt
+++ b/npc/mobs/dungeons/anthell.txt
@@ -12,28 +12,56 @@
//============================================================
//==================================================
-// anthell01 - Ant Hell F1
+// anthell01 - Ant Hell
//==================================================
-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,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,28,266,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
-anthell01,28,263,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,28,262,0,0 monster Ant Egg 1097,1,60000,30000,0
-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
@@ -43,20 +71,20 @@ 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
+anthell01,28,263,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,28,262,0,0 monster Ant Egg 1097,1,60000,30000,0
+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,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,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
-anthell01,41,267,0,0 monster Ant Egg 1097,1,60000,30000,0
-anthell01,41,266,0,0 monster Ant Egg 1097,1,60000,30000,0
-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
@@ -66,57 +94,28 @@ 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
+anthell01,41,267,0,0 monster Ant Egg 1097,1,60000,30000,0
+anthell01,41,266,0,0 monster Ant Egg 1097,1,60000,30000,0
+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,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 F2
+// anthell02 - Ant Hell
//==================================================
-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
+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 boss_monster Maya 1147,1,7200000,600000,1 \ No newline at end of file
diff --git a/npc/mobs/dungeons/ayo_dun.txt b/npc/mobs/dungeons/ayo_dun.txt
index 8882c6bff..f1f5d36e4 100644
--- a/npc/mobs/dungeons/ayo_dun.txt
+++ b/npc/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,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_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_dun02 - Inside Ancient Shrine
//==================================================
-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
+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,150,90,15,30 boss_monster Lady Tanee 1688,1,25200000,600000,0 \ No newline at end of file
diff --git a/npc/mobs/dungeons/beach_dun.txt b/npc/mobs/dungeons/beach_dun.txt
index 23aee0e2e..b63c7d6a2 100644
--- a/npc/mobs/dungeons/beach_dun.txt
+++ b/npc/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,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 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 boss_monster Tao Gunka 1583,1,18000000,600000,0
//==================================================
-// beach_dun2 - Ruande, the North Cave
+// beach_dun2 - Ruande the northern 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,0,0,0
-beach_dun2,0,0,0,0 monster Hydra 1068,10,0,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_dun3 - Mao, the East Cave
+// beach_dun3 - Mao, the East Cave
//==================================================
-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
+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 \ No newline at end of file
diff --git a/npc/mobs/dungeons/bra_dun.txt b/npc/mobs/dungeons/bra_dun.txt
new file mode 100644
index 000000000..b720dce8f
--- /dev/null
+++ b/npc/mobs/dungeons/bra_dun.txt
@@ -0,0 +1,34 @@
+//===== eAthena Script ========================================
+//= Brasilis Dungeon Monster Spawn Script
+//===== By: ==================================================
+//= Kisuka
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= eAthena SVN
+//===== Description: =========================================
+//= Official monster spawns in Brasilis Dungeon.
+//===== Additional Comments: =================================
+//= 1.0 Official spawns from Aegis [Kisuka]
+//============================================================
+
+//==================================================
+// bra_dun01 - Behind the Waterfall
+//==================================================
+bra_dun01,0,0,0,0 monster Iara 2069,60,5000,0,0
+bra_dun01,0,0,0,0 monster Piranha 2070,100,5000,0,0
+bra_dun01,0,0,0,0 monster Hydra 1068,10,5000,0,0
+bra_dun01,0,0,0,0 monster Plankton 1161,10,5000,0,0
+bra_dun01,0,0,0,0 monster Marina 1141,10,5000,0,0
+bra_dun01,0,0,0,0 monster Black Mushroom 1084,10,180000,90000,1
+
+//==================================================
+// bra_dun02 - Behind the Waterfall
+//==================================================
+bra_dun02,0,0,0,0 monster Iara 2069,120,5000,0,0
+bra_dun02,0,0,0,0 monster Piranha 2070,80,5000,0,0
+bra_dun02,0,0,0,0 monster Hydra 1068,20,5000,0,0
+bra_dun02,0,0,0,0 monster Plankton 1161,20,5000,0,0
+bra_dun02,0,0,0,0 monster Marina 1141,10,5000,0,0
+bra_dun02,0,0,0,0 boss_monster Boitata 2068,1,7200000,600000,1
+bra_dun02,0,0,0,0 monster Black Mushroom 1084,10,180000,90000,1
diff --git a/npc/mobs/dungeons/c_tower.txt b/npc/mobs/dungeons/c_tower.txt
index 88fe27949..b494ead8a 100644
--- a/npc/mobs/dungeons/c_tower.txt
+++ b/npc/mobs/dungeons/c_tower.txt
@@ -11,91 +11,39 @@
//============================================================
//==================================================
-// c_tower1 - Clock Tower F1
+// c_tower1 - Clock Tower 1f
//==================================================
-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_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_tower2 - Clock Tower F2
+// c_tower2 - Clock Tower 2f
//==================================================
-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_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 Willow 1033,2,5000,0,0
+c_tower2,0,0,0,0 monster Clock Tower Manager 1270,1,5000,0,0
//==================================================
-// c_tower3 - Clock Tower F3
+// c_tower3 - Clock Tower 3f
//==================================================
-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_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_tower4 - Clock Tower F4
+// c_tower4 - Clock Tower 4f
//==================================================
-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
+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 Willow 1033,2,5000,0,0 \ No newline at end of file
diff --git a/npc/mobs/dungeons/dic_dun.txt b/npc/mobs/dungeons/dic_dun.txt
new file mode 100644
index 000000000..371947a07
--- /dev/null
+++ b/npc/mobs/dungeons/dic_dun.txt
@@ -0,0 +1,30 @@
+//===== eAthena Script ========================================
+//= El Dicastes Dungeon Monster Spawn Script
+//===== By: ==================================================
+//= Kisuka
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= eAthena SVN
+//===== Description: =========================================
+//= Official monster spawns in El Dicastes Dungeon.
+//===== Additional Comments: =================================
+//= 1.0 Official spawns from Aegis [Kisuka]
+//============================================================
+
+//==================================================
+// dic_dun01 - Underground Passage Kamidal Tunnel
+//==================================================
+dic_dun01,0,0,0,0 monster Scaraba 2083,50,5000,0,0
+dic_dun01,0,0,0,0 monster Scaraba 2084,45,5000,0,0
+dic_dun01,0,0,0,0 monster Scaraba Egg 2088,15,5000,0,0
+dic_dun01,0,0,0,0 monster Scaraba Egg 2089,15,5000,0,0
+
+//==================================================
+// dic_dun02 - Underground Nest Scarab Hole
+//==================================================
+dic_dun02,0,0,0,0 monster Antler Scaraba 2085,50,5000,0,0
+dic_dun02,0,0,0,0 monster Rake Scaraba 2086,45,5000,0,0
+dic_dun02,0,0,0,0 monster Antler Scaraba Egg 2090,15,5000,0,0
+dic_dun02,0,0,0,0 monster Rake Scaraba Egg 2091,15,5000,0,0
+dic_dun02,0,0,0,0 boss_monster Queen Scaraba 2087,1,7200000,0,0 \ No newline at end of file
diff --git a/npc/mobs/dungeons/ein_dun.txt b/npc/mobs/dungeons/ein_dun.txt
index 315b73e85..8c3cdd40f 100644
--- a/npc/mobs/dungeons/ein_dun.txt
+++ b/npc/mobs/dungeons/ein_dun.txt
@@ -17,24 +17,20 @@
//============================================================
//==================================================
-// ein_dun01 - Mine Dungeon F1
+// ein_dun01 - Mine Dungeon
//==================================================
-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 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 Ungoliant 1618,1,3600000,3000000,0
//==================================================
-// ein_dun02 - Mine Dungeon F2
+// ein_dun02 - Mine Dungeon
//==================================================
-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
+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 boss_monster RSX-0806 1623,1,7500000,600000,0 \ No newline at end of file
diff --git a/npc/mobs/dungeons/gef_dun.txt b/npc/mobs/dungeons/gef_dun.txt
index 0c4a6203b..a226cba74 100644
--- a/npc/mobs/dungeons/gef_dun.txt
+++ b/npc/mobs/dungeons/gef_dun.txt
@@ -13,11 +13,11 @@
//============================================================
//==================================================
-// gef_dun00 - Geffen Dungeon F1
+// gef_dun00 - Geffen Dungeon
//==================================================
-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,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,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,16 +28,15 @@ 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 F2
+// gef_dun01 - Geffen Dungeon
//==================================================
-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 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,234,121,0,0 monster Blue Plant 1079,1,300000,100000,0
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
@@ -47,12 +46,12 @@ gef_dun01,150,237,10,10 monster White Plant 1082,2,180000,90000,1
//==================================================
// gef_dun02 - Geffenia
//==================================================
-gef_dun02,0,0,0,0 monster Ghoul 1036,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 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 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
@@ -62,37 +61,12 @@ 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 (Event Map)
+// gef_dun03 - Geffenia
//==================================================
-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 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 Wind Ghost 1263,3,60000,30000,0
+gef_dun03,0,0,0,0 monster Hellion Revenant 1626,1,600000,300000,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
+gef_dun03,0,0,0,0 monster White Plant 1082,10,180000,90000,1 \ No newline at end of file
diff --git a/npc/mobs/dungeons/gefenia.txt b/npc/mobs/dungeons/gefenia.txt
index 9c63098f8..5dc13714c 100644
--- a/npc/mobs/dungeons/gefenia.txt
+++ b/npc/mobs/dungeons/gefenia.txt
@@ -17,12 +17,12 @@
//==================================================
// gefenia01 - Geffenia
//==================================================
-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 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 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,99 +31,41 @@ gefenia01,0,0,0,0 monster Ogretooth 1204,1,18000000,14400000,0
//==================================================
// gefenia02 - Geffenia
//==================================================
-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 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 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,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 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 Bloody Knight 1268,1,3600000,3000000,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 Mysteltainn 1203,1,18000000,14400000,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,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 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 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
+gefenia04,0,0,0,0 monster Ogretooth 1204,1,18000000,14400000,0 \ No newline at end of file
diff --git a/npc/mobs/dungeons/glastheim.txt b/npc/mobs/dungeons/glastheim.txt
index d22a58f4c..d46acb7e5 100644
--- a/npc/mobs/dungeons/glastheim.txt
+++ b/npc/mobs/dungeons/glastheim.txt
@@ -15,175 +15,96 @@
//============================================================
//==================================================
-// 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 Abysmal Knight 1219,2,600000,300000,1
-glast_01,0,0,0,0 monster Gargoyle 1253,10,0,0,1
+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,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_church - Glast Heim St. Abbey
+// gl_cas01 - Glast Heim 1f
//==================================================
-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_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_chyard - Glast Heim Churchyard
+// gl_cas02 - Glast Heim 2f
//==================================================
-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_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_sew01 - Glast Heim Culvert F1
+// gl_church - Glast Heim St. Abbey
//==================================================
-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_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_sew02 - Glast Heim Culvert F2
+// gl_chyard - Glast Heim Churchyard
//==================================================
-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_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_sew03 - Glast Heim Culvert F3
+// gl_dun01 - The Lowest Cave in Glast Heim
//==================================================
-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_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_sew04 - Glast Heim Culvert F4
+// gl_dun02 - The Lowest Cave in Glast Heim
//==================================================
-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_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_step - Glast Heim Staircase Dungeon
+// gl_in01 - Inside Glast Heim
//==================================================
-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_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_knt01 - Inside Glast Heim Chivalry F1
+// gl_knt01 - Inside Glast Heim Chivalry
//==================================================
-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,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,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
@@ -198,35 +119,64 @@ 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 F2
+// gl_knt02 - Inside Glast Heim Chivalry
//==================================================
-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 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 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_knt02,0,0,0,0 monster Bloody Knight 1268,1,3600000,1800000,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_dun01 - The Lowest Cave in Glast Heim F1
+// gl_sew01 - Glast Heim Culvert
//==================================================
-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_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_dun02 - The Lowest Cave in Glast Heim F2
+// 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_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_step - Glast Heim Staircase Dungeon
//==================================================
-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
+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 \ No newline at end of file
diff --git a/npc/mobs/dungeons/gld_dun.txt b/npc/mobs/dungeons/gld_dun.txt
index 303934659..dc47a4ad3 100644
--- a/npc/mobs/dungeons/gld_dun.txt
+++ b/npc/mobs/dungeons/gld_dun.txt
@@ -12,41 +12,41 @@
//============================================================
//==================================================
-// gld_dun01 - Baldur Guild Dungeon
+// gld_dun01 - Guild Dungeon
//==================================================
-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 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 Cat o' Nine Tails 1307,3,1200000,0,0
-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_dun01,0,0,0,0 boss_monster Eddga 1115,1,28800000,600000,1
//==================================================
-// gld_dun02 - Luina Guild Dungeon
+// gld_dun02 - Guild Dungeon
//==================================================
-gld_dun02,0,0,0,0 monster Owl Baron 1295,3,0,0,0
+gld_dun02,0,0,0,0 monster Giant Hornet 1303,10,120000,60000,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,5,120000,60000,0
+gld_dun02,0,0,0,0 monster Ancient Worm 1305,7,120000,60000,0
gld_dun02,0,0,0,0 monster Killer Mantis 1294,5,120000,60000,0
-gld_dun02,0,0,0,0 monster Giant Hornet 1303,10,120000,60000,0
+gld_dun02,0,0,0,0 monster Owl Baron 1295,1,5000,0,0
gld_dun02,0,0,0,0 boss_monster Doppelganger 1046,1,28800000,600000,1
//==================================================
-// gld_dun03 - Valkyrie Guild Dungeon
+// gld_dun03 - 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 - Britoniah Guild Dungeon
+// gld_dun04 - Guild Dungeon
//==================================================
-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 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 Dark Illusion 1302,1,1200000,0,0
-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
+gld_dun04,0,0,0,0 boss_monster Dark Lord 1272,1,28800000,600000,1 \ No newline at end of file
diff --git a/npc/mobs/dungeons/gld_dunSE.txt b/npc/mobs/dungeons/gld_dunSE.txt
index 6b34496e0..95e51c079 100644
--- a/npc/mobs/dungeons/gld_dunSE.txt
+++ b/npc/mobs/dungeons/gld_dunSE.txt
@@ -12,18 +12,18 @@
//============================================================
//==================================================
-// arug_dun01 - Arunafeltz Guild Dungeon
+// schg_dun01 - Subterranean Guild Dungeon
//==================================================
-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
+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
//==================================================
-// schg_dun01 - Schwartzvald Guild Dungeon
+// arug_dun01 - Subterranean 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,0,0,0
-schg_dun01,0,0,0,0 monster Cobalt Mineral 1976,15,0,0,0
+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 \ No newline at end of file
diff --git a/npc/mobs/dungeons/gon_dun.txt b/npc/mobs/dungeons/gon_dun.txt
index c6755bc1d..d8c683dc7 100644
--- a/npc/mobs/dungeons/gon_dun.txt
+++ b/npc/mobs/dungeons/gon_dun.txt
@@ -12,33 +12,29 @@
//============================================================
//==================================================
-// gon_dun01 - Shrine of Gonryun Queen
+// gon_dun01 - Shrine of Kunlun Queen
//==================================================
-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_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_dun02 - Hermit's Checkers
//==================================================
-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_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_dun03 - Arcadia
//==================================================
-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 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 boss_monster Evil Snake Lord 1418,1,5650000,600000,0
+gon_dun03,0,0,0,0 monster White Plant 1082,10,5000,0,0 \ No newline at end of file
diff --git a/npc/mobs/dungeons/ice_dun.txt b/npc/mobs/dungeons/ice_dun.txt
index f90ee7889..09b9da34f 100644
--- a/npc/mobs/dungeons/ice_dun.txt
+++ b/npc/mobs/dungeons/ice_dun.txt
@@ -15,55 +15,24 @@
//==================================================
// ice_dun01 - Ice Cave
//==================================================
-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_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_dun02 - Ice Cave
//==================================================
-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_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_dun03 - Ice Cave
//==================================================
-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
+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 \ No newline at end of file
diff --git a/npc/mobs/dungeons/in_sphinx.txt b/npc/mobs/dungeons/in_sphinx.txt
index 93d3194ee..6b1745c63 100644
--- a/npc/mobs/dungeons/in_sphinx.txt
+++ b/npc/mobs/dungeons/in_sphinx.txt
@@ -14,43 +14,43 @@
//============================================================
//==================================================
-// In_sphinx1 - Sphinx F1
+// in_sphinx1 - Sphinx
//==================================================
-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_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_sphinx2 - Sphinx F2
+// in_sphinx2 - Sphinx
//==================================================
-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_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_sphinx3 - Sphinx F3
+// in_sphinx3 - Sphinx
//==================================================
-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_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_sphinx4 - Sphinx F4
+// in_sphinx4 - Sphinx
//==================================================
-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_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_sphinx5 - Sphinx F5
+// in_sphinx5 - Sphinx
//==================================================
-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
+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 boss_monster Pharaoh 1157,1,3600000,600000,1 \ No newline at end of file
diff --git a/npc/mobs/dungeons/iz_dun.txt b/npc/mobs/dungeons/iz_dun.txt
index 185bf64bf..68430af10 100644
--- a/npc/mobs/dungeons/iz_dun.txt
+++ b/npc/mobs/dungeons/iz_dun.txt
@@ -12,62 +12,46 @@
//============================================================
//==================================================
-// iz_dun00 - Undersea Tunnel F1
+// iz_dun00 - Undersea Tunnel
//==================================================
-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 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 Black Mushroom 1084,5,180000,90000,1
//==================================================
-// iz_dun01 - Undersea Tunnel F2
+// iz_dun01 - Undersea Tunnel
//==================================================
-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 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 Black Mushroom 1084,10,180000,90000,1
//==================================================
-// iz_dun02 - Undersea Tunnel F3
+// iz_dun02 - Undersea Tunnel
//==================================================
-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 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 Black Mushroom 1084,15,180000,90000,1
//==================================================
-// iz_dun03 - Undersea Tunnel F4
+// iz_dun03 - Undersea Tunnel
//==================================================
-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,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,200,144,0,0 monster Hydra 1068,1,282000,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,178,253,0,0 monster Hydra 1068,1,300000,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
@@ -75,40 +59,51 @@ 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,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,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,80,163,0,0 monster Hydra 1068,1,300000,150000,0
-iz_dun03,0,0,0,0 monster Merman 1264,3,1800000,1200000,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_dun04 - Undersea Tunnel F5
+// iz_dun04 - Undersea Tunnel
//==================================================
-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,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,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,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,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,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,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 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
+iz_dun04,58,135,0,0 monster Hydra 1068,1,305000,150000,0
+iz_dun04,42,116,0,0 monster Hydra 1068,1,306000,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,80,233,0,0 monster Hydra 1068,1,318000,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 \ No newline at end of file
diff --git a/npc/mobs/dungeons/juperos.txt b/npc/mobs/dungeons/juperos.txt
index 8537d2e7e..0e47c167c 100644
--- a/npc/mobs/dungeons/juperos.txt
+++ b/npc/mobs/dungeons/juperos.txt
@@ -17,44 +17,36 @@
//= 1.4 Corrected MVP spawn variance. [L0ne_W0lf]
//============================================================
-//========================================================================================
-// - Juperos 01
-//========================================================================================
+//==================================================
+// 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,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
+//==================================================
+// 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 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
+//==================================================
+// 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
+jupe_core,0,0,0,0 boss_monster Vesper 1685,1,7200000,600000,1 \ No newline at end of file
diff --git a/npc/mobs/dungeons/kh_dun.txt b/npc/mobs/dungeons/kh_dun.txt
index 28f324375..5b3be2502 100644
--- a/npc/mobs/dungeons/kh_dun.txt
+++ b/npc/mobs/dungeons/kh_dun.txt
@@ -14,20 +14,29 @@
//============================================================
//==================================================
-// kh_kiehl01
+// kh_dun01 - Robot Factory level 1
//==================================================
-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
-kh_kiehl01,135,24,3,3 monster Alicel 1739,1,180000,120000,0
-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_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
@@ -36,27 +45,15 @@ 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
+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,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
+kh_kiehl01,135,24,3,3 monster Alicel 1739,1,180000,120000,0
+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,122,155,3,3 monster Aliza 1746,1,180000,120000,0 \ No newline at end of file
diff --git a/npc/mobs/dungeons/lhz_dun.txt b/npc/mobs/dungeons/lhz_dun.txt
index 9708c9b13..558e0a51f 100644
--- a/npc/mobs/dungeons/lhz_dun.txt
+++ b/npc/mobs/dungeons/lhz_dun.txt
@@ -23,289 +23,46 @@
//= 1.8 Corrected MVP spawn variance (Labs2 MVP). [L0ne_W0lf]
//============================================================
-
-//========================================================================================
-// 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_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_dun02,0,0,0,0 boss_monster Egnigem Cenia 1658,1,7200000,600000,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,163,138,12,16 monster Whitesmith Howard 1642,1,3000000,2700000,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,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,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,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;
- }
- set .@mob,rand(1646,1651);
- 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;
- }
- set .@mob2,rand(1640,1645);
- monster "lhz_dun03",.@x2,.@y2,strmobinfo(1,.@mob2),.@mob2,1,"summon_boss_lt::OnMVP";
- end;
-
-OnMyMvPDead:
- killmonster "lhz_dun03","summon_boss_lt::OnMVP";
- initnpctimer;
- end;
-
-//Required to keep from erroring
-OnMVP:
- end;
-}
diff --git a/npc/mobs/dungeons/lou_dun.txt b/npc/mobs/dungeons/lou_dun.txt
index 0adb7dfdf..3cf9e50ce 100644
--- a/npc/mobs/dungeons/lou_dun.txt
+++ b/npc/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 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 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 Leib Olmai 1306,1,300000,120000,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_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_dun02 - Inside the Royal Tomb
//==================================================
-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_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_dun03 - Suei Long Gon
+// lou_dun03 - Suei Long Gon
//==================================================
-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 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 Green Maiden 1631,5,3000000,1800000,1
-lou_dun03,0,0,0,0 boss_monster White Lady 1630,1,7000000,600000,1
+lou_dun03,0,0,0,0 boss_monster White Lady 1630,1,7000000,600000,1 \ No newline at end of file
diff --git a/npc/mobs/dungeons/mag_dun.txt b/npc/mobs/dungeons/mag_dun.txt
index 0be0d79d5..dda98c066 100644
--- a/npc/mobs/dungeons/mag_dun.txt
+++ b/npc/mobs/dungeons/mag_dun.txt
@@ -13,31 +13,20 @@
//============================================================
//==================================================
-// mag_dun01 - Nogg Road F1
+// mag_dun01 - Nogg Road
//==================================================
-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_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_dun02 - Nogg Road F2
+// mag_dun02 - Nogg Road
//==================================================
-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
+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 \ No newline at end of file
diff --git a/npc/mobs/dungeons/mjo_dun.txt b/npc/mobs/dungeons/mjo_dun.txt
index 1b5143493..f54ad3e5d 100644
--- a/npc/mobs/dungeons/mjo_dun.txt
+++ b/npc/mobs/dungeons/mjo_dun.txt
@@ -11,26 +11,25 @@
//============================================================
//==================================================
-// mjo_dun01 - Mjolnir Dead Pit F1
+// mjo_dun01 - Mjolnir Dead Pit
//==================================================
-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_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_dun02 - Mjolnir Dead Pit F2
+// mjo_dun02 - Mjolnir Dead Pit
//==================================================
-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_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_dun03 - Mjolnir Dead Pit F3
+// mjo_dun03 - Mjolnir Dead Pit
//==================================================
-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
+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 \ No newline at end of file
diff --git a/npc/mobs/dungeons/moc_pryd.txt b/npc/mobs/dungeons/moc_pryd.txt
index e0ff59747..7bb89f233 100644
--- a/npc/mobs/dungeons/moc_pryd.txt
+++ b/npc/mobs/dungeons/moc_pryd.txt
@@ -13,52 +13,52 @@
//============================================================
//==================================================
-// moc_pryd01 - Inside Pyramid F1
+// moc_pryd01 - Inside Pyramid
//==================================================
-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_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_pryd02 - Inside Pyramid F2
+// moc_pryd02 - Inside Pyramid
//==================================================
-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_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_pryd03 - Inside Pyramid F3
+// moc_pryd03 - Inside Pyramid
//==================================================
-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_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_pryd04 - Inside Pyramid F4
+// moc_pryd04 - Inside Pyramid
//==================================================
-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 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 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 B1
+// moc_pryd05 - Inside Pyramid
//==================================================
-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_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_pryd06 - Inside Pyramid B2
+// moc_pryd06 - Inside Pyramid
//==================================================
-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
+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,102,85,1,1 boss_monster Amon Ra 1511,1,3600000,600000,0 \ No newline at end of file
diff --git a/npc/mobs/dungeons/mosk_dun.txt b/npc/mobs/dungeons/mosk_dun.txt
index a4087bc7e..65facd118 100644
--- a/npc/mobs/dungeons/mosk_dun.txt
+++ b/npc/mobs/dungeons/mosk_dun.txt
@@ -14,36 +14,28 @@
//============================================================
//==================================================
-// mosk_dun01 - Moscovia Dungeon 1
+// mosk_dun01 - Les Forest
//==================================================
-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_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_dun02 - Moscovia Dungeon 2
+// mosk_dun02 - Temny Forest
//==================================================
-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_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_dun03 - Moscovia Dungeon 3
+// mosk_dun03 - Dremuci Forest
//==================================================
-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,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 Shining Plant 1083,5,10000,0,0 \ No newline at end of file
diff --git a/npc/mobs/dungeons/nyd_dun.txt b/npc/mobs/dungeons/nyd_dun.txt
index a0d13ab71..c28609ca4 100644
--- a/npc/mobs/dungeons/nyd_dun.txt
+++ b/npc/mobs/dungeons/nyd_dun.txt
@@ -11,11 +11,20 @@
//============================================================
//==================================================
-// nyd_dun01 - Yggdrasil Root Dungeon
+// nyd_dun01 - Yggdrasil Root
//==================================================
-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 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 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 \ No newline at end of file
diff --git a/npc/mobs/dungeons/odin.txt b/npc/mobs/dungeons/odin.txt
index 9caab6d17..4eb11909a 100644
--- a/npc/mobs/dungeons/odin.txt
+++ b/npc/mobs/dungeons/odin.txt
@@ -13,55 +13,43 @@
//============================================================
//==================================================
-// odin_tem01 - Odin Temple F1
+// odin_tem01 - Odin Shrine
//==================================================
-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 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 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 Temple F2
+// odin_tem02 - Odin Shrine
//==================================================
-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 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 Blue Plant 1079,10,1800000,900000,1
//==================================================
-// odin_tem03 - Odin Temple F3
+// odin_tem03 - Odin Shrine
//==================================================
-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 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 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
+odin_tem03,0,0,0,0 monster Shining Plant 1083,15,1800000,900000,1 \ No newline at end of file
diff --git a/npc/mobs/dungeons/orcsdun.txt b/npc/mobs/dungeons/orcsdun.txt
index 19d0c503f..75b45229b 100644
--- a/npc/mobs/dungeons/orcsdun.txt
+++ b/npc/mobs/dungeons/orcsdun.txt
@@ -11,31 +11,26 @@
//============================================================
//==================================================
-// orcsdun01 - Orc Dungeon F1
+// orcsdun01 - Orc Dungeon
//==================================================
-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,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,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 F2
+// orcsdun02 - Orc Dungeon
//==================================================
-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 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 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
+orcsdun02,37,44,10,10 monster White Plant 1082,3,180000,90000,1 \ No newline at end of file
diff --git a/npc/mobs/dungeons/pay_dun.txt b/npc/mobs/dungeons/pay_dun.txt
index 0d9889ff7..8bdd29684 100644
--- a/npc/mobs/dungeons/pay_dun.txt
+++ b/npc/mobs/dungeons/pay_dun.txt
@@ -13,70 +13,69 @@
//============================================================
//==================================================
-// pay_dun00 - Payon Cave F1
+/// pay_dun00 - Payon Cave
//==================================================
-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 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 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 F2
+// pay_dun01 - Payon Cave
//==================================================
-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,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,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 F3
+// pay_dun02 - Payon Cave
//==================================================
-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,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,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,122,197,0,0 monster Hydra 1068,1,321000,100000,1
+pay_dun02,110,190,0,0 monster Hydra 1068,1,300000,100000,1
pay_dun02,110,194,0,0 monster Hydra 1068,1,300000,100000,1
-pay_dun02,113,194,0,0 monster Hydra 1068,1,319000,100000,1
+pay_dun02,117,191,0,0 monster Hydra 1068,1,300000,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,109,192,0,0 monster Hydra 1068,1,374000,100000,1
+pay_dun02,116,196,0,0 monster Hydra 1068,1,300000,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,107,190,0,0 monster Hydra 1068,1,320000,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,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,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
@@ -84,79 +83,68 @@ 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 F4
+// pay_dun03 - Payon Cave
//==================================================
-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,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,64,66,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,64,66,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,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,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,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 F5
+// pay_dun04 - Payon Cave
//==================================================
-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,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,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
pay_dun04,0,0,0,0 monster Red Plant 1078,10,180000,90000,1
pay_dun04,107,206,5,5 monster White Plant 1082,2,180000,90000,1
pay_dun04,28,110,10,10 monster White Plant 1082,2,180000,90000,1
-pay_dun04,190,207,5,5 monster White Plant 1082,2,180000,90000,1
+pay_dun04,190,207,5,5 monster White Plant 1082,2,180000,90000,1 \ No newline at end of file
diff --git a/npc/mobs/dungeons/prt_maze.txt b/npc/mobs/dungeons/prt_maze.txt
index 7d9263706..ac9448ce8 100644
--- a/npc/mobs/dungeons/prt_maze.txt
+++ b/npc/mobs/dungeons/prt_maze.txt
@@ -13,38 +13,37 @@
//============================================================
//==================================================
-// prt_maze01 - Labyrinth Forest F1
+// prt_maze01 - Labyrinth Forest
//==================================================
-
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 Hornet 1004,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,99,20,21,21 monster Creamy 1018,1,120000,40000,1
+prt_maze01,19,180,21,21 monster Savage 1166,5,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,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,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,179,100,21,21 monster Argiope 1099,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,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,59,140,21,21 monster Choco 1214,2,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 Hunter Fly 1035,1,5000,0,0
+prt_maze01,99,20,21,21 monster Creamy 1018,1,120000,40000,1
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
@@ -62,29 +61,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 F2
+// prt_maze02 - Labyrinth Forest
//==================================================
-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 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 Sasquatch 1243,1,900000,40000,0
prt_maze02,0,0,0,0 monster Leib Olmai 1306,1,1800000,900000,0
//==================================================
-// prt_maze03 - Labyrinth Forest F3
+// prt_maze03 - Labyrinth Forest
//==================================================
-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,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,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,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,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,170,170,70,70 monster Eclipse 1093,1,1920000,150000,1
prt_maze03,23,23,70,70 monster Mastering 1090,1,1920000,150000,1
-prt_maze03,100,100,80,80 monster Baphomet Jr. 1101,25,0,0,0
+prt_maze03,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,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
@@ -100,4 +99,4 @@ prt_maze03,0,0,0,0 monster Red Plant 1078,5,180000,90000,1
prt_maze03,99,21,10,10 monster Black Mushroom 1084,3,180000,90000,1
prt_maze03,54,15,10,10 monster Black Mushroom 1084,3,180000,90000,1
prt_maze03,171,180,3,3 monster Red Mushroom 1085,2,180000,90000,1
-prt_maze03,174,187,3,3 monster Red Mushroom 1085,3,180000,90000,1
+prt_maze03,174,187,3,3 monster Red Mushroom 1085,3,180000,90000,1 \ No newline at end of file
diff --git a/npc/mobs/dungeons/prt_sew.txt b/npc/mobs/dungeons/prt_sew.txt
index 233d2ef1e..9f99a4e14 100644
--- a/npc/mobs/dungeons/prt_sew.txt
+++ b/npc/mobs/dungeons/prt_sew.txt
@@ -12,42 +12,42 @@
//============================================================
//==================================================
-// prt_sewb1 - Prontera Culvert F1
+// prt_sewb1 - Prontera Culvert
//==================================================
-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_sewb1,0,0,0,0 monster Thief Bug Egg 1048,80,5000,0,0
+prt_sewb1,0,0,0,0 monster Thief Bug Egg 1048,30,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_sewb2 - Prontera Culvert F2
+// prt_sewb2 - Prontera Culvert
//==================================================
-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_sewb2,0,0,0,0 monster Thief Bug Egg 1048,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 Egg 1048,10,5000,0,0
+prt_sewb2,0,0,0,0 monster Familiar 1005,10,5000,0,0
//==================================================
-// prt_sewb3 - Prontera Culvert F3
+// prt_sewb3 - Prontera Culvert
//==================================================
-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_sewb3,0,0,0,0 monster Thief Bug Egg 1048,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 Egg 1048,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_sewb4 - Prontera Culvert F4
+// prt_sewb4 - Prontera Culvert
//==================================================
-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
+prt_sewb4,0,0,0,0 monster Thief Bug Male 1054,70,5000,0,0
+prt_sewb4,0,0,0,0 monster Thief Bug Egg 1048,20,5000,0,0
+prt_sewb4,0,0,0,0 monster Thief Bug Egg 1048,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 boss_monster Golden Thief Bug 1086,1,3600000,600000,1 \ No newline at end of file
diff --git a/npc/mobs/dungeons/ra_san.txt b/npc/mobs/dungeons/ra_san.txt
index f0e090907..3e862e5ad 100644
--- a/npc/mobs/dungeons/ra_san.txt
+++ b/npc/mobs/dungeons/ra_san.txt
@@ -13,70 +13,46 @@
//============================================================
//==================================================
-// ra_san01
+// ra_san01 - Holy Ground
//==================================================
-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_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_san02
+// ra_san02 - Holy Ground
//==================================================
-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_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_san03
+// ra_san03 - Holy Ground
//==================================================
-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_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_san04
+// ra_san04 - Holy Ground
//==================================================
-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_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_san05
+// ra_san05 - Holy Ground
//==================================================
-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
+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 boss_monster Gloom Under Night 1768,1,18000000,600000,0 \ No newline at end of file
diff --git a/npc/mobs/dungeons/tha_t.txt b/npc/mobs/dungeons/tha_t.txt
index 1e0ac64c6..6fe6a562d 100644
--- a/npc/mobs/dungeons/tha_t.txt
+++ b/npc/mobs/dungeons/tha_t.txt
@@ -14,169 +14,139 @@
//============================================================
//==================================================
-// tha_t01 - Thanatos Tower F1
+// tha_t01 - Thanatos Tower - Lower Level
//==================================================
-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_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_t02 - Thanatos Tower F2
+// tha_t02 - Thanatos Tower - Lower Level
//==================================================
-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_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 Willow 1033,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_t03 - Thanatos Tower F3
+// tha_t03 - Thanatos Tower - Lower Level
//==================================================
-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_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 Willow 1033,10,5000,0,0
+tha_t03,0,0,0,0 monster Mistress of Shelter 1701,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_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 Willow 1033,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_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_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 Willow 1033,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_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_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 Willow 1033,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_t07 - Thanatos Tower F7
+// tha_t07 - Thanatos Tower - Upper Level
//==================================================
-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_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_t08 - Thanatos Tower F8
+// tha_t08 - Thanatos Tower - Upper Level
//==================================================
-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_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_t09 - Thanatos Tower F9
+// tha_t09 - Thanatos Tower - Upper Level
//==================================================
-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_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_t10 - Thanatos Tower F10
+// tha_t10 - Thanatos Tower - Upper Level
//==================================================
-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_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_t11 - Thanatos Tower F11
+// tha_t11 - Thanatos Tower - Upper Level
//==================================================
-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_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_t12 - Thanatos Tower F12
+// tha_t12 - Thanatos Tower - Upper Level
//==================================================
-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
+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 \ No newline at end of file
diff --git a/npc/mobs/dungeons/thor_v.txt b/npc/mobs/dungeons/thor_v.txt
index 470d6dda4..2b28e4506 100644
--- a/npc/mobs/dungeons/thor_v.txt
+++ b/npc/mobs/dungeons/thor_v.txt
@@ -16,53 +16,40 @@
//= 1.4 Corrected MVP spawn variance. [L0ne_W0lf]
//============================================================
-// ================= [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 - Thor Volcano Dungeon
+//==================================================
+thor_v01,0,0,0,0 monster Kasa 1833,45,5000,0,0
+thor_v01,0,0,0,0 monster Fire 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 Master 1830,5,5000,0,0
+thor_v01,0,0,0,0 monster Sword Master 1829,5,5000,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_v01,0,0,0,0 monster Sword Master 1829,5,420000,0,0
+thor_v01,0,0,0,0 monster Byorgue 1839,1,5000,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 - 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 Fire 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 Master 1830,1,7200000,0,0
+thor_v02,0,0,0,0 monster Sword Master 1829,1,7200000,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 - 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 Master 1830,10,5000,0,0
+thor_v03,0,0,0,0 monster Sword Master 1829,10,5000,0,0
+thor_v03,0,0,0,0 monster Byorgue 1839,5,5000,0,0
+thor_v03,0,0,0,0 monster Sword Master 1829,5,5000,0,0
+thor_v03,0,0,0,0 monster Bow Master 1830,5,5000,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
+thor_v03,0,0,0,0 monster Sword Master 1829,5,1800000,0,0
+thor_v03,0,0,0,0 boss_monster Ifrit 1832,1,39600000,600000,0 \ No newline at end of file
diff --git a/npc/mobs/dungeons/treasure.txt b/npc/mobs/dungeons/treasure.txt
index 63d69657c..8e5456404 100644
--- a/npc/mobs/dungeons/treasure.txt
+++ b/npc/mobs/dungeons/treasure.txt
@@ -13,120 +13,91 @@
//============================================================
//==================================================
-// treasure01 - Sunken Ship F1
+// treasure01 - Sunken Ship
//==================================================
-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,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,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,107,39,15,15 monster Hydra 1068,1,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,68,161,0,0 monster Hydra 1068,1,317000,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,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,48,160,0,0 monster Hydra 1068,1,300000,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,151,5,5 monster Pirate Skeleton 1071,3,300000,100000,1
-treasure01,163,151,5,5 monster Hydra 1068,1,300000,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,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,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,158,44,0,0 monster Hydra 1068,1,300000,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,158,42,0,0 monster Hydra 1068,1,300000,100000,1
-treasure01,158,41,0,0 monster Hydra 1068,1,300000,100000,1
+treasure01,69,161,0,0 monster Hydra 1068,1,305000,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,165,71,0,0 monster Hydra 1068,1,307000,100000,1
treasure01,158,40,0,0 monster Hydra 1068,1,307000,100000,1
-treasure01,159,45,0,0 monster Hydra 1068,1,285000,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,44,0,0 monster Hydra 1068,1,312000,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,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,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,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,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 F2
+// treasure02 - Sunken Ship
//==================================================
-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,102,85,0,0 monster Hydra 1068,1,300000,100000,1
-treasure02,103,85,0,0 monster Hydra 1068,1,300000,100000,1
+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
@@ -135,24 +106,15 @@ 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
+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,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,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,101,151,8,8 boss_monster Drake 1112,1,7200000,600000,1 \ No newline at end of file
diff --git a/npc/mobs/dungeons/tur_dun.txt b/npc/mobs/dungeons/tur_dun.txt
index 0178b0b2e..b901a13ca 100644
--- a/npc/mobs/dungeons/tur_dun.txt
+++ b/npc/mobs/dungeons/tur_dun.txt
@@ -13,60 +13,40 @@
//==================================================
// tur_dun01 - Turtle Island
//==================================================
-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_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_dun02 - Turtle Island Dungeon
//==================================================
-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_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_dun03 - Good Turtles Village
//==================================================
-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_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_dun04 - Turtle Palace
//==================================================
-tur_dun04,99,92,10,10 monster Wanderer 1208,1,60000,30000,0
+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,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 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
+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 \ No newline at end of file
diff --git a/npc/mobs/dungeons/um_dun.txt b/npc/mobs/dungeons/um_dun.txt
deleted file mode 100644
index 147a0d69e..000000000
--- a/npc/mobs/dungeons/um_dun.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-//===== eAthena Script =======================================
-//= Umbala Dungeon Monster Spawn Script
-//===== By: ==================================================
-//= Athena (1.0)
-//===== Current Version: =====================================
-//= 1.4
-//===== Compatible With: =====================================
-//= Any Athena Version
-//===== Additional Comments: =================================
-//= 1.2 Official kRO 10.1 spawns [Playtester]
-//= 1.3 Some 11.1 spawn updates [Playtester]
-//= 1.4 More accurate spawns [Playtester]
-//============================================================
-
-//==================================================
-// um_dun01 - Carpenter's Shop in the Tree
-//==================================================
-um_dun01,0,0,0,0 monster Stone Shooter 1495,70,0,0,0
-um_dun01,0,0,0,0 monster Wootan Fighter 1499,10,0,0,0
-um_dun01,0,0,0,0 monster Wootan Shooter 1498,10,0,0,0
-um_dun01,0,0,0,0 monster Yellow Plant 1081,5,180000,90000,1
-um_dun01,0,0,0,0 monster Green Plant 1080,5,180000,90000,1
-
-//==================================================
-// um_dun02 - Passage to a Foreign World
-//==================================================
-um_dun02,0,0,0,0 monster Wooden Golem 1497,50,0,0,0
-um_dun02,79,227,10,10 monster Wooden Golem 1497,2,240000,60000,0
-um_dun02,87,189,10,10 monster Wooden Golem 1497,2,240000,60000,0
-um_dun02,170,145,10,10 monster Wooden Golem 1497,2,240000,60000,0
-um_dun02,196,131,14,14 monster Wooden Golem 1497,2,240000,60000,0
-um_dun02,244,129,15,15 monster Wooden Golem 1497,2,360000,60000,0
-um_dun02,90,97,10,15 monster Wooden Golem 1497,2,360000,60000,0
-um_dun02,90,97,10,15 monster Wooden Golem 1497,2,240000,60000,0
-um_dun02,32,83,10,15 monster Wooden Golem 1497,2,360000,60000,0
-um_dun02,32,83,10,15 monster Wooden Golem 1497,2,240000,60000,0
-um_dun02,180,238,15,15 monster Wooden Golem 1497,2,180000,60000,0
-um_dun02,144,277,15,15 monster Wooden Golem 1497,2,360000,60000,0
-um_dun02,144,277,15,15 monster Wooden Golem 1497,2,180000,60000,0
-um_dun02,272,163,15,15 monster Wooden Golem 1497,2,360000,60000,0
-um_dun02,272,163,15,15 monster Wooden Golem 1497,2,180000,60000,0
-um_dun02,232,156,15,15 monster Wooden Golem 1497,2,300000,60000,0
-um_dun02,232,156,15,15 monster Wooden Golem 1497,2,180000,60000,0
-um_dun02,0,0,0,0 monster Driller 1380,5,0,0,0
-um_dun02,0,0,0,0 monster Wootan Shooter 1498,10,0,0,0
-um_dun02,213,217,15,15 monster Wootan Shooter 1498,2,120000,60000,0
-um_dun02,72,258,15,15 monster Wootan Shooter 1498,3,120000,60000,0
-um_dun02,79,227,10,10 monster Wootan Shooter 1498,1,120000,60000,0
-um_dun02,170,145,10,10 monster Wootan Shooter 1498,1,120000,60000,0
-um_dun02,209,34,15,15 monster Wootan Shooter 1498,1,120000,60000,0
-um_dun02,272,163,15,15 monster Wootan Shooter 1498,1,120000,60000,0
-um_dun02,232,156,15,15 monster Wootan Shooter 1498,1,120000,60000,0
-um_dun02,0,0,0,0 monster Dryad 1493,25,0,0,0
-um_dun02,0,0,0,0 monster Yellow Plant 1081,5,180000,90000,1
-um_dun02,0,0,0,0 monster Red Plant 1078,5,180000,90000,1
-um_dun02,0,0,0,0 monster Shining Plant 1083,6,180000,90000,1
diff --git a/npc/mobs/dungeons/xmas_dun.txt b/npc/mobs/dungeons/xmas_dun.txt
index 395268f0a..0a2806bd9 100644
--- a/npc/mobs/dungeons/xmas_dun.txt
+++ b/npc/mobs/dungeons/xmas_dun.txt
@@ -16,13 +16,13 @@
//==================================================
// xmas_dun01 - Toy Factory Warehouse
//==================================================
-xmas_dun01,0,0,0,0 monster Marin 1242,20,0,0,0
-xmas_dun01,0,0,0,0 monster Poring 1002,10,0,0,0
-xmas_dun01,0,0,0,0 monster Drops 1113,10,0,0,0
-xmas_dun01,0,0,0,0 monster Poporing 1031,20,0,0,0
-xmas_dun01,0,0,0,0 monster Cookie 1265,40,0,0,0
-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 Christmas Cookie 1246,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 Marina 1141,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 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,9 +30,8 @@ xmas_dun01,0,0,0,0 monster Angeling 1096,1,3600000,1800000,0
//==================================================
// xmas_dun02 - Toy Monitoring Room
//==================================================
-xmas_dun02,0,0,0,0 monster 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
+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 Christmas Cookie 1246,20,5000,0,0
+xmas_dun02,0,0,0,0 monster Christmas Cookie 1246,20,5000,0,0
+xmas_dun02,0,0,0,0 boss_monster Stormy Knight 1251,1,3600000,600000,0 \ No newline at end of file
diff --git a/npc/mobs/fields/amatsu.txt b/npc/mobs/fields/amatsu.txt
index 8f02d97de..f97c2b1a8 100644
--- a/npc/mobs/fields/amatsu.txt
+++ b/npc/mobs/fields/amatsu.txt
@@ -16,12 +16,22 @@
//==================================================
// ama_fild01 - Amatsu Field
//==================================================
-ama_fild01,0,0,0,0 monster Karakasa 1400,50,0,0,0
-ama_fild01,0,0,0,0 monster Kapha 1406,40,0,0,0
-ama_fild01,0,0,0,0 monster Miyabi Doll 1404,2,0,0,0
-ama_fild01,0,0,0,0 monster Hydra 1068,1,60000,30000,0
-ama_fild01,0,0,0,0 monster Hydra 1068,1,63000,31500,0
-ama_fild01,0,0,0,0 monster Hydra 1068,1,66000,33000,0
-ama_fild01,0,0,0,0 monster Hydra 1068,1,69000,34500,0
-ama_fild01,0,0,0,0 monster Hydra 1068,1,72000,39000,0
-ama_fild01,0,0,0,0 monster Poison Toad 1402,1,0,0,0
+ama_fild01,0,0,0,0 monster Bigfoot 1060,15,5000,0,0
+ama_fild01,0,0,0,0 monster Karakasa 1400,50,5000,0,0
+ama_fild01,0,0,0,0 monster Kapha 1406,40,5000,0,0
+ama_fild01,0,0,0,0 monster Miyabi Doll 1404,2,5000,0,0
+ama_fild01,0,0,0,0 monster Poison Toad 1402,1,5000,0,0
+ama_fild01,173,313,0,0 monster Hydra 1068,1,60000,30000,0
+ama_fild01,173,314,0,0 monster Hydra 1068,1,60000,30000,0
+ama_fild01,173,310,0,0 monster Hydra 1068,1,60000,30000,0
+ama_fild01,177,315,0,0 monster Hydra 1068,1,60000,30000,0
+ama_fild01,175,315,0,0 monster Hydra 1068,1,63000,31500,0
+ama_fild01,169,314,0,0 monster Hydra 1068,1,63000,31500,0
+ama_fild01,177,314,0,0 monster Hydra 1068,1,66000,33000,0
+ama_fild01,175,313,0,0 monster Hydra 1068,1,66000,33000,0
+ama_fild01,173,315,0,0 monster Hydra 1068,1,66000,33000,0
+ama_fild01,171,313,0,0 monster Hydra 1068,1,66000,33000,0
+ama_fild01,171,314,0,0 monster Hydra 1068,1,69000,34500,0
+ama_fild01,171,315,0,0 monster Hydra 1068,1,69000,34500,0
+ama_fild01,175,314,0,0 monster Hydra 1068,1,72000,39000,0
+ama_fild01,169,315,0,0 monster Hydra 1068,1,72000,39000,0 \ No newline at end of file
diff --git a/npc/mobs/fields/ayothaya.txt b/npc/mobs/fields/ayothaya.txt
index 9e8839d54..7675f32d4 100644
--- a/npc/mobs/fields/ayothaya.txt
+++ b/npc/mobs/fields/ayothaya.txt
@@ -17,13 +17,15 @@
//==================================================
// ayo_fild01 - Ayothaya Field
//==================================================
-ayo_fild01,0,0,0,0 monster Coco 1104,30,0,0,0
-ayo_fild01,0,0,0,0 monster Yoyo 1057,30,0,0,0
-ayo_fild01,0,0,0,0 monster Smokie 1056,30,0,0,0
+ayo_fild01,0,0,0,0 monster Smokie 1056,30,5000,0,0
+ayo_fild01,0,0,0,0 monster Coco 1104,30,5000,0,0
+ayo_fild01,0,0,0,0 monster Yoyo 1057,30,5000,0,0
+ayo_fild01,0,0,0,0 monster Green Plant 1080,10,5000,0,0
//==================================================
// ayo_fild02 - Ayothaya Field
//==================================================
-ayo_fild02,0,0,0,0 monster Yoyo 1057,45,0,0,0
-ayo_fild02,0,0,0,0 monster Leaf Cat 1586,35,0,0,0
-ayo_fild02,0,0,0,0 monster Kraben 1587,5,0,0,0
+ayo_fild02,0,0,0,0 monster Yoyo 1057,45,5000,0,0
+ayo_fild02,0,0,0,0 monster Leaf Cat 1586,35,5000,0,0
+ayo_fild02,0,0,0,0 monster Kraben 1587,5,5000,0,0
+ayo_fild02,0,0,0,0 monster Yellow Plant 1081,10,5000,0,0
diff --git a/npc/mobs/fields/brasilis.txt b/npc/mobs/fields/brasilis.txt
new file mode 100644
index 000000000..6b52709aa
--- /dev/null
+++ b/npc/mobs/fields/brasilis.txt
@@ -0,0 +1,22 @@
+//===== eAthena Script =======================================
+//= Brasilis Fields Monster Spawn Script
+//===== By: ==================================================
+//= Kisuka
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= eAthena SVN
+//===== Additional Comments: =================================
+//= 1.0 Official spawns from Aegis [Kisuka]
+//============================================================
+
+//==================================================
+// bra_fild01
+//==================================================
+bra_fild01,0,0,0,0 monster Headless Mule 2071,40,5000,0,0
+bra_fild01,0,0,0,0 monster Curupira 2074,80,5000,0,0
+bra_fild01,0,0,0,0 monster Dokebi 1110,20,5000,0,0
+bra_fild01,0,0,0,0 monster Jaguar 2072,10,5000,0,0
+bra_fild01,0,0,0,0 monster Savage 1166,20,5000,0,0
+bra_fild01,0,0,0,0 monster Toucan 2073,10,5000,0,0
+bra_fild01,0,0,0,0 monster Red Mushroom 1085,3,5000,0,0 \ No newline at end of file
diff --git a/npc/mobs/fields/comodo.txt b/npc/mobs/fields/comodo.txt
index b0e4b7d90..2142156d1 100644
--- a/npc/mobs/fields/comodo.txt
+++ b/npc/mobs/fields/comodo.txt
@@ -15,8 +15,8 @@
//==================================================
// cmd_fild01 - Papuchicha Forest
//==================================================
-cmd_fild01,0,0,0,0 monster Grove 1687,150,0,0,0
-cmd_fild01,0,0,0,0 monster Flora 1118,50,0,0,0
+cmd_fild01,0,0,0,0 monster Grove 1687,150,5000,0,0
+cmd_fild01,0,0,0,0 monster Flora 1118,50,5000,0,0
cmd_fild01,313,213,10,10 monster Shining Plant 1083,1,1800000,900000,1
cmd_fild01,313,213,10,10 monster Blue Plant 1079,1,1800000,900000,1
cmd_fild01,171,339,10,10 monster Blue Plant 1079,2,1800000,900000,1
@@ -25,23 +25,20 @@ cmd_fild01,194,176,20,20 monster Blue Plant 1079,1,1800000,900000,1
cmd_fild01,0,0,0,0 monster Green Plant 1080,5,1800000,900000,1
//==================================================
-// cmd_fild02 - Kokomo Beach
-//==================================================
-cmd_fild02,200,130,150,40 monster Seal 1317,110,0,0,0
-cmd_fild02,93,82,40,80 monster Seal 1317,10,0,0,0
-cmd_fild02,0,0,0,0 monster Galapago 1391,30,0,0,0
-cmd_fild02,0,0,0,0 monster Crab 1073,20,0,0,0
-cmd_fild02,0,0,0,0 monster Shellfish 1074,35,0,0,0
-cmd_fild02,93,82,40,80 monster Shellfish 1074,5,,0,0
-cmd_fild02,73,100,40,100 monster Aster 1266,5,0,0,0
-cmd_fild02,200,130,150,50 monster Aster 1266,5,0,0,0
-cmd_fild02,0,0,0,0 monster Mobster 1313,1,0,0,0
+// cmd_fild02 - Kokomo beach
+//==================================================
+cmd_fild02,0,0,0,0 monster Seal 1317,120,5000,0,0
+cmd_fild02,0,0,0,0 monster Galapago 1391,30,5000,0,0
+cmd_fild02,0,0,0,0 monster Shellfish 1074,20,5000,0,0
+cmd_fild02,0,0,0,0 monster Crab 1073,20,5000,0,0
+cmd_fild02,0,0,0,0 monster Aster 1266,10,5000,0,0
+cmd_fild02,0,0,0,0 monster Mobster 1313,1,5000,0,0
//==================================================
// cmd_fild03 - Zenhai Marsh
//==================================================
-cmd_fild03,0,0,0,0 monster Alligator 1271,150,0,0,0
-cmd_fild03,0,0,0,0 monster Flora 1118,50,0,0,0
+cmd_fild03,0,0,0,0 monster Alligator 1271,150,5000,0,0
+cmd_fild03,0,0,0,0 monster Flora 1118,50,5000,0,0
cmd_fild03,0,0,0,0 monster Mutant Dragonoid 1262,4,0,0,1
cmd_fild03,0,0,0,0 monster Toad 1089,1,3600000,1800000,1
cmd_fild03,356,232,3,3 monster Shining Plant 1083,1,1800000,900000,1
@@ -49,57 +46,50 @@ cmd_fild03,262,289,3,3 monster Shining Plant 1083,1,1800000,900000,1
cmd_fild03,145,191,3,3 monster Shining Plant 1083,1,1800000,900000,1
//==================================================
-// cmd_fild04 - Kokomo Beach
+// cmd_fild04 - Kokomo beach
//==================================================
-cmd_fild04,221,120,120,40 monster Sea Otter 1323,120,0,0,0
-cmd_fild04,0,0,0,0 monster Galapago 1391,30,0,0,0
-cmd_fild04,0,0,0,0 monster Crab 1073,20,0,0,0
-cmd_fild04,0,0,0,0 monster Shellfish 1074,20,0,0,0
-cmd_fild04,221,120,120,40 monster Aster 1266,10,0,0,0
+cmd_fild04,0,0,0,0 monster Sea Otter 1323,120,5000,0,0
+cmd_fild04,0,0,0,0 monster Galapago 1391,30,5000,0,0
+cmd_fild04,0,0,0,0 monster Shellfish 1074,20,5000,0,0
+cmd_fild04,0,0,0,0 monster Crab 1073,20,5000,0,0
+cmd_fild04,0,0,0,0 monster Aster 1266,10,5000,0,0
//==================================================
-// cmd_fild05 - Border of Papuchica Forest
+// cmd_fild05 - Disabled on Renewal
//==================================================
-// No Spawns/Disabled Map - 13.3
//==================================================
// cmd_fild06 - Fortress Saint Darmain (West)
//==================================================
-cmd_fild06,0,0,0,0 monster Golem 1040,150,0,0,0
-cmd_fild06,0,0,0,0 monster Metaller 1056,50,0,0,0
+cmd_fild06,0,0,0,0 monster Golem 1040,150,5000,0,0
+cmd_fild06,0,0,0,0 monster Metaller 1058,50,5000,0,0
cmd_fild06,293,235,5,5 monster Yellow Plant 1081,2,1800000,900000,1
cmd_fild06,84,375,10,10 monster Yellow Plant 1081,3,1800000,900000,1
//==================================================
-// cmd_fild07 - Beacon Island, Pharos
-//==================================================
-cmd_fild07,101,176,60,90 monster Raggler 1254,25,0,0,0
-cmd_fild07,241,106,40,90 monster Raggler 1254,25,0,0,0
-cmd_fild07,204,317,60,60 monster Raggler 1254,25,0,0,0
-cmd_fild07,323,310,60,60 monster Raggler 1254,25,0,0,0
-cmd_fild07,240,107,40,90 monster Crab 1073,15,0,0,0
-cmd_fild07,100,175,60,90 monster Crab 1073,15,0,0,0
-cmd_fild07,239,105,40,90 monster Shellfish 1074,15,0,0,0
-cmd_fild07,104,180,40,90 monster Shellfish 1074,15,0,0,0
-cmd_fild07,242,108,40,90 monster Aster 1266,15,0,0,0
-cmd_fild07,102,177,60,90 monster Aster 1266,15,0,0,0
+// cmd_fild07 - Beacon Island, Pharos
+//==================================================
+cmd_fild07,0,0,0,0 monster Raggler 1254,100,5000,0,0
+cmd_fild07,0,0,0,0 monster Aster 1266,30,5000,0,0
+cmd_fild07,0,0,0,0 monster Shellfish 1074,30,5000,0,0
+cmd_fild07,0,0,0,0 monster Crab 1073,30,5000,0,0
//==================================================
// cmd_fild08 - Fortress Saint Darmain (East)
//==================================================
-cmd_fild08,0,0,0,0 monster Andre 1095,50,0,0,0
-cmd_fild08,0,0,0,0 monster Deniro 1105,50,0,0,0
-cmd_fild08,0,0,0,0 monster Piere 1160,50,0,0,0
-cmd_fild08,0,0,0,0 monster Ant Egg 1097,30,0,0,0
-cmd_fild08,0,0,0,0 monster Andre 1040,2,0,0,0
+cmd_fild08,0,0,0,0 monster Deniro 1105,50,5000,0,0
+cmd_fild08,0,0,0,0 monster Piere 1160,50,5000,0,0
+cmd_fild08,0,0,0,0 monster Andre 1095,50,5000,0,0
+cmd_fild08,0,0,0,0 monster Ant Egg 1097,30,5000,0,0
+cmd_fild08,0,0,0,0 monster Golem 1040,2,5000,0,0
cmd_fild08,60,143,10,10 monster Yellow Plant 1081,4,1800000,900000,1
cmd_fild08,130,201,10,10 monster Yellow Plant 1081,4,1800000,900000,1
//==================================================
// cmd_fild09 - Fortress Saint Darmain (South)
//==================================================
-cmd_fild09,0,0,0,0 monster Metaller 1056,145,0,0,0
-cmd_fild09,0,0,0,0 monster Andre 1095,15,0,0,0
-cmd_fild09,0,0,0,0 monster Deniro 1105,15,0,0,0
-cmd_fild09,0,0,0,0 monster Piere 1160,15,0,0,0
-cmd_fild09,0,0,0,0 monster Ant Egg 1097,10,0,0,0
+cmd_fild09,0,0,0,0 monster Metaller 1058,145,5000,0,0
+cmd_fild09,0,0,0,0 monster Deniro 1105,15,5000,0,0
+cmd_fild09,0,0,0,0 monster Piere 1160,15,5000,0,0
+cmd_fild09,0,0,0,0 monster Andre 1095,15,5000,0,0
+cmd_fild09,0,0,0,0 monster Ant Egg 1097,10,5000,0,0 \ No newline at end of file
diff --git a/npc/mobs/fields/dicastes.txt b/npc/mobs/fields/dicastes.txt
new file mode 100644
index 000000000..c9a758d2f
--- /dev/null
+++ b/npc/mobs/fields/dicastes.txt
@@ -0,0 +1,28 @@
+//===== eAthena Script =======================================
+//= El Dicastes Fields Monster Spawn Script
+//===== By: ==================================================
+//= Kisuka
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= eAthena SVN
+//===== Additional Comments: =================================
+//= 1.0 Official spawns from Aegis [Kisuka]
+//============================================================
+
+//==================================================
+// dic_fild01 - At the Foot of the Kamidal Mountain
+//==================================================
+dic_fild01,0,0,0,0 monster Centipede 1987,60,5000,0,0
+dic_fild01,0,0,0,0 monster Centipede Larva 1999,30,5000,0,0
+dic_fild01,0,0,0,0 monster Tatacho 1986,25,5000,0,0
+dic_fild01,0,0,0,0 monster Dolomedes 2092,20,5000,0,0
+
+//==================================================
+// dic_fild02 - At the Foot of the Kamidal Mountain
+//==================================================
+dic_fild02,0,0,0,0 monster Bradium Golem 2024,3,5000,0,0
+dic_fild02,0,0,0,0 monster Centipede 1987,35,5000,0,0
+dic_fild02,0,0,0,0 monster Centipede Larva 1999,10,5000,0,0
+dic_fild02,0,0,0,0 monster Tatacho 1986,25,5000,0,0
+dic_fild02,0,0,0,0 monster Dolomedes 2092,80,5000,0,0 \ No newline at end of file
diff --git a/npc/mobs/fields/einbroch.txt b/npc/mobs/fields/einbroch.txt
index 44b5e7801..053c3538a 100644
--- a/npc/mobs/fields/einbroch.txt
+++ b/npc/mobs/fields/einbroch.txt
@@ -24,61 +24,82 @@
//============================================================
//==================================================
-// ein_fild02 - Einbroch Field
+// ein_fild01 - Spawns disabled on Renewal
+//==================================================
+
+//==================================================
+// ein_fild02 - Disabled on Renewal
//==================================================
-ein_fild02,0,0,0,0 monster Ungoliant 1618,1,75600000,75000000,0
//==================================================
// ein_fild03 - Einbroch Field
//==================================================
-ein_fild03,0,0,0,0 monster Teddy Bear 1622,100,0,0,0
-ein_fild03,0,0,0,0 monster Pitman 1616,20,0,0,0
-ein_fild03,0,0,0,0 monster Noxious 1620,20,0,0,0
-ein_fild03,0,0,0,0 monster Venomous 1621,20,0,0,0
+ein_fild03,0,0,0,0 monster Teddy Bear 1622,100,5000,0,0
+ein_fild03,0,0,0,0 monster Venomous 1621,20,5000,0,0
+ein_fild03,0,0,0,0 monster Noxious 1620,20,5000,0,0
+ein_fild03,0,0,0,0 monster Pitman 1616,20,5000,0,0
+ein_fild03,0,0,0,0 monster Yellow Plant 1081,15,60000,30000,0
+ein_fild03,0,0,0,0 monster Green Plant 1080,15,60000,30000,0
//==================================================
// ein_fild04 - Einbroch Field
//==================================================
-ein_fild04,0,0,0,0 monster Venomous 1621,100,0,0,0
-ein_fild04,0,0,0,0 monster Noxious 1620,30,0,0,0
-ein_fild04,0,0,0,0 monster Teddy Bear 1622,20,0,0,0
-ein_fild04,0,0,0,0 monster Demon Pungus 1378,15,0,0,0
-ein_fild04,0,0,0,0 monster Pitman 1616,10,0,0,0
+ein_fild04,0,0,0,0 monster Venomous 1621,100,5000,0,0
+ein_fild04,0,0,0,0 monster Noxious 1620,30,5000,0,0
+ein_fild04,0,0,0,0 monster Teddy Bear 1622,20,5000,0,0
+ein_fild04,0,0,0,0 monster Demon Pungus 1378,15,5000,0,0
+ein_fild04,0,0,0,0 monster Pitman 1616,10,5000,0,0
+ein_fild04,0,0,0,0 monster Red Plant 1078,10,60000,30000,0
+ein_fild04,0,0,0,0 monster Yellow Plant 1081,10,60000,30000,0
+ein_fild04,0,0,0,0 monster Green Plant 1080,10,60000,30000,0
//==================================================
// ein_fild05 - Einbroch Field
//==================================================
-ein_fild04,0,0,0,0 monster Noxious 1620,100,0,0,0
-ein_fild04,0,0,0,0 monster Venomous 1621,30,0,0,0
-ein_fild04,0,0,0,0 monster Teddy Bear 1622,20,0,0,0
-ein_fild04,0,0,0,0 monster Demon Pungus 1378,15,0,0,0
-ein_fild04,0,0,0,0 monster Pitman 1616,10,0,0,0
+ein_fild05,0,0,0,0 monster Noxious 1620,100,5000,0,0
+ein_fild05,0,0,0,0 monster Venomous 1621,30,5000,0,0
+ein_fild05,0,0,0,0 monster Teddy Bear 1622,20,5000,0,0
+ein_fild05,0,0,0,0 monster Demon Pungus 1378,15,5000,0,0
+ein_fild05,0,0,0,0 monster Pitman 1616,10,5000,0,0
//==================================================
// ein_fild06 - Einbroch Field
//==================================================
-ein_fild06,0,0,0,0 monster Holden 1628,100,0,0,0
-ein_fild06,0,0,0,0 monster Metaling 1613,30,0,0,0
+ein_fild06,0,0,0,0 monster Holden 1628,100,5000,0,0
+ein_fild06,0,0,0,0 monster Metaling 1613,30,5000,0,0
+ein_fild06,0,0,0,0 monster Red Plant 1078,10,120000,60000,0
+ein_fild06,0,0,0,0 monster Yellow Plant 1081,10,120000,60000,0
+ein_fild06,0,0,0,0 monster Black Mushroom 1084,5,120000,60000,0
//==================================================
// ein_fild07 - Einbroch Field
//==================================================
-ein_fild07,0,0,0,0 monster Metaling 1613,90,0,0,0
-ein_fild07,0,0,0,0 monster Porcellio 1619,30,0,0,0
-ein_fild07,0,0,0,0 monster Red Mushroom 1085,10,120000,60000,0
-ein_fild07,0,0,0,0 monster Holden 1628,10,0,0,0
+ein_fild07,0,0,0,0 monster Metaling 1613,90,5000,0,0
+ein_fild07,0,0,0,0 monster Porcellio 1619,30,5000,0,0
+ein_fild07,0,0,0,0 monster Holden 1628,10,5000,0,0
ein_fild07,0,0,0,0 monster Ungoliant 1618,1,86400000,86000000,0
+ein_fild07,0,0,0,0 monster Red Plant 1078,10,120000,60000,0
+ein_fild07,0,0,0,0 monster Yellow Plant 1081,10,120000,60000,0
+ein_fild07,0,0,0,0 monster Red Mushroom 1085,10,120000,60000,0
//==================================================
// ein_fild08 - Einbroch Field
//==================================================
-ein_fild08,0,0,0,0 monster Metaling 1613,100,0,0,0
-ein_fild08,0,0,0,0 monster Porcellio 1619,30,0,0,0
+ein_fild08,0,0,0,0 monster Metaling 1613,100,5000,0,0
+ein_fild08,0,0,0,0 monster Porcellio 1619,30,5000,0,0
+ein_fild08,0,0,0,0 monster Red Plant 1078,10,120000,60000,0
+ein_fild08,0,0,0,0 monster Yellow Plant 1081,10,120000,60000,0
ein_fild08,0,0,0,0 monster Red Mushroom 1085,10,120000,60000,0
//==================================================
// ein_fild09 - Einbroch Field
//==================================================
-ein_fild09,0,0,0,0 monster Porcellio 1619,70,0,0,0
-ein_fild09,0,0,0,0 monster Metaling 1613,30,0,0,0
+ein_fild09,0,0,0,0 monster Porcellio 1619,70,5000,0,0
+ein_fild09,0,0,0,0 monster Metaling 1613,30,5000,0,0
+ein_fild09,0,0,0,0 monster Red Plant 1078,10,120000,60000,0
+ein_fild09,0,0,0,0 monster Yellow Plant 1081,10,120000,60000,0
ein_fild09,0,0,0,0 monster Red Mushroom 1085,10,120000,60000,0
+
+//==================================================
+// ein_fild10 - Disabled on Renewal
+//================================================== \ No newline at end of file
diff --git a/npc/mobs/fields/geffen.txt b/npc/mobs/fields/geffen.txt
index 950e68cd9..cff6c2931 100644
--- a/npc/mobs/fields/geffen.txt
+++ b/npc/mobs/fields/geffen.txt
@@ -17,109 +17,186 @@
//==================================================
// gef_fild00 - Geffen Field
//==================================================
-gef_fild00,0,0,0,0 monster Chonchon 1011,140,0,0,0
-gef_fild00,0,0,0,0 monster Poring 1002,30,0,0,0
-gef_fild00,0,0,0,0 monster Fabre 1007,30,0,0,0
+gef_fild00,0,0,0,0 monster Chonchon 1011,140,5000,0,0
+gef_fild00,0,0,0,0 monster Poring 1002,30,5000,0,0
+gef_fild00,0,0,0,0 monster Fabre 1007,30,5000,0,0
+gef_fild00,95,128,0,0 monster Blue Plant 1079,1,900000,450000,1
+gef_fild00,124,321,0,0 monster Blue Plant 1079,1,900000,450000,1
+gef_fild00,54,212,5,5 monster Green Plant 1080,3,360000,180000,1
+gef_fild00,54,186,5,5 monster Green Plant 1080,3,360000,180000,1
//==================================================
// gef_fild01 - Geffen Field
//==================================================
-gef_fild01,0,0,0,0 monster Roda Frog 1012,80,0,0,0
-gef_fild01,0,0,0,0 monster Ambernite 1094,20,0,0,0
+gef_fild01,0,0,0,0 monster Roda Frog 1012,80,5000,0,0
+gef_fild01,0,0,0,0 monster Ambernite 1094,20,5000,0,0
gef_fild01,0,0,0,0 monster Toad 1089,1,3600000,1800000,1
+gef_fild01,215,225,10,10 monster Green Plant 1080,5,360000,180000,1
//==================================================
// gef_fild02 - Geffen Field
//==================================================
-gef_fild02,0,0,0,0 monster Coco 1104,140,0,0,0
-gef_fild02,0,0,0,0 monster Poporing 1031,20,0,0,0
-gef_fild02,0,0,0,0 monster Elder Willow 1033,20,0,0,0
-gef_fild02,0,0,0,0 monster Horn 1128,20,0,0,0
-//gef_fild02,0,0,0,0 boss_monster Orc Hero 1087,1,86400000,600000,1
+gef_fild02,0,0,0,0 monster Coco 1104,140,5000,0,0
+gef_fild02,0,0,0,0 monster Poporing 1031,20,5000,0,0
+gef_fild02,0,0,0,0 monster Hornet 1004,20,5000,0,0
+gef_fild02,0,0,0,0 monster Elder Willow 1033,20,5000,0,0
+gef_fild02,227,316,6,6 monster Green Plant 1080,8,360000,180000,1
gef_fild02,87,48,6,6 monster Red Mushroom 1085,5,360000,180000,1
+gef_fild02,215,209,2,1 monster Blue Plant 1079,2,360000,180000,1
+gef_fild02,207,214,1,1 monster Blue Plant 1079,1,360000,180000,1
+gef_fild02,220,214,1,1 monster Blue Plant 1079,1,360000,180000,1
+gef_fild02,164,194,1,1 monster Shining Plant 1083,1,1800000,900000,1
//==================================================
// gef_fild03 - Geffen Field
//==================================================
-gef_fild03,0,0,0,0 monster Orc Lady 1273,130,0,0,0
-gef_fild03,0,0,0,0 monster Orc Baby 1686,60,0,0,0
-gef_fild03,0,0,0,0 monster Orc Warrior 1023,20,0,0,0
+gef_fild03,0,0,0,0 monster Orc Lady 1273,130,5000,0,0
+gef_fild03,0,0,0,0 monster Orc Warrior 1023,60,5000,0,0
+gef_fild03,0,0,0,0 monster Orc Baby 1686,20,5000,0,0
gef_fild03,0,0,0,0 boss_monster Orc Hero 1087,1,3600000,600000,1
+gef_fild03,45,350,3,3 monster Green Plant 1080,1,180000,90000,1
+gef_fild03,66,300,3,3 monster Green Plant 1080,1,180000,90000,1
+gef_fild03,80,252,3,3 monster Green Plant 1080,1,180000,90000,1
+gef_fild03,118,281,3,3 monster Green Plant 1080,1,180000,90000,1
+gef_fild03,135,344,3,3 monster Green Plant 1080,1,180000,90000,1
+gef_fild03,210,363,3,3 monster Green Plant 1080,1,180000,90000,1
+gef_fild03,215,345,3,3 monster Green Plant 1080,1,180000,90000,1
+gef_fild03,359,316,3,3 monster Green Plant 1080,1,180000,90000,1
+gef_fild03,350,247,3,3 monster Green Plant 1080,1,180000,90000,1
+gef_fild03,304,202,3,3 monster Green Plant 1080,1,180000,90000,1
+gef_fild03,285,223,3,3 monster Green Plant 1080,1,180000,90000,1
+gef_fild03,282,192,3,3 monster Green Plant 1080,1,180000,90000,1
+gef_fild03,316,143,3,3 monster Green Plant 1080,1,180000,90000,1
+gef_fild03,337,104,3,3 monster Green Plant 1080,1,180000,90000,1
+gef_fild03,348,42,3,3 monster Green Plant 1080,1,180000,90000,1
+gef_fild03,326,79,3,3 monster Green Plant 1080,1,180000,90000,1
+gef_fild03,280,92,3,3 monster Green Plant 1080,1,180000,90000,1
+gef_fild03,216,135,3,3 monster Green Plant 1080,1,180000,90000,1
+gef_fild03,169,92,3,3 monster Green Plant 1080,1,180000,90000,1
+gef_fild03,45,93,3,3 monster Green Plant 1080,1,180000,90000,1
+gef_fild03,44,133,3,3 monster Green Plant 1080,1,180000,90000,1
//==================================================
// gef_fild04 - Geffen Field
//==================================================
-gef_fild04,0,0,0,0 monster Mandragora 1020,124,0,0,0
-gef_fild04,0,0,0,0 monster Fabre 1007,25,0,0,0
-gef_fild04,0,0,0,0 monster Chonchon 1011,25,0,0,0
-gef_fild04,0,0,0,0 monster Lunatic 1063,25,0,0,0
+gef_fild04,0,0,0,0 monster Mandragora 1020,125,5000,0,0
+gef_fild04,0,0,0,0 monster Lunatic 1063,25,5000,0,0
+gef_fild04,0,0,0,0 monster Fabre 1007,25,5000,0,0
+gef_fild04,0,0,0,0 monster Chonchon 1011,25,5000,0,0
+gef_fild04,224,82,5,2 monster Green Plant 1080,3,360000,180000,1
+gef_fild04,152,82,5,2 monster Green Plant 1080,3,360000,180000,1
//==================================================
// gef_fild05 - Geffen Field
//==================================================
-gef_fild05,0,0,0,0 monster Creamy 1018,140,0,0,0
-gef_fild05,0,0,0,0 monster Smokie 1056,20,0,0,0
-gef_fild05,0,0,0,0 monster Stainer 1174,20,0,0,0
-gef_fild05,0,0,0,0 monster Thief Bug Egg 1048,10,0,0,0
-gef_fild05,0,0,0,0 monster Thief Bug 1051,10,0,0,0
+gef_fild05,0,0,0,0 monster Creamy 1018,140,5000,0,0
+gef_fild05,0,0,0,0 monster Stainer 1174,20,5000,0,0
+gef_fild05,0,0,0,0 monster Smokie 1056,20,5000,0,0
+gef_fild05,0,0,0,0 monster Thief Bug Egg 1048,10,5000,0,0
+gef_fild05,0,0,0,0 monster Thief Bug Egg 1048,10,5000,0,0
+gef_fild05,235,322,0,0 monster Red Plant 1078,1,180000,90000,1
+gef_fild05,238,326,0,0 monster Red Plant 1078,1,180000,90000,1
+gef_fild05,170,337,0,0 monster Red Plant 1078,1,180000,90000,1
+gef_fild05,108,317,0,0 monster Red Plant 1078,1,180000,90000,1
+gef_fild05,56,285,0,0 monster Red Plant 1078,1,180000,90000,1
+gef_fild05,65,256,0,0 monster Red Plant 1078,1,180000,90000,1
+gef_fild05,74,228,0,0 monster Red Plant 1078,1,180000,90000,1
+gef_fild05,50,189,0,0 monster Red Plant 1078,1,180000,90000,1
+gef_fild05,51,166,0,0 monster Red Plant 1078,1,180000,90000,1
+gef_fild05,146,161,0,0 monster Red Plant 1078,1,180000,90000,1
+gef_fild05,153,180,0,0 monster Red Plant 1078,1,180000,90000,1
+gef_fild05,124,207,0,0 monster Red Plant 1078,1,180000,90000,1
+gef_fild05,187,249,0,0 monster Red Plant 1078,1,180000,90000,1
+gef_fild05,187,265,0,0 monster Red Plant 1078,1,180000,90000,1
+gef_fild05,130,293,0,0 monster Red Plant 1078,1,180000,90000,1
//==================================================
// gef_fild06 - Geffen Field
//==================================================
-gef_fild06,0,0,0,0 monster Petite 1155,130,0,0,0
-gef_fild06,0,0,0,0 monster Side Winder 1037,30,0,0,0
-gef_fild06,0,0,0,0 monster Mantis 1139,30,0,0,0
+gef_fild06,0,0,0,0 monster Petite 1155,130,5000,0,0
+gef_fild06,0,0,0,0 monster Mantis 1139,30,5000,0,0
+gef_fild06,0,0,0,0 monster Side Winder 1037,30,5000,0,0
+gef_fild06,0,0,0,0 monster Shining Plant 1083,4,1800000,900000,1
//==================================================
// gef_fild07 - Geffen Field
//==================================================
-gef_fild07,0,0,0,0 monster Pupa 1008,130,0,0,0
-gef_fild07,0,0,0,0 monster Poring 1002,20,0,0,0
-gef_fild07,0,0,0,0 monster Fabre 1007,30,0,0,0
-gef_fild07,0,0,0,0 monster Chonchon 1011,20,0,0,0
+gef_fild07,0,0,0,0 monster Pupa 1008,130,5000,0,0
+gef_fild07,0,0,0,0 monster Poring 1002,20,5000,0,0
+gef_fild07,0,0,0,0 monster Fabre 1007,20,5000,0,0
+gef_fild07,0,0,0,0 monster Chonchon 1011,20,5000,0,0
+gef_fild07,122,221,0,0 monster Green Plant 1080,3,360000,180000,1
+gef_fild07,185,247,0,0 monster Shining Plant 1083,1,1800000,900000,1
+gef_fild07,269,289,0,0 monster Blue Plant 1079,1,900000,450000,1
+gef_fild07,269,289,3,3 monster Green Plant 1080,3,360000,180000,1
//==================================================
// gef_fild08 - Geffen Field
//==================================================
-gef_fild08,0,0,0,0 monster Petite 1156,130,0,0,0
-gef_fild08,0,0,0,0 monster Flora 1118,30,0,0,0
-gef_fild08,0,0,0,0 monster Mantis 1139,30,0,0,0
+gef_fild08,0,0,0,0 monster Petite 1156,130,5000,0,0
+gef_fild08,0,0,0,0 monster Mantis 1139,30,5000,0,0
+gef_fild08,0,0,0,0 monster Flora 1118,30,5000,0,0
+gef_fild08,65,341,0,0 monster Blue Plant 1079,1,900000,450000,1
+gef_fild08,111,319,0,0 monster Blue Plant 1079,1,900000,450000,1
+gef_fild08,59,91,0,0 monster Blue Plant 1079,1,900000,450000,1
+gef_fild08,70,80,0,0 monster Blue Plant 1079,1,900000,450000,1
+gef_fild08,144,140,0,0 monster Blue Plant 1079,1,900000,450000,1
+gef_fild08,344,78,0,0 monster Blue Plant 1079,1,900000,450000,1
+gef_fild08,325,311,0,0 monster Blue Plant 1079,1,900000,450000,1
+gef_fild08,162,247,0,0 monster Blue Plant 1079,1,900000,450000,1
//==================================================
// gef_fild09 - Geffen Field
//==================================================
-gef_fild09,0,0,0,0 monster Ambernite 1094,80,0,0,0
-gef_fild09,0,0,0,0 monster Roda Frog 1012,20,0,0,0
+gef_fild09,0,0,0,0 monster Ambernite 1094,80,5000,0,0
+gef_fild09,0,0,0,0 monster Roda Frog 1012,20,5000,0,0
gef_fild09,51,43,0,0 monster Red Mushroom 1085,1,180000,90000,1
+gef_fild09,125,53,0,0 monster Red Mushroom 1085,1,180000,90000,1
+gef_fild09,148,74,0,0 monster Red Mushroom 1085,1,180000,90000,1
+gef_fild09,184,66,0,0 monster Red Mushroom 1085,1,180000,90000,1
+gef_fild09,207,54,0,0 monster Red Mushroom 1085,1,180000,90000,1
+gef_fild09,245,62,0,0 monster Red Mushroom 1085,1,180000,90000,1
+gef_fild09,268,45,0,0 monster Red Mushroom 1085,1,180000,90000,1
+gef_fild09,258,24,0,0 monster Red Mushroom 1085,1,180000,90000,1
+gef_fild09,325,36,0,0 monster Red Mushroom 1085,1,180000,90000,1
+gef_fild09,344,51,0,0 monster Red Mushroom 1085,1,180000,90000,1
+gef_fild09,277,201,5,5 monster Blue Plant 1079,3,900000,450000,1
//==================================================
// gef_fild10 - Geffen Field
//==================================================
-gef_fild10,0,0,0,0 monster Orc Warrior 1023,130,0,0,0
-gef_fild10,0,0,0,0 monster Orc Lady 1273,40,0,0,0
-gef_fild10,0,0,0,0 monster Orc Baby 1686,20,0,0,0
+gef_fild10,0,0,0,0 monster Orc Warrior 1023,130,5000,0,0
+gef_fild10,0,0,0,0 monster Orc Lady 1273,40,5000,0,0
+gef_fild10,0,0,0,0 monster Orc Baby 1686,20,5000,0,0
gef_fild10,0,0,0,0 boss_monster Orc Lord 1190,1,7200000,600000,0
+gef_fild10,46,350,5,5 monster Blue Plant 1079,3,900000,450000,1
+gef_fild10,287,61,5,5 monster Blue Plant 1079,3,900000,450000,1
+gef_fild10,300,253,5,5 monster Green Plant 1080,3,360000,180000,1
//==================================================
// gef_fild11 - Geffen Field
//==================================================
-gef_fild11,0,0,0,0 monster Goblin 1122,50,0,0,0
-gef_fild11,0,0,0,0 monster Goblin 1123,50,0,0,0
-gef_fild11,0,0,0,0 monster Goblin 1124,50,0,0,0
-gef_fild11,0,0,0,0 monster Goblin 1125,50,0,0,0
+gef_fild11,0,0,0,0 monster Goblin 1122,50,5000,0,0
+gef_fild11,0,0,0,0 monster Goblin 1123,50,5000,0,0
+gef_fild11,0,0,0,0 monster Goblin 1124,50,5000,0,0
+gef_fild11,0,0,0,0 monster Goblin 1125,50,5000,0,0
gef_fild11,0,0,0,0 monster Goblin Leader 1299,1,1800000,1200000,0
+gef_fild11,101,277,4,1 monster Black Mushroom 1084,3,360000,180000,1
+gef_fild11,176,288,1,4 monster Black Mushroom 1084,3,360000,180000,1
+gef_fild11,253,357,1,4 monster Black Mushroom 1084,3,360000,180000,1
+gef_fild11,247,249,1,4 monster Black Mushroom 1084,3,360000,180000,1
+gef_fild11,257,209,1,4 monster Black Mushroom 1084,3,360000,180000,1
+gef_fild11,174,240,1,3 monster Black Mushroom 1084,3,360000,180000,1
+gef_fild11,283,100,4,1 monster Black Mushroom 1084,3,360000,180000,1
//==================================================
-// gef_fild12 - Kordt Forest
+// gef_fild12 - Disabled on Renewal
//==================================================
-// No spawns/Disabled Map - 13.3
//==================================================
-// gef_fild13 - Britoniah
+// gef_fild13 - No Spawns on Renewal
//==================================================
-// No spawns - 13.3
//==================================================
-// gef_fild14 - West Orc Village
-//==================================================
-// No spawns/Disabled Map - 13.3
+// gef_fild14 - Disabled on Renewal
+//================================================== \ No newline at end of file
diff --git a/npc/mobs/fields/gonryun.txt b/npc/mobs/fields/gonryun.txt
index e1f32c17a..9652e8df4 100644
--- a/npc/mobs/fields/gonryun.txt
+++ b/npc/mobs/fields/gonryun.txt
@@ -12,8 +12,10 @@
//============================================================
//==================================================
-// gon_fild01 - Gonryun Field
+// gon_fild01 - Kunlun Field
//==================================================
-gon_fild01,0,0,0,0 monster Dumpling Child 1409,55,0,0,0
-gon_fild01,0,0,0,0 monster Baby Leopard 1415,40,0,0,0
-gon_fild01,0,0,0,0 monster Side Winder 1037,10,0,0,0
+gon_fild01,0,0,0,0 monster Dumpling Child 1409,55,5000,0,0
+gon_fild01,0,0,0,0 monster Baby Leopard 1415,40,5000,0,0
+gon_fild01,0,0,0,0 monster Side Winder 1037,10,5000,0,0
+gon_fild01,0,0,0,0 monster Green Plant 1080,5,5000,0,0
+gon_fild01,0,0,0,0 monster Shining Plant 1083,1,5000,0,0 \ No newline at end of file
diff --git a/npc/mobs/fields/hugel.txt b/npc/mobs/fields/hugel.txt
index 1d2630730..af4b51d2d 100644
--- a/npc/mobs/fields/hugel.txt
+++ b/npc/mobs/fields/hugel.txt
@@ -23,38 +23,52 @@
//==================================================
// hu_fild01 - Thanatos Tower
//==================================================
-hu_fild01,0,0,0,0 monster Novus 1715,100,0,0,0
-hu_fild01,0,0,0,0 monster Novus 1718,35,0,0,0
-hu_fild01,0,0,0,0 monster Geographer 1368,10,0,0,0
-hu_fild01,0,0,0,0 monster Dragon Egg 1721,10,0,0,0
+hu_fild01,0,0,0,0 monster Novus 1715,100,5000,0,0
+hu_fild01,0,0,0,0 monster Novus 1718,35,5000,0,0
+hu_fild01,0,0,0,0 monster Geographer 1368,10,5000,0,0
+hu_fild01,0,0,0,0 monster Dragon Egg 1721,10,5000,0,0
//==================================================
// hu_fild02 - Hugel Field
//==================================================
-hu_fild02,0,0,0,0 monster Novus 1715,100,0,0,0
-hu_fild02,0,0,0,0 monster Geographer 1368,30,0,0,0
-hu_fild02,0,0,0,0 monster Novus 1718,30,0,0,0
-hu_fild02,0,0,0,0 monster Dragon Egg 1721,20,0,0,0
+hu_fild02,0,0,0,0 monster Novus 1715,100,5000,0,0
+hu_fild02,0,0,0,0 monster Novus 1718,30,5000,0,0
+hu_fild02,0,0,0,0 monster Geographer 1368,30,5000,0,0
+hu_fild02,0,0,0,0 monster Dragon Egg 1721,20,5000,0,0
hu_fild02,0,0,0,0 monster Gryphon 1259,3,3600000,0,1
//==================================================
+// hu_fild03 - Disabled on Renewal
+//==================================================
+
+//==================================================
// hu_fild04 - Hugel Field
//==================================================
-hu_fild04,0,0,0,0 monster Novus 1718,100,0,0,0
-hu_fild04,0,0,0,0 monster Geographer 1368,30,0,0,0
-hu_fild04,0,0,0,0 monster Novus 1715,30,0,0,0
-hu_fild04,0,0,0,0 monster Dragon Egg 1721,20,0,0,0
+hu_fild04,0,0,0,0 monster Novus 1718,100,5000,0,0
+hu_fild04,0,0,0,0 monster Novus 1715,30,5000,0,0
+hu_fild04,0,0,0,0 monster Geographer 1368,30,5000,0,0
+hu_fild04,0,0,0,0 monster Dragon Egg 1721,20,5000,0,0
+hu_fild04,0,0,0,0 monster Green Plant 1080,10,0,0,0
+hu_fild04,0,0,0,0 monster Yellow Plant 1081,10,0,0,0
+hu_fild04,206,210,30,18 monster Blue Plant 1079,4,120000,600000,0
+hu_fild04,206,120,10,10 monster Blue Plant 1079,2,120000,600000,0
//==================================================
// hu_fild05 - The Abyss Lake
//==================================================
-hu_fild05,0,0,0,0 monster Novus 1718,130,0,0,0
-hu_fild05,0,0,0,0 monster Novus 1715,35,0,0,0
-hu_fild05,0,0,0,0 monster Dragon Egg 1721,20,0,0,0
+hu_fild05,0,0,0,0 monster Novus 1718,130,5000,0,0
+hu_fild05,0,0,0,0 monster Novus 1715,35,5000,0,0
+hu_fild05,0,0,0,0 monster Dragon Egg 1721,20,5000,0,0
//==================================================
// hu_fild06 - Hugel Field
//==================================================
-hu_fild06,0,0,0,0 monster Shellfish 1074,50,0,0,0
-hu_fild06,0,0,0,0 monster Crab 1073,20,0,0,0
-hu_fild06,0,0,0,0 monster Aster 1266,20,0,0,0
+hu_fild06,0,0,0,0 monster Shellfish 1074,50,5000,0,0
+hu_fild06,0,0,0,0 monster Crab 1073,20,5000,0,0
+hu_fild06,0,0,0,0 monster Aster 1266,20,5000,0,0
+hu_fild06,234,251,14,120 monster Green Plant 1080,10,600000,0,0
+hu_fild06,234,251,14,120 monster Yellow Plant 1081,10,600000,0,0
+
+//==================================================
+// hu_fild07 - Disabled on Renewal
+//================================================== \ No newline at end of file
diff --git a/npc/mobs/fields/jawaii.txt b/npc/mobs/fields/jawaii.txt
index aea56dd1e..0c63c6312 100644
--- a/npc/mobs/fields/jawaii.txt
+++ b/npc/mobs/fields/jawaii.txt
@@ -3,15 +3,27 @@
//===== By: ==================================================
//= MasterOfMuppets (1.0)
//===== Current Version: =====================================
-//= 1.1
+//= 1.0
//===== Compatible With: =====================================
//= Any Athena Version
//===== Additional Comments: =================================
//= 1.0 First version [MasterOfMuppets]
-//= 1.1 Updated to Renewal Spawns [Kisuka]
//============================================================
//==================================================
+// jawaii - Jawaii, the Honeymoon Island
+//==================================================
+jawaii,207,290,10,10 monster Phen 1158,3,3600000,1800000,0
+jawaii,221,220,30,30 monster Aster 1266,2,3600000,2400000,0
+jawaii,276,163,20,20 monster Aster 1266,1,7200000,3600000,0
+jawaii,221,220,30,30 monster Shellfish 1074,1,4800000,3000000,0
+jawaii,276,163,20,30 monster Shellfish 1074,2,4200000,2400000,0
+
+//==================================================
// jawaii_in - Inside Jawaii
//==================================================
jawaii_in,128,121,1,4 monster Red Mushroom 1085,1,3000000,1200000,0
+jawaii_in,124,76,1,1 monster Black Mushroom 1084,1,3600000,1200000,0
+jawaii_in,72,74,5,1 monster Black Mushroom 1084,2,3000000,1200000,0
+jawaii_in,73,117,4,4 monster Thief Bug Egg 1048,1,5400000,3000000,0
+jawaii_in,83,117,5,5 monster Thief Bug Egg 1048,1,4800000,2400000,0 \ No newline at end of file
diff --git a/npc/mobs/fields/lighthalzen.txt b/npc/mobs/fields/lighthalzen.txt
index daa99adae..e7bd81a3d 100644
--- a/npc/mobs/fields/lighthalzen.txt
+++ b/npc/mobs/fields/lighthalzen.txt
@@ -20,24 +20,31 @@
//==================================================
// lhz_fild01 - Lighthalzen Field
//==================================================
-lhz_fild01,0,0,0,0 monster Rafflesia 1162,130,0,0,0
-lhz_fild01,0,0,0,0 monster Stem Worm 1215,35,0,0,0
-lhz_fild01,0,0,0,0 monster Metaling 1613,35,0,0,0
+lhz_fild01,0,0,0,0 monster Rafflesia 1162,130,5000,0,0
+lhz_fild01,0,0,0,0 monster Stem Worm 1215,35,5000,0,0
+lhz_fild01,0,0,0,0 monster Metaling 1613,35,5000,0,0
+lhz_fild01,0,0,0,0 monster Red Plant 1078,10,60000,30000,0
+lhz_fild01,0,0,0,0 monster Yellow Plant 1081,10,60000,30000,0
+lhz_fild01,0,0,0,0 monster Green Plant 1080,10,60000,30000,0
//==================================================
-// lhz_fild02 - Lighthalzen Field (Grim Ripper's Valley)
+// lhz_fild02 - Lighthalzen Field (Grim Reaper's Valley)
//==================================================
-lhz_fild02,0,0,0,0 monster Stem Worm 1215,100,0,0,0
-lhz_fild02,0,0,0,0 monster Breeze 1692,40,0,0,0
-lhz_fild02,0,0,0,0 monster Rafflesia 1162,20,0,0,0
-lhz_fild02,0,0,0,0 monster Metaling 1613,20,0,0,0
-lhz_fild02,0,0,0,0 monster Demon Pungus 1378,15,0,0,0
+lhz_fild02,0,0,0,0 monster Stem Worm 1215,100,5000,0,0
+lhz_fild02,0,0,0,0 monster Breeze 1692,40,5000,0,0
+lhz_fild02,0,0,0,0 monster Rafflesia 1162,20,5000,0,0
+lhz_fild02,0,0,0,0 monster Metaling 1613,20,5000,0,0
+lhz_fild02,0,0,0,0 monster Demon Pungus 1378,15,5000,0,0
+lhz_fild02,0,0,0,0 monster Yellow Plant 1081,15,60000,30000,0
+lhz_fild02,0,0,0,0 monster Green Plant 1080,15,60000,30000,0
//==================================================
// lhz_fild03 - Lighthalzen Field
//==================================================
-lhz_fild02,0,0,0,0 monster Breeze 1692,130,0,0,0
-lhz_fild02,0,0,0,0 monster Rafflesia 1162,20,0,0,0
-lhz_fild02,0,0,0,0 monster Stem Worm 1215,20,0,0,0
-lhz_fild02,0,0,0,0 monster Metaling 1613,20,0,0,0
-lhz_fild02,0,0,0,0 monster Demon Pungus 1378,15,0,0,0
+lhz_fild03,0,0,0,0 monster Breeze 1692,130,5000,0,0
+lhz_fild03,0,0,0,0 monster Stem Worm 1215,20,5000,0,0
+lhz_fild03,0,0,0,0 monster Rafflesia 1162,20,5000,0,0
+lhz_fild03,0,0,0,0 monster Metaling 1613,20,5000,0,0
+lhz_fild03,0,0,0,0 monster Demon Pungus 1378,15,5000,0,0
+lhz_fild03,0,0,0,0 monster Red Plant 1078,10,60000,30000,0
+lhz_fild03,0,0,0,0 monster Green Plant 1080,10,60000,30000,0 \ No newline at end of file
diff --git a/npc/mobs/fields/louyang.txt b/npc/mobs/fields/louyang.txt
index 331f03797..fab563b85 100644
--- a/npc/mobs/fields/louyang.txt
+++ b/npc/mobs/fields/louyang.txt
@@ -15,6 +15,8 @@
//==================================================
// lou_fild01 - Louyang Field
//==================================================
-lou_fild01,0,0,0,0 monster Mi Gao 1516,40,0,0,0
-lou_fild01,0,0,0,0 monster Mantis 1139,19,0,0,0
-lou_fild01,0,0,0,0 monster Geographer 1368,19,0,0,0
+lou_fild01,0,0,0,0 monster Mi Gao 1516,40,5000,0,0
+lou_fild01,0,0,0,0 monster Mantis 1139,19,5000,0,0
+lou_fild01,0,0,0,0 monster Geographer 1368,19,5000,0,0
+lou_fild01,0,0,0,0 monster Black Mushroom 1084,5,5000,0,0
+lou_fild01,0,0,0,0 monster Yellow Plant 1081,10,5000,0,0 \ No newline at end of file
diff --git a/npc/mobs/fields/lutie.txt b/npc/mobs/fields/lutie.txt
index 2ca380c3f..91c508a9b 100644
--- a/npc/mobs/fields/lutie.txt
+++ b/npc/mobs/fields/lutie.txt
@@ -16,7 +16,7 @@
//==================================================
// xmas_fild01 - Lutie Field
//==================================================
-xmas_fild01,0,0,0,0 monster Marin 1242,35,0,0,0
-xmas_fild01,0,0,0,0 monster Sasquatch 1243,5,0,0,0
-xmas_fild01,0,0,0,0 monster Hatii Baby 1515,1,0,0,0
-xmas_fild01,0,0,0,0 boss_monster Hatii 1252,1,7200000,600000,1
+xmas_fild01,0,0,0,0 monster Marina 1141,35,5000,0,0
+xmas_fild01,0,0,0,0 monster Sasquatch 1243,5,5000,0,0
+xmas_fild01,0,0,0,0 monster Garm Baby 1515,1,5000,0,0
+xmas_fild01,0,0,0,0 boss_monster Garm 1252,1,7200000,600000,1 \ No newline at end of file
diff --git a/npc/mobs/fields/manuk.txt b/npc/mobs/fields/manuk.txt
index 62a1275d4..75dbbd68b 100644
--- a/npc/mobs/fields/manuk.txt
+++ b/npc/mobs/fields/manuk.txt
@@ -12,25 +12,25 @@
//= 1.1a Corrected fild2 mobs spawning on fild1. (bugreport:4248)
//============================================================
-//============================================================
+//==================================================
// man_fild01 - Manuk Field
-//============================================================
-man_fild01,0,0,0,0 monster Nepenthes 1988,105,0,0,0
-man_fild01,0,0,0,0 monster Hillthion 1989,10,0,0,0
-man_fild01,0,0,0,0 monster Centipede Larva 1999,30,0,0,0
-man_fild01,0,0,0,0 monster Centipede 1987,2,0,0,0
+//==================================================
+man_fild01,0,0,0,0 monster Nepenthes 1988,105,5000,0,0
+man_fild01,0,0,0,0 monster Centipede Larva 1999,30,5000,0,0
+man_fild01,0,0,0,0 monster Hillslion 1989,10,5000,0,0
+man_fild01,0,0,0,0 monster Centipede 1987,2,5000,0,0
-//============================================================
+//==================================================
// man_fild02 - Manuk Field
-//============================================================
-man_fild02,0,0,0,0 monster Bradium Golem 2024,50,0,0,0
-man_fild02,0,0,0,0 monster Centipede 1987,35,0,0,0
-man_fild02,0,0,0,0 monster Tatacho 1986,25,0,0,0
+//==================================================
+man_fild02,0,0,0,0 monster Bradium Golem 2024,50,5000,0,0
+man_fild02,0,0,0,0 monster Centipede 1987,35,5000,0,0
+man_fild02,0,0,0,0 monster Tatacho 1986,25,5000,0,0
-//============================================================
+//==================================================
// man_fild03 - Manuk Field
-//============================================================
-man_fild03,0,0,0,0 monster Hillthion 1989,25,0,0,0
-man_fild03,0,0,0,0 monster Tatacho 1986,25,0,0,0
-man_fild03,0,0,0,0 monster Centipede 1987,25,0,0,0
-man_fild03,0,0,0,0 monster Hardrock Mammoth 1990,1,14400000,0,0
+//==================================================
+man_fild03,0,0,0,0 monster Hillslion 1989,25,5000,0,0
+man_fild03,0,0,0,0 monster Tatacho 1986,25,5000,0,0
+man_fild03,0,0,0,0 monster Centipede 1987,25,5000,0,0
+man_fild03,0,0,0,0 monster Hardrock Mammoth 1990,1,14400000,0,0 \ No newline at end of file
diff --git a/npc/mobs/fields/mjolnir.txt b/npc/mobs/fields/mjolnir.txt
index b49540893..5babaf0ce 100644
--- a/npc/mobs/fields/mjolnir.txt
+++ b/npc/mobs/fields/mjolnir.txt
@@ -14,10 +14,10 @@
//==================================================
// mjolnir_01 - Mt.Mjolnir
//==================================================
-mjolnir_01,0,0,0,0 monster Caramel 1103,140,0,0,0
-mjolnir_01,0,0,0,0 monster Creamy 1018,20,0,0,0
-mjolnir_01,0,0,0,0 monster Bigfoot 1060,20,0,0,0
-mjolnir_01,0,0,0,0 monster Stainer 1174,20,0,0,0
+mjolnir_01,0,0,0,0 monster Caramel 1103,140,5000,0,0
+mjolnir_01,0,0,0,0 monster Stainer 1174,20,5000,0,0
+mjolnir_01,0,0,0,0 monster Creamy 1018,20,5000,0,0
+mjolnir_01,0,0,0,0 monster Bigfoot 1060,20,5000,0,0
mjolnir_01,75,85,25,25 monster Shining Plant 1083,1,1800000,900000,1
mjolnir_01,78,219,25,25 monster Shining Plant 1083,1,1800000,900000,1
mjolnir_01,75,85,25,25 monster Green Plant 1080,5,180000,90000,1
@@ -27,10 +27,10 @@ mjolnir_01,311,271,25,25 monster Blue Plant 1079,5,360000,180000,1
//==================================================
// mjolnir_02 - Mt.Mjolnir
//==================================================
-mjolnir_02,0,0,0,0 monster Horn 1128,140,0,0,0
-mjolnir_02,0,0,0,0 monster Poporing 1031,20,0,0,0
-mjolnir_02,0,0,0,0 monster Elder Willow 1033,20,0,0,0
-mjolnir_02,0,0,0,0 monster Yoyo 1057,20,0,0,0
+mjolnir_02,0,0,0,0 monster Hornet 1004,140,5000,0,0
+mjolnir_02,0,0,0,0 monster Poporing 1031,20,5000,0,0
+mjolnir_02,0,0,0,0 monster Elder Willow 1033,20,5000,0,0
+mjolnir_02,0,0,0,0 monster Yoyo 1057,20,5000,0,0
mjolnir_02,86,270,0,0 monster Green Plant 1080,1,180000,90000,1
mjolnir_02,80,211,0,0 monster Green Plant 1080,1,180000,90000,1
mjolnir_02,86,270,0,0 monster Green Plant 1080,1,180000,90000,1
@@ -69,9 +69,9 @@ mjolnir_02,188,192,10,10 monster Blue Plant 1079,2,360000,180000,1
//==================================================
// mjolnir_03 - Mt.Mjolnir
//==================================================
-mjolnir_03,0,0,0,0 monster Side Winder 1037,130,0,0,0
-mjolnir_03,0,0,0,0 monster Mantis 1139,35,0,0,0
-mjolnir_03,0,0,0,0 monster Driller 1380,35,0,0,0
+mjolnir_03,0,0,0,0 monster Side Winder 1037,130,5000,0,0
+mjolnir_03,0,0,0,0 monster Driller 1380,35,5000,0,0
+mjolnir_03,0,0,0,0 monster Mantis 1139,35,5000,0,0
mjolnir_03,211,216,10,10 monster Shining Plant 1083,1,1800000,900000,1
mjolnir_03,280,252,10,10 monster Shining Plant 1083,1,1800000,900000,1
mjolnir_03,135,94,0,0 monster Green Plant 1080,1,180000,90000,1
@@ -91,9 +91,9 @@ mjolnir_03,91,161,0,0 monster Green Plant 1080,1,180000,90000,1
//==================================================
// mjolnir_04 - Mt.Mjolnir
//==================================================
-mjolnir_04,0,0,0,0 monster Driller 1380,130,0,0,0
-mjolnir_04,0,0,0,0 monster Side Winder 1037,35,0,0,0
-mjolnir_04,0,0,0,0 monster Mantis 1139,35,0,0,0
+mjolnir_04,0,0,0,0 monster Driller 1380,130,5000,0,0
+mjolnir_04,0,0,0,0 monster Mantis 1139,35,5000,0,0
+mjolnir_04,0,0,0,0 monster Side Winder 1037,35,5000,0,0
mjolnir_04,0,0,0,0 boss_monster Mistress 1059,1,7200000,600000,1
mjolnir_04,200,200,30,30 monster Shining Plant 1083,3,1800000,900000,1
mjolnir_04,177,34,0,0 monster Green Plant 1080,1,180000,90000,1
@@ -117,9 +117,9 @@ mjolnir_04,205,33,0,0 monster Green Plant 1080,1,180000,90000,1
//==================================================
// mjolnir_05 - Mt.Mjolnir
//==================================================
-mjolnir_05,0,0,0,0 monster Argiope 1099,130,0,0,0
-mjolnir_05,0,0,0,0 monster Mantis 1139,35,0,0,0
-mjolnir_05,0,0,0,0 monster Driller 1380,35,0,0,0
+mjolnir_05,0,0,0,0 monster Argiope 1099,130,5000,0,0
+mjolnir_05,0,0,0,0 monster Mantis 1139,35,5000,0,0
+mjolnir_05,0,0,0,0 monster Driller 1380,35,5000,0,0
mjolnir_05,200,240,40,40 monster Blue Plant 1079,3,360000,180000,1
mjolnir_05,200,240,40,40 monster Shining Plant 1083,1,1800000,900000,1
mjolnir_05,134,103,20,20 monster Blue Plant 1079,3,360000,180000,1
@@ -129,9 +129,9 @@ mjolnir_05,0,0,0,0 monster Red Plant 1078,10,180000,90000,1
//==================================================
// mjolnir_06 - Mt.Mjolnir
//==================================================
-mjolnir_06,0,0,0,0 monster Poison Spore 1077,140,0,0,0
-mjolnir_06,0,0,0,0 monster Creamy 1018,30,0,0,0
-mjolnir_06,0,0,0,0 monster Smokie 1056,30,0,0,0
+mjolnir_06,0,0,0,0 monster Poison Spore 1077,140,5000,0,0
+mjolnir_06,0,0,0,0 monster Creamy 1018,30,5000,0,0
+mjolnir_06,0,0,0,0 monster Smokie 1056,30,5000,0,0
mjolnir_06,162,285,0,0 monster Blue Plant 1079,1,360000,180000,1
mjolnir_06,162,255,0,0 monster Blue Plant 1079,1,360000,180000,1
mjolnir_06,304,98,0,0 monster Red Mushroom 1085,1,180000,90000,1
@@ -146,9 +146,9 @@ mjolnir_06,55,276,0,0 monster Red Mushroom 1085,1,180000,90000,1
//==================================================
// mjolnir_07 - Mt.Mjolnir
//==================================================
-mjolnir_07,0,0,0,0 monster Savage 1166,140,0,0,0
-mjolnir_07,0,0,0,0 monster Beetle King 1494,30,0,0,0
-mjolnir_07,0,0,0,0 monster Flora 1118,30,0,0,0
+mjolnir_07,0,0,0,0 monster Savage 1166,140,5000,0,0
+mjolnir_07,0,0,0,0 monster Beetle King 1494,30,5000,0,0
+mjolnir_07,0,0,0,0 monster Flora 1118,30,5000,0,0
mjolnir_07,314,133,0,0 monster Green Plant 1080,1,180000,90000,1
mjolnir_07,299,145,0,0 monster Green Plant 1080,1,180000,90000,1
mjolnir_07,272,152,0,0 monster Green Plant 1080,1,180000,90000,1
@@ -161,11 +161,11 @@ mjolnir_07,97,210,0,0 monster Green Plant 1080,1,180000,90000,1
mjolnir_07,249,214,0,0 monster Blue Plant 1079,2,360000,180000,1
//==================================================
-// mjolnir_08 - Mt.Mjolnir
+// mjolnir_08 - Mt.Mjolnir
//==================================================
-mjolnir_08,0,0,0,0 monster Beetle King 1494,140,0,0,0
-mjolnir_08,0,0,0,0 monster Flora 1118,30,0,0,0
-mjolnir_08,0,0,0,0 monster Savage 1166,30,0,0,0
+mjolnir_08,0,0,0,0 monster Beetle King 1494,140,5000,0,0
+mjolnir_08,0,0,0,0 monster Savage 1166,30,5000,0,0
+mjolnir_08,0,0,0,0 monster Flora 1118,30,5000,0,0
mjolnir_08,280,280,20,40 monster Blue Plant 1079,2,360000,180000,1
mjolnir_08,207,83,0,0 monster Green Plant 1080,1,180000,90000,1
mjolnir_08,176,153,0,0 monster Green Plant 1080,1,180000,90000,1
@@ -177,9 +177,9 @@ mjolnir_08,149,328,0,0 monster Green Plant 1080,1,180000,90000,1
//==================================================
// mjolnir_09 - Mt.Mjolnir
//==================================================
-mjolnir_09,0,0,0,0 monster Savage Babe 1167,140,0,0,0
-mjolnir_09,0,0,0,0 monster Hornet 1004,30,0,0,0
-mjolnir_09,0,0,0,0 monster Willow 1010,30,0,0,0
+mjolnir_09,0,0,0,0 monster Savage Babe 1167,140,5000,0,0
+mjolnir_09,0,0,0,0 monster Willow 1010,30,5000,0,0
+mjolnir_09,0,0,0,0 monster Hornet 1004,30,5000,0,0
mjolnir_09,205,352,0,0 monster Red Mushroom 1085,1,180000,90000,1
mjolnir_09,199,344,0,0 monster Red Mushroom 1085,1,180000,90000,1
mjolnir_09,210,331,0,0 monster Red Mushroom 1085,1,180000,90000,1
@@ -195,18 +195,18 @@ mjolnir_09,125,82,0,0 monster Red Mushroom 1085,1,180000,90000,1
//==================================================
// mjolnir_10 - Mt.Mjolnir
//==================================================
-mjolnir_10,0,0,0,0 monster Argos 1100,140,0,0,0
-mjolnir_10,0,0,0,0 monster Flora 1118,30,0,0,0
-mjolnir_10,0,0,0,0 monster Beetle King 1494,30,0,0,0
+mjolnir_10,0,0,0,0 monster Argos 1100,140,5000,0,0
+mjolnir_10,0,0,0,0 monster Beetle King 1494,30,5000,0,0
+mjolnir_10,0,0,0,0 monster Flora 1118,30,5000,0,0
mjolnir_10,123,331,10,10 monster Shining Plant 1083,1,1800000,900000,1
mjolnir_10,0,0,0,0 monster Green Plant 1080,10,180000,90000,1
//==================================================
-// mjolnir_11 - Mt.Mjolnir
+// mjolnir_11 - Mt.Mjolnir
//==================================================
-mjolnir_11,0,0,0,0 monster Argiope 1099,140,0,0,0
-mjolnir_11,0,0,0,0 monster Argos 1100,35,0,0,0
-mjolnir_11,0,0,0,0 monster Flora 1118,35,0,0,0
+mjolnir_11,0,0,0,0 monster Argiope 1099,130,5000,0,0
+mjolnir_11,0,0,0,0 monster Argos 1100,35,5000,0,0
+mjolnir_11,0,0,0,0 monster Flora 1118,35,5000,0,0
mjolnir_11,112,276,0,0 monster Green Plant 1080,1,180000,90000,1
mjolnir_11,159,283,0,0 monster Green Plant 1080,1,180000,90000,1
mjolnir_11,116,240,0,0 monster Green Plant 1080,1,180000,90000,1
@@ -222,8 +222,8 @@ mjolnir_11,282,300,0,0 monster Green Plant 1080,1,180000,90000,1
mjolnir_11,295,271,0,0 monster Green Plant 1080,1,180000,90000,1
//==================================================
-// mjolnir_12 - Mt.Mjolnir
+// mjolnir_12 - Mt.Mjolnir
//==================================================
-mjolnir_12,0,0,0,0 monster Dustiness 1114,130,0,0,0
-mjolnir_12,0,0,0,0 monster Hunter Fly 1035,35,0,0,0
-mjolnir_12,0,0,0,0 monster Mantis 1139,35,0,0,0
+mjolnir_12,0,0,0,0 monster Dustiness 1114,130,5000,0,0
+mjolnir_12,0,0,0,0 monster Hunter Fly 1035,35,5000,0,0
+mjolnir_12,0,0,0,0 monster Mantis 1139,35,5000,0,0 \ No newline at end of file
diff --git a/npc/mobs/fields/morocc.txt b/npc/mobs/fields/morocc.txt
index 0e2e645aa..85bb02286 100644
--- a/npc/mobs/fields/morocc.txt
+++ b/npc/mobs/fields/morocc.txt
@@ -19,19 +19,19 @@
//============================================================
//==================================================
-// moc_fild01 - Sograt Desert
+// moc_fild01 - Sograt Desert
//==================================================
-moc_fild01,0,0,0,0 monster Peco Peco 1019,130,0,0,0
-moc_fild01,0,0,0,0 monster Muka 1055,50,0,0,0
-moc_fild01,0,0,0,0 monster Peco Peco Egg 1047,20,0,0,0
+moc_fild01,0,0,0,0 monster Peco Peco 1019,130,5000,0,0
+moc_fild01,0,0,0,0 monster Muka 1055,50,5000,0,0
+moc_fild01,0,0,0,0 monster Peco Peco Egg 1047,20,5000,0,0
moc_fild01,194,51,10,10 monster Yellow Plant 1081,10,900000,450000,1
//==================================================
-// moc_fild02 - Sograt Desert
+// moc_fild02 - Sograt Desert
//==================================================
-moc_fild02,0,0,0,0 monster Muka 1055,130,0,0,0
-moc_fild02,0,0,0,0 monster Peco Peco 1019,60,0,0,0
-moc_fild02,0,0,0,0 monster Peco Peco Egg 1047,10,0,0,0
+moc_fild02,0,0,0,0 monster Muka 1055,130,5000,0,0
+moc_fild02,0,0,0,0 monster Peco Peco 1019,60,5000,0,0
+moc_fild02,0,0,0,0 monster Peco Peco Egg 1047,10,5000,0,0
moc_fild02,89,315,0,0 monster Yellow Plant 1081,1,180000,90000,1
moc_fild02,99,261,0,0 monster Yellow Plant 1081,1,180000,90000,1
moc_fild02,94,195,0,0 monster Yellow Plant 1081,1,180000,90000,1
@@ -48,11 +48,11 @@ moc_fild02,353,103,0,0 monster Green Plant 1080,1,180000,90000,1
moc_fild02,337,35,0,0 monster Green Plant 1080,1,180000,90000,1
//==================================================
-// moc_fild03 - Sograt Desert
+// moc_fild03 - Sograt Desert
//==================================================
-moc_fild03,0,0,0,0 monster Wolf 1013,140,0,0,0
-moc_fild03,0,0,0,0 monster Steel Chonchon 1042,20,0,0,0
-moc_fild03,0,0,0,0 monster Argos 1100,20,0,0,0
+moc_fild03,0,0,0,0 monster Wolf 1013,140,5000,0,0
+moc_fild03,0,0,0,0 monster Argos 1100,20,5000,0,0
+moc_fild03,0,0,0,0 monster Steel Chonchon 1042,20,5000,0,0
moc_fild03,77,311,5,5 monster Green Plant 1080,2,180000,90000,1
moc_fild03,108,199,5,5 monster Green Plant 1080,2,180000,90000,1
moc_fild03,96,65,5,5 monster Green Plant 1080,2,180000,90000,1
@@ -62,71 +62,64 @@ moc_fild03,213,201,5,5 monster Green Plant 1080,2,180000,90000,1
moc_fild03,200,263,5,5 monster Green Plant 1080,2,180000,90000,1
//==================================================
-// moc_fild04 - Sograt Desert
+// moc_fild04 - Disabled on Episode 12.1
//==================================================
-// No spawns/Disabled Map - 12.1
//==================================================
-// moc_fild05 - Sograt Desert
+// moc_fild05 - Disabled on Episode 12.1
//==================================================
-// No spawns/Disabled Map - 12.1
//==================================================
-// moc_fild06 - Sograt Desert
+// moc_fild06 - Disabled on Episode 12.1
//==================================================
-// No spawns/Disabled Map - 12.1
//==================================================
-// moc_fild07 - Sograt Desert
+// moc_fild07 - Sograt Desert
//==================================================
-moc_fild07,0,0,0,0 monster Drops 1113,140,0,0,0
-moc_fild07,0,0,0,0 monster Chonchon 1011,30,0,0,0
-moc_fild07,0,0,0,0 monster Picky 1050,15,0,0,0
-moc_fild07,0,0,0,0 monster Peco Peco Egg 1047,10,0,0,0
-moc_fild07,0,0,0,0 monster Picky 1049,10,0,0,0
+moc_fild07,0,0,0,0 monster Drops 1113,140,5000,0,0
+moc_fild07,0,0,0,0 monster Chonchon 1011,30,5000,0,0
+moc_fild07,0,0,0,0 monster Picky 1050,15,5000,0,0
+moc_fild07,0,0,0,0 monster Peco Peco Egg 1047,10,5000,0,0
+moc_fild07,0,0,0,0 monster Picky 1049,10,5000,0,0
moc_fild07,162,333,12,12 monster Yellow Plant 1081,5,360000,180000,1
//==================================================
-// moc_fild08 - Sograt Desert
+// moc_fild08 - Disabled on Episode 12.1
//==================================================
-// No spawns/Disabled Map - 12.1
//==================================================
-// moc_fild09 - Sograt Desert
+// moc_fild09 - Disabled on Episode 12.1
//==================================================
-// No spawns/Disabled Map - 12.1
//==================================================
-// moc_fild10 - Sograt Desert
+// moc_fild10 - Disabled on Episode 12.1
//==================================================
-// No spawns/Disabled Map - 12.1
//==================================================
// moc_fild11 - Sograt Desert
//==================================================
-moc_fild11,0,0,0,0 monster Baby Desert Wolf 1107,140,0,0,0
-moc_fild11,0,0,0,0 monster Condor 1009,30,0,0,0
-moc_fild11,0,0,0,0 monster Scorpion 1001,30,0,0,0
-moc_fild11,197,216,0,0 monster Shining Plant 1083,1,1800000,900000,1
+moc_fild11,0,0,0,0 monster Baby Desert Wolf 1107,140,5000,0,0
+moc_fild11,0,0,0,0 monster Condor 1009,30,5000,0,0
+moc_fild11,0,0,0,0 monster Scorpion 1001,30,5000,0,0
//==================================================
-// moc_fild12 - Sograt Desert
+// moc_fild12 - Sograt Desert
//==================================================
-moc_fild12,0,0,0,0 monster Picky 1050,50,0,0,0
-moc_fild12,0,0,0,0 monster Picky 1049,50,0,0,0
-moc_fild12,0,0,0,0 monster Peco Peco Egg 1047,35,0,0,0
-moc_fild12,0,0,0,0 monster Condor 1009,30,0,0,0
-moc_fild12,0,0,0,0 monster Drops 1113,30,0,0,0
+moc_fild12,0,0,0,0 monster Picky 1049,50,5000,0,0
+moc_fild12,0,0,0,0 monster Picky 1050,50,5000,0,0
+moc_fild12,0,0,0,0 monster Peco Peco Egg 1047,35,5000,0,0
+moc_fild12,0,0,0,0 monster Drops 1113,30,5000,0,0
+moc_fild12,0,0,0,0 monster Condor 1009,30,5000,0,0
moc_fild12,181,336,40,20 monster Yellow Plant 1081,10,180000,90000,1
//==================================================
-// moc_fild13 - Sograt Desert
+// moc_fild13 - Sograt Desert
//==================================================
-moc_fild13,0,0,0,0 monster Steel Chonchon 1042,140,0,0,0
-moc_fild13,0,0,0,0 monster Wolf 1013,15,0,0,0
-moc_fild13,0,0,0,0 monster Metaller 1058,15,0,0,0
-moc_fild13,0,0,0,0 monster Argos 1100,15,0,0,0
-moc_fild13,0,0,0,0 monster Magnolia 1138,15,0,0,0
+moc_fild13,0,0,0,0 monster Steel Chonchon 1042,140,5000,0,0
+moc_fild13,0,0,0,0 monster Wolf 1013,15,5000,0,0
+moc_fild13,0,0,0,0 monster Argos 1100,15,5000,0,0
+moc_fild13,0,0,0,0 monster Metaller 1058,15,5000,0,0
+moc_fild13,0,0,0,0 monster Magnolia 1138,15,5000,0,0
moc_fild13,280,99,0,0 monster Red Mushroom 1085,1,180000,90000,1
moc_fild13,264,64,0,0 monster Red Mushroom 1085,1,180000,90000,1
moc_fild13,305,91,0,0 monster Red Mushroom 1085,1,180000,90000,1
@@ -151,28 +144,26 @@ moc_fild13,106,258,5,5 monster Yellow Plant 1081,3,180000,90000,1
moc_fild13,161,273,5,5 monster Yellow Plant 1081,3,180000,90000,1
//==================================================
-// moc_fild14 - Sograt Desert
+// moc_fild14 - Disabled on Episode 12.1
//==================================================
-// No spawns/Disabled Map - 12.1
//==================================================
-// moc_fild15 - Sograt Desert
+// moc_fild15 - Disabled on Episode 12.1
//==================================================
-// No spawns/Disabled Map - 12.1
//==================================================
// moc_fild16 - Sograt Desert
//==================================================
-moc_fild16,0,0,0,0 monster Sandman 1165,130,0,0,0
-moc_fild16,0,0,0,0 monster Hode 1127,30,0,0,0
-moc_fild16,0,0,0,0 monster Frilldora 1119,10,0,0,0
+moc_fild16,0,0,0,0 monster Sandman 1165,130,5000,0,0
+moc_fild16,0,0,0,0 monster Hode 1127,30,5000,0,0
+moc_fild16,0,0,0,0 monster Frilldora 1119,10,5000,0,0
//==================================================
-// moc_fild17 - Sograt Desert
+// moc_fild17 - Sograt Desert
//==================================================
-moc_fild17,0,0,0,0 monster Hode 1127,130,0,0,0
-moc_fild16,0,0,0,0 monster Sandman 1165,30,0,0,0
-moc_fild17,0,0,0,0 monster Frilldora 1119,10,0,0,0
+moc_fild17,0,0,0,0 monster Hode 1127,130,5000,0,0
+moc_fild17,0,0,0,0 monster Sandman 1165,30,5000,0,0
+moc_fild17,0,0,0,0 monster Frilldora 1119,10,5000,0,0
moc_fild17,0,0,0,0 boss_monster Phreeoni 1159,1,7200000,600000,1
moc_fild17,40,258,0,0 monster Yellow Plant 1081,1,180000,90000,1
moc_fild17,144,151,0,0 monster Yellow Plant 1081,1,180000,90000,1
@@ -185,9 +176,9 @@ moc_fild17,359,258,0,0 monster Yellow Plant 1081,1,180000,90000,1
//==================================================
// moc_fild18 - Sograt Desert
//==================================================
-moc_fild18,0,0,0,0 monster Scorpion 1001,140,0,0,0
-moc_fild18,0,0,0,0 monster Condor 1009,30,0,0,0
-moc_fild18,0,0,0,0 monster Baby Desert Wolf 1107,30,0,0,0
+moc_fild18,0,0,0,0 monster Scorpion 1001,140,5000,0,0
+moc_fild18,0,0,0,0 monster Condor 1009,30,5000,0,0
+moc_fild18,0,0,0,0 monster Baby Desert Wolf 1107,30,5000,0,0
moc_fild18,0,0,0,0 monster Dragon Fly 1091,1,3600000,1800000,1
moc_fild18,143,352,0,0 monster Yellow Plant 1081,1,180000,90000,1
moc_fild18,72,333,0,0 monster Yellow Plant 1081,1,180000,90000,1
@@ -199,26 +190,30 @@ moc_fild18,325,207,0,0 monster Yellow Plant 1081,1,180000,90000,1
moc_fild18,325,272,0,0 monster Yellow Plant 1081,1,180000,90000,1
//==================================================
-// moc_fild20 - Dimensional Gorge
+// moc_fild19 - Quest Map
//==================================================
-moc_fild20,0,0,0,0 monster Morroc's Shadow 1918,1,30000,0,0
-moc_fild20,0,0,0,0 monster Morroc's Shadow 1919,1,30000,0,0
-moc_fild20,0,0,0,0 monster Morroc's Shadow 1920,1,30000,0,0
-moc_fild20,0,0,0,0 monster Morroc's Shadow 1921,1,30000,0,0
//==================================================
-// moc_fild21 - Dimensional Gorge
+// moc_fild20 - Sograt Desert - Continental Guard Quarantine
//==================================================
-moc_fild21,0,0,0,0 monster Morroc's Shadow 1918,46,30000,0,0
-moc_fild21,0,0,0,0 monster Morroc's Shadow 1919,46,30000,0,0
-moc_fild21,0,0,0,0 monster Morroc's Shadow 1920,46,30000,0,0
-moc_fild21,0,0,0,0 monster Morroc's Shadow 1921,34,30000,0,0
+moc_fild20,0,0,0,0 monster Incarnation of Morroc 1918,1,30000,0,0
+moc_fild20,0,0,0,0 monster Incarnation of Morroc 1919,1,30000,0,0
+moc_fild20,0,0,0,0 monster Incarnation of Morroc 1920,1,30000,0,0
+moc_fild20,0,0,0,0 monster Incarnation of Morroc 1921,1,30000,0,0
//==================================================
-// moc_fild22 - Dimensional Gorge
+// moc_fild21 - Dimensional Gorge
//==================================================
-moc_fild22,0,0,0,0 monster Morroc's Shadow 1918,60,30000,0,0
-moc_fild22,0,0,0,0 monster Morroc's Shadow 1919,60,30000,0,0
-moc_fild22,0,0,0,0 monster Morroc's Shadow 1920,60,30000,0,0
-moc_fild22,0,0,0,0 monster Morroc's Shadow 1921,25,30000,0,0
-moc_fild22,0,0,0,0 monster Wounded Satan Morroc 1917,1,43200000,3600000,1
+moc_fild21,0,0,0,0 monster Incarnation of Morroc 1918,46,30000,0,0
+moc_fild21,0,0,0,0 monster Incarnation of Morroc 1919,46,30000,0,0
+moc_fild21,0,0,0,0 monster Incarnation of Morroc 1920,46,30000,0,0
+moc_fild21,0,0,0,0 monster Incarnation of Morroc 1921,34,30000,0,0
+
+//==================================================
+// moc_fild22 - Dimensional Gorge
+//==================================================
+moc_fild22,0,0,0,0 monster Incarnation of Morroc 1918,60,30000,0,0
+moc_fild22,0,0,0,0 monster Incarnation of Morroc 1919,60,30000,0,0
+moc_fild22,0,0,0,0 monster Incarnation of Morroc 1920,60,30000,0,0
+moc_fild22,0,0,0,0 monster Incarnation of Morroc 1921,25,10000,0,0
+moc_fild22,0,0,0,0 boss_monster Wounded Morroc 1917,1,43200000,600000,0 \ No newline at end of file
diff --git a/npc/mobs/fields/moscovia.txt b/npc/mobs/fields/moscovia.txt
index b1116ca52..5ab6cdce7 100644
--- a/npc/mobs/fields/moscovia.txt
+++ b/npc/mobs/fields/moscovia.txt
@@ -12,9 +12,11 @@
//============================================================
//==================================================
-// mosk_fild02 - Moscovia Field
+// mosk_fild02 - Okrestnosti of Moscovia
//==================================================
-mosk_fild02,0,0,0,0 monster Side Winder 1037,40,0,0,0
-mosk_fild02,0,0,0,0 monster Argiope 1099,30,0,0,0
-mosk_fild02,0,0,0,0 monster Mantis 1139,10,0,0,0
-mosk_fild02,0,0,0,0 monster Geographer 1368,5,0,0,0
+mosk_fild02,0,0,0,0 monster Side Winder 1037,40,5000,0,0
+mosk_fild02,0,0,0,0 monster Argiope 1099,30,5000,0,0
+mosk_fild02,0,0,0,0 monster Mantis 1139,10,5000,0,0
+mosk_fild02,0,0,0,0 monster Geographer 1368,5,5000,0,0
+mosk_fild02,0,0,0,0 monster Yellow Plant 1081,5,5000,0,0
+mosk_fild02,0,0,0,0 monster White Plant 1082,5,10000,0,0 \ No newline at end of file
diff --git a/npc/mobs/fields/niflheim.txt b/npc/mobs/fields/niflheim.txt
index 317e7ac25..14cecfda8 100644
--- a/npc/mobs/fields/niflheim.txt
+++ b/npc/mobs/fields/niflheim.txt
@@ -17,170 +17,29 @@
//============================================================
//==================================================
-// nif_fild01 - Skellington, a Solitary Village in Niflheim
+// niflheim - Nifflheim, Realm of the Dead
//==================================================
-nif_fild01,0,0,0,0 monster Disguise 1506,50,0,0,0
-nif_fild01,0,0,0,0 monster Quve 1508,30,0,0,0
-nif_fild01,0,0,0,0 monster Dullahan 1504,20,0,0,0
-nif_fild01,0,0,0,0 monster Gibbet 1503,10,0,0,0
-nif_fild01,0,0,0,0 monster Heirozoist 1510,10,0,0,0
+niflheim,0,0,0,0 monster Lude 1509,20,5000,0,0
+niflheim,0,0,0,0 monster Quve 1508,20,5000,0,0
+niflheim,0,0,0,0 monster Gibbet 1503,10,5000,0,0
+niflheim,0,0,0,0 monster Heirozoist 1510,10,5000,0,0
+niflheim,0,0,0,0 monster Dullahan 1504,5,5000,0,0
//==================================================
-// nif_fild02 - Valley of Gyoll
+// nif_fild01 - Skellington, a Solitary Village in Nifflheim
//==================================================
-nif_fild02,0,0,0,0 monster Loli Ruri 1505,21,0,0,0
-nif_fild02,0,0,0,0 monster Gibbet 1503,20,0,0,0
-nif_fild02,0,0,0,0 monster Bloody Murderer 1507,11,0,0,0
-nif_fild02,0,0,0,0 monster Dullahan 1504,10,0,0,0
-nif_fild02,0,0,0,0 monster Lude 1509,10,0,0,0
-nif_fild02,0,0,0,0 monster Heirozoist 1510,10,0,0,0
+nif_fild01,0,0,0,0 monster Disguise 1506,50,5000,0,0
+nif_fild01,0,0,0,0 monster Quve 1508,30,5000,0,0
+nif_fild01,0,0,0,0 monster Dullahan 1504,20,5000,0,0
+nif_fild01,0,0,0,0 monster Gibbet 1503,10,5000,0,0
+nif_fild01,0,0,0,0 monster Heirozoist 1510,10,5000,0,0
//==================================================
-// niflheim - Niflheim, Realm of the Dead
+// nif_fild02 - Vally of Gyoll
//==================================================
-niflheim,0,0,0,0 monster Dullahan 1504,5,0,0,0
-niflheim,0,0,0,0 monster Gibbet 1503,10,0,0,0
-niflheim,0,0,0,0 monster Heirozoist 1510,10,0,0,0
-niflheim,0,0,0,0 monster Quve 1508,20,0,0,0
-niflheim,0,0,0,0 monster Lude 1509,20,0,0,0
-
-niflheim,1,1,0 script NifInvasion -1,{
-OnInit:
-
- while(1)
- {
- initnpctimer;
- end;
-
-OnTimer7980000:
- stopnpctimer;
- switch(rand(6))
- {
-
- case 0:
- monster "niflheim",327,193,"Lord Of Death",1373,1,"NifInvasion::OnLoDDead";
- monster "niflheim",330,193,"Bloody Murderer",1507,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",324,193,"Bloody Murderer",1507,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",327,196,"Bloody Murderer",1507,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",327,190,"Bloody Murderer",1507,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",324,190,"Loli Ruri",1505,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",330,190,"Loli Ruri",1505,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",324,196,"Loli Ruri",1505,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",330,196,"Loli Ruri",1505,1,"NifInvasion::OnInvasionMonsters";
- break;
-
- case 1:
- monster "niflheim",337,252,"Lord Of Death",1373,1,"NifInvasion::OnLoDDead";
- monster "niflheim",337,255,"Bloody Murderer",1507,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",337,249,"Bloody Murderer",1507,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",334,252,"Bloody Murderer",1507,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",340,252,"Bloody Murderer",1507,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",334,249,"Loli Ruri",1505,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",340,255,"Loli Ruri",1505,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",340,249,"Loli Ruri",1505,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",334,255,"Loli Ruri",1505,1,"NifInvasion::OnInvasionMonsters";
- break;
-
- case 2:
- monster "niflheim",190,185,"Lord Of Death",1373,1,"NifInvasion::OnLoDDead";
- monster "niflheim",190,188,"Bloody Murderer",1507,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",190,182,"Bloody Murderer",1507,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",193,185,"Bloody Murderer",1507,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",187,185,"Bloody Murderer",1507,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",187,182,"Loli Ruri",1505,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",193,182,"Loli Ruri",1505,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",193,188,"Loli Ruri",1505,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",187,188,"Loli Ruri",1505,1,"NifInvasion::OnInvasionMonsters";
- break;
-
- case 3:
- monster "niflheim",131,138,"Lord Of Death",1373,1,"NifInvasion::OnLoDDead";
- monster "niflheim",131,141,"Bloody Murderer",1507,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",131,135,"Bloody Murderer",1507,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",128,138,"Bloody Murderer",1507,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",134,138,"Bloody Murderer",1507,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",134,141,"Loli Ruri",1505,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",128,141,"Loli Ruri",1505,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",134,135,"Loli Ruri",1505,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",128,135,"Loli Ruri",1505,1,"NifInvasion::OnInvasionMonsters";
- break;
-
- case 4:
- monster "niflheim",311,64,"Lord Of Death",1373,1,"NifInvasion::OnLoDDead";
- monster "niflheim",311,67,"Bloody Murderer",1507,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",311,61,"Bloody Murderer",1507,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",308,64,"Bloody Murderer",1507,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",314,64,"Bloody Murderer",1507,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",314,61,"Loli Ruri",1505,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",314,67,"Loli Ruri",1505,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",308,67,"Loli Ruri",1505,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",308,61,"Loli Ruri",1505,1,"NifInvasion::OnInvasionMonsters";
- break;
-
- case 5:
- monster "niflheim",238,131,"Lord Of Death",1373,1,"NifInvasion::OnLoDDead";
- monster "niflheim",238,134,"Bloody Murderer",1507,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",238,128,"Bloody Murderer",1507,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",235,131,"Bloody Murderer",1507,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",241,131,"Bloody Murderer",1507,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",235,128,"Loli Ruri",1505,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",235,134,"Loli Ruri",1505,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",241,128,"Loli Ruri",1505,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",241,134,"Loli Ruri",1505,1,"NifInvasion::OnInvasionMonsters";
- break;
-
- case 6:
- monster "niflheim",86,219,"Lord Of Death",1373,1,"NifInvasion::OnLoDDead";
- monster "niflheim",86,222,"Bloody Murderer",1507,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",86,216,"Bloody Murderer",1507,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",89,219,"Bloody Murderer",1507,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",83,219,"Bloody Murderer",1507,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",89,222,"Loli Ruri",1505,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",89,216,"Loli Ruri",1505,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",83,222,"Loli Ruri",1505,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",83,216,"Loli Ruri",1505,1,"NifInvasion::OnInvasionMonsters";
- break;
-
- }
- monster "niflheim",154,95,"Disguise",1506,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",115,65,"Disguise",1506,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",330,195,"Disguise",1506,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",151,83,"Disguise",1506,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",285,245,"Disguise",1506,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",235,135,"Disguise",1506,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",265,48,"Disguise",1506,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",186,139,"Disguise",1506,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",166,267,"Disguise",1506,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",82,202,"Disguise",1506,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",219,44,"Disguise",1506,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",287,44,"Disguise",1506,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",275,165,"Disguise",1506,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",138,204,"Disguise",1506,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",299,39,"Disguise",1506,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",31,154,"Disguise",1506,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",154,96,"Dullahan",1504,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",116,65,"Dullahan",1504,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",151,84,"Dullahan",1504,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",286,245,"Dullahan",1504,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",330,196,"Dullahan",1504,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",236,135,"Dullahan",1504,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",165,49,"Dullahan",1504,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",167,267,"Dullahan",1504,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",82,203,"Dullahan",1504,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",220,44,"Dullahan",1504,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",287,45,"Dullahan",1504,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",287,44,"Dullahan",1504,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",276,166,"Dullahan",1504,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",139,205,"Dullahan",1504,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",300,39,"Dullahan",1504,1,"NifInvasion::OnInvasionMonsters";
- monster "niflheim",31,155,"Dullahan",1504,1,"NifInvasion::OnInvasionMonsters";
- end;
-
-OnInvasionMonsters:
- end;
-
-OnLoDDead:
- killmonster "niflheim","NifInvasion::OnInvasionMonsters";
- }
-
-}
+nif_fild02,0,0,0,0 monster Loli Ruri 1505,21,5000,0,0
+nif_fild02,0,0,0,0 monster Gibbet 1503,20,5000,0,0
+nif_fild02,0,0,0,0 monster Bloody Murderer 1507,11,5000,0,0
+nif_fild02,0,0,0,0 monster Dullahan 1504,10,5000,0,0
+nif_fild02,0,0,0,0 monster Lude 1509,10,5000,0,0
+nif_fild02,0,0,0,0 monster Heirozoist 1510,10,5000,0,0 \ No newline at end of file
diff --git a/npc/mobs/fields/payon.txt b/npc/mobs/fields/payon.txt
index 386618fe1..cc6a4b9ba 100644
--- a/npc/mobs/fields/payon.txt
+++ b/npc/mobs/fields/payon.txt
@@ -17,9 +17,9 @@
//==================================================
// pay_fild01 - Payon Forest
//==================================================
-pay_fild01,0,0,0,0 monster Willow 1010,140,0,0,0
-pay_fild01,0,0,0,0 monster Poring 1002,30,0,0,0
-pay_fild01,0,0,0,0 monster Fabre 1007,30,0,0,0
+pay_fild01,0,0,0,0 monster Willow 1010,140,5000,0,0
+pay_fild01,0,0,0,0 monster Poring 1002,30,5000,0,0
+pay_fild01,0,0,0,0 monster Fabre 1007,30,5000,0,0
pay_fild01,340,89,0,0 monster Black Mushroom 1084,1,180000,90000,1
pay_fild01,336,116,0,0 monster Black Mushroom 1084,1,180000,90000,1
pay_fild01,231,258,0,0 monster Black Mushroom 1084,1,180000,90000,1
@@ -38,49 +38,48 @@ pay_fild01,70,246,0,0 monster Black Mushroom 1084,1,180000,90000,1
pay_fild01,0,0,0,0 monster Green Plant 1080,5,180000,90000,1
//==================================================
-// pay_fild02 - Payon Forest
+// pay_fild02 - Payon Forest
//==================================================
-pay_fild02,0,0,0,0 monster Boa 1025,140,0,0,0
-pay_fild02,0,0,0,0 monster Spore 1014,30,0,0,0
-pay_fild02,0,0,0,0 monster Wormtail 1024,30,0,0,0
+pay_fild02,0,0,0,0 monster Boa 1025,140,5000,0,0
+pay_fild02,0,0,0,0 monster Wormtail 1024,30,5000,0,0
+pay_fild02,0,0,0,0 monster Spore 1014,30,5000,0,0
pay_fild02,105,256,10,10 monster Green Plant 1080,4,360000,180000,1
pay_fild02,105,256,10,10 monster Red Mushroom 1085,4,360000,180000,1
//==================================================
// pay_fild03 - Payon Forest
//==================================================
-pay_fild03,0,0,0,0 monster Fabre 1007,130,0,0,0
-pay_fild03,0,0,0,0 monster Poring 1002,25,0,0,0
-pay_fild03,0,0,0,0 monster Willow 1010,25,0,0,0
-pay_fild03,0,0,0,0 monster Pupa 1008,20,0,0,0
+pay_fild03,0,0,0,0 monster Fabre 1007,130,5000,0,0
+pay_fild03,0,0,0,0 monster Poring 1002,25,5000,0,0
+pay_fild03,0,0,0,0 monster Willow 1010,25,5000,0,0
+pay_fild03,0,0,0,0 monster Pupa 1008,20,5000,0,0
pay_fild03,153,216,10,10 monster Red Mushroom 1085,6,900000,450000,1
pay_fild03,372,64,15,15 monster Green Plant 1080,4,180000,90000,1
//==================================================
// pay_fild04 - Sograt Desert
//==================================================
-pay_fild04,0,0,0,0 monster Poporing 1031,130,0,0,0
-pay_fild04,0,0,0,0 monster Marin 1242,30,0,0,0
-pay_fild04,0,0,0,0 monster Drops 1113,20,0,0,0
-pay_fild04,0,0,0,0 monster Poring 1002,15,0,0,0
+pay_fild04,0,0,0,0 monster Poporing 1031,130,5000,0,0
+pay_fild04,0,0,0,0 monster Marina 1141,30,5000,0,0
+pay_fild04,0,0,0,0 monster Drops 1113,20,5000,0,0
+pay_fild04,0,0,0,0 monster Poring 1002,15,5000,0,0
+pay_fild04,0,0,0,0 monster Angeling 1096,1,3600000,1800000,1
pay_fild04,0,0,0,0 monster Ghostring 1120,1,3600000,1800000,1
pay_fild04,0,0,0,0 monster Mastering 1090,1,3600000,1800000,1
-pay_fild04,0,0,0,0 monster Angeling 1096,1,3600000,1800000,1
pay_fild04,0,0,0,0 monster Deviling 1582,1,7200000,3600000,1
pay_fild04,346,335,5,5 monster Shining Plant 1083,1,1800000,900000,1
pay_fild04,254,193,10,10 monster Green Plant 1080,5,360000,180000,1
//==================================================
-// pay_fild05 - Payon Forest
+// pay_fild05 - Disabled on Renewal
//==================================================
-// No spawns/Disabled Map - 13.3
//==================================================
// pay_fild06 - Payon Forest
//==================================================
-pay_fild06,0,0,0,0 monster Wormtail 1024,140,0,0,0
-pay_fild06,0,0,0,0 monster Spore 1014,30,0,0,0
-pay_fild06,0,0,0,0 monster Boa 1025,30,0,0,0
+pay_fild06,0,0,0,0 monster Wormtail 1024,140,5000,0,0
+pay_fild06,0,0,0,0 monster Boa 1025,30,5000,0,0
+pay_fild06,0,0,0,0 monster Spore 1014,30,5000,0,0
pay_fild06,211,191,2,10 monster Red Mushroom 1085,8,180000,90000,1
pay_fild06,268,155,20,20 monster Green Plant 1080,10,360000,180000,1
pay_fild06,268,155,20,20 monster Shining Plant 1083,1,1800000,900000,1
@@ -88,37 +87,36 @@ pay_fild06,268,155,20,20 monster Shining Plant 1083,1,1800000,900000,1
//==================================================
// pay_fild07 - Payon Forest
//==================================================
-pay_fild07,0,0,0,0 monster Bigfoot 1060,13,0,0,0
-pay_fild07,0,0,0,0 monster Caramel 1103,30,0,0,0
-pay_fild07,0,0,0,0 monster Creamy 1018,20,0,0,0
-pay_fild07,0,0,0,0 monster Stainer 1174,20,0,0,0
-//pay_fild07,0,0,0,0 monster Eggyra 1116,40,0,0,0
+pay_fild07,0,0,0,0 monster Bigfoot 1060,130,5000,0,0
+pay_fild07,0,0,0,0 monster Caramel 1103,30,5000,0,0
+pay_fild07,0,0,0,0 monster Stainer 1174,20,5000,0,0
+pay_fild07,0,0,0,0 monster Creamy 1018,20,5000,0,0
pay_fild07,171,331,20,20 monster Green Plant 1080,8,900000,450000,1
//==================================================
// pay_fild08 - Payon Forest
//==================================================
-pay_fild08,0,0,0,0 monster Spore 1014,140,0,0,0
-pay_fild08,0,0,0,0 monster Wormtail 1024,30,0,0,0
-pay_fild08,0,0,0,0 monster Boa 1025,30,0,0,0
+pay_fild08,0,0,0,0 monster Spore 1014,140,5000,0,0
+pay_fild08,0,0,0,0 monster Wormtail 1024,30,5000,0,0
+pay_fild08,0,0,0,0 monster Boa 1025,30,5000,0,0
pay_fild08,0,0,0,0 monster Green Plant 1080,10,60000,30000,1
pay_fild08,143,156,40,40 monster Shining Plant 1083,1,3600000,1800000,1
//==================================================
// pay_fild09 - Payon Forest
//==================================================
-pay_fild09,0,0,0,0 monster Elder Willow 1033,140,0,0,0
-pay_fild09,0,0,0,0 monster Coco 1104,30,0,0,0
-pay_fild09,0,0,0,0 monster Horn 1128,30,0,0,0
+pay_fild09,0,0,0,0 monster Elder Willow 1033,140,5000,0,0
+pay_fild09,0,0,0,0 monster Hornet 1004,30,5000,0,0
+pay_fild09,0,0,0,0 monster Coco 1104,30,5000,0,0
pay_fild09,198,217,30,30 monster Green Plant 1080,10,360000,180000,0
pay_fild09,198,217,30,30 monster Shining Plant 1083,1,1800000,900000,1
//==================================================
// pay_fild10 - Payon Forest
//==================================================
-pay_fild10,0,0,0,0 monster Greatest General 1277,100,0,0,0
-pay_fild10,0,0,0,0 monster Savage 1166,50,0,0,0
-pay_fild10,0,0,0,0 monster Beetle King 1494,50,0,0,0
+pay_fild10,0,0,0,0 monster Greatest General 1277,100,5000,0,0
+pay_fild10,0,0,0,0 monster Beetle King 1494,50,5000,0,0
+pay_fild10,0,0,0,0 monster Savage 1166,50,5000,0,0
pay_fild10,0,0,0,0 boss_monster Eddga 1115,1,7200000,600000,1
pay_fild10,213,157,10,10 monster Green Plant 1080,5,360000,180000,1
pay_fild10,281,307,10,10 monster Green Plant 1080,5,360000,180000,1
@@ -128,6 +126,5 @@ pay_fild10,281,307,10,10 monster Blue Plant 1079,1,360000,180000,1
pay_fild10,66,332,10,10 monster Blue Plant 1079,1,360000,180000,1
//==================================================
-// pay_fild11 - Payon Forest
-//==================================================
-// No spawns/Disabled Map - 13.3
+// pay_fild11 - Disabled on Renewal
+//================================================== \ No newline at end of file
diff --git a/npc/mobs/fields/prontera.txt b/npc/mobs/fields/prontera.txt
index 93dcecb0f..dac0c99dc 100644
--- a/npc/mobs/fields/prontera.txt
+++ b/npc/mobs/fields/prontera.txt
@@ -14,95 +14,113 @@
//============================================================
//==================================================
-// prt_fild00 - Prontera Field
+// prt_fild00 - Prontera Field
//==================================================
-prt_fild00,0,0,0,0 monster Roda Frog 1012,130,0,0,0
-prt_fild00,0,0,0,0 monster Ambernite 1094,50,0,0,0
-prt_fild00,0,0,0,0 monster Savage Babe 1167,20,0,0,0
+prt_fild00,0,0,0,0 monster Roda Frog 1012,130,5000,0,0
+prt_fild00,0,0,0,0 monster Ambernite 1094,50,5000,0,0
+prt_fild00,0,0,0,0 monster Savage Babe 1167,20,5000,0,0
+prt_fild00,227,212,0,0 monster Shining Plant 1083,1,1800000,900000,1
+prt_fild00,285,138,10,10 monster Green Plant 1080,5,360000,180000,1
//==================================================
-// prt_fild01 - Prontera Field
+// prt_fild01 - Prontera Field
//==================================================
-prt_fild01,0,0,0,0 monster Lunatic 1063,140,0,0,0
-prt_fild01,0,0,0,0 monster Poring 1002,30,0,0,0
-prt_fild01,0,0,0,0 monster Fabre 1007,30,0,0,0
+prt_fild01,0,0,0,0 monster Lunatic 1063,140,5000,0,0
+prt_fild01,0,0,0,0 monster Poring 1002,30,5000,0,0
+prt_fild01,0,0,0,0 monster Fabre 1007,30,5000,0,0
+prt_fild01,199,266,3,3 monster Green Plant 1080,3,360000,180000,1
+prt_fild01,199,266,3,3 monster Blue Plant 1079,1,900000,450000,1
//==================================================
-// prt_fild02 - Prontera Field
+// prt_fild02 - Prontera Field
//==================================================
-prt_fild02,0,0,0,0 monster Stainer 1174,140,0,0,0
-prt_fild02,0,0,0,0 monster Creamy 1018,30,0,0,0
-prt_fild02,0,0,0,0 monster Poporing 1031,30,0,0,0
+prt_fild02,0,0,0,0 monster Stainer 1174,140,5000,0,0
+prt_fild02,0,0,0,0 monster Creamy 1018,30,5000,0,0
+prt_fild02,0,0,0,0 monster Poporing 1031,30,5000,0,0
prt_fild02,0,0,0,0 monster Eclipse 1093,1,1800000,1200000,0
+prt_fild02,339,309,3,3 monster Shining Plant 1083,1,1800000,900000,1
+prt_fild02,0,0,0,0 monster Shining Plant 1083,2,1800000,900000,1
//==================================================
-// prt_fild03 - Prontera Field
-//==================================================
-prt_fild03,0,0,0,0 monster Yoyo 1057,100,0,0,0
-prt_fild03,0,0,0,0 monster Poporing 1031,30,0,0,0
-prt_fild03,0,0,0,0 monster Horn 1128,30,0,0,0
-prt_fild03,0,0,0,0 monster Choco 1214,1,0,0,0
+// prt_fild03 - Prontera Field
+//==================================================
+prt_fild03,0,0,0,0 monster Yoyo 1057,100,5000,0,0
+prt_fild03,0,0,0,0 monster Poporing 1031,30,5000,0,0
+prt_fild03,0,0,0,0 monster Hornet 1004,30,5000,0,0
+prt_fild03,0,0,0,0 monster Choco 1214,1,5000,0,0
+prt_fild03,296,58,15,15 monster Green Plant 1080,5,180000,90000,1
+prt_fild03,296,58,15,15 monster Blue Plant 1079,2,900000,450000,1
+prt_fild03,307,75,5,5 monster Green Plant 1080,5,360000,180000,1
+prt_fild03,0,0,0,0 monster Green Plant 1080,5,360000,180000,1
+prt_fild03,148,107,5,5 monster Green Plant 1080,5,360000,180000,1
//==================================================
-// prt_fild04 - Prontera Field
+// prt_fild04 - Prontera Field
//==================================================
-prt_fild04,0,0,0,0 monster Roda Frog 1012,80,0,0,0
-prt_fild04,0,0,0,0 monster Ambernite 1094,20,0,0,0
+prt_fild04,0,0,0,0 monster Ambernite 1094,80,5000,0,0
+prt_fild04,0,0,0,0 monster Roda Frog 1012,20,5000,0,0
prt_fild04,0,0,0,0 monster Vocal 1088,1,1800000,1200000,0
+prt_fild04,350,114,10,10 monster Green Plant 1080,5,900000,450000,1
//==================================================
-// prt_fild05 - Prontera Field
+// prt_fild05 - Prontera Field
//==================================================
-prt_fild05,0,0,0,0 monster Hornet 1004,140,0,0,0
-prt_fild05,0,0,0,0 monster Thief Bug Egg 1048,30,0,0,0
-prt_fild05,0,0,0,0 monster Thief Bug 1051,30,0,0,0
+prt_fild05,0,0,0,0 monster Hornet 1004,140,5000,0,0
+prt_fild05,0,0,0,0 monster Thief Bug Egg 1048,30,5000,0,0
+prt_fild05,0,0,0,0 monster Thief Bug Egg 1048,30,5000,0,0
+prt_fild05,208,37,10,10 monster Green Plant 1080,6,900000,450000,1
+prt_fild05,208,37,10,10 monster Blue Plant 1079,1,900000,450000,1
//==================================================
-// prt_fild06 - Prontera Field
+// prt_fild06 - Prontera Field
//==================================================
-prt_fild06,0,0,0,0 monster Fabre 1007,140,0,0,0
-prt_fild06,0,0,0,0 monster Poring 1002,30,0,0,0
-prt_fild06,0,0,0,0 monster Lunatic 1063,30,0,0,0
+prt_fild06,0,0,0,0 monster Fabre 1007,140,5000,0,0
+prt_fild06,0,0,0,0 monster Poring 1002,30,5000,0,0
+prt_fild06,0,0,0,0 monster Lunatic 1063,30,5000,0,0
+prt_fild06,222,30,40,10 monster Green Plant 1080,15,900000,450000,1
//==================================================
-// prt_fild07 - Prontera Field
+// prt_fild07 - Prontera Field
//==================================================
-prt_fild07,0,0,0,0 monster Rocker 1052,150,0,0,0
-prt_fild07,0,0,0,0 monster Savage Babe 1167,50,0,0,0
+prt_fild07,0,0,0,0 monster Rocker 1052,150,5000,0,0
+prt_fild07,0,0,0,0 monster Savage Babe 1167,50,5000,0,0
prt_fild07,0,0,0,0 monster Vocal 1088,1,1800000,1200000,0
+prt_fild07,225,110,5,5 monster Black Mushroom 1084,3,360000,180000,1
//==================================================
-// prt_fild08 - Prontera Field
+// prt_fild08 - Prontera Field
//==================================================
-prt_fild08,0,0,0,0 monster Poring 1002,140,0,0,0
-prt_fild08,0,0,0,0 monster Fabre 1007,40,0,0,0
-prt_fild08,0,0,0,0 monster Lunatic 1063,40,0,0,0
+prt_fild08,0,0,0,0 monster Poring 1002,140,5000,0,0
+prt_fild08,0,0,0,0 monster Lunatic 1063,40,5000,0,0
+prt_fild08,0,0,0,0 monster Fabre 1007,40,5000,0,0
//==================================================
-// prt_fild09 - Prontera Field
+// prt_fild09 - Prontera Field
//==================================================
-prt_fild09,0,0,0,0 monster Magnolia 1138,140,0,0,0
-prt_fild09,0,0,0,0 monster Metaller 1058,60,0,0,0
+prt_fild09,0,0,0,0 monster Magnolia 1138,140,5000,0,0
+prt_fild09,0,0,0,0 monster Metaller 1058,60,5000,0,0
+prt_fild09,237,115,5,5 monster Yellow Plant 1081,3,360000,180000,1
//==================================================
-// prt_fild10 - Prontera Field
+// prt_fild10 - Prontera Field
//==================================================
-prt_fild10,0,0,0,0 monster Elder Willow 1033,140,0,0,0
-prt_fild10,0,0,0,0 monster Poporing 1031,20,0,0,0
-prt_fild03,0,0,0,0 monster coco 1104,20,0,0,0
-prt_fild03,0,0,0,0 monster Horn 1128,20,0,0,0
+prt_fild10,0,0,0,0 monster Elder Willow 1033,140,5000,0,0
+prt_fild10,0,0,0,0 monster Poporing 1031,20,5000,0,0
+prt_fild10,0,0,0,0 monster Hornet 1004,20,5000,0,0
+prt_fild10,0,0,0,0 monster Coco 1104,20,5000,0,0
prt_fild10,99,114,20,5 monster Red Mushroom 1085,15,360000,180000,1
+prt_fild10,155,179,10,10 monster Shining Plant 1083,1,1800000,900000,1
//==================================================
// prt_fild11 - Prontera Field
//==================================================
-prt_fild11,0,0,0,0 monster Goblin 1122,10,0,0,0
-prt_fild11,0,0,0,0 monster Goblin 1123,10,0,0,0
-prt_fild11,0,0,0,0 monster Goblin 1124,10,0,0,0
-prt_fild11,0,0,0,0 monster Goblin 1125,10,0,0,0
-prt_fild11,0,0,0,0 monster Goblin 1126,60,0,0,0
-prt_fild11,0,0,0,0 monster Goblin Archer 1258,50,0,0,0
+prt_fild11,0,0,0,0 monster Goblin 1126,60,5000,0,0
+prt_fild11,0,0,0,0 monster Rotar Zairo 1392,50,5000,0,0
+prt_fild11,0,0,0,0 monster Goblin Archer 1258,50,5000,0,0
+prt_fild11,0,0,0,0 monster Goblin Steamrider 1280,30,5000,0,0
+prt_fild11,0,0,0,0 monster Goblin 1124,10,5000,0,0
+prt_fild11,0,0,0,0 monster Goblin 1125,10,5000,0,0
+prt_fild11,0,0,0,0 monster Goblin 1123,10,5000,0,0
+prt_fild11,0,0,0,0 monster Goblin 1122,10,5000,0,0
prt_fild11,0,0,0,0 monster Panzer Goblin 1308,1,1800000,1200000,0
-prt_fild11,0,0,0,0 monster Goblin Steamrider 1280,30,0,0,0
-prt_fild11,0,0,0,0 monster Rotar Zairo 1280,50,0,0,0
-prt_fild11,0,0,0,0 monster Red Mushroom 1085,10,180000,90000,1
+prt_fild11,0,0,0,0 monster Red Mushroom 1085,10,180000,90000,1 \ No newline at end of file
diff --git a/npc/mobs/fields/rachel.txt b/npc/mobs/fields/rachel.txt
index 6a33e7070..9c62c5134 100644
--- a/npc/mobs/fields/rachel.txt
+++ b/npc/mobs/fields/rachel.txt
@@ -17,59 +17,85 @@
//==================================================
// ra_fild01 - Audhumbla Grassland
//==================================================
-ra_fild01,0,0,0,0 monster Desert Wolf 1106,130,0,0,0
-ra_fild01,0,0,0,0 monster Roween 1782,30,0,0,0
-ra_fild01,0,0,0,0 monster Baby Desert Wolf 1107,20,0,0,0
-ra_fild01,0,0,0,0 monster Anopheles 1627,10,0,0,0
+ra_fild01,0,0,0,0 monster Desert Wolf 1106,130,5000,0,0
+ra_fild01,0,0,0,0 monster Roween 1782,30,5000,0,0
+ra_fild01,0,0,0,0 monster Baby Desert Wolf 1107,20,5000,0,0
+ra_fild01,0,0,0,0 monster Anopheles 1627,10,5000,0,0
+
+//==================================================
+// ra_fild02 - Disabled on Renewal
+//==================================================
//==================================================
// ra_fild03 - The Plain of Ida
//==================================================
-ra_fild03,0,0,0,0 monster Hill Wind 1680,130,0,0,0
-ra_fild03,0,0,0,0 monster Roween 1782,30,0,0,0
-ra_fild03,0,0,0,0 monster Anacondaq 1030,20,0,0,0
-ra_fild03,0,0,0,0 monster Anopheles 1627,20,0,0,0
+ra_fild03,0,0,0,0 monster Hill Wind 1680,130,5000,0,0
+ra_fild03,0,0,0,0 monster Roween 1782,30,5000,0,0
+ra_fild03,0,0,0,0 monster Anacondaq 1030,20,5000,0,0
+ra_fild03,0,0,0,0 monster Anopheles 1627,20,5000,0,0
ra_fild03,0,0,0,0 boss_monster Atroce 1785,1,10800000,600000,1
//==================================================
// ra_fild04 - Audhumbla Grassland
//==================================================
-ra_fild04,0,0,0,0 monster Hill Wind 1680,130,0,0,0
-ra_fild04,0,0,0,0 monster Roween 1782,30,0,0,0
-ra_fild04,0,0,0,0 monster Desert Wolf 1106,20,0,0,0
-ra_fild04,0,0,0,0 monster Anopheles 1627,20,0,0,0
+ra_fild04,0,0,0,0 monster Hill Wind 1680,130,5000,0,0
+ra_fild04,0,0,0,0 monster Roween 1782,30,5000,0,0
+ra_fild04,0,0,0,0 monster Desert Wolf 1106,20,5000,0,0
+ra_fild04,0,0,0,0 monster Anopheles 1627,20,5000,0,0
ra_fild04,0,0,0,0 boss_monster Atroce 1785,1,18000000,600000,1
//==================================================
// ra_fild05 - Audhumbla Grassland
//==================================================
-ra_fild05,0,0,0,0 monster Kobold 1133,70,0,0,0
-ra_fild05,0,0,0,0 monster Kobold 1134,70,0,0,0
-ra_fild05,0,0,0,0 monster Kobold 1135,70,0,0,0
-ra_fild05,0,0,0,0 monster Anopheles 1627,10,0,0,0
+ra_fild05,0,0,0,0 monster Kobold 1133,70,5000,0,0
+ra_fild05,0,0,0,0 monster Kobold 1134,70,5000,0,0
+ra_fild05,0,0,0,0 monster Kobold 1135,70,5000,0,0
+ra_fild05,0,0,0,0 monster Anopheles 1627,10,5000,0,0
//==================================================
// ra_fild06 - Portus Luna
//==================================================
-ra_fild06,0,0,0,0 monster Kobold Archer 1282,70,0,0,0
-ra_fild06,0,0,0,0 monster Kobold 1133,40,0,0,0
-ra_fild06,0,0,0,0 monster Kobold 1134,40,0,0,0
-ra_fild06,0,0,0,0 monster Kobold 1135,40,0,0,0
-ra_fild06,0,0,0,0 monster Anopheles 1627,10,0,0,0
+ra_fild06,0,0,0,0 monster Kobold Archer 1282,70,5000,0,0
+ra_fild06,0,0,0,0 monster Kobold 1133,40,5000,0,0
+ra_fild06,0,0,0,0 monster Kobold 1134,40,5000,0,0
+ra_fild06,0,0,0,0 monster Kobold 1135,40,5000,0,0
+ra_fild06,0,0,0,0 monster Anopheles 1627,10,5000,0,0
ra_fild06,0,0,0,0 monster Kobold Leader 1296,1,1800000,1200000,0
//==================================================
+// ra_fild07 - Disabled on Renewal
+//==================================================
+
+//==================================================
// ra_fild08 - The Plain of Ida
//==================================================
-ra_fild08,0,0,0,0 monster Anacondaq 1030,100,0,0,0
-ra_fild08,0,0,0,0 monster Roween 1782,50,0,0,0
-ra_fild08,0,0,0,0 monster Hill Wind 1680,20,0,0,0
-ra_fild08,0,0,0,0 monster Baby Desert Wolf 1107,10,0,0,0
-ra_fild08,0,0,0,0 monster Anopheles 1627,10,0,0,0
+ra_fild08,0,0,0,0 monster Anacondaq 1030,100,5000,0,0
+ra_fild08,0,0,0,0 monster Roween 1782,50,5000,0,0
+ra_fild08,0,0,0,0 monster Hill Wind 1680,20,5000,0,0
+ra_fild08,0,0,0,0 monster Baby Desert Wolf 1107,10,5000,0,0
+ra_fild08,0,0,0,0 monster Anopheles 1627,10,5000,0,0
+
+//==================================================
+// ra_fild09 - Disabled on Renewal
+//==================================================
+
+//==================================================
+// ra_fild10 - Disabled on Renewal
+//==================================================
+
+//==================================================
+// ra_fild11 - Disabled on Renewal
+//==================================================
//==================================================
// ra_fild12 - The Plain of Ida
//==================================================
-ra_fild12,0,0,0,0 monster Roween 1782,130,0,0,0
-ra_fild12,0,0,0,0 monster Anopheles 1627,30,0,0,0
-ra_fild12,0,0,0,0 monster Baby Desert Wolf 1107,15,0,0,0 \ No newline at end of file
+ra_fild12,0,0,0,0 monster Roween 1782,130,5000,0,0
+ra_fild12,0,0,0,0 monster Anopheles 1627,30,5000,0,0
+ra_fild12,0,0,0,0 monster Baby Desert Wolf 1107,15,5000,0,0
+ra_fild12,0,0,0,0 monster Yellow Plant 1081,15,5000,0,1
+ra_fild12,0,0,0,0 monster Red Plant 1078,5,5000,0,1
+
+//==================================================
+// ra_fild13 - Disabled on Renewal
+//================================================== \ No newline at end of file
diff --git a/npc/mobs/fields/splendide.txt b/npc/mobs/fields/splendide.txt
index b0a4ad21c..faa66a48e 100644
--- a/npc/mobs/fields/splendide.txt
+++ b/npc/mobs/fields/splendide.txt
@@ -14,19 +14,22 @@
//==================================================
// spl_fild01 - Splendide Field
//==================================================
-spl_fild01,0,0,0,0 monster Pinguicula 1995,50,0,0,0
-spl_fild01,0,0,0,0 monster Naga 1993,35,0,0,0
-spl_fild01,0,0,0,0 monster Cornus 1992,25,0,0,0
+spl_fild01,0,0,0,0 monster Dark Pinguicula 2015,50,5000,0,0
+spl_fild01,0,0,0,0 monster Naga 1993,35,5000,0,0
+spl_fild01,0,0,0,0 monster Cornus 1992,25,5000,0,0
- // spl_fild02 - Splendide Field
//==================================================
-spl_fild02,0,0,0,0 monster Pinguicula 1995,95,0,0,0
-spl_fild02,0,0,0,0 monster Luciola Vespa 1994,15,0,0,0
+// spl_fild02 - Splendide Field
+//==================================================
+spl_fild02,0,0,0,0 monster Pinguicula 1995,75,5000,0,0
+spl_fild02,0,0,0,0 monster Bradium Golem 2049,20,5000,0,0
+spl_fild02,0,0,0,0 monster Naga 2047,20,5000,0,0
+spl_fild02,0,0,0,0 monster Luciola Vespa 1994,15,5000,0,0
//==================================================
// spl_fild03 - Splendide Field
//==================================================
-spl_fild03,0,0,0,0 monster Luciola Vespa 1994,35,0,0,0
-spl_fild03,0,0,0,0 monster Cornus 1992,25,0,0,0
-spl_fild03,0,0,0,0 monster Naga 1993,20,0,0,0
-spl_fild03,0,0,0,0 monster Tendril Lion 1991,1,3600000,0,0 \ No newline at end of file
+spl_fild03,0,0,0,0 monster Luciola Vespa 1994,35,5000,0,0
+spl_fild03,0,0,0,0 monster Cornus 1992,25,5000,0,0
+spl_fild03,0,0,0,0 monster Naga 1993,20,5000,0,0
+spl_fild03,0,0,0,0 monster Tendrilion 1991,1,3600000,0,0 \ No newline at end of file
diff --git a/npc/mobs/fields/umbala.txt b/npc/mobs/fields/umbala.txt
index b8f704836..a045ef7af 100644
--- a/npc/mobs/fields/umbala.txt
+++ b/npc/mobs/fields/umbala.txt
@@ -13,46 +13,47 @@
//============================================================
//==================================================
-// um_fild01 - Luluka Forest
+// um_fild01 - Luluka Forest
//==================================================
-um_fild01,0,0,0,0 monster Dryad 1493,70,0,0,0
-um_fild02,0,0,0,0 monster Stone Shooter 1495,10,0,0,0
-um_fild04,0,0,0,0 monster Wootan Shooter 1498,10,0,0,0
-um_fild01,0,0,0,0 monster Wootan Fighter 1499,10,0,0,0
-um_fild01,0,0,0,0 monster Wooden Golem 1497,5,0,0,0
+um_fild01,0,0,0,0 monster Dryad 1493,70,5000,0,0
+um_fild01,0,0,0,0 monster Stone Shooter 1495,15,5000,0,0
+um_fild01,0,0,0,0 monster Wootan Shooter 1498,10,5000,0,0
+um_fild01,0,0,0,0 monster Wootan Fighter 1499,10,5000,0,0
+um_fild01,0,0,0,0 monster Wooden Golem 1497,10,5000,0,0
um_fild01,0,0,0,0 monster Green Plant 1080,10,180000,90000,1
um_fild01,0,0,0,0 monster Yellow Plant 1081,10,180000,90000,1
-um_fild01,0,0,0,0 monster Shining Plant 1083,6,180000,90000,1
+um_fild01,0,0,0,0 monster Shining Plant 1083,5,180000,90000,1
//==================================================
-// um_fild02 - Hoomga Forest
+// um_fild02 - Hoomga Forest
//==================================================
-um_fild02,0,0,0,0 monster Wootan Fighter 1499,40,0,0,0
-um_fild02,0,0,0,0 monster Stone Shooter 1495,10,0,0,0
-um_fild04,0,0,0,0 monster Wootan Shooter 1498,10,0,0,0
-um_fild02,0,0,0,0 monster Choco 1214,5,0,0,0
+um_fild02,0,0,0,0 monster Wootan Fighter 1499,40,5000,0,0
+um_fild02,0,0,0,0 monster Stone Shooter 1495,15,5000,0,0
+um_fild02,0,0,0,0 monster Wootan Shooter 1498,10,5000,0,0
+um_fild02,0,0,0,0 monster Choco 1214,5,5000,0,0
um_fild02,0,0,0,0 monster Red Plant 1078,5,180000,90000,1
um_fild02,0,0,0,0 monster Yellow Plant 1081,5,180000,90000,1
//==================================================
-// um_fild03 - Kalala Swamp
+// um_fild03 - Kalala Swamp
//==================================================
-um_fild03,0,0,0,0 monster Parasite 1500,60,0,0,0
-um_fild02,0,0,0,0 monster Stone Shooter 1495,10,0,0,0
-um_fild04,0,0,0,0 monster Wootan Shooter 1498,10,0,0,0
-um_fild02,0,0,0,0 monster Wootan Fighter 1499,10,0,0,0
+um_fild03,0,0,0,0 monster Parasite 1500,60,5000,0,0
+um_fild03,0,0,0,0 monster Stone Shooter 1495,15,5000,0,0
+um_fild03,0,0,0,0 monster Wootan Shooter 1498,10,5000,0,0
+um_fild03,0,0,0,0 monster Wootan Fighter 1499,10,5000,0,0
um_fild03,0,0,0,0 monster Blue Plant 1079,5,180000,90000,1
um_fild03,0,0,0,0 monster Green Plant 1080,10,180000,90000,1
um_fild03,0,0,0,0 monster Shining Plant 1083,2,180000,90000,1
//==================================================
-// um_fild04 - Hoomga Jungle
+// um_fild04 - Hoomga Jungle
//==================================================
-um_fild04,0,0,0,0 monster Wild Rose 1261,30,0,0,0
-um_fild04,0,0,0,0 monster Stone Shooter 1495,5,0,0,0
-um_fild04,0,0,0,0 monster Wooden Golem 1497,5,0,0,0
-um_fild04,0,0,0,0 monster Wootan Shooter 1498,5,0,0,0
-um_fild04,0,0,0,0 monster Wootan Fighter 1499,5,0,0,0
-um_fild04,0,0,0,0 monster Choco 1214,2,0,0,0
+um_fild04,0,0,0,0 monster Wild Rose 1261,30,5000,0,0
+um_fild04,0,0,0,0 monster Stone Shooter 1495,10,5000,0,0
+um_fild04,0,0,0,0 monster Wootan Shooter 1498,5,5000,0,0
+um_fild04,0,0,0,0 monster Wootan Fighter 1499,5,5000,0,0
+um_fild04,0,0,0,0 monster Wooden Golem 1497,10,5000,0,0
+um_fild04,0,0,0,0 monster Choco 1214,2,5000,0,0
um_fild04,0,0,0,0 monster Red Plant 1078,5,180000,90000,1
um_fild04,0,0,0,0 monster Yellow Plant 1081,5,180000,90000,1
+um_fild01,0,0,0,0 monster Shining Plant 1083,1,180000,90000,1 \ No newline at end of file
diff --git a/npc/mobs/fields/veins.txt b/npc/mobs/fields/veins.txt
index 3eb6fcfb2..5d6c6f9d4 100644
--- a/npc/mobs/fields/veins.txt
+++ b/npc/mobs/fields/veins.txt
@@ -21,37 +21,56 @@
//==================================================
// ve_fild01 - Veins Field
//==================================================
-ve_fild01,0,0,0,0 monster Galion 1783,35,0,0,0
-ve_fild01,0,0,0,0 monster Muscipular 1780,20,0,0,0
-ve_fild01,0,0,0,0 monster Drosera 1781,20,0,0,0
-ve_fild01,0,0,0,0 monster Stapo 1784,20,0,0,0
+ve_fild01,0,0,0,0 monster Galion 1783,35,5000,0,0
+ve_fild01,0,0,0,0 monster Stapo 1784,20,5000,0,0
+ve_fild01,0,0,0,0 monster Drosera 1781,20,5000,0,0
+ve_fild01,0,0,0,0 monster Muscipular 1780,20,5000,0,0
ve_fild01,0,0,0,0 boss_monster Atroce 1785,1,10800000,600000,0
+ve_fild01,0,0,0,0 monster Red Plant 1078,10,5000,0,0
+ve_fild01,0,0,0,0 monster Yellow Plant 1081,10,5000,0,0
+ve_fild01,270,80,20,7 monster Blue Plant 1079,4,840000,0,0
+ve_fild01,270,80,20,7 monster Shining Plant 1083,1,960000,0,0
//==================================================
// ve_fild02 - Veins Field
//==================================================
-ve_fild02,0,0,0,0 monster Drosera 1781,130,0,0,0
-ve_fild02,0,0,0,0 monster Muscipular 1780,20,0,0,0
-ve_fild02,0,0,0,0 monster Galion 1783,10,0,0,0
+ve_fild02,0,0,0,0 monster Drosera 1781,130,5000,0,0
+ve_fild02,0,0,0,0 monster Muscipular 1780,20,5000,0,0
+ve_fild02,0,0,0,0 monster Galion 1783,10,5000,0,0
ve_fild02,120,55,50,50 boss_monster Atroce 1785,1,21600000,600000,0
+ve_fild02,0,0,0,0 monster Red Plant 1078,10,5000,0,0
+ve_fild02,0,0,0,0 monster Yellow Plant 1081,10,5000,0,0
//==================================================
// ve_fild03 - Veins Field
//==================================================
-ve_fild03,0,0,0,0 monster Magmaring 1836,130,0,0,0
-ve_fild03,0,0,0,0 monster Muscipular 1780,35,0,0,0
-ve_fild03,0,0,0,0 monster Drosera 1781,35,0,0,0
+ve_fild03,0,0,0,0 monster Magmaring 1836,130,5000,0,0
+ve_fild03,0,0,0,0 monster Muscipular 1780,35,5000,0,0
+ve_fild03,0,0,0,0 monster Drosera 1781,35,5000,0,0
+ve_fild03,200,212,114,60 monster Red Plant 1078,10,0,0,0
+ve_fild03,0,0,0,0 monster Yellow Plant 1081,10,0,0,0
//==================================================
-// ve_fild04 - Veins Field
+// ve_fild04 - Veins Field
//==================================================
-ve_fild04,0,0,0,0 monster Muscipular 1780,100,0,0,0
-ve_fild04,0,0,0,0 monster Drosera 1781,50,0,0,0
-ve_fild04,0,0,0,0 monster Galion 1783,20,0,0,0
+ve_fild04,0,0,0,0 monster Muscipular 1780,100,5000,0,0
+ve_fild04,0,0,0,0 monster Drosera 1781,50,5000,0,0
+ve_fild04,0,0,0,0 monster Galion 1783,20,5000,0,0
+ve_fild04,288,273,4,4 monster Blue Plant 1079,3,660000,0,0
+
+//==================================================
+// ve_fild05 - Disabled on Renewal
+//==================================================
+
+//==================================================
+// ve_fild06 - Veins Field - No spawns on Renewal
+//==================================================
+ve_fild06,0,0,0,0 monster Shining Plant 1083,1,5000,0,0
//==================================================
// ve_fild07 - Veins Field
//==================================================
-ve_fild07,0,0,0,0 monster Stapo 1784,100,0,0,0
-ve_fild07,0,0,0,0 monster Drosera 1781,50,0,0,0
-ve_fild07,0,0,0,0 monster Muscipular 1780,30,0,0,0 \ No newline at end of file
+ve_fild07,0,0,0,0 monster Stapo 1784,100,5000,0,0
+ve_fild07,0,0,0,0 monster Drosera 1781,50,5000,0,0
+ve_fild07,0,0,0,0 monster Muscipular 1780,30,5000,0,0
+ve_fild07,0,0,0,0 monster White Plant 1082,10,600000,0,0 \ No newline at end of file
diff --git a/npc/mobs/fields/yuno.txt b/npc/mobs/fields/yuno.txt
index d117057e9..b3a754709 100644
--- a/npc/mobs/fields/yuno.txt
+++ b/npc/mobs/fields/yuno.txt
@@ -24,11 +24,11 @@
//============================================================
//==================================================
-// yuno_fild01 - Border Posts
+// yuno_fild01 - Border Posts
//==================================================
-yuno_fild01,0,0,0,0 monster Geographer 1368,50,0,0,0
-yuno_fild01,0,0,0,0 monster Dustiness 1114,35,0,0,0
-yuno_fild01,0,0,0,0 monster Mantis 1139,35,0,0,0
+yuno_fild01,0,0,0,0 monster Geographer 1368,50,5000,0,0
+yuno_fild01,0,0,0,0 monster Dustiness 1114,35,5000,0,0
+yuno_fild01,0,0,0,0 monster Mantis 1139,35,5000,0,0
yuno_fild01,0,0,0,0 monster Red Plant 1078,15,1800000,900000,1
yuno_fild01,70,370,10,10 monster Blue Plant 1079,2,1800000,900000,1
yuno_fild01,70,370,10,10 monster Shining Plant 1083,1,1800000,900000,1
@@ -39,11 +39,11 @@ yuno_fild01,0,0,0,0 monster Yellow Plant 1081,15,1800000,900000,1
yuno_fild01,0,0,0,0 monster Green Plant 1080,20,1800000,900000,1
//==================================================
-// yuno_fild02 - Kiel Khayr's Cottage
+// yuno_fild02 - Kiel Hyre's Cottage
//==================================================
-yuno_fild02,0,0,0,0 monster Sleeper 1386,130,0,0,0
-yuno_fild02,0,0,0,0 monster Grand Peco 1369,35,0,0,0
-yuno_fild02,0,0,0,0 monster Harpy 1376,35,0,0,0
+yuno_fild02,0,0,0,0 monster Sleeper 1386,130,5000,0,0
+yuno_fild02,0,0,0,0 monster Grand Peco 1369,35,5000,0,0
+yuno_fild02,0,0,0,0 monster Harpy 1376,35,5000,0,0
yuno_fild02,0,0,0,0 monster Red Plant 1078,10,1800000,900000,1
yuno_fild02,0,0,0,0 monster Yellow Plant 1081,10,1800000,900000,1
yuno_fild02,0,0,0,0 monster Green Plant 1080,10,1800000,900000,1
@@ -51,11 +51,11 @@ yuno_fild02,0,0,0,0 monster Green Plant 1080,10,1800000,900000,1
//==================================================
// yuno_fild03 - El Mes Plateau
//==================================================
-yuno_fild03,0,0,0,0 monster Harpy 1376,130,0,0,0
-yuno_fild03,0,0,0,0 monster Sleeper 1386,35,0,0,0
-yuno_fild03,0,0,0,0 monster Goat 1372,35,0,0,0
-yuno_fild03,0,0,0,0 monster Angeling 1096,1,3600000,1800000,1
+yuno_fild03,0,0,0,0 monster Harpy 1376,130,5000,0,0
+yuno_fild03,0,0,0,0 monster Goat 1372,35,5000,0,0
+yuno_fild03,0,0,0,0 monster Sleeper 1386,35,5000,0,0
yuno_fild03,0,0,0,0 monster Deviling 1582,1,3600000,1800000,1
+yuno_fild03,0,0,0,0 monster Angeling 1096,1,3600000,1800000,1
yuno_fild03,0,0,0,0 monster Red Plant 1078,15,1800000,900000,1
yuno_fild03,0,0,0,0 monster Yellow Plant 1081,15,1800000,900000,1
yuno_fild03,0,0,0,0 monster Green Plant 1080,15,1800000,900000,1
@@ -65,75 +65,67 @@ yuno_fild03,358,215,10,10 monster Blue Plant 1079,4,1800000,900000,1
//==================================================
// yuno_fild04 - El Mes Plateau
//==================================================
-yuno_fild04,0,0,0,0 monster Harpy 1376,130,0,0,0
-yuno_fild04,0,0,0,0 monster Geographer 1368,35,0,0,0
-yuno_fild04,0,0,0,0 monster Goat 1372,35,0,0,0
-yuno_fild04,0,0,0,0 monster Mastering 1090,1,3600000,1800000,1
+yuno_fild04,0,0,0,0 monster Harpy 1376,130,5000,0,0
+yuno_fild04,0,0,0,0 monster Goat 1372,35,5000,0,0
+yuno_fild04,0,0,0,0 monster Geographer 1368,35,5000,0,0
yuno_fild04,0,0,0,0 monster Arc Angeling 1388,1,3600000,180000,0
+yuno_fild04,0,0,0,0 monster Mastering 1090,1,3600000,1800000,1
yuno_fild04,0,0,0,0 monster Red Plant 1078,10,1800000,900000,1
yuno_fild04,0,0,0,0 monster Yellow Plant 1081,10,1800000,900000,1
yuno_fild04,0,0,0,0 monster Green Plant 1080,10,1800000,900000,1
//==================================================
-// yuno_fild05 - El Mes Plateau
+// yuno_fild05 - Disabled on Renewal
//==================================================
-// No Spawns/Disabled Map = 13.3
//==================================================
-// yuno_fild06 - Yuno Field
+// yuno_fild06 - El Mes Plateau
//==================================================
-yuno_fild06,0,0,0,0 monster Sleeper 1386,80,0,0,0
-yuno_fild06,0,0,0,0 monster Geographer 1368,20,0,0,0
-yuno_fild06,0,0,0,0 monster Red Plant 1078,10,0,0,0
-yuno_fild06,0,0,0,0 monster Yellow Plant 1081,10,0,0,0
-yuno_fild06,0,0,0,0 monster Green Plant 1080,10,0,0,0
+yuno_fild06,0,0,0,0 monster Sleeper 1386,80,5000,0,0
+yuno_fild06,0,0,0,0 monster Geographer 1368,20,5000,0,0
+yuno_fild06,0,0,0,0 monster Red Plant 1078,10,5000,0,0
+yuno_fild06,0,0,0,0 monster Yellow Plant 1081,10,5000,0,0
+yuno_fild06,0,0,0,0 monster Green Plant 1080,10,5000,0,0
//==================================================
// yuno_fild07 - El Mes Gorge (Valley of Abyss)
//==================================================
-yuno_fild07,0,0,0,0 monster Goat 1372,90,0,0,0
-yuno_fild07,0,0,0,0 monster Harpy 1376,50,0,0,0
-yuno_fild07,0,0,0,0 monster Grand Peco 1369,30,0,0,0
+yuno_fild07,0,0,0,0 monster Goat 1372,90,5000,0,0
+yuno_fild07,0,0,0,0 monster Harpy 1376,50,5000,0,0
+yuno_fild07,0,0,0,0 monster Grand Peco 1369,30,5000,0,0
yuno_fild07,0,0,0,0 monster Red Plant 1078,10,180000,90000,1
yuno_fild07,0,0,0,0 monster Green Plant 1080,10,180000,90000,1
yuno_fild07,0,0,0,0 monster Yellow Plant 1081,10,180000,90000,1
//==================================================
-// yuno_fild08 - Kiel Khayr's Academy
+// yuno_fild08 - Kiel Hyre's Academy
//==================================================
-yuno_fild08,200,300,290,100 monster Grand Peco 1369,50,0,0,0
-yuno_fild08,272,205,100,120 monster Grand Peco 1369,30,0,0,0
-yuno_fild08,230,110,250,90 monster Grand Peco 1369,50,0,0,0
-yuno_fild08,200,300,290,100 monster Geographer 1368,12,0,0,0
-yuno_fild08,272,205,100,120 monster Geographer 1368,6,0,0,0
-yuno_fild08,230,110,250,90 monster Geographer 1368,12,0,0,0
-yuno_fild08,0,0,0,0 monster Goat 1372,30,0,0,0
+yuno_fild08,0,0,0,0 monster Grand Peco 1369,130,5000,0,0
+yuno_fild08,0,0,0,0 monster Goat 1372,30,5000,0,0
+yuno_fild08,0,0,0,0 monster Geographer 1368,30,5000,0,0
yuno_fild08,0,0,0,0 monster Red Plant 1078,10,180000,90000,1
yuno_fild08,0,0,0,0 monster Green Plant 1080,10,180000,90000,1
yuno_fild08,0,0,0,0 monster Yellow Plant 1081,10,180000,90000,1
//==================================================
-// yuno_fild09 - Schwarzwald Guards Camp
+// yuno_fild09 - Schwaltzvalt Guards Camp
//==================================================
-yuno_fild09,0,0,0,0 monster Grand Peco 1369,130,0,0,0
-yuno_fild09,0,0,0,0 monster Geographer 1368,30,0,0,0
-yuno_fild09,0,0,0,0 monster Sleeper 1386,30,0,0,0
+yuno_fild09,0,0,0,0 monster Grand Peco 1369,130,5000,0,0
+yuno_fild09,0,0,0,0 monster Sleeper 1386,30,5000,0,0
+yuno_fild09,0,0,0,0 monster Geographer 1368,30,5000,0,0
yuno_fild09,0,0,0,0 monster Red Plant 1078,10,180000,90000,1
yuno_fild09,0,0,0,0 monster Green Plant 1080,10,180000,90000,1
yuno_fild09,0,0,0,0 monster Yellow Plant 1081,10,180000,90000,1
//==================================================
-// yuno_fild10 - Yuno Field
+// yuno_fild10 - Disabled on Renewal
//==================================================
-// No Spawns/Disabled Map - 13.3
//==================================================
-// yuno_fild11 - Yuno Field
+// yuno_fild11 - Juno Field
//==================================================
-yuno_fild10,0,0,0,0 monster Goat 1372,100,0,0,0
-yuno_fild11,0,0,0,0 monster Geographer 1368,23,0,0,0
-yuno_fild11,65,294,70,160 monster Geographer 1368,2,0,0,0
-yuno_fild11,225,220,125,135 monster Geographer 1368,15,0,0,0
+yuno_fild11,0,0,0,0 monster Goat 1372,100,5000,0,0
+yuno_fild11,0,0,0,0 monster Geographer 1368,40,5000,0,0
yuno_fild11,0,0,0,0 monster Red Plant 1078,10,180000,90000,1
yuno_fild11,0,0,0,0 monster Green Plant 1080,10,180000,90000,1
yuno_fild11,0,0,0,0 monster Yellow Plant 1081,10,180000,90000,1
@@ -141,5 +133,5 @@ yuno_fild11,0,0,0,0 monster Yellow Plant 1081,10,180000,90000,1
//==================================================
// yuno_fild12 - Border Checkpoint
//==================================================
-yuno_fild12,0,0,0,0 monster Geographer 1368,60,0,0,0
-yuno_fild01,0,0,0,0 monster Mantis 1139,30,0,0,0
+yuno_fild12,0,0,0,0 monster Geographer 1368,60,5000,0,0
+yuno_fild12,0,0,0,0 monster Mantis 1139,30,5000,0,0 \ No newline at end of file
diff --git a/npc/scripts_monsters.conf b/npc/scripts_monsters.conf
index 651bf6831..e94abbd13 100644
--- a/npc/scripts_monsters.conf
+++ b/npc/scripts_monsters.conf
@@ -6,7 +6,9 @@ npc: npc/mobs/pvp.txt
npc: npc/mobs/fields/amatsu.txt
npc: npc/mobs/fields/ayothaya.txt
+//npc: npc/mobs/fields/brasilis.txt
npc: npc/mobs/fields/comodo.txt
+//npc: npc/mobs/fields/dicastes.txt
npc: npc/mobs/fields/einbroch.txt
npc: npc/mobs/fields/geffen.txt
npc: npc/mobs/fields/gonryun.txt
@@ -35,7 +37,9 @@ npc: npc/mobs/dungeons/ama_dun.txt
npc: npc/mobs/dungeons/anthell.txt
npc: npc/mobs/dungeons/ayo_dun.txt
npc: npc/mobs/dungeons/beach_dun.txt
+//npc: npc/mobs/dungeons/bra_dun.txt
npc: npc/mobs/dungeons/c_tower.txt
+//npc: npc/mobs/dungeons/dic_dun.txt
npc: npc/mobs/dungeons/ein_dun.txt
npc: npc/mobs/dungeons/gef_dun.txt
npc: npc/mobs/dungeons/gefenia.txt
@@ -65,7 +69,6 @@ npc: npc/mobs/dungeons/tha_t.txt
npc: npc/mobs/dungeons/thor_v.txt
npc: npc/mobs/dungeons/treasure.txt
npc: npc/mobs/dungeons/tur_dun.txt
-//npc: npc/mobs/dungeons/um_dun.txt
npc: npc/mobs/dungeons/xmas_dun.txt
npc: npc/mobs/dungeons/yggdrasil.txt
// --------------------------------------------------------------
diff --git a/src/common/mmo.h b/src/common/mmo.h
index 39a5717ab..024008b7b 100644
--- a/src/common/mmo.h
+++ b/src/common/mmo.h
@@ -637,6 +637,65 @@ enum {
JOB_STAR_GLADIATOR,
JOB_STAR_GLADIATOR2,
JOB_SOUL_LINKER,
+
+ JOB_RUNE_KNIGHT = 4054,
+ JOB_WARLOCK,
+ JOB_RANGER,
+ JOB_ARCHBISHOP,
+ JOB_MECHANIC,
+ JOB_GUILLOTINE_CROSS,
+
+ JOB_RUNE_KNIGHT_H,
+ JOB_WARLOCK_H,
+ JOB_RANGER_H,
+ JOB_ARCHBISHOP_H,
+ JOB_MECHANIC_H,
+ JOB_GUILLOTINE_CROSS_H,
+
+ JOB_ROYAL_GUARD,
+ JOB_SORCERER,
+ JOB_MINSTREL,
+ JOB_WANDERER,
+ JOB_SURA,
+ JOB_GENETIC,
+ JOB_SHADOW_CHASER,
+
+ JOB_ROYAL_GUARD_H,
+ JOB_SORCERER_H,
+ JOB_MINSTREL_H,
+ JOB_WANDERER_H,
+ JOB_SURA_H,
+ JOB_GENETIC_H,
+ JOB_SHADOW_CHASER_H,
+
+ JOB_RUNE_KNIGHT2,
+ JOB_RUNE_KNIGHT_H2,
+ JOB_ROYAL_GUARD2,
+ JOB_ROYAL_GUARD_H2,
+ JOB_RANGER2,
+ JOB_RANGER_H2,
+ JOB_MECHANIC2,
+ JOB_MECHANIC_H2,
+
+ JOB_BABY_RUNE = 4096,
+ JOB_BABY_WARLOCK,
+ JOB_BABY_RANGER,
+ JOB_BABY_BISHOP,
+ JOB_BABY_MECHANIC,
+ JOB_BABY_CROSS,
+ JOB_BABY_GUARD,
+ JOB_BABY_SORCERER,
+ JOB_BABY_MINSTREL,
+ JOB_BABY_WANDERER,
+ JOB_BABY_SURA,
+ JOB_BABY_GENETIC,
+ JOB_BABY_CHASER,
+
+ JOB_BABY_RUNE2,
+ JOB_BABY_GUARD2,
+ JOB_BABY_RANGER2,
+ JOB_BABY_MECHANIC2,
+
JOB_MAX,
};
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index b44eae946..0d1c8f9d9 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -1252,7 +1252,7 @@ ACMD_FUNC(jobchange)
if (!message || !*message || sscanf(message, "%d %d", &job, &upper) < 1)
{
int i, found = 0;
- const struct { char name[16]; int id; } jobs[] = {
+ const struct { char name[22]; int id; } jobs[] = {
{ "novice", 0 },
{ "swordsman", 1 },
{ "mage", 2 },
@@ -1327,6 +1327,45 @@ ACMD_FUNC(jobchange)
{ "taekwon girl", 4046 },
{ "star gladiator", 4047 },
{ "soul linker", 4049 },
+ { "rune knight", 4054 },
+ { "warlock", 4055 },
+ { "ranger", 4056 },
+ { "arch bishop", 4057 },
+ { "mechanic", 4058 },
+ { "guillotine cross", 4059 },
+ { "rune knight2", 4060 },
+ { "warlock2", 4061 },
+ { "ranger2", 4062 },
+ { "arch bishop2", 4063 },
+ { "mechanic2", 4064 },
+ { "guillotine cross2", 4065 },
+ { "royal guard", 4066 },
+ { "sorcerer", 4067 },
+ { "minstrel", 4068 },
+ { "wanderer", 4069 },
+ { "sura", 4070 },
+ { "genetic", 4071 },
+ { "shadow chaser", 4072 },
+ { "royal guard2", 4073 },
+ { "sorcerer2", 4074 },
+ { "minstrel2", 4075 },
+ { "wanderer2", 4076 },
+ { "sura2", 4077 },
+ { "genetic2", 4078 },
+ { "shadow chaser2", 4079 },
+ { "baby rune knight", 4096 },
+ { "baby warlock", 4097 },
+ { "baby ranger", 4098 },
+ { "baby arch bishop", 4099 },
+ { "baby mechanic", 4100 },
+ { "baby guillotine cross", 4101 },
+ { "baby royal guard", 4102 },
+ { "baby sorcerer", 4103 },
+ { "baby minstrel", 4104 },
+ { "baby wanderer", 4105 },
+ { "baby sura", 4106 },
+ { "baby genetic", 4107 },
+ { "baby shadow chaser", 4108 },
};
for (i=0; i < ARRAYLENGTH(jobs); i++) {
@@ -1340,36 +1379,61 @@ ACMD_FUNC(jobchange)
if (!found) {
clif_displaymessage(fd, "Please, enter job ID (usage: @job/@jobchange <job name/ID>).");
- clif_displaymessage(fd, " 0 Novice 7 Knight 14 Crusader 21 N/A");
- clif_displaymessage(fd, " 1 Swordman 8 Priest 15 Monk 22 N/A");
- clif_displaymessage(fd, " 2 Mage 9 Wizard 16 Sage 23 Super Novice");
- clif_displaymessage(fd, " 3 Archer 10 Blacksmith 17 Rogue 24 Gunslinger");
- clif_displaymessage(fd, " 4 Acolyte 11 Hunter 18 Alchemist 25 Ninja");
- clif_displaymessage(fd, " 5 Merchant 12 Assassin 19 Bard 26 N/A");
- clif_displaymessage(fd, " 6 Thief 13 N/A 20 Dancer 27 N/A");
- clif_displaymessage(fd, "4001 Novice High 4008 Lord Knight 4015 Paladin 4022 N/A");
- clif_displaymessage(fd, "4002 Swordman High 4009 High Priest 4016 Champion");
- clif_displaymessage(fd, "4003 Mage High 4010 High Wizard 4017 Professor");
- clif_displaymessage(fd, "4004 Archer High 4011 Whitesmith 4018 Stalker");
- clif_displaymessage(fd, "4005 Acolyte High 4012 Sniper 4019 Creator");
- clif_displaymessage(fd, "4006 Merchant High 4013 Assassin Cross 4020 Clown");
- clif_displaymessage(fd, "4007 Thief High 4014 N/A 4021 Gypsy");
- clif_displaymessage(fd, "4023 Baby Novice 4030 Baby Knight 4037 Baby Crusader 4044 N/A");
- clif_displaymessage(fd, "4024 Baby Swordsman 4031 Baby Priest 4038 Baby Monk 4045 Super Baby");
- clif_displaymessage(fd, "4025 Baby Mage 4032 Baby Wizard 4039 Baby Sage 4046 Taekwon Kid");
- clif_displaymessage(fd, "4026 Baby Archer 4033 Baby Blacksmith 4040 Baby Rogue 4047 Taekwon Master");
- clif_displaymessage(fd, "4027 Baby Acolyte 4034 Baby Hunter 4041 Baby Alchemist 4048 N/A");
- clif_displaymessage(fd, "4028 Baby Merchant 4035 Baby Assassin 4042 Baby Bard 4049 Soul Linker");
- clif_displaymessage(fd, "4029 Baby Thief 4036 N/A 4043 Baby Dancer");
+ clif_displaymessage(fd, "----- Novice / 1st Class -----");
+ clif_displaymessage(fd, " 0 Novice 1 Swordman 2 Mage 3 Archer");
+ clif_displaymessage(fd, " 4 Acolyte 5 Merchant 6 Thief");
+ clif_displaymessage(fd, "----- 2nd Class -----");
+ clif_displaymessage(fd, " 7 Knight 8 Priest 9 Wizard 10 Blacksmith");
+ clif_displaymessage(fd, " 11 Hunter 12 Assassin 14 Crusader 15 Monk");
+ clif_displaymessage(fd, " 16 Sage 17 Rogue 18 Alchemist 19 Bard");
+ clif_displaymessage(fd, " 20 Dancer");
+ clif_displaymessage(fd, "----- High Novice / High 1st Class -----");
+ clif_displaymessage(fd, "4001 Novice High 4002 Swordman High 4003 Mage High 4004 Archer High");
+ clif_displaymessage(fd, "4005 Acolyte High 4006 Merchant High 4007 Thief High");
+ clif_displaymessage(fd, "----- Transcendent Class -----");
+ clif_displaymessage(fd, "4008 Lord Knight 4009 High Priest 4010 High Wizard 4011 Whitesmith");
+ clif_displaymessage(fd, "4012 Sniper 4013 Assassin Cross 4015 Paladin 4016 Champion");
+ clif_displaymessage(fd, "4017 Professor 4018 Stalker 4019 Creator 4020 Clown");
+ clif_displaymessage(fd, "4021 Gypsy");
+ clif_displaymessage(fd, "----- 3rd Class (Regular 3rd) -----");
+ clif_displaymessage(fd, "4054 Rune Knight 4055 Warlock 4056 Ranger 4057 Arch Bishop");
+ clif_displaymessage(fd, "4058 Mechanic 4059 Guillotine Cross 4066 Royal Guard 4067 Sorcerer");
+ clif_displaymessage(fd, "4068 Minstrel 4069 Wanderer 4070 Sura 4071 Genetic");
+ clif_displaymessage(fd, "4072 Shadow Chaser");
+ clif_displaymessage(fd, "----- 3rd Class (Trans 3rd) -----");
+ clif_displaymessage(fd, "4060 Rune Knight 4061 Warlock 4062 Ranger 4063 Arch Bishop");
+ clif_displaymessage(fd, "4064 Mechanic 4065 Guillotine Cross 4073 Royal Guard 4074 Sorcerer");
+ clif_displaymessage(fd, "4075 Minstrel 4076 Wanderer 4077 Sura 4078 Genetic");
+ clif_displaymessage(fd, "4079 Shadow Chaser");
+ clif_displaymessage(fd, "----- Expanded Class -----");
+ clif_displaymessage(fd, " 23 Super Novice 24 Gunslinger 25 Ninja 4046 Taekwon");
+ clif_displaymessage(fd, "4047 Star Gladiator 4049 Soul Linker");
+ clif_displaymessage(fd, "---- Baby 1st / 2nd Class ----");
+ clif_displaymessage(fd, "4023 Baby Novice 4024 Baby Swordsman 4025 Baby Mage 4026 Baby Archer");
+ clif_displaymessage(fd, "4027 Baby Acolyte 4028 Baby Merchant 4029 Baby Thief 4030 Baby Knight");
+ clif_displaymessage(fd, "4031 Baby Priest 4032 Baby Wizard 4033 Baby Blacksmith 4034 Baby Hunter");
+ clif_displaymessage(fd, "4035 Baby Assassin 4037 Baby Crusader 4038 Baby Monk 4039 Baby Sage");
+ clif_displaymessage(fd, "4040 Baby Rogue 4041 Baby Alchemist 4042 Baby Bard 4043 Baby Dancer");
+ clif_displaymessage(fd, "4045 Super Baby");
+ clif_displaymessage(fd, "---- Baby 3rd Class ----");
+ clif_displaymessage(fd, "4096 Baby Rune Knight 4097 Baby Warlock 4098 Baby Ranger");
+ clif_displaymessage(fd, "4099 Baby Arch Bishop 4100 Baby Mechanic 4101 Baby Guillotine Cross");
+ clif_displaymessage(fd, "4102 Baby Royal Guard 4103 Baby Sorcerer 4104 Baby Minstrel");
+ clif_displaymessage(fd, "4105 Baby Wanderer 4106 Baby Sura 4107 Baby Genetic");
+ clif_displaymessage(fd, "4108 Baby Shadow Chaser");
clif_displaymessage(fd, "[upper]: -1 (default) to automatically determine the 'level', 0 to force normal job, 1 to force high job.");
return -1;
}
}
- if (job == 13 || job == 21 || job == 22 || job == 26 || job == 27
- || job == 4014 || job == 4022 || job == 4036 || job == 4044 || job == 4048
- ) // Deny direct transformation into dummy jobs
- return 0;
+ switch(job)
+ {
+ case 13: case 21: case 4014: case 4022: case 4036:
+ case 4044: case 4080: case 4081: case 4082: case 4083:
+ case 4084: case 4085: case 4086: case 4087: case 4109:
+ case 4110: case 4111: case 4112:
+ return 0; // Deny direct transformation into dummy jobs
+ }
if (pcdb_checkid(job))
{
@@ -1381,27 +1445,48 @@ ACMD_FUNC(jobchange)
}
} else {
clif_displaymessage(fd, "Please, enter job ID (usage: @job/@jobchange <job name/ID>).");
- clif_displaymessage(fd, " 0 Novice 7 Knight 14 Crusader 21 N/A");
- clif_displaymessage(fd, " 1 Swordman 8 Priest 15 Monk 22 N/A");
- clif_displaymessage(fd, " 2 Mage 9 Wizard 16 Sage 23 Super Novice");
- clif_displaymessage(fd, " 3 Archer 10 Blacksmith 17 Rogue 24 Gunslinger");
- clif_displaymessage(fd, " 4 Acolyte 11 Hunter 18 Alchemist 25 Ninja");
- clif_displaymessage(fd, " 5 Merchant 12 Assassin 19 Bard 26 N/A");
- clif_displaymessage(fd, " 6 Thief 13 N/A 20 Dancer 27 N/A");
- clif_displaymessage(fd, "4001 Novice High 4008 Lord Knight 4015 Paladin 4022 N/A");
- clif_displaymessage(fd, "4002 Swordman High 4009 High Priest 4016 Champion");
- clif_displaymessage(fd, "4003 Mage High 4010 High Wizard 4017 Professor");
- clif_displaymessage(fd, "4004 Archer High 4011 Whitesmith 4018 Stalker");
- clif_displaymessage(fd, "4005 Acolyte High 4012 Sniper 4019 Creator");
- clif_displaymessage(fd, "4006 Merchant High 4013 Assassin Cross 4020 Clown");
- clif_displaymessage(fd, "4007 Thief High 4014 N/A 4021 Gypsy");
- clif_displaymessage(fd, "4023 Baby Novice 4030 Baby Knight 4037 Baby Crusader 4044 N/A");
- clif_displaymessage(fd, "4024 Baby Swordsman 4031 Baby Priest 4038 Baby Monk 4045 Super Baby");
- clif_displaymessage(fd, "4025 Baby Mage 4032 Baby Wizard 4039 Baby Sage 4046 Taekwon Kid");
- clif_displaymessage(fd, "4026 Baby Archer 4033 Baby Blacksmith 4040 Baby Rogue 4047 Taekwon Master");
- clif_displaymessage(fd, "4027 Baby Acolyte 4034 Baby Hunter 4041 Baby Alchemist 4048 N/A");
- clif_displaymessage(fd, "4028 Baby Merchant 4035 Baby Assassin 4042 Baby Bard 4049 Soul Linker");
- clif_displaymessage(fd, "4029 Baby Thief 4036 N/A 4043 Baby Dancer");
+ clif_displaymessage(fd, "----- Novice / 1st Class -----");
+ clif_displaymessage(fd, " 0 Novice 1 Swordman 2 Mage 3 Archer");
+ clif_displaymessage(fd, " 4 Acolyte 5 Merchant 6 Thief");
+ clif_displaymessage(fd, "----- 2nd Class -----");
+ clif_displaymessage(fd, " 7 Knight 8 Priest 9 Wizard 10 Blacksmith");
+ clif_displaymessage(fd, " 11 Hunter 12 Assassin 14 Crusader 15 Monk");
+ clif_displaymessage(fd, " 16 Sage 17 Rogue 18 Alchemist 19 Bard");
+ clif_displaymessage(fd, " 20 Dancer");
+ clif_displaymessage(fd, "----- High Novice / High 1st Class -----");
+ clif_displaymessage(fd, "4001 Novice High 4002 Swordman High 4003 Mage High 4004 Archer High");
+ clif_displaymessage(fd, "4005 Acolyte High 4006 Merchant High 4007 Thief High");
+ clif_displaymessage(fd, "----- Transcendent Class -----");
+ clif_displaymessage(fd, "4008 Lord Knight 4009 High Priest 4010 High Wizard 4011 Whitesmith");
+ clif_displaymessage(fd, "4012 Sniper 4013 Assassin Cross 4015 Paladin 4016 Champion");
+ clif_displaymessage(fd, "4017 Professor 4018 Stalker 4019 Creator 4020 Clown");
+ clif_displaymessage(fd, "4021 Gypsy");
+ clif_displaymessage(fd, "----- 3rd Class (Regular 3rd) -----");
+ clif_displaymessage(fd, "4054 Rune Knight 4055 Warlock 4056 Ranger 4057 Arch Bishop");
+ clif_displaymessage(fd, "4058 Mechanic 4059 Guillotine Cross 4066 Royal Guard 4067 Sorcerer");
+ clif_displaymessage(fd, "4068 Minstrel 4069 Wanderer 4070 Sura 4071 Genetic");
+ clif_displaymessage(fd, "4072 Shadow Chaser");
+ clif_displaymessage(fd, "----- 3rd Class (Trans 3rd) -----");
+ clif_displaymessage(fd, "4060 Rune Knight 4061 Warlock 4062 Ranger 4063 Arch Bishop");
+ clif_displaymessage(fd, "4064 Mechanic 4065 Guillotine Cross 4073 Royal Guard 4074 Sorcerer");
+ clif_displaymessage(fd, "4075 Minstrel 4076 Wanderer 4077 Sura 4078 Genetic");
+ clif_displaymessage(fd, "4079 Shadow Chaser");
+ clif_displaymessage(fd, "----- Expanded Class -----");
+ clif_displaymessage(fd, " 23 Super Novice 24 Gunslinger 25 Ninja 4046 Taekwon");
+ clif_displaymessage(fd, "4047 Star Gladiator 4049 Soul Linker");
+ clif_displaymessage(fd, "---- Baby 1st / 2nd Class ----");
+ clif_displaymessage(fd, "4023 Baby Novice 4024 Baby Swordsman 4025 Baby Mage 4026 Baby Archer");
+ clif_displaymessage(fd, "4027 Baby Acolyte 4028 Baby Merchant 4029 Baby Thief 4030 Baby Knight");
+ clif_displaymessage(fd, "4031 Baby Priest 4032 Baby Wizard 4033 Baby Blacksmith 4034 Baby Hunter");
+ clif_displaymessage(fd, "4035 Baby Assassin 4037 Baby Crusader 4038 Baby Monk 4039 Baby Sage");
+ clif_displaymessage(fd, "4040 Baby Rogue 4041 Baby Alchemist 4042 Baby Bard 4043 Baby Dancer");
+ clif_displaymessage(fd, "4045 Super Baby");
+ clif_displaymessage(fd, "---- Baby 3rd Class ----");
+ clif_displaymessage(fd, "4096 Baby Rune Knight 4097 Baby Warlock 4098 Baby Ranger");
+ clif_displaymessage(fd, "4099 Baby Arch Bishop 4100 Baby Mechanic 4101 Baby Guillotine Cross");
+ clif_displaymessage(fd, "4102 Baby Royal Guard 4103 Baby Sorcerer 4104 Baby Minstrel");
+ clif_displaymessage(fd, "4105 Baby Wanderer 4106 Baby Sura 4107 Baby Genetic");
+ clif_displaymessage(fd, "4108 Baby Shadow Chaser");
clif_displaymessage(fd, "[upper]: -1 (default) to automatically determine the 'level', 0 to force normal job, 1 to force high job.");
return -1;
}
diff --git a/src/map/map.h b/src/map/map.h
index 3b1775e46..8c817387f 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -40,7 +40,7 @@ struct item_data;
#define NATURAL_HEAL_INTERVAL 500
#define MIN_FLOORITEM 2
#define MAX_FLOORITEM START_ACCOUNT_NUM
-#define MAX_LEVEL 99
+#define MAX_LEVEL 150
#define MAX_DROP_PER_MAP 48
#define MAX_IGNORE_LIST 20 // official is 14
#define MAX_VENDING 12
@@ -62,6 +62,7 @@ struct item_data;
#define JOBL_UPPER 0x1000 //4096
#define JOBL_BABY 0x2000 //8192
+#define JOBL_3 0x4000 //16384
//for filtering and quick checking.
#define MAPID_UPPERMASK 0x0fff
@@ -71,6 +72,7 @@ struct item_data;
//Super Novices are considered the 2-1 version of the novice! Novices are considered a first class type, too...
enum {
MAPID_NOVICE = 0x0,
+//1st classes
MAPID_SWORDMAN,
MAPID_MAGE,
MAPID_ARCHER,
@@ -84,7 +86,7 @@ enum {
MAPID_XMAS,
MAPID_SUMMER,
//2_1 classes
- MAPID_SUPER_NOVICE = JOBL_2_1|0x0,
+ MAPID_SUPER_NOVICE = JOBL_2_1|MAPID_NOVICE,
MAPID_KNIGHT,
MAPID_WIZARD,
MAPID_HUNTER,
@@ -93,15 +95,29 @@ enum {
MAPID_ASSASSIN,
MAPID_STAR_GLADIATOR,
//2_2 classes
- MAPID_CRUSADER = JOBL_2_2|0x1,
+ MAPID_CRUSADER = JOBL_2_2|MAPID_SWORDMAN,
MAPID_SAGE,
MAPID_BARDDANCER,
MAPID_MONK,
MAPID_ALCHEMIST,
MAPID_ROGUE,
MAPID_SOUL_LINKER,
-//1-1, advanced
- MAPID_NOVICE_HIGH = JOBL_UPPER|0x0,
+//3_1 classes
+ MAPID_RUNE_KNIGHT = JOBL_3|JOBL_2_1|MAPID_SWORDMAN,
+ MAPID_WARLOCK,
+ MAPID_RANGER,
+ MAPID_ARCHBISHOP,
+ MAPID_MECHANIC,
+ MAPID_GUILLOTINE_CROSS,
+//3_2 classes
+ MAPID_ROYAL_GUARD = JOBL_3|JOBL_2_2|MAPID_SWORDMAN,
+ MAPID_SORCERER,
+ MAPID_MINSTRELWANDERER,
+ MAPID_SURA,
+ MAPID_GENETIC,
+ MAPID_SHADOW_CHASER,
+//1st, advanced
+ MAPID_NOVICE_HIGH = JOBL_UPPER|MAPID_NOVICE,
MAPID_SWORDMAN_HIGH,
MAPID_MAGE_HIGH,
MAPID_ARCHER_HIGH,
@@ -109,21 +125,35 @@ enum {
MAPID_MERCHANT_HIGH,
MAPID_THIEF_HIGH,
//2_1 advanced
- MAPID_LORD_KNIGHT = JOBL_UPPER|JOBL_2_1|0x1,
+ MAPID_LORD_KNIGHT = JOBL_UPPER|JOBL_2_1|MAPID_SWORDMAN,
MAPID_HIGH_WIZARD,
MAPID_SNIPER,
MAPID_HIGH_PRIEST,
MAPID_WHITESMITH,
MAPID_ASSASSIN_CROSS,
//2_2 advanced
- MAPID_PALADIN = JOBL_UPPER|JOBL_2_2|0x1,
+ MAPID_PALADIN = JOBL_UPPER|JOBL_2_2|MAPID_SWORDMAN,
MAPID_PROFESSOR,
MAPID_CLOWNGYPSY,
MAPID_CHAMPION,
MAPID_CREATOR,
MAPID_STALKER,
-//1-1 baby
- MAPID_BABY = JOBL_BABY|0x0,
+//3_1 advanced
+ MAPID_RUNE_KNIGHT_H = JOBL_3|JOBL_UPPER|JOBL_2_1|MAPID_SWORDMAN,
+ MAPID_WARLOCK_H,
+ MAPID_RANGER_H,
+ MAPID_ARCHBISHOP_H,
+ MAPID_MECHANIC_H,
+ MAPID_GUILLOTINE_CROSS_H,
+//3_2 advanced
+ MAPID_ROYAL_GUARD_H = JOBL_3|JOBL_UPPER|JOBL_2_2|MAPID_SWORDMAN,
+ MAPID_SORCERER_H,
+ MAPID_MINSTRELWANDERER_H,
+ MAPID_SURA_H,
+ MAPID_GENETIC_H,
+ MAPID_SHADOW_CHASER_H,
+//1st baby
+ MAPID_BABY = JOBL_BABY|MAPID_NOVICE,
MAPID_BABY_SWORDMAN,
MAPID_BABY_MAGE,
MAPID_BABY_ARCHER,
@@ -132,7 +162,7 @@ enum {
MAPID_BABY_THIEF,
MAPID_BABY_TAEKWON,
//2_1 baby
- MAPID_SUPER_BABY = JOBL_BABY|JOBL_2_1|0x0,
+ MAPID_SUPER_BABY = JOBL_BABY|JOBL_2_1|MAPID_NOVICE,
MAPID_BABY_KNIGHT,
MAPID_BABY_WIZARD,
MAPID_BABY_HUNTER,
@@ -141,13 +171,27 @@ enum {
MAPID_BABY_ASSASSIN,
MAPID_BABY_STAR_GLADIATOR,
//2_2 baby
- MAPID_BABY_CRUSADER = JOBL_BABY|JOBL_2_2|0x1,
+ MAPID_BABY_CRUSADER = JOBL_BABY|JOBL_2_2|MAPID_SWORDMAN,
MAPID_BABY_SAGE,
MAPID_BABY_BARDDANCER,
MAPID_BABY_MONK,
MAPID_BABY_ALCHEMIST,
MAPID_BABY_ROGUE,
MAPID_BABY_SOUL_LINKER,
+//3_1 baby
+ MAPID_BABY_RUNE = JOBL_3|JOBL_BABY|JOBL_2_1|MAPID_SWORDMAN,
+ MAPID_BABY_WARLOCK,
+ MAPID_BABY_RANGER,
+ MAPID_BABY_BISHOP,
+ MAPID_BABY_MECHANIC,
+ MAPID_BABY_CROSS,
+//3_2 baby
+ MAPID_BABY_GUARD = JOBL_3|JOBL_BABY|JOBL_2_2|MAPID_SWORDMAN,
+ MAPID_BABY_SORCERER,
+ MAPID_BABY_MINSTRELWANDERER,
+ MAPID_BABY_SURA,
+ MAPID_BABY_GENETIC,
+ MAPID_BABY_CHASER
};
//Max size for inputs to Graffiti, Talkie Box and Vending text prompts
diff --git a/src/map/pc.c b/src/map/pc.c
index 4b2d4511e..82e395153 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -4435,102 +4435,144 @@ int pc_checkequip(struct map_session_data *sd,int pos)
*------------------------------------------*/
int pc_jobid2mapid(unsigned short b_class)
{
- int class_ = 0;
- if (b_class >= JOB_BABY && b_class <= JOB_SUPER_BABY)
+ switch(b_class)
{
- if (b_class == JOB_SUPER_BABY)
- b_class = JOB_SUPER_NOVICE;
- else
- b_class -= JOB_BABY;
- class_|= JOBL_BABY;
- }
- else if (b_class >= JOB_NOVICE_HIGH && b_class <= JOB_PALADIN2)
- {
- b_class -= JOB_NOVICE_HIGH;
- class_|= JOBL_UPPER;
- }
- if (b_class >= JOB_KNIGHT && b_class <= JOB_KNIGHT2)
- class_|= JOBL_2_1;
- else if (b_class >= JOB_CRUSADER && b_class <= JOB_CRUSADER2)
- class_|= JOBL_2_2;
- switch (b_class)
- {
- case JOB_NOVICE:
- case JOB_SWORDMAN:
- case JOB_MAGE:
- case JOB_ARCHER:
- case JOB_ACOLYTE:
- case JOB_MERCHANT:
- case JOB_THIEF:
- class_ |= b_class;
- break;
- case JOB_KNIGHT:
- case JOB_KNIGHT2:
- case JOB_CRUSADER:
- case JOB_CRUSADER2:
- class_ |= MAPID_SWORDMAN;
- break;
- case JOB_PRIEST:
- case JOB_MONK:
- class_ |= MAPID_ACOLYTE;
- break;
- case JOB_WIZARD:
- case JOB_SAGE:
- class_ |= MAPID_MAGE;
- break;
- case JOB_BLACKSMITH:
- case JOB_ALCHEMIST:
- class_ |= MAPID_MERCHANT;
- break;
- case JOB_HUNTER:
+ case JOB_NOVICE: return MAPID_NOVICE;
+ //1st classes
+ case JOB_SWORDMAN: return MAPID_SWORDMAN;
+ case JOB_MAGE: return MAPID_MAGE;
+ case JOB_ARCHER: return MAPID_ARCHER;
+ case JOB_ACOLYTE: return MAPID_ACOLYTE;
+ case JOB_MERCHANT: return MAPID_MERCHANT;
+ case JOB_THIEF: return MAPID_THIEF;
+ case JOB_TAEKWON: return MAPID_TAEKWON;
+ case JOB_WEDDING: return MAPID_WEDDING;
+ case JOB_GUNSLINGER: return MAPID_GUNSLINGER;
+ case JOB_NINJA: return MAPID_NINJA;
+ case JOB_XMAS: return MAPID_XMAS;
+ case JOB_SUMMER: return MAPID_SUMMER;
+ //2_1 classes
+ case JOB_SUPER_NOVICE: return MAPID_SUPER_NOVICE;
+ case JOB_KNIGHT: return MAPID_KNIGHT;
+ case JOB_WIZARD: return MAPID_WIZARD;
+ case JOB_HUNTER: return MAPID_HUNTER;
+ case JOB_PRIEST: return MAPID_PRIEST;
+ case JOB_BLACKSMITH: return MAPID_BLACKSMITH;
+ case JOB_ASSASSIN: return MAPID_ASSASSIN;
+ case JOB_STAR_GLADIATOR: return MAPID_STAR_GLADIATOR;
+ //2_2 classes
+ case JOB_CRUSADER: return MAPID_CRUSADER;
+ case JOB_SAGE: return MAPID_SAGE;
case JOB_BARD:
- case JOB_DANCER:
- class_ |= MAPID_ARCHER;
- break;
- case JOB_ASSASSIN:
- case JOB_ROGUE:
- class_ |= MAPID_THIEF;
- break;
-
- case JOB_STAR_GLADIATOR:
- case JOB_STAR_GLADIATOR2:
- class_ |= JOBL_2_1;
- class_ |= MAPID_TAEKWON;
- break;
- case JOB_SOUL_LINKER:
- class_ |= JOBL_2_2;
- case JOB_TAEKWON:
- class_ |= MAPID_TAEKWON;
- break;
- case JOB_WEDDING:
- class_ = MAPID_WEDDING;
- break;
- case JOB_SUPER_NOVICE: //Super Novices are considered 2-1 novices. [Skotlex]
- class_ |= JOBL_2_1;
- break;
- case JOB_GUNSLINGER:
- class_ |= MAPID_GUNSLINGER;
- break;
- case JOB_NINJA:
- class_ |= MAPID_NINJA;
- break;
- case JOB_XMAS:
- class_ = MAPID_XMAS;
- break;
- case JOB_SUMMER:
- class_ = MAPID_SUMMER;
- break;
+ case JOB_DANCER: return MAPID_BARDDANCER;
+ case JOB_MONK: return MAPID_MONK;
+ case JOB_ALCHEMIST: return MAPID_ALCHEMIST;
+ case JOB_ROGUE: return MAPID_ROGUE;
+ case JOB_SOUL_LINKER: return MAPID_SOUL_LINKER;
+ //3_1 classes
+ case JOB_RUNE_KNIGHT: return MAPID_RUNE_KNIGHT;
+ case JOB_WARLOCK: return MAPID_WARLOCK;
+ case JOB_RANGER: return MAPID_RANGER;
+ case JOB_ARCHBISHOP: return MAPID_ARCHBISHOP;
+ case JOB_MECHANIC: return MAPID_MECHANIC;
+ case JOB_GUILLOTINE_CROSS: return MAPID_GUILLOTINE_CROSS;
+ //3_2 classes
+ case JOB_ROYAL_GUARD: return MAPID_ROYAL_GUARD;
+ case JOB_SORCERER: return MAPID_SORCERER;
+ case JOB_MINSTREL:
+ case JOB_WANDERER: return MAPID_MINSTRELWANDERER;
+ case JOB_SURA: return MAPID_SURA;
+ case JOB_GENETIC: return MAPID_GENETIC;
+ case JOB_SHADOW_CHASER: return MAPID_SHADOW_CHASER;
+ //1st: advanced
+ case JOB_NOVICE_HIGH: return MAPID_NOVICE_HIGH;
+ case JOB_SWORDMAN_HIGH: return MAPID_SWORDMAN_HIGH;
+ case JOB_MAGE_HIGH: return MAPID_MAGE_HIGH;
+ case JOB_ARCHER_HIGH: return MAPID_ARCHER_HIGH;
+ case JOB_ACOLYTE_HIGH: return MAPID_ACOLYTE_HIGH;
+ case JOB_MERCHANT_HIGH: return MAPID_MERCHANT_HIGH;
+ case JOB_THIEF_HIGH: return MAPID_THIEF_HIGH;
+ //2_1 advanced
+ case JOB_LORD_KNIGHT: return MAPID_LORD_KNIGHT;
+ case JOB_HIGH_WIZARD: return MAPID_HIGH_WIZARD;
+ case JOB_SNIPER: return MAPID_SNIPER;
+ case JOB_HIGH_PRIEST: return MAPID_HIGH_PRIEST;
+ case JOB_WHITESMITH: return MAPID_WHITESMITH;
+ case JOB_ASSASSIN_CROSS: return MAPID_ASSASSIN_CROSS;
+ //2_2 advanced
+ case JOB_PALADIN: return MAPID_PALADIN;
+ case JOB_PROFESSOR: return MAPID_PROFESSOR;
+ case JOB_CLOWN:
+ case JOB_GYPSY: return MAPID_CLOWNGYPSY;
+ case JOB_CHAMPION: return MAPID_CHAMPION;
+ case JOB_CREATOR: return MAPID_CREATOR;
+ case JOB_STALKER: return MAPID_STALKER;
+ //3_1 advanced
+ case JOB_RUNE_KNIGHT_H: return MAPID_RUNE_KNIGHT_H;
+ case JOB_WARLOCK_H: return MAPID_WARLOCK_H;
+ case JOB_RANGER_H: return MAPID_RANGER_H;
+ case JOB_ARCHBISHOP_H: return MAPID_ARCHBISHOP_H;
+ case JOB_MECHANIC_H: return MAPID_MECHANIC_H;
+ case JOB_GUILLOTINE_CROSS_H:return MAPID_GUILLOTINE_CROSS_H;
+ //3_2 advanced
+ case JOB_ROYAL_GUARD_H: return MAPID_ROYAL_GUARD_H;
+ case JOB_SORCERER_H: return MAPID_SORCERER_H;
+ case JOB_MINSTREL_H:
+ case JOB_WANDERER_H: return MAPID_MINSTRELWANDERER_H;
+ case JOB_SURA_H: return MAPID_SURA_H;
+ case JOB_GENETIC_H: return MAPID_GENETIC_H;
+ case JOB_SHADOW_CHASER_H: return MAPID_SHADOW_CHASER_H;
+ //1-1 baby
+ case JOB_BABY: return MAPID_BABY;
+ case JOB_BABY_SWORDMAN: return MAPID_BABY_SWORDMAN;
+ case JOB_BABY_MAGE: return MAPID_BABY_MAGE;
+ case JOB_BABY_ARCHER: return MAPID_BABY_ARCHER;
+ case JOB_BABY_ACOLYTE: return MAPID_BABY_ACOLYTE;
+ case JOB_BABY_MERCHANT: return MAPID_BABY_MERCHANT;
+ case JOB_BABY_THIEF: return MAPID_BABY_THIEF;
+ //2_1 baby
+ case JOB_SUPER_BABY: return MAPID_SUPER_BABY;
+ case JOB_BABY_KNIGHT: return MAPID_BABY_KNIGHT;
+ case JOB_BABY_WIZARD: return MAPID_BABY_WIZARD;
+ case JOB_BABY_HUNTER: return MAPID_BABY_HUNTER;
+ case JOB_BABY_PRIEST: return MAPID_BABY_PRIEST;
+ case JOB_BABY_BLACKSMITH: return MAPID_BABY_BLACKSMITH;
+ case JOB_BABY_ASSASSIN: return MAPID_BABY_ASSASSIN;
+ //2_2 baby
+ case JOB_BABY_CRUSADER: return MAPID_BABY_CRUSADER;
+ case JOB_BABY_SAGE: return MAPID_BABY_SAGE;
+ case JOB_BABY_BARD:
+ case JOB_BABY_DANCER: return MAPID_BABY_BARDDANCER;
+ case JOB_BABY_MONK: return MAPID_BABY_MONK;
+ case JOB_BABY_ALCHEMIST: return MAPID_BABY_ALCHEMIST;
+ case JOB_BABY_ROGUE: return MAPID_BABY_ROGUE;
+ //3_1 baby classes
+ case JOB_BABY_RUNE: return MAPID_BABY_RUNE;
+ case JOB_BABY_WARLOCK: return MAPID_BABY_WARLOCK;
+ case JOB_BABY_RANGER: return MAPID_BABY_RANGER;
+ case JOB_BABY_BISHOP: return MAPID_BABY_BISHOP;
+ case JOB_BABY_MECHANIC: return MAPID_BABY_MECHANIC;
+ case JOB_BABY_CROSS: return MAPID_BABY_CROSS;
+ //3_2 baby classes
+ case JOB_BABY_GUARD: return MAPID_BABY_GUARD;
+ case JOB_BABY_SORCERER: return MAPID_BABY_SORCERER;
+ case JOB_BABY_WANDERER:
+ case JOB_BABY_MINSTREL: return MAPID_BABY_MINSTRELWANDERER;
+ case JOB_BABY_SURA: return MAPID_BABY_SURA;
+ case JOB_BABY_GENETIC: return MAPID_BABY_GENETIC;
+ case JOB_BABY_CHASER: return MAPID_BABY_CHASER;
default:
return -1;
}
- return class_;
}
//Reverts the map-style class id to the client-style one.
int pc_mapid2jobid(unsigned short class_, int sex)
{
- switch(class_) {
+ switch(class_)
+ {
case MAPID_NOVICE: return JOB_NOVICE;
+ //1st classes
case MAPID_SWORDMAN: return JOB_SWORDMAN;
case MAPID_MAGE: return JOB_MAGE;
case MAPID_ARCHER: return JOB_ARCHER;
@@ -4560,7 +4602,21 @@ int pc_mapid2jobid(unsigned short class_, int sex)
case MAPID_ALCHEMIST: return JOB_ALCHEMIST;
case MAPID_ROGUE: return JOB_ROGUE;
case MAPID_SOUL_LINKER: return JOB_SOUL_LINKER;
- //1-1: advanced
+ //3_1 classes
+ case MAPID_RUNE_KNIGHT: return JOB_RUNE_KNIGHT;
+ case MAPID_WARLOCK: return JOB_WARLOCK;
+ case MAPID_RANGER: return JOB_RANGER;
+ case MAPID_ARCHBISHOP: return JOB_ARCHBISHOP;
+ case MAPID_MECHANIC: return JOB_MECHANIC;
+ case MAPID_GUILLOTINE_CROSS:return JOB_GUILLOTINE_CROSS;
+ //3_2 classes
+ case MAPID_ROYAL_GUARD: return JOB_ROYAL_GUARD;
+ case MAPID_SORCERER: return JOB_SORCERER;
+ case MAPID_MINSTRELWANDERER:return sex?JOB_MINSTREL:JOB_WANDERER;
+ case MAPID_SURA: return JOB_SURA;
+ case MAPID_GENETIC: return JOB_GENETIC;
+ case MAPID_SHADOW_CHASER: return JOB_SHADOW_CHASER;
+ //1st: advanced
case MAPID_NOVICE_HIGH: return JOB_NOVICE_HIGH;
case MAPID_SWORDMAN_HIGH: return JOB_SWORDMAN_HIGH;
case MAPID_MAGE_HIGH: return JOB_MAGE_HIGH;
@@ -4582,6 +4638,20 @@ int pc_mapid2jobid(unsigned short class_, int sex)
case MAPID_CHAMPION: return JOB_CHAMPION;
case MAPID_CREATOR: return JOB_CREATOR;
case MAPID_STALKER: return JOB_STALKER;
+ //3_1 advanced
+ case MAPID_RUNE_KNIGHT_H: return JOB_RUNE_KNIGHT_H;
+ case MAPID_WARLOCK_H: return JOB_WARLOCK_H;
+ case MAPID_RANGER_H: return JOB_RANGER_H;
+ case MAPID_ARCHBISHOP_H: return JOB_ARCHBISHOP_H;
+ case MAPID_MECHANIC_H: return JOB_MECHANIC_H;
+ case MAPID_GUILLOTINE_CROSS_H: return JOB_GUILLOTINE_CROSS_H;
+ //3_2 advanced
+ case MAPID_ROYAL_GUARD_H: return JOB_ROYAL_GUARD_H;
+ case MAPID_SORCERER_H: return JOB_SORCERER_H;
+ case MAPID_MINSTRELWANDERER_H: return sex?JOB_MINSTREL_H:JOB_WANDERER_H;
+ case MAPID_SURA_H: return JOB_SURA_H;
+ case MAPID_GENETIC_H: return JOB_GENETIC_H;
+ case MAPID_SHADOW_CHASER_H: return JOB_SHADOW_CHASER_H;
//1-1 baby
case MAPID_BABY: return JOB_BABY;
case MAPID_BABY_SWORDMAN: return JOB_BABY_SWORDMAN;
@@ -4605,6 +4675,20 @@ int pc_mapid2jobid(unsigned short class_, int sex)
case MAPID_BABY_MONK: return JOB_BABY_MONK;
case MAPID_BABY_ALCHEMIST: return JOB_BABY_ALCHEMIST;
case MAPID_BABY_ROGUE: return JOB_BABY_ROGUE;
+ //3_1 baby classes
+ case MAPID_BABY_RUNE: return JOB_BABY_RUNE;
+ case MAPID_BABY_WARLOCK: return JOB_BABY_WARLOCK;
+ case MAPID_BABY_RANGER: return JOB_BABY_RANGER;
+ case MAPID_BABY_BISHOP: return JOB_BABY_BISHOP;
+ case MAPID_BABY_MECHANIC: return JOB_BABY_MECHANIC;
+ case MAPID_BABY_CROSS: return JOB_BABY_CROSS;
+ //3_2 baby classes
+ case MAPID_BABY_GUARD: return JOB_BABY_GUARD;
+ case MAPID_BABY_SORCERER: return JOB_BABY_SORCERER;
+ case MAPID_BABY_MINSTRELWANDERER: return sex?JOB_BABY_MINSTREL:JOB_BABY_WANDERER;
+ case MAPID_BABY_SURA: return JOB_BABY_SURA;
+ case MAPID_BABY_GENETIC: return JOB_BABY_GENETIC;
+ case MAPID_BABY_CHASER: return JOB_BABY_CHASER;
default:
return -1;
}
@@ -4736,9 +4820,86 @@ char* job_name(int class_)
return msg_txt(619);
case JOB_NINJA:
return msg_txt(620);
-
+
+ case JOB_RUNE_KNIGHT:
+ case JOB_WARLOCK:
+ case JOB_RANGER:
+ case JOB_ARCHBISHOP:
+ case JOB_MECHANIC:
+ case JOB_GUILLOTINE_CROSS:
+ return msg_txt(625 - JOB_RUNE_KNIGHT +class_);
+
+ case JOB_RUNE_KNIGHT_H:
+ case JOB_WARLOCK_H:
+ case JOB_RANGER_H:
+ case JOB_ARCHBISHOP_H:
+ case JOB_MECHANIC_H:
+ case JOB_GUILLOTINE_CROSS_H:
+ return msg_txt(625 - JOB_RUNE_KNIGHT_H +class_);
+
+ case JOB_ROYAL_GUARD:
+ case JOB_SORCERER:
+ case JOB_MINSTREL:
+ case JOB_WANDERER:
+ case JOB_SURA:
+ case JOB_GENETIC:
+ case JOB_SHADOW_CHASER:
+ return msg_txt(631 - JOB_ROYAL_GUARD +class_);
+
+ case JOB_ROYAL_GUARD_H:
+ case JOB_SORCERER_H:
+ case JOB_MINSTREL_H:
+ case JOB_WANDERER_H:
+ case JOB_SURA_H:
+ case JOB_GENETIC_H:
+ case JOB_SHADOW_CHASER_H:
+ return msg_txt(631 - JOB_ROYAL_GUARD_H +class_);
+
+ case JOB_RUNE_KNIGHT2:
+ case JOB_RUNE_KNIGHT_H2:
+ return msg_txt(625);
+
+ case JOB_ROYAL_GUARD2:
+ case JOB_ROYAL_GUARD_H2:
+ return msg_txt(631);
+
+ case JOB_RANGER2:
+ case JOB_RANGER_H2:
+ return msg_txt(627);
+
+ case JOB_MECHANIC2:
+ case JOB_MECHANIC_H2:
+ return msg_txt(629);
+
+ case JOB_BABY_RUNE:
+ case JOB_BABY_WARLOCK:
+ case JOB_BABY_RANGER:
+ case JOB_BABY_BISHOP:
+ case JOB_BABY_MECHANIC:
+ case JOB_BABY_CROSS:
+ case JOB_BABY_GUARD:
+ case JOB_BABY_SORCERER:
+ case JOB_BABY_MINSTREL:
+ case JOB_BABY_WANDERER:
+ case JOB_BABY_SURA:
+ case JOB_BABY_GENETIC:
+ case JOB_BABY_CHASER:
+ return msg_txt(638 - JOB_BABY_RUNE +class_);
+
+ case JOB_BABY_RUNE2:
+ return msg_txt(638);
+
+ case JOB_BABY_GUARD2:
+ return msg_txt(644);
+
+ case JOB_BABY_RANGER2:
+ return msg_txt(640);
+
+ case JOB_BABY_MECHANIC2:
+ return msg_txt(642);
+
default:
- return msg_txt(650);
+ return msg_txt(651);
}
}