From f47ce884e05379ed4f78fa2d8926223c94e86e7d Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 26 Jul 2018 22:48:45 +0300 Subject: Update from hercules. Update configs Add new sql update. --- conf/map/battle/client.conf | 11 ++++++++--- db/constants.conf | 6 ------ db/stylist_db.conf | 12 ++++++++++++ sql-files/main.sql | 1 + sql-files/upgrades/2018-07-24--03-23.sql | 22 ++++++++++++++++++++++ sql-files/upgrades/index.txt | 1 + 6 files changed, 44 insertions(+), 9 deletions(-) create mode 100644 sql-files/upgrades/2018-07-24--03-23.sql diff --git a/conf/map/battle/client.conf b/conf/map/battle/client.conf index ed4f3236..8df6ea54 100644 --- a/conf/map/battle/client.conf +++ b/conf/map/battle/client.conf @@ -72,6 +72,13 @@ area_size: 14 // Chat area size (how many squares away from a player can they chat) chat_area_size: 14 +// Area which monster death packets should be sent to. +// This should be set to the farthest distance a player can reach in 250ms +// after a monster dies. +// Setting it to (area_size + 18) (18 being the range of Monk's Snap skill) +// should be a great value +dead_area_size: 32 + // Maximum walk path (how many cells a player can walk going to cursor) // default: 17(official) max_walk_path: 17 @@ -104,9 +111,7 @@ wedding_modifydisplay: false save_clothcolor: true // Save body styles? (Note 1) -// Note: Don't turn this on unless you know what your doing. -// Sprites are not released officially. -save_body_style: false +save_body_style: true // Do not display cloth colors for the wedding costume? // Note: Both save_clothcolor and wedding_modifydisplay have to be enabled diff --git a/db/constants.conf b/db/constants.conf index d49283f1..29d308c1 100644 --- a/db/constants.conf +++ b/db/constants.conf @@ -33,15 +33,9 @@ constants_db: { ************* Entry structure (full) ************************************* Identifier: { Value: value // (int) - Parameter: true // (boolean) Defaults to false. Deprecated: true // (boolean) Defaults to false. } **************************************************************************/ -// NOTE: -// Parameters are special in that they retrieve certain runtime values -// depending on the specified ID in field Value. Depending on the -// implementation values assigned by scripts to parameters will affect -// runtime values, such as Zeny, as well (see pc_readparam/pc_setparam). comment__: "Weekdays" SUNDAY: 0 diff --git a/db/stylist_db.conf b/db/stylist_db.conf index 6452da8a..e857df97 100644 --- a/db/stylist_db.conf +++ b/db/stylist_db.conf @@ -251,4 +251,16 @@ stylist_db: ( // ItemID: "Clothing_Dye_Coupon" // BoxItemID: "Clothing_Dye_Box" }, +{ + Type: "LOOK_BODY2" + Id: 0 +// ItemID: "Costume_Change_Ticket" +// BoxItemID: "Costume_Change_Ticket" +}, +{ + Type: "LOOK_BODY2" + Id: 1 +// ItemID: "Costume_Change_Ticket" +// BoxItemID: "Costume_Change_Ticket" +}, ) diff --git a/sql-files/main.sql b/sql-files/main.sql index 8f7e5355..d1c6364c 100644 --- a/sql-files/main.sql +++ b/sql-files/main.sql @@ -895,6 +895,7 @@ INSERT IGNORE INTO `sql_updates` (`timestamp`) VALUES (1509835214); -- 2017-11-0 INSERT IGNORE INTO `sql_updates` (`timestamp`) VALUES (1519671456); -- 2018-02-26--15-57.sql INSERT IGNORE INTO `sql_updates` (`timestamp`) VALUES (1520654809); -- 2018-03-10--04-06.sql 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 -- -- Table structure for table `storage` -- diff --git a/sql-files/upgrades/2018-07-24--03-23.sql b/sql-files/upgrades/2018-07-24--03-23.sql new file mode 100644 index 00000000..64e29996 --- /dev/null +++ b/sql-files/upgrades/2018-07-24--03-23.sql @@ -0,0 +1,22 @@ +#1532403228 + +-- This file is part of Hercules. +-- http://herc.ws - http://github.com/HerculesWS/Hercules +-- +-- Copyright (C) 2018 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 . + +UPDATE `inventory` SET `identify` = 1, `attribute` = 1 WHERE `card0` = -256 and `identify` = 0 +INSERT INTO `sql_updates` (`timestamp`) VALUES (1532403228); diff --git a/sql-files/upgrades/index.txt b/sql-files/upgrades/index.txt index d92f3fc5..1d313a0c 100644 --- a/sql-files/upgrades/index.txt +++ b/sql-files/upgrades/index.txt @@ -45,3 +45,4 @@ 2018-02-26--15-57.sql 2018-03-10--04-06.sql 2018-06-05--12-02.sql +2018-07-24--03-23.sql -- cgit v1.2.3-70-g09d2