Browse Source

* Some optimization of 13-1 quests.
* Updated SQL databases from r17134, r17149.

> Hercules merges:
* 2f72676, 06883a7:
Renewal item_db updates, mostly new headgears and costumes.

* b38c660:
Fixed Trick Dead not being removed on job change.

* 55134e8:
Modified @mi exclusion criteria so that it requires a monster to not have a fixed spawn point as well as no base/job exp. It was excluding things such as red/blue/whatever plant from search results.

* bf76055:
#autotrade now relogs the target, not the caster.

* c6882c7, 412efb9:
Updated Renewal Izlude warps.
Moved various Izlude NPCs to Renewal coordinates.

* 064dad8:
Fixed bug where Kagerou and Oboro could hit their Zanzoe.
Follow-up on bugreport:4832, Ankle Snare now works properly in GvG.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17151 54d463be-8e91-2dee-dedb-b68131a5f0ec

euphyy 12 years ago
parent
commit
fa88107a9e

+ 141 - 31
db/re/item_db.txt

@@ -5519,7 +5519,7 @@
 12411,HE_Battle_Manual,HE Battle Manual,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_EXPBOOST,900000,200; },{},{}
 12412,HE_Bubble_Gum,HE Bubble Gum,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_ITEMBOOST,900000,300; },{},{}
 12413,PCBang_Coupon_Box2,PCBang Coupon Box2,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-12414,Guarana_Candy,Guarana Candy,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{sc_start SC_INCASPDRATE,1800000,10; sc_start SC_INCREASEAGI,140000,5; skilleffect "AL_INCAGI",0;},{},{}
+12414,Guarana_Candy,Guarana Candy,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCASPDRATE,1800000,10; sc_start SC_INCREASEAGI,140000,5; skilleffect "AL_INCAGI",0; },{},{}
 12415,Siege_Teleport_Scroll2,Siege Teleport Scroll2,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 12416,LUcky_Egg_C3,LUcky Egg C3,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 12417,Boost500,Boost500,2,100,,50,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
@@ -6021,7 +6021,7 @@
 13174,BF_Launcher1,Soldier Grenade Launcher,4,0,,0,300,,9,0,0x01000000,7,2,34,3,80,1,21,{ bonus bDex,2; bonus bSplashRange,1; bonus2 bAddRace,RC_DemiHuman,55; bonus2 bIgnoreDefRate,RC_DemiHuman,20; autobonus "{ bonus bBaseAtk,300; bonus2 bHPLossRate,120,1000; }",30,9000,BF_WEAPON,"{ specialeffect2 EF_BASH3D; }"; bonus bUnbreakableWeapon,0; },{},{}
 13175,Lever_Action_Rifle_C,Lever Action Rifle,4,20,,0,170,,9,0,0x01000000,7,2,34,3,0,0,18,{ bonus bHit,20; bonus bCritical,50; bonus bAspdRate,-5; },{},{}
 13176,Krieger_Rifle1,Glorious Rifle,4,0,,0,90,,9,0,0x01000000,7,2,34,4,80,1,18,{ bonus2 bAddRace,RC_DemiHuman,75; bonus2 bIgnoreDefRate,RC_DemiHuman,20; bonus2 bSkillAtk,"GS_TRIPLEACTION",30; bonus bUnbreakableWeapon,0; if(getrefine()>5) { bonus2 bAddRace,RC_DemiHuman,pow(((getrefine()>14)?14:getrefine())-4,2); bonus2 bIgnoreDefRate,RC_DemiHuman,5; } if(getrefine()>8) { bonus2 bVariableCastrate,"GS_TRACKING",25; bonus2 bSkillAtk,"GS_TRACKING",getrefine() * 3; } },{},{}
-13177,Krieger_Gatling1,Glorious Gatling Gun,4,0,,0,90,,9,0,0x01000000,7,2,34,4,80,1,19,{ bonus2 bAddRace,RC_DemiHuman,35; bonus2 bIgnoreDefRate,RC_DemiHuman,20; bonus2 bSkillAtk,"GS_TRIPLEACTION",30; bonus bUnbreakableWeapon,0; if(getrefine()>5) { bonus2 bAddRace,RC_DemiHuman,pow(((getrefine()>10)?10:getrefine())-4,2); bonus2 bIgnoreDefRate,RC_DemiHuman,5; } if(getrefine()>8) {bonus2 bAddRace,RC_Boss,getrefine(); bonus2 bAddRace,RC_NonBoss,getrefine(); } },{},{}
+13177,Krieger_Gatling1,Glorious Gatling Gun,4,0,,0,90,,9,0,0x01000000,7,2,34,4,80,1,19,{ bonus2 bAddRace,RC_DemiHuman,35; bonus2 bIgnoreDefRate,RC_DemiHuman,20; bonus2 bSkillAtk,"GS_TRIPLEACTION",30; bonus bUnbreakableWeapon,0; if(getrefine()>5) { bonus2 bAddRace,RC_DemiHuman,pow(((getrefine()>10)?10:getrefine())-4,2); bonus2 bIgnoreDefRate,RC_DemiHuman,5; } if(getrefine()>8) { bonus2 bAddRace,RC_Boss,getrefine(); bonus2 bAddRace,RC_NonBoss,getrefine(); } },{},{}
 13178,Krieger_Shotgun1,Glorious Shotgun,4,0,,0,110,,9,0,0x01000000,7,2,34,4,80,1,20,{ bonus2 bAddRace,RC_DemiHuman,55; bonus2 bIgnoreDefRate,RC_DemiHuman,20; bonus bSplashRange,1; bonus2 bSkillAtk,"GS_TRIPLEACTION",30; bonus bUnbreakableWeapon,0; if(getrefine()>5) { bonus2 bAddRace,RC_DemiHuman,pow(((getrefine()>10)?10:getrefine())-4,2); bonus2 bIgnoreDefRate,RC_DemiHuman,5; } if(getrefine()>8) { bonus2 bSkillAtk,"GS_SPREADATTACK",getrefine() * 2; bonus3 bAddEffOnSkill,"GS_SPREADATTACK",Eff_Stun,2000; } },{},{}
 13179,Krieger_Launcher1,Glorious Grenade Launcher,4,0,,0,330,,9,0,0x01000000,7,2,34,4,80,1,21,{ bonus2 bAddRace,RC_DemiHuman,35; bonus2 bIgnoreDefRate,RC_DemiHuman,20; bonus2 bSkillAtk,"GS_TRIPLEACTION",30; bonus bUnbreakableWeapon,0; if(getrefine()>5) { bonus2 bAddRace,RC_DemiHuman,pow(((getrefine()>10)?10:getrefine())-4,2); bonus2 bIgnoreDefRate,RC_DemiHuman,5; } if(getrefine()>8) { bonus2 bSkillAtk,"GS_GROUNDDRIFT",getrefine() * 2; bonus3 bAddEffOnSkill,"GS_SPREADATTACK",Eff_Stun,2000; autobonus "{ bonus bAspdRate,20; }",200,20000,BF_WEAPON,"{ specialeffect2 EF_POTION_BERSERK; }"; } },{},{}
 // Bullets
@@ -6033,6 +6033,7 @@
 13205,Poison_Sphere,Poison Sphere,10,80,,5,50,,,,0x01000000,7,2,32768,,1,,5,{ bonus bAtkEle,Ele_Poison; bonus2 bAddEff,Eff_Poison,500; },{},{}
 13206,Blind_Sphere,Blind Sphere,10,80,,5,50,,,,0x01000000,7,2,32768,,1,,5,{ bonus bAtkEle,Ele_Dark; bonus2 bAddEff,Eff_Blind,500; },{},{}
 13207,Freezing_Sphere,Freezing Sphere,10,80,,5,50,,,,0x01000000,7,2,32768,,1,,5,{ bonus bAtkEle,Ele_Water; },{},{}
+13208,Gong_Bug,Gong Bug,10,0,,20,50,,,,0x01000000,7,2,32768,,50,,3,{},{},{}
 // Shurikens & Kunais
 13250,Shuriken,Shuriken,10,4,,5,10,,,,0x02000000,7,2,32768,,1,,6,{},{},{}
 13251,Nimbus_Shuriken,Nimbus Shuriken,10,10,,5,30,,,,0x02000000,7,2,32768,,20,,6,{},{},{}
@@ -6085,7 +6086,7 @@
 13303,Huuma_Blaze,Huuma Blaze Shuriken,4,78000,,1500,185,,1,0,0x02000000,7,2,34,4,55,1,22,{ bonus bUnbreakableWeapon,0; bonus bAtkEle,Ele_Fire; bonus bDex,-2; bonus3 bAutoSpell,"MG_FIREBALL",5,30; },{},{}
 13304,Huuma_Calm_Mind,Huuma Calm Mind,4,20,,1550,112,,1,2,0x02000000,7,2,34,3,70,1,22,{ bonus bUnbreakableWeapon,0; bonus2 bSkillAtk,"NJ_HUUMA",30; bonus bNoCastCancel,0; },{},{}
 13305,BF_Huuma_Shuriken1,Brave Huuma Front Shuriken,4,20,,0,55,,1,0,0x02000000,7,2,34,3,80,1,22,{ bonus bStr,2; bonus bDex,1; bonus2 bAddRace,RC_DemiHuman,95; bonus2 bIgnoreDefRate,RC_DemiHuman,20; bonus bUnbreakableWeapon,0; },{},{}
-13306,BF_Huuma_Shuriken2,Valorous Huuma Front Shuriken,4,20,,0,55,,1,0,0x02000000,7,2,34,3,80,1,22,{ bonus bStr,2; bonus bDex,1; bonus2 bAddRace,RC_DemiHuman,95; autobonus "{ bonus2 bSkillAtk,\"NJ_HUUMA\",100; bonus2 bSkillAtk,\"NJ_ISSEN\",100; }",50,10000,BF_WEAPON,"{specialeffect2 EF_POTION_BERSERK; }"; bonus bUnbreakableWeapon,0; },{},{}
+13306,BF_Huuma_Shuriken2,Valorous Huuma Front Shuriken,4,20,,0,55,,1,0,0x02000000,7,2,34,3,80,1,22,{ bonus bStr,2; bonus bDex,1; bonus2 bAddRace,RC_DemiHuman,95; autobonus "{ bonus2 bSkillAtk,\"NJ_HUUMA\",100; bonus2 bSkillAtk,\"NJ_ISSEN\",100; }",50,10000,BF_WEAPON,"{ specialeffect2 EF_POTION_BERSERK; }"; bonus bUnbreakableWeapon,0; },{},{}
 13307,Krieger_Huuma_Shuriken1,Glorious Shuriken,4,20,,0,55:90,,1,0,0x02000000,7,2,34,4,80,1,22,{ bonus2 bAddRace,RC_DemiHuman,95; bonus2 bIgnoreDefRate,RC_DemiHuman,20; bonus bMatkRate,15; autobonus "{ bonus2 bSkillAtk,\"NJ_HUUMA\",100; bonus2 bSkillAtk,\"NJ_ISSEN\",100; }",50,10000; bonus bUnbreakableWeapon,0; if(getrefine()>5) { bonus2 bAddRace,RC_DemiHuman,pow(((getrefine()>14)?14:getrefine())-3,2); bonus2 bIgnoreDefRate,RC_DemiHuman,5; } if(getrefine()>8) { bonus5 bAutoSpellOnSkill,"NJ_ISSEN","AL_HEAL",10,1000,1; bonus4 bAutoSpellOnSkill,"NJ_HUUMA","NPC_CRITICALWOUND",2,200; } },{},{}
 13308,Huuma_Blaze_I,Huuma Blaze Shuriken,4,0,,0,230,,1,0,0x02000000,7,2,34,4,0,0,22,{ bonus bUnbreakableWeapon,0; bonus bAtkEle,Ele_Fire; bonus bDex,2; },{},{}
 13309,Huuma_Giant_Wheel_C,Huuma Giant Wheel Shuriken,4,0,,0,99,,1,0,0x02000000,7,2,34,4,1,0,22,{},{},{}
@@ -6601,7 +6602,7 @@
 13965,Tayelin_Doll_Hat_Box,Tailring Doll Hat Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5343,1; },{},{}
 13966,Binit_Doll_Hat_Box,Vinit Doll Hat Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5344,1; },{},{}
 13967,Debril_Doll_Hat_Box,W Doll Hat Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5345,1; },{},{}
-13968,Bubblegum_Lower_Box,Bubble Gum Hat Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5394,86400;},{},{}
+13968,Bubblegum_Lower_Box,Bubble Gum Hat Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 5394,86400; },{},{}
 13969,Lucky_Clip_Box,Lucky Clip Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ rentitem 2742,86400; },{},{}
 13970,Iron_10_Box,Iron Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 998,10; },{},{}
 13971,Steel_10_Box,Steel Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 999,10; },{},{}
@@ -7316,13 +7317,95 @@
 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; },{},{}
 //
-18612,White_Musang_Hat,White Musang Hat,5,40,,200,,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,,200,,3,,1,0xFFFFFFFF,7,2,256,,0,1,771,{ bonus bInt,2; bonus bDex,2; bonus bAgi,1; bonus bUnbreakableHelm,0; },{},{}
+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; },{},{}
 //
-18620,Heart_Eye_Patch,Heart Eyepatch,5,5,,200,,2,,0,0xFFFFFFFF,7,2,512,,20,1,779,{},{},{}
+18620,Heart_Eye_Patch,Heart Eyepatch,5,5,,50,,2,,0,0xFFFFFFFF,7,2,512,,20,1,779,{},{},{}
 //
+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; },{},{}
+18625,Rocket_Helm_RWC,Rocket Helm RWC,5,10000,,1000,,20,,1,0xFFFFFFFF,7,2,256,,95,1,769,{ bonus bAllStats,2; bonus bUnbreakableHelm,0; },{},{}
+18626,Gelato_Hat,Gelato Hat,5,20,,200,,2,,1,0xFFFFFFFF,7,2,256,,40,1,777,{},{},{}
+18627,Dried_Leaf,Dried Leaf,5,20,,50,,0,,0,0xFFFFFFFF,7,2,1,,10,0,711,{ bonus bUnbreakableHelm,0; },{},{}
+18628,Tare_Brownie,Tare Brownie,5,20,,500,,5,,1,0xFFFFFFFF,7,2,256,,50,0,781,{},{},{}
+18629,B_Desert_Wolf_Hat,B Desert Wolf Hat,5,10,,300,,0,,1,0xFFFFFFFF,7,2,256,,1,1,392,{},{},{}
+18629,Dep_Alice_Hat,Dep Alice Hat,5,20,,500,,6,,0,0xFFFFFFFE,7,2,256,,70,1,784,{},{},{}
+18631,Ribbon_Chef_Hat,Ribbon Chef Hat,5,20,,300,,5,,0,0xFFFFFFFF,7,2,256,,70,1,785,{ bonus bDex,3; bonus bLuk,1; },{},{}
+18632,Yellow_Poring_Hairpin,Yellow Poring Hairpin,5,20,,100,,3,,1,0xFFFFFFFF,7,2,256,,1,1,786,{},{},{}
+18633,Pink_Poring_Hairpin,Pink Poring Hairpin,5,20,,100,,3,,1,0xFFFFFFFF,7,2,256,,1,1,787,{},{},{}
+18634,Green_Poring_Hairpin,Green Poring Hairpin,5,20,,100,,3,,1,0xFFFFFFFF,7,2,256,,1,1,788,{},{},{}
+18635,Blue_Poring_Hairpin,Blue Poring Hairpin,5,20,,100,,3,,1,0xFFFFFFFF,7,2,256,,1,1,789,{},{},{}
+18636,Bridal_Ribbon,Bridal Ribbon,5,20,,200,,6,,0,0xFFFFFFFF,7,2,256,,30,1,790,{ bonus bDex,1; },{},{}
+18638,Citron_Hat,Citron Hat,5,20,,400,,3,,0,0xFFFFFFFE,7,2,256,,1,1,791,{ bonus bLuk,3; },{},{}
+18639,Naval_Officer_Hat,Naval Officer Hat,5,20,,200,,2,,0,0xFFFFFFFE,7,2,256,,1,1,792,{ bonus bLuk,3; },{},{}
+18640,Starfish_Headband,Starfish Headband,5,20,,200,,2,,0,0xFFFFFFFE,7,2,256,,1,1,793,{},{},{}
+18641,Ribbon_Magic_Hat,Ribbon Magic Hat,5,20,,200,,2,,0,0xFFFFFFFE,7,2,256,,1,1,794,{},{},{}
+18642,Scissorhand_Model,Scissorhand Model,5,20,,200,,0,,0,0xFFFFFFFE,7,2,1,,20,0,795,{ bonus bAgi,1; },{},{}
+18643,Rockhand_Model,Rockhand Model,5,20,,200,,0,,0,0xFFFFFFFE,7,2,1,,20,0,796,{ bonus bStr,1; },{},{}
+18644,Paperhand_Model,Paperhand Model,5,20,,200,,0,,0,0xFFFFFFFE,7,2,1,,20,0,797,{},{},{}
+18645,Sailor_Hat,Sailor Hat,5,20,,200,,2,,0,0xFFFFFFFF,7,2,256,,1,1,798,{ bonus bInt,1; },{},{}
+18646,Cow_Hat,Cow Hat,5,20,,300,,4,,1,0xFFFFFFFF,7,2,256,,1,1,799,{ bonus bDex,2; },{},{}
+18647,Star_Eyepatch,Star Eyepatch,5,20,,100,,0,,0,0xFFFFFFFF,7,2,256,,1,0,800,{},{},{}
+18648,Tongue_Charm,Tongue Charm,5,20,,100,,0,,0,0xFFFFFFFF,7,2,1,,1,0,801,{},{},{}
+18650,RWC_Shouting_Mouth,RWC Shouting Mouth,5,20,,50,,0,,0,0xFFFFFFFF,7,2,1,,1,0,194,{},{},{}
+18651,Ignis_Cap,Ignis Cap,5,20,,800,,8,,1,0xFFFFFFFF,7,2,256,,40,1,7,{},{},{}
+18652,Vanargandr_Helm,Vanargandr Helm,5,20,,1500,,10,,1,0xFFFFFFFF,7,2,256,,80,1,7,{},{},{}
+18653,Deviruchi_Headphone,Deviruchi Headphone,5,20,,200,,8,,1,0xFFFFFFFF,7,2,256,,30,1,7,{ bonus bAgi,2; },{},{}
+18655,Goedo_Monocle,Goedo Monocle,5,20,,100,,0,,0,0xFFFFFFFF,7,2,512,,50,0,23,{},{},{}
 18656,Witch's_Pumpkin_Hat,Witch's Pumpkin Hat,5,20,,300,,10,,0,0xFFFFFFFF,7,2,256,,20,1,717,{ bonus bMdef,10; bonus bStr,2; bonus bInt,2; bonus2 bMagicAddRace,RC_Undead,15; bonus2 bMagicAddRace,RC_Demon,15; },{},{}
-
+//
+18657,Pegasus_Wing_Ears,Pegasus Wing Ears,5,20,,500,,1,,0,0xFFFFFFFF,7,2,512,,80,0,568,{ bonus bUnbreakableHelm,0; },{},{}
+18658,Holy_Santa_Beard,Holy Santa Beard,5,20,,100,,0,,0,0xFFFFFFFF,7,2,1,,1,0,25,{},{},{}
+18661,Trident_Helm,Trident Helm,5,20,,400,,3,,1,0xFFFFFFFE,7,2,256,,20,1,810,{ bonus bStr,2; },{},{}
+18662,Antler_Fedora,Antler Fedora,5,20,,400,,3,,0,0xFFFFFFFE,7,2,256,,1,1,811,{ bonus bInt,3; },{},{}
+18664,Blind_Glasses,Blind Glasses,5,20,,400,,3,,0,0xFFFFFFFE,7,2,512,,20,1,813,{},{},{}
+18665,Orange_In_Mouth,Orange In Mouth,5,20,,200,,0,,0,0xFFFFFFFE,7,2,1,,20,0,814,{},{},{}
+18666,CD_In_Mouth,CD In Mouth,5,20,,200,,0,,0,0xFFFFFFFE,7,2,1,,20,0,815,{},{},{}
+18667,Cat_Lace_Hairband,Cat Lace Hairband,5,20,,500,,2,,0,0xFFFFFFFE,7,2,256,,60,0,816,{ bonus bDex,3; },{},{}
+18668,Droopy_Turtle_Hat,Droopy Turtle Hat,5,20,,300,,1,,1,0xFFFFFFFE,7,2,256,,1,1,694,{},{},{}
+18669,Cowhide_Hat,Cowhide Hat,5,20,,200,,3,,1,0xFFFFFFFE,7,2,256,,1,1,11,{ bonus bDex,2; },{},{}
+18670,Hankie_In_Mouth,Hankie In Mouth,5,20,,100,,1,,0,0xFFFFFFFF,7,2,1,,12,0,818,{},{},{}
+18671,Rudolf_Hairband,Rudolf Hairband,5,20,,200,,5,,0,0xFFFFFFFF,7,2,256,,30,1,836,{},{},{}
+18672,Tare_Pope,Tare Pope,5,20,,300,,0,,0,0xFFFFFFFF,7,2,256,,1,0,817,{ bonus bUnbreakableHelm,0; },{},{}
+18673,Tare_Pope_,Tare Pope,5,20,,300,,0,,1,0xFFFFFFFF,7,2,256,,1,0,817,{ bonus bUnbreakableHelm,0; },{},{}
+18674,Planewing_Hat,Planewing Hat,5,20,,200,,3,,1,0xFFFFFFFE,7,2,256,,1,1,11,{ bonus bAgi,3; },{},{}
+18675,Green_Apple_Hat,Green Apple Hat,5,20,,200,,3,,1,0xFFFFFFFE,7,2,256,,20,1,11,{ bonus bDex,2; },{},{}
+18677,Cherry_Twig_In_Mouth,Cherry Twig In Mouth,5,20,,200,,0,,0,0xFFFFFFFE,7,2,1,,20,0,823,{},{},{}
+18678,Leek_In_Mouth,Leek In Mouth,5,20,,200,,0,,0,0xFFFFFFFE,7,2,1,,20,0,824,{},{},{}
+18679,Abacus_In_Mouth,Abacus In Mouth,5,20,,200,,0,,0,0xFFFFFFFE,7,2,1,,20,0,825,{},{},{}
+18680,Tw_Frog_Hat,Tw Frog Hat,5,20,,200,,2,,0,0xFFFFFFFF,7,2,256,,35,0,11,{ bonus bAgi,1; },{},{}
+18681,Puppy_Ears_Hat,Puppy Ears Hat,5,20,,200,,2,,0,0xFFFFFFFF,7,2,256,,1,1,11,{ bonus bVit,2; },{},{}
+18683,Carrot_In_Mouth,Carrot In Mouth,5,20,,200,,1,,0,0xFFFFFFFF,7,2,1,,1,0,829,{},{},{}
+18684,Showy_High_Cap,Showy High Cap,5,20,,200,,3,,1,0xFFFFFFFE,7,2,256,,1,1,11,{ bonus bStr,3; bonus bInt,2; },{},{}
+18685,Stardust_Hairband,Stardust Hairband,5,20,,1000,,0,,0,0xFFFFFFFF,7,2,256,,10,0,831,{},{},{}
+18686,2011_RMSC_1,2011 RMSC 1,5,20,,2500,,20,,1,0xFFFFFFFF,7,2,256,,1,0,832,{ bonus bUnbreakableHelm,0; bonus bAllStats,5; },{},{}
+18687,2011_RMSC_2,2011 RMSC 2,5,20,,2500,,20,,1,0xFFFFFFFF,7,2,256,,1,0,832,{ bonus bUnbreakableHelm,0; bonus bAllStats,3; },{},{}
+18688,2011_RMSC_3,2011 RMSC 3,5,20,,2500,,20,,1,0xFFFFFFFF,7,2,256,,1,0,832,{ bonus bUnbreakableHelm,0; bonus bAllStats,1; },{},{}
+18689,2011_RMSC_4,2011 RMSC 4,5,20,,10,,0,,0,0xFFFFFFFF,7,2,256,,1,0,832,{ bonus bUnbreakableHelm,0; },{},{}
+18690,Sirt_Evil_Eye,Sirt Evil Eye,5,20,,400,,0,,0,0xFFFFFFFF,7,2,512,,50,0,345,{ bonus bUnbreakableHelm,0; bonus bStr,1; },{},{}
+18691,Rising_Black_Dragon,Rising Black Dragon,5,20,,100,,3,,0,0xFFFFFFFF,7,2,256,,1,1,166,{},{},{}
+18692,Mike_Hat,Mike Hat,5,20,,200,,3,,1,0xFFFFFFFE,7,2,256,,1,1,837,{ bonus bDex,2; bonus bLuk,1; },{},{}
+18693,Sleeping_Kitty_Cat,Sleeping Kitty Cat,5,20,,200,,4,,1,0xFFFFFFFE,7,2,256,,20,1,838,{},{},{}
+18694,Red_Hood,Red Hood,5,20,,200,,3,,1,0xFFFFFFFE,7,2,256,,20,1,839,{},{},{}
+18695,Phoenix_Crown,Phoenix Crown,5,20,,400,,3,,1,0xFFFFFFFE,7,2,256,,20,1,840,{ bonus bInt,2; },{},{}
+18696,Orange_Hat,Orange Hat,5,20,,200,,3,,0,0xFFFFFFFE,7,2,256,,20,1,841,{},{},{}
+18697,Syringe_In_Mouth,Syringe In Mouth,5,20,,200,,0,,0,0xFFFFFFFE,7,2,1,,20,0,842,{},{},{}
+18698,Cheesy_Snack_In_Mouth,Cheesy Snack In Mouth,5,20,,200,,0,,0,0xFFFFFFFE,7,2,1,,20,0,843,{},{},{}
+18699,Starving_Fish_Hat,Starving Fish Hat,5,20,,1200,,3,,0,0xFFFFFFFF,7,2,256,,1,0,844,{},{},{}
+18700,Rabbit_Ribbon,Rabbit Ribbon,5,20,,500,,3,,1,0xFFFFFFFF,7,2,256,,50,1,845,{ bonus bInt,1; },{},{}
+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,{},{},{}
+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,{},{},{}
+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; },{},{}
+18821,Rainbow_Feather_Deco,Rainbow Feather Deco,5,20,,300,,5,,1,0xFFFFFFFF,7,2,256,,1,1,934,{},{},{}
+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; },{},{}
 19501,T_Spinx_Helm,T Spinx Helm,5,0,,0,,0,,1,0xFFFFFFFF,7,2,5120,,0,0,137,{},{},{}
@@ -7330,29 +7413,56 @@
 19504,T_Sunglasses,T Sunglasses,5,0,,0,,0,,0,0xFFFFFFFF,7,2,2048,,0,0,12,{},{},{}
 19505,T_Cigarette,T Cigarette,5,0,,0,,0,,0,0xFFFFFFFF,7,2,4096,,0,0,54,{},{},{}
 19506,T_Valkyrie_Feather_Band,T Valkyrie Feather Band,5,0,,0,,0,,0,0xFFFFFFFF,7,2,1024,,0,1,300,{},{},{}
