7 files changed, 28 insertions, 4 deletions
diff --git a/sql-files/item_db.sql b/sql-files/item_db.sql
index 4d5649b67..f7abfd9db 100644
--- a/sql-files/item_db.sql
+++ b/sql-files/item_db.sql
@@ -2532,7 +2532,7 @@ REPLACE INTO `item_db` VALUES ('5361','Gang_Scarf','Gangster Scarf','5','20','10
 REPLACE INTO `item_db` VALUES ('5362','Ninja_Scroll','Ninja Scroll','5','20','10','200','0','0','0','0','0','0xFFFFFFFFFFFFFFFF','63','2','1','0','60',NULL,'0','370','0','0','0','0','73',NULL,'0',NULL,'0',NULL,'0','bonus bMatkRate,1;','','');
 REPLACE INTO `item_db` VALUES ('5363','Helm_Of_Abyss','Helm Of Abyss','5','20','10','1000','0','0','2','0','1','0x654E2','63','2','256','0','70',NULL,'1','371','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus2 bSubRace,RC_DemiPlayer,-10; bonus2 bSubRace,RC_Boss,10;','','');
 REPLACE INTO `item_db` VALUES ('5364','Dark_Snake_Lord_Hat','Evil Snake Lord Hat','5','20','10','500','0','0','2','0','1','0xFFFFFFFFFFFFFFFF','63','2','256','0','60',NULL,'1','372','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bStr,1; bonus bInt,1; bonus bAgi,2;','','');
-REPLACE INTO `item_db` VALUES ('5365','Fried_Egg','Magnolia Hat','5','20','10','100','0','0','3','0','1','0xFFFFFFFFFFFFFFFF','63','2','256','0','1',NULL,'0','373','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus2 bResEff,Eff_Stun,500; skill HT_FLASHER,1;','','');
+REPLACE INTO `item_db` VALUES ('5365','Fried_Egg','Magnolia Hat','5','20','10','100','0','0','3','0','1','0xFFFFFFFFFFFFFFFF','63','2','256','0','1',NULL,'0','373','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bBaseAtk, 5; bonus5 bAutoSpellWhenHit, BS_GREED, 1, 10, BF_SHORT, 0;','','');
 REPLACE INTO `item_db` VALUES ('5366','Hat_0f_King','Love Dad Bandana','5','20','10','200','0','0','3','0','0','0xFFFFFFFFFFFFFFFF','63','2','256','0','0',NULL,'1','374','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bAllStats,5;','','');
 REPLACE INTO `item_db` VALUES ('5367','Hyegun_Hat','Hyegun Hat','5','20','10','100','0','0','5','0','1','0xFFFFFFFFFFFFFFFF','63','2','769','0','10',NULL,'0','375','0','0','0','0','73',NULL,'0',NULL,'0',NULL,'0','bonus bMdef,3; bonus2 bSubRace,RC_Demon,10;','','');
 REPLACE INTO `item_db` VALUES ('5368','White_Wing','White Wing','5','20','10','100','0','0','2','0','0','0xFFFFFFFFFFFFFFFF','63','2','256','0','0',NULL,'1','38','0','0','0','0','475',NULL,'0',NULL,'0',NULL,'0','bonus2 bAddMonsterDropItem,12280,300;','','');
diff --git a/sql-files/item_db_re.sql b/sql-files/item_db_re.sql
index bcd6e4d71..7d0f42257 100644
--- a/sql-files/item_db_re.sql
+++ b/sql-files/item_db_re.sql
@@ -3435,7 +3435,7 @@ REPLACE INTO `item_db` VALUES ('5361','Gang_Scarf','Gangster Scarf','5','20','10
 REPLACE INTO `item_db` VALUES ('5362','Ninja_Scroll','Ninja Scroll','5','20','10','200','0','0','0','0','0','0xFFFFFFFFFFFFFFFF','63','2','1','0','0',NULL,'0','370','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bUnbreakableHelm,0; bonus bMatkRate,1;','','');
 REPLACE INTO `item_db` VALUES ('5363','Helm_Of_Abyss','Abysmal Knight Helm','5','20','10','1000','0','0','9','0','1','0x654E2','63','2','256','0','70',NULL,'1','371','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus2 bSubRace,RC_DemiPlayer,-10; bonus2 bSubRace,RC_Boss,10;','','');
 REPLACE INTO `item_db` VALUES ('5364','Dark_Snake_Lord_Hat','Evil Snake Lord Hat','5','20','10','500','0','0','4','0','1','0xFFFFFFFFFFFFFFFF','63','2','256','0','150',NULL,'1','372','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bStr,1; bonus bInt,1; bonus bAgi,2; bonus2 bAddMonsterDropItem,12582,30;','','');
-REPLACE INTO `item_db` VALUES ('5365','Fried_Egg','Mangolia Hat','5','20','10','100','0','0','2','0','1','0xFFFFFFFFFFFFFFFF','63','2','256','0','0',NULL,'0','373','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus2 bResEff,Eff_Stun,500; skill HT_FLASHER,1;','','');
+REPLACE INTO `item_db` VALUES ('5365','Fried_Egg','Mangolia Hat','5','20','10','100','0','0','2','0','1','0xFFFFFFFFFFFFFFFF','63','2','256','0','0',NULL,'0','373','0','0','0','0','1',NULL,'0',NULL,'0',NULL,'0','bonus bBaseAtk, 5; bonus5 bAutoSpellWhenHit, BS_GREED, 1, 10, BF_SHORT, 0;','','');
 REPLACE INTO `item_db` VALUES ('5366','Hat_0f_King','Love Dad Bandana','5','20','10','200','0','0','5','0','0','0xFFFFFFFFFFFFFFFF','63','2','256','0','0',NULL,'1','374','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bAllStats,5;','','');
 REPLACE INTO `item_db` VALUES ('5367','Hyegun_Hat','Yao Jun Hat','5','20','10','100','0','0','5','0','1','0xFFFFFFFFFFFFFFFF','63','2','769','0','10',NULL,'0','375','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bMdef,3; bonus2 bAddRaceTolerance,RC_Demon,10;','','');
 REPLACE INTO `item_db` VALUES ('5368','White_Wing','White Wing','5','20','10','100','0','0','4','0','0','0xFFFFFFFFFFFFFFFF','63','2','256','0','0',NULL,'1','38','0','0','0','0','475',NULL,'0',NULL,'0',NULL,'0','bonus2 bAddMonsterDropItem,12280,300;','','');
diff --git a/sql-files/logs.sql b/sql-files/logs.sql
index 0c97fdecf..ab722a2fe 100644
--- a/sql-files/logs.sql
+++ b/sql-files/logs.sql
@@ -144,7 +144,7 @@ CREATE TABLE IF NOT EXISTS `picklog` (
   `id` INT(11) NOT NULL AUTO_INCREMENT,
   `time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
   `char_id` INT(11) NOT NULL DEFAULT '0',
-  `type` ENUM('M','P','L','T','V','S','N','C','A','R','G','E','B','O','I','X','D','U') NOT NULL DEFAULT 'P',
+  `type` ENUM('M','P','L','T','V','S','N','C','A','R','G','E','B','O','I','X','D','U','K','Y','Z','W','Q','J','H','@','0','1','2') NOT NULL DEFAULT 'P',
   `nameid` INT(11) NOT NULL DEFAULT '0',
   `amount` INT(11) NOT NULL DEFAULT '1',
   `refine` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0',
diff --git a/sql-files/main.sql b/sql-files/main.sql
index 1ed751d15..e2717cdc5 100644
--- a/sql-files/main.sql
+++ b/sql-files/main.sql
@@ -824,6 +824,7 @@ INSERT IGNORE INTO `sql_updates` (`timestamp`) VALUES (1436360978); -- 2015-07-0
 INSERT IGNORE INTO `sql_updates` (`timestamp`) VALUES (1440688342); -- 2015-08-27--20-42.sql
 INSERT IGNORE INTO `sql_updates` (`timestamp`) VALUES (1450241859); -- 2015-12-16--12-57.sql
 INSERT IGNORE INTO `sql_updates` (`timestamp`) VALUES (1450367880); -- 2015-12-17--15-58.sql
+INSERT IGNORE INTO `sql_updates` (`timestamp`) VALUES (1457638175); -- 2016-03-10--22-18.sql
 
 --
 -- Table structure for table `storage`
diff --git a/sql-files/upgrades/2016-03-10--22-18.sql b/sql-files/upgrades/2016-03-10--22-18.sql
new file mode 100644
index 000000000..80266bcca
--- /dev/null
+++ b/sql-files/upgrades/2016-03-10--22-18.sql
@@ -0,0 +1,22 @@
+#1457638175
+
+-- This file is part of Hercules.
+-- http://herc.ws - http://github.com/HerculesWS/Hercules
+--
+-- Copyright (C) 2015-2016  Hercules Dev Team
+--
+-- Hercules is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+ALTER TABLE `picklog` MODIFY `type` enum('M','P','L','T','V','S','N','C','A','R','G','E','B','O','I','X','D','U','K','Y','Z','W','Q','J','H','@','0','1','2') NOT NULL default 'P';
+INSERT INTO `sql_updates` (`timestamp`) VALUES (1457638175)
diff --git a/sql-files/upgrades/index.txt b/sql-files/upgrades/index.txt
index e73a8659d..6e81bd199 100644
--- a/sql-files/upgrades/index.txt
+++ b/sql-files/upgrades/index.txt
@@ -29,3 +29,4 @@
 2015-07-08--13-08.sql
 2015-08-27--20-42.sql
 2015-12-17--15-58.sql
+2016-03-10--22-18.sql
diff --git a/sql-files/upgrades/rAthena-logs-upgrade.sql b/sql-files/upgrades/rAthena-logs-upgrade.sql
index b0faed244..5e9dbf60c 100644
--- a/sql-files/upgrades/rAthena-logs-upgrade.sql
+++ b/sql-files/upgrades/rAthena-logs-upgrade.sql
@@ -34,7 +34,7 @@ DROP TABLE IF EXISTS `cashlog`;
 ALTER TABLE `mvplog` MODIFY `prize` INT(11) NOT NULL DEFAULT '0';
 
 -- Upgrades to table `picklog`
-ALTER TABLE `picklog` MODIFY `type` enum('M','P','L','T','V','S','N','C','A','R','G','E','B','O','I','X','D','U') NOT NULL default 'P';
+ALTER TABLE `picklog` MODIFY `type` enum('M','P','L','T','V','S','N','C','A','R','G','E','B','O','I','X','D','U','K','Y','Z','W','Q','J','H','@','0','1','2') NOT NULL default 'P';
 ALTER TABLE `picklog` MODIFY `nameid` INT(11) NOT NULL DEFAULT '0';
 ALTER TABLE `picklog` MODIFY `card0` INT(11) NOT NULL DEFAULT '0';
 ALTER TABLE `picklog` MODIFY `card1` INT(11) NOT NULL DEFAULT '0';