summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt4
-rw-r--r--db/Changelog.txt3
-rw-r--r--db/mob_db.txt58
-rw-r--r--src/map/map.h2
4 files changed, 37 insertions, 30 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 9a2740376..8d5cd1ea6 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,10 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. EVERYTHING ELSE
GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS
+2006/02/20
+ * Preparing eA for new mob_skill_db from Aegis 10.2 [Komurka]
+ - increased MAX_MOBSKILL 32 -> 40
+
2006/02/19
* Some fixes to the last item usage tick. Items should be working fine now.
[Skotlex]
diff --git a/db/Changelog.txt b/db/Changelog.txt
index 3c9f6b36a..e71f3f47c 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -24,6 +24,9 @@
=========================
+02/20
+ * Fixed some names in mob_db.txt ('Name', not 'JName') [Komurka]
+
02/18
* Updated Chung_E's drops a bit according to recent info, it had the same [MasterOfMuppets]
drops as Sohees before.
diff --git a/db/mob_db.txt b/db/mob_db.txt
index c6b9b4d4e..e502cdd2f 100644
--- a/db/mob_db.txt
+++ b/db/mob_db.txt
@@ -612,11 +612,11 @@
1601,G_PERMETER,Permeter,63,11684,0,0,0,2,943,1212,46,45,69,59,60,5,69,100,10,12,1,2,40,17,250,1100,483,528,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,
1602,G_SOLIDER,Solider,70,17181,0,0,0,2,796,978,57,43,69,35,85,5,74,100,10,12,1,2,42,17,250,1452,483,528,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1603,G_BIGFOOT,Bigfoot,25,1619,0,0,0,1,198,220,10,0,1,25,55,15,20,25,10,12,2,2,22,145,300,1260,192,192,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,
-1604,G_GIANT_HORNET,Giant Hornet,56,12834,0,0,0,1,650,851,38,43,35,38,32,10,71,64,10,12,0,4,24,53,155,1292,792,340,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1604,G_GIANT_HONET,Giant Hornet,56,12834,0,0,0,1,650,851,38,43,35,38,32,10,71,64,10,12,0,4,24,53,155,1292,792,340,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1605,G_DARK_ILLUSION,Dark Illusion,77,101487,0,0,0,2,1300,1982,64,70,5,100,40,100,97,40,10,12,2,6,89,53,145,1024,768,480,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1606,G_GARM_BABY,Hatii Baby,61,20119,0,0,0,3,680,1179,34,13,1,30,56,55,85,30,10,12,1,2,41,133,300,1152,1152,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1607,G_XMAS_GOBLINE,Xmas Goblin,28,2090,0,0,0,1,140,170,0,50,1,24,30,53,45,100,10,12,0,7,46,9,400,1248,1248,240,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1608,G_THIEF_BUG_MALE,Male Thief Bug,19,583,0,0,0,1,76,88,15,5,1,29,16,5,36,1,10,12,1,4,27,141,300,988,288,768,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1607,G_GOBLINE_XMAS,Xmas Goblin,28,2090,0,0,0,1,140,170,0,50,1,24,30,53,45,100,10,12,0,7,46,9,400,1248,1248,240,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1608,G_THIEF_BUG__,Male Thief Bug,19,583,0,0,0,1,76,88,15,5,1,29,16,5,36,1,10,12,1,4,27,141,300,988,288,768,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1609,G_DANCING_DRAGON,Dancing Dragon,54,9136,0,0,0,3,550,789,39,10,1,62,55,25,72,10,10,12,1,9,44,131,200,1152,1152,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1610,G_MUNAK,Munak,30,2872,0,0,0,1,180,230,0,0,1,15,20,5,46,15,10,12,1,1,29,133,200,2468,768,288,901,5500,2264,1,2404,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1611,G__BON_GUN,Bongun,32,3520,0,0,0,1,220,260,0,0,45,15,36,10,48,15,10,12,1,1,29,149,200,1720,500,420,512,0,512,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -641,9 +641,9 @@
1626,G_DARK_PRIEST,Dark Priest,59,9660,0,3320,2974,1,298,370,30,60,1,54,38,95,82,60,10,12,1,7,87,661,200,1500,500,1000,1557,2,2608,30,505,100,716,450,1009,50,2319,1,1241,1,0,0,0,0,4171,1,0,0,0,0,0,0,0,0,
1627,ANOPHELES,Virus,23,100,0,99,55,1,48,63,0,90,1,200,4,5,120,5,10,12,0,4,64,131,400,1872,672,480,7119,2000,601,500,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1628,MOLE,Mole,36,2209,0,268,172,1,53,63,0,5,1,18,23,30,45,5,10,12,0,2,42,131,400,1872,672,480,1017,7000,1018,3000,512,200,5119,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1629,HILL_WIND_SPEAR,Hill Wind,43,3189,0,1800,1100,1,290,480,10,15,1,42,31,50,51,23,10,12,1,2,64,671,400,1872,672,480,7115,4200,7116,1800,528,800,510,300,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1630,G_BACSOJIN,Bacsojin,72,56380,0,5590,1659,1,560,1446,10,51,1,85,78,85,150,60,10,12,2,7,44,1973,200,1152,1152,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1631,G_CHUNG_E,Chung E,59,23900,0,4256,920,1,60,105,8,15,1,33,33,10,58,15,10,12,1,7,44,145,300,2112,912,576,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1629,HILL_WIND,Hill Wind,43,3189,0,1800,1100,1,290,480,10,15,1,42,31,50,51,23,10,12,1,2,64,671,400,1872,672,480,7115,4200,7116,1800,528,800,510,300,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1630,BACSOJIN_,Bacsojin,72,56380,0,5590,1659,1,560,1446,10,51,1,85,78,85,150,60,10,12,2,7,44,1973,200,1152,1152,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1631,CHUNG_E_,Chung E,59,23900,0,4256,920,1,60,105,8,15,1,33,33,10,58,15,10,12,1,7,44,145,300,2112,912,576,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1632,GREMLIN,Gremlin,53,9280,0,4355,1768,1,329,762,29,25,1,41,59,75,62,15,10,12,1,3,21,671,200,1872,672,480,7340,0,910,3000,603,25,719,20,2406,1,0,0,0,0,1265,1,0,0,0,0,0,0,0,0,0,0,0,0,
1633,BEHOLDER,Beholder,56,7950,0,4821,3822,1,723,812,17,30,1,62,25,59,85,32,10,12,1,3,21,671,200,1872,672,480,576,1200,0,0,996,25,985,96,603,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
//Normal advanced class mobs
@@ -661,12 +661,12 @@
1644,G_SHECIL,Sniper Shecil,99,209000,0,18000,10000,9,1892,5113,22,35,1,145,27,49,134,80,10,12,1,7,21,1693,150,500,672,480,1722,5,1720,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1645,G_KATRINN,High Wizard Katrinn,99,189920,0,18000,10000,1,497,2094,10,82,1,56,39,180,110,39,10,12,1,7,21,1693,150,1872,672,480,2319,30,1620,5,1618,10,2616,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
//MVP Monsters
-1646,L_SEYREN,Lord Knight Seyren,99,1647590,0,4835600,1569970,1,7238,11040,72,37,1,81,94,110,130,52,10,12,1,7,63,1973,120,672,672,480,1166,100,1132,80,2342,250,2412,500,1470,90,1230,75,1169,50,1469,100,0,0,0,0,94100,7000,617,1000,732,3000,603,5500,
-1647,L_EREMES,Assassin Cross Eremes,99,1411230,0,4083400,1592380,1,4189,8289,37,39,1,181,62,37,122,60,10,12,1,7,85,1973,120,672,672,480,1234,100,2319,75,1233,100,1232,250,1265,50,1231,75,13002,100,0,0,0,0,0,0,84100,7000,617,1000,732,3000,603,5500,
-1648,L_HARWORD,Whitesmith Harword,99,1460000,0,4002340,1421000,1,7822,8251,66,36,1,73,112,35,136,60,10,12,1,7,82,1973,120,672,672,480,1138,50,1140,100,2318,250,1364,100,1368,75,1363,250,1365,125,0,0,0,0,0,0,82100,7000,617,1000,732,3000,603,5500,
-1649,L_MAGALETA,High Priest Magaleta,99,1092910,0,4257000,1318800,1,4688,5580,35,78,1,84,64,182,92,100,10,12,1,7,66,1973,120,1872,672,480,1814,150,2513,225,2615,100,1557,50,1527,100,1560,100,1526,100,0,0,0,0,0,0,80100,7000,617,1000,732,3000,603,5500,
-1650,L_SHECIL,Sniper Shecil,99,1349000,0,4093000,1526000,9,4892,9113,22,35,1,180,39,67,193,130,10,12,1,7,64,1973,120,500,672,480,1228,100,1236,500,617,2500,1234,75,1237,125,1722,250,1724,100,1720,50,0,0,0,0,92100,7000,603,5500,617,3000,1723,1000,
-1651,L_KATRINN,High Wizard Katrinn,99,1069920,0,4008200,1636700,1,1197,4394,10,88,1,89,42,223,128,93,10,12,1,7,68,1973,120,1872,672,480,1241,100,1242,50,2616,75,2343,500,2513,200,1618,250,1620,200,0,0,0,0,0,0,95100,7000,617,3000,2319,1500,603,5500,
+1646,B_SEYREN,Lord Knight Seyren,99,1647590,0,4835600,1569970,1,7238,11040,72,37,1,81,94,110,130,52,10,12,1,7,63,1973,120,672,672,480,1166,100,1132,80,2342,250,2412,500,1470,90,1230,75,1169,50,1469,100,0,0,0,0,94100,7000,617,1000,732,3000,603,5500,
+1647,B_EREMES,Assassin Cross Eremes,99,1411230,0,4083400,1592380,1,4189,8289,37,39,1,181,62,37,122,60,10,12,1,7,85,1973,120,672,672,480,1234,100,2319,75,1233,100,1232,250,1265,50,1231,75,13002,100,0,0,0,0,0,0,84100,7000,617,1000,732,3000,603,5500,
+1648,B_HARWORD,Whitesmith Harword,99,1460000,0,4002340,1421000,1,7822,8251,66,36,1,73,112,35,136,60,10,12,1,7,82,1973,120,672,672,480,1138,50,1140,100,2318,250,1364,100,1368,75,1363,250,1365,125,0,0,0,0,0,0,82100,7000,617,1000,732,3000,603,5500,
+1649,B_MAGALETA,High Priest Magaleta,99,1092910,0,4257000,1318800,1,4688,5580,35,78,1,84,64,182,92,100,10,12,1,7,66,1973,120,1872,672,480,1814,150,2513,225,2615,100,1557,50,1527,100,1560,100,1526,100,0,0,0,0,0,0,80100,7000,617,1000,732,3000,603,5500,
+1650,B_SHECIL,Sniper Shecil,99,1349000,0,4093000,1526000,9,4892,9113,22,35,1,180,39,67,193,130,10,12,1,7,64,1973,120,500,672,480,1228,100,1236,500,617,2500,1234,75,1237,125,1722,250,1724,100,1720,50,0,0,0,0,92100,7000,603,5500,617,3000,1723,1000,
+1651,B_KATRINN,High Wizard Katrinn,99,1069920,0,4008200,1636700,1,1197,4394,10,88,1,89,42,223,128,93,10,12,1,7,68,1973,120,1872,672,480,1241,100,1242,50,2616,75,2343,500,2513,200,1618,250,1620,200,0,0,0,0,0,0,95100,7000,617,3000,2319,1500,603,5500,
//1'st Class Mobs
1652,YGNIZEM,Ygnizem,58,11200,0,4870,98,1,723,1112,19,12,1,35,52,21,70,20,10,12,2,7,43,1693,200,1872,672,480,7345,5000,644,75,1158,2,1127,1,1054,12,2317,1,1170,1,2313,5,0,0,0,0,0,0,0,0,0,0,0,0,
1653,WHIKEBAIN,Whikebain,62,7320,0,4204,21,1,593,789,9,12,1,48,100,57,74,30,10,12,2,7,65,1693,200,1872,672,480,7345,5000,644,75,1220,25,2315,1,1208,50,1223,1,2306,50,13004,1,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -675,30 +675,30 @@
1656,KAVAC,Kavac,60,7899,0,4090,86,9,584,804,12,5,1,75,10,20,108,40,10,12,2,7,44,1693,200,1872,672,480,7345,5000,644,75,12006,1000,1708,35,2308,25,2402,150,2404,10,1716,2,0,0,0,0,0,0,0,0,0,0,0,0,
1657,RAWREL,Rawrel,61,6168,0,4620,30,1,330,417,5,48,1,41,5,100,45,10,10,12,2,7,48,1693,200,1872,672,480,934,4500,644,75,1616,2,2102,10,1608,10,2322,10,2333,10,2607,15,0,0,0,0,0,0,0,0,0,0,0,0,
//1'st Class MvP (Ygnizem) and her mobs.
-1658,G_YGNIZEM,Ygnizem,79,214200,0,158760,86000,1,3890,5690,48,25,1,60,45,31,110,40,10,12,1,7,43,1973,100,500,672,480,1130,1,1167,1,617,2000,1162,500,644,3500,2406,250,0,0,0,0,0,0,0,0,32000,4000,603,3500,732,5000,2320,1000,
+1658,B_YGNIZEM,Ygnizem,79,214200,0,158760,86000,1,3890,5690,48,25,1,60,45,31,110,40,10,12,1,7,43,1973,100,500,672,480,1130,1,1167,1,617,2000,1162,500,644,3500,2406,250,0,0,0,0,0,0,0,0,32000,4000,603,3500,732,5000,2320,1000,
1659,G_WHIKEBAIN,Whikebain,62,7320,0,0,0,1,593,789,9,12,1,48,100,57,74,30,10,12,2,7,65,1693,200,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,
1660,G_ARMAIA,Armaia,66,7110,0,0,0,1,650,813,20,6,1,36,40,25,80,60,10,12,2,7,62,1693,200,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,
1661,G_EREND,Erend,59,6980,0,0,0,1,796,1059,14,30,1,31,41,84,60,30,10,12,2,7,46,1693,200,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,
1662,G_KAVAC,Kavac,60,7899,0,0,0,9,584,804,12,5,1,75,10,20,108,40,10,12,2,7,44,1693,200,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,
1663,G_RAWREL,Rawrel,61,6168,0,0,0,1,330,417,5,48,1,41,5,100,45,10,10,12,2,7,48,1693,200,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,
-1664,POTON_CANON_1,Photon Canon,66,8000,0,3900,1800,1,800,900,10,10,1,40,25,20,60,30,10,12,1,0,40,669,200,1872,672,480,7126,2500,910,3400,718,33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1665,POTON_CANON_2,Photon Canon,67,7500,0,4300,2000,1,700,800,15,10,1,40,30,40,66,30,10,12,1,0,40,669,200,1872,672,480,7126,2500,910,3400,728,33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1666,POTON_CANON_3,Photon Canon,64,7100,0,3100,2700,1,800,900,8,10,1,40,21,29,60,21,10,12,1,0,40,669,200,1872,672,480,7126,2500,910,3400,721,33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1667,POTON_CANON_4,Photon Canon,65,7800,0,3800,2300,1,700,800,15,10,1,40,23,30,70,19,10,12,1,0,40,669,200,1872,672,480,7126,2500,910,3400,7053,1000,720,33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1664,POTON_CANON,Photon Canon,66,8000,0,3900,1800,1,800,900,10,10,1,40,25,20,60,30,10,12,1,0,40,669,200,1872,672,480,7126,2500,910,3400,718,33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1665,POTON_CANON_1,Photon Canon,67,7500,0,4300,2000,1,700,800,15,10,1,40,30,40,66,30,10,12,1,0,40,669,200,1872,672,480,7126,2500,910,3400,728,33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1666,POTON_CANON_2,Photon Canon,64,7100,0,3100,2700,1,800,900,8,10,1,40,21,29,60,21,10,12,1,0,40,669,200,1872,672,480,7126,2500,910,3400,721,33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1667,POTON_CANON_3,Photon Canon,65,7800,0,3800,2300,1,700,800,15,10,1,40,23,30,70,19,10,12,1,0,40,669,200,1872,672,480,7126,2500,910,3400,7053,1000,720,33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1668,ARCHDAM,Archdam,79,11000,0,8000,100,1,1000,2000,15,15,1,65,35,75,75,15,10,12,1,3,21,669,200,1872,672,480,7317,7000,999,240,984,186,985,114,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1669,DIMIK_1,Dimik,77,8000,0,2,1,1,840,1480,45,28,1,1,1,1,1,1,10,12,1,0,40,671,200,1872,671,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,
-1670,DIMIK_2,Dimik,79,11000,0,6400,3500,1,940,1580,45,28,1,88,20,20,120,40,10,12,1,0,44,669,200,1872,672,480,7319,5500,999,400,984,222,7352,2000,12129,18,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1671,DIMIK_3,Dimik,82,19000,0,5800,4500,1,1040,1680,45,28,1,20,30,30,120,70,10,12,1,0,41,669,200,1872,672,480,7319,5500,999,400,984,222,7355,2000,12129,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1672,DIMIK_4,Dimik,80,15000,0,5900,2800,1,940,1580,45,28,1,30,78,20,120,30,10,12,1,0,42,669,200,1872,672,480,7319,5500,999,400,984,222,7354,2000,12129,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1673,DIMIK_5,Dimik,89,8900,0,8000,5000,1,1540,2540,45,28,1,40,20,10,150,30,10,12,1,0,43,669,200,1872,672,480,7319,5500,999,400,984,222,7353,2000,12129,17,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1669,DIMIK,Dimik,77,8000,0,2,1,1,840,1480,45,28,1,1,1,1,1,1,10,12,1,0,40,671,200,1872,671,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,
+1670,DIMIK_1,Dimik,79,11000,0,6400,3500,1,940,1580,45,28,1,88,20,20,120,40,10,12,1,0,44,669,200,1872,672,480,7319,5500,999,400,984,222,7352,2000,12129,18,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1671,DIMIK_2,Dimik,82,19000,0,5800,4500,1,1040,1680,45,28,1,20,30,30,120,70,10,12,1,0,41,669,200,1872,672,480,7319,5500,999,400,984,222,7355,2000,12129,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1672,DIMIK_3,Dimik,80,15000,0,5900,2800,1,940,1580,45,28,1,30,78,20,120,30,10,12,1,0,42,669,200,1872,672,480,7319,5500,999,400,984,222,7354,2000,12129,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1673,DIMIK_4,Dimik,89,8900,0,8000,5000,1,1540,2540,45,28,1,40,20,10,150,30,10,12,1,0,43,669,200,1872,672,480,7319,5500,999,400,984,222,7353,2000,12129,17,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1674,MONEMUS,Monemus,88,80000,0,2,1,1,2000,3000,26,52,1,1,1,1,1,1,10,12,1,3,21,671,200,1872,672,480,7049,6000,953,5000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1675,VENATU_1,Venatu,77,8000,0,0,0,1,1200,1800,35,20,1,1,1,1,1,1,10,12,1,0,40,671,200,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,
-1676,VENATU_2,Venatu,72,8900,0,4000,2000,1,800,1000,30,20,1,26,24,5,82,30,10,12,1,0,41,669,200,1872,672,480,7317,4850,999,320,7357,1200,985,190,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1677,VENATU_3,Venatu,80,9000,0,4000,2000,1,900,1100,30,20,1,82,32,5,95,30,10,12,1,0,44,669,200,1872,672,480,7317,4850,999,320,7358,1200,985,190,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1678,VENATU_4,Venatu,78,9500,0,4500,2000,1,800,1000,30,20,1,26,68,5,75,30,10,12,1,0,42,669,200,1872,672,480,7317,4850,999,320,7359,1200,985,190,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1679,VENATU_5,Venatu,75,12300,0,4000,2000,1,800,1000,30,20,1,26,24,5,80,30,10,12,1,0,41,669,200,1872,672,480,7317,4850,999,320,7356,1200,985,190,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1680,HILL_WIND,Hill Wind,45,4233,0,2132,1722,1,320,510,10,15,1,42,31,50,67,23,10,12,1,2,64,669,200,1872,672,480,528,1100,517,6500,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1675,VENATU,Venatu,77,8000,0,0,0,1,1200,1800,35,20,1,1,1,1,1,1,10,12,1,0,40,671,200,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,
+1676,VENATU_1,Venatu,72,8900,0,4000,2000,1,800,1000,30,20,1,26,24,5,82,30,10,12,1,0,41,669,200,1872,672,480,7317,4850,999,320,7357,1200,985,190,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1677,VENATU_2,Venatu,80,9000,0,4000,2000,1,900,1100,30,20,1,82,32,5,95,30,10,12,1,0,44,669,200,1872,672,480,7317,4850,999,320,7358,1200,985,190,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1678,VENATU_3,Venatu,78,9500,0,4500,2000,1,800,1000,30,20,1,26,68,5,75,30,10,12,1,0,42,669,200,1872,672,480,7317,4850,999,320,7359,1200,985,190,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1679,VENATU_4,Venatu,75,12300,0,4000,2000,1,800,1000,30,20,1,26,24,5,80,30,10,12,1,0,41,669,200,1872,672,480,7317,4850,999,320,7356,1200,985,190,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1680,HILL_WIND_1,Hill Wind,45,4233,0,2132,1722,1,320,510,10,15,1,42,31,50,67,23,10,12,1,2,64,669,200,1872,672,480,528,1100,517,6500,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1681,GEMINI,Gemini S58,72,57870,0,22024,9442,1,2150,3030,60,45,1,75,70,77,105,55,10,12,1,0,21,669,200,1872,672,480,7005,5000,546,1200,547,400,971,250,972,125,603,25,7479,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1682,REMOVAL,Removal,55,10289,0,3831,1278,1,558,797,5,20,1,20,56,35,57,20,10,12,1,1,49,669,200,1872,672,480,713,7000,7319,2800,516,1500,5120,10,971,75,972,50,5005,5,2227,10,0,0,0,0,0,0,0,0,0,0,0,0,
1683,POTON_CANON_5,Poton Canon,46,7000,0,2,1,1,560,570,5,10,1,1,1,1,1,1,10,12,1,0,43,669,200,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,
@@ -706,7 +706,7 @@
1685,APOCALIPS_H,Vesper,97,220070,0,200000,100000,2,4000,10000,50,54,1,50,60,70,160,150,10,12,2,0,60,677,400,1564,864,576,7095,3000,7094,5500,2659,500,2660,500,2661,500,2662,500,617,1500,0,0,0,0,0,0,50000,5000,603,3000,732,5000,0,0,
1686,ORC_BABY,Orc Baby,21,912,0,220,220,1,135,270,15,10,1,30,60,20,45,20,10,12,1,7,42,653,200,2000,1000,500,7126,3500,519,400,627,20,10015,25,5110,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1687,GREEN_IGUANA,Green Iguana,54,6444,0,2400,2050,1,550,650,5,10,5,20,20,0,28,10,10,12,1,2,22,129,200,2000,1000,500,521,750,520,1500,903,7000,528,120,606,30,511,2000,511,100,511,10,0,0,0,0,0,0,0,0,0,0,0,0,
-1688,BANANA_LADY_TANEE,Lady Tany,89,493000,0,64995,42222,9,450,3770,30,44,1,185,78,78,210,38,10,12,0,3,62,676,75,1564,864,576,513,7000,634,3000,12127,1500,607,2800,985,2500,5116,350,1716,250,0,0,0,0,0,0,2500,4000,617,750,753,2500,732,3000,
+1688,LADY_TANEE,Lady Tany,89,493000,0,64995,42222,9,450,3770,30,44,1,185,78,78,210,38,10,12,0,3,62,676,75,1564,864,576,513,7000,634,3000,12127,1500,607,2800,985,2500,5116,350,1716,250,0,0,0,0,0,0,2500,4000,617,750,753,2500,732,3000,
1689,G_BACSOJIN,Bacsojin,72,56380,0,5590,1659,1,560,1446,10,51,1,85,78,85,150,60,10,12,2,7,44,1973,200,1152,1152,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1690,G_SPRING_RABBIT,Spring Rabbit,58,9045,0,3982,1766,1,585,813,29,21,45,61,5,15,77,90,10,12,1,2,42,131,160,1120,552,511,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1691,G_KRABEN,Kraben,50,5880,0,257,1652,1,125,765,1,66,1,40,40,40,40,30,10,12,1,0,48,645,75,1872,672,480,703,75,521,1500,519,5000,912,5000,7299,3000,2102,15,603,5,0,0,0,0,4295,1,0,0,0,0,0,0,0,0,
diff --git a/src/map/map.h b/src/map/map.h
index 645976375..ce26686e5 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -37,7 +37,7 @@
#define MAX_SKILLUNITGROUPTICKSET 32
#define MAX_SKILLTIMERSKILL 32
#define MAX_MOBSKILLTIMERSKILL 10
-#define MAX_MOBSKILL 32
+#define MAX_MOBSKILL 40
#define MAX_MOB_LIST_PER_MAP 128
#define MAX_EVENTQUEUE 2
#define MAX_EVENTTIMER 32