From 373cfe9bee3f297540d09cb0616e2b5da17463f3 Mon Sep 17 00:00:00 2001
From: eathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Sat, 24 Dec 2011 14:13:39 +0000
Subject: * Merged changes up to eAthena 15040.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15245 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 conf/log_athena.conf | 59 ++++++++++++++++++++++++++--------------------------
 1 file changed, 30 insertions(+), 29 deletions(-)

(limited to 'conf/log_athena.conf')

diff --git a/conf/log_athena.conf b/conf/log_athena.conf
index c3bc2009a..156fabb17 100644
--- a/conf/log_athena.conf
+++ b/conf/log_athena.conf
@@ -19,28 +19,29 @@
 //         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun)
 //--------------------------------------------------------------
 
-// Enable Logs?
-// 1 - Log all events.
-// Or, determine what to log by adding up the different events:
-// 0002 - (T) Log trades
-// 0004 - (V) Log vending transactions
-// 0008 - (P) Log items drop/picked by players
-// 0016 - (L) Log items drop/looted by monsters
-// 0032 - (S) Log NPC transactions (buy/sell)
-// 0064 - (N) Log Script transactions (items deleted/acquired through quests)
-// 0128 - (M) Log items stolen from mobs (Steal/Gank)
-// 0256 - (C) Log player-used items
-// 0512 - (M) Log MVP prize items
-// 1024 - (A) Log player created/deleted items (through @/# commands)
-// 2048 - (R) Log items placed/retrieved from storage.
-// 4096 - (G) Log items placed/retrieved from guild storage.
-// 8192 - (E) Log mail system transactions.
-// 16384 - (B) Log buying store transactions
-// Example: Log trades+vending+script items+created items: 2+4+64+1024 = 1094
-enable_logs: 1
-
-// Use MySQL Logs? (SQL Version Only)
-sql_logs: 0
+// Enable Logs? (Note 3)
+// 0x0000 - Don't log at all
+// 0x0001 - (T) Log trades
+// 0x0002 - (V) Log vending transactions
+// 0x0004 - (P) Log items drop/picked by players
+// 0x0008 - (L) Log items drop/looted by monsters
+// 0x0010 - (S) Log NPC transactions (buy/sell)
+// 0x0020 - (N) Log Script transactions (items deleted/acquired through quests)
+// 0x0040 - (D) Log items stolen from mobs (Steal/Gank)
+// 0x0080 - (C) Log player-used items
+// 0x0100 - (O) Log produced/ingredient items
+// 0x0200 - (U) Log MVP prize items
+// 0x0400 - (A) Log player created/deleted items (through @/# commands)
+// 0x0800 - (R) Log items placed/retrieved from storage.
+// 0x1000 - (G) Log items placed/retrieved from guild storage.
+// 0x2000 - (E) Log mail system transactions.
+// 0x4000 - (I) Log auction system transactions.
+// 0x8000 - (B) Log buying store transactions
+// Example: Log trades+vending+script items+created items: 1+2+32+1024 = 1059
+enable_logs: 0xFFFF
+
+// Use MySQL Logs? [SQL Version Only] (Note 1)
+sql_logs: no
 
 // LOGGING FILTERS
 // =============================================================
@@ -80,25 +81,25 @@ price_items_log: 1000
 amount_items_log: 100
 //=============================================================
 
-// Log Dead Branch Usage
-log_branch: 0
+// Log Dead Branch Usage (Note 1)
+log_branch: no
 
 // Track Zeny Changes
 // Filter settings
 // 0 - don't log; 1 - log any zeny changes; 2.....1000000 - minimal absolut logging zeny value
 log_zeny: 0
 
-// Log MVP Monster Drops
+// Log MVP Monster Drops (Note 1)
 // Outdated. Use Pick_Log instead. But this log could be useful to keep track slayed MVPs
-log_mvpdrop: 0
+log_mvpdrop: no
 
 // Log GM Commands (set to minimum level of Logged Commands)
 log_gm: 40
 
-// Log NPC 'logmes' commands
-log_npc: 0
+// Log NPC 'logmes' commands (Note 1)
+log_npc: no
 
-// Log CHAT (Global, Whisper, Party, Guild, Main chat)
+// Log CHAT (Global, Whisper, Party, Guild, Main chat) (Note 3)
 // LOGGING FILTERS
 // =============================================================
 // 0 = Don't log at all
-- 
cgit v1.2.3-60-g2f50