fixed some monsters map locations, numbers, respawn delays

added missing MVP to Niflheim

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

12 files changed, 246 insertions, 245 deletions

diff --git a/npc/mobs/dungeons/anthell.txt b/npc/mobs/dungeons/anthell.txt
index fe13e2f26..afab24d23 100644
--- a/npc/mobs/dungeons/anthell.txt
+++ b/npc/mobs/dungeons/anthell.txt
@@ -11,103 +11,103 @@
 //============================================================
 
 //(anthell01.gat)*
-anthell01.gat,0,0,0,0	monster	Giearth	1121,1,60000,30000,0
+anthell01.gat,0,0,0,0	monster	Giearth	1121,1,0,0,0
 anthell01.gat,0,0,0,0	monster	Vitata	1176,10,0,0,0
 anthell01.gat,0,0,0,0	monster	Piere	1160,50,0,0,0
 anthell01.gat,0,0,0,0	monster	Deniro	1105,40,0,0,0
 anthell01.gat,0,0,0,0	monster	Andre	1095,25,0,0,0
 anthell01.gat,0,0,0,0	monster	Familiar	1005,20,0,0,0
-anthell01.gat,100,121,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,101,121,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,102,121,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,102,121,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,103,120,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,103,121,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,104,120,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,104,122,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,104,123,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,105,124,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,28,262,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,28,263,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,28,264,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,28,265,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,28,266,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,29,186,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,29,262,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,29,263,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,29,264,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,29,265,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,29,266,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,30,187,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,30,190,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,30,195,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,30,198,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,30,261,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,30,262,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,30,263,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,30,264,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,30,265,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,31,186,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,31,190,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,31,194,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,31,195,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,31,198,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,31,262,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,31,263,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,31,264,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,32,186,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,32,187,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,32,189,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,32,196,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,32,197,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,32,198,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,32,263,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,33,195,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,33,196,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,35,186,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,36,186,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,36,187,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,37,183,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,37,186,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,38,183,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,38,184,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,38,186,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,40,168,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,40,265,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,40,266,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,40,267,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,40,268,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,40,269,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,40,270,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,41,165,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,41,168,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,41,265,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,41,266,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,41,267,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,41,268,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,41,269,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,42,165,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,42,166,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,42,167,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,42,168,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,43,165,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,43,166,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,44,165,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,44,166,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,45,165,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,97,123,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,97,124,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,97,125,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,97,126,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,97,127,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,98,121,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,98,127,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,99,121,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,99,127,0,0	monster	Ant Egg	1097,1,60000,30000,0
-anthell01.gat,0,0,0,0	monster	Maya Purple	1289,1,7200000,3600000,0
+anthell01.gat,100,121,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,101,121,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,102,121,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,102,121,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,103,120,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,103,121,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,104,120,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,104,122,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,104,123,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,105,124,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,28,262,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,28,263,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,28,264,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,28,265,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,28,266,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,29,186,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,29,262,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,29,263,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,29,264,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,29,265,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,29,266,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,30,187,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,30,190,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,30,195,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,30,198,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,30,261,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,30,262,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,30,263,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,30,264,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,30,265,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,31,186,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,31,190,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,31,194,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,31,195,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,31,198,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,31,262,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,31,263,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,31,264,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,32,186,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,32,187,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,32,189,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,32,196,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,32,197,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,32,198,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,32,263,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,33,195,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,33,196,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,35,186,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,36,186,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,36,187,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,37,183,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,37,186,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,38,183,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,38,184,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,38,186,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,40,168,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,40,265,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,40,266,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,40,267,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,40,268,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,40,269,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,40,270,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,41,165,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,41,168,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,41,265,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,41,266,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,41,267,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,41,268,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,41,269,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,42,165,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,42,166,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,42,167,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,42,168,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,43,165,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,43,166,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,44,165,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,44,166,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,45,165,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,97,123,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,97,124,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,97,125,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,97,126,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,97,127,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,98,121,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,98,127,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,99,121,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,99,127,0,0	monster	Ant Egg	1097,1,0,0,0
+anthell01.gat,0,0,0,0	monster	Maya Purple	1289,1,7200000,7200000,0
 
 //(anthell02.gat)*
-anthell02.gat,0,0,0,0	monster	Giearth	1121,3,60000,30000,0
+anthell02.gat,0,0,0,0	monster	Giearth	1121,3,0,0,0
 anthell02.gat,0,0,0,0	monster	Vitata	1176,30,0,0,0
 anthell02.gat,0,0,0,0	monster	Piere	1160,15,0,0,0
 anthell02.gat,0,0,0,0	monster	Deniro	1105,15,0,0,0
diff --git a/npc/mobs/dungeons/geftower.txt b/npc/mobs/dungeons/geftower.txt
index 310b3f672..f5761e7cd 100644
--- a/npc/mobs/dungeons/geftower.txt
+++ b/npc/mobs/dungeons/geftower.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.0
+//= 1.1
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Additional Comments: =================================
@@ -46,17 +46,17 @@ gef_dun02.gat,0,0,0,0	monster	Shining Plant	1083,2,1800000,900000,1
 gef_dun02.gat,0,0,0,0	monster	Doppelganger	1046,1,7200000,3600000,1
 
 //(gef_dun03.gat)?
-gef_dun03.gat,0,0,0,0	monster	Baphomet	1039,1,7200000,3600000,1
-gef_dun03.gat,0,0,0,0	monster	Doppelganger	1046,1,7200000,3600000,1
+gef_dun03.gat,0,0,0,0	monster	Baphomet	1039,1,7200000,7200000,1
+gef_dun03.gat,0,0,0,0	monster	Doppelganger	1046,1,7200000,7200000,1
 gef_dun03.gat,0,0,0,0	monster	Deviruchi	1109,8,0,0,0
 gef_dun03.gat,0,0,0,0	monster	Joker	1131,5,300000,100000,0
 gef_dun03.gat,0,0,0,0	monster	Khalitzburg	1132,2,0,0,0
 gef_dun03.gat,0,0,0,0	monster	Knight of Abyss	1219,2,300000,0,0
 gef_dun03.gat,0,0,0,0	monster	Gryphon	1259,1,7200000,3600000,1
 gef_dun03.gat,0,0,0,0	monster	Blood Knight	1268,2,300000,0,0
