Update from hercules.8-mapping-problems-in-hurnscald

Rodex flags.
New sql update.

4 files changed, 139 insertions, 1 deletions

diff --git a/conf/map/battle/feature.conf b/conf/map/battle/feature.conf
index 003e4c75..cdb9913e 100644
--- a/conf/map/battle/feature.conf
+++ b/conf/map/battle/feature.conf
@@ -55,4 +55,14 @@ features: {
 	// Requires: 2014-10-22bRagexe or later
 	// Disabled by default while test version is out; enable at your own risk -- the mean dev.
 	roulette: false
+
+	// Enabled RoDEX (Note 1)
+	// Requires: 2015-05-13aRagexe or later
+	rodex: true
+
+	// Allow usage of "Account Mail" box in RoDEX?
+	// Requires: 2016-03-16aRagexeRE or later
+	// This is disabled in client-side in some client versions
+	// Disabled by default
+	rodex_use_accountmail: false
 }
diff --git a/sql-files/main.sql b/sql-files/main.sql
index 3edbdbc3..1e1fdbc3 100644
--- a/sql-files/main.sql
+++ b/sql-files/main.sql
@@ -882,7 +882,7 @@ INSERT IGNORE INTO `sql_updates` (`timestamp`) VALUES (1475526420); -- 2016-10-0
 INSERT IGNORE INTO `sql_updates` (`timestamp`) VALUES (1477434595); -- 2016-10-26--10-29.sql
 INSERT IGNORE INTO `sql_updates` (`timestamp`) VALUES (1488454834); -- 2017-03-02--11-40.sql
 INSERT IGNORE INTO `sql_updates` (`timestamp`) VALUES (1488744559); -- 2017-03-05--08-09.sql
-
+INSERT IGNORE INTO `sql_updates` (`timestamp`) VALUES (1489588190); -- 2017-03-15--14-29.sql
 --
 -- Table structure for table `storage`
 --
@@ -916,3 +916,56 @@ CREATE TABLE IF NOT EXISTS `storage` (
   PRIMARY KEY (`id`),
   KEY `account_id` (`account_id`)
 ) ENGINE=MyISAM;
