diff options
author | Haru <haru@dotalux.com> | 2015-09-18 13:09:16 +0200 |
---|---|---|
committer | Haru <haru@dotalux.com> | 2015-09-25 12:55:36 +0200 |
commit | 1aea178ef7cdb76eda5600540b5fbd29fd54ff88 (patch) | |
tree | 855d4feafba212d7f36872c1b46814c1f1a85e75 /conf/battle | |
parent | e99bf73af31a8b1f09b9ce033c16832ee5cac51d (diff) | |
download | hercules-1aea178ef7cdb76eda5600540b5fbd29fd54ff88.tar.gz hercules-1aea178ef7cdb76eda5600540b5fbd29fd54ff88.tar.bz2 hercules-1aea178ef7cdb76eda5600540b5fbd29fd54ff88.tar.xz hercules-1aea178ef7cdb76eda5600540b5fbd29fd54ff88.zip |
More aggressive whitespace cleanup. Follow up to 51329e6
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'conf/battle')
-rw-r--r-- | conf/battle/battle.conf | 10 | ||||
-rw-r--r-- | conf/battle/drops.conf | 2 | ||||
-rw-r--r-- | conf/battle/exp.conf | 6 | ||||
-rw-r--r-- | conf/battle/gm.conf | 4 | ||||
-rw-r--r-- | conf/battle/items.conf | 6 | ||||
-rw-r--r-- | conf/battle/misc.conf | 20 | ||||
-rw-r--r-- | conf/battle/party.conf | 3 | ||||
-rw-r--r-- | conf/battle/pet.conf | 6 | ||||
-rw-r--r-- | conf/battle/player.conf | 4 | ||||
-rw-r--r-- | conf/battle/skill.conf | 29 |
10 files changed, 46 insertions, 44 deletions
diff --git a/conf/battle/battle.conf b/conf/battle/battle.conf index 42d9a7262..8c9447ccb 100644 --- a/conf/battle/battle.conf +++ b/conf/battle/battle.conf @@ -37,7 +37,7 @@ pc_damage_walk_delay_rate: 20 damage_walk_delay_rate: 100 // Move-delay adjustment for multi-hitting attacks. -// When hit by a multi-hitting skill like Lord of Vermillion or Jupitel Thunder, characters will be +// When hit by a multi-hitting skill like Lord of Vermillion or Jupitel Thunder, characters will be // unable to move for an additional "(number of hits -1) * multihit_delay" milliseconds. // 80 is the setting that feels like Aegis (vs Sonic Blows) // 230 is the setting that makes walkdelay last until the last hit (vs Jupitel thunder) @@ -57,7 +57,7 @@ undead_detect_type: 0 // (Will not work in Renewal) attribute_recover: no -// What is the minimum and maximum hitrate of normal attacks? +// What is the minimum and maximum hitrate of normal attacks? min_hitrate: 5 max_hitrate: 100 @@ -121,7 +121,7 @@ attack_attr_none: 14 equip_natural_break_rate: 0 // Overall rate of which your own equipment can break. (Note 2) -// This rate affects penalty breaking rate of skills such as power-thrust and your natural breaking rate +// This rate affects penalty breaking rate of skills such as power-thrust and your natural breaking rate // (from equip_natural_break_rate). If a Sage's endow skill fails and this is above 0, the selected char's // weapon will be broken. equip_self_break_rate: 100 @@ -137,8 +137,8 @@ delay_battle_damage: yes // Are arrows/ammo consumed when used on a bow/gun? // 0 = No // 1 = Yes -// 2 = Yes even for skills that do not specify arrow consumption when said -// skill is weapon-based and used with ranged weapons (auto-guesses which +// 2 = Yes even for skills that do not specify arrow consumption when said +// skill is weapon-based and used with ranged weapons (auto-guesses which // skills should consume ammo when it's acquired via a card or plagiarize) arrow_decrement: 1 diff --git a/conf/battle/drops.conf b/conf/battle/drops.conf index 424c46f5b..ec122002a 100644 --- a/conf/battle/drops.conf +++ b/conf/battle/drops.conf @@ -83,7 +83,7 @@ item_drop_treasure_min: 1 item_drop_treasure_max: 10000 // Use logarithmic drops? (Note 1) -// Logarithmic drops scale drop rates in a non-linear fashion using the equation +// Logarithmic drops scale drop rates in a non-linear fashion using the equation // Droprate(x,y) = x * (5 - log(x)) ^ (ln(y) / ln(5)) // Where x is the original drop rate and y is the drop_rate modifier (the previously mentioned item_rate* variables) // Use the following table for an idea of how the rate will affect drop rates when logarithmic drops are used: diff --git a/conf/battle/exp.conf b/conf/battle/exp.conf index 7c781d3a3..88c5d9c7a 100644 --- a/conf/battle/exp.conf +++ b/conf/battle/exp.conf @@ -20,14 +20,14 @@ multi_level_up: no // Setting this can cap the max experience one can get per kill specified as a // % of the current exp bar. (Every 10 = 1.0%) -// For example, set it to 500 and no matter how much exp the mob gives, +// For example, set it to 500 and no matter how much exp the mob gives, // it can never give you above half of your current exp bar. max_exp_gain_rate: 0 // Method of calculating earned experience when defeating a monster: // 0 = uses damage given / total damage as damage ratio // 1 = uses damage given / max_hp as damage ratio -// NOTE: Using type 1 disables the bonus where the first attacker gets +// NOTE: Using type 1 disables the bonus where the first attacker gets // his share of the exp doubled when multiple people attack the mob. exp_calc_type: 0 @@ -86,6 +86,6 @@ disp_experience: no disp_zeny: no // Use the contents of db/statpoint.txt when doing a stats reset and leveling up? (Note 1) -// If no, an equation will be used which preserves statpoints earned/lost +// If no, an equation will be used which preserves statpoints earned/lost // through external means (ie: stat point buyers/sellers) use_statpoint_table: yes diff --git a/conf/battle/gm.conf b/conf/battle/gm.conf index 7370da6c5..83882ae1c 100644 --- a/conf/battle/gm.conf +++ b/conf/battle/gm.conf @@ -13,8 +13,8 @@ atcommand_spawn_quantity_limit: 100 // Maximum number of slave-clones that can be have by using the @slaveclone at command. (0 denotes unlimited quantity) atcommand_slave_clone_limit: 25 -// If 'no', commands require exact player name. If 'yes', entering a partial -// name will work, as long as there's only one match from all players in the +// If 'no', commands require exact player name. If 'yes', entering a partial +// name will work, as long as there's only one match from all players in the // current map server. partial_name_scan: yes diff --git a/conf/battle/items.conf b/conf/battle/items.conf index 09210a3ea..e2358b6d6 100644 --- a/conf/battle/items.conf +++ b/conf/battle/items.conf @@ -52,9 +52,9 @@ random_monster_checklv: no ignore_items_gender: yes // Item check? (Note 1) -// On map change it will check for items not tagged as "available" and +// On map change it will check for items not tagged as "available" and // auto-delete them from inventory/cart. -// NOTE: An item is not available if it was not loaded from the item_db or you +// NOTE: An item is not available if it was not loaded from the item_db or you // specify it as unavailable in db/item_avail.txt item_check: no @@ -72,7 +72,7 @@ cashfood_use_interval: 60000 gtb_sc_immunity: 50 // Enable autospell card effects to stack? -// NOTE: Different cards that grant the same skill will both +// NOTE: Different cards that grant the same skill will both // always work independently of each other regardless of setting. autospell_stacking: no diff --git a/conf/battle/misc.conf b/conf/battle/misc.conf index 7d797d2eb..a3c6ed26a 100644 --- a/conf/battle/misc.conf +++ b/conf/battle/misc.conf @@ -9,12 +9,16 @@ // assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun) //-------------------------------------------------------------- -// PK Server Mode. Turns entire server pvp(excluding towns). Experience loss is doubled if killed by another player. -// When players hunt monsters over 20 levels higher, they will receive 15% additional exp., and 25% chance of receiving more items. -// There is a nopvp.txt for setting up maps not to have pk on in this mode. Novices cannot be attacked and cannot attack. -// Normal pvp counter and rank display are disabled as well. -// Note: If pk_mode is set to 2 instead of 1 (yes), players will receive a -// manner penalty of 5 each time they kill another player (see manner_system +// PK Server Mode. +// Turns entire server pvp(excluding towns). +// Experience loss is doubled if killed by another player. +// When players hunt monsters over 20 levels higher, they will receive 15% +// additional exp., and 25% chance of receiving more items. +// There is a nopvp.txt for setting up maps not to have pk on in this mode. +// Novices cannot be attacked and cannot attack. +// Normal pvp counter and rank display are disabled as well. +// Note: If pk_mode is set to 2 instead of 1 (yes), players will receive a +// manner penalty of 5 each time they kill another player (see manner_system // config to adjust how this will affect players) pk_mode: 0 @@ -45,7 +49,7 @@ battle_log: off etc_log: off // Do you want to debug warp points? If set to yes, warp points will appear as flags.(Note 1) -// It will also run on start-up a warp-check to print out which warp points lead directly on +// It will also run on start-up a warp-check to print out which warp points lead directly on // top of on-touch npcs (which can lead to infinite loopback warping situations) warp_point_debug: no @@ -80,7 +84,7 @@ duel_time_interval: 60 // Restrict duel usage to same map duel_only_on_same_map: no -// Determines max number of characters that can stack within a single cell. +// Determines max number of characters that can stack within a single cell. // Official - Only affects the walking routines of characters, including monsters. // If a unit stops walking and is on a cell with more than stack limit // characters on it, it will walk to the closest free cell. diff --git a/conf/battle/party.conf b/conf/battle/party.conf index 14d5f47c8..72a22b94a 100644 --- a/conf/battle/party.conf +++ b/conf/battle/party.conf @@ -18,7 +18,7 @@ party_update_interval: 1000 // 1: Athena - bar is updated with the party map dots (up to 1 second delay) party_hp_mode: 0 -// When 'Party Share' item sharing is enabled in a party, +// When 'Party Share' item sharing is enabled in a party, // announce in the party which party-member received the item and what's he received? (Note 1) show_party_share_picker: yes @@ -30,7 +30,6 @@ show_party_share_picker: yes show_picker.item_type: 112 // Method of distribution when item party share is enabled in a party: -// // 0: Normal (item goes to a random party member) // 1: Item Share is disabled for non-mob drops (player/pet drops) // 2: Round Robin (items are distributed evenly and in order among members) diff --git a/conf/battle/pet.conf b/conf/battle/pet.conf index e80826ce8..594184b35 100644 --- a/conf/battle/pet.conf +++ b/conf/battle/pet.conf @@ -34,7 +34,7 @@ pet_attack_support: no // When the master receives damage from the monster, whether or not the pet attacks back. (Note 1) pet_damage_support: no -// Minimum intimacy necessary for a pet to support their master. Default is 900 +// Minimum intimacy necessary for a pet to support their master. Default is 900 // (intimacy goes from 0 to 1000). At this minimum, support rate is 50% of pet's normal value. // At max (1000) support rate is 150%. pet_support_min_friendly: 900 @@ -43,7 +43,7 @@ pet_support_min_friendly: 900 pet_equip_min_friendly: 900 // Whether or not the pet's will use skills. (Note 1) -// Note: Offensive pet skills need at least pet_attack_support or +// Note: Offensive pet skills need at least pet_attack_support or // pet_damage_support to work (they trigger while the pet is attacking). pet_status_support: no @@ -66,7 +66,7 @@ pet_lv_rate: 0 pet_max_stats: 99 // When pet leveling is enabled, these are the imposed caps on -// min/max damage. Note that these only cap atk1 and atk2, if you +// min/max damage. Note that these only cap atk1 and atk2, if you // enable pet_str, their max damage is then their base_atk + pet_max_atk2 pet_max_atk1: 500 pet_max_atk2: 1000 diff --git a/conf/battle/player.conf b/conf/battle/player.conf index cdfcece8d..babd6cfc3 100644 --- a/conf/battle/player.conf +++ b/conf/battle/player.conf @@ -94,7 +94,7 @@ max_baby_parameter: 80 max_baby_third_parameter: 117 // Max armor def/mdef -// NOTE: This setting have no effect if server is run on Renewal Mode (RENEWAL) +// NOTE: This setting have no effect if server is run on Renewal Mode (RENEWAL) // NOTE: does not affects skills and status effects like Mental Strength // If weapon_defense_type is non-zero, it won't apply to max def. // If magic_defense_type is non-zero, it won't apply to max mdef. @@ -117,7 +117,7 @@ show_hp_sp_drain: no // Display the gained hp/sp values from killing mobs? (Ie: Sky Deleter Card) show_hp_sp_gain: yes -// If set, when A accepts B as a friend, B will also be added to A's friend +// If set, when A accepts B as a friend, B will also be added to A's friend // list, otherwise, only A appears in B's friend list. // NOTE: this setting only enables friend auto-adding; auto-deletion does not work yet friend_auto_add: yes diff --git a/conf/battle/skill.conf b/conf/battle/skill.conf index f3da0e209..7622968f8 100644 --- a/conf/battle/skill.conf +++ b/conf/battle/skill.conf @@ -25,8 +25,8 @@ delay_dependon_agi: no min_skill_delay_limit: 100 // This delay is the min 'can't walk delay' of all skills. -// NOTE: Do not set this too low, if a character starts moving too soon after -// doing a skill, the client will not update this, and the player/mob will +// NOTE: Do not set this too low, if a character starts moving too soon after +// doing a skill, the client will not update this, and the player/mob will // appear to "teleport" afterwards. default_walk_delay: 300 @@ -74,7 +74,7 @@ skillrange_by_distance: 14 skillrange_from_weapon: 0 // Should a check on the caster's status be performed in all skill attacks? -// When set to yes, meteors, storm gust and any other ground skills will have +// When set to yes, meteors, storm gust and any other ground skills will have // no effect while the caster is unable to fight (eg: stunned). skill_caster_check: yes @@ -103,7 +103,7 @@ combo_delay_rate: 100 auto_counter_type: 15 // Can ground skills be placed on top of each other? (Note 3) -// By default, skills with UF_NOREITERATION set cannot be stacked on top of +// By default, skills with UF_NOREITERATION set cannot be stacked on top of // other skills, this setting will override that. (skill_unit_db) skill_reiteration: 0 @@ -123,7 +123,7 @@ traps_setting: 0 // Restrictions applied to the Alchemist's Summon Flora skill (add as necessary) // 1: Enable players to damage the floras outside of versus grounds. // 2: Disable having different types out at the same time -// (eg: forbid summoning anything except hydras when there's already +// (eg: forbid summoning anything except hydras when there's already // one hydra out) summon_flora_setting: 3 @@ -135,14 +135,13 @@ summon_flora_setting: 3 song_timer_reset: 0 // Whether placed down skills will check walls (Note 1) -// (Makes it so that Storm Gust/Lord of Vermillion/etc when cast next to a wall, won't hit on the other side) +// (Makes it so that Storm Gust/Lord of Vermillion/etc when cast next to a wall, won't hit on the other side) skill_wall_check: yes // When cloaking, Whether the wall is checked or not. (Note 1) // Note: When the skill does not checks for walls, you will always be considered -// as if you had a wall-next to you (you always get the wall-based speed). +// as if you had a wall-next to you (you always get the wall-based speed). // Add the settings as required, being hit always uncloaks you. -// // 0 = doesn't check for walls // 1 = Check for walls // 2 = Cloaking is not canceled when attacking. @@ -168,7 +167,7 @@ chat_warpportal: no // 0: Do not show defense // 1: Base defense [RE default] // 2: Vit/Int defense -// 3: Both (the addition of both) +// 3: Both (the addition of both) sense_type: 1 // Which finger offensive style will be used? @@ -205,10 +204,10 @@ backstab_bow_penalty: yes // Use 0 to disable (max allowed value is 255) skill_steal_max_tries: 0 -// Can Rogues plagiarize advanced job skills +// Can Rogues plagiarize advanced job skills // 0 = no restriction -// 1 = only stalker may plagiarize advanced skills -// 2 = advanced skills cannot be plagiarized by anyone +// 1 = only stalker may plagiarize advanced skills +// 2 = advanced skills cannot be plagiarized by anyone // Official servers setting: 2 copyskill_restrict: 2 @@ -221,7 +220,7 @@ max_heal: 9999 max_heal_lv: 11 // Emergency Recall Guild Skill setting (add as appropriate). -// Note that for the skill to be usable at all, +// Note that for the skill to be usable at all, // you need at least one of 1/2 and 4/8 // 1: Skill is usable outside of woe. // 2: Skill is usable during woe. @@ -233,7 +232,7 @@ emergency_call: 11 // Guild Aura Skills setting (add as appropriate). // (This affects GD_LEADERSHIP, GD_GLORYWOUNDS, GD_SOULCOLD and GD_HAWKEYES) -// Note that for the skill to be usable at all, +// Note that for the skill to be usable at all, // you need at least one of 1/2 and 4/8 // 1: Skill works outside of woe. // 2: Skill works during woe. @@ -266,7 +265,7 @@ sg_angel_skill_ratio: 10 skill_add_heal_rate: 7 // Whether the damage of EarthQuake with a single target on screen is able to be reflected. -// Note: On official server, EQ is reflectable when there is only one target on the screen, +// Note: On official server, EQ is reflectable when there is only one target on the screen, // which might be an exploit to hunt the MVPs. eq_single_target_reflectable: yes |