diff options
| author | gumi <git@gumi.ca> | 2020-07-29 15:43:12 +0000 |
|---|---|---|
| committer | gumi <git@gumi.ca> | 2020-07-29 15:43:12 +0000 |
| commit | 5f7e2dd6d5d1a2e408d0463eac961afdecf45410 (patch) | |
| tree | 1ffd154bf66ca506407121accd7589752f75ad1d /conf | |
| parent | 97561caeca7e9518ff7e4961a57257c5298bdf25 (diff) | |
| download | serverdata-5f7e2dd6d5d1a2e408d0463eac961afdecf45410.tar.gz serverdata-5f7e2dd6d5d1a2e408d0463eac961afdecf45410.tar.bz2 serverdata-5f7e2dd6d5d1a2e408d0463eac961afdecf45410.tar.xz serverdata-5f7e2dd6d5d1a2e408d0463eac961afdecf45410.zip | |
update for Hercules v2020.07.26
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/map/battle/pet.conf | 5 | ||||
| -rw-r--r-- | conf/messages.conf | 7 |
2 files changed, 4 insertions, 8 deletions
diff --git a/conf/map/battle/pet.conf b/conf/map/battle/pet.conf index 9ee4c9f8..e2bf9f66 100644 --- a/conf/map/battle/pet.conf +++ b/conf/map/battle/pet.conf @@ -102,11 +102,6 @@ pet_max_stats: 99 pet_max_atk1: 500 pet_max_atk2: 1000 -// Are pets disabled during Guild Wars? -// If set to true, pets are automatically returned to egg when entering castles during WoE times -// and hatching is forbidden within as well. -pet_disable_in_gvg: false - // Should the pet immediately be removed when its intimacy drops to 0? (Note 1) // If set to false the pet will randomly walk around the map before being removed. pet_remove_immediately: true diff --git a/conf/messages.conf b/conf/messages.conf index d6250406..cdb4f1e7 100644 --- a/conf/messages.conf +++ b/conf/messages.conf @@ -646,8 +646,9 @@ 668: Shadow Chaser T 669: Summoner -//670-853 FREE (please start using from the top if you need, leave the 670+ range for new jobs) +//670-852 FREE (please start using from the top if you need, leave the 670+ range for new jobs) +853: NoPet | // Mapflag to disable Autoloot Commands 854: Auto loot item are disabled on this map. @@ -667,7 +668,7 @@ 863: Duel: Can't use this item in duel. 864: You cannot use this command when dead. 865: Can't create chat rooms in this area. -866: Pets are not allowed in Guild Wars. +866: Pets are disabled in this map. 867: You're not dead. 868: Your current memo positions are: 869: You broke the target's weapon. @@ -694,7 +695,7 @@ 886: Gained %dz. 887: %s stole an Unknown Item (id: %i). 888: %s stole %s. -889: Experience Gained Base:%"PRIu64" (%.2f%%) Job:%"PRIu64" (%.2f%%) +889: Experience Gained Base:%llu (%.2f%%) Job:%llu (%.2f%%) 890: [KS Warning!! - Owner : %s] 891: [Watch out! %s is trying to KS you!] 892: Growth: hp:%d sp:%d str(%.2f) agi(%.2f) vit(%.2f) int(%.2f) dex(%.2f) luk(%.2f) |