diff options
| author | brianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-10-02 18:33:10 +0000 |
|---|---|---|
| committer | brianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-10-02 18:33:10 +0000 |
| commit | cc256e4bdc0c3cb858b993e82f53104113f814c4 (patch) | |
| tree | eed2a136d870a0012571ed896aa0c17eecc475b1 /db | |
| parent | 9667d693f53f5eb0be58798bbb953aa3ee0146b8 (diff) | |
| download | hercules-cc256e4bdc0c3cb858b993e82f53104113f814c4.tar.gz hercules-cc256e4bdc0c3cb858b993e82f53104113f814c4.tar.bz2 hercules-cc256e4bdc0c3cb858b993e82f53104113f814c4.tar.xz hercules-cc256e4bdc0c3cb858b993e82f53104113f814c4.zip | |
- Added instance, GVG, and BG maps to nopvp.txt (bugreport:4396)
and changed /conf/mapflag/nopvp.txt to be loaded first.
- Removed a duplicate line in item_misc.txt (bugreport:4453)
- Updated script paths to custom BG scripts, follow up to r14374. (bugreport:4443)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14411 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'db')
| -rw-r--r-- | db/item_misc.txt | 1 | ||||
| -rw-r--r-- | db/pet_db.txt | 30 |
2 files changed, 15 insertions, 16 deletions
diff --git a/db/item_misc.txt b/db/item_misc.txt index 9b2375072..63ef67bed 100644 --- a/db/item_misc.txt +++ b/db/item_misc.txt @@ -164,7 +164,6 @@ 22,12373,1 // 22,12374,1 // 22,12395,1 // -22,12395,1 // // Bundle Of Magic Scroll 23,686,1 // Level 3 Earth Spike 23,687,1 // Level 5 Earth Spike diff --git a/db/pet_db.txt b/db/pet_db.txt index d9ffbd364..ce2316c59 100644 --- a/db/pet_db.txt +++ b/db/pet_db.txt @@ -5,21 +5,21 @@ // // 01. MobID Monster ID of the pet. // 02. Name Name of the monster as defined in the database. -// 02. JName The display name of the monster when hatched. -// 03. LureID Pet Tame Item ID. -// 04. EggID Pet Egg ID. -// 05. EquipID Pet Accessory ID. -// 06. FoodID Pet Food ID. -// 07. Fullness The amount Hunger is decreased every [HungeyDelay] seconds. -// 08. HungeyDelay The amount of time it takes for hunger to decrease after feeding. (Default: 60 seconds) -// 09. R_Hungry Amount of Intimacy that is increased when fed. -// 10. R_Full Amount of Intimacy that is decreased when over-fed. -// 11. Intimate Amount of Intimacy the pet starts with. -// 12. Die Amount of Intimacy that is decreased when the pet owner dies. -// 13. Capture Capture succes rate (10000 = 100%) -// 14. Speed Pet's walk speed. (Defaul: 150) -// 15. S_Performance Special Performance. (Yes = 1, No = 0) -// 16. talk_convert_class Disables pet talk (instead of talking they emote with /!.) +// 03. JName The display name of the monster when hatched. +// 04. LureID Pet Tame Item ID. +// 05. EggID Pet Egg ID. +// 06. EquipID Pet Accessory ID. +// 07. FoodID Pet Food ID. +// 08. Fullness The amount Hunger is decreased every [HungeyDelay] seconds. +// 09. HungeyDelay The amount of time it takes for hunger to decrease after feeding. (Default: 60 seconds) +// 10. R_Hungry Amount of Intimacy that is increased when fed. +// 11. R_Full Amount of Intimacy that is decreased when over-fed. +// 12. Intimate Amount of Intimacy the pet starts with. +// 13. Die Amount of Intimacy that is decreased when the pet owner dies. +// 14. Capture Capture succes rate (10000 = 100%) +// 15. Speed Pet's walk speed. (Defaul: 150) +// 16. S_Performance Special Performance. (Yes = 1, No = 0) +// 17. talk_convert_class Disables pet talk (instead of talking they emote with /!.) //NOTE: The max value (100%) of attack_rate, defense_rate & change_target_rate is 10000. //In theory you can use any valid script, but it is run only once upon pet |