diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2009-01-22 19:16:10 +0000 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2009-01-22 19:16:10 +0000 |
| commit | ad401e02f0602dd9f0905ce290441b10e46ff75a (patch) | |
| tree | 6040b4f38e071999b9ef650b8abc0d082c768e45 /conf | |
| parent | b33e9b4508101d7097ed684c7c3316cb48a4f995 (diff) | |
| parent | 96352cdf87009db08ca68a3c3deee577a981adb8 (diff) | |
| download | serverdata-ad401e02f0602dd9f0905ce290441b10e46ff75a.tar.gz serverdata-ad401e02f0602dd9f0905ce290441b10e46ff75a.tar.bz2 serverdata-ad401e02f0602dd9f0905ce290441b10e46ff75a.tar.xz serverdata-ad401e02f0602dd9f0905ce290441b10e46ff75a.zip | |
Merge commit 'origin/master' into magic
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/battle_athena.conf | 11 | ||||
| -rw-r--r-- | conf/battle_local.conf.example | 1 |
2 files changed, 8 insertions, 4 deletions
diff --git a/conf/battle_athena.conf b/conf/battle_athena.conf index 474fcfd3..a4806bec 100644 --- a/conf/battle_athena.conf +++ b/conf/battle_athena.conf @@ -75,20 +75,20 @@ attribute_recover: yes item_auto_get: no // How long does it take for an item to disappear from the floor after it is dropped? (in miliseconds) -flooritem_lifetime: 60000 +flooritem_lifetime: 120000 // How long before the first person who did the most damage to a monster can get the item? (in milliseconds) -item_first_get_time: 3000 +item_first_get_time: 15000 // How long before the second person who did the second most damage to a monster can get the item? (in milliseconds) // (It Adds Time From The First Persons Time) // So, It Is Like First Person's Time + Second Person's Time = Time Before Second Person Can Get The Items -item_second_get_time: 1000 +item_second_get_time: 10000 // How long before the third person who did the third most/least damage to a monster can get the item? (in milliseconds) // (It Adds Time From The First Persons Time And Second Persons Time) // So, It Is Like First Person's Time + Second Person's Time + Third Person's Time = Time Before Third Person Can Get The Items -item_third_get_time: 1000 +item_third_get_time: 5000 // How long before the first person who did the most damage to a MVP can get the item? (in milliseconds) mvp_item_first_get_time: 10000 @@ -723,3 +723,6 @@ spam_threshold: 10 // Maximum line lengt, if a message is above chat_maxline, its dropped [1-512]. Default 255. chat_maxline: 512 + +// local settings for this server in this file +import: conf/battle_local.conf diff --git a/conf/battle_local.conf.example b/conf/battle_local.conf.example new file mode 100644 index 00000000..c9ba222c --- /dev/null +++ b/conf/battle_local.conf.example @@ -0,0 +1 @@ +// Nothing needs to be done here. |