summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorFate <fate-tmw@googlemail.com>2009-01-10 01:53:41 -0700
committerFate <fate-tmw@googlemail.com>2009-01-10 01:53:41 -0700
commitbfea41dd3353f915e14b2948e7d9ee5e2efdd56a (patch)
tree6daca21aceea8fb650227a70b17de2846f338ae1 /conf
parent35a3951245e4c2549cf8109c675eb5f0c3f56d35 (diff)
parent64f98b45c853e6f7a21eb0289206f81a8183bf01 (diff)
downloadserverdata-bfea41dd3353f915e14b2948e7d9ee5e2efdd56a.tar.gz
serverdata-bfea41dd3353f915e14b2948e7d9ee5e2efdd56a.tar.bz2
serverdata-bfea41dd3353f915e14b2948e7d9ee5e2efdd56a.tar.xz
serverdata-bfea41dd3353f915e14b2948e7d9ee5e2efdd56a.zip
Merge branch 'master' into magic
Diffstat (limited to 'conf')
-rw-r--r--conf/battle_athena.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/battle_athena.conf b/conf/battle_athena.conf
index 3419fc80..474fcfd3 100644
--- a/conf/battle_athena.conf
+++ b/conf/battle_athena.conf
@@ -149,7 +149,7 @@ pvp_exp: yes
// 0 = No penalty.
// 1 = Lose % of current level when killed.
// 2 = Lose % of total experience when killed.
-death_penalty_type: 1
+death_penalty_type: 0
// Base exp. penalty rate (Each 100 is 1% of their exp)
death_penalty_base: 100