2 files changed, 44 insertions, 19 deletions
diff --git a/sql-files/upgrades/eAthena-logs-upgrade.sql b/sql-files/upgrades/eAthena-logs-upgrade.sql
new file mode 100644
index 000000000..09ed4d8d0
--- /dev/null
+++ b/sql-files/upgrades/eAthena-logs-upgrade.sql
@@ -0,0 +1,44 @@
+-- This file is part of Hercules.
+-- http://herc.ws - http://github.com/HerculesWS/Hercules
+--
+-- Copyright (C) 2013-2015  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/>.
+
+--
+-- Upgrade file to be used when going from eAthena to Hercules
+-- Note: If you're not up to date with eAthena, go through their upgrade files first and run them before this file.
+-- Note: After runing this file run Hercules upgrade files.
+--
+
+-- Adds 'I' and 'X' to `type` in `picklog` table
+ALTER TABLE `picklog` MODIFY `type` ENUM('M','P','L','T','V','S','N','C','A','R','G','E','B','O','I','X') NOT NULL DEFAULT 'P';
+
+-- Adds 'D' and 'U' to `type` in `picklog` table
+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';
+
+-- Adds unique ID to `picklog` table
+ALTER TABLE `picklog` ADD `nsiuid` BIGINT NOT NULL DEFAULT '0' AFTER `card3`;
+
+-- Change `nsiuid` to BIGINT(20)
+ALTER TABLE `picklog` CHANGE `nsiuid` `unique_id` BIGINT( 20 ) NOT NULL DEFAULT '0';
+
+-- Adds 'I' to `type` in `zenylog`
+ALTER TABLE `zenylog` MODIFY `type` ENUM('M','T','V','S','N','A','E','B','I') NOT NULL DEFAULT 'S';
+
+-- Adds 'D' to `type` in `zenylog`
+ALTER TABLE `zenylog` MODIFY `type` ENUM('M','T','V','S','N','A','E','B','I','D') NOT NULL DEFAULT 'S';
+
+-- Add 'P' and 'C' types in `zenylog`
+ALTER TABLE `zenylog` MODIFY `type` ENUM('T','V','P','M','S','N','D','C','A','E','I','B') NOT NULL DEFAULT 'S';
diff --git a/sql-files/upgrades/eathena-upgrade.sql b/sql-files/upgrades/eAthena-main-upgrade.sql
index 53053fa7a..64b22bfe9 100644
--- a/sql-files/upgrades/eathena-upgrade.sql
+++ b/sql-files/upgrades/eAthena-main-upgrade.sql
@@ -24,12 +24,6 @@
 
 ALTER TABLE `global_reg_value` MODIFY `type` TINYINT(1) UNSIGNED NOT NULL DEFAULT '3';
 
--- Adds 'I' and 'X' to `type` in `picklog` table
-ALTER TABLE `picklog` MODIFY `type` ENUM('M','P','L','T','V','S','N','C','A','R','G','E','B','O','I','X') NOT NULL DEFAULT 'P';
-
--- Adds 'D' and 'U' to `type` in `picklog` table
-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';
-
 -- `ExpPer` column removed from `mob_db` and `mob_db2` tables
 ALTER TABLE `mob_db` DROP COLUMN `ExpPer`;
 ALTER TABLE `mob_db2` DROP COLUMN `ExpPer`;
@@ -37,9 +31,6 @@ ALTER TABLE `mob_db2` DROP COLUMN `ExpPer`;
 -- Rename `level` column to `group_id` in `login` table
 ALTER TABLE `login` CHANGE COLUMN `level` `group_id` TINYINT(3) NOT NULL DEFAULT '0';
 
--- Adds 'I' to `type` in `zenylog`
-ALTER TABLE `zenylog` MODIFY `type` ENUM('M','T','V','S','N','A','E','B','I') NOT NULL DEFAULT 'S';
-
 ALTER TABLE `char` ADD COLUMN `elemental_id` INT(11) UNSIGNED NOT NULL DEFAULT '0';
 
 CREATE TABLE IF NOT EXISTS `elemental` (
@@ -61,9 +52,6 @@ CREATE TABLE IF NOT EXISTS `elemental` (
   PRIMARY KEY (`ele_id`)
 ) ENGINE=MyISAM;
 
--- Adds 'D' to `type` in `zenylog`
-ALTER TABLE `zenylog` MODIFY `type` ENUM('M','T','V','S','N','A','E','B','I','D') NOT NULL DEFAULT 'S';
-
 ALTER TABLE `char` ADD CONSTRAINT `name_key` UNIQUE (`name`);
 
 ALTER TABLE `inventory`  ADD COLUMN `favorite` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0' AFTER `expire_time`;
@@ -80,8 +68,6 @@ ALTER TABLE `item_db_re` MODIFY `defence` SMALLINT(5) DEFAULT NULL;
 
 ALTER TABLE `item_db` MODIFY `defence` SMALLINT(5) DEFAULT NULL;
 
-ALTER TABLE `zenylog` MODIFY `type` ENUM('T','V','P','M','S','N','D','C','A','E','I','B') NOT NULL DEFAULT 'S';
-
 ALTER TABLE `elemental` CHANGE COLUMN `str` `atk1` MEDIUMINT(6) UNSIGNED NOT NULL DEFAULT 0,
   CHANGE COLUMN `agi` `atk2` MEDIUMINT(6) UNSIGNED NOT NULL DEFAULT 0,
   CHANGE COLUMN `vit` `matk` MEDIUMINT(6) UNSIGNED NOT NULL DEFAULT 0,
@@ -92,8 +78,6 @@ ALTER TABLE `elemental` CHANGE COLUMN `str` `atk1` MEDIUMINT(6) UNSIGNED NOT NUL
   ADD COLUMN `hit` SMALLINT(4) UNSIGNED NOT NULL DEFAULT 0 AFTER `flee`,
   ADD COLUMN `life_time` INT(11) NOT NULL DEFAULT 0 AFTER `hit`;
 
-ALTER TABLE `picklog` ADD `nsiuid` BIGINT NOT NULL DEFAULT '0' AFTER `card3`;
-
 CREATE TABLE IF NOT EXISTS `interreg` (
   `varname` VARCHAR(11) NOT NULL,
   `value` VARCHAR(20) NOT NULL,
@@ -114,8 +98,6 @@ ALTER TABLE `mail` ADD `nsiuid` BIGINT NOT NULL DEFAULT '0';
 
 ALTER TABLE `storage` ADD `nsiuid` BIGINT NOT NULL DEFAULT '0';
 
-ALTER TABLE `picklog` CHANGE `nsiuid` `unique_id` BIGINT( 20 ) NOT NULL DEFAULT '0';
-
 UPDATE `interreg` SET `varname` = 'unique_id' WHERE `interreg`.`varname` = 'nsiuid';
 
 ALTER TABLE `auction` CHANGE `nsiuid` `unique_id` BIGINT( 20 ) NOT NULL DEFAULT '0';
@@ -129,4 +111,3 @@ ALTER TABLE `inventory` CHANGE `nsiuid` `unique_id` BIGINT( 20 ) NOT NULL DEFAUL
 ALTER TABLE `mail` CHANGE `nsiuid` `unique_id` BIGINT( 20 ) NOT NULL DEFAULT '0';
 
 ALTER TABLE `storage` CHANGE `nsiuid` `unique_id` BIGINT( 20 ) NOT NULL DEFAULT '0';
-