From a822cbcef119fd572e2ce6da18eb512cc33f322b Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 23 Jan 2019 21:28:33 +0300 Subject: Update from hercules --- conf/atcommand.conf | 1 + conf/common/inter-server.conf | 1 + conf/map/battle/player.conf | 1 + db/constants.conf | 9 +++------ sql-files/main.sql | 14 +++++++++++++- sql-files/upgrades/2018-12-14--01-02.sql | 24 ++++++++++++++++++++++++ sql-files/upgrades/2018-12-29--07-51.sql | 29 +++++++++++++++++++++++++++++ sql-files/upgrades/index.txt | 2 ++ 8 files changed, 74 insertions(+), 7 deletions(-) create mode 100644 sql-files/upgrades/2018-12-14--01-02.sql create mode 100644 sql-files/upgrades/2018-12-29--07-51.sql diff --git a/conf/atcommand.conf b/conf/atcommand.conf index 78befea8..91485f3b 100644 --- a/conf/atcommand.conf +++ b/conf/atcommand.conf @@ -57,6 +57,7 @@ aliases: { itemreset: ["clearinventory"] channel: ["main"] autoloottype: ["aloottype"] + camerainfo: ["setcamera", "viewpointvalue"] } /* List of commands that should not be logged at all */ diff --git a/conf/common/inter-server.conf b/conf/common/inter-server.conf index c3db6fc1..a4122b85 100644 --- a/conf/common/inter-server.conf +++ b/conf/common/inter-server.conf @@ -116,6 +116,7 @@ inter_configuration: { autotrade_merchants_db: "autotrade_merchants" autotrade_data_db: "autotrade_data" npc_market_data_db: "npc_market_data" + npc_barter_data_db: "npc_barter_data" } // Show warning in console if some string translation missing for selected language diff --git a/conf/map/battle/player.conf b/conf/map/battle/player.conf index 7295824f..913f3ec6 100644 --- a/conf/map/battle/player.conf +++ b/conf/map/battle/player.conf @@ -211,6 +211,7 @@ snovice_call_type: 0 // 0x080 - Emotion Request // 0x100 - DropItem Request // 0x200 - @/#Command Request +// 0x400 - NPC Script Interaction // Please note that at least 1 option has to be enabled. // Be mindful that the more options used, the easier it becomes to cheat features that rely on idletime (e.g. checkidle()). // Default: walk ( 0x1 ) + useskilltoid ( 0x2 ) + useskilltopos ( 0x4 ) + useitem ( 0x8 ) + attack ( 0x10 ) = 0x1F diff --git a/db/constants.conf b/db/constants.conf index 2da38e3c..a4813353 100644 --- a/db/constants.conf +++ b/db/constants.conf @@ -3625,12 +3625,6 @@ constants_db: { IOT_PARTY: 2 IOT_GUILD: 3 - comment__: "tradertype" - NST_ZENY: 0 - NST_CASH: 1 - NST_MARKET: 2 - NST_CUSTOM: 3 - comment__: "strcharinfo" PC_NAME: 0 PC_PARTY: 1 @@ -3929,6 +3923,9 @@ constants_db: { ACH_ACHIEVE: 44 ACH_ACHIEVEMENT_RANK: 45 + comment__: "inventory expansion" + INVENTORY_INCREASE_STEP: 10 + // for disable warning ITMCHAIN_ORE: 1 diff --git a/sql-files/main.sql b/sql-files/main.sql index d918d4a3..a08ec60b 100644 --- a/sql-files/main.sql +++ b/sql-files/main.sql @@ -244,6 +244,7 @@ CREATE TABLE IF NOT EXISTS `char` ( `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', + `inventory_size` INT(11) UNSIGNED NOT NULL DEFAULT '100', PRIMARY KEY (`char_id`), UNIQUE KEY `name_key` (`name`), KEY `account_id` (`account_id`), @@ -293,7 +294,7 @@ CREATE TABLE IF NOT EXISTS `charlog` ( `str` INT(11) UNSIGNED NOT NULL DEFAULT '0', `agi` INT(11) UNSIGNED NOT NULL DEFAULT '0', `vit` INT(11) UNSIGNED NOT NULL DEFAULT '0', - `INT` INT(11) UNSIGNED NOT NULL DEFAULT '0', + `int` INT(11) UNSIGNED NOT NULL DEFAULT '0', `dex` INT(11) UNSIGNED NOT NULL DEFAULT '0', `luk` INT(11) UNSIGNED NOT NULL DEFAULT '0', `hair` TINYINT(4) NOT NULL DEFAULT '0', @@ -922,6 +923,8 @@ INSERT IGNORE INTO `sql_updates` (`timestamp`) VALUES (1528026381); -- 2018-06-0 INSERT IGNORE INTO `sql_updates` (`timestamp`) VALUES (1528180320); -- 2018-06-05--12-02.sql INSERT IGNORE INTO `sql_updates` (`timestamp`) VALUES (1532403228); -- 2018-07-24--03-23.sql INSERT IGNORE INTO `sql_updates` (`timestamp`) VALUES (1535865732); -- 2018-09-01--05-22.sql +INSERT IGNORE INTO `sql_updates` (`timestamp`) VALUES (1544738447); -- 2018-12-14--01-02.sql +INSERT IGNORE INTO `sql_updates` (`timestamp`) VALUES (1546059075); -- 2018-12-29--07-51.sql -- -- Table structure for table `storage` @@ -1010,3 +1013,12 @@ CREATE TABLE IF NOT EXISTS `rodex_mail` ( KEY `send_date` (`send_date`), KEY `expire_date` (`expire_date`) ) ENGINE=MyISAM; + +CREATE TABLE IF NOT EXISTS `npc_barter_data` ( + `name` VARCHAR(24) NOT NULL DEFAULT '', + `itemId` INT(11) UNSIGNED NOT NULL DEFAULT '0', + `amount` INT(11) UNSIGNED NOT NULL DEFAULT '0', + `priceId` INT(11) UNSIGNED NOT NULL DEFAULT '0', + `priceAmount` INT(11) UNSIGNED NOT NULL DEFAULT '0', + PRIMARY KEY (`name`, `itemid`, `priceId`, `priceAmount`) +) ENGINE=MyISAM; diff --git a/sql-files/upgrades/2018-12-14--01-02.sql b/sql-files/upgrades/2018-12-14--01-02.sql new file mode 100644 index 00000000..7bcd583c --- /dev/null +++ b/sql-files/upgrades/2018-12-14--01-02.sql @@ -0,0 +1,24 @@ +#1544738447 + +-- This file is part of Hercules. +-- http://herc.ws - http://github.com/HerculesWS/Hercules +-- +-- Copyright (C) 2018 Hercules Dev Team +-- Copyright (C) 4144 +-- +-- 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 . + +ALTER TABLE `char` ADD `inventory_size` INT(11) UNSIGNED NOT NULL DEFAULT '100'; + +INSERT INTO `sql_updates` (`timestamp`, `ignored`) VALUES (1544738447, 'No'); diff --git a/sql-files/upgrades/2018-12-29--07-51.sql b/sql-files/upgrades/2018-12-29--07-51.sql new file mode 100644 index 00000000..64117939 --- /dev/null +++ b/sql-files/upgrades/2018-12-29--07-51.sql @@ -0,0 +1,29 @@ +#1546059075 + +-- 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 . + +CREATE TABLE IF NOT EXISTS `npc_barter_data` ( + `name` VARCHAR(24) NOT NULL DEFAULT '', + `itemId` INT(11) UNSIGNED NOT NULL DEFAULT '0', + `amount` INT(11) UNSIGNED NOT NULL DEFAULT '0', + `priceId` INT(11) UNSIGNED NOT NULL DEFAULT '0', + `priceAmount` INT(11) UNSIGNED NOT NULL DEFAULT '0', + PRIMARY KEY (`name`, `itemid`, `priceId`, `priceAmount`) +) ENGINE=MyISAM; +INSERT INTO `sql_updates` (`timestamp`) VALUES (1546059075); diff --git a/sql-files/upgrades/index.txt b/sql-files/upgrades/index.txt index 041480c4..13b2fda6 100644 --- a/sql-files/upgrades/index.txt +++ b/sql-files/upgrades/index.txt @@ -49,3 +49,5 @@ 2018-06-05--12-02.sql 2018-07-24--03-23.sql 2018-09-01--05-22.sql +2018-12-14--01-02.sql +2018-12-29--07-51.sql -- cgit v1.2.3-60-g2f50