From 6096ce0b42a3eee07dc70ae5ef489aa4c30bf515 Mon Sep 17 00:00:00 2001 From: ai4rei Date: Sun, 26 Dec 2010 22:36:41 +0000 Subject: * 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 --- conf/Changelog.txt | 4 ++++ conf/battle/client.conf | 9 +++++++++ conf/battle/homunc.conf | 2 +- conf/battle/party.conf | 1 + conf/char_athena.conf | 2 +- conf/charhelp.txt | 46 +++++++++++++++++++++++----------------------- conf/log_athena.conf | 2 +- conf/packet_athena.conf | 7 +++++++ conf/script_athena.conf | 6 ++++++ 9 files changed, 53 insertions(+), 26 deletions(-) (limited to 'conf') 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 - Set all stats of a player to maximum. 40:#itemlist - Displays all items of a player. 40:#storagelist - Displays all items of a player's storage. 40:#stats - Displays a characters stats. - 60:#option - Like @option command but only to target character. - 50:#mountpeco - Give/remove to a player a peco (Class is required, but not skill). - 50:#petrename - Re-enable pet rename to a player. - 60:#save - Changes the target players respawn point. - 60:#baselvl <#> - Change a characters base level. - 60:#jlvl <#> - Change a characters job level. - 60:#job/#jobchange - Changes target characters job. - 60:#zeny - Give/take a players Zeny - 60:#cash - Give/take a player cash points - 60:#points - Give/take a player Kafra points - 60:#stpoint - Give/take a players stat points - 60:#skpoint - give/take a players skill points - 60:#skreset - Reset skills of a character. - 60:#streset - Reset stats of a character. - 60:#reset - Reset stats AND skills of a character. - 60:#questskill <#> - Gives to a player the specified quest skill. - 60:#lostskill <#> - Takes away the specified quest skill from the player. - 60:#delitem - Remove items from a character - 50:#model - Changes a player's model - 60:#disguise - Changes disguise of a player + 60:#option - Like @option command but only to target character. + 50:#mountpeco - Give/remove to a player a peco (Class is required, but not skill). + 50:#petrename - Re-enable pet rename to a player. + 60:#save - Changes the target players respawn point. + 60:#baselvl/#blvl <#> - Change a characters base level. + 60:#joblvl/#jlvl <#> - Change a characters job level. + 60:#job/#jobchange - Changes target characters job. + 60:#zeny - Give/take a players Zeny + 60:#cash - Give/take a player cash points + 60:#points - Give/take a player Kafra points + 60:#stpoint - Give/take a players stat points + 60:#skpoint - give/take a players skill points + 60:#skreset - Reset skills of a character. + 60:#streset - Reset stats of a character. + 60:#reset - Reset stats AND skills of a character. + 60:#questskill <#> - Gives to a player the specified quest skill. + 60:#lostskill <#> - Takes away the specified quest skill from the player. + 60:#delitem - Remove items from a character + 50:#model - Changes a player's model + 60:#disguise - Changes disguise of a player 60:#undisguise - Cancels disguise of a player - 60:#changesex - Changes sex of a player (all characters of the account) - 60:#warp/#rura+ - Warps character to location of choice + 60:#changesex - Changes sex of a player (all characters of the account) + 60:#warp/#rura+ - 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 -- cgit v1.2.3-70-g09d2