-gef_dun03.gat,0,0,0,0	monster	Dark Lord	1272,1,7200000,3600000,1
+gef_dun03.gat,0,0,0,0	monster	Dark Lord	1272,1,7200000,7200000,1
 gef_dun03.gat,0,0,0,0	monster	Alice	1275,3,0,0,0
-gef_dun03.gat,0,0,0,0	monster	Chimera	1283,1,7200000,3600000,1
+gef_dun03.gat,0,0,0,0	monster	Chimera	1283,1,7200000,7200000,1
 gef_dun03.gat,0,0,0,0	monster	Mini Demon	1292,2,300000,0,0
 gef_dun03.gat,0,0,0,0	monster	Dark Illusion	1302,2,300000,0,0
 gef_dun03.gat,0,0,0,0	monster	Apocalypse	1365,2,300000,0,0
diff --git a/npc/mobs/dungeons/glastheim.txt b/npc/mobs/dungeons/glastheim.txt
index fd22479ad..fe0e3d747 100644
--- a/npc/mobs/dungeons/glastheim.txt
+++ b/npc/mobs/dungeons/glastheim.txt
@@ -3,11 +3,11 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.0
+//= 1.1
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Additional Comments: =================================
-//=
+//= 1.1 [Lupus]
 //============================================================
 
 //(glast_01.gat)*
@@ -27,8 +27,8 @@ gl_cas01.gat,0,0,0,0	monster	Whisper	1179,20,0,0,0
 gl_cas01.gat,0,0,0,0	monster	Owl Baron	1295,3,30000,15000,0
 gl_cas01.gat,0,0,0,0	monster	Tyrfing	1204,1,7200000,3600000,1
 
-//(gl_cas02.gat)?
-gl_cas02.gat,0,0,0,0	monster	Evil Druid	1117,10,0,0,0
+//(gl_cas02.gat)*
+gl_cas02.gat,0,0,0,0	monster	Evil Druid	1117,9,0,0,0
 gl_cas02.gat,133,83,3,3	monster	Khalitzburg	1132,1,360000,180000,1
 gl_cas02.gat,173,127,3,3	monster	Khalitzburg	1132,1,360000,180000,1
 gl_cas02.gat,173,167,3,3	monster	Khalitzburg	1132,1,360000,180000,1
@@ -40,67 +40,67 @@ gl_cas02.gat,102,180,0,0	monster	Whisper	1185,1,1800000,900000,1
 gl_cas02.gat,105,180,0,0	monster	Whisper	1185,1,1800000,900000,1
 gl_cas02.gat,83,80,2,2	monster	Mimic	1191,1,360000,180000,1
 gl_cas02.gat,83,84,2,2	monster	Mimic	1191,1,360000,180000,1
-gl_cas02.gat,185,11,8,8	monster	Rideword	1195,4,120000,60000,1
-gl_cas02.gat,46,124,15,15	monster	Rideword	1195,15,360000,180000,1
-gl_cas02.gat,0,0,0,0	monster	Mysteltainn	1203,1,7200000,3600000,1
-gl_cas02.gat,104,145,5,5	monster	Mysteltainn	1203,1,7200000,3600000,1
-gl_cas02.gat,0,0,0,0	monster	Tyrfing	1204,1,7200000,3600000,0
+gl_cas02.gat,185,11,8,8	monster	Rideword	1195,7,120000,60000,1
+gl_cas02.gat,46,124,15,15	monster	Rideword	1195,22,360000,180000,1
+gl_cas02.gat,104,145,5,5	monster	Mysteltainn	1203,1,7200000,7200000,1
+gl_cas02.gat,0,0,0,0	monster	Tyrfing	1204,1,7200000,7200000,0
 gl_cas02.gat,0,0,0,0	monster	Wanderer	1208,20,0,0,0
 gl_cas02.gat,190,23,1,1	monster	Wanderer	1208,1,360000,180000,0
-gl_cas02.gat,104,38,4,4	monster	Knight of Abyss	1219,1,1800000,900000,1
-gl_cas02.gat,115,177,3,3	monster	Knight of Abyss	1219,1,1800000,900000,1
-gl_cas02.gat,24,35,4,4	monster	Knight of Abyss	1219,1,1800000,900000,1
-gl_cas02.gat,93,177,3,3	monster	Knight of Abyss	1219,1,1800000,900000,1
+gl_cas02.gat,104,38,4,4	monster	Knight of Abyss	1219,1,600000,600000,1
+gl_cas02.gat,115,177,3,3	monster	Knight of Abyss	1219,1,600000,600000,1
+gl_cas02.gat,24,35,4,4	monster	Knight of Abyss	1219,1,600000,600000,1
+gl_cas02.gat,93,177,3,3	monster	Knight of Abyss	1219,1,600000,600000,1
 gl_cas02.gat,0,0,0,0	monster	Alice	1275,1,0,0,0
 gl_cas02.gat,0,0,0,0	monster	Raydric Archer	1276,19,0,0,0
 gl_cas02.gat,190,38,1,1	monster	Raydric Archer	1276,1,360000,180000,0
