Merge branch 'master' of git@gitorious.org:tmw-eathena-data/mainline

Conflicts:
	db/item_db.txt
	npc/013-3_Cave/barrier.txt

4 files changed, 41 insertions, 13 deletions

diff --git a/conf/atcommand_local.conf.example b/conf/atcommand_local.conf.example
index 1f07f962..ca369949 100644
--- a/conf/atcommand_local.conf.example
+++ b/conf/atcommand_local.conf.example
@@ -81,7 +81,8 @@ charstats: 40
 // Heals a person to full HP/SP.
 heal: 40
 
-// GM Hide (enables you to be invisible to characters, and most monsters) (1 command + /hide).
+// GM Hide (hides you from monsters and most reporting functions).  
+// To hide from other players use @invisible
 hide: 40
 
 // Enables you to to jump randomly on a map (that you are already on).
@@ -109,6 +110,13 @@ itemreset: 40
 // Sets your spawn point (aka save point).
 save: 40
 
+// Send text to the GM log
+log: 40
+l: 40
+
+// Send text to the GM log and local chat
+tee: 40
+t: 40
 
 //--------------------
 // 60: "GM"
@@ -285,6 +293,18 @@ chardropall: 60
 // put a players possessions in storage
 charstoreall: 60
 
+// iterate over players
+// forward
+hugo: 60
+// backward
+linus: 60
+
+// make yourself invisible to everyone
+invisible: 60
+
+// make yourself visible to everyone
+visible: 60
+
 //----------------------
 // 80: "eA Dev"
 
diff --git a/conf/battle_athena.conf b/conf/battle_athena.conf
index a4806bec..d4852dd7 100644
--- a/conf/battle_athena.conf
+++ b/conf/battle_athena.conf
@@ -708,18 +708,19 @@ max_cloth_color: 4
 area_size: 14
 
 // chat system:
-// 2 anti spam systems works together, one is a time based system and the
-// other is a repeat based system. Both count up individually, and if one
-// surpasses the spam_threshold, players is auto-banned for spam_ban hours
+// More than flood lines in threshold seconds gets a ban
+// More than warn lines in threshold seconds gets a warning
+chat_spam_flood: 10
+chat_spam_warn: 8
+chat_spam_threshold: 10
 
-// how many hours to auto ban spammer, 0 to disable [0-32767]. Default 6.
-spam_ban: 1
-
-// how many ms must the message be within to hit threshold counter [1-32767]. Default 3000.
-spam_time: 3000
+// How much to increment the line count if the content is lame.
+// Lameness is defined as mostly caps, punctuation, or a repeat of the last line.
+// Set to 1 or 2 depending on how much you hate hearing "ITEN PLZ!" 3 times in a row..
+chat_lame_penalty: 2
 
-// how many unpaused lines/repeats in a row before ban trigger [1-32767]. Default 10.
-spam_threshold: 10
+// how many hours to auto ban spammer, 0 to disable [0-32767]. Default 6.
+chat_spam_ban: 1
 
 // Maximum line lengt, if a message is above chat_maxline, its dropped [1-512]. Default 255.
 chat_maxline: 512
diff --git a/conf/char_athena.conf b/conf/char_athena.conf
index 83a06145..d1e27843 100644
--- a/conf/char_athena.conf
+++ b/conf/char_athena.conf
@@ -106,7 +106,7 @@ online_sorting_option: 0
 online_display_option: 64
 
 // minimum GM level to display 'GM' when we want to display it (default: 1)
-online_gm_display_min_level: 20
+online_gm_display_min_level: 60
 
 // refresh time (in sec) of the html file in the explorer (default 20)
 online_refresh_html: 20
diff --git a/conf/help.txt.example b/conf/help.txt.example
index 3aa1af99..bcbbf563 100644
--- a/conf/help.txt.example
+++ b/conf/help.txt.example
@@ -30,7 +30,9 @@
  40: 
  40:--- CHANGE GM STATE CMD ---
  40:@die ---- suicide
- 40:@hide - Makes you character invisible (GM invisibility). Type @hide again become visible.
+ 40:@hide - Makes you invisible to monsters and other reporting functions. Type @hide again become visible.
+ 60:@invisible - Makes your character invisible (complete)
+ 60:@visible - Makes your character visible (opposite of @invisible)
  40:@save - Sets respawn point to current spot
  40:@return - Warps you to your save point
  40:@warp <mapname> <x> <y> - Warps you to the selected position
@@ -42,6 +44,11 @@
  40:  -2: (Memo point 1)  2: geffen   6: aldebaran     10: amatsu   14: louyang
  40:  -1: (Memo point 0)  3: payon    7: xmas (lutie)  11: gonryun  15: start point
  40:   0: prontera        4: alberta  8: comodo        12: umbala   16: prison/jail
+ 60:@hugo - iterate over players forward
+ 60:@linus - iterator over players backwards
+ 40:
+ 40:@log/@l - Send text to the GM log
+ 40:@tee/@t - Send text to the GM log and local chat
  40: 
  60:@alive - Revives yourself from death
  40:@heal [<HP> <SP>] - Heals the desired amount of HP and SP. No value specified will do a full heal.