-19507,Clear_Sun,Clear Sun,5,0,,0,,0,,0,0xFFFFFFFF,7,2,1024,,1,0,654,{},{},{}
-19508,T_Gemmed_Sallet,T Gemmed Sallet,5,0,,0,,0,,0,0xFFFFFFFF,7,2,1024,,0,1,0,{},{},{}
-19509,Butterfly_Wing_Ears,Butterfly Wing Ears,5,0,,0,,0,,0,0xFFFFFFFF,7,2,2048,,1,0,695,{},{},{}
-19510,Screw_Stuck_in_Head,Screw Stuck in Head,5,0,,0,,0,,0,0xFFFFFFFF,7,2,2048,,1,0,696,{},{},{}
-//
-19513,Chicken_Bill,Chicken Bill,5,0,,0,,0,,0,0xFFFFFFFF,7,2,4096,,1,0,699,{},{},{}
-19514,Charlies_Beard,Charlies Beard,5,0,,0,,0,,0,0xFFFFFFFF,7,2,4096,,1,0,700,{},{},{}
-19515,Yellow_Hat,Yellow Hat,5,0,,0,,0,,0,0xFFFFFFFF,7,2,1024,,1,0,701,{},{},{}
-19516,Singing_Bird,Singing Bird,5,0,,0,,0,,0,0xFFFFFFFF,7,2,1024,,1,0,702,{},{},{}
-19517,Chicken_Crest,Chicken Crest,5,0,,0,,0,,0,0xFFFFFFFF,7,2,1024,,1,0,703,{},{},{}
-19518,Rainbow,Rainbow,5,0,,0,,0,,0,0xFFFFFFFF,7,2,1024,,1,0,704,{},{},{}
-19519,Thunderstorm_Cloud,Thunderstorm Cloud,5,0,,0,,0,,0,0xFFFFFFFF,7,2,1024,,1,0,688,{},{},{}
-19520,Rain_Cloud,Rain Cloud,5,0,,0,,0,,0,0xFFFFFFFF,7,2,1024,,1,0,705,{},{},{}
-19521,Charlies_Hat,Charlies Hat,5,0,,0,,0,,0,0xFFFFFFFF,7,2,1024,,1,0,706,{},{},{}
-19522,Mini_Crown,Mini Crown,5,0,,0,,0,,0,0xFFFFFFFF,7,2,1024,,1,0,707,{},{},{}
-19523,Green_Ribbon,Green Ribbon,5,0,,0,,0,,0,0xFFFFFFFF,7,2,1024,,1,0,244,{},{},{}
-19524,Costume_Green_Feeler,Costume Green Feeler,5,0,,0,,0,,0,0xFFFFFFFF,7,2,1024,,1,0,85,{},{},{}
-19525,Costume_Mini_Glasses,Costume Mini Glasses,5,0,,0,,0,,0,0xFFFFFFFF,7,2,2048,,1,0,47,{},{},{}
-19526,Costume_Helm,Costume Helm,5,0,,0,,0,,0,0xFFFFFFFF,7,2,1024,,1,0,40,{},{},{}
-19527,Costume_Spiky_Band,Costume Spiky Band,5,0,,0,,0,,0,0xFFFFFFFF,7,2,1024,,1,0,43,{},{},{}
-19528,Costume_Iron_Cain,Costume Iron Cain,5,0,,0,,0,,0,0xFFFFFFFF,7,2,4096,,1,0,53,{},{},{}
-19529,Costume_Angel_Wing,Costume Angel Wing,5,0,,0,,0,,0,0xFFFFFFFF,7,2,1024,,1,0,38,{},{},{}
-19530,Costume_Wild_Rose,Costume Wild Rose,5,20,,0,,0,,0,0xFFFFFFFF,7,2,1024,,1,0,541,{},{},{}
+19507,Clear_Sun,Clear Sun,5,0,,0,,0,,0,0xFFFFFFFF,7,2,1024,,1,0,654,{ bonus bUnbreakableHelm,0; },{},{}
+19508,T_Gemmed_Sallet,T Gemmed Sallet,5,0,,0,,0,,0,0xFFFFFFFF,7,2,1024,,0,1,0,{ bonus bUnbreakableHelm,0; },{},{}
+19509,Butterfly_Wing_Ears,Butterfly Wing Ears,5,0,,0,,0,,0,0xFFFFFFFF,7,2,2048,,1,0,695,{ bonus bUnbreakableHelm,0; },{},{}
+19510,Screw_Stuck_in_Head,Screw Stuck in Head,5,0,,0,,0,,0,0xFFFFFFFF,7,2,2048,,1,0,696,{ bonus bUnbreakableHelm,0; },{},{}
+19511,Heart_Eye_Patch1,Heart Eye Patch 1,5,0,,0,,0,,0,0xFFFFFFFF,7,2,2048,,1,0,697,{ bonus bUnbreakableHelm,0; },{},{}
+19512,Heart_Eye_Patch2,Heart Eye Patch 2,5,0,,0,,0,,0,0xFFFFFFFF,7,2,2048,,1,0,698,{ bonus bUnbreakableHelm,0; },{},{}
+19513,Chicken_Bill,Chicken Bill,5,0,,0,,0,,0,0xFFFFFFFF,7,2,4096,,1,0,699,{ bonus bUnbreakableHelm,0; },{},{}
+19514,Charlies_Beard,Charlies Beard,5,0,,0,,0,,0,0xFFFFFFFF,7,2,4096,,1,0,700,{ bonus bUnbreakableHelm,0; },{},{}
+19515,Yellow_Hat,Yellow Hat,5,0,,0,,0,,0,0xFFFFFFFF,7,2,1024,,1,0,701,{ bonus bUnbreakableHelm,0; },{},{}
+19516,Singing_Bird,Singing Bird,5,0,,0,,0,,0,0xFFFFFFFF,7,2,1024,,1,0,702,{ bonus bUnbreakableHelm,0; },{},{}
+19517,Chicken_Crest,Chicken Crest,5,0,,0,,0,,0,0xFFFFFFFF,7,2,1024,,1,0,703,{ bonus bUnbreakableHelm,0; },{},{}
+19518,Rainbow,Rainbow,5,0,,0,,0,,0,0xFFFFFFFF,7,2,1024,,1,0,704,{ bonus bUnbreakableHelm,0; },{},{}
+19519,Thunderstorm_Cloud,Thunderstorm Cloud,5,0,,0,,0,,0,0xFFFFFFFF,7,2,1024,,1,0,688,{ bonus bUnbreakableHelm,0; },{},{}
+19520,Rain_Cloud,Rain Cloud,5,0,,0,,0,,0,0xFFFFFFFF,7,2,1024,,1,0,705,{ bonus bUnbreakableHelm,0; },{},{}
+19521,Charlies_Hat,Charlies Hat,5,0,,0,,0,,0,0xFFFFFFFF,7,2,1024,,1,0,706,{ bonus bUnbreakableHelm,0; },{},{}
+19522,Mini_Crown,Mini Crown,5,0,,0,,0,,0,0xFFFFFFFF,7,2,1024,,1,0,707,{ bonus bUnbreakableHelm,0; },{},{}
+19523,Green_Ribbon,Green Ribbon,5,0,,0,,0,,0,0xFFFFFFFF,7,2,1024,,1,0,244,{ bonus bUnbreakableHelm,0; },{},{}
+19524,Costume_Green_Feeler,Costume Green Feeler,5,0,,0,,0,,0,0xFFFFFFFF,7,2,1024,,1,0,85,{ bonus bUnbreakableHelm,0; },{},{}
+19525,Costume_Mini_Glasses,Costume Mini Glasses,5,0,,0,,0,,0,0xFFFFFFFF,7,2,2048,,1,0,47,{ bonus bUnbreakableHelm,0; },{},{}
+19526,Costume_Helm,Costume Helm,5,0,,0,,0,,0,0xFFFFFFFF,7,2,1024,,1,0,40,{ bonus bUnbreakableHelm,0; },{},{}
+19527,Costume_Spiky_Band,Costume Spiky Band,5,0,,0,,0,,0,0xFFFFFFFF,7,2,1024,,1,0,43,{ bonus bUnbreakableHelm,0; },{},{}
+19528,Costume_Iron_Cain,Costume Iron Cain,5,0,,0,,0,,0,0xFFFFFFFF,7,2,4096,,1,0,53,{ bonus bUnbreakableHelm,0; },{},{}
+19529,Costume_Angel_Wing,Costume Angel Wing,5,0,,0,,0,,0,0xFFFFFFFF,7,2,1024,,1,0,38,{ bonus bUnbreakableHelm,0; bonus bVit,1; bonus bAgi,1; },{},{}
+19530,Costume_Wild_Rose,Costume Wild Rose,5,0,,0,,0,,0,0xFFFFFFFF,7,2,1024,,1,0,541,{ bonus bUnbreakableHelm,0; },{},{}
+19532,C_Red_Bunny_Band,Red Bunny Band,5,0,,0,,0,,0,0xFFFFFFFF,7,2,1024,,1,0,640,{ bonus bUnbreakableHelm,0; bonus bDex,1; },{},{}
+19533,C_Spore_Hat,Costume Spore Hat,5,0,,0,,0,,0,0xFFFFFFFF,7,2,1024,,1,0,114,{ bonus bUnbreakableHelm,0; bonus bVit,1; },{},{}
+19535,C_Sinsuncho_Hat,Costume Sinsuncho Hat,5,0,,0,,0,,0,0xFFFFFFFF,7,2,1024,,1,0,730,{ bonus bUnbreakableHelm,0; bonus bStr,1; },{},{}
+19536,C_Rose_Corsage,Costume Rose Corsage,5,0,,0,,0,,0,0xFFFFFFFF,7,2,1024,,1,0,533,{ bonus bUnbreakableHelm,0; bonus bInt,1; },{},{}
+19537,C_Gryphon_Hat,Costume Gryphon Hat,5,0,,0,,0,,0,0xFFFFFFFF,7,2,1024,,1,0,591,{ bonus bUnbreakableHelm,0; },{},{}
+19538,Full_Moon,Full Moon,5,0,,0,,0,,0,0xFFFFFFFF,7,2,1024,,1,0,780,{ bonus bUnbreakableHelm,0; },{},{}
+19541,C_Romantic_White_Flower,Costume Romantic White Flower,5,20,,0,,0,,0,0xFFFFFFFF,7,2,4096,,1,0,259,{ bonus bUnbreakableHelm,0; },{},{}
+19542,C_Devil_Whisper,Costume Devil Whisper,5,20,,0,,0,,0,0xFFFFFFFF,7,2,2048,,1,0,712,{ bonus bUnbreakableHelm,0; },{},{}
+19543,Oliver_Wolf_Hood,Oliver Wold Hood,5,20,,300,,0,,1,0xFFFFFFFF,7,2,1024,,70,0,849,{ bonus bUnbreakableHelm,0; },{},{}
+19544,C_Tare_Neko_Cru,Costume Tare Neko Cru,5,20,,0,,0,,0,0xFFFFFFFF,7,2,1024,,1,0,692,{ bonus bUnbreakableHelm,0; },{},{}
+19545,C_Boys_Cap,Costume Boys Hat,5,20,,100,,0,,0,0xFFFFFFFF,7,2,1024,,100,0,102,{ bonus bUnbreakableHelm,0; },{},{}
+19546,C_Valkyrie_Helm,Costume Valkyrie Helm,5,20,,100,,0,,0,0xFFFFFFFF,7,2,1024,,100,0,225,{ bonus bUnbreakableHelm,0; },{},{}
+19547,C_Deviruchi_Cap,Costume Deviruchi Cap,5,20,,100,,0,,0,0xFFFFFFFF,7,2,1024,,100,0,123,{ bonus bUnbreakableHelm,0; },{},{}
+19548,C_Frog_Cap,Costume Frog Cap,5,20,,100,,0,,0,0xFFFFFFFF,7,2,1024,,100,0,448,{},{ bonus bUnbreakableHelm,0; },{}
+19549,C_Magestic_Goat,Costume Magestic Goat,5,20,,100,,0,,0,0xFFFFFFFF,7,2,1024,,100,0,41,{ bonus bUnbreakableHelm,0; },{},{}
+19550,C_Blush,Costume Blush,5,20,,100,,0,,0,0xFFFFFFFF,7,2,2048,,100,0,125,{ bonus bUnbreakableHelm,0; },{},{}
+19551,C_Elven_Ears,Costume Elven Ears,5,20,,100,,0,,0,0xFFFFFFFF,7,2,2048,,100,0,73,{ bonus bUnbreakableHelm,0; },{},{}
+19552,C_Centimental_Flower,Costume Centimental Flower,5,20,,100,,0,,0,0xFFFFFFFF,7,2,4096,,100,0,56,{ bonus bUnbreakableHelm,0; },{},{}
+19553,C_Assassin_Mask_,Costume Assassin Mask,5,20,,100,,0,,0,0xFFFFFFFF,7,2,4096,,100,0,180,{ bonus bUnbreakableHelm,0; },{},{}
+19573,C_Heart_Wing_Hairband,Costume Heart Wing Hairband,5,0,,0,,0,,0,0xFFFFFFFF,7,2,1024,,1,1,733,{},{},{}
+19587,C_King_Poring_Hat,Costume King Poring Hat,5,0,,100,,0,,0,0xFFFFFFFF,7,2,1024,,1,0,905,{ bonus bUnbreakableHelm,0; },{},{}
+19650,C_Rainbow_Feather_Deco,Costume Rainbow Feather Deco,5,0,,0,,0,,0,0xFFFFFFFF,7,2,1024,,1,1,934,{},{},{}
+20500,T_Archangel_Wing,Archangel Wing,5,0,,0,,0,,0,0xFFFFFFFF,7,2,8192,,1,0,1,{ bonus bUnbreakableHelm,0; },{},{}
+20600,Fantastic_Aura,Fantastic Aura,5,0,,0,,0,,0,0xFFFFFFFF,7,2,16384,,1,0,0,{ bonus bUnbreakableHelm,0; },{},{}
+20700,Egir_Manteau,Egir Manteau,5,200000,,300,,10,,1,0xFFFFFFFF,7,2,4,,110,1,0,{ bonus bUnbreakableHelm,0; },{},{}
+20724,Love_Dad_Wings_2012,Love Dad Wings 2012,5,0,,100,,15,,1,0xFFFFFFFF,7,2,4,,1,1,5,{},{},{}
 // More 2-Handed Swords
 21001,Bellum_Claymore,Bellum 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,Bellum_Katzbalger,Bellum Katzbalger,4,20,,2500,100,,1,0,0x00004082,7,2,34,4,95,1,3,{ bonus2 bSPVanishRate,10000,8; },{},{}

+ 2 - 3
npc/merchants/shops.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= rAthena Dev Team
 //===== Current Version: ===================================== 
-//= 3.3
+//= 3.4
 //===== Compatible With: ===================================== 
 //= rAthena 1.0+
 //===== Description: ========================================= 
@@ -37,6 +37,7 @@
 //= 3.1 Moved some merchants to a separate renewal file. [Kenpachi]
 //= 3.2 Added Missing Items to the pet Groomers in prontera, payon, and yuno. BugReport:6680[Spre]
 //= 3.3 Moved more shops to Renewal file. [Euphy]
+//= 3.4 Moved Izlude shops to pre-re/re paths. [Streusel]
 //============================================================ 
 
 //=======================================================
@@ -143,8 +144,6 @@ hu_in01,94,313,3	shop	Armor Dealer#hu	86,2224:-1,2232:-1,2226:-1,2101:-1,2103:-1
 //=======================================================
 izlude_in,60,127,4	shop	Weapon Dealer#iz	72,1750:-1,1751:-1,1701:-1,1601:-1,1201:-1,1204:-1,1207:-1,1101:-1,1104:-1,1107:-1,1116:-1,1151:-1,1154:-1,1157:-1,1160:-1,1301:-1
 izlude_in,70,127,4	shop	Armor Dealer#iz	62,2103:-1,2105:-1,2403:-1,2405:-1,2503:-1,2505:-1,2226:-1,2228:-1,2303:-1,2305:-1,2328:-1,2307:-1,2309:-1,2312:-1,2314:-1,2316:-1,2628:-1
-izlude_in,115,61,0	shop	Tool Dealer#iz	47,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,1750:-1
-izlude_in,121,64,3	shop	Trading Merchant#iz	900,13200:-1,13201:-1,13202:-1,13150:-1,13102:-1,13151:-1,13154:-1,13155:-1,13163:-1,13165:-1,13168:-1
 
 //=======================================================
 // Jawaii

+ 4 - 1
npc/pre-re/merchants/shops.txt

@@ -3,13 +3,14 @@
 //===== By: ================================================== 
 //= Daegaladh
 //===== Current Version: ===================================== 
-//= 1.0
+//= 1.1
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
 //= Pre-renewal-specific town shop NPCs.
 //===== Additional Comments: ================================= 
 //= 1.0 First version.
+//= 1.1 Moved Izlude shops to pre-re/re paths. [Streusel]
 //============================================================ 
 
 //=======================================================
@@ -19,3 +20,5 @@ izlude,105,99,0	shop	Butcher#iz	54,517:-1
 izlude,94,98,4	shop	Fruit Gardener#iz	53,512:-1,513:-1,515:-1,516:-1
 izlude,105,92,7	shop	Vendor from Milk Ranch#i	90,519:-1
 izlude,164,138,4	shop	Pet Groomer#iz	124,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-1
+izlude_in,115,61,0	shop	Tool Dealer#iz	47,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,1750:-1
+izlude_in,121,64,3	shop	Trading Merchant#iz	900,13200:-1,13201:-1,13202:-1,13150:-1,13102:-1,13151:-1,13154:-1,13155:-1,13163:-1,13165:-1,13168:-1

+ 15 - 0
npc/pre-re/quests/monstertamers.txt

@@ -0,0 +1,15 @@
+//===== rAthena Script =======================================
+//= Monster Tamers
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= rAthena SVN
+//===== Description: =========================================
+//= Cute pet quest items
+//===== Additional Comments: =================================
+//= 1.0 Moved Izlude NPC to pre-re/re paths.
+//============================================================
+
+izlude_in,129,64,4	duplicate(MonsterTamer_izlude)	Monster Tamer#izu	125

+ 15 - 0
npc/pre-re/quests/quests_13_1.txt

@@ -0,0 +1,15 @@
+//===== rAthena Script ======================================= 
+//= Quest NPCs related to Ash-Vacuum
+//===== By: ================================================== 
+//= Euphy
+//===== Current Version: ===================================== 
+//= 1.0
+//===== Compatible With: ===================================== 
+//= rAthena SVN
+//===== Description: ========================================= 
+//= Contains duplicate NPCs from main script.
+//===== Additional Comments: ================================= 
+//= 1.0 Moved Izlude NPC to pre-re/re paths. [Euphy]
+//============================================================ 
+
+izlude,101,173,6	duplicate(PromotionalStaff_izlude)	Promotional Staff#iz	100

+ 2 - 0
npc/pre-re/scripts_athena.conf

@@ -76,7 +76,9 @@ npc: npc/pre-re/other/mercenary_rent.txt
 //npc: npc/pre-re/quests/collection/quest_pupa.txt
 //npc: npc/pre-re/quests/collection/quest_zhupolong.txt
 // --------------------------------------------------------------
+npc: npc/pre-re/quests/monstertamers.txt
 npc: npc/pre-re/quests/mrsmile.txt
+npc: npc/pre-re/quests/quests_13_1.txt
 npc: npc/pre-re/quests/quests_izlude.txt
 npc: npc/pre-re/quests/quests_lighthalzen.txt
 npc: npc/pre-re/quests/quests_veins.txt

+ 3 - 2
npc/quests/monstertamers.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= kobra_k88, Darkchild, x[tsk]
 //===== Current Version: =====================================
-//= 1.4b
+//= 1.5
 //===== Compatible With: =====================================
 //= rAthena 1.0
 //===== Description: =========================================
@@ -16,6 +16,7 @@
 //= 1.4 Updated Monster taming item quests. [L0ne_W0lf]
 //= 1.4a FIXED item requirement for stellar hairpin. [L0ne_W0lf]
 //= 1.4b Fixed the delitem assosiated with the last uptate. [L0ne_W0lf]
+//= 1.5 Moved Izlude NPC to pre-re/re paths.
 //============================================================
 
 alberta_in,173,76,4	script	Monster Tamer#alb	125,{
@@ -464,7 +465,7 @@ aldeba_in,168,175,4	script	Monster Tamer#alde	125,{
 	}
 }
 
-izlude_in,129,64,4	script	Monster Tamer#izu	125,{
+-	script	::MonsterTamer_izlude	-1,{
 	mes "[Shogo]";
 	mes "Are you pre-occupied with";
 	mes "gathering items for monsters";

+ 107 - 860
npc/quests/quests_13_1.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 2.7a
+//= 2.8
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
@@ -47,18 +47,18 @@
 //= 2.6a Added 'npcskill' command. [Euphy]
 //= 2.7 Updated EXP rewards.
 //= 2.7a Added 'consumeitem' command. [Euphy]
+//= 2.8 Some optimization, and moved an Izlude NPC. [Euphy]
 //============================================================ 
 
 // Onward to the New World
 //============================================================ 
-prontera,163,53,3	script	Promotional Staff#prt	100,{
+function	script	Promotional_Staff	{
 	mes "[Promotional Staff]";
 	mes "We are looking for adventurers who are super curious and extremely brave.";
 	mes "Join us for a wonderful adventure!";
 	next;
 	mes "[Promotional Staff]";
-	mes "Hey, you're a knowledgeable person, right?";
-	mes "Are you interested in my story?";
+	mes "Hey, you're a knowledgeable person, right? Are you interested in my story?";
 	next;
 	switch(select("Yes.:No, thanks.")) {
 	case 1:
@@ -70,8 +70,7 @@ prontera,163,53,3	script	Promotional Staff#prt	100,{
 		mes "[Promotional Staff]";
 		mes "I usually send adventurers to";
 		mes "newly found places for research.";
-		mes "It's quite challenging, as nobody's";
-		mes "ever been to these places.";
+		mes "It's quite challeging, as nobody's ever been to these places.";
 		next;
 		mes "[Promotional Staff]";
 		mes "The missions are quite dangerous,";
@@ -80,15 +79,10 @@ prontera,163,53,3	script	Promotional Staff#prt	100,{
 		mes "of this mission.";
 		next;
 		mes "[Promotional Staff]";
-		mes "I'm not sure that you're strong";
-		mes "enough, but you seem brave. How";
-		mes "about going to the kingdom";
-		mes "receptionist? He should be in the";
-		mes "first room of Prontera Castle.";
+		mes "I'm not sure that you're strong enough, but you seem brave. How about going to the kingdom receptionist? He should be in the first room of Prontera Castle.";
 		next;
 		mes "[Promotional Staff]";
-		mes "From what I've heard about this";
-		mes "new place... It's not a new continent.";
+		mes "From what I've heard about this place... It's not a new continent.";
 		mes "I don't know where it is.";
 		mes "Hmm... Inside of the sky?";
 		next;
@@ -98,20 +92,21 @@ prontera,163,53,3	script	Promotional Staff#prt	100,{
 		mes "It's not my business.";
 		next;
 		mes "[Promotional Staff]";
-		mes "Anyway, I'm supposed to inform many";
-		mes "adventurers about it.";
+		mes "Anyway, I'm supposed to inform many adventurers about it.";
 		mes "There's no time to waste!";
 		close;
 	case 2:
 		mes "[Promotional Staff]";
-		mes "Huh, I thought you were a real";
-		mes "adventurer. You're missing a big";
-		mes "opportunity. You're definitely not";
-		mes "brave. Absolutely not!";
+		mes "Huh, I thought you were a real adventurer. You're missing a big opportunity. You're definitely not brave. Absolutely not!";
 		close;
 	}
 }
 
+prontera,163,53,3	script	Promotional Staff#prt	100,{
+	callfunc "Promotional_Staff";
+	end;
+}
+
 prt_castle,121,51,3	script	Alliance Manager#prt	752,{
 	if (ep13_ryu == 13) {
 		mes "[Alliance Manager]";
@@ -389,7 +384,14 @@ aldebaran,127,138,3	script	Promotional Staff#alde	100,{
 		mes "Just visit the ^FF0000Promotional Staff in Geffen^000000. You have no business with me anymore. Bless you. I wish you a safe adventure.";
 		close;
 	}
-	if ((ep13_ryu == 2) && (countitem(909) > 299)) {
+	if (ep13_ryu == 2) {
+		if (countitem(909) < 300) {
+			mes "[Promotional Staff]";
+			mes "Don't forget to bring... ^FF0000300 Jellopy^000000.";
+			mes "Got it? ^FF0000300 Jellopy^000000!";
+			mes "Let me know once you got them.";
+			close;
+		}
 		mes "[Promotional Staff]";
 		mes "Hey! Let me know once you collect all of them.";
 		mes "Don't disturb me anymore. I'm a busy man... What a waste.";
@@ -429,13 +431,6 @@ aldebaran,127,138,3	script	Promotional Staff#alde	100,{
 		mes "Bless you!";
 		close;
 	}
-	if (ep13_ryu == 2) {
-		mes "[Promotional Staff]";
-		mes "Don't forget to bring... ^FF0000300 Jellopy^000000.";
-		mes "Got it? ^FF0000300 Jellopy^000000!";
-		mes "Let me know once you got them.";
-		close;
-	}
 	if (ep13_ryu == 1) {
 		mes "[Promotional Staff]";
 		mes "We want the adventurers who are super curious and extremely brave. Join us for a wonderful adventure!";
@@ -474,52 +469,8 @@ aldebaran,127,138,3	script	Promotional Staff#alde	100,{
 		mes "Then we can go forward.";
 		close;
 	}
-	mes "[Promotional Staff]";
-	mes "We want the adventurers who are super curious and extremely brave. Join us for a wonderful adventure!";
-	next;
-	mes "[Promotional Staff]";
-	mes "Hey, you're a well-versed person, right? Are you interested in my story?";
-	next;
-	switch(select("Yes.:No, thanks.")) {
-	case 1:
-		mes "[Promotional Staff]";
-		mes "You're a real adventurer.";
-		mes "Good for you!";
-		mes "You won't regret it.";
-		next;
-		mes "[Promotional Staff]";
-		mes "I usually send adventurers to";
-		mes "newly found places for research.";
-		mes "It's quite challeging, as nobody's ever been to these places.";
-		next;
-		mes "[Promotional Staff]";
-		mes "The missions are quite dangerous,";
-		mes "so only those who are courageous";
-		mes "are qualified for the challenge";
-		mes "of this mission.";
-		next;
-		mes "[Promotional Staff]";
-		mes "I'm not sure that you're strong enough, but you seem brave. How about going to the kingdom receptionist? He should be in the first room of Prontera Castle.";
-		next;
-		mes "[Promotional Staff]";
-		mes "From what I've heard about this place... It's not a new continent.";
-		mes "I don't know where it is.";
-		mes "Hmm... Inside of the sky?";
-		next;
-		mes "[Promotional Staff]";
-		mes "Could just be a rumor,";
-		mes "but I don't know exactly.";
-		mes "It's not my business.";
-		next;
-		mes "[Promotional Staff]";
-		mes "Anyway, I'm supposed to inform many adventurers about it.";
-		mes "There's no time to waste!";
-		close;
-	case 2:
-		mes "[Promotional Staff]";
-		mes "Huh, I thought you were a real adventurer. You're missing a big opportunity. You're definitely not brave. Absolutely not!";
-		close;
-	}
+	callfunc "Promotional_Staff";
+	end;
 }
 
 geffen,90,67,3	script	Promotional Staff#gef	100,{