-gl_cas02.gat,0,0,0,0	monster	Chimera	1283,1,7200000,3600000,0
-
-//(gl_church.gat)?
-gl_church.gat,0,0,0,0	monster	Ghoul	1036,25,0,0,0
-gl_church.gat,0,0,0,0	monster	Evil Druid	1117,15,0,0,0
-gl_church.gat,0,0,0,0	monster	Mimic	1191,10,0,0,0
-gl_church.gat,0,0,0,0	monster	Wraith	1192,10,0,0,0
-gl_church.gat,0,0,0,0	monster	Dark Illusion	1302,1,0,0,0
-
-//(gl_chyard.gat)?
-gl_chyard.gat,0,0,0,0	monster	Zombie	1015,20,0,0,0
-gl_chyard.gat,0,0,0,0	monster	Hunter Fly	1035,15,0,0,0
-gl_chyard.gat,0,0,0,0	monster	Ghoul	1036,25,0,0,0
+gl_cas02.gat,0,0,0,0	monster	Chimera	1283,1,7200000,7200000,0
+
+//(gl_church.gat)*
+gl_church.gat,0,0,0,0	monster	Ghoul	1036,70,0,0,0
+gl_church.gat,0,0,0,0	monster	Evil Druid	1117,30,0,0,0
+gl_church.gat,0,0,0,0	monster	Mimic	1191,24,0,0,0
+gl_church.gat,0,0,0,0	monster	Wraith	1192,5,0,0,0
+gl_church.gat,0,0,0,0	monster	Dark Illusion	1302,1,1800000,1800000,0
+
+//(gl_chyard.gat)*
+gl_chyard.gat,0,0,0,0	monster	Zombie	1015,30,0,0,0
+gl_chyard.gat,0,0,0,0	monster	Hunter Fly	1035,20,0,0,0
+gl_chyard.gat,0,0,0,0	monster	Ghoul	1036,35,0,0,0
 gl_chyard.gat,0,0,0,0	monster	Evil Druid	1117,10,0,0,0
-gl_chyard.gat,0,0,0,0	monster	Mimic	1191,5,0,0,0
-gl_chyard.gat,0,0,0,0	monster	Wraith	1192,15,0,0,0
-gl_chyard.gat,0,0,0,0	monster	Dark Lord	1272,1,3600000,1800000,0
+gl_chyard.gat,0,0,0,0	monster	Mimic	1191,3,0,0,0
+gl_chyard.gat,0,0,0,0	monster	Wraith	1192,25,0,0,0
+gl_chyard.gat,0,0,0,0	monster	Dark Lord	1272,1,3600000,3600000,0
 
-//(gl_dun01.gat)?
-gl_dun01.gat,0,0,0,0	monster	Arclouse	1194,100,0,0,0
-gl_dun01.gat,0,0,0,0	monster	Sting	1207,20,0,0,0
+//(gl_dun01.gat)*
+gl_dun01.gat,0,0,0,0	monster	Arclouse	1194,50,0,0,0
+gl_dun01.gat,0,0,0,0	monster	Sting	1207,50,0,0,0
 
-//(gl_dun02.gat)?
-gl_dun02.gat,0,0,0,0	monster	Minorous	1149,20,0,0,0
+//(gl_dun02.gat)*
+//gl_dun02.gat,0,0,0,0	monster	Minorous	1149,20,0,0,0
 gl_dun02.gat,0,0,0,0	monster	Gargoyle	1253,20,0,0,0
 gl_dun02.gat,0,0,0,0	monster	Majoruros	1310,40,0,0,0
 
-//(gl_in01.gat)?
-gl_in01.gat,0,0,0,0	monster	Marionette	1143,10,0,0,0
-gl_in01.gat,0,0,0,0	monster	Rideword	1195,10,0,0,0
+//(gl_in01.gat)*
+gl_in01.gat,0,0,0,0	monster	Marionette	1143,20,0,0,0
+gl_in01.gat,0,0,0,0	monster	Rideword	1195,8,0,0,0
 gl_in01.gat,0,0,0,0	monster	Wanderer	1208,1,0,0,0
 gl_in01.gat,0,0,0,0	monster	Dark Frame	1260,10,0,0,0
 gl_in01.gat,0,0,0,0	monster	Alice	1275,1,0,0,0
-gl_in01.gat,0,0,0,0	monster	Sageworm	1281,20,0,0,0
+gl_in01.gat,0,0,0,0	monster	Sageworm	1281,14,0,0,0
 
-//(gl_knt01.gat)?
-gl_knt01.gat,0,0,0,0	monster	Khalitzburg	1132,5,0,0,0
-gl_knt01.gat,0,0,0,0	monster	Raydric	1163,60,0,0,0
-gl_knt01.gat,21,278,0,0	monster	Giant Whisper	1186,1,3600000,1800000,1
+//(gl_knt01.gat)*
+gl_knt01.gat,0,0,0,0	monster	Khalitzburg	1132,10,0,0,0
+gl_knt01.gat,0,0,0,0	monster	Raydric	1163,65,0,0,0
+gl_knt01.gat,0,0,0,0	monster	Black Mushroom	1084,12,360000,180000,1
+gl_knt01.gat,21,278,0,0	monster	Giant Whisper	1186,1,1800000,1800000,1
 gl_knt01.gat,122,266,0,0	monster	Rideword	1195,1,120000,60000,1
 gl_knt01.gat,26,223,20,20	monster	Rideword	1195,10,120000,60000,1
-gl_knt01.gat,33,120,30,30	monster	Rideword	1195,30,120000,60000,1
-gl_knt01.gat,0,0,0,0	monster	Knight of Abyss	1219,20,60000,30000,1
+gl_knt01.gat,33,120,30,30	monster	Rideword	1195,25,120000,60000,1
+gl_knt01.gat,0,0,0,0	monster	Knight of Abyss	1219,10,60000,30000,1
 gl_knt01.gat,0,0,0,0	monster	Alice	1275,1,0,0,1
 gl_knt01.gat,0,0,0,0	monster	Raydric Archer	1276,25,0,0,0
 
-//(gl_knt02.gat)?
+//(gl_knt02.gat)*
 gl_knt02.gat,0,0,0,0	monster	Joker	1131,20,0,0,0
 gl_knt02.gat,114,194,5,5	monster	Khalitzburg	1132,1,1800000,900000,1
 gl_knt02.gat,118,241,5,5	monster	Khalitzburg	1132,2,1800000,900000,1
