diff options
| author | ajarn <ajarn@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-12-20 21:10:11 +0000 |
|---|---|---|
| committer | ajarn <ajarn@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-12-20 21:10:11 +0000 |
| commit | aab0d866949ff34a86096d3da93134b79accd245 (patch) | |
| tree | a65d00c5751dd0d49acb25ee5348ab52bf93cf2b | |
| parent | 17947817554295d025a317d03e03a82feaa37f49 (diff) | |
| download | hercules-aab0d866949ff34a86096d3da93134b79accd245.tar.gz hercules-aab0d866949ff34a86096d3da93134b79accd245.tar.bz2 hercules-aab0d866949ff34a86096d3da93134b79accd245.tar.xz hercules-aab0d866949ff34a86096d3da93134b79accd245.zip | |
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@687 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog.txt | 1 | ||||
| -rw-r--r-- | conf-tmpl/battle_athena.conf | 4 | ||||
| -rw-r--r-- | conf-tmpl/char_athena.conf | 5 |
3 files changed, 4 insertions, 6 deletions
diff --git a/Changelog.txt b/Changelog.txt index 9d8c041b3..ce1eecf50 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -1,6 +1,7 @@ Date Added 12/20 + * Moddified some *_athena.conf's (my typos and some inncorect default values) [Ajarn] * Added Valaris' double connection bug fix (imalive watchdog) [Valaris] * Fixed map-server exiting when it came across a bad NPC file [Codemaster] * Updated Valaris' large/tiny monsters - of course, he told us what he did wrong and how to fix it :) [Codemaster & Valaris] diff --git a/conf-tmpl/battle_athena.conf b/conf-tmpl/battle_athena.conf index 74672d35d..681a42063 100644 --- a/conf-tmpl/battle_athena.conf +++ b/conf-tmpl/battle_athena.conf @@ -154,7 +154,7 @@ base_exp_rate: 100 job_exp_rate: 100 // PVP exp. Do players get exp during pvp -pvp_exp: yes +pvp_exp: no // When a player dies, how should we penalize them? // 0 = No penalty. @@ -216,7 +216,7 @@ gm_skill_unconditional: no player_skillfree: no // When doing a skill reset, whether the skill's restriction is to be ignored or not. (Note 1) -player_skillup_limit: yes +player_skillup_limit: no // Forging success rate. (Note 2) weapon_produce_rate: 100 diff --git a/conf-tmpl/char_athena.conf b/conf-tmpl/char_athena.conf index 93769c144..d50862e6b 100644 --- a/conf-tmpl/char_athena.conf +++ b/conf-tmpl/char_athena.conf @@ -161,13 +161,10 @@ anti_freeze_enable: 0 // Anti-freeze system interval (in seconds) anti_freeze_interval: 6 -// If you want use an additional configuration file, uncomment and use this parameter -//import: path/additional_configuration_file - // Mugendai's GUI Support imalive_on: 0 imalive_time: 30 flush_on: 0 flush_time: 30 -import: conf/import/char_conf.txt
\ No newline at end of file +import: conf/import/char_conf.txt |