@@ -535,7 +486,14 @@ geffen,90,67,3	script	Promotional Staff#gef	100,{
 		mes "Or do you have any business in Geffen?";
 		close;
 	}
-	if ((ep13_ryu == 5) && (countitem(723) > 0)) {
+	if (ep13_ryu == 5) {
+		if (countitem(723) == 0) {
+			mes "[Promotional Staff]";
+			mes "^FF00001 Ruby!!^000000.";
+			mes "Don't you forget it!";
+			mes "Hurry up! Time is zeny!";
+			close;
+		}
 		mes "[Promotional Staff]";
 		mes "Wow, you brought a genuine Jewel.";
 		mes "You are absolutely qualified.";
@@ -568,14 +526,13 @@ geffen,90,67,3	script	Promotional Staff#gef	100,{
 		mes "Good luck!";
 		close;
 	}
-	if (ep13_ryu == 5) {
-		mes "[Promotional Staff]";
-		mes "^FF00001 Ruby!!^000000.";
-		mes "Don't you forget it!";
-		mes "Hurry up! Time is zeny!";
-		close;
-	}
-	if ((ep13_ryu == 4) && (countitem(721) > 0)) {
+	if (ep13_ryu == 4) {
+		if (countitem(721) == 0) {
+			mes "[Promotional Staff]";
+			mes "The one you should bring me is";
+			mes "^FF0000Emerald^000000. Can you get it?";
+			close;
+		}
 		mes "[Promotional Staff]";
 		mes "You brought it so soon!";
 		mes "You're a real adventurer!";
@@ -599,12 +556,6 @@ geffen,90,67,3	script	Promotional Staff#gef	100,{
 		mes "I will wait until you bring me a stone again.";
 		close;
 	}
-	if (ep13_ryu == 4) {
-		mes "[Promotional Staff]";
-		mes "The one you should bring me is";
-		mes "^FF0000Emerald^000000. Can you get it?";
-		close;
-	}
 	if (ep13_ryu == 3) {
 		mes "[Promotional Staff]";
 		mes "We are recruiting adventurers who are strong and curious. Try your life at something more challenging.";
@@ -634,55 +585,11 @@ geffen,90,67,3	script	Promotional Staff#gef	100,{
 		mes "Then we can go forward.";
 		close;
 	}
-	mes "[Promotional Staff]";
-	mes "We want adventurers who are super curious and extremely brave. Join us for a wonderful adventure!";
-	next;
-	mes "[Promotional Staff]";
-	mes "Hey, you're a knowledgeable person, right? Are you interested in my story?";
-	next;
-	switch(select("Yes.:No, thanks.")) {
-	case 1:
-		mes "[Promotional Staff]";
-		mes "You're a real adventurer.";
-		mes "Good for you!";
-		mes "You won't regret it.";
-		next;
-		mes "[Promotional Staff]";
-		mes "I usually send adventurers to";
-		mes "newly found places for research.";
-		mes "It's quite challeging, as nobody's ever been to these places.";
-		next;
-		mes "[Promotional Staff]";
-		mes "The missions are quite dangerous,";
-		mes "so only those who are courageous";
-		mes "are qualified for the challenge";
-		mes "of this mission.";
-		next;
-		mes "[Promotional Staff]";
-		mes "I'm not sure that you're strong enough, but you seem brave. How about going to the kingdom receptionist? He should be in the first room of Prontera Castle.";
-		next;
-		mes "[Promotional Staff]";
-		mes "From what I've heard about this place... It's not a new continent.";
-		mes "I don't know where it is.";
-		mes "Hmm... Inside of the sky?";
-		next;
-		mes "[Promotional Staff]";
-		mes "Could just be a rumor,";
-		mes "but I don't know exactly.";
-		mes "It's not my business.";
-		next;
-		mes "[Promotional Staff]";
-		mes "Anyway, I'm supposed to inform many adventurers about it.";
-		mes "There's no time to waste!";
-		close;
-	case 2:
-		mes "[Promotional Staff]";
-		mes "Huh, I thought you were a real adventurer. You're missing a big opportunity. You're definitely not brave. Absolutely not!";
-		close;
-	}
+	callfunc "Promotional_Staff";
+	end;
 }
 
-izlude,101,173,6	script	Promotional Staff#iz	100,{
+-	script	::PromotionalStaff_izlude	-1,{
 	if (ep13_ryu > 8) {
 		mes "[Promotional Staff]";
 		mes "I bless you for your future! May it be full of happiness!";
@@ -694,7 +601,21 @@ izlude,101,173,6	script	Promotional Staff#iz	100,{
 		mes "If you have any other business, go to the palace.";
 		close;
 	}
-	if ((ep13_ryu == 7) && (BaseLevel > 69)) {
+	if (ep13_ryu == 7) {
+		if (BaseLevel < 70) {
+			mes "[Promotional Staff]";
+			mes "You don't look that strong.";
+			mes "Nothing but skin and bones!";
+			mes "Not reliable.";
+			mes "You should level up more before";
+			mes "considering this adventure.";
+			next;
+			mes "[Promotional Staff]";
+			mes "I don't need adventurers who are";
+			mes "body-builders... but at least";
+			mes "someone not so little!!";
+			close;
+		}
 		mes "[Promotional Staff]";
 		mes "Wow! You are considerably";
 		mes "stronger than before!";
@@ -733,20 +654,6 @@ izlude,101,173,6	script	Promotional Staff#iz	100,{
 		mes "for your great future!";
 		close;
 	}
-	if (ep13_ryu == 7) {
-		mes "[Promotional Staff]";
-		mes "You don't look that strong.";
-		mes "Nothing but skin and bones!";
-		mes "Not reliable.";
-		mes "You should level up more before";
-		mes "considering this adventure.";
-		next;
-		mes "[Promotional Staff]";
-		mes "I don't need adventurers who are";
-		mes "body-builders... but at least";
-		mes "someone not so little!!";
-		close;
-	}
 	if (ep13_ryu == 6) {
 		mes "[Promotional Staff]";
 		mes "We are recruiting adventurers";
@@ -811,54 +718,8 @@ izlude,101,173,6	script	Promotional Staff#iz	100,{
 			close;
 		}
 	}
-	mes "[Promotional Staff]";
-	mes "We want the adventurers who are super curious";
-	mes "and extremely brave.";
-	mes "Join us for a wonderful adventure!";
-	next;
-	mes "[Promotional Staff]";
-	mes "Hey, you're a well-knowledged person, as I know. Are you interested in my story?";
-	next;
-	switch(select("Yes.:No, thanks.")) {
-	case 1:
-		mes "[Promotional Staff]";
-		mes "You're a real adventurer.";
-		mes "Good for you!";
-		mes "You won't regret it.";
-		next;
-		mes "[Promotional Staff]";
-		mes "I usually send adventurers to";
-		mes "newly found places for research.";
-		mes "It's quite challeging, as nobody's ever been to these places.";
-		next;
-		mes "[Promotional Staff]";
-		mes "The missions are quite dangerous,";
-		mes "so only those who are courageous";
-		mes "are qualified for the challenge";
-		mes "of this mission.";
-		next;
-		mes "[Promotional Staff]";
-		mes "I'm not sure that you're strong enough, but you seem brave. How about going to the kingdom receptionist? He should be in the first room of Prontera Castle.";
-		next;
-		mes "[Promotional Staff]";
-		mes "From what I've heard about this place... It's not a new continent.";
-		mes "I don't know where it is.";
-		mes "Hmm... Inside of the sky?";
-		next;
-		mes "[Promotional Staff]";
-		mes "Could just be a rumor,";
-		mes "but I don't know exactly.";
-		mes "It's not my business.";
-		next;
-		mes "[Promotional Staff]";
-		mes "Anyway, I'm supposed to inform many adventurers about it.";
-		mes "There's no time to waste!";
-		close;
-	case 2:
-		mes "[Promotional Staff]";
-		mes "Huh, I thought you were a real adventurer. You're missing a big opportunity. You're definitely not brave. Absolutely not!";
-		close;
-	}
+	callfunc "Promotional_Staff";
+	end;
 }
 
 lighthalzen,220,292,3	script	Guide#ep13_1	899,{
@@ -10426,689 +10287,75 @@ man_fild01,315,95,3	script	Expedition Scout#1	707,{
 	next;
 	mes "[Expedition Scout]";
 	mes "I've been ordered by Instructor Igrid to conduct a search for something.";
-	set .@ep13_search_control,checkquest(3091,PLAYTIME);
+	set .@playtime,checkquest(3091,PLAYTIME);
 	next;
 	switch(select("Ask about search results.:Chitchat.:Quit.")) {
 	case 1:
-		if (((ep13_1_edq == 71) || (ep13_1_edq == 72)) && (.@ep13_search_control == -1)) {
-			set .@ep13_search_lotto,rand(1,6);
-			if (.@ep13_search_lotto == 4) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 5 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,5; //Some_Of_Report
-				changequest 3090,3091;
-				erasequest 3090;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else if ((.@ep13_search_lotto == 1) || (.@ep13_search_lotto == 6)) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 2 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,2; //Some_Of_Report
-				changequest 3090,3091;
-				erasequest 3090;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else if (.@ep13_search_lotto == 3) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 3 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,3; //Some_Of_Report
-				changequest 3090,3091;
-				erasequest 3090;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "I'm doing my best, but I haven't found any pages yet.";
-				next;
-				changequest 3090,3091;
-				erasequest 3090;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-		}
-		else if (((ep13_1_edq == 71) || (ep13_1_edq == 72)) && ((.@ep13_search_control == 0) || (.@ep13_search_control == 1))) {
+		if (ep13_1_edq == 71 || ep13_1_edq == 72) {
 			mes "[Expedition Scout]";
-			mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report.";
+			mes "Oh, you must be"+strcharinfo(0)+". I heard that you'll be delivering the report.";
 			next;
-			mes "[Expedition Scout]";
-			mes "Searching for lost pages was tougher then I expected. Please come back later when I'm finished making one round.";
-			close;
-		}
-		else if (((ep13_1_edq == 71) || (ep13_1_edq == 72)) && (.@ep13_search_control == 2)) {
-			set .@ep13_search_lotto,rand(1,6);
-			if (.@ep13_search_lotto == 4) {
+			if (.@playtime == 0 || .@playtime == 1) {
 				mes "[Expedition Scout]";
-				mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 5 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,5; //Some_Of_Report
-				erasequest 3091;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
+				mes "Searching for lost pages was tougher then I expected. Please come back later when I'm finished making one round.";
 				close;
-			}
-			else if ((.@ep13_search_lotto == 1) || (.@ep13_search_lotto == 6)) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
+			} else {
+				switch(rand(1,6)) {
+				case 1:
+				case 6:
+					set .@i,2;
+					break;
+				case 3:
+					set .@i,3;
+					break;
+				case 4:
+					set .@i,5;
+					break;
+				case 2:
+				case 5:
+					set .@i,0;
+					break;
+				}
 				mes "[Expedition Scout]";
-				mes "Good news! I've found 2 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,2; //Some_Of_Report
-				erasequest 3091;
+				if (.@i) {
+					mes "Good news! I've found "+.@i+" pieces of paper that appear to be part of the report.";
+					next;
+					getitem 6040,.@i; //Some_Of_Report
+				} else {
+					mes "I'm doing my best, but I haven't found any pages yet.";
+					next;
+				}
+				if (.@playtime == -1) {
+					changequest 3090,3091;
+					erasequest 3090;
+				} else
+					erasequest 3091;
 				setquest 3091;
 				mes "[Expedition Scout]";
 				mes "Well then, keep up the good work!";
 				close;
 			}
-			else if (.@ep13_search_lotto == 3) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 3 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,3; //Some_Of_Report
-				erasequest 3091;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "I'm doing my best, but I haven't found any pages yet.";
-				next;
-				erasequest 3091;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-		}
-		else if (ep13_1_edq < 8) {
-			mes "[Expedition Scout]";
-			mes "Who are you? Why do you want to know about our search results? Are you from the army?";
-			next;
-			mes "[Expedition Scout]";
-			mes "Man, don't you know that you can be arrested for interrupting a military operation?";
-			next;
-			mes "[Expedition Scout]";
-			mes "Please leave immediately.";
-		}
-		else {
-			mes "[Expedition Scout]";
-			mes "Who are you? Why do you want to know about our search results? Are you from the army?";
-			next;
-			mes "[Expedition Scout]";
-			mes "Man, don't you know that you can be arrested for interrupting a military operation?";
-			next;
-			mes "[Expedition Scout]";
-			mes "Please leave immediately.";
-		}
-		close;
-	case 2:
-		if (ep13_1_edq < 10) {
-			mes "[Expedition Scout]";
-			mes "I'm sorry, but I'm on duty. Why don't we talk later when I'm off-duty?";
-			close;
-		}
-		else {
-			mes "[Expedition Scout]";
-			mes "I'm sorry, but I'm on duty. Why don't we talk later when I'm off-duty?";
-			close;
-		}
-	case 3:
-		close;
-	}
-}
-
-man_fild03,202,251,3	script	Expedition Scout#2	707,{
-	mes "[Expedition Scout]";
-	mes "Good day. I'm from the Third Scout Party under direct command of the commander of the Midgard Expedition.";
-	next;
-	mes "[Expedition Scout]";
-	mes "I've been ordered by Instructor Igrid to conduct a search for something.";
-	set .@ep13_search_control,checkquest(3091,PLAYTIME);
-	next;
-	switch(select("Ask about search results.:Chitchat.:Quit.")) {
-	case 1:
-		if (((ep13_1_edq == 71) || (ep13_1_edq == 72)) && (.@ep13_search_control == -1)) {
-			set .@ep13_search_lotto,rand(1,6);
-			if (.@ep13_search_lotto == 4) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 5 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,5; //Some_Of_Report
-				changequest 3090,3091;
-				erasequest 3090;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else if ((.@ep13_search_lotto == 1) || (.@ep13_search_lotto == 6)) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 2 piece of paper that appear to be part of the report.";
-				next;
-				getitem 6040,2; //Some_Of_Report
-				changequest 3090,3091;
-				erasequest 3090;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else if (.@ep13_search_lotto == 3) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 3 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,3; //Some_Of_Report
-				changequest 3090,3091;
-				erasequest 3090;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "I'm doing my best, but I haven't found any pages yet.";
-				next;
-				changequest 3090,3091;
-				erasequest 3090;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-		}
-		else if (((ep13_1_edq == 71) || (ep13_1_edq == 72)) && ((.@ep13_search_control == 0) || (.@ep13_search_control == 1))) {
-			mes "[Expedition Scout]";
-			mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-			next;
-			mes "[Expedition Scout]";
-			mes "Searching for lost pages was tougher then I expected. Please come back later when I'm finished making one round.";
-			close;
-		}
-		else if (((ep13_1_edq == 71) || (ep13_1_edq == 72)) && (.@ep13_search_control == 2)) {
-			set .@ep13_search_lotto,rand(1,6);
-			if (.@ep13_search_lotto == 4) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 5 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,5; //Some_Of_Report
-				erasequest 3091;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else if ((.@ep13_search_lotto == 1) || (.@ep13_search_lotto == 6)) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 2 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,2; //Some_Of_Report
-				erasequest 3091;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else if (.@ep13_search_lotto == 3) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 3 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,3; //Some_Of_Report
-				erasequest 3091;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "I'm doing my best, but I haven't found any pages yet.";
-				next;
-				erasequest 3091;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-		}
-		else if (ep13_1_edq < 8) {
-			mes "[Expedition Scout]";
-			mes "Who are you? Why do you want to know about our search results? Are you from the army?";
-			next;
-			mes "[Expedition Scout]";
-			mes "Man, don't you know that you can be arrested for interrupting a military operation?";
-			next;
-			mes "[Expedition Scout]";
-			mes "Please leave immediately.";
-		}
-		close;
-	case 2:
-		if (ep13_1_edq < 10) {
-			mes "[Expedition Scout]";
-			mes "I'm sorry, but I'm on duty. Why don't we talk later when I'm off-duty?";
-			close;
-		}
-		else {
-			mes "[Expedition Scout]";
-			mes "I'm sorry, but I'm on duty. Why don't we talk later when I'm off-duty?";
-			close;
-		}
-	case 3:
-		close;
-	}
-}
-
-spl_fild02,295,368,3	script	Expedition Scout#3	707,{
-	mes "[Expedition Scout]";
-	mes "Good day. I'm from the Third Scout Party under direct command of the commander of the Midgard Expedition.";
-	next;
-	mes "[Expedition Scout]";
-	mes "I've been ordered by Instructor Igrid to conduct a search for something.";
-	set .@ep13_search_control,checkquest(3091,PLAYTIME);
-	next;
-	switch(select("Ask about search results.:Chitchat.:Quit.")) {
-	case 1:
-		if (((ep13_1_edq == 71) || (ep13_1_edq == 72)) && (.@ep13_search_control == -1)) {
-			set .@ep13_search_lotto,rand(1,6);
-			if (.@ep13_search_lotto == 4) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 5 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,5; //Some_Of_Report
-				changequest 3090,3091;
-				erasequest 3090;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else if ((.@ep13_search_lotto == 1) || (.@ep13_search_lotto == 6)) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 2 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,2; //Some_Of_Report
-				changequest 3090,3091;
-				erasequest 3090;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else if (.@ep13_search_lotto == 3) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 3 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,3; //Some_Of_Report
-				changequest 3090,3091;
-				erasequest 3090;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "I'm doing my best, but I haven't found any pages yet.";
-				next;
-				changequest 3090,3091;
-				erasequest 3090;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-		}
-		else if (((ep13_1_edq == 71) || (ep13_1_edq == 72)) && ((.@ep13_search_control == 0) || (.@ep13_search_control == 1))) {
-			mes "[Expedition Scout]";
-			mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-			next;
-			mes "[Expedition Scout]";
-			mes "Searching for lost pages was tougher then I expected. Please come back later when I'm finished making one round.";
-			close;
-		}
-		else if (((ep13_1_edq == 71) || (ep13_1_edq == 72)) && (.@ep13_search_control == 2)) {
-			set .@ep13_search_lotto,rand(1,6);
-			if (.@ep13_search_lotto == 4) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 5 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,5; //Some_Of_Report
-				erasequest 3091;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else if ((.@ep13_search_lotto == 1) || (.@ep13_search_lotto == 6)) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 2 piece of paper that appear to be part of the report.";
-				next;
-				getitem 6040,2; //Some_Of_Report
-				erasequest 3091;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else if (.@ep13_search_lotto == 3) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 3 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,3; //Some_Of_Report
-				erasequest 3091;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "I'm doing my best, but I haven't found any pages yet.";
-				next;
-				erasequest 3091;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-		}
-		else if (ep13_1_edq < 8) {
-			mes "[Expedition Scout]";
-			mes "Who are you? Why do you want to know about our search results? Are you from the army?";
-			next;
-			mes "[Expedition Scout]";
-			mes "Man, don't you know that you can be arrested for interrupting a military operation?";
-			next;
-			mes "[Expedition Scout]";
-			mes "Please leave immediately.";
-		}
-		else {
-			mes "[Expedition Scout]";
-			mes "Who are you? Why do you want to know about our search results? Are you from the army?";
-			next;
-			mes "[Expedition Scout]";
-			mes "Man, don't you know that you can be arrested for interrupting a military operation?";
-			next;
-			mes "[Expedition Scout]";
-			mes "Please leave immediately.";
-		}
-		close;
-	case 2:
-		if (ep13_1_edq < 10) {
-			mes "[Expedition Scout]";
-			mes "I'm sorry, but I'm on duty. Why don't we talk later when I'm off-duty?";
-			close;
-		}
-		else {
-			mes "[Expedition Scout]";
-			mes "I'm sorry, but I'm on duty. Why don't we talk later when I'm off-duty?";
-		}
-		close;
-	case 3:
-		close;
-	}
-}
-
-spl_fild03,172,71,3	script	Expedition Scout#4	707,{
-	mes "[Expedition Scout]";
-	mes "Good day. I'm from the Third Scout Party under direct command of the commander of the Midgard Expedition.";
-	next;
-	mes "[Expedition Scout]";
-	mes "I've been ordered by Instructor Igrid to conduct a search for something.";
-	set .@ep13_search_control,checkquest(3091,PLAYTIME);
-	next;
-	switch(select("Ask about search results.:Chitchat.:Quit.")) {
-	case 1:
-		if (((ep13_1_edq == 71) || (ep13_1_edq == 72)) && (.@ep13_search_control == -1)) {
-			set .@ep13_search_lotto,rand(1,6);
-			if (.@ep13_search_lotto == 4) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 5 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,5; //Some_Of_Report
-				changequest 3090,3091;
-				erasequest 3090;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else if ((.@ep13_search_lotto == 1) || (.@ep13_search_lotto == 6)) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 2 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,2; //Some_Of_Report
-				changequest 3090,3091;
-				erasequest 3090;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else if (.@ep13_search_lotto == 3) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 3 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,3; //Some_Of_Report
-				changequest 3090,3091;
-				erasequest 3090;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "I'm doing my best, but I haven't found any pages yet.";
-				next;
-				changequest 3090,3091;
-				erasequest 3090;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-		}
-		else if (((ep13_1_edq == 71) || (ep13_1_edq == 72)) && ((.@ep13_search_control == 0) || (.@ep13_search_control == 1))) {
-			mes "[Expedition Scout]";
-			mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-			next;
-			mes "[Expedition Scout]";
-			mes "Searching for lost pages was tougher then I expected. Please come back later when I'm finished making one round.";
-			close;
-		}
-		else if (((ep13_1_edq == 71) || (ep13_1_edq == 72)) && (.@ep13_search_control == 2)) {
-			set .@ep13_search_lotto,rand(1,6);
-			if (.@ep13_search_lotto == 4) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 5 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,5; //Some_Of_Report
-				erasequest 3091;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else if ((.@ep13_search_lotto == 1) || (.@ep13_search_lotto == 6)) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 2 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,2; //Some_Of_Report
-				erasequest 3091;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else if (.@ep13_search_lotto == 3) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 3 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,3; //Some_Of_Report
-				erasequest 3091;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "I'm doing my best, but I haven't found any pages yet.";
-				next;
-				erasequest 3091;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-		}
-		else if (ep13_1_edq < 8) {
-			mes "[Expedition Scout]";
-			mes "Who are you? Why do you want to know about our search results? Are you from the army?";
-			next;
-			mes "[Expedition Scout]";
-			mes "Man, don't you know that you can be arrested for interrupting a military operation?";
-			next;
-			mes "[Expedition Scout]";
-			mes "Please leave immediately.";
-		}
-		else {
-			mes "[Expedition Scout]";
-			mes "Who are you? Why do you want to know about our search results? Are you from the army?";
-			next;
-			mes "[Expedition Scout]";
-			mes "Man, don't you know that you can be arrested for interrupting a military operation?";
-			next;
-			mes "[Expedition Scout]";
-			mes "Please leave immediately.";
 		}
+		mes "[Expedition Scout]";
+		mes "Who are you? Why do you want to know about our search results? Are you from the army?";
+		next;
+		mes "[Expedition Scout]";
+		mes "Man, don't you know that you can be arrested for interrupting a military operation?";
+		next;
+		mes "[Expedition Scout]";
+		mes "Please leave immediately.";
 		close;
 	case 2:
-		if (ep13_1_edq < 10) {
-			mes "[Expedition Scout]";
-			mes "I'm sorry, but I'm on duty. Why don't we talk later when I'm off-duty?";
-			close;
-		}
-		else {
-			mes "[Expedition Scout]";
-			mes "I'm sorry, but I'm on duty. Why don't we talk later when I'm off-duty?";
-		}
+		mes "[Expedition Scout]";
+		mes "I'm sorry, but I'm on duty. Why don't we talk later when I'm off-duty?";
 		close;
 	case 3:
 		close;
 	}
 }