@@ -109,51 +109,52 @@ gl_knt02.gat,208,45,5,5	monster	Khalitzburg	1132,1,1800000,900000,1
 gl_knt02.gat,232,132,5,5	monster	Khalitzburg	1132,2,1800000,900000,1
 gl_knt02.gat,243,74,5,5	monster	Khalitzburg	1132,1,1800000,900000,1
 gl_knt02.gat,60,242,5,5	monster	Khalitzburg	1132,1,1800000,900000,1
-gl_knt02.gat,62,80,5,5	monster	Khalitzburg	1132,2,1800000,900000,1
+gl_knt02.gat,62,80,5,5	monster	Khalitzburg	1132,1,1800000,900000,1
 gl_knt02.gat,82,134,5,5	monster	Khalitzburg	1132,1,1800000,900000,1
-gl_knt02.gat,99,49,5,5	monster	Khalitzburg	1132,2,1800000,900000,1
-gl_knt02.gat,0,0,0,0	monster	Raydric	1163,50,0,0,0
+gl_knt02.gat,99,49,5,5	monster	Khalitzburg	1132,1,1800000,900000,1
+gl_knt02.gat,0,0,0,0	monster	Khalitzburg	1132,20,1800000,900000,1
+gl_knt02.gat,0,0,0,0	monster	Raydric	1163,55,0,0,0
 gl_knt02.gat,0,0,0,0	monster	Mysteltainn	1203,1,0,0,1
-gl_knt02.gat,149,26,5,5	monster	Knight of Abyss	1219,10,60000,30000,1
-gl_knt02.gat,0,0,0,0	monster	Blood Knight	1268,1,3600000,1800000,1
+gl_knt02.gat,149,26,5,5	monster	Knight of Abyss	1219,6,60000,30000,1
+gl_knt02.gat,0,0,0,0	monster	Blood Knight	1268,1,3600000,3600000,1
 gl_knt02.gat,0,0,0,0	monster	Alice	1275,1,0,0,1
 gl_knt02.gat,0,0,0,0	monster	Raydric Archer	1276,25,0,0,0
 
-//(gl_prison.gat)?
+//(gl_prison.gat)*
+gl_prison.gat,0,0,0,0	monster	Zombie Prisoner	1197,40,0,0,0
+gl_prison.gat,0,0,0,0	monster	Injustice	1257,20,0,0,0
+gl_prison.gat,0,0,0,0	monster	Rybio	1201,15,0,0,0
 gl_prison.gat,0,0,0,0	monster	Hunter Fly	1035,10,0,0,0
-gl_prison.gat,0,0,0,0	monster	Zombie Prisoner	1197,20,0,0,0
-gl_prison.gat,0,0,0,0	monster	Rybio	1201,10,0,0,0
-gl_prison.gat,0,0,0,0	monster	Injustice	1257,10,0,0,0
 
-//(gl_prison1.gat)?
-gl_prison1.gat,0,0,0,0	monster	Hunter Fly	1035,10,0,0,0
-gl_prison1.gat,0,0,0,0	monster	Skeleton Prisoner	1196,10,0,0,0
-gl_prison1.gat,0,0,0,0	monster	Zherlthsh	1200,1,3600000,0,0
-gl_prison1.gat,0,0,0,0	monster	Rybio	1201,10,0,0,0
+//(gl_prison1.gat)*
+gl_prison1.gat,0,0,0,0	monster	Cramp	1209,20,0,0,0
+gl_prison1.gat,0,0,0,0	monster	Skeleton Prisoner	1196,30,0,0,0
+gl_prison1.gat,0,0,0,0	monster	Injustice	1257,40,0,0,0
+gl_prison1.gat,0,0,0,0	monster	Zherlthsh	1200,1,3600000,3600000,0
 gl_prison1.gat,0,0,0,0	monster	Phendark	1202,10,0,0,0
-gl_prison1.gat,0,0,0,0	monster	Cramp	1209,30,0,0,0
-gl_prison1.gat,0,0,0,0	monster	Injustice	1257,50,0,0,0
-
-//(gl_sew01.gat)?
-gl_sew01.gat,0,0,0,0	monster	Whisper	1179,30,0,0,0
-gl_sew01.gat,0,0,0,0	monster	Arclouse	1194,10,0,0,0
-gl_sew01.gat,0,0,0,0	monster	Gargoyle	1253,10,0,0,0
-
-//(gl_sew02.gat)?
-gl_sew02.gat,0,0,0,0	monster	Cramp	1209,30,0,0,0
-gl_sew02.gat,0,0,0,0	monster	Gargoyle	1253,30,0,0,0
-
-//(gl_sew03.gat)?
-gl_sew03.gat,0,0,0,0	monster	Sting	1207,50,0,0,0
-gl_sew03.gat,0,0,0,0	monster	Cramp	1209,30,0,0,0
-gl_sew03.gat,0,0,0,0	monster	Gargoyle	1253,15,0,0,0
-
-//(gl_sew04.gat)?
-gl_sew04.gat,0,0,0,0	monster	Drainliar	1111,20,0,0,0
-gl_sew04.gat,0,0,0,0	monster	Anolian	1206,10,0,0,0
-gl_sew04.gat,0,0,0,0	monster	Gargoyle	1253,10,0,0,0
-
-//(gl_step.gat)?
-gl_step.gat,0,0,0,0	monster	Mimic	1191,30,60000,30000,1
-gl_step.gat,0,0,0,0	monster	Wind Ghost	1263,30,0,0,0
+gl_prison1.gat,0,0,0,0	monster	Rybio	1201,10,0,0,0
+gl_prison1.gat,0,0,0,0	monster	Hunter Fly	1035,10,0,0,0
+
+//(gl_sew01.gat)*
+gl_sew01.gat,0,0,0,0	monster	Whisper	1179,45,0,0,0
+gl_sew01.gat,0,0,0,0	monster	Arclouse	1194,15,0,0,0
+gl_sew01.gat,0,0,0,0	monster	Gargoyle	1253,40,0,0,0
+
+//(gl_sew02.gat)*
+gl_sew02.gat,0,0,0,0	monster	Cramp	1209,40,0,0,0
+gl_sew02.gat,0,0,0,0	monster	Gargoyle	1253,60,0,0,0
+
+//(gl_sew03.gat)*
+gl_sew03.gat,0,0,0,0	monster	Cramp	1209,25,0,0,0
+gl_sew03.gat,0,0,0,0	monster	Sting	1207,75,0,0,0
+gl_sew03.gat,0,0,0,0	monster	Gargoyle	1253,25,0,0,0
+
+//(gl_sew04.gat)*
+gl_sew04.gat,0,0,0,0	monster	Anolian	1206,60,0,0,0
+gl_sew04.gat,0,0,0,0	monster	Drainliar	1111,30,0,0,0
+gl_sew04.gat,0,0,0,0	monster	Gargoyle	1253,20,0,0,0
+
+//(gl_step.gat)*
+gl_step.gat,0,0,0,0	monster	Mimic	1191,25,60000,30000,1
+gl_step.gat,0,0,0,0	monster	Wind Ghost	1263,60,0,0,0
 gl_step.gat,0,0,0,0	monster	Raydric Archer	1276,30,0,0,0
