3 files changed, 21 insertions, 7 deletions
diff --git a/conf/atcommand_local.conf.example b/conf/atcommand_local.conf.example
index 737c793e..0e87addc 100644
--- a/conf/atcommand_local.conf.example
+++ b/conf/atcommand_local.conf.example
@@ -163,8 +163,8 @@ killmonster: 60
 // Kill all monsters in map (without drops)
 killmonster2: 60
 
-// drop all your items
-dropall: 99
+// Check which characters are online from a characters IP address
+ipcheck: 60
 
 // store all your items
 storeall: 60
@@ -230,9 +230,6 @@ kill: 60
 // Enable hitting a player even when not in pvp
 killer: 60
 
-// Creates weapon of desired element.
-produce: 60
-
 // Warps a character to you
 recall: 60
 
@@ -361,6 +358,9 @@ idsearch: 80
 // Creates an item of your choosing, either Item ID or Name (1 command + /item).
 item: 80
 
+// Creates weapon of desired element.
+produce: 80
+
 // ??
 itemcheck: 80
 
@@ -368,6 +368,9 @@ itemcheck: 80
 //---------------------------
 // 99: "Admin"
 
+// drop all your items
+dropall: 99
+
 // Enables GVG on a map (2 same commands).
 gvgon: 99
 gpvpon: 99
diff --git a/conf/battle_athena.conf b/conf/battle_athena.conf
index 782a05bd..574938d6 100644
--- a/conf/battle_athena.conf
+++ b/conf/battle_athena.conf
@@ -240,8 +240,10 @@ quest_skill_reset: no
 // You must have basic skills to be able to sit, trade, form a party or create a chatroom? (Note 1)
 basic_skill_check: yes
 
-// When making a guild, an Emperium is consumed? (Note 1)
-guild_emperium_check: yes
+// Item to require when making a guild. Setting this to
+// 0 will disable the check. Using item 1337 for now
+// to disable creation (as it's unallocated)
+guild_emperium_check: 1337
 
 // Maximum tax limit on a guild member.
 guild_exp_limit: 50
@@ -725,5 +727,13 @@ chat_spam_ban: 1
 // Maximum line lengt, if a message is above chat_maxline, its dropped [1-512]. Default 255.
 chat_maxline: 512
 
+// Packet flood protection
+// If more than packet_spam_flood over-limits packets are recieved in 
+// packet_spam_threshold seconds, we will kick the user if packet_spam_kick
+// is not set to 0. Limits on individual packets are defined in src/map/clif.c
+packet_spam_flood: 30
+packet_spam_threshold: 2
+packet_spam_kick: 1
+
 // local settings for this server in this file
 import: conf/battle_local.conf
diff --git a/conf/help.txt.example b/conf/help.txt.example
index bcbbf563..c12b1a89 100644
--- a/conf/help.txt.example
+++ b/conf/help.txt.example
@@ -18,6 +18,7 @@
  60:@charitemlist <char name> - Displays all items of a player.
  60:@charstoragelist <char name> - Displays all items of a player's storage.
  60:@charcartlist <char name> - Displays all items of a player's cart.
+ 60:@ipcheck <char name> - Display all characters online from a characters IP address
  99:@mapinfo [<0-3> [map]] - Give information about a map (general info +: 0: no more, 1: players, 2: NPC, 3: shops/chat).
  99: 
  99:@guildspy <guild_name/id> - You will receive all messages of the guild channel