summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authoreathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-19 21:47:34 +0000
committereathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-19 21:47:34 +0000
commit59c5b131644b8caedae22f6e716cddab90512dae (patch)
treeeebca77b3fcfa24fa36d8dedde1d2c131c2d91d0 /conf
parent5019704630e86a940669b44da6b1d824d8c1577f (diff)
downloadhercules-59c5b131644b8caedae22f6e716cddab90512dae.tar.gz
hercules-59c5b131644b8caedae22f6e716cddab90512dae.tar.bz2
hercules-59c5b131644b8caedae22f6e716cddab90512dae.tar.xz
hercules-59c5b131644b8caedae22f6e716cddab90512dae.zip
* Merged changes up to eAthena 15036.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15167 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'conf')
-rw-r--r--conf/Changelog.txt4
-rw-r--r--conf/log_athena.conf43
2 files changed, 35 insertions, 12 deletions
diff --git a/conf/Changelog.txt b/conf/Changelog.txt
index 8a32c7f47..4b8a7844a 100644
--- a/conf/Changelog.txt
+++ b/conf/Changelog.txt
@@ -1,5 +1,9 @@
Date Added
+2011/12/19
+ * Rev. 15036 Updates to log_athena.conf [Ai4rei]
+ - Changed meaning of 'log_chat' bits (shift to right by one, &64 bit removed, 1 no longer means 'all').
+ - Added option 'log_chat_woe_disable' which replaces &64 log_chat bit.
2011/10/15
* Rev. 14972 Updated misleading comment in conf/mapflag/partylock.txt (bugreport:4930, since r14092). [Ai4rei]
2011/08/21
diff --git a/conf/log_athena.conf b/conf/log_athena.conf
index 0d5378a8f..c3bc2009a 100644
--- a/conf/log_athena.conf
+++ b/conf/log_athena.conf
@@ -1,4 +1,23 @@
-// eAthena - Log Configuration File
+// ______ __ __
+// /\ _ \/\ \__/\ \
+// __\ \ \L\ \ \ ,_\ \ \___ __ ___ __
+// /'__`\ \ __ \ \ \/\ \ _ `\ /'__`\/' _ `\ /'__`\
+///\ __/\ \ \/\ \ \ \_\ \ \ \ \/\ __//\ \/\ \/\ \L\.\_
+//\ \____\\ \_\ \_\ \__\\ \_\ \_\ \____\ \_\ \_\ \__/.\_\
+// \/____/ \/_/\/_/\/__/ \/_/\/_/\/____/\/_/\/_/\/__/\/_/
+// _ _ _ _ _ _ _ _ _ _ _ _ _
+// / \ / \ / \ / \ / \ / \ / \ / \ / \ / \ / \ / \ / \
+//( e | n | g | l | i | s | h ) ( A | t | h | e | n | a )
+// \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/
+//
+//--------------------------------------------------------------
+// eAthena Log Configuration File
+//--------------------------------------------------------------
+// Note 1: Value is a config switch (on/off, yes/no or 1/0)
+// Note 2: Value is in percents (100 means 100%)
+// Note 3: Value is a bit field. If no description is given,
+// assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun)
+//--------------------------------------------------------------
// Enable Logs?
// 1 - Log all events.
@@ -83,20 +102,20 @@ log_npc: 0
// LOGGING FILTERS
// =============================================================
// 0 = Don't log at all
-// 1 = Log EVERYTHING!
-// Advanced Filter Bits: ||
-// 02 - Log Global messages
-// 04 - Log Whisper messages
-// 08 - Log Party messages
-// 16 - Log Guild messages
-// 32 - Log Main chat messages
-// 64 - Don't log anything when WOE is on
+// 1 - Log Global messages
+// 2 - Log Whisper messages
+// 4 - Log Party messages
+// 8 - Log Guild messages
+// 16 - Log Main chat messages
// Example:
-// log_chat: 12 = logs both Whisper & Party messages
-// log_chat: 16 = logs only Guild messages
-// log_chat: 68 = logs only Whisper, when WOE is off
+// log_chat: 5 = logs both Whisper & Party messages
+// log_chat: 8 = logs only Guild messages
+// log_chat: 31 = logs everything
log_chat: 0
+// Disable chat logging when WoE is running? (Note 1)
+log_chat_woe_disable: no
+
// Dead Branch Log Table
log_branch_db: branchlog