diff --git a/npc/mobs/dungeons/guilddun.txt b/npc/mobs/dungeons/guilddun.txt
index 67d8d664b..7322dcf6d 100644
--- a/npc/mobs/dungeons/guilddun.txt
+++ b/npc/mobs/dungeons/guilddun.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.0
+//= 1.1
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Additional Comments: =================================
@@ -15,7 +15,7 @@ gld_dun01.gat,0,0,0,0	monster	Skeleton General	1290,10,0,0,0
 gld_dun01.gat,0,0,0,0	monster	Gajomart	1309,10,0,0,0
 gld_dun01.gat,0,0,0,0	monster	Am Mut	1301,10,0,0,0
 gld_dun01.gat,0,0,0,0	monster	Cat'o'Nine Tails	1307,3,1200000,0,0
-gld_dun01.gat,0,0,0,0	monster	Vagabond Wolf	1092,1,14400000,7200000,1
+gld_dun01.gat,0,0,0,0	monster	Vagabond Wolf	1092,1,14400000,14400000,1
 gld_dun01.gat,0,0,0,0	monster	Eddga	1115,1,28800000,28800000,1
 
 //(gld_dun02.gat)*
diff --git a/npc/mobs/dungeons/moc_pyramid.txt b/npc/mobs/dungeons/moc_pyramid.txt
index 31fec7b85..96f005cad 100644
--- a/npc/mobs/dungeons/moc_pyramid.txt
+++ b/npc/mobs/dungeons/moc_pyramid.txt
@@ -35,7 +35,7 @@ moc_pryd04.gat,0,0,0,0	monster	Mimic	1191,15,600000,300000,1
 moc_pryd04.gat,0,0,0,0	monster	Isis	1029,50,150000,75000,0
 moc_pryd04.gat,0,0,0,0	monster	Mummy	1041,40,0,0,0
 moc_pryd04.gat,0,0,0,0	monster	Matyr	1146,20,0,0,0
-moc_pryd04.gat,0,0,0,0	monster	Osiris	1038,1,3600000,7200000,0
+moc_pryd04.gat,0,0,0,0	monster	Osiris	1038,1,3600000,3600000,0
 
 //(moc_pryd05.gat)*
 moc_pryd05.gat,0,0,0,0	monster	Minorous	1149,60,0,0,0
@@ -47,4 +47,4 @@ moc_pryd06.gat,100,90,80,50	monster	Ancient Mummy	1297,20,0,0,0
 moc_pryd06.gat,0,0,0,0	monster	Arclouse	1194,20,0,0,0
 moc_pryd06.gat,100,90,80,50	monster	Mimic	1191,20,0,0,0
 moc_pryd06.gat,0,0,0,0	monster	Verit	1032,10,0,0,0
-moc_pryd06.gat,101,119,0,0	monster	Amon Ra	1511,1,3600000,7200000,0
+moc_pryd06.gat,101,119,0,0	monster	Amon Ra	1511,1,3600000,3600000,0
diff --git a/npc/mobs/dungeons/moc_sphinx.txt b/npc/mobs/dungeons/moc_sphinx.txt
index bb57c4c61..ef6bb5a45 100644
--- a/npc/mobs/dungeons/moc_sphinx.txt
+++ b/npc/mobs/dungeons/moc_sphinx.txt
@@ -41,4 +41,4 @@ in_sphinx5.gat,0,0,0,0	monster	Sidewinder	1037,20,0,0,0
 in_sphinx5.gat,0,0,0,0	monster	Pasana	1154,30,0,0,0
 in_sphinx5.gat,0,0,0,0	monster	Mimic	1191,7,600000,300000,1
 in_sphinx5.gat,0,0,0,0	monster	Marduk	1140,30,0,0,0
-in_sphinx5.gat,0,0,0,0	monster	Pharaoh	1157,1,3600000,1800000,1
+in_sphinx5.gat,0,0,0,0	monster	Pharaoh	1157,1,3600000,3600000,1
diff --git a/npc/mobs/dungeons/payoncave.txt b/npc/mobs/dungeons/payoncave.txt
index 6a7e9d6fc..2f0be1939 100644
--- a/npc/mobs/dungeons/payoncave.txt
+++ b/npc/mobs/dungeons/payoncave.txt
@@ -144,7 +144,7 @@ pay_dun04.gat,136,111,0,0	monster	Sohee	1170,2,300000,100000,1
 pay_dun04.gat,0,0,0,0	monster	Dokebi	1110,40,0,0,0
 pay_dun04.gat,0,0,0,0	monster	Skeleton Soldier	1028,10,0,0,0
 pay_dun04.gat,0,0,0,0	monster	Skeleton Archer	1016,20,0,0,0
