diff options
author | Euphy <euphy@rathena.org> | 2013-06-20 22:29:03 -0400 |
---|---|---|
committer | Euphy <euphy@rathena.org> | 2013-06-20 22:29:03 -0400 |
commit | 86c43fa2e2c164362cae4f3c2d9cf0ccd22bc528 (patch) | |
tree | df955a23899586104e67359dc490891221b2875b /conf/logs.conf | |
parent | caa8a41b40a5ce3c96eb793619ff75f191ca558b (diff) | |
parent | 0f7c29113d7d898150108d66d1358f15bb018e0a (diff) | |
download | hercules-86c43fa2e2c164362cae4f3c2d9cf0ccd22bc528.tar.gz hercules-86c43fa2e2c164362cae4f3c2d9cf0ccd22bc528.tar.bz2 hercules-86c43fa2e2c164362cae4f3c2d9cf0ccd22bc528.tar.xz hercules-86c43fa2e2c164362cae4f3c2d9cf0ccd22bc528.zip |
Merge remote-tracking branch 'upstream/master'
Conflicts:
conf/plugins.conf
db/pre-re/skill_tree.txt
db/re/skill_tree.txt
db/sc_config.txt
npc/mobs/citycleaners.txt
src/map/atcommand.c
src/map/battle.c
src/map/clif.c
src/map/map.c
src/map/packets.h
src/map/pc.c
src/map/script.c
src/map/skill.c
src/map/status.c
src/map/storage.c
src/map/trade.h
Merged master.
Diffstat (limited to 'conf/logs.conf')
-rw-r--r-- | conf/logs.conf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/conf/logs.conf b/conf/logs.conf index 2aeb1b52e..f036cbccf 100644 --- a/conf/logs.conf +++ b/conf/logs.conf @@ -25,7 +25,7 @@ // 0x02000 - (E) Log mail system transactions. // 0x04000 - (I) Log auction system transactions. // 0x08000 - (B) Log buying store transactions -// 0x10000 - (X) Log all other transcations (rentals expiring/inserting cards/items removed by item_check/ +// 0x10000 - (X) Log all other transactions (rentals expiring/inserting cards/items removed by item_check/ // rings deleted by divorce/pet egg (un)hatching/pet armor (un)equipping/Weapon Refine skill/Remove Trap skill) // Example: Log trades+vending+script items+created items: 1+2+32+1024 = 1059 // Please note that moving items from inventory to cart and back is not logged by design. @@ -77,7 +77,7 @@ log_branch: no // Track Zeny Changes // Filter settings -// 0 - don't log; 1 - log any zeny changes; 2.....1000000 - minimal absolut logging zeny value +// 0 - don't log; 1 - log any zeny changes; 2.....1000000 - minimal absolute logging zeny value log_zeny: 0 // Log MVP Monster Drops (Note 1) |