+man_fild03,202,251,3	duplicate(Expedition Scout#1)	Expedition Scout#2	707
+spl_fild02,295,368,3	duplicate(Expedition Scout#1)	Expedition Scout#3	707
+spl_fild03,172,71,3	duplicate(Expedition Scout#1)	Expedition Scout#4	707
 
 prt_castle,88,165,3	script	Laur	57,{
 	mes "[Laur]";

+ 1 - 1
npc/re/airports/izlude.txt

@@ -11,4 +11,4 @@
 //= Updated to match the new Izlude Map. [Masao]
 //============================================================ 
 
-izlude,204,75,3	duplicate(Airship_Staff_izlude)	Airship Staff#izlude	90
+izlude,202,75,3	duplicate(Airship_Staff_izlude)	Airship Staff#izlude	90

+ 7 - 4
npc/re/merchants/shops.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= rAthena Dev Team
 //===== Current Version: ===================================== 
-//= 1.3
+//= 1.4
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
@@ -13,6 +13,7 @@
 //= 1.1 Added Dicastes merchants. [Joseph]
 //= 1.2 Moved more shops to Renewal file. [Euphy]
 //= 1.3 Added Malangdo tool dealer. [Euphy]
+//= 1.4 Moved Izlude merchants. [Streusel]
 //============================================================ 
 
 //=======================================================
@@ -35,10 +36,12 @@ dicastes01,207,200,6	shop	Points Merchant#dic	66,6360:-1,6361:-1,6362:-1,6363:-1
 //=======================================================
 // Izlude
 //=======================================================
-izlude,97,146,0	shop	Butcher#iz	54,517:-1
+izlude,160,186,0	shop	Butcher#iz	54,517:-1
 izlude,124,165,4	shop	Fruit Gardener#iz	53,512:-1,513:-1,515:-1,516:-1
-izlude,95,145,6	shop	Vendor from Milk Ranch#i	90,519:-1
-izlude,174,164,4	shop	Pet Groomer#iz	124,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-1
+izlude,128,158,6	shop	Vendor from Milk Ranch#i	90,519:-1
+izlude_in,72,98,3	shop	Pet Groomer#iz	124,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-1
+izlude_in,57,109,0	shop	Tool Dealer#iz	47,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,1750:-1
+izlude_in,72,110,3	shop	Trading Merchant#iz	900,13200:-1,13201:-1,13202:-1,13150:-1,13102:-1,13151:-1,13154:-1,13155:-1,13163:-1,13165:-1,13168:-1
 
 //=======================================================
 // Juno

+ 15 - 0
npc/re/quests/monstertamers.txt

@@ -0,0 +1,15 @@
+//===== rAthena Script =======================================
+//= Monster Tamers
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= rAthena SVN
+//===== Description: =========================================
+//= Cute pet quest items
+//===== Additional Comments: =================================
+//= 1.0 Moved Izlude NPC to pre-re/re paths.
+//============================================================
+
+izlude_in,55,105,4	duplicate(MonsterTamer_izlude)	Monster Tamer#izu	125

+ 15 - 0
npc/re/quests/quests_13_1.txt

@@ -0,0 +1,15 @@
+//===== rAthena Script ======================================= 
+//= Quest NPCs related to Ash-Vacuum
+//===== By: ================================================== 
+//= Euphy
+//===== Current Version: ===================================== 
+//= 1.0
+//===== Compatible With: ===================================== 
+//= rAthena SVN
+//===== Description: ========================================= 
+//= Contains duplicate NPCs from main script.
+//===== Additional Comments: ================================= 
+//= 1.0 Moved Izlude NPC to pre-re/re paths. [Euphy]
+//============================================================ 
+
+izlude,102,171,6	duplicate(PromotionalStaff_izlude)	Promotional Staff#iz	100

+ 3 - 3
npc/re/quests/quests_lighthalzen.txt

@@ -15,7 +15,7 @@
 
 // Renewal split [Daegaladh]
 //============================================================
-izlude,171,73,6	duplicate(Scamp)	Scamp#2	853
+izlude,172,73,6	duplicate(Scamp)	Scamp#2	853
 
 // Somatology Laboratory F4
 //============================================================
@@ -70,8 +70,8 @@ lighthalzen,303,304,5	script	Jerome Jameson#start	904,{
 }
 
 // Is this the correct behavior? (limited and conflicting sources)
-// -- iRO: lhz_dun03 warps directly to que_lhz.
-// -- Ziu: NPC in lhz_dun04 warps into que_lhz.
+// - NPC in lhz_dun04 warps into que_lhz. (?)
+// - lhz_dun03 warps directly to que_lhz. (?)
 function	script	lhz4enter	{
 	if (getmapusers("que_lhz") == 0 && mobcount("que_lhz","#controllhz4::OnMyMobDead") < 1) {
 		if (getarg(0) == 0) {

+ 2 - 0
npc/re/scripts_athena.conf

@@ -74,8 +74,10 @@ npc: npc/re/quests/eden/eden_service.txt
 //npc: npc/re/quests/cupet.txt
 npc: npc/re/quests/homu_s.txt
 npc: npc/re/quests/magic_books.txt
+npc: npc/re/quests/monstertamers.txt
 npc: npc/re/quests/mrsmile.txt
 npc: npc/re/quests/pile_bunker.txt
+npc: npc/re/quests/quests_13_1.txt
 npc: npc/re/quests/quests_brasilis.txt
 npc: npc/re/quests/quests_dewata.txt
 npc: npc/re/quests/quests_dicastes.txt

+ 9 - 1
npc/re/warps/cities/izlude.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Athena (1.0), Nana (1.1)
 //===== Current Version: =====================================
-//= 1.4
+//= 1.6
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Description: =========================================
@@ -12,6 +12,7 @@
 //= 1.3 Added warps to Izlude Airship [Justin84]
 //= 1.4 Minor correction on airport warps
 //= 1.5 Updated to match the new Izlude Map. [Masao]
+//= 1.6 Added new warps. [Streusel]
 //============================================================
 
 //= Izlude City ==============================================
@@ -20,6 +21,8 @@ izlude,162,125,0	warp	iz02	2,2,izlude_in,116,49
 izlude,216,162,0	warp	iz03	3,2,izlude_in,151,127
 izlude,21,98,0	warp	iz001	3,3,prt_fild08,367,212
 izlude,52,172,0	warp	iz04	2,2,izlude_in,74,161
+izlude,130,257,0	warp	iz_ac01-1	2,2,iz_ac01,99,29
+izlude,125,257,0	warp	iz_ac01-2	2,2,iz_ac01,99,29
 izlude_in,108,169,0	warp	iz05	2,3,izlude_in,84,169
 izlude_in,116,46,0	warp	iz02-1	3,2,izlude,157,125
 izlude_in,148,127,0	warp	iz03-1	2,5,izlude,207,162
@@ -31,3 +34,8 @@ izlude_in,43,169,0	warp	w219	2,3,izlude_in,64,169
 izlude_in,65,84,0	warp	iz01-1	5,2,izlude,113,178
 izlude_in,74,158,0	warp	iz04-1	3,2,izlude,52,166
 izlude_in,87,169,0	warp	iz05-1	2,3,izlude_in,111,169
+iz_ac01,100,24,0	warp	iz_ac01	2,2,izlude,127,253
+iz_ac01,122,25,0	warp	iz_ac02	2,2,iz_ac02,104,27
+iz_ac01,78,25,0	warp	iz_ac03	2,2,iz_ac02,104,27
+iz_ac02,113,27,0	warp	iz_ac04	2,2,iz_ac01,122,28
+iz_ac02,94,27,0	warp	iz_ac05	2,2,iz_ac01,78,28

+ 16 - 16
sql-files/item_db.sql

@@ -570,7 +570,7 @@ REPLACE INTO `item_db` VALUES (1185,'Violet_Fear','Violet Fear',4,20,NULL,2200,2
 REPLACE INTO `item_db` VALUES (1186,'Death_Guidance','Death Guidance',4,20,NULL,2000,200,NULL,1,2,0x00004082,2,2,34,4,70,1,3,'bonus bStr,5; bonus bAgi,2; bonus bFlee2,20; bonus3 bAutoSpell,"NPC_HELLPOWER",1,10; bonus4 bAutoSpell,"NPC_HELLPOWER",1,10,0; if( getrefine()>8 ) bonus3 bAutoSpell,"NPC_VAMPIRE_GIFT",2,20; else bonus3 bAutoSpell,"NPC_VAMPIRE_GIFT",1,20;',NULL,NULL);
 REPLACE INTO `item_db` VALUES (1187,'Krieger_Twohand_Sword1','Glorious Claymore',4,20,NULL,0,220,NULL,1,NULL,0x00004082,7,2,34,4,80,1,3,'bonus2 bAddRace,RC_DemiHuman,70; bonus2 bIgnoreDefRate,RC_DemiHuman,25; bonus bUnbreakableWeapon,0; if(getrefine()>5) { bonus2 bAddRace,RC_DemiHuman,(getrefine()-3)*(getrefine()-3); bonus2 bIgnoreDefRate,RC_DemiHuman,5; } if(getrefine()>8) { bonus3 bAutoSpell,"LK_CONCENTRATION",getskilllv("LK_CONCENTRATION")>1?getskilllv("LK_CONCENTRATION"):1,30; bonus3 bAutoSpell,"LK_AURABLADE",getskilllv("LK_AURABLADE")>1?getskilllv("LK_AURABLADE"):1,30; }',NULL,NULL);
 REPLACE INTO `item_db` VALUES (1188,'Veteran_Sword','Veteran Sword',4,10000,NULL,2000,180,NULL,1,1,0x00004082,7,2,34,4,80,1,3,'if(getskilllv("SM_BASH")==10) { bonus2 bSkillAtk,"SM_BASH",50; } if(getskilllv("KN_BOWLINGBASH")==10) { bonus2 bSkillAtk,"KN_BOWLINGBASH",50; } bonus bStr,1; bonus bDex,1;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (1189,'Krasnaya','Krasnaya',4,20,NULL,3800,200,NULL,2,3,0x00004082,2,2,34,2,50,1,3,'if(readparam(bStr)>=95) { bonus bAtk,20; }',NULL,NULL);
+REPLACE INTO `item_db` VALUES (1189,'Krasnaya','Krasnaya',4,20,NULL,3800,200,NULL,2,3,0x00004082,2,2,34,2,50,1,3,'if(readparam(bStr)>=95) { bonus bBaseAtk,20; }',NULL,NULL);
 REPLACE INTO `item_db` VALUES (1190,'Claymore_C','Claymore',4,NULL,NULL,0,220,NULL,1,NULL,0x00004080,7,2,34,3,1,NULL,3,'bonus2 bAddSize,Size_Small,40; bonus2 bAddSize,Size_Medium,40; bonus2 bAddSize,Size_Large,40;',NULL,NULL);
 # Daggers
 REPLACE INTO `item_db` VALUES (1201,'Knife','Knife',4,50,NULL,400,17,NULL,1,3,0xFE9F7EEF,7,2,2,1,1,1,1,NULL,NULL,NULL);
@@ -671,7 +671,7 @@ REPLACE INTO `item_db` VALUES (1307,'Windhawk','Windhawk',4,18000,NULL,1500,115,
 REPLACE INTO `item_db` VALUES (1308,'Golden_Axe','Golden Axe',4,20,NULL,3000,170,NULL,1,NULL,0x00000001,7,2,2,4,45,1,6,NULL,NULL,NULL);
 REPLACE INTO `item_db` VALUES (1309,'Orcish_Axe_','Orcish Axe',4,20,NULL,1500,75,NULL,1,4,0x000654E3,7,2,2,3,3,1,6,NULL,NULL,NULL);
 REPLACE INTO `item_db` VALUES (1310,'Krieger_Onehand_Axe1','Glorious Cleaver',4,20,NULL,0,130,NULL,1,NULL,0x000444A2,7,2,2,4,80,1,6,'bonus2 bAddRace,RC_DemiHuman,75; bonus2 bIgnoreDefRate,RC_DemiHuman,20; bonus bUnbreakableWeapon,0; if(getrefine()>5) { bonus2 bAddRace,RC_DemiHuman,(getrefine()-4)*(getrefine()-4); bonus2 bIgnoreDefRate,RC_DemiHuman,5; bonus bAspdRate,5; } if(getrefine()>8) { bonus bAspdRate,5; bonus3 bAutoSpell,"NPC_CRITICALWOUND",1,50; bonus4 bAutoSpellOnSkill,"MC_MAMMONITE","NPC_CRITICALWOUND",2,200; }',NULL,NULL);
-REPLACE INTO `item_db` VALUES (1311,'Vecer_Axe','Vecer Axe',4,20,NULL,1500,140,NULL,1,2,0x000444A2,2,2,2,3,50,1,6,'if(readparam(bLuk)>=90) { bonus bAtk,20; } if(readparam(bDex)>=90) { bonus bCritical,5; } if(readparam(bDex)>=90||readparam(bLuk)>=90) { bonus2 bSkillAtk,"MC_MAMMONITE",15; }',NULL,NULL);
+REPLACE INTO `item_db` VALUES (1311,'Vecer_Axe','Vecer Axe',4,20,NULL,1500,140,NULL,1,2,0x000444A2,2,2,2,3,50,1,6,'if(readparam(bLuk)>=90) { bonus bBaseAtk,20; } if(readparam(bDex)>=90) { bonus bCritical,5; } if(readparam(bDex)>=90||readparam(bLuk)>=90) { bonus2 bSkillAtk,"MC_MAMMONITE",15; }',NULL,NULL);
 REPLACE INTO `item_db` VALUES (1312,'Orcish_Axe_C','Orcish Axe',4,NULL,NULL,0,110,NULL,1,NULL,0x000654E3,7,2,2,3,1,NULL,6,'bonus2 bAddSize,Size_Small,70; bonus2 bAddSize,Size_Medium,70; bonus2 bAddSize,Size_Large,70;',NULL,NULL);
 REPLACE INTO `item_db` VALUES (1313,'Tourist_Axe','Tourist Axe',4,NULL,NULL,500,77,NULL,1,NULL,0x000654E3,7,2,2,1,1,NULL,6,'bonus bStr,2;',NULL,NULL);
 REPLACE INTO `item_db` VALUES (1314,'F_Tomahawk_C','Tomahawk',4,2,NULL,0,200,NULL,1,NULL,0x000444A2,7,2,34,4,NULL,NULL,7,'bonus bAtkEle,Ele_Wind;',NULL,NULL);
@@ -710,7 +710,7 @@ REPLACE INTO `item_db` VALUES (1380,'BF_Two_Handed_Axe2','Brave Insane Battle Ax
 REPLACE INTO `item_db` VALUES (1381,'N_Battle_Axe','Novice Battle Axe',4,NULL,NULL,0,100,NULL,1,3,0x000444A2,7,2,34,1,3,NULL,7,NULL,NULL,NULL);
 REPLACE INTO `item_db` VALUES (1382,'Krieger_Twohand_Axe1','Glorious Two-Handed Axe',4,20,NULL,0,220,NULL,1,NULL,0x000444A2,7,2,34,4,80,1,7,'bonus2 bAddRace,RC_DemiHuman,70; bonus2 bIgnoreDefRate,RC_DemiHuman,25; bonus bUnbreakableWeapon,0; if(getrefine()>5) { bonus2 bAddRace,RC_DemiHuman,(getrefine()-3)*(getrefine()-3); bonus2 bIgnoreDefRate,RC_DemiHuman,5; bonus3 bAutoSpell,"NPC_CRITICALWOUND",1,50; } if(getrefine()>8) { bonus3 bAutoSpell,"NPC_CRITICALWOUND",1,100; bonus4 bAutoSpellOnSkill,"MC_MAMMONITE","NPC_CRITICALWOUND",2,200; bonus4 bAutoSpellOnSkill,"WS_CARTTERMINATION","NPC_CRITICALWOUND",2,200; }',NULL,NULL);
 REPLACE INTO `item_db` VALUES (1383,'Holy_Celestial_Axe','Celestial Axe',4,20,NULL,1500,200,NULL,1,NULL,0x000444A2,7,2,34,4,60,1,7,'bonus bAtkEle,Ele_Holy; bonus bVit,10; bonus2 bAddRace,RC_Undead,10; bonus3 bAutoSpell,"AL_BLESSING",5,50;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (1384,'Veteran_Axe','Veteran Axe',4,10000,NULL,3000,250,NULL,1,2,0x000444A2,7,2,34,3,80,1,7,'if(getskilllv("BS_DAGGER")==3) { bonus bAtk,10; } if(getskilllv("BS_SWORD")==3) { bonus bAtk,10; } if(getskilllv("BS_TWOHANDSWORD")==3) { bonus bAtk,10; } if(getskilllv("BS_KNUCKLE")==3) { bonus bAtk,10; } if(getskilllv("BS_SPEAR")==3) { bonus bAtk,10; } if(getskilllv("BS_AXE")==3) { bonus bAtk,10; } if(getskilllv("BS_MACE")==3) { bonus bAtk,10; } bonus bVit,2;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (1384,'Veteran_Axe','Veteran Axe',4,10000,NULL,3000,250,NULL,1,2,0x000444A2,7,2,34,3,80,1,7,'if(getskilllv("BS_DAGGER")==3) { bonus bBaseAtk,10; } if(getskilllv("BS_SWORD")==3) { bonus bBaseAtk,10; } if(getskilllv("BS_TWOHANDSWORD")==3) { bonus bBaseAtk,10; } if(getskilllv("BS_KNUCKLE")==3) { bonus bBaseAtk,10; } if(getskilllv("BS_SPEAR")==3) { bonus bBaseAtk,10; } if(getskilllv("BS_AXE")==3) { bonus bBaseAtk,10; } if(getskilllv("BS_MACE")==3) { bonus bBaseAtk,10; } bonus bVit,2;',NULL,NULL);
 REPLACE INTO `item_db` VALUES (1385,'Bradium_Stonehammer','Bradium Stone Hammer',4,20,NULL,2700,210,NULL,1,NULL,0x000444A2,2,2,34,4,75,1,7,'bonus3 bAddEffOnSkill,"BS_HAMMERFALL",Eff_Stun,500+(200*getrefine());',NULL,NULL);
 REPLACE INTO `item_db` VALUES (1386,'Doom_Slayer_I','Doom Slayer',4,NULL,NULL,0,20,NULL,1,NULL,0x000444A2,7,2,34,4,NULL,NULL,7,'if(readparam(bStr)>=95){ bonus bBaseAtk,400; bonus2 bAddEff,Eff_Stun,3000; bonus bAspdRate,-25; bonus bUseSPrate,100; bonus bBreakArmorRate,500; }',NULL,NULL);
 REPLACE INTO `item_db` VALUES (1387,'Giant_Axe','Giant Axe',4,20,NULL,4000,330,NULL,1,1,0x000444A2,2,2,34,3,50,1,7,'bonus2 bSkillAtk,"WS_CARTTERMINATION",15; if(readparam(bStr)>=95) { bonus bHit,10; bonus bAspdRate,3; }',NULL,NULL);
@@ -1469,7 +1469,7 @@ REPLACE INTO `item_db` VALUES (2616,'Critical_Ring','Critical Ring',5,75000,NULL
 REPLACE INTO `item_db` VALUES (2617,'Mitten_Of_Presbyter','Celebrant\'s Mitten',5,2,NULL,100,NULL,1,NULL,NULL,0xFFFFFFFE,7,2,136,NULL,35,NULL,0,'bonus bInt,1;',NULL,NULL);
 REPLACE INTO `item_db` VALUES (2618,'Matyr\'s_Flea_Guard','Matyr\'s Leash',5,2,NULL,100,NULL,1,NULL,NULL,0xFFFFFFFE,7,2,136,NULL,35,NULL,0,'bonus bAgi,1;',NULL,NULL);
 REPLACE INTO `item_db` VALUES (2619,'Thimble_Of_Archer','Bow Thimble',5,10000,NULL,100,NULL,NULL,NULL,NULL,0x00080808,7,2,136,NULL,65,NULL,0,'bonus bLongAtkRate,3;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (2620,'Ring_Of_Rogue','Rogue\'s Treasure',5,10000,NULL,100,NULL,NULL,NULL,NULL,0x02021040,7,2,136,NULL,70,NULL,0,'if(readparam(bStr)>=90){ bonus bHit,10; bonus bFlee,10; } if(readparam(bAgi)>=90){ bonus bAtk,10; bonus bCritical,10; }',NULL,NULL);
+REPLACE INTO `item_db` VALUES (2620,'Ring_Of_Rogue','Rogue\'s Treasure',5,10000,NULL,100,NULL,NULL,NULL,NULL,0x02021040,7,2,136,NULL,70,NULL,0,'if(readparam(bStr)>=90){ bonus bHit,10; bonus bFlee,10; } if(readparam(bAgi)>=90){ bonus bBaseAtk,10; bonus bCritical,10; }',NULL,NULL);
 REPLACE INTO `item_db` VALUES (2621,'Ring_','Ring',5,30000,NULL,200,NULL,NULL,NULL,1,0xFFFFFFFE,7,2,136,NULL,90,NULL,0,'bonus bStr,1;',NULL,NULL);
 REPLACE INTO `item_db` VALUES (2622,'Earring_','Earring',5,30000,NULL,200,NULL,NULL,NULL,1,0xFFFFFFFE,7,2,136,NULL,90,NULL,0,'bonus bInt,1;',NULL,NULL);
 REPLACE INTO `item_db` VALUES (2623,'Necklace_','Necklace',5,30000,NULL,200,NULL,NULL,NULL,1,0xFFFFFFFE,7,2,136,NULL,90,NULL,0,'bonus bVit,1;',NULL,NULL);
@@ -1650,7 +1650,7 @@ REPLACE INTO `item_db` VALUES (2797,'Magical_Stone_','Rocks',5,NULL,NULL,200,NUL
 REPLACE INTO `item_db` VALUES (2798,'Will_Of_Exhausted_Angel','Will Of Exhausted Angel',5,NULL,NULL,200,NULL,NULL,NULL,NULL,0x00008100,7,2,136,NULL,99,NULL,0,'if(strcharinfo(3)=="job3_arch02") { bonus2 bAddDefClass,1761,50; bonus2 bAddDefClass,1762,50; }',NULL,NULL);
 REPLACE INTO `item_db` VALUES (2799,'Kuirpenring','Kuirpenring',5,NULL,NULL,100,NULL,NULL,NULL,1,0xFFFFFFFF,7,2,136,NULL,NULL,NULL,0,'bonus bMdef,1;',NULL,NULL);
 REPLACE INTO `item_db` VALUES (2819,'Swordman_Manual','Swordsman Manual',5,NULL,NULL,100,NULL,NULL,NULL,NULL,0x00000001,7,2,136,NULL,1,NULL,0,'bonus bMaxSP,100; skill "SM_BASH",1; skill "SM_PROVOKE",1; skill "SM_MAGNUM",1;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (2820,'Thief_Manual','Thief Manual',5,NULL,NULL,100,NULL,NULL,NULL,NULL,0x00000001,7,2,136,NULL,1,NULL,0,'bonus bMaxSP,100; skill "TF_DOUBLE",3; skill "TF_STEAL",1; skill "TF_HIDING",1; skill "TF_POISON",1;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (2820,'Thief_Manual','Thief Manual',5,NULL,NULL,100,NULL,NULL,NULL,NULL,0x00000001,7,2,136,NULL,1,NULL,0,'bonus bMaxSP,100; skill "TF_DOUBLE",3; skill "TF_STEAL",1; skill "TF_HIDING",1; skill "TF_POISON",1; bonus bDoubleRate,15;',NULL,NULL);
 REPLACE INTO `item_db` VALUES (2821,'Acolyte_Manual','Acolyte Manual',5,NULL,NULL,100,NULL,NULL,NULL,NULL,0x00000001,7,2,136,NULL,1,NULL,0,'bonus bMaxSP,100; skill "AL_HEAL",1; skill "AL_INCAGI",1; skill "AL_BLESSING",1;',NULL,NULL);
 REPLACE INTO `item_db` VALUES (2822,'Archer_Manual','Archer Manual',5,NULL,NULL,100,NULL,NULL,NULL,NULL,0x00000001,7,2,136,NULL,1,NULL,0,'bonus bMaxSP,100; skill "AC_OWL",1; skill "AC_CONCENTRATION",1;',NULL,NULL);
 REPLACE INTO `item_db` VALUES (2823,'Merchant_Manual','Merchant Manual',5,NULL,NULL,100,NULL,NULL,NULL,NULL,0x00000001,7,2,136,NULL,1,NULL,0,'bonus bMaxSP,100; skill "MC_DISCOUNT",1; skill "MC_OVERCHARGE",10; skill "MC_IDENTIFY",1; skill "MC_MAMMONITE",1;',NULL,NULL);
@@ -2586,7 +2586,7 @@ REPLACE INTO `item_db` VALUES (5384,'Santa_Hat_1','Twin Pompom By JB',5,20,NULL,
 REPLACE INTO `item_db` VALUES (5385,'Yoyo_Hat','Yoyo Hat',5,20,NULL,300,NULL,1,NULL,NULL,0xFFFFFFFF,7,2,256,NULL,20,1,391,'skill "TF_HIDING",1;',NULL,'sc_end SC_HIDING;');
 REPLACE INTO `item_db` VALUES (5386,'Ayam_','Ayam',5,NULL,NULL,70,NULL,7,NULL,NULL,0xFFFFFFFF,7,2,256,NULL,1,NULL,228,'bonus bMdef,7; bonus bFlee,7; bonus2 bAddMonsterDropItem,12198,200;',NULL,NULL);
 REPLACE INTO `item_db` VALUES (5387,'Neko_Mimi_Kafra','Neko Mimi Kafra',5,20,NULL,200,NULL,1,NULL,1,0xFFFFFFFF,7,2,256,NULL,30,1,392,'bonus bMdef,5;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (5388,'Snake_Head','Snake Head Hat',5,20,NULL,200,NULL,1,NULL,1,0xFFFFFFFF,7,2,256,NULL,30,1,393,'skill "TF_DOUBLE",5;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (5388,'Snake_Head','Snake Head Hat',5,20,NULL,200,NULL,1,NULL,1,0xFFFFFFFF,7,2,256,NULL,30,1,393,'skill "TF_DOUBLE",5; bonus bDoubleRate,25;',NULL,NULL);
 REPLACE INTO `item_db` VALUES (5389,'Angel_Spirit','Angel Spirit',5,20,NULL,200,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,512,NULL,30,NULL,394,'bonus bStr,2; bonus bHit,15;',NULL,NULL);
 REPLACE INTO `item_db` VALUES (5390,'Santa_Hat_2','Frozen Twin Pompom',5,20,NULL,100,NULL,2,NULL,NULL,0xFFFFFFFF,7,2,256,NULL,NULL,1,395,'bonus2 bResEff,Eff_Freeze,3000;',NULL,NULL);
 REPLACE INTO `item_db` VALUES (5391,'Toast_C','Toast',5,20,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,1,NULL,NULL,NULL,188,'bonus bMaxHP,100; bonus2 bAddMonsterDropItem,617,10;',NULL,NULL);
@@ -2768,7 +2768,7 @@ REPLACE INTO `item_db` VALUES (5566,'Tiger_Arhat_Mask','Tiger Arhat Mask',5,NULL
 REPLACE INTO `item_db` VALUES (5567,'Bright_Fury','Bright Fury',5,20,NULL,300,NULL,1,NULL,1,0xFFFFFFFF,7,2,256,NULL,1,1,548,'bonus bStr,1; bonus2 bAddRace,RC_NonBoss,2; bonus2 bAddRace,RC_Boss,2; bonus bAspdRate,2;',NULL,NULL);
 REPLACE INTO `item_db` VALUES (5568,'Rabbit_Bonnet','Rabbit Bonnet',5,20,NULL,1000,NULL,1,NULL,1,0xFFFFFFFF,7,2,768,NULL,NULL,1,549,'bonus bInt,2;',NULL,NULL);
 REPLACE INTO `item_db` VALUES (5569,'Gemini_Diadem','Gemini Diadem',5,20,NULL,300,NULL,4,NULL,NULL,0xFFFFFFFF,7,2,256,NULL,70,1,550,'bonus bAgi,2; bonus bMatkRate,2; if(getrefine()>6) { bonus bMdef,7; bonus bMAtkRate,8; bonus2 bSubEle,Ele_Wind,5; }',NULL,NULL);
-REPLACE INTO `item_db` VALUES (5570,'Gemini_Crown','Gemini Crown',5,20,NULL,300,NULL,4,NULL,NULL,0xFFFFFFFF,7,2,256,NULL,70,1,551,'bonus bAgi,2; bonus bAtk,2; bonus bMdef,5; if(getrefine()>6) { bonus bDef,1; bonus bMatk,15; bonus bFlee,10; bonus2 bSubEle,Ele_Wind,5; }',NULL,NULL);
+REPLACE INTO `item_db` VALUES (5570,'Gemini_Crown','Gemini Crown',5,20,NULL,300,NULL,4,NULL,NULL,0xFFFFFFFF,7,2,256,NULL,70,1,551,'bonus bAgi,2; bonus bBaseAtk,2; bonus bMdef,5; if(getrefine()>6) { bonus bDef,1; bonus bMatk,15; bonus bFlee,10; bonus2 bSubEle,Ele_Wind,5; }',NULL,NULL);
 # REPLACE INTO `item_db` VALUES (5571,'Rasta_Wig','Rasta_Wig',5,20,NULL,100,NULL,1,NULL,NULL,0xFFFFFFFF,7,2,256,NULL,NULL,1,552,'bonus bStr,1;',NULL,NULL);
 REPLACE INTO `item_db` VALUES (5572,'Savage_Baby_Hat','Savage Babe Hat',5,20,NULL,100,NULL,1,NULL,1,0xFFFFFFFF,7,2,256,NULL,1,1,553,'bonus bVit,2;',NULL,NULL);
 REPLACE INTO `item_db` VALUES (5573,'Bogy_Horn','Dokebi Horn',5,20,NULL,100,NULL,1,NULL,1,0xFFFFFFFF,7,2,256,NULL,NULL,1,554,NULL,NULL,NULL);
@@ -2780,7 +2780,7 @@ REPLACE INTO `item_db` VALUES (5578,'Voyage_Hat','Voyage_Hat',5,200,NULL,10,NULL
 REPLACE INTO `item_db` VALUES (5579,'Wanderer\'s_Sakkat','Wanderer\'s Sakkat',5,20,NULL,300,NULL,2,NULL,1,0xFFFFFFFF,7,2,768,NULL,70,1,558,'bonus bAgi,2;',NULL,NULL);
 # REPLACE INTO `item_db` VALUES (5580,'Red_Beret','Red Beret',5,20,NULL,100,NULL,1,NULL,NULL,0xFFFFFFFF,7,2,256,NULL,NULL,NULL,559,'bonus bAllStats,3; bonus bMdef,3;',NULL,NULL);
 REPLACE INTO `item_db` VALUES (5581,'Cancer_Diadem','Cancer Diadem',5,20,NULL,300,NULL,3,NULL,NULL,0xFFFFFFFF,7,2,256,NULL,70,1,560,'bonus bInt,2; bonus2 bSubEle,Ele_water,5; if(getrefine()>6) { bonus bMdef,1; bonus bHealPower,3; bonus bMatkRate,2; }',NULL,NULL);
-REPLACE INTO `item_db` VALUES (5582,'Cancer_Crown','Cancer Crown',5,20,NULL,300,NULL,3,NULL,NULL,0xFFFFFFFF,7,2,256,NULL,70,1,561,'bonus bStr,2; bonus2 bSubEle,Ele_water,5; if(getrefine()>6) { bonus bDef,1; bonus bAtk,15; bonus bFlee,10; }',NULL,NULL);
+REPLACE INTO `item_db` VALUES (5582,'Cancer_Crown','Cancer Crown',5,20,NULL,300,NULL,3,NULL,NULL,0xFFFFFFFF,7,2,256,NULL,70,1,561,'bonus bStr,2; bonus2 bSubEle,Ele_water,5; if(getrefine()>6) { bonus bDef,1; bonus bBaseAtk,15; bonus bFlee,10; }',NULL,NULL);
 REPLACE INTO `item_db` VALUES (5583,'Para_Team_Hat','Eden Team Hat',5,NULL,NULL,0,NULL,1,NULL,NULL,0xFFFFFFFF,7,2,256,NULL,12,1,465,NULL,NULL,NULL);
 REPLACE INTO `item_db` VALUES (5584,'Majestic_Evil_Horn','Majestic Evil Horns',5,NULL,NULL,400,NULL,1,NULL,NULL,0xFFFFFFFF,7,2,256,NULL,1,1,562,'bonus2 bSubRace,RC_Demon,3; bonus2 bHPDrainRate,3,15; bonus2 bSPDrainRate,1,7;',NULL,NULL);
 REPLACE INTO `item_db` VALUES (5585,'Rune_Hairband','Rune Cloth Circlet',5,20,NULL,400,NULL,1,NULL,1,0xFFFFFFFF,7,2,768,NULL,1,1,564,NULL,NULL,NULL);
@@ -2944,21 +2944,21 @@ REPLACE INTO `item_db` VALUES (5742,'Rudolf_Santa_Hat','Rudolph Santa Hat',5,20,
 REPLACE INTO `item_db` VALUES (5743,'Orange_Stem_Hat','Orange Stem Hat',5,20,NULL,100,NULL,NULL,NULL,NULL,0x00000000,7,2,256,NULL,1,NULL,620,'bonus bLuk,3;',NULL,NULL);
 # REPLACE INTO `item_db` VALUES (5744,'Capricon_Crown','Capricon Crown',5,20,NULL,300,NULL,3,NULL,1,0xFFFFFFFF,7,2,256,NULL,1,1,621,'bonus bVit,2; bonus bDex,2;',NULL,NULL);
 # REPLACE INTO `item_db` VALUES (5745,'Capricon_Diadem','Capricon Diadem',5,20,NULL,300,NULL,3,NULL,NULL,0xFFFFFFFF,7,2,256,NULL,1,1,622,'bonus bDex,2; bonus bMdef,5;',NULL,NULL);
-# REPLACE INTO `item_db` VALUES (5746,'Rune_Circlet','Rune Circlet',5,20,NULL,100,NULL,12,NULL,1,0x00000080,8,2,256,NULL,100,1,623,'bonus bStr,1; bonus bInt,1; bonus bMdef,5; if(readparam(bStr)>=120){ bonus bAtk,10; bonus bMatk,5; }',NULL,NULL);
+# REPLACE INTO `item_db` VALUES (5746,'Rune_Circlet','Rune Circlet',5,20,NULL,100,NULL,12,NULL,1,0x00000080,8,2,256,NULL,100,1,623,'bonus bStr,1; bonus bInt,1; bonus bMdef,5; if(readparam(bStr)>=120){ bonus bBaseAtk,10; bonus bMatk,5; }',NULL,NULL);
 # REPLACE INTO `item_db` VALUES (5747,'Mitra','Mitra',5,20,NULL,100,NULL,12,NULL,1,0x00000100,8,2,256,NULL,100,1,624,'bonus bVit,1; bonus bInt,1; bonus bMdef,5; bonus bHealPower,5; if(readparam(bInt)>=120){ bonus bMatk,10; }',NULL,NULL);
 # REPLACE INTO `item_db` VALUES (5748,'Sniper_Goggles','Sniper Goggles',5,20,NULL,100,NULL,12,NULL,1,0x00000800,8,2,768,NULL,100,1,625,'bonus bAgi,1; bonus bDex,1; bonus bMdef,5; if(readparam(bAgi)>=120){ bonus bLongAtkRate,4; bonus bAspd,1; }',NULL,NULL);
-# REPLACE INTO `item_db` VALUES (5749,'Driver_Band_M','Driver Band',5,20,NULL,100,NULL,12,NULL,1,0x00000400,8,1,256,NULL,100,1,626,'bonus bStr,1; bonus bDex,1; bonus bMdef,5; if(readparam(bStr)>=120){ bonus bAtk,10; bonus bCritical,3; }',NULL,NULL);
-# REPLACE INTO `item_db` VALUES (5750,'Shadow_Crown','Shadow Crown',5,20,NULL,100,NULL,12,NULL,1,0x00020000,8,2,256,NULL,100,1,627,'bonus bAgi,1; bonus bInt,1; bonus bMdef,1; if(readparam(bAgi)>=120){ bonus bAtk,10; bonus bFlee,3; }',NULL,NULL);
+# REPLACE INTO `item_db` VALUES (5749,'Driver_Band_M','Driver Band',5,20,NULL,100,NULL,12,NULL,1,0x00000400,8,1,256,NULL,100,1,626,'bonus bStr,1; bonus bDex,1; bonus bMdef,5; if(readparam(bStr)>=120){ bonus bBaseAtk,10; bonus bCritical,3; }',NULL,NULL);
+# REPLACE INTO `item_db` VALUES (5750,'Shadow_Crown','Shadow Crown',5,20,NULL,100,NULL,12,NULL,1,0x00020000,8,2,256,NULL,100,1,627,'bonus bAgi,1; bonus bInt,1; bonus bMdef,1; if(readparam(bAgi)>=120){ bonus bBaseAtk,10; bonus bFlee,3; }',NULL,NULL);
 # REPLACE INTO `item_db` VALUES (5751,'Minstrel_Song_Hat','Minstrel Song Hat',5,20,NULL,100,NULL,12,NULL,1,0x00080000,8,1,256,NULL,100,1,628,'bonus bInt,1; bonus bLuk,1; bonus bMdef,5; bonus bLongAtkRate,4; bonus bUseSPrate,-10;',NULL,NULL);
-# REPLACE INTO `item_db` VALUES (5752,'Midas_Whispers','Midas Whispers',5,20,NULL,100,NULL,12,NULL,1,0x00040000,8,2,256,NULL,100,1,629,'bonus bStr,1; bonus bDex,1; bonus bMdef,5; if(readparam(bStr)>=120){ bonus bAtk,5; bonus bAspd,1; }',NULL,NULL);
+# REPLACE INTO `item_db` VALUES (5752,'Midas_Whispers','Midas Whispers',5,20,NULL,100,NULL,12,NULL,1,0x00040000,8,2,256,NULL,100,1,629,'bonus bStr,1; bonus bDex,1; bonus bMdef,5; if(readparam(bStr)>=120){ bonus bBaseAtk,5; bonus bAspd,1; }',NULL,NULL);
 # REPLACE INTO `item_db` VALUES (5753,'Magic_Stone_Hat','Magic Stone Hat',5,20,NULL,100,NULL,12,NULL,1,0x00000200,8,2,256,NULL,100,1,630,'bonus bInt,1; bonus bDex,1; bonus bMdef,5; if(readparam(bDex)>=120){ bonus bMatkRate,10; bonus bCastrate,-2; }',NULL,NULL);
-# REPLACE INTO `item_db` VALUES (5754,'Burning_Spirit','Burning Spirit',5,20,NULL,100,NULL,12,NULL,1,0x00008000,8,2,256,NULL,100,1,631,'bonus bStr,1; bonus bVit,1; bonus bMdef,5; if(readparam(bStr)>=120){ bonus bAtk,10; bonus bHit,3; }',NULL,NULL);
-# REPLACE INTO `item_db` VALUES (5755,'Silent_Enforcer','Silent Enforcer',5,20,NULL,100,NULL,12,NULL,NULL,0x00001000,8,2,513,NULL,100,1,632,'bonus bAgi,1; bonus bMdef,5; if(readparam(bAgi)>=120){ bonus bAtk,10; bonus bFlee2,5; }',NULL,NULL);
+# REPLACE INTO `item_db` VALUES (5754,'Burning_Spirit','Burning Spirit',5,20,NULL,100,NULL,12,NULL,1,0x00008000,8,2,256,NULL,100,1,631,'bonus bStr,1; bonus bVit,1; bonus bMdef,5; if(readparam(bStr)>=120){ bonus bBaseAtk,10; bonus bHit,3; }',NULL,NULL);
+# REPLACE INTO `item_db` VALUES (5755,'Silent_Enforcer','Silent Enforcer',5,20,NULL,100,NULL,12,NULL,NULL,0x00001000,8,2,513,NULL,100,1,632,'bonus bAgi,1; bonus bMdef,5; if(readparam(bAgi)>=120){ bonus bBaseAtk,10; bonus bFlee2,5; }',NULL,NULL);
 # REPLACE INTO `item_db` VALUES (5756,'Wispers_of_Wind','Wispers of Wind',5,20,NULL,100,NULL,12,NULL,1,0x00010000,8,2,256,NULL,100,1,633,'bonus bInt,1; bonus bDex,1; bonus bMdef,5; if(readparam(bInt)>=120){ bonus bMatkRate,10; bonus bFlee,3; }',NULL,NULL);
 # REPLACE INTO `item_db` VALUES (5757,'Reissue_Schmitz_Helm','Reissue Schmitz Helm',5,20,NULL,100,NULL,12,NULL,1,0x00004000,8,2,768,NULL,100,1,634,'bonus bVit,2; bonus bInt,1; bonus bMdef,5; if(readparam(bInt)>=120){ bonus bMatkRate,10; bonus bDef,5; }',NULL,NULL);
 # REPLACE INTO `item_db` VALUES (5758,'Resting_Swan','Resting Swan',5,20,NULL,100,NULL,17,NULL,1,0x00080000,8,NULL,256,NULL,100,1,635,'bonus bInt,1; bonus bLuk,1; bonus bMdef,5; bonus bAtkRate,5; bonus bUseSPrate,-10;',NULL,NULL);
 # REPLACE INTO `item_db` VALUES (5759,'Noah_Hat','Noah Hat',5,20,NULL,500,NULL,1,NULL,1,0xFFFFFFFF,7,2,256,NULL,1,1,636,'bonus bMdef,3;',NULL,NULL);
-# REPLACE INTO `item_db` VALUES (5760,'Driver_Band_F','Driver Band',5,20,NULL,100,NULL,12,NULL,1,0x00000400,8,NULL,256,NULL,100,1,637,'bonus bStr,1; bonus bDex,1; bonus bMdef,5; if(readparam(bStr)>=120){ bonus bAtk,10; bonus bCritical,3; }',NULL,NULL);
+# REPLACE INTO `item_db` VALUES (5760,'Driver_Band_F','Driver Band',5,20,NULL,100,NULL,12,NULL,1,0x00000400,8,NULL,256,NULL,100,1,637,'bonus bStr,1; bonus bDex,1; bonus bMdef,5; if(readparam(bStr)>=120){ bonus bBaseAtk,10; bonus bCritical,3; }',NULL,NULL);
 # REPLACE INTO `item_db` VALUES (5761,'Sloth_Hat','Sloth Hat',5,20,NULL,800,NULL,3,NULL,1,0xFFFFFFFF,7,2,256,NULL,1,1,638,'bonus bAgi,2;',NULL,NULL);
 # REPLACE INTO `item_db` VALUES (5762,'Duneyrr_Helm','Duneyrr Helm',5,20,NULL,100,NULL,5,NULL,NULL,0xFFFFFFFF,7,2,256,NULL,1,1,639,'bonus bAllStats,1; bonus bMdef,5;',NULL,NULL);
 REPLACE INTO `item_db` VALUES (5763,'Red_Bunny_Band','Red Bunny Band',5,NULL,NULL,200,NULL,4,NULL,NULL,0xFFFFFFFF,7,2,256,NULL,1,1,640,'bonus bAgi,2; bonus bMdef,3;',NULL,NULL);
@@ -6563,7 +6563,7 @@ REPLACE INTO `item_db` VALUES (18507,'Elven_Ears_','Elven Ears',5,20,NULL,100,NU
 #
 REPLACE INTO `item_db` VALUES (18539,'Skull_Cap','Skull Cap',5,40,NULL,200,NULL,5,NULL,1,0xFFFFFFFF,7,2,256,NULL,10,1,713,'bonus bMatkRate,2; if(getrefine() >= 5) { bonus bMatkRate,3; } if(getrefine() >= 7) { bonus bMatkRate,3; }',NULL,NULL);
 #
-REPLACE INTO `item_db` VALUES (18595,'Horn_Of_Ancient','Horn of Ancient',5,40,NULL,200,NULL,8,NULL,1,0xFFFFFFFF,7,2,256,NULL,50,1,757,'autobonus "{bonus bAtk,100;}",5,10000,0,"{specialeffect2 EF_POTION_BERSERK;}";',NULL,NULL);
+REPLACE INTO `item_db` VALUES (18595,'Horn_Of_Ancient','Horn of Ancient',5,40,NULL,200,NULL,8,NULL,1,0xFFFFFFFF,7,2,256,NULL,50,1,757,'autobonus "{bonus bBaseAtk,100;}",5,10000,0,"{specialeffect2 EF_POTION_BERSERK;}";',NULL,NULL);
 REPLACE INTO `item_db` VALUES (18596,'Sprout_Hat','Sprout Hat',5,20,NULL,200,NULL,4,NULL,NULL,0xFFFFFFFF,7,2,256,NULL,70,1,758,'skill "WZ_HEAVENDRIVE",3;',NULL,NULL);
 REPLACE INTO `item_db` VALUES (18597,'Mercury_Riser','Mercury Riser',5,40,NULL,200,NULL,10,NULL,1,0xFFFFFFFF,7,2,256,NULL,NULL,NULL,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; }',NULL,NULL);
 #

+ 156 - 47
sql-files/item_db_re.sql

@@ -571,12 +571,12 @@ REPLACE INTO `item_db_re` VALUES (1180,'Dragon_Slayer_','Dragon Slayer',4,20,NUL
 REPLACE INTO `item_db_re` VALUES (1181,'Tae_Goo_Lyeon','Tae Goo Lyeon',4,20,NULL,2000,'250',NULL,1,2,0x00004082,2,2,34,4,'90',1,3,'bonus bFlee2,10; if(JobLevel>=70) autobonus "{bonus bBaseAtk,50;}",10,10000,BF_WEAPON,"{specialeffect2 EF_POTION_BERSERK;}"; if(getrefine()>8) { bonus bVariableCastrate,-20; bonus bDelayRate,-20; }',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (1182,'Bloody_Eater','Bloody Eater',4,20,NULL,1200,'200',NULL,1,2,0x00004082,7,2,34,4,'50',1,3,'bonus bAtkEle,Ele_Ghost; autobonus "{bonus bCritical,100; bonus bBaseAtk,50;}",1,5000,0,"{specialeffect2 EF_FIRESPLASHHIT;}"; bonus bHPGainValue,100;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (1183,'BF_Two_Handed_Sword1','Brave Assaulter\'s Katzbalger',4,20,NULL,0,'200',NULL,1,NULL,0x00004082,7,2,34,3,'80',1,3,'bonus bStr,2; bonus2 bAddRace,RC_DemiHuman,55; bonus2 bIgnoreDefRate,RC_DemiHuman,20; bonus bUnbreakableWeapon,0;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (1184,'BF_Two_Handed_Sword2','Valorous Assaulter\'s Katzbalger',4,20,NULL,0,'200',NULL,1,NULL,0x00004082,7,2,34,3,'80',1,3,'bonus2 bAddRace,RC_DemiHuman,55; bonus bCritAtkRate,20;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (1184,'BF_Two_Handed_Sword2','Valorous Assaulter\'s Katzbalger',4,20,NULL,0,'200',NULL,1,NULL,0x00004082,7,2,34,3,'80',1,3,'bonus2 bAddRace,RC_DemiHuman,55; bonus bCritAtkRate,20; bonus bUnbreakableWeapon,0;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (1185,'Violet_Fear','Violet Fear',4,20,NULL,2200,'275',NULL,1,2,0x00004082,2,2,34,4,'80',1,3,'bonus3 bAutoSpell,"WZ_METEOR",3,30; bonus3 bAutoSpell,"WZ_FROSTNOVA",5,50; autobonus "{bonus bIgnoreDefRace,RC_NonBoss;}",50,5000;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (1186,'Death_Guidance','Death Guidance',4,20,NULL,2000,'200',NULL,1,2,0x00004082,2,2,34,4,'70',1,3,'bonus bStr,5; bonus bAgi,2; bonus bFlee2,20; bonus3 bAutoSpell,"NPC_HELLPOWER",1,10; bonus4 bAutoSpell,"NPC_HELLPOWER",1,10,0; if( getrefine()>8 ) bonus3 bAutoSpell,"NPC_VAMPIRE_GIFT",2,20; else bonus3 bAutoSpell,"NPC_VAMPIRE_GIFT",1,20;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (1187,'Krieger_Twohand_Sword1','Glorious Claymore',4,20,NULL,0,'220',NULL,1,NULL,0x00004082,7,2,34,4,'80',1,3,'bonus2 bAddRace,RC_DemiHuman,70; bonus2 bIgnoreDefRate,RC_DemiHuman,25; bonus bUnbreakableWeapon,0; if(getrefine()>5) { bonus2 bAddRace,RC_DemiHuman,pow(((getrefine()>14)?14:getrefine())-3,1); bonus2 bIgnoreDefRate,RC_DemiHuman,5; } if(getrefine()>8) { bonus3 bAutoSpell,"LK_CONCENTRATION",getskilllv("LK_CONCENTRATION")>1?getskilllv("LK_CONCENTRATION"):1,30; bonus3 bAutoSpell,"LK_AURABLADE",getskilllv("LK_AURABLADE")>1?getskilllv("LK_AURABLADE"):1,30; }',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (1188,'Veteran_Sword','Veteran Sword',4,10000,NULL,2000,'180',NULL,1,1,0x00004082,7,2,34,4,'80',1,3,'if(getskilllv("SM_BASH")==10) { bonus2 bSkillAtk,"SM_BASH",50; } if(getskilllv("KN_BOWLINGBASH")==10) { bonus2 bSkillAtk,"KN_BOWLINGBASH",50; } bonus bStr,1; bonus bDex,1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (1189,'Krasnaya','Krasnaya',4,20,NULL,3800,'200',NULL,2,3,0x00004082,2,2,34,2,'50',1,3,'if(readparam(bStr)>=95) { bonus bAtk,20; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (1189,'Krasnaya','Krasnaya',4,20,NULL,3800,'200',NULL,2,3,0x00004082,2,2,34,2,'50',1,3,'if(readparam(bStr)>=95) { bonus bBaseAtk,20; }',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (1190,'Claymore_C','Claymore',4,NULL,NULL,0,'220',NULL,1,NULL,0x00004080,7,2,34,3,'1',NULL,3,'bonus2 bAddSize,Size_Small,40; bonus2 bAddSize,Size_Medium,40; bonus2 bAddSize,Size_Large,40;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (1191,'Alca_Bringer','Alca Bringer',4,20,NULL,3400,'280',NULL,2,NULL,0x00004082,7,2,34,3,'100',1,3,'bonus bAspd,(getrefine()/2);',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (1192,'P_Slayer1','Eden Slayer I',4,NULL,NULL,0,'162',NULL,1,NULL,0x00004082,7,2,34,2,'26',NULL,3,NULL,NULL,NULL);
@@ -693,7 +693,7 @@ REPLACE INTO `item_db_re` VALUES (1307,'Windhawk','Windhawk',4,18000,NULL,1500,'
 REPLACE INTO `item_db_re` VALUES (1308,'Golden_Axe','Golden Axe',4,20,NULL,3000,'170',NULL,1,NULL,0x00000001,7,2,2,4,'45',1,6,NULL,NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (1309,'Orcish_Axe_','Orcish Axe',4,20,NULL,1500,'75',NULL,1,4,0x000654E3,7,2,2,3,'3',1,6,NULL,NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (1310,'Krieger_Onehand_Axe1','Glorious Cleaver',4,20,NULL,0,'130',NULL,1,NULL,0x000444A2,7,2,2,4,'80',1,6,'bonus2 bAddRace,RC_DemiHuman,75; bonus2 bIgnoreDefRate,RC_DemiHuman,20; bonus bUnbreakableWeapon,0; if(getrefine()>5) { bonus2 bAddRace,RC_DemiHuman,pow(((getrefine()>14)?14:getrefine())-4,2); bonus2 bIgnoreDefRate,RC_DemiHuman,5; bonus bAspdRate,5; } if(getrefine()>8) { bonus bAspdRate,5; bonus3 bAutoSpell,"NPC_CRITICALWOUND",1,50; bonus4 bAutoSpellOnSkill,"MC_MAMMONITE","NPC_CRITICALWOUND",2,200; }',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (1311,'Vecer_Axe','Vecer Axe',4,20,NULL,1500,'140',NULL,1,2,0x000444A2,2,2,2,3,'50',1,6,'if(readparam(bLuk)>=90) { bonus bAtk,20; } if(readparam(bDex)>=90) { bonus bCritical,5; } if(readparam(bDex)>=90||readparam(bLuk)>=90) { bonus2 bSkillAtk,"MC_MAMMONITE",15; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (1311,'Vecer_Axe','Vecer Axe',4,20,NULL,1500,'140',NULL,1,2,0x000444A2,2,2,2,3,'50',1,6,'if(readparam(bLuk)>=90) { bonus bBaseAtk,20; } if(readparam(bDex)>=90) { bonus bCritical,5; } if(readparam(bDex)>=90||readparam(bLuk)>=90) { bonus2 bSkillAtk,"MC_MAMMONITE",15; }',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (1312,'Orcish_Axe_C','Orcish Axe',4,NULL,NULL,0,'110',NULL,1,NULL,0x000654E3,7,2,2,3,'1',NULL,6,'bonus2 bAddSize,Size_Small,70; bonus2 bAddSize,Size_Medium,70; bonus2 bAddSize,Size_Large,70;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (1313,'Tourist_Axe','Tourist Axe',4,NULL,NULL,500,'77',NULL,1,NULL,0x000654E3,7,2,2,1,'1',NULL,6,'bonus bStr,2;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (1314,'F_Tomahawk_C','Tomahawk',4,2,NULL,0,'200',NULL,1,NULL,0x000444A2,7,2,34,4,NULL,NULL,7,'bonus bAtkEle,Ele_Wind;',NULL,NULL);
@@ -732,7 +732,7 @@ REPLACE INTO `item_db_re` VALUES (1380,'BF_Two_Handed_Axe2','Brave Insane Battle
 REPLACE INTO `item_db_re` VALUES (1381,'N_Battle_Axe','Novice Battle Axe',4,NULL,NULL,0,'100',NULL,1,3,0x000444A2,7,2,34,1,'3',NULL,7,NULL,NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (1382,'Krieger_Twohand_Axe1','Glorious Two-Handed Axe',4,20,NULL,0,'220',NULL,1,NULL,0x000444A2,7,2,34,4,'80',1,7,'bonus2 bAddRace,RC_DemiHuman,70; bonus2 bIgnoreDefRate,RC_DemiHuman,25; bonus bUnbreakableWeapon,0; if(getrefine()>5) { bonus2 bAddRace,RC_DemiHuman,pow(((getrefine()>14)?14:getrefine())-3,2); bonus2 bIgnoreDefRate,RC_DemiHuman,5; bonus3 bAutoSpell,"NPC_CRITICALWOUND",1,50; } if(getrefine()>8) { bonus3 bAutoSpell,"NPC_CRITICALWOUND",1,100; bonus4 bAutoSpellOnSkill,"MC_MAMMONITE","NPC_CRITICALWOUND",2,200; bonus4 bAutoSpellOnSkill,"WS_CARTTERMINATION","NPC_CRITICALWOUND",2,200; }',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (1383,'Holy_Celestial_Axe','Celestial Axe',4,20,NULL,1500,'200',NULL,1,NULL,0x000444A2,7,2,34,4,'60',1,7,'bonus bAtkEle,Ele_Holy; bonus bVit,10; bonus2 bAddRace,RC_Undead,10; bonus3 bAutoSpell,"AL_BLESSING",5,50;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (1384,'Veteran_Axe','Veteran Axe',4,10000,NULL,3000,'250',NULL,1,2,0x000444A2,7,2,34,3,'80',1,7,'if(getskilllv("BS_DAGGER")==3) { bonus bAtk,10; } if(getskilllv("BS_SWORD")==3) { bonus bAtk,10; } if(getskilllv("BS_TWOHANDSWORD")==3) { bonus bAtk,10; } if(getskilllv("BS_KNUCKLE")==3) { bonus bAtk,10; } if(getskilllv("BS_SPEAR")==3) { bonus bAtk,10; } if(getskilllv("BS_AXE")==3) { bonus bAtk,10; } if(getskilllv("BS_MACE")==3) { bonus bAtk,10; } bonus bVit,2;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (1384,'Veteran_Axe','Veteran Axe',4,10000,NULL,3000,'250',NULL,1,2,0x000444A2,7,2,34,3,'80',1,7,'if(getskilllv("BS_DAGGER")==3) { bonus bBaseAtk,10; } if(getskilllv("BS_SWORD")==3) { bonus bBaseAtk,10; } if(getskilllv("BS_TWOHANDSWORD")==3) { bonus bBaseAtk,10; } if(getskilllv("BS_KNUCKLE")==3) { bonus bBaseAtk,10; } if(getskilllv("BS_SPEAR")==3) { bonus bBaseAtk,10; } if(getskilllv("BS_AXE")==3) { bonus bBaseAtk,10; } if(getskilllv("BS_MACE")==3) { bonus bBaseAtk,10; } bonus bVit,2;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (1385,'Bradium_Stonehammer','Bradium Stone Hammer',4,20,NULL,2700,'210',NULL,1,NULL,0x000444A2,2,2,34,4,'75',1,7,'bonus3 bAddEffOnSkill,"BS_HAMMERFALL",Eff_Stun,500+(200*getrefine());',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (1386,'Doom_Slayer_I','Doom Slayer',4,NULL,NULL,0,'20',NULL,1,NULL,0x000444A2,7,2,34,4,NULL,NULL,7,'if(readparam(bStr)>=95){ bonus bBaseAtk,400; bonus2 bAddEff,Eff_Stun,3000; bonus bAspdRate,-25; bonus bUseSPrate,100; bonus bBreakArmorRate,500; }',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (1387,'Giant_Axe','Giant Axe',4,20,NULL,4000,'330',NULL,1,1,0x000444A2,2,2,34,3,'50',1,7,'bonus2 bSkillAtk,"WS_CARTTERMINATION",15; if(readparam(bStr)>=95) { bonus bHit,10; bonus bAspdRate,3; }',NULL,NULL);
@@ -1664,7 +1664,7 @@ REPLACE INTO `item_db_re` VALUES (2616,'Critical_Ring','Critical Ring',5,75000,N
 REPLACE INTO `item_db_re` VALUES (2617,'Mitten_Of_Presbyter','Celebrant\'s Mitten',5,2,NULL,100,NULL,1,NULL,NULL,0xFFFFFFFE,7,2,136,NULL,'35',NULL,0,'bonus bInt,1;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (2618,'Matyr\'s_Flea_Guard','Matyr\'s Leash',5,2,NULL,100,NULL,1,NULL,NULL,0xFFFFFFFE,7,2,136,NULL,'35',NULL,0,'bonus bAgi,1;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (2619,'Thimble_Of_Archer','Bow Thimble',5,10000,NULL,100,NULL,NULL,NULL,NULL,0x00080808,7,2,136,NULL,'65',NULL,0,'bonus bLongAtkRate,3;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (2620,'Ring_Of_Rogue','Rogue\'s Treasure',5,10000,NULL,100,NULL,NULL,NULL,NULL,0x02021040,7,2,136,NULL,'70',NULL,0,'if(readparam(bStr)>=90){ bonus bHit,10; bonus bFlee,10; } if(readparam(bAgi)>=90){ bonus bAtk,10; bonus bCritical,10; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (2620,'Ring_Of_Rogue','Rogue\'s Treasure',5,10000,NULL,100,NULL,NULL,NULL,NULL,0x02021040,7,2,136,NULL,'70',NULL,0,'if(readparam(bStr)>=90){ bonus bHit,10; bonus bFlee,10; } if(readparam(bAgi)>=90){ bonus bBaseAtk,10; bonus bCritical,10; }',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (2621,'Ring_','Ring',5,30000,NULL,200,NULL,NULL,NULL,1,0xFFFFFFFE,7,2,136,NULL,'90',NULL,0,'bonus bStr,1;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (2622,'Earring_','Earring',5,30000,NULL,200,NULL,NULL,NULL,1,0xFFFFFFFE,7,2,136,NULL,'90',NULL,0,'bonus bInt,1;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (2623,'Necklace_','Necklace',5,30000,NULL,200,NULL,NULL,NULL,1,0xFFFFFFFE,7,2,136,NULL,'90',NULL,0,'bonus bVit,1;',NULL,NULL);
@@ -1833,7 +1833,7 @@ REPLACE INTO `item_db_re` VALUES (2785,'Orleans_Glove_M','Orlean\'s Gloves',5,20
 REPLACE INTO `item_db_re` VALUES (2786,'Spiritual_Ring_M','Spiritual Ring',5,20,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,136,NULL,NULL,NULL,0,'bonus bInt,2; bonus bDex,1;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (2787,'Waterdrop_Brooch','Waterdrop Brooch',5,20,NULL,200,NULL,NULL,NULL,1,0xFFFFFFFF,2,2,136,NULL,NULL,NULL,0,'bonus bMdef,2; bonus bMaxHPrate,1; bonus2 bSubEle,Ele_Water,5;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (2788,'Bradium_Earing','Bradium Earring',5,20,NULL,200,NULL,NULL,NULL,1,0xFFFFFFFF,2,2,136,NULL,NULL,NULL,0,'bonus bInt,1; bonus bDex,1; bonus bMatk,5;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (2789,'Bradium_Ring','Bradium Ring',5,20,NULL,200,NULL,NULL,NULL,1,0xFFFFFFFF,2,2,136,NULL,NULL,NULL,0,'bonus bStr,1; bonus bVit,1; bonus bAtk,5;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (2789,'Bradium_Ring','Bradium Ring',5,20,NULL,200,NULL,NULL,NULL,1,0xFFFFFFFF,2,2,136,NULL,NULL,NULL,0,'bonus bStr,1; bonus bVit,1; bonus bBaseAtk,5;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (2790,'Bradium_Brooch','Bradium Brooch',5,20,NULL,200,NULL,NULL,NULL,1,0xFFFFFFFF,2,2,136,NULL,NULL,NULL,0,'bonus bAgi,1; bonus bFlee,4; if(readparam(bAgi)==120) bonus bCritical,4;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (2791,'Just_Got_Fish','Fresh Fish',5,20,NULL,500,NULL,NULL,NULL,1,0xFFFFFFFF,7,2,136,NULL,'1',NULL,0,'bonus bHit,3;',NULL,NULL);
 # REPLACE INTO `item_db_re` VALUES (2792,'Ring_Of_Flame_Lord_I','Ring of Flame Lord',5,NULL,NULL,0,NULL,NULL,NULL,NULL,0x00CFFF80,2,2,136,NULL,NULL,NULL,0,'bonus bStr,2; bonus bVit,1; bonus bBaseAtk,15; bonus2 bSubEle,Ele_Fire,10; bonus3 bAutoSpell,"CH_SOULCOLLECT",1,30; bonus3 bAutoSpell,"MO_EXPLOSIONSPIRITS",1,10; bonus3 bAutoSpell,"PA_PRESSURE",2,30; bonus3 bAutoSpell,"MG_FIREBALL",1,150; bonus3 bAutoSpell,"KN_BOWLINGBASH",5,20;',NULL,NULL);
@@ -1864,7 +1864,7 @@ REPLACE INTO `item_db_re` VALUES (2816,'Radar_Ring1','Radar Ring',5,NULL,NULL,0,
 REPLACE INTO `item_db_re` VALUES (2817,'Radar_Ring2','Radar Ring',5,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,136,NULL,NULL,NULL,0,NULL,NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (2818,'Radar_Ring3','Radar Ring',5,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,136,NULL,NULL,NULL,0,NULL,NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (2819,'Swordman_Manual','Swordsman Manual',5,NULL,NULL,100,NULL,NULL,NULL,NULL,0x00000001,7,2,136,NULL,'1',NULL,0,'bonus bMaxSP,100; skill "SM_BASH",1; skill "SM_PROVOKE",1; skill "SM_MAGNUM",1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (2820,'Thief_Manual','Thief Manual',5,NULL,NULL,100,NULL,NULL,NULL,NULL,0x00000001,7,2,136,NULL,'1',NULL,0,'bonus bMaxSP,100; skill "TF_DOUBLE",3; skill "TF_STEAL",1; skill "TF_HIDING",1; skill "TF_POISON",1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (2820,'Thief_Manual','Thief Manual',5,NULL,NULL,100,NULL,NULL,NULL,NULL,0x00000001,7,2,136,NULL,'1',NULL,0,'bonus bMaxSP,100; skill "TF_DOUBLE",3; bonus bDoubleRate,15; skill "TF_STEAL",1; skill "TF_HIDING",1; skill "TF_POISON",1;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (2821,'Acolyte_Manual','Acolyte Manual',5,NULL,NULL,100,NULL,NULL,NULL,NULL,0x00000001,7,2,136,NULL,'1',NULL,0,'bonus bMaxSP,100; skill "AL_HEAL",1; skill "AL_INCAGI",1; skill "AL_BLESSING",1;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (2822,'Archer_Manual','Archer Manual',5,NULL,NULL,100,NULL,NULL,NULL,NULL,0x00000001,7,2,136,NULL,'1',NULL,0,'bonus bMaxSP,100; skill "AC_OWL",1; skill "AC_CONCENTRATION",1;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (2823,'Merchant_Manual','Merchant Manual',5,NULL,NULL,100,NULL,NULL,NULL,NULL,0x00000001,7,2,136,NULL,'1',NULL,0,'bonus bMaxSP,100; skill "MC_DISCOUNT",1; skill "MC_OVERCHARGE",10; skill "MC_IDENTIFY",1; skill "MC_MAMMONITE",1;',NULL,NULL);
@@ -2388,7 +2388,7 @@ REPLACE INTO `item_db_re` VALUES (4449,'Dark_Shadow_Card','Dark Shadow Card',6,2
 REPLACE INTO `item_db_re` VALUES (4450,'Banshee_Master_Card','Banshee Master Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bInt,1; bonus bMatk,10;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (4451,'Entweihen_Card','Entweihen Crothen Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bMatk,100;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (4452,'Centipede_Larva_Card','Centipede Larva Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,'bonus bInt,1; bonus bMatk,3;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (4453,'Hilsrion_Card','Hillsrion Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,'bonus bAtk,25;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (4453,'Hilsrion_Card','Hillsrion Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,'bonus bBaseAtk,25;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (4454,'Light_Up_Card1','Light Up Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (4455,'Light_Up_Card2','Light Up Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (4456,'Nidhoggur_Shadow_Card','Nidhoggur Shadow Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bInt,5; if (Class == Job_High_Wizard || Class == Job_Baby_Warlock || Class == Job_Warlock || Class == Job_Warlock_T) bonus bFixedCastrate,-50;',NULL,NULL);
@@ -3031,7 +3031,7 @@ REPLACE INTO `item_db_re` VALUES (5384,'Santa_Hat_1','Twin Pompom By JB',5,20,NU
 REPLACE INTO `item_db_re` VALUES (5385,'Yoyo_Hat','Yoyo Hat',5,20,NULL,300,NULL,1,NULL,NULL,0xFFFFFFFF,7,2,256,NULL,'20',1,391,'skill "TF_HIDING",1;',NULL,'sc_end SC_HIDING;');
 REPLACE INTO `item_db_re` VALUES (5386,'Ayam_','Ayam',5,NULL,NULL,70,NULL,7,NULL,NULL,0xFFFFFFFF,7,2,256,NULL,'1',NULL,228,'bonus bMdef,7; bonus bFlee,7; bonus2 bAddMonsterDropItem,12198,200;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (5387,'Neko_Mimi_Kafra','Neko Mimi Kafra',5,20,NULL,200,NULL,1,NULL,1,0xFFFFFFFF,7,2,256,NULL,'30',1,392,'bonus bMdef,5;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (5388,'Snake_Head','Snake Head Hat',5,20,NULL,200,NULL,1,NULL,1,0xFFFFFFFF,7,2,256,NULL,'30',1,393,'skill "TF_DOUBLE",5;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (5388,'Snake_Head','Snake Head Hat',5,20,NULL,200,NULL,1,NULL,1,0xFFFFFFFF,7,2,256,NULL,'30',1,393,'skill "TF_DOUBLE",5; bonus bDoubleRate,25;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (5389,'Angel_Spirit','Angel Spirit',5,20,NULL,200,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,512,NULL,'30',NULL,394,'bonus bStr,2; bonus bHit,15;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (5390,'Santa_Hat_2','Frozen Twin Pompom',5,20,NULL,100,NULL,2,NULL,NULL,0xFFFFFFFF,7,2,256,NULL,NULL,1,395,'bonus2 bResEff,Eff_Freeze,3000;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (5391,'Toast_C','Toast',5,20,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,1,NULL,NULL,NULL,188,'bonus bMaxHP,100; bonus2 bAddMonsterDropItem,617,10;',NULL,NULL);
@@ -3213,7 +3213,7 @@ REPLACE INTO `item_db_re` VALUES (5566,'Tiger_Arhat_Mask','Tiger Arhat Mask',5,N
 REPLACE INTO `item_db_re` VALUES (5567,'Bright_Fury','Bright Fury',5,20,NULL,300,NULL,1,NULL,1,0xFFFFFFFF,7,2,256,NULL,'1',1,548,'bonus bStr,1; bonus2 bAddRace,RC_NonBoss,2; bonus2 bAddRace,RC_Boss,2; bonus bAspdRate,2;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (5568,'Rabbit_Bonnet','Rabbit Bonnet',5,20,NULL,1000,NULL,1,NULL,1,0xFFFFFFFF,7,2,768,NULL,NULL,1,549,'bonus bInt,2; bonus bDelayRate,-3;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (5569,'Gemini_Diadem','Gemini Diadem',5,20,NULL,300,NULL,4,NULL,NULL,0xFFFFFFFF,7,2,256,NULL,'70',1,550,'bonus bAgi,2; bonus bMatkRate,2; if(getrefine()>6) { bonus bMdef,7; bonus bMAtkRate,8; bonus2 bSubEle,Ele_Wind,5; }',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (5570,'Gemini_Crown','Gemini Crown',5,20,NULL,300,NULL,4,NULL,NULL,0xFFFFFFFF,7,2,256,NULL,'70',1,551,'bonus bAgi,2; bonus bAtk,2; bonus bMdef,5; if(getrefine()>6) { bonus bDef,1; bonus bMatk,15; bonus bFlee,10; bonus2 bSubEle,Ele_Wind,5; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (5570,'Gemini_Crown','Gemini Crown',5,20,NULL,300,NULL,4,NULL,NULL,0xFFFFFFFF,7,2,256,NULL,'70',1,551,'bonus bAgi,2; bonus bBaseAtk,2; bonus bMdef,5; if(getrefine()>6) { bonus bDef,1; bonus bMatk,15; bonus bFlee,10; bonus2 bSubEle,Ele_Wind,5; }',NULL,NULL);
 # REPLACE INTO `item_db_re` VALUES (5571,'Rasta_Wig','Rasta_Wig',5,20,NULL,100,NULL,1,NULL,NULL,0xFFFFFFFF,7,2,256,NULL,NULL,1,552,'bonus bStr,1;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (5572,'Savage_Baby_Hat','Savage Babe Hat',5,20,NULL,100,NULL,1,NULL,1,0xFFFFFFFF,7,2,256,NULL,'1',1,553,'bonus bVit,2; bonus2 bAddEff,Eff_Stun,500; bonus2 bSubRace,RC_Brute,-10;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (5573,'Bogy_Horn','Dokebi Horn',5,20,NULL,100,NULL,1,NULL,1,0xFFFFFFFF,7,2,256,NULL,NULL,1,554,'bonus2 bAddMonsterDropItemGroup,IG_Jewel,100; bonus3 bAutoSpell,"MC_MAMMONITE",5,70;',NULL,NULL);
@@ -3225,7 +3225,7 @@ REPLACE INTO `item_db_re` VALUES (5578,'Voyage_Hat','Voyage_Hat',5,200,NULL,10,N
 REPLACE INTO `item_db_re` VALUES (5579,'Wanderer\'s_Sakkat','Wanderer\'s Sakkat',5,20,NULL,300,NULL,2,NULL,1,0xFFFFFFFF,7,2,768,NULL,'70',1,558,'bonus bAgi,2;',NULL,NULL);
 # REPLACE INTO `item_db_re` VALUES (5580,'Red_Beret','Red Beret',5,20,NULL,100,NULL,1,NULL,NULL,0xFFFFFFFF,7,2,256,NULL,NULL,NULL,559,'bonus bAllStats,3; bonus bMdef,3;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (5581,'Cancer_Diadem','Cancer Diadem',5,20,NULL,300,NULL,3,NULL,NULL,0xFFFFFFFF,7,2,256,NULL,'70',1,560,'bonus bInt,2; bonus2 bSubEle,Ele_water,5; if(getrefine()>6) { bonus bMdef,1; bonus bHealPower,3; bonus bMatkRate,2; }',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (5582,'Cancer_Crown','Cancer Crown',5,20,NULL,300,NULL,3,NULL,NULL,0xFFFFFFFF,7,2,256,NULL,'70',1,561,'bonus bStr,2; bonus2 bSubEle,Ele_water,5; if(getrefine()>6) { bonus bDef,1; bonus bAtk,15; bonus bFlee,10; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (5582,'Cancer_Crown','Cancer Crown',5,20,NULL,300,NULL,3,NULL,NULL,0xFFFFFFFF,7,2,256,NULL,'70',1,561,'bonus bStr,2; bonus2 bSubEle,Ele_water,5; if(getrefine()>6) { bonus bDef,1; bonus bBaseAtk,15; bonus bFlee,10; }',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (5583,'Para_Team_Hat1','Eden Team Hat I',5,NULL,NULL,0,NULL,1,NULL,NULL,0xFFFFFFFF,7,2,256,NULL,'12',1,465,NULL,NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (5584,'Majestic_Evil_Horn','Majestic Evil Horns',5,NULL,NULL,400,NULL,1,NULL,NULL,0xFFFFFFFF,7,2,256,NULL,'1',1,562,'bonus2 bSubRace,RC_Demon,3; bonus2 bHPDrainRate,3,15; bonus2 bSPDrainRate,1,7;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (5585,'Rune_Hairband','Rune Cloth Circlet',5,20,NULL,400,NULL,1,NULL,1,0xFFFFFFFF,7,2,768,NULL,'1',1,564,NULL,NULL,NULL);
@@ -3236,7 +3236,7 @@ REPLACE INTO `item_db_re` VALUES (5587,'Mosquito_Coil_1Use','Mosquito Coil',5,NU
 REPLACE INTO `item_db_re` VALUES (5590,'K_Poring_Cake_Cap','Poring Cake Hat',5,20,NULL,200,NULL,1,NULL,NULL,0xFFFFFFFF,7,2,256,NULL,NULL,1,417,'bonus bMaxHP,BaseLevel*2; bonus bMaxSP,50;',NULL,NULL);
 # REPLACE INTO `item_db_re` VALUES (5591,'Desert_Prince','Desert Prince',5,20,NULL,100,NULL,1,NULL,1,0xFFFFFFFF,7,2,256,NULL,'30',NULL,567,NULL,NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (5592,'Sigrun\'s_Wings','Sigrun\'s Wings',5,20,NULL,100,NULL,2,NULL,NULL,0xFFFFFFFF,7,2,512,NULL,'80',NULL,568,'if(BaseClass==Job_Swordman||BaseClass==Job_Merchant||BaseClass==Job_Thief||(BaseJob==Job_Taekwon&&Class!=Job_Soul_Linker)) bonus bStr,1; else if(BaseClass==Job_Mage||BaseClass==Job_Acolyte||class==Job_Ninja||class==Job_Soul_Linker) bonus bInt,1; else if(BaseClass==Job_Archer||BaseClass==Job_Gunslinger) bonus bDex,1; else if(BaseJob==Job_Novice||BaseJob==Job_SuperNovice) { bonus bMaxHP,80; bonus bMaxSP,30; }',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (5593,'Rabbit_Bonnet_','Rabbit Bonnet',5,20,NULL,200,NULL,1,NULL,1,0xFFFFFFFF,7,2,768,NULL,'1',1,549,'bonus bAtk,10; bonus bMatk,10; bonus2 bSubRace,RC_DemiHuman,3; bonus bDelayRate,-3; if(getrefine()>6) { bonus2 bSubEle,Ele_Neutral,5; bonus2 bSubEle,Ele_Water,5; bonus2 bSubEle,Ele_Earth,5; bonus2 bSubEle,Ele_Fire,5; bonus2 bSubEle,Ele_Wind,5; bonus2 bSubEle,Ele_Holy,5; bonus2 bSubEle,Ele_Dark,5; bonus2 bSubEle,Ele_Ghost,5; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (5593,'Rabbit_Bonnet_','Rabbit Bonnet',5,20,NULL,200,NULL,1,NULL,1,0xFFFFFFFF,7,2,768,NULL,'1',1,549,'bonus bBaseAtk,10; bonus bMatk,10; bonus2 bSubRace,RC_DemiHuman,3; bonus bDelayRate,-3; if(getrefine()>6) { bonus2 bSubEle,Ele_Neutral,5; bonus2 bSubEle,Ele_Water,5; bonus2 bSubEle,Ele_Earth,5; bonus2 bSubEle,Ele_Fire,5; bonus2 bSubEle,Ele_Wind,5; bonus2 bSubEle,Ele_Holy,5; bonus2 bSubEle,Ele_Dark,5; bonus2 bSubEle,Ele_Ghost,5; }',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (5594,'Donut_In_Mouth','Donut In Mouth',5,20,NULL,50,NULL,1,NULL,NULL,0xFFFFFFFF,7,2,1,NULL,'1',NULL,569,'bonus2 bHPRegenRate,1,10000; bonus bMaxHP,100;',NULL,NULL);
 # REPLACE INTO `item_db_re` VALUES (5595,'Eye_Of_Juno','Eye Of Juno',5,20,NULL,400,NULL,2,NULL,1,0xFFFFFFFF,7,2,256,NULL,'1',1,570,'bonus bMdef,2;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (5596,'4Leaf_Clover_In_Mouth','4Leaf Clover In Mouth',5,20,NULL,0,NULL,2,NULL,NULL,0xFFFFFFFF,7,2,1,NULL,'1',NULL,571,'bonus bMdef,2; bonus2 bAddMonsterDropItem,12245,10;',NULL,NULL);
@@ -3389,21 +3389,21 @@ REPLACE INTO `item_db_re` VALUES (5742,'Rudolf_Santa_Hat','Rudolph Santa Hat',5,
 REPLACE INTO `item_db_re` VALUES (5743,'Orange_Stem_Hat','Orange Stem Hat',5,20,NULL,100,NULL,NULL,NULL,NULL,0x00000000,7,2,256,NULL,'1',NULL,620,'bonus bLuk,3;',NULL,NULL);
 # REPLACE INTO `item_db_re` VALUES (5744,'Capricon_Crown','Capricon Crown',5,20,NULL,300,NULL,3,NULL,1,0xFFFFFFFF,7,2,256,NULL,'1',1,621,'bonus bVit,2; bonus bDex,2;',NULL,NULL);
 # REPLACE INTO `item_db_re` VALUES (5745,'Capricon_Diadem','Capricon Diadem',5,20,NULL,300,NULL,3,NULL,NULL,0xFFFFFFFF,7,2,256,NULL,'1',1,622,'bonus bDex,2; bonus bMdef,5;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (5746,'Rune_Circlet','Rune Circlet',5,20,NULL,100,NULL,12,NULL,1,0x00000080,8,2,256,NULL,'100',1,623,'bonus bStr,1; bonus bInt,1; bonus bMdef,5; if(readparam(bStr)>=120){ bonus bAtk,10; bonus bMatk,5; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (5746,'Rune_Circlet','Rune Circlet',5,20,NULL,100,NULL,12,NULL,1,0x00000080,8,2,256,NULL,'100',1,623,'bonus bStr,1; bonus bInt,1; bonus bMdef,5; if(readparam(bStr)>=120){ bonus bBaseAtk,10; bonus bMatk,5; }',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (5747,'Mitra','Mitra',5,20,NULL,100,NULL,12,NULL,1,0x00000100,8,2,256,NULL,'100',1,624,'bonus bVit,1; bonus bInt,1; bonus bMdef,5; bonus bHealPower,5; if(readparam(bInt)>=120){ bonus bMatk,10; }',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (5748,'Sniper_Goggle','Sniper Goggles',5,20,NULL,100,NULL,12,NULL,1,0x00000800,8,2,768,NULL,'100',1,625,'bonus bAgi,1; bonus bDex,1; bonus bMdef,5; if(readparam(bAgi)>=120){ bonus bLongAtkRate,4; bonus bAspd,1; }',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (5749,'Driver_Band','Driver Band',5,20,NULL,100,NULL,12,NULL,1,0x00000400,8,1,256,NULL,'100',1,626,'bonus bStr,1; bonus bDex,1; bonus bMdef,5; if(readparam(bStr)>=120){ bonus bAtk,10; bonus bCritical,3; }',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (5750,'Shadow_Handicraft','Shadow Crown',5,20,NULL,100,NULL,12,NULL,1,0x00020000,8,2,256,NULL,'100',1,627,'bonus bAgi,1; bonus bInt,1; bonus bMdef,1; if(readparam(bAgi)>=120){ bonus bAtk,10; bonus bFlee,3; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (5749,'Driver_Band','Driver Band',5,20,NULL,100,NULL,12,NULL,1,0x00000400,8,1,256,NULL,'100',1,626,'bonus bStr,1; bonus bDex,1; bonus bMdef,5; if(readparam(bStr)>=120){ bonus bBaseAtk,10; bonus bCritical,3; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (5750,'Shadow_Handicraft','Shadow Crown',5,20,NULL,100,NULL,12,NULL,1,0x00020000,8,2,256,NULL,'100',1,627,'bonus bAgi,1; bonus bInt,1; bonus bMdef,1; if(readparam(bAgi)>=120){ bonus bBaseAtk,10; bonus bFlee,3; }',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (5751,'Minstrel_Song_Hat','Minstrel Song Hat',5,20,NULL,100,NULL,12,NULL,1,0x00080000,8,1,256,NULL,'100',1,628,'bonus bInt,1; bonus bLuk,1; bonus bMdef,5; bonus bLongAtkRate,4; bonus bUseSPrate,-10;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (5752,'Midas_Whisper','Midas Whispers',5,20,NULL,100,NULL,12,NULL,1,0x00040000,8,2,256,NULL,'100',1,629,'bonus bStr,1; bonus bDex,1; bonus bMdef,5; if(readparam(bStr)>=120){ bonus bAtk,5; bonus bAspd,1; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (5752,'Midas_Whisper','Midas Whispers',5,20,NULL,100,NULL,12,NULL,1,0x00040000,8,2,256,NULL,'100',1,629,'bonus bStr,1; bonus bDex,1; bonus bMdef,5; if(readparam(bStr)>=120){ bonus bBaseAtk,5; bonus bAspd,1; }',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (5753,'Magic_Stone_Hat','Magic Stone Hat',5,20,NULL,100,NULL,12,NULL,1,0x00000200,8,2,256,NULL,'100',1,630,'bonus bInt,1; bonus bDex,1; bonus bMdef,5; if(readparam(bDex)>=120){ bonus bMatkRate,10; bonus bVariableCastrate,-2; }',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (5754,'Blazing_Soul','Burning Spirit',5,20,NULL,100,NULL,12,NULL,1,0x00008000,8,2,256,NULL,'100',1,631,'bonus bStr,1; bonus bVit,1; bonus bMdef,5; if(readparam(bStr)>=120){ bonus bAtk,10; bonus bHit,3; }',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (5755,'Silent_Executer','Silent Enforcer',5,20,NULL,100,NULL,12,NULL,NULL,0x00001000,8,2,513,NULL,'100',1,632,'bonus bAgi,1; bonus bMdef,5; if(readparam(bAgi)>=120){ bonus bAtk,10; bonus bFlee2,5; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (5754,'Blazing_Soul','Burning Spirit',5,20,NULL,100,NULL,12,NULL,1,0x00008000,8,2,256,NULL,'100',1,631,'bonus bStr,1; bonus bVit,1; bonus bMdef,5; if(readparam(bStr)>=120){ bonus bBaseAtk,10; bonus bHit,3; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (5755,'Silent_Executer','Silent Enforcer',5,20,NULL,100,NULL,12,NULL,NULL,0x00001000,8,2,513,NULL,'100',1,632,'bonus bAgi,1; bonus bMdef,5; if(readparam(bAgi)>=120){ bonus bBaseAtk,10; bonus bFlee2,5; }',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (5756,'Wind_Whisper','Wispers of Wind',5,20,NULL,100,NULL,12,NULL,1,0x00010000,8,2,256,NULL,'100',1,633,'bonus bInt,1; bonus bDex,1; bonus bMdef,5; if(readparam(bInt)>=120){ bonus bMatkRate,10; bonus bFlee,3; }',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (5757,'Schmidt_Helm','Reissue Schmitz Helm',5,20,NULL,100,NULL,12,NULL,1,0x00004000,8,2,768,NULL,'100',1,634,'bonus bVit,2; bonus bInt,1; bonus bMdef,5; if(readparam(bInt)>=120){ bonus bMatkRate,10; bonus bDef,5; }',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (5758,'Dying_Swan','Resting Swan',5,20,NULL,100,NULL,17,NULL,1,0x00080000,8,NULL,256,NULL,'100',1,635,'bonus bInt,1; bonus bLuk,1; bonus bMdef,5; bonus bLongAtkRate,5; bonus bUseSPrate,-10;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (5759,'Noah_Hat','Noah Hat',5,20,NULL,500,NULL,1,NULL,1,0xFFFFFFFF,7,2,256,NULL,'1',1,636,'bonus bMdef,3;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (5760,'Driver_Band_','Driver Band',5,20,NULL,100,NULL,12,NULL,1,0x00000400,8,NULL,256,NULL,'100',1,637,'bonus bStr,1; bonus bDex,1; bonus bMdef,5; if(readparam(bStr)>=120){ bonus bAtk,10; bonus bCritical,3; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (5760,'Driver_Band_','Driver Band',5,20,NULL,100,NULL,12,NULL,1,0x00000400,8,NULL,256,NULL,'100',1,637,'bonus bStr,1; bonus bDex,1; bonus bMdef,5; if(readparam(bStr)>=120){ bonus bBaseAtk,10; bonus bCritical,3; }',NULL,NULL);
 # REPLACE INTO `item_db_re` VALUES (5761,'Sloth_Hat','Sloth Hat',5,20,NULL,800,NULL,3,NULL,1,0xFFFFFFFF,7,2,256,NULL,'1',1,638,'bonus bAgi,2;',NULL,NULL);
 # REPLACE INTO `item_db_re` VALUES (5762,'Duneyrr_Helm','Duneyrr Helm',5,20,NULL,100,NULL,5,NULL,NULL,0xFFFFFFFF,7,2,256,NULL,'1',1,639,'bonus bAllStats,1; bonus bMdef,5;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (5763,'Red_Bunny_Band','Red Bunny Band',5,NULL,NULL,200,NULL,4,NULL,NULL,0xFFFFFFFF,7,2,256,NULL,'1',1,640,'bonus bAgi,2; bonus bMdef,3;',NULL,NULL);
@@ -6064,6 +6064,7 @@ REPLACE INTO `item_db_re` VALUES (13204,'Lighting_Sphere','Lightning Sphere',10,
 REPLACE INTO `item_db_re` VALUES (13205,'Poison_Sphere','Poison Sphere',10,80,NULL,5,'50',NULL,NULL,NULL,0x01000000,7,2,32768,NULL,'1',NULL,5,'bonus bAtkEle,Ele_Poison; bonus2 bAddEff,Eff_Poison,500;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (13206,'Blind_Sphere','Blind Sphere',10,80,NULL,5,'50',NULL,NULL,NULL,0x01000000,7,2,32768,NULL,'1',NULL,5,'bonus bAtkEle,Ele_Dark; bonus2 bAddEff,Eff_Blind,500;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (13207,'Freezing_Sphere','Freezing Sphere',10,80,NULL,5,'50',NULL,NULL,NULL,0x01000000,7,2,32768,NULL,'1',NULL,5,'bonus bAtkEle,Ele_Water;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (13208,'Gong_Bug','Gong Bug',10,0,NULL,20,'50',NULL,NULL,NULL,0x01000000,7,2,32768,NULL,'50',NULL,3,NULL,NULL,NULL);
 # Shurikens & Kunais
 REPLACE INTO `item_db_re` VALUES (13250,'Shuriken','Shuriken',10,4,NULL,5,'10',NULL,NULL,NULL,0x02000000,7,2,32768,NULL,'1',NULL,6,NULL,NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (13251,'Nimbus_Shuriken','Nimbus Shuriken',10,10,NULL,5,'30',NULL,NULL,NULL,0x02000000,7,2,32768,NULL,'20',NULL,6,NULL,NULL,NULL);
@@ -7335,7 +7336,7 @@ REPLACE INTO `item_db_re` VALUES (18570,'Ancient_Gold_Ornament','Ancient Gold Or
 #
 REPLACE INTO `item_db_re` VALUES (18580,'Yggdrasil_Crown','Yggdrasil Crown',5,20,NULL,200,NULL,3,NULL,NULL,0xFFFFFFFF,7,2,256,NULL,'1',1,724,'bonus bMdef,3; bonus bHealPower,2; bonus bHealpower2,10; if(getrefine() >= 7){ bonus bHealPower,5; } if(getrefine() >= 9){ bonus bHealPower,3; }',NULL,NULL);
 #
-REPLACE INTO `item_db_re` VALUES (18595,'Horn_Of_Ancient','Horn of Ancient',5,40,NULL,200,NULL,8,NULL,1,0xFFFFFFFF,7,2,256,NULL,'50',1,757,'autobonus "{bonus bAtk,100;}",5,10000,0,"{specialeffect2 EF_POTION_BERSERK;}";',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18595,'Horn_Of_Ancient','Horn of Ancient',5,40,NULL,200,NULL,8,NULL,1,0xFFFFFFFF,7,2,256,NULL,'50',1,757,'autobonus "{bonus bBaseAtk,100;}",5,10000,0,"{specialeffect2 EF_POTION_BERSERK;}";',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (18596,'Sprout_Hat','Sprout Hat',5,20,NULL,200,NULL,4,NULL,NULL,0xFFFFFFFF,7,2,256,NULL,'70',1,758,'skill "WZ_HEAVENDRIVE",3;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (18597,'Mercury_Riser','Mercury Riser',5,40,NULL,200,NULL,10,NULL,1,0xFFFFFFFF,7,2,256,NULL,NULL,NULL,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; }',NULL,NULL);
 #
@@ -7347,13 +7348,94 @@ REPLACE INTO `item_db_re` VALUES (18607,'Blush_S','Blush',5,20,NULL,100,NULL,NUL
 REPLACE INTO `item_db_re` VALUES (18608,'Pair_Of_Red_Ribbon_S','Small Ribbons',5,20,NULL,100,NULL,2,NULL,1,0xFFFFFFFF,7,2,512,NULL,'45',NULL,169,NULL,NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (18609,'Dark_Blindfold_S','Dark Blinder',5,20,NULL,100,NULL,NULL,NULL,1,0xFFFFFFFE,7,2,512,NULL,NULL,NULL,187,'bonus2 bResEff,Eff_Blind,10000; bonus2 bResEff,Eff_Stun,200;',NULL,NULL);
 #
-REPLACE INTO `item_db_re` VALUES (18612,'White_Musang_Hat','White Musang Hat',5,40,NULL,200,NULL,3,NULL,1,0xFFFFFFFF,7,2,256,NULL,NULL,1,770,'bonus bStr,2; bonus bVit,2; bonus bLuk,1; bonus bUnbreakableHelm,0;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (18613,'Black_Musang_Hat','Black Musang Hat',5,40,NULL,200,NULL,3,NULL,1,0xFFFFFFFF,7,2,256,NULL,NULL,1,771,'bonus bInt,2; bonus bDex,2; bonus bAgi,1; bonus bUnbreakableHelm,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18612,'White_Musang_Hat','White Musang Hat',5,40,NULL,400,NULL,3,NULL,1,0xFFFFFFFF,7,2,256,NULL,NULL,1,770,'bonus bStr,2; bonus bVit,2; bonus bLuk,1; bonus bUnbreakableHelm,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18613,'Black_Musang_Hat','Black Musang Hat',5,40,NULL,400,NULL,3,NULL,1,0xFFFFFFFF,7,2,256,NULL,NULL,1,771,'bonus bInt,2; bonus bDex,2; bonus bAgi,1; bonus bUnbreakableHelm,0;',NULL,NULL);
 #
-REPLACE INTO `item_db_re` VALUES (18620,'Heart_Eye_Patch','Heart Eyepatch',5,5,NULL,200,NULL,2,NULL,NULL,0xFFFFFFFF,7,2,512,NULL,'20',1,779,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18620,'Heart_Eye_Patch','Heart Eyepatch',5,5,NULL,50,NULL,2,NULL,NULL,0xFFFFFFFF,7,2,512,NULL,'20',1,779,NULL,NULL,NULL);
 #
+REPLACE INTO `item_db_re` VALUES (18622,'Rocket_Helm_1','Rocket Helm 1',5,20,NULL,1000,NULL,20,NULL,1,0xFFFFFFFF,7,2,256,NULL,'95',1,764,'bonus bAllStats,5; bonus bUnbreakableHelm,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18623,'Rocket_Helm_2','Rocket Helm 2',5,20,NULL,1000,NULL,20,NULL,1,0xFFFFFFFF,7,2,256,NULL,'95',1,765,'bonus bAllStats,4; bonus bUnbreakableHelm,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18624,'Rocket_Helm_3','Rocket Helm 3',5,20,NULL,1000,NULL,20,NULL,1,0xFFFFFFFF,7,2,256,NULL,'95',1,768,'bonus bAllStats,3; bonus bUnbreakableHelm,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18625,'Rocket_Helm_RWC','Rocket Helm RWC',5,10000,NULL,1000,NULL,20,NULL,1,0xFFFFFFFF,7,2,256,NULL,'95',1,769,'bonus bAllStats,2; bonus bUnbreakableHelm,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18626,'Gelato_Hat','Gelato Hat',5,20,NULL,200,NULL,2,NULL,1,0xFFFFFFFF,7,2,256,NULL,'40',1,777,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18627,'Dried_Leaf','Dried Leaf',5,20,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,1,NULL,'10',NULL,711,'bonus bUnbreakableHelm,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18628,'Tare_Brownie','Tare Brownie',5,20,NULL,500,NULL,5,NULL,1,0xFFFFFFFF,7,2,256,NULL,'50',NULL,781,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18629,'B_Desert_Wolf_Hat','B Desert Wolf Hat',5,10,NULL,300,NULL,NULL,NULL,1,0xFFFFFFFF,7,2,256,NULL,'1',1,392,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18629,'Dep_Alice_Hat','Dep Alice Hat',5,20,NULL,500,NULL,6,NULL,NULL,0xFFFFFFFE,7,2,256,NULL,'70',1,784,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18631,'Ribbon_Chef_Hat','Ribbon Chef Hat',5,20,NULL,300,NULL,5,NULL,NULL,0xFFFFFFFF,7,2,256,NULL,'70',1,785,'bonus bDex,3; bonus bLuk,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18632,'Yellow_Poring_Hairpin','Yellow Poring Hairpin',5,20,NULL,100,NULL,3,NULL,1,0xFFFFFFFF,7,2,256,NULL,'1',1,786,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18633,'Pink_Poring_Hairpin','Pink Poring Hairpin',5,20,NULL,100,NULL,3,NULL,1,0xFFFFFFFF,7,2,256,NULL,'1',1,787,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18634,'Green_Poring_Hairpin','Green Poring Hairpin',5,20,NULL,100,NULL,3,NULL,1,0xFFFFFFFF,7,2,256,NULL,'1',1,788,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18635,'Blue_Poring_Hairpin','Blue Poring Hairpin',5,20,NULL,100,NULL,3,NULL,1,0xFFFFFFFF,7,2,256,NULL,'1',1,789,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18636,'Bridal_Ribbon','Bridal Ribbon',5,20,NULL,200,NULL,6,NULL,NULL,0xFFFFFFFF,7,2,256,NULL,'30',1,790,'bonus bDex,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18638,'Citron_Hat','Citron Hat',5,20,NULL,400,NULL,3,NULL,NULL,0xFFFFFFFE,7,2,256,NULL,'1',1,791,'bonus bLuk,3;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18639,'Naval_Officer_Hat','Naval Officer Hat',5,20,NULL,200,NULL,2,NULL,NULL,0xFFFFFFFE,7,2,256,NULL,'1',1,792,'bonus bLuk,3;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18640,'Starfish_Headband','Starfish Headband',5,20,NULL,200,NULL,2,NULL,NULL,0xFFFFFFFE,7,2,256,NULL,'1',1,793,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18641,'Ribbon_Magic_Hat','Ribbon Magic Hat',5,20,NULL,200,NULL,2,NULL,NULL,0xFFFFFFFE,7,2,256,NULL,'1',1,794,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18642,'Scissorhand_Model','Scissorhand Model',5,20,NULL,200,NULL,NULL,NULL,NULL,0xFFFFFFFE,7,2,1,NULL,'20',NULL,795,'bonus bAgi,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18643,'Rockhand_Model','Rockhand Model',5,20,NULL,200,NULL,NULL,NULL,NULL,0xFFFFFFFE,7,2,1,NULL,'20',NULL,796,'bonus bStr,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18644,'Paperhand_Model','Paperhand Model',5,20,NULL,200,NULL,NULL,NULL,NULL,0xFFFFFFFE,7,2,1,NULL,'20',NULL,797,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18645,'Sailor_Hat','Sailor Hat',5,20,NULL,200,NULL,2,NULL,NULL,0xFFFFFFFF,7,2,256,NULL,'1',1,798,'bonus bInt,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18646,'Cow_Hat','Cow Hat',5,20,NULL,300,NULL,4,NULL,1,0xFFFFFFFF,7,2,256,NULL,'1',1,799,'bonus bDex,2;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18647,'Star_Eyepatch','Star Eyepatch',5,20,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,256,NULL,'1',NULL,800,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18648,'Tongue_Charm','Tongue Charm',5,20,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,1,NULL,'1',NULL,801,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18650,'RWC_Shouting_Mouth','RWC Shouting Mouth',5,20,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,1,NULL,'1',NULL,194,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18651,'Ignis_Cap','Ignis Cap',5,20,NULL,800,NULL,8,NULL,1,0xFFFFFFFF,7,2,256,NULL,'40',1,7,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18652,'Vanargandr_Helm','Vanargandr Helm',5,20,NULL,1500,NULL,10,NULL,1,0xFFFFFFFF,7,2,256,NULL,'80',1,7,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18653,'Deviruchi_Headphone','Deviruchi Headphone',5,20,NULL,200,NULL,8,NULL,1,0xFFFFFFFF,7,2,256,NULL,'30',1,7,'bonus bAgi,2;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18655,'Goedo_Monocle','Goedo Monocle',5,20,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,512,NULL,'50',NULL,23,NULL,NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (18656,'Witch\'s_Pumpkin_Hat','Witch\'s Pumpkin Hat',5,20,NULL,300,NULL,10,NULL,NULL,0xFFFFFFFF,7,2,256,NULL,'20',1,717,'bonus bMdef,10; bonus bStr,2; bonus bInt,2; bonus2 bMagicAddRace,RC_Undead,15; bonus2 bMagicAddRace,RC_Demon,15;',NULL,NULL);
-
+REPLACE INTO `item_db_re` VALUES (18657,'Pegasus_Wing_Ears','Pegasus Wing Ears',5,20,NULL,500,NULL,1,NULL,NULL,0xFFFFFFFF,7,2,512,NULL,'80',NULL,568,'bonus bUnbreakableHelm,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18658,'Holy_Santa_Beard','Holy Santa Beard',5,20,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,1,NULL,'1',NULL,25,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18661,'Trident_Helm','Trident Helm',5,20,NULL,400,NULL,3,NULL,1,0xFFFFFFFE,7,2,256,NULL,'20',1,810,'bonus bStr,2;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18662,'Antler_Fedora','Antler Fedora',5,20,NULL,400,NULL,3,NULL,NULL,0xFFFFFFFE,7,2,256,NULL,'1',1,811,'bonus bInt,3;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18664,'Blind_Glasses','Blind Glasses',5,20,NULL,400,NULL,3,NULL,NULL,0xFFFFFFFE,7,2,512,NULL,'20',1,813,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18665,'Orange_In_Mouth','Orange In Mouth',5,20,NULL,200,NULL,NULL,NULL,NULL,0xFFFFFFFE,7,2,1,NULL,'20',NULL,814,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18666,'CD_In_Mouth','CD In Mouth',5,20,NULL,200,NULL,NULL,NULL,NULL,0xFFFFFFFE,7,2,1,NULL,'20',NULL,815,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18667,'Cat_Lace_Hairband','Cat Lace Hairband',5,20,NULL,500,NULL,2,NULL,NULL,0xFFFFFFFE,7,2,256,NULL,'60',NULL,816,'bonus bDex,3;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18668,'Droopy_Turtle_Hat','Droopy Turtle Hat',5,20,NULL,300,NULL,1,NULL,1,0xFFFFFFFE,7,2,256,NULL,'1',1,694,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18669,'Cowhide_Hat','Cowhide Hat',5,20,NULL,200,NULL,3,NULL,1,0xFFFFFFFE,7,2,256,NULL,'1',1,11,'bonus bDex,2;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18670,'Hankie_In_Mouth','Hankie In Mouth',5,20,NULL,100,NULL,1,NULL,NULL,0xFFFFFFFF,7,2,1,NULL,'12',NULL,818,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18671,'Rudolf_Hairband','Rudolf Hairband',5,20,NULL,200,NULL,5,NULL,NULL,0xFFFFFFFF,7,2,256,NULL,'30',1,836,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18672,'Tare_Pope','Tare Pope',5,20,NULL,300,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,256,NULL,'1',NULL,817,'bonus bUnbreakableHelm,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18673,'Tare_Pope_','Tare Pope',5,20,NULL,300,NULL,NULL,NULL,1,0xFFFFFFFF,7,2,256,NULL,'1',NULL,817,'bonus bUnbreakableHelm,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18674,'Planewing_Hat','Planewing Hat',5,20,NULL,200,NULL,3,NULL,1,0xFFFFFFFE,7,2,256,NULL,'1',1,11,'bonus bAgi,3;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18675,'Green_Apple_Hat','Green Apple Hat',5,20,NULL,200,NULL,3,NULL,1,0xFFFFFFFE,7,2,256,NULL,'20',1,11,'bonus bDex,2;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18677,'Cherry_Twig_In_Mouth','Cherry Twig In Mouth',5,20,NULL,200,NULL,NULL,NULL,NULL,0xFFFFFFFE,7,2,1,NULL,'20',NULL,823,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18678,'Leek_In_Mouth','Leek In Mouth',5,20,NULL,200,NULL,NULL,NULL,NULL,0xFFFFFFFE,7,2,1,NULL,'20',NULL,824,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18679,'Abacus_In_Mouth','Abacus In Mouth',5,20,NULL,200,NULL,NULL,NULL,NULL,0xFFFFFFFE,7,2,1,NULL,'20',NULL,825,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18680,'Tw_Frog_Hat','Tw Frog Hat',5,20,NULL,200,NULL,2,NULL,NULL,0xFFFFFFFF,7,2,256,NULL,'35',NULL,11,'bonus bAgi,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18681,'Puppy_Ears_Hat','Puppy Ears Hat',5,20,NULL,200,NULL,2,NULL,NULL,0xFFFFFFFF,7,2,256,NULL,'1',1,11,'bonus bVit,2;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18683,'Carrot_In_Mouth','Carrot In Mouth',5,20,NULL,200,NULL,1,NULL,NULL,0xFFFFFFFF,7,2,1,NULL,'1',NULL,829,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18684,'Showy_High_Cap','Showy High Cap',5,20,NULL,200,NULL,3,NULL,1,0xFFFFFFFE,7,2,256,NULL,'1',1,11,'bonus bStr,3; bonus bInt,2;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18685,'Stardust_Hairband','Stardust Hairband',5,20,NULL,1000,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,256,NULL,'10',NULL,831,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18686,'2011_RMSC_1','2011 RMSC 1',5,20,NULL,2500,NULL,20,NULL,1,0xFFFFFFFF,7,2,256,NULL,'1',NULL,832,'bonus bUnbreakableHelm,0; bonus bAllStats,5;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18687,'2011_RMSC_2','2011 RMSC 2',5,20,NULL,2500,NULL,20,NULL,1,0xFFFFFFFF,7,2,256,NULL,'1',NULL,832,'bonus bUnbreakableHelm,0; bonus bAllStats,3;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18688,'2011_RMSC_3','2011 RMSC 3',5,20,NULL,2500,NULL,20,NULL,1,0xFFFFFFFF,7,2,256,NULL,'1',NULL,832,'bonus bUnbreakableHelm,0; bonus bAllStats,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18689,'2011_RMSC_4','2011 RMSC 4',5,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,256,NULL,'1',NULL,832,'bonus bUnbreakableHelm,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18690,'Sirt_Evil_Eye','Sirt Evil Eye',5,20,NULL,400,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,512,NULL,'50',NULL,345,'bonus bUnbreakableHelm,0; bonus bStr,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18691,'Rising_Black_Dragon','Rising Black Dragon',5,20,NULL,100,NULL,3,NULL,NULL,0xFFFFFFFF,7,2,256,NULL,'1',1,166,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18692,'Mike_Hat','Mike Hat',5,20,NULL,200,NULL,3,NULL,1,0xFFFFFFFE,7,2,256,NULL,'1',1,837,'bonus bDex,2; bonus bLuk,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18693,'Sleeping_Kitty_Cat','Sleeping Kitty Cat',5,20,NULL,200,NULL,4,NULL,1,0xFFFFFFFE,7,2,256,NULL,'20',1,838,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18694,'Red_Hood','Red Hood',5,20,NULL,200,NULL,3,NULL,1,0xFFFFFFFE,7,2,256,NULL,'20',1,839,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18695,'Phoenix_Crown','Phoenix Crown',5,20,NULL,400,NULL,3,NULL,1,0xFFFFFFFE,7,2,256,NULL,'20',1,840,'bonus bInt,2;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18696,'Orange_Hat','Orange Hat',5,20,NULL,200,NULL,3,NULL,NULL,0xFFFFFFFE,7,2,256,NULL,'20',1,841,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18697,'Syringe_In_Mouth','Syringe In Mouth',5,20,NULL,200,NULL,NULL,NULL,NULL,0xFFFFFFFE,7,2,1,NULL,'20',NULL,842,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18698,'Cheesy_Snack_In_Mouth','Cheesy Snack In Mouth',5,20,NULL,200,NULL,NULL,NULL,NULL,0xFFFFFFFE,7,2,1,NULL,'20',NULL,843,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18699,'Starving_Fish_Hat','Starving Fish Hat',5,20,NULL,1200,NULL,3,NULL,NULL,0xFFFFFFFF,7,2,256,NULL,'1',NULL,844,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18700,'Rabbit_Ribbon','Rabbit Ribbon',5,20,NULL,500,NULL,3,NULL,1,0xFFFFFFFF,7,2,256,NULL,'50',1,845,'bonus bInt,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18701,'Ancient_Civil_Man','Ancient Civil Man',5,20,NULL,500,NULL,2,NULL,NULL,0xFFFFFFFE,7,2,256,NULL,'70',NULL,846,'bonus bInt,3; bonus bDex,2; bonus bLuk,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18702,'Shaving_Cream','Shaving Cream',5,20,NULL,50,NULL,1,NULL,NULL,0xFFFFFFFF,7,2,1,NULL,'10',NULL,847,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18703,'Stem_In_Mouth','Stem In Mouth',5,20,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,1,NULL,'1',NULL,848,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18727,'Sedora_Hat','Sedora Hat',5,20,NULL,300,NULL,13,NULL,1,0xFFFFFFFF,7,2,256,NULL,'10',1,869,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18728,'Egir_Helm','Egir Helm',5,200000,NULL,800,NULL,10,NULL,1,0xFFFFFFFF,7,2,256,NULL,'110',1,870,'bonus bUnbreakableHelm,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18729,'MVP_Basketball','MVP Basketball',5,20,NULL,150,NULL,6,NULL,1,0xFFFFFFFF,7,2,256,NULL,'1',1,871,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18785,'King_Poring_Hat','King Poring Hat',5,20,NULL,600,NULL,10,NULL,1,0xFFFFFFFF,7,2,256,NULL,'10',1,905,'bonus bDex,1; bonus bLuk,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18821,'Rainbow_Feather_Deco','Rainbow Feather Deco',5,20,NULL,300,NULL,5,NULL,1,0xFFFFFFFF,7,2,256,NULL,'1',1,934,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18839,'Poring_Sunglasses','Poring Sunglasses',5,0,NULL,100,NULL,10,NULL,1,0xFFFFFFFF,7,2,512,NULL,'1',NULL,954,'bonus bDex,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18850,'Polar_Bear_Cap','Polar Bear Cap',5,20,NULL,300,NULL,7,NULL,NULL,0xFFFFFFFF,7,2,256,NULL,'1',NULL,966,'bonus bUnbreakableHelm,0; bonus bDex,1; bonus bAgi,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18851,'C_Polar_Bear_Cap','Costume Polar Bear Cap',5,20,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,1024,NULL,'1',1,966,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18873,'Sweet_Valentine_Out','Sweet Valentine Out',5,20,NULL,100,NULL,1,NULL,NULL,0xFFFFFFFF,7,2,256,NULL,'1',1,965,NULL,NULL,NULL);
 # Costume System
 REPLACE INTO `item_db_re` VALUES (19500,'T_Mr_Smile','T Mr Smile',5,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,6144,NULL,NULL,NULL,65,'bonus bStr,2;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (19501,'T_Spinx_Helm','T Spinx Helm',5,NULL,NULL,0,NULL,NULL,NULL,1,0xFFFFFFFF,7,2,5120,NULL,NULL,NULL,137,NULL,NULL,NULL);
@@ -7361,29 +7443,56 @@ REPLACE INTO `item_db_re` VALUES (19501,'T_Spinx_Helm','T Spinx Helm',5,NULL,NUL
 REPLACE INTO `item_db_re` VALUES (19504,'T_Sunglasses','T Sunglasses',5,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,2048,NULL,NULL,NULL,12,NULL,NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (19505,'T_Cigarette','T Cigarette',5,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,4096,NULL,NULL,NULL,54,NULL,NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (19506,'T_Valkyrie_Feather_Band','T Valkyrie Feather Band',5,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,1024,NULL,NULL,1,300,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19507,'Clear_Sun','Clear Sun',5,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,1024,NULL,'1',NULL,654,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19508,'T_Gemmed_Sallet','T Gemmed Sallet',5,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,1024,NULL,NULL,1,0,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19509,'Butterfly_Wing_Ears','Butterfly Wing Ears',5,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,2048,NULL,'1',NULL,695,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19510,'Screw_Stuck_in_Head','Screw Stuck in Head',5,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,2048,NULL,'1',NULL,696,NULL,NULL,NULL);
-#
-REPLACE INTO `item_db_re` VALUES (19513,'Chicken_Bill','Chicken Bill',5,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,4096,NULL,'1',NULL,699,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19514,'Charlies_Beard','Charlies Beard',5,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,4096,NULL,'1',NULL,700,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19515,'Yellow_Hat','Yellow Hat',5,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,1024,NULL,'1',NULL,701,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19516,'Singing_Bird','Singing Bird',5,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,1024,NULL,'1',NULL,702,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19517,'Chicken_Crest','Chicken Crest',5,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,1024,NULL,'1',NULL,703,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19518,'Rainbow','Rainbow',5,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,1024,NULL,'1',NULL,704,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19519,'Thunderstorm_Cloud','Thunderstorm Cloud',5,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,1024,NULL,'1',NULL,688,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19520,'Rain_Cloud','Rain Cloud',5,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,1024,NULL,'1',NULL,705,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19521,'Charlies_Hat','Charlies Hat',5,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,1024,NULL,'1',NULL,706,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19522,'Mini_Crown','Mini Crown',5,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,1024,NULL,'1',NULL,707,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19523,'Green_Ribbon','Green Ribbon',5,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,1024,NULL,'1',NULL,244,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19524,'Costume_Green_Feeler','Costume Green Feeler',5,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,1024,NULL,'1',NULL,85,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19525,'Costume_Mini_Glasses','Costume Mini Glasses',5,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,2048,NULL,'1',NULL,47,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19526,'Costume_Helm','Costume Helm',5,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,1024,NULL,'1',NULL,40,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19527,'Costume_Spiky_Band','Costume Spiky Band',5,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,1024,NULL,'1',NULL,43,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19528,'Costume_Iron_Cain','Costume Iron Cain',5,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,4096,NULL,'1',NULL,53,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19529,'Costume_Angel_Wing','Costume Angel Wing',5,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,1024,NULL,'1',NULL,38,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19530,'Costume_Wild_Rose','Costume Wild Rose',5,20,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,1024,NULL,'1',NULL,541,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19507,'Clear_Sun','Clear Sun',5,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,1024,NULL,'1',NULL,654,'bonus bUnbreakableHelm,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19508,'T_Gemmed_Sallet','T Gemmed Sallet',5,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,1024,NULL,'0',1,NULL,'bonus bUnbreakableHelm,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19509,'Butterfly_Wing_Ears','Butterfly Wing Ears',5,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,2048,NULL,'1',NULL,695,'bonus bUnbreakableHelm,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19510,'Screw_Stuck_in_Head','Screw Stuck in Head',5,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,2048,NULL,'1',NULL,696,'bonus bUnbreakableHelm,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19511,'Heart_Eye_Patch1','Heart Eye Patch 1',5,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,2048,NULL,'1',NULL,697,'bonus bUnbreakableHelm,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19512,'Heart_Eye_Patch2','Heart Eye Patch 2',5,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,2048,NULL,'1',NULL,698,'bonus bUnbreakableHelm,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19513,'Chicken_Bill','Chicken Bill',5,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,4096,NULL,'1',NULL,699,'bonus bUnbreakableHelm,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19514,'Charlies_Beard','Charlies Beard',5,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,4096,NULL,'1',NULL,700,'bonus bUnbreakableHelm,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19515,'Yellow_Hat','Yellow Hat',5,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,1024,NULL,'1',NULL,701,'bonus bUnbreakableHelm,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19516,'Singing_Bird','Singing Bird',5,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,1024,NULL,'1',NULL,702,'bonus bUnbreakableHelm,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19517,'Chicken_Crest','Chicken Crest',5,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,1024,NULL,'1',NULL,703,'bonus bUnbreakableHelm,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19518,'Rainbow','Rainbow',5,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,1024,NULL,'1',NULL,704,'bonus bUnbreakableHelm,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19519,'Thunderstorm_Cloud','Thunderstorm Cloud',5,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,1024,NULL,'1',NULL,688,'bonus bUnbreakableHelm,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19520,'Rain_Cloud','Rain Cloud',5,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,1024,NULL,'1',NULL,705,'bonus bUnbreakableHelm,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19521,'Charlies_Hat','Charlies Hat',5,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,1024,NULL,'1',NULL,706,'bonus bUnbreakableHelm,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19522,'Mini_Crown','Mini Crown',5,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,1024,NULL,'1',NULL,707,'bonus bUnbreakableHelm,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19523,'Green_Ribbon','Green Ribbon',5,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,1024,NULL,'1',NULL,244,'bonus bUnbreakableHelm,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19524,'Costume_Green_Feeler','Costume Green Feeler',5,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,1024,NULL,'1',NULL,85,'bonus bUnbreakableHelm,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19525,'Costume_Mini_Glasses','Costume Mini Glasses',5,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,2048,NULL,'1',NULL,47,'bonus bUnbreakableHelm,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19526,'Costume_Helm','Costume Helm',5,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,1024,NULL,'1',NULL,40,'bonus bUnbreakableHelm,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19527,'Costume_Spiky_Band','Costume Spiky Band',5,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,1024,NULL,'1',NULL,43,'bonus bUnbreakableHelm,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19528,'Costume_Iron_Cain','Costume Iron Cain',5,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,4096,NULL,'1',NULL,53,'bonus bUnbreakableHelm,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19529,'Costume_Angel_Wing','Costume Angel Wing',5,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,1024,NULL,'1',NULL,38,'bonus bUnbreakableHelm,0; bonus bVit,1; bonus bAgi,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19530,'Costume_Wild_Rose','Costume Wild Rose',5,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,1024,NULL,'1',NULL,541,'bonus bUnbreakableHelm,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19532,'C_Red_Bunny_Band','Red Bunny Band',5,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,1024,NULL,'1',NULL,640,'bonus bUnbreakableHelm,0; bonus bDex,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19533,'C_Spore_Hat','Costume Spore Hat',5,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,1024,NULL,'1',NULL,114,'bonus bUnbreakableHelm,0; bonus bVit,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19535,'C_Sinsuncho_Hat','Costume Sinsuncho Hat',5,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,1024,NULL,'1',NULL,730,'bonus bUnbreakableHelm,0; bonus bStr,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19536,'C_Rose_Corsage','Costume Rose Corsage',5,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,1024,NULL,'1',NULL,533,'bonus bUnbreakableHelm,0; bonus bInt,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19537,'C_Gryphon_Hat','Costume Gryphon Hat',5,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,1024,NULL,'1',NULL,591,'bonus bUnbreakableHelm,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19538,'Full_Moon','Full Moon',5,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,1024,NULL,'1',NULL,780,'bonus bUnbreakableHelm,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19541,'C_Romantic_White_Flower','Costume Romantic White Flower',5,20,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,4096,NULL,'1',NULL,259,'bonus bUnbreakableHelm,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19542,'C_Devil_Whisper','Costume Devil Whisper',5,20,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,2048,NULL,'1',NULL,712,'bonus bUnbreakableHelm,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19543,'Oliver_Wolf_Hood','Oliver Wold Hood',5,20,NULL,300,NULL,NULL,NULL,1,0xFFFFFFFF,7,2,1024,NULL,'70',NULL,849,'bonus bUnbreakableHelm,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19544,'C_Tare_Neko_Cru','Costume Tare Neko Cru',5,20,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,1024,NULL,'1',NULL,692,'bonus bUnbreakableHelm,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19545,'C_Boys_Cap','Costume Boys Hat',5,20,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,1024,NULL,'100',NULL,102,'bonus bUnbreakableHelm,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19546,'C_Valkyrie_Helm','Costume Valkyrie Helm',5,20,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,1024,NULL,'100',NULL,225,'bonus bUnbreakableHelm,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19547,'C_Deviruchi_Cap','Costume Deviruchi Cap',5,20,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,1024,NULL,'100',NULL,123,'bonus bUnbreakableHelm,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19548,'C_Frog_Cap','Costume Frog Cap',5,20,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,1024,NULL,'100',NULL,448,NULL,'bonus bUnbreakableHelm,0;',NULL);
+REPLACE INTO `item_db_re` VALUES (19549,'C_Magestic_Goat','Costume Magestic Goat',5,20,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,1024,NULL,'100',NULL,41,'bonus bUnbreakableHelm,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19550,'C_Blush','Costume Blush',5,20,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,2048,NULL,'100',NULL,125,'bonus bUnbreakableHelm,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19551,'C_Elven_Ears','Costume Elven Ears',5,20,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,2048,NULL,'100',NULL,73,'bonus bUnbreakableHelm,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19552,'C_Centimental_Flower','Costume Centimental Flower',5,20,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,4096,NULL,'100',NULL,56,'bonus bUnbreakableHelm,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19553,'C_Assassin_Mask_','Costume Assassin Mask',5,20,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,4096,NULL,'100',NULL,180,'bonus bUnbreakableHelm,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19573,'C_Heart_Wing_Hairband','Costume Heart Wing Hairband',5,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,1024,NULL,'1',1,733,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19587,'C_King_Poring_Hat','Costume King Poring Hat',5,NULL,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,1024,NULL,'1',NULL,905,'bonus bUnbreakableHelm,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19650,'C_Rainbow_Feather_Deco','Costume Rainbow Feather Deco',5,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,1024,NULL,'1',1,934,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20500,'T_Archangel_Wing','Archangel Wing',5,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,8192,NULL,'1',NULL,1,'bonus bUnbreakableHelm,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20600,'Fantastic_Aura','Fantastic Aura',5,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,16384,NULL,'1',NULL,NULL,'bonus bUnbreakableHelm,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20700,'Egir_Manteau','Egir Manteau',5,200000,NULL,300,NULL,10,NULL,1,0xFFFFFFFF,7,2,4,NULL,'110',1,NULL,'bonus bUnbreakableHelm,0;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (20724,'Love_Dad_Wings_2012','Love Dad Wings 2012',5,NULL,NULL,100,NULL,15,NULL,1,0xFFFFFFFF,7,2,4,NULL,'1',1,5,NULL,NULL,NULL);
 # More 2-Handed Swords
 REPLACE INTO `item_db_re` VALUES (21001,'Bellum_Claymore','Bellum Claymore',4,20,NULL,3500,'260',NULL,1,NULL,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;}"; }',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (21002,'Bellum_Katzbalger','Bellum Katzbalger',4,20,NULL,2500,'100',NULL,1,NULL,0x00004082,7,2,34,4,'95',1,3,'bonus2 bSPVanishRate,10000,8;',NULL,NULL);

+ 8 - 8
sql-files/mob_db_re.sql

@@ -1246,7 +1246,7 @@ REPLACE INTO `mob_db` VALUES (2070,'PIRANHA','Piranha','Piranha',75,4522,1,899,1
 REPLACE INTO `mob_db` VALUES (2071,'HEADLESS_MULE','Headless Mule','Headless Mule',80,6620,1,1011,1120,1,210,267,33,44,68,51,50,35,67,20,10,12,2,6,63,0x3985,165,1216,816,432,0,0,0,0,0,0,0,7120,4000,2317,5,7097,1000,7122,1000,1269,1,2317,1,1255,2,0,0,0,0,0,0);
 REPLACE INTO `mob_db` VALUES (2072,'JAGUAR','Jaguar','Jaguar',71,3914,1,720,512,1,192,234,44,15,69,30,45,5,59,5,10,12,1,2,42,0x91,150,576,1248,480,0,0,0,0,0,0,0,7171,3000,7172,2000,919,1000,756,40,1810,1,0,0,0,0,0,0,0,0,0,0);
 REPLACE INTO `mob_db` VALUES (2073,'TOUCAN','Toucan','Toucan',70,3640,1,659,544,1,166,201,12,12,54,14,40,35,44,10,10,12,1,2,44,0x1089,155,960,1440,960,0,0,0,0,0,0,0,917,3000,7053,1000,510,50,508,100,2612,200,0,0,0,0,0,0,0,0,0,0);
-REPLACE INTO `mob_db` VALUES (2074,'CURUPIRA','Curupira','Curupira',68,3096,1,622,450,1,140,175,42,12,32,23,38,20,45,10,10,12,1,7,22,0x118B,250,528,480,384,0,0,0,0,0,0,0,517,3000,757,250,1011,10,7267,500,1505,100,0,0,0,0,0,0,0,0,0,0);
+REPLACE INTO `mob_db` VALUES (2074,'CURUPIRA','Curupira','Curupira',68,3096,1,622,450,1,140,175,42,12,32,23,38,20,45,10,10,12,1,7,22,0x108B,250,528,480,384,0,0,0,0,0,0,0,517,3000,757,250,1011,10,7267,500,1505,100,0,0,0,0,0,0,0,0,0,0);
 
 # Event MVP
 REPLACE INTO `mob_db` VALUES (2075,'E_VADON_X','Ragunta','Ragunta',150,25000000,0,9999999,9999999,1,7000,10000,500,500,100,100,100,100,100,100,10,12,2,5,88,0x37B5,150,1632,432,540,4999999,0,0,0,0,0,0,960,5000,7095,3000,7093,3000,984,1000,985,500,7444,50,617,10,0,0,0,0,6414,9000);
@@ -1315,19 +1315,19 @@ REPLACE INTO `mob_db` VALUES (2129,'M_LUCIOLA_VESPA','Luciola Vespa','Luciola Ve
 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);
 
 # Bifrost (14.1)
-REPLACE INTO `mob_db` VALUES (2131,'LOST_DRAGON','Lost Dragon','Lost Dragon',135,608920,0,30000,30000,3,1050,1580,60,51,140,81,69,122,98,61,10,12,2,9,67,0x3795,150,840,648,576,15000,617,2500,616,5000,0,0,2610,1000,13062,1000,607,1000,608,500,610,500,1985,500,2854,300,0,0,0,0,0,0);
+REPLACE INTO `mob_db` VALUES (2131,'LOST_DRAGON','Lost Dragon','Lost Dragon',135,608920,0,30000,30000,3,1050,1580,60,51,140,81,69,122,98,61,10,12,2,9,67,0x3695,150,840,648,576,15000,617,2500,616,5000,0,0,2610,1000,13062,1000,607,1000,608,500,610,500,1985,500,2854,300,0,0,0,0,0,0);
 REPLACE INTO `mob_db` VALUES (2132,'POM_SPIDER','Pom Spider','Pom Spider',145,122110,1,8010,8037,1,632,847,240,115,156,85,178,88,139,102,10,12,1,4,62,0x3985,250,864,1056,576,0,0,0,0,0,0,0,12573,500,11520,1000,1042,1000,13431,10,1654,3,0,0,0,0,0,0,0,0,4514,1);
 REPLACE INTO `mob_db` VALUES (2133,'ANGRA_MANTIS','Angra Mantis','Angra Mantis',144,91720,1,7790,7020,1,579,756,175,81,122,155,119,81,132,79,10,12,1,4,42,0x3985,150,576,480,480,0,0,0,0,0,0,0,6086,5000,7194,1000,997,10,1830,10,0,0,0,0,0,0,0,0,0,0,4513,1);
 REPLACE INTO `mob_db` VALUES (2134,'PARUS','Parus','Parus',142,86990,1,7310,6990,1,511,663,161,39,80,136,128,44,105,51,10,12,0,2,42,0x3885,180,384,792,432,0,0,0,0,0,0,0,6393,5000,7063,1000,12736,100,6383,5000,6383,3000,6383,1000,0,0,0,0,0,0,4512,1);
 REPLACE INTO `mob_db` VALUES (2135,'CREEPER','Creeper','Creeper',100,1000,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,1,3,22,0x40,2000,192,192,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 (2136,'LITTLE_FATUM','Little Fatum','Little Fatum',142,85100,1,7500,6500,1,442,894,51,198,10,66,17,148,148,97,10,12,0,7,44,0x3885,150,432,300,432,0,0,0,0,0,0,0,6395,5000,7938,100,11519,100,2465,3,0,0,0,0,0,0,0,0,0,0,4511,1);
 REPLACE INTO `mob_db` VALUES (2137,'MIMING','Miming','Miming',140,81200,1,7100,6300,1,430,652,120,120,90,66,105,77,133,77,10,12,0,0,20,0x3885,250,576,1140,504,0,0,0,0,0,0,0,6394,5000,7938,100,969,1,2853,3,0,0,0,0,0,0,0,0,0,0,4510,1);
-REPLACE INTO `mob_db` VALUES (2138,'NYDHOG_MEMORY1_1','Nydhogg\'s Memory','Nydhogg\'s Memory',130,10,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,0xC9,200,1248,576,1248,0,0,0,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 (2139,'NYDHOG_MEMORY1_2','Nydhogg\'s Memory','Nydhogg\'s Memory',130,10,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,0xC9,200,1248,576,1248,0,0,0,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 (2140,'NYDHOG_MEMORY2_1','Nydhogg\'s Memory','Nydhogg\'s Memory',130,10,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,0xC9,200,1248,576,1248,0,0,0,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 (2141,'NYDHOG_MEMORY2_2','Nydhogg\'s Memory','Nydhogg\'s Memory',130,10,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,0xC9,200,1248,576,1248,0,0,0,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 (2142,'NYDHOG_MEMORY3_1','Nydhogg\'s Memory','Nydhogg\'s Memory',130,10,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,0xC9,200,1248,576,1248,0,0,0,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 (2143,'NYDHOG_MEMORY3_2','Nydhogg\'s Memory','Nydhogg\'s Memory',130,10,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,0xC9,200,1248,576,1248,0,0,0,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 (2138,'NYDHOG_MEMORY1_1','Nydhogg\'s Memory','Nydhogg\'s Memory',130,10,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,0x161,200,1248,576,1248,0,0,0,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 (2139,'NYDHOG_MEMORY1_2','Nydhogg\'s Memory','Nydhogg\'s Memory',130,10,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,0x161,200,1248,576,1248,0,0,0,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 (2140,'NYDHOG_MEMORY2_1','Nydhogg\'s Memory','Nydhogg\'s Memory',130,10,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,0x161,200,1248,576,1248,0,0,0,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 (2141,'NYDHOG_MEMORY2_2','Nydhogg\'s Memory','Nydhogg\'s Memory',130,10,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,0x161,200,1248,576,1248,0,0,0,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 (2142,'NYDHOG_MEMORY3_1','Nydhogg\'s Memory','Nydhogg\'s Memory',130,10,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,0x161,200,1248,576,1248,0,0,0,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 (2143,'NYDHOG_MEMORY3_2','Nydhogg\'s Memory','Nydhogg\'s Memory',130,10,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,0x161,200,1248,576,1248,0,0,0,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 (2144,'G_ANTLER_SCARABA','Antler Scaraba','Antler Scaraba',136,62600,1,0,0,1,412,822,155,102,23,99,59,129,91,45,10,12,1,4,42,0x3985,200,504,624,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 (2145,'G_RAKE_SCARABA','Rake Scaraba','Rake Scaraba',139,67700,1,0,0,1,830,942,250,70,90,66,145,52,112,77,10,12,1,4,42,0x3985,150,588,768,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 (2146,'G_S_NYDHOG','G_S_NYDHOG','G_S_NYDHOG',117,300000,0,0,0,2,840,1680,60,60,1,30,30,136,88,30,10,12,2,9,87,0x37B5,150,1596,1620,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);

+ 2 - 3
src/map/atcommand.c

@@ -5672,12 +5672,11 @@ ACMD_FUNC(autotrade)
 	}
 
 	sd->state.autotrade = 1;
-	if( battle_config.at_timeout )
-	{
+	if( battle_config.at_timeout ) {
 		int timeout = atoi(message);
 		status_change_start(&sd->bl, SC_AUTOTRADE, 10000, 0, 0, 0, 0, ((timeout > 0) ? min(timeout,battle_config.at_timeout) : battle_config.at_timeout) * 60000, 0);
 	}
-	clif_authfail_fd(fd, 15);
+	clif_authfail_fd(sd->fd, 15);
 
 	return 0;
 }

+ 1 - 1
src/map/battle.c

@@ -5204,7 +5204,7 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f
 		case BL_MOB:
 			if(((((TBL_MOB*)target)->special_state.ai == 2 || //Marine Spheres
 				(((TBL_MOB*)target)->special_state.ai == 3 && battle_config.summon_flora&1)) && //Floras
-				s_bl->type == BL_PC && src->type != BL_MOB) || ((TBL_MOB*)target)->special_state.ai == 4) //Zanzoe
+				s_bl->type == BL_PC && src->type != BL_MOB) || ((TBL_MOB*)target)->special_state.ai == 4 && t_bl->id != src->id) //Zanzoe
 			{	//Targettable by players
 				state |= BCT_ENEMY;
 				strip_enemy = 0;

+ 3 - 3
src/map/mob.c

@@ -112,9 +112,9 @@ int mobdb_searchname(const char *str)
 static int mobdb_searchname_array_sub(struct mob_db* mob, const char *str)
 {
 	if (mob == mob_dummy)
-		return 1; //Invalid mob.
-	if(!mob->base_exp && !mob->job_exp)
-		return 1; //Discount slave-mobs (no exp) as requested by Playtester. [Skotlex]
+		return 1;
+	if(!mob->base_exp && !mob->job_exp && mob->spawn[0].qty < 1)
+		return 1; // Monsters with no base/job exp and no spawn point are, by this criteria, considered "slave mobs" and excluded from search results
 	if(stristr(mob->jname,str))
 		return 0;
 	if(stristr(mob->name,str))

+ 13 - 2
src/map/pc.c

@@ -1282,10 +1282,21 @@ int pc_calc_skilltree(struct map_session_data *sd)
 	}
 	c = pc_class2idx(c);
 
-	for( i = 0; i < MAX_SKILL; i++ )
-	{
+	for( i = 0; i < MAX_SKILL; i++ ) {
 		if( sd->status.skill[i].flag != SKILL_FLAG_PLAGIARIZED && sd->status.skill[i].flag != SKILL_FLAG_PERM_GRANTED ) //Don't touch these
 			sd->status.skill[i].id = 0; //First clear skills.
+		/* permanent skills that must be re-checked */
+		if( sd->status.skill[i].flag == SKILL_FLAG_PERM_GRANTED ) {
+			switch( i ) {
+				case NV_TRICKDEAD:
+					if( (sd->class_&MAPID_UPPERMASK) != MAPID_NOVICE ) {
+							sd->status.skill[i].id = 0;
+							sd->status.skill[i].lv = 0;
+							sd->status.skill[i].flag = 0;
+					}
+					break;
+			}
+		}
 	}
 
 	for( i = 0; i < MAX_SKILL; i++ )

+ 3 - 2
src/map/status.c

@@ -997,6 +997,7 @@ void initChangeTables(void) {
 		StatusIconChangeTable[SC_HALLUCINATION] = SI_BLANK;
 
 	/* StatusChangeState (SCS_) NOMOVE */
+	StatusChangeStateTable[SC_ANKLE]               |= SCS_NOMOVE;
 	StatusChangeStateTable[SC_AUTOCOUNTER]         |= SCS_NOMOVE;
 	StatusChangeStateTable[SC_TRICKDEAD]           |= SCS_NOMOVE;
 	StatusChangeStateTable[SC_BLADESTOP]           |= SCS_NOMOVE;
@@ -1019,9 +1020,9 @@ void initChangeTables(void) {
 	StatusChangeStateTable[SC_CRYSTALIZE]          |= SCS_NOMOVE|SCS_NOMOVECOND;
 	StatusChangeStateTable[SC_NETHERWORLD]         |= SCS_NOMOVE;
 	StatusChangeStateTable[SC_CAMOUFLAGE]          |= SCS_NOMOVE|SCS_NOMOVECOND;
-	StatusChangeStateTable[SC_MEIKYOUSISUI]		   |= SCS_NOMOVE;
+	StatusChangeStateTable[SC_MEIKYOUSISUI]        |= SCS_NOMOVE;
 	StatusChangeStateTable[SC_KAGEHUMI]            |= SCS_NOMOVE;
-	StatusChangeStateTable[SC_KYOUGAKU]			   |= SCS_NOMOVE;
+	StatusChangeStateTable[SC_KYOUGAKU]            |= SCS_NOMOVE;
 
 	/* StatusChangeState (SCS_) NOPICKUPITEMS */
 	StatusChangeStateTable[SC_HIDING]              |= SCS_NOPICKITEM;

+ 0 - 7
src/map/unit.c

@@ -352,8 +352,6 @@ int unit_walktoxy( struct block_list *bl, short x, short y, int flag)
 		map_random_dir(bl, &ud->to_x, &ud->to_y);
 
 	if(ud->walktimer != INVALID_TIMER) {
-		if( !battle_config.skill_trap_type && sc && map_flag_gvg(bl->m) && sc->data[SC_ANKLE] ) // Ankle disallows you from changing your path
-		return 0;
 		// When you come to the center of the grid because the change of destination while you're walking right now
 		// Call a function from a timer unit_walktoxy_sub
 		ud->state.change_walk_target = 1;
@@ -429,8 +427,6 @@ int unit_walktobl(struct block_list *bl, struct block_list *tbl, int range, int
 		map_random_dir(bl, &ud->to_x, &ud->to_y);
 
 	if(ud->walktimer != INVALID_TIMER) {
-		if( !battle_config.skill_trap_type && sc && map_flag_gvg(bl->m) && sc->data[SC_ANKLE] ) // Ankle disallows you from changing your path
-		return 0;
 		ud->state.change_walk_target = 1;
 		set_mobstate(bl, flag&2);
 		return 1;
@@ -937,9 +933,6 @@ int unit_can_move(struct block_list *bl) {
 			)
 			return 0;
 
-		if( sc->data[SC_ANKLE] && ( battle_config.skill_trap_type || ( !map_flag_gvg(bl->m) && !unit_is_walking(bl) ) ) ) // Ankle only stops you after you're done moving
-			return 0;
-
 		if (sc->opt1 > 0 && sc->opt1 != OPT1_STONEWAIT && sc->opt1 != OPT1_BURNING && !(sc->opt1 == OPT1_CRYSTALIZE && bl->type == BL_MOB))
 			return 0;