-pay_dun04.gat,0,0,0,0	monster	White Plant	1082,6,600000,300000,1
-pay_dun04.gat,120,120,10,10	monster	Shining Plant	1083,2,1800000,900000,1
-pay_dun04.gat,120,115,0,0	monster	Moonlight Flower	1150,1,3600000,7200000,1
+pay_dun04.gat,0,0,0,0	monster	White Plant	1082,6,180000,180000,1
+pay_dun04.gat,120,120,10,10	monster	Shining Plant	1083,2,1800000,1800000,1
+pay_dun04.gat,120,115,0,0	monster	Moonlight Flower	1150,1,3600000,3600000,1
 pay_dun04.gat,0,0,0,0	monster	Red Plant	1078,10,180000,90000,1
diff --git a/npc/mobs/dungeons/pront_maze.txt b/npc/mobs/dungeons/pront_maze.txt
index 58bd00bfd..0a3be6f63 100644
--- a/npc/mobs/dungeons/pront_maze.txt
+++ b/npc/mobs/dungeons/pront_maze.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.0
+//= 1.1
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Additional Comments: =================================
@@ -11,48 +11,48 @@
 //============================================================
 
 //(prt_maze01.gat)*
-prt_maze01.gat,99,140,21,21	monster	Sidewinder	1037,3,120000,40000,1
-prt_maze01.gat,59,140,21,21	monster	Choco	1214,2,120000,40000,1
-prt_maze01.gat,19,100,21,21	monster	Hunter Fly	1035,4,120000,40000,1
-prt_maze01.gat,179,100,21,21	monster	Argiope	1099,3,120000,40000,1
-prt_maze01.gat,179,140,21,21	monster	Mantis	1139,3,120000,40000,1
-prt_maze01.gat,19,180,21,21	monster	Savage	1166,5,120000,40000,1
-prt_maze01.gat,139,60,21,21	monster	Bigfoot	1060,5,120000,40000,1
-prt_maze01.gat,139,100,21,21	monster	Argos	1100,3,120000,40000,1
-prt_maze01.gat,139,180,21,21	monster	Caramel	1103,5,120000,40000,1
-prt_maze01.gat,59,140,21,21	monster	Yoyo	1057,4,120000,40000,1
-prt_maze01.gat,59,180,21,21	monster	Martin	1145,5,120000,40000,1
-prt_maze01.gat,179,180,21,21	monster	Coco	1104,5,120000,40000,1
-prt_maze01.gat,19,140,21,21	monster	Steel ChonChon	1042,5,120000,40000,1
-prt_maze01.gat,99,20,21,21	monster	Creamy	1018,1,120000,40000,1
-prt_maze01.gat,139,140,21,21	monster	Stainer	1174,5,120000,40000,1
-prt_maze01.gat,59,60,21,21	monster	Boa	1025,5,120000,40000,1
-prt_maze01.gat,19,20,21,21	monster	Poporing	1031,5,120000,40000,1
-prt_maze01.gat,19,60,21,21	monster	Wolf	1013,5,120000,40000,1
-prt_maze01.gat,179,60,21,21	monster	Rocker	1052,5,120000,40000,1
-prt_maze01.gat,99,100,21,21	monster	ChonChon	1011,5,120000,40000,1
-prt_maze01.gat,139,20,21,21	monster	Lunatic	1063,5,120000,40000,1
-prt_maze01.gat,99,20,21,21	monster	Fabre	1007,5,120000,40000,1
-prt_maze01.gat,179,20,21,21	monster	Poring	1002,5,120000,40000,1
-prt_maze01.gat,99,60,21,21	monster	Smokie	1056,5,120000,40000,1
-prt_maze01.gat,19,180,21,21	monster	Savage Babe	1167,3,120000,40000,1
-prt_maze01.gat,99,180,21,21	monster	Dustiness	1114,5,120000,40000,1
-prt_maze01.gat,59,20,21,21	monster	Pupa	1008,5,120000,40000,1
-prt_maze01.gat,59,100,21,21	monster	Horn	1128,5,120000,40000,1
-prt_maze01.gat,0,0,0,0	monster	Yellow Plant	1081,2,180000,90000,1
+prt_maze01.gat,99,140,21,21	monster	Sidewinder	1037,3,120000,120000,1
+prt_maze01.gat,59,140,21,21	monster	Choco	1214,2,120000,120000,1
+prt_maze01.gat,19,100,21,21	monster	Hunter Fly	1035,4,120000,120000,1
+prt_maze01.gat,179,100,21,21	monster	Argiope	1099,3,120000,120000,1
+prt_maze01.gat,179,140,21,21	monster	Mantis	1139,3,120000,120000,1
+prt_maze01.gat,19,180,21,21	monster	Savage	1166,5,120000,120000,1
+prt_maze01.gat,139,60,21,21	monster	Bigfoot	1060,5,120000,120000,1
+prt_maze01.gat,139,100,21,21	monster	Argos	1100,3,120000,120000,1
+prt_maze01.gat,139,180,21,21	monster	Caramel	1103,5,120000,120000,1
+prt_maze01.gat,59,140,21,21	monster	Yoyo	1057,4,120000,120000,1
+prt_maze01.gat,59,180,21,21	monster	Martin	1145,5,120000,120000,1
+prt_maze01.gat,179,180,21,21	monster	Coco	1104,5,120000,120000,1
+prt_maze01.gat,19,140,21,21	monster	Steel ChonChon	1042,5,120000,120000,1
+prt_maze01.gat,99,20,21,21	monster	Creamy	1018,1,120000,120000,1
+prt_maze01.gat,139,140,21,21	monster	Stainer	1174,5,120000,120000,1
+prt_maze01.gat,59,60,21,21	monster	Boa	1025,5,120000,120000,1
+prt_maze01.gat,19,20,21,21	monster	Poporing	1031,5,120000,120000,1
+prt_maze01.gat,19,60,21,21	monster	Wolf	1013,5,120000,120000,1
+prt_maze01.gat,179,60,21,21	monster	Rocker	1052,5,120000,120000,1
+prt_maze01.gat,99,100,21,21	monster	ChonChon	1011,5,120000,120000,1
+prt_maze01.gat,139,20,21,21	monster	Lunatic	1063,5,120000,120000,1
+prt_maze01.gat,99,20,21,21	monster	Fabre	1007,5,120000,120000,1
+prt_maze01.gat,179,20,21,21	monster	Poring	1002,5,120000,120000,1
+prt_maze01.gat,99,60,21,21	monster	Smokie	1056,5,120000,120000,1
+prt_maze01.gat,19,180,21,21	monster	Savage Babe	1167,3,120000,120000,1
+prt_maze01.gat,99,180,21,21	monster	Dustiness	1114,5,120000,120000,1
+prt_maze01.gat,59,20,21,21	monster	Pupa	1008,5,120000,120000,1
+prt_maze01.gat,59,100,21,21	monster	Horn	1128,5,120000,120000,1
+prt_maze01.gat,0,0,0,0	monster	Yellow Plant	1081,2,180000,180000,1
 prt_maze01.gat,0,0,0,0	monster	Blue Plant	1079,3,360000,180000,1
