diff options
| -rw-r--r-- | conf/map/battle/feature.conf | 7 | ||||
| -rw-r--r-- | db/re/job_db.conf | 4 | ||||
| -rw-r--r-- | db/re/pet_db.conf | 7 | ||||
| -rw-r--r-- | sql-files/main.sql | 2 | ||||
| -rw-r--r-- | sql-files/upgrades/2018-06-05--12-02.sql | 24 | ||||
| -rw-r--r-- | sql-files/upgrades/index.txt | 1 |
6 files changed, 42 insertions, 3 deletions
diff --git a/conf/map/battle/feature.conf b/conf/map/battle/feature.conf index fc6b49ede..eaff849f0 100644 --- a/conf/map/battle/feature.conf +++ b/conf/map/battle/feature.conf @@ -69,7 +69,12 @@ features: { // Allow Homunculus autofeeding // true: enable (Default) // false: disable - enable_homun_autofeed: true + enable_homun_autofeed: false + + // Allow Pet autofeeding + // true: enable (Default) + // false: disable + enable_pet_autofeed: false // Enable Attendance System for clients >= 2018-03-07bRagexeRE or 2018-04-04bRagexe // true: enable (Default) diff --git a/db/re/job_db.conf b/db/re/job_db.conf index 021eed101..8c0711725 100644 --- a/db/re/job_db.conf +++ b/db/re/job_db.conf @@ -12,8 +12,8 @@ //============== RE Structure Example ================ /* Job_Name: { // Job names as in src/map/pc.c (they are hardcoded at the moment so if you want to add a new job you should add it there) - BaseExpGroup: "EvolClasses" - JobExpGroup: "EvolClasses" + BaseExpGroup: "Exp Group Name" (string) // Name of base exp group defined in exp_group_db.conf + JobExpGroup: "Exp Group Name" (string) // Name of job exp group defined in exp_group_db.conf Inherit: ( "Other_Job_Name" ); // Base job from which this job will inherit its max weight, base ASPD set and HP/SP table. InheritHP: ( "Other_Job_Name" );// Base job from which this job will inherit its HP table. InheritSP: ( "Other_Job_Name" );// Base job from which this job will inherit its SP table. diff --git a/db/re/pet_db.conf b/db/re/pet_db.conf index d450c2991..8d78a83a3 100644 --- a/db/re/pet_db.conf +++ b/db/re/pet_db.conf @@ -56,6 +56,13 @@ pet_db:( AttackRate: attack rate (int, defaults to 0) DefendRate: Defence attack (int, defaults to 0) ChangeTargetRate: change target (int, defaults to 0) + Evolve: { + EggID: { (string, Evolved Pet EggID) + Name: Amount (items required to perform evolution) + ... + } + } + AutoFeed: true/false (boolean, defaults to false) PetScript: <" Pet Script (can also be multi-line) "> EquipScript: <" Equip Script (can also be multi-line) "> }, diff --git a/sql-files/main.sql b/sql-files/main.sql index 2e51d6a12..8f7e5355b 100644 --- a/sql-files/main.sql +++ b/sql-files/main.sql @@ -782,6 +782,7 @@ CREATE TABLE IF NOT EXISTS `pet` ( `hungry` SMALLINT(9) UNSIGNED NOT NULL DEFAULT '0', `rename_flag` TINYINT(4) UNSIGNED NOT NULL DEFAULT '0', `incubate` INT(11) UNSIGNED NOT NULL DEFAULT '0', + `autofeed` TINYINT(2) UNSIGNED NOT NULL DEFAULT '0', PRIMARY KEY (`pet_id`) ) ENGINE=MyISAM; @@ -893,6 +894,7 @@ INSERT IGNORE INTO `sql_updates` (`timestamp`) VALUES (1496588700); -- 2017-06-0 INSERT IGNORE INTO `sql_updates` (`timestamp`) VALUES (1509835214); -- 2017-11-04--10-39.sql 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 -- -- Table structure for table `storage` -- diff --git a/sql-files/upgrades/2018-06-05--12-02.sql b/sql-files/upgrades/2018-06-05--12-02.sql new file mode 100644 index 000000000..26c22243f --- /dev/null +++ b/sql-files/upgrades/2018-06-05--12-02.sql @@ -0,0 +1,24 @@ +#1528180320 + +-- This file is part of Hercules. +-- http://herc.ws - http://github.com/HerculesWS/Hercules +-- +-- Copyright (C) 2018 Hercules Dev Team +-- Copyright (C) 2018 Dastgir +-- +-- 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 `pet` ADD COLUMN `autofeed` TINYINT(2) UNSIGNED NOT NULL DEFAULT '0'; + +INSERT INTO `sql_updates` (`timestamp`, `ignored`) VALUES (1528180320 , 'No'); diff --git a/sql-files/upgrades/index.txt b/sql-files/upgrades/index.txt index dd474ea9d..d92f3fc5d 100644 --- a/sql-files/upgrades/index.txt +++ b/sql-files/upgrades/index.txt @@ -44,3 +44,4 @@ 2017-11-04--10-39.sql 2018-02-26--15-57.sql 2018-03-10--04-06.sql +2018-06-05--12-02.sql |