Merge branch 'master' of gitlab.com:jesusalva/evolsrc into jesusalva/freeyorplogsjesusalva/freeyorplogs

5 files changed, 28 insertions, 1 deletions

diff --git a/conf/map/script.conf b/conf/map/script.conf
index fc617d85..802ce253 100644
--- a/conf/map/script.conf
+++ b/conf/map/script.conf
@@ -52,7 +52,7 @@ script_configuration: {
 	// Default value of the 'min' argument of the script command 'input'.
 	// When the 'min' argument isn't provided, this value is used instead.
 	// Defaults to 0.
-	//input_min_value: 0
+	input_min_value: 0
 
 	// Default value of the 'max' argument of the script command 'input'.
 	// When the 'max' argument isn't provided, this value is used instead.
diff --git a/db/constants.conf b/db/constants.conf
index 422f9d3f..51b8d9ae 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -424,6 +424,8 @@ constants_db: {
 	mf_noviewid:           56
 	mf_pairship_startable: 57
 	mf_pairship_endable:   58
+	mf_nostorage:          59
+	mf_nogstorage:         60
 
 	comment__: "Cell Properties"
 	cell_walkable:      0
diff --git a/sql-files/main.sql b/sql-files/main.sql
index 241efd39..e364ec77 100644
--- a/sql-files/main.sql
+++ b/sql-files/main.sql
@@ -241,6 +241,7 @@ CREATE TABLE IF NOT EXISTS `char` (
   `uniqueitem_counter` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0',
   `sex` ENUM('M','F','U') NOT NULL DEFAULT 'U',
   `hotkey_rowshift` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0',
+  `hotkey_rowshift2` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0',
   `attendance_count` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0',
   `attendance_timer` BIGINT(20) NULL DEFAULT '0',
   `title_id` INT(11) UNSIGNED NOT NULL DEFAULT '0',
@@ -928,6 +929,7 @@ INSERT IGNORE INTO `sql_updates` (`timestamp`) VALUES (1544738447); -- 2018-12-1
 INSERT IGNORE INTO `sql_updates` (`timestamp`) VALUES (1546059075); -- 2018-12-29--07-51.sql
 INSERT IGNORE INTO `sql_updates` (`timestamp`) VALUES (1554760320); -- 2019-04-08--21-52.sql
 INSERT IGNORE INTO `sql_updates` (`timestamp`) VALUES (1556147483); -- 2019-04-25--02-12.sql
+INSERT IGNORE INTO `sql_updates` (`timestamp`) VALUES (1557414445); -- 2019-05-09--18-07.sql
 
 --
 -- Table structure for table `storage`
diff --git a/sql-files/upgrades/2019-05-09--18-07.sql b/sql-files/upgrades/2019-05-09--18-07.sql
new file mode 100644
index 00000000..96d80c29
--- /dev/null
+++ b/sql-files/upgrades/2019-05-09--18-07.sql
@@ -0,0 +1,22 @@
+#1557414445
+
+-- This file is part of Hercules.
+-- http://herc.ws - http://github.com/HerculesWS/Hercules
+--
+-- Copyright (C) 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/>.
+
+ALTER TABLE  `char` ADD COLUMN `hotkey_rowshift2` TINYINT(3) UNSIGNED NOT NULL DEFAULT  '0' AFTER `hotkey_rowshift`;
+INSERT INTO `sql_updates` (`timestamp`) VALUES (1557414445);
diff --git a/sql-files/upgrades/index.txt b/sql-files/upgrades/index.txt
index ac80cdf0..915d3565 100644
--- a/sql-files/upgrades/index.txt
+++ b/sql-files/upgrades/index.txt
@@ -53,3 +53,4 @@
 2018-12-29--07-51.sql
 2019-04-08--21-52.sql
 2019-04-25--02-12.sql
+2019-05-09--18-07.sql