summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-04-10 22:59:35 +0300
committerAndrei Karas <akaras@inbox.ru>2015-04-10 22:59:35 +0300
commitdf8247b810ece6ab47bdc83b70b10040094024fe (patch)
tree56d9a63cbece4a9559939deca668c0e007c30eac /conf
parentf7a4c50eb2ec90840394b9e5845423b51e46a31b (diff)
downloadserverdata-df8247b810ece6ab47bdc83b70b10040094024fe.tar.gz
serverdata-df8247b810ece6ab47bdc83b70b10040094024fe.tar.bz2
serverdata-df8247b810ece6ab47bdc83b70b10040094024fe.tar.xz
serverdata-df8247b810ece6ab47bdc83b70b10040094024fe.zip
Update configuration files from hercules.
Diffstat (limited to 'conf')
-rw-r--r--conf/battle/misc.conf4
-rw-r--r--conf/battle/skill.conf3
-rw-r--r--conf/inter-server.conf1
3 files changed, 6 insertions, 2 deletions
diff --git a/conf/battle/misc.conf b/conf/battle/misc.conf
index dc83fb7aa..f27598f35 100644
--- a/conf/battle/misc.conf
+++ b/conf/battle/misc.conf
@@ -90,6 +90,10 @@ duel_only_on_same_map: no
official_cell_stack_limit: 0
custom_cell_stack_limit: 1
+// If 0 while walking not check occupied cells
+// If 1 while walking check occupied cells
+check_occupied_cells: 0
+
// Allow autotrade only in map with autotrade flag?
// Set this to "no" will allow autotrade where no "autotrade" mapflag is set
// Set this to "yes" to only allow autotrade on maps with "autotrade" mapflag
diff --git a/conf/battle/skill.conf b/conf/battle/skill.conf
index 028228729..f3da0e209 100644
--- a/conf/battle/skill.conf
+++ b/conf/battle/skill.conf
@@ -154,11 +154,12 @@ monster_cloak_check_type: 4
land_skill_limit: 9
//Determines which kind of skill-failed messages should be sent:
+// 0 - Enable by default
// 1 - Disable all skill-failed messages.
// 2 - Disable skill-failed messages due to can-act delays.
// 4 - Disable failed message from Snatcher
// 8 - Disable failed message from Envenom
-display_skill_fail: 2
+display_skill_fail: 0
// Can a player in chat room (in-game), be warped by a warp portal? (Note 1)
chat_warpportal: no
diff --git a/conf/inter-server.conf b/conf/inter-server.conf
index 184285cfd..2bffeb1af 100644
--- a/conf/inter-server.conf
+++ b/conf/inter-server.conf
@@ -118,7 +118,6 @@ char_reg_num_db: char_reg_num_db
// Map Database Tables
item_db_db: item_db
-item_db_re_db: item_db_re
item_db2_db: item_db2
mob_db_db: mob_db
mob_db2_db: mob_db2