summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--db/re/mob_db.txt54
-rw-r--r--db/re/mob_skill_db.txt1
-rw-r--r--doc/atcommands.txt3
-rw-r--r--doc/script_commands.txt36
-rw-r--r--sql-files/mob_db_re.sql54
-rw-r--r--sql-files/mob_skill_db_re.sql1
6 files changed, 74 insertions, 75 deletions
diff --git a/db/re/mob_db.txt b/db/re/mob_db.txt
index 829a525b9..4e8ff9772 100644
--- a/db/re/mob_db.txt
+++ b/db/re/mob_db.txt
@@ -4,15 +4,15 @@
// ID,Sprite_Name,kROName,iROName,LV,HP,SP,EXP,JEXP,Range1,ATK1,ATK2,DEF,MDEF,STR,AGI,VIT,INT,DEX,LUK,Range2,Range3,Scale,Race,Element,Mode,Speed,aDelay,aMotion,dMotion,MEXP,MVP1id,MVP1per,MVP2id,MVP2per,MVP3id,MVP3per,Drop1id,Drop1per,Drop2id,Drop2per,Drop3id,Drop3per,Drop4id,Drop4per,Drop5id,Drop5per,Drop6id,Drop6per,Drop7id,Drop7per,Drop8id,Drop8per,Drop9id,Drop9per,DropCardid,DropCardper
// Note: Keep the Sprite_Name field as it is in the game client.
-1001,SCORPION,Scorpion,Scorpion,16,153,1,108,81,1,33,40,16,5,12,15,10,5,19,5,10,12,0,4,23,0x3195,200,1564,864,576,0,0,0,0,0,0,0,990,70,904,5500,757,57,943,210,7041,100,508,200,625,20,0,0,0,0,4068,1
+1001,SCORPION,Scorpion,Scorpion,16,153,1,108,81,1,33,40,16,5,12,15,10,5,19,5,10,12,0,4,23,0x3191,200,1564,864,576,0,0,0,0,0,0,0,990,70,904,5500,757,57,943,210,7041,100,508,200,625,20,0,0,0,0,4068,1
1002,PORING,Poring,Poring,1,60,1,27,20,1,8,9,2,5,6,1,1,0,6,5,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,909,7000,1202,100,938,400,512,1000,713,1500,512,150,619,20,0,0,0,0,4001,1
//1003,TESTEGG,Test Egg,Test Egg,2,100000,0,10,10,0,3,9,99,0,1,99,1,1,1,1,10,12,0,4,22,0,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,0,0,0
-1004,HORNET,Hornet,Hornet,11,90,1,81,60,1,13,16,7,1,12,24,4,5,6,5,10,12,0,4,24,0x1189,150,1292,792,216,0,0,0,0,0,0,0,992,80,939,9000,909,3500,1208,15,511,350,518,150,0,0,0,0,0,0,4019,1
-1005,FARMILIAR,Familiar,Familiar,24,427,1,144,162,1,68,77,26,5,15,19,20,5,20,1,10,12,0,2,27,0x3885,150,1276,576,384,0,0,0,0,0,0,0,913,5500,1105,20,2209,15,601,50,514,100,507,700,645,50,0,0,0,0,4020,1
+1004,HORNET,Hornet,Hornet,11,90,1,81,60,1,13,16,7,1,12,24,4,5,6,5,10,12,0,4,24,0x1181,150,1292,792,216,0,0,0,0,0,0,0,992,80,939,9000,909,3500,1208,15,511,350,518,150,0,0,0,0,0,0,4019,1
+1005,FARMILIAR,Familiar,Familiar,24,427,1,144,162,1,68,77,26,5,15,19,20,5,20,1,10,12,0,2,27,0x3881,150,1276,576,384,0,0,0,0,0,0,0,913,5500,1105,20,2209,15,601,50,514,100,507,700,645,50,0,0,0,0,4020,1
//1006,THIEF_BUG_LARVA,Thief Bug Larva,Thief Bug Larva,1,1,0,0,0,0,0,0,0,0,1,1,1,1,1,1,0,0,0,0,1,651,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1007,FABRE,Fabre,Fabre,6,72,1,54,41,1,12,15,24,0,12,5,5,5,12,5,10,12,0,4,22,0x181,400,1672,672,480,0,0,0,0,0,0,0,914,6500,949,500,1502,80,721,5,511,700,705,1000,1501,200,0,0,0,0,4002,1
1008,PUPA,Pupa,Pupa,4,66,1,36,27,1,1,4,24,2,11,1,3,3,8,6,10,12,0,4,22,0x100,1000,1001,1,1,0,0,0,0,0,0,0,1010,80,915,5500,938,600,2102,2,935,1000,938,600,1002,200,0,0,0,0,4003,1
-1009,CONDOR,Condor,Condor,12,114,1,81,60,1,14,20,7,5,14,7,6,0,13,5,10,12,1,2,24,0x1089,150,1148,648,480,0,0,0,0,0,0,0,917,9000,1702,150,715,80,1750,5500,517,400,916,2000,582,600,0,0,0,0,4015,1
+1009,CONDOR,Condor,Condor,12,114,1,81,60,1,14,20,7,5,14,7,6,0,13,5,10,12,1,2,24,0x1081,150,1148,648,480,0,0,0,0,0,0,0,917,9000,1702,150,715,80,1750,5500,517,400,916,2000,582,600,0,0,0,0,4015,1
1010,WILOW,Willow,Willow,8,91,1,63,47,1,13,18,38,2,13,3,8,5,12,5,10,12,1,3,22,0x81,200,1672,672,432,0,0,0,0,0,0,0,902,9000,1019,100,907,1500,516,700,1068,3500,1067,2000,1066,1000,0,0,0,0,4010,1
1011,CHONCHON,Chonchon,Chonchon,5,57,1,45,36,1,11,14,27,0,13,4,4,0,8,5,10,12,0,4,24,0x181,200,1076,576,480,0,0,0,0,0,0,0,998,50,935,6500,909,1500,1205,55,601,100,742,5,1002,150,0,0,0,0,4009,1
1012,RODA_FROG,Roda Frog,Roda Frog,13,160,1,90,68,1,19,23,12,5,12,6,4,0,14,9,10,12,1,5,21,0x81,200,2016,816,288,0,0,0,0,0,0,0,918,9000,908,500,511,300,721,7,713,2000,0,0,0,0,0,0,0,0,4014,1
@@ -54,7 +54,7 @@
1048,THIEF_BUG_EGG,Thief Bug Egg,Thief Bug Egg,20,344,1,126,143,0,1,2,64,10,10,1,50,0,3,15,10,12,0,4,27,0x100,1000,701,1,1,0,0,0,0,0,0,0,1010,300,915,5000,2102,2,938,600,716,100,737,10,1002,250,0,0,0,0,4012,1
1049,PICKY,Picky,Picky,9,95,1,63,47,1,18,19,21,3,14,9,10,0,10,3,10,12,0,2,23,0x81,200,988,288,168,0,0,0,0,0,0,0,916,9000,949,700,2302,150,507,550,519,300,715,50,0,0,0,0,0,0,4008,1
1050,PICKY_,Picky,Picky,10,89,1,72,54,1,18,38,48,10,15,8,8,5,9,3,10,12,0,2,23,0x81,200,988,288,168,0,0,0,0,0,0,0,916,9000,949,700,5015,10,507,600,519,300,715,50,10012,10,0,0,0,0,4011,1
-1051,THIEF_BUG,Thief Bug,Thief Bug,21,354,1,126,143,1,56,61,24,3,19,7,10,0,12,5,10,12,0,4,60,0x118B,150,1288,288,768,0,0,0,0,0,0,0,955,2500,2304,80,507,350,909,2000,2303,120,1002,250,0,0,0,0,0,0,4016,1
+1051,THIEF_BUG,Thief Bug,Thief Bug,21,354,1,126,143,1,56,61,24,3,19,7,10,0,12,5,10,12,0,4,60,0x1183,150,1288,288,768,0,0,0,0,0,0,0,955,2500,2304,80,507,350,909,2000,2303,120,1002,250,0,0,0,0,0,0,4016,1
1052,ROCKER,Rocker,Rocker,15,185,1,99,74,1,19,24,16,3,12,18,8,10,17,5,10,12,1,4,22,0x181,200,1864,864,540,0,0,0,0,0,0,0,940,9000,1916,10,2298,4,1402,80,520,10,752,10,703,10,0,0,0,0,4021,1
1053,THIEF_BUG_,Thief Bug Female,Thief Bug Female,28,531,1,180,203,1,42,58,28,7,12,10,23,10,24,10,10,12,1,4,27,0x118B,200,988,288,768,0,0,0,0,0,0,0,955,3500,910,250,1108,15,928,200,507,400,716,50,1002,300,0,0,0,0,4026,1
1054,THIEF_BUG__,Thief Bug Male,Thief Bug Male,30,595,1,198,224,1,46,67,40,20,17,37,22,5,31,13,10,12,1,4,27,0x318D,300,988,288,768,0,0,0,0,0,0,0,1011,40,928,5500,955,1500,1152,10,508,90,729,5,1116,50,0,0,0,0,4050,1
@@ -81,14 +81,14 @@
//1075,TURTLE,Turtle,Turtle,3,77,0,0,0,1,1,2,35,0,1,1,1,1,1,1,7,12,0,5,22,0x81,200,500,500,500,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1076,SKELETON,Skeleton,Skeleton,27,612,1,162,183,1,78,102,21,2,24,15,30,5,19,1,10,12,1,1,29,0x91,200,2228,528,576,0,0,0,0,0,0,0,1010,90,932,800,1505,80,909,3000,507,850,2609,30,0,0,0,0,0,0,4025,1
1077,POISON_SPORE,Poison Spore,Poison Spore,26,456,1,162,183,1,68,83,40,8,19,17,22,5,20,5,10,12,1,3,25,0x3885,200,1672,672,288,0,0,0,0,0,0,0,7033,9000,2221,20,511,550,510,60,972,50,921,1200,912,5,0,0,0,0,4048,1
-1078,RED_PLANT,Red Plant,Red Plant,1,10,0,0,0,1,1,2,100,99,0,0,0,0,0,0,7,12,0,3,22,0x40,2000,1,1,1,0,0,0,0,0,0,0,507,5500,712,1000,711,1000,905,500,7933,300,914,500,708,50,0,0,0,0,2269,2
+1078,RED_PLANT,Red Plant,Red Plant,1,5,0,0,0,1,1,2,100,99,0,0,0,0,0,0,7,12,0,3,22,0x40,2000,1,1,1,0,0,0,0,0,0,0,507,5500,712,1000,711,1000,905,500,7933,300,914,500,708,50,0,0,0,0,2269,2
1079,BLUE_PLANT,Blue Plant,Blue Plant,1,10,0,0,0,1,1,2,100,99,0,0,0,0,0,0,7,12,0,3,22,0x40,2000,1,1,1,0,0,0,0,0,0,0,510,5500,712,1000,711,1000,905,500,7932,300,522,50,514,1000,0,0,0,0,2270,2
-1080,GREEN_PLANT,Green Plant,Green Plant,1,10,0,0,0,1,1,2,100,99,0,0,0,0,0,0,7,12,0,3,22,0x40,2000,1,1,1,0,0,0,0,0,0,0,511,7000,7934,300,621,20,905,3000,906,1500,704,50,521,50,0,0,0,0,2270,2
-1081,YELLOW_PLANT,Yellow Plant,Yellow Plant,1,10,0,0,0,1,1,2,100,99,0,0,0,0,0,0,7,12,0,3,22,0x40,2000,1,1,1,0,0,0,0,0,0,0,508,5500,712,1000,711,1000,905,500,7937,300,707,5,914,500,0,0,0,0,2269,2
-1082,WHITE_PLANT,White Plant,White Plant,1,10,0,0,0,1,1,2,100,99,0,0,0,0,0,0,7,12,0,3,22,0x40,2000,1,1,1,0,0,0,0,0,0,0,509,5500,712,1000,631,20,905,3000,7935,300,521,50,703,50,0,0,0,0,2269,2
+1080,GREEN_PLANT,Green Plant,Green Plant,1,5,0,0,0,1,1,2,100,99,0,0,0,0,0,0,7,12,0,3,22,0x40,2000,1,1,1,0,0,0,0,0,0,0,511,7000,7934,300,621,20,905,3000,906,1500,704,50,521,50,0,0,0,0,2270,2
+1081,YELLOW_PLANT,Yellow Plant,Yellow Plant,1,6,0,0,0,1,1,2,100,99,0,0,0,0,0,0,7,12,0,3,22,0x40,2000,1,1,1,0,0,0,0,0,0,0,508,5500,712,1000,711,1000,905,500,7937,300,707,5,914,500,0,0,0,0,2269,2
+1082,WHITE_PLANT,White Plant,White Plant,1,7,0,0,0,1,1,2,100,99,0,0,0,0,0,0,7,12,0,3,22,0x40,2000,1,1,1,0,0,0,0,0,0,0,509,5500,712,1000,631,20,905,3000,7935,300,521,50,703,50,0,0,0,0,2269,2
1083,SHINING_PLANT,Shining Plant,Shining Plant,1,20,0,0,0,1,1,2,100,99,0,0,0,0,0,90,7,12,0,3,26,0x40,2000,1,1,1,0,0,0,0,0,0,0,510,5500,508,1000,509,1000,710,5,608,20,7938,500,607,50,0,0,0,0,714,1
-1084,BLACK_MUSHROOM,Black Mushroom,Black Mushroom,1,15,0,0,0,1,1,2,100,99,0,0,0,0,0,0,7,12,0,3,22,0x40,2000,1,1,1,0,0,0,0,0,0,0,970,50,971,50,630,20,949,2000,991,800,921,5500,921,5500,0,0,0,0,7033,5500
-1085,RED_MUSHROOM,Red Mushroom,Red Mushroom,1,15,0,0,0,1,1,2,100,99,0,0,0,0,0,0,7,12,0,3,22,0x40,2000,1,1,1,0,0,0,0,0,0,0,970,50,972,50,630,20,949,2000,990,1000,921,5500,921,5500,0,0,0,0,7033,5500
+1084,BLACK_MUSHROOM,Black Mushroom,Black Mushroom,1,5,0,0,0,1,1,2,100,99,0,0,0,0,0,0,7,12,0,3,22,0x40,2000,1,1,1,0,0,0,0,0,0,0,970,50,971,50,630,20,949,2000,991,800,921,5500,921,5500,0,0,0,0,7033,5500
+1085,RED_MUSHROOM,Red Mushroom,Red Mushroom,1,5,0,0,0,1,1,2,100,99,0,0,0,0,0,0,7,12,0,3,22,0x40,2000,1,1,1,0,0,0,0,0,0,0,970,50,972,50,630,20,949,2000,990,1000,921,5500,921,5500,0,0,0,0,7033,5500
1086,GOLDEN_BUG,Golden Thief Bug,Golden Thief Bug,65,222750,1,194400,155520,1,907,1750,159,81,71,77,80,62,127,76,10,12,2,4,43,0x11AB,100,768,768,480,97200,2610,2000,701,1000,0,0,969,1000,1524,150,2246,250,10016,500,714,300,985,2000,984,1500,0,0,0,0,4128,1
1087,ORK_HERO,Orc Hero,Orc Hero,50,362000,1,106920,97200,1,662,1103,197,70,97,82,107,71,144,43,10,12,2,7,42,0x37B5,150,1678,780,648,53460,725,2000,607,1500,999,5000,968,9700,10018,500,1366,150,2106,250,1124,1000,985,4559,1387,100,0,0,0,0,4143,1
1088,VOCAL,Vocal,Vocal,18,3317,1,99,79,1,71,82,77,26,77,26,26,30,53,40,10,12,1,4,22,0x3795,200,1080,648,480,0,0,0,0,0,0,0,2247,50,940,8000,721,1000,752,1500,2420,1000,7938,500,1917,10,0,0,0,0,4211,1
@@ -98,7 +98,7 @@
1092,VAGABOND_WOLF,Vagabond Wolf,Vagabond Wolf,93,8203,1,1422,2601,1,399,445,102,51,72,63,55,29,90,15,10,12,1,2,22,0x37B5,150,1048,648,432,0,0,0,0,0,0,0,2248,200,920,8000,728,1500,1148,100,2521,1000,7938,500,626,50,0,0,0,0,4183,1
1093,ECLIPSE,Eclipse,Eclipse,31,625,1,207,233,1,60,80,50,20,20,28,35,17,27,55,10,12,1,2,60,0x37B5,200,1456,456,336,0,0,0,0,0,0,0,2250,200,507,8000,727,1200,7938,500,706,30,622,50,2355,1000,0,0,0,0,4266,1
1094,AMBERNITE,Ambernite,Ambernite,19,340,1,117,87,1,26,37,28,0,16,20,11,10,21,5,10,12,2,4,21,0x191,400,2048,648,648,0,0,0,0,0,0,0,991,50,946,9000,910,1200,935,3000,943,2,757,14,1002,150,0,0,0,0,4032,1
-1095,ANDRE,Andre,Andre,33,724,1,216,243,1,51,72,55,16,11,20,40,10,24,10,10,12,0,4,22,0x118B,300,1288,288,384,0,0,0,0,0,0,0,955,9000,910,1000,938,500,993,50,1001,4,1002,350,757,28,0,0,0,0,4043,1
+1095,ANDRE,Andre,Andre,33,724,1,216,243,1,51,72,55,16,11,20,40,10,24,10,10,12,0,4,22,0x1181,300,1288,288,384,0,0,0,0,0,0,0,955,9000,910,1000,938,500,993,50,1001,4,1002,350,757,28,0,0,0,0,4043,1
1096,ANGELING,Angeling,Angeling,77,19800,1,3060,2693,1,355,500,72,238,58,50,33,105,67,200,10,12,1,8,86,0x37B5,200,1072,672,672,0,0,0,0,0,0,0,2254,100,2324,60,610,500,2282,1,509,2000,512,28,714,40,0,0,0,0,4054,1
1097,ANT_EGG,Ant Egg,Ant Egg,28,530,1,180,203,0,1,2,68,45,5,1,65,5,10,30,10,12,0,0,60,0x0,1000,1001,1,1,0,0,0,0,0,0,0,1010,320,935,2000,909,2000,938,650,713,2000,1002,200,0,0,0,0,0,0,4013,1
1098,ANUBIS,Anubis,Anubis,105,18826,1,3356,2450,1,480,695,103,48,88,67,40,128,89,55,10,12,2,7,49,0x3695,150,1250,720,576,0,0,0,0,0,0,0,12735,10,1625,10,934,550,984,105,1045,4365,2617,1,1614,3,0,0,0,0,4138,1
@@ -108,9 +108,9 @@
1102,BATHORY,Bathory,Bathory,86,5242,1,1170,1364,1,229,325,61,89,66,38,40,77,56,50,10,12,1,7,27,0x3695,100,1504,840,900,0,0,0,0,0,0,0,1001,200,1061,4850,2252,3,1611,5,1000,30,1006,15,637,20,0,0,0,0,4119,1
1103,CARAMEL,Caramel,Caramel,25,518,1,162,183,1,67,76,39,0,19,10,15,10,32,5,10,12,0,2,22,0x91,200,1604,840,756,0,0,0,0,0,0,0,1027,9000,2310,5,919,5500,1455,10,1405,15,1408,20,0,0,0,0,0,0,4063,1
1104,COCO,Coco,Coco,38,836,1,270,305,1,71,82,37,0,22,13,30,20,38,10,10,12,0,2,22,0x91,150,1864,864,1008,0,0,0,0,0,0,0,1026,9000,2502,20,914,3000,919,2500,516,500,2402,25,578,600,0,0,0,0,4041,1
-1105,DENIRO,Deniro,Deniro,31,671,1,207,233,1,45,61,52,16,15,16,30,10,23,15,10,12,0,4,22,0x118B,150,1288,288,576,0,0,0,0,0,0,0,955,9000,910,3000,938,1200,990,50,1001,8,1002,450,757,34,0,0,0,0,4043,1
+1105,DENIRO,Deniro,Deniro,31,671,1,207,233,1,45,61,52,16,15,16,30,10,23,15,10,12,0,4,22,0x1181,150,1288,288,576,0,0,0,0,0,0,0,955,9000,910,3000,938,1200,990,50,1001,8,1002,450,757,34,0,0,0,0,4043,1
1106,DESERT_WOLF,Desert Wolf,Desert Wolf,103,9447,1,1800,1350,1,520,579,114,47,93,69,63,61,82,42,10,12,1,2,23,0x308D,200,1120,420,288,0,0,0,0,0,0,0,1253,1,7030,5500,2311,1,6252,200,1287,1,756,53,1217,140,0,0,0,0,4082,1
-1107,DESERT_WOLF_B,Desert Wolf Baby,Baby Desert Wolf,14,140,1,90,68,1,33,41,13,0,10,12,8,5,17,7,10,12,0,2,23,0x1089,300,1600,900,240,0,0,0,0,0,0,0,1010,85,919,5500,2306,80,6252,200,2301,200,13011,5,582,1000,0,0,0,0,4023,1
+1107,DESERT_WOLF_B,Desert Wolf Baby,Baby Desert Wolf,14,140,1,90,68,1,33,41,13,0,10,12,8,5,17,7,10,12,0,2,23,0x1081,300,1600,900,240,0,0,0,0,0,0,0,1010,85,919,5500,2306,80,6252,200,2301,200,13011,5,582,1000,0,0,0,0,4023,1
1108,DEVIACE,Deviace,Deviace,60,3135,1,658,740,1,160,189,51,16,57,26,32,25,45,15,10,12,1,5,81,0x91,400,1680,480,384,0,0,0,0,0,0,0,995,25,1053,9000,1054,1000,5011,2,971,200,1256,3,756,161,0,0,0,0,4125,1
1109,DEVIRUCHI,Deviruchi,Deviruchi,93,8912,1,1806,2166,1,367,549,72,16,61,49,30,85,99,5,10,12,0,6,27,0x3795,150,980,600,384,0,0,0,0,0,0,0,1038,5335,1039,400,984,2,1458,2,1009,5,912,1500,756,154,0,0,0,0,4122,1
1110,DOKEBI,Dokebi,Dokebi,68,2820,1,675,759,1,317,347,85,20,52,56,35,20,60,25,10,12,0,6,27,0x191,250,1156,456,384,0,0,0,0,0,0,0,1021,9000,757,150,1517,2,1613,1,969,1,1501,300,1005,5,0,0,0,0,4098,1
@@ -163,7 +163,7 @@
1157,PHARAOH,Pharaoh,Pharaoh,85,500000,1,417600,334080,1,1476,3258,124,269,98,102,96,142,144,102,10,12,2,7,67,0x37B5,125,868,768,288,208800,607,5500,526,5000,732,5000,7113,5820,7114,2500,1136,100,2327,150,5002,500,1552,300,1231,80,0,0,0,0,4148,1
1158,PHEN,Phen,Phen,52,1963,1,446,503,1,97,127,44,11,54,15,35,15,25,15,10,12,1,5,41,0x91,150,2544,1344,1152,0,0,0,0,0,0,0,1023,5500,963,2000,720,5,517,1000,951,500,756,25,0,0,0,0,0,0,4077,1
1159,PHREEONI,Phreeoni,Phreeoni,71,300000,1,116000,180000,1,630,1597,269,98,88,70,112,87,102,71,10,12,2,2,60,0x37B5,200,1020,1020,288,58000,1008,500,730,1000,1000,4000,1015,9700,1223,500,1236,150,1014,5000,2288,300,985,2900,13047,100,0,0,0,0,4121,1
-1160,PIERE,Piere,Piere,32,696,1,216,243,1,47,67,57,16,19,19,36,8,27,15,10,12,0,4,22,0x118B,200,1288,288,576,0,0,0,0,0,0,0,955,9000,910,1100,938,600,992,30,1001,5,1002,400,757,31,0,0,0,0,4043,1
+1160,PIERE,Piere,Piere,32,696,1,216,243,1,47,67,57,16,19,19,36,8,27,15,10,12,0,4,22,0x1181,200,1288,288,576,0,0,0,0,0,0,0,955,9000,910,1100,938,600,992,30,1001,5,1002,400,757,31,0,0,0,0,4043,1
1161,PLANKTON,Plankton,Plankton,40,1232,1,334,375,1,75,111,28,28,23,53,25,55,35,14,10,12,0,3,61,0x81,400,2208,1008,324,0,0,0,0,0,0,0,1052,9000,910,300,938,700,970,4,713,1000,630,20,645,50,0,0,0,0,4024,1
1162,RAFFLESIA,Rafflesia,Rafflesia,86,5819,1,1170,1317,3,295,336,86,2,47,41,44,29,65,31,10,12,0,3,22,0x3885,150,512,528,240,0,0,0,0,0,0,0,1033,5500,911,1600,706,2,708,10,703,10,711,550,509,30,0,0,0,0,4083,1
1163,RAYDRIC,Raydric,Raydric,115,18408,1,2770,2076,1,572,668,89,15,129,87,55,32,76,27,10,12,2,7,47,0x3095,150,824,780,420,0,0,0,0,0,0,0,985,106,2266,1,2315,2,1158,2,1116,100,1004,10,7054,4850,0,0,0,0,4133,1
@@ -237,14 +237,14 @@
1234,PROVOKE_YOYO,Yoyo,Yoyo,19,879,1,122,77,1,71,82,0,0,1,24,30,35,32,55,10,12,0,2,22,0x108B,200,1054,54,384,0,0,0,0,0,0,0,942,6000,7182,500,508,130,919,5500,753,7,578,500,582,1000,0,0,0,0,4051,1
1235,SMOKING_ORC,Smoking Orc,Smoking Orc,24,1400,1,235,144,1,114,136,16,20,1,24,48,20,34,0,10,12,1,7,22,0x308D,200,1864,864,288,0,0,0,0,0,0,0,998,210,931,5500,756,40,2267,3,1352,10,1304,5,1301,100,0,0,0,0,4066,1
1236,META_ANT_EGG,Ant Egg,Ant Egg,4,420,1,5,4,0,1,2,32,20,1,1,1,0,1,20,10,12,0,0,60,0x0,1000,1001,1,1,0,0,0,0,0,0,0,1010,135,935,2740,909,3000,938,750,713,2000,1002,220,0,0,0,0,0,0,4013,1
-1237,META_ANDRE,Andre,Andre,17,688,1,98,64,1,60,71,16,0,1,17,24,20,26,20,10,12,0,4,22,0x118B,300,1288,288,576,0,0,0,0,0,0,0,955,6000,910,3000,938,1000,935,3000,1001,6,1002,350,757,28,0,0,0,0,4043,1
-1238,META_PIERE,Piere,Piere,18,733,1,110,70,1,64,75,24,0,1,18,26,20,27,15,10,12,0,4,22,0x118B,200,1288,288,576,0,0,0,0,0,0,0,955,5700,910,1100,938,600,992,15,1001,5,1002,400,757,31,0,0,0,0,4043,1
-1239,META_DENIRO,Deniro,Deniro,19,760,1,122,77,1,68,79,24,0,1,19,30,20,43,10,10,12,0,4,22,0x118B,150,1288,288,576,0,0,0,0,0,0,0,955,6000,910,3000,938,1200,990,45,1001,8,1002,450,757,34,0,0,0,0,4043,1
+1237,META_ANDRE,Andre,Andre,17,688,1,98,64,1,60,71,16,0,1,17,24,20,26,20,10,12,0,4,22,0x1181,300,1288,288,576,0,0,0,0,0,0,0,955,6000,910,3000,938,1000,935,3000,1001,6,1002,350,757,28,0,0,0,0,4043,1
+1238,META_PIERE,Piere,Piere,18,733,1,110,70,1,64,75,24,0,1,18,26,20,27,15,10,12,0,4,22,0x1181,200,1288,288,576,0,0,0,0,0,0,0,955,5700,910,1100,938,600,992,15,1001,5,1002,400,757,31,0,0,0,0,4043,1
+1239,META_DENIRO,Deniro,Deniro,19,760,1,122,77,1,68,79,24,0,1,19,30,20,43,10,10,12,0,4,22,0x1181,150,1288,288,576,0,0,0,0,0,0,0,955,6000,910,3000,938,1200,990,45,1001,8,1002,450,757,34,0,0,0,0,4043,1
1240,META_PICKY,Picky,Picky,3,80,1,4,3,1,9,12,0,0,1,3,3,0,10,30,10,12,0,2,23,0x81,200,988,288,168,0,0,0,0,0,0,0,916,6500,949,850,2302,150,507,650,519,350,715,60,0,0,0,0,0,0,4008,1
1241,META_PICKY_,Picky,Picky,4,83,1,5,4,1,8,11,32,0,1,3,3,0,11,20,10,12,0,2,23,0x81,200,988,288,168,0,0,0,0,0,0,0,916,6500,949,850,5015,7,507,750,519,350,715,60,0,0,0,0,0,0,4011,1
// Lutie (2.0)
-1242,MARIN,Marin,Marin,37,987,1,282,317,1,69,83,32,8,24,5,10,5,30,15,10,12,1,3,41,0x81,400,1872,672,480,0,0,0,0,0,0,0,910,3200,938,1500,700,100,720,40,510,75,529,350,5035,1,0,0,0,0,4196,1
+1242,MARIN,Marin,Marin,37,987,1,282,317,1,69,83,32,8,24,5,10,5,30,15,10,12,1,3,41,0x83,400,1872,672,480,0,0,0,0,0,0,0,910,3200,938,1500,700,100,720,40,510,75,529,350,5035,1,0,0,0,0,4196,1
1243,SASQUATCH,Sasquatch,Sasquatch,72,3163,1,765,860,1,266,296,101,28,70,35,60,10,59,20,10,12,2,2,60,0x3695,300,1260,192,192,0,0,0,0,0,0,0,912,750,509,800,949,1000,5030,1,948,5000,727,30,757,90,0,0,0,0,4216,1
1244,JAKK_XMAS,Christmas Jakk,Christmas Jakk,63,2054,1,1002,619,1,218,255,90,25,58,43,42,25,55,15,10,12,1,0,43,0x81,200,1180,480,648,0,0,0,0,0,0,0,1062,5335,912,900,985,31,2331,5,644,20,7175,1200,7174,1200,0,0,0,0,4109,1
1245,GOBLINE_XMAS,Christmas Goblin,Christmas Goblin,25,1176,1,254,154,1,118,140,16,5,1,53,25,20,38,45,10,12,1,7,24,0x81,100,1120,620,240,0,0,0,0,0,0,0,7174,550,7175,550,756,43,644,10,1211,10,2104,5,2236,10,0,0,0,0,4060,1
@@ -439,7 +439,7 @@
1418,DARK_SNAKE_LORD,Evil Snake Lord,Evil Snake Lord,105,1101000,1,720000,630000,3,2217,4203,314,185,122,172,107,135,196,88,10,12,2,2,68,0x37B5,200,588,816,420,78120,607,5500,608,3500,985,5500,7169,5820,10020,5100,1471,80,5012,80,1474,500,7226,900,661,2000,0,0,0,0,4330,1
// Additional G_Mobs
-1419,G_FARMILIAR,Familiar,Familiar,24,427,1,0,0,1,68,77,26,5,15,19,20,5,20,1,10,12,0,2,27,0x3885,150,1276,576,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1419,G_FARMILIAR,Familiar,Familiar,24,427,1,0,0,1,68,77,26,5,15,19,20,5,20,1,10,12,0,2,27,0x3881,150,1276,576,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1420,G_ARCHER_SKELETON,Archer Skeleton,Archer Skeleton,50,1646,1,0,0,9,90,113,47,10,30,29,20,10,32,5,10,12,1,1,29,0x3885,300,2864,864,576,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1421,G_ISIS,Isis,Isis,59,2092,1,0,0,1,192,229,83,5,58,43,22,5,39,15,10,12,2,6,27,0x3985,200,1384,768,336,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1422,G_HUNTER_FLY,Hunter Fly,Hunter Fly,63,2050,1,0,0,1,120,140,46,20,32,72,22,25,79,15,10,12,0,4,44,0x3985,150,676,576,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -591,7 +591,7 @@
1556,G_POISON_TOAD,Poison Toad,Poisonous Toad,87,4876,1,0,0,3,212,266,80,42,66,42,40,45,58,30,10,12,1,2,45,0x81,160,1148,1728,864,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1557,G_ROTAR_ZAIRO,Rotar Zairo,Rotar Zairo,48,1088,1,0,0,10,75,115,57,34,29,70,45,26,61,5,10,12,2,0,44,0x2085,155,2416,2016,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1558,G_SAND_MAN,Sandman,Sandman,61,2887,1,0,0,1,156,212,126,25,44,8,55,15,31,25,10,12,1,0,62,0x3885,250,1672,720,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1559,G_SCORPION,Scorpion,Scorpion,16,153,1,0,0,1,39,46,16,5,14,15,10,5,33,5,10,12,0,4,23,0x3195,200,1564,864,576,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1559,G_SCORPION,Scorpion,Scorpion,16,153,1,0,0,1,39,46,16,5,14,15,10,5,33,5,10,12,0,4,23,0x3191,200,1564,864,576,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1560,G_SHINOBI,Shinobi,Shinobi,95,8000,1,0,0,2,441,492,49,45,71,70,55,30,69,30,10,12,1,7,67,0x3695,150,1003,1152,336,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1561,G_SMOKIE,Smokie,Smokie,29,591,1,0,0,1,70,81,26,0,16,34,16,5,27,5,10,12,0,2,22,0x91,200,1576,576,420,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1562,G_SOLDIER_SKELETON,Soldier Skeleton,Soldier Skeleton,34,804,1,0,0,1,84,98,53,5,14,10,32,5,29,3,10,12,1,1,29,0x3885,200,2276,576,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -631,7 +631,7 @@
1592,A_MOBSTER,Gangster,Gangster,40,8000,0,0,0,1,300,355,32,27,1,50,45,45,73,30,10,12,1,7,20,0x11A9,250,1100,560,580,0,0,0,0,0,0,0,7049,10000,601,2000,1206,3000,713,1000,550,10000,0,0,0,0,0,0,0,0,0,0
1593,A_ANCIENT_MUMMY,Ancient Mummy,Ancient Mummy,52,8613,0,0,0,1,830,930,64,27,58,47,42,5,69,26,10,12,1,1,69,0xB5,175,1772,120,384,0,0,0,0,0,0,0,502,2000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1594,G_FREEZER,Freezer,Freezer,94,9990,1,0,0,2,388,438,127,38,68,47,50,45,55,25,10,12,1,2,41,0x3695,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
-1595,G_MARIN,Marin,Marin,37,987,1,0,0,1,69,83,32,8,24,5,10,5,30,15,10,12,1,3,41,0x81,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
+1595,G_MARIN,Marin,Marin,37,987,1,0,0,1,69,83,32,8,24,5,10,5,30,15,10,12,1,3,41,0x83,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
1596,G_TAMRUAN,Tamruan,Tamruan,73,3195,1,0,0,1,305,342,63,30,60,38,40,20,61,20,10,12,2,6,67,0x318D,140,512,1152,672,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1597,G_GARGOYLE,Gargoyle,Gargoyle,100,8772,1,0,0,9,383,472,98,43,100,61,60,57,100,70,10,12,1,6,64,0x2185,200,1020,720,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1598,G_BLAZZER,Blazzer,Blazzer,101,8121,1,0,0,2,461,555,116,60,99,75,55,70,60,65,10,12,1,6,43,0x3395,180,1732,1332,540,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -736,7 +736,7 @@
1684,G_ARCHDAM,Archdam,Archdam,119,20700,1,0,0,3,603,722,98,15,118,64,70,65,66,25,10,12,2,8,60,0x3885,180,1080,288,360,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1685,APOCALIPS_H,Vesper,Vesper,128,3802000,1,2700000,2250000,3,2620,7276,402,109,177,195,165,130,182,102,10,12,2,2,46,0x37B5,180,504,912,432,100000,617,5500,603,5000,732,2000,7095,5000,7094,3000,617,1000,2659,100,2660,100,2661,100,2662,100,0,0,0,0,4374,1
1686,ORC_BABY,Orc Baby,Orc Baby,43,1122,1,315,354,1,64,75,49,3,25,1,32,20,31,35,10,12,0,7,22,0x3885,200,672,864,288,0,0,0,0,0,0,0,7126,1000,10004,100,2299,1,519,5000,7270,200,7269,100,0,0,0,0,0,0,4375,1
-1687,GREEN_IGUANA,Green Iguana,Grove,55,2090,1,486,548,9,139,174,96,18,58,42,22,5,45,17,10,12,1,2,42,0x83,200,1152,1152,480,0,0,0,0,0,0,0,521,1500,903,1000,520,1000,511,1000,528,2000,606,10,6264,500,0,0,0,0,4377,1
+1687,GREEN_IGUANA,Green Iguana,Grove,55,2090,1,486,548,1,139,174,96,18,58,42,22,5,45,17,10,12,1,2,42,0x83,200,1152,1152,480,0,0,0,0,0,0,0,521,1500,903,1000,520,1000,511,1000,528,2000,606,10,6264,500,0,0,0,0,4377,1
1688,LADY_TANEE,Lady Tanee,Lady Tanee,80,360000,1,334080,261000,14,1760,2685,141,104,86,108,88,121,200,71,10,12,2,3,64,0x1A4,100,576,432,360,167040,617,5500,12095,5000,732,2000,12090,5000,634,4000,12129,1000,5116,1000,985,5000,617,2000,1716,6000,0,0,0,0,4376,1
1689,G_BACSOJIN,Bacsojin,White Lady,97,720500,1,0,0,3,1088,3124,210,178,118,244,98,126,205,102,10,12,2,7,64,0x37B5,130,576,960,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
1690,G_SPRING_RABBIT,Spring Rabbit,Spring Rabbit,12,15,1,0,0,1,0,0,160,99,1,1,1,1,1,1,10,12,1,2,20,0xC3,160,1120,552,511,0,0,0,0,0,0,0,6005,5000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -924,7 +924,7 @@
1854,E_MUKA,Muka,Muka,17,610,0,246,108,1,40,49,8,5,15,15,30,5,20,10,10,12,2,3,22,0x83,300,1960,960,384,0,0,0,0,0,0,0,993,70,952,9000,713,2000,7742,400,507,1000,1451,50,1002,250,0,0,0,0,4036,1
1855,E_POISONSPORE,Poison Spore,Poison Spore,19,665,0,167,84,1,89,101,0,0,1,19,25,0,24,0,10,12,1,3,25,0x3885,200,1672,672,288,0,0,0,0,0,0,0,7033,9000,2221,20,511,550,7743,60,972,50,921,1200,912,5,0,0,0,0,4048,1
1856,E_MAGNOLIA,Magnolia,Magnolia,26,3195,0,354,223,1,120,151,8,30,1,26,26,0,39,5,10,12,0,6,21,0x183,250,1560,360,360,0,0,0,0,0,0,0,7031,9000,910,800,911,100,912,10,737,40,7744,400,12127,5,0,0,0,0,4076,1
-1857,E_MARIN,Marin,Marin,15,742,0,59,40,1,39,43,0,10,1,10,10,5,35,15,10,12,1,3,41,0x81,400,1872,672,480,0,0,0,0,0,0,0,910,3200,938,1500,700,100,720,40,7745,75,529,350,5035,1,0,0,0,0,4196,1
+1857,E_MARIN,Marin,Marin,15,742,0,59,40,1,39,43,0,10,1,10,10,5,35,15,10,12,1,3,41,0x83,400,1872,672,480,0,0,0,0,0,0,0,910,3200,938,1500,700,100,720,40,7745,75,529,350,5035,1,0,0,0,0,4196,1
1858,E_PLANKTON,Plankton,Plankton,10,354,0,21,16,1,26,31,0,5,1,10,10,0,15,0,10,12,0,3,61,0x81,400,2208,1008,324,0,0,0,0,0,0,0,1052,9000,7746,300,938,700,970,4,713,1000,630,20,645,50,0,0,0,0,4024,1
1859,E_MANDRAGORA,Mandragora,Mandragora,12,405,0,41,29,4,26,35,0,25,1,12,24,0,36,15,10,12,1,3,62,0x84,1000,1768,768,576,0,0,0,0,0,0,0,993,50,905,9000,1405,30,7747,350,711,300,706,3,1967,10,0,0,0,0,4030,1
1860,E_COCO,Coco,Coco,17,817,0,108,70,1,56,67,0,0,24,17,34,20,24,10,10,12,0,2,22,0x91,150,1864,864,1008,0,0,0,0,0,0,0,1026,9000,2502,20,914,3000,919,2500,516,500,2402,25,7748,600,0,0,0,0,4041,1
@@ -976,7 +976,7 @@
// WoE Second Edition; Battlegrounds
1899,SWORD_GUARDIAN_,Sword Guardian,Sword Guardian,133,70000,0,0,0,2,451,580,122,33,122,87,54,65,103,65,14,16,2,7,80,0x20A5,170,140,384,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1900,BOW_GUARDIAN_,Archer Guardian,Archer Guardian,80,80404,1,0,0,12,1840,2520,64,62,95,80,33,90,165,55,14,16,2,7,80,0x20A5,170,76,384,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1901,E_CONDOR,Condor,Condor,10,15,0,90,90,1,13,20,10,15,1,1,1,50,100,100,10,12,0,2,26,0x1089,150,1148,648,480,0,0,0,0,0,0,0,7973,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1901,E_CONDOR,Condor,Condor,10,15,0,90,90,1,13,20,10,15,1,1,1,50,100,100,10,12,0,2,26,0x1081,150,1148,648,480,0,0,0,0,0,0,0,7973,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1902,E_TREASURE1,Treasure Box,Treasure Box,99,49,0,0,0,0,0,0,100,0,0,0,0,0,999,0,0,0,0,0,26,0x120,0,0,0,0,0,0,0,0,0,0,0,7782,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1903,E_TREASURE2,Treasure Box,Treasure Box,99,49,0,0,0,0,0,0,100,0,0,0,0,0,999,0,0,0,0,0,26,0x120,0,0,0,0,0,0,0,0,0,0,0,7783,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1904,BOMBPORING,Bomb Poring,Bomb Poring,28,1000000,1,415,256,1,120,320,160,99,1,28,28,0,33,50,10,12,0,0,20,0x308D,300,1672,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
@@ -1243,8 +1243,8 @@
//2124,EL_TERA_M,Tera,Tera,100,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,5,0,1,0,82,0x120,200,0,0,0,0,0,0,0,0,0,0,0
//2125,EL_TERA_L,Tera,Tera,100,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,5,0,2,0,82,0x120,200,0,0,0,0,0,0,0,0,0,0,0
2126,M_ANOPHELES,Anopheles,Anopheles,100,8000,1,0,0,1,300,400,0,0,40,70,40,40,80,40,10,12,0,4,64,0x3985,170,1084,2304,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
-2127,M_HORNET,Hornet,Hornet,110,9000,1,0,0,1,350,450,0,0,40,70,40,40,90,40,10,12,0,4,24,0x1189,150,1292,792,216,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-2128,M_HORNET2,Hornet,Hornet,120,10000,1,0,0,1,400,500,0,0,40,70,40,40,100,40,10,12,0,4,24,0x1189,150,1292,792,216,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+2127,M_HORNET,Hornet,Hornet,110,9000,1,0,0,1,350,450,0,0,40,70,40,40,90,40,10,12,0,4,24,0x1181,150,1292,792,216,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+2128,M_HORNET2,Hornet,Hornet,120,10000,1,0,0,1,400,500,0,0,40,70,40,40,100,40,10,12,0,4,24,0x1181,150,1292,792,216,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
2129,M_LUCIOLA_VESPA,Luciola Vespa,Luciola Vespa,130,11000,1,0,0,1,450,650,0,0,60,80,50,50,110,50,10,12,1,4,24,0x7795,110,1000,864,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
2130,M_LUCIOLA_VESPA2,Luciola Vespa,Luciola Vespa,140,12000,1,0,0,1,500,700,0,0,60,80,50,50,120,50,10,12,1,4,24,0x7795,110,1000,864,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
diff --git a/db/re/mob_skill_db.txt b/db/re/mob_skill_db.txt
index 83e2b7b93..575563537 100644
--- a/db/re/mob_skill_db.txt
+++ b/db/re/mob_skill_db.txt
@@ -1076,6 +1076,7 @@
1219,Knight of Abyss@NPC_ARMORBRAKE,attack,344,10,500,0,5000,yes,target,always,0,,,,,,,
1219,Knight of Abyss@CR_AUTOGUARD,chase,249,10,2000,0,300000,yes,self,longrangeattacked,,,,,,,,
1219,Knight of Abyss@CR_AUTOGUARD,attack,249,10,500,0,300000,yes,self,always,0,,,,,,,
+1242,Marin@NPC_EMOTION,loot,197,1,2000,0,5000,yes,self,always,0,2,,,,,,
1242,Marin@MG_FROSTDIVER,attack,15,5,500,1000,5000,yes,target,always,0,,,,,,,
1242,Marin@NPC_EMOTION,loot,197,1,2000,0,5000,yes,self,always,0,2,,,,,,
1242,Marin@NPC_WATERATTACK,attack,184,1,2000,0,5000,yes,target,always,0,,,,,,,
diff --git a/doc/atcommands.txt b/doc/atcommands.txt
index dd1eb80dd..28fcc342c 100644
--- a/doc/atcommands.txt
+++ b/doc/atcommands.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= rAthena Dev Team
//===== Current Version: =====================================
-//= 20121112
+//= 20121127
//===== Description: =========================================
//= List of available atcommands and their functions.
//============================================================
@@ -508,6 +508,7 @@ If @jail was used, the chat window will display "You have been jailed indefinite
@accinfo <player name/account id>
Searches for an account by ID or a character name, and outputs detailed information.
+Password will only be displayed for group levels lower than yours.
To search partial names, "%" can be used as a wildcard.
Example:
diff --git a/doc/script_commands.txt b/doc/script_commands.txt
index 94f62849c..a116fcf41 100644
--- a/doc/script_commands.txt
+++ b/doc/script_commands.txt
@@ -4088,8 +4088,7 @@ sprites, which is essential for making custom headgear.
Since a lot of people have different palettes for hair and clothes, it's
impossible to tell you what all the color numbers are. If you want a serious
example, there is a Stylist script inside the default rAthena installation that
-you can look at, this may help you create a Stylist of your own:
-'custom\dye.txt'
+you can look at: 'npc/custom/stylist.txt'
---------------------------------------
@@ -4114,8 +4113,8 @@ wall), the character is pushed only up to the obstacle.
This command will return the SVN revision number that the server is
currently running on.
- if ( get_revision() >= 15000 )
- mes "Welcome rAthena !";
+ if ( get_revision() >= 15000 )
+ mes "Welcome rAthena!";
---------------------------------------
\\
@@ -4508,7 +4507,7 @@ success rate must be specified (which adds to the base formula).
You can see the full list of runes that can be produced in 'db/produce_db.txt'.
The window will not be empty only if the invoking character can actually produce
-the items of that type and has the appropriate raw materials in their inventory.
+a rune and has the appropriate raw materials in their inventory.
---------------------------------------
@@ -6558,18 +6557,18 @@ the keyboard from a character that belonged to an account which had GM level 99.
The commands can also run without an attached rid.
-Example:
-
-//this would do the same as above, but now doesn't need a player attached by default.
- charCommand "#option 0 0 0 Roy";
+ // This would do the same as above, but now
+ // it doesn't need a player attached by default.
+ charcommand "#option 0 0 0 Roy";
---------------------------------------
*bindatcmd "command","<NPC object name>::<event label>"{,<atcommand level>,<charcommand level>};
*bindatcmd("command","<NPC object name>::<event label>"{,<atcommand level>,<charcommand level>});
-This command will bind a NPC event label to an atcommand. Upon execution of
-the atcommand, the user will invoke the NPC event label.
+This command will bind a NPC event label to an atcommand. Upon execution of the
+atcommand, the user will invoke the NPC event label. An array .@atcmd_parameters$[]
+will be filled with the given parameters, starting with an index of 0.
Example:
@@ -6733,10 +6732,13 @@ Example:
---------------------------------------
-*query_sql "your MySQL query", <array variable> {,<array variable>, ...};
-*query_logsql "your MySQL query", <array variable> {,<array variable>, ...};
+*query_sql("your MySQL query"{, <array variable>{, <array variable>{, ...}}});
+*query_logsql("your MySQL query"{, <array variable>{, <array variable>{, ...}}});
-Puts up to 128 rows of values into the arrays and returns the number of rows.
+Executes an SQL query. A 'select' query can fill array variables with up to 128 rows of values,
+and will return the number of rows (i.e. array size).
+
+Note that 'query_sql' runs on the main database while 'query_logsql' runs on the log database.
Example:
set @nb, query_sql("select name,fame from `char` ORDER BY fame DESC LIMIT 5", @name$, @fame);
@@ -6747,12 +6749,6 @@ mes "3."+@name$[2]+"("+@fame[2]+")";
mes "4."+@name$[3]+"("+@fame[3]+")";
mes "5."+@name$[4]+"("+@fame[4]+")";
-Note: In the TXT version it doesn't fill the array and always return -1.
-Note: Use $ as suffix in the array to receive all data as text.
-Note: The difference between query_sql and query_logsql is that the latter
-uses the sql connection to the log database, and should be used when you want
-to query the server log tables.
-
---------------------------------------
*escape_sql(<value>)
diff --git a/sql-files/mob_db_re.sql b/sql-files/mob_db_re.sql
index 89171e01b..67ac58535 100644
--- a/sql-files/mob_db_re.sql
+++ b/sql-files/mob_db_re.sql
@@ -70,15 +70,15 @@ CREATE TABLE `mob_db` (
# REPLACE INTO `mob_db` VALUES ( ID,'Sprite_Name','kROName','iROName',LV,HP,SP,EXP,JEXP,Range1,ATK1,ATK2,DEF,MDEF,STR,AGI,VIT,INT,DEX,LUK,Range2,Range3,Scale,Race,Element,Mode,Speed,aDelay,aMotion,dMotion,MEXP,MVP1id,MVP1per,MVP2id,MVP2per,MVP3id,MVP3per,Drop1id,Drop1per,Drop2id,Drop2per,Drop3id,Drop3per,Drop4id,Drop4per,Drop5id,Drop5per,Drop6id,Drop6per,Drop7id,Drop7per,Drop8id,Drop8per,Drop9id,Drop9per,DropCardid,DropCardper);
# Note: Keep the Sprite_Name field as it is (in the game client). You may change Name,JName field though
-REPLACE INTO `mob_db` VALUES (1001,'SCORPION','Scorpion','Scorpion',16,153,1,108,81,1,33,40,16,5,12,15,10,5,19,5,10,12,0,4,23,0x3195,200,1564,864,576,0,0,0,0,0,0,0,990,70,904,5500,757,57,943,210,7041,100,508,200,625,20,0,0,0,0,4068,1);
+REPLACE INTO `mob_db` VALUES (1001,'SCORPION','Scorpion','Scorpion',16,153,1,108,81,1,33,40,16,5,12,15,10,5,19,5,10,12,0,4,23,0x3191,200,1564,864,576,0,0,0,0,0,0,0,990,70,904,5500,757,57,943,210,7041,100,508,200,625,20,0,0,0,0,4068,1);
REPLACE INTO `mob_db` VALUES (1002,'PORING','Poring','Poring',1,60,1,27,20,1,8,9,2,5,6,1,1,0,6,5,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,909,7000,1202,100,938,400,512,1000,713,1500,512,150,619,20,0,0,0,0,4001,1);
# REPLACE INTO `mob_db` VALUES (1003,'TESTEGG','Test Egg','Test Egg',2,100000,0,10,10,0,3,9,99,0,1,99,1,1,1,1,10,12,0,4,22,0,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,0,0,0);
-REPLACE INTO `mob_db` VALUES (1004,'HORNET','Hornet','Hornet',11,90,1,81,60,1,13,16,7,1,12,24,4,5,6,5,10,12,0,4,24,0x1189,150,1292,792,216,0,0,0,0,0,0,0,992,80,939,9000,909,3500,1208,15,511,350,518,150,0,0,0,0,0,0,4019,1);
-REPLACE INTO `mob_db` VALUES (1005,'FARMILIAR','Familiar','Familiar',24,427,1,144,162,1,68,77,26,5,15,19,20,5,20,1,10,12,0,2,27,0x3885,150,1276,576,384,0,0,0,0,0,0,0,913,5500,1105,20,2209,15,601,50,514,100,507,700,645,50,0,0,0,0,4020,1);
+REPLACE INTO `mob_db` VALUES (1004,'HORNET','Hornet','Hornet',11,90,1,81,60,1,13,16,7,1,12,24,4,5,6,5,10,12,0,4,24,0x1181,150,1292,792,216,0,0,0,0,0,0,0,992,80,939,9000,909,3500,1208,15,511,350,518,150,0,0,0,0,0,0,4019,1);
+REPLACE INTO `mob_db` VALUES (1005,'FARMILIAR','Familiar','Familiar',24,427,1,144,162,1,68,77,26,5,15,19,20,5,20,1,10,12,0,2,27,0x3881,150,1276,576,384,0,0,0,0,0,0,0,913,5500,1105,20,2209,15,601,50,514,100,507,700,645,50,0,0,0,0,4020,1);
# REPLACE INTO `mob_db` VALUES (1006,'THIEF_BUG_LARVA','Thief Bug Larva','Thief Bug Larva',1,1,0,0,0,0,0,0,0,0,1,1,1,1,1,1,0,0,0,0,1,651,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
REPLACE INTO `mob_db` VALUES (1007,'FABRE','Fabre','Fabre',6,72,1,54,41,1,12,15,24,0,12,5,5,5,12,5,10,12,0,4,22,0x181,400,1672,672,480,0,0,0,0,0,0,0,914,6500,949,500,1502,80,721,5,511,700,705,1000,1501,200,0,0,0,0,4002,1);
REPLACE INTO `mob_db` VALUES (1008,'PUPA','Pupa','Pupa',4,66,1,36,27,1,1,4,24,2,11,1,3,3,8,6,10,12,0,4,22,0x100,1000,1001,1,1,0,0,0,0,0,0,0,1010,80,915,5500,938,600,2102,2,935,1000,938,600,1002,200,0,0,0,0,4003,1);
-REPLACE INTO `mob_db` VALUES (1009,'CONDOR','Condor','Condor',12,114,1,81,60,1,14,20,7,5,14,7,6,0,13,5,10,12,1,2,24,0x1089,150,1148,648,480,0,0,0,0,0,0,0,917,9000,1702,150,715,80,1750,5500,517,400,916,2000,582,600,0,0,0,0,4015,1);
+REPLACE INTO `mob_db` VALUES (1009,'CONDOR','Condor','Condor',12,114,1,81,60,1,14,20,7,5,14,7,6,0,13,5,10,12,1,2,24,0x1081,150,1148,648,480,0,0,0,0,0,0,0,917,9000,1702,150,715,80,1750,5500,517,400,916,2000,582,600,0,0,0,0,4015,1);
REPLACE INTO `mob_db` VALUES (1010,'WILOW','Willow','Willow',8,91,1,63,47,1,13,18,38,2,13,3,8,5,12,5,10,12,1,3,22,0x81,200,1672,672,432,0,0,0,0,0,0,0,902,9000,1019,100,907,1500,516,700,1068,3500,1067,2000,1066,1000,0,0,0,0,4010,1);
REPLACE INTO `mob_db` VALUES (1011,'CHONCHON','Chonchon','Chonchon',5,57,1,45,36,1,11,14,27,0,13,4,4,0,8,5,10,12,0,4,24,0x181,200,1076,576,480,0,0,0,0,0,0,0,998,50,935,6500,909,1500,1205,55,601,100,742,5,1002,150,0,0,0,0,4009,1);
REPLACE INTO `mob_db` VALUES (1012,'RODA_FROG','Roda Frog','Roda Frog',13,160,1,90,68,1,19,23,12,5,12,6,4,0,14,9,10,12,1,5,21,0x81,200,2016,816,288,0,0,0,0,0,0,0,918,9000,908,500,511,300,721,7,713,2000,0,0,0,0,0,0,0,0,4014,1);
@@ -120,7 +120,7 @@ REPLACE INTO `mob_db` VALUES (1047,'PECOPECO_EGG','Peco Peco Egg','Peco Peco Egg
REPLACE INTO `mob_db` VALUES (1048,'THIEF_BUG_EGG','Thief Bug Egg','Thief Bug Egg',20,344,1,126,143,0,1,2,64,10,10,1,50,0,3,15,10,12,0,4,27,0x100,1000,701,1,1,0,0,0,0,0,0,0,1010,300,915,5000,2102,2,938,600,716,100,737,10,1002,250,0,0,0,0,4012,1);
REPLACE INTO `mob_db` VALUES (1049,'PICKY','Picky','Picky',9,95,1,63,47,1,18,19,21,3,14,9,10,0,10,3,10,12,0,2,23,0x81,200,988,288,168,0,0,0,0,0,0,0,916,9000,949,700,2302,150,507,550,519,300,715,50,0,0,0,0,0,0,4008,1);
REPLACE INTO `mob_db` VALUES (1050,'PICKY_','Picky','Picky',10,89,1,72,54,1,18,38,48,10,15,8,8,5,9,3,10,12,0,2,23,0x81,200,988,288,168,0,0,0,0,0,0,0,916,9000,949,700,5015,10,507,600,519,300,715,50,10012,10,0,0,0,0,4011,1);
-REPLACE INTO `mob_db` VALUES (1051,'THIEF_BUG','Thief Bug','Thief Bug',21,354,1,126,143,1,56,61,24,3,19,7,10,0,12,5,10,12,0,4,60,0x118B,150,1288,288,768,0,0,0,0,0,0,0,955,2500,2304,80,507,350,909,2000,2303,120,1002,250,0,0,0,0,0,0,4016,1);
+REPLACE INTO `mob_db` VALUES (1051,'THIEF_BUG','Thief Bug','Thief Bug',21,354,1,126,143,1,56,61,24,3,19,7,10,0,12,5,10,12,0,4,60,0x1183,150,1288,288,768,0,0,0,0,0,0,0,955,2500,2304,80,507,350,909,2000,2303,120,1002,250,0,0,0,0,0,0,4016,1);
REPLACE INTO `mob_db` VALUES (1052,'ROCKER','Rocker','Rocker',15,185,1,99,74,1,19,24,16,3,12,18,8,10,17,5,10,12,1,4,22,0x181,200,1864,864,540,0,0,0,0,0,0,0,940,9000,1916,10,2298,4,1402,80,520,10,752,10,703,10,0,0,0,0,4021,1);
REPLACE INTO `mob_db` VALUES (1053,'THIEF_BUG_','Thief Bug Female','Thief Bug Female',28,531,1,180,203,1,42,58,28,7,12,10,23,10,24,10,10,12,1,4,27,0x118B,200,988,288,768,0,0,0,0,0,0,0,955,3500,910,250,1108,15,928,200,507,400,716,50,1002,300,0,0,0,0,4026,1);
REPLACE INTO `mob_db` VALUES (1054,'THIEF_BUG__','Thief Bug Male','Thief Bug Male',30,595,1,198,224,1,46,67,40,20,17,37,22,5,31,13,10,12,1,4,27,0x318D,300,988,288,768,0,0,0,0,0,0,0,1011,40,928,5500,955,1500,1152,10,508,90,729,5,1116,50,0,0,0,0,4050,1);
@@ -147,14 +147,14 @@ REPLACE INTO `mob_db` VALUES (1074,'SHELLFISH','Shellfish','Shellfish',50,1680,1
# REPLACE INTO `mob_db` VALUES (1075,'TURTLE','Turtle','Turtle',3,77,0,0,0,1,1,2,35,0,1,1,1,1,1,1,7,12,0,5,22,0x81,200,500,500,500,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
REPLACE INTO `mob_db` VALUES (1076,'SKELETON','Skeleton','Skeleton',27,612,1,162,183,1,78,102,21,2,24,15,30,5,19,1,10,12,1,1,29,0x91,200,2228,528,576,0,0,0,0,0,0,0,1010,90,932,800,1505,80,909,3000,507,850,2609,30,0,0,0,0,0,0,4025,1);
REPLACE INTO `mob_db` VALUES (1077,'POISON_SPORE','Poison Spore','Poison Spore',26,456,1,162,183,1,68,83,40,8,19,17,22,5,20,5,10,12,1,3,25,0x3885,200,1672,672,288,0,0,0,0,0,0,0,7033,9000,2221,20,511,550,510,60,972,50,921,1200,912,5,0,0,0,0,4048,1);
-REPLACE INTO `mob_db` VALUES (1078,'RED_PLANT','Red Plant','Red Plant',1,10,0,0,0,1,1,2,100,99,0,0,0,0,0,0,7,12,0,3,22,0x40,2000,1,1,1,0,0,0,0,0,0,0,507,5500,712,1000,711,1000,905,500,7933,300,914,500,708,50,0,0,0,0,2269,2);
+REPLACE INTO `mob_db` VALUES (1078,'RED_PLANT','Red Plant','Red Plant',1,5,0,0,0,1,1,2,100,99,0,0,0,0,0,0,7,12,0,3,22,0x40,2000,1,1,1,0,0,0,0,0,0,0,507,5500,712,1000,711,1000,905,500,7933,300,914,500,708,50,0,0,0,0,2269,2);
REPLACE INTO `mob_db` VALUES (1079,'BLUE_PLANT','Blue Plant','Blue Plant',1,10,0,0,0,1,1,2,100,99,0,0,0,0,0,0,7,12,0,3,22,0x40,2000,1,1,1,0,0,0,0,0,0,0,510,5500,712,1000,711,1000,905,500,7932,300,522,50,514,1000,0,0,0,0,2270,2);
-REPLACE INTO `mob_db` VALUES (1080,'GREEN_PLANT','Green Plant','Green Plant',1,10,0,0,0,1,1,2,100,99,0,0,0,0,0,0,7,12,0,3,22,0x40,2000,1,1,1,0,0,0,0,0,0,0,511,7000,7934,300,621,20,905,3000,906,1500,704,50,521,50,0,0,0,0,2270,2);
-REPLACE INTO `mob_db` VALUES (1081,'YELLOW_PLANT','Yellow Plant','Yellow Plant',1,10,0,0,0,1,1,2,100,99,0,0,0,0,0,0,7,12,0,3,22,0x40,2000,1,1,1,0,0,0,0,0,0,0,508,5500,712,1000,711,1000,905,500,7937,300,707,5,914,500,0,0,0,0,2269,2);
-REPLACE INTO `mob_db` VALUES (1082,'WHITE_PLANT','White Plant','White Plant',1,10,0,0,0,1,1,2,100,99,0,0,0,0,0,0,7,12,0,3,22,0x40,2000,1,1,1,0,0,0,0,0,0,0,509,5500,712,1000,631,20,905,3000,7935,300,521,50,703,50,0,0,0,0,2269,2);
+REPLACE INTO `mob_db` VALUES (1080,'GREEN_PLANT','Green Plant','Green Plant',1,5,0,0,0,1,1,2,100,99,0,0,0,0,0,0,7,12,0,3,22,0x40,2000,1,1,1,0,0,0,0,0,0,0,511,7000,7934,300,621,20,905,3000,906,1500,704,50,521,50,0,0,0,0,2270,2);
+REPLACE INTO `mob_db` VALUES (1081,'YELLOW_PLANT','Yellow Plant','Yellow Plant',1,6,0,0,0,1,1,2,100,99,0,0,0,0,0,0,7,12,0,3,22,0x40,2000,1,1,1,0,0,0,0,0,0,0,508,5500,712,1000,711,1000,905,500,7937,300,707,5,914,500,0,0,0,0,2269,2);
+REPLACE INTO `mob_db` VALUES (1082,'WHITE_PLANT','White Plant','White Plant',1,7,0,0,0,1,1,2,100,99,0,0,0,0,0,0,7,12,0,3,22,0x40,2000,1,1,1,0,0,0,0,0,0,0,509,5500,712,1000,631,20,905,3000,7935,300,521,50,703,50,0,0,0,0,2269,2);
REPLACE INTO `mob_db` VALUES (1083,'SHINING_PLANT','Shining Plant','Shining Plant',1,20,0,0,0,1,1,2,100,99,0,0,0,0,0,90,7,12,0,3,26,0x40,2000,1,1,1,0,0,0,0,0,0,0,510,5500,508,1000,509,1000,710,5,608,20,7938,500,607,50,0,0,0,0,714,1);
-REPLACE INTO `mob_db` VALUES (1084,'BLACK_MUSHROOM','Black Mushroom','Black Mushroom',1,15,0,0,0,1,1,2,100,99,0,0,0,0,0,0,7,12,0,3,22,0x40,2000,1,1,1,0,0,0,0,0,0,0,970,50,971,50,630,20,949,2000,991,800,921,5500,921,5500,0,0,0,0,7033,5500);
-REPLACE INTO `mob_db` VALUES (1085,'RED_MUSHROOM','Red Mushroom','Red Mushroom',1,15,0,0,0,1,1,2,100,99,0,0,0,0,0,0,7,12,0,3,22,0x40,2000,1,1,1,0,0,0,0,0,0,0,970,50,972,50,630,20,949,2000,990,1000,921,5500,921,5500,0,0,0,0,7033,5500);
+REPLACE INTO `mob_db` VALUES (1084,'BLACK_MUSHROOM','Black Mushroom','Black Mushroom',1,5,0,0,0,1,1,2,100,99,0,0,0,0,0,0,7,12,0,3,22,0x40,2000,1,1,1,0,0,0,0,0,0,0,970,50,971,50,630,20,949,2000,991,800,921,5500,921,5500,0,0,0,0,7033,5500);
+REPLACE INTO `mob_db` VALUES (1085,'RED_MUSHROOM','Red Mushroom','Red Mushroom',1,5,0,0,0,1,1,2,100,99,0,0,0,0,0,0,7,12,0,3,22,0x40,2000,1,1,1,0,0,0,0,0,0,0,970,50,972,50,630,20,949,2000,990,1000,921,5500,921,5500,0,0,0,0,7033,5500);
REPLACE INTO `mob_db` VALUES (1086,'GOLDEN_BUG','Golden Thief Bug','Golden Thief Bug',65,222750,1,194400,155520,1,907,1750,159,81,71,77,80,62,127,76,10,12,2,4,43,0x11AB,100,768,768,480,97200,2610,2000,701,1000,0,0,969,1000,1524,150,2246,250,10016,500,714,300,985,2000,984,1500,0,0,0,0,4128,1);
REPLACE INTO `mob_db` VALUES (1087,'ORK_HERO','Orc Hero','Orc Hero',50,362000,1,106920,97200,1,662,1103,197,70,97,82,107,71,144,43,10,12,2,7,42,0x37B5,150,1678,780,648,53460,725,2000,607,1500,999,5000,968,9700,10018,500,1366,150,2106,250,1124,1000,985,4559,1387,100,0,0,0,0,4143,1);
REPLACE INTO `mob_db` VALUES (1088,'VOCAL','Vocal','Vocal',18,3317,1,99,79,1,71,82,77,26,77,26,26,30,53,40,10,12,1,4,22,0x3795,200,1080,648,480,0,0,0,0,0,0,0,2247,50,940,8000,721,1000,752,1500,2420,1000,7938,500,1917,10,0,0,0,0,4211,1);
@@ -164,7 +164,7 @@ REPLACE INTO `mob_db` VALUES (1091,'DRAGON_FLY','Dragon Fly','Dragon Fly',47,103
REPLACE INTO `mob_db` VALUES (1092,'VAGABOND_WOLF','Vagabond Wolf','Vagabond Wolf',93,8203,1,1422,2601,1,399,445,102,51,72,63,55,29,90,15,10,12,1,2,22,0x37B5,150,1048,648,432,0,0,0,0,0,0,0,2248,200,920,8000,728,1500,1148,100,2521,1000,7938,500,626,50,0,0,0,0,4183,1);
REPLACE INTO `mob_db` VALUES (1093,'ECLIPSE','Eclipse','Eclipse',31,625,1,207,233,1,60,80,50,20,20,28,35,17,27,55,10,12,1,2,60,0x37B5,200,1456,456,336,0,0,0,0,0,0,0,2250,200,507,8000,727,1200,7938,500,706,30,622,50,2355,1000,0,0,0,0,4266,1);
REPLACE INTO `mob_db` VALUES (1094,'AMBERNITE','Ambernite','Ambernite',19,340,1,117,87,1,26,37,28,0,16,20,11,10,21,5,10,12,2,4,21,0x191,400,2048,648,648,0,0,0,0,0,0,0,991,50,946,9000,910,1200,935,3000,943,2,757,14,1002,150,0,0,0,0,4032,1);
-REPLACE INTO `mob_db` VALUES (1095,'ANDRE','Andre','Andre',33,724,1,216,243,1,51,72,55,16,11,20,40,10,24,10,10,12,0,4,22,0x118B,300,1288,288,384,0,0,0,0,0,0,0,955,9000,910,1000,938,500,993,50,1001,4,1002,350,757,28,0,0,0,0,4043,1);
+REPLACE INTO `mob_db` VALUES (1095,'ANDRE','Andre','Andre',33,724,1,216,243,1,51,72,55,16,11,20,40,10,24,10,10,12,0,4,22,0x1181,300,1288,288,384,0,0,0,0,0,0,0,955,9000,910,1000,938,500,993,50,1001,4,1002,350,757,28,0,0,0,0,4043,1);
REPLACE INTO `mob_db` VALUES (1096,'ANGELING','Angeling','Angeling',77,19800,1,3060,2693,1,355,500,72,238,58,50,33,105,67,200,10,12,1,8,86,0x37B5,200,1072,672,672,0,0,0,0,0,0,0,2254,100,2324,60,610,500,2282,1,509,2000,512,28,714,40,0,0,0,0,4054,1);
REPLACE INTO `mob_db` VALUES (1097,'ANT_EGG','Ant Egg','Ant Egg',28,530,1,180,203,0,1,2,68,45,5,1,65,5,10,30,10,12,0,0,60,0x0,1000,1001,1,1,0,0,0,0,0,0,0,1010,320,935,2000,909,2000,938,650,713,2000,1002,200,0,0,0,0,0,0,4013,1);
REPLACE INTO `mob_db` VALUES (1098,'ANUBIS','Anubis','Anubis',105,18826,1,3356,2450,1,480,695,103,48,88,67,40,128,89,55,10,12,2,7,49,0x3695,150,1250,720,576,0,0,0,0,0,0,0,12735,10,1625,10,934,550,984,105,1045,4365,2617,1,1614,3,0,0,0,0,4138,1);
@@ -174,9 +174,9 @@ REPLACE INTO `mob_db` VALUES (1101,'BAPHOMET_','Baphomet Jr.','Baphomet Jr.',57,
REPLACE INTO `mob_db` VALUES (1102,'BATHORY','Bathory','Bathory',86,5242,1,1170,1364,1,229,325,61,89,66,38,40,77,56,50,10,12,1,7,27,0x3695,100,1504,840,900,0,0,0,0,0,0,0,1001,200,1061,4850,2252,3,1611,5,1000,30,1006,15,637,20,0,0,0,0,4119,1);
REPLACE INTO `mob_db` VALUES (1103,'CARAMEL','Caramel','Caramel',25,518,1,162,183,1,67,76,39,0,19,10,15,10,32,5,10,12,0,2,22,0x91,200,1604,840,756,0,0,0,0,0,0,0,1027,9000,2310,5,919,5500,1455,10,1405,15,1408,20,0,0,0,0,0,0,4063,1);
REPLACE INTO `mob_db` VALUES (1104,'COCO','Coco','Coco',38,836,1,270,305,1,71,82,37,0,22,13,30,20,38,10,10,12,0,2,22,0x91,150,1864,864,1008,0,0,0,0,0,0,0,1026,9000,2502,20,914,3000,919,2500,516,500,2402,25,578,600,0,0,0,0,4041,1);
-REPLACE INTO `mob_db` VALUES (1105,'DENIRO','Deniro','Deniro',31,671,1,207,233,1,45,61,52,16,15,16,30,10,23,15,10,12,0,4,22,0x118B,150,1288,288,576,0,0,0,0,0,0,0,955,9000,910,3000,938,1200,990,50,1001,8,1002,450,757,34,0,0,0,0,4043,1);
+REPLACE INTO `mob_db` VALUES (1105,'DENIRO','Deniro','Deniro',31,671,1,207,233,1,45,61,52,16,15,16,30,10,23,15,10,12,0,4,22,0x1181,150,1288,288,576,0,0,0,0,0,0,0,955,9000,910,3000,938,1200,990,50,1001,8,1002,450,757,34,0,0,0,0,4043,1);
REPLACE INTO `mob_db` VALUES (1106,'DESERT_WOLF','Desert Wolf','Desert Wolf',103,9447,1,1800,1350,1,520,579,114,47,93,69,63,61,82,42,10,12,1,2,23,0x308D,200,1120,420,288,0,0,0,0,0,0,0,1253,1,7030,5500,2311,1,6252,200,1287,1,756,53,1217,140,0,0,0,0,4082,1);
-REPLACE INTO `mob_db` VALUES (1107,'DESERT_WOLF_B','Desert Wolf Baby','Baby Desert Wolf',14,140,1,90,68,1,33,41,13,0,10,12,8,5,17,7,10,12,0,2,23,0x1089,300,1600,900,240,0,0,0,0,0,0,0,1010,85,919,5500,2306,80,6252,200,2301,200,13011,5,582,1000,0,0,0,0,4023,1);
+REPLACE INTO `mob_db` VALUES (1107,'DESERT_WOLF_B','Desert Wolf Baby','Baby Desert Wolf',14,140,1,90,68,1,33,41,13,0,10,12,8,5,17,7,10,12,0,2,23,0x1081,300,1600,900,240,0,0,0,0,0,0,0,1010,85,919,5500,2306,80,6252,200,2301,200,13011,5,582,1000,0,0,0,0,4023,1);
REPLACE INTO `mob_db` VALUES (1108,'DEVIACE','Deviace','Deviace',60,3135,1,658,740,1,160,189,51,16,57,26,32,25,45,15,10,12,1,5,81,0x91,400,1680,480,384,0,0,0,0,0,0,0,995,25,1053,9000,1054,1000,5011,2,971,200,1256,3,756,161,0,0,0,0,4125,1);
REPLACE INTO `mob_db` VALUES (1109,'DEVIRUCHI','Deviruchi','Deviruchi',93,8912,1,1806,2166,1,367,549,72,16,61,49,30,85,99,5,10,12,0,6,27,0x3795,150,980,600,384,0,0,0,0,0,0,0,1038,5335,1039,400,984,2,1458,2,1009,5,912,1500,756,154,0,0,0,0,4122,1);
REPLACE INTO `mob_db` VALUES (1110,'DOKEBI','Dokebi','Dokebi',68,2820,1,675,759,1,317,347,85,20,52,56,35,20,60,25,10,12,0,6,27,0x191,250,1156,456,384,0,0,0,0,0,0,0,1021,9000,757,150,1517,2,1613,1,969,1,1501,300,1005,5,0,0,0,0,4098,1);
@@ -229,7 +229,7 @@ REPLACE INTO `mob_db` VALUES (1156,'PETIT_','Petite','Petite',79,3556,1,900,1013
REPLACE INTO `mob_db` VALUES (1157,'PHARAOH','Pharaoh','Pharaoh',85,500000,1,417600,334080,1,1476,3258,124,269,98,102,96,142,144,102,10,12,2,7,67,0x37B5,125,868,768,288,208800,607,5500,526,5000,732,5000,7113,5820,7114,2500,1136,100,2327,150,5002,500,1552,300,1231,80,0,0,0,0,4148,1);
REPLACE INTO `mob_db` VALUES (1158,'PHEN','Phen','Phen',52,1963,1,446,503,1,97,127,44,11,54,15,35,15,25,15,10,12,1,5,41,0x91,150,2544,1344,1152,0,0,0,0,0,0,0,1023,5500,963,2000,720,5,517,1000,951,500,756,25,0,0,0,0,0,0,4077,1);
REPLACE INTO `mob_db` VALUES (1159,'PHREEONI','Phreeoni','Phreeoni',71,300000,1,116000,180000,1,630,1597,269,98,88,70,112,87,102,71,10,12,2,2,60,0x37B5,200,1020,1020,288,58000,1008,500,730,1000,1000,4000,1015,9700,1223,500,1236,150,1014,5000,2288,300,985,2900,13047,100,0,0,0,0,4121,1);
-REPLACE INTO `mob_db` VALUES (1160,'PIERE','Piere','Piere',32,696,1,216,243,1,47,67,57,16,19,19,36,8,27,15,10,12,0,4,22,0x118B,200,1288,288,576,0,0,0,0,0,0,0,955,9000,910,1100,938,600,992,30,1001,5,1002,400,757,31,0,0,0,0,4043,1);
+REPLACE INTO `mob_db` VALUES (1160,'PIERE','Piere','Piere',32,696,1,216,243,1,47,67,57,16,19,19,36,8,27,15,10,12,0,4,22,0x1181,200,1288,288,576,0,0,0,0,0,0,0,955,9000,910,1100,938,600,992,30,1001,5,1002,400,757,31,0,0,0,0,4043,1);
REPLACE INTO `mob_db` VALUES (1161,'PLANKTON','Plankton','Plankton',40,1232,1,334,375,1,75,111,28,28,23,53,25,55,35,14,10,12,0,3,61,0x81,400,2208,1008,324,0,0,0,0,0,0,0,1052,9000,910,300,938,700,970,4,713,1000,630,20,645,50,0,0,0,0,4024,1);
REPLACE INTO `mob_db` VALUES (1162,'RAFFLESIA','Rafflesia','Rafflesia',86,5819,1,1170,1317,3,295,336,86,2,47,41,44,29,65,31,10,12,0,3,22,0x3885,150,512,528,240,0,0,0,0,0,0,0,1033,5500,911,1600,706,2,708,10,703,10,711,550,509,30,0,0,0,0,4083,1);
REPLACE INTO `mob_db` VALUES (1163,'RAYDRIC','Raydric','Raydric',115,18408,1,2770,2076,1,572,668,89,15,129,87,55,32,76,27,10,12,2,7,47,0x3095,150,824,780,420,0,0,0,0,0,0,0,985,106,2266,1,2315,2,1158,2,1116,100,1004,10,7054,4850,0,0,0,0,4133,1);
@@ -303,14 +303,14 @@ REPLACE INTO `mob_db` VALUES (1232,'META_PECOPECO_EGG','Peco Peco Egg','Peco Pec
REPLACE INTO `mob_db` VALUES (1234,'PROVOKE_YOYO','Yoyo','Yoyo',19,879,1,122,77,1,71,82,0,0,1,24,30,35,32,55,10,12,0,2,22,0x108B,200,1054,54,384,0,0,0,0,0,0,0,942,6000,7182,500,508,130,919,5500,753,7,578,500,582,1000,0,0,0,0,4051,1);
REPLACE INTO `mob_db` VALUES (1235,'SMOKING_ORC','Smoking Orc','Smoking Orc',24,1400,1,235,144,1,114,136,16,20,1,24,48,20,34,0,10,12,1,7,22,0x308D,200,1864,864,288,0,0,0,0,0,0,0,998,210,931,5500,756,40,2267,3,1352,10,1304,5,1301,100,0,0,0,0,4066,1);
REPLACE INTO `mob_db` VALUES (1236,'META_ANT_EGG','Ant Egg','Ant Egg',4,420,1,5,4,0,1,2,32,20,1,1,1,0,1,20,10,12,0,0,60,0x0,1000,1001,1,1,0,0,0,0,0,0,0,1010,135,935,2740,909,3000,938,750,713,2000,1002,220,0,0,0,0,0,0,4013,1);
-REPLACE INTO `mob_db` VALUES (1237,'META_ANDRE','Andre','Andre',17,688,1,98,64,1,60,71,16,0,1,17,24,20,26,20,10,12,0,4,22,0x118B,300,1288,288,576,0,0,0,0,0,0,0,955,6000,910,3000,938,1000,935,3000,1001,6,1002,350,757,28,0,0,0,0,4043,1);
-REPLACE INTO `mob_db` VALUES (1238,'META_PIERE','Piere','Piere',18,733,1,110,70,1,64,75,24,0,1,18,26,20,27,15,10,12,0,4,22,0x118B,200,1288,288,576,0,0,0,0,0,0,0,955,5700,910,1100,938,600,992,15,1001,5,1002,400,757,31,0,0,0,0,4043,1);
-REPLACE INTO `mob_db` VALUES (1239,'META_DENIRO','Deniro','Deniro',19,760,1,122,77,1,68,79,24,0,1,19,30,20,43,10,10,12,0,4,22,0x118B,150,1288,288,576,0,0,0,0,0,0,0,955,6000,910,3000,938,1200,990,45,1001,8,1002,450,757,34,0,0,0,0,4043,1);
+REPLACE INTO `mob_db` VALUES (1237,'META_ANDRE','Andre','Andre',17,688,1,98,64,1,60,71,16,0,1,17,24,20,26,20,10,12,0,4,22,0x1181,300,1288,288,576,0,0,0,0,0,0,0,955,6000,910,3000,938,1000,935,3000,1001,6,1002,350,757,28,0,0,0,0,4043,1);
+REPLACE INTO `mob_db` VALUES (1238,'META_PIERE','Piere','Piere',18,733,1,110,70,1,64,75,24,0,1,18,26,20,27,15,10,12,0,4,22,0x1181,200,1288,288,576,0,0,0,0,0,0,0,955,5700,910,1100,938,600,992,15,1001,5,1002,400,757,31,0,0,0,0,4043,1);
+REPLACE INTO `mob_db` VALUES (1239,'META_DENIRO','Deniro','Deniro',19,760,1,122,77,1,68,79,24,0,1,19,30,20,43,10,10,12,0,4,22,0x1181,150,1288,288,576,0,0,0,0,0,0,0,955,6000,910,3000,938,1200,990,45,1001,8,1002,450,757,34,0,0,0,0,4043,1);
REPLACE INTO `mob_db` VALUES (1240,'META_PICKY','Picky','Picky',3,80,1,4,3,1,9,12,0,0,1,3,3,0,10,30,10,12,0,2,23,0x81,200,988,288,168,0,0,0,0,0,0,0,916,6500,949,850,2302,150,507,650,519,350,715,60,0,0,0,0,0,0,4008,1);
REPLACE INTO `mob_db` VALUES (1241,'META_PICKY_','Picky','Picky',4,83,1,5,4,1,8,11,32,0,1,3,3,0,11,20,10,12,0,2,23,0x81,200,988,288,168,0,0,0,0,0,0,0,916,6500,949,850,5015,7,507,750,519,350,715,60,0,0,0,0,0,0,4011,1);
# Lutie (2.0)
-REPLACE INTO `mob_db` VALUES (1242,'MARIN','Marin','Marin',37,987,1,282,317,1,69,83,32,8,24,5,10,5,30,15,10,12,1,3,41,0x81,400,1872,672,480,0,0,0,0,0,0,0,910,3200,938,1500,700,100,720,40,510,75,529,350,5035,1,0,0,0,0,4196,1);
+REPLACE INTO `mob_db` VALUES (1242,'MARIN','Marin','Marin',37,987,1,282,317,1,69,83,32,8,24,5,10,5,30,15,10,12,1,3,41,0x83,400,1872,672,480,0,0,0,0,0,0,0,910,3200,938,1500,700,100,720,40,510,75,529,350,5035,1,0,0,0,0,4196,1);
REPLACE INTO `mob_db` VALUES (1243,'SASQUATCH','Sasquatch','Sasquatch',72,3163,1,765,860,1,266,296,101,28,70,35,60,10,59,20,10,12,2,2,60,0x3695,300,1260,192,192,0,0,0,0,0,0,0,912,750,509,800,949,1000,5030,1,948,5000,727,30,757,90,0,0,0,0,4216,1);
REPLACE INTO `mob_db` VALUES (1244,'JAKK_XMAS','Christmas Jakk','Christmas Jakk',63,2054,1,1002,619,1,218,255,90,25,58,43,42,25,55,15,10,12,1,0,43,0x81,200,1180,480,648,0,0,0,0,0,0,0,1062,5335,912,900,985,31,2331,5,644,20,7175,1200,7174,1200,0,0,0,0,4109,1);
REPLACE INTO `mob_db` VALUES (1245,'GOBLINE_XMAS','Christmas Goblin','Christmas Goblin',25,1176,1,254,154,1,118,140,16,5,1,53,25,20,38,45,10,12,1,7,24,0x81,100,1120,620,240,0,0,0,0,0,0,0,7174,550,7175,550,756,43,644,10,1211,10,2104,5,2236,10,0,0,0,0,4060,1);
@@ -505,7 +505,7 @@ REPLACE INTO `mob_db` VALUES (1417,'ZIPPER_BEAR','Zipper Bear','Zipper Bear',90,
REPLACE INTO `mob_db` VALUES (1418,'DARK_SNAKE_LORD','Evil Snake Lord','Evil Snake Lord',105,1101000,1,720000,630000,3,2217,4203,314,185,122,172,107,135,196,88,10,12,2,2,68,0x37B5,200,588,816,420,78120,607,5500,608,3500,985,5500,7169,5820,10020,5100,1471,80,5012,80,1474,500,7226,900,661,2000,0,0,0,0,4330,1);
# Additional G_Mobs
-REPLACE INTO `mob_db` VALUES (1419,'G_FARMILIAR','Familiar','Familiar',24,427,1,0,0,1,68,77,26,5,15,19,20,5,20,1,10,12,0,2,27,0x3885,150,1276,576,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+REPLACE INTO `mob_db` VALUES (1419,'G_FARMILIAR','Familiar','Familiar',24,427,1,0,0,1,68,77,26,5,15,19,20,5,20,1,10,12,0,2,27,0x3881,150,1276,576,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
REPLACE INTO `mob_db` VALUES (1420,'G_ARCHER_SKELETON','Archer Skeleton','Archer Skeleton',50,1646,1,0,0,9,90,113,47,10,30,29,20,10,32,5,10,12,1,1,29,0x3885,300,2864,864,576,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
REPLACE INTO `mob_db` VALUES (1421,'G_ISIS','Isis','Isis',59,2092,1,0,0,1,192,229,83,5,58,43,22,5,39,15,10,12,2,6,27,0x3985,200,1384,768,336,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
REPLACE INTO `mob_db` VALUES (1422,'G_HUNTER_FLY','Hunter Fly','Hunter Fly',63,2050,1,0,0,1,120,140,46,20,32,72,22,25,79,15,10,12,0,4,44,0x3985,150,676,576,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
@@ -657,7 +657,7 @@ REPLACE INTO `mob_db` VALUES (1555,'G_PARASITE','Parasite','Parasite',76,3222,1,
REPLACE INTO `mob_db` VALUES (1556,'G_POISON_TOAD','Poison Toad','Poisonous Toad',87,4876,1,0,0,3,212,266,80,42,66,42,40,45,58,30,10,12,1,2,45,0x81,160,1148,1728,864,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
REPLACE INTO `mob_db` VALUES (1557,'G_ROTAR_ZAIRO','Rotar Zairo','Rotar Zairo',48,1088,1,0,0,10,75,115,57,34,29,70,45,26,61,5,10,12,2,0,44,0x2085,155,2416,2016,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
REPLACE INTO `mob_db` VALUES (1558,'G_SAND_MAN','Sandman','Sandman',61,2887,1,0,0,1,156,212,126,25,44,8,55,15,31,25,10,12,1,0,62,0x3885,250,1672,720,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
-REPLACE INTO `mob_db` VALUES (1559,'G_SCORPION','Scorpion','Scorpion',16,153,1,0,0,1,39,46,16,5,14,15,10,5,33,5,10,12,0,4,23,0x3195,200,1564,864,576,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+REPLACE INTO `mob_db` VALUES (1559,'G_SCORPION','Scorpion','Scorpion',16,153,1,0,0,1,39,46,16,5,14,15,10,5,33,5,10,12,0,4,23,0x3191,200,1564,864,576,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
REPLACE INTO `mob_db` VALUES (1560,'G_SHINOBI','Shinobi','Shinobi',95,8000,1,0,0,2,441,492,49,45,71,70,55,30,69,30,10,12,1,7,67,0x3695,150,1003,1152,336,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
REPLACE INTO `mob_db` VALUES (1561,'G_SMOKIE','Smokie','Smokie',29,591,1,0,0,1,70,81,26,0,16,34,16,5,27,5,10,12,0,2,22,0x91,200,1576,576,420,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
REPLACE INTO `mob_db` VALUES (1562,'G_SOLDIER_SKELETON','Soldier Skeleton','Soldier Skeleton',34,804,1,0,0,1,84,98,53,5,14,10,32,5,29,3,10,12,1,1,29,0x3885,200,2276,576,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
@@ -697,7 +697,7 @@ REPLACE INTO `mob_db` VALUES (1591,'A_LUNATIC','Lunatic','Lunatic',29,2334,0,0,0
REPLACE INTO `mob_db` VALUES (1592,'A_MOBSTER','Gangster','Gangster',40,8000,0,0,0,1,300,355,32,27,1,50,45,45,73,30,10,12,1,7,20,0x11A9,250,1100,560,580,0,0,0,0,0,0,0,7049,10000,601,2000,1206,3000,713,1000,550,10000,0,0,0,0,0,0,0,0,0,0);
REPLACE INTO `mob_db` VALUES (1593,'A_ANCIENT_MUMMY','Ancient Mummy','Ancient Mummy',52,8613,0,0,0,1,830,930,64,27,58,47,42,5,69,26,10,12,1,1,69,0xB5,175,1772,120,384,0,0,0,0,0,0,0,502,2000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
REPLACE INTO `mob_db` VALUES (1594,'G_FREEZER','Freezer','Freezer',94,9990,1,0,0,2,388,438,127,38,68,47,50,45,55,25,10,12,1,2,41,0x3695,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);
-REPLACE INTO `mob_db` VALUES (1595,'G_MARIN','Marin','Marin',37,987,1,0,0,1,69,83,32,8,24,5,10,5,30,15,10,12,1,3,41,0x81,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);
+REPLACE INTO `mob_db` VALUES (1595,'G_MARIN','Marin','Marin',37,987,1,0,0,1,69,83,32,8,24,5,10,5,30,15,10,12,1,3,41,0x83,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);
REPLACE INTO `mob_db` VALUES (1596,'G_TAMRUAN','Tamruan','Tamruan',73,3195,1,0,0,1,305,342,63,30,60,38,40,20,61,20,10,12,2,6,67,0x318D,140,512,1152,672,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
REPLACE INTO `mob_db` VALUES (1597,'G_GARGOYLE','Gargoyle','Gargoyle',100,8772,1,0,0,9,383,472,98,43,100,61,60,57,100,70,10,12,1,6,64,0x2185,200,1020,720,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
REPLACE INTO `mob_db` VALUES (1598,'G_BLAZZER','Blazzer','Blazzer',101,8121,1,0,0,2,461,555,116,60,99,75,55,70,60,65,10,12,1,6,43,0x3395,180,1732,1332,540,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
@@ -802,7 +802,7 @@ REPLACE INTO `mob_db` VALUES (1683,'G_POTON_CANON','Photon Cannon','Photon Canno
REPLACE INTO `mob_db` VALUES (1684,'G_ARCHDAM','Archdam','Archdam',119,20700,1,0,0,3,603,722,98,15,118,64,70,65,66,25,10,12,2,8,60,0x3885,180,1080,288,360,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
REPLACE INTO `mob_db` VALUES (1685,'APOCALIPS_H','Vesper','Vesper',128,3802000,1,2700000,2250000,3,2620,7276,402,109,177,195,165,130,182,102,10,12,2,2,46,0x37B5,180,504,912,432,100000,617,5500,603,5000,732,2000,7095,5000,7094,3000,617,1000,2659,100,2660,100,2661,100,2662,100,0,0,0,0,4374,1);
REPLACE INTO `mob_db` VALUES (1686,'ORC_BABY','Orc Baby','Orc Baby',43,1122,1,315,354,1,64,75,49,3,25,1,32,20,31,35,10,12,0,7,22,0x3885,200,672,864,288,0,0,0,0,0,0,0,7126,1000,10004,100,2299,1,519,5000,7270,200,7269,100,0,0,0,0,0,0,4375,1);
-REPLACE INTO `mob_db` VALUES (1687,'GREEN_IGUANA','Green Iguana','Grove',55,2090,1,486,548,9,139,174,96,18,58,42,22,5,45,17,10,12,1,2,42,0x83,200,1152,1152,480,0,0,0,0,0,0,0,521,1500,903,1000,520,1000,511,1000,528,2000,606,10,6264,500,0,0,0,0,4377,1);
+REPLACE INTO `mob_db` VALUES (1687,'GREEN_IGUANA','Green Iguana','Grove',55,2090,1,486,548,1,139,174,96,18,58,42,22,5,45,17,10,12,1,2,42,0x83,200,1152,1152,480,0,0,0,0,0,0,0,521,1500,903,1000,520,1000,511,1000,528,2000,606,10,6264,500,0,0,0,0,4377,1);
REPLACE INTO `mob_db` VALUES (1688,'LADY_TANEE','Lady Tanee','Lady Tanee',80,360000,1,334080,261000,14,1760,2685,141,104,86,108,88,121,200,71,10,12,2,3,64,0x1A4,100,576,432,360,167040,617,5500,12095,5000,732,2000,12090,5000,634,4000,12129,1000,5116,1000,985,5000,617,2000,1716,6000,0,0,0,0,4376,1);
REPLACE INTO `mob_db` VALUES (1689,'G_BACSOJIN','Bacsojin','White Lady',97,720500,1,0,0,3,1088,3124,210,178,118,244,98,126,205,102,10,12,2,7,64,0x37B5,130,576,960,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);
REPLACE INTO `mob_db` VALUES (1690,'G_SPRING_RABBIT','Spring Rabbit','Spring Rabbit',12,15,1,0,0,1,0,0,160,99,1,1,1,1,1,1,10,12,1,2,20,0xC3,160,1120,552,511,0,0,0,0,0,0,0,6005,5000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
@@ -990,7 +990,7 @@ REPLACE INTO `mob_db` VALUES (1853,'G_EM_DEVILING','Deviling','Deviling',99,120,
REPLACE INTO `mob_db` VALUES (1854,'E_MUKA','Muka','Muka',17,610,0,246,108,1,40,49,8,5,15,15,30,5,20,10,10,12,2,3,22,0x83,300,1960,960,384,0,0,0,0,0,0,0,993,70,952,9000,713,2000,7742,400,507,1000,1451,50,1002,250,0,0,0,0,4036,1);
REPLACE INTO `mob_db` VALUES (1855,'E_POISONSPORE','Poison Spore','Poison Spore',19,665,0,167,84,1,89,101,0,0,1,19,25,0,24,0,10,12,1,3,25,0x3885,200,1672,672,288,0,0,0,0,0,0,0,7033,9000,2221,20,511,550,7743,60,972,50,921,1200,912,5,0,0,0,0,4048,1);
REPLACE INTO `mob_db` VALUES (1856,'E_MAGNOLIA','Magnolia','Magnolia',26,3195,0,354,223,1,120,151,8,30,1,26,26,0,39,5,10,12,0,6,21,0x183,250,1560,360,360,0,0,0,0,0,0,0,7031,9000,910,800,911,100,912,10,737,40,7744,400,12127,5,0,0,0,0,4076,1);
-REPLACE INTO `mob_db` VALUES (1857,'E_MARIN','Marin','Marin',15,742,0,59,40,1,39,43,0,10,1,10,10,5,35,15,10,12,1,3,41,0x81,400,1872,672,480,0,0,0,0,0,0,0,910,3200,938,1500,700,100,720,40,7745,75,529,350,5035,1,0,0,0,0,4196,1);
+REPLACE INTO `mob_db` VALUES (1857,'E_MARIN','Marin','Marin',15,742,0,59,40,1,39,43,0,10,1,10,10,5,35,15,10,12,1,3,41,0x83,400,1872,672,480,0,0,0,0,0,0,0,910,3200,938,1500,700,100,720,40,7745,75,529,350,5035,1,0,0,0,0,4196,1);
REPLACE INTO `mob_db` VALUES (1858,'E_PLANKTON','Plankton','Plankton',10,354,0,21,16,1,26,31,0,5,1,10,10,0,15,0,10,12,0,3,61,0x81,400,2208,1008,324,0,0,0,0,0,0,0,1052,9000,7746,300,938,700,970,4,713,1000,630,20,645,50,0,0,0,0,4024,1);
REPLACE INTO `mob_db` VALUES (1859,'E_MANDRAGORA','Mandragora','Mandragora',12,405,0,41,29,4,26,35,0,25,1,12,24,0,36,15,10,12,1,3,62,0x84,1000,1768,768,576,0,0,0,0,0,0,0,993,50,905,9000,1405,30,7747,350,711,300,706,3,1967,10,0,0,0,0,4030,1);
REPLACE INTO `mob_db` VALUES (1860,'E_COCO','Coco','Coco',17,817,0,108,70,1,56,67,0,0,24,17,34,20,24,10,10,12,0,2,22,0x91,150,1864,864,1008,0,0,0,0,0,0,0,1026,9000,2502,20,914,3000,919,2500,516,500,2402,25,7748,600,0,0,0,0,4041,1);
@@ -1042,7 +1042,7 @@ REPLACE INTO `mob_db` VALUES (1898,'EVENT_ZOMBIE','Zombie','Zombie',12,434,0,0,0
# WoE Second Edition; Battlegrounds
REPLACE INTO `mob_db` VALUES (1899,'SWORD_GUARDIAN_','Sword Guardian','Sword Guardian',133,70000,0,0,0,2,451,580,122,33,122,87,54,65,103,65,14,16,2,7,80,0x20A5,170,140,384,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
REPLACE INTO `mob_db` VALUES (1900,'BOW_GUARDIAN_','Archer Guardian','Archer Guardian',80,80404,1,0,0,12,1840,2520,64,62,95,80,33,90,165,55,14,16,2,7,80,0x20A5,170,76,384,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
-REPLACE INTO `mob_db` VALUES (1901,'E_CONDOR','Condor','Condor',10,15,0,90,90,1,13,20,10,15,1,1,1,50,100,100,10,12,0,2,26,0x1089,150,1148,648,480,0,0,0,0,0,0,0,7973,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+REPLACE INTO `mob_db` VALUES (1901,'E_CONDOR','Condor','Condor',10,15,0,90,90,1,13,20,10,15,1,1,1,50,100,100,10,12,0,2,26,0x1081,150,1148,648,480,0,0,0,0,0,0,0,7973,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
REPLACE INTO `mob_db` VALUES (1902,'E_TREASURE1','Treasure Box','Treasure Box',99,49,0,0,0,0,0,0,100,0,0,0,0,0,999,0,0,0,0,0,26,0x120,0,0,0,0,0,0,0,0,0,0,0,7782,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
REPLACE INTO `mob_db` VALUES (1903,'E_TREASURE2','Treasure Box','Treasure Box',99,49,0,0,0,0,0,0,100,0,0,0,0,0,999,0,0,0,0,0,26,0x120,0,0,0,0,0,0,0,0,0,0,0,7783,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
REPLACE INTO `mob_db` VALUES (1904,'BOMBPORING','Bomb Poring','Bomb Poring',28,1000000,1,415,256,1,120,320,160,99,1,28,28,0,33,50,10,12,0,0,20,0x308D,300,1672,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);
@@ -1309,8 +1309,8 @@ REPLACE INTO `mob_db` VALUES (2113,'E_B_EREMES','Assassin Cross Eremes','Assassi
#2124,EL_TERA_M,Tera,Tera,100,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,5,0,1,0,82,0x120,200,0,0,0,0,0,0,0,0,0,0,0
#2125,EL_TERA_L,Tera,Tera,100,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,5,0,2,0,82,0x120,200,0,0,0,0,0,0,0,0,0,0,0
REPLACE INTO `mob_db` VALUES (2126,'M_ANOPHELES','Anopheles','Anopheles',100,8000,1,0,0,1,300,400,0,0,40,70,40,40,80,40,10,12,0,4,64,0x3985,170,1084,2304,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);
-REPLACE INTO `mob_db` VALUES (2127,'M_HORNET','Hornet','Hornet',110,9000,1,0,0,1,350,450,0,0,40,70,40,40,90,40,10,12,0,4,24,0x1189,150,1292,792,216,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
-REPLACE INTO `mob_db` VALUES (2128,'M_HORNET2','Hornet','Hornet',120,10000,1,0,0,1,400,500,0,0,40,70,40,40,100,40,10,12,0,4,24,0x1189,150,1292,792,216,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+REPLACE INTO `mob_db` VALUES (2127,'M_HORNET','Hornet','Hornet',110,9000,1,0,0,1,350,450,0,0,40,70,40,40,90,40,10,12,0,4,24,0x1181,150,1292,792,216,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+REPLACE INTO `mob_db` VALUES (2128,'M_HORNET2','Hornet','Hornet',120,10000,1,0,0,1,400,500,0,0,40,70,40,40,100,40,10,12,0,4,24,0x1181,150,1292,792,216,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
REPLACE INTO `mob_db` VALUES (2129,'M_LUCIOLA_VESPA','Luciola Vespa','Luciola Vespa',130,11000,1,0,0,1,450,650,0,0,60,80,50,50,110,50,10,12,1,4,24,0x7795,110,1000,864,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
REPLACE INTO `mob_db` VALUES (2130,'M_LUCIOLA_VESPA2','Luciola Vespa','Luciola Vespa',140,12000,1,0,0,1,500,700,0,0,60,80,50,50,120,50,10,12,1,4,24,0x7795,110,1000,864,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
diff --git a/sql-files/mob_skill_db_re.sql b/sql-files/mob_skill_db_re.sql
index ba7eb9968..f7cf89bd2 100644
--- a/sql-files/mob_skill_db_re.sql
+++ b/sql-files/mob_skill_db_re.sql
@@ -1111,6 +1111,7 @@ REPLACE INTO `mob_skill_db` VALUES (1219,'Knight of Abyss@NPC_SUMMONSLAVE','idle
REPLACE INTO `mob_skill_db` VALUES (1219,'Knight of Abyss@NPC_ARMORBRAKE','attack',344,10,500,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db` VALUES (1219,'Knight of Abyss@CR_AUTOGUARD','chase',249,10,2000,0,300000,'yes','self','longrangeattacked',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db` VALUES (1219,'Knight of Abyss@CR_AUTOGUARD','attack',249,10,500,0,300000,'yes','self','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `mob_skill_db` VALUES (1242,'Marin@NPC_EMOTION','loot',197,1,2000,0,5000,'yes','self','always','0',2,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db` VALUES (1242,'Marin@MG_FROSTDIVER','attack',15,5,500,1000,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db` VALUES (1242,'Marin@NPC_EMOTION','loot',197,1,2000,0,5000,'yes','self','always','0',2,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `mob_skill_db` VALUES (1242,'Marin@NPC_WATERATTACK','attack',184,1,2000,0,5000,'yes','target','always','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL);