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

2 files changed, 7 insertions, 7 deletions

diff --git a/sql-files/item_db.sql b/sql-files/item_db.sql
index 44d56bdde..651f1d00f 100644
--- a/sql-files/item_db.sql
+++ b/sql-files/item_db.sql
@@ -4601,8 +4601,8 @@ REPLACE INTO `item_db` VALUES ('12294','PC_Bang_Coin_Box1','PC-Room Coin Box','2
 REPLACE INTO `item_db` VALUES ('12295','PC_Bang_Coin_Box2','PC-Room Coin Box','2','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','0','0','0','507',NULL,'0',NULL,'0',NULL,'0','getitem 2739,1;','','');
 REPLACE INTO `item_db` VALUES ('12296','PC_Bang_Coin_Box3','PC-Room Coin Box','2','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','0','0','0','507',NULL,'0',NULL,'0',NULL,'0','getitem 2738,1;','','');
 REPLACE INTO `item_db` VALUES ('12297','PC_Bang_Coin_Box4','PC-Room Coin Box','2','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','0','0','0','507',NULL,'0',NULL,'0',NULL,'0','getitem 2738,2;','','');
-REPLACE INTO `item_db` VALUES ('12298','SP_Potion','SP Consumption Reduction Potion','2','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','0','0','0','507',NULL,'0',NULL,'0',NULL,'0','sc_start SC_ATKER_BLOOD,3600000,15;','','');
-REPLACE INTO `item_db` VALUES ('12299','Mega_Resist_Potion','Mega Resist Potion','2','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','0','0','0','507',NULL,'0',NULL,'0',NULL,'0','sc_start SC_TARGET_BLOOD,3600000,10;','','');
+REPLACE INTO `item_db` VALUES ('12298','SP_Potion','SP Consumption Reduction Potion','2','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','0','0','0','507',NULL,'0',NULL,'0',NULL,'0','specialeffect2 EF_SPELLBREAKER; sc_start SC_ATKER_BLOOD,3600000,15;','','');
+REPLACE INTO `item_db` VALUES ('12299','Mega_Resist_Potion','Mega Resist Potion','2','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','0','0','0','507',NULL,'0',NULL,'0',NULL,'0','specialeffect2 EF_GUARD; sc_start SC_TARGET_BLOOD,3600000,10;','','');
 REPLACE INTO `item_db` VALUES ('12300','Wild_Rose_Scroll','Wild Rose Contract','2','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','0','0','0','499',NULL,'0',NULL,'0',NULL,'0','mercenary_create 1965,1800000;','','');
 REPLACE INTO `item_db` VALUES ('12301','Doppelganger_Scroll','Doppelganger Contract','2','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','0','0','0','499',NULL,'0',NULL,'0',NULL,'0','mercenary_create 1966,1800000;','','');
 REPLACE INTO `item_db` VALUES ('12302','Ygnizem_Scroll','Egnigem Cenia Contract','2','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','0','0','0','499',NULL,'0',NULL,'0',NULL,'0','mercenary_create 1967,1800000;','','');
diff --git a/sql-files/item_db_re.sql b/sql-files/item_db_re.sql
index b2eb5f26f..147fb5b08 100644
--- a/sql-files/item_db_re.sql
+++ b/sql-files/item_db_re.sql
@@ -5873,8 +5873,8 @@ REPLACE INTO `item_db` VALUES ('12294','PC_Bang_Coin_Box1','Blue Christmas Cheer
 REPLACE INTO `item_db` VALUES ('12295','PC_Bang_Coin_Box2','Groove Pack 1','2','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','0','0','0','507',NULL,'0',NULL,'0',NULL,'0','getitem 2739,1;','','');
 REPLACE INTO `item_db` VALUES ('12296','PC_Bang_Coin_Box3','Splendid Spring Hat Box','2','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','0','0','0','507',NULL,'0',NULL,'0',NULL,'0','getitem 2738,1;','','');
 REPLACE INTO `item_db` VALUES ('12297','PC_Bang_Coin_Box4','Expanded Party Buff Scroll Box','2','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','0','0','0','507',NULL,'0',NULL,'0',NULL,'0','getitem 2738,2;','','');
-REPLACE INTO `item_db` VALUES ('12298','SP_Potion','SP Consumption Reduction Potion','2','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','0','0','0','507',NULL,'0',NULL,'0',NULL,'0','sc_start SC_ATKER_BLOOD,3600000,15;','','');
-REPLACE INTO `item_db` VALUES ('12299','Mega_Resist_Potion','Mega Resist Potion','2','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','0','0','0','507',NULL,'0',NULL,'0',NULL,'0','sc_start SC_TARGET_BLOOD,3600000,10;','','');
+REPLACE INTO `item_db` VALUES ('12298','SP_Potion','SP Consumption Reduction Potion','2','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','0','0','0','507',NULL,'0',NULL,'0',NULL,'0','specialeffect2 EF_SPELLBREAKER; sc_start SC_ATKER_BLOOD,3600000,15;','','');
+REPLACE INTO `item_db` VALUES ('12299','Mega_Resist_Potion','Mega Resist Potion','2','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','0','0','0','507',NULL,'0',NULL,'0',NULL,'0','specialeffect2 EF_GUARD; sc_start SC_TARGET_BLOOD,3600000,10;','','');
 REPLACE INTO `item_db` VALUES ('12300','Wild_Rose_Scroll','Wild Rose Contract','2','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','0','0','0','499',NULL,'0',NULL,'0',NULL,'0','mercenary_create 1965,1800000;','','');
 REPLACE INTO `item_db` VALUES ('12301','Doppelganger_Scroll','Doppelganger Contract','2','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','0','0','0','499',NULL,'0',NULL,'0',NULL,'0','mercenary_create 1966,1800000;','','');
 REPLACE INTO `item_db` VALUES ('12302','Ygnizem_Scroll','Egnigem Cenia Contract','2','0','0','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','0','0','0','499',NULL,'0',NULL,'0',NULL,'0','mercenary_create 1967,1800000;','','');
@@ -6382,9 +6382,9 @@ REPLACE INTO `item_db` VALUES ('12850','Heaven_Scroll','Heaven Scroll','11','20'
 REPLACE INTO `item_db` VALUES ('12851','Vocation_Scroll','Vocation Scroll','11','20','10','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','','','');
 REPLACE INTO `item_db` VALUES ('12852','Wisdom_Scroll','Wisdom Scroll','11','20','10','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','','','');
 REPLACE INTO `item_db` VALUES ('12853','Patron_Scroll','Patron Scroll','11','20','10','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','','','');
-REPLACE INTO `item_db` VALUES ('12884','C_Center_Potion','Infinite Concentration Potion','11','0','0','0','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','0','0','0','507',NULL,'0',NULL,'0',NULL,'0','sc_start SC_ATTHASTE_POTION1,1800000,4; specialeffect EF_POTION_CON; /* NOTE: No special effect when used. */','','');
-REPLACE INTO `item_db` VALUES ('12885','C_Awakening_Potion','Infinite Awakening Potion','11','0','0','0','0','0','0','0','0','2146959087','63','2','0','0','40',NULL,'0','0','0','0','0','0','507',NULL,'0',NULL,'0',NULL,'0','sc_start SC_ATTHASTE_POTION2,1800000,6; specialeffect EF_POTION_; /* NOTE: No special effect when used. */','','');
-REPLACE INTO `item_db` VALUES ('12886','C_Berserk_Potion','Infinite Berserk Potion','11','0','0','0','0','0','0','0','0','31868582','63','2','0','0','85',NULL,'0','0','0','0','0','0','507',NULL,'0',NULL,'0',NULL,'0','sc_start SC_ATTHASTE_POTION3,1800000,9; specialeffect EF_POTION_BERSERK; /* NOTE: No special effect when used. */','','');
+REPLACE INTO `item_db` VALUES ('12884','C_Center_Potion','Infinite Concentration Potion','11','0','0','0','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','0','0','0','507',NULL,'0',NULL,'0',NULL,'0','sc_start SC_ATTHASTE_POTION1,1800000,4; specialeffect2 EF_POTION_CON; /* NOTE: No special effect when used. */','','');
+REPLACE INTO `item_db` VALUES ('12885','C_Awakening_Potion','Infinite Awakening Potion','11','0','0','0','0','0','0','0','0','2146959087','63','2','0','0','40',NULL,'0','0','0','0','0','0','507',NULL,'0',NULL,'0',NULL,'0','sc_start SC_ATTHASTE_POTION2,1800000,6; specialeffect2 EF_POTION_; /* NOTE: No special effect when used. */','','');
+REPLACE INTO `item_db` VALUES ('12886','C_Berserk_Potion','Infinite Berserk Potion','11','0','0','0','0','0','0','0','0','31868582','63','2','0','0','85',NULL,'0','0','0','0','0','0','507',NULL,'0',NULL,'0',NULL,'0','sc_start SC_ATTHASTE_POTION3,1800000,9; specialeffect2 EF_POTION_BERSERK; /* NOTE: No special effect when used. */','','');
 REPLACE INTO `item_db` VALUES ('12887','C_Wing_Of_Fly','Infinite Fly Wing','11','0','0','0','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','0','0','0','507',NULL,'0',NULL,'0',NULL,'0','','','');
 REPLACE INTO `item_db` VALUES ('12900','Battle_Manual_Box','Battle Manual Box','18','20','10','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','0','0','0','475',NULL,'0',NULL,'0',NULL,'0','getitem 12208,10;','','');
 REPLACE INTO `item_db` VALUES ('12901','Insurance_Package','Insurance Package','18','20','10','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','0','0','0','475',NULL,'0',NULL,'0',NULL,'0','getitem 12209,10;','','');