summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/battle/items.conf5
-rw-r--r--conf/battle/skill.conf2
-rw-r--r--conf/inter-server.conf12
3 files changed, 18 insertions, 1 deletions
diff --git a/conf/battle/items.conf b/conf/battle/items.conf
index 9bc2e37cc..343b4212e 100644
--- a/conf/battle/items.conf
+++ b/conf/battle/items.conf
@@ -75,3 +75,8 @@ gtb_sc_immunity: 50
// NOTE: Different cards that grant the same skill will both
// always work independently of each other regardless of setting.
autospell_stacking: no
+
+// Will disabled consumables (disabled by item_noequip.txt) be consumed when trying to use them?
+// 1 (official): yes
+// 0: no
+item_restricted_consumption_type:1 \ No newline at end of file
diff --git a/conf/battle/skill.conf b/conf/battle/skill.conf
index 03aae2ad1..0dd97610e 100644
--- a/conf/battle/skill.conf
+++ b/conf/battle/skill.conf
@@ -278,5 +278,5 @@ dancing_weaponswitch_fix: yes
// Skill Trap Type
// 0: (official) traps only makes player unable to move after its walk path is complete, and it activates other traps on the way.
-// 1: trap makes player stops moving right when stepping over it.
+// 1: trap makes player stop moving right when stepping over it.
skill_trap_type: 0
diff --git a/conf/inter-server.conf b/conf/inter-server.conf
index 70bf80e5c..523437007 100644
--- a/conf/inter-server.conf
+++ b/conf/inter-server.conf
@@ -56,6 +56,18 @@ log_db_db: ragnarok
log_codepage:
log_login_db: loginlog
+// == MySQL Reconnect Settings
+// ===========================
+// - mysql_reconnect_type
+// - 1: when mysql disconnects during runtime, the server tries to reconnect mysql_reconnect_count times and,
+// -- if unsuccessful, the server is shut down
+// - 2: when mysql disconnects during runtime it tries to reconnect indefinitely
+mysql_reconnect_type:2
+// - mysql_reconnect_count
+// - number of reconnect attempts the server should do when the database disconnects during runtime
+// - only used when mysql_reconnect_type is 1
+mysql_reconnect_count:1
+
// DO NOT CHANGE ANYTHING BEYOND THIS LINE UNLESS YOU KNOW YOUR DATABASE DAMN WELL
// this is meant for people who KNOW their stuff, and for some reason want to change their
// database layout. [CLOWNISIUS]