* Merged changes from trunk [14496:14630/trunk].

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14632 54d463be-8e91-2dee-dedb-b68131a5f0ec

9 files changed, 53 insertions, 26 deletions

diff --git a/conf/Changelog.txt b/conf/Changelog.txt
index 297c04ed2..4cbff02fe 100644
--- a/conf/Changelog.txt
+++ b/conf/Changelog.txt
@@ -1,5 +1,9 @@
 Date	Added
 
+2010/12/12
+	* Rev. 14587 Corrected wording of the setting homunculus_autoloot (since r12203). [Ai4rei]
+2010/12/10
+	* Rev. 14572 Applied update to charhelp.txt provided by EvilPuncker to match current charcommand behavior (bugreport:4632, follow up to r13403). [Ai4rei]
 2010/11/21
 	* Changed party_share_level from 10 to 15 as per kRO maintenance from 2010/04/14. [Ai4rei]
 2010/10/10
diff --git a/conf/battle/client.conf b/conf/battle/client.conf
index a2db1a6c3..143505a36 100644
--- a/conf/battle/client.conf
+++ b/conf/battle/client.conf
@@ -119,3 +119,12 @@ display_hallucination: yes
 // Set this to 1 if your client supports status change timers and you want to use them
 // Clients from 2009 onward support this
 display_status_timers: yes
+
+// Randomizes the dice emoticon server-side, to prevent clients from forging
+// packets for the desired number. (Note 1)
+client_reshuffle_dice: no
+
+// Sorts the character and guild storage before it is sent to the client.
+// Official servers do not sort storage. (Note 1)
+// NOTE: Enabling this option degrades performance.
+client_sort_storage: no
diff --git a/conf/battle/homunc.conf b/conf/battle/homunc.conf
index d9d501f4f..4b8205f9d 100644
--- a/conf/battle/homunc.conf
+++ b/conf/battle/homunc.conf
@@ -44,7 +44,7 @@ hvan_explosion_intimate: 45000
 // Show stat growth to the owner when an Homunculus levels up
 homunculus_show_growth: no
 
-// If a monster is killed only by homunculus, can autoloot works?
+// Does autoloot work, when a monster is killed by homunculus only?
 homunculus_autoloot: yes
 
 // Should homunculii Vaporize when Master dies?
diff --git a/conf/battle/party.conf b/conf/battle/party.conf
index 2bb0dbb0c..f0b2c8de2 100644
--- a/conf/battle/party.conf
+++ b/conf/battle/party.conf
@@ -38,6 +38,7 @@ show_party_share_picker: yes
 // 1:   IT_HEALING,  2:   IT_UNKNOWN,  4:    IT_USABLE, 8:    IT_ETC,
 // 16:  IT_WEAPON,   32:  IT_ARMOR,    64:   IT_CARD,   128:  IT_PETEGG,
 // 256: IT_PETARMOR, 512: IT_UNKNOWN2, 1024: IT_AMMO,   2048: IT_DELAYCONSUME
+// 262144: IT_CASH
 show_picker.item_type: 112
 
 // Method of distribution when item party share is enabled in a party:
diff --git a/conf/char_athena.conf b/conf/char_athena.conf
index d92f2a47a..af0da9976 100644
--- a/conf/char_athena.conf
+++ b/conf/char_athena.conf
@@ -156,7 +156,7 @@ char_name_option: 1
 // Note: Don't add spaces unless you mean to add 'space' to the list.
 char_name_letters: abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890
 
-// How many Characters are allowed per Account ? (0 = disabled) [SQL Only!]
+// How many Characters are allowed per Account ? (0 = disabled)
 chars_per_account: 0
 
 // Restrict character deletion by BaseLevel
diff --git a/conf/charhelp.txt b/conf/charhelp.txt
index fe877b5e3..e3acddbb4 100644
--- a/conf/charhelp.txt
+++ b/conf/charhelp.txt
@@ -1,28 +1,28 @@
  40:--- CHARACTER CMD ---
- 40:#statsall - Displays stats of all characters.
+ 40:#statsall <char name> - Set all stats of a player to maximum.
  40:#itemlist <char name> - Displays all items of a player.
  40:#storagelist <char name> - Displays all items of a player's storage.
  40:#stats <char name> - Displays a characters stats.
