diff options
author | Frost <jedzkie13@rocketmail.com> | 2015-09-17 14:38:26 +0200 |
---|---|---|
committer | Haru <haru@dotalux.com> | 2015-09-17 15:01:14 +0200 |
commit | 51329e6c6f783cbfbb51f928c921afd3b114a72a (patch) | |
tree | 6efe2d828325abf55fe5f6f064394bf1d3c0b514 /conf | |
parent | 18f222b67d03dc8ad7584b972025bf58dbf39c1a (diff) | |
download | hercules-51329e6c6f783cbfbb51f928c921afd3b114a72a.tar.gz hercules-51329e6c6f783cbfbb51f928c921afd3b114a72a.tar.bz2 hercules-51329e6c6f783cbfbb51f928c921afd3b114a72a.tar.xz hercules-51329e6c6f783cbfbb51f928c921afd3b114a72a.zip |
corrected some white spaces and added missing EOL.
Split from #558 (and added a few more corrections)
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'conf')
-rw-r--r-- | conf/battle/client.conf | 6 | ||||
-rw-r--r-- | conf/battle/guild.conf | 5 | ||||
-rw-r--r-- | conf/battle/monster.conf | 14 | ||||
-rw-r--r-- | conf/battlegrounds.conf | 14 | ||||
-rw-r--r-- | conf/groups.conf | 43 | ||||
-rw-r--r-- | conf/packet.conf | 2 | ||||
-rw-r--r-- | conf/script.conf | 1 |
7 files changed, 41 insertions, 44 deletions
diff --git a/conf/battle/client.conf b/conf/battle/client.conf index 5089fa4a5..e10f03d82 100644 --- a/conf/battle/client.conf +++ b/conf/battle/client.conf @@ -16,7 +16,7 @@ packet_obfuscation: 1 // Minimum delay between whisper/global/party/guild messages (in ms) -// Messages that break this threshold are silently omitted. +// Messages that break this threshold are silently omitted. min_chat_delay: 0 // Valid range of dyes and styles on the client. @@ -24,7 +24,7 @@ min_hair_style: 0 max_hair_style: 29 min_hair_color: 0 max_hair_color: 8 -min_cloth_color: 0 +min_cloth_color: 0 max_cloth_color: 4 // When set to yes, the damage field in packets sent from woe maps will be set @@ -77,7 +77,7 @@ save_clothcolor: yes // Do not display cloth colors for the wedding costume? // Note: Both save_clothcolor and wedding_modifydisplay have to be enabled -// for this option to take effect. Set this to yes if your cloth palettes +// for this option to take effect. Set this to yes if your cloth palettes // pack doesn't has wedding palettes (or has less than the other jobs) wedding_ignorepalette: no diff --git a/conf/battle/guild.conf b/conf/battle/guild.conf index 91c39fe71..59fc78c51 100644 --- a/conf/battle/guild.conf +++ b/conf/battle/guild.conf @@ -17,7 +17,8 @@ guild_exp_limit: 50 guild_max_castles: 0 // Restart guild skills cooldown by relog? (Note 1) -// When "no", you relog with the same cooldown remaining as from when you logged out, "yes" restarts the cooldown upon login to its full duration. +// When "no", you relog with the same cooldown remaining as from when you +// logged out, "yes" restarts the cooldown upon login to its full duration. guild_skill_relog_delay: no // Damage adjustments for WOE battles against defending Guild monsters (Note 2) @@ -46,4 +47,4 @@ guild_notice_changemap: 2 // Can guild members invite/expel members inside guild castles in WoE/GvG? (Note 1) // default: no guild_castle_invite: no -guild_castle_expulsion: no
\ No newline at end of file +guild_castle_expulsion: no diff --git a/conf/battle/monster.conf b/conf/battle/monster.conf index 3167c11b1..23087ec78 100644 --- a/conf/battle/monster.conf +++ b/conf/battle/monster.conf @@ -27,13 +27,13 @@ monster_max_aspd: 199 // attacked (eg: GrimTooth), otherwise, their rude attack" is only activated // if they can't melee reach the target (eg: sniping) // 0x004: If not set, mobs that can change target only do so when melee attacked -// (distance player/mob < 3), otherwise mobs may change target and chase +// (distance player/mob < 3), otherwise mobs may change target and chase // ranged attackers. This flag also overrides the 'provoke' target. // 0x008: When set, mobs scatter as soon as they lose their target. Use this mode // to make it much harder to mob-train by hiding and collecting them on a // single spot (ie: GrimTooth training) // 0x010: If set, mob skills defined for friends will also trigger on themselves. -// 0x020: When set, the monster ai is executed for all monsters in maps that +// 0x020: When set, the monster ai is executed for all monsters in maps that // have players on them, instead of only for mobs who are in the vicinity // of players. // 0x040: When set, when the mob's target changes map, the mob will walk towards @@ -45,7 +45,7 @@ monster_max_aspd: 199 // the same skill, instead, only to that particular entry (eg: Mob has heal // on six lines in the mob_skill_db, only the entry that is actually used // will receive the delay). This will make monsters harder, especially MvPs. -// 0x400: Set this to make mobs have a range of 9 for all skills. Otherwise, they +// 0x400: Set this to make mobs have a range of 9 for all skills. Otherwise, they // will obey the normal skill range rules. // Example: 0x140 -> Chase players through warps + use skills in random order. monster_ai: 0 @@ -56,7 +56,7 @@ monster_ai: 0 // 2: Every 2 cells moved // 3: Every 3 cells moved (official) // x: Every x cells moved -// Regardless of this setting, a monster will always rethink its chase if it has +// Regardless of this setting, a monster will always rethink its chase if it has // reached its target. Increase this value if you want to make monsters continue // moving after they lost their target (hide, no line of sight, etc.). monster_chase_refresh: 3 @@ -120,7 +120,7 @@ plant_spawn_delay: 100 boss_spawn_delay: 100 // Should mobs not spawn within the viewing range of players? -// 0 is disabled, otherwise it is the number of retries before giving up +// 0 is disabled, otherwise it is the number of retries before giving up // and spawning the mob within player-view anyway, unless the max (100) is used, // in which case the mob will not be spawned, and it'll be retried again in // 5 seconds. @@ -195,7 +195,7 @@ mob_remove_delay: 300000 // Defines on who the mob npc_event gets executed when a mob is killed. // Type 1: On the player that killed the mob (if killed by a non-player, resorts to type 0) // Type 0: On the player that did the most damage to the mob. -// NOTE: This affects who gains the Castle when the Emperium is broken. +// NOTE: This affects who gains the Castle when the Emperium is broken. mob_npc_event_type: 1 // Time in milliseconds to activate protection against Kill Steal @@ -235,4 +235,4 @@ mob_size_influence: no // Default (least exploitable): mob - 75, boss - 0 // Default (most official): mob - 220, boss - 1 mob_icewall_walk_block: 220 -boss_icewall_walk_block: 1
\ No newline at end of file +boss_icewall_walk_block: 1 diff --git a/conf/battlegrounds.conf b/conf/battlegrounds.conf index ea54d3f2e..2b4184e11 100644 --- a/conf/battlegrounds.conf +++ b/conf/battlegrounds.conf @@ -1,12 +1,12 @@ //==================================================== -//= _ _ _ -//= | | | | | | -//= | |_| | ___ _ __ ___ _ _| | ___ ___ +//= _ _ _ +//= | | | | | | +//= | |_| | ___ _ __ ___ _ _| | ___ ___ //= | _ |/ _ \ '__/ __| | | | |/ _ \/ __| //= | | | | __/ | | (__| |_| | | __/\__ \ //= \_| |_/\___|_| \___|\__,_|_|\___||___/ -//= -//= http://herc.ws/board/ +//= +//= http://herc.ws/board/ //==================================================== //= http://herc.ws/board/topic/928-memory-slasher-may-30-patch/ //==================================================== @@ -21,12 +21,12 @@ battlegrounds: ( { /* feature is not complete */ - feature_off:true + feature_off: true /* character variable for global bg delay */ global_delay_var: "BG_Delay_Tick" /* how many seconds to consider a player "afk" and kick him out? */ maximum_afk_seconds: 30 - + /* one can add as many as he wishes */ /* for custom ones, need to edit "lua files/entryqueue/entryqueuelist.lua" [Ind/Hercules] */ arenas: ({ diff --git a/conf/groups.conf b/conf/groups.conf index d31f46f24..3f0c34ffb 100644 --- a/conf/groups.conf +++ b/conf/groups.conf @@ -5,7 +5,7 @@ Player groups configuration file This file defines "player groups" and their privileges. -Each group has its id and name, lists of available commands and other +Each group has its id and name, lists of available commands and other permissions, and a list of other groups it inherits from. @@ -15,15 +15,15 @@ Group settings Unique group number. The only required field. <name> -Any string. If empty, defaults to "Group <id>". It is used in several @who +Any string. If empty, defaults to "Group <id>". It is used in several @who commands. <level> -Equivalent of GM level, which was used in revisions before r15572. You can -set it to any number, but usually it's between 0 (default) and 99. Members of -groups with lower level can not perform some actions/commands (like @kick) on -members of groups with higher level. It is what script command getgmlevel() -returns. Group level can also be used to override trade restrictions +Equivalent of GM level, which was used in revisions before r15572. You can set +it to any number, but usually it's between 0 (default) and 99. Members of +groups with lower level can not perform some actions/commands (like @kick) on +members of groups with higher level. It is what script command getgmlevel() +returns. Group level can also be used to override trade restrictions (db/item_trade.txt). <commands> @@ -31,15 +31,15 @@ A group of settings <command name> : <bool> or <commandname> : [ <bool>, <bool> ] -First boolean value is for atcommand, second one for charcommand. If set to -true, group can use command. If only atcommand value is provided, false is -assumed for charcommand. If a command name is not included, false is assumed for -both atcommand and charcommand. +First boolean value is for atcommand, second one for charcommand. If set to +true, group can use command. If only atcommand value is provided, false is +assumed for charcommand. If a command name is not included, false is assumed +for both atcommand and charcommand. For a full list of available commands, see: doc/atcommands.txt. Command names must not be aliases. <log_commands> -Boolean value. If true then all commands used by the group will be logged to +Boolean value. If true then all commands used by the group will be logged to atcommandlog. If setting is omitted in a group definition, false is assumed. Requires 'log_commands' to be enabled in 'conf/logs.conf'. @@ -50,7 +50,7 @@ If a permission is not included, false is assumed. For a full list of available permissions, see: doc/permissions.txt <inherit> -A list of group names that given group will inherit commands and permissions +A list of group names that given group will inherit commands and permissions from. Group names are case-sensitive. Inheritance results @@ -58,19 +58,19 @@ Inheritance results Both multiple inheritance (Group 2 -> Group 1 and Group 3 -> Group 1) and recursive inheritance (Group 3 -> Group 2 -> Group 1) are allowed. -Inheritance rules should not create cycles (eg Group 1 inherits from Group 2, -and Group inherits from Group 1 at the same time). Configuration with cycles is +Inheritance rules should not create cycles (eg Group 1 inherits from Group 2, +and Group inherits from Group 1 at the same time). Configuration with cycles is considered faulty and can't be processed fully by server. -Command or permission is inherited ONLY if it's not already defined for the +Command or permission is inherited ONLY if it's not already defined for the group. -If group inherits from multiple groups, and the same command or permission is -defined for more than one of these groups, it's undefined which one will be +If group inherits from multiple groups, and the same command or permission is +defined for more than one of these groups, it's undefined which one will be inherited. Syntax ------ -This config file uses libconfig syntax: +This config file uses libconfig syntax: http://www.hyperrealm.com/libconfig/libconfig_manual.html#Configuration-Files */ @@ -84,8 +84,8 @@ groups: ( /* no commands by default */ } permissions: { - /* without this basic permissions regular players could not - trade or party */ + /* without this basic permissions regular players could not + * trade or party */ can_trade: true can_party: true } @@ -273,4 +273,3 @@ groups: ( } } ) - diff --git a/conf/packet.conf b/conf/packet.conf index 85996f4e3..33de0e901 100644 --- a/conf/packet.conf +++ b/conf/packet.conf @@ -45,7 +45,6 @@ order: deny,allow // deny: 127.0.0.1 - //---- DDoS Protection Settings ---- // If ddos_count connection request are made within ddos_interval msec, it assumes it's a DDoS attack @@ -62,5 +61,4 @@ ddos_count: 5 // (default is 600000 msecs, 10 minutes) ddos_autoreset: 600000 - import: conf/import/packet_conf.txt diff --git a/conf/script.conf b/conf/script.conf index 57442e87f..1512aa15a 100644 --- a/conf/script.conf +++ b/conf/script.conf @@ -2,7 +2,6 @@ // Hercules Script Configuration File //-------------------------------------------------------- - warn_func_mismatch_paramnum: yes check_cmdcount: 655360 |