+
+CREATE TABLE IF NOT EXISTS `rodex_items` (
+	`id` INT(11) NOT NULL AUTO_INCREMENT,
+	`mail_id` BIGINT(20) NOT NULL DEFAULT '0',
+	`nameid` INT(11) NOT NULL DEFAULT '0',
+	`amount` INT(11) NOT NULL DEFAULT '0',
+	`equip` INT(11) UNSIGNED NOT NULL DEFAULT '0',
+	`identify` SMALLINT(6) NOT NULL DEFAULT '0',
+	`refine` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0',
+	`attribute` TINYINT(4) NOT NULL DEFAULT '0',
+	`card0` SMALLINT(11) NOT NULL DEFAULT '0',
+	`card1` SMALLINT(11) NOT NULL DEFAULT '0',
+	`card2` SMALLINT(11) NOT NULL DEFAULT '0',
+	`card3` SMALLINT(11) NOT NULL DEFAULT '0',
+	`opt_idx0` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0',
+	`opt_val0` SMALLINT(5) NOT NULL DEFAULT '0',
+	`opt_idx1` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0',
+	`opt_val1` SMALLINT(5) NOT NULL DEFAULT '0',
+	`opt_idx2` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0',
+	`opt_val2` SMALLINT(5) NOT NULL DEFAULT '0',
+	`opt_idx3` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0',
+	`opt_val3` SMALLINT(5) NOT NULL DEFAULT '0',
+	`opt_idx4` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0',
+	`opt_val4` SMALLINT(5) NOT NULL DEFAULT '0',
+	`expire_time` INT(11) UNSIGNED NOT NULL DEFAULT '0',
+	`bound` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0',
+	`unique_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0',
+	PRIMARY KEY (`id`),
+  KEY `mail_id` (`mail_id`)
+) ENGINE=InnoDB;
+
+CREATE TABLE IF NOT EXISTS `rodex_mail` (
+	`mail_id` BIGINT(20) NOT NULL AUTO_INCREMENT,
+	`sender_name` VARCHAR(30) NOT NULL,
+	`sender_id` INT(11) NOT NULL,
+	`receiver_name` VARCHAR(30) NOT NULL,
+	`receiver_id` INT(11) NOT NULL,
+  `receiver_accountid` INT(11) NOT NULL,
+	`title` VARCHAR(50) NOT NULL,
+	`body` VARCHAR(510) NOT NULL,
+	`zeny` BIGINT(20) NOT NULL,
+	`type` TINYINT(8) UNSIGNED NOT NULL,
+	`is_read` TINYINT(8) NOT NULL,
+	`send_date` INT(11) NOT NULL,
+	`expire_date` INT(11) NOT NULL,
+	`weight` INT(11) NOT NULL,
+	PRIMARY KEY (`mail_id`),
+  KEY `sender_id` (`sender_id`),
+  KEY `receiver_id` (`receiver_id`),
+  KEY `receiver_accountid` (`receiver_accountid`),
+  KEY `send_date` (`send_date`),
+  KEY `expire_date` (`expire_date`)
+) ENGINE=MyISAM;
diff --git a/sql-files/upgrades/2017-03-15--14-29.sql b/sql-files/upgrades/2017-03-15--14-29.sql
new file mode 100644
index 00000000..6e604473
--- /dev/null
+++ b/sql-files/upgrades/2017-03-15--14-29.sql
@@ -0,0 +1,74 @@
+#1489588190
+
+-- This file is part of Hercules.
+-- http://herc.ws - http://github.com/HerculesWS/Hercules
+--
+-- Copyright (C) 2017  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/>.
+
+CREATE TABLE IF NOT EXISTS `rodex_items` (
+	`id` INT(11) NOT NULL AUTO_INCREMENT,
+	`mail_id` BIGINT(20) NOT NULL DEFAULT '0',
+	`nameid` INT(11) NOT NULL DEFAULT '0',
+	`amount` INT(11) NOT NULL DEFAULT '0',
+	`equip` INT(11) UNSIGNED NOT NULL DEFAULT '0',
+	`identify` SMALLINT(6) NOT NULL DEFAULT '0',
+	`refine` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0',
+	`attribute` TINYINT(4) NOT NULL DEFAULT '0',
+	`card0` SMALLINT(11) NOT NULL DEFAULT '0',
+	`card1` SMALLINT(11) NOT NULL DEFAULT '0',
+	`card2` SMALLINT(11) NOT NULL DEFAULT '0',
+	`card3` SMALLINT(11) NOT NULL DEFAULT '0',
+	`opt_idx0` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0',
+	`opt_val0` SMALLINT(5) NOT NULL DEFAULT '0',
+	`opt_idx1` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0',
+	`opt_val1` SMALLINT(5) NOT NULL DEFAULT '0',
+	`opt_idx2` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0',
+	`opt_val2` SMALLINT(5) NOT NULL DEFAULT '0',
+	`opt_idx3` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0',
+	`opt_val3` SMALLINT(5) NOT NULL DEFAULT '0',
+	`opt_idx4` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0',
+	`opt_val4` SMALLINT(5) NOT NULL DEFAULT '0',
+	`expire_time` INT(11) UNSIGNED NOT NULL DEFAULT '0',
+	`bound` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0',
+	`unique_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0',
+	PRIMARY KEY (`id`),
+  KEY `mail_id` (`mail_id`)
+) ENGINE=InnoDB;
+
+CREATE TABLE IF NOT EXISTS `rodex_mail` (
+	`mail_id` BIGINT(20) NOT NULL AUTO_INCREMENT,
+	`sender_name` VARCHAR(30) NOT NULL COLLATE 'utf8_unicode_ci',
+	`sender_id` INT(11) NOT NULL,
+	`receiver_name` VARCHAR(30) NOT NULL COLLATE 'utf8_unicode_ci',
+	`receiver_id` INT(11) NOT NULL,
+	`receiver_accountid` INT(11) NOT NULL,
+	`title` VARCHAR(50) NOT NULL COLLATE 'utf8_unicode_ci',
+	`body` VARCHAR(510) NOT NULL COLLATE 'utf8_unicode_ci',
+	`zeny` BIGINT(20) NOT NULL,
+	`type` TINYINT(8) UNSIGNED NOT NULL,
+	`is_read` TINYINT(8) NOT NULL,
+	`send_date` INT(11) NOT NULL,
+	`expire_date` INT(11) NOT NULL,
+	`weight` INT(11) NOT NULL,
+	PRIMARY KEY (`mail_id`),
+  KEY `sender_id` (`sender_id`),
+  KEY `receiver_id` (`receiver_id`),
+  KEY `receiver_accountid` (`receiver_accountid`),
+  KEY `send_date` (`send_date`),
+  KEY `expire_date` (`expire_date`)
+) ENGINE=MyISAM;
+
+INSERT INTO `sql_updates` (`timestamp`, `ignored`) VALUES (1489588190 , 'No');
diff --git a/sql-files/upgrades/index.txt b/sql-files/upgrades/index.txt
index 768800cb..8546918e 100644
--- a/sql-files/upgrades/index.txt
+++ b/sql-files/upgrades/index.txt
@@ -38,3 +38,4 @@
 2016-10-26--10-29.sql
 2017-03-02--11-40.sql
 2017-03-05--08-09.sql
+2017-03-15--14-29.sql