- 60:#option <param1> <param2> <param3> <charname> - Like @option command but only to target character.
- 50:#mountpeco <charname> - Give/remove to a player a peco (Class is required, but not skill).
- 50:#petrename <charname> - Re-enable pet rename to a player.
- 60:#save <map> <x> <y> <charname> - Changes the target players respawn point.
- 60:#baselvl <#> <nickname> - Change a characters base level.
- 60:#jlvl <#> <nickname> - Change a characters job level.
- 60:#job/#jobchange <job ID> <char name> - Changes target characters job.
- 60:#zeny <amount> <name> - Give/take a players Zeny
- 60:#cash <amount> <name> - Give/take a player cash points
- 60:#points <amount> <name> - Give/take a player Kafra points
- 60:#stpoint <amount> <name> - Give/take a players stat points
- 60:#skpoint <amount> <name> - give/take a players skill points
- 60:#skreset <charname> - Reset skills of a character.
- 60:#streset <charname> - Reset stats of a character.
- 60:#reset <charname> - Reset stats AND skills of a character.
- 60:#questskill <#> <charname> - Gives to a player the specified quest skill.
- 60:#lostskill <#> <charname> - Takes away the specified quest skill from the player.
- 60:#delitem <item_name_or_ID> <quantity> <player> - Remove items from a character
- 50:#model <hair type> <hair color> <clothes color> <name> - Changes a player's model
- 60:#disguise <monster_name_or_monster_ID> <char name> - Changes disguise of a player
+ 60:#option <char name> <param1> <param2> <param3> - Like @option command but only to target character.
+ 50:#mountpeco <char name> - Give/remove to a player a peco (Class is required, but not skill).
+ 50:#petrename <char name> - Re-enable pet rename to a player.
+ 60:#save <char name> <map> <x> <y> - Changes the target players respawn point.
+ 60:#baselvl/#blvl <char name> <#> - Change a characters base level.
+ 60:#joblvl/#jlvl <char name> <#> - Change a characters job level.
+ 60:#job/#jobchange <char name> <job ID> - Changes target characters job.
+ 60:#zeny <char name> <amount> - Give/take a players Zeny
+ 60:#cash <char name> <amount> - Give/take a player cash points
+ 60:#points <char name> <amount> - Give/take a player Kafra points
+ 60:#stpoint <char name> <amount> - Give/take a players stat points
+ 60:#skpoint <char name> <amount> - give/take a players skill points
+ 60:#skreset <char name> - Reset skills of a character.
+ 60:#streset <char name> - Reset stats of a character.
+ 60:#reset <char name> - Reset stats AND skills of a character.
+ 60:#questskill <char name> <#> - Gives to a player the specified quest skill.
+ 60:#lostskill <char name> <#> - Takes away the specified quest skill from the player.
+ 60:#delitem <char name> <item_name_or_ID> <quantity> - Remove items from a character
+ 50:#model <char name> <hair type> <hair color> <clothes color> - Changes a player's model
+ 60:#disguise <char name> <monster_name_or_monster_ID> - Changes disguise of a player
  60:#undisguise <char name> - Cancels disguise of a player
- 60:#changesex <name> - Changes sex of a player (all characters of the account)
- 60:#warp/#rura+ <mapname> <x> <y> <char name> - Warps character to location of choice
+ 60:#changesex <char name> - Changes sex of a player (all characters of the account)
+ 60:#warp/#rura+ <char name> <mapname> <x> <y> - Warps character to location of choice
diff --git a/conf/log_athena.conf b/conf/log_athena.conf
index b75f1b363..2f8effd18 100644
--- a/conf/log_athena.conf
+++ b/conf/log_athena.conf
@@ -30,7 +30,7 @@ sql_logs: 0
 // Advanced Filter Bits by item type: ||
 // 0002 - Healing items (0)
 // 0004 - Etc Items(3) + Arrows (10)
-// 0008 - Usable Items(2) + Lures,Scrolls(11)
+// 0008 - Usable Items(2) + Lures,Scrolls(11) + Usable Cash Items(18)
 // 0016 - Weapon(4)
 // 0032 - Shields,Armor,Headgears,Accessories,etc(5)
 // 0064 - Cards(6)
diff --git a/conf/packet_athena.conf b/conf/packet_athena.conf
index 76203bedb..84711139a 100644
--- a/conf/packet_athena.conf
+++ b/conf/packet_athena.conf
@@ -8,6 +8,13 @@ debug: no
 // How long can a socket stall before closing the connection (in seconds)
 stall_time: 60
 
+// Maximum allowed size for clients packets in bytes (default: 20480).
+// NOTE: To reduce the size of reported packets, lower the values of defines, which
+//       have been customized, such as MAX_STORAGE, MAX_GUILD_STORAGE or MAX_CART.
+// NOTE: Do not modify this setting, unless the client has been modified to support
+//       larger packets. The client will crash, when it receives larger packets.
+socket_max_client_packet: 20480
+
 //----- IP Rules Settings -----
 
 // If IP's are checked when connecting.
diff --git a/conf/script_athena.conf b/conf/script_athena.conf
index f45af4bad..8264c0efe 100644
--- a/conf/script_athena.conf
+++ b/conf/script_athena.conf
@@ -32,4 +32,10 @@ check_gotocount: 2048
 //input_max_value: 2147483647
 input_max_value: 10000000
 
+// Specifies whether or not each built-in function's arguments are checked for
+// correct type. When a function is given an argument different from what it
+// expects, a warning is thrown before the function is ran anyway.
+// Default: yes
+warn_func_mismatch_argtypes: yes
+
 import: conf/import/script_conf.txt