Merge branch 'master' of https://github.com/HerculesWS/Hercules

1 files changed, 7 insertions, 7 deletions

diff --git a/sql-files/item_db_re.sql b/sql-files/item_db_re.sql
index 1d5c0c8e2..83fd564b8 100644
--- a/sql-files/item_db_re.sql
+++ b/sql-files/item_db_re.sql
@@ -7945,7 +7945,7 @@ REPLACE INTO `item_db` VALUES ('18557','Devil_Team_Helm','Devil\'s Symbol','5','
 REPLACE INTO `item_db` VALUES ('18558','Sinsuncho_Hat','Sinsuncho Hat','5','20','10','1000','0','0','0','0','0','4294967295','63','2','256','0','10',NULL,'0','730','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus2 bExpAddRace,RC_Plant,5; bonus2 bSubRace,RC_Plant,-10;','','');
 REPLACE INTO `item_db` VALUES ('18559','Fafnir_Skin','Fafunirusukin','5','20','10','100','0','0','3','0','0','4294967295','63','2','512','0','50',NULL,'0','152','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','','','');
 REPLACE INTO `item_db` VALUES ('18560','Fafnir_Mask','Fafunirumasuku','5','20','10','300','0','0','2','0','0','4294967295','63','2','1','0','50',NULL,'0','180','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','','','');
-REPLACE INTO `item_db` VALUES ('18561','B_Feather_Beret','Black Feather Beret','5','20','10','300','0','0','5','0','1','4294967295','63','2','256','0','40',NULL,'1','731','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bVit,2; bonus bMdef,3; bonus2 bAddRaceTolerace,RC_DemiHuman,10;','','');
+REPLACE INTO `item_db` VALUES ('18561','B_Feather_Beret','Black Feather Beret','5','20','10','300','0','0','5','0','1','4294967295','63','2','256','0','40',NULL,'1','731','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bVit,2; bonus bMdef,3; bonus2 bAddRaceTolerance,RC_DemiHuman,10;','','');
 REPLACE INTO `item_db` VALUES ('18562','Bone_Hat','Death Corsage','5','20','10','200','0','0','3','0','1','4294967295','63','2','256','0','10',NULL,'1','732','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bMdef,3;','','');
 REPLACE INTO `item_db` VALUES ('18563','Heart_Wing_Hairband','Heart Wing Headband','5','20','10','300','0','0','0','0','1','4294967295','63','2','256','0','50',NULL,'1','733','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','','','');
 REPLACE INTO `item_db` VALUES ('18564','Love_Piece','Fragments of The Love','5','20','10','200','0','0','0','0','0','4294967295','63','2','1','0','50',NULL,'0','734','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','','','');
@@ -7984,8 +7984,8 @@ REPLACE INTO `item_db` VALUES ('18596','Sprout_Hat','Sprout Hat','5','45000','22
 REPLACE INTO `item_db` VALUES ('18597','Mercury_Helm','Mercury Riser','5','45000','22500','400','0','0','10','0','1','4294967295','63','2','256','0','70',NULL,'1','759','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bAspdRate,3; bonus bCritical,3; if(getrefine() >= 7) { bonus bAspdRate,2; bonus bCritical,2; } if(getrefine() >= 9) { bonus bAspdRate,2; bonus bCritical,2; }','','');
 REPLACE INTO `item_db` VALUES ('18598','Mini_Tree_J','Holy xmas Tree','5','20','10','50','0','0','0','0','1','4294967295','63','2','256','0','0',NULL,'0','727','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bMdef,20;','','');
 REPLACE INTO `item_db` VALUES ('18599','Black_Devil_Mask','Black Devil\'s Mask','5','20','10','100','0','0','0','0','0','4294967295','63','2','512','0','0',NULL,'0','760','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bAllStats,2;','','');
-REPLACE INTO `item_db` VALUES ('18600','Cat_Ears_Beret','Cat Ear Beret','5','20','10','300','0','0','5','0','1','4294967295','63','2','256','0','0',NULL,'1','761','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bAtkRate,5; if(getrefine() > 5 && getrefine() <= 12) { bonus2 bAddRace,RC_DemiHuman,(getrefine() - 5); bonus2 AddRaceTolerace,RC_DemiHuman,(getrefine() - 5); } if(getrefine() > 12) { bonus2 bAddRace,RC_DemiHuman,7; bonus2 AddRaceTolerace,RC_DemiHuman,7; }','','');
-REPLACE INTO `item_db` VALUES ('18601','Red_Bread_Hat','Red Pom Band','5','20','10','300','0','0','0','0','1','4294967295','63','2','256','0','0',NULL,'1','762','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bMdef,5; if(getrefine() > 5 && getrefine() <= 12) { bonus2 bAddRaceTolerace,RC_DemiHuman,(getrefine() - 5); bonus2 bMagicAddRace,RC_DemiHuman,(getrefine() - 5); } if(getrefine() > 12) { bonus2 bAddRaceTolerace,RC_DemiHuman,7; bonus2 bMagicAddRace,RC_DemiHuman,7; }','','');
+REPLACE INTO `item_db` VALUES ('18600','Cat_Ears_Beret','Cat Ear Beret','5','20','10','300','0','0','5','0','1','4294967295','63','2','256','0','0',NULL,'1','761','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bAtkRate,5; if(getrefine() > 5 && getrefine() <= 12) { bonus2 bAddRace,RC_DemiHuman,(getrefine() - 5); bonus2 AddRaceTolerance,RC_DemiHuman,(getrefine() - 5); } if(getrefine() > 12) { bonus2 bAddRace,RC_DemiHuman,7; bonus2 AddRacetolerance,RC_DemiHuman,7; }','','');
+REPLACE INTO `item_db` VALUES ('18601','Red_Bread_Hat','Red Pom Band','5','20','10','300','0','0','0','0','1','4294967295','63','2','256','0','0',NULL,'1','762','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bMdef,5; if(getrefine() > 5 && getrefine() <= 12) { bonus2 bAddRaceTolerance,RC_DemiHuman,(getrefine() - 5); bonus2 bMagicAddRace,RC_DemiHuman,(getrefine() - 5); } if(getrefine() > 12) { bonus2 bAddRaceTolerance,RC_DemiHuman,7; bonus2 bMagicAddRace,RC_DemiHuman,7; }','','');
 REPLACE INTO `item_db` VALUES ('18602','Watermelon_Slice','Watermelon Bite','5','20','10','100','0','0','0','0','0','4294967295','63','2','1','0','30',NULL,'0','763','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bUnbreakableHelm,0; bonus bMdef,4; bonus2 bAddEle,Ele_Fire,4;','','');
 REPLACE INTO `item_db` VALUES ('18603','Black_Devil_Mask_','Black Devil\'s Mask','5','20','10','100','0','0','0','0','1','4294967295','63','2','512','0','0',NULL,'0','760','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bAllStats,1;','','');
 REPLACE INTO `item_db` VALUES ('18604','Falcon_Mask','Falcon Mask','5','10','5','30','0','0','0','0','1','4294967295','63','2','513','0','50',NULL,'0','782','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','','','');
@@ -8032,7 +8032,7 @@ REPLACE INTO `item_db` VALUES ('18644','Paperhand_Model','Paperhand Model','5','
 REPLACE INTO `item_db` VALUES ('18645','Sailor_Hat','Sailor Hat','5','20','10','200','0','0','2','0','0','4294967295','63','2','256','0','0',NULL,'1','798','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bInt,1;','','');
 REPLACE INTO `item_db` VALUES ('18646','Cow_Hat','Cow Hat','5','20','10','300','0','0','4','0','1','4294967295','63','2','256','0','0',NULL,'1','799','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','','','');
 REPLACE INTO `item_db` VALUES ('18647','Star_Eyepatch','Stunning Star Eyepatch','5','20','10','100','0','0','0','0','0','4294967295','63','2','512','0','0',NULL,'0','800','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus2 bResEff,Eff_Stun,1500;','','');
-REPLACE INTO `item_db` VALUES ('18648','Tongue_Charm','Tongue Charm','5','20','10','100','0','0','0','0','0','4294967295','63','2','1','0','0',NULL,'0','801','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus2 bAddRaceTolerace,RC_Demon,3;','','');
+REPLACE INTO `item_db` VALUES ('18648','Tongue_Charm','Tongue Charm','5','20','10','100','0','0','0','0','0','4294967295','63','2','1','0','0',NULL,'0','801','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus2 bAddRaceTolerance,RC_Demon,3;','','');
 REPLACE INTO `item_db` VALUES ('18649','Lude_Mask','Lude Mask','5','10','5','100','0','0','1','0','0','4294967295','63','2','513','0','0',NULL,'1','802','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','','','');
 REPLACE INTO `item_db` VALUES ('18650','RWC_Shouting_Mouth','RWC Shouting Mouth','5','20','10','50','0','0','0','0','0','4294967295','63','2','1','0','0',NULL,'0','194','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','','','');
 REPLACE INTO `item_db` VALUES ('18651','Ignis_Cap','Ignis Cap','5','20','10','800','0','0','8','0','1','4294967295','63','2','256','0','40',NULL,'1','803','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','','','');
@@ -8054,7 +8054,7 @@ REPLACE INTO `item_db` VALUES ('18666','CD_In_Mouth','CD In Mouth','5','20','10'
 REPLACE INTO `item_db` VALUES ('18667','Cat_Lace_Hairband','Cat Lace Hairband','5','20','10','500','0','0','2','0','0','2147483646','63','2','256','0','60',NULL,'0','816','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bDex,3;','','');
 REPLACE INTO `item_db` VALUES ('18668','Droopy_Turtle_Hat','Droopy Turtle Hat','5','20','10','300','0','0','1','0','1','4294967295','63','2','256','0','0',NULL,'1','694','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','','','');
 REPLACE INTO `item_db` VALUES ('18669','Cowhide_Hat','Cowhide Hat','5','20','10','200','0','0','3','0','1','2147483646','63','2','256','0','0',NULL,'1','819','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bDex,2;','','');
-REPLACE INTO `item_db` VALUES ('18670','Hankie_In_Mouth','Handkerchief In Mouth','5','20','10','100','0','0','1','0','0','4294967295','63','2','1','0','12',NULL,'0','818','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus2 bAddRaceTolerace,RC_DemiHuman,3;','','');
+REPLACE INTO `item_db` VALUES ('18670','Hankie_In_Mouth','Handkerchief In Mouth','5','20','10','100','0','0','1','0','0','4294967295','63','2','1','0','12',NULL,'0','818','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus2 bAddRaceTolerance,RC_DemiHuman,3;','','');
 REPLACE INTO `item_db` VALUES ('18671','Rudolf_Hairband','Rudolf Hairband','5','20','10','200','0','0','5','0','0','4294967295','63','2','256','0','30',NULL,'1','836','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus3 bAutoSpell,AL_INCAGI,10,50; bonus2 bAddItemHealRate,Carrot,2000;','','');
 REPLACE INTO `item_db` VALUES ('18672','Tare_Pope','Flap Pope','5','20','10','300','0','0','0','0','0','4294967295','63','2','256','0','0',NULL,'0','817','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bMdef,1; bonus bUnbreakableHelm,0;','','');
 REPLACE INTO `item_db` VALUES ('18673','Tare_Pope_','Chibi Pope','5','20','10','300','0','0','0','0','1','4294967295','63','2','256','0','0',NULL,'1','817','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bMdef,1; bonus bUnbreakableHelm,0;','','');
@@ -8067,7 +8067,7 @@ REPLACE INTO `item_db` VALUES ('18679','Abacus_In_Mouth','Abacus In Mouth','5','
 REPLACE INTO `item_db` VALUES ('18680','Tw_Frog_Hat','Tw Frog Hat','5','20','10','200','0','0','2','0','0','4294967295','63','2','256','0','35',NULL,'0','826','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bAgi,1;','','');
 REPLACE INTO `item_db` VALUES ('18681','Puppy_Ears_Hat','Puppy Ears Hat','5','20','10','200','0','0','2','0','0','4294967295','63','2','256','0','0',NULL,'1','827','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bVit,2;','','');
 REPLACE INTO `item_db` VALUES ('18682','Teardrop','Teardrop','5','20','10','100','0','0','1','0','0','4294967295','63','2','512','0','0',NULL,'1','828','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bMaxSP,15;','','');
-REPLACE INTO `item_db` VALUES ('18683','Carrot_In_Mouth','Carrot In Mouth','5','20','10','200','0','0','1','0','0','4294967295','63','2','1','0','0',NULL,'0','829','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus2 bAddRaceTolerace,RC_Plant,3','','');
+REPLACE INTO `item_db` VALUES ('18683','Carrot_In_Mouth','Carrot In Mouth','5','20','10','200','0','0','1','0','0','4294967295','63','2','1','0','0',NULL,'0','829','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus2 bAddRaceTolerance,RC_Plant,3','','');
 REPLACE INTO `item_db` VALUES ('18684','Showy_High_Cap','Showy High Cap','5','20','10','200','0','0','3','0','1','2147483646','63','2','256','0','0',NULL,'1','11','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bStr,3; bonus bInt,2;','','');
 REPLACE INTO `item_db` VALUES ('18685','Stardust_Hairband','Stardust Hairband','5','20','10','1000','0','0','0','0','0','4294967295','63','2','256','0','10',NULL,'0','831','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','','','');
 REPLACE INTO `item_db` VALUES ('18686','2011_RMSC_1','2011 RMSC 1','5','20','10','2500','0','0','20','0','1','4294967295','63','2','256','0','0',NULL,'0','832','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bUnbreakableHelm,0; bonus bAllStats,5;','','');
@@ -8277,7 +8277,7 @@ REPLACE INTO `item_db` VALUES ('19538','Full_Moon','Costume: Full Moon','5','20'
 REPLACE INTO `item_db` VALUES ('19539','C_Reginleif_Hairband','Costume: Hairband Wing','5','20','10','0','0','0','0','0','0','4294967295','63','2','3072','0','0',NULL,'0','468','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bAllStats,1;','','');
 REPLACE INTO `item_db` VALUES ('19540','C_Rabbit_Earplug','Costume: Bunny Ear Costume','5','20','10','0','0','0','0','0','0','4294967295','63','2','3072','0','0',NULL,'0','515','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bAgi,1; bonus bFlee,2;','','');
 REPLACE INTO `item_db` VALUES ('19541','C_Romantic_White_Flower','Costume: White Flower','5','20','10','0','0','0','0','0','0','4294967295','63','2','4096','0','0',NULL,'0','259','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bUnbreakableHelm,0;','','');
-REPLACE INTO `item_db` VALUES ('19542','C_Devil_Whisper','Costume: Devil\'s Whisper','5','20','10','0','0','0','0','0','0','4294967295','63','2','2048','0','0',NULL,'0','712','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bUnbreakableHelm,0; bonus2 bAddRaceTolerace,RC_Angel,1; bonus2 bAddRaceTolerace,RC_Demon,1; bonus3 bAddMonsterDropItem,523,RC_Angel,400; bonus3 bAddMonsterDropItem,12020,RC_Demon,400;','','');
+REPLACE INTO `item_db` VALUES ('19542','C_Devil_Whisper','Costume: Devil\'s Whisper','5','20','10','0','0','0','0','0','0','4294967295','63','2','2048','0','0',NULL,'0','712','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bUnbreakableHelm,0; bonus2 bAddRaceTolerance,RC_Angel,1; bonus2 bAddRaceTolerance,RC_Demon,1; bonus3 bAddMonsterDropItem,523,RC_Angel,400; bonus3 bAddMonsterDropItem,12020,RC_Demon,400;','','');
 REPLACE INTO `item_db` VALUES ('19543','Oliver_Wolf_Hood','Costume: Oliver Wolf Hood','5','20','10','300','0','0','0','0','0','4294967295','63','2','1024','0','70',NULL,'1','849','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bUnbreakableHelm,0;','','');
 REPLACE INTO `item_db` VALUES ('19544','C_Tare_Neko_Cru','Costume: Drooping Neko Crew Costume','5','20','10','0','0','0','0','0','0','4294967295','63','2','1024','0','0',NULL,'0','692','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bUnbreakableHelm,0;','','');
 REPLACE INTO `item_db` VALUES ('19545','C_Boy\'s_Cap','Costume: Boy\'s Cap','5','20','10','100','0','0','0','0','0','4294967295','63','2','1024','0','100',NULL,'0','102','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bUnbreakableHelm,0;','','');