-prt_maze01.gat,0,0,0,0	monster	Shining Plant	1083,2,1800000,900000,1
-prt_maze01.gat,0,0,0,0	monster	Vagabond Wolf	1092,1,3600000,1800000,1
+prt_maze01.gat,0,0,0,0	monster	Shining Plant	1083,2,1800000,1800000,1
+prt_maze01.gat,0,0,0,0	monster	Vagabond Wolf	1092,1,3600000,3600000,1
 prt_maze01.gat,0,0,0,0	monster	Black Mushroom	1084,5,360000,180000,1
-prt_maze01.gat,0,0,0,0	monster	Red Plant	1078,5,180000,90000,1
-prt_maze01.gat,0,0,0,0	monster	Red Mushroom	1085,5,180000,90000,1
-prt_maze01.gat,0,0,0,0	monster	White Plant	1082,3,180000,90000,1
+prt_maze01.gat,0,0,0,0	monster	Red Plant	1078,5,180000,180000,1
+prt_maze01.gat,0,0,0,0	monster	Red Mushroom	1085,5,180000,180000,1
+prt_maze01.gat,0,0,0,0	monster	White Plant	1082,3,180000,180000,1
 
 //(prt_maze02.gat)*
 prt_maze02.gat,0,0,0,0	monster	Bigfoot	1060,5,0,0,0
 prt_maze02.gat,0,0,0,0	monster	Poporing	1031,25,0,0,0
-prt_maze02.gat,0,0,0,0	monster	Sasquatch	1243,1,600000,300000,1
-prt_maze02.gat,0,0,0,0	monster	Leib Olmai	1306,1,1800000,900000,1
+prt_maze02.gat,0,0,0,0	monster	Sasquatch	1243,1,600000,600000,1
+prt_maze02.gat,0,0,0,0	monster	Leib Olmai	1306,1,1800000,1800000,1
 
 //(prt_maze03.gat)*
 prt_maze03.gat,0,0,0,0	monster	Killer Mantis	1294,1,0,0,0
@@ -61,15 +61,15 @@ prt_maze03.gat,0,0,0,0	monster	Sidewinder	1037,30,0,0,0
 prt_maze03.gat,0,0,0,0	monster	Hunter Fly	1035,30,0,0,0
 prt_maze03.gat,0,0,0,0	monster	Stem Worm	1215,20,0,0,0
 prt_maze03.gat,0,0,0,0	monster	Mantis	1139,30,0,0,0
-prt_maze03.gat,0,0,0,0	monster	Yellow Plant	1081,1,600000,300000,1
-prt_maze03.gat,0,0,0,0	monster	Blue Plant	1079,5,900000,450000,1
-prt_maze03.gat,0,0,0,0	monster	Vocal	1088,1,1800000,200000,1
-prt_maze03.gat,0,0,0,0	monster	Eclipse	1093,1,1800000,200000,1
-prt_maze03.gat,0,0,0,0	monster	Mastering	1090,1,1800000,200000,1
-prt_maze03.gat,0,0,0,0	monster	Shining Plant	1083,5,1800000,200000,1
-prt_maze03.gat,0,0,0,0	monster	Vagabond Wolf	1092,1,3600000,200000,1
-prt_maze03.gat,0,0,0,0	monster	Baphomet	1039,1,3600000,7200000,1
-prt_maze03.gat,0,0,0,0	monster	Ghostring	1120,1,3600000,7200000,1
+prt_maze03.gat,0,0,0,0	monster	Yellow Plant	1081,1,600000,600000,1
+prt_maze03.gat,0,0,0,0	monster	Blue Plant	1079,5,900000,900000,1
+prt_maze03.gat,0,0,0,0	monster	Vocal	1088,1,1800000,1800000,1
+prt_maze03.gat,0,0,0,0	monster	Eclipse	1093,1,1800000,1800000,1
+prt_maze03.gat,0,0,0,0	monster	Mastering	1090,1,1800000,1800000,1
+prt_maze03.gat,0,0,0,0	monster	Shining Plant	1083,5,1800000,1800000,1
+prt_maze03.gat,0,0,0,0	monster	Vagabond Wolf	1092,1,3600000,1800000,1
+prt_maze03.gat,0,0,0,0	monster	Baphomet	1039,1,7200000,7200000,1
+prt_maze03.gat,0,0,0,0	monster	Ghostring	1120,1,7200000,7200000,1
 prt_maze03.gat,0,0,0,0	monster	Black Mushroom	1084,6,360000,180000,1
 prt_maze03.gat,0,0,0,0	monster	Red Plant	1078,5,360000,180000,1
 prt_maze03.gat,0,0,0,0	monster	Red Mushroom	1085,5,180000,90000,1
diff --git a/npc/mobs/dungeons/pront_sewers.txt b/npc/mobs/dungeons/pront_sewers.txt
index f626d912c..ce077fff6 100644
--- a/npc/mobs/dungeons/pront_sewers.txt
+++ b/npc/mobs/dungeons/pront_sewers.txt
@@ -41,4 +41,4 @@ prt_sewb4.gat,0,0,0,0	monster	Thief Bug Female	1053,20,0,0,0
 prt_sewb4.gat,0,0,0,0	monster	Thief Bug Male	1054,70,0,0,0
 prt_sewb4.gat,0,0,0,0	monster	Thief Bug Larva	1051,20,0,0,0
 prt_sewb4.gat,0,0,0,0	monster	Thief Bug Egg	1048,10,0,0,0
