summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/common/inter-server.conf1
-rw-r--r--conf/map/battle/skill.conf5
2 files changed, 6 insertions, 0 deletions
diff --git a/conf/common/inter-server.conf b/conf/common/inter-server.conf
index 1e738c587..cbeb6617d 100644
--- a/conf/common/inter-server.conf
+++ b/conf/common/inter-server.conf
@@ -117,6 +117,7 @@ inter_configuration: {
autotrade_merchants_db: "autotrade_merchants"
autotrade_data_db: "autotrade_data"
npc_market_data_db: "npc_market_data"
+ npc_barter_data_db: "npc_barter_data"
}
}
diff --git a/conf/map/battle/skill.conf b/conf/map/battle/skill.conf
index 64bba68b5..da8d1906d 100644
--- a/conf/map/battle/skill.conf
+++ b/conf/map/battle/skill.conf
@@ -330,3 +330,8 @@ bowling_bash_area: 0
// punch a hole into SG it will for example create a "suck in" effect.
// If you disable this setting, the knockback direction will be completely random (eAthena style).
stormgust_knockback: true
+
+// Magic Rod's animation behavior (Note 1)
+// 0 : (official) Magic Rod's animation occurs every time it is used.
+// 1 : Magic Rod's animation would not occur unless a spell was absorbed. (old behavior)
+magicrod_type: 0