summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorEmistry Haoyan <equinox1991@gmail.com>2020-03-08 05:18:26 +0800
committerEmistry Haoyan <equinox1991@gmail.com>2020-07-06 00:50:48 +0800
commitd3c24f7d9ae64354e446a85ba0dad21daca589c1 (patch)
tree194c6e85100d516fe73425f6aed1c72ea05d61fe /conf
parent1dfebbd4966310387357cbddae600418a56df658 (diff)
downloadhercules-d3c24f7d9ae64354e446a85ba0dad21daca589c1.tar.gz
hercules-d3c24f7d9ae64354e446a85ba0dad21daca589c1.tar.bz2
hercules-d3c24f7d9ae64354e446a85ba0dad21daca589c1.tar.xz
hercules-d3c24f7d9ae64354e446a85ba0dad21daca589c1.zip
Add NoPet mapflag
- allow to set nopet mapflag at any maps. - mapflag to disable pet, and force return to egg.
Diffstat (limited to 'conf')
-rw-r--r--conf/map/battle/pet.conf5
-rw-r--r--conf/messages.conf6
2 files changed, 4 insertions, 7 deletions
diff --git a/conf/map/battle/pet.conf b/conf/map/battle/pet.conf
index 3060b6e64..6d013b0ef 100644
--- a/conf/map/battle/pet.conf
+++ b/conf/map/battle/pet.conf
@@ -95,11 +95,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 98b0e0a9d..d8338968e 100644
--- a/conf/messages.conf
+++ b/conf/messages.conf
@@ -646,8 +646,10 @@
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 +669,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.