summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStreusel <advance_me@hotmail.de>2013-03-20 21:15:46 -0800
committerStreusel <advance_me@hotmail.de>2013-03-20 21:15:46 -0800
commite29d30559c862ddcdffcd9f76d24c5deb4c110d4 (patch)
tree6532872795bb45a5bb357ac25652cf54a3729772
parentd642604583c9dfcbee525042498b38c312a3d097 (diff)
downloadhercules-e29d30559c862ddcdffcd9f76d24c5deb4c110d4.tar.gz
hercules-e29d30559c862ddcdffcd9f76d24c5deb4c110d4.tar.bz2
hercules-e29d30559c862ddcdffcd9f76d24c5deb4c110d4.tar.xz
hercules-e29d30559c862ddcdffcd9f76d24c5deb4c110d4.zip
-Part 1 'the great commit', all credits to L0ne_W0lf
-Added new Mercenary's -Updated item_db.txt -Updated mob_db.txt
-rw-r--r--db/mercenary_db.txt18
-rw-r--r--db/re/item_db.txt393
-rw-r--r--db/re/mob_db.txt8
-rw-r--r--src/common/mmo.h2
4 files changed, 386 insertions, 35 deletions
diff --git a/db/mercenary_db.txt b/db/mercenary_db.txt
index 8c841a32d..829a898c9 100644
--- a/db/mercenary_db.txt
+++ b/db/mercenary_db.txt
@@ -18,7 +18,23 @@
2058,M_MIMIC,Mimic,51,6120,182,1,800,950,10,40,44,121,1,60,75,110,10,12,1,0,60,100,972,500,288
2059,M_DISGUISE,Disguise,55,7543,180,2,526,693,18,29,0,72,45,35,48,65,10,12,1,6,82,147,516,768,384
2060,M_ALICE,Alice,62,10000,221,1,700,850,5,5,64,64,42,85,100,130,10,12,1,7,60,200,502,1999,480
-
+2213,M_WANDER_MAN,Wander Man,81,8614,220,2,1100,1300,60,20,80,110,63,51,85,90,10,12,1,6,24,100,672,500,192
+2214,M_WICKED_NYMPH,Wicked Nymph,85,6157,256,2,420,620,30,45,40,50,40,92,60,110,10,12,1,6,67,200,637,1008,360
+2215,M_KASA,Kasa,83,9815,234,2,1100,1300,60,60,85,90,71,43,85,105,10,12,2,0,63,150,800,600,288
+2216,M_SALAMANDER,Salamander,87,9517,260,2,900,1100,60,68,90,80,65,45,87,95,10,12,2,0,63,160,140,384,288
+2217,M_TEDDY_BEAR,Teddy Bear,85,14493,243,1,600,800,100,70,60,20,85,50,75,130,10,12,0,0,60,200,512,780,504
+2325,M_BAPHOMET_,Baphomet,57,7510,204,1,810,955,70,40,52,60,36,17,57,25,10,12,0,6,27,100,868,480,120
+2326,M_GALAPAGO,Galapago,45,7513,201,1,760,915,70,40,30,28,29,18,30,16,10,12,0,2,22,165,1430,1080,1080
+2342,MER_DIABOLIC,MER_DIABOLIC,83,9815,234,2,1100,1300,60,60,85,90,71,43,85,105,10,12,0,6,47,150,1080,780,180
+2344,MER_WISH_MAIDEN,MER_WISH_MAIDEN,83,9815,234,2,1100,1300,60,60,85,90,71,43,85,105,10,12,0,6,47,150,1080,780,180
+2345,MER_ZHERLTHSH,MER_ZHERLTHSH,83,9815,234,2,1100,1300,60,60,85,90,71,43,85,105,10,12,0,6,47,150,1080,780,180
+2346,MER_KTULLANUX,MER_KTULLANUX,83,9815,234,2,1100,1300,60,60,85,90,71,43,85,105,10,12,0,6,47,150,1080,780,180
+2347,MER_EDDGA,MER_EDDGA,83,9815,234,2,1100,1300,60,60,85,90,71,43,85,105,10,12,0,6,47,150,1080,780,180
+2348,MER_CIVIL_SERVANT,MER_CIVIL_SERVANT,83,9815,234,2,1100,1300,60,60,85,90,71,43,85,105,10,12,0,6,47,150,1080,780,180
+2349,MER_LOLI_RURI,MER_LOLI_RURI,83,9815,234,2,1100,1300,60,60,85,90,71,43,85,105,10,12,0,6,47,150,1080,780,180
+2350,MER_SEDORA,MER_SEDORA,83,9815,234,2,1100,1300,60,60,85,90,71,43,85,105,10,12,0,6,47,150,1080,780,180
+2351,MER_CHEPET,MER_CHEPET,83,9815,234,2,1100,1300,60,60,85,90,71,43,85,105,10,12,0,6,47,150,1080,780,180
+2378,MER_ANTLER_SCARABA,MER_ANTLER_SCARABA,136,30000,1,1,1418,1828,155,102,23,99,59,129,137,45,10,12,1,4,42,200,504,624,360
// Normal Mercenaries
6017,MER_ARCHER01,Mina,20,256,200,10,170,85,7,5,1,16,5,1,28,8,10,0,0,7,20,150,700,432,300
6018,MER_ARCHER02,Dororu,30,457,70,10,228,114,11,7,1,18,8,1,40,11,10,0,0,7,20,150,700,432,300
diff --git a/db/re/item_db.txt b/db/re/item_db.txt
index 05a2d94cc..a917734b0 100644
--- a/db/re/item_db.txt
+++ b/db/re/item_db.txt
@@ -7187,10 +7187,29 @@
//16346,Leo_Diadem_Box
//16368,Virgo_Crown_Box
16371,Tw_Aug_Scroll,Tw Aug Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+16372,F_Clover_Box_Mouth,F Clover Box Mouth,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+16374,Mouth_Bubble_Gum_Box,Mouth Bubble Gum Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
//16381,WoE_Teleport_Scroll_100_Box
+16385,F_Clover_Box_Mouth2,F Clover Box Mouth2,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+16386,F_Clover_Box_Mouth4,F Clover Box Mouth4,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+16389,BGum_Box_In_Mouth2,BGum Box In Mouth2,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+16390,BGum_Box_In_Mouth4,BGum Box In Mouth4,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+16393,HD_Ori_Box5,HD Ori Box5,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 6240,5; },{},{}
+16394,HD_Ori_Box10,HD Ori Box10,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 6240,10; },{},{}
+16395,HD_Elu_Box5,HD Elu Box5,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 6241,5; },{},{}
+16396,HD_Elu_Box10,HD Elu Box10,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 6241,10; },{},{}
//16397,Virgo_Diadem_Box
//16398,Virgo_Crown_Box
//16399,Virgo_Diadem_Box
+16405,Midgard_Coin_Box,Midgard Coin Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 6242,1; },{},{}
+16406,FMidgard_Coin_Box,FMidgard Coin Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 6242,1; },{},{}
+16409,Tw_Sep_Scroll,Tw Sep Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+16410,Chung_Hairband_Box,Chung Hairband Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5609,1; },{},{}
+16411,FChung_Hairband_Box,FChung Hairband Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5609,1; },{},{}
+16412,Ice_Wing_Ear_Box,Ice Wing Ear Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5610,1; },{},{}
+16413,FIce_Wing_Ear_Box,FIce Wing Ear Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5610,1; },{},{}
+16414,Turtle_Hat_Box,Turtle Hat Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5611,1; },{},{}
+16415,FTurtle_Hat_Box,FTurtle Hat Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5611,1; },{},{}
//16418,Giant_Fly_Wing_Box_500
//16419,Greed_Scroll_30_Box
//16420,Adventurer_Pack
@@ -7205,35 +7224,89 @@
//16429,Tomahawk_Box
//16430,Rudra_Bow_Box
//16431,Pole_Axe_Box
-//16436,Libra_Crown_Box
+16436,Libra_Crown_Box,Libra Crown Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5662,1; },{},{}
//16437,Libra_Crown_Box
-//16438,Libra_Diadem_Box
+16438,Libra_Diadem_Box,Libra Diadem Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5663,1; },{},{}
//16439,Libra_Diadem_Box
-//16447,Scorpio_Crown_Box
-//16448,Scorpio_Diadem_Box
+16440,Filir_Wing_Box,Filir Wing Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5664,1; },{},{}
+16446,Tw_October_Scroll,Tw October Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+16447,Scorpio_Crown_Box,Scorpio Crown Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5676,1; },{},{}
+16448,Scorpio_Diadem_Box,Scorpio Diadem Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5677,1; },{},{}
//16449,Scorpio_Crown_Box
-//16450,Scorpio_Diadem_Box
+16450,FScorpio_Diadem_Box,FScorpio Diadem Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5677,1; },{},{}
+16456,My_Scroll1,My Scroll1,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+16457,Tw_Nov_Scroll,Tw Nov Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+//
16461,Red_Wing_Hat_Box,Red Wing Hat Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5690,1; },{},{}
-//16462,Red_Wing_Hat_Box
-//16543,Snowman_Hat_Box
-//16544,Snowman_Hat_Box
-//16548,Sagittarius_Crown_Box
-//16549,Sagittarius_Diadem_Box
+16462,FRed_Wing_Hat_Box,FRed Wing Hat Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5690,1; },{},{}
+16466,My_Scroll2,My Scroll2,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+//
+16503,E_Insurance_Package,E Insurance Package,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12209,10; },{},{}
+//
+16542,Xmas_Bless,Xmas Bless,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+16543,Snowman_Hat_Box,Snowman Hat Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5738,1; },{},{}
+16544,FSnowman_Hat_Box,FSnowman Hat Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5738,1; },{},{}
+16548,Sagittarius_Crown_Box,Sagittarius Crown Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5739,1; },{},{}
+16549,Sagittarius_Diadem_Box,Sagittarius Diadem Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5740,1; },{},{}
//16550,Sagittarius_Crown_Box
//16551,Sagittarius_Diadem_Box
//16554,Elven_Sunglasses_Box
16555,Pr_Reset_Stone_Box,Pr Reset Stone Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-//16565,Capricorn_Crown_Box
+16556,FPr_Reset_Stone_Box,FPr Reset Stone Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+16557,CP_Helm_Scroll10,CP Helm Scroll10,18,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14517,10; },{},{}
+16558,CP_Shield_Scroll10,CP Shield Scroll10,18,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14518,10; },{},{}
+16559,CP_Armor_Scroll10,CP Armor Scroll10,18,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14519,10; },{},{}
+16560,CP_Weapon_Scroll10,CP Weapon Scroll10,18,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14520,10; },{},{}
+16561,CP_Scroll_Package,CP Scroll Package,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+16562,Majestic_Devil_Scroll,Majestic Devil Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+16563,BM100_Box_5,BM100 Box 5,18,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14533,5; },{},{}
+16565,Capricorn_Crown_Box,Capricorn Crown Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5744,1; },{},{}
//16566,Capricorn_Crown_Box
-//16567,Capricorn_Diadem_Box
-//16568,Capricorn_Diadem_Box
+16567,Capricorn_Diadem_Box,Capricorn Diadem Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5745,1; },{},{}
+16568,FCapricorn_Diadem_Box,FCapricorn Diadem Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5745,1; },{},{}
+16569,Summer_Scroll,Summer Scroll,2,20,,100,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+16576,Illusion_Nothing,Illusion Nothing,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+16577,Dragon_Captain,Dragon Captain,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+16582,Red_Bunny_Band_Box,Red Bunny Band Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5763,1; },{},{}
+16584,Sloth_Hat_Box,Sloth Hat Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5761,1; },{},{}
+16585,F_Sloth_Hat_Box,F Sloth Hat Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5761,1; },{},{}
+16586,Duneyrr_Helm_Box,Duneyrr Helm Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5762,1; },{},{}
+16587,F_Duneyrr_Helm_Box,F Duneyrr Helm Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5762,1; },{},{}
//16588,Thoughtful_Hat_Box
//16589,Thoughtful_Hat_Box
//16590,Thoughtful_Hat_Box
+16600,Spring_Flower_Scr_Tw,Spring Flower Scr Tw,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+16601,Blue_Arara_Hat_Box,Blue Arara Hat Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5778,1; },{},{}
+16602,F_Blue_Arara_Hat_Box,F Blue Arara Hat Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5778,1; },{},{}
+//
+16619,Yellow_Bunnyband_Box,Yellow Bunnyband Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5783,1; },{},{}
+16631,Aributa_Scroll,Aributa Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+16638,Life_Ribbon_Box,Life Ribbon Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+16639,Life_Ribbon_Box2,Life Ribbon Box2,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+16640,Life_Ribbon_Box3,Life Ribbon Box3,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+//
+16652,Flame_Light,Flame Light,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+16653,BM75_10Box,BM75 10Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12563,10; },{},{}
+16654,Valiant_Will,Valiant Will,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+16664,Leo_Scroll,Leo Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+16665,Virgo_Scroll,Virgo Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+16666,Magic_Candy_Box10,Magic Candy Box10,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+16673,Libra_Scroll,Libra Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+16675,Splash_Scroll,Splash Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+//
16677,Universal_Catalog_Gold_Box10,Universal Catalog Gold 10 Box,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12581,10; },{},{}
16678,Universal_Catalog_Gold_Box50,Universal Catalog Gold 50 Box,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12581,50; },{},{}
16679,Universal_Catalog_Gold_Box10,Universal Catalog Gold 10 Box,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12581,10; },{},{}
16680,Universal_Catalog_Gold_Box50,Universal Catalog Gold 50 Box,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12581,50; },{},{}
+16681,BR_Independence_Scroll,BR Independence Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+16682,Boarding_Halter_Box,Boarding Halter Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12622,1; },{},{}
+16683,B_Halter_Box_30Days,B Halter Box 30Days,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+16684,Wing_Of_Fly_Box10,Wing Of Fly Box10,18,20,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 601,10; },{},{}
+16685,Wing_Of_Fly_Box50,Wing Of Fly Box50,18,20,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 601,50; },{},{}
+16686,Wing_Of_Fly_Box100,Wing Of Fly Box100,18,20,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 601,100; },{},{}
+16687,RWC2010_SuitcaseA,RWC2010 SuitcaseA,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+16688,RWC2010_SuitcaseB,RWC2010 SuitcaseB,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+16691,Scorpius_Scroll,Scorpius Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
//
16740,The_Sea_God's_Call_23_Hour_Box,The Sea God's Call 23 Hour Box,2,20,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 6436,86400; },{},{}
16741,Cutlass_1_Day_Box,Cutlass 1 Day Box,2,20,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 1198,86400; },{},{}
@@ -7248,6 +7321,13 @@
16750,Malangdo_Crab_7_Day_Box,Malangdo Crab 7 Day Box,2,20,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 18107,604800; },{},{}
16751,Zebra_Eel_1_Day_Box,Zebra Eel 1 Day Box,2,20,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 18108,86400; },{},{}
16752,Zebra_Eel_7_Day_Box,Zebra Eel 7 Day Box,2,20,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 18108,604800; },{},{}
+16753,Unbreak_Weap_Box,Unbreak Weap Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 6438,1; },{},{}
+16754,F_Unbreak_Weap_Box,F Unbreak Weap Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 6438,1; },{},{}
+16755,Unbreak_Def_Box,Unbreak Def Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 6439,1; },{},{}
+16756,F_Unbreak_Def_Box,F Unbreak Def Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 6439,1; },{},{}
+16757,Hallo_Scroll,Hallo Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+16760,Umbala_Spirit_Box2,Umbala Spirit Box2,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+16761,F_Umbala_Spirit_Box2,F Umbala Spirit Box2,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
//
16763,The_Sea_God's_Call_7_Day_Box,The Sea God's Call 7 Day Box,2,20,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 6436,604800; },{},{}
16764,The_Sea_God's_Call_15_Day_Box,The Sea God's Call 15 Day Box,2,20,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 6436,1209600; },{},{}
@@ -7258,15 +7338,94 @@
16770,Silvervine_Fruit_Box10,Silvervine 10 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 6417,10; getitem 12636,30; },{},{}
16771,Silvervine_Fruit_Box40,Silvervine 40 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 6417,40; getitem 12636,120; },{},{}
//
+16774,Asgard_Scroll,Asgard Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+16775,Sagittarius_Scroll,Sagittarius Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
16776,Universal_Catalog_Gold_Box10,Universal Catalog Gold 10 Box,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12581,10; },{},{}
16777,Universal_Catalog_Gold_Box50,Universal Catalog Gold 50 Box,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12581,50; },{},{}
//
+16972,Weather_Report_Box,Weather Report Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+16973,Yellow_Hat_Box,Yellow Hat Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 19515,1; },{},{}
+16974,Comin_Actor_Box,Comin Actor Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+16975,Singing_Bird_Box,Singing Bird Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 19516,1; },{},{}
+16976,Hen_Set_Box,Hen Set Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+16977,Red_Minicrown_Box,Red Minicrown Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 19522,1; },{},{}
16979,Silvervine_Fruit_Box4,Silvervine 4 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 6417,4; getitem 12636,12; },{},{}
//
+16990,Sagittar_Diadem_Scroll,Sagittar Diadem Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+16991,Sagittar_Di_Scroll_Box,Sagittar Di Scroll Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+16992,Butterfly_Wing_Box20,Butterfly Wing Box20,18,20,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 602,20; },{},{}
+16993,Butterfly_Wing_Box50,Butterfly Wing Box50,18,20,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 602,50; },{},{}
+16996,Capri_Crown_Scroll,Capri Crown Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+16997,Capri_Crown_Scroll_Box,Capri Crown Scroll Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
16998,Archangel_Wings_Box,Archangel Wings Box,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2573,1; },{},{}
-//
+16999,Bravery_Bag_Box,Bravery Bag Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2576,1; },{},{}
+17000,Wander_Man_Box5,Wander Man Box5,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12626,5; },{},{}
+17001,Wander_Man_Box10,Wander Man Box10,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12626,10; },{},{}
+17002,Wicked_Nymph_Box5,Wicked Nymph Box5,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12627,5; },{},{}
+17003,Wicked_Nymph_Box10,Wicked Nymph Box10,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12627,10; },{},{}
+17004,Kasa_Scroll_Box5,Kasa Scroll Box5,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12628,5; },{},{}
+17005,Kasa_Scroll_Box10,Kasa Scroll Box10,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12628,10; },{},{}
+17006,Salamander_Box5,Salamander Box5,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12629,5; },{},{}
+17007,Salamander_Box10,Salamander Box10,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12629,10; },{},{}
+17008,Teddy_Bear_Box5,Teddy Bear Box5,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12630,5; },{},{}
+17009,Teddy_Bear_Box10,Teddy Bear Box10,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12630,10; },{},{}
+17011,Capricon_Di_Scroll,Capricon Di Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17012,Capricon_Di_Scroll_Box,Capricon Di Scroll Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
17013,Malang_Woe_Encard_Box,Malang Woe Encard Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 16740,1; getitem 16765,1; },{},{}
-//
+17014,Butterfly_ear_Box,Butterfly ear Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 19509,1; },{},{}
+17015,Stuckhead_Screw_Box,Stuckhead Screw Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 19510,1; },{},{}
+17016,Aquarius_Diadem_Scroll,Aquarius Diadem Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17017,Aquarius_Di_Scroll_Box,Aquarius Di Scroll Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17018,Libra_Scroll2,Libra Scroll2,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17019,Scorpio_Scroll2,Scorpio Scroll2,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17020,Tw_Nov_Scroll2,Tw Nov Scroll2,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17021,Summer_Scroll3,Summer Scroll3,2,20,,100,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17022,Super_Pet_Egg1_2,Super Pet Egg1 2,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17023,Super_Pet_Egg4_2,Super Pet Egg4 2,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17024,Lovely_Aquarius_Scroll,Lovely Aquarius Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17025,Lovely_Aquarius_Box,Lovely Aquarius Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17026,Boitata_Scroll,Boitata Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17028,Pisces_Diadem_Scroll,Pisces Diadem Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17029,Pisces_Diadem_Box,Pisces Diadem Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17030,St_Pat_Hat_box,St Pat Hat box,18,20,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 18565,1; },{},{}
+17035,Energetic_Pisces_Scroll,Energetic Pisces Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17036,Energetic_Pisces_Box,Energetic Pisces Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17037,Trans_Box_Devi,Trans Box Devi,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17038,Trans_Box_Ray_Arch,Trans Box Ray Arch,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17039,Trans_Box_Mavka,Trans Box Mavka,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17040,Trans_Box_Marduk,Trans Box Marduk,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17041,Trans_Box_Banshee,Trans Box Banshee,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17042,Trans_Box_Poring,Trans Box Poring,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12663,10; },{},{}
+17043,Trans_Box_Golem,Trans Box Golem,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17050,Aries_Scroll,Aries Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17051,Aries_Scroll_Box,Aries Scroll Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17052,Holy_Mom_Blaze_Box,Holy Mom Blaze Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 6472,1; },{},{}
+17056,Wiz_Card_Album,Wiz Card Album,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17057,Swordman_Card_Album,Swordman Card Album,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17058,Thief_Card_Album,Thief Card Album,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17059,Acolyte_Card_Album,Acolyte Card Album,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17060,Merchant_Card_Album,Merchant Card Album,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17061,Archer_Card_Album,Archer Card Album,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17062,Taurus_Diadem_Scroll,Taurus Diadem Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17063,Taurus_Di_Scroll_Box,Taurus Di Scroll Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17064,Tw_Sagitt_Scroll,Tw Sagitt Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17066,Poison_Bottle_Box50,Poison Bottle Box50,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 678,50; },{},{}
+17067,Poison_Bottle_Box100,Poison Bottle Box100,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 678,100; },{},{}
+17068,Acidbomb_Box50,Acidbomb Box50,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17069,Acidbomb_Box100,Acidbomb Box100,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17070,Acidbomb_Box500,Acidbomb Box500,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17071,Superb_Fish_Box50,Superb Fish Box50,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14524,50; },{},{}
+17072,Superb_Fish_Box100,Superb Fish Box100,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14524,100; },{},{}
+17073,Superb_Fish_Box500,Superb Fish Box500,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14524,500; },{},{}
+17074,Empty_Bottle_Box10,Empty Bottle Box10,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 713,10; },{},{}
+17075,Empty_Bottle_Box100,Empty Bottle Box100,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 713,100; },{},{}
+17076,Empty_Bottle_Box500,Empty Bottle Box500,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 713,500; },{},{}
+17077,Taurus_Crown_Scroll,Taurus Crown Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17078,Taurus_Crown_Scroll_Box,Taurus Crown Scroll Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17080,Scorpio_Scroll3,Scorpio Scroll3,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17081,Yggdrasil_Crown_Box,Yggdrasil Crown Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 18580,1; },{},{}
+17082,Gemi_Diadem_Scroll,Gemi Diadem Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17083,Gemi_Diadem_Scroll_Box,Gemi Diadem Scroll Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
17084,Upg_Katar_Box,Upg Katar Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 1292,1; },{},{}
17085,Upg_Two_Handed_Axe_Box,Upg Two Handed Axe Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 1394,1; },{},{}
17086,Upg_Lance_Box,Upg Lance Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 1491,1; },{},{}
@@ -7278,7 +7437,59 @@
17092,Upg_Bow_Box,Upg Bow Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 18112,1; },{},{}
17093,Upg_Twohand_Sword_Box,Upg Two-Handed Sword Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 21000,1; },{},{}
//
+17104,HD_Oridecon_50Box,HD Oridecon 50Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 6240,50; },{},{}
+17105,HD_Elunium_50Box,HD Elunium 50Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 6241,50; },{},{}
+17106,Max_Weight_Up_10Box,Max Weight Up 10Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7776,10; },{},{}
+17107,Gemi_Crown_Scroll,Gemi Crown Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17108,Gemi_Crown_Scroll_Box,Gemi Crown Scroll Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17109,Capri_Scroll,Capri Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17110,Aquarius_Scroll,Aquarius Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17113,Pisces_Scroll,Pisces Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17114,Horn_Of_Ancient_Box,Horn Of Ancient Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 18595,1; },{},{}
+17115,Sprout_Hat_Box,Sprout Hat Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 18596,1; },{},{}
+17116,Mercury_Helm_Box,Mercury Helm Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 18597,1; },{},{}
+17117,Aries_Scroll,Aries Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17120,Taurus_Scroll,Taurus Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17121,Starry_Scroll,Starry Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17122,Immuned_Shield_Box,Immuned Shield Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2168,1; },{},{}
+17123,Black_Devil_Mask_Box,Black Devil Mask Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 18599,1; },{},{}
+17124,Cat_Ears_Beret_Box,Cat Ears Beret Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 18600,1; },{},{}
+17125,Red_Bread_Hat_Box,Red Bread Hat Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 18601,1; },{},{}
+17127,Leo_Scroll2,Leo Scroll2,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17134,RWC_Scroll,RWC Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17138,Ms_Cancer_Scroll,Ms Cancer Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17139,RWC_Super_Scroll,RWC Super Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17140,Leo_Scroll,Leo Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17141,Ms_Virgo_Scroll,Ms Virgo Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17143,Ms_Scorpio_Scroll,Ms Scorpio Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17146,Dep_Alice_Hat_Box,Dep Alice Hat Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 18630,1; },{},{}
+17147,Ribbon_Chef_Hat_Box,Ribbon Chef Hat Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 18631,1; },{},{}
+17152,Bridal_Ribbon_Box,Bridal Ribbon Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 18636,1; },{},{}
17155,Upg_Huuma_Shuriken_Box,Upg Huuma Shuriken Box,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 13316,86400; },{},{}
+17157,Vital_Flower_Box,Vital Flower Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 6113,10; },{},{}
+17158,Flame_Gemstone_Box,Flame Gemstone Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 6114,10; },{},{}
+17162,Boarding_Halter_Box7,Boarding Halter Box7,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17165,Challenge_Kit,Challenge Kit,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17181,Jan_Groove_Box,Jan Groove Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17184,3rd_Test_Pass_Box,3rd Test Pass Box,18,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 6583,1; },{},{}
+17203,Free_Pass_Box,Free Pass Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17207,Idn_Heart_Scroll,Idn Heart Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17209,Tw_Rainbow_Scroll,Tw Rainbow Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17210,Tw_Red_Scroll,Tw Red Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17211,Tw_Orange_Scroll,Tw Orange Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17212,Tw_Yellow_Scroll,Tw Yellow Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17233,Scroll_Of_Death,Scroll Of Death,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17234,Scroll_Of_Life,Scroll Of Life,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17235,Scroll_Of_Magic,Scroll Of Magic,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17236,Scroll_Of_Thews,Scroll Of Thews,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17237,Scroll_Of_Darkness,Scroll Of Darkness,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17238,Scroll_Of_Holiness,Scroll Of Holiness,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17239,Horned_Scroll,Horned Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17240,Mercury_Scroll,Mercury Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17251,C_Wing_Of_Fly_3Day_Box,C Wing Of Fly 3Day Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17252,RWC_2012_Set_Box,RWC 2012 Set Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+17253,RWC_2012_Ring_Box,RWC 2012 Ring Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2966,1; },{},{}
+17254,RWC_2012_Pendant_Box,RWC 2012 Pendant Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2968,1; },{},{}
// Mechanic/Genetic Cannonballs
18000,Cannon_Ball,Cannon Ball,10,100,,10,100,,,,0x00040400,8,2,32768,,99,,8,{},{},{}
18001,Holy_Cannon_Ball,Holy Cannon Ball,10,200,,10,120,,,,0x00040400,8,2,32768,,99,,8,{ bonus bAtkEle,Ele_Holy; },{},{}
@@ -7290,8 +7501,8 @@
18101,F_Bow_Of_Rudra_C,Rudra Bow,4,2,,0,185,,5,0,0x000A0848,7,2,34,4,0,0,11,{ bonus bAtkEle,Ele_Holy; bonus bInt,5; skill "AL_CURE",1; skill "AL_HEAL",1; bonus2 bResEff,Eff_Poison,5000; bonus2 bResEff,Eff_Curse,5000; bonus2 bResEff,Eff_Silence,5000; bonus2 bResEff,Eff_Confusion,5000; bonus2 bResEff,Eff_Blind,5000; },{},{}
18102,E_Bow_Of_Rudra_C,Rudra Bow,4,2,,0,185,,5,0,0x000A0848,7,2,34,4,0,0,11,{ bonus bAtkEle,Ele_Holy; bonus bInt,5; skill "AL_CURE",1; skill "AL_HEAL",1; bonus2 bResEff,Eff_Poison,5000; bonus2 bResEff,Eff_Curse,5000; bonus2 bResEff,Eff_Silence,5000; bonus2 bResEff,Eff_Confusion,5000; bonus2 bResEff,Eff_Blind,5000; },{},{}
18103,Mystic_Bow,Mystic Bow,4,0,,1700,75,,5,0,0x00080800,8,2,34,3,105,1,11,{ bonus bMatk,100; bonus bInt,4; bonus2 bSkillUseSP,"WM_SEVERE_RAINSTORM",10; },{},{}
-//18104,
-//18105,
+18104,Adventure_Bow,Adventure Bow,4,0,,0,60,,1,0,98824,7,2,34,1,1,0,11,{ bonus bUnbreakableWeapon,0; },{},{}
+18105,Academy_Bow,Academy Bow,4,0,,1200,90,,5,1,98824,7,2,34,1,1,1,11,{},{},{}
18106,P_Bow3,Eden Bow III,4,0,,0,140,,5,0,0x000A0848,7,2,34,3,60,0,11,{},{},{}
18107,Malangdo_Crab,Malangdo Crab,4,0,,0,120,,5,0,0x000A0848,7,2,34,1,50,0,11,{ bonus bUnbreakableWeapon,0; bonus bLuk,3; bonus bCritAtkRate,50; if(BaseLevel>99) { bonus bLongAtkRate,10; } },{},{}
18108,Zebra_Eel,Zebra Eel,4,0,,0,180,,5,0,0x00080800,7,2,34,1,50,0,11,{ bonus bUnbreakableWeapon,0; bonus bAgi,3; autobonus "{ bonus bAspd,2; }",10,7000,BF_WEAPON,"{ specialeffect2 EF_HASTEUP; }"; if(BaseLevel>99) { bonus bLongAtkRate,10; } },{},{}
@@ -7301,6 +7512,8 @@
18112,Upg_Bow,Upg Bow,4,20,,600,60,,5,1,0x000A0848,7,2,34,3,1,0,11,{ bonus bBaseAtk,(getrefine()*7); bonus bLongAtkRate,(getrefine()*2); if(BaseJob==Job_Hunter) bonus bBaseAtk,20; if(BaseLevel>70) bonus bBaseAtk,(((BaseLevel-70)/10)*10); },{},{}
18113,Velum_Balista,Vellum Balista,4,20,,1100,50,,5,0,0x000A0848,7,2,34,4,95,1,11,{ bonus2 bSPVanishRate,10000,4; bonus bAspd,-5; },{},{}
18114,Velum_Crossbow,Vellum Crossbow,4,20,,1100,110,,5,0,0x000A0848,7,2,34,4,95,1,11,{ bonus2 bAddRace,RC_DemiHuman,30+getrefine(); bonus2 bIgnoreDefRate,RC_DemiHuman,30; },{},{}
+18115,Orc_Archer_Bow_,Orc Archer Bow ,4,20,,1600,120,,5,1,623112,7,2,34,3,65,1,11,{},{},{}
+18116,Metal_Bow,Metal Bow,4,20,,0,50,,5,1,98824,7,2,34,3,1,1,11,{},{},{}
// More Headgears
18500,Cheer_Scarf6,Cheer Scarf6,5,0,,0,,0,,0,0xFFFFFFFF,7,2,1,,1,0,369,{ bonus2 bExpAddRace,RC_Boss,60; bonus2 bExpAddRace,RC_NonBoss,60; },{},{}
18501,Cheer_Scarf8,Cheer Scarf8,5,0,,0,,0,,0,0xFFFFFFFF,7,2,1,,1,0,369,{ bonus2 bExpAddRace,RC_Boss,80; bonus2 bExpAddRace,RC_NonBoss,80; },{},{}
@@ -7309,7 +7522,12 @@
18505,Umbala_Spirit,Umbala Spirit,5,0,,200,,1,,1,0xFFFFFFFF,7,2,1,,30,0,675,{ bonus bVit,1; bonus bMaxHPrate,1; bonus2 bAddMonsterDropItem,517,500; },{},{}
18506,Hattah_Black,Hattah Black,5,12000,,4000,,2,,1,0xFFFFFFFF,7,2,769,,1,1,676,{},{},{}
18507,Elven_Ears_,Elven Ears,5,20,,100,,0,,1,0xFFFFFFFE,7,2,512,,70,0,73,{},{},{}
-//
+18508,Garuda_Hat,Garuda Hat,5,20,,100,,4,,1,0xFFFFFFFE,7,2,256,,30,1,677,{ bonus bLuk,5; bonus bMdef,3; },{},{}
+18509,RWC2010_Indonesia,RWC2010 Indonesia,5,20,,100,,6,,1,0xFFFFFFFE,7,2,256,,15,1,678,{ bonus bLuk,5; },{},{}
+18510,Blood_Angel_Hair_Band,Blood Angel Hair Band,5,0,,0,,1,,0,0xFFFFFFFF,7,2,256,,60,0,679,{},{},{}
+18511,Blood_Angel_Wing_Ear,Blood Angel Wing Ear,5,0,,0,,1,,0,0xFFFFFFFF,7,2,512,,60,0,680,{},{},{}
+18512,Juho_Necktie,Juho Necktie,5,0,,0,,1,,1,0xFFFFFFFF,7,2,256,,20,1,443,{},{},{}
+18513,Shining_Sunflower,Shining Sunflower,5,20,,300,,0,,0,0xFFFFFFFE,7,2,256,,0,0,681,{ bonus bLuk,2; },{},{}
18514,Para_Team_Hat2,Eden Team Hat II,5,0,,0,,5,,1,0xFFFFFFFF,7,2,256,,60,1,682,{ autobonus "{ bonus bBaseAtk,10; }",50,5000,BF_WEAPON,"{ specialeffect2 EF_ENHANCE; }"; autobonus "{ bonus bMatk,10; }",50,5000,BF_MAGIC,"{ specialeffect2 EF_MAGICALATTHIT; }"; },{},{}
18515,RTC_Winner_Hat,RTC Winner Hat,5,20,,100,,2,,0,0xFFFFFFFF,7,2,512,,1,0,683,{},{},{}
18516,RTC_2nd_Winner_Hat,RTC 2nd Winner Hat,5,20,,100,,2,,0,0xFFFFFFFF,7,2,512,,1,0,684,{},{},{}
@@ -7317,35 +7535,109 @@
18518,Angelwing_Ear_S,Angel Wing Ears,5,20,,100,,3,,1,0xFFFFFFFF,7,2,512,,70,0,158,{ bonus bStr,1; },{},{}
18519,Devilwing_Ear_S,Evil Wing Ears,5,20,,100,,3,,1,0xFFFFFFFF,7,2,512,,70,0,152,{ bonus bStr,1; },{},{}
18520,Jati_Crown,Jati Crown,5,20,,100,,1,,0,0xFFFFFFFF,7,2,256,,1,1,686,{ bonus2 bSubRace,RC_Plant,5; bonus2 bSubRace,RC_Brute,5; bonus2 bAddRace,RC_Plant,5; bonus2 bAddRace,RC_Brute,5; },{},{}
-//
+18521,Lucky_Clover,Lucky Clover,5,20,,100,,0,,0,0xFFFFFFFF,7,2,1,,50,0,571,{ bonus bLuk,1; },{},{}
+18522,Evil_Marcher_Hat,Evil Marcher Hat,5,20,,500,,10,,1,0xFFFFFFFF,7,2,256,,0,1,687,{ bonus bStr,2; bonus bMdef,1; },{},{}
18523,Thunderstorm_Cloud,Thunderstorm Cloud,5,20,,100,,2,,0,0xFFFFFFFF,7,2,512,,1,0,688,{},{},{}
-//
+18524,Dokkebi_Mask,Dokkebi Mask,5,20,,700,,1,,0,0xFFFFFFFF,7,2,513,,50,0,689,{ bonus bStr,2; },{},{}
18525,Watermelon_Hat,Watermelon Cap,5,20,,100,,4,,1,0xFFFFFFFF,7,2,256,,30,1,690,{ bonus bMdef,4; bonus2 bAddEle,Ele_Fire,3; },{},{}
18526,Candy_Cane_In_Mouth,Candy Cane In Mouth,5,20,,100,,2,,0,0xFFFFFFFF,7,2,512,,1,0,446,{},{},{}
18527,Dark_Pumpkin_Hat,Dark Pumpkin-head,5,20,,500,,5,,0,0xFFFFFFFF,7,2,256,,45,1,691,{ bonus2 bAddMonsterDropItem,12192,10; bonus bMdef,5; bonus bAllStats,2; },{},{}
+18528,Tare_Neko_Cru,Tare Neko Cru,5,20,,100,,0,,1,0xFFFFFFFF,7,2,256,,0,1,692,{ bonus bInt,2; bonus bMdef,5; },{},{}
+18529,Drooping_Wild_Rose,Drooping Wild Rose,5,20,,500,,5,,1,0xFFFFFFFF,7,2,768,,30,1,541,{},{},{}
+18530,Tha_Despero_Mask,Tha Despero Mask,5,20,,100,,0,,0,0xFFFFFFFF,7,2,513,,30,0,693,{ bonus bLuk,-5; },{},{}
+18531,Drooping_Permeter,Drooping Permeter,5,20,,1000,,8,,1,0xFFFFFFFF,7,2,256,,10,1,694,{},{},{}
+18532,Heart_Ribbon_Band,Heart Ribbon Band,5,20,,100,,0,,1,0xFFFFFFFF,7,2,256,,10,1,708,{ bonus bInt,2; },{},{}
+18533,Honeybee_Hat,Honeybee Hat,5,20,,100,,3,,1,0xFFFFFFFF,7,2,256,,50,1,709,{ bonus bMdef,3; },{},{}
+18534,Fancy_Phantom_Mask,Fancy Phantom Mask,5,20,,1000,,5,,1,0xFFFFFFFF,7,2,768,,20,1,710,{ bonus bStr,1; },{},{}
+18535,Pumpkin_Hat_2010,Pumpkin Hat 2010,5,20,,200,,0,,0,0xFFFFFFFF,7,2,256,,0,1,206,{},{},{}
+18536,Foxtail,Foxtail,5,20,,100,,0,,0,0xFFFFFFFF,7,2,1,,0,0,711,{},{},{}
+18537,Malangdo_Hat,Malangdo Hat,5,20,,100,,5,,1,0xFFFFFFFF,7,2,256,,0,1,726,{},{},{}
+18538,Devil_Whisper,Devil Whisper,5,20,,300,,3,,0,0xFFFFFFFF,7,2,512,,0,0,712,{ bonus bMdef,3; },{},{}
18539,Skull_Cap,Skull Cap,5,40,,200,,5,,1,0xFFFFFFFF,7,2,256,,10,1,713,{ bonus bMatkRate,2; if(getrefine() >= 5) { bonus bMatkRate,3; } if(getrefine() >= 7) { bonus bMatkRate,3; } },{},{}
-//
+18540,Evil_Mask,Evil Mask,5,20,,1000,,3,,0,0xFFFFFFFF,7,2,513,,10,0,714,{},{},{}
+18541,Little_Feather_Hat,Little Feather Hat,5,20,,500,,1,,1,0xFFFFFFFF,7,2,256,,30,1,715,{ bonus bDex,2; },{},{}
+18542,Love_Guard,Love Guard,5,20,,500,,10,,1,0xFFFFFFFF,7,2,768,,10,1,716,{},{},{}
+18543,Witchs_Hat,Witchs Hat,5,20,,300,,7,,0,0xFFFFFFFF,7,2,256,,20,1,717,{ bonus bMdef,5; },{},{}
+18544,Blrabbit_Hband,Blrabbit Hband,5,20,,100,,6,,0,0xFFFFFFFF,7,2,256,,30,1,718,{},{},{}
+18545,Whrabbit_Hband,Whrabbit Hband,5,20,,100,,6,,0,0xFFFFFFFF,7,2,256,,30,1,719,{},{},{}
+18546,Lover_In_Mouth,Lover In Mouth,5,20,,300,,0,,0,0xFFFFFFFF,7,2,1,,0,0,720,{},{},{}
+18547,Campus_Festival,Campus Festival,5,20,,100,,0,,0,0xFFFFFFFF,7,2,256,,0,1,721,{},{},{}
+18548,Tiny_Hat,Tiny Hat,5,20,,30,,0,,0,0xFFFFFFFF,7,2,256,,0,1,722,{ bonus bInt,1; bonus bAgi,1; },{},{}
+18549,Nabi_Hair_Pin,Nabi Hair Pin,5,20,,200,,3,,1,0xFFFFFFFF,7,2,256,,20,1,723,{ bonus bInt,1; bonus bAgi,1; bonus bMdef,3; },{},{}
+18550,Asgard_Blessing,Asgard Blessing,5,20,,300,,3,,1,0xFFFFFFFF,7,2,256,,30,1,724,{ bonus bAllStats,2; },{},{}
+18551,Galaxy_Circlet,Galaxy Circlet,5,20,,1000,,5,,1,0xFFFFFFFF,7,2,256,,50,1,725,{ bonus bMdef,5; },{},{}
+18552,Proba_Angel_Blessing,Proba Angel Blessing,5,20,,1200,,0,,1,0xFFFFFFFF,7,2,256,,10,1,444,{ bonus bLuk,2; },{},{}
+18553,Mini_Tree,Mini Tree,5,20,,50,,5,,0,0xFFFFFFFF,7,2,256,,0,1,727,{},{},{}
+18554,King_Prawn_Hat,King Prawn Hat,5,20,,1000,,8,,0,0xFFFFFFFF,7,2,256,,0,0,728,{},{},{}
+18555,General_Helmet,General Helmet,5,20,,200,,3,,1,0xFFFFFFFF,7,2,256,,10,1,729,{ bonus bMdef,3; },{},{}
+18556,Angel_Helmet,Angel Helmet,5,0,,0,,0,,0,0xFFFFFFFF,7,2,512,,0,0,3,{},{},{}
+18557,Devil_Helmet,Devil Helmet,5,0,,0,,0,,0,0xFFFFFFFF,7,2,512,,0,0,12,{},{},{}
+18558,Sinsuncho_Hat,Sinsuncho Hat,5,20,,1000,,0,,0,0xFFFFFFFF,7,2,256,,10,0,730,{},{},{}
+18559,Fafnir_Skin,Fafnir Skin,5,20,,100,,3,,0,0xFFFFFFFF,7,2,512,,50,0,152,{},{},{}
+18560,Fafnir_Mask,Fafnir Mask,5,20,,300,,2,,0,0xFFFFFFFF,7,2,1,,50,0,180,{},{},{}
+18561,B_Feather_Beret,B Feather Beret,5,20,,300,,5,,1,0xFFFFFFFF,7,2,256,,40,1,731,{ bonus bVit,2; bonus bMdef,3; },{},{}
+18562,Bone_Hat,Bone Hat,5,20,,200,,3,,1,0xFFFFFFFF,7,2,256,,10,1,732,{ bonus bMdef,3; },{},{}
+18563,Heart_Wing_Hairband,Heart Wing Hairband,5,20,,300,,0,,1,0xFFFFFFFF,7,2,256,,50,1,733,{},{},{}
+18564,Love_Piece,Love Piece,5,20,,200,,0,,0,0xFFFFFFFF,7,2,1,,50,0,734,{},{},{}
+18565,Leprechaun_Hat,Leprechaun Hat,5,20,,300,,8,,1,0xFFFFFFFF,7,2,256,,40,0,735,{ bonus bStr,1; bonus bInt,1; bonus bMdef,4; },{},{}
+18566,Nut_Donut_In_Mouth,Nut Donut In Mouth,5,20,,0,,1,,0,0xFFFFFFFF,7,2,1,,0,0,736,{},{},{}
+18567,Stretched_Nose,Stretched Nose,5,20,,100,,0,,0,0xFFFFFFFF,7,2,1,,0,0,737,{},{},{}
+18568,Humming_Bird,Humming Bird,5,20,,100,,3,,0,0xFFFFFFFF,7,2,256,,10,0,702,{ bonus bMdef,6; },{},{}
+18569,Soft_Sheep_Hat,Soft Sheep Hat,5,20,,1000,,0,,0,0xFFFFFFFF,7,2,256,,10,0,738,{},{},{}
18570,Ancient_Gold_Ornament,Ancient Gold Ornament,5,20,,400,,7,,1,0xFFFFFFFE,7,2,256,,100,1,739,{ if(BaseLevel >= 150) { bonus bAllStats,2; } if(BaseClass==Job_Swordman||BaseClass==Job_Merchant||BaseClass==Job_Thief){ bonus2 bAddRace,RC_Boss,8; bonus2 bAddRace,RC_NonBoss,8; } if(BaseClass==Job_Mage||BaseClass==Job_Acolyte){ bonus bMatk,8; } if(BaseClass==Job_Archer){ bonus bDex,3; bonus bLongAtkRate,10; } },{},{}
-//
+18571,Lucky_Hat,Lucky Hat,5,20,,1000,,0,,0,0xFFFFFFFF,7,2,256,,0,0,740,{},{},{}
+18572,Korean_Judge_Hat,Korean Judge Hat,5,20,,300,,2,,1,0xFFFFFFFF,7,2,256,,0,1,377,{ bonus bMdef,2; },{},{}
+18573,White_Feather,White Feather,5,20,,500,,2,,1,0xFFFFFFFF,7,2,256,,30,1,741,{},{},{}
+18574,Lord_of_Death,Lord of Death,5,20,,1000,,10,,1,0xFFFFFFFF,7,2,256,,70,1,742,{ bonus bMdef,5; },{},{}
+18574,Lord_of_Death,Lord of Death,5,20,,1000,,10,,1,0xFFFFFFFF,7,2,768,,70,1,742,{ bonus bMdef,5; },{},{}
+18575,Wunderkammer,Wunderkammer,5,20,,500,,10,,1,0xFFFFFFFF,7,2,769,,20,0,743,{ bonus bMdef,10; },{},{}
+18576,YinYang_Earring,YinYang Earring,5,20,,100,,0,,0,0xFFFFFFFF,7,2,512,,50,0,744,{},{},{}
+18577,24_Bolt,24 Bolt,5,20,,200,,0,,0,0xFFFFFFFF,7,2,512,,10,0,696,{},{},{}
+18578,Helm_Of_Valor,Helm Of Valor,5,0,,0,,4,,0,0xFFFFFFFF,7,2,256,,0,0,258,{},{},{}
+18579,9th_Anni_Hat,9th Anni Hat,5,0,,90,,0,,0,0xFFFFFFFF,7,2,256,,0,1,745,{ bonus bMdef,9; },{},{}
18580,Yggdrasil_Crown,Yggdrasil Crown,5,20,,200,,3,,0,0xFFFFFFFF,7,2,256,,1,1,724,{ bonus bMdef,3; bonus bHealPower,2; bonus bHealpower2,10; if(getrefine() >= 7){ bonus bHealPower,5; } if(getrefine() >= 9){ bonus bHealPower,3; } },{},{}
-//
+18581,Red_Tiger_Mask,Red Tiger Mask,5,20,,400,,2,,0,0xFFFFFFFF,7,2,768,,50,0,747,{ bonus bStr,3; },{},{}
+18582,Blue_Tiger_Mask,Blue Tiger Mask,5,20,,400,,2,,0,0xFFFFFFFF,7,2,768,,50,0,748,{ bonus bStr,3; },{},{}
+18583,Navy_Drooping_Kitty,Navy Drooping Kitty,5,250000,,500,,3,,0,0xFFFFFFFE,7,2,256,,0,1,749,{ bonus bMdef,15; },{},{}
+18584,Brown_Drooping_Kitty,Brown Drooping Kitty,5,250000,,500,,3,,0,0xFFFFFFFE,7,2,256,,0,1,750,{ bonus bMdef,15; },{},{}
+18585,Orange_Bunny_Hairband,Orange Bunny Hairband,5,20,,10,,0,,0,0xFFFFFFFF,7,2,256,,0,1,751,{ bonus bStr,1; bonus bInt,2; bonus bVit,3; },{},{}
+18586,Violet_Bunny_Hairband,Violet Bunny Hairband,5,20,,10,,0,,0,0xFFFFFFFF,7,2,256,,0,1,752,{ bonus bStr,1; bonus bInt,3; bonus bVit,2; bonus bDex,1; },{},{}
+18587,Blue_Bunny_Hairband,Blue Bunny Hairband,5,20,,10,,0,,0,0xFFFFFFFF,7,2,256,,0,1,753,{ bonus bStr,3; bonus bInt,1; bonus bVit,2; bonus bDex,1; },{},{}
+18588,Silver_Bunny_Hairband,Silver Bunny Hairband,5,20,,10,,0,,0,0xFFFFFFFF,7,2,256,,0,1,754,{ bonus bStr,2; bonus bInt,3; bonus bVit,1; bonus bDex,1; },{},{}
+18589,Strawberry_Hat,Strawberry Hat,5,20,,100,,5,,1,0xFFFFFFFF,7,2,256,,0,1,755,{},{},{}
+18590,Gemma_Hairband,Gemma Hairband,5,20,,200,,3,,1,0xFFFFFFFF,7,2,256,,10,1,564,{ bonus bMdef,3; },{},{}
+18591,Mini_Glasses_,Mini Glasses,5,20,,100,,2,,1,0xFFFFFFFE,7,2,512,,0,0,47,{},{},{}
+18592,Nestea_Hat,Nestea Hat,5,20,,200,,5,,1,0xFFFFFFFF,7,2,256,,0,1,756,{ bonus bMdef,5; },{},{}
+18593,Fancy_Mini_Crown,Fancy Mini Crown,5,20,,100,,2,,1,0xFFFFFFFF,7,2,256,,30,1,707,{ bonus bInt,1; bonus bMdef,5; },{},{}
+18594,Magni_Cap_,Magni Cap,5,30000,,1000,,9,,1,0xFFFFFFFE,7,2,256,,0,1,250,{ bonus bStr,2; },{},{}
18595,Horn_Of_Ancient,Horn of Ancient,5,40,,200,,8,,1,0xFFFFFFFF,7,2,256,,50,1,757,{ autobonus "{ bonus bBaseAtk,100; }",5,10000,0,"{ specialeffect2 EF_POTION_BERSERK; }"; },{},{}
18596,Sprout_Hat,Sprout Hat,5,20,,200,,4,,0,0xFFFFFFFF,7,2,256,,70,1,758,{ skill "WZ_HEAVENDRIVE",3; },{},{}
18597,Mercury_Riser,Mercury Riser,5,40,,200,,10,,1,0xFFFFFFFF,7,2,256,,0,,759,{ bonus bAspdRate,3; bonus bCritical,3; if(getrefine() >= 7) { bonus bAspdRate,2; bonus bCritical,2; } if(getrefine() >= 9) { bonus bAspdRate,2; bonus bCritical,2; }},{},{}
-//
+18598,Mini_Tree_J,Mini Tree J,5,20,,50,,0,,1,0xFFFFFFFF,7,2,256,,0,0,727,{ bonus bMdef,20; },{},{}
+18599,Black_Devil_Mask,Black Devil Mask,5,20,,100,,0,,0,0xFFFFFFFF,7,2,512,,0,0,760,{ bonus bAllStats,2; },{},{}
18600,Cat_Ear_Beret,Cat Ear Beret,5,20,,100,,5,,0,0xFFFFFFFF,7,2,256,,0,1,761,{ bonus bAtkRate,5; if(getrefine() > 5 && getrefine() <= 12) { bonus2 bAddRace,RC_DemiHuman,(getrefine() - 5); bonus2 bSubRace,RC_DemiHuman,(getrefine() - 5); } if(getrefine() > 12) { bonus2 bAddRace,RC_DemiHuman,7; bonus2 bSubRace,RC_DemiHuman,7; } },{},{}
-//
+18601,Red_Bread_Hat,Red Bread Hat,5,20,,300,,0,,1,0xFFFFFFFF,7,2,256,,0,1,762,{ bonus bMdef,5; },{},{}
18602,Watermelon_Bite,Watermelon Bite,5,20,,100,,4,,0,0xFFFFFFFF,7,2,1,,30,0,763,{ bonus bMdef,4; bonus2 bAddEle,Ele_Fire,4; },{},{}
-//
+18603,Black_Devil_Mask_,Black Devil Mask,5,20,,100,,0,,1,0xFFFFFFFF,7,2,512,,0,0,760,{ bonus bAllStats,1; },{},{}
+18604,Falcon_Mask,Falcon Mask,5,10,,30,,0,,1,0xFFFFFFFF,7,2,513,,50,0,782,{},{},{}
+18604,Falcon_Mask,Falcon Mask,5,10,,30,,0,,1,0xFFFFFFFF,7,2,513,,50,0,782,{},{},{}
+18605,Dark_Age,Dark Age,5,20,,200,,3,,1,0xFFFFFFFF,7,2,256,,10,1,766,{ bonus bMdef,3; },{},{}
+18606,Tear_Drop,Tear Drop,5,20,,100,,1,,0,0xFFFFFFFF,7,2,513,,30,0,767,{},{},{}
18607,Blush_S,Blush,5,20,,100,,0,,1,0xFFFFFFFF,7,2,512,,0,0,125,{},{},{}
18608,Pair_Of_Red_Ribbon_S,Small Ribbons,5,20,,100,,2,,1,0xFFFFFFFF,7,2,512,,45,0,169,{},{},{}
18609,Dark_Blindfold_S,Dark Blinder,5,20,,100,,0,,1,0xFFFFFFFE,7,2,512,,0,0,187,{ bonus2 bResEff,Eff_Blind,10000; bonus2 bResEff,Eff_Stun,200; },{},{}
-//
+18610,7th_Anni_Hat_B,7th Anni Hat B,5,20,,500,,4,,0,0xFFFFFFFF,7,2,256,,0,1,778,{ bonus bAllStats,5; bonus bMdef,4; },{},{}
+18611,Black_Glasses_,Black Glasses,5,20,,200,,2,,1,0xFFFFFFFF,7,2,512,,0,0,404,{ bonus bInt,1; bonus bMdef,2; },{},{}
18612,White_Musang_Hat,White Musang Hat,5,40,,400,,3,,1,0xFFFFFFFF,7,2,256,,0,1,770,{ bonus bStr,2; bonus bVit,2; bonus bLuk,1; bonus bUnbreakableHelm,0; },{},{}
18613,Black_Musang_Hat,Black Musang Hat,5,40,,400,,3,,1,0xFFFFFFFF,7,2,256,,0,1,771,{ bonus bInt,2; bonus bDex,2; bonus bAgi,1; bonus bUnbreakableHelm,0; },{},{}
-//
+18614,Grim_Reaper_Hat,Grim Reaper Hat,5,20,,200,,2,,1,0xFFFFFFFF,7,2,256,,20,1,732,{},{},{}
+18615,Injured_Eyepatch,Injured Eyepatch,5,20,,200,,2,,0,0xFFFFFFFE,7,2,512,,20,0,772,{},{},{}
+18616,Long_Tongue,Long Tongue,5,20,,200,,0,,0,0xFFFFFFFE,7,2,1,,20,0,773,{},{},{}
+18617,Onigiri_In_Mouth,Onigiri In Mouth,5,20,,200,,0,,0,0xFFFFFFFE,7,2,1,,20,0,774,{},{},{}
+18618,Airplane_Hat,Airplane Hat,5,20,,200,,8,,1,0xFFFFFFFE,7,2,256,,20,1,775,{},{},{}
+18619,Thief_Bandana,Thief Bandana,5,20,,200,,1,,0,0xFFFFFFFE,7,2,256,,20,1,776,{},{},{}
18620,Heart_Eye_Patch,Heart Eyepatch,5,5,,50,,2,,0,0xFFFFFFFF,7,2,512,,20,1,779,{},{},{}
-//
+18621,Gangster_Mask_A,Gangster Mask A,5,20,,100,,0,,0,0xFFFFFFFF,7,2,1,,0,0,52,{},{},{}
18622,Rocket_Helm_1,Rocket Helm 1,5,20,,1000,,20,,1,0xFFFFFFFF,7,2,256,,95,1,764,{ bonus bAllStats,5; bonus bUnbreakableHelm,0; },{},{}
18623,Rocket_Helm_2,Rocket Helm 2,5,20,,1000,,20,,1,0xFFFFFFFF,7,2,256,,95,1,765,{ bonus bAllStats,4; bonus bUnbreakableHelm,0; },{},{}
18624,Rocket_Helm_3,Rocket Helm 3,5,20,,1000,,20,,1,0xFFFFFFFF,7,2,256,,95,1,768,{ bonus bAllStats,3; bonus bUnbreakableHelm,0; },{},{}
@@ -7420,14 +7712,54 @@
18701,Ancient_Civil_Man,Ancient Civil Man,5,20,,500,,2,,0,0xFFFFFFFE,7,2,256,,70,0,846,{ bonus bInt,3; bonus bDex,2; bonus bLuk,1; },{},{}
18702,Shaving_Cream,Shaving Cream,5,20,,50,,1,,0,0xFFFFFFFF,7,2,1,,10,0,847,{},{},{}
18703,Stem_In_Mouth,Stem In Mouth,5,20,,50,,0,,0,0xFFFFFFFF,7,2,1,,1,0,848,{},{},{}
+18706,Can_Hat,Can Hat,5,20,,400,,3,,0,0xFFFFFFFE,7,2,256,,20,1,851,{ bonus bLuk,3; },{},{}
+18707,Maneater_Flower_Hat,Maneater Flower Hat,5,20,,500,,3,,0,0xFFFFFFFE,7,2,256,,20,1,852,{},{},{}
+18708,Candy_Hat,Candy Hat,5,20,,200,,3,,0,0xFFFFFFFE,7,2,256,,20,1,853,{},{},{}
+18709,Black_Knitted_Hat,Black Knitted Hat,5,20,,200,,3,,1,0xFFFFFFFE,7,2,256,,0,1,854,{},{},{}
+18710,Sugared_Fruit_Stick,Sugared Fruit Stick,5,20,,200,,0,,0,0xFFFFFFFE,7,2,1,,20,0,855,{},{},{}
+18711,Electric_Sunglass,Electric Sunglass,5,20,,400,,3,,0,0xFFFFFFFE,7,2,512,,20,0,856,{},{},{}
+18712,Fan_In_Mouth,Fan In Mouth,5,20,,200,,0,,0,0xFFFFFFFE,7,2,1,,20,0,857,{},{},{}
+18713,Monkey_On_Fur_Hat,Monkey On Fur Hat,5,20,,300,,6,,1,0xFFFFFFFF,7,2,256,,20,1,858,{ bonus bDex,1; bonus bAgi,1; },{},{}
+18714,Hippo_Hat,Hippo Hat,5,20,,500,,5,,1,0xFFFFFFFF,7,2,256,,10,1,859,{},{},{}
+18715,Helm_Of_Thoth,Helm Of Thoth,5,20,,2500,,2,,1,0xFFFFFFFE,7,2,768,,80,0,860,{ bonus bInt,2; bonus bMdef,5; },{},{}
+18716,Strawberry_In_Mouth,Strawberry In Mouth,5,20,,50,,2,,0,0xFFFFFFFF,7,2,1,,10,0,861,{},{},{}
+18718,Rose_Hairband,Rose Hairband,5,20,,200,,3,,0,0xFFFFFFFF,7,2,256,,30,0,864,{ bonus bInt,1; bonus bVit,1; },{},{}
18727,Sedora_Hat,Sedora Hat,5,20,,300,,13,,1,0xFFFFFFFF,7,2,256,,10,1,869,{},{},{}
18728,Egir_Helm,Egir Helm,5,200000,,800,,10,,1,0xFFFFFFFF,7,2,256,,110,1,870,{ bonus bUnbreakableHelm,0; },{},{}
18729,MVP_Basketball,MVP Basketball,5,20,,150,,6,,1,0xFFFFFFFF,7,2,256,,1,1,871,{},{},{}
+18730,Cryptura_Academy_Hat,Cryptura Academy Hat,5,0,,200,,2,,1,0xFFFFFFFF,7,2,256,,0,1,872,{},{},{}
+18739,Carnation_Hairband,Carnation Hairband,5,20,,100,,0,,0,0xFFFFFFFF,7,2,256,,0,1,878,{ bonus bLuk,1; },{},{}
+18740,Hair_Of_The_Strong,Hair Of The Strong,5,20,,0,,0,,0,0xFFFFFFFF,7,2,1024,,0,0,879,{},{},{}
+18745,Choco_Stick_In_Mouth,Choco Stick In Mouth,5,20,,100,,0,,0,0xFFFFFFFF,7,2,1,,10,0,884,{},{},{}
+18746,Chilly_Breath,Chilly Breath,5,20,,100,,0,,0,0xFFFFFFFF,7,2,1,,10,0,885,{ bonus bInt,1; },{},{}
+18747,Eyes_Of_Ifrit,Eyes Of Ifrit,5,20,,100,,1,,1,0xFFFFFFFF,7,2,512,,0,0,886,{ bonus bDex,1; },{},{}
+18748,Gold_Ingot_Poring_Hat,Gold Ingot Poring Hat,5,20,,200,,3,,1,0xFFFFFFFF,7,2,256,,0,1,887,{ bonus bDex,2; bonus bLuk,2; },{},{}
+18749,Majoruros_Horn,Majoruros Horn,5,20,,500,,8,,1,0xFFFFFFFF,7,2,256,,0,1,888,{ bonus bStr,2; },{},{}
+18750,Poker_Card_In_Mouth,Poker Card In Mouth,5,20,,50,,0,,0,0xFFFFFFFF,7,2,1,,10,0,889,{},{},{}
+18753,Tw_Rice_Ball,Tw Rice Ball,5,20,,100,,6,,0,0xFFFFFFFF,7,2,256,,0,0,892,{ bonus bLuk,1; },{},{}
+18758,Hat_Of_Scrat,Hat Of Scrat,5,20,,200,,3,,1,0xFFFFFFFF,7,2,256,,0,1,896,{},{},{}
+//
18785,King_Poring_Hat,King Poring Hat,5,20,,600,,10,,1,0xFFFFFFFF,7,2,256,,10,1,905,{ bonus bDex,1; bonus bLuk,1; },{},{}
+//
+18790,Rainbow_Poring_Hat,Rainbow Poring Hat,5,20,,100,,3,,1,0xFFFFFFFF,7,2,256,,0,1,900,{},{},{}
+18805,Eclipse_Hat,Eclipse Hat,5,20,,300,,2,,0,0xFFFFFFFF,7,2,256,,0,1,922,{ bonus bLuk,3; bonus bMdef,5; },{},{}
+18806,Black_Rabbit_Hat,Black Rabbit Hat,5,20,,300,,2,,1,0xFFFFFFFF,7,2,256,,0,1,923,{ bonus bDex,2; bonus bAgi,3; },{},{}
+18807,Yellow_Yuzu_Hat,Yellow Yuzu Hat,5,20,,400,,3,,1,0xFFFFFFFE,7,2,256,,0,1,924,{ bonus bVit,2; bonus bLuk,3; },{},{}
+18808,Wing_Form_Spectacle,Wing Form Spectacle,5,20,,100,,1,,0,0xFFFFFFFF,7,2,256,,0,1,925,{ bonus bAgi,1; },{},{}
+18810,Hell_Pumpkin_Hat,Hell Pumpkin Hat,5,20,,500,,12,,0,0xFFFFFFFF,7,2,256,,0,1,717,{ bonus bMdef,12; },{},{}
+//
18821,Rainbow_Feather_Deco,Rainbow Feather Deco,5,20,,300,,5,,1,0xFFFFFFFF,7,2,256,,1,1,934,{},{},{}
+//
+18828,2012RMSCNO1,2012RMSCNO1,5,0,,1000,,20,,1,0xFFFFFFFF,7,2,256,,95,0,942,{ bonus bAllStats,5; bonus bMdef,5; },{},{}
+18829,2012RMSCNO2,2012RMSCNO2,5,0,,1000,,20,,1,0xFFFFFFFF,7,2,256,,95,0,943,{ bonus bAllStats,4; bonus bMdef,5; },{},{}
+18830,2012RMSCNO3,2012RMSCNO3,5,0,,1000,,20,,1,0xFFFFFFFF,7,2,256,,95,0,944,{ bonus bAllStats,3; bonus bMdef,5; },{},{}
+18831,2012RMSCNO4,2012RMSCNO4,5,0,,1000,,20,,1,0xFFFFFFFF,7,2,256,,95,0,945,{ bonus bAllStats,2; bonus bMdef,5; },{},{}
+//
18839,Poring_Sunglasses,Poring Sunglasses,5,0,,100,,10,,1,0xFFFFFFFF,7,2,512,,1,0,954,{ bonus bDex,1; },{},{}
+//
18850,Polar_Bear_Cap,Polar Bear Cap,5,20,,300,,7,,0,0xFFFFFFFF,7,2,256,,1,0,966,{ bonus bUnbreakableHelm,0; bonus bDex,1; bonus bAgi,1; },{},{}
18851,C_Polar_Bear_Cap,Costume Polar Bear Cap,5,20,,0,,0,,0,0xFFFFFFFF,7,2,1024,,1,1,966,{},{},{}
+//
18873,Sweet_Valentine_Out,Sweet Valentine Out,5,20,,100,,1,,0,0xFFFFFFFF,7,2,256,,1,1,965,{},{},{}
// Costume System
19500,T_Mr_Smile,T Mr Smile,5,0,,0,,0,,0,0xFFFFFFFF,7,2,6144,,0,0,65,{ bonus bStr,2; },{},{}
@@ -7493,3 +7825,6 @@
21000,Upg_Twohand_Sword,Upg Two-Handed Sword,4,20,,1500,100,,1,1,0x00004082,7,2,34,3,1,1,3,{ bonus bBaseAtk,(getrefine()*12); bonus bMatk,(getrefine()*5); if(BaseLevel>70) bonus bBaseAtk,(((BaseLevel-70)/10)*10); },{},{}
21001,Velum_Claymore,Vellum Claymore,4,20,,3500,260,,1,0,0x00004082,7,2,34,4,95,1,3,{ bonus2 bAddRace,RC_DemiHuman,80; bonus2 bIgnoreDefRate,RC_DemiHuman,30; if(getrefine()>=6) { bonus2 bAddRace,RC_DemiHuman,40; } if(getrefine()>=9) { autobonus2 "{ bonus bShortWeaponDamageReturn,20; bonus bMagicDamageReturn,20; }",200,1000,BF_WEAPON,"{ specialeffect2 EF_REFLECTSHIELD; }"; } },{},{}
21002,Velum_Katzbalger,Vellum Katzbalger,4,20,,2500,100,,1,0,0x00004082,7,2,34,4,95,1,3,{ bonus2 bSPVanishRate,10000,8; },{},{}
+21003,Muramasa_,Muramasa ,4,20,,1000,155,,1,2,0x00004082,7,2,34,4,48,1,3,{},{},{}
+21004,Alca_Bringer_,Alca Bringer ,4,20,,3400,280,,2,2,125,7,2,34,3,100,1,3,{},{},{}
+21005,Metal_Two_Hand_Sword,Metal Two Hand Sword,4,20,,0,95,,1,1,0x00004082,7,2,34,3,1,1,3,{},{},{}
diff --git a/db/re/mob_db.txt b/db/re/mob_db.txt
index f81a21db9..e608cbf49 100644
--- a/db/re/mob_db.txt
+++ b/db/re/mob_db.txt
@@ -19,7 +19,7 @@
1013,WOLF,Wolf,Wolf,45,1219,1,342,386,1,80,91,55,3,27,24,30,15,33,5,10,12,1,2,22,0x1089,200,1054,504,432,0,0,0,0,0,0,0,1011,20,920,9000,2308,10,517,650,528,1050,919,5500,578,600,0,0,0,0,4029,1
1014,SPORE,Spore,Spore,18,280,1,117,87,1,25,33,12,10,15,5,10,0,12,0,10,12,1,3,21,0x81,200,1872,672,288,0,0,0,0,0,0,0,921,9000,507,800,510,50,743,10,2220,40,7033,5,578,600,0,0,0,0,4022,1
1015,ZOMBIE,Zombie,Zombie,17,234,1,117,87,1,38,50,20,3,15,8,17,0,15,0,10,12,1,1,29,0x3885,400,2612,912,288,0,0,0,0,0,0,0,957,9000,724,5,938,1000,958,50,727,70,0,0,0,0,0,0,0,0,4038,1
-1016,ARCHER_SKELETON,Archer Skeleton,Archer Skeleton,50,1646,1,405,455,9,90,113,47,10,30,29,20,10,32,5,10,12,1,1,29,0x2085,300,2864,864,576,0,0,0,0,0,0,0,932,4500,756,70,2285,3,1708,35,1752,1000,507,1800,1701,150,0,0,0,0,4094,1
+1016,ARCHER_SKELETON,Archer Skeleton,Archer Skeleton,50,1646,1,405,455,9,95,118,47,10,30,29,20,10,35,5,10,12,1,1,29,0x2085,300,2864,864,576,0,0,0,0,0,0,0,932,4500,756,70,2285,3,1708,35,1752,1000,507,1800,1701,150,0,0,0,0,4094,1
//1017,THIEF_BUG_FEMALE,Thief Bug Female,Thief Bug Female,10,170,0,35,18,1,33,40,5,5,1,15,10,5,23,5,10,12,1,4,27,0x651,200,988,288,768,0,0,0,0,0,0,0,955,3500,910,250,1108,15,928,200,507,400,716,50,1002,400,0,0,0,0,4026,1
1018,CREAMY,Creamy,Creamy,23,378,1,144,162,1,61,62,28,20,16,1,1,0,1,20,10,12,0,4,24,0x181,150,1136,720,840,0,0,0,0,0,0,0,924,9000,2322,10,518,150,602,100,2207,2,712,500,692,100,0,0,0,0,4040,1
1019,PECOPECO,Peco Peco,Peco Peco,25,446,1,162,183,1,76,83,48,0,21,10,13,5,28,5,10,12,2,2,23,0x1089,200,1564,864,576,0,0,0,0,0,0,0,925,9000,2402,20,508,200,507,900,1604,100,0,0,582,1000,0,0,0,0,4031,1
@@ -29,11 +29,11 @@
1023,ORK_WARRIOR,Orc Warrior,Orc Warrior,44,1434,1,350,540,1,71,104,52,3,32,15,24,15,16,10,10,12,1,7,22,0x3885,200,1864,864,288,0,0,0,0,0,0,0,998,210,931,9000,756,40,2267,3,1352,10,1304,5,2147,3,0,0,0,0,4066,1
1024,WORM_TAIL,Wormtail,Wormtail,17,200,1,117,87,1,22,27,16,0,10,6,14,5,12,35,10,12,1,3,22,0x91,200,1048,48,192,0,0,0,0,0,0,0,993,60,1011,25,906,5500,1408,30,508,70,721,5,10015,100,0,0,0,0,4034,1
1025,SNAKE,Snake,Boa,18,217,1,117,87,1,23,28,9,8,10,8,18,10,14,15,10,12,1,2,22,0x81,200,1576,576,576,0,0,0,0,0,0,0,926,9000,1117,15,507,900,1011,35,937,800,954,1,578,600,0,0,0,0,4037,1
-1026,MUNAK,Munak,Munak,58,2445,1,495,557,1,175,205,77,15,53,9,25,10,30,10,10,12,1,1,29,0x3885,200,2468,768,288,0,0,0,0,0,0,0,901,9000,2264,2,2404,15,609,20,2337,1,2305,100,1558,5,0,0,0,0,4090,1
+1026,MUNAK,Munak,Munak,58,2445,1,495,557,1,184,214,77,15,53,9,25,10,33,10,10,12,1,1,29,0x3885,200,2468,768,288,0,0,0,0,0,0,0,901,9000,2264,2,2404,15,609,20,2337,1,2305,100,1558,5,0,0,0,0,4090,1
//1027,RAPTICE,Raptice,Raptice,17,600,0,100,55,1,0,0,5,10,5,20,20,0,28,10,10,12,1,2,22,0x131,200,2000,1000,500,0,0,0,0,0,0,0,909,7000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1028,SOLDIER_SKELETON,Soldier Skeleton,Soldier Skeleton,34,804,1,216,243,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,932,5500,756,60,1214,12,507,700,934,10,2315,1,1216,50,0,0,0,0,4086,1
-1029,ISIS,Isis,Isis,59,2092,1,531,597,1,192,229,83,5,58,43,22,5,39,15,10,12,2,6,27,0x3195,200,1384,768,336,0,0,0,0,0,0,0,936,5335,2233,5,2603,1,733,150,732,20,954,1000,731,5,0,0,0,0,4116,1
-1030,ANACONDAQ,Anacondaq,Anacondaq,100,8510,1,1602,1202,1,388,443,92,0,79,46,28,43,56,25,10,12,1,2,25,0x91,200,1576,576,576,0,0,0,0,0,0,0,6247,200,937,9000,1455,10,926,1500,936,200,508,150,756,50,0,0,0,0,4062,1
+1029,ISIS,Isis,Isis,59,2092,1,531,597,1,202,239,83,5,58,43,22,5,43,15,10,12,2,6,27,0x3195,200,1384,768,336,0,0,0,0,0,0,0,936,5335,2233,5,2603,1,733,150,732,20,954,1000,731,5,0,0,0,0,4116,1
+1030,ANACONDAQ,Anacondaq,Anacondaq,100,8510,1,1602,1202,1,504,559,92,0,79,46,28,43,67,25,10,12,1,2,25,0x91,200,1576,576,576,0,0,0,0,0,0,0,6247,200,937,9000,1455,10,926,1500,936,200,508,150,756,50,0,0,0,0,4062,1
1031,POPORING,Poporing,Poporing,30,524,1,198,224,1,74,94,36,17,17,26,20,18,36,5,10,12,1,3,25,0x83,300,1672,672,480,0,0,0,0,0,0,0,938,5500,910,1500,511,500,514,200,512,5,1207,5,512,250,0,0,0,0,4033,1
1032,VERIT,Verit,Verit,52,1944,1,414,467,1,132,152,63,10,51,4,25,10,5,5,10,12,1,1,29,0x83,250,2468,768,480,0,0,0,0,0,0,0,929,9000,912,700,930,1100,509,600,2609,1,2612,200,639,20,0,0,0,0,4107,1
1033,ELDER_WILOW,Elder Willow,Elder Willow,34,599,1,233,263,1,80,94,45,0,10,14,25,0,29,0,10,12,1,3,43,0x3095,200,1372,672,432,0,0,0,0,0,0,0,990,50,907,9000,7939,1,757,40,2329,30,690,100,604,100,0,0,0,0,4052,1
diff --git a/src/common/mmo.h b/src/common/mmo.h
index e13816832..c70b20b1f 100644
--- a/src/common/mmo.h
+++ b/src/common/mmo.h
@@ -151,7 +151,7 @@
//Mercenary System
#define MC_SKILLBASE 8201
#define MAX_MERCSKILL 40
-#define MAX_MERCENARY_CLASS 44
+#define MAX_MERCENARY_CLASS 61
//Elemental System
#define MAX_ELEMENTALSKILL 42