-prt_sewb4.gat,0,0,0,0	monster	Golden Thief Bug	1086,1,7200000,7200000,0
+prt_sewb4.gat,0,0,0,0	monster	Golden Thief Bug	1086,1,3600000,3600000,0
diff --git a/npc/mobs/dungeons/sunkenship.txt b/npc/mobs/dungeons/sunkenship.txt
index c75307cf7..db4fe13b3 100644
--- a/npc/mobs/dungeons/sunkenship.txt
+++ b/npc/mobs/dungeons/sunkenship.txt
@@ -96,8 +96,8 @@ treasure01.gat,89,160,0,0	monster	Hydra	1068,1,305000,100000,1
 treasure01.gat,89,161,0,0	monster	Hydra	1068,1,300000,100000,1
 treasure01.gat,0,0,0,0	monster	Kukre	1070,10,0,0,1
 treasure01.gat,21,165,5,9	monster	Kukre	1070,10,300000,150000,1
-treasure01.gat,162,58,0,0	monster	Penomena	1216,1,900000,450000,0
-treasure01.gat,168,59,0,0	monster	Wanderer	1208,1,1800000,900000,0
+treasure01.gat,162,58,0,0	monster	Penomena	1216,1,900000,900000,0
+treasure01.gat,168,59,0,0	monster	Wanderer	1208,1,1800000,1800000,0
 
 //(treasure02.gat)*
 treasure02.gat,23,142,1,1	monster	Marionette	1143,1,200000,100000,1
@@ -137,5 +137,5 @@ treasure02.gat,108,57,0,0	monster	Hydra	1068,1,300000,100000,1
 treasure02.gat,95,57,0,0	monster	Hydra	1068,1,300000,100000,1
 treasure02.gat,96,57,0,0	monster	Hydra	1068,1,300000,100000,1
 treasure02.gat,0,0,0,0	monster	Kukre	1070,20,0,0,1
-treasure02.gat,0,0,0,0	monster	Ghostring	1120,1,1800000,900000,1
-treasure02.gat,101,151,8,8	monster	Drake	1112,1,3600000,7200000,1
+treasure02.gat,0,0,0,0	monster	Ghostring	1120,1,3600000,3600000,1
+treasure02.gat,101,151,8,8	monster	Drake	1112,1,7200000,7200000,1
diff --git a/npc/mobs/dungeons/turtleisland.txt b/npc/mobs/dungeons/turtleisland.txt
index b1d246c68..89f773978 100644
--- a/npc/mobs/dungeons/turtleisland.txt
+++ b/npc/mobs/dungeons/turtleisland.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.0
+//= 1.1
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Additional Comments: =================================
@@ -19,7 +19,7 @@ tur_dun01.gat,0,0,0,0	monster	Thara Frog	1034,10,0,0,0
 
 //(tur_dun02.gat)*
 tur_dun02.gat,0,0,0,0	monster	Freezer	1319,20,0,0,0
-tur_dun02.gat,0,0,0,0	monster	Soldier	1316,40,0,0,0
+tur_dun02.gat,0,0,0,0	monster	Solider	1316,40,0,0,0
 tur_dun02.gat,0,0,0,0	monster	Perimeter	1314,40,0,0,0
 tur_dun02.gat,0,0,0,0	monster	Pest	1256,15,0,0,0
 
@@ -39,7 +39,7 @@ tur_dun04.gat,100,93,20,20	monster	Freezer	1319,4,120000,60000,0
 tur_dun04.gat,0,0,0,0	monster	Heater	1318,30,0,0,0
 tur_dun04.gat,100,93,20,20	monster	Heater	1318,3,120000,60000,0
 tur_dun04.gat,0,0,0,0	monster	Perimeter	1314,4,0,0,0
-tur_dun04.gat,99,93,20,20	monster	Turtle General	1312,1,3600000,7200000,0
+tur_dun04.gat,99,93,20,20	monster	Turtle General	1312,1,3600000,3600000,0
 
 //(tur_dun05.gat)? //no data at emp.org
 tur_dun05.gat,0,0,0,0	monster	Perimeter	1314,3,20000,0,0
diff --git a/npc/mobs/dungeons/umbaladun.txt b/npc/mobs/dungeons/umbaladun.txt
index 5adb03481..21feb49f7 100644
--- a/npc/mobs/dungeons/umbaladun.txt
+++ b/npc/mobs/dungeons/umbaladun.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.0
+//= 1.1
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Additional Comments: =================================
@@ -11,16 +11,16 @@
 //============================================================
 
 
-//(um_dun01.gat)?
+//(um_dun01.gat)*
 um_dun01.gat,0,0,0,0	monster	Stainer	1174,30,0,0,0
 um_dun01.gat,0,0,0,0	monster	Dustiness	1114,30,0,0,0
 um_dun01.gat,0,0,0,0	monster	Wooden Fighter	1499,30,0,0,0
 um_dun01.gat,0,0,0,0	monster	Stone Shooter	1495,10,0,0,0 
 um_dun01.gat,0,0,0,0	monster	Wooden Golem	1497,5,0,0,0
 
-//(um_dun02.gat)?
+//(um_dun02.gat)*
 um_dun02.gat,0,0,0,0	monster	Wooden Fighter	1499,20,0,0,0
 um_dun02.gat,0,0,0,0	monster	Wooden Shooter	1498,10,0,0,0
 um_dun02.gat,0,0,0,0	monster	Dryad	1493,30,0,0,0
 um_dun02.gat,0,0,0,0	monster	Wooden Golem	1497,30,0,0,0
-um_dun02.gat,0,0,0,0	monster	Stone Shooter	1495,10,0,0,0
+um_dun02.gat,0,0,0,0	monster	Stone Shooter	1495,20,0,0,0