diff options
author | Jared Adams <jaxad0127@gmail.com> | 2009-01-18 16:27:13 +0000 |
---|---|---|
committer | Jared Adams <jaxad0127@gmail.com> | 2009-01-18 16:27:13 +0000 |
commit | 6a92fbc8e20a211d85e0656cc86bb3569389b85b (patch) | |
tree | 2c209e08298c90c31c0bd9323043cc3d8f80c440 /conf | |
parent | bb203b7c602ae52111828c7f89a5c10cd8e7a206 (diff) | |
parent | d66e5af9f0024f897a8d239aa5100b30c487a45b (diff) | |
download | serverdata-6a92fbc8e20a211d85e0656cc86bb3569389b85b.tar.gz serverdata-6a92fbc8e20a211d85e0656cc86bb3569389b85b.tar.bz2 serverdata-6a92fbc8e20a211d85e0656cc86bb3569389b85b.tar.xz serverdata-6a92fbc8e20a211d85e0656cc86bb3569389b85b.zip |
Merge commit 'mainline/master'
Diffstat (limited to 'conf')
-rw-r--r-- | conf/battle_athena.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/battle_athena.conf b/conf/battle_athena.conf index f40d2b7d..